Merge branch 'web-v2' of http://192.168.1.43:3000/git/sass-lab-web into web-v2

src/views/mine/index.vue

@@ -244,6 +244,7 @@
           <div v-if="upFaceUrl" class="scrollbar-box" style="width:560px;margin:0 auto;max-height:700px;overflow-y: scroll">
             <img :src="upFaceUrl" style="max-width:560px;border: 1px dashed #E0E0E0;cursor: pointer;margin:0 auto;">
           </div>
+
         </el-upload>
         <div slot="footer" class="dialog-footer">
           <el-button @click="faceButton(1)">取 消</el-button>
@@ -566,7 +567,7 @@
           this.user.faceImg = res.data.cardUrl;
           this.upFaceOpen = false;
           this.getUser();
-          this.msgSuccess(res.msg)
+          this.msgSuccess('上传成功!')
           this.$forceUpdate()
         }else{
           this.msgError(res.msg)

src/views/mine/indexOne.vue

@@ -715,6 +715,7 @@
         }else if(type == 2){
           this.$refs.faceUpLoad.submit();
         }
+
       },
       //上传
       handleAvatarSuccess(res, type) {
@@ -722,7 +723,7 @@
           this.user.faceImg = res.data.cardUrl;
           this.upFaceOpen = false;
           this.getUser();
-          this.msgSuccess(res.msg)
+          this.msgSuccess('上传成功!')
           this.$forceUpdate()
         }else{
           this.msgError(res.msg)

src/views/mine/userAvatar.vue

@@ -18,6 +18,7 @@
             @realTime="realTime"
             v-if="visible"
           />
+
         </el-col>
         <el-col :xs="24" :md="12" :style="{height: '350px'}">
           <div class="avatar-upload-preview">