From 849a0bae4fea586cfe501d90b4491165522c6be8 Mon Sep 17 00:00:00 2001
From: mixtan <424491071@qq.com>
Date: Tue, 27 May 2025 09:05:15 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E5=AF=B9=E5=85=AC=E5=AF=B9=E7=A7=81?=
 =?UTF-8?q?=E6=97=B6=E6=94=BE=E5=BC=80=E9=93=B6=E8=A1=8C=E5=8D=A1=E6=AF=94?=
 =?UTF-8?q?=E5=A1=AB=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=8F=AF=E6=89=8B=E5=86=99?=
 =?UTF-8?q?=E5=8F=AFOCR=E8=AF=86=E5=88=AB=EF=BC=9BHTTP=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E6=8B=A6=E6=88=AA=E6=B7=BB=E5=8A=A0=E9=94=99=E8=AF=AF=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E6=8F=90=E7=A4=BA=EF=BC=9B=E4=B8=8A=E4=BC=A0=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E7=BB=84=E4=BB=B6=E6=B7=BB=E5=8A=A0=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/http.js         |  4 ++++
 src/views/start/start.vue | 38 +++++++++++++++++++++++++++-----------
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/utils/http.js b/src/utils/http.js
index 8a57c04..3ac3a9a 100644
--- a/src/utils/http.js
+++ b/src/utils/http.js
@@ -1,4 +1,5 @@
 import axios from "axios";
+import { ElMessage } from "element-plus";
 // import store from '@/store'
 
 const baseURL = import.meta.env.VUE_APP_BASE_URL;
@@ -29,6 +30,9 @@ service.interceptors.request.use(
 // response interceptor
 service.interceptors.response.use(
   (response) => {   
+    if(response.data.status==250){
+      ElMessage.error(response.data.msg || '请求异常，再重试！')
+    }
     return response.data;
   },
   (error) => {
diff --git a/src/views/start/start.vue b/src/views/start/start.vue
index 5bb0a6b..53b8130 100644
--- a/src/views/start/start.vue
+++ b/src/views/start/start.vue
@@ -123,6 +123,7 @@
               <el-icon class="avatar-uploader-icon">
                 <Plus />
               </el-icon>
+              <div class="uploader-tips">上传门店图</div>
             </el-upload>
           </el-form-item>
           <el-form-item
@@ -159,6 +160,7 @@
               <el-icon>
                 <Plus />
               </el-icon>
+              <div class="uploader-tips">上传环境图</div>
             </el-upload>
           </el-form-item>
         </div>
@@ -211,6 +213,7 @@
                 <el-icon>
                   <Plus />
                 </el-icon>
+                <div class="uploader-tips">上传营业执照</div>
               </el-upload>
 
               <el-button
@@ -311,6 +314,7 @@
                 <el-icon>
                   <Plus />
                 </el-icon>
+                <div class="uploader-tips">上传许可证</div>
               </el-upload>
             </el-form-item>
 
@@ -361,6 +365,7 @@
                 <el-icon class="avatar-uploader-icon">
                   <Plus />
                 </el-icon>
+                <div class="uploader-tips">上传证件正面</div>
               </el-upload>
               <el-button
               type="info"
@@ -405,6 +410,7 @@
                 <el-icon class="avatar-uploader-icon">
                   <Plus />
                 </el-icon>
+                <div class="uploader-tips">上传证件反面</div>
               </el-upload>
             </el-form-item>
             <el-form-item
@@ -455,6 +461,7 @@
                 <el-icon class="avatar-uploader-icon">
                   <Plus />
                 </el-icon>
+                <div class="uploader-tips">上传证件正面</div>
               </el-upload>
             </el-form-item>
 
@@ -493,6 +500,7 @@
                 <el-icon class="avatar-uploader-icon">
                   <Plus />
                 </el-icon>
+                <div class="uploader-tips">上传证件反面</div>
               </el-upload>
             </el-form-item>
             <el-form-item
@@ -536,16 +544,17 @@
               <el-icon class="avatar-uploader-icon">
                 <Plus />
               </el-icon>
+              <div class="uploader-tips">上传银行卡<br>免填卡号</div>
             </el-upload>
             <el-button
               type="info"
               plain
               v-if="applyFormData.bank_image && !applyFormData.account_number"
               @click="handleOcrText(currentBbatchNo, 'bank_image')"
-              >点击免填银行卡号</el-button
+              >点击免填卡号</el-button
             >
           </el-form-item>
-          <template v-if="applyFormData.bank_image">
+          <template v-if="applyFormData.entity_type==1 || applyFormData.bank_image">
             <el-form-item label="开户名称" prop="account_holder_name">
               <el-input v-model="applyFormData.account_holder_name" />
             </el-form-item>
@@ -595,11 +604,13 @@
 
 <script lang="ts" setup>
 import { ref, reactive, onMounted, watch } from "vue";
+import { ElMessage } from "element-plus";
+import { Plus } from "@element-plus/icons-vue";
+
 import cityData from "../../stores/cityData";
 import type { CityDataStructure } from "../../stores/cityData";
-import { ElMessage } from "element-plus";
 import { useUserStore } from "@/stores/userStore";
-import { Plus } from "@element-plus/icons-vue";
+
 import {
   GetStoreCategories,
   transformStoreCategories,
@@ -608,7 +619,6 @@ import {
   merchApply,
   GetAppDistrict,
 } from "@/api/login";
-
 import { batchNoApi, imgOcrResultApi } from "@/api/upload";
 
 interface Bank {
@@ -796,9 +806,6 @@ const rules = reactive({
   individual_id_images2: [
     { required: true, message: "请上传个人身份证反面", trigger: "change" },
   ],
-  bank_image: [
-    { required: true, message: "请上传银行卡正面", trigger: "change" },
-  ],
   bank_branch_name: [
     { required: true, message: "请选择银行", trigger: "change" },
   ],
@@ -812,6 +819,7 @@ const rules = reactive({
 });
 
 const handleMerchApply = async () => {
+  console.log(2001);
   const {
     bank_name,
     bank_district,
@@ -895,9 +903,13 @@ const checkForm = async () => {
     return valid;
   });
 
+  if(applyFormData.entity_type==2 && !applyFormData.bank_image){
+      ElMessage.error("请上传银行卡")
+      return
+  }
+
   if (isValid) {
-    // handleReApply();
-    handleMerchApply
+    handleMerchApply()
   }
 };
 
@@ -950,7 +962,7 @@ const showAll = () => {
 
 const merchToApply = async () => {
   console.log("formdata", applyFormData);
-  showAll();
+  // showAll();
   checkForm();
 };
 
@@ -1298,6 +1310,10 @@ onMounted(() => {
 :deep(.el-upload-list__item) {
   width: 96px;
   height: 96px;
+  text-align: center;
+  flex-direction: column;
+  color: #666;
+  line-height: 20px;
 }
 
 .signUp-container {