Merge branch 'feature/游戏营销' into master

src/views/game/cmh/gameTemplate.vue

@@ -281,9 +281,9 @@ export default {
         5: 'color:#000000'
       },
       bulletTop: {
-        1: 'top: 129px;color: #FFFFFF;',
-        2: 'top: 129px;color: #FFFFFF;',
-        3: 'top: 129px;color: #FFFFFF;',
+        1: 'top: 148px;color: #FFFFFF;',
+        2: 'top: 148px;color: #FFFFFF;',
+        3: 'top: 148px;color: #FFFFFF;',
         5: 'top: 148px;color: #000000;'
       }
     };
@@ -394,7 +394,7 @@ img {
 .integral {
   position: absolute;
   z-index: 2;
-  top: 98px;
+  top: 120px;
   left: 50%;
   transform: translateX(-50%);
   min-width: 120px;

src/views/game/cmh/rule-config.vue

@@ -49,7 +49,7 @@
             </div>
           </div>
           <div v-if="index == 1">
-            <div class="flex mb10"><el-checkbox v-model="item.conditionType" :true-label="0" :false-label="-1" :disabled="isDisabled" @change="$emit('change', { val: item.conditionJson.value, type: item.conditionType })" /> <span class="ml10">消耗积分获得游戏次数</span></div>
+            <div class="flex mb10"><el-checkbox v-model="item.conditionType" :true-label="0" :false-label="-1" :disabled="isDisabled" @change="$emit('change', { val: item.conditionJson.value, type: item.conditionType, id: 0 })" /> <span class="ml10">消耗积分获得游戏次数</span></div>
             <div v-show="item.conditionType == 0">
               <el-form-item label="参与游戏每次消耗积分" label-width="170px" :prop="'gameRuleConditionList.' + index + '.conditionJson.' + 'value'" :rules="{ required: true, message: '请输入积分' }">
                 <el-input-number class="w140" :disabled="isDisabled" placeholder="请输入积分" v-model="item.conditionJson.value" :min="1" :max="1000000" controls-position="right" @change="$emit('change', { val: item.conditionJson.value, type: item.conditionType, id: 0 })" />