jufubao-base 1.0.232-beta6 → 1.0.232-beta7
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/JfbBaseBalance/JfbBaseBalance.vue +4 -1
- package/src/components/JfbBaseBalance/Mock.js +5 -9
- package/src/components/JfbBaseConsumpCode/Api.js +94 -19
- package/src/components/JfbBaseConsumpCode/Attr.js +13 -0
- package/src/components/JfbBaseConsumpCode/JfbBaseConsumpCode.vue +397 -93
- package/src/components/JfbBaseConsumpCode/Mock.js +18 -9
- package/src/components/JfbBasePointsCard/Attr.js +12 -0
- package/src/components/JfbBasePointsDetail/JfbBasePointsDetail.vue +2 -1
- package/src/components/JfbBasePointsDetail/Mock.js +0 -1
- package/src/components/JfbBaseWithDrawAgain/Mock.js +6 -9
- package/src/components/JfbBaseWithDrawRecord/JfbBaseWithDrawRecord.vue +8 -3
- package/src/components/JfbBaseWithDrawRecord/Mock.js +3 -9
- package/src/components/JfbBaseWithdraw/Mock.js +2 -8
package/package.json
CHANGED
|
@@ -90,6 +90,7 @@
|
|
|
90
90
|
recordList: [],
|
|
91
91
|
hasNext: true,
|
|
92
92
|
page_token: 1,
|
|
93
|
+
next_page_token: ''
|
|
93
94
|
}
|
|
94
95
|
},
|
|
95
96
|
computed: {
|
|
@@ -153,12 +154,13 @@
|
|
|
153
154
|
).fullTime;
|
|
154
155
|
return item;
|
|
155
156
|
})
|
|
156
|
-
this.hasNext = res.next_page_token !== "";
|
|
157
157
|
if (this.page_token === 1) {
|
|
158
158
|
this.recordList = list
|
|
159
159
|
} else {
|
|
160
160
|
this.recordList = this.recordList.concat(list);
|
|
161
161
|
}
|
|
162
|
+
this.next_page_token = res.next_page_token
|
|
163
|
+
this.hasNext = res.next_page_token !== "";
|
|
162
164
|
})
|
|
163
165
|
},
|
|
164
166
|
getContent() {
|
|
@@ -201,6 +203,7 @@
|
|
|
201
203
|
this.wallet_type = item.wallet_type;
|
|
202
204
|
this.isWithDraw = item.is_support_withdraw;
|
|
203
205
|
this.amount = item.amount;
|
|
206
|
+
this.next_page_token=''
|
|
204
207
|
this.hasNext = true;
|
|
205
208
|
this.page_token = 1;
|
|
206
209
|
this.recordList = [];
|
|
@@ -1,13 +1,9 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
3
|
module.exports = {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
removeBalanceFilmAddress:{},
|
|
10
|
-
|
|
11
|
-
addBalanceFilmcart:{},
|
|
12
|
-
|
|
4
|
+
|
|
5
|
+
getBalanceDetail: { "wallet_list": [{ "sort": 2, "wallet_type": "UC", "show_name": "可用余额", "amount": 19940, "is_support_withdraw": "Y" }, { "sort": 0, "wallet_type": "UT", "show_name": "待到账余额", "amount": 0, "is_support_withdraw": "N" }], "request_id": "279b309d137cae9f" },
|
|
6
|
+
|
|
7
|
+
getBalanceWalletTradeList: { "next_page_token": "2", "total_size": 0, "list": [{ "trade_nnid": "eDaOl5aPD4Fx8gtBJC1bd", "order_id": "i771037005030096968", "amount": 10, "trade_type": "user_withdraw_chargeback", "trade_type_name": "提现失败", "operate_type": "A", "operate_type_name": "收入", "trade_name": "", "comment": "余额提现", "created_time": 1744883229 }, { "trade_nnid": "qhBI-btv4hh8TpsGdCrDG", "order_id": "i771066286233878607", "amount": 10, "trade_type": "user_withdraw", "trade_type_name": "余额提现", "operate_type": "R", "operate_type_name": "支出", "trade_name": "", "comment": "", "created_time": 1744796528 }, { "trade_nnid": "NCI4DolRx-0GqFfY5J9-P", "order_id": "i771065517556367438", "amount": 10, "trade_type": "user_withdraw", "trade_type_name": "余额提现", "operate_type": "R", "operate_type_name": "支出", "trade_name": "", "comment": "", "created_time": 1744796345 }, { "trade_nnid": "upM7epMxX3FqoTytFyKUn", "order_id": "i771062549364867149", "amount": 10, "trade_type": "user_withdraw", "trade_type_name": "余额提现", "operate_type": "R", "operate_type_name": "支出", "trade_name": "", "comment": "", "created_time": 1744795637 }, { "trade_nnid": "nzH3e_P25C-q7wcN52L-z", "order_id": "i771061580484837452", "amount": 10, "trade_type": "user_withdraw", "trade_type_name": "余额提现", "operate_type": "R", "operate_type_name": "支出", "trade_name": "", "comment": "", "created_time": 1744795406 }, { "trade_nnid": "aduSpdXNKl0dwqxPhovf0", "order_id": "i771059916772212811", "amount": 10, "trade_type": "user_withdraw", "trade_type_name": "余额提现", "operate_type": "R", "operate_type_name": "支出", "trade_name": "", "comment": "", "created_time": 1744795009 }, { "trade_nnid": "dTTmA75uN-Mv3as8XE1Te", "order_id": "i771054224359293002", "amount": 10, "trade_type": "user_withdraw", "trade_type_name": "余额提现", "operate_type": "R", "operate_type_name": "支出", "trade_name": "", "comment": "", "created_time": 1744793652 }, { "trade_nnid": "jo4IOWJ1wPyGXiA5wQYUU", "order_id": "i771037005030096968", "amount": 10, "trade_type": "user_withdraw", "trade_type_name": "余额提现", "operate_type": "R", "operate_type_name": "支出", "trade_name": "", "comment": "", "created_time": 1744789547 }, { "trade_nnid": "78qU6Cemnhqnvms2-iJDI", "order_id": "i771019326374281284", "amount": 1000, "trade_type": "user_withdraw_chargeback", "trade_type_name": "提现失败", "operate_type": "A", "operate_type_name": "收入", "trade_name": "", "comment": "余额提现", "created_time": 1744789418 }, { "trade_nnid": "yLLohJoE-qowAuxastB1z", "order_id": "i771034873199591494", "amount": 1000, "trade_type": "user_withdraw_chargeback", "trade_type_name": "提现失败", "operate_type": "A", "operate_type_name": "收入", "trade_name": "", "comment": "余额提现", "created_time": 1744789410 }], "request_id": "e9f0142e62066570" },
|
|
8
|
+
|
|
13
9
|
}
|
|
@@ -7,52 +7,127 @@
|
|
|
7
7
|
module.exports = [
|
|
8
8
|
{
|
|
9
9
|
//设置方法名字当别忘记加上【模块名字】：Consump
|
|
10
|
-
mapFnName: '
|
|
11
|
-
title: '
|
|
12
|
-
path: '/
|
|
10
|
+
mapFnName: 'getConsumpCode',
|
|
11
|
+
title: '获取支付码',
|
|
12
|
+
path: '/store/v1/order/get-quick-pay-code',
|
|
13
13
|
isRule: false,
|
|
14
14
|
params: {
|
|
15
|
-
|
|
16
|
-
|
|
15
|
+
shop_id: ['门店ID', 'Number', '必选'],
|
|
16
|
+
temp_order_id: ['临时订单号第一次获取为空，再次获取需要传上次获取到数据', 'Number', '非必选'],
|
|
17
17
|
},
|
|
18
18
|
isConsole: true,
|
|
19
19
|
disabled: true,
|
|
20
20
|
},
|
|
21
21
|
{
|
|
22
22
|
//设置方法名字当别忘记加上【模块名字】：Consump
|
|
23
|
-
mapFnName: '
|
|
24
|
-
title: '
|
|
25
|
-
path: '/
|
|
23
|
+
mapFnName: 'getConsumpCodeScanStatus',
|
|
24
|
+
title: '获取支付码扫码状态',
|
|
25
|
+
path: '/store/v1/order/get-quick-pay-scan-status',
|
|
26
26
|
isRule: false,
|
|
27
27
|
params: {
|
|
28
|
-
|
|
29
|
-
cinema_id: ['影院id', 'Number', '必选'],
|
|
28
|
+
temp_order_id: ['临时订单号', 'Number', '必选'],
|
|
30
29
|
},
|
|
31
30
|
isConsole: true,
|
|
32
31
|
disabled: true,
|
|
33
32
|
},
|
|
34
33
|
{
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
34
|
+
mapFnName: "getConsumpListUserPayChannel",
|
|
35
|
+
title: "获取用户可用支付渠道",
|
|
36
|
+
path: "/pay/v1/pay-channel/list-user-pay-channel",
|
|
37
|
+
isRule: false,
|
|
38
|
+
params: {
|
|
39
|
+
providers: ['支付方式id 多个用逗号分隔', "String", '必选']
|
|
40
|
+
},
|
|
41
|
+
isConsole: true,
|
|
42
|
+
disabled: true
|
|
43
|
+
},
|
|
44
|
+
{
|
|
45
|
+
path: '/store/v1/order/async-submit-status',
|
|
46
|
+
title: "获取异步下单的状态",
|
|
47
|
+
mapFnName: "getConsumpAsyncSubmitStatus",
|
|
39
48
|
isRule: false,
|
|
40
49
|
params: {
|
|
41
|
-
|
|
50
|
+
request_order_id: ['temp_order_id', 'Number', '必选'],
|
|
42
51
|
},
|
|
43
52
|
isConsole: true,
|
|
44
53
|
disabled: true,
|
|
45
54
|
},
|
|
55
|
+
{
|
|
56
|
+
mapFnName: "setConsumpThirdPlace",
|
|
57
|
+
title: "第三方渠道下单",
|
|
58
|
+
path: "/pay/v1/order/third-place",
|
|
59
|
+
isRule: false,
|
|
60
|
+
data: {
|
|
61
|
+
order_id: ['订单号', "String", "必填"],
|
|
62
|
+
channel_provider_id: ['支付渠道id', "String", '必选']
|
|
63
|
+
},
|
|
64
|
+
isConsole: true,
|
|
65
|
+
disabled: true
|
|
66
|
+
},
|
|
67
|
+
{
|
|
68
|
+
mapFnName: "updateConsumpPay",
|
|
69
|
+
title: "修改订单为支付中",
|
|
70
|
+
path: "/order/v1/order/update-to-paying",
|
|
71
|
+
isRule: false,
|
|
72
|
+
data: {
|
|
73
|
+
main_order_id: ['订单号', "String", "必填"],
|
|
74
|
+
},
|
|
75
|
+
isConsole: true,
|
|
76
|
+
disabled: true
|
|
77
|
+
},
|
|
46
78
|
{
|
|
47
79
|
//设置方法名字当别忘记加上【模块名字】：Consump
|
|
48
|
-
mapFnName: '
|
|
49
|
-
title: '
|
|
50
|
-
path: '/
|
|
80
|
+
mapFnName: 'batchConsumpUseCardCreated',
|
|
81
|
+
title: '批量使用卡券下单',
|
|
82
|
+
path: '/store/v1/order/batch-use-card-created',
|
|
83
|
+
isRule: false,
|
|
84
|
+
data: {
|
|
85
|
+
temp_order_id: ['临时订单号', 'Number', '必选'],
|
|
86
|
+
},
|
|
87
|
+
isConsole: true,
|
|
88
|
+
disabled: true,
|
|
89
|
+
},
|
|
90
|
+
{
|
|
91
|
+
//设置方法名字当别忘记加上【模块名字】：Consump
|
|
92
|
+
mapFnName: 'getConsumpShopList',
|
|
93
|
+
title: '获取附近门店列表',
|
|
94
|
+
path: '/mall/v1/shop/msearch',
|
|
95
|
+
isRule: false,
|
|
96
|
+
params: {},
|
|
97
|
+
isConsole: true,
|
|
98
|
+
disabled: true,
|
|
99
|
+
},
|
|
100
|
+
{
|
|
101
|
+
mapFnName: 'getConsumpSettleMainInfo',
|
|
102
|
+
title: '门店核销 - 展示主界面数据',
|
|
103
|
+
// path: '/store/v1/cash/settle/main-info',
|
|
104
|
+
path: "/store/v1/order/main-info",
|
|
51
105
|
isRule: false,
|
|
52
106
|
params: {
|
|
53
|
-
|
|
107
|
+
shop_id: ['门店id', 'Number', '必选'],
|
|
54
108
|
},
|
|
55
109
|
isConsole: true,
|
|
56
110
|
disabled: true,
|
|
57
111
|
},
|
|
112
|
+
{
|
|
113
|
+
mapFnName: 'addConsumpCashierTempOrderData',
|
|
114
|
+
title: '门店核销 - 保存临时购物数据',
|
|
115
|
+
path: "/store/v1/order/save-cart-order-data",
|
|
116
|
+
isRule: false,
|
|
117
|
+
data: {
|
|
118
|
+
shop_id: ['门店id', 'Number', '必选'],
|
|
119
|
+
settle_tag_id: ['结算标签id', 'Number', '必选'],
|
|
120
|
+
},
|
|
121
|
+
isConsole: true,
|
|
122
|
+
disabled: true,
|
|
123
|
+
},
|
|
124
|
+
{
|
|
125
|
+
mapFnName: 'getConsumpBaseUserInfo',
|
|
126
|
+
title: '获取用户信息',
|
|
127
|
+
path: '/passport/v1/user/get',
|
|
128
|
+
params: {},
|
|
129
|
+
isRule: false,
|
|
130
|
+
isConsole: true,
|
|
131
|
+
disabled: true,
|
|
132
|
+
}
|
|
58
133
|
];
|
|
@@ -42,6 +42,19 @@ export default {
|
|
|
42
42
|
},
|
|
43
43
|
inline: false,
|
|
44
44
|
},
|
|
45
|
+
{
|
|
46
|
+
label: '核销支付路径:',
|
|
47
|
+
ele: 'xd-select-pages-path',
|
|
48
|
+
valueKey: 'cash_pay_path',
|
|
49
|
+
placeholder: '请选择核销支付路径',
|
|
50
|
+
className: 'input100',
|
|
51
|
+
groupKey:'advanced',
|
|
52
|
+
value: null,
|
|
53
|
+
setting: {
|
|
54
|
+
router: XdBus.getParentApi('getPagesTree')
|
|
55
|
+
},
|
|
56
|
+
inline: false,
|
|
57
|
+
},
|
|
45
58
|
].filter(i=>i)
|
|
46
59
|
},
|
|
47
60
|
advanced: [],
|
|
@@ -12,50 +12,77 @@
|
|
|
12
12
|
}">
|
|
13
13
|
<view class="content-box">
|
|
14
14
|
<view class="logo-box">
|
|
15
|
-
<image src="
|
|
16
|
-
class="logo"></image>
|
|
15
|
+
<image :src="userInfo['head_url']" class="logo"></image>
|
|
17
16
|
</view>
|
|
18
|
-
<view v-if="
|
|
17
|
+
<view v-if="isFlow">
|
|
19
18
|
<view @click="handleToShop" class="shop">
|
|
20
|
-
<view
|
|
19
|
+
<view>{{shopName}}</view>
|
|
21
20
|
<XdFontIcon size="20" icon="iconxiangyou_xian"></XdFontIcon>
|
|
22
21
|
</view>
|
|
23
|
-
<
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
</image>
|
|
29
|
-
<view class="code-refresh">{{expiration_sec_str}}后自动更新</view>
|
|
30
|
-
<view class="vip">
|
|
31
|
-
<view class="vip-title">
|
|
32
|
-
<view class="vip-title-left">PLUS会员专享</view>
|
|
33
|
-
<view class="vip-title-right">
|
|
34
|
-
<text>8</text>折
|
|
22
|
+
<view class="verification-item">
|
|
23
|
+
<view class="verification-item-label">提货标签</view>
|
|
24
|
+
<view class="verification-item-tags">
|
|
25
|
+
<view :style="{color:tag_id===item.value?mainColor:'',borderColor: tag_id===item.value?mainColor:''}"
|
|
26
|
+
v-for="(item,index) in settle_tag_list" :key="index" @click="handlerTagRadio(item)">{{item.label}}
|
|
35
27
|
</view>
|
|
36
28
|
</view>
|
|
37
|
-
<view class="
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
29
|
+
<view class="nodata" v-if="settle_tag_list_status">结算标签为空，请联系店员设置后重试</view>
|
|
30
|
+
</view>
|
|
31
|
+
<view class="verification-item">
|
|
32
|
+
<view class="verification-item-label">提货点数</view>
|
|
33
|
+
<view class="verification-item-input">
|
|
34
|
+
<input v-model="total_price" @input="(value)=>handlerPrice(value)" type="text">
|
|
35
|
+
<xd-number v-if="curTag.is_static_price" class="xd-number" :min="1" :max="999" v-model="num"
|
|
36
|
+
@change="handleNumberChange"></xd-number>
|
|
37
|
+
<view :style="{color:mainColor}" class="tip">*提货点数请咨询店员，提货成功后无法退换</view>
|
|
41
38
|
</view>
|
|
42
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>
|
|
43
42
|
</view>
|
|
44
|
-
<view
|
|
45
|
-
<view
|
|
46
|
-
<view class="
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
43
|
+
<view v-else>
|
|
44
|
+
<view v-if="!showMask">
|
|
45
|
+
<view @click="handleToShop" class="shop">
|
|
46
|
+
<view>{{shopName}}</view>
|
|
47
|
+
<XdFontIcon size="20" icon="iconxiangyou_xian"></XdFontIcon>
|
|
48
|
+
</view>
|
|
49
|
+
<image mode="aspectFit" class="bar-code" :src="barcode_url">
|
|
50
|
+
</image>
|
|
51
|
+
<view class="bar-code-text">{{barCode}}</view>
|
|
52
|
+
<image mode="aspectFit" class="qrcode" :src="code_url">
|
|
53
|
+
</image>
|
|
54
|
+
<view class="code-refresh">{{expiration_sec_str}}后自动更新</view>
|
|
55
|
+
<view class="vip" v-if="plusDiscount">
|
|
56
|
+
<view class="vip-title">
|
|
57
|
+
<view class="vip-title-left">PLUS会员专享</view>
|
|
58
|
+
<view class="vip-title-right">
|
|
59
|
+
<text>{{plusDiscount/1000}}</text>折
|
|
60
|
+
</view>
|
|
61
|
+
</view>
|
|
62
|
+
<view class="vip-open" @click="handleToOpen">
|
|
63
|
+
<xd-font-icon color="#FCBF28" size="20" icon="iconjinhangzhong"></xd-font-icon>
|
|
64
|
+
<text>立即开通</text>
|
|
65
|
+
<xd-font-icon size="20" icon="iconxiangyou_xian"></xd-font-icon>
|
|
66
|
+
</view>
|
|
67
|
+
</view>
|
|
68
|
+
</view>
|
|
69
|
+
<view class="mask-box" v-else>
|
|
70
|
+
<view class="mask">
|
|
71
|
+
<view class="mask-title">{{tip}}</view>
|
|
72
|
+
<!-- <view class="mask-open">
|
|
73
|
+
PLUS会员专享 <span :style="{color:mainColor,marginLeft:'8rpx'}">8</span>折 <span @click="handleToOpen"
|
|
74
|
+
:style="{color:mainColor,marginLeft:'15rpx'}">立即开通</span>
|
|
75
|
+
</view> -->
|
|
50
76
|
</view>
|
|
51
77
|
</view>
|
|
52
78
|
</view>
|
|
79
|
+
|
|
53
80
|
</view>
|
|
54
81
|
</view>
|
|
55
82
|
<XdDialog :show.sync="showDialog" :showClose="false" :showTitle="false">
|
|
56
83
|
<view class="dialog-title" slot="title">门店确认</view>
|
|
57
84
|
<view class="dialog-content">
|
|
58
|
-
<view>当前门店：<span :style="{color:mainColor}">
|
|
85
|
+
<view>当前门店：<span :style="{color:mainColor}">{{shopName}}</span></view>
|
|
59
86
|
<view>请确认您是否在当前门店中</view>
|
|
60
87
|
</view>
|
|
61
88
|
<view class="dialog-btns" slot="btn">
|
|
@@ -72,6 +99,7 @@
|
|
|
72
99
|
import XdButton from "@/components/XdButton/XdButton";
|
|
73
100
|
import { jfbRootExec } from "@/utils/xd.event";
|
|
74
101
|
import JfbBaseConsumpCodeMixin from "./JfbBaseConsumpCodeMixin";
|
|
102
|
+
import getServiceUrl from "@/common/getServiceUrl";
|
|
75
103
|
import { getContainerPropsValue } from "@/utils/xd.base";
|
|
76
104
|
import componentsMixins from "@/mixins/componentsMixins";
|
|
77
105
|
import extsMixins from "@/mixins/extsMixins";
|
|
@@ -92,17 +120,33 @@
|
|
|
92
120
|
openPath: "",
|
|
93
121
|
shopPath: "",
|
|
94
122
|
successPath: "",
|
|
123
|
+
cashPayPath: "",
|
|
95
124
|
showDialog: false,
|
|
96
|
-
showMask:
|
|
125
|
+
showMask: true,
|
|
97
126
|
shop_id: '',
|
|
98
127
|
secondTimer: null,
|
|
99
128
|
expiration_sec: '',
|
|
100
129
|
code_url: '',
|
|
130
|
+
barcode_url: '',
|
|
131
|
+
barCode: '',
|
|
101
132
|
statusTimer: null,
|
|
102
133
|
validTimer: null,
|
|
103
134
|
payChannels: [],
|
|
104
135
|
channel_provider_id: "",
|
|
105
|
-
options: {}
|
|
136
|
+
options: {},
|
|
137
|
+
canEdit: true,
|
|
138
|
+
settle_tag_list: [],
|
|
139
|
+
settle_tag_list_status: false,
|
|
140
|
+
tag_id: "",
|
|
141
|
+
price: "",
|
|
142
|
+
total_price: "",
|
|
143
|
+
num: 1,
|
|
144
|
+
tip: '',
|
|
145
|
+
shopName: '',
|
|
146
|
+
isFlow: false,
|
|
147
|
+
xnamespace: '',
|
|
148
|
+
plusDiscount: 0,
|
|
149
|
+
userInfo: {}
|
|
106
150
|
}
|
|
107
151
|
},
|
|
108
152
|
watch: {
|
|
@@ -131,28 +175,61 @@
|
|
|
131
175
|
let sec = second % 60;
|
|
132
176
|
return `${min}分${sec}秒`;
|
|
133
177
|
},
|
|
178
|
+
curTag() {
|
|
179
|
+
return this.settle_tag_list.find(item => item.value === this.tag_id) || {}
|
|
180
|
+
},
|
|
181
|
+
curTagPrice() {
|
|
182
|
+
const curTag = this.curTag;
|
|
183
|
+
if (this.$xdUniHelper.isEmpty(curTag)) return 0;
|
|
184
|
+
if (curTag.is_static_price) {
|
|
185
|
+
return curTag.price_yuan;
|
|
186
|
+
} else {
|
|
187
|
+
return this.total_price;
|
|
188
|
+
}
|
|
189
|
+
},
|
|
190
|
+
btnDisabled() {
|
|
191
|
+
return this.total_price === '' || !this.tag_id;
|
|
192
|
+
}
|
|
134
193
|
},
|
|
135
194
|
created() {
|
|
136
195
|
this.init(this.container);
|
|
137
196
|
},
|
|
138
197
|
methods: {
|
|
139
|
-
onJfbLoad(options) {
|
|
198
|
+
async onJfbLoad(options) {
|
|
199
|
+
this.xnamespace = this.projectAttr.business_code
|
|
200
|
+
this.getUserInfo()
|
|
140
201
|
this.options = options
|
|
141
202
|
if (!this.isPreview) {
|
|
142
203
|
if (Object.keys(this.stateLocation).length === 0) {
|
|
204
|
+
this.tip = '为了给您提供更好的服务需要获取您的位置信息'
|
|
143
205
|
this.showMask = true;
|
|
144
206
|
this.showDialog = false;
|
|
145
207
|
return
|
|
146
208
|
}
|
|
147
209
|
}
|
|
148
|
-
this.
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
210
|
+
if (!this.options.shop_id) {
|
|
211
|
+
jfbRootExec("getConsumpShopList", {
|
|
212
|
+
vm: this,
|
|
213
|
+
data: {
|
|
214
|
+
city_code: this.stateCity.city_code,
|
|
215
|
+
consume_mode: 'SELL',
|
|
216
|
+
latitude: this.stateLocation.latitude + '',
|
|
217
|
+
longitude: this.stateLocation.longitude + '',
|
|
218
|
+
},
|
|
219
|
+
}).then(res => {
|
|
220
|
+
if (res && res.list.length > 0) {
|
|
221
|
+
this.shop_id = res.list[0].shop_id;
|
|
222
|
+
this.shopName = res.list[0].resource_shop_name;
|
|
223
|
+
this.showMask = true;
|
|
224
|
+
this.showDialog = true;
|
|
225
|
+
} else {
|
|
226
|
+
this.tip = '您的附近暂时没有支持的店铺'
|
|
227
|
+
this.showDialog = false;
|
|
228
|
+
}
|
|
229
|
+
})
|
|
154
230
|
} else {
|
|
155
|
-
this.
|
|
231
|
+
this.shop_id = this.options.shop_id;
|
|
232
|
+
this.p_getAsyncStep();
|
|
156
233
|
}
|
|
157
234
|
},
|
|
158
235
|
/**
|
|
@@ -175,14 +252,27 @@
|
|
|
175
252
|
"content.successPath",
|
|
176
253
|
{ value: "" }
|
|
177
254
|
).value;
|
|
255
|
+
this.cashPayPath = getContainerPropsValue(container, 'content.cash_pay_path', { value: "" }
|
|
256
|
+
).value;
|
|
257
|
+
},
|
|
258
|
+
getUserInfo() {
|
|
259
|
+
jfbRootExec("getConsumpBaseUserInfo", {
|
|
260
|
+
vm: this,
|
|
261
|
+
data: {},
|
|
262
|
+
}).then(res => {
|
|
263
|
+
this.userInfo = res || {};
|
|
264
|
+
})
|
|
178
265
|
},
|
|
179
266
|
async p_getAsyncStep() {
|
|
180
267
|
await this.p_getQuickPayQRCode();
|
|
181
|
-
this.
|
|
268
|
+
if (!this.isFlow) {
|
|
269
|
+
this.p_getQRCodeStatus();
|
|
270
|
+
this.p_getListUserPayChannel();
|
|
271
|
+
}
|
|
182
272
|
},
|
|
183
273
|
p_getListUserPayChannel() {
|
|
184
274
|
const { pay_channels } = this.projectAttr;
|
|
185
|
-
jfbRootExec("
|
|
275
|
+
jfbRootExec("getConsumpListUserPayChannel", {
|
|
186
276
|
vm: this,
|
|
187
277
|
data: {
|
|
188
278
|
providers: pay_channels && pay_channels.join(","),
|
|
@@ -195,30 +285,45 @@
|
|
|
195
285
|
},
|
|
196
286
|
p_getQuickPayQRCode() {
|
|
197
287
|
return new Promise((resolve, reject) => {
|
|
198
|
-
|
|
199
|
-
jfbRootExec("
|
|
288
|
+
this.$xdShowLoading({});
|
|
289
|
+
jfbRootExec("getConsumpCode", {
|
|
200
290
|
vm: this,
|
|
201
291
|
data: {
|
|
202
292
|
shop_id: this.shop_id,
|
|
203
|
-
temp_order_id: this.temp_order_id
|
|
293
|
+
temp_order_id: this.temp_order_id,
|
|
204
294
|
}
|
|
205
295
|
}).then(res => {
|
|
206
|
-
|
|
207
|
-
this.
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
this.
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
296
|
+
this.$xdHideLoading();
|
|
297
|
+
this.plusDiscount = res.plus_discount
|
|
298
|
+
if (res.is_st_flow === 'Y') {
|
|
299
|
+
//水牌
|
|
300
|
+
this.isFlow = true
|
|
301
|
+
this.shopName = res.shop_name;
|
|
302
|
+
this.getSettleTagList()
|
|
303
|
+
} else {
|
|
304
|
+
// 消费码
|
|
305
|
+
this.temp_order_id = res.temp_order_id;
|
|
306
|
+
let code_url = this.brandInfo['api_host'] + res.code_url;
|
|
307
|
+
let barcode_url = this.brandInfo['api_host'] + res.barcode_url;
|
|
308
|
+
if (this.isPreview) code_url = res.code_url;
|
|
309
|
+
if (this.isPreview) barcode_url = res.barcode_url;
|
|
310
|
+
this.code_url = code_url;
|
|
311
|
+
this.barcode_url = barcode_url;
|
|
312
|
+
this.barCode = res.payment_code
|
|
313
|
+
this.expiration_sec = res.expiration_sec;
|
|
314
|
+
this.showMask = false;
|
|
315
|
+
this.shopName = res.shop_name;
|
|
316
|
+
clearInterval(this.secondTimer);
|
|
317
|
+
this.secondTimer = setInterval(() => {
|
|
318
|
+
this.expiration_sec--;
|
|
319
|
+
if (this.expiration_sec <= 0) {
|
|
320
|
+
clearInterval(this.secondTimer);
|
|
321
|
+
this.p_getQuickPayQRCode();
|
|
322
|
+
}
|
|
323
|
+
}, 1000);
|
|
324
|
+
resolve();
|
|
325
|
+
}
|
|
326
|
+
|
|
222
327
|
}).catch(err => {
|
|
223
328
|
console.error(err);
|
|
224
329
|
reject(err);
|
|
@@ -226,7 +331,7 @@
|
|
|
226
331
|
})
|
|
227
332
|
},
|
|
228
333
|
p_getQRCodeStatus() {
|
|
229
|
-
jfbRootExec("
|
|
334
|
+
jfbRootExec("getConsumpCodeScanStatus", {
|
|
230
335
|
vm: this,
|
|
231
336
|
data: {
|
|
232
337
|
temp_order_id: this.temp_order_id,
|
|
@@ -265,7 +370,7 @@
|
|
|
265
370
|
})
|
|
266
371
|
},
|
|
267
372
|
p_createOrder() {
|
|
268
|
-
jfbRootExec("
|
|
373
|
+
jfbRootExec("batchConsumpUseCardCreated", {
|
|
269
374
|
vm: this,
|
|
270
375
|
data: {
|
|
271
376
|
temp_order_id: this.temp_order_id,
|
|
@@ -279,7 +384,7 @@
|
|
|
279
384
|
})
|
|
280
385
|
},
|
|
281
386
|
p_getOrderStatus() {
|
|
282
|
-
jfbRootExec("
|
|
387
|
+
jfbRootExec("getConsumpAsyncSubmitStatus", {
|
|
283
388
|
vm: this,
|
|
284
389
|
data: {
|
|
285
390
|
request_order_id: this.request_order_id
|
|
@@ -371,6 +476,131 @@
|
|
|
371
476
|
if (this.validTimer) clearInterval(this.validTimer)
|
|
372
477
|
this.p_getAsyncStep();
|
|
373
478
|
},
|
|
479
|
+
getSettleTagList() {
|
|
480
|
+
this.$xdShowLoading({});
|
|
481
|
+
|
|
482
|
+
jfbRootExec("getConsumpSettleMainInfo", {
|
|
483
|
+
vm: this,
|
|
484
|
+
data: {
|
|
485
|
+
shop_id: this.shop_id,
|
|
486
|
+
}
|
|
487
|
+
}).then(res => {
|
|
488
|
+
this.$xdHideLoading();
|
|
489
|
+
const { settle_tag_list } = res;
|
|
490
|
+
this.settle_tag_list = settle_tag_list;
|
|
491
|
+
if (settle_tag_list.length > 0) {
|
|
492
|
+
this.handlerTagRadio(settle_tag_list[0]);
|
|
493
|
+
this.settle_tag_list_status = false;
|
|
494
|
+
}
|
|
495
|
+
else this.settle_tag_list_status = true;
|
|
496
|
+
}).catch(err => {
|
|
497
|
+
this.$xdHideLoading();
|
|
498
|
+
this.$xdLog.catch(error)
|
|
499
|
+
})
|
|
500
|
+
},
|
|
501
|
+
toPayOrder(options = {}) {
|
|
502
|
+
let { tag_id, total_price, curTag, num = 1, shop_id } = this;
|
|
503
|
+
let err_tip = "";
|
|
504
|
+
if (!curTag.is_static_price) this.price = total_price;
|
|
505
|
+
if (curTag.is_static_price) {
|
|
506
|
+
if (total_price > 10000) {
|
|
507
|
+
err_tip = '金额不能超过10000'
|
|
508
|
+
}
|
|
509
|
+
}
|
|
510
|
+
let price = this.price;
|
|
511
|
+
if (!price) err_tip = "请填写正确的提货金额";
|
|
512
|
+
if (!tag_id) err_tip = "请选择结算标签";
|
|
513
|
+
if (err_tip) {
|
|
514
|
+
uni.showToast({
|
|
515
|
+
title: err_tip,
|
|
516
|
+
icon: 'none'
|
|
517
|
+
});
|
|
518
|
+
return false;
|
|
519
|
+
}
|
|
520
|
+
if (this.total_price == 0) {
|
|
521
|
+
uni.showToast(
|
|
522
|
+
{
|
|
523
|
+
title: '核销金额不能为0',
|
|
524
|
+
icon: 'none'
|
|
525
|
+
}
|
|
526
|
+
)
|
|
527
|
+
return
|
|
528
|
+
}
|
|
529
|
+
jfbRootExec("addConsumpCashierTempOrderData", {
|
|
530
|
+
vm: this,
|
|
531
|
+
data: {
|
|
532
|
+
shop_id: this.shop_id,
|
|
533
|
+
settle_tag_id: this.tag_id,
|
|
534
|
+
num: this.num,
|
|
535
|
+
settle_tag_price: this.curTagPrice,
|
|
536
|
+
total_price: this.total_price,
|
|
537
|
+
...options
|
|
538
|
+
}
|
|
539
|
+
})
|
|
540
|
+
.then(res => {
|
|
541
|
+
if (res.confirm_notice) {
|
|
542
|
+
return this.useCardPop(res).then(data => {
|
|
543
|
+
if (data == 2) {
|
|
544
|
+
this.toPayOrder({
|
|
545
|
+
is_ignore_unique_check: "Y"
|
|
546
|
+
})
|
|
547
|
+
}
|
|
548
|
+
})
|
|
549
|
+
} else {
|
|
550
|
+
this.price = "";
|
|
551
|
+
let params = {
|
|
552
|
+
...this.options,
|
|
553
|
+
price: price,
|
|
554
|
+
num: num,
|
|
555
|
+
tag: tag_id,
|
|
556
|
+
shop_id: shop_id,
|
|
557
|
+
cart_order_id: res.cart_order_id
|
|
558
|
+
};
|
|
559
|
+
params = this.$xdUniHelper.jsonToParams(params)
|
|
560
|
+
this.$xdUniHelper.navigateTo({
|
|
561
|
+
url: this.cashPayPath + `?${params}`
|
|
562
|
+
})
|
|
563
|
+
}
|
|
564
|
+
})
|
|
565
|
+
.catch(error => {
|
|
566
|
+
console.error(error);
|
|
567
|
+
})
|
|
568
|
+
},
|
|
569
|
+
//选卡弹出项
|
|
570
|
+
useCardPop(data) {
|
|
571
|
+
return new Promise((resolve, reject) => {
|
|
572
|
+
uni.showModal({
|
|
573
|
+
title: '提示',
|
|
574
|
+
content: data.msg,
|
|
575
|
+
// confirmText: data.confirm_text,
|
|
576
|
+
// cancelText: data.cancel_text,
|
|
577
|
+
success: function (res) {
|
|
578
|
+
if (res.confirm) {
|
|
579
|
+
resolve(2);
|
|
580
|
+
} else if (res.cancel) {
|
|
581
|
+
resolve();
|
|
582
|
+
}
|
|
583
|
+
},
|
|
584
|
+
fail: function (res) {
|
|
585
|
+
reject(res);
|
|
586
|
+
}
|
|
587
|
+
});
|
|
588
|
+
})
|
|
589
|
+
},
|
|
590
|
+
handlerPrice(e) {
|
|
591
|
+
this.$nextTick(() => {
|
|
592
|
+
this.total_price = e.detail.value.replace(/^\D*([0-9]\d*\.?\d{0,2})?.*$/, '$1');
|
|
593
|
+
if (this.total_price > 10000) {
|
|
594
|
+
this.total_price = 10000
|
|
595
|
+
uni.showToast(
|
|
596
|
+
{
|
|
597
|
+
title: '核销金额不能超过10000',
|
|
598
|
+
icon: 'none'
|
|
599
|
+
}
|
|
600
|
+
)
|
|
601
|
+
}
|
|
602
|
+
})
|
|
603
|
+
},
|
|
374
604
|
handleThirdPay(pay_order_id, main_order_id) {
|
|
375
605
|
let { login_providers = [] } = this.projectAttr;
|
|
376
606
|
let data = {
|
|
@@ -387,7 +617,7 @@
|
|
|
387
617
|
data['pay_success_url'] += this.successPath + `?order_id=${main_order_id}`;
|
|
388
618
|
}
|
|
389
619
|
|
|
390
|
-
jfbRootExec("
|
|
620
|
+
jfbRootExec("setConsumpThirdPlace", {
|
|
391
621
|
vm: this,
|
|
392
622
|
data,
|
|
393
623
|
})
|
|
@@ -396,7 +626,7 @@
|
|
|
396
626
|
const { channel_data } = res;
|
|
397
627
|
const paySignData = JSON.parse(Base64.decode(channel_data));
|
|
398
628
|
this.openTemplatePay(paySignData, (ps) => {
|
|
399
|
-
jfbRootExec("
|
|
629
|
+
jfbRootExec("updateConsumpPay", {
|
|
400
630
|
vm: this,
|
|
401
631
|
data: {
|
|
402
632
|
main_order_id: main_order_id,
|
|
@@ -432,21 +662,36 @@
|
|
|
432
662
|
});
|
|
433
663
|
},
|
|
434
664
|
handleConfirm() {
|
|
435
|
-
//todo 经纬度获取第一个门店
|
|
436
665
|
this.showDialog = false;
|
|
437
666
|
this.p_getAsyncStep();
|
|
438
667
|
},
|
|
668
|
+
handlerTagRadio(item) {
|
|
669
|
+
this.tag_id = item.value;
|
|
670
|
+
this.canEdit = !item.is_static_price;
|
|
671
|
+
this.num = 1;
|
|
672
|
+
if (item.is_static_price) {
|
|
673
|
+
this.total_price = item.price_yuan
|
|
674
|
+
this.price = item.price_yuan
|
|
675
|
+
} else {
|
|
676
|
+
this.total_price = "";
|
|
677
|
+
this.price = "";
|
|
678
|
+
}
|
|
679
|
+
},
|
|
680
|
+
handleNumberChange(num) {
|
|
681
|
+
let curTag = this.curTag;
|
|
682
|
+
this.total_price = this.$xdUniHelper.multiplyFloatNumber(curTag.price_yuan, num);
|
|
683
|
+
},
|
|
439
684
|
onJfbUnload(options) {
|
|
440
685
|
console.log('event.onJfbUnload', options)
|
|
441
|
-
if(this.secondTimer) clearInterval(this.secondTimer);
|
|
442
|
-
if(this.statusTimer) clearTimeout(this.statusTimer);
|
|
443
|
-
if(this.orderTimer) clearTimeout(this.orderTimer);
|
|
686
|
+
if (this.secondTimer) clearInterval(this.secondTimer);
|
|
687
|
+
if (this.statusTimer) clearTimeout(this.statusTimer);
|
|
688
|
+
if (this.orderTimer) clearTimeout(this.orderTimer);
|
|
444
689
|
},
|
|
445
690
|
onJfbBack(options) {
|
|
446
691
|
console.log('event.onJfbBack', options)
|
|
447
|
-
if(this.secondTimer) clearInterval(this.secondTimer);
|
|
448
|
-
if(this.statusTimer) clearTimeout(this.statusTimer);
|
|
449
|
-
if(this.orderTimer) clearTimeout(this.orderTimer);
|
|
692
|
+
if (this.secondTimer) clearInterval(this.secondTimer);
|
|
693
|
+
if (this.statusTimer) clearTimeout(this.statusTimer);
|
|
694
|
+
if (this.orderTimer) clearTimeout(this.orderTimer);
|
|
450
695
|
},
|
|
451
696
|
onJfbScroll(options) {
|
|
452
697
|
console.log('event.onJfbScroll', options)
|
|
@@ -459,6 +704,9 @@
|
|
|
459
704
|
},
|
|
460
705
|
onJfbHide(options) {
|
|
461
706
|
console.log('event.onJfbHide', options)
|
|
707
|
+
if (this.secondTimer) clearInterval(this.secondTimer);
|
|
708
|
+
if (this.statusTimer) clearTimeout(this.statusTimer);
|
|
709
|
+
if (this.orderTimer) clearTimeout(this.orderTimer);
|
|
462
710
|
},
|
|
463
711
|
onJfbUpdate(...data) {
|
|
464
712
|
console.log('event.onJfbUpdate', data)
|
|
@@ -477,9 +725,9 @@
|
|
|
477
725
|
.jfb-base-consump-code {
|
|
478
726
|
&__body {
|
|
479
727
|
.content-box {
|
|
480
|
-
margin:
|
|
728
|
+
margin: 158rpx 30rpx 0 30rpx;
|
|
481
729
|
background-color: #fff;
|
|
482
|
-
padding:
|
|
730
|
+
padding: 81rpx 32rpx 32rpx 32rpx;
|
|
483
731
|
border-radius: 24rpx;
|
|
484
732
|
position: relative;
|
|
485
733
|
display: flex;
|
|
@@ -488,11 +736,11 @@
|
|
|
488
736
|
justify-content: center;
|
|
489
737
|
|
|
490
738
|
.logo-box {
|
|
491
|
-
width:
|
|
492
|
-
height:
|
|
739
|
+
width: 154rpx;
|
|
740
|
+
height: 154rpx;
|
|
493
741
|
background-color: #fff;
|
|
494
742
|
position: absolute;
|
|
495
|
-
top: -
|
|
743
|
+
top: -100rpx;
|
|
496
744
|
left: 50%;
|
|
497
745
|
transform: translate(-50%, 0);
|
|
498
746
|
display: flex;
|
|
@@ -501,8 +749,8 @@
|
|
|
501
749
|
border-radius: 50%;
|
|
502
750
|
|
|
503
751
|
.logo {
|
|
504
|
-
width:
|
|
505
|
-
height:
|
|
752
|
+
width: 144rpx;
|
|
753
|
+
height: 144rpx;
|
|
506
754
|
border-radius: 50%;
|
|
507
755
|
}
|
|
508
756
|
}
|
|
@@ -511,10 +759,10 @@
|
|
|
511
759
|
|
|
512
760
|
.shop {
|
|
513
761
|
border: 2rpx solid #E6E6E6;
|
|
514
|
-
padding:
|
|
762
|
+
padding: 30rpx 40rpx;
|
|
515
763
|
border-radius: 24rpx;
|
|
516
764
|
color: #fff;
|
|
517
|
-
font-size:
|
|
765
|
+
font-size: 26rpx;
|
|
518
766
|
display: flex;
|
|
519
767
|
justify-content: space-between;
|
|
520
768
|
align-items: center;
|
|
@@ -526,7 +774,7 @@
|
|
|
526
774
|
.bar-code {
|
|
527
775
|
height: 120rpx;
|
|
528
776
|
width: 600rpx;
|
|
529
|
-
margin:
|
|
777
|
+
margin: 38rpx 0 0 0;
|
|
530
778
|
|
|
531
779
|
&-text {
|
|
532
780
|
color: #999999;
|
|
@@ -536,19 +784,23 @@
|
|
|
536
784
|
}
|
|
537
785
|
|
|
538
786
|
.qrcode {
|
|
539
|
-
width:
|
|
540
|
-
height:
|
|
541
|
-
margin:
|
|
787
|
+
width: 272rpx;
|
|
788
|
+
height: 272rpx;
|
|
789
|
+
margin: 54rpx auto 18rpx auto;
|
|
790
|
+
display: flex;
|
|
791
|
+
justify-content: center;
|
|
792
|
+
align-items: center;
|
|
793
|
+
|
|
542
794
|
}
|
|
543
795
|
|
|
544
796
|
.code-refresh {
|
|
545
797
|
color: #999;
|
|
546
798
|
font-size: 24rpx;
|
|
547
|
-
margin-bottom:
|
|
799
|
+
margin-bottom: 36rpx;
|
|
548
800
|
border-bottom: 2rpx dashed #E5E5E5;
|
|
549
801
|
width: 95%;
|
|
550
802
|
text-align: center;
|
|
551
|
-
padding-bottom:
|
|
803
|
+
padding-bottom: 36rpx;
|
|
552
804
|
}
|
|
553
805
|
|
|
554
806
|
.vip {
|
|
@@ -565,9 +817,9 @@
|
|
|
565
817
|
&-left {
|
|
566
818
|
background: linear-gradient(90deg, #665646 0%, #473D34 52.05%, #2B2623 100%);
|
|
567
819
|
color: #EFD5C3;
|
|
568
|
-
font-size:
|
|
820
|
+
font-size: 22rpx;
|
|
569
821
|
border-radius: 74rpx 0rpx 0rpx 74rpx;
|
|
570
|
-
padding:
|
|
822
|
+
padding: 18rpx 18rpx 18rpx 22rpx;
|
|
571
823
|
display: flex;
|
|
572
824
|
align-items: center;
|
|
573
825
|
justify-content: center;
|
|
@@ -576,16 +828,16 @@
|
|
|
576
828
|
&-right {
|
|
577
829
|
background: linear-gradient(270deg, #FCD6B8 0%, #FCEDD7 100%);
|
|
578
830
|
border-radius: 0px 80rpx 80rpx 0px;
|
|
579
|
-
padding:
|
|
580
|
-
font-size:
|
|
831
|
+
padding: 5rpx 32rpx;
|
|
832
|
+
font-size: 22rpx;
|
|
581
833
|
display: flex;
|
|
582
834
|
align-items: center;
|
|
583
835
|
justify-content: center;
|
|
584
836
|
|
|
585
|
-
&>
|
|
837
|
+
&>text {
|
|
586
838
|
color: #D10300;
|
|
587
839
|
font-weight: 700;
|
|
588
|
-
font-size:
|
|
840
|
+
font-size: 43rpx;
|
|
589
841
|
margin-right: 5rpx;
|
|
590
842
|
}
|
|
591
843
|
}
|
|
@@ -597,7 +849,7 @@
|
|
|
597
849
|
font-size: 28rpx;
|
|
598
850
|
align-items: center;
|
|
599
851
|
|
|
600
|
-
&>
|
|
852
|
+
&>text {
|
|
601
853
|
margin: 0 8rpx;
|
|
602
854
|
}
|
|
603
855
|
}
|
|
@@ -614,7 +866,7 @@
|
|
|
614
866
|
align-items: center;
|
|
615
867
|
justify-content: center;
|
|
616
868
|
background: url('https://img-b.jufubao.cn/uploads/20250407/11e6e600ab4395c44d42489bc7b25034.jpg') no-repeat;
|
|
617
|
-
background-size:
|
|
869
|
+
background-size: 100% 100%;
|
|
618
870
|
|
|
619
871
|
&-title {
|
|
620
872
|
font-size: 26rpx;
|
|
@@ -629,6 +881,58 @@
|
|
|
629
881
|
}
|
|
630
882
|
}
|
|
631
883
|
}
|
|
884
|
+
|
|
885
|
+
.verification {
|
|
886
|
+
&-item {
|
|
887
|
+
display: flex;
|
|
888
|
+
margin-top: 60rpx;
|
|
889
|
+
|
|
890
|
+
&-label {
|
|
891
|
+
color: #999999;
|
|
892
|
+
font-size: 30rpx;
|
|
893
|
+
margin-right: 64rpx;
|
|
894
|
+
}
|
|
895
|
+
|
|
896
|
+
&-tags {
|
|
897
|
+
display: flex;
|
|
898
|
+
align-items: flex-start;
|
|
899
|
+
|
|
900
|
+
&>view {
|
|
901
|
+
margin-right: 32rpx;
|
|
902
|
+
font-size: 28rpx;
|
|
903
|
+
border-radius: 12rpx;
|
|
904
|
+
padding: 16rpx 24rpx;
|
|
905
|
+
border: 2rpx solid #EEEEEE;
|
|
906
|
+
color: #CCCCCC;
|
|
907
|
+
}
|
|
908
|
+
|
|
909
|
+
}
|
|
910
|
+
|
|
911
|
+
&-input {
|
|
912
|
+
display: flex;
|
|
913
|
+
flex-direction: column;
|
|
914
|
+
text-align: center;
|
|
915
|
+
font-size: 28rpx;
|
|
916
|
+
|
|
917
|
+
&>input {
|
|
918
|
+
border-radius: 10rpx;
|
|
919
|
+
border: 2rpx solid #EEEEEE;
|
|
920
|
+
padding: 20rpx 24rpx;
|
|
921
|
+
}
|
|
922
|
+
|
|
923
|
+
.tip {
|
|
924
|
+
font-size: 18rpx;
|
|
925
|
+
margin-top: 12rpx;
|
|
926
|
+
}
|
|
927
|
+
}
|
|
928
|
+
}
|
|
929
|
+
}
|
|
930
|
+
|
|
931
|
+
.nodata {
|
|
932
|
+
color: #f00;
|
|
933
|
+
line-height: unit(68, rpx);
|
|
934
|
+
font-size: unit(28, rpx);
|
|
935
|
+
}
|
|
632
936
|
}
|
|
633
937
|
|
|
634
938
|
.dialog-title {
|
|
@@ -1,13 +1,22 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
3
|
module.exports = {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
4
|
+
|
|
5
|
+
getConsumpCode: { "payment_code": "h.161.v71913434717194", "expiration_time": 1744971193, "expiration_sec": 60, "temp_order_id": "quickpay-5000358-DBeMnvrvInuINYeTqbCXw", "confirm_notice": false, "notice": "", "cash_order_id": "", "code_url": "\/common\/v1\/image\/qrcode?code_content=h.161.v71913434717194&size=240", "plus_discount": 0, "is_st_flow": "张三", "barcode_url": "\/common\/v1\/image\/barcode?code_content=h.161.v71913434717194", "shop_name": "六九豆浆饺子(石门市场店)", "request_id": "52ebf80c255ebcb5" },
|
|
6
|
+
|
|
7
|
+
getConsumpCodeScanStatus: { "status": "P", "message": "", "order_data": "{\"total_amount\":\"0\",\"pay_expire_time\":\"0\",\"message\":\"\",\"status\":\"P\",\"cash_order_id\":\"\",\"user_id\":\"5000358\",\"channel_order_id\":\"\",\"cart_order_id\":\"\"}", "seconds": 0, "request_id": "a54ac53ad31312d6" },
|
|
8
|
+
|
|
9
|
+
getConsumpListUserPayChannel: { "list": [{ "channel_provider_id": "1rRq74ACKJj5nIx5CgLpb", "channel_provider_name": "微信", "channel_code": "wxpay", "channel_logo": "https:\/\/jfb-public-images.oss-cn-qingdao.aliyuncs.com\/system-paychannel-logo-wxpay.png?x-oss-process=style\/200_200" }], "request_id": "e142d26c3d24c060" },
|
|
10
|
+
|
|
11
|
+
batchConsumpUseCardCreated: { "request_order_id": "quickpay-5000358-DBeMnvrvInuINYeTqbCXw", "request_id": "e17499843ece44b1" },
|
|
12
|
+
|
|
13
|
+
getConsumpAsyncSubmitStatus: { "hand_status": "U", "hand_status_msg": "异步下单中", "order_id": "", "pay_order_id": "", "need_pay_price": "0", "request_id": "fddff0af4216825d" },
|
|
14
|
+
|
|
15
|
+
getConsumpShopList: { "namespaces": [{ "label": "蛋糕(勿改)", "value": "cake" }], "brands": [{ "label": "测试1111", "value": 14, "icon": "\/uploads\/20230324\/3265afeb6a1f2a94f25c968a09275574.png" }, { "label": "品牌jls0519", "value": 100003, "icon": "\/uploads\/20230710\/44f645b06fe4da358f7b0ee06259afcd.jpg" }], "list": [{ "brand_id": 14, "brand_name": "测试1111", "brand_type": "MA", "business_status": "CLOSED", "consume_mode": ["SELL"], "consume_mode_name": "", "distance": "42km", "distance_conversion": "41.9km", "default_consume_type": "CV", "consume_type": ["CV"], "is_support_jhd": true, "address": "顺义区东六环与顺于路交叉口东150米", "province_name": "", "city_name": "", "area_name": "", "street_name": "", "phone": "(010)89430806", "resource_shop_id": 8003489, "exts_params": "eyJyZXNvdXJjZV9zaG9wX2lkIjo4MDAzNDg5LCJzaG9wX2lkIjoxMTUzNTIwLCJ2ZXJzaW9uIjoyfQ", "resource_shop_name": "六九豆浆饺子(石门市场店)", "shop_icon": "\/uploads\/20230324\/3265afeb6a1f2a94f25c968a09275574.png", "shop_id": 1153520, "shop_tags": [], "stars": 0, "time_slot_name": "-", "business_code": "", "longitude": "116.630756", "latitude": "40.134773" }, { "brand_id": 100003, "brand_name": "品牌jls0519", "brand_type": "MA", "business_status": "OPEN_BUSINESS", "consume_mode": ["SELL"], "consume_mode_name": "", "distance": "55km", "distance_conversion": "54.8km", "default_consume_type": "", "consume_type": [""], "is_support_jhd": false, "address": "东城区东直门街道东城区东直门内南大街4号（东直门内第一个十字路口东南角）", "province_name": "", "city_name": "", "area_name": "", "street_name": "", "phone": "64034959", "resource_shop_id": 8000077, "exts_params": "eyJyZXNvdXJjZV9zaG9wX2lkIjo4MDAwMDc3LCJzaG9wX2lkIjoxMDIzNTMwLCJ2ZXJzaW9uIjoyfQ", "resource_shop_name": "东直门[2]", "shop_icon": "\/uploads\/20230710\/44f645b06fe4da358f7b0ee06259afcd.jpg", "shop_id": 1023530, "shop_tags": [], "stars": 0, "time_slot_name": "09:00-18:00", "business_code": "", "longitude": "116.44373384708321", "latitude": "39.94636369444035" }, { "brand_id": 100003, "brand_name": "品牌jls0519", "brand_type": "MA", "business_status": "OPEN_BUSINESS", "consume_mode": ["SELL"], "consume_mode_name": "", "distance": "56km", "distance_conversion": "55.5km", "default_consume_type": "JHD", "consume_type": ["JHD"], "is_support_jhd": true, "address": "东城区建国门街道北京inn", "province_name": "", "city_name": "", "area_name": "", "street_name": "", "phone": "18843854566", "resource_shop_id": 8000078, "exts_params": "eyJyZXNvdXJjZV9zaG9wX2lkIjo4MDAwMDc4LCJzaG9wX2lkIjoxMDM3MjY2LCJ2ZXJzaW9uIjoyfQ", "resource_shop_name": "a加盟商-185", "shop_icon": "\/uploads\/20230710\/44f645b06fe4da358f7b0ee06259afcd.jpg", "shop_id": 1037266, "shop_tags": [], "stars": 0, "time_slot_name": "-", "business_code": "", "longitude": "116.43814998003319", "latitude": "39.9280800962547" }], "total_size": 3, "next_page_token": "", "request_id": "fa91f05cff4b280b" },
|
|
16
|
+
|
|
17
|
+
getConsumpSettleMainInfo: { "shop_id": 1037266, "shop_logo": "\/uploads\/20230710\/44f645b06fe4da358f7b0ee06259afcd.jpg", "shop_name": "a加盟商-185", "shop_brand": 100003, "shop_partner_name": "A加盟商-余额测试", "settle_tag_list": [{ "label": "幸福西饼、goodlike品牌", "value": 262, "price": 0, "price_yuan": "0.00", "is_static_price": false, "icon_url": "https:\/\/sandbox-img.jufubao.cn\/uploads\/20230728\/70f4dd90cdf2681e71ccf41d332d71a0.jpeg" }], "request_id": "a4a6cfe9db905597" },
|
|
18
|
+
|
|
19
|
+
getConsumpBaseUserInfo: { "user_name": "", "user_code": "WuE5Wotf08", "nickname": "张三", "real_name": "", "head_url": "https:\/\/thirdwx.qlogo.cn\/mmopen\/vi_32\/AOqEDeiaxss8GR4jD1GicIgyqWSOZV8xN23Iw3DOzFjVBzTFbdv21X7u9ZASQJYsTNm07XSq6ebzp4K4qu1JT26qGZ0qYFMe1nHdQjFZib83Fg\/132", "province_code": "", "city_code": "", "province_name": "", "city_name": "", "sex": "1", "sex_name": "男", "birthday_date": "2025-04-16", "phone_number": "177****7945", "show_user_name": "张三", "user_level": "VIP", "vip_expire_time": 1776157293, "request_id": "f1dbb1c0bb8da893" }，
|
|
20
|
+
|
|
21
|
+
addConsumpCashierTempOrderData: { "cart_order_id": "c08f38347ec8bc5b", "request_id": "779bf62e988587ce" }
|
|
13
22
|
}
|
|
@@ -157,6 +157,18 @@ export default {
|
|
|
157
157
|
},
|
|
158
158
|
inline: false,
|
|
159
159
|
},
|
|
160
|
+
{
|
|
161
|
+
label: '积分详情路径:',
|
|
162
|
+
ele: 'xd-select-pages-path',
|
|
163
|
+
valueKey: 'pointsPath',
|
|
164
|
+
groupKey:'advanced',
|
|
165
|
+
placeholder: '请选择积分详情路径',
|
|
166
|
+
value: data['coupointsPathponPath'] || null,
|
|
167
|
+
setting: {
|
|
168
|
+
router: XdBus.getParentApi('getPagesTree'),
|
|
169
|
+
},
|
|
170
|
+
inline: false,
|
|
171
|
+
},
|
|
160
172
|
{
|
|
161
173
|
label: '优惠券路径:',
|
|
162
174
|
ele: 'xd-select-pages-path',
|
|
@@ -149,12 +149,13 @@
|
|
|
149
149
|
).fullTime;
|
|
150
150
|
return item;
|
|
151
151
|
})
|
|
152
|
-
this.hasNext = res.next_page_token !== "";
|
|
153
152
|
if (this.page_token === 1) {
|
|
154
153
|
this.recordList = list
|
|
155
154
|
} else {
|
|
156
155
|
this.recordList = this.recordList.concat(list);
|
|
157
156
|
}
|
|
157
|
+
this.next_page_token = res.next_page_token
|
|
158
|
+
this.hasNext = res.next_page_token !== "";
|
|
158
159
|
})
|
|
159
160
|
},
|
|
160
161
|
/**
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
3
|
module.exports = {
|
|
4
|
-
|
|
5
4
|
getPointsWalletDetail:{"wallet_list":[{"sort":1,"wallet_type":"US","show_name":"可用积分","amount":10000,"is_support_withdraw":"N"}],"request_id":"43fa9f773f0c3014"},
|
|
6
5
|
getPointsWalletTradeList: {"next_page_token":"","total_size":0,"list":[{"trade_nnid":"zd0rYpZgWXE9Yf8e1mtH3","order_id":"111112-2025041517-03-54","amount":10000,"trade_type":"activity_a","trade_type_name":"活动收入","operate_type":"A","operate_type_name":"收入","trade_name":"","comment":"","created_time":1744707836}],"request_id":"eec94260e6f9de53"}
|
|
7
6
|
}
|
|
@@ -1,13 +1,10 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
3
|
module.exports = {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
addWithFilmcart:{},
|
|
12
|
-
|
|
4
|
+
|
|
5
|
+
getWithdrawOrderDetail: { "detail": { "partner_id": 161, "site_id": "04c78d51890a18b8", "user_id": 5000358, "wallet_type": "UC", "total_amount": 200, "channel_amount": 200, "order_id": "i771668569418104913", "channel_code": "wxpay", "channel_code_name": "微信", "channel_order_id": "", "channel_user_id": "oJM1I6-ns0kM_byNgio_n_ZuTqCk", "channel_app_id": "wxad70f65127f9471c", "wallet_nnid": "", "wallet_trade_nnid": "", "arrival_time": 0, "extras": "", "comment": "", "created_time": 1744940123, "updated_time": 0, "status": "N", "status_name": "提现中", "service_amount": 0, "service_rate": 0 }, "channel_name": "微信", "logo": "https:\/\/jfb-public-images.oss-cn-qingdao.aliyuncs.com\/system-paychannel-logo-wxpay.png?x-oss-process=style\/200_200", "request_id": "473e8bf6986efc25" },
|
|
6
|
+
|
|
7
|
+
getWithdrawThirdPlaceOrderList: { "order_id": "i771668569418104913", "channel_data": "ABBQO+oYAAABAAAAAAAvz7kzb9HMNRWNvawBaBAAAADnGpepZahT9IkJjn90+1qgAYQYW\/LmJL0WH47tlOYOunGem4Trqj+ox5EfmQFESJ76f9lMWaLN2pvCJ5stBUZFIFIjhvk8fybnzYnmaUkvbpln+bc=", "app_id": "wxad70f65127f9471c", "mch_id": "1614921673", "request_id": "48ef7a43d95aa020" },
|
|
8
|
+
|
|
9
|
+
cancelWithdraw: { "request_id": "48ef7a43d95aa020" }
|
|
13
10
|
}
|
|
@@ -57,7 +57,8 @@
|
|
|
57
57
|
bodyBorder: {},
|
|
58
58
|
againWithDrawPath: '',
|
|
59
59
|
page_token: 1,
|
|
60
|
-
orderList: []
|
|
60
|
+
orderList: [],
|
|
61
|
+
hasNext: true
|
|
61
62
|
}
|
|
62
63
|
},
|
|
63
64
|
computed: {
|
|
@@ -111,12 +112,13 @@
|
|
|
111
112
|
).fullTime;
|
|
112
113
|
return item;
|
|
113
114
|
})
|
|
114
|
-
this.hasNext = res.next_page_token !== "";
|
|
115
115
|
if (this.page_token === 1) {
|
|
116
116
|
this.orderList = list
|
|
117
117
|
} else {
|
|
118
118
|
this.orderList = this.orderList.concat(list);
|
|
119
119
|
}
|
|
120
|
+
this.next_page_token = res.next_page_token
|
|
121
|
+
this.hasNext = res.next_page_token !== "";
|
|
120
122
|
})
|
|
121
123
|
},
|
|
122
124
|
handleToDetail(item) {
|
|
@@ -126,7 +128,10 @@
|
|
|
126
128
|
console.log('event.onJfbScroll', options)
|
|
127
129
|
},
|
|
128
130
|
onJfbReachBottom(options) {
|
|
129
|
-
|
|
131
|
+
if (this.hasNext) {
|
|
132
|
+
this.page_token = this.next_page_token;
|
|
133
|
+
this.getOrderRecord()
|
|
134
|
+
}
|
|
130
135
|
},
|
|
131
136
|
onJfbShow(options) {
|
|
132
137
|
this.getOrderRecord()
|
|
@@ -1,13 +1,7 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
3
|
module.exports = {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
updateWithFilmPaiqiDate:{},
|
|
8
|
-
|
|
9
|
-
removeWithFilmAddress:{},
|
|
10
|
-
|
|
11
|
-
addWithFilmcart:{},
|
|
12
|
-
|
|
4
|
+
|
|
5
|
+
getRecordWithdrawOrderList: { "next_page_token": "2", "total_size": 0, "list": [{ "order_id": "i771668569418104913", "channel_order_id": "1330001353947642504180083243436870", "channel_code": "wxpay", "channel_code_name": "微信", "total_amount": 200, "user_id": 5000358, "status": "F", "status_name": "失败", "arrival_time": 0, "comment": "", "created_time": 1744940123 }, { "order_id": "i771066286233878607", "channel_order_id": "1330001353947642504160061966293601", "channel_code": "wxpay", "channel_code_name": "微信", "total_amount": 10, "user_id": 5000358, "status": "Y", "status_name": "成功", "arrival_time": 1744796566, "comment": "", "created_time": 1744796528 }, { "order_id": "i771065517556367438", "channel_order_id": "1330001353947642504160093737710292", "channel_code": "wxpay", "channel_code_name": "微信", "total_amount": 10, "user_id": 5000358, "status": "Y", "status_name": "成功", "arrival_time": 1744796406, "comment": "", "created_time": 1744796345 }, { "order_id": "i771062549364867149", "channel_order_id": "1330001353947642504160084846150384", "channel_code": "wxpay", "channel_code_name": "微信", "total_amount": 10, "user_id": 5000358, "status": "Y", "status_name": "成功", "arrival_time": 1744795686, "comment": "", "created_time": 1744795637 }, { "order_id": "i771061580484837452", "channel_order_id": "1330001353947642504160039106651145", "channel_code": "wxpay", "channel_code_name": "微信", "total_amount": 10, "user_id": 5000358, "status": "Y", "status_name": "成功", "arrival_time": 1744795456, "comment": "", "created_time": 1744795406 }, { "order_id": "i771059916772212811", "channel_order_id": "1330001353947642504160031021516401", "channel_code": "wxpay", "channel_code_name": "微信", "total_amount": 10, "user_id": 5000358, "status": "Y", "status_name": "成功", "arrival_time": 1744795088, "comment": "", "created_time": 1744795009 }, { "order_id": "i771054224359293002", "channel_order_id": "1330001353947642504160089300449824", "channel_code": "wxpay", "channel_code_name": "微信", "total_amount": 10, "user_id": 5000358, "status": "Y", "status_name": "成功", "arrival_time": 1744794894, "comment": "", "created_time": 1744793652 }, { "order_id": "i771037005030096968", "channel_order_id": "1330001353947642504160086581901379", "channel_code": "wxpay", "channel_code_name": "微信", "total_amount": 10, "user_id": 5000358, "status": "F", "status_name": "失败", "arrival_time": 0, "comment": "", "created_time": 1744789547 }, { "order_id": "i771034877834297415", "channel_order_id": "", "channel_code": "wxpay", "channel_code_name": "微信", "total_amount": 1000, "user_id": 5000358, "status": "F", "status_name": "失败", "arrival_time": 0, "comment": "", "created_time": 1744789040 }, { "order_id": "i771034873199591494", "channel_order_id": "", "channel_code": "wxpay", "channel_code_name": "微信", "total_amount": 1000, "user_id": 5000358, "status": "F", "status_name": "失败", "arrival_time": 0, "comment": "", "created_time": 1744789038 }], "request_id": "e6f3ea562f8fd9e9" },
|
|
6
|
+
|
|
13
7
|
}
|
|
@@ -2,12 +2,6 @@
|
|
|
2
2
|
|
|
3
3
|
module.exports = {
|
|
4
4
|
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
updateWithdrawFilmPaiqiDate:{},
|
|
8
|
-
|
|
9
|
-
removeWithdrawFilmAddress:{},
|
|
10
|
-
|
|
11
|
-
addWithdrawFilmcart:{},
|
|
12
|
-
|
|
5
|
+
getWithDrawDetail:{"wallet_list":[{"sort":2,"wallet_type":"UC","show_name":"可用余额","amount":19940,"is_support_withdraw":"Y"},{"sort":0,"wallet_type":"UT","show_name":"待到账余额","amount":0,"is_support_withdraw":"N"}],"request_id":"9de3e66af2da41d4"},
|
|
6
|
+
createWithdraw: {"order_id":"i771668569418104913","request_id":"bf9328f714d693aa"}
|
|
13
7
|
}
|