From 490a5f84e00902d4f6141cc9c1743e67bfb23d47 Mon Sep 17 00:00:00 2001
From: fox <1466778434@qq.com>
Date: Sun, 4 May 2025 23:37:15 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/center.vue           |  9 ++++++---
 pages_order/mine/cooperation.vue | 11 +++++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/pages/index/center.vue b/pages/index/center.vue
index fd036a7..1ae52a7 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -2,7 +2,7 @@
 	<view class="page">
 
 		<view class="flex flex-column header">
-			<view class="user">
+			<view class="flex flex-column user">
 				<image class="user-avatar" :src="userInfo.headImage" mode="aspectFill"></image>
 				<view class="user-name">{{ userInfo.nickName }}</view>
 			</view>
@@ -86,7 +86,7 @@
 		</view>
 
 		<view class="card fun-common">
-			<view v-if="userInfo.is_merchants" class="fun-header">
+			<view v-if="isMerchants" class="fun-header">
 				<cardTitle>常用功能</cardTitle>
 			</view>
 			<view class="fun-content fun-common-content">
@@ -126,7 +126,7 @@
 			</view>
 		</view>
 
-		<view v-if="userInfo.is_merchants" class="card fun-merchant">
+		<view v-if="isMerchants" class="card fun-merchant">
 			<view class="fun-header">
 				<cardTitle>商家功能</cardTitle>
 			</view>
@@ -168,6 +168,9 @@
 		computed: {
 			...mapGetters(['role']),
 			...mapState(['userInfo', 'riceInfo']),
+			isMerchants() {
+				return this.userInfo.isMerchants === '1'
+			},
 		},
 		data() {
 			return {
diff --git a/pages_order/mine/cooperation.vue b/pages_order/mine/cooperation.vue
index 992edf0..f48d196 100644
--- a/pages_order/mine/cooperation.vue
+++ b/pages_order/mine/cooperation.vue
@@ -204,6 +204,7 @@ export default {
           id,
           status,
           status_dictText,
+          remark,
           image,
           shop,
           name,
@@ -227,7 +228,7 @@ export default {
 
         this.id = id
         this.status = status
-        this.statusDesc = status_dictText
+        this.statusDesc = status == '2' ? `${status_dictText}：${remark}` : status_dictText
 
       } catch (err) {
         
@@ -239,13 +240,15 @@ export default {
       }
 
       try {
-        const { status, status_dictText } = await this.$fetch('queryShopById', { id: this.id })
+        const { status, status_dictText, remark } = await this.$fetch('queryShopById', { id: this.id })
 
         this.status = status
-        this.statusDesc = status_dictText
+        this.statusDesc = status == '2' ? `${status_dictText}：${remark}` : status_dictText
       } catch (err) {
-
+        console.log('--err', err)
       }
+
+      uni.stopPullDownRefresh();
     },
     async onSubmit() {
       try {