jufubao-third 1.0.11-beta3 → 1.0.11-beta5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -4,6 +4,17 @@ export default {
|
|
|
4
4
|
style: [],
|
|
5
5
|
advanced: [],
|
|
6
6
|
content: [
|
|
7
|
+
{
|
|
8
|
+
label: "支付时是否跳过补差提示:",
|
|
9
|
+
ele: 'xd-radio',
|
|
10
|
+
valueKey: "skipTip",
|
|
11
|
+
value: data['skipTip'] || 'N',
|
|
12
|
+
groupKey:'content',
|
|
13
|
+
list: [
|
|
14
|
+
{label: '是', value: 'Y'},
|
|
15
|
+
{label: '否', value: 'N'},
|
|
16
|
+
],
|
|
17
|
+
},
|
|
7
18
|
{
|
|
8
19
|
label: "选择业务线",
|
|
9
20
|
ele: "xd-choose-namespace",
|
|
@@ -396,7 +396,8 @@
|
|
|
396
396
|
orderSuccessPath: "",
|
|
397
397
|
thirdPayPath: "",
|
|
398
398
|
xnamespace: "",
|
|
399
|
-
bindCard: '1'
|
|
399
|
+
bindCard: '1',
|
|
400
|
+
skipTip: "N",
|
|
400
401
|
}
|
|
401
402
|
},
|
|
402
403
|
watch: {
|
|
@@ -487,6 +488,7 @@
|
|
|
487
488
|
this.thirdPayPath = getContainerPropsValue(container, 'content.thirdPayPath', {value: ""}).value;
|
|
488
489
|
this.xnamespace = getContainerPropsValue(container, 'content.xnamespace', this.projectAttr.business_code);
|
|
489
490
|
this.bindCard = getContainerPropsValue(container,"content.bindCard","1");
|
|
491
|
+
this.skipTip = getContainerPropsValue(container, "content.skipTip", "N");
|
|
490
492
|
},
|
|
491
493
|
getTimeFormat(time){
|
|
492
494
|
let date = null;
|
|
@@ -537,6 +539,8 @@
|
|
|
537
539
|
return;
|
|
538
540
|
}
|
|
539
541
|
this.p_getPayMethod(res.pay_methods);
|
|
542
|
+
let real_pay_price = this.$xdUniHelper.multiplyFloatNumber(res.real_pay_price, 1);
|
|
543
|
+
let priceChange = this.total_price !== real_pay_price;
|
|
540
544
|
this.origin_total_price = res.total_price;
|
|
541
545
|
this.total_price = this.$xdUniHelper.multiplyFloatNumber(res.real_pay_price, 1);
|
|
542
546
|
this.needPayPrice = this.total_price;
|
|
@@ -548,8 +552,16 @@
|
|
|
548
552
|
if(res.show_vip_card === 'Y' && !this.vipCardList.length){
|
|
549
553
|
this.p_getVipList(res.business_code);
|
|
550
554
|
}
|
|
555
|
+
if(priceChange){
|
|
556
|
+
this.clearCheckedWhenPriceChange();
|
|
557
|
+
}
|
|
551
558
|
})
|
|
552
559
|
},
|
|
560
|
+
//确认订单价格改变,清空选择
|
|
561
|
+
clearCheckedWhenPriceChange(){
|
|
562
|
+
if(this.$refs['xdCardPayChose']) this.$refs['xdCardPayChose'].clearChecked();
|
|
563
|
+
if(this.$refs['xdWalletChose']) this.$refs['xdWalletChose'].clearChecked();
|
|
564
|
+
},
|
|
553
565
|
p_getH5WxAuthorize(){
|
|
554
566
|
jfbRootExec("getH5WxAuthorize", {
|
|
555
567
|
vm: this,
|
|
@@ -600,7 +612,7 @@
|
|
|
600
612
|
if(!submitCardList.length){
|
|
601
613
|
//支持补差, 提示是否使用补差
|
|
602
614
|
if(this.payThird){
|
|
603
|
-
if(
|
|
615
|
+
if(this.skipTip === 'N'){
|
|
604
616
|
await this.handleConfirmAllWxPay();
|
|
605
617
|
}
|
|
606
618
|
}else{
|