From 8e3966d80b6f98ccf11529b9519f0537c3224485 Mon Sep 17 00:00:00 2001
From: wx-jincw <jin.chenwei@iwhalecloud.com>
Date: Tue, 21 Apr 2026 22:32:55 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8A=95=E8=AF=89=E5=BB=BA=E8=AE=AE?=
 =?UTF-8?q?=E3=80=81=E7=A5=88=E6=84=BF=E8=8F=9C=E5=8D=95=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/property.js                           |   9 +
 app/config/app.js                             |   8 +-
 app/pages.json                                |  62 ++--
 .../supply_chain/complaint/HandlePopup.vue    | 309 ++++++++++++++++++
 app/pages/supply_chain/complaint/index.vue    |  79 ++++-
 .../supply_chain/wish_menu/HandlePopup.vue    | 309 ++++++++++++++++++
 app/pages/supply_chain/wish_menu/index.vue    |  83 ++++-
 app/pages/user/index.vue                      |  22 +-
 8 files changed, 825 insertions(+), 56 deletions(-)
 create mode 100644 app/pages/supply_chain/complaint/HandlePopup.vue
 create mode 100644 app/pages/supply_chain/wish_menu/HandlePopup.vue

diff --git a/app/api/property.js b/app/api/property.js
index 4114236..a507d56 100644
--- a/app/api/property.js
+++ b/app/api/property.js
@@ -9,6 +9,15 @@ export function createComplaintSuggestion(data) {
   );
 }
 
+// 投诉与建议 - 更新
+export function updateComplaintSuggestion(data) {
+  return request.post(
+    'autogencode/pmcomplaintsuggestion/update',
+    data,
+    { useAdminUrl: true }
+  );
+}
+
 // 投诉与建议 - 列表（可根据实际需要传入查询参数，如业主ID等）
 export function listComplaintSuggestion(params) {
   return request.get(
diff --git a/app/config/app.js b/app/config/app.js
index 8a9fc51..eadf9eb 100644
--- a/app/config/app.js
+++ b/app/config/app.js
@@ -8,8 +8,8 @@
 // | Author: CRMEB Team <admin@crmeb.com>
 // +----------------------------------------------------------------------
 //移动端商城API
-let domain = 'https://fzbfwy.com/mobile-api'
-// let domain = 'http://crmebxcx.test.jiutianda.cn'
+// let domain = 'https://fzbfwy.com/mobile-api'
+let domain = 'http://crmebxcx.test.jiutianda.cn'
 
 module.exports = {
 	// 请求域名 格式： https://您的域名
@@ -18,8 +18,8 @@ module.exports = {
 	// #ifdef MP
 		HTTP_REQUEST_URL: domain,
 	// #endif
-	// HTTP_ADMIN_URL:'https://crmeb.test.jiutianda.cn',
-	HTTP_ADMIN_URL:'https://fzbfwy.com/prod-api', //PC后台的API请求地址，上传图片用,影响h5上传头像
+	HTTP_ADMIN_URL:'https://crmeb.test.jiutianda.cn',
+	// HTTP_ADMIN_URL:'https://fzbfwy.com/prod-api', //PC后台的API请求地址，上传图片用,影响h5上传头像
 	// #ifdef H5
 		//H5接口是浏览器地址
 		// HTTP_REQUEST_URL: window.location.protocol+"//"+window.location.host,
diff --git a/app/pages.json b/app/pages.json
index d955383..aa0894b 100644
--- a/app/pages.json
+++ b/app/pages.json
@@ -379,7 +379,13 @@
 				{
 					"path": "privacy/index",
 					"style": {
-						"navigationBarTitleText": "隐私协议"
+						"navigationBarTitleText": "隐私协议",
+						"navigationBarBackgroundColor": "#FFFFFF",
+						"navigationBarTextStyle": "black"
+						// #ifdef H5
+							,
+						"navigationStyle": "custom"
+						// #endif 
 					}
 				},
 				{
@@ -390,20 +396,24 @@
 				{
 					"path": "retrievePassword/index",
 					"style": {
-						"navigationBarTitleText": "忘记密码"
+						"navigationBarTitleText": "忘记密码",
+						"navigationBarBackgroundColor": "#FFFFFF",
+						"navigationBarTextStyle": "black"
+						// #ifdef H5
+							,
+						"navigationStyle": "custom"
+						// #endif 
 					}
 				},
 				{
 					"path": "user_info/index",
 					"style": {
-						//"navigationBarTitleText": "个人资料",
-						"navigationBarBackgroundColor": "#409EFF",
-						"app-plus": {
-							// #ifdef APP-PLUS
-							"titleNView": {
-								"type": "default"
-							}
-							// #endif
+						"navigationBarBackgroundColor": "#FFFFFF",
+						"navigationBarTextStyle": "black"
+						// #ifdef H5
+							,
+						"navigationStyle": "custom"
+						// #endif 
 						}
 					}
 				},
@@ -624,11 +634,12 @@
 					"path": "user_phone/index",
 					"style": {
 						"navigationBarTitleText": "修改手机号",
-						"navigationBarBackgroundColor": "#409EFF"
-							// #ifdef MP
+						"navigationBarBackgroundColor": "#FFFFFF",
+						"navigationBarTextStyle": "black"
+						// #ifdef H5
 							,
-						"navigationBarTextStyle": "#fff"
-							// #endif
+						"navigationStyle": "custom"
+						// #endif 
 					}
 				},
 				{
@@ -641,11 +652,12 @@
 					"path": "user_pwd_edit/index",
 					"style": {
 						"navigationBarTitleText": "修改密码",
-						"navigationBarBackgroundColor": "#409EFF"
-							// #ifdef MP 
+						"navigationBarBackgroundColor": "#FFFFFF",
+						"navigationBarTextStyle": "black"
+						// #ifdef H5
 							,
-						"navigationBarTextStyle": "#fff"
-							// #endif
+						"navigationStyle": "custom"
+						// #endif 
 					}
 				},
 				{
@@ -801,14 +813,12 @@
 					"path": "login/index",
 					"style": {
 						"navigationBarTitleText": "登录",
-						"navigationBarBackgroundColor": "#409EFF",
-								"app-plus": {
-									// #ifdef APP-PLUS
-									"titleNView": {
-										"type": "default"
-									}
-									// #endif
-								}
+						"navigationBarBackgroundColor": "#FFFFFF",
+						"navigationBarTextStyle": "black"
+						// #ifdef H5
+							,
+						"navigationStyle": "custom"
+						// #endif 
 							}
 						},
 				{
diff --git a/app/pages/supply_chain/complaint/HandlePopup.vue b/app/pages/supply_chain/complaint/HandlePopup.vue
new file mode 100644
index 0000000..20bbd9e
--- /dev/null
+++ b/app/pages/supply_chain/complaint/HandlePopup.vue
@@ -0,0 +1,309 @@
+<template>
+  <uni-popup ref="popup" type="bottom">
+    <view class="handle-popup">
+      <view class="popup-header">
+        <text class="popup-title">处理反馈</text>
+        <text class="popup-close" @click="close">×</text>
+      </view>
+
+      <scroll-view scroll-y class="popup-body">
+        <view class="form-item">
+          <text class="label">处理结果</text>
+          <textarea
+            class="textarea"
+            v-model="form.handlerReslut"
+            placeholder="请输入处理结果"
+            maxlength="500"
+            :auto-height="true"
+          />
+          <text class="count">{{ (form.handlerReslut || '').length }}/500</text>
+        </view>
+
+        <view class="form-item">
+          <text class="label">反馈图片</text>
+          <view class="upload-section">
+            <view class="upload-list">
+              <view
+                class="upload-item"
+                v-for="(image, index) in images"
+                :key="index"
+              >
+                <image :src="HTTP_ADMIN_URL + '/' + (image.url || image.attDir || image.filePath || '')" mode="aspectFill"></image>
+                <text class="delete-btn" @click="deleteImage(index)">×</text>
+              </view>
+              <view class="upload-btn" @click="chooseImage" v-if="images.length < 9">
+                <text class="iconfont icon-tianjia"></text>
+                <text>添加图片</text>
+              </view>
+            </view>
+            <text class="hint">最多上传9张图片</text>
+          </view>
+        </view>
+      </scroll-view>
+
+      <view class="popup-footer">
+        <view class="submit-btn" @click="handleSubmit">提交处理</view>
+      </view>
+    </view>
+  </uni-popup>
+</template>
+
+<script>
+import { HTTP_ADMIN_URL } from '@/config/app';
+import request from '@/utils/request.js';
+
+export default {
+  data() {
+    return {
+      HTTP_ADMIN_URL,
+      currentItem: null,
+      form: {
+        handlerReslut: ''
+      },
+      images: []
+    };
+  },
+  methods: {
+    open(item) {
+      this.currentItem = item;
+      this.form.handlerReslut = item.handlerReslut || '';
+      this.images = item.beforeProcessFiles && item.beforeProcessFiles.length ? [...item.beforeProcessFiles] : [];
+      this.$refs.popup.open();
+    },
+    close() {
+      this.$refs.popup.close();
+    },
+    chooseImage() {
+      // #ifndef MP-WEIXIN
+      uni.chooseImage({
+        count: 9 - this.images.length,
+        sizeType: ['compressed'],
+        sourceType: ['album', 'camera'],
+        success: (res) => {
+          this.uploadImages(res.tempFilePaths);
+        }
+      });
+      // #endif
+      // #ifdef MP-WEIXIN
+      uni.chooseMedia({
+        count: 9 - this.images.length,
+        mediaType: ['image'],
+        sourceType: ['album', 'camera'],
+        sizeType: ['compressed'],
+        success: (res) => {
+          const tempFilePaths = res.tempFiles.map(file => file.tempFilePath);
+          this.uploadImages(tempFilePaths);
+        }
+      });
+      // #endif
+    },
+    async uploadImages(filePaths) {
+      for (let i = 0; i < filePaths.length; i++) {
+        try {
+          uni.showLoading({ title: '上传中...', mask: true });
+          const result = await request.uploadFile(filePaths[i], 'multipart', {}, {
+            params: { model: 'app-complaint', pid: 10 }
+          });
+          this.images.push(result);
+        } catch (e) {
+          console.error('上传图片失败:', e);
+          uni.showToast({ title: '上传失败', icon: 'none' });
+        } finally {
+          uni.hideLoading();
+        }
+      }
+    },
+    deleteImage(index) {
+      this.images.splice(index, 1);
+    },
+    getCurrentTime() {
+      const now = new Date();
+      return `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}-${String(now.getDate()).padStart(2, '0')} ${String(now.getHours()).padStart(2, '0')}:${String(now.getMinutes()).padStart(2, '0')}:${String(now.getSeconds()).padStart(2, '0')}`;
+    },
+    normalizeFile(file) {
+      let attDir = file.url;
+      return {
+        attId: file.id + '',
+        name: file.fileName,
+        attDir,
+        attSize: file.fileSize,
+        attType: file.type,
+        fileName: file.fileName,
+        filePath: attDir,
+        url: attDir,
+        originalFileName: file.fileName
+      };
+    },
+    handleSubmit() {
+      const result = (this.form.handlerReslut || '').trim();
+      if (!result) {
+        uni.showToast({ title: '请输入处理结果', icon: 'none' });
+        return;
+      }
+      const afterProcessFiles = this.images.map(file => this.normalizeFile(file));
+      const payload = {
+        ...this.currentItem,
+        handlerReslut: result,
+        handlerDate: this.getCurrentTime(),
+        afterProcessFiles,
+        status: '3',
+      };
+      this.$emit('submit', payload);
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+.handle-popup {
+  width: 100%;
+  max-height: 80vh;
+  background: #fff;
+  border-radius: 20rpx 20rpx 0 0;
+  display: flex;
+  flex-direction: column;
+
+  .popup-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 30rpx;
+    border-bottom: 1rpx solid #f0f0f0;
+    flex-shrink: 0;
+
+    .popup-title {
+      font-size: 32rpx;
+      font-weight: 600;
+      color: #333;
+    }
+
+    .popup-close {
+      font-size: 50rpx;
+      color: #999;
+      line-height: 1;
+    }
+  }
+
+  .popup-body {
+    flex: 1;
+    padding: 30rpx;
+    max-height: 55vh;
+
+    .form-item {
+      margin-bottom: 30rpx;
+
+      .label {
+        display: block;
+        font-size: 28rpx;
+        color: #374151;
+        margin-bottom: 12rpx;
+        font-weight: 500;
+      }
+
+      .textarea {
+        width: 100%;
+        min-height: 160rpx;
+        background: #f9fafb;
+        border-radius: 12rpx;
+        padding: 20rpx;
+        font-size: 28rpx;
+        box-sizing: border-box;
+        line-height: 1.6;
+      }
+
+      .count {
+        display: block;
+        margin-top: 10rpx;
+        text-align: right;
+        font-size: 22rpx;
+        color: #999;
+      }
+
+      .upload-section {
+        .upload-list {
+          display: flex;
+          flex-wrap: wrap;
+          gap: 20rpx;
+
+          .upload-item {
+            width: 180rpx;
+            height: 180rpx;
+            position: relative;
+            border-radius: 12rpx;
+            overflow: hidden;
+
+            image {
+              width: 100%;
+              height: 100%;
+            }
+
+            .delete-btn {
+              position: absolute;
+              top: 10rpx;
+              right: 10rpx;
+              width: 40rpx;
+              height: 40rpx;
+              background: rgba(0, 0, 0, 0.6);
+              color: #fff;
+              border-radius: 50%;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              font-size: 32rpx;
+            }
+          }
+
+          .upload-btn {
+            width: 180rpx;
+            height: 180rpx;
+            border: 2rpx dashed #d9d9d9;
+            border-radius: 12rpx;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+            background: #fafafa;
+
+            .iconfont {
+              font-size: 48rpx;
+              color: #bfbfbf;
+              margin-bottom: 8rpx;
+            }
+
+            text {
+              font-size: 24rpx;
+              color: #999;
+            }
+          }
+        }
+
+        .hint {
+          display: block;
+          margin-top: 16rpx;
+          font-size: 22rpx;
+          color: #999;
+        }
+      }
+    }
+  }
+
+  .popup-footer {
+    padding: 20rpx 30rpx;
+    padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
+    border-top: 1rpx solid #f0f0f0;
+    flex-shrink: 0;
+
+    .submit-btn {
+      height: 88rpx;
+      background: #3b82f6;
+      color: #fff;
+      border-radius: 44rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-size: 30rpx;
+      font-weight: 600;
+    }
+  }
+}
+</style>
diff --git a/app/pages/supply_chain/complaint/index.vue b/app/pages/supply_chain/complaint/index.vue
index 27bb18e..b7d0944 100644
--- a/app/pages/supply_chain/complaint/index.vue
+++ b/app/pages/supply_chain/complaint/index.vue
@@ -1,8 +1,16 @@
 <template>
   <z-paging ref="paging" v-model="records" @query="queryList" :layout-only="activeTab === 'form'">
     <template #top>
-      <!-- 顶部标签：我要反馈 / 我的记录 -->
+      <!-- 顶部标签：反馈记录 / 我要反馈 / 我的记录 -->
       <view class="tabs">
+        <view
+          class="tab"
+          v-if="checkPermi('complaint_suggest_deal')"
+          :class="activeTab === 'allList' ? 'active' : ''"
+          @click="switchToAllList"
+        >
+          反馈记录
+        </view>
         <view
           class="tab"
           :class="activeTab === 'form' ? 'active' : ''"
@@ -121,7 +129,7 @@
     </view>
 
     <!-- 列表区域 -->
-    <view class="tab-content" v-show="activeTab === 'list'">
+    <view class="tab-content" v-show="activeTab === 'allList' || activeTab === 'list'">
       <view
         class="record-card"
         v-for="item in records"
@@ -137,7 +145,7 @@
               {{ statusText(item.status) }}
             </text>
           </view>
-          <view class="header-right">
+          <view class="header-right" v-if="activeTab !== 'allList'">
             <text class="time">
               {{ item.submitTime || item.createTime || '' }}
             </text>
@@ -209,24 +217,33 @@
             </view>
           </view>
         </view>
+        <view class="card-footer" v-if="activeTab === 'allList' && item.status !== '3' && item.status !== '2'">
+          <text class="handle-btn" @click="openHandlePopup(item)">处理</text>
+        </view>
       </view>
     </view>
+    <HandlePopup ref="handlePopup" @submit="handleComplaintSubmit" />
   </z-paging>
 </template>
 
 <script>
 import {
   createComplaintSuggestion,
+  updateComplaintSuggestion,
   listComplaintSuggestion,
   deleteComplaintSuggestion
 } from '@/api/property.js';
 import request from '@/utils/request.js';
 import { HTTP_ADMIN_URL } from '@/config/app';
+import { checkPermi } from '@/utils/auth/permission.js';
+import HandlePopup from './HandlePopup.vue';
 
 export default {
+  components: { HandlePopup },
   dicts: ['cs_type'],
   data() {
     return {
+      checkPermi,
       HTTP_ADMIN_URL,
       activeTab: 'form',
       form: {
@@ -258,11 +275,17 @@ export default {
     }
   },
   onLoad() {
-    if (this.activeTab === 'list') {
-      this.refreshList();
+    if (checkPermi('complaint_suggest_deal')) {
+      this.activeTab = 'allList';
     }
   },
   methods: {
+    switchToAllList() {
+      this.activeTab = 'allList';
+      if (!this.records.length) {
+        this.$refs.paging.reload();
+      }
+    },
     switchToList() {
       this.activeTab = 'list';
       if (!this.records.length) {
@@ -391,11 +414,15 @@ export default {
     },
     // 获取反馈记录列表
     queryList(pageNo, pageSize) {
-      // 调用API
-      listComplaintSuggestion({
+      const params = {
         page: pageNo,
         limit: pageSize
-      }).then((res) => {
+      };
+      if (this.activeTab === 'allList') {
+        params.uid = '';
+      }
+      // 调用API
+      listComplaintSuggestion(params).then((res) => {
         const data = res?.data;
         const list = data?.list || [];
         // 将请求结果通过complete传给z-paging处理
@@ -450,6 +477,28 @@ export default {
         }
       });
     },
+    openHandlePopup(item) {
+      this.$refs.handlePopup.open(item);
+    },
+    async handleComplaintSubmit(payload) {
+      try {
+        uni.showLoading({ title: '提交中...', mask: true });
+        await updateComplaintSuggestion(payload);
+        uni.hideLoading();
+        uni.showToast({
+          title: '处理成功',
+          icon: 'success'
+        });
+        this.$refs.handlePopup.close();
+        this.$refs.paging.reload();
+      } catch (e) {
+        uni.hideLoading();
+        uni.showToast({
+          title: typeof e === 'string' ? e : '处理失败，请稍后重试',
+          icon: 'none'
+        });
+      }
+    }
   }
 };
 </script>
@@ -784,6 +833,20 @@ export default {
         }
       }
     }
+
+    .card-footer {
+      margin-top: 16rpx;
+      display: flex;
+      justify-content: flex-end;
+
+      .handle-btn {
+        font-size: 24rpx;
+        color: #409EFF;
+        padding: 8rpx 24rpx;
+        border-radius: 20rpx;
+        background-color: #E6F7FF;
+      }
+    }
   }
 }
 </style>
diff --git a/app/pages/supply_chain/wish_menu/HandlePopup.vue b/app/pages/supply_chain/wish_menu/HandlePopup.vue
new file mode 100644
index 0000000..26aeea1
--- /dev/null
+++ b/app/pages/supply_chain/wish_menu/HandlePopup.vue
@@ -0,0 +1,309 @@
+<template>
+  <uni-popup ref="popup" type="bottom">
+    <view class="handle-popup">
+      <view class="popup-header">
+        <text class="popup-title">处理祈愿</text>
+        <text class="popup-close" @click="close">×</text>
+      </view>
+
+      <scroll-view scroll-y class="popup-body">
+        <view class="form-item">
+          <text class="label">处理结果</text>
+          <textarea
+            class="textarea"
+            v-model="form.handlerReslut"
+            placeholder="请输入处理结果"
+            maxlength="500"
+            :auto-height="true"
+          />
+          <text class="count">{{ (form.handlerReslut || '').length }}/500</text>
+        </view>
+
+        <view class="form-item">
+          <text class="label">处理图片</text>
+          <view class="upload-section">
+            <view class="upload-list">
+              <view
+                class="upload-item"
+                v-for="(image, index) in images"
+                :key="index"
+              >
+                <image :src="HTTP_ADMIN_URL + '/' + (image.url || image.attDir || image.filePath || '')" mode="aspectFill"></image>
+                <text class="delete-btn" @click="deleteImage(index)">×</text>
+              </view>
+              <view class="upload-btn" @click="chooseImage" v-if="images.length < 9">
+                <text class="iconfont icon-tianjia"></text>
+                <text>添加图片</text>
+              </view>
+            </view>
+            <text class="hint">最多上传9张图片</text>
+          </view>
+        </view>
+      </scroll-view>
+
+      <view class="popup-footer">
+        <view class="submit-btn" @click="handleSubmit">提交处理</view>
+      </view>
+    </view>
+  </uni-popup>
+</template>
+
+<script>
+import { HTTP_ADMIN_URL } from '@/config/app';
+import request from '@/utils/request.js';
+
+export default {
+  data() {
+    return {
+      HTTP_ADMIN_URL,
+      currentItem: null,
+      form: {
+        handlerReslut: ''
+      },
+      images: []
+    };
+  },
+  methods: {
+    open(item) {
+      this.currentItem = item;
+      this.form.handlerReslut = item.handlerReslut || '';
+      this.images = item.afterProcessFiles && item.afterProcessFiles.length ? [...item.afterProcessFiles] : [];
+      this.$refs.popup.open();
+    },
+    close() {
+      this.$refs.popup.close();
+    },
+    chooseImage() {
+      // #ifndef MP-WEIXIN
+      uni.chooseImage({
+        count: 9 - this.images.length,
+        sizeType: ['compressed'],
+        sourceType: ['album', 'camera'],
+        success: (res) => {
+          this.uploadImages(res.tempFilePaths);
+        }
+      });
+      // #endif
+      // #ifdef MP-WEIXIN
+      uni.chooseMedia({
+        count: 9 - this.images.length,
+        mediaType: ['image'],
+        sourceType: ['album', 'camera'],
+        sizeType: ['compressed'],
+        success: (res) => {
+          const tempFilePaths = res.tempFiles.map(file => file.tempFilePath);
+          this.uploadImages(tempFilePaths);
+        }
+      });
+      // #endif
+    },
+    async uploadImages(filePaths) {
+      for (let i = 0; i < filePaths.length; i++) {
+        try {
+          uni.showLoading({ title: '上传中...', mask: true });
+          const result = await request.uploadFile(filePaths[i], 'multipart', {}, {
+            params: { model: 'app-wish', pid: 10 }
+          });
+          this.images.push(result);
+        } catch (e) {
+          console.error('上传图片失败:', e);
+          uni.showToast({ title: '上传失败', icon: 'none' });
+        } finally {
+          uni.hideLoading();
+        }
+      }
+    },
+    deleteImage(index) {
+      this.images.splice(index, 1);
+    },
+    getCurrentTime() {
+      const now = new Date();
+      return `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}-${String(now.getDate()).padStart(2, '0')} ${String(now.getHours()).padStart(2, '0')}:${String(now.getMinutes()).padStart(2, '0')}:${String(now.getSeconds()).padStart(2, '0')}`;
+    },
+    normalizeFile(file) {
+      const attDir = file.url || file.attDir || file.filePath || '';
+      return {
+        attId: (file.id || file.attId || '') + '',
+        name: file.fileName || file.name,
+        attDir,
+        attSize: file.fileSize || file.attSize,
+        attType: file.type || file.attType,
+        fileName: file.fileName || file.name,
+        filePath: attDir,
+        url: attDir,
+        originalFileName: file.fileName || file.originalFileName || file.name
+      };
+    },
+    handleSubmit() {
+      const result = (this.form.handlerReslut || '').trim();
+      if (!result) {
+        uni.showToast({ title: '请输入处理结果', icon: 'none' });
+        return;
+      }
+      const afterProcessFiles = this.images.map(file => this.normalizeFile(file));
+      const payload = {
+        ...this.currentItem,
+        handlerReslut: result,
+        handlerDate: this.getCurrentTime(),
+        afterProcessFiles,
+        status: '3',
+      };
+      this.$emit('submit', payload);
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+.handle-popup {
+  width: 100%;
+  max-height: 80vh;
+  background: #fff;
+  border-radius: 20rpx 20rpx 0 0;
+  display: flex;
+  flex-direction: column;
+
+  .popup-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 30rpx;
+    border-bottom: 1rpx solid #f0f0f0;
+    flex-shrink: 0;
+
+    .popup-title {
+      font-size: 32rpx;
+      font-weight: 600;
+      color: #333;
+    }
+
+    .popup-close {
+      font-size: 50rpx;
+      color: #999;
+      line-height: 1;
+    }
+  }
+
+  .popup-body {
+    flex: 1;
+    padding: 30rpx;
+    max-height: 55vh;
+
+    .form-item {
+      margin-bottom: 30rpx;
+
+      .label {
+        display: block;
+        font-size: 28rpx;
+        color: #374151;
+        margin-bottom: 12rpx;
+        font-weight: 500;
+      }
+
+      .textarea {
+        width: 100%;
+        min-height: 160rpx;
+        background: #f9fafb;
+        border-radius: 12rpx;
+        padding: 20rpx;
+        font-size: 28rpx;
+        box-sizing: border-box;
+        line-height: 1.6;
+      }
+
+      .count {
+        display: block;
+        margin-top: 10rpx;
+        text-align: right;
+        font-size: 22rpx;
+        color: #999;
+      }
+
+      .upload-section {
+        .upload-list {
+          display: flex;
+          flex-wrap: wrap;
+          gap: 20rpx;
+
+          .upload-item {
+            width: 180rpx;
+            height: 180rpx;
+            position: relative;
+            border-radius: 12rpx;
+            overflow: hidden;
+
+            image {
+              width: 100%;
+              height: 100%;
+            }
+
+            .delete-btn {
+              position: absolute;
+              top: 10rpx;
+              right: 10rpx;
+              width: 40rpx;
+              height: 40rpx;
+              background: rgba(0, 0, 0, 0.6);
+              color: #fff;
+              border-radius: 50%;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              font-size: 32rpx;
+            }
+          }
+
+          .upload-btn {
+            width: 180rpx;
+            height: 180rpx;
+            border: 2rpx dashed #d9d9d9;
+            border-radius: 12rpx;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+            background: #fafafa;
+
+            .iconfont {
+              font-size: 48rpx;
+              color: #bfbfbf;
+              margin-bottom: 8rpx;
+            }
+
+            text {
+              font-size: 24rpx;
+              color: #999;
+            }
+          }
+        }
+
+        .hint {
+          display: block;
+          margin-top: 16rpx;
+          font-size: 22rpx;
+          color: #999;
+        }
+      }
+    }
+  }
+
+  .popup-footer {
+    padding: 20rpx 30rpx;
+    padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
+    border-top: 1rpx solid #f0f0f0;
+    flex-shrink: 0;
+
+    .submit-btn {
+      height: 88rpx;
+      background: #3b82f6;
+      color: #fff;
+      border-radius: 44rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-size: 30rpx;
+      font-weight: 600;
+    }
+  }
+}
+</style>
diff --git a/app/pages/supply_chain/wish_menu/index.vue b/app/pages/supply_chain/wish_menu/index.vue
index 7d65a0c..1d8194b 100644
--- a/app/pages/supply_chain/wish_menu/index.vue
+++ b/app/pages/supply_chain/wish_menu/index.vue
@@ -1,8 +1,16 @@
 <template>
   <z-paging ref="paging" v-model="records" @query="queryList" :layout-only="activeTab === 'form'">
     <template #top>
-      <!-- 顶部标签：我要祈愿 / 祈愿记录 -->
+      <!-- 顶部标签：祈愿处理 / 我要祈愿 / 祈愿记录 -->
       <view class="tabs">
+        <view
+          class="tab"
+          v-if="checkPermi('wish_menu_deal')"
+          :class="activeTab === 'allList' ? 'active' : ''"
+          @click="switchToAllList"
+        >
+          祈愿处理
+        </view>
         <view
           class="tab"
           :class="activeTab === 'form' ? 'active' : ''"
@@ -87,7 +95,7 @@
     </view>
 
     <!-- 列表区域 -->
-    <view class="tab-content" v-show="activeTab === 'list'">
+    <view class="tab-content" v-show="activeTab === 'allList' || activeTab === 'list'">
       <view
         class="record-card"
         v-for="item in records"
@@ -103,11 +111,11 @@
               {{ statusText(item.status) }}
             </text>
           </view>
-          <view class="header-right">
+          <view class="header-right" v-if="activeTab !== 'allList'">
             <text class="time">
               {{ item.submitTime || item.createTime || '' }}
             </text>
-            <text class="delete-btn" @click="handleDelete(item.id)">删除</text>
+            <text class="delete-btn" @click="handleDelete(item.id)">去删除</text>
           </view>
         </view>
 
@@ -181,24 +189,33 @@
             </view>
           </view>
         </view>
+        <view class="card-footer" v-if="activeTab === 'allList' && item.status !== '3' && item.status !== '2'">
+          <text class="handle-btn" @click="openHandlePopup(item)">处理</text>
+        </view>
       </view>
     </view>
+    <HandlePopup ref="handlePopup" @submit="handleWishSubmit" />
   </z-paging>
 </template>
 
 <script>
 import {
   createComplaintSuggestion,
+  updateComplaintSuggestion,
   wishMenuList,
   deleteComplaintSuggestion
 } from '@/api/property.js';
 import request from '@/utils/request.js';
 import { HTTP_ADMIN_URL } from '@/config/app';
 import store from '@/store';
+import { checkPermi } from '@/utils/auth/permission.js';
+import HandlePopup from './HandlePopup.vue';
 
 export default {
+  components: { HandlePopup },
   data() {
     return {
+      checkPermi,
       HTTP_ADMIN_URL,
       activeTab: 'form',
       form: {
@@ -220,11 +237,17 @@ export default {
     };
   },
   onLoad() {
-    if (this.activeTab === 'list') {
-      this.refreshList();
+    if (checkPermi('wish_menu_deal')) {
+      this.activeTab = 'allList';
     }
   },
   methods: {
+    switchToAllList() {
+      this.activeTab = 'allList';
+      if (!this.records.length) {
+        this.$refs.paging.reload();
+      }
+    },
     switchToList() {
       this.activeTab = 'list';
       if (!this.records.length) {
@@ -360,11 +383,15 @@ export default {
     },
     // 获取祈愿记录列表
     queryList(pageNo, pageSize) {
-      // 调用API
-      wishMenuList({
+      const params = {
         page: pageNo,
         limit: pageSize
-      }).then((res) => {
+      };
+      if (this.activeTab === 'allList') {
+        params.uid = '';
+      }
+      // 调用API
+      wishMenuList(params).then((res) => {
         const data = res?.data;
         const list = data?.list || [];
         // 将请求结果通过complete传给z-paging处理
@@ -424,7 +451,29 @@ export default {
         return store.getters.userInfo.nickname || '—';
       }
       return item.ownerName || '—';
-    }, 
+    },
+    openHandlePopup(item) {
+      this.$refs.handlePopup.open(item);
+    },
+    async handleWishSubmit(payload) {
+      try {
+        uni.showLoading({ title: '提交中...', mask: true });
+        await updateComplaintSuggestion(payload);
+        uni.hideLoading();
+        uni.showToast({
+          title: '处理成功',
+          icon: 'success'
+        });
+        this.$refs.handlePopup.close();
+        this.$refs.paging.reload();
+      } catch (e) {
+        uni.hideLoading();
+        uni.showToast({
+          title: typeof e === 'string' ? e : '处理失败，请稍后重试',
+          icon: 'none'
+        });
+      }
+    }
   }
 };
 </script>
@@ -725,6 +774,20 @@ export default {
         }
       }
     }
+
+    .card-footer {
+      margin-top: 16rpx;
+      display: flex;
+      justify-content: flex-end;
+
+      .handle-btn {
+        font-size: 24rpx;
+        color: #409EFF;
+        padding: 8rpx 24rpx;
+        border-radius: 20rpx;
+        background-color: #E6F7FF;
+      }
+    }
   }
 }
 </style>
diff --git a/app/pages/user/index.vue b/app/pages/user/index.vue
index 8746b76..fb7e14a 100644
--- a/app/pages/user/index.vue
+++ b/app/pages/user/index.vue
@@ -21,7 +21,7 @@
 									</view>
 								</view>
 								<view class="num" v-if="userInfo.phone && uid" @click="goEdit()">
-									<view class="num-txt">{{userInfo.phone}}</view>
+								<view class="num-txt">{{maskPhone(userInfo.phone)}}</view>
 									<view class="icon">
 										<image src="/static/images/edit.png" mode=""></image>
 									</view>
@@ -369,6 +369,12 @@
 						expires: oneDay * 7
 					}); //设置七天过期时间
 				})
+			},
+			maskPhone(phone) {
+				if (!phone) return '';
+				const phoneStr = String(phone);
+				if (phoneStr.length < 7) return phoneStr;
+				return phoneStr.replace(/^(\d{3})\d+(\d{4})$/, '$1****$2');
 			}
 		}
 	}
@@ -386,7 +392,7 @@
 		top: 0;
 		width: 100%;
 		height: 420rpx;
-		background: linear-gradient(180deg, #409EFF 0%, #B3D8FF 100%)
+		background: #fff;
 	}
 
 	.contenBox {
@@ -423,7 +429,7 @@
 		}
 
 		.head {
-			background: linear-gradient(360deg, rgba(255, 121, 49, 0) 0%,  #409EFF 100%);
+			background: #fff;
 			// padding: 0 30rpx;
 
 			.user-card {
@@ -454,7 +460,7 @@
 						.name {
 							display: flex;
 							align-items: center;
-							color: #fff;
+							color: #333;
 							font-size: 31rpx;
 
 							.vip {
@@ -477,7 +483,7 @@
 							display: flex;
 							align-items: center;
 							font-size: 26rpx;
-							color: rgba(255, 255, 255, 0.6);
+							color: #666;
 
 							image {
 								width: 22rpx;
@@ -495,7 +501,7 @@
 					align-items: center;
 					justify-content: space-between;
 					margin-top: 30rpx;
-					color: #fff;
+					color: #333;
 
 					.num-item {
 						width: 33.33%;
@@ -509,7 +515,7 @@
 						.txt {
 							margin-top: 10rpx;
 							font-size: 26rpx;
-							color: rgba(255, 255, 255, 0.6);
+							color: #666;
 						}
 					}
 				}
@@ -656,7 +662,7 @@
 		}
 
 		.phone {
-			color: #fff;
+			color: #409EFF;
 		}
 
 		.order-status-num {