From 0ad456dc33003c983ba44f8c01a1edf6c3694b86 Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Thu, 22 May 2025 12:00:04 +0800
Subject: [PATCH] =?UTF-8?q?feat(market):=20=E4=BC=98=E5=8C=96=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E8=B5=84=E6=96=99=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改部门信息展示方式，按校区和部门分别显示
- 优化页面布局，调整用户信息和部门信息的样式- 在我的页面中添加部门信息展示
- 修复意见反馈功能暂时不可用的问题
---
 pages/market/my/index.vue | 52 ++++++++++++++++++++++++++++++---------
 pages/market/my/info.vue  | 14 ++++++++++-
 2 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/pages/market/my/index.vue b/pages/market/my/index.vue
index c281068..0cef266 100644
--- a/pages/market/my/index.vue
+++ b/pages/market/my/index.vue
@@ -20,12 +20,16 @@
             <view class="btn"></view>
           </view>
         </view>
-        <view class="bottom">
-          <view class="title">部门</view>
-          <view class="title">{{userInfo.department_name_str}}</view>
+        <view class="bottom" v-for="(v,k) in userInfo.cameus_dept_arr">
+          <view class="left">
+            <view class="title">校区：</view>
+            <view class="title">{{v.campus_id_name}}</view>
+          </view>
           <view class="division"></view>
-          <view class="title">等级</view>
-          <view class="title">S5</view>
+          <view class="right">
+            <view class="title">部门：</view>
+            <view class="title dept">{{v.dept_name_str}}</view>
+          </view>
         </view>
       </view>
 
@@ -84,10 +88,10 @@
       </view>
 
       <view class="section_box">
-        <view class="item" @click="openViewFeedback()">
-          <view>意见反馈</view>
-          <view></view>
-        </view>
+<!--        <view class="item" @click="openViewFeedback()">-->
+<!--          <view>意见反馈</view>-->
+<!--          <view></view>-->
+<!--        </view>-->
 
         <view class="item" @click="openViewSetUp()">
           <view>设置</view>
@@ -165,7 +169,21 @@ export default {
         })
         return
       }
+
+
+
+      res.data.cameus_dept_arr.forEach((v,k)=>{
+        console.log(111111,v)
+        let d_arr = []
+        v.dept_arr.forEach((dv,dk)=>{
+          d_arr.push(dv.dept_name)
+        })
+        //数组转字符串
+        v.dept_name_str = d_arr.join('，')
+      })
+
       this.userInfo = res.data
+      console.log('限定',this.userInfo)
     },
 
 
@@ -275,7 +293,7 @@ export default {
 //用户信息
 .user_section {
   background-color: #29D3B4;
-  padding-top: 58rpx;
+  padding-top: 10rpx;
   padding-bottom: 42rpx;
   color: #fff;
   font-size: 28rpx;
@@ -314,15 +332,27 @@ export default {
     padding: 0rpx 40rpx;
     display: flex;
     justify-content: space-between;
-    align-items: center;
+    align-items: flex-start;
     .title{
       font-size: 28rpx;
     }
+    //分割线段
     .division{
       width: 2px;
       height: 35rpx;
       background-color: #fff;
     }
+    .left{
+      width: 48%;
+      display: flex;
+    }
+    .right{
+      width: 48%;
+      display: flex;
+      .dept{
+        width: 70%;
+      }
+    }
   }
 }
 
diff --git a/pages/market/my/info.vue b/pages/market/my/info.vue
index 9307f9a..fefbe9c 100644
--- a/pages/market/my/info.vue
+++ b/pages/market/my/info.vue
@@ -39,7 +39,8 @@
             部门 <text class="required"></text>
           </view>
           <view class="input">
-            <input disabled :placeholder="formData.department_name_str" />
+<!--            <input disabled :placeholder="formData.department_name_str" />-->
+            <view class="dept disabled">{{formData.department_name_str || '暂无'}}</view>
           </view>
         </view>
 
@@ -455,6 +456,7 @@ export default {
       .btn{}
 
       .title{
+        min-width: 100rpx;
         display: flex;
         align-items: center;
         font-size: 26rpx;
@@ -465,9 +467,19 @@ export default {
         }
       }
       .input{
+        display: flex;
+        justify-content: flex-end;
         input{
           text-align: right;
         }
+        .dept{
+          width: 50%;
+        }
+        .disabled{
+          color: #808080;
+          //禁止图标
+          cursor: not-allowed;
+        }
       }
     }
   }