jufubao-admin-library 1.1.64 → 1.1.65

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.
@@ -76,6 +76,7 @@
76
76
  <i v-if="(index + 1) === handTimeOptions.length" class="el-icon-circle-plus ml5" @click="add(item)" ></i>
77
77
  <i v-if="handTimeOptions.length > 1" class="el-icon-remove ml5" @click="remove(index)"></i>
78
78
  </div>
79
+ <div style="color: red;font-size: 12px;line-height: 18px;">设置后将按每周周几对应时间点调价,例如每周星期五17点~22点调价</div>
79
80
  </el-form-item>
80
81
  </template>
81
82
  </xd-base-dynamic-field>
@@ -127,11 +127,19 @@ export default {
127
127
  },
128
128
 
129
129
  setMovieForm (data) {
130
-
131
- let adjust_type_key = `${data.adjust_type}_valid_data`
132
- if (data['valid_data']) {
133
- data[adjust_type_key] = this.getParseJSON(data.valid_data)
134
- delete data.valid_data
130
+ if(data.adjust_type=='CARD_CITY') {
131
+ if (data['valid_data']) {
132
+ let valid_data = this.getParseJSON(data.valid_data)
133
+ data.card= valid_data.card
134
+ data.city=valid_data.city
135
+ delete data.valid_data
136
+ }
137
+ } else {
138
+ let adjust_type_key = `${data.adjust_type}_valid_data`
139
+ if (data['valid_data']) {
140
+ data[adjust_type_key] = this.getParseJSON(data.valid_data)
141
+ delete data.valid_data
142
+ }
135
143
  }
136
144
  if (data.valid_weeks) data.valid_weeks = this.getParseJSON(data.valid_weeks)
137
145
 
@@ -635,6 +643,7 @@ export default {
635
643
  { "label": "按院线", "value": 'LINE' },
636
644
  { "label": "按号段", "value": 'CARD' },
637
645
  { "label": "按影院", "value": 'CINE' },
646
+ { "label": "按号段加城市", "value": 'CARD_CITY' },
638
647
  this.JfbParent.isShowTypeMove && { "label": "按影片", "value": 'FILM' },
639
648
  ].filter(i=>i)
640
649
  },
@@ -693,6 +702,34 @@ export default {
693
702
  { required: false, message: '请选择院线', trigger: 'change' },
694
703
  ]
695
704
  },
705
+ params.adjust_type === 'CARD_CITY' && {
706
+ label: '按城市:',
707
+ placeholder: '请选择城市',
708
+ ele: 'xd-select-list',
709
+ valueKey: 'city',
710
+ value: params['city'] || [],
711
+ multiple: true,
712
+ collapseTags: false,
713
+ className: 'input50',
714
+ list: this.cityList,
715
+ rules: [
716
+ { required: true, message: '请选择城市', trigger: 'change' },
717
+ ]
718
+ },
719
+ params.adjust_type === 'CARD_CITY' && {
720
+ label: '号段:',
721
+ tips: '注意:开始和结束卡号段必须填写,并且开始卡号必须小于结束开号.',
722
+ ele: 'xd-range-group',
723
+ keys: ['start_number', 'end_number'],
724
+ value: params['card'] || [],
725
+ defaultValue: params['card'] || [],
726
+ valueKey: 'card',
727
+ className: 'input50',
728
+ placeholder: ['开始卡号', '结束卡号'],
729
+ rules: [
730
+ { required: true, message: '请输入号段', trigger: ['blur', 'change'] }
731
+ ]
732
+ },
696
733
  params.adjust_type === 'CITY' && {
697
734
  label: '按城市:',
698
735
  placeholder: '请选择城市',
@@ -999,6 +1036,15 @@ export default {
999
1036
  let data = this.$xdHelper.cloneDeep(this.listValue)
1000
1037
  let adjust_type_key = `${data.adjust_type}_valid_data`
1001
1038
 
1039
+ if(data.adjust_type==='CARD_CITY') {
1040
+ data['valid_data'] = {
1041
+ city:data['city'],
1042
+ card:data['card']
1043
+ }
1044
+ delete data['city']
1045
+ delete data['card']
1046
+ }
1047
+
1002
1048
  if (data[adjust_type_key]) {
1003
1049
  data['valid_data'] = data[adjust_type_key]
1004
1050
  delete data[adjust_type_key]
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-admin-library",
3
- "version": "1.1.64",
3
+ "version": "1.1.65",
4
4
  "description": "聚福宝福利后台管理系统公共模块",
5
5
  "author": "goashiyong <gaoshiyong1272@vip.163.com>",
6
6
  "scripts": {