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

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

@@ -7,7 +7,7 @@
       </el-input>
     </el-form-item>
 
-    <el-table :data="prizeForm.gamePrizeList" style="width:100%" row-key="sort" ref="sortTable" row-class-name="table-row">
+    <el-table :data="prizeForm.gamePrizeList" style="width: 100%" row-key="sort" ref="sortTable" row-class-name="table-row">
       <el-table-column width="40" label-class-name="tag-head">
         <template>
           <el-tooltip placement="top" content="拖动排序" trigger="hover" effect="dark" popper-class="drag-tooltip">
@@ -44,9 +44,7 @@
           <div v-else-if="row.prizeType == 1">
             <el-form-item :prop="'gamePrizeList.' + $index + '.' + 'prizeNumber'" :rules="rules.prizeNumber" label-width="0"> <el-input class="inputClass-32" :disabled="isDisabled && row.isOld" v-model.number="row.prizeNumber" @change="val => handlePrizeNumChange(val, $index)" />积分 </el-form-item>
           </div>
-          <el-form-item label-width="0" v-else>
-            - -
-          </el-form-item>
+          <el-form-item label-width="0" v-else> - - </el-form-item>
         </template>
       </el-table-column>
       <el-table-column min-width="120px" prop="prizeName">
@@ -57,9 +55,7 @@
               <el-input v-model="row.prizeName" maxlength="10" placeholder="不超过10个字" :disabled="isDisabled && row.isOld" />
             </el-form-item>
           </div>
-          <el-form-item label-width="0" v-else>
-            - -
-          </el-form-item>
+          <el-form-item label-width="0" v-else> - - </el-form-item>
         </template>
       </el-table-column>
       <el-table-column min-width="115px" prop="prizeImageUrl">
@@ -72,14 +68,12 @@
           </span>
         </template>
         <template slot-scope="{ row, $index }">
-          <div v-if="row.prizeType == 1 || row.prizeType == 2" style="width:60px;height:62px">
+          <div v-if="row.prizeType == 1 || row.prizeType == 2" style="width: 60px; height: 62px">
             <el-form-item :prop="'gamePrizeList.' + $index + '.' + 'prizeImageUrl'" :rules="rules.prizeImageUrl" label-width="0">
               <dm-upload-avatar class="upload-avatar" width="60" height="60" :limit="{ type: false, maxSize: 1 }" fileType="img" imgType="jpg/jpeg/png" :model.sync="row.prizeImageUrl" tips="" :unused="isDisabled && row.isOld ? true : false"></dm-upload-avatar>
             </el-form-item>
           </div>
-          <el-form-item label-width="0" v-else>
-            - -
-          </el-form-item>
+          <el-form-item label-width="0" v-else> - - </el-form-item>
         </template>
       </el-table-column>
       <el-table-column min-width="118px" prop="prizeStock">
@@ -88,9 +82,7 @@
           <div v-if="row.prizeType == 1 || row.prizeType == 2">
             <el-form-item :prop="'gamePrizeList.' + $index + '.' + 'prizeStock'" :rules="{ validator: prizeStockRule(row) }" label-width="0"> <el-input class="inputClass-12" v-model.number="row.prizeStock" placeholder="请输入" @change="calculateRate" /> 件 </el-form-item>
           </div>
-          <el-form-item label-width="0" v-else>
-            - -
-          </el-form-item>
+          <el-form-item label-width="0" v-else> - - </el-form-item>
         </template>
       </el-table-column>
       <el-table-column label="奖品说明" min-width="140px" prop="prizeDesc">
@@ -100,9 +92,7 @@
               <el-input v-model="row.prizeDesc" maxlength="30" placeholder="不超过30个字" />
             </el-form-item>
           </div>
-          <el-form-item label-width="0" v-else>
-            - -
-          </el-form-item>
+          <el-form-item label-width="0" v-else> - - </el-form-item>
         </template>
       </el-table-column>
       <el-table-column label="中奖率" min-width="84px" prop="prizeRate">
@@ -124,13 +114,13 @@
       <el-table-column label="操作" fixed="right">
         <template slot-scope="{ row, $index }">
           <el-popconfirm icon="el-icon-info" title="确认删除吗？" @confirm="del($index)">
-            <el-button slot="reference" :disabled="isDisabled && row.isOld" type="text" v-show="row.prizeType != 0 || prizeForm.gamePrizeList.filter(item => item.prizeType == 0).length > 1">删除</el-button>
+            <el-button slot="reference" :disabled="isDisabled && row.isOld" type="text" v-show="row.prizeType != 0 || prizeForm.gamePrizeList.filter(item => item.prizeType == 0).length > 1">删除 </el-button>
           </el-popconfirm>
         </template>
       </el-table-column>
     </el-table>
 
-    <el-button @click="addPrize" class="mb20 mt16" size="small" style="border-style: dashed;" v-show="this.prizeForm.gamePrizeList.length < prizeMax"> <i class="iconfont icon-Plus" /> 添加奖项({{ this.prizeForm.gamePrizeList.length }}/{{ prizeMax }}) </el-button>
+    <el-button @click="addPrize" class="mb20 mt16" size="small" style="border-style: dashed" v-show="this.prizeForm.gamePrizeList.length < prizeMax"> <i class="iconfont icon-Plus" /> 添加奖项({{ this.prizeForm.gamePrizeList.length }}/{{ prizeMax }}) </el-button>
     <el-form-item label="奖品数量提醒">
       <el-switch v-model="prizeForm.prizeNoticeFlag" :active-value="1" :inactive-value="0" />
     </el-form-item>
@@ -412,6 +402,7 @@ export default {
         }
       });
       let prizeArr = this.prizeForm.gamePrizeList.filter(item => item.prizeType == 0);
+
       if (!prizeNumTotal) {
         prizeArr.forEach(item => {
           const prizeRate = 100 / prizeArr.length || 0;
@@ -503,6 +494,7 @@ export default {
 .footer {
   width: calc(100% - 520px) !important;
 }
+
 .table-row:hover {
   .deactive {
     color: #606266;
@@ -510,12 +502,14 @@ export default {
     cursor: grabbing;
   }
 }
+
 .box {
   position: relative;
   height: 48px;
   padding: 10px 0;
   width: 100%;
 }
+
 .cardBox {
   width: 100%;
   height: 32px;
@@ -526,9 +520,11 @@ export default {
   text-overflow: ellipsis;
   padding-left: 10px;
 }
+
 .redBorder {
   border-color: red;
 }
+
 .cardIcon {
   position: absolute;
   top: -5px;
@@ -536,44 +532,21 @@ export default {
   cursor: pointer;
 }
 
-.inputClass-32 {
-  width: calc(100% - 32px);
-}
-.inputClass-12 {
-  width: calc(100% - 24px);
-}
-.tableForm {
-  /depp/ .has-gutter {
-    .cell {
-      &::before {
-        content: '*';
-        color: #f56c6c;
-        margin-right: 4px;
-      }
-    }
-  }
-}
-/depp/ .has-gutter {
-  .cell {
-    &::before {
-      content: '*';
-      color: #f56c6c;
-      margin-right: 4px;
-    }
-  }
-}
-/depp/ .cell {
-  &::before {
-    content: '*';
-    color: #f56c6c;
-    margin-right: 4px;
-  }
-}
 .needCell {
+  color: #303133;
+
   &::before {
     content: '*';
     color: #f56c6c;
     margin-right: 4px;
   }
 }
+
+.inputClass-32 {
+  width: calc(100% - 32px);
+}
+
+.inputClass-12 {
+  width: calc(100% - 24px);
+}
 </style>