jufubao-base 1.0.39 → 1.0.40-beta10
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/JfbBaseAfterOrderDetail/JfbBaseAfterOrderDetail.vue +7 -3
- package/src/components/JfbBaseEntry/JfbBaseEntry.vue +14 -26
- package/src/components/JfbBaseEntry/Mock.js +73 -35
- package/src/components/JfbBaseExpressDetail/JfbBaseExpressDetail.vue +2 -1
- package/src/components/JfbBaseExpressDetail/XdExpressTimeLine/XdExpressTimeLine.vue +4 -0
- package/src/components/JfbBaseNotice/JfbBaseNotice.vue +3 -3
- package/src/components/JfbBasePay/Api.js +11 -0
- package/src/components/JfbBasePay/JfbBasePay.vue +24 -1
- package/src/components/JfbBasePoster/JfbBasePoster.vue +2 -2
- package/src/components/JfbBasePoster/MoreScreen.vue +1 -1
- package/src/components/JfbBasePosterEntry/JfbBasePosterEntry.vue +2 -2
- package/src/components/JfbBasePosterType/FourScreen.vue +1 -1
- package/src/components/JfbBasePosterType/JfbBasePosterType.vue +1 -1
package/package.json
CHANGED
|
@@ -75,11 +75,15 @@
|
|
|
75
75
|
v-if="info.after_sale_method === 'exchange'"
|
|
76
76
|
:style="{ color: mainColor }"
|
|
77
77
|
>换成：{{ info.exchangeMsg }}</view>
|
|
78
|
-
<view
|
|
78
|
+
<!-- <view
|
|
79
79
|
v-else-if="info.after_sale_method === 'again'"
|
|
80
80
|
:style="{ color: mainColor }"
|
|
81
|
-
>补发快递：{{ info['express_name'] }}
|
|
82
|
-
<view v-else :style="{ color: mainColor }"
|
|
81
|
+
>补发快递：{{ info['express_name'] }}</view> -->
|
|
82
|
+
<view v-else :style="{ color: mainColor }">
|
|
83
|
+
<view v-if="info.business_code !== 'gift'">
|
|
84
|
+
已退款：¥{{ info.total_refund_sale_amount }}
|
|
85
|
+
</view>
|
|
86
|
+
</view>
|
|
83
87
|
</view>
|
|
84
88
|
</view>
|
|
85
89
|
</view>
|
|
@@ -14,11 +14,10 @@
|
|
|
14
14
|
</view>
|
|
15
15
|
<!-- #endif -->
|
|
16
16
|
<view class="jfb-base-entry__body" :style="bodyStyle">
|
|
17
|
-
<view class="entry_list">
|
|
17
|
+
<view class="entry_list" :style="entryStyle">
|
|
18
18
|
<view v-for="(item,i) in entryList" :key="i"
|
|
19
19
|
class="entry_item"
|
|
20
20
|
:class="'row_num_'+rowNum"
|
|
21
|
-
:style="entryStyle"
|
|
22
21
|
@click="toLink(item)"
|
|
23
22
|
>
|
|
24
23
|
<image v-if="rowNum == 1" :src="item.image_url" mode="widthFix"/>
|
|
@@ -65,8 +64,9 @@
|
|
|
65
64
|
},
|
|
66
65
|
entryStyle(){
|
|
67
66
|
return {
|
|
68
|
-
|
|
69
|
-
|
|
67
|
+
gridTemplateColumns: `repeat(${this.rowNum}, 1fr)`,
|
|
68
|
+
gap: this.paddingInput + 'rpx',
|
|
69
|
+
padding: this.paddingInput + 'rpx'
|
|
70
70
|
}
|
|
71
71
|
}
|
|
72
72
|
},
|
|
@@ -119,6 +119,14 @@
|
|
|
119
119
|
return item;
|
|
120
120
|
});
|
|
121
121
|
if(res.list.length === 1) this.toLink(this.entryList[0]);
|
|
122
|
+
if(res.list.length === 0) {
|
|
123
|
+
uni.showToast({
|
|
124
|
+
title: '当前票券暂无支持服务',
|
|
125
|
+
icon: 'none',
|
|
126
|
+
duration: 2000
|
|
127
|
+
});
|
|
128
|
+
}
|
|
129
|
+
|
|
122
130
|
})
|
|
123
131
|
},
|
|
124
132
|
toLink(item){
|
|
@@ -149,33 +157,13 @@
|
|
|
149
157
|
.jfb-base-entry {
|
|
150
158
|
&__body{
|
|
151
159
|
.entry_list{
|
|
152
|
-
|
|
153
|
-
display: flex;
|
|
154
|
-
flex-wrap: wrap;
|
|
160
|
+
display: grid;
|
|
155
161
|
.entry_item{
|
|
156
162
|
width: 100%;
|
|
157
163
|
box-sizing: border-box;
|
|
158
|
-
display: flex;
|
|
159
|
-
align-items: center;
|
|
160
|
-
justify-content: center;
|
|
161
164
|
image{
|
|
162
165
|
width: 100%;
|
|
163
|
-
|
|
164
|
-
&.row_num_1{
|
|
165
|
-
width: 100%;
|
|
166
|
-
padding-right: 0 !important;
|
|
167
|
-
}
|
|
168
|
-
&.row_num_2{
|
|
169
|
-
width: 50%;
|
|
170
|
-
&:nth-of-type(2n){
|
|
171
|
-
padding-right: 0 !important;
|
|
172
|
-
}
|
|
173
|
-
}
|
|
174
|
-
&.row_num_3{
|
|
175
|
-
width: 33.3333%;
|
|
176
|
-
&:nth-child(3n){
|
|
177
|
-
padding-right: 0 !important;
|
|
178
|
-
}
|
|
166
|
+
display: block;
|
|
179
167
|
}
|
|
180
168
|
}
|
|
181
169
|
}
|
|
@@ -9,26 +9,29 @@ module.exports = {
|
|
|
9
9
|
site_id: "17928cc37788be02",
|
|
10
10
|
entry_name: "JlS(Apply)在线选座",
|
|
11
11
|
business_code: "movie",
|
|
12
|
-
image_url:
|
|
13
|
-
|
|
14
|
-
|
|
12
|
+
image_url:
|
|
13
|
+
"//sandbox-img.jufubao.cn/uploads/20230508/381f2ef3398fd0b2e1c8e78317e974fd.png",
|
|
14
|
+
image_url2:
|
|
15
|
+
"//sandbox-img.jufubao.cn/uploads/20230808/d60303731c85d586c2a3f745f3291621.png",
|
|
16
|
+
image_url3:
|
|
17
|
+
"//sandbox-img.jufubao.cn/uploads/20230808/51452965ebdd27bc94b3a3aed20dc563.png",
|
|
15
18
|
redirect_data: {
|
|
16
19
|
all: {
|
|
17
20
|
app: { path: "/main/movie/index", value: "/main/movie/index" },
|
|
18
|
-
site: { label: "测试专用", value: "17928cc37788be02" }
|
|
21
|
+
site: { label: "测试专用", value: "17928cc37788be02" },
|
|
19
22
|
},
|
|
20
23
|
app: {
|
|
21
24
|
path: "/main/movie/index",
|
|
22
|
-
site_url: "https://undefined/undefined/main/movie/index"
|
|
25
|
+
site_url: "https://undefined/undefined/main/movie/index",
|
|
23
26
|
},
|
|
24
|
-
site: []
|
|
27
|
+
site: [],
|
|
25
28
|
},
|
|
26
29
|
sort: 1,
|
|
27
30
|
status: "Y",
|
|
28
31
|
no_card_is_show: "Y",
|
|
29
32
|
op_user_id: "lichao",
|
|
30
33
|
created_time: 1683525079,
|
|
31
|
-
updated_time: 1683529294
|
|
34
|
+
updated_time: 1683529294,
|
|
32
35
|
},
|
|
33
36
|
{
|
|
34
37
|
id: 8,
|
|
@@ -36,9 +39,12 @@ module.exports = {
|
|
|
36
39
|
site_id: "17928cc37788be02",
|
|
37
40
|
entry_name: "JSL(apply)商城",
|
|
38
41
|
business_code: "book",
|
|
39
|
-
image_url:
|
|
40
|
-
|
|
41
|
-
|
|
42
|
+
image_url:
|
|
43
|
+
"//sandbox-img.jufubao.cn/uploads/20230508/f6b3106bea6ed0b05e2cee5e17d4ba97.png",
|
|
44
|
+
image_url2:
|
|
45
|
+
"//sandbox-img.jufubao.cn/uploads/20230808/9f15196d68d91f04ab9f52f6be4b8ac0.png",
|
|
46
|
+
image_url3:
|
|
47
|
+
"//sandbox-img.jufubao.cn/uploads/20230808/7ccb809ead78599cd892a595e97333f7.png",
|
|
42
48
|
redirect_data: {
|
|
43
49
|
all: {
|
|
44
50
|
app: {
|
|
@@ -50,60 +56,66 @@ module.exports = {
|
|
|
50
56
|
appValue: "49",
|
|
51
57
|
parentId: "fdvZdhBHA6R2TmG1YM0cF",
|
|
52
58
|
parentName: "商城",
|
|
53
|
-
aopen_app_code: ""
|
|
59
|
+
aopen_app_code: "",
|
|
54
60
|
},
|
|
55
|
-
site: { label: "测试专用", value: "17928cc37788be02" }
|
|
61
|
+
site: { label: "测试专用", value: "17928cc37788be02" },
|
|
56
62
|
},
|
|
57
63
|
app: {
|
|
58
64
|
dir: "apply",
|
|
59
65
|
path: "/main/mall/index",
|
|
60
|
-
site_url: "https://undefined/apply/main/mall/index"
|
|
66
|
+
site_url: "https://undefined/apply/main/mall/index",
|
|
61
67
|
},
|
|
62
|
-
site: []
|
|
68
|
+
site: [],
|
|
63
69
|
},
|
|
64
70
|
sort: 2,
|
|
65
71
|
status: "Y",
|
|
66
72
|
no_card_is_show: "Y",
|
|
67
73
|
op_user_id: "lichao",
|
|
68
74
|
created_time: 1683529527,
|
|
69
|
-
updated_time: 1683529527
|
|
75
|
+
updated_time: 1683529527,
|
|
70
76
|
},
|
|
71
77
|
{
|
|
72
78
|
id: 9,
|
|
73
79
|
partner_id: 161,
|
|
74
80
|
site_id: "17928cc37788be02",
|
|
75
|
-
entry_name: "
|
|
81
|
+
entry_name: "JLS(apply)图书",
|
|
76
82
|
business_code: "movie",
|
|
77
|
-
image_url:
|
|
78
|
-
|
|
79
|
-
|
|
83
|
+
image_url:
|
|
84
|
+
"//sandbox-img.jufubao.cn/uploads/20230808/39b81aac7ec32774dc48729801d3d9eb.png",
|
|
85
|
+
image_url2:
|
|
86
|
+
"//sandbox-img.jufubao.cn/uploads/20230808/025613c8b36cfa36e7e5cbe142bce3c3.png",
|
|
87
|
+
image_url3:
|
|
88
|
+
"//sandbox-img.jufubao.cn/uploads/20230808/bcf08ce03b35c3b73a47dd35b0a21bff.png",
|
|
80
89
|
redirect_data: {
|
|
81
90
|
all: {
|
|
82
91
|
app: { path: "/main/movie/index", value: "/main/movie/index" },
|
|
83
|
-
site: { label: "测试专用", value: "17928cc37788be02" }
|
|
92
|
+
site: { label: "测试专用", value: "17928cc37788be02" },
|
|
84
93
|
},
|
|
85
94
|
app: {
|
|
86
95
|
path: "/main/cake/index",
|
|
87
|
-
site_url: "https://undefined/undefined/main/movie/index"
|
|
96
|
+
site_url: "https://undefined/undefined/main/movie/index",
|
|
88
97
|
},
|
|
89
|
-
site: []
|
|
98
|
+
site: [],
|
|
90
99
|
},
|
|
91
100
|
sort: 1,
|
|
92
101
|
status: "Y",
|
|
93
102
|
no_card_is_show: "Y",
|
|
94
103
|
op_user_id: "lichao",
|
|
95
104
|
created_time: 1683525079,
|
|
96
|
-
updated_time: 1683529294
|
|
105
|
+
updated_time: 1683529294,
|
|
97
106
|
},
|
|
98
107
|
{
|
|
99
108
|
id: 10,
|
|
100
109
|
partner_id: 161,
|
|
101
110
|
site_id: "17928cc37788be02",
|
|
102
|
-
entry_name: "
|
|
111
|
+
entry_name: "JLS(apply)蛋糕",
|
|
103
112
|
business_code: "book",
|
|
104
|
-
image_url:
|
|
105
|
-
|
|
106
|
-
|
|
113
|
+
image_url:
|
|
114
|
+
"//sandbox-img.jufubao.cn/uploads/20230509/8e4c196a2bb3a17f9748f9750fe73e09.png",
|
|
115
|
+
image_url2:
|
|
116
|
+
"//sandbox-img.jufubao.cn/uploads/20230808/d640db0bf98e6d08c9be715176397c34.png",
|
|
117
|
+
image_url3:
|
|
118
|
+
"//sandbox-img.jufubao.cn/uploads/20230808/fc5c3849844b268a2d916f829d69ef49.png",
|
|
107
119
|
redirect_data: {
|
|
108
120
|
all: {
|
|
109
121
|
app: {
|
|
@@ -115,25 +127,51 @@ module.exports = {
|
|
|
115
127
|
appValue: "49",
|
|
116
128
|
parentId: "fdvZdhBHA6R2TmG1YM0cF",
|
|
117
129
|
parentName: "商城",
|
|
118
|
-
aopen_app_code: ""
|
|
130
|
+
aopen_app_code: "",
|
|
119
131
|
},
|
|
120
|
-
site: { label: "测试专用", value: "17928cc37788be02" }
|
|
132
|
+
site: { label: "测试专用", value: "17928cc37788be02" },
|
|
121
133
|
},
|
|
122
134
|
app: {
|
|
123
135
|
dir: "apply",
|
|
124
136
|
path: "/main/mall/index",
|
|
125
|
-
site_url: "https://undefined/apply/main/mall/index"
|
|
137
|
+
site_url: "https://undefined/apply/main/mall/index",
|
|
126
138
|
},
|
|
127
|
-
site: []
|
|
139
|
+
site: [],
|
|
128
140
|
},
|
|
129
141
|
sort: 2,
|
|
130
142
|
status: "Y",
|
|
131
143
|
no_card_is_show: "Y",
|
|
132
144
|
op_user_id: "lichao",
|
|
133
145
|
created_time: 1683529527,
|
|
134
|
-
updated_time: 1683529527
|
|
135
|
-
}
|
|
146
|
+
updated_time: 1683529527,
|
|
147
|
+
},
|
|
148
|
+
{
|
|
149
|
+
id: 17,
|
|
150
|
+
partner_id: 161,
|
|
151
|
+
site_id: "17928cc37788be02",
|
|
152
|
+
entry_name: "JLS(apply)网络视听",
|
|
153
|
+
business_code: "video",
|
|
154
|
+
image_url: "//sandbox-img.jufubao.cn/uploads/20230509/a904c75396b50411caad69e0e1271783.png",
|
|
155
|
+
image_url2: "//sandbox-img.jufubao.cn/uploads/20230808/2a56c7eadc2fb6109596ad456e33094c.png",
|
|
156
|
+
image_url3: "//sandbox-img.jufubao.cn/uploads/20230808/c423a80c6714864c6137dce348b7749c.png",
|
|
157
|
+
redirect_data: {
|
|
158
|
+
dir: "apply",
|
|
159
|
+
host: "sandbox-website-05.jufubao.cn",
|
|
160
|
+
path: "/main/video/index",
|
|
161
|
+
site_id: "17928cc37788be02",
|
|
162
|
+
site_url:
|
|
163
|
+
"https://sandbox-website-05.jufubao.cn/apply/main/video/index",
|
|
164
|
+
frontPath: "/apply/main/video/index",
|
|
165
|
+
fixed_business_code: "",
|
|
166
|
+
},
|
|
167
|
+
sort: 8,
|
|
168
|
+
status: "Y",
|
|
169
|
+
no_card_is_show: "Y",
|
|
170
|
+
op_user_id: "lichao",
|
|
171
|
+
created_time: 1683604295,
|
|
172
|
+
updated_time: 1691476562,
|
|
173
|
+
},
|
|
136
174
|
],
|
|
137
|
-
request_id: "4bdb77ebd2ef325e"
|
|
138
|
-
}
|
|
175
|
+
request_id: "4bdb77ebd2ef325e",
|
|
176
|
+
},
|
|
139
177
|
};
|
|
@@ -17,6 +17,10 @@
|
|
|
17
17
|
<view>国内承运人：</view>
|
|
18
18
|
<view>{{ information["name"] }}</view>
|
|
19
19
|
</view>
|
|
20
|
+
<view v-if="information['remarks']">
|
|
21
|
+
<view>物流备注：</view>
|
|
22
|
+
<view>{{ information["remarks"] }}</view>
|
|
23
|
+
</view>
|
|
20
24
|
<view>
|
|
21
25
|
<view>{{ noticeName }}</view>
|
|
22
26
|
<view>{{ information["notice"] }}</view>
|
|
@@ -149,7 +149,7 @@
|
|
|
149
149
|
this.timer = null
|
|
150
150
|
}
|
|
151
151
|
setTimeout(() => {
|
|
152
|
-
this.
|
|
152
|
+
if (this.$configProject['isPreview']) this.onJfbLoad()
|
|
153
153
|
}, 400)
|
|
154
154
|
|
|
155
155
|
},
|
|
@@ -159,12 +159,12 @@
|
|
|
159
159
|
this.timer = null
|
|
160
160
|
}
|
|
161
161
|
setTimeout(() => {
|
|
162
|
-
this.onJfbLoad()
|
|
162
|
+
if (this.$configProject['isPreview']) this.onJfbLoad()
|
|
163
163
|
}, 400)
|
|
164
164
|
|
|
165
165
|
},
|
|
166
166
|
style() {
|
|
167
|
-
this.onJfbLoad()
|
|
167
|
+
if(this.$configProject['isPreview']) this.onJfbLoad()
|
|
168
168
|
},
|
|
169
169
|
speed(){
|
|
170
170
|
if(this.timer) {
|
|
@@ -22,6 +22,17 @@ module.exports = [
|
|
|
22
22
|
isConsole: true,
|
|
23
23
|
disabled: true,
|
|
24
24
|
},
|
|
25
|
+
{
|
|
26
|
+
mapFnName: 'getBaseOrderDetail', //自定义方法名字（必选）
|
|
27
|
+
title: '获取订单详情',
|
|
28
|
+
path: '/order/v1/order/detail',
|
|
29
|
+
isRule: false,
|
|
30
|
+
params: {
|
|
31
|
+
main_order_id: ['id', 'Number', '必选'],
|
|
32
|
+
},
|
|
33
|
+
isConsole: true,
|
|
34
|
+
disabled: true,
|
|
35
|
+
},
|
|
25
36
|
{
|
|
26
37
|
mapFnName: "getListUserPayChannel",
|
|
27
38
|
title: "获取用户可用支付渠道",
|
|
@@ -152,7 +152,7 @@
|
|
|
152
152
|
</view>
|
|
153
153
|
</view>
|
|
154
154
|
<view class="bottom_btn-mask"></view>
|
|
155
|
-
<view class="bottom_btn" :style="prod_bottom">
|
|
155
|
+
<view v-if="is_can_pay=='Y'" class="bottom_btn" :style="prod_bottom">
|
|
156
156
|
<xd-button
|
|
157
157
|
width="360rpx"
|
|
158
158
|
type="primary"
|
|
@@ -202,6 +202,8 @@ export default {
|
|
|
202
202
|
needPayPrice: 1000,
|
|
203
203
|
type: "",
|
|
204
204
|
|
|
205
|
+
is_can_pay: "Y",
|
|
206
|
+
can_pay_message: "",
|
|
205
207
|
order_id: "",
|
|
206
208
|
main_order_id: "",
|
|
207
209
|
total_price: "",
|
|
@@ -245,6 +247,7 @@ export default {
|
|
|
245
247
|
this.type = options.type;
|
|
246
248
|
this.p_getPayOrderDetail();
|
|
247
249
|
this.p_getListUserPayChannel();
|
|
250
|
+
this.p_getBaseOrderDetail();
|
|
248
251
|
},
|
|
249
252
|
/**
|
|
250
253
|
* @description 监听事件变化
|
|
@@ -279,6 +282,26 @@ export default {
|
|
|
279
282
|
}
|
|
280
283
|
return time;
|
|
281
284
|
},
|
|
285
|
+
p_getBaseOrderDetail(){
|
|
286
|
+
jfbRootExec("getBaseOrderDetail", {
|
|
287
|
+
vm: this,
|
|
288
|
+
data: {
|
|
289
|
+
main_order_id: this.main_order_id,
|
|
290
|
+
}
|
|
291
|
+
}).then(res => {
|
|
292
|
+
let { is_can_pay, can_pay_message } = res.can_pay_info
|
|
293
|
+
this.is_can_pay = is_can_pay;
|
|
294
|
+
this.can_pay_message = can_pay_message;
|
|
295
|
+
if(is_can_pay !== "Y"){
|
|
296
|
+
uni.showToast({
|
|
297
|
+
title: can_pay_message,
|
|
298
|
+
icon: 'none',
|
|
299
|
+
duration: 3000
|
|
300
|
+
});
|
|
301
|
+
// this.$xdNavigateBack()
|
|
302
|
+
}
|
|
303
|
+
})
|
|
304
|
+
},
|
|
282
305
|
p_getPayOrderDetail() {
|
|
283
306
|
jfbRootExec("getPayOrderDetail", {
|
|
284
307
|
vm: this,
|
|
@@ -256,7 +256,7 @@
|
|
|
256
256
|
this.init(value);
|
|
257
257
|
if(this.timer) clearTimeout(this.timer);
|
|
258
258
|
this.timer = setTimeout(()=>{
|
|
259
|
-
this.onJfbLoad(
|
|
259
|
+
if (this.$configProject['isPreview']) this.onJfbLoad()
|
|
260
260
|
}, 400)
|
|
261
261
|
}
|
|
262
262
|
},
|
|
@@ -317,7 +317,7 @@
|
|
|
317
317
|
let url = JSON.parse(item.redirect_data);
|
|
318
318
|
if (reg.test(url.url)) {
|
|
319
319
|
console.warn(`广告跳转外站: ${url.url}`);
|
|
320
|
-
window.location.
|
|
320
|
+
window.location.href = url.url;
|
|
321
321
|
} else {
|
|
322
322
|
throw Error('地址错误')
|
|
323
323
|
}
|
|
@@ -125,7 +125,7 @@
|
|
|
125
125
|
},
|
|
126
126
|
watch: {
|
|
127
127
|
container(value) {
|
|
128
|
-
this.init(value)
|
|
128
|
+
if (this.$configProject['isPreview']) this.init(value)
|
|
129
129
|
}
|
|
130
130
|
},
|
|
131
131
|
created() {
|
|
@@ -170,7 +170,7 @@
|
|
|
170
170
|
let url = JSON.parse(item.redirect_data);
|
|
171
171
|
if (reg.test(url.url)) {
|
|
172
172
|
console.warn(`广告跳转外站: ${url.url}`);
|
|
173
|
-
window.location.
|
|
173
|
+
window.location.href = url.url;
|
|
174
174
|
}
|
|
175
175
|
else {
|
|
176
176
|
throw Error('地址错误')
|