jufubao-base 1.0.237-beta15 → 1.0.237-beta17
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 +1 -1
- package/src/components/JfbBaseConsumpCode/JfbBaseConsumpCode.vue +3 -2
- package/src/components/JfbBasePersonalData/JfbBasePersonalData.vue +2 -0
- package/src/components/JfbBasePosterGroup/JfbBasePosterGroup.vue +2 -2
- package/src/components/JfbBaseShare/JfbBaseShare.vue +2 -1
- package/src/components/JfbBaseWithDrawAgain/JfbBaseWithDrawAgain.vue +2 -0
- package/src/components/JfbBaseWithdraw/JfbBaseWithdraw.vue +9 -1
package/package.json
CHANGED
|
@@ -37,8 +37,8 @@
|
|
|
37
37
|
<view :style="{color:mainColor}" class="tip">*提货点数请咨询店员，提货成功后无法退换</view>
|
|
38
38
|
</view>
|
|
39
39
|
</view>
|
|
40
|
-
<XdButton v-if="btnDisabled" style="margin-top: 200rpx" width="260rpx" type="primary" disabled>下一步</XdButton>
|
|
41
|
-
<XdButton v-else style="margin-top: 200rpx" width="260rpx" type="primary" @click="toPayOrder">下一步</XdButton>
|
|
40
|
+
<XdButton v-if="btnDisabled" style="margin-top: 200rpx;display:block" width="260rpx" type="primary" disabled>下一步</XdButton>
|
|
41
|
+
<XdButton v-else style="margin-top: 200rpx;display:block" width="260rpx" type="primary" @click="toPayOrder">下一步</XdButton>
|
|
42
42
|
<view v-if="plusDiscount">
|
|
43
43
|
<view class="vip" v-if="is_vip==='N'">
|
|
44
44
|
<view class="vip-title">
|
|
@@ -730,6 +730,7 @@
|
|
|
730
730
|
},
|
|
731
731
|
onJfbShow(options) {
|
|
732
732
|
console.log('event.onJfbShow', options)
|
|
733
|
+
this.onJfbLoad(options);
|
|
733
734
|
},
|
|
734
735
|
onJfbHide(options) {
|
|
735
736
|
console.log('event.onJfbHide', options)
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
<view class="jfb-base-poster-group__body" :style="[bodyStyleComp]">
|
|
9
9
|
<view class="jfb-base-poster-group__body-header">
|
|
10
10
|
<view class="jfb-base-poster-group__body-header-title">
|
|
11
|
-
<XdContentXss
|
|
11
|
+
<XdContentXss :html="title"></XdContentXss>
|
|
12
12
|
<view @click="handleToMore" v-if="is_show_more==='Y'" class="jfb-base-poster-group__body-header-title-more">
|
|
13
13
|
更多
|
|
14
14
|
<XdFontIcon size="20" icon="iconxiangyou_xian"></XdFontIcon>
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
</view>
|
|
21
21
|
<view class="jfb-base-poster-group__body-content">
|
|
22
22
|
<view class="jfb-base-poster-group__body-content-tabs">
|
|
23
|
-
<view @click="handleChangeTab(item)" :style="tab===item.random?
|
|
23
|
+
<view @click="handleChangeTab(item)" :style="[tab===item.random?activeStyleComp:normalStyleComp]"
|
|
24
24
|
class="jfb-base-poster-group__body-content-tabs-item" v-for="(item, index) in posterGroup.group"
|
|
25
25
|
:key="index">
|
|
26
26
|
{{item.title}}
|
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
import componentsMixins from "@/mixins/componentsMixins";
|
|
55
55
|
import extsMixins from "@/mixins/extsMixins";
|
|
56
56
|
import getServiceUrl from "@/common/getServiceUrl";
|
|
57
|
-
import { mapState } from "vuex";
|
|
57
|
+
import { mapState, mapMutations } from "vuex";
|
|
58
58
|
export default {
|
|
59
59
|
name: "JfbBaseShare",
|
|
60
60
|
components: {
|
|
@@ -74,6 +74,7 @@
|
|
|
74
74
|
},
|
|
75
75
|
computed: {
|
|
76
76
|
...mapState(["shareInfo"]),
|
|
77
|
+
...mapMutations(["setShareInfo"]),
|
|
77
78
|
showShare(){
|
|
78
79
|
if(this.isPreview) return true;
|
|
79
80
|
// #ifdef MP-WEIXIN
|
|
@@ -154,7 +154,13 @@
|
|
|
154
154
|
wallet_type: this.wallet_type,
|
|
155
155
|
total_amount: this.amount * 100,
|
|
156
156
|
login_providers: this.projectAttr.login_providers.join(),
|
|
157
|
-
pay_channel_providers: this.projectAttr.pay_channels.join()
|
|
157
|
+
pay_channel_providers: this.projectAttr.pay_channels.join(),
|
|
158
|
+
//#ifdef MP-WEIXIN
|
|
159
|
+
'x-jfb-platform': 'MP-WEIXIN',
|
|
160
|
+
//#endif
|
|
161
|
+
//#ifdef H5
|
|
162
|
+
'x-jfb-platform': 'H5'
|
|
163
|
+
//#endif
|
|
158
164
|
},
|
|
159
165
|
}).then(res => {
|
|
160
166
|
this.$xdUniHelper.navigateTo({ url: `${this.withDrawPath}?order_id=${res.order_id}` })
|
|
@@ -233,6 +239,8 @@
|
|
|
233
239
|
&-amount {
|
|
234
240
|
color: #333;
|
|
235
241
|
font-size: 64rpx;
|
|
242
|
+
line-height: 64rpx;
|
|
243
|
+
height: 70rpx;
|
|
236
244
|
font-weight: 500;
|
|
237
245
|
margin: 20rpx 0;
|
|
238
246
|
border-bottom: 0.5px solid #EEEEEE;
|