jufubao-base 1.0.226 → 1.0.228-beta1
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/JfbBaseFastLink/JfbBaseFastLink.vue +10 -12
- package/src/components/JfbBasePosterType/FourScreen.vue +8 -2
- package/src/components/JfbBaseSuccess/Attr.js +21 -0
- package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue +11 -8
- package/src/components/JfbBaseUserInfo/JfbBaseUserInfo.vue +1 -1
- package/src/components/JfbBaseWallet/Attr.js +6 -0
package/package.json
CHANGED
|
@@ -118,30 +118,28 @@
|
|
|
118
118
|
|
|
119
119
|
computed: {
|
|
120
120
|
bodyStyle(){
|
|
121
|
-
let margin = `${this.checkValue(this.margin.top,
|
|
122
|
-
margin = `${margin} ${this.checkValue(this.margin.right,
|
|
123
|
-
margin = `${margin} ${this.checkValue(this.margin.bottom,
|
|
124
|
-
margin = `${margin} ${this.checkValue(this.margin.left,
|
|
125
|
-
|
|
126
|
-
let padding = `${this.checkValue(this.padding.top, 20)}rpx`;
|
|
127
|
-
padding = `${padding} ${this.checkValue(this.padding.right, 20)}rpx`;
|
|
128
|
-
padding = `${padding} ${this.checkValue(this.padding.bottom, 20)}rpx`;
|
|
129
|
-
padding = `${padding} ${this.checkValue(this.padding.left, 20)}rpx`;
|
|
121
|
+
let margin = `${this.checkValue(this.margin.top, 20)}rpx`;
|
|
122
|
+
margin = `${margin} ${this.checkValue(this.margin.right, 20)}rpx`;
|
|
123
|
+
margin = `${margin} ${this.checkValue(this.margin.bottom, 20)}rpx`;
|
|
124
|
+
margin = `${margin} ${this.checkValue(this.margin.left, 20)}rpx`;
|
|
130
125
|
|
|
131
126
|
return {
|
|
132
127
|
margin,
|
|
133
|
-
padding
|
|
134
128
|
}
|
|
135
129
|
},
|
|
136
|
-
|
|
137
130
|
contStyle(){
|
|
138
131
|
let border = 0;
|
|
139
132
|
if (this.is_border === 'Y') border = `${this.is_border_w}rpx solid ${this.is_border_c}`;
|
|
133
|
+
let padding = `${this.checkValue(this.padding.top, 20)}rpx`;
|
|
134
|
+
padding = `${padding} ${this.checkValue(this.padding.right, 20)}rpx`;
|
|
135
|
+
padding = `${padding} ${this.checkValue(this.padding.bottom, 20)}rpx`;
|
|
136
|
+
padding = `${padding} ${this.checkValue(this.padding.left, 20)}rpx`;
|
|
140
137
|
return {
|
|
141
138
|
background: this.backgroundColor,
|
|
142
139
|
borderRadius: this.radius + 'rpx',
|
|
143
140
|
marginBottom: this.rowSpacing + 'rpx',
|
|
144
|
-
border
|
|
141
|
+
border,
|
|
142
|
+
padding
|
|
145
143
|
}
|
|
146
144
|
},
|
|
147
145
|
|
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
v-if="config['isCarousel'] === false"
|
|
10
10
|
:style="[notCarouselComp,{'--title-height':titleHeight}]"
|
|
11
11
|
>
|
|
12
|
+
|
|
12
13
|
<view
|
|
13
14
|
v-for="item in list"
|
|
14
15
|
:key="item['content_id']"
|
|
@@ -181,7 +182,12 @@
|
|
|
181
182
|
return (this.config['mode'] === 'normal'?0:48) * this.$rpxNum;
|
|
182
183
|
},
|
|
183
184
|
getContHeight() {
|
|
184
|
-
let realRow =
|
|
185
|
+
let realRow = this.config['row'];
|
|
186
|
+
|
|
187
|
+
if(this.list.length === 1) {
|
|
188
|
+
this.list[0] = this.list[0].splice(0,5);
|
|
189
|
+
realRow = Math.ceil(this.list[0].length/this.config.column);
|
|
190
|
+
}
|
|
185
191
|
//数量小于等于1,2行
|
|
186
192
|
if(realRow < 3) {
|
|
187
193
|
return this.height * realRow;
|
|
@@ -238,7 +244,7 @@
|
|
|
238
244
|
this.h5key = Date.now()
|
|
239
245
|
}
|
|
240
246
|
|
|
241
|
-
},
|
|
247
|
+
}, 100)
|
|
242
248
|
},
|
|
243
249
|
|
|
244
250
|
handleClick(item) {
|
|
@@ -319,6 +319,27 @@ export default {
|
|
|
319
319
|
value: data.btnTextColor || '',
|
|
320
320
|
classNmae: 'input80',
|
|
321
321
|
},
|
|
322
|
+
{
|
|
323
|
+
label: '文字大小:',
|
|
324
|
+
ele: 'xd-site-select-list',
|
|
325
|
+
valueKey: 'btnTextSize',
|
|
326
|
+
groupKey:'style',
|
|
327
|
+
value: data['btnTextSize'] || '',
|
|
328
|
+
placeholder: '请选择文字大小',
|
|
329
|
+
multiple: false,
|
|
330
|
+
className: 'input60',
|
|
331
|
+
handleCustom({action, data}) {
|
|
332
|
+
XdBus.getParentApi('getOptionsSettingList')({
|
|
333
|
+
setting_id: 'edtix_style_font_size'
|
|
334
|
+
})
|
|
335
|
+
.then(res => {
|
|
336
|
+
data.cb(res.list)
|
|
337
|
+
})
|
|
338
|
+
.catch(error => {
|
|
339
|
+
console.error(error);
|
|
340
|
+
});
|
|
341
|
+
},
|
|
342
|
+
},
|
|
322
343
|
{
|
|
323
344
|
"label": "自定义按钮跳转地址:",
|
|
324
345
|
"ele": "xd-select-pages-path",
|
|
@@ -116,7 +116,7 @@
|
|
|
116
116
|
v-if="info.codes[0].can_read_password"
|
|
117
117
|
class="jfb-base-success__body-cashier-password"
|
|
118
118
|
@click="showPassword = true"
|
|
119
|
-
:style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
|
|
119
|
+
:style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor, fontSize: btnTextSize + 'rpx'}"
|
|
120
120
|
>{{ showPassword ? info.codes[0].can_read_code : "查看" }}</view>
|
|
121
121
|
<view v-else class="jfb-base-success__body-cashier-text">{{ info.codes[0].can_read_code }}</view>
|
|
122
122
|
<view v-if="info.codes[0].refund_tip_text" style="color:red;font-size:24rpx;text-align:center;margin-top:10rpx">{{info.codes[0].refund_tip_text}}</view>
|
|
@@ -157,7 +157,7 @@
|
|
|
157
157
|
<view
|
|
158
158
|
class="jfb-base-success__body-num-info-copy"
|
|
159
159
|
@click="copy(item.code)"
|
|
160
|
-
:style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
|
|
160
|
+
:style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor, fontSize: btnTextSize + 'rpx'}"
|
|
161
161
|
>复制</view>
|
|
162
162
|
<view
|
|
163
163
|
v-if="item['code_end_time']"
|
|
@@ -187,7 +187,7 @@
|
|
|
187
187
|
<view
|
|
188
188
|
class="jfb-base-success__body-num-info-copy"
|
|
189
189
|
@click="copy(item.code)"
|
|
190
|
-
:style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
|
|
190
|
+
:style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor, fontSize: btnTextSize + 'rpx'}"
|
|
191
191
|
>复制</view>
|
|
192
192
|
</view>
|
|
193
193
|
<view
|
|
@@ -200,7 +200,7 @@
|
|
|
200
200
|
<view
|
|
201
201
|
class="jfb-base-success__body-num-info-copy"
|
|
202
202
|
@click="copy(item.password)"
|
|
203
|
-
:style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
|
|
203
|
+
:style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor, fontSize: btnTextSize + 'rpx'}"
|
|
204
204
|
>复制</view>
|
|
205
205
|
<view
|
|
206
206
|
v-if="item['code_end_time']"
|
|
@@ -227,7 +227,7 @@
|
|
|
227
227
|
<view
|
|
228
228
|
class="jfb-base-success__body-num-info-copy"
|
|
229
229
|
@click="handleShowCode(item)"
|
|
230
|
-
:style="{marginTop:0, borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
|
|
230
|
+
:style="{marginTop:0, borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor, fontSize: btnTextSize + 'rpx'}"
|
|
231
231
|
>查看二维码和{{ item.password_title }}</view>
|
|
232
232
|
<view
|
|
233
233
|
v-if="item['code_end_time']"
|
|
@@ -254,7 +254,7 @@
|
|
|
254
254
|
<view
|
|
255
255
|
class="jfb-base-success__body-num-info-copy"
|
|
256
256
|
@click="handleShowCode(item)"
|
|
257
|
-
:style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
|
|
257
|
+
:style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor, fontSize: btnTextSize + 'rpx'}"
|
|
258
258
|
>查看一维码</view>
|
|
259
259
|
<view
|
|
260
260
|
v-if="item['code_end_time']"
|
|
@@ -281,13 +281,13 @@
|
|
|
281
281
|
<view
|
|
282
282
|
class="jfb-base-success__body-num-info-copy"
|
|
283
283
|
@click="handleToLink(item.code)"
|
|
284
|
-
:style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
|
|
284
|
+
:style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor, fontSize: btnTextSize + 'rpx'}"
|
|
285
285
|
>访问</view>
|
|
286
286
|
</view>
|
|
287
287
|
<view
|
|
288
288
|
class="jfb-base-success__body-num-info-copy"
|
|
289
289
|
@click="copy(item.code)"
|
|
290
|
-
:style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
|
|
290
|
+
:style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor, fontSize: btnTextSize + 'rpx'}"
|
|
291
291
|
>复制</view>
|
|
292
292
|
<view
|
|
293
293
|
v-if="item['code_end_time']"
|
|
@@ -432,6 +432,7 @@ export default {
|
|
|
432
432
|
btnTextColor:'',
|
|
433
433
|
btnBgColor:'',
|
|
434
434
|
btnBorderColor:'',
|
|
435
|
+
btnTextSize: '',
|
|
435
436
|
|
|
436
437
|
info: null,
|
|
437
438
|
timeer: null,
|
|
@@ -533,7 +534,9 @@ export default {
|
|
|
533
534
|
this.btnBgColor = getContainerPropsValue(value, "content.btnBgColor", '#e5e5e5');
|
|
534
535
|
this.btnTextColor = getContainerPropsValue(value, "content.btnTextColor", '#666');
|
|
535
536
|
this.btnBorderColor = getContainerPropsValue(value, "content.btnBorderColor", 'rgba(0,0,0,0)');
|
|
537
|
+
this.btnTextSize = getContainerPropsValue(value, "content.btnTextSize", '28');
|
|
536
538
|
this.payBgColor = getContainerPropsValue(value, "content.payBgColor", '#fff');
|
|
539
|
+
console.log("this., fontSize: btnTextSize + 'rpx'", this.btnTextSize)
|
|
537
540
|
this.custom_btn_path = getContainerPropsValue(
|
|
538
541
|
value,
|
|
539
542
|
"content.custom_btn_path",
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
:class="{center: textType === 'N',vertical: textType === 'Y'}"
|
|
26
26
|
>
|
|
27
27
|
<template v-if="logined">
|
|
28
|
-
<image v-if="userInfo['head_url']" :src="userInfo['head_url']"></image>
|
|
28
|
+
<image v-if="userInfo['head_url']" :style="{border: `1px solid ${imageColor}`, borderRadius:imageRadius}" :src="userInfo['head_url']"></image>
|
|
29
29
|
<view class="no-image" :style="{borderColor: imageColor, borderRadius:imageRadius}" v-else>
|
|
30
30
|
<xd-font-icon :color="imageColor" icon="iconwode_mian" size="100"></xd-font-icon>
|
|
31
31
|
</view>
|