From 0af8d2525b8e58c3eb2c3eb30bb32ac482d20856 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 15 七月 2025 11:03:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/components/business/OperaMemberDetailWindow.vue |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/admin/src/components/business/OperaMemberDetailWindow.vue b/admin/src/components/business/OperaMemberDetailWindow.vue
index c175618..aa11ebd 100644
--- a/admin/src/components/business/OperaMemberDetailWindow.vue
+++ b/admin/src/components/business/OperaMemberDetailWindow.vue
@@ -141,9 +141,9 @@
               <span class="m10" v-if="item.type ==0">鐢ㄥ伐璁よ瘉</span>
               <span class="m10" v-if="item.type ==1">璐ц繍璁よ瘉</span>
               <span class="m10" v-if="item.type ==2">渚涢璁よ瘉</span>
-              <el-tag type="primary" class="mr10 tag2" v-if="item.auditStatus == 0">璁よ瘉涓�</el-tag>
-              <el-tag type="success" class="mr10 tag2" v-if="item.auditStatus == 1">璁よ瘉閫氳繃</el-tag>
-              <el-tag type="danger" class="mr10 tag2" v-if="item.auditStatus == 2">璁よ瘉澶辫触</el-tag>
+              <el-tag type="primary" class="ml10 tag2" v-if="item.auditStatus == 1">璁よ瘉涓�</el-tag>
+              <el-tag type="success" class="ml10 tag2" v-if="item.auditStatus == 2">璁よ瘉閫氳繃</el-tag>
+              <el-tag type="danger" class="ml10 tag2" v-if="item.auditStatus == 3">璁よ瘉澶辫触</el-tag>
           </div>
           <div class="detail" >
             <div class="line">
@@ -162,12 +162,16 @@
               <div class="line">  <span class="label">韬唤淇℃伅锛�</span> <span v-if="!item.imgList || item.imgList.length==0" class="txt">鏃�</span> </div>
             </template>
               <div class="line" v-if="item.imgList && item.imgList.length>0">
-                <div v-for="info in item.imgList">
+                <div v-for="info in item.imgList" style="display: inline-block">
                   <el-image v-if="info" style="width: 50px; height: 50px; margin-right: 10px" :src="info"
                             :preview-src-list="[info]">
                   </el-image>
                 </div>
               </div>
+            <div class="line" v-if="item.auditStatus == 3 || item.auditStatus == 2" :style="'background-color: '+(item.auditStatus==2?'#eff8ea':'rgb(253 226 226)')+';padding: 20px'">
+              <span class="label"> 瀹℃牳浜猴細</span> <span class="txt">{{item.editorName}} </span><span class="label">{{item.auditTime || '' }} </span>
+              <div  style="margin-top: 20px"> <span class="label">  瀹℃牳淇℃伅锛�</span> <span class="txt">{{item.auditRemark || '' }}</span></div>
+          </div>
           </div>
         </div>
     </div>
@@ -385,6 +389,9 @@
       margin-top: 15px;
     }
   }
+  .ml10{
+    margin-left: 10px;
+  }
   .info{
     font-size: 14px;
     font-weight: bold;

--
Gitblit v1.9.3