From 0c68b305f32ad25f5999b30e3577402052d3905f Mon Sep 17 00:00:00 2001
From: wangdong <1551135706@qq.com>
Date: Fri, 24 May 2024 20:01:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=8D=E9=A6=88=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/category/index.js       |  8 +++++++-
 pages/feedback/list.vue     | 33 ++++++---------------------------
 pages/shopList/shopPage.vue |  4 ++--
 3 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/api/category/index.js b/api/category/index.js
index 67e1608..c51e87f 100644
--- a/api/category/index.js
+++ b/api/category/index.js
@@ -3,7 +3,8 @@ import request from '@/utils/request'
 // api地址
 const api = {
   list: 'category/list',
-  sonList:'goods/list'
+  sonList:'goods/list',
+	listmerchant: 'category/listmerchant'
 }
 
 
@@ -17,4 +18,9 @@ export const sonList = (param, option) => {
 }
 export const childrenList = (param, option) => {
   return request.get('category/childrenList', param, option)
+}
+
+// 获取商户下商品分类列表
+export const listmerchant = (param, option) => {
+  return request.get(api.listmerchant, param, option)
 }
\ No newline at end of file
diff --git a/pages/feedback/list.vue b/pages/feedback/list.vue
index 79ced36..6e25daf 100644
--- a/pages/feedback/list.vue
+++ b/pages/feedback/list.vue
@@ -5,7 +5,7 @@
 				<view class="f-top">
 					<view class="top-type">
 						<view class="type-info">您的反馈：{{ typeList[item.type - 1] }}</view>
-						<text :class="{ 'ing': item.status !== 1 }">{{ item.status === 1 ? '已完成' : '受理中' }}</text>
+						<text :class="{ 'ing': !item.answer }">{{ item.answer ? '已完成' : '受理中' }}</text>
 					</view>
 					<view class="top-suggest">
 						<view class="suggest" :class="{'suggest-mask': !item.openSuggest }">
@@ -19,7 +19,7 @@
 					</view>
 					<view class="time">{{ item.create_time }}</view>
 				</view>
-				<view v-if="item.status === 1" class="f-bottom">
+				<view v-if="item.answer" class="f-bottom">
 					<view class="title">
 						处理结果
 						<view v-if="item.showResultBtn" class="btn" @click="item.openResult = !item.openResult">
@@ -29,12 +29,12 @@
 					</view>
 					<view class="result" style="margin-bottom: 30rpx;">
 						<view class="result-label">处理时间：</view>
-						<view class="result-content" style="color: #333;">{{ item.solveTime }}</view>
+						<view class="result-content" style="color: #333;">{{ item.deal_time }}</view>
 					</view>
 					<view class="result">
 						<view class="result-label">回复内容：</view>
 						<view class="result-content" :class="{'result-mask': !item.openResult }">
-							{{ item.solveResult }}
+							{{ item.answer }}
 							<view v-if="!item.openResult && item.showResultBtn" class="mask"></view>
 						</view>
 					</view>
@@ -59,28 +59,7 @@
 					'功能新增：我想用的功能，希望能开发新增',
 					'服务建议：服务商服务不到位，我有建议',
 				],
-				list: [
-					// {
-					// 	type: '系统功能异常或不可用',
-					// 	suggest: '点击退款按钮，系统一直转圈，没有反应，请尽快修复解决，另外，系统上能否对接更多好资源。有时候系统打开会显示一直在加载中，不知道是什么原因有时候又没有这个情况。',
-					// 	create_time: '2024-04-01 20:22:31',
-					// 	status: 0,
-					// 	solveTime: '2024-04-01 20:22:31',
-					// 	solveResult: '您好，您反馈的系统问题，我们已经修复，请您删除下小程序，再重新搜索进入小程序即可。供应链系统资源我们-直都在努力对接中，感谢您',
-					// 	openSuggest: false,
-					// 	openResult: false,
-					// },
-					// {
-					// 	type: '系统功能异常或不可用系统功能异常或不可用系统功能异常或不可用',
-					// 	suggest: '点击退款按钮，系统一直转圈，没有反应，请尽快修复解决，另外，系统上能否对接更多好资源。有时候系统打开会显示一直在加载中，不知道是什么原因有时候又没有这个情况。',
-					// 	create_time: '2024-04-01 20:22:31',
-					// 	status: 1,
-					// 	solveTime: '2024-04-01 20:22:31',
-					// 	solveResult: '您好，您反馈的系统问题，我们已经修复，请您删除下小程序，再重新搜索进入小程序即可。供应链系统资源我们-直都在努力对接中，感谢您',
-					// 	openSuggest: false,
-					// 	openResult: false,
-					// }
-				],
+				list: [],
 				loading: false,
 			};
 		},
@@ -103,7 +82,7 @@
 							item.openSuggest = false;
 							item.openResult = false;
 							item.showSuggestBtn = this.calcContentWidth(item.suggest);
-							item.showResultBtn = this.calcContentWidth(item.solveResult);
+							item.showResultBtn = this.calcContentWidth(item.answer);
 						}
 					})
 					.finally(() => this.loading = false)
diff --git a/pages/shopList/shopPage.vue b/pages/shopList/shopPage.vue
index 37bfc28..601ec63 100644
--- a/pages/shopList/shopPage.vue
+++ b/pages/shopList/shopPage.vue
@@ -213,8 +213,8 @@
 			getGoodsTypeList() {
 				const that = this;
 				return new Promise((resolve, reject) => {
-					cstegory.list({
-							// merchantId: this.id
+					cstegory.listmerchant({
+							merchantId: this.id
 						})
 						.then(res => {
 							// 合并新数据