jufubao-base 1.0.414 → 1.0.415-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/.claude/settings.local.json +8 -0
- package/package.json +1 -1
- package/src/components/CusCouponChose/CusCouponChose.vue +3 -3
- package/src/components/JfbBaseCardDetail/JfbBaseCardDetail.vue +1 -1
- package/src/components/JfbBaseCardDetail/XdEditPwd.vue +3 -3
- package/src/components/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue +1 -1
- package/src/components/JfbBaseCardDetailEntry/XdEditPwd.vue +3 -3
- package/src/components/JfbBaseConsumpCode/JfbBaseConsumpCode.vue +1 -1
- package/src/components/JfbBaseConsumpCode/QPMixin.js +6 -6
- package/src/components/JfbBaseConsumpCode/XdDeductSort.vue +2 -2
- package/src/components/JfbBaseMy/JfbBaseMy.vue +1 -1
- package/src/components/JfbBaseOpenVipDetail/JfbBaseOpenVipDetail.vue +1 -1
- package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue +1 -1
- package/src/components/JfbBaseOrderList/JfbBaseOrderList.vue +1 -1
- package/src/components/JfbBasePay/JfbBasePay.vue +11 -11
- package/src/components/JfbBaseRecharge/JfbBaseRecharge.vue +1 -1
- package/src/components/JfbBaseRechargeNew/JfbBaseRechargeNew.vue +3 -3
- package/src/components/JfbBaseRechargeOrder/JfbBaseRechargeOrder.vue +1 -1
- package/src/components/JfbBaseRechargeOrderDetail/JfbBaseRechargeOrderDetail.vue +1 -1
- package/src/components/JfbBaseRechargeSuccess/JfbBaseRechargeSuccess.vue +2 -2
- package/src/components/JfbBaseSetPwd/JfbBaseSetPwd.vue +3 -3
- package/src/components/JfbBaseUserCenter/JfbBaseUserCenter.vue +1 -1
- package/get.package.path.js +0 -22
package/package.json
CHANGED
|
@@ -38,8 +38,8 @@
|
|
|
38
38
|
</view>
|
|
39
39
|
<view class="column-item">
|
|
40
40
|
<view class="column_label">
|
|
41
|
-
|
|
42
|
-
<view class="label_sub"
|
|
41
|
+
仍需兑换
|
|
42
|
+
<view class="label_sub">(可使用多张优惠券兑换)</view>
|
|
43
43
|
</view>
|
|
44
44
|
<view class="column_value text-primary">
|
|
45
45
|
<xd-unit
|
|
@@ -100,7 +100,7 @@
|
|
|
100
100
|
type="primary"
|
|
101
101
|
radius="50rpx"
|
|
102
102
|
@click="doTicketPay"
|
|
103
|
-
|
|
103
|
+
>确认兑换</xd-button
|
|
104
104
|
>
|
|
105
105
|
</view>
|
|
106
106
|
</view>
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
<xd-dailog
|
|
4
4
|
:show.sync="uiShow"
|
|
5
5
|
width="90%"
|
|
6
|
-
title="
|
|
6
|
+
title="设置兑换密码"
|
|
7
7
|
:cancel="false"
|
|
8
8
|
:confirm="false"
|
|
9
9
|
:zIndex="1100"
|
|
@@ -60,7 +60,7 @@
|
|
|
60
60
|
</view>
|
|
61
61
|
|
|
62
62
|
<view class="pwd__form-item">
|
|
63
|
-
<view
|
|
63
|
+
<view>设置兑换密码:</view>
|
|
64
64
|
<view>
|
|
65
65
|
<input
|
|
66
66
|
type="password"
|
|
@@ -73,7 +73,7 @@
|
|
|
73
73
|
</view>
|
|
74
74
|
|
|
75
75
|
<view class="pwd__form-item">
|
|
76
|
-
<view
|
|
76
|
+
<view>确认兑换密码:</view>
|
|
77
77
|
<view>
|
|
78
78
|
<input
|
|
79
79
|
type="password"
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
<xd-dailog
|
|
4
4
|
:show.sync="uiShow"
|
|
5
5
|
width="90%"
|
|
6
|
-
title="
|
|
6
|
+
title="设置兑换密码"
|
|
7
7
|
:cancel="false"
|
|
8
8
|
:confirm="false"
|
|
9
9
|
:zIndex="1100"
|
|
@@ -60,7 +60,7 @@
|
|
|
60
60
|
</view>
|
|
61
61
|
|
|
62
62
|
<view class="pwd__form-item">
|
|
63
|
-
<view
|
|
63
|
+
<view>设置兑换密码:</view>
|
|
64
64
|
<view>
|
|
65
65
|
<input
|
|
66
66
|
type="password"
|
|
@@ -73,7 +73,7 @@
|
|
|
73
73
|
</view>
|
|
74
74
|
|
|
75
75
|
<view class="pwd__form-item">
|
|
76
|
-
<view
|
|
76
|
+
<view>确认兑换密码:</view>
|
|
77
77
|
<view>
|
|
78
78
|
<input
|
|
79
79
|
type="password"
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
</view>
|
|
33
33
|
<view class="code-refresh">{{expiration_sec_str}}后自动更新</view>
|
|
34
34
|
<view v-if="isShowPaySoft === 'Y'" class="pay_way">
|
|
35
|
-
<view class="pay_title"
|
|
35
|
+
<view class="pay_title">此二维码优先使用以下账户进行兑换</view>
|
|
36
36
|
<view class="pay_select" @click="showSortDialog">
|
|
37
37
|
<view>{{ curPaySelectShow }}</view>
|
|
38
38
|
<xd-font-icon icon="iconxia_down" size="28" style="margin-left: 24rpx;"></xd-font-icon>
|
|
@@ -68,7 +68,7 @@ export default {
|
|
|
68
68
|
this.refresh = false;
|
|
69
69
|
this.$xdLog.setARMSInfo({ options: this.options, res }, 'pay_success');
|
|
70
70
|
uni.showToast({
|
|
71
|
-
title: "
|
|
71
|
+
title: "兑换成功",
|
|
72
72
|
});
|
|
73
73
|
cb(res);
|
|
74
74
|
},
|
|
@@ -76,7 +76,7 @@ export default {
|
|
|
76
76
|
this.onRefreshPage();
|
|
77
77
|
this.$xdLog.setARMSInfo(this.options, 'cancel_pay');
|
|
78
78
|
uni.showToast({
|
|
79
|
-
title: "
|
|
79
|
+
title: "取消兑换",
|
|
80
80
|
});
|
|
81
81
|
},
|
|
82
82
|
fail: (error) => {
|
|
@@ -85,7 +85,7 @@ export default {
|
|
|
85
85
|
if (window['jwxJfbSDKParams']) error = Object.assign(error, paySignData, window['jwxJfbSDKParams'])
|
|
86
86
|
this.$xdLog.setARMSError(error)
|
|
87
87
|
uni.showToast({
|
|
88
|
-
title: "
|
|
88
|
+
title: "兑换失败",
|
|
89
89
|
});
|
|
90
90
|
},
|
|
91
91
|
});
|
|
@@ -97,7 +97,7 @@ export default {
|
|
|
97
97
|
this.refresh = false;
|
|
98
98
|
this.$xdLog.setARMSInfo({ options: this.options, res }, 'pay_success');
|
|
99
99
|
uni.showToast({
|
|
100
|
-
title: "
|
|
100
|
+
title: "兑换成功",
|
|
101
101
|
icon: "none",
|
|
102
102
|
});
|
|
103
103
|
cb(res);
|
|
@@ -109,7 +109,7 @@ export default {
|
|
|
109
109
|
error: JSON.stringify(err)
|
|
110
110
|
});
|
|
111
111
|
uni.showToast({
|
|
112
|
-
title: "
|
|
112
|
+
title: "兑换失败",
|
|
113
113
|
icon: "none",
|
|
114
114
|
});
|
|
115
115
|
},
|
|
@@ -198,7 +198,7 @@ export default {
|
|
|
198
198
|
} else if (hand_status === 'F') {
|
|
199
199
|
this.handlerOderFail();
|
|
200
200
|
this.$xdAlert({
|
|
201
|
-
content: hand_status_msg || '
|
|
201
|
+
content: hand_status_msg || '兑换失败',
|
|
202
202
|
time: 3000,
|
|
203
203
|
isClose: false,
|
|
204
204
|
zIndex: 5000
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<view class="xd-deduct-sort">
|
|
3
3
|
<view class="sort_header">
|
|
4
|
-
<view class="sort_title"
|
|
4
|
+
<view class="sort_title">优先兑换管理</view>
|
|
5
5
|
<view @click="handleClose">
|
|
6
6
|
<xd-font-icon icon="iconguanbi" :size="40"></xd-font-icon>
|
|
7
7
|
</view>
|
|
8
8
|
</view>
|
|
9
9
|
<view class="drag_header">
|
|
10
|
-
<view
|
|
10
|
+
<view>将按以下顺序兑换</view>
|
|
11
11
|
<!-- #ifdef H5 -->
|
|
12
12
|
<view>长按拖动</view>
|
|
13
13
|
<!-- #endif -->
|
|
@@ -34,7 +34,7 @@
|
|
|
34
34
|
<view class="jfb-base-my__body-card">
|
|
35
35
|
<view class="jfb-base-my__body-card-num">
|
|
36
36
|
<view>可用票券:1</view>
|
|
37
|
-
<view @click="handleToLink(pwd_url)"
|
|
37
|
+
<view @click="handleToLink(pwd_url)">设置兑换密码
|
|
38
38
|
<xd-font-icon size="24" icon="iconxiangyou_xian"></xd-font-icon>
|
|
39
39
|
</view>
|
|
40
40
|
</view>
|
|
@@ -28,7 +28,7 @@
|
|
|
28
28
|
|
|
29
29
|
<view class="fixed_bottom" :style="fixed_bottom">
|
|
30
30
|
<view class="pay_btn" @click="p_createVipOrder">
|
|
31
|
-
|
|
31
|
+
立即兑换
|
|
32
32
|
¥{{ $xdUniHelper.divisionFloatNumber(vipInfo.sale_price, 100) }}
|
|
33
33
|
{{ vipInfo.vip_card_life_cycle_unit ? '/'+vipInfo.vip_card_life_cycle_unit:'' }}
|
|
34
34
|
<!-- <xd-unit style="margin-left: 16rpx;"
|
|
@@ -157,7 +157,7 @@
|
|
|
157
157
|
radius="50rpx"
|
|
158
158
|
@click="doThirdPay"
|
|
159
159
|
>
|
|
160
|
-
|
|
160
|
+
确认兑换
|
|
161
161
|
¥{{ $xdUniHelper.divisionFloatNumber(payInfo.channel_amount, 100) }}
|
|
162
162
|
</xd-button>
|
|
163
163
|
</view>
|
|
@@ -474,7 +474,7 @@ export default {
|
|
|
474
474
|
console.log(this.projectAttr)
|
|
475
475
|
if (+payInfo.channel_amount > 0 && !this.channel_provider_id) {
|
|
476
476
|
this.$xdAlert({
|
|
477
|
-
content: '
|
|
477
|
+
content: '请选择兑换方式',
|
|
478
478
|
time: 2500,
|
|
479
479
|
isClose: false,
|
|
480
480
|
zIndex: 5000
|
|
@@ -568,7 +568,7 @@ export default {
|
|
|
568
568
|
this.$xdLog.setARMSInfo({options:this.options, res}, 'pay_success');
|
|
569
569
|
console.log("pay success", res);
|
|
570
570
|
this.$xdAlert({
|
|
571
|
-
content: '
|
|
571
|
+
content: '兑换成功',
|
|
572
572
|
time: 2500,
|
|
573
573
|
isClose: false,
|
|
574
574
|
zIndex: 5000
|
|
@@ -578,7 +578,7 @@ export default {
|
|
|
578
578
|
cancel: () => {
|
|
579
579
|
this.$xdLog.setARMSInfo(this.options, 'cancel_pay');
|
|
580
580
|
this.$xdAlert({
|
|
581
|
-
content: '
|
|
581
|
+
content: '取消兑换',
|
|
582
582
|
time: 2500,
|
|
583
583
|
isClose: false,
|
|
584
584
|
zIndex: 5000
|
|
@@ -589,7 +589,7 @@ export default {
|
|
|
589
589
|
if (window['jwxJfbSDKParams']) error = Object.assign(error, paySignData, window['jwxJfbSDKParams'])
|
|
590
590
|
this.$xdLog.setARMSError(error)
|
|
591
591
|
this.$xdAlert({
|
|
592
|
-
content: '
|
|
592
|
+
content: '兑换失败',
|
|
593
593
|
time: 2500,
|
|
594
594
|
isClose: false,
|
|
595
595
|
zIndex: 5000
|
|
@@ -603,7 +603,7 @@ export default {
|
|
|
603
603
|
success: (res) => {
|
|
604
604
|
this.$xdLog.setARMSInfo({options: this.options, res}, 'pay_success');
|
|
605
605
|
this.$xdAlert({
|
|
606
|
-
content: '
|
|
606
|
+
content: '兑换成功',
|
|
607
607
|
time: 2500,
|
|
608
608
|
isClose: false,
|
|
609
609
|
zIndex: 5000
|
|
@@ -616,7 +616,7 @@ export default {
|
|
|
616
616
|
error: JSON.stringify(err)
|
|
617
617
|
});
|
|
618
618
|
this.$xdAlert({
|
|
619
|
-
content: '
|
|
619
|
+
content: '兑换失败',
|
|
620
620
|
time: 2500,
|
|
621
621
|
isClose: false,
|
|
622
622
|
zIndex: 5000
|
|
@@ -644,7 +644,7 @@ export default {
|
|
|
644
644
|
this.$xdLog.setARMSInfo({options: this.options, res}, 'alipay_pay_success');
|
|
645
645
|
if(res.resultStatus == '9000'){
|
|
646
646
|
this.$xdAlert({
|
|
647
|
-
content: '
|
|
647
|
+
content: '兑换成功',
|
|
648
648
|
time: 2500,
|
|
649
649
|
isClose: false,
|
|
650
650
|
zIndex: 5000
|
|
@@ -656,7 +656,7 @@ export default {
|
|
|
656
656
|
}else if (res.resultStatus == '6001'){
|
|
657
657
|
// 用户取消支付
|
|
658
658
|
this.$xdAlert({
|
|
659
|
-
content: '
|
|
659
|
+
content: '取消兑换',
|
|
660
660
|
time: 2500,
|
|
661
661
|
isClose: false,
|
|
662
662
|
zIndex: 5000
|
|
@@ -665,7 +665,7 @@ export default {
|
|
|
665
665
|
}else {
|
|
666
666
|
// 支付失败
|
|
667
667
|
this.$xdAlert({
|
|
668
|
-
content: '
|
|
668
|
+
content: '兑换失败',
|
|
669
669
|
time: 2500,
|
|
670
670
|
isClose: false,
|
|
671
671
|
zIndex: 5000
|
|
@@ -677,7 +677,7 @@ export default {
|
|
|
677
677
|
this.$xdLog.setARMSError({options: this.options, err});
|
|
678
678
|
// 支付失败
|
|
679
679
|
this.$xdAlert({
|
|
680
|
-
content: '
|
|
680
|
+
content: '兑换失败',
|
|
681
681
|
time:
|
|
682
682
|
2500,
|
|
683
683
|
isClose: false,
|
|
@@ -73,7 +73,7 @@ export default {
|
|
|
73
73
|
return {
|
|
74
74
|
closeMask: true,
|
|
75
75
|
isPreview: false,
|
|
76
|
-
buyBtnName: '
|
|
76
|
+
buyBtnName: '立即兑换' ,
|
|
77
77
|
newCardList:[],
|
|
78
78
|
};
|
|
79
79
|
},
|
|
@@ -97,7 +97,7 @@ export default {
|
|
|
97
97
|
*/
|
|
98
98
|
init(container) {
|
|
99
99
|
this.payPath = getContainerPropsValue(container, "content.payPath", {value: "",}).value;
|
|
100
|
-
this.buyBtnName = getContainerPropsValue(container, 'content.buyBtnName', '
|
|
100
|
+
this.buyBtnName = getContainerPropsValue(container, 'content.buyBtnName', '立即兑换')
|
|
101
101
|
},
|
|
102
102
|
|
|
103
103
|
//==套餐购买=============
|
|
@@ -165,7 +165,7 @@ export default {
|
|
|
165
165
|
if(!this.payPath) {
|
|
166
166
|
this.$xdAlert({
|
|
167
167
|
time: 3000,
|
|
168
|
-
content: '
|
|
168
|
+
content: '兑换路径未设置,清检查配置',
|
|
169
169
|
type: 'error',
|
|
170
170
|
isClose: false
|
|
171
171
|
})
|
|
@@ -94,7 +94,7 @@
|
|
|
94
94
|
style="padding-top: 0"
|
|
95
95
|
class="jfb-base-recharge-order-detail__body-order-item"
|
|
96
96
|
>
|
|
97
|
-
<view
|
|
97
|
+
<view>兑换方式:微信</view>
|
|
98
98
|
</view>
|
|
99
99
|
<view class="jfb-base-recharge-order-detail__body-order-item">
|
|
100
100
|
<view>充值金额:{{ info.pay_amount / 100 }} </view>
|
|
@@ -136,11 +136,11 @@ export default {
|
|
|
136
136
|
} else if (info.pay_status === "3007") {
|
|
137
137
|
info.icon = "icondengdai";
|
|
138
138
|
info.iconColor = this.mainColor;
|
|
139
|
-
info.btn = [{ label: "
|
|
139
|
+
info.btn = [{ label: "去兑换", type: "pay", radius: "12rpx" }];
|
|
140
140
|
} else if (info.pay_status === "3010") {
|
|
141
141
|
info.icon = "iconshibai";
|
|
142
142
|
info.iconColor = "#FA5C5C";
|
|
143
|
-
info.btn = [{ label: "
|
|
143
|
+
info.btn = [{ label: "重新兑换", type: "pay", radius: "12rpx" }];
|
|
144
144
|
}
|
|
145
145
|
this.info = info;
|
|
146
146
|
//订单完成
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
background:noticeBackgroundColor,
|
|
25
25
|
color: warningColor
|
|
26
26
|
}"
|
|
27
|
-
|
|
27
|
+
>您暂未设置平台兑换密码,请设置</view>
|
|
28
28
|
<view class="jfb-base-set-pwd__body-form">
|
|
29
29
|
<view class="jfb-base-set-pwd__body-form-label">手机号</view>
|
|
30
30
|
<view class="jfb-base-set-pwd__body-form-value">
|
|
@@ -48,11 +48,11 @@
|
|
|
48
48
|
</view>
|
|
49
49
|
<view class="jfb-base-set-pwd__body-form">
|
|
50
50
|
<view class="jfb-base-set-pwd__body-form-label">输入密码</view>
|
|
51
|
-
<input class="jfb-base-set-pwd__body-form-input" type="text" v-model="pwd" placeholder="
|
|
51
|
+
<input class="jfb-base-set-pwd__body-form-input" type="text" v-model="pwd" placeholder="请输入兑换密码">
|
|
52
52
|
</view>
|
|
53
53
|
<view class="jfb-base-set-pwd__body-form">
|
|
54
54
|
<view class="jfb-base-set-pwd__body-form-label">确认密码</view>
|
|
55
|
-
<input class="jfb-base-set-pwd__body-form-input" type="text" v-model="confirmPwd" placeholder="
|
|
55
|
+
<input class="jfb-base-set-pwd__body-form-input" type="text" v-model="confirmPwd" placeholder="请再次输入兑换密码">
|
|
56
56
|
</view>
|
|
57
57
|
<view
|
|
58
58
|
class="jfb-base-set-pwd__body-footer"
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
<view class="my-card-add__link-num" v-if="0">
|
|
57
57
|
<view :style="{color: color}">可用{{cardName}}:1</view>
|
|
58
58
|
<view @click="handleToLink(pwd_url)">
|
|
59
|
-
<text :style="{color: color}"
|
|
59
|
+
<text :style="{color: color}">设置兑换密码</text>
|
|
60
60
|
<xd-font-icon size="24" icon="iconxiangyou_xian" :color="color"></xd-font-icon>
|
|
61
61
|
</view>
|
|
62
62
|
</view>
|
package/get.package.path.js
DELETED
|
@@ -1,22 +0,0 @@
|
|
|
1
|
-
'use strict';
|
|
2
|
-
|
|
3
|
-
/**
|
|
4
|
-
* @description 第三方库
|
|
5
|
-
* @param threePackagePath {String} 第三方库所在项目路径存放路径路
|
|
6
|
-
* @param packname {String} 包名字
|
|
7
|
-
* @returns {string|*}
|
|
8
|
-
*/
|
|
9
|
-
const getPackagePath = (threePackagePath, packname = 'gxd-commands-bussiness')=>{
|
|
10
|
-
if(packname === 'gxd-commands-bussiness') {
|
|
11
|
-
return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-commands-bussiness/${threePackagePath}`;
|
|
12
|
-
}
|
|
13
|
-
|
|
14
|
-
if (packname === 'gxd-uni-library-editx') {
|
|
15
|
-
return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-uni-library-editx/${threePackagePath}`;
|
|
16
|
-
}
|
|
17
|
-
|
|
18
|
-
};
|
|
19
|
-
|
|
20
|
-
module.exports = {
|
|
21
|
-
getPackagePath
|
|
22
|
-
}
|