合并代码

src/views/integral/integral.vue

@@ -249,12 +249,12 @@
 					<div class="imgs" v-for="(item,index) in form.img" :key="index">
 					  <img width="100%" class="images" height="100%" :src="item" alt="">
 					  <span class="dels">
-					    <i class="el-icon-delete" @click="dels(index)"></i>
+					    <i class="el-icon-delete" @click="dels2(index)"></i>
 					  </span>
 					</div>
 					<div class="imgs" style="width: 50%;">
 					  <el-upload action="https://mxys.chuanghai-tech.com/sqx_fast/alioss/upload" list-type="picture-card"
-					    :show-file-list="false" :on-success="handleRemove" :on-progress="onprogress1">
+					    :show-file-list="false" :on-success="handleRemove2" :on-progress="onprogress1">
 					    <el-progress v-if="percentage1>0 && percentage1<100" type="circle" :percentage="percentage1">
 					    </el-progress>
 					    <i v-else class="el-icon-plus"></i>
@@ -1018,6 +1018,7 @@
 			handleRemove(file) {
 			  console.log(file, this.img)
 			  this.img.push(file.data);
+        this.form.img.push(file.data);
 			},
 			handleDownload(file) {
 
@@ -1026,8 +1027,18 @@
 			// 删除轮播图
 			dels(index) {
 			  this.img.splice(index, 1);
+        this.form.img.splice(index, 1);
 			  console.log(this.img)
 			},
+      //修改时
+      // 轮播图片上传
+			handleRemove2(file) {
+        this.form.img.push(file.data);
+			},
+			// 删除轮播图
+			dels2(index) {
+        this.form.img.splice(index, 1);
+			},
 			// 修改活动状态
 			changeType(enableFlag, row) {
 				console.log('row.enableFlag',row)
@@ -1268,7 +1279,7 @@
 						url: this.$http.adornUrl('admin/activity-shop/quit'),
 						method: 'put',
 						params: this.$http.adornParams({
-							'activityId':row.id,
+							'activityId':row.activityId,
 							'shopId':row.shopId
 						})
 					}).then(({