From 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 四月 2026 09:42:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/components/business/OperaShopApprovalWindow.vue |   40 +++++++++++++++++++++++-----------------
 1 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/admin/src/components/business/OperaShopApprovalWindow.vue b/admin/src/components/business/OperaShopApprovalWindow.vue
index cf67cd7..7dcf8ac 100644
--- a/admin/src/components/business/OperaShopApprovalWindow.vue
+++ b/admin/src/components/business/OperaShopApprovalWindow.vue
@@ -7,11 +7,12 @@
   >
     <div class="store-header" v-if="storeInfo">
       <div class="store-header-left">
-        <el-image :src="storeInfo.payMemberCoverImage ? storeInfo.imgPrefix + storeInfo.payMemberCoverImage : ''" fit="cover" class="store-avatar">
+        <el-image v-if="storeInfo.payMemberCoverImage" :src="storeInfo.payMemberCoverImage ? storeInfo.imgPrefix + storeInfo.payMemberCoverImage : ''" fit="cover" class="store-avatar">
           <div slot="error" class="image-slot">
             <i class="el-icon-picture-outline"></i>
           </div>
         </el-image>
+        <img  v-if="! storeInfo.payMemberCoverImage" src="@/assets/avatar/man.png" fit="cover" class="store-avatar" />
       </div>
       <div class="store-header-right">
         <div class="store-name">{{ storeInfo.name }}</div>
@@ -79,19 +80,19 @@
           <div class="image-section">
             <div class="image-item">
               <span class="label">娉曚汉韬唤璇佹闈細</span>
-              <el-image :src="storeInfo.idcardImg" fit="cover" class="qualification-image" :preview-src-list="[storeInfo.idcardImg]">
+              <el-image :src="storeInfo.idcardImgUrl" fit="cover" class="qualification-image" :preview-src-list="[storeInfo.idcardImgUrl]">
                 <div slot="error" class="image-slot"><i class="el-icon-picture-outline"></i></div>
               </el-image>
             </div>
             <div class="image-item">
               <span class="label">娉曚汉韬唤璇佸弽闈細</span>
-              <el-image :src="storeInfo.idcardImgBack" fit="cover" class="qualification-image" :preview-src-list="[storeInfo.idcardImgBack]">
+              <el-image :src="storeInfo.idcardImgBackUrl" fit="cover" class="qualification-image" :preview-src-list="[storeInfo.idcardImgBackUrl]">
                 <div slot="error" class="image-slot"><i class="el-icon-picture-outline"></i></div>
               </el-image>
             </div>
             <div class="image-item">
               <span class="label">钀ヤ笟鎵х収锛�</span>
-              <el-image :src="storeInfo.businessImg" fit="cover" class="qualification-image" :preview-src-list="[storeInfo.businessImg]">
+              <el-image :src="storeInfo.businessImgUrl" fit="cover" class="qualification-image" :preview-src-list="[storeInfo.businessImgUrl]">
                 <div slot="error" class="image-slot"><i class="el-icon-picture-outline"></i></div>
               </el-image>
             </div>
@@ -100,20 +101,20 @@
         <template v-else>
           <div class="image-item-row">
             <span class="label">韬唤璇佹闈細</span>
-            <el-image :src="storeInfo.idcardImg" fit="cover" class="qualification-image" :preview-src-list="[storeInfo.idcardImg]">
+            <el-image :src="storeInfo.idcardImgUrl" fit="cover" class="qualification-image" :preview-src-list="[storeInfo.idcardImgUrl]">
               <div slot="error" class="image-slot"><i class="el-icon-picture-outline"></i></div>
             </el-image>
           </div>
           <div class="image-item-row">
             <span class="label">韬唤璇佸弽闈細</span>
-            <el-image :src="storeInfo.idcardImgBack" fit="cover" class="qualification-image" :preview-src-list="[storeInfo.idcardImgBack]">
+            <el-image :src="storeInfo.idcardImgBackUrl" fit="cover" class="qualification-image" :preview-src-list="[storeInfo.idcardImgBackUrl]">
               <div slot="error" class="image-slot"><i class="el-icon-picture-outline"></i></div>
             </el-image>
           </div>
           <div class="image-item-row">
             <span class="label">鏈夋晥鍔冲姩鍚堝悓锛�</span>
             <div class="image-list">
-              <el-image v-for="(img, index) in storeInfo.laborContractImgs" :key="index" :src="img" fit="cover" class="qualification-image" :preview-src-list="storeInfo.laborContractImgs">
+              <el-image v-for="(img, index) in storeInfo.laborContractImgUrls" :key="index" :src="img" fit="cover" class="qualification-image" :preview-src-list="storeInfo.laborContractImgUrls">
                 <div slot="error" class="image-slot"><i class="el-icon-picture-outline"></i></div>
               </el-image>
             </div>
@@ -121,7 +122,7 @@
           <div class="image-item-row">
             <span class="label">绀句繚缂寸撼璇佹槑锛�</span>
             <div class="image-list">
-              <el-image v-for="(img, index) in storeInfo.socialSecurityImgs" :key="index" :src="img" fit="cover" class="qualification-image" :preview-src-list="storeInfo.socialSecurityImgs">
+              <el-image v-for="(img, index) in storeInfo.socialSecurityImgUrls" :key="index" :src="img" fit="cover" class="qualification-image" :preview-src-list="storeInfo.socialSecurityImgUrls">
                 <div slot="error" class="image-slot"><i class="el-icon-picture-outline"></i></div>
               </el-image>
             </div>
@@ -134,7 +135,7 @@
         <div class="image-item-row">
           <span class="label">闂ㄥ簵闂ㄥご鐓э細</span>
           <div class="image-list">
-            <el-image v-for="(img, index) in storeInfo.storeFrontImgs" :key="index" :src="img" fit="cover" class="qualification-image" :preview-src-list="storeInfo.storeFrontImgs">
+            <el-image v-for="(img, index) in storeInfo.storeFrontImgUrls" :key="index" :src="img" fit="cover" class="qualification-image" :preview-src-list="storeInfo.storeFrontImgUrls">
               <div slot="error" class="image-slot"><i class="el-icon-picture-outline"></i></div>
             </el-image>
           </div>
@@ -142,7 +143,7 @@
         <div class="image-item-row">
           <span class="label">闂ㄥ簵鍐呴儴鐓х墖锛�</span>
           <div class="image-list">
-            <el-image v-for="(img, index) in storeInfo.storeInteriorImgs" :key="index" :src="img" fit="cover" class="qualification-image" :preview-src-list="storeInfo.storeInteriorImgs">
+            <el-image v-for="(img, index) in storeInfo.storeInteriorImgUrls" :key="index" :src="img" fit="cover" class="qualification-image" :preview-src-list="storeInfo.storeInteriorImgUrls">
               <div slot="error" class="image-slot"><i class="el-icon-picture-outline"></i></div>
             </el-image>
           </div>
@@ -150,7 +151,7 @@
         <div class="image-item-row">
           <span class="label">鍏跺畠鏉愭枡锛�</span>
           <div class="image-list">
-            <el-image v-for="(img, index) in storeInfo.otherMaterialImgs" :key="index" :src="img" fit="cover" class="qualification-image" :preview-src-list="storeInfo.otherMaterialImgs">
+            <el-image v-for="(img, index) in storeInfo.otherMaterialImgUrls" :key="index" :src="img" fit="cover" class="qualification-image" :preview-src-list="storeInfo.otherMaterialImgUrls">
               <div slot="error" class="image-slot"><i class="el-icon-picture-outline"></i></div>
             </el-image>
           </div>
@@ -181,7 +182,7 @@
     </div>
 
     <div class="approval-form" v-if="storeInfo && storeInfo.auditStatus === 0">
-      <el-form ref="approvalForm" :model="approvalForm" :rules="approvalRules">
+      <el-form ref="approvalForm" :model="approvalForm" :rules="approvalForm.auditStatus ==1?approvalRules:approvalRules1">
         <el-form-item label="瀹℃壒缁撴灉" prop="auditStatus">
           <el-radio-group v-model="approvalForm.auditStatus" @change="handleAuditStatusChange">
             <el-radio :label="0">閫氳繃</el-radio>
@@ -228,6 +229,7 @@
           { required: true, message: '璇疯緭鍏ユ嫆缁濆師鍥�', trigger: 'blur' }
         ]
       },
+      approvalRules1: { },
       isWorking: {
         submit: false
       }
@@ -240,6 +242,9 @@
     })
   },
   methods: {
+    changeRadio(){
+      this.$refs.approvalForm.clearValidate()
+    },
     open (title, row) {
       this.title = title
       this.approvalForm = {
@@ -257,11 +262,12 @@
         })
     },
     handleAuditStatusChange (val) {
-      if (val === 1) {
-        this.approvalRules.auditRemark = []
-      } else {
-        this.approvalRules.auditRemark = [{ required: true, message: '璇疯緭鍏ユ嫆缁濆師鍥�', trigger: 'blur' }]
-      }
+      this.$refs.approvalForm.clearValidate()
+      // if (val === 1) {
+      //   this.approvalRules.auditRemark = []
+      // } else {
+      //   this.approvalRules.auditRemark = [{ required: true, message: '璇疯緭鍏ユ嫆缁濆師鍥�', trigger: 'blur' }]
+      // }
     },
     handleSubmit () {
       this.$refs.approvalForm.validate(valid => {

--
Gitblit v1.9.3