jufubao-mall 2.0.16-beta6 → 2.0.16-beta8

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 (7) hide show
  1. package/package.json +1 -1
  2. package/src/components/JfbMallNewShopList/JfbMallNewShopList.vue +4 -4
  3. package/src/components/JfbMallNewShopList/XdQueryFilter.vue +1 -1
  4. package/src/components/JfbMallNewShopList/cusAttr/content.js +2 -2
  5. package/src/components/JfbMallShop/JfbMallShop.vue +52 -48
  6. package/src/components/JfbMallShop/Mock.js +1 -1
  7. package/src/components/JfbMallShop/cusAttr/content.js +12 -12
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-mall",
3
- "version": "2.0.16-beta6",
3
+ "version": "2.0.16-beta8",
4
4
  "private": false,
5
5
  "description": "聚福宝商城业务组件插件包",
6
6
  "main": "index.js",
package/src/components/JfbMallNewShopList/JfbMallNewShopList.vue CHANGED
@@ -17,7 +17,7 @@
17
17
  <!-- #endif -->
18
18
  <view class="jfb-mall-new-shop-list__body" >
19
19
  <!--搜索条件-->
20
- <view v-if="showQuery === 'Y' && isFixed" :style="{height:cateFixedHeight + 'rpx'}"></view>
20
+ <view v-if="showQuery === 'Y' && isFixed && searchFilterList.length > 0" :style="{height:cateFixedHeight + 'rpx'}"></view>
21
21
  <view
22
22
  class="query_wrap"
23
23
  :class="{isFixed:isFixed}"
@@ -304,7 +304,7 @@
304
304
  this.cusContent = cusContent;
305
305
 
306
306
  //style
307
- let sValue = `{"cardItemSpace":16,"margin":{"bottom":16,"left":0,"right":0,"top":16},"backgroundColor":"rgba(245, 245, 245, 1)"}`
307
+ let sValue = `{"cardItemSpace":16,"margin":{"bottom":16,"left":16,"right":16,"top":16},"backgroundColor":"rgba(245, 245, 245, 1)"}`
308
308
  let shopStyle = this.getRelationStatus(container,'shopStyle', { cardItemSpaceStatus:['cardItemSpace'],bodyPaddingStatus:['bodyPadding']}, sValue);
309
309
  this.bodyPadding = gCPVal(container,'bodyPadding', [{ bottom:0,left:16, right:16,top:16}], {sKey:'bodyPaddingStatus',fields:['bodyPadding'],cusFields: ['shopStyle','margin',shopStyle],isPMR: true});
310
310
  this.contentBgColor = gCPVal(container,'contentBgColor', '#f8f8f8', {sKey:'contentBgColorStatus',fields:['contentBgColor']});
@@ -518,8 +518,6 @@
518
518
  keyword: this.keyword,
519
519
  city_code: this.stateCity.city_code,
520
520
  type:'sell',
521
- filter_item: this.filterMode.filter(item=>item !== 'filter').join(','),
522
-
523
521
  }
524
522
  jfbRootExec("getNewSearchFilterList", {
525
523
  vm: this,
@@ -663,6 +661,8 @@
663
661
  &_title {
664
662
  text-align: center;
665
663
  flex: 1;
664
+ font-size: 28rpx;
665
+ color: #333;
666
666
  }
667
667
 
668
668
  &_item {
package/src/components/JfbMallNewShopList/XdQueryFilter.vue CHANGED
@@ -93,7 +93,7 @@ export default {
93
93
  };
94
94
  },
95
95
  boxListComp(){
96
- let maxHeight = this.$root.layoutInfo['bodyMinHeightRpx'] - 180;
96
+ let maxHeight = this.$root.layoutInfo['bodyMinHeightRpx'] - 400;
97
97
  if(this.$configProject.isPreview) maxHeight = 800;
98
98
  return {
99
99
  backgroundColor: this.filterStyle['filterListColor'] || '#f8f8f8',
package/src/components/JfbMallNewShopList/cusAttr/content.js CHANGED
@@ -127,13 +127,13 @@ export default (data, gValue, gColor, oldData={})=>{
127
127
  key: 'shopStyle',
128
128
  fields: checkFieldsBg,
129
129
  gValue,
130
- sValue:`{"cardItemSpace":16,"margin":{"bottom":16,"left":0,"right":0,"top":16},"backgroundColor":"rgba(245, 245, 245, 1)"}`,
130
+ sValue:`{"cardItemSpace":16,"margin":{"bottom":16,"left":16,"right":16,"top":16},"backgroundColor":"rgba(245, 245, 245, 1)"}`,
131
131
  }),
132
132
  labelInline:true,
133
133
  className: 'input100',
134
134
  handleCustom(cusRes) {
135
135
  XdBus.getParentApi('getCompStylesOptions')({
136
- layout_ids: 'HRpFvIp2mhuIUZujv9dnR',
136
+ layout_ids: '0kzfDGB7TKSmh5z2KTKH4',
137
137
  key: Date.now()
138
138
  })
139
139
  .then(res => {
package/src/components/JfbMallShop/JfbMallShop.vue CHANGED
@@ -67,60 +67,62 @@
67
67
  </view>
68
68
  <view class="shop_exchange_box">
69
69
  <template v-for="item in shopInfo.consume_options">
70
- <view v-if="item.consume_mode === 'WB' && showScan === 'Y'" class="shop_wrap-exchange" :key="item.consume_mode">
71
- <view class="shop_wrap-exchange_txt">
72
- <view class="exchange_name">{{scanName}}</view>
73
- <view class="exchange_desc">{{item.desc}}</view>
74
- </view>
75
- <view class="shop_wrap-exchange_btn">
76
- <xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{ scanBtnName }}</xd-button>
77
- </view>
78
- </view>
79
- <view v-if="item.consume_mode === 'JHD' && showExchange==='Y'" class="shop_wrap-exchange" :key="item.consume_mode">
80
- <view class="shop_wrap-exchange_txt">
81
- <view class="exchange_name">{{ exchangeName }}</view>
82
- <view class="exchange_desc">{{item.desc}}</view>
83
- </view>
84
- <view class="shop_wrap-exchange_btn">
85
- <xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{exchangeBtnName}}</xd-button>
86
- </view>
87
- </view>
88
- <view v-if="item.consume_mode === 'QP' && showTake === 'Y'" class="shop_wrap-exchange" :key="item.consume_mode">
89
- <view class="shop_wrap-exchange_txt">
90
- <view class="exchange_name">{{takeName}}</view>
91
- <view class="exchange_desc">{{item.desc}}</view>
92
- </view>
93
- <view class="shop_wrap-exchange_btn">
94
- <xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{takeBtnName}}</xd-button>
95
- </view>
96
- </view>
97
- <view v-if="item.consume_mode === 'SEAT' && showMovie === 'Y'" class="shop_wrap-exchange" :key="item.consume_mode">
98
- <view class="shop_wrap-exchange_txt">
99
- <view class="exchange_name">{{movieName}}</view>
100
- <view class="exchange_desc">{{item.desc}}</view>
70
+ <template v-if="isPreview || shopInfo.default_consume_type === item.consume_mode">
71
+ <view v-if="item.consume_mode === 'WB' && showScan === 'Y'" class="shop_wrap-exchange" :key="item.consume_mode">
72
+ <view class="shop_wrap-exchange_txt">
73
+ <view class="exchange_name">{{scanName}}</view>
74
+ <view class="exchange_desc">{{item.desc}}</view>
75
+ </view>
76
+ <view class="shop_wrap-exchange_btn">
77
+ <xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{ scanBtnName }}</xd-button>
78
+ </view>
101
79
  </view>
102
- <view class="shop_wrap-exchange_btn">
103
- <xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{ movieBtnName }}</xd-button>
80
+ <view v-if="item.consume_mode === 'JHD' && showExchange==='Y'" class="shop_wrap-exchange" :key="item.consume_mode">
81
+ <view class="shop_wrap-exchange_txt">
82
+ <view class="exchange_name">{{ exchangeName }}</view>
83
+ <view class="exchange_desc">{{item.desc}}</view>
84
+ </view>
85
+ <view class="shop_wrap-exchange_btn">
86
+ <xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{exchangeBtnName}}</xd-button>
87
+ </view>
104
88
  </view>
105
- </view>
106
- <view v-if="item.consume_mode === 'HDSELF' && showFood === 'Y'" class="shop_wrap-exchange" :key="item.consume_mode">
107
- <view class="shop_wrap-exchange_txt">
108
- <view class="exchange_name">{{foodName}}</view>
109
- <view class="exchange_desc">{{item.desc}}</view>
89
+ <view v-if="item.consume_mode === 'QP' && showTake === 'Y'" class="shop_wrap-exchange" :key="item.consume_mode">
90
+ <view class="shop_wrap-exchange_txt">
91
+ <view class="exchange_name">{{takeName}}</view>
92
+ <view class="exchange_desc">{{item.desc}}</view>
93
+ </view>
94
+ <view class="shop_wrap-exchange_btn">
95
+ <xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{takeBtnName}}</xd-button>
96
+ </view>
110
97
  </view>
111
- <view class="shop_wrap-exchange_btn">
112
- <xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{foodBtnName}}</xd-button>
98
+ <view v-if="item.consume_mode === 'SEAT' && showMovie === 'Y'" class="shop_wrap-exchange" :key="item.consume_mode">
99
+ <view class="shop_wrap-exchange_txt">
100
+ <view class="exchange_name">{{movieName}}</view>
101
+ <view class="exchange_desc">{{item.desc}}</view>
102
+ </view>
103
+ <view class="shop_wrap-exchange_btn">
104
+ <xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{ movieBtnName }}</xd-button>
105
+ </view>
113
106
  </view>
114
- </view>
115
- <view v-if="item.consume_mode === 'TRAVEL' && showTravel === 'Y'" class="shop_wrap-exchange" :key="item.consume_mode">
116
- <view class="shop_wrap-exchange_txt">
117
- <view class="exchange_name">{{ travelName }}</view>
118
- <view class="exchange_desc">{{item.desc}}</view>
107
+ <view v-if="item.consume_mode === 'HDSELF' && showFood === 'Y'" class="shop_wrap-exchange" :key="item.consume_mode">
108
+ <view class="shop_wrap-exchange_txt">
109
+ <view class="exchange_name">{{foodName}}</view>
110
+ <view class="exchange_desc">{{item.desc}}</view>
111
+ </view>
112
+ <view class="shop_wrap-exchange_btn">
113
+ <xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{foodBtnName}}</xd-button>
114
+ </view>
119
115
  </view>
120
- <view class="shop_wrap-exchange_btn">
121
- <xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{travelBtnName}}</xd-button>
116
+ <view v-if="item.consume_mode === 'TRAVEL' && showTravel === 'Y'" class="shop_wrap-exchange" :key="item.consume_mode">
117
+ <view class="shop_wrap-exchange_txt">
118
+ <view class="exchange_name">{{ travelName }}</view>
119
+ <view class="exchange_desc">{{item.desc}}</view>
120
+ </view>
121
+ <view class="shop_wrap-exchange_btn">
122
+ <xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{travelBtnName}}</xd-button>
123
+ </view>
122
124
  </view>
123
- </view>
125
+ </template>
124
126
  </template>
125
127
  </view>
126
128
  <view v-if="isShowCodeProduct && productList.length" class="code_product_wrap">
@@ -223,6 +225,7 @@
223
225
  spacing:32,
224
226
  alphaColor: "",
225
227
  is_plus_site: false,
228
+ isPreview: false,
226
229
 
227
230
  errorStatus: false,
228
231
  errorImage:'https://img0.jufubao.cn/common/empty/shop.png?v1=1',
@@ -406,6 +409,7 @@
406
409
  this.init(this.container);
407
410
  this.is_plus_site = this.projectAttr.headers['X-Site-Group']==="vip";
408
411
  this.alphaColor = Color(this.mainColor).alpha(0.1).toString();
412
+ this.isPreview = this.$configProject.isPreview;
409
413
  },
410
414
  methods: {
411
415
  onJfbLoad(options) {
package/src/components/JfbMallShop/Mock.js CHANGED
@@ -25,7 +25,7 @@ module.exports = {
25
25
  "xsd",
26
26
  "travel"
27
27
  ],
28
- default_consume_type: "CV",
28
+ default_consume_type: "JHD",
29
29
  is_support_jhd: true,
30
30
  resource_shop_name: "福司令渠道门店",
31
31
  brand_about: "福司令渠道门店品牌描述内容",
package/src/components/JfbMallShop/cusAttr/content.js CHANGED
@@ -102,7 +102,7 @@ export default function (data, gValue,gColor,oldData){
102
102
  className: 'input80',
103
103
  placeholder: "聚好兑",
104
104
  inline: false,
105
- max: 5,
105
+ max: 4,
106
106
  },
107
107
  {
108
108
  label: '标题',
@@ -114,7 +114,7 @@ export default function (data, gValue,gColor,oldData){
114
114
  groupKey: 'content',
115
115
  className: 'input80',
116
116
  inline: false,
117
- max: 5,
117
+ max: 4,
118
118
  placeholder: "聚好兑"
119
119
  },
120
120
  { ele: 'group_end' },
@@ -144,7 +144,7 @@ export default function (data, gValue,gColor,oldData){
144
144
  groupKey: 'content',
145
145
  className: 'input80',
146
146
  placeholder: "扫一扫",
147
- max: 5,
147
+ max: 4,
148
148
  inline: false
149
149
  },
150
150
  {
@@ -157,7 +157,7 @@ export default function (data, gValue,gColor,oldData){
157
157
  groupKey: 'content',
158
158
  className: 'input80',
159
159
  inline: false,
160
- max: 5,
160
+ max: 4,
161
161
  placeholder: "扫码提货"
162
162
  },
163
163
  { ele: 'group_end' },
@@ -187,7 +187,7 @@ export default function (data, gValue,gColor,oldData){
187
187
  groupKey: 'content',
188
188
  className: 'input80',
189
189
  placeholder: "去提货",
190
- max: 5,
190
+ max: 4,
191
191
  inline: false
192
192
  },
193
193
  {
@@ -200,7 +200,7 @@ export default function (data, gValue,gColor,oldData){
200
200
  groupKey: 'content',
201
201
  className: 'input80',
202
202
  inline: false,
203
- max: 5,
203
+ max: 4,
204
204
  placeholder: "快捷提货"
205
205
  },
206
206
  { ele: 'group_end' },
@@ -230,7 +230,7 @@ export default function (data, gValue,gColor,oldData){
230
230
  groupKey: 'content',
231
231
  className: 'input80',
232
232
  placeholder: "去订票",
233
- max: 5,
233
+ max: 4,
234
234
  inline: false
235
235
  },
236
236
  {
@@ -243,7 +243,7 @@ export default function (data, gValue,gColor,oldData){
243
243
  groupKey: 'content',
244
244
  className: 'input80',
245
245
  inline: false,
246
- max: 5,
246
+ max: 4,
247
247
  placeholder: "在线选座"
248
248
  },
249
249
  { ele: 'group_end' },
@@ -288,7 +288,7 @@ export default function (data, gValue,gColor,oldData){
288
288
  groupKey: 'content',
289
289
  className: 'input80',
290
290
  placeholder: "去下单",
291
- max: 5,
291
+ max: 4,
292
292
  inline: false
293
293
  },
294
294
  {
@@ -301,7 +301,7 @@ export default function (data, gValue,gColor,oldData){
301
301
  groupKey: 'content',
302
302
  className: 'input80',
303
303
  inline: false,
304
- max: 5,
304
+ max: 4,
305
305
  placeholder: "到店自取"
306
306
  },
307
307
  { ele: 'group_end' },
@@ -331,7 +331,7 @@ export default function (data, gValue,gColor,oldData){
331
331
  groupKey: 'content',
332
332
  className: 'input80',
333
333
  placeholder: "去订票",
334
- max: 5,
334
+ max: 4,
335
335
  inline: false
336
336
  },
337
337
  {
@@ -344,7 +344,7 @@ export default function (data, gValue,gColor,oldData){
344
344
  groupKey: 'content',
345
345
  className: 'input80',
346
346
  inline: false,
347
- max: 5,
347
+ max: 4,
348
348
  placeholder: "旅游门店"
349
349
  },
350
350
  { ele: 'group_end' },