Merge branch 'master' of http://47.92.161.104:10080/yanliming/water-tank-installation-portal

src/views/Login.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="login-container">
-    <div class="login-form" style="margin-top:0px">
+    <div class="login-form" style="margin-top:80px">
       <h3 style="margin-left:-12px">
         <img src="../assets/logo_cy_login.png"/>
       </h3>

src/views/base/customerInfo-list.vue

@@ -55,7 +55,10 @@
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column  prop="image"  label="头像">
           <template slot-scope="{row}">
-            <el-avatar :size="50" :src="row.image"></el-avatar>
+            <el-avatar v-if="row.image" :size="50" :src="row.image"></el-avatar>
+            <el-avatar v-else :size="50" src="https://empty" @error="errorHandler">
+              <img src="https://cube.elemecdn.com/e/fd/0fc7d20532fdaf769a25683617711png.png"/>
+            </el-avatar>
           </template>
         </el-table-column>
         <el-table-column  prop="companyName"  label="企业名称"></el-table-column>
@@ -148,6 +151,9 @@
       };
     },
     methods: {
+      errorHandler() {
+        return true
+      },
       changePage(pageIndex,exportFlag) {
         var self = this;
   

src/views/base/workOrder-detail.vue

@@ -118,7 +118,7 @@
                 <div>
                     <el-image v-for="(item,index) in imageList" :key="index"
                         class="img"
-                        src="https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg"
+                        :src="item"
                         fit="fit"></el-image>
                 </div>
             </el-tab-pane>