Merge branch 'developerC' of http://git.caimei365.com/caimei365/caimei365-manager-ui into developer

src/views/serviceSettlement/list/edit.vue

@@ -57,7 +57,7 @@
         <image-upload
           :limit="6"
           :image-list="textRelateds"
-          @success="uploadSuccess($event, 'textRelateds')"
+          @success="handleImageSuccess($event, 'textRelateds')"
           @remove="handleImageRemove($event, 'textRelateds')"
         />
       </el-form-item>
@@ -70,7 +70,7 @@
         />
       </el-form-item>
       <el-form-item v-if="id" label="资格证书：">
-        <el-image style="width: 200px;" :src="formLabelAlign.qualificationImage" :preview-src-list="[formLabelAlign.qualificationImage]" />
+        <el-image style="width: 200px;" :src="qualificationImage" :preview-src-list="[qualificationImage]" />
       </el-form-item>
       <el-form-item label="资料上传：" prop="infoRelateds">
         <file-upload
@@ -152,6 +152,7 @@ export default {
           contractRelateds: []
         }
       },
+      qualificationImage: '',
       infoList: [],
       contractList: [],
       textRelateds: [],
@@ -232,6 +233,7 @@ export default {
       this.infoList = data.infoRelateds.map((e, i) => ({ name: e.fileName, response: { data: e.image }}))
       this.textRelateds = data.textRelateds.map((e, i) => ({ uid: i, url: e.image }))
       this.formLabelAlign.area = data.address.split('/').map(e => e.trim())
+      this.qualificationImage = data.qualificationImage
       setTimeout(() => {
         this.areaKey = Math.random() * 1000
       }, 500)
@@ -281,6 +283,12 @@ export default {
       this.formLabelAlign[name] = $event.fileList.map(e => ({
         image: e.url
       }))
+    },
+    handleImageSuccess($event, name) {
+      console.log($event)
+      this.formLabelAlign[name] = $event.fileList.map(e => ({
+        image: e.response ? e.response.data : e.url
+      }))
     }
   }
 }

src/views/serviceSettlement/list/index.vue

@@ -224,7 +224,7 @@ export default {
     },
     handleSelectionChange() {},
     async handleStatus($event) {
-      this.$confirm('是否下线该服务商?', '提示', {
+      this.$confirm(`是否${$event.status === 91 ? '上线' : '下线'}该服务商?`, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'