From 9d7979a2933632bc2083c7f0b3e4a793b0dc3f3e Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期二, 15 七月 2025 12:10:14 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- admin/src/components/business/OperaMemberDetailWindow.vue | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/admin/src/components/business/OperaMemberDetailWindow.vue b/admin/src/components/business/OperaMemberDetailWindow.vue index 33d525e..7b5a453 100644 --- a/admin/src/components/business/OperaMemberDetailWindow.vue +++ b/admin/src/components/business/OperaMemberDetailWindow.vue @@ -7,7 +7,7 @@ :confirm-working="isWorking" @close="close" @confirm="confirm"> - <div style="width: 100%; position: sticky;padding: 12px 16px; top: 0px; left: 0; z-index: 999; background-color: white"> + <div style="width: calc(100% - 32px); position: sticky;padding: 12px 16px; top: 0px; left: 0; z-index: 999; background-color: white"> <div style="display: flex;background: #e4ecfe;padding: 20px"> <div style="width: 60px;"> <div class="home_title" v-if="info"> @@ -21,8 +21,7 @@ <div style="width: calc(100% - 60px);"> <div class="home_title" v-if="info"> <div class="left"> - <span class="m10">鏄电О锛歿{info.nickName }}</span> - <span class="mr10 bluebtn" :title="'濮撳悕锛�'+(info.name||'鏈缃鍚�')" >({{(info.name||'鏈缃鍚�') }})</span> + <span class="m10">鏄电О锛歿{info.nickName }} <span class="ml10 bluebtn" :title="'濮撳悕锛�'+(info.name||'鏈缃鍚�')" >({{(info.name||'鏈缃鍚�') }})</span></span> <el-tag type="primary" class="mr10 tag1">鍙戝崟鏂�</el-tag> <el-tag type="success" class="mr10 tag1" v-if="info.workerIdentity == 2 || info.driverIdentity == 2 || info.chefIdentity == 2">鎺ュ崟鏂�</el-tag> </div> @@ -141,7 +140,7 @@ <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="ml10 tag2" v-if="item.auditStatus == 1">璁よ瘉涓�</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> @@ -150,6 +149,7 @@ <span class="label"> 璁よ瘉绫诲瀷锛�</span> <span class="txt">{{item.authType == 0? '涓汉':'浼佷笟' }}</span> <span class="label"> 鑱旂郴浜猴細</span> <span class="txt">{{item.linkName || '' }}</span> <span class="label"> 鑱旂郴鏂瑰紡锛�</span> <span class="txt">{{item.telephone || '' }}</span> + <span class="label"> 鐢宠鏃堕棿锛�</span> <span class="txt">{{item.createTime || '' }}</span> </div> <template v-if="item.authType ==1"> <div class="line"> -- Gitblit v1.9.3