jufubao-movie 1.0.41-beta2 → 1.0.41-beta4
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
|
@@ -156,11 +156,11 @@
|
|
|
156
156
|
</view>
|
|
157
157
|
</xd-list-item>
|
|
158
158
|
<xd-list-item v-if="item.method === 'coupon'" :key="item.method" :label="item.show_name" paddingLR="60rpx" size="small" :showRight="!(choseCard && choseCard.cardPayPrice)" @click="toChoseCoupon">
|
|
159
|
-
<view v-if="(choseCoupon && choseCoupon.cardPayPrice)
|
|
159
|
+
<view v-if="(choseCoupon && choseCoupon.cardPayPrice)" slot="label">
|
|
160
160
|
{{item.show_name}} <text style="color:red;margin-left: 4px;">(已选{{ choseCoupon.selectedCardList.length }}张)</text>
|
|
161
161
|
</view>
|
|
162
162
|
<view v-else>
|
|
163
|
-
<view style="color:#CCCCCC;font-size: 20rpx" v-if="choseCard && choseCard.cardPayPrice">已使用其他票券,不可用</view>
|
|
163
|
+
<view style="color:#CCCCCC;font-size: 20rpx" v-if="(choseWallet && choseWallet.walletPayPrice)||(choseCard && choseCard.cardPayPrice)">已使用其他票券,不可用</view>
|
|
164
164
|
<view v-else>请选择</view>
|
|
165
165
|
</view>
|
|
166
166
|
</xd-list-item>
|
|
@@ -251,7 +251,7 @@
|
|
|
251
251
|
:mainColor="mainColor"
|
|
252
252
|
v-if="payCoupon"
|
|
253
253
|
ref="xdCouponChose"
|
|
254
|
-
:hadChoseCoupon="choseCoupon && choseCoupon.
|
|
254
|
+
:hadChoseCoupon="choseCoupon && choseCoupon.selectedCardList"
|
|
255
255
|
:layoutInfo="layoutInfo"
|
|
256
256
|
:show.sync="showCouponChose"
|
|
257
257
|
:jwxSDK="jwxSDK"
|
|
@@ -532,7 +532,7 @@
|
|
|
532
532
|
this.showCouponChose = true;
|
|
533
533
|
},
|
|
534
534
|
//only选择满减券结果
|
|
535
|
-
|
|
535
|
+
handleCouponChose(data){
|
|
536
536
|
console.log(data)
|
|
537
537
|
this.choseCoupon = data;
|
|
538
538
|
this.showCouponChose = false;
|
|
@@ -580,12 +580,6 @@
|
|
|
580
580
|
cb(res);
|
|
581
581
|
})
|
|
582
582
|
},
|
|
583
|
-
|
|
584
|
-
handleCouponChose(data) {
|
|
585
|
-
console.log(data)
|
|
586
|
-
this.choseCoupon = data;
|
|
587
|
-
this.showCouponChose = false;
|
|
588
|
-
},
|
|
589
583
|
|
|
590
584
|
addSettleCard(options, successCb, errCb) {
|
|
591
585
|
console.log(options, 'ioioioioi')
|