jufubao-admin-library 1.1.225 → 1.1.227

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.
@@ -26,6 +26,9 @@
26
26
  :key="renderFormKey"
27
27
  :list="listForm"
28
28
  >
29
+ <template slot="category_ids_notice" slot-scope="scope">
30
+ <div :style="{color:'red',marginLeft: scope.width,fontSize:'12px'}">类目后面的百分比为当前分类下所有商品的平均折扣(仅供参考)</div>
31
+ </template>
29
32
  <template slot="tag">
30
33
  <el-form ref="tagForm" :model="tagForm" :rules="tagRules" label-width="140px">
31
34
  <el-form-item label="按标签:" prop="zTag">
@@ -325,6 +325,10 @@ export default {
325
325
  value: params.product_type || [],
326
326
  list: this.getConfigOptions('product_type', this.productTypeList)
327
327
  },
328
+ this.checkConfig('category_ids') && {
329
+ slot: 'category_ids_notice',
330
+ ele: 'slot'
331
+ },
328
332
  this.checkConfig('category_ids') && {
329
333
  label: "按类目",
330
334
  ele: "xd-remote-cascader-panel",
@@ -333,6 +337,7 @@ export default {
333
337
  className: "input70",
334
338
  setting: {
335
339
  multiple: false,
340
+ notice: '请选择按类目',
336
341
  },
337
342
  handleCustom: ({ action, data }) => {
338
343
  this.handleRemoteCategorySearch(data)
@@ -429,6 +434,22 @@ export default {
429
434
  },
430
435
  ],
431
436
  },
437
+ this.channelParams.scene === "select" &&{
438
+ label: "快递服务:",
439
+ ele: "xd-check",
440
+ valueKey: "delivery_exp_service",
441
+ value: params.delivery_exp_service || [],
442
+ list: [
443
+ {
444
+ label:'普通快递',
445
+ value:'STD'
446
+ },
447
+ {
448
+ label:'送货上门',
449
+ value:'DTD'
450
+ },
451
+ ],
452
+ },
432
453
  this.channelParams.scene === "select" &&{
433
454
  label: "按节假日发货:",
434
455
  ele: "xd-check",
@@ -134,7 +134,7 @@ export default {
134
134
  randomKey: 'randomKey',
135
135
  setFormList: [],
136
136
  setFormParams: null,
137
- optionsData: [],
137
+ optionsData: {},
138
138
  frequencyTimeData: [
139
139
  {label:'00:00',value:'00:00'},{label:'01:00',value:'01:00'},{label:'02:00',value:'02:00'},{label:'03:00',value:'03:00'},{label:'04:00',value:'04:00'},{label:'05:00',value:'05:00'},{label:'06:00',value:'06:00'},{label:'07:00',value:'07:00'},{label:'08:00',value:'08:00'},
140
140
  {label:'09:00',value:'09:00'},{label:'10:00',value:'10:00'},{label:'11:00',value:'11:00'},{label:'12:00',value:'12:00'},{label:'13:00',value:'13:00'},{label:'14:00',value:'14:00'},{label:'15:00',value:'15:00'},{label:'16:00',value:'16:00'},
@@ -377,7 +377,7 @@ export default {
377
377
  ele: 'xd-radio',
378
378
  valueKey: 'notify_mode',
379
379
  value: params.notify_mode || 'default',
380
- list: this.optionsData['notify_mode_list'],
380
+ list: this.optionsData['notify_mode_list'] || [],
381
381
  rules: [
382
382
  { required: true, message: '请选择通知设置', trigger: 'change' },
383
383
  ]
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-admin-library",
3
- "version": "1.1.225",
3
+ "version": "1.1.227",
4
4
  "description": "聚福宝福利后台管理系统公共模块",
5
5
  "author": "goashiyong <gaoshiyong1272@vip.163.com>",
6
6
  "scripts": {