jufubao-base 1.0.269-beta2 → 1.0.269-beta3
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/JfbBaseConsumpCode/Attr.js +23 -0
- package/src/components/JfbBaseConsumpCode/JfbBaseConsumpCode.vue +14 -7
- package/src/components/JfbBaseConsumpCode/Mock.js +2 -2
- package/src/components/JfbBaseConsumpCode/shopList.vue +22 -5
- package/src/components/JfbBasePersonalData/JfbBasePersonalData.vue +23 -12
- package/src/components/JfbBasePointsCard/JfbBasePointsCard.vue +2 -2
package/package.json
CHANGED
|
@@ -7,6 +7,29 @@ export default {
|
|
|
7
7
|
style: [],
|
|
8
8
|
content: (data) => {
|
|
9
9
|
return [
|
|
10
|
+
{
|
|
11
|
+
label: '背景图片:', //label
|
|
12
|
+
ele: 'xd-upload', //package 名称
|
|
13
|
+
valueKey: 'bodyBgImg', //form[valueKey]
|
|
14
|
+
value: data.bodyBgImg || null, //v-model
|
|
15
|
+
defaultValue: data.bodyBgImg || null, //默认图片对象
|
|
16
|
+
groupKey: "content",
|
|
17
|
+
slot: true, //按钮是否使用slot
|
|
18
|
+
oneWidth: 200, //单个图片显示宽度
|
|
19
|
+
oneHeight: 350, //单个图片显示高度
|
|
20
|
+
elinputClassName: 'input40',
|
|
21
|
+
tipsformet: '上传文件格式：@imageType@，不超过@size@MB.',
|
|
22
|
+
type: ['jpg', 'png', 'jpeg'],
|
|
23
|
+
styleType: 'one', //其值：one=>单文件上传 auth=>证件正反面上传 list=>多文件上传
|
|
24
|
+
uploadType: 'aliyun', //''=>API服务上传 qiniu=>七牛云OSS上传 aliyun=> 阿里云OSS上传
|
|
25
|
+
size: 5, //5M
|
|
26
|
+
action: 'aliyun',
|
|
27
|
+
sort: true, //当上传图片列表时候，是否启用排序
|
|
28
|
+
maxlen: 100, //当上传图片列表时候，最大数量数量
|
|
29
|
+
rules: [
|
|
30
|
+
{ required: true, message: '请上传图片', trigger: ['blur', 'change'] },
|
|
31
|
+
]
|
|
32
|
+
},
|
|
10
33
|
{
|
|
11
34
|
label: '开通路径:',
|
|
12
35
|
groupKey:'advanced',
|
|
@@ -5,11 +5,7 @@
|
|
|
5
5
|
<view class="jfb-base-consump-code__edit-icon" @click="delEdit">删除</view>
|
|
6
6
|
</view>
|
|
7
7
|
<!-- #endif -->
|
|
8
|
-
<view v-if="!showMask" class="jfb-base-consump-code__body" :style="
|
|
9
|
-
minHeight: layoutInfo.bodyMinHeightRpx + 'rpx',
|
|
10
|
-
background: 'url(https://img.js.design/assets/img/678f560988986af5661c2876.png#a3be067970d2c78a56d08024581a9ca0)',
|
|
11
|
-
backgroundSize: '100% 100%'
|
|
12
|
-
}">
|
|
8
|
+
<view v-if="!showMask" class="jfb-base-consump-code__body" :style="[bodyStyleComp]">
|
|
13
9
|
<view class="content-box">
|
|
14
10
|
<view class="logo-box">
|
|
15
11
|
<image v-if="shopLogo" :src="shopLogo" class="logo"></image>
|
|
@@ -108,7 +104,7 @@
|
|
|
108
104
|
</view>
|
|
109
105
|
<view :style="{
|
|
110
106
|
minHeight: layoutInfo.bodyMinHeightRpx + 'rpx',
|
|
111
|
-
|
|
107
|
+
backgroundImage: 'url(https://img1-b.jufubao.cn/uploads/20250507/1a97fda8cd8804f9bcf984da10e0a666.png?x-oss-process=style/size8)',
|
|
112
108
|
backgroundSize: '100% 100%'
|
|
113
109
|
}" v-else>
|
|
114
110
|
<view
|
|
@@ -248,6 +244,8 @@
|
|
|
248
244
|
deductDialog: false,
|
|
249
245
|
paySortList: [],
|
|
250
246
|
tempList: [],
|
|
247
|
+
|
|
248
|
+
bodyBgImg: "",
|
|
251
249
|
}
|
|
252
250
|
},
|
|
253
251
|
watch: {
|
|
@@ -293,8 +291,16 @@
|
|
|
293
291
|
return this.total_price === '' || !this.tag_id;
|
|
294
292
|
},
|
|
295
293
|
curPaySelectShow(){
|
|
294
|
+
if(this.paySortList.length === 0) return ''
|
|
296
295
|
let curPay = this.paySortList[0];
|
|
297
|
-
return curPay.pay_method_name + (curPay.
|
|
296
|
+
return curPay.pay_method_name + (curPay.pay_method !== 'card' ? `: ${this.$xdUniHelper.divisionFloatNumber(curPay.wallet_amount, 100)}` : '')
|
|
297
|
+
},
|
|
298
|
+
bodyStyleComp(){
|
|
299
|
+
return {
|
|
300
|
+
minHeight: this.layoutInfo.bodyMinHeightRpx + 'rpx',
|
|
301
|
+
backgroundImage: `url(${this.bodyBgImg})`,
|
|
302
|
+
backgroundSize: '100% 100%'
|
|
303
|
+
}
|
|
298
304
|
}
|
|
299
305
|
},
|
|
300
306
|
created() {
|
|
@@ -389,6 +395,7 @@
|
|
|
389
395
|
).value;
|
|
390
396
|
this.cityPath = getContainerPropsValue(container, 'content.cityPath', { value: "" }
|
|
391
397
|
).value;
|
|
398
|
+
this.bodyBgImg = getServiceUrl(getContainerPropsValue(container, 'content.bodyBgImg', {url: ""}).url)
|
|
392
399
|
},
|
|
393
400
|
handleSortClose(){
|
|
394
401
|
this.deductDialog = false;
|
|
@@ -11,8 +11,8 @@ module.exports = {
|
|
|
11
11
|
batchConsumpUseCardCreated: { "request_order_id": "quickpay-5000358-DBeMnvrvInuINYeTqbCXw", "request_id": "e17499843ece44b1" },
|
|
12
12
|
|
|
13
13
|
getConsumpAsyncSubmitStatus: { "hand_status": "U", "hand_status_msg": "异步下单中", "order_id": "", "pay_order_id": "", "need_pay_price": "0", "request_id": "fddff0af4216825d" },
|
|
14
|
-
|
|
15
|
-
getConsumpShopList: {
|
|
14
|
+
|
|
15
|
+
getConsumpShopList: {"categories":[{"label":"商超","value":100518},{"label":"蛋糕店","value":100519}],"namespaces":[{"label":"蛋糕(勿改)","value":"cake"}],"brands":[{"label":"测试1111","value":14,"icon":"\/uploads\/20230324\/3265afeb6a1f2a94f25c968a09275574.png"},{"label":"好利来","value":3,"icon":"\/uploads\/20230524\/b18190a6d80ae31a84a1ed53fc0dc8aa.jpg"}],"list":[{"brand_id":14,"brand_name":"测试1111","brand_type":"MA","business_status":"OPEN_BUSINESS","consume_mode":["SELL"],"consume_mode_name":"","distance":"37km","distance_conversion":"36.8km","default_consume_type":"CV","consume_type":["CV"],"is_support_jhd":false,"address":"通州区马驹桥镇北京通州区","province_name":"","city_name":"","area_name":"","street_name":"","phone":"13152565898","resource_shop_id":8003538,"exts_params":"eyJyZXNvdXJjZV9zaG9wX2lkIjo4MDAzNTM4LCJzaG9wX2lkIjoxMDUwMzQyLCJ2ZXJzaW9uIjoyfQ","resource_shop_name":"新建559","shop_icon":"https://sandbox-img2.jufubao.cn\/uploads\/20230324\/3265afeb6a1f2a94f25c968a09275574.png","shop_id":1050342,"shop_tags":[],"stars":0,"time_slot_name":"-","business_code":"","longitude":"116.6634126629373","latitude":"39.91601857510662","discount_ratio":7200},{"brand_id":14,"brand_name":"测试1111","brand_type":"MA","business_status":"CLOSED","consume_mode":["SELL"],"consume_mode_name":"","distance":"38km","distance_conversion":"37.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":"https://sandbox-img2.jufubao.cn\/uploads\/20230324\/3265afeb6a1f2a94f25c968a09275574.png","shop_id":1153520,"shop_tags":[],"stars":0,"time_slot_name":"-","business_code":"","longitude":"116.65307505295904","latitude":"40.07088305940431","discount_ratio":7200}],"total_size":6,"next_page_token":"2","request_id":"d7071936733ed3f5"},
|
|
16
16
|
|
|
17
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
18
|
|
|
@@ -22,9 +22,12 @@
|
|
|
22
22
|
<image :src="item.shop_icon" />
|
|
23
23
|
</view>
|
|
24
24
|
<view class="shop_info">
|
|
25
|
-
<view class="
|
|
26
|
-
<view class="
|
|
27
|
-
|
|
25
|
+
<view class="shop_top">
|
|
26
|
+
<view class="shop_name">
|
|
27
|
+
<view class="_name">{{ item.resource_shop_name }}</view>
|
|
28
|
+
<view class="distance" v-if='item.distance'>{{ item.distance }}</view>
|
|
29
|
+
</view>
|
|
30
|
+
<view v-if="item.discount_ratio" class="shop_radio">全店{{ item.discount_ratio/1000 }}折</view>
|
|
28
31
|
</view>
|
|
29
32
|
<view class='shop_addr'>{{ item.address }}</view>
|
|
30
33
|
</view>
|
|
@@ -34,7 +37,9 @@
|
|
|
34
37
|
</view>
|
|
35
38
|
</view>
|
|
36
39
|
<view v-else class="empty_data">
|
|
37
|
-
<xd-no-data icon-type="shop" height="100%"
|
|
40
|
+
<xd-no-data :scaleSize="2.5" icon-type="shop" height="100%">
|
|
41
|
+
<view style="margin-top: -100rpx;">附近暂无推荐门店</view>
|
|
42
|
+
</xd-no-data>
|
|
38
43
|
</view>
|
|
39
44
|
</view>
|
|
40
45
|
</template>
|
|
@@ -75,6 +80,11 @@ export default {
|
|
|
75
80
|
stateLocation: state => state.cityLocation.location || {},
|
|
76
81
|
}),
|
|
77
82
|
},
|
|
83
|
+
watch: {
|
|
84
|
+
stateCity(){
|
|
85
|
+
this.p_getList();
|
|
86
|
+
}
|
|
87
|
+
},
|
|
78
88
|
created(){
|
|
79
89
|
this.p_getList();
|
|
80
90
|
},
|
|
@@ -207,6 +217,14 @@ export default {
|
|
|
207
217
|
.shop_addr{
|
|
208
218
|
color: #999999;
|
|
209
219
|
font-size: 24rpx;
|
|
220
|
+
margin-top: 12rpx;
|
|
221
|
+
}
|
|
222
|
+
}
|
|
223
|
+
.shop_top{
|
|
224
|
+
.shop_radio{
|
|
225
|
+
font-size: 24rpx;
|
|
226
|
+
color: rgba(255, 87, 51, 1);
|
|
227
|
+
margin-top: 12rpx;
|
|
210
228
|
}
|
|
211
229
|
}
|
|
212
230
|
.shop_name{
|
|
@@ -215,7 +233,6 @@ export default {
|
|
|
215
233
|
justify-content: space-between;
|
|
216
234
|
font-size: 32rpx;
|
|
217
235
|
color: #242424;
|
|
218
|
-
height: 120rpx;
|
|
219
236
|
._name{
|
|
220
237
|
flex: 1;
|
|
221
238
|
width: 200rpx;
|
|
@@ -8,13 +8,16 @@
|
|
|
8
8
|
<view class="jfb-base-personal-data__body" v-if="info">
|
|
9
9
|
<view class="jfb-base-personal-data__body-item">
|
|
10
10
|
<view class="jfb-base-personal-data__body-item-label">头像</view>
|
|
11
|
-
<view class="
|
|
12
|
-
<
|
|
13
|
-
|
|
11
|
+
<view class="profile_wrap">
|
|
12
|
+
<view class="profile">
|
|
13
|
+
<image v-if="info.head_url" :src="info.head_url"></image>
|
|
14
|
+
<image v-else src="https://img1-b.jufubao.cn/uploads/20250528/e88bb70d4ccdcdd01a277bdf6b66c488.jpg"></image>
|
|
15
|
+
</view>
|
|
14
16
|
<!--#ifdef MP-->
|
|
15
17
|
<button type="default" open-type="chooseAvatar" @chooseavatar="handleChooseAvatar"></button>
|
|
16
18
|
<!-- #endif -->
|
|
17
19
|
</view>
|
|
20
|
+
|
|
18
21
|
|
|
19
22
|
</view>
|
|
20
23
|
<view class="jfb-base-personal-data__body-item">
|
|
@@ -54,6 +57,7 @@
|
|
|
54
57
|
v-model="info.sex"
|
|
55
58
|
:list="sexList"
|
|
56
59
|
width="100%"
|
|
60
|
+
style="width:100%;"
|
|
57
61
|
justifyContent="flex-end"
|
|
58
62
|
>
|
|
59
63
|
<template>
|
|
@@ -227,6 +231,19 @@
|
|
|
227
231
|
|
|
228
232
|
.jfb-base-personal-data {
|
|
229
233
|
&__body {
|
|
234
|
+
.profile_wrap{
|
|
235
|
+
width: 100%;
|
|
236
|
+
height: 80rpx;
|
|
237
|
+
position: relative;
|
|
238
|
+
& > button {
|
|
239
|
+
position: absolute;
|
|
240
|
+
right: 0;
|
|
241
|
+
top: 0;
|
|
242
|
+
opacity: 0;
|
|
243
|
+
width: 100%;
|
|
244
|
+
height: 100%;
|
|
245
|
+
}
|
|
246
|
+
}
|
|
230
247
|
.icon {
|
|
231
248
|
margin-left: 8rpx;
|
|
232
249
|
}
|
|
@@ -258,8 +275,10 @@
|
|
|
258
275
|
width: 80rpx;
|
|
259
276
|
height: 80rpx;
|
|
260
277
|
border-radius: 50%;
|
|
261
|
-
position:
|
|
278
|
+
position: absolute;
|
|
262
279
|
overflow: hidden;
|
|
280
|
+
right: 0;
|
|
281
|
+
top: 0;
|
|
263
282
|
|
|
264
283
|
& > image {
|
|
265
284
|
width: 78rpx;
|
|
@@ -268,14 +287,6 @@
|
|
|
268
287
|
border:1px solid #ccc;
|
|
269
288
|
box-sizing: border-box;
|
|
270
289
|
}
|
|
271
|
-
& > button {
|
|
272
|
-
position: absolute;
|
|
273
|
-
left: 0;
|
|
274
|
-
right: 0;
|
|
275
|
-
bottom: 0;
|
|
276
|
-
top: 0;
|
|
277
|
-
opacity: 0;
|
|
278
|
-
}
|
|
279
290
|
}
|
|
280
291
|
}
|
|
281
292
|
}
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
<view class="jfb-base-points-card__body-list-item-label">
|
|
13
13
|
{{item.name}}
|
|
14
14
|
</view>
|
|
15
|
-
<view v-if="item.method
|
|
15
|
+
<view v-if="item.method==='wallet'||item.method==='score'" class="jfb-base-points-card__body-list-item-value">{{getAmout(item.amount)}}</view>
|
|
16
16
|
<view v-else class="jfb-base-points-card__body-list-item-value">{{item.coupon_count}}</view>
|
|
17
17
|
</view>
|
|
18
18
|
</view>
|
|
@@ -127,7 +127,7 @@
|
|
|
127
127
|
if (item.method === 'wallet') {
|
|
128
128
|
this.$xdUniHelper.navigateTo({ url: `${this.withdrawPath}?method=wallet` })
|
|
129
129
|
}
|
|
130
|
-
if (item.method === 'coupon') {
|
|
130
|
+
if (item.method === 'coupon' || item.method === 'card') {
|
|
131
131
|
this.$xdUniHelper.navigateTo({ url: this.couponPath })
|
|
132
132
|
}
|
|
133
133
|
},
|