jufubao-base 1.0.438-beta4 → 1.0.438
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.
|
@@ -0,0 +1,22 @@
|
|
|
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/home/root/Base-Jufubao/xd-commands-bussiness/${threePackagePath}`;
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
if (packname === 'gxd-uni-library-editx') {
|
|
15
|
+
return `/Users/shiyonggao/home/root/Base-Jufubao/xd-uni-library-editx/${threePackagePath}`;
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
};
|
|
19
|
+
|
|
20
|
+
module.exports = {
|
|
21
|
+
getPackagePath
|
|
22
|
+
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "jufubao-base",
|
|
3
|
-
"version": "1.0.438
|
|
3
|
+
"version": "1.0.438",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "聚福宝业务组件基础插件包",
|
|
6
6
|
"main": "index.js",
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
"dingtalk-jsapi": "^3.0.31",
|
|
52
52
|
"flyio": "^0.6.2",
|
|
53
53
|
"gxd-commands-bussiness": "^1.0.12",
|
|
54
|
-
"gxd-uni-library-editx": "1.0.
|
|
54
|
+
"gxd-uni-library-editx": "1.0.203",
|
|
55
55
|
"jweixin-module": "^1.6.0",
|
|
56
56
|
"md5": "^2.3.0",
|
|
57
57
|
"path-to-regexp": "^6.2.1",
|
|
@@ -178,6 +178,7 @@
|
|
|
178
178
|
* @description 获取包裹列表
|
|
179
179
|
*/
|
|
180
180
|
getExpressList() {
|
|
181
|
+
this.$xdShowLoading({});
|
|
181
182
|
jfbRootExec("getExpressList", {
|
|
182
183
|
vm: this,
|
|
183
184
|
data: this.$xdUniHelper.deleteParamEmptyKey({
|
|
@@ -189,6 +190,7 @@
|
|
|
189
190
|
}),
|
|
190
191
|
})
|
|
191
192
|
.then((res) => {
|
|
193
|
+
this.$xdHideLoading();
|
|
192
194
|
const list = (res.list || []).map((item) => {
|
|
193
195
|
item.product_list = (item.product_list || []).map((Sitem) => {
|
|
194
196
|
Sitem.product_thumb = Sitem.product_thumb ? getServiceUrl(Sitem.product_thumb, "size3") : "";
|
|
@@ -202,6 +204,7 @@
|
|
|
202
204
|
this.hasNext = !!res.next_page_token;
|
|
203
205
|
})
|
|
204
206
|
.catch((err) => {
|
|
207
|
+
this.$xdHideLoading();
|
|
205
208
|
this.$xdLog.catch(err);
|
|
206
209
|
if (this.page_token === '1') this.express = [];
|
|
207
210
|
});
|
|
@@ -211,8 +214,13 @@
|
|
|
211
214
|
* @param status {string} 状态值
|
|
212
215
|
*/
|
|
213
216
|
handleStatusChange(status) {
|
|
217
|
+
//点击已选中的tab不再请求接口
|
|
218
|
+
if (status === this.activeStatus) return;
|
|
214
219
|
this.activeStatus = status;
|
|
215
220
|
this.page_token = '1';
|
|
221
|
+
this.next_page_token = '';
|
|
222
|
+
this.hasNext = false;
|
|
223
|
+
this.express = [];
|
|
216
224
|
this.getExpressList();
|
|
217
225
|
},
|
|
218
226
|
/**
|
|
@@ -322,7 +322,7 @@
|
|
|
322
322
|
</view>
|
|
323
323
|
</view>
|
|
324
324
|
<view class="t_card_right">
|
|
325
|
-
<image class="c_r_img" :src="info.codes[0].code_url"
|
|
325
|
+
<image class="c_r_img" :src="info.codes[0].code_url"></image>
|
|
326
326
|
</view>
|
|
327
327
|
</view>
|
|
328
328
|
<view class="t_card_bottom">
|
|
@@ -332,7 +332,7 @@
|
|
|
332
332
|
</view>
|
|
333
333
|
</view>
|
|
334
334
|
</view>
|
|
335
|
-
</view>
|
|
335
|
+
</view>
|
|
336
336
|
<view v-else-if="qrcodeLayout === '3' && order_from === 'offline'" style="padding: 30rpx;">
|
|
337
337
|
<view class="box_background">
|
|
338
338
|
<image class="box-bg-img" src="https://jfbv2-img-jufubao-cn.oss-cn-beijing.aliyuncs.com/common/new-coupon-bg-3.jpeg" mode="scaleToFill"></image>
|
|
@@ -367,7 +367,7 @@
|
|
|
367
367
|
<view class="card-right">
|
|
368
368
|
<view class="card-right-inner">
|
|
369
369
|
<view class="qrcode-wrap">
|
|
370
|
-
<image class="qrcode-img" :src="info.codes[0].code_url"
|
|
370
|
+
<image class="qrcode-img" :src="info.codes[0].code_url"></image>
|
|
371
371
|
</view>
|
|
372
372
|
<text class="qrcode-tip">请到店出示此券核验</text>
|
|
373
373
|
</view>
|
|
@@ -445,7 +445,7 @@
|
|
|
445
445
|
>{{ btn.name }}</view>
|
|
446
446
|
</view>
|
|
447
447
|
</view>
|
|
448
|
-
|
|
448
|
+
|
|
449
449
|
</view>
|
|
450
450
|
<!--单条条形码或者二维码-->
|
|
451
451
|
<!--其他情况显示-->
|
|
@@ -1000,7 +1000,7 @@
|
|
|
1000
1000
|
<text class="cs-btn__text">客服</text>
|
|
1001
1001
|
</view>
|
|
1002
1002
|
</view>
|
|
1003
|
-
|
|
1003
|
+
|
|
1004
1004
|
<view :style="[bottomBoxStyle]" class="btn_wrap">
|
|
1005
1005
|
<view v-for="(item, index) in info.buttons" :key="index">
|
|
1006
1006
|
<view
|
|
@@ -1472,7 +1472,7 @@ export default {
|
|
|
1472
1472
|
},
|
|
1473
1473
|
})
|
|
1474
1474
|
.then((res) => {
|
|
1475
|
-
|
|
1475
|
+
|
|
1476
1476
|
//跳转到第三方订单
|
|
1477
1477
|
if(res['third_order_detail_url']) {
|
|
1478
1478
|
this.$xdUniHelper.redirectTo({url: res['third_order_detail_url']}, false, true);
|
|
@@ -3051,7 +3051,7 @@ export default {
|
|
|
3051
3051
|
z-index: 1;
|
|
3052
3052
|
display: flex;
|
|
3053
3053
|
box-sizing: border-box;
|
|
3054
|
-
|
|
3054
|
+
|
|
3055
3055
|
.card-left {
|
|
3056
3056
|
flex: 1;
|
|
3057
3057
|
display: flex;
|
|
@@ -58,7 +58,7 @@
|
|
|
58
58
|
</view>
|
|
59
59
|
</view>
|
|
60
60
|
<view class="t_card_right">
|
|
61
|
-
<image class="c_r_img" :src="info.codes[0].code_url"
|
|
61
|
+
<image class="c_r_img" :src="info.codes[0].code_url"></image>
|
|
62
62
|
</view>
|
|
63
63
|
</view>
|
|
64
64
|
<view class="t_card_bottom">
|
|
@@ -102,7 +102,7 @@
|
|
|
102
102
|
<view class="card-right">
|
|
103
103
|
<view class="card-right-inner">
|
|
104
104
|
<view class="qrcode-wrap">
|
|
105
|
-
<image class="qrcode-img" :src="info.codes[0].code_url"
|
|
105
|
+
<image class="qrcode-img" :src="info.codes[0].code_url"></image>
|
|
106
106
|
</view>
|
|
107
107
|
<text class="qrcode-tip">请到店出示此券核验</text>
|
|
108
108
|
</view>
|