jufubao-admin-library 1.1.215 → 1.1.217

package/library/pageComponents/modules/lib/JfbRuleCreate.js

@@ -158,6 +158,18 @@ export default {
           data['CARD_CITY_is_hide_other_card'] = data['is_hide_other_card'];
           delete data['is_hide_other_card']
         }
+      } else if(data.adjust_type==='CARD_CINE') {
+        if (data['valid_data']) {
+          let valid_data = this.getParseJSON(data.valid_data)
+          data.card= valid_data.card
+          data.cine=valid_data.cine
+          delete data.valid_data
+        }
+        //设置是否隐藏其他号段
+        if(data['is_hide_other_card']) {
+          data['CARD_CINE_is_hide_other_card'] = data['is_hide_other_card'];
+          delete data['is_hide_other_card']
+        }
       } else {
         let adjust_type_key = `${data.adjust_type}_valid_data`
         if (data['valid_data']) {
@@ -815,6 +827,7 @@ export default {
             { "label": "按影院", "value": 'CINE' },
             { "label": "按号段加城市", "value": 'CARD_CITY' },
             this.JfbParent.isShowTypeMove && { "label": "按影片", "value": 'FILM' },
+            this.JfbParent.isShowTypeMove && { "label": "按号段加影院", "value": 'CARD_CINE' },
           ].filter(i=>i)
         },
 
@@ -910,6 +923,58 @@ export default {
             { "label": "不隐藏", "value": 'N' },
           ],
         },
+        params.adjust_type === 'CARD_CINE' && {
+          label: '按影院:',
+          ele: 'xd-remote-select',
+          valueKey: 'cine',
+          value: params['cine'] || [],
+          className: 'input50',
+          placeholder: '请选择影院',
+          multiple: true,
+          collapseTags: false,
+          remoteSearch: (query, resolve) => {
+            this.movieCinema({
+              status: 1,
+              resource_shop_name: query
+            })
+              .then(res => {
+                let temp = res.data.list.map(item => {
+                  return {
+                    label: item.resource_shop_name,
+                    value: item.resource_shop_id
+                  }
+                })
+                resolve(temp)
+              }).catch()
+          },
+          rules: [
+            { required: true, message: '请选择影院', trigger: 'change' },
+          ]
+        },
+        params.adjust_type === 'CARD_CINE' && {
+          label: '号段:',
+          tips: '注意:开始和结束卡号段必须填写，并且开始卡号必须小于结束开号.',
+          ele: 'xd-range-group',
+          keys: ['start_number', 'end_number'],
+          value: params['card'] || [],
+          defaultValue: params['card'] || [],
+          valueKey: 'card',
+          className: 'input50',
+          placeholder: ['开始卡号', '结束卡号'],
+          rules: [
+            { required: true, message: '请输入号段', trigger: ['blur', 'change'] }
+          ]
+        },
+        params.adjust_type === 'CARD_CINE' && {
+          label: '是否隐藏其他卡号:',
+          ele: 'xd-radio',
+          valueKey: 'CARD_CINE_is_hide_other_card',
+          value: params['CARD_CINE_is_hide_other_card'] || 'N',
+          list: [
+            { "label": "隐藏", "value": 'Y' },
+            { "label": "不隐藏", "value": 'N' },
+          ],
+        },
         params.adjust_type === 'CITY' && {
           label: '按城市:',
           placeholder: '请选择城市',
@@ -1405,6 +1470,10 @@ export default {
         data['is_hide_other_card'] = data['CARD_is_hide_other_card'];
         delete data['CARD_is_hide_other_card']
       }
+      if(data['CARD_CINE_is_hide_other_card']) {
+        data['is_hide_other_card'] = data['CARD_CINE_is_hide_other_card'];
+        delete data['CARD_CINE_is_hide_other_card']
+      }
 
       if(data.adjust_type === 'CARD_CITY') {
         data['valid_data'] = {
@@ -1413,6 +1482,13 @@ export default {
         }
         delete data['city']
         delete data['card']
+      } else if(data.adjust_type === 'CARD_CINE') {
+        data['valid_data'] = {
+          cine:data['cine'],
+          card:data['card']
+        }
+        delete data['cine']
+        delete data['card']
       }
 
       if (data[adjust_type_key]) {

package/library/viewModules/viewsPrize/viewsPrize/create.vue

@@ -18,7 +18,12 @@
         <template slot="prize_set" slot-scope="scope">
           <el-form ref="form" :model="form" label-width="140px">
             <el-form-item label="奖品设置" required>
+             <!-- #ifdef saas-admin  -->
+              <prize-set :list="prizeSetList" :site_id="siteId" @tableUpdate="handleChange" @tableNumChange="handleNumChange" :key="prizeSetKey"></prize-set>
+            <!-- #endif -->
+            <!-- #ifdef sms-prize -->
               <prize-set v-if="siteId" :list="prizeSetList" :site_id="siteId" @tableUpdate="handleChange" @tableNumChange="handleNumChange" :key="prizeSetKey"></prize-set>
+            <!-- #endif -->
             </el-form-item>
           </el-form>
         </template>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-admin-library",
-  "version": "1.1.215",
+  "version": "1.1.217",
   "description": "聚福宝福利后台管理系统公共模块",
   "author": "goashiyong <gaoshiyong1272@vip.163.com>",
   "scripts": {