Merge branch 'M_2.5_1122' into test

src/views/entry/fillMainInf.vue

@@ -184,10 +184,10 @@
       </div>
     </el-card>
     <!-- 图片识别 对话框 -->
-    <el-dialog title="提示" :visible.sync="isReadFailVisible" width="400px" center
-               :close-on-click-modal="false">
+    <el-dialog title="提示" :visible.sync="isReadFailVisible" class="read-fail-dialog" width="600px" center
+               :close-on-click-modal="false" :show-close="false">
       <p>未能识别有效信息，请重新上传正确的图片或者手动输入相关信息</p>
-      <p>改弹窗显示<span>readTime</span>s后自动关闭，无需手动关闭</p>
+      <p>改弹窗显示<span class="read-time-m">{{ readTime }}</span>S后自动关闭，无需手动关闭</p>
     </el-dialog>
   </div>
 </template>
@@ -430,6 +430,16 @@
             }
           }else {
             this.isReadFailVisible = true;
+            this.readTime = 5;
+            this.TIMER = setInterval(() => {
+              if (this.readTime && 0 < this.readTime <= 5 ) {
+                this.readTime--
+              } else {
+                this.readTime = 0;
+                this.isReadFailVisible = false;
+              }
+            }, 1000)
+
           }
         });
       },
@@ -459,6 +469,17 @@
           if (res.code == 1 ) {
             this.mainForm.real_name = res.data.words_result['姓名'].words ? res.data.words_result['姓名'].words : '';
             this.mainForm.idcard_number = res.data.words_result['公民身份号码'].words ? res.data.words_result['公民身份号码'].words : '';
+          }else {
+            this.isReadFailVisible = true;
+            this.readTime = 5;
+            this.TIMER = setInterval(() => {
+              if (this.readTime && 0 < this.readTime <= 5 ) {
+                this.readTime--
+              } else {
+                this.readTime = 0;
+                this.isReadFailVisible = false;
+              }
+            }, 1000)
           }
         });
       },
@@ -513,6 +534,17 @@
               this.validityConcreteTime.push(end);
               this.validityLongTermVal = false;
             }
+          }else {
+            this.isReadFailVisible = true;
+            this.readTime = 5;
+            this.TIMER = setInterval(() => {
+              if (this.readTime && 0 < this.readTime <= 5 ) {
+                this.readTime--
+              } else {
+                this.readTime = 0;
+                this.isReadFailVisible = false;
+              }
+            }, 1000)
           }
         });
       },
@@ -874,4 +906,14 @@
       text-align: center;
     }
   }
+  .read-fail-dialog >>> .el-dialog > .el-dialog__body > p{
+    text-align : center;
+    font-size: 16px;
+  }
+
+  .read-fail-dialog >>> .read-time-m {
+    color: #F56C6C;
+    font-size: 18px;
+    padding: 0 5px;
+  }
 </style>

src/views/system/shop/brand.vue

@@ -92,8 +92,10 @@
             <span v-if="brandForm.status == 2" class="color-spe-error"><i class="el-icon-error"></i></span>
             <span v-if="brandForm.status == 0" class="color-spe-waiting"><i class="el-icon-success"></i></span>
             <span class="brand-form-status-text">{{ statusVal }}</span>
+            <span v-if="brandForm.status == 2"><span class="brand-refused-title">原因：</span>{{ brandForm.last_check_content }}</span>
           </p>
         </el-row>
+        <p class="brand-title-tips">请您严格按照商标注册证书信息填写，否则审核将无法通过！</p>
         <el-row>
           <el-col :span="16" :offset="3">
             <el-form-item label="经营品牌类型：" prop="brand_type">
@@ -158,7 +160,7 @@
               </span>
                 </div>
                 <div style="width:380px;line-height: 24px;padding-top: 6px;">
-                  <span class="tips-text">必须与商标图文一致。文件大小在500KB以内，支持png,jpg格式，最多可上传2张</span>
+                  <span class="tips-text">必须与商标图文一致。文件大小在500KB以内，支持png,jpg格式，最多可上传1张</span>
                 </div>
               </div>
             </el-form-item>
@@ -194,7 +196,7 @@
               </span>
                 </div>
                 <div style="width:380px;line-height: 24px;padding-top: 6px;">
-                  <span class="tips-text">品牌方给予企业的授权书。文件大小在2MB以内，支持png,jpg格式</span>
+                  <span class="tips-text">请提供有效期内的商标注册证，保持信息清晰可见，支持png,jpg格式，最多可上传1张</span>
                 </div>
               </div>
             </el-form-item>
@@ -267,9 +269,10 @@
               </span>
                 </div>
                 <div style="width:380px;line-height: 24px;padding-top: 6px;">
-                  <span class="tips-text">品牌方给予企业的授权书。文件大小在2MB以内，支持png,jpg格式</span>
+                  <span class="tips-text">授权在云仓平台经营此品牌，支持png,jpg格式，文件大小在2MB以内</span>
                 </div>
               </div>
+              <p class="brand-auth-tips">上传完整授权链路，品牌方给予企业的授权书，如果是多级授权，请上传各级授权证书</p>
             </el-form-item>
           </el-col>
         </el-row>
@@ -301,7 +304,7 @@
               </span>
                 </div>
                 <div style="width:380px;line-height: 24px;padding-top: 6px;">
-                  <span class="tips-text">授权在云仓平台经营此品牌。文件大小在2MB以内，支持png,jpg格式</span>
+                  <span class="tips-text">授权在云仓平台经营此品牌，支持png,jpg格式</span>
                 </div>
               </div>
             </el-form-item>
@@ -1084,6 +1087,25 @@
     }
   }
 
+  .brand-title-tips {
+    text-align : center;
+    padding: 10px 20px 20px;
+    margin: 0;
+    font-size : 14px;
+    color: #F56C6C;
+  }
+
+  .brand-auth-tips {
+    margin: 0;
+    font-size : 12px;
+    color: #F56C6C;
+  }
+
+  .brand-refused-title {
+    margin: 0 8px;
+    font-size: 18px;
+  }
+
 // 上传图片样式重置 start
   .uploadData {
     display: inline-block;