jufubao-third 1.0.20 → 1.0.21-beta2
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
|
@@ -81,8 +81,8 @@
|
|
|
81
81
|
<view v-if="!isPlusSite" class="pay_section">
|
|
82
82
|
<view class="column-item">
|
|
83
83
|
<view class="column_label">
|
|
84
|
-
|
|
85
|
-
<view class="label_sub"
|
|
84
|
+
仍需兑换
|
|
85
|
+
<view class="label_sub">（可使用多张票券兑换）</view>
|
|
86
86
|
</view>
|
|
87
87
|
<view class="column_value text-primary">
|
|
88
88
|
<xd-unit
|
|
@@ -194,7 +194,7 @@
|
|
|
194
194
|
:icon-size="0.3"
|
|
195
195
|
></xd-unit></view>
|
|
196
196
|
<view>
|
|
197
|
-
<xd-button type="primary" @click="doAllPay"
|
|
197
|
+
<xd-button type="primary" @click="doAllPay">兑换</xd-button>
|
|
198
198
|
</view>
|
|
199
199
|
</view>
|
|
200
200
|
<view
|
|
@@ -208,7 +208,7 @@
|
|
|
208
208
|
radius="50rpx"
|
|
209
209
|
:disabled="is_can_buy==='N'"
|
|
210
210
|
@click="doAllPay"
|
|
211
|
-
|
|
211
|
+
>确认兑换</xd-button>
|
|
212
212
|
</view>
|
|
213
213
|
</view>
|
|
214
214
|
<template v-if="otherPayLoaded && !showOldPay">
|
|
@@ -650,13 +650,13 @@
|
|
|
650
650
|
return new Promise((resolve, reject) => {
|
|
651
651
|
uni.showModal({
|
|
652
652
|
title: '提示',
|
|
653
|
-
content: '
|
|
653
|
+
content: '您当前未使用兑换卡，您将全部用微信兑换',
|
|
654
654
|
confirmText: "我知道了",
|
|
655
655
|
success: function (res) {
|
|
656
656
|
if (res.confirm) {
|
|
657
657
|
resolve();
|
|
658
658
|
} else if (res.cancel) {
|
|
659
|
-
reject("
|
|
659
|
+
reject("取消兑换");
|
|
660
660
|
}
|
|
661
661
|
}
|
|
662
662
|
});
|