Merge branch 'feature/营销' into dev

src/styles/component.less

@@ -22,10 +22,15 @@
 .mt10 {
   margin-top: 10px;
 }
+.mt15{
+  margin-top: 15px;
+}
 .mb10 {
   margin-bottom: 10px;
 }
-
+.mb12{
+  margin-bottom: 12px;
+}
 .mr20 {
   margin-right: 20px;
 }
@@ -59,6 +64,9 @@
 .pb10{
   padding-bottom: 10px;
 }
+.lh1{
+  line-height: 1;
+}
 .lh20{
   line-height: 20px;
 }

src/views/activity/template-config.vue

@@ -29,7 +29,7 @@ export default {
     return {
       list: [],
       typeMap: {
-        1: '盲盒'
+        1: '幸运盲盒'
       }
     };
   },
@@ -72,6 +72,8 @@ export default {
       width: 32px;
       height: 32px;
       margin-bottom: 8px;
+
+border-radius: 6px;
     }
     .template-name {
       font-size: 16px;

src/views/activity/template-detail.vue

@@ -40,7 +40,7 @@
       </div>
       <dm-sub-title type="fill">游戏首页奖品样式</dm-sub-title>
       <div class="section">
-        <el-form-item label="奖项展示个数" prop="viewPrize">
+        <el-form-item label="奖项展示个数" prop="viewPrize" required>
           <el-input class="w340" v-model.number="form.viewPrize" :disabled="isDisabled" @change="onValChange" placeholder="请输入展示数量"  ></el-input>
         </el-form-item>
         <el-form-item label="奖项图片尺寸" required>
@@ -65,8 +65,7 @@
           <div :class="[form.changeType==1?'multiBox':'']">
            <p class="tips mb10" v-show="form.changeType==1">图片格式 jpg/jpeg/png/gif，大小 1M 以内。</p>
            <div v-for="(item, index) in form.prizeStyleJson" :key="index" class="multiBox-line">
-
-           <div class="mr20 lh20 mt10"  v-show="form.changeType==1">盲盒{{index+1}}</div>
+           <div class="mr20 lh20 mt10"  v-show="form.changeType==1" style="width: 46px;">盲盒{{index+1}}</div>
             <div class="flex-gap">
               <el-form-item :prop="'prizeStyleJson.' + index + '.' + 'imageNoSelectUrl'" label-width="0"  :style="form.changeType==0?'margin: 0':''" :rules="[{required:true,message:'请上传'}]">
                 <div :class="['flex-column',form.changeType==1?'multi':'']">
@@ -83,7 +82,7 @@
             </div>
           </div>
           </div>
-          <p class="tips mt6" v-show="form.changeType==0">图片格式 jpg/jpeg/png/gif，大小 1M 以内。</p>
+          <p class="tips mt15" v-show="form.changeType==0">图片格式 jpg/jpeg/png/gif，大小 1M 以内。</p>
         </el-form-item>
         <!-- <el-form-item label="更换奖项样式"> <el-switch v-model="form.canChangePrizeStyle"></el-switch><span class="tipss ml18">开启则表示支持用户更换此处模板内默认奖项样式</span> </el-form-item> -->
       </div>
@@ -128,13 +127,13 @@
           </div>
 
         </el-form-item>
-        <el-form-item label="模板奖品图片" required>
-          <p class="tips">图片建议尺寸 300*300px，格式 jpg/jpeg/png，大小 1M 以内。</p>
+        <el-form-item label="模板奖品图片" required class="temlpatePrizeImg">
+          <p class="tips mb12">图片建议尺寸 300*300px，格式 jpg/jpeg/png，大小 1M 以内。</p>
           <div class="flex-gap">
             <div v-for="item in prizeImgList" :key="item.prop">
               <el-form-item :rules="[{ required: true, message: '请上传' } ]" :prop="item.prop+'.materialValue'" label-width="0">
               <div class="flex-column">
-                <span class="mb8">{{ item.label }}</span>
+                <span class="lh1 mb8">{{ item.label }}</span>
                 <vue-gic-upload-image :project-name="projectName" is-yw :action-url="actionUrl"  :image-list="imageList[item.prop+'List']"  max-image-length="1"  accept="image/jpg,image/jpeg,image/png" :before-upload="(file) => beforeUpload(file,1,1)" @uploadOnSuccess="(data) => uploadOnSuccess(data, item.prop)" @deleteImage="deleteImage(item.prop)" preview-append-to-body> </vue-gic-upload-image>
               </div>
               </el-form-item>
@@ -736,5 +735,10 @@ export default {
   width: calc( 100% - 200px);
   box-shadow: 1px -2px 8px 0px rgba(220, 223, 230, 0.6);
 }
+.temlpatePrizeImg{
+ /deep/ .el-form-item__label{
+    line-height: 14px;
+  }
+}
 
 </style>
\ No newline at end of file