jufubao-admin-library 1.1.195 → 1.1.196

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.
@@ -582,6 +582,22 @@ export default {
582
582
  },
583
583
  ],
584
584
  },
585
+ (this.$setting.system==='partner-mall'||this.$setting.system==='partner-movie')&&(this.channelParams&&this.channelParams.scene === 'selected')&&{
586
+ label: "是否置顶:", //label
587
+ ele: "xd-select-list", //package 名称
588
+ valueKey: "is_top", //form[valueKey]
589
+ value: [], //v-model
590
+ placeholder: "请选择是否置顶",
591
+ multiple: false, //多选
592
+ className:'input40',
593
+ list: [{
594
+ value:'Y',
595
+ label:'是'
596
+ },{
597
+ value:'N',
598
+ label:'否'
599
+ }],
600
+ },
585
601
  ].filter(i => i);
586
602
  this.searchStatus = true
587
603
  this.renderSearchKey = Date.now()
@@ -34,6 +34,10 @@
34
34
  <template slot="market_price_ratio" slot-scope="inScope">
35
35
  <div v-if="inScope.row.purchase_div_market_discount_ratio">货源:<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.purchase_div_market_discount_ratio, 1000)}}</span>折</div>
36
36
  <div v-if="inScope.row.dist_div_market_discount_ratio">{{$setting['system']==='open-dist'?'分销':'平台'}}:<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.dist_div_market_discount_ratio, 1000)}}</span>折</div>
37
+ </template>
38
+ <template slot="sale_price_ratio" slot-scope="inScope">
39
+ <div v-if="inScope.row.purchase_div_sale_discount_ratio">货源:<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.purchase_div_sale_discount_ratio, 1000)}}</span>折</div>
40
+ <div v-if="inScope.row.dist_div_sale_discount_ratio">{{$setting['system']==='open-dist'?'分销':'平台'}}:<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.dist_div_sale_discount_ratio, 1000)}}</span>折</div>
37
41
  </template>
38
42
  </xd-table>
39
43
  <xd-dialog
@@ -148,6 +152,8 @@
148
152
  this.isShowJfbPriceRatio && {"type": "price", "prop": "jfb_price_ratio", "align": "left", "min-width": 120, "label": "建议售价折扣"},
149
153
  {"type": "price", "prop": "market_price", "align": "center", "min-width": 80, "label": "市场价"},
150
154
  this.isShowMarketPriceRatio && {"type": "price", "prop": "market_price_ratio", "align": "left", "min-width": 120, "label": "市场价折扣"},
155
+ this.isShowSalePrice&&{"type": "price", "prop": "sale_price", "align": "center", "min-width": 80, "label": "售价"},
156
+ this.isShowSalePriceRatio&&{"type": "price", "prop": "sale_price_ratio", "align": "center", "min-width": 140, "label": "售价折扣"},
151
157
  this.isShowOnNum && {"type": "normal", "prop": "on_num", "align": "center", "min-width": 80, "label": "库存"},
152
158
  {"type": "normal", "prop": "weight", "align": "left", "min-width": 80, "label": "重量"},
153
159
  {"type": "normal", "prop": "volume", "align": "left", "min-width": 80, "label": "体积"},
@@ -176,6 +182,8 @@
176
182
  this.isShowJfbPriceRatio = (this.productSkuList[0].specs.purchase_div_jfb_discount_ratio || this.productSkuList[0].specs.dist_div_jfb_discount_ratio)?true:false;
177
183
  this.isShowMarketPriceRatio = (this.productSkuList[0].specs.purchase_div_market_discount_ratio || this.productSkuList[0].specs.dist_div_market_discount_ratio)?true:false;
178
184
  this.isShowOnNum = ((this.productSkuList[0].stocks.on_num && this.productSkuList[0].stocks.on_num!==-1)||this.productSkuList[0].stocks.on_num==0)?true:false;
185
+ this.isShowSalePrice = (this.productSkuList[0].specs.sale_price ||this.productSkuList[0].specs.sale_price==0)?true:false;
186
+ this.isShowSalePriceRatio = (this.productSkuList[0].specs.purchase_div_sale_discount_ratio || this.productSkuList[0].specs.dist_div_sale_discount_ratio)?true:false;
179
187
  }
180
188
  },
181
189
  methods: {
@@ -101,16 +101,7 @@ export default {
101
101
  customRules: {},
102
102
  isMain:true,
103
103
  channelActive: '',
104
- channelTabList:[
105
- {
106
- label:'聚福宝精选',
107
- value:'1'
108
- },
109
- {
110
- label:'聚福宝初筛',
111
- value:'2'
112
- }
113
- ],
104
+ channelTabList:[],
114
105
  ruleOptions:{},
115
106
  brand_type:'',
116
107
  consume_mode:'',
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-admin-library",
3
- "version": "1.1.195",
3
+ "version": "1.1.196",
4
4
  "description": "聚福宝福利后台管理系统公共模块",
5
5
  "author": "goashiyong <gaoshiyong1272@vip.163.com>",
6
6
  "scripts": {