jufubao-base 1.0.28 → 1.0.29
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/JfbBaseAddress/Api.js +1 -1
- package/src/components/JfbBaseAddress/JfbBaseAddress.vue +29 -4
- package/src/components/JfbBaseAddress/Mock.js +13 -38
- package/src/components/JfbBaseAfterOrderList/JfbBaseAfterOrderList.vue +1 -0
- package/src/components/JfbBaseRecharge/JfbBaseRecharge.vue +2 -2
- package/src/components/JfbBaseRechargeSuccess/JfbBaseRechargeSuccess.vue +1 -1
package/package.json
CHANGED
|
@@ -51,7 +51,27 @@
|
|
|
51
51
|
}"
|
|
52
52
|
>默认</view
|
|
53
53
|
>
|
|
54
|
-
<view
|
|
54
|
+
<view
|
|
55
|
+
:style="{
|
|
56
|
+
color: '#999999',
|
|
57
|
+
flex: 1,
|
|
58
|
+
paddingRight: item.is_valid === 'N' ? '40rpx' : '',
|
|
59
|
+
}"
|
|
60
|
+
>
|
|
61
|
+
<view>
|
|
62
|
+
{{ item | getCodeName }}
|
|
63
|
+
</view>
|
|
64
|
+
</view>
|
|
65
|
+
<view
|
|
66
|
+
style="position: absolute; right: 40rpx; width: 50rpx"
|
|
67
|
+
v-if="item.is_valid === 'N'"
|
|
68
|
+
>
|
|
69
|
+
<xd-font-icon
|
|
70
|
+
size="32"
|
|
71
|
+
:color="dangerColor"
|
|
72
|
+
icon="iconmingchengtubiao"
|
|
73
|
+
></xd-font-icon>
|
|
74
|
+
</view>
|
|
55
75
|
</view>
|
|
56
76
|
<view class="jfb-base-address__body-address-item-middle">
|
|
57
77
|
{{ item.address_detail }} {{ item.house_number }}
|
|
@@ -209,7 +229,7 @@ export default {
|
|
|
209
229
|
},
|
|
210
230
|
getList(callback) {
|
|
211
231
|
this.$xdShowLoading({});
|
|
212
|
-
jfbRootExec("
|
|
232
|
+
jfbRootExec("getBaseAddressList", {
|
|
213
233
|
vm: this,
|
|
214
234
|
data: {},
|
|
215
235
|
})
|
|
@@ -406,10 +426,14 @@ export default {
|
|
|
406
426
|
handleSelectAddress(item) {
|
|
407
427
|
console.log("handleSelectAddress", item);
|
|
408
428
|
if (item.is_valid === "N") {
|
|
409
|
-
this.$
|
|
429
|
+
this.$xdConfirm({
|
|
410
430
|
content: "因版本升级，为了确保您能正常收货，请您重新编辑收货地址!",
|
|
411
431
|
zIndex: 3200,
|
|
412
432
|
isClose: false,
|
|
433
|
+
cancel: false,
|
|
434
|
+
showClose: false,
|
|
435
|
+
confirmText: "我知道了",
|
|
436
|
+
$vm: this
|
|
413
437
|
});
|
|
414
438
|
return;
|
|
415
439
|
}
|
|
@@ -624,9 +648,10 @@ export default {
|
|
|
624
648
|
|
|
625
649
|
&-top {
|
|
626
650
|
display: flex;
|
|
627
|
-
align-items:
|
|
651
|
+
align-items: flex-start;
|
|
628
652
|
font-size: unit(28, rpx);
|
|
629
653
|
padding: unit(40, rpx) unit(40, rpx) unit(24, rpx) unit(40, rpx);
|
|
654
|
+
position: relative;
|
|
630
655
|
}
|
|
631
656
|
|
|
632
657
|
&-middle {
|
|
@@ -1,64 +1,39 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
3
|
module.exports = {
|
|
4
|
-
|
|
5
|
-
"list": [{
|
|
6
|
-
"address_nnid": "XqTFRxcmancCA9vCxCB52",
|
|
7
|
-
"user_id": 5000002,
|
|
8
|
-
"province_code": "110000",
|
|
9
|
-
"city_code": "110100",
|
|
10
|
-
"area_code": "110102",
|
|
11
|
-
"street_code": "110102019",
|
|
12
|
-
"province_name": "北京市",
|
|
13
|
-
"city_name": "北京市",
|
|
14
|
-
"area_name": "西城区",
|
|
15
|
-
"street_name": "白纸坊街道",
|
|
16
|
-
"address_detail": "测试地址",
|
|
17
|
-
"name": "测试哈哈",
|
|
18
|
-
"phone": "13900000001",
|
|
19
|
-
"is_default": "Y",
|
|
20
|
-
"tag": 0,
|
|
21
|
-
"is_select": "N",
|
|
22
|
-
"latitude": "1",
|
|
23
|
-
"longitude": "1aa",
|
|
24
|
-
"partner_id": 161,
|
|
25
|
-
"site_id": "a3e8b499a07507a2",
|
|
26
|
-
"created_time": 1672211238,
|
|
27
|
-
"updated_time": 1672211238
|
|
28
|
-
}], "request_id": "75e04221b14aeec6"
|
|
29
|
-
},
|
|
4
|
+
getBaseAddressList: { "list": [{ "address_nnid": "loub_n81zJYH6UUGZq2cc", "user_id": 5000052, "province_code": "5", "city_code": "274", "area_code": "49707", "street_code": "49973", "province_name": "河北", "city_name": "廊坊市", "area_name": "三河市", "street_name": "燕郊镇", "address_detail": "润旭商场", "name": "刘小妮", "phone": "15555555555", "is_default": "Y", "tag": 0, "is_select": "N", "latitude": "39.962333", "longitude": "116.843951", "partner_id": 185, "site_id": "b7beb73251752cf1", "created_time": 1687247020, "updated_time": 1689909498, "house_number": "2102", "is_valid": "N" }, { "address_nnid": "wHtxVCE-IjPPjagziutLi", "user_id": 5000052, "province_code": "1", "city_code": "jfb1", "area_code": "72", "street_code": "55666", "province_name": "北京", "city_name": "北京", "area_name": "朝阳区", "street_name": "呼家楼街道", "address_detail": "朝阳区朝外SOHO", "name": "莉莉", "phone": "18888888888", "is_default": "N", "tag": 0, "is_select": "N", "latitude": "39.925588", "longitude": "116.460776", "partner_id": 185, "site_id": "b7beb73251752cf1", "created_time": 1688955159, "updated_time": 1689909534, "house_number": "13层", "is_valid": "Y" }, { "address_nnid": "WR5lhpuBAlbE6OlQJZJvp", "user_id": 5000052, "province_code": "1", "city_code": "jfb1", "area_code": "2809", "street_code": "51225", "province_name": "北京", "city_name": "北京", "area_name": "通州区", "street_name": "潞城镇", "address_detail": "通州区", "name": "嗯嗯", "phone": "18888888888", "is_default": "N", "tag": 0, "is_select": "Y", "latitude": "39.916019", "longitude": "116.663413", "partner_id": 185, "site_id": "b7beb73251752cf1", "created_time": 1689909530, "updated_time": 1689909534, "house_number": "1111", "is_valid": "Y" }, { "address_nnid": "kR_MNZ8tVLX3Ua0zEltnV", "user_id": 5000052, "province_code": "1", "city_code": "jfb1", "area_code": "3065", "street_code": "51511", "province_name": "北京", "city_name": "北京", "area_name": "延庆区", "street_name": "张山营镇", "address_detail": "北京市", "name": "刘小妮", "phone": "18888888888", "is_default": "N", "tag": 0, "is_select": "N", "latitude": "39.910924", "longitude": "116.413387", "partner_id": 185, "site_id": "b7beb73251752cf1", "created_time": 1687771062, "updated_time": 1689909499, "house_number": "2101", "is_valid": "Y" }], "request_id": "fc496ab155bdb36f" },
|
|
30
5
|
getCityList: {
|
|
31
|
-
"list": [{"label": "陕西省", "value": "610000"}, {"label": "浙江省", "value": "330000"}, {
|
|
6
|
+
"list": [{ "label": "陕西省", "value": "610000" }, { "label": "浙江省", "value": "330000" }, {
|
|
32
7
|
"label": "海南省",
|
|
33
8
|
"value": "460000"
|
|
34
|
-
}, {"label": "广东省", "value": "440000"}, {"label": "广西壮族自治区", "value": "450000"}, {
|
|
9
|
+
}, { "label": "广东省", "value": "440000" }, { "label": "广西壮族自治区", "value": "450000" }, {
|
|
35
10
|
"label": "北京市",
|
|
36
11
|
"value": "110000"
|
|
37
|
-
}, {"label": "宁夏回族自治区", "value": "640000"}, {"label": "安徽省", "value": "340000"}, {
|
|
12
|
+
}, { "label": "宁夏回族自治区", "value": "640000" }, { "label": "安徽省", "value": "340000" }, {
|
|
38
13
|
"label": "重庆市",
|
|
39
14
|
"value": "500000"
|
|
40
|
-
}, {"label": "西藏自治区", "value": "540000"}, {"label": "江苏省", "value": "320000"}, {
|
|
15
|
+
}, { "label": "西藏自治区", "value": "540000" }, { "label": "江苏省", "value": "320000" }, {
|
|
41
16
|
"label": "湖南省",
|
|
42
17
|
"value": "430000"
|
|
43
|
-
}, {"label": "贵州省", "value": "520000"}, {"label": "河南省", "value": "410000"}, {
|
|
18
|
+
}, { "label": "贵州省", "value": "520000" }, { "label": "河南省", "value": "410000" }, {
|
|
44
19
|
"label": "云南省",
|
|
45
20
|
"value": "530000"
|
|
46
|
-
}, {"label": "四川省", "value": "510000"}, {"label": "河北省", "value": "130000"}, {
|
|
21
|
+
}, { "label": "四川省", "value": "510000" }, { "label": "河北省", "value": "130000" }, {
|
|
47
22
|
"label": "青海省",
|
|
48
23
|
"value": "630000"
|
|
49
|
-
}, {"label": "福建省", "value": "350000"}, {"label": "江西省", "value": "360000"}, {
|
|
24
|
+
}, { "label": "福建省", "value": "350000" }, { "label": "江西省", "value": "360000" }, {
|
|
50
25
|
"label": "湖北省",
|
|
51
26
|
"value": "420000"
|
|
52
|
-
}, {"label": "甘肃省", "value": "620000"}, {"label": "吉林省", "value": "220000"}, {
|
|
27
|
+
}, { "label": "甘肃省", "value": "620000" }, { "label": "吉林省", "value": "220000" }, {
|
|
53
28
|
"label": "新疆维吾尔自治区",
|
|
54
29
|
"value": "650000"
|
|
55
|
-
}, {"label": "天津市", "value": "120000"}, {"label": "上海市", "value": "310000"}, {
|
|
30
|
+
}, { "label": "天津市", "value": "120000" }, { "label": "上海市", "value": "310000" }, {
|
|
56
31
|
"label": "山西省",
|
|
57
32
|
"value": "140000"
|
|
58
|
-
}, {"label": "山东省", "value": "370000"}, {"label": "内蒙古自治区", "value": "150000"}, {
|
|
33
|
+
}, { "label": "山东省", "value": "370000" }, { "label": "内蒙古自治区", "value": "150000" }, {
|
|
59
34
|
"label": "辽宁省",
|
|
60
35
|
"value": "210000"
|
|
61
|
-
}, {"label": "黑龙江省", "value": "230000"}], "request_id": "f7cb4be8c4842163"
|
|
36
|
+
}, { "label": "黑龙江省", "value": "230000" }], "request_id": "f7cb4be8c4842163"
|
|
62
37
|
},
|
|
63
38
|
updateAddress: {
|
|
64
39
|
"address_nnid": "mKMCseXZ4i7gJTsAUeCks",
|
|
@@ -147,5 +122,5 @@ module.exports = {
|
|
|
147
122
|
"updated_time": 1675148198,
|
|
148
123
|
"request_id": "480ae5ebe830f31c"
|
|
149
124
|
},
|
|
150
|
-
deleteAddress: {"request_id": "dbbdc7388bf3160f"}
|
|
125
|
+
deleteAddress: { "request_id": "dbbdc7388bf3160f" }
|
|
151
126
|
}
|
|
@@ -42,7 +42,7 @@
|
|
|
42
42
|
>
|
|
43
43
|
</view>
|
|
44
44
|
</view>
|
|
45
|
-
<view style="font-size: 30rpx; padding:
|
|
45
|
+
<view style="font-size: 30rpx; padding: 0rpx 40rpx 40rpx 40rpx">
|
|
46
46
|
<view style="color: #666666">注意事项:</view>
|
|
47
47
|
<view v-html="content"></view>
|
|
48
48
|
</view>
|
|
@@ -202,7 +202,7 @@ export default {
|
|
|
202
202
|
box-shadow: 0px unit(16, rpx) unit(60, rpx) 0px rgba(227, 227, 227, 0.37);
|
|
203
203
|
background: #ffffff;
|
|
204
204
|
padding: unit(48, rpx);
|
|
205
|
-
margin: unit(
|
|
205
|
+
margin: unit(40, rpx);
|
|
206
206
|
border-radius: unit(20, rpx);
|
|
207
207
|
}
|
|
208
208
|
&-form {
|