jufubao-admin-library 1.1.39 → 1.1.40

package/library/pageComponents/modules/JfbRuleCreate.vue

@@ -29,20 +29,20 @@
       <template slot="tag">
         <el-form ref="tagForm" :model="tagForm" :rules="tagRules" label-width="140px">
           <el-form-item label="按标签:" prop="zTag">
-            <el-checkbox-group 
+            <el-checkbox-group
               v-model="tagForm.zTag"
               >
               <el-checkbox :disabled="zChooseData.includes(item.value)" v-for="(item,index) in tagData" :label="item.value" :key="index">{{item.label}}</el-checkbox>
             </el-checkbox-group>
             <!-- <div style="display:flex">
               <div class="mr10">反选标签</div>
-              <el-checkbox-group 
+              <el-checkbox-group
                 v-model="tagForm.fTag"
                 >
                 <el-checkbox :disabled="tagForm.zTag.includes(item.value)||fChooseData.includes(item.value)"  v-for="(item,index) in tagData" :label="item.value" :key="index">{{item.label}}</el-checkbox>
               </el-checkbox-group>
             </div> -->
-          </el-form-item> 
+          </el-form-item>
         </el-form>
       </template>
       <template slot="time">
@@ -76,7 +76,7 @@
             <i v-if="(index + 1) === handTimeOptions.length" class="el-icon-circle-plus ml5" @click="add(item)" ></i>
             <i v-if="handTimeOptions.length > 1" class="el-icon-remove ml5" @click="remove(index)"></i>
           </div>
-        </el-form-item> 
+        </el-form-item>
       </template>
 			</xd-base-dynamic-field>
 			<div class="adjust-btn" style="margin-left: 140px">
@@ -85,14 +85,14 @@
 			</div>
 		</div>
 	</div>
-	
+
 </template>
 
 <script>
 	import JfbRuleCreate from "./lib/JfbRuleCreate";
   import XdBaseDynamicField from "@/components/XdBaseDynamicField";
   import {mapState} from 'vuex';
-	
+
   export default {
     name: "JfbRuleCreate",
 		components:{
@@ -106,12 +106,12 @@
         //渠道
         channelActiveName: '',
         channelTabList: [],
-				
+
 				//提交对象
         listForm: [],
         listValue: {},
         renderFormKey: 'renderFormKey',
-				
+
 				policySettingObj : {},
         tagForm:{
           zTag:[],
@@ -130,73 +130,73 @@
         handTimeOptions:[{start:'',end:''}],
         timeList:[
           {
-            lebel:'1',
+            label:'1',
             value:'1',
           },{
-            lebel:'2',
+            label:'2',
             value:'2',
           },{
-            lebel:'3',
+            label:'3',
             value:'3',
           },{
-            lebel:'4',
+            label:'4',
             value:'4',
           },{
-            lebel:'5',
+            label:'5',
             value:'5',
           },{
-            lebel:'6',
+            label:'6',
             value:'6',
           },{
-            lebel:'7',
+            label:'7',
             value:'7',
           },{
-            lebel:'8',
+            label:'8',
             value:'8',
           },{
-            lebel:'9',
+            label:'9',
             value:'9',
           },{
-            lebel:'10',
+            label:'10',
             value:'10',
           },{
-            lebel:'11',
+            label:'11',
             value:'11',
           },{
-            lebel:'12',
+            label:'12',
             value:'12',
           },{
-            lebel:'13',
+            label:'13',
             value:'13',
           },{
-            lebel:'14',
+            label:'14',
             value:'14',
           },{
-            lebel:'15',
+            label:'15',
             value:'15',
           },{
-            lebel:'16',
+            label:'16',
             value:'16',
           },{
-            lebel:'17',
+            label:'17',
             value:'17',
           },{
-            lebel:'18',
+            label:'18',
             value:'18',
           },{
-            lebel:'19',
+            label:'19',
             value:'19',
           },{
-            lebel:'20',
+            label:'20',
             value:'20',
           },{
-            lebel:'21',
+            label:'21',
             value:'21',
           },{
-            lebel:'22',
+            label:'22',
             value:'22',
           },{
-            lebel:'23',
+            label:'23',
             value:'23',
           },
         ]
@@ -210,13 +210,14 @@
       btnName(){
         return this.select_policy_id ? '更新': '提交';
 			},
-			
+
 			isMovie(){
+        let isOldMovie = /^(\/movies\/).+$/.test(this.$route.path);
         let scene = false;
         if(this.channelParams && this.channelParams.scene && this.channelParams.scene  === 'modifyprice'){
           scene = true;
-				}
-        return this.commonParams.xnamespace === 'movie' && scene;
+        }
+        return this.commonParams.xnamespace === 'movie' && scene && isOldMovie ;
 			},
       select_policy_setting_params() {
         return {
@@ -225,11 +226,11 @@
 				}
       }
     },
-		
+
 		async created(){
-  
+
 		},
-		
+
 		methods:{
       /**
 			 * @description 获取编辑数据
@@ -254,7 +255,7 @@
               }
             }
 					}
-          
+
           //非电影初始化
           else{
             let {conditions, options, agg_channel_code,formula, ...other} = res.data;
@@ -280,7 +281,7 @@
                   this.$xdHelper.divisionFloatNumber(conditions.discount_ratio.max, 100) : ""
               }
             }
-            
+
             //折扣设置
 						let formulaData = {};
 						if(formula && formula.sale_price) {
@@ -308,10 +309,10 @@
           //非电影设置渠道选择值
           if (!this.isMovie) this.channelActiveName = this.channelTabList[0]['value'];
 				}
-        
+
         //初始化表单
 				this.handleTabClick(formData);
-				
+
       },
       /**
        * @description 初始化表单
@@ -327,7 +328,7 @@
           this.initForm(params);
           return
 				}
-        
+
         //设置公共参数
         let commonConfig = {sort: {"enabled": true}};
         if(this.channelParams.scene === 'modifyprice') {
@@ -352,11 +353,11 @@
             }
           }
 				}
-        
+
         let loading = this.$loading({});
         try {
           let policySettingObj = await this.getRoleSetting(this.select_policy_setting_params);
-					
+
 					//售价选项卡设置
 					if(policySettingObj.data && policySettingObj.data.formula
 						&& policySettingObj.data.formula.options
@@ -364,7 +365,7 @@
 					) {
             commonConfig['sale_price_base'] = policySettingObj.data.formula;
           }
-					
+
           this.policySettingObj = Object.assign({},commonConfig,policySettingObj.data.conditions) ;
           console.log('aaaaaa')
           if(this.policySettingObj['partner_product_tags']){
@@ -399,10 +400,10 @@
           this.policySettingObj = Object.assign({}, commonConfig);
           console.error(e)
           throw Error(`获取配置错误：policySetting`);
-          
+
         }
         this.initForm(params);
-        
+
 			},
 
       /**
@@ -433,7 +434,7 @@
                 postData.valid_week_hours = JSON.stringify(noData)
               }
             }
-            
+
             let fn = 'createRole';
             let params = {
               item: postData,
@@ -456,10 +457,10 @@
                  }
               }
             }
-            
+
             // console.log(params)
             // return;
-            
+
             let loading = this.$loading({});
             this[fn](params)
               .then(res => {
@@ -469,12 +470,12 @@
                     this.$bus.$emit('delTags', this.$route)
                   }, 500);
 								}
-                
+
                 //创建与不跳转到首页
                 if(!select_policy_id && isBack === false) {
                   this.initForm({})
 								}
-                
+
                 loading.close()
               })
               .catch(err => {
@@ -504,7 +505,7 @@
       remove(index) {
         this.handTimeOptions.splice(index, 1);
       },
-			
+
 		}
   }
 </script>
@@ -515,52 +516,52 @@
 		::v-deep .el-tabs__nav-wrap {
 			margin-right: 81px;
 		}
-		
+
 		&-back {
 			position: absolute;
 			right: 0;
 			bottom: 23px
 		}
 	}
-	
+
 	::v-deep {
 		.el-tabs--card > .el-tabs__header .el-tabs__item {
 			background: #f8f8f8;
 			border-bottom: 1px solid #dfe4ed !important;
-			
+
 			&.is-top.is-active {
 				&:first-child {
 					border-radius: 2px 0 0 0;
 				}
-				
+
 				&:last-child {
 					border-radius: 0 2px 0 0;
 				}
-				
+
 				background: $blue;
 				border-bottom: 1px solid $blue !important;
 				color: #fff !important;
 			}
 		}
 	}
-	
+
 	@media screen and (max-width: 768px) {
 		::v-deep {
 			& .el-tabs__item {
 				height: 30px;
 				line-height: 30px;
 			}
-			
+
 			& .el-tabs__nav-next, .el-tabs__nav-prev {
 				line-height: 30px;
 			}
-			
+
 		}
-		
+
 		::v-deep .el-tabs__nav-wrap {
 			margin-right: 61px!important;
 		}
-		
+
 		.app-tab {
 			&-back {
 				bottom: 18px

package/package.json

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