Merge branch 'develop/3.0.6' into test

src/views/music/singer/index.vue

@@ -7,8 +7,7 @@
       </el-form-item>
       <el-form-item label="资源平台：">
         <el-select v-model="form.platformId" placeholder="请选择资源平台" clearable>
-          <el-option v-for="item in platformOptions" :key="item.value" :value="item.value"
-            :label="item.label" />
+          <el-option v-for="item in platformOptions" :key="item.value" :value="item.value" :label="item.label" />
         </el-select>
       </el-form-item>
       <el-form-item label="歌手性别：">
@@ -18,14 +17,12 @@
       </el-form-item>
       <el-form-item label="所属地区：">
         <el-select v-model="form.singerArea" placeholder="请选择所属地区" clearable>
-          <el-option v-for="item in regionOptions" :key="item.value" :value="item.value"
-            :label="item.label" />
+          <el-option v-for="item in regionOptions" :key="item.value" :value="item.value" :label="item.label" />
         </el-select>
       </el-form-item>
       <el-form-item label="当前状态：">
         <el-select v-model="form.status" placeholder="请选择当前状态" clearable>
-          <el-option v-for="item in onOrOffOptions" :key="item.value" :value="item.value"
-            :label="item.label" />
+          <el-option v-for="item in onOrOffOptions" :key="item.value" :value="item.value" :label="item.label" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -64,7 +61,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="total>0" :total="total" :page.sync="form.pageNum" :limit.sync="form.pageSize"
+    <pagination v-show="total > 0" :total="total" :page.sync="form.pageNum" :limit.sync="form.pageSize"
       @pagination="getList" />
   </div>
 </template>

src/views/ohplay/operation/index.vue

@@ -18,7 +18,7 @@
             <el-input v-model="item.script" placeholder="请输入快捷按钮文字" />
           </el-form-item>
           <el-form-item v-else label="Banner：">
-            <Upload listType="picture-card" :url="item.banner" measure="343*140" @upload="getUpload" />
+            <Upload listType="picture-card" :url="item.banner" measure="343*140" @upload="getUpload($event, index)" />
           </el-form-item>
           <el-form-item label="选择日期：">
             <el-date-picker v-model="item.date" size="small" type="datetimerange" start-placeholder="开始时间"
@@ -137,9 +137,8 @@ export default {
     },
 
     // 上传图片
-    getUpload(e) {
-      console.log(e);
-      this.pic = e.file
+    getUpload(e, index) {
+      this.list[index].banner = e.file 
     },
 
     // 新增 编辑
@@ -152,7 +151,7 @@ export default {
         skip: item.skip,
         skipUrl: item.skipUrl,
         script: item.script,
-        banner: this.pic
+        banner: item.banner
       }
       if (item.id) {
         form.id = item.id