jufubao-mall 2.0.95 → 2.0.97

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 CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-mall",
3
- "version": "2.0.95",
3
+ "version": "2.0.97",
4
4
  "private": false,
5
5
  "description": "聚福宝商城业务组件插件包",
6
6
  "main": "index.js",
@@ -32,6 +32,7 @@
32
32
  v-if="navList.length"
33
33
  class="xd-tab"
34
34
  :height="110"
35
+ :nav-padding="navPadding"
35
36
  :key="tagNameKey"
36
37
  :line-bottom="lineBottom"
37
38
  :footer-style="titleFooterStyle"
@@ -238,6 +239,7 @@
238
239
  titleStyleDesc:{},
239
240
  navRadius:'0',
240
241
  titleTabShadow:'',
242
+ navPadding:{}, //导航内边界
241
243
 
242
244
 
243
245
  //特别推荐
@@ -329,7 +331,8 @@
329
331
  top: (this.layoutInfo.top - 2) + 'rpx',
330
332
  borderRadius: this.navRadius + 'rpx',
331
333
  overflow: 'hidden',
332
- boxShadow:this.titleTabShadow
334
+ boxShadow:this.titleTabShadow,
335
+ padding: this.getMarginAndPadding(this.navPadding,0),
333
336
  }
334
337
  },
335
338
  listPaddingComp(){
@@ -487,6 +490,7 @@
487
490
  this.titleBgcColor = gCPVal(container,'titleBgcColor', '#fff', {sKey:'titleBgcColorStatus',fields:['titleBgcColor']});
488
491
  this.titleColor = gCPVal(container, 'titleColor', '#333');
489
492
  this.titleBorder = gCPVal(container, 'titleBorder', {});
493
+ this.navPadding = gCPVal(container,'navPadding', [0], {sKey:'navPaddingStatus',fields:['navPadding'],isPMR: true});
490
494
  //兼容老写法
491
495
  this.is_title_border = gCPVal(container, 'is_title_border', 'N');
492
496
  this.is_title_border_c = gCPVal(container, 'is_title_border_c', '#fff');
@@ -884,6 +888,7 @@
884
888
  right: 0;
885
889
  background: #fff;
886
890
  z-index: 10000;
891
+ border-radius: 0!important;
887
892
  &-height{
888
893
  height: unit(112, rpx);
889
894
  }
@@ -166,7 +166,39 @@ export default function (data={},gValue={},gColor={},oldData) {
166
166
  size: 'small',
167
167
  groupKey:'style',
168
168
  },
169
-
169
+ {
170
+ label: '导航边距',
171
+ ele: 'xd-radio',
172
+ groupKey: 'style',
173
+ valueKey: 'navPaddingStatus',
174
+ value: statusDataVal({data, key: 'navPaddingStatus', fields:['navPadding'], gValue}),
175
+ labelInline:true,
176
+ list: [
177
+ {label: '默认', value: 'D'},
178
+ {label: '自定义', value: 'C'},
179
+ ]
180
+ },
181
+ {ele: 'group_start'},
182
+ {
183
+ label: '',
184
+ ele: 'xd-margin-padding',
185
+ groupKey:'style',
186
+ valueKey: 'navPadding',
187
+ value: dataVal({
188
+ data,
189
+ key:'navPadding',
190
+ dValue:0,
191
+ gValue,
192
+ isPM: true,
193
+ }),
194
+ hidden: !statusShow({data, key: 'navPaddingStatus', fields:['navPadding'], gValue}),
195
+ labelInline:true,
196
+ setting: {
197
+ type: 'margin',
198
+ },
199
+ inline: false,
200
+ },
201
+ {ele: 'group_end'},
170
202
  {
171
203
  label: '导航名称',
172
204
  ele: 'xd-radio',