jufubao-movie 1.0.41 → 1.0.42
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
|
@@ -101,7 +101,7 @@
|
|
|
101
101
|
:price="order_info.total_price"
|
|
102
102
|
></xd-unit>
|
|
103
103
|
</template>
|
|
104
|
-
|
|
104
|
+
|
|
105
105
|
</view>
|
|
106
106
|
</view>
|
|
107
107
|
</view>
|
|
@@ -142,7 +142,7 @@
|
|
|
142
142
|
<template v-if="choseCard && choseCard.cardPayPrice">
|
|
143
143
|
<xd-unit v-if="choseCard.unit == '次'" :price="choseCard.cardPayPoint" :isOld="false" :fontSize="24" :iconSize="0.3" :unit="choseCard.unit"></xd-unit>
|
|
144
144
|
<xd-unit v-else :price="choseCard.cardPayPrice" :isOld="false" :fontSize="24" :iconSize="0.3" :unit="choseCard.unit || ''"></xd-unit>
|
|
145
|
-
</template>
|
|
145
|
+
</template>
|
|
146
146
|
<view v-else>请选择</view>
|
|
147
147
|
</view>
|
|
148
148
|
</xd-list-item>
|
|
@@ -580,7 +580,7 @@
|
|
|
580
580
|
cb(res);
|
|
581
581
|
})
|
|
582
582
|
},
|
|
583
|
-
|
|
583
|
+
|
|
584
584
|
addSettleCard(options, successCb, errCb) {
|
|
585
585
|
console.log(options, 'ioioioioi')
|
|
586
586
|
this.$xdShowLoading({})
|
|
@@ -660,15 +660,17 @@
|
|
|
660
660
|
* 有任一新版支付都用新版支付, 仅卡支付也用新版选卡支付
|
|
661
661
|
*/
|
|
662
662
|
if(this.payWallet || this.payCard || this.payCoupon){ //已选卡
|
|
663
|
-
let selected_card_list
|
|
663
|
+
let selected_card_list = [];
|
|
664
|
+
|
|
664
665
|
if(this.choseCard) {
|
|
665
666
|
selected_card_list = this.choseCard ? this.choseCard.selectedCardList : [];
|
|
666
667
|
} else if(this.choseCoupon) {
|
|
667
668
|
selected_card_list = this.choseCoupon ? this.choseCoupon.selectedCardList : [];
|
|
668
669
|
}
|
|
670
|
+
|
|
669
671
|
let selected_wallet_list = this.choseWallet ? this.choseWallet.selectedWalletList : []
|
|
670
672
|
//票券跟钱包都未选择,给用户提示
|
|
671
|
-
if(selected_card_list.length
|
|
673
|
+
if(selected_card_list.length === 0 && selected_wallet_list.length === 0){
|
|
672
674
|
if(!this.hasAlertCardChose){
|
|
673
675
|
if(this.payCard){
|
|
674
676
|
this.showCardPayChose = true;
|