Merge branch 'M_2.5_1122' into test

src/views/entry/fillShopInf.vue

@@ -87,7 +87,7 @@
             <div class="auth-con">
               <!--*** 方法二 start ***-->
               <div v-for="(item,index) in qualificationList" :key="item.id" class="single-upload-con">
-                <div v-show="!item.url" class="single-auth-img" @click="upPreAuthImg(index)"></div>
+                <div v-show="!item.url" class="single-auth-img el-icon-plus" @click="upPreAuthImg(index)"></div>
 
                 <div v-show="item.url" class="single-auth-img-con">
                   <img class="auth-spec-img" :src="item.url" alt="" />
@@ -714,6 +714,9 @@
       border: 1px dashed #eee;
       margin: 5px auto;
       cursor: pointer;
+      color: #8c939d;
+      line-height : 98px;
+      font-size : 28px;
     }
 
     .single-auth-img-con{