Merge branch 'master' of e.coding.net:g-cphe0354/duanju/video_admin into gyq

src/views/mission/mission.vue

@@ -348,8 +348,19 @@
         <el-table-column
           prop="price"
           label="购买剧价格"
-          width="60"
+        >
-        ></el-table-column>
+        <template slot-scope="scope">
+           {{scope.row.price?scope.row.price:''}}
+          </template>
+      </el-table-column>
+      <el-table-column
+          prop="wholesalePrice"
+          label="购买10集价格"
+        >
+        <template slot-scope="scope">
+           {{scope.row.wholesalePrice?scope.row.wholesalePrice:''}}
+          </template>
+      </el-table-column>
         <el-table-column
           prop="payNum"
           label="购买次数"
@@ -595,6 +606,17 @@
             placeholder="请输入购买剧价格"
           ></el-input>
         </div>
+        <div style="margin-bottom: 10px">
+          <span style="width: 200px; display: inline-block; text-align: right"
+            >购买10集价格：</span
+          >
+          <el-input
+            v-model="wholesalePrice"
+            type="number"
+            style="width: 50%"
+            placeholder="请输入购买10集价格"
+          ></el-input>
+        </div>
         <div style="margin-bottom: 10px">
           <span style="width: 200px; display: inline-block; text-align: right"
             >购买次数：</span
@@ -1762,6 +1784,7 @@ export default {
       privilege: [], //标签集合
       bq: "", //标签
       price: "", //价格
+      wholesalePrice: "", //10集价格
       payNum: "", //购买次数
       viewCounts: 0, //播放量
       details: "", //短剧介绍
@@ -2345,7 +2368,7 @@ export default {
       this.statusType = row.status;
       this.details = row.details;
       this.viewCounts = row.viewCounts;
-
+      this.wholesalePrice = row.wholesalePrice?row.wholesalePrice:'';
       this.payNum = row.payNum;
       if (row.isPrice) {
         this.isPrice = row.isPrice;
@@ -2538,7 +2561,7 @@ export default {
           payNum: this.payNum,
           price: this.price,
           viewCounts: this.viewCounts,
-
+          wholesalePrice:this.wholesalePrice,
           title: this.title,
           titleImg: this.titleImg,
           msgUrl: "",
@@ -2574,6 +2597,7 @@ export default {
               that.title = "";
               that.remark = "";
               that.titleImg = "";
+              this.wholesalePrice=""
               that.dataSelect();
             },
           });

src/views/renwu/components/pop-add-gift.vue

@@ -6,6 +6,15 @@
         <el-form-item label="奖励名称" required>
           <el-input v-model="form.name"></el-input>
         </el-form-item>
+        <el-form-item label="奖励图标">
+          <el-upload class="avatar-uploader" v-model="form.img" :action="$http.adornUrl('alioss/upload')"
+            :show-file-list="false" :on-success="uploadSuccess">
+            <div class="upload-file-box">
+              <img v-if="form.img" :src="form.img" class="avatar" />
+              <i v-else class="el-icon-plus avatar-uploader-icon iconss"></i>
+            </div>
+          </el-upload>
+        </el-form-item>
         <el-form-item label="奖励类型" required>
           <el-radio-group v-model="form.type">
             <el-radio :label="1">金币</el-radio>
@@ -15,13 +24,8 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="奖励图标">
-          <el-upload
+          <el-upload class="avatar-uploader" v-model="form.img" :action="$http.adornUrl('alioss/upload')"
-            class="avatar-uploader"
+            :show-file-list="false" :on-success="uploadSuccess">
-            v-model="form.img"
-            :action="$http.adornUrl('alioss/upload')"
-            :show-file-list="false"
-            :on-success="uploadSuccess"
-          >
             <div class="upload-file-box">
               <img v-if="form.img" :src="form.img" class="avatar" />
               <i v-else class="el-icon-plus avatar-uploader-icon iconss"></i>
@@ -90,6 +94,7 @@ export default {
         name: "",
         number: "",
         type: "",
+        img: "",
       };
       this.renwu = {}
     },

src/views/renwu/components/pop-gift-list.vue

@@ -18,6 +18,15 @@
               <span>{{ returnTypeName(scope.row.type) }}</span>
             </template>
           </el-table-column>
+          <el-table-column label="奖励图片">
+            <template slot-scope="scope">
+              <img
+            style="width: 50px; height: 50px"
+            v-if="scope.row.img"
+            :src="scope.row.img"
+          />
+            </template>
+          </el-table-column>
           <el-table-column label="数量">
             <template slot-scope="scope">
               <span>{{ scope.row.number }}</span>
@@ -106,15 +115,16 @@ export default {
       const $types = {
         1: "金币",
         2: "现金红包",
+        3: "虚拟物品",
         9: "大转盘抽奖次数",
       };
       return $types[type] ? $types[type] : "";
     },
     //数据初始化
     async init() {
-        const {id}=this.renwu;
+      const { id } = this.renwu;
       const { data } = await $api.getList({
-        taskId:id,
+        taskId: id,
         page: this.page,
         limit: this.limit,
       });