jufubao-admin-library 1.1.110 → 1.1.112

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.
@@ -81,6 +81,20 @@
81
81
  <template slot="resource_shop_name" slot-scope="scope">
82
82
  <div>{{scope.row.resource_shop_name?scope.row.resource_shop_name:'-'}}</div>
83
83
  </template>
84
+ <template slot="discount" slot-scope="scope">
85
+ <div>
86
+ <div v-if="scope.row.max_discount!=='-1'&&scope.row.min_discount!=='-1'">
87
+ <div>平台折扣:</div>
88
+ <div>最高:{{scope.row.max_discount/100}}%</div>
89
+ <div>最低:{{scope.row.min_discount/100}}%</div>
90
+ </div>
91
+ <div v-if="scope.row.purchase_max_discount!=='-1'&&scope.row.purchase_min_discount!=='-1'">
92
+ <div>货源折扣:</div>
93
+ <div>最高:{{scope.row.purchase_max_discount/100}}%</div>
94
+ <div>最低:{{scope.row.purchase_min_discount/100}}%</div>
95
+ </div>
96
+ </div>
97
+ </template>
84
98
  </xd-table>
85
99
  </div>
86
100
  <div class="app-container__list-pagination">
@@ -213,9 +227,8 @@ export default {
213
227
  { "type": "normal", "prop": "resource_shop_name", "align": "center", "label": "关联后门店名称" },
214
228
  { "type": "normal", "prop": "shop_id", "align": "center", "label": "门店ID" },
215
229
  { "type": "normal", "prop": "shop_name", "align": "center", "label": "门店名称" },
216
- // #ifndef partner-movie
217
230
  { "type": "image", "prop": "shop_icon", "align": "center", "width": 100, "height": 100, "label": "门店logo" },
218
- // #endif
231
+ { "type": "normal", "prop": "discount", "align": "center","width": 150, "label": "门店折扣" },
219
232
  { "type": "normal", "prop": "brand_type_name", "align": "center", "label": "门店类型" },
220
233
  { "type": "normal", "prop": "business_status_name", "align": "center", "label": "营业状态" },
221
234
  { "type": "normal", "prop": "brand_name", "align": "center", "label": "门店品牌" },
@@ -333,6 +346,11 @@ export default {
333
346
  page_token: this.currentPage,
334
347
  page_size: this.limit
335
348
  }
349
+ if (params.filters['discount']) {
350
+ if (!params.filters['discount']['type'] || (!params.filters['discount']['max']&&params.filters['discount']['max']!==0) || (!params.filters['discount']['min']&&params.filters['discount']['min']!==0)) {
351
+ delete params.filters['discount']
352
+ }
353
+ }
336
354
  if(type==='count'){
337
355
  params.data_type = type
338
356
  }
@@ -386,6 +404,36 @@ export default {
386
404
  value: '',
387
405
  placeholder: '请输入门店名称'
388
406
  },
407
+ this.checkEnabled(options,'discount')&&{
408
+ label: "门店折扣:", //label
409
+ ele: "xd-input-range", //package 名称
410
+ valueKey: "discount", //form[valueKey]
411
+ labelSlot:'按大于等于最低折扣,小于最高折扣(不含)进行搜索',
412
+ value: {},
413
+ disabled: false,
414
+ setting: {
415
+ /**单位显示**/
416
+ //图标优先于文字单位
417
+ unit: "%",
418
+
419
+ //图标参考element ui 或者 iconfont库
420
+ // icon: "xd_admin_iconfont xdicon_jiage",
421
+
422
+ /**选择条件显示**/
423
+ selectWidth: "110px",
424
+ selectMultiple: false,
425
+ selectPlaceholder: "请选择",
426
+ className: "input60",
427
+ //是否启动条件选择
428
+ select: options['discount_type']['options'],
429
+ isPrice:true,
430
+ },
431
+ maps: {
432
+ start: "min",
433
+ end: "max",
434
+ select: "type",
435
+ },
436
+ },
389
437
  this.checkEnabled(options,'brand_type')&&{
390
438
  label: "门店类型:",
391
439
  ele: "xd-select-list",
@@ -82,6 +82,20 @@
82
82
  <div v-for="(item,index) in scope.row.down_consume_mode_name" :key="index">{{item}}<span style="color:red">(已下架)</span></div>
83
83
  </div>
84
84
  </template>
85
+ <template slot="discount" slot-scope="scope">
86
+ <div>
87
+ <div v-if="scope.row.max_discount!=='-1'&&scope.row.min_discount!=='-1'">
88
+ <div>平台折扣:</div>
89
+ <div>最高:{{scope.row.max_discount/100}}%</div>
90
+ <div>最低:{{scope.row.min_discount/100}}%</div>
91
+ </div>
92
+ <div v-if="scope.row.purchase_max_discount!=='-1'&&scope.row.purchase_min_discount!=='-1'">
93
+ <div>货源折扣:</div>
94
+ <div>最高:{{scope.row.purchase_max_discount/100}}%</div>
95
+ <div>最低:{{scope.row.purchase_min_discount/100}}%</div>
96
+ </div>
97
+ </div>
98
+ </template>
85
99
  </xd-table>
86
100
  </div>
87
101
  <div class="app-container__list-pagination">
@@ -306,9 +320,8 @@ export default {
306
320
  { "type": "normal", "prop": "resource_shop_name", "align": "center", "label": "关联后门店名称" },
307
321
  this.storeType!=='AGG'&&this.storeType!=='SEAT'&&this.storeType!=='PRODUCT'&&{ "type": "normal", "prop": "shop_id", "align": "center", "label": "门店ID" },
308
322
  this.storeType!=='AGG'&&this.storeType!=='SEAT'&&this.storeType!=='PRODUCT'&&{ "type": "normal", "prop": "shop_name", "align": "center", "label": "门店名称" },
309
- // #ifndef partner-movie
310
323
  { "type": "image", "prop": "shop_icon", "align": "center", "width": 100, "height": 100, "label": "门店logo" },
311
- // #endif
324
+ this.storeType==='SELL'&&{ "type": "normal", "prop": "discount", "align": "center","width": 150, "label": "门店折扣" },
312
325
  { "type": "normal", "prop": "brand_type_name", "align": "center", "label": "门店类型" },
313
326
  this.storeType!=='AGG'&&{ "type": "normal", "prop": "select_from_name", "align": "center", "label": "选店来源" },
314
327
  this.storeType!=='AGG'&&this.storeType!=='SEAT'&&{ "type": "normal", "prop": "business_status_name", "align": "center", "label": "营业状态" },
@@ -456,6 +469,11 @@ export default {
456
469
  page_token: this.currentPage,
457
470
  page_size: this.limit
458
471
  }
472
+ if (params.filters['discount']) {
473
+ if (!params.filters['discount']['type'] || (!params.filters['discount']['max']&&params.filters['discount']['max']!==0) || (!params.filters['discount']['min']&&params.filters['discount']['min']!==0)) {
474
+ delete params.filters['discount']
475
+ }
476
+ }
459
477
  if(type==='count'){
460
478
  params.data_type = type
461
479
  }
@@ -511,6 +529,36 @@ export default {
511
529
  value: '',
512
530
  placeholder: '请输入门店名称'
513
531
  },
532
+ this.checkEnabled(options,'discount')&&{
533
+ label: "门店折扣:", //label
534
+ ele: "xd-input-range", //package 名称
535
+ valueKey: "discount", //form[valueKey]
536
+ labelSlot:'按大于等于最低折扣,小于最高折扣(不含)进行搜索',
537
+ value: {},
538
+ disabled: false,
539
+ setting: {
540
+ /**单位显示**/
541
+ //图标优先于文字单位
542
+ unit: "%",
543
+
544
+ //图标参考element ui 或者 iconfont库
545
+ // icon: "xd_admin_iconfont xdicon_jiage",
546
+
547
+ /**选择条件显示**/
548
+ selectWidth: "110px",
549
+ selectMultiple: false,
550
+ selectPlaceholder: "请选择",
551
+ className: "input60",
552
+ //是否启动条件选择
553
+ select: options['discount_type']['options'],
554
+ isPrice:true,
555
+ },
556
+ maps: {
557
+ start: "min",
558
+ end: "max",
559
+ select: "type",
560
+ },
561
+ },
514
562
  (this.storeType==='AGG'||this.storeType==='SEAT'||this.storeType==='PRODUCT')&&{
515
563
  label: '关联后门店名称:',
516
564
  ele: 'el-input',
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-admin-library",
3
- "version": "1.1.110",
3
+ "version": "1.1.112",
4
4
  "description": "聚福宝福利后台管理系统公共模块",
5
5
  "author": "goashiyong <gaoshiyong1272@vip.163.com>",
6
6
  "scripts": {