jufubao-base 1.0.28-beta151 → 1.0.28-beta153

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.
Files changed (11) hide show
  1. package/package.json +1 -1
  2. package/src/components/JfbBaseAfterOrderList/JfbBaseAfterOrderList.vue +67 -46
  3. package/src/components/JfbBaseBlock/Attr.js +16 -135
  4. package/src/components/JfbBaseBlock/JfbBaseBlock.vue +4 -4
  5. package/src/components/JfbBaseFastLink/Attr.js +2 -2
  6. package/src/components/JfbBaseFastLink/JfbBaseFastLink.vue +7 -3
  7. package/src/components/JfbBaseFooter/JfbBaseFooter.vue +1 -1
  8. package/src/components/JfbBasePosterType/FourScreen.vue +10 -3
  9. package/src/components/JfbBaseUserCenter/JfbBaseUserCenter.vue +6 -6
  10. package/src/components/JfbBaseUserInfo/JfbBaseUserInfo.vue +12 -5
  11. package/src/components/JfbBaseUserOrder/JfbBaseUserOrder.vue +7 -3
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-base",
3
- "version": "1.0.28-beta151",
3
+ "version": "1.0.28-beta153",
4
4
  "private": false,
5
5
  "description": "聚福宝业务组件基础插件包",
6
6
  "main": "index.js",
package/src/components/JfbBaseAfterOrderList/JfbBaseAfterOrderList.vue CHANGED
@@ -20,58 +20,67 @@
20
20
  <!-- #endif -->
21
21
  <view class="jfb-base-after-order-list__body">
22
22
  <view :style="{ padding: outMargin }">
23
- <view
24
- class="jfb-base-after-order-list__body-order"
25
- v-for="(item, index) in orderList"
26
- :key="index"
27
- @click="handleToLink(item)"
28
- :style="{
29
- background: backgroundColor,
30
- border: borderBox,
31
- borderRadius: radius + 'rpx',
32
- boxShadow: shadowBox,
33
- marginBottom: padding + 'rpx',
34
- }"
35
- >
36
- <view class="jfb-base-after-order-list__body-order-biz">
37
- <view
38
- v-if="item.business_icon"
39
- class="jfb-base-after-order-list__body-order-biz-icon"
40
- >
41
- <xd-font-icon
42
-
43
- :icon="item.business_icon"
44
- :size="item.business_icon_size"
45
- ></xd-font-icon>
23
+ <view v-if="orderList && orderList.length > 0">
24
+ <view
25
+ class="jfb-base-after-order-list__body-order"
26
+ v-for="(item, index) in orderList"
27
+ :key="index"
28
+ @click="handleToLink(item)"
29
+ :style="{
30
+ background: backgroundColor,
31
+ border: borderBox,
32
+ borderRadius: radius + 'rpx',
33
+ boxShadow: shadowBox,
34
+ marginBottom: padding + 'rpx',
35
+ }"
36
+ >
37
+ <view class="jfb-base-after-order-list__body-order-biz">
38
+ <view
39
+ v-if="item.business_icon"
40
+ class="jfb-base-after-order-list__body-order-biz-icon"
41
+ >
42
+ <xd-font-icon
43
+ :icon="item.business_icon"
44
+ :size="item.business_icon_size"
45
+ ></xd-font-icon>
46
+ </view>
47
+
48
+ <view>{{ item.business_name }}订单</view>
46
49
  </view>
47
-
48
- <view>{{ item.business_name }}订单</view>
49
- </view>
50
- <view class="jfb-base-after-order-list__body-order-title">
51
- <view>服务单号：{{ item.order_id }}</view>
52
- <view :style="{ color: mainColor }">
53
- <!-- <xd-font-icon
50
+ <view class="jfb-base-after-order-list__body-order-title">
51
+ <view>服务单号：{{ item.order_id }}</view>
52
+ <view :style="{ color: mainColor }">
53
+ <!-- <xd-font-icon
54
54
  style="margin-right: 16rpx"
55
55
  icon="iconqianbao-01"
56
56
  size="40rpx"
57
57
  :color="mainColor"
58
58
  ></xd-font-icon> -->
59
- {{ item.after_sale_method_name }}
59
+ {{ item.after_sale_method_name }}
60
+ </view>
61
+ </view>
62
+ <view
63
+ class="jfb-base-after-order-list__body-order-content"
64
+ v-for="(Sitem, Sindex) in item.sale_goods"
65
+ :key="Sindex"
66
+ >
67
+ <image
68
+ style="background: #ffffff"
69
+ mode="aspectFit"
70
+ :src="Sitem.thumb"
71
+ ></image>
72
+ <view>{{ Sitem.product_name }}</view>
60
73
  </view>
61
- </view>
62
- <view
63
- class="jfb-base-after-order-list__body-order-content"
64
- v-for="(Sitem, Sindex) in item.sale_goods"
65
- :key="Sindex"
66
- >
67
- <image
68
- style="background: #ffffff"
69
- mode="aspectFit"
70
- :src="Sitem.thumb"
71
- ></image>
72
- <view>{{ Sitem.product_name }}</view>
73
74
  </view>
74
75
  </view>
76
+ <view v-else class="jfb-base-after-order-list__body-no">
77
+ <xd-font-icon
78
+ size="120"
79
+ color="#B3C1C4"
80
+ icon="iconzanwudingdan"
81
+ ></xd-font-icon>
82
+ <view>暂无订单</view>
83
+ </view>
75
84
  </view>
76
85
  </view>
77
86
  </view>
@@ -239,7 +248,7 @@ export default {
239
248
  );
240
249
  this.orderList = this.orderList.concat(list);
241
250
  }
242
- this.hasNext = res.next_page_token !== '';
251
+ this.hasNext = res.next_page_token !== "";
243
252
  this.next_page_token = res.next_page_token;
244
253
  })
245
254
  .catch((err) => {
@@ -278,6 +287,18 @@ export default {
278
287
 
279
288
  .jfb-base-after-order-list {
280
289
  &__body {
290
+ &-no {
291
+ display: flex;
292
+ justify-content: center;
293
+ align-items: center;
294
+ flex-direction: column;
295
+ color: #b3c1c4;
296
+ font-size: unit(32, rpx);
297
+ margin-top: unit(360, rpx);
298
+ & > view {
299
+ margin-top: unit(30, rpx);
300
+ }
301
+ }
281
302
  &-order {
282
303
  border-radius: unit(20, rpx);
283
304
  padding: unit(30, rpx);
@@ -292,9 +313,9 @@ export default {
292
313
  border-bottom: unit(2, rpx) solid #eee;
293
314
  display: flex;
294
315
  align-items: center;
295
-
316
+
296
317
  &-icon {
297
- margin-right:unit(10, rpx);
318
+ margin-right: unit(10, rpx);
298
319
  }
299
320
  }
300
321
 
package/src/components/JfbBaseBlock/Attr.js CHANGED
@@ -4,149 +4,30 @@
4
4
  * @description 当表单组件中有联动操作时候，使用方法进行返回
5
5
  */
6
6
  export default {
7
- style: [
8
- {
9
- label: '文字颜色:', //label
10
- ele: 'xd-color', //package 名称
11
- valueKey: 'tColor', //form[valueKey]
12
- value: '', //v-model
13
- placeholder: '请输入占位框背景颜色',
14
- classNmae: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
15
- rules: [
16
- {
17
- required: true,
18
- message: '请输入占位框背景颜色',
19
- trigger: 'blur'
20
- },
21
- ]
22
- },
23
- {
24
- label: '背景颜色:', //label
25
- ele: 'xd-color', //package 名称
26
- valueKey: 'bgcolor', //form[valueKey]
27
- value: '', //v-model
28
- placeholder: '请输入占位框背景颜色',
29
- classNmae: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
30
- rules: [
31
- {
32
- required: true,
33
- message: '请输入占位框背景颜色',
34
- trigger: 'blur'
35
- },
36
- ]
37
- },
38
- {
39
- label: '尺寸:', //label
40
- ele: 'xd-size', //package 名称
41
- valueKey: 'size', //form[valueKey]
42
- value: {
43
- height: 200,
44
- width: 750
45
- }, //v-model
46
- disabled: {
47
- wDisabled: true,
48
- hDisabled: false
49
- },
50
- setting: {
51
- height: null,
52
- width: 750,
53
- },
54
- placeholder: {},
55
- rules: [
56
- {required: true, message: '请设置广告位尺寸', trigger: 'change'},
57
- ],
58
- },
59
- {
60
- label: '边距:', //label
61
- ele: 'xd-margin-padding', //package 名称
62
- valueKey: 'margin', //form[valueKey]
63
- value: null, //v-model
64
- disabled: false,
65
- setting: {
66
- type: 'margin',
67
- },
68
- placeholder: '请设置边距值',
69
- rules: [
70
- {required: true, message: '请设置边距值', trigger: 'change'},
71
- ],
72
- },
73
- ],
7
+ style: [],
74
8
  content: [
75
9
  {
76
- label: '选中路径:', //label
77
- ele: 'xd-select-pages-path', //package 名称
78
- valueKey: 'select-pages-path', //form[valueKey]
79
- value: null,
80
- setting: {
81
- router: XdBus.getParentApi('getPagesTree')
82
- },
83
- inline: false,
10
+ label: '背景颜色:',
11
+ ele: 'xd-color',
12
+ valueKey: 'bgcolor',
13
+ value: '',
14
+ placeholder: '请输入占位框背景颜色',
15
+ classNmae: 'input80',
84
16
  },
85
17
  {
86
- label: '高度:', //label
87
- ele: 'el-input', //package 名称
18
+ label: '高度:',
19
+ ele: 'el-input',
88
20
  type: 'number',
89
- valueKey: 'height', //form[valueKey]
90
- value: null, //v-model
91
- placeholder: '请输入占位框高度，单位像素，默认：10px',
92
- classNmae: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
93
- rules: [
94
- {
95
- required: true,
96
- message: '请输入占位框高度',
97
- trigger: 'blur'
98
- },
99
- ]
21
+ valueKey: 'height',
22
+ value: null,
23
+ placeholder: '请输入占位框高度，单位像素，默认：20px',
24
+ classNmae: 'input80',
100
25
  },
101
26
  {
102
- label: '', //label
103
- ele: 'slot', //package 名称
27
+ label: '',
28
+ ele: 'slot',
104
29
  slot: 'is_reference',
105
30
  },
106
31
  ],
107
- advanced: (data) => {
108
- let list = [
109
- {
110
- label: '参数类型:',
111
- ele: 'xd-radio',
112
- valueKey: 'radio',
113
- value: data['radio'] || 1,
114
- rules: [
115
- {required: true, message: '请选择', trigger: ['blur', 'change']}
116
- ],
117
- list: [
118
- {"label": "使用路径", "value": 1},
119
- {"label": "使用高度", "value": 2},
120
- ]
121
- },
122
- data['radio'] === 1 && {
123
- label: '选中路径:', //label
124
- ele: 'xd-select-pages-path', //package 名称
125
- valueKey: 'select-pages-path', //form[valueKey]
126
- value: data['select-pages-path'] || {},
127
- setting: {
128
- router: XdBus.getParentApi('getPagesTree')
129
- },
130
- inline: false,
131
- },
132
- data['radio'] === 2 && {
133
- label: '高度:',
134
- ele: 'el-input',
135
- type: 'number',
136
- valueKey: 'height',
137
- value: data.height || 10,
138
- placeholder: '请输入占位框高度，单位像素，默认：10px',
139
- className: 'input80',
140
- rules: [
141
- {
142
- required: true,
143
- message: '请输入占位框高度',
144
- trigger: 'blur'
145
- },
146
- ]
147
- },
148
- ].filter(i => i);
149
- console.log(data, list)
150
- return list
151
- },
32
+ advanced: [],
152
33
  };
package/src/components/JfbBaseBlock/JfbBaseBlock.vue CHANGED
@@ -17,7 +17,7 @@
17
17
  </view>
18
18
  <!-- #endif -->
19
19
  <view class="jfb-base-block__body">
20
- <view :style="{height: height * 2 + 'rpx', background: bgcolor}"></view>
20
+ <view :style="{height: height + 'rpx', background: bgcolor}"></view>
21
21
  </view>
22
22
  </view>
23
23
  </template>
@@ -52,8 +52,8 @@
52
52
  },
53
53
  methods: {
54
54
  init(value) {
55
- let bgcolor = getContainerPropsValue(value, 'style.bgcolor');
56
- let height = getContainerPropsValue(value, 'content.height');
55
+ let bgcolor = getContainerPropsValue(value, 'content.bgcolor', '#fff');
56
+ let height = getContainerPropsValue(value, 'content.height', 20);
57
57
  if (bgcolor) this.bgcolor = bgcolor;
58
58
  if (height) this.height = height;
59
59
  },
@@ -73,7 +73,7 @@
73
73
  @import "./JfbBaseBlockLess.less";
74
74
 
75
75
  .jfb-base-block {
76
-
76
+ min-height: 0!important;
77
77
  &__body{
78
78
 
79
79
  }
package/src/components/JfbBaseFastLink/Attr.js CHANGED
@@ -117,7 +117,7 @@ export default {
117
117
  ele: 'el-input',
118
118
  type: 'number',
119
119
  valueKey: 'padding',
120
- value: data.padding || 0,
120
+ value: data.padding===undefined? data.padding: '',
121
121
  placeholder: '请输入间距',
122
122
  className: 'input80',
123
123
  },
@@ -173,7 +173,7 @@ export default {
173
173
  label: '内容圆角设置:',
174
174
  ele: 'xd-site-select-list',
175
175
  valueKey: 'radius',
176
- value: data['radius'] || '0',
176
+ value: data['radius'] || '',
177
177
  placeholder: '请选择内容圆角设置',
178
178
  multiple: false,
179
179
  className: 'input80',
package/src/components/JfbBaseFastLink/JfbBaseFastLink.vue CHANGED
@@ -95,7 +95,11 @@
95
95
 
96
96
  computed: {
97
97
  outMargin(){
98
- return `${this.margin.top || 0}rpx ${this.margin.right||0}rpx ${this.margin.bottom||0}rpx ${this.margin.left||0}rpx`
98
+ let margin = `${this.margin.top !== null ? this.margin.top : 20}rpx`;
99
+ margin = `${margin} ${this.margin.right !== null ? this.margin.right : 20}rpx`;
100
+ margin = `${margin} ${this.margin.bottom !== null ? this.margin.bottom : 20}rpx`;
101
+ margin = `${margin} ${this.margin.left !== null ? this.margin.left : 20}rpx`;
102
+ return margin;
99
103
  },
100
104
  borderBox() {
101
105
  if (this.is_border === 'Y') return `${this.is_border_w}rpx solid ${this.is_border_c}`;
@@ -124,9 +128,9 @@
124
128
  * @param container {object} 业务组件对象自己
125
129
  */
126
130
  init(container) {
127
- this.backgroundColor = getContainerPropsValue(container, 'content.backgroundColor', '#fff');
131
+ this.backgroundColor = getContainerPropsValue(container, 'content.backgroundColor', '#f8f8f8');
128
132
  this.color = getContainerPropsValue(container, 'content.textColor', '#000');
129
- this.fontSize = getContainerPropsValue(container, 'content.fontSize', 20);
133
+ this.fontSize = getContainerPropsValue(container, 'content.fontSize', 26);
130
134
  this.radius = getContainerPropsValue(container, 'content.radius', 10);
131
135
  this.iconColor = getContainerPropsValue(container, 'content.iconColor', '#999');
132
136
  this.padding = getContainerPropsValue(container, 'content.padding', 20);
package/src/components/JfbBaseFooter/JfbBaseFooter.vue CHANGED
@@ -164,7 +164,7 @@
164
164
  color: getContainerPropsValue(value, 'content.color', '#333'),
165
165
  list: bar.map((item,index)=>{
166
166
  return {
167
- name: item.name,
167
+ name: item.name.slice(0, 6),
168
168
  icon: item.icon,
169
169
  path: item.path.value,
170
170
  size: item.size,
package/src/components/JfbBasePosterType/FourScreen.vue CHANGED
@@ -15,7 +15,7 @@
15
15
  :key="item['content_id']"
16
16
  @click="handleClick(item)"
17
17
  :style="{
18
- height: (height) + 'px'
18
+ height: (height + rpxText) + 'px'
19
19
  }"
20
20
  >
21
21
 
@@ -111,6 +111,7 @@
111
111
  timer: null,
112
112
  width: 0,
113
113
  height: 0,
114
+ text: 50,
114
115
  padding: 0,
115
116
  status: false,
116
117
  list: [],
@@ -120,8 +121,11 @@
120
121
  },
121
122
  computed:{
122
123
  getHeight() {
123
- return this.height * this.config.jdRows + 20 * this.config.jdRows;
124
+ return this.height * this.config.jdRows + this.rpxText * this.config.jdRows;
124
125
  },
126
+ rpxText(){
127
+ return this.$rpxNum * this.text
128
+ },
125
129
  },
126
130
  watch: {
127
131
  config() {
@@ -274,11 +278,13 @@
274
278
 
275
279
  & > view:last-child {
276
280
  text-align: center;
277
- line-height: 15px;
281
+ line-height: unit(36, rpx);
278
282
  width: 90%;
279
283
  margin: 0 5%;
280
284
  overflow: hidden;
281
285
  font-size: unit(24, rpx);
286
+ .uni-max-cut(1, 36);
287
+
282
288
  }
283
289
  }
284
290
  }
@@ -319,6 +325,7 @@
319
325
  margin: 0 5%;
320
326
  overflow: hidden;
321
327
  font-size: unit(24, rpx);
328
+ .uni-max-cut(1, 36);
322
329
  }
323
330
  }
324
331
  }
package/src/components/JfbBaseUserCenter/JfbBaseUserCenter.vue CHANGED
@@ -70,7 +70,7 @@
70
70
  mixins: [componentsMixins,extsMixins,JfbBaseUserCenterMixin],
71
71
  computed: {
72
72
  outMargin() {
73
- return `${this.margin.top || 0}rpx ${this.margin.right || 0}rpx ${this.margin.bottom || 0}rpx ${this.margin.left || 0}rpx`
73
+ return `${this.margin.top || 20}rpx ${this.margin.right || 20}rpx ${this.margin.bottom || 20}rpx ${this.margin.left || 20}rpx`
74
74
  },
75
75
  borderBox() {
76
76
  if (this.is_border === 'Y') return `${this.is_border_w}rpx solid ${this.is_border_c}`;
@@ -100,10 +100,10 @@
100
100
 
101
101
  //其他
102
102
  margin: {
103
- top: 0,
104
- left: 0,
105
- right: 0,
106
- bottom: 0
103
+ top: 20,
104
+ left: 20,
105
+ right: 20,
106
+ bottom: 20
107
107
  },
108
108
 
109
109
  }
@@ -133,7 +133,7 @@
133
133
  init(container) {
134
134
 
135
135
  //基础
136
- this.margin = getContainerPropsValue(container, 'content.margin', {top: 0, left: 0, right: 0, bottom: 0});
136
+ this.margin = getContainerPropsValue(container, 'content.margin', {top: 20, left: 20, right: 20, bottom: 20});
137
137
  this.radius = getContainerPropsValue(container, 'content.radius', 0);
138
138
  this.color = getContainerPropsValue(container, 'content.textColor', '#333');
139
139
  this.backgroundColor = getContainerPropsValue(container, 'content.backgroundColor', '#f8f8f8');
package/src/components/JfbBaseUserInfo/JfbBaseUserInfo.vue CHANGED
@@ -68,10 +68,18 @@
68
68
  ...mapState(['jfbAuthorize']),
69
69
 
70
70
  outMargin() {
71
- return `${this.margin.top || 0}rpx ${this.margin.right || 0}rpx ${this.margin.bottom || 0}rpx ${this.margin.left || 0}rpx`
71
+ let margin = `${this.margin.top !== null ? this.margin.top : 20}rpx`;
72
+ margin = `${margin} ${this.margin.right !== null ? this.margin.right : 20}rpx`;
73
+ margin = `${margin} ${this.margin.bottom !== null ? this.margin.bottom : 20}rpx`;
74
+ margin = `${margin} ${this.margin.left !== null ? this.margin.left : 20}rpx`;
75
+ return margin;
72
76
  },
73
77
  outPadding() {
74
- return `${this.padding.top || 0}rpx ${this.padding.right || 0}rpx ${this.padding.bottom || 0}rpx ${this.padding.left || 0}rpx`
78
+ let padding = `${this.padding.top !== null ? this.padding.top : 20}rpx`;
79
+ padding = `${padding} ${this.padding.right !== null ? this.padding.right : 20}rpx`;
80
+ padding = `${padding} ${this.margin.bottom !== null ? this.padding.bottom : 20}rpx`;
81
+ padding = `${padding} ${this.padding.left !== null ? this.padding.left : 20}rpx`;
82
+ return padding;
75
83
  },
76
84
  shadow(){
77
85
  if(this.is_shadow === 'Y') return `0 0 ${this.is_shadow_w}rpx ${this.is_shadow_bg}`;
@@ -158,7 +166,6 @@
158
166
  }
159
167
 
160
168
  this.logined = await this.jfbAuthorize.checkUserLogin(true, this, false);
161
- console.log('options', this.logined)
162
169
  if(!this.logined) return;
163
170
 
164
171
  jfbRootExec('getBaseUserInfo', {
@@ -176,8 +183,8 @@
176
183
  * @param container {object} 业务组件对象自己
177
184
  */
178
185
  init(container) {
179
- this.margin = getContainerPropsValue(container, 'content.margin', {top: 0, left: 0, right: 0, bottom: 0});
180
- this.padding = getContainerPropsValue(container, 'content.padding', {top: 0, left: 0, right: 0, bottom: 0});
186
+ this.margin = getContainerPropsValue(container, 'content.margin', {top: 20, left: 20, right: 20, bottom: 20});
187
+ this.padding = getContainerPropsValue(container, 'content.padding', {top: 20, left: 20, right: 20, bottom: 20});
181
188
  this.address_url = getContainerPropsValue(container, 'content.address_url', {value: ''});
182
189
  this.color = getContainerPropsValue(container, 'content.textColor', '#333');
183
190
  this.backgroundColor = getContainerPropsValue(container, 'content.backgroundColor', 'rgba(0,0,0,0)');
package/src/components/JfbBaseUserOrder/JfbBaseUserOrder.vue CHANGED
@@ -27,7 +27,7 @@
27
27
  :style="{
28
28
  borderRadius: radius + 'rpx',
29
29
  background: backgroundColor,
30
- marginTop: margin.top ? margin.top + 'rpx': 0,
30
+ marginTop: margin.top ? margin.top + 'rpx': '20rpx',
31
31
  border: borderBox,
32
32
  }"
33
33
  >
@@ -73,7 +73,11 @@
73
73
  mixins: [componentsMixins,extsMixins,JfbBaseUserOrderMixin],
74
74
  computed: {
75
75
  outMargin() {
76
- return `${this.margin.top || 0}rpx ${this.margin.right || 0}rpx ${this.margin.bottom || 0}rpx ${this.margin.left || 0}rpx`
76
+ let margin = `${this.margin.top !== null ? this.margin.top : 20}rpx`;
77
+ margin = `${margin} ${this.margin.right !== null ? this.margin.right : 20}rpx`;
78
+ margin = `${margin} ${this.margin.bottom !== null ? this.margin.bottom : 20}rpx`;
79
+ margin = `${margin} ${this.margin.left !== null ? this.margin.left : 20}rpx`;
80
+ return margin;
77
81
  },
78
82
  borderBox() {
79
83
  if (this.is_border === 'Y') return `${this.is_border_w}rpx solid ${this.is_border_c}`;
@@ -168,7 +172,7 @@
168
172
  this.radius = getContainerPropsValue(container, 'content.radius', 0);
169
173
  this.color = getContainerPropsValue(container, 'content.textColor', '#333');
170
174
  this.iconColor = getContainerPropsValue(container, 'content.iconColor', this.mainColor);
171
- this.backgroundColor = getContainerPropsValue(container, 'content.backgroundColor', '#fff');
175
+ this.backgroundColor = getContainerPropsValue(container, 'content.backgroundColor', '#f8f8f8');
172
176
 
173
177
  //边框
174
178
  this.is_border = getContainerPropsValue(container, 'content.is_border', 'N');