From d1fd6baf6db9de92f00880ee1f533954b75fa1fe Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Fri, 27 Jun 2025 17:14:31 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=9B=9E=E6=94=B6?=
 =?UTF-8?q?=E5=8E=BB=E5=90=91=E5=92=8C=E5=AE=A2=E6=9C=8D=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=8F=8A=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在pages.json中添加mine子包，包含recyclingDestination和questionDetail页面
- 修改questionDetail页面标题和API调用
- 更新回收规则显示组件为uv-parse
- 优化首页和回收页的banner显示逻辑和高度
- 为回收去向和客服问题添加点击跳转功能
- 添加用户黑名单检查逻辑
- 统一描述字段为description
---
 pages.json                       | 17 +++++++++++++
 pages/component/home.vue         | 26 +++++++++++++-------
 pages/component/my.vue           |  6 ++---
 pages/component/recycle copy.vue |  2 +-
 pages/component/recycle.vue      | 52 ++++++++++++++++++++++++++++++++++------
 pages/mine/questionDetail.vue    |  4 ++--
 pages/subcomponent/admin_faq.vue |  7 ++++--
 7 files changed, 91 insertions(+), 23 deletions(-)

diff --git a/pages.json b/pages.json
index f3fffc4..b0a608a 100644
--- a/pages.json
+++ b/pages.json
@@ -31,6 +31,23 @@
 		}
 	],
 	"subPackages": [
+		{
+			"root": "pages/mine",
+			"pages": [
+				{
+					"path": "recyclingDestination",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "questionDetail",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				}
+			]
+		},
 		{
 			"root": "pages/subcomponent",
 			"pages": [
diff --git a/pages/component/home.vue b/pages/component/home.vue
index 5ab01c0..8ff9bd7 100644
--- a/pages/component/home.vue
+++ b/pages/component/home.vue
@@ -8,7 +8,7 @@
         :interval="3000"
         :duration="500"
         circular
-        style="width: 100%; height: 380rpx;"
+        style="width: 100%; height: 320rpx;"
       >
         <swiper-item v-for="(item, index) in bannerList" :key="item.id || index">
           <video 
@@ -137,11 +137,14 @@
 		    <text class="title">回收去向</text>
 		  </view>
 		  <view class="destination-grid">
-		    <view class="destination-item "  :class="`destination-item${index + 1}`" v-for="(item, index) in destinations" :key="index">
+		    <view class="destination-item " 
+			@click="$utils.navigateTo('/pages/mine/recyclingDestination?id=' + item.id)"
+			:class="`destination-item${index + 1}`" 
+			v-for="(item, index) in destinations" :key="index">
 		      <image :src="item.icon" mode="aspectFit" class="dest-icon"></image>
 		      <view class="dest-info">
 		        <text class="dest-title">{{item.title}}</text>
-		        <text class="dest-desc">{{item.desc}}</text>
+		        <text class="dest-desc">{{item.description}}</text>
 		      </view>
 		    </view>
 		  </view>
@@ -197,22 +200,22 @@ export default {
         { 
           icon: '/static/home/爱心援乡.png', 
           title: '爱心援乡',
-          desc: '精准帮扶贫困群体'
+          description: '精准帮扶贫困群体'
         },
         { 
           icon: '/static/home/回塑新源.png',  
           title: '回塑新源',
-          desc: '塑料的第二次成型'
+          description: '塑料的第二次成型'
         },
         { 
           icon: '/static/home/织物出海.png',
           title: '织物出海',
-          desc: '分拣出最高价值'
+          description: '分拣出最高价值'
         },
         { 
           icon: '/static/home/碳循再生.png',
           title: '碳循再生',
-          desc: '减碳从出发生系统'
+          description: '减碳从出发生系统'
         }
       ],
       bannerList: [],
@@ -336,6 +339,12 @@ export default {
         }
       })
     },
+    getRecyclingDestination() {
+      this.$api('getRecyclingDestination')
+	  .then(res => {
+		  this.destinations = res.result
+	  })
+    },
     goToInspectionReport(item) {
       uni.navigateTo({
         url: `/pages/subcomponent/inspection-report?id=${item.id}`
@@ -415,6 +424,7 @@ export default {
     // 监听全局数据更新
     uni.$on('configDataUpdated', this.updateCionData);
     this.getPricePreview();
+	this.getRecyclingDestination()
   },
 }
 </script>
@@ -435,7 +445,7 @@ export default {
 
 .banner {
   width: 100%;
-  height: 390rpx;
+  height: 330rpx;
   position: relative;
   overflow: hidden;
   border-radius: 0 0 30rpx 30rpx;
diff --git a/pages/component/my.vue b/pages/component/my.vue
index c309849..0518940 100644
--- a/pages/component/my.vue
+++ b/pages/component/my.vue
@@ -393,8 +393,8 @@ export default {
       return getApp().globalData.bannerList || []
     },
     myBannerImage() {
-      const banner = (getApp().globalData.bannerList || []).find(item => item.title === '我的-轮播图');
-      return banner ? banner.image : '';
+      const item = getApp().globalData.configData.find(i => i.keyName === 'user_banner')
+      return item ? item.keyContent : ''
     },
     userTypeText() {
       // 0 普通用户, 1 推广达人, 2 推广大使
@@ -452,7 +452,7 @@ export default {
 }
 
 .banner {
-  height: 400rpx;
+  height: 320rpx;
   background: #ff6b35;
   position: relative;
   overflow: hidden;
diff --git a/pages/component/recycle copy.vue b/pages/component/recycle copy.vue
index 134e98e..b34939a 100644
--- a/pages/component/recycle copy.vue	
+++ b/pages/component/recycle copy.vue	
@@ -249,7 +249,7 @@
       <view class="rule-popup">
         <view class="rule-popup-title">回收规则</view>
         <scroll-view class="rule-popup-content" scroll-y>
-          <rich-text :nodes="ruleHtml" />
+          <uv-parse :nodes="ruleHtml" />
         </scroll-view>
         <button class="rule-popup-btn" @click="closeRulePopup">我知道了</button>
         <!-- <view class="rule-popup-close" @tap="closeRulePopup">
diff --git a/pages/component/recycle.vue b/pages/component/recycle.vue
index 764723b..67d4b78 100644
--- a/pages/component/recycle.vue
+++ b/pages/component/recycle.vue
@@ -2,15 +2,15 @@
   <view class="container">
     <!-- 顶部banner -->
     <view class="banner">
-      <swiper
+      <!-- <swiper
         :indicator-dots="false"
         :autoplay="true"
         :interval="3000"
         :duration="500"
         circular
-        style="width: 100%; height: 400rpx;"
-      >
-        <swiper-item v-for="(item, index) in bannerList" :key="item.id || index">
+        style="width: 100%; height: 320rpx;"
+      > -->
+        <!-- <swiper-item v-for="(item, index) in bannerList" :key="item.id || index">
           <video 
             v-if="item.type == 1" 
             :src="item.voUrl" 
@@ -25,8 +25,11 @@
           ></video>
           <image v-else :src="item.image" mode="aspectFill" style="width: 100%; height: 100%;" />
         </swiper-item>
-      </swiper>
+      </swiper> -->
+	  
+	    <image v-if="recycle_banner" :src="recycle_banner" mode="aspectFill" style="width: 100%; height: 100%;" />
     </view>
+	
 
     <!-- 商品列表 -->
     <view class="goods-list">
@@ -250,7 +253,7 @@
       <view class="rule-popup">
         <view class="rule-popup-title">回收规则</view>
         <scroll-view class="rule-popup-content" scroll-y>
-          <rich-text :nodes="ruleHtml" />
+		  <uv-parse :content="ruleHtml"></uv-parse>
         </scroll-view>
         <button class="rule-popup-btn" @click="closeRulePopup">我知道了</button>
         <!-- <view class="rule-popup-close" @tap="closeRulePopup">
@@ -352,9 +355,15 @@ export default {
       reduceBrandList: [], // 可减少的品牌列表
       viewedRuleItems: new Set(), // 已查看过规则的商品ID集合
       loadOptions: null, // 保存options参数
+      userInfo: null, // 用户信息
+      isUserBlacklisted: false, // 用户是否被拉黑
     }
   },
   computed: {
+    recycle_banner() {
+      const item = getApp().globalData.configData.find(i => i.keyName === 'recycle_banner')
+      return item ? item.keyContent : ''
+    },
     // 当前分类的商品列表
     recycleList() {
       const currentCategoryId = this.categories[this.currentCategory]?.id
@@ -625,6 +634,17 @@ export default {
       })
     },
     submitOrder() {
+      // 检查用户是否被拉入黑名单
+      if (this.isUserBlacklisted) {
+        uni.showModal({
+          title: '提示',
+          content: '您的账户已被限制使用回收服务，如有疑问请联系客服。',
+          showCancel: false,
+          confirmText: '我知道了'
+        })
+        return
+      }
+      
       if (this.totalCount < 3) {
         uni.showToast({
           title: '各品类混合需要满3件才能回收哦',
@@ -740,6 +760,21 @@ export default {
     toggleDetailPanel() {
       this.showDetailPanel = !this.showDetailPanel
     },
+    fetchUserInfo() {
+      if(uni.getStorageSync('token')){
+        this.login_status = getApp().globalData.login_status;
+        this.$api("getUserByToken",{},(res)=>{
+          if(res.code == 200){
+            this.userInfo = res.result
+            // 检查用户是否被拉入黑名单
+            this.isUserBlacklisted = res.result.isBlack === 'Y'
+            // isTuiType 为0用户,1推广达人,2推广大使 
+          }
+        })
+      } else {
+        this.login_status = false;
+      }
+    },
     updateQuantityByProduct(item, delta) {
       // 在明细弹窗中更新数量
       if (item.brandId) {
@@ -984,6 +1019,9 @@ export default {
     uni.$off('clearRecycleOrderData')
   },
   onShow() {
+    // 获取用户信息，检查黑名单状态
+    this.fetchUserInfo()
+    
     const id = getApp().globalData.targetRecycleCategoryId
     if (id) {
       const trySwitch = () => {
@@ -1083,7 +1121,7 @@ export default {
   // flex: 1;
   display: flex;
   position: relative;
-  height: calc(100vh - 400rpx - 120rpx - env(safe-area-inset-bottom)); /* 减去banner和底部栏的高度 */
+  height: calc(100vh - 320rpx - 120rpx - env(safe-area-inset-bottom)); /* 减去banner和底部栏的高度 */
   margin-top: -10rpx;
   z-index: 2;
   border-radius: 20rpx 20rpx 0 0;
diff --git a/pages/mine/questionDetail.vue b/pages/mine/questionDetail.vue
index dfbabb7..7a7f0f5 100644
--- a/pages/mine/questionDetail.vue
+++ b/pages/mine/questionDetail.vue
@@ -25,12 +25,12 @@
 			return {
 				id : 0,
 				detail : {},
-				title : '回收去向',
+				title : '客服问题',
 			}
 		},
 		methods: {
 			getDetail(){
-				this.$api('getRecyclingDestinationDetail', {
+				this.$api('getQuestionListDetail', {
 					id : this.id
 				}).then(res => {
 					this.detail = res.result
diff --git a/pages/subcomponent/admin_faq.vue b/pages/subcomponent/admin_faq.vue
index 22fc705..0f52546 100644
--- a/pages/subcomponent/admin_faq.vue
+++ b/pages/subcomponent/admin_faq.vue
@@ -10,7 +10,9 @@
     <view class="main-content">
       <view class="content-card">
         <view class="qa-list">
-          <view class="qa-item" v-for="(item, idx) in faqList" :key="idx">
+          <view class="qa-item" 
+		  @click="$utils.navigateTo('/pages/mine/questionDetail?id=' + item.id)"
+		  v-for="(item, idx) in faqList" :key="idx">
             <view class="question-row">
               <text class="q-icon">Q</text>
               <text class="question">{{item.q}}</text>
@@ -111,7 +113,8 @@ export default {
         if (res && res.success && res.result && res.result.records) {
           this.faqList = res.result.records.map(item => ({
             q: item.title,
-            a: item.titleText
+            a: item.titleText,
+			id : item.id
           }))
         }
       })