Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/SalesModule/MyCustomer.vue

@@ -803,7 +803,7 @@
               </span>
             </p>
           </el-col>
-          <el-col :span="10">
+          <el-col :span="14">
             <el-form-item label="区域：">
               <el-select class='w200' filterable v-model='updateMsg.Province' @change='getCityNew'>
                 <el-option v-for='item in provinceList' :label='item.Name' :value='item.ID' :key='item.ID'>
@@ -819,7 +819,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="10">
+          <el-col :span="6">
             <el-form-item label="详细地址：">
               <el-input v-model='updateMsg.Address'></el-input>
             </el-form-item>
@@ -837,7 +837,7 @@
             <el-form-item label="门牌照片：">
               <el-upload class="avatar-uploader" action="" :http-request="uploadImg1New"
                 accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false">
-                <img v-if="HousePhotosNew" :src="HousePhotosNew" class="avatar">
+                <img v-if="HousePhotos" :src="HousePhotos" class="avatar">
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
               </el-upload>
             </el-form-item>
@@ -846,7 +846,7 @@
             <el-form-item label="营业执照：">
               <el-upload class="avatar-uploader" action="" :http-request="uploadImg2New"
                 accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false">
-                <img v-if="ImagesNew" :src="ImagesNew" class="avatar">
+                <img v-if="Images" :src="Images" class="avatar">
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
               </el-upload>
             </el-form-item>
@@ -1237,7 +1237,7 @@
         newArr.push(file.file);
         let path = "/Upload/Temporary/";
         this.UploadSelfFileT(path, newArr, x => {
-          this.HousePhotosNew = this.domainManager().ViittoFileUrl + x.data.FilePath
+          this.HousePhotos = this.domainManager().ViittoFileUrl + x.data.FilePath
           that.$message.success('上传成功');
         });
       },
@@ -1249,7 +1249,7 @@
         newArr.push(file.file);
         let path = "/Upload/Temporary/";
         this.UploadSelfFileT(path, newArr, x => {
-          this.ImagesNew = this.domainManager().ViittoFileUrl + x.data.FilePath
+          this.Images = this.domainManager().ViittoFileUrl + x.data.FilePath
           that.$message.success('上传成功');
         });
       },
@@ -1271,15 +1271,11 @@
             this.updateMsg.customerExceptionList = x.customerExceptionList
             this.updateMsg.CustomerExceptionIds = []
             this.updateMsg.District = x.district
-            if (x.businessCardPhotos && x.businessCardPhotos.length > 0) {
-              this.BusinessCardPhotos = x.businessCardPhotos[0]
-            }
-            if (x.images && x.images.length > 0) {
-              this.Images = x.images[0]
-            }
-            if (x.housePhotos && x.housePhotos.length > 0) {
-              this.HousePhotos = x.housePhotos[0]
-            }
+
+            this.BusinessCardPhotos = x.businessCardPhotos && x.businessCardPhotos.length > 0?x.businessCardPhotos[0]:''
+            this.Images = x.images && x.images.length > 0?x.images[0]:''
+            this.HousePhotos = x.housePhotos && x.housePhotos.length > 0?x.housePhotos[0]:''
+
             this.updateMsg.uniqueCode = x.uniqueCode
             this.updateMsg.lineid = x.lineid
             this.updateMsg.email = x.email