jufubao-movie 1.0.41-beta3 → 1.0.41-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
|
@@ -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>
|
|
@@ -240,7 +240,7 @@
|
|
|
240
240
|
@onChose="handleWalletChose"
|
|
241
241
|
@onAlert="() => hasAlertCardChose = true"
|
|
242
242
|
></xd-wallet-chose>
|
|
243
|
-
<
|
|
243
|
+
<CusCouponChose
|
|
244
244
|
:couponRadius="couponRadius"
|
|
245
245
|
:couponImageUrl="couponImageUrl"
|
|
246
246
|
:couponTitleBgColor="couponTitleBgColor"
|
|
@@ -263,7 +263,7 @@
|
|
|
263
263
|
:orderNeedPayPrice="orderNeedPayPrice"
|
|
264
264
|
:getSettleListCoupons="getSettleListCoupons"
|
|
265
265
|
:setSettleSelectCoupon="setSettleSelectCoupon"
|
|
266
|
-
></
|
|
266
|
+
></CusCouponChose>
|
|
267
267
|
</view>
|
|
268
268
|
</view>
|
|
269
269
|
</template>
|
|
@@ -276,7 +276,7 @@
|
|
|
276
276
|
import XdButton from "@/components/XdButton/XdButton";
|
|
277
277
|
import XdCardPay from "@/components/XdCardPay/XdCardPay";
|
|
278
278
|
import XdCardPayChose from "@/components/XdCardPayChose/XdCardPayChose"
|
|
279
|
-
import
|
|
279
|
+
import CusCouponChose from '@/components/CusCouponChose/CusCouponChose'
|
|
280
280
|
import XdWalletChose from "@/components/XdWalletChose/XdWalletChose"
|
|
281
281
|
import XdContentXss from "@/components/XdContentXss/XdContentXss";
|
|
282
282
|
import {jfbRootExec} from "@/utils/xd.event";
|
|
@@ -298,7 +298,7 @@
|
|
|
298
298
|
XdListItem,
|
|
299
299
|
XdCardPayChose,
|
|
300
300
|
XdWalletChose,
|
|
301
|
-
|
|
301
|
+
CusCouponChose
|
|
302
302
|
},
|
|
303
303
|
mixins: [componentsMixins,extsMixins,JfbMovieConfirmMixin],
|
|
304
304
|
data() {
|