From c8329b2e28a2659c101aab292c9269d92ca0d6fe Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Sat, 28 Jun 2025 19:20:56 +0800
Subject: [PATCH] 1

---
 config.js                                |  2 +-
 pages/component/my.vue                   |  2 +-
 pages/manager/user-detail.vue            |  6 +++---
 pages/manager/user.vue                   | 16 ++++++++++++----
 pages/subcomponent/inspection-report.vue | 13 ++++++++++++-
 5 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/config.js b/config.js
index b78c2f0..a1172f2 100644
--- a/config.js
+++ b/config.js
@@ -1,5 +1,5 @@
 // config.js
-const type = 'prod'
+const type = 'local'
 
 const config = {
   local: {
diff --git a/pages/component/my.vue b/pages/component/my.vue
index c8695c7..c2ffaaa 100644
--- a/pages/component/my.vue
+++ b/pages/component/my.vue
@@ -367,7 +367,7 @@ export default {
         userTypeText() {
             if (this.userInfo.isUser == 'Y') return this.userInfo.isTuiTypeTitle
             return '普通用户'
-        }
+        },
     },
     onLoad() {
         // 检查App数据是否已经准备好
diff --git a/pages/manager/user-detail.vue b/pages/manager/user-detail.vue
index 135089c..1313e8b 100644
--- a/pages/manager/user-detail.vue
+++ b/pages/manager/user-detail.vue
@@ -61,7 +61,7 @@
     </view>
     <!-- 底部操作栏 -->
     <view class="bottom-bar">
-      <button v-if="user.blocked" class="action-btn danger" @tap="unblockUser">解除拉黑</button>
+      <button v-if="user.blocked" class="action-btn danger" @tap="blockUser">解除拉黑</button>
       <template v-else>
         <button class="action-btn danger" @tap="blockUser">拉黑</button>
         <button v-if="user.role!=='推广官'" class="action-btn primary" @tap="upgradeUser">升级推广官</button>
@@ -135,8 +135,8 @@ export default {
       if (!this.user.id) return;
       this.$api('blackUser', { userId: this.user.id }, res => {
         if (res && res.code === 200) {
-          uni.showToast({ title: '已拉黑', icon: 'success' });
-          this.user.blocked = true;
+			this.user.blocked = !this.user.blocked;
+          uni.showToast({ title: this.user.blocked ? '已拉黑' : '已解除', icon: 'success' });
         } else {
           uni.showToast({ title: res.msg || '拉黑失败', icon: 'none' });
         }
diff --git a/pages/manager/user.vue b/pages/manager/user.vue
index f2a200f..8ad4f07 100644
--- a/pages/manager/user.vue
+++ b/pages/manager/user.vue
@@ -41,7 +41,9 @@
         <view class="user-info-row">
           <text class="user-label">角色：</text>
           <template v-if="user.role">
-            <text class="role-tag" v-if="user.role === '推广官'">推广官</text>
+            <text class="role-tag" v-if="user.role == '推广官'">
+				{{ userTypeText(user) || '推广官' }}
+			</text>
             <text v-else class="user-value">{{ user.role }}</text>
           </template>
           <template v-else>
@@ -100,8 +102,9 @@ export default {
         }
       }).exec();
     });
-    // 初始加载数据
-    this.refreshData();
+  },
+  onShow() {
+  	this.refreshData();
   },
   methods: {
     goBack() {
@@ -120,6 +123,10 @@ export default {
         this.showSuggestList = false;
       }
     },
+	userTypeText(userInfo) {
+	    if (userInfo.isUser == 'Y') return userInfo.isTuiTypeTitle
+	    return '普通用户'
+	},
     clearInput() {
       this.searchText = '';
       this.showSuggestList = false;
@@ -159,12 +166,13 @@ export default {
         });
         if (res && res.code === 200 && res.result && Array.isArray(res.result.records)) {
           this.users = res.result.records.map(user => ({
+			...user,
             id: user.id,
             name: user.name || user.nickName || '-',
             phone: user.phone || '-',
             role: user.isUser === 'Y' ? '推广官' : '',
             blocked: user.isBlack === 'Y',
-            avatar: user.headImage || user.avatar || user.avatarUrl || ''
+            avatar: user.headImage || user.avatar || user.avatarUrl || '',
           }));
         }
       } catch (error) {
diff --git a/pages/subcomponent/inspection-report.vue b/pages/subcomponent/inspection-report.vue
index b36ed02..6deea85 100644
--- a/pages/subcomponent/inspection-report.vue
+++ b/pages/subcomponent/inspection-report.vue
@@ -14,7 +14,7 @@
     </view>
     <!-- 打钩标签区及说明 -->
     <view class="feature-area" :style="{marginTop: navBarTotalHeight+statusBarHeight + 'px'}">
-      <view class="feature-desc">该报告由「瀚海回收」质检查验出具</view>
+      <view class="feature-desc">该报告由「{{ applet_title }}」质检查验出具</view>
       <view class="feature-tags">
         <view class="tag" v-for="(t, i) in featureTags" :key="i">
           <text class="check">✓</text>
@@ -22,6 +22,13 @@
         </view>
       </view>
     </view>
+	
+	<!-- <view class="">
+		<image src="https://oss.budingxiaoshuo.com/upload/质检报告_1748937704910.png" 
+		style="width: 100%;"
+		mode="widthFix"></image>
+	</view> -->
+	
     <!-- 主内容区（卡片悬浮覆盖打钩区） -->
     <view class="main-content">
       <view v-if="showQualified && goodsList.length" class="inspection-card">
@@ -103,6 +110,10 @@ export default {
     }
   },
   computed: {
+    applet_title() {
+      const item = getApp().globalData.configData.find(i => i.keyName === 'applet_title')
+      return item ? item.keyContent : ''
+    },
     totalCount() {
       return this.goodsList.reduce((sum, item) => sum + item.count, 0)
     },