|
@@ -70,7 +70,7 @@
|
|
<view class="text-content">
|
|
<view class="text-content">
|
|
<view class="text">请复制以下链接,并发送至电脑端,在浏览器访问该链接并选择银行尽快完成支付</view>
|
|
<view class="text">请复制以下链接,并发送至电脑端,在浏览器访问该链接并选择银行尽快完成支付</view>
|
|
<view class="text-p">{{payHttpUrl}}</view>
|
|
<view class="text-p">{{payHttpUrl}}</view>
|
|
- <view class="text-b">链接有效期为24小时</view>
|
|
|
|
|
|
+ <view class="text-b">链接有效期为72小时</view>
|
|
</view>
|
|
</view>
|
|
<view class="text-button" @click.stop="clipboard(payHttpUrl)">复制链接</view>
|
|
<view class="text-button" @click.stop="clipboard(payHttpUrl)">复制链接</view>
|
|
</view>
|
|
</view>
|
|
@@ -81,7 +81,7 @@
|
|
|
|
|
|
<script>
|
|
<script>
|
|
import authorize from '@/common/config/authorize.js'
|
|
import authorize from '@/common/config/authorize.js'
|
|
- import thorui from "@/components/clipboard/clipboard.thorui.js"
|
|
|
|
|
|
+ import thorui from '@/components/clipboard/clipboard.thorui.js'
|
|
export default{
|
|
export default{
|
|
components: {
|
|
components: {
|
|
// keyboard
|
|
// keyboard
|
|
@@ -121,23 +121,23 @@
|
|
},
|
|
},
|
|
filters: {
|
|
filters: {
|
|
NumFormat(value) {
|
|
NumFormat(value) {
|
|
- if(!value) return '0.00';
|
|
|
|
|
|
+ if(!value) return '0.00'
|
|
/*原来用的是Number(value).toFixed(0),这样取整时有问题,例如0.51取整之后为1,感谢Nils指正*/
|
|
/*原来用的是Number(value).toFixed(0),这样取整时有问题,例如0.51取整之后为1,感谢Nils指正*/
|
|
/*后来改成了 Number(value)|0,但是输入超过十一位就为负数了,具体见评论 */
|
|
/*后来改成了 Number(value)|0,但是输入超过十一位就为负数了,具体见评论 */
|
|
- var intPart = Number(value) - Number(value)%1; //获取整数部分(这里是windy93的方法)
|
|
|
|
- var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,'); //将整数部分逢三一断
|
|
|
|
- var floatPart = ".00"; //预定义小数部分
|
|
|
|
- var value2Array = value.toString().split(".");
|
|
|
|
|
|
+ var intPart = Number(value) - Number(value)%1 //获取整数部分(这里是windy93的方法)
|
|
|
|
+ var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,') //将整数部分逢三一断
|
|
|
|
+ var floatPart = '.00' //预定义小数部分
|
|
|
|
+ var value2Array = value.toString().split('.')
|
|
//=2表示数据有小数位
|
|
//=2表示数据有小数位
|
|
if(value2Array.length == 2) {
|
|
if(value2Array.length == 2) {
|
|
- floatPart = value2Array[1].toString(); //拿到小数部分
|
|
|
|
|
|
+ floatPart = value2Array[1].toString() //拿到小数部分
|
|
if(floatPart.length == 1) { //补0,实际上用不着
|
|
if(floatPart.length == 1) { //补0,实际上用不着
|
|
- return intPartFormat + "." + floatPart + '0';
|
|
|
|
|
|
+ return intPartFormat + '.' + floatPart + '0'
|
|
} else {
|
|
} else {
|
|
- return intPartFormat + "." + floatPart;
|
|
|
|
|
|
+ return intPartFormat + '.' + floatPart
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
- return intPartFormat + floatPart;
|
|
|
|
|
|
+ return intPartFormat + floatPart
|
|
}
|
|
}
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -149,19 +149,19 @@
|
|
switch(this.payType){
|
|
switch(this.payType){
|
|
case '0':
|
|
case '0':
|
|
this.payWay = 'WEIXIN'
|
|
this.payWay = 'WEIXIN'
|
|
- this.btnColor="#09BB07"
|
|
|
|
|
|
+ this.btnColor='#09BB07'
|
|
this.buttonText = '去支付'
|
|
this.buttonText = '去支付'
|
|
- break;
|
|
|
|
|
|
+ break
|
|
case '1':
|
|
case '1':
|
|
this.payWay = 'UNIONPAY'
|
|
this.payWay = 'UNIONPAY'
|
|
- this.btnColor="#034582"
|
|
|
|
|
|
+ this.btnColor='#034582'
|
|
this.buttonText = '生成企业网银支付链接'
|
|
this.buttonText = '生成企业网银支付链接'
|
|
- break;
|
|
|
|
|
|
+ break
|
|
case '2':
|
|
case '2':
|
|
this.payWay = 'UNIONPAY'
|
|
this.payWay = 'UNIONPAY'
|
|
- this.btnColor="#034582"
|
|
|
|
|
|
+ this.btnColor='#034582'
|
|
this.buttonText = '生成个人网银支付链接'
|
|
this.buttonText = '生成个人网银支付链接'
|
|
- break;
|
|
|
|
|
|
+ break
|
|
}
|
|
}
|
|
this.GetPayOrderInfo()
|
|
this.GetPayOrderInfo()
|
|
},
|
|
},
|
|
@@ -183,22 +183,22 @@
|
|
switch(this.payType){
|
|
switch(this.payType){
|
|
case '0':
|
|
case '0':
|
|
this.MiniWxPayFor()
|
|
this.MiniWxPayFor()
|
|
- break;
|
|
|
|
|
|
+ break
|
|
case '1':
|
|
case '1':
|
|
this.BuildCatenate()
|
|
this.BuildCatenate()
|
|
- break;
|
|
|
|
|
|
+ break
|
|
case '2':
|
|
case '2':
|
|
this.BuildCatenate()
|
|
this.BuildCatenate()
|
|
- break;
|
|
|
|
|
|
+ break
|
|
}
|
|
}
|
|
},
|
|
},
|
|
BuildCatenate(){
|
|
BuildCatenate(){
|
|
if(this.payAmount == 0){
|
|
if(this.payAmount == 0){
|
|
- this.$util.msg("请输入本次支付的金额",2000)
|
|
|
|
|
|
+ this.$util.msg('请输入本次支付的金额',2000)
|
|
return
|
|
return
|
|
}
|
|
}
|
|
if(this.payAmount <=10){
|
|
if(this.payAmount <=10){
|
|
- this.$util.msg("企业网银支付的金额必须大于¥10.00",2000)
|
|
|
|
|
|
+ this.$util.msg('企业网银支付的金额必须大于¥10.00',2000)
|
|
return
|
|
return
|
|
}
|
|
}
|
|
this.PayService.PayOrderPayLink({unpaidAmount:this.payAmount,orderId:this.orderId,payType:this.payType}).then(response =>{
|
|
this.PayService.PayOrderPayLink({unpaidAmount:this.payAmount,orderId:this.orderId,payType:this.payType}).then(response =>{
|
|
@@ -213,17 +213,17 @@
|
|
return
|
|
return
|
|
}
|
|
}
|
|
if(this.payAmount == 0){
|
|
if(this.payAmount == 0){
|
|
- this.$util.msg("请输入本次支付的金额",2000)
|
|
|
|
|
|
+ this.$util.msg('请输入本次支付的金额',2000)
|
|
return
|
|
return
|
|
}
|
|
}
|
|
if(this.payAmount*100 < 2){
|
|
if(this.payAmount*100 < 2){
|
|
- this.$util.msg("本次支付的金额必须大于¥0.02",2000)
|
|
|
|
|
|
+ this.$util.msg('本次支付的金额必须大于¥0.02',2000)
|
|
return
|
|
return
|
|
}
|
|
}
|
|
console.log('this.payAmount',this.payAmount)
|
|
console.log('this.payAmount',this.payAmount)
|
|
let params ={
|
|
let params ={
|
|
payAmount:this.accMul(this.payAmount,100),
|
|
payAmount:this.accMul(this.payAmount,100),
|
|
- payWay:"WEIXIN",
|
|
|
|
|
|
+ payWay:'WEIXIN',
|
|
code:wechatcode,
|
|
code:wechatcode,
|
|
orderId:this.orderId
|
|
orderId:this.orderId
|
|
}
|
|
}
|
|
@@ -237,7 +237,7 @@
|
|
Um_Key_PayOrderID:`${this.orderId}`
|
|
Um_Key_PayOrderID:`${this.orderId}`
|
|
})
|
|
})
|
|
}
|
|
}
|
|
- let PayInfo = JSON.parse(response.data.data.payInfo);
|
|
|
|
|
|
+ let PayInfo = JSON.parse(response.data.data.payInfo)
|
|
this.WxRequestPayment(PayInfo)
|
|
this.WxRequestPayment(PayInfo)
|
|
}).catch(error =>{
|
|
}).catch(error =>{
|
|
this.$util.msg(error.msg,2000)
|
|
this.$util.msg(error.msg,2000)
|
|
@@ -253,7 +253,7 @@
|
|
'signType': data.signType,
|
|
'signType': data.signType,
|
|
'paySign': data.paySign,
|
|
'paySign': data.paySign,
|
|
'success':function(res){
|
|
'success':function(res){
|
|
- wx.reLaunch({url: '/pages/tabBar/user/user'});
|
|
|
|
|
|
+ wx.reLaunch({url: '/pages/tabBar/user/user'})
|
|
},
|
|
},
|
|
'fail':function(res){
|
|
'fail':function(res){
|
|
self.$util.msg('用户取消支付~')
|
|
self.$util.msg('用户取消支付~')
|
|
@@ -265,16 +265,16 @@
|
|
},
|
|
},
|
|
accMul(value1, value2) {
|
|
accMul(value1, value2) {
|
|
if (value1 == 0 || value2 == 0) {
|
|
if (value1 == 0 || value2 == 0) {
|
|
- return 0;
|
|
|
|
|
|
+ return 0
|
|
}
|
|
}
|
|
- let m = 0;
|
|
|
|
- let v1 = value1.toString();
|
|
|
|
- let v2 = value2.toString();
|
|
|
|
- m += v1.split(".")[1] ? v1.split(".")[1].length : 0;
|
|
|
|
- m += v2.split(".")[1] ? v2.split(".")[1].length : 0;
|
|
|
|
- let _v1 = Number(v1.replace(".", ""));
|
|
|
|
- let _v2 = Number(v2.replace(".", ""));
|
|
|
|
- return (_v1 * _v2) / Math.pow(10, m);
|
|
|
|
|
|
+ let m = 0
|
|
|
|
+ let v1 = value1.toString()
|
|
|
|
+ let v2 = value2.toString()
|
|
|
|
+ m += v1.split('.')[1] ? v1.split('.')[1].length : 0
|
|
|
|
+ m += v2.split('.')[1] ? v2.split('.')[1].length : 0
|
|
|
|
+ let _v1 = Number(v1.replace('.', ''))
|
|
|
|
+ let _v2 = Number(v2.replace('.', ''))
|
|
|
|
+ return (_v1 * _v2) / Math.pow(10, m)
|
|
},
|
|
},
|
|
confirmEvent(value){//点击自定义键盘完成的回调函数
|
|
confirmEvent(value){//点击自定义键盘完成的回调函数
|
|
this.chechValue(value)
|
|
this.chechValue(value)
|
|
@@ -290,13 +290,13 @@
|
|
this.showDigitKeyboard = false
|
|
this.showDigitKeyboard = false
|
|
},
|
|
},
|
|
chechValue(value){
|
|
chechValue(value){
|
|
- let patern = /\d+\.\d+/g;
|
|
|
|
|
|
+ let patern = /\d+\.\d+/g
|
|
if(value && value.split('.').length > 2) {
|
|
if(value && value.split('.').length > 2) {
|
|
- value= patern.exec(value);
|
|
|
|
|
|
+ value= patern.exec(value)
|
|
}
|
|
}
|
|
- if(value == "" || value <0 ){
|
|
|
|
- this.payAmount = '';
|
|
|
|
- this.balanceAmount = this.payableAmount;
|
|
|
|
|
|
+ if(value == '' || value <0 ){
|
|
|
|
+ this.payAmount = ''
|
|
|
|
+ this.balanceAmount = this.payableAmount
|
|
}else if( value > this.payableAmount){
|
|
}else if( value > this.payableAmount){
|
|
this.payAmount = this.toFixedFn(this.payableAmount)
|
|
this.payAmount = this.toFixedFn(this.payableAmount)
|
|
this.balanceAmount = this.toFixedFn(this.payableAmount - this.payAmount)
|
|
this.balanceAmount = this.toFixedFn(this.payableAmount - this.payAmount)
|
|
@@ -308,7 +308,7 @@
|
|
hanldNavigateBack(){//页面返回
|
|
hanldNavigateBack(){//页面返回
|
|
uni.navigateBack({
|
|
uni.navigateBack({
|
|
delta: 1
|
|
delta: 1
|
|
- });
|
|
|
|
|
|
+ })
|
|
},
|
|
},
|
|
payTypeText (state){//处理支付记录文字
|
|
payTypeText (state){//处理支付记录文字
|
|
let stateText = '',
|
|
let stateText = '',
|
|
@@ -324,19 +324,19 @@
|
|
stateText = stateTextObject[key]
|
|
stateText = stateTextObject[key]
|
|
}
|
|
}
|
|
})
|
|
})
|
|
- return stateText;
|
|
|
|
|
|
+ return stateText
|
|
},
|
|
},
|
|
hideTips(){//隐藏弹窗
|
|
hideTips(){//隐藏弹窗
|
|
this.isShowTip = false
|
|
this.isShowTip = false
|
|
},
|
|
},
|
|
toFixedFn(text){//处理小数点后两位数
|
|
toFixedFn(text){//处理小数点后两位数
|
|
- return Number(text).toFixed(2);
|
|
|
|
|
|
+ return Number(text).toFixed(2)
|
|
},
|
|
},
|
|
clipboard(data) {//复制链接
|
|
clipboard(data) {//复制链接
|
|
thorui.getClipboardData(data, (res) => {
|
|
thorui.getClipboardData(data, (res) => {
|
|
if (res) {
|
|
if (res) {
|
|
- this.isShowTip = false;
|
|
|
|
- this.$util.msg("复制成功",2000,true,'success');
|
|
|
|
|
|
+ this.isShowTip = false
|
|
|
|
+ this.$util.msg('复制成功',2000,true,'success')
|
|
// 友盟埋点收集复制网银链接
|
|
// 友盟埋点收集复制网银链接
|
|
if(process.env.NODE_ENV != 'development'){
|
|
if(process.env.NODE_ENV != 'development'){
|
|
this.$uma.trackEvent('Um_Event_CopyUnionPay', {
|
|
this.$uma.trackEvent('Um_Event_CopyUnionPay', {
|
|
@@ -350,7 +350,7 @@
|
|
this.$api.navigateTo(`/pages/user/order/order-details?state=0&orderId=${this.orderId}`)
|
|
this.$api.navigateTo(`/pages/user/order/order-details?state=0&orderId=${this.orderId}`)
|
|
},2000)
|
|
},2000)
|
|
} else {
|
|
} else {
|
|
- this.$util.msg("复制失败",2000,true,'none');
|
|
|
|
|
|
+ this.$util.msg('复制失败',2000,true,'none')
|
|
}
|
|
}
|
|
})
|
|
})
|
|
},
|
|
},
|