From 684c4f51906e16b30fc696b731d2436752c3b62e Mon Sep 17 00:00:00 2001
From: fox <1466778434@qq.com>
Date: Thu, 1 May 2025 00:04:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=8E=A5=E5=8F=A3=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/model/product.js              |  2 +-
 api/model/shop.js                 | 28 +++++++++++
 components/base/tabbar.vue        |  8 +---
 components/order/orderCard.vue    |  7 +++
 pages.json                        |  5 +-
 pages_order/mine/cooperation.vue  | 97 ++++++++++++++++++++++++++++++++++++---
 pages_order/mine/voucher.vue      |  2 +-
 pages_order/order/createOrder.vue | 80 +++++++-------------------------
 8 files changed, 150 insertions(+), 79 deletions(-)

diff --git a/api/model/product.js b/api/model/product.js
index 5c15a0b..f0b8752 100644
--- a/api/model/product.js
+++ b/api/model/product.js
@@ -33,7 +33,7 @@ const api = {
 	/**
 	 * 获取优惠券信息
 	 */
-	queryShopList: {
+	queryVoucherShopList: {
 		url: '/vouchers/queryShopList',
 		method: 'GET',
 	},
diff --git a/api/model/shop.js b/api/model/shop.js
index 55481b6..0073a3e 100644
--- a/api/model/shop.js
+++ b/api/model/shop.js
@@ -2,6 +2,24 @@
 // 商家相关接口
 
 const api = {
+	/**
+	 * 查询商家详情
+	 */
+	queryShopList: {
+		url: '/shop/queryShopList',
+		method: 'GET',
+		auth : true,
+		showLoading : true,
+	},
+	/**
+	 * 查询商家详情
+	 */
+	queryShopById: {
+		url: '/shop/queryShopById',
+		method: 'GET',
+		auth : true,
+		showLoading : true,
+	},
 	/**
 	 * 新增商家信息
 	 */
@@ -12,6 +30,16 @@ const api = {
 		auth : true,
 		showLoading : true,
 	},
+	/**
+	 * 修改商家信息
+	 */
+	updateShop: {
+		url: '/shop/updateShop',
+		method: 'POST',
+		limit : 500,
+		auth : true,
+		showLoading : true,
+	},
 }
 
 export default api
\ No newline at end of file
diff --git a/components/base/tabbar.vue b/components/base/tabbar.vue
index dee27e8..d96393b 100644
--- a/components/base/tabbar.vue
+++ b/components/base/tabbar.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="tabbar-box">
 		<view class="tabbar">
-			<!-- v-if="!item.isNotShop || !userShop" -->
 			<view 
 				:class="{ 'tabbar-active' : select == item.key}" 
 				v-for="(item, index) in list" :key="index"
@@ -21,15 +20,10 @@
 </template>
 
 <script>
-	import {
-		mapGetters
-	} from 'vuex'
+
 	export default {
 		name: "tabbar",
 		props: ['select'],
-		computed: {
-			...mapGetters(['userShop']),
-		},
 		data() {
 			return {
 				list: [{
diff --git a/components/order/orderCard.vue b/components/order/orderCard.vue
index 319ea6e..651a416 100644
--- a/components/order/orderCard.vue
+++ b/components/order/orderCard.vue
@@ -78,6 +78,13 @@
         })
       },
       onPay() {
+				this.$store.commit('setPayOrderProduct', [
+          this.data.massageItem
+				])
+
+				this.$utils.navigateTo(`/pages_order/order/createOrder?id=${this.data.id}`)
+	
+        return
         // todo
         this.$api('payOrder', {
           orderId : this.data.id,
diff --git a/pages.json b/pages.json
index dc7814b..5642281 100644
--- a/pages.json
+++ b/pages.json
@@ -92,7 +92,10 @@
 				"path": "mine/pointsRecord"
 			},
 			{
-				"path": "mine/cooperation"
+				"path": "mine/cooperation",
+				"style": {
+					"enablePullDownRefresh": true
+				}
 			},
 			{
 				"path": "mine/verifyRecord"
diff --git a/pages_order/mine/cooperation.vue b/pages_order/mine/cooperation.vue
index ea59b6b..992edf0 100644
--- a/pages_order/mine/cooperation.vue
+++ b/pages_order/mine/cooperation.vue
@@ -3,6 +3,11 @@
 		<!-- 导航栏 -->
 		<navbar title="商家合作" leftClick @leftClick="$utils.navigateBack" color="#fff" />
   
+    <view v-if="['0', '2'].includes(status) && statusDesc" class="flex tips">
+      <uv-icon name="info-circle" color="#86A941" size="28rpx"></uv-icon>
+      <text style="margin-left: 3rpx;">{{ statusDesc }}</text>
+    </view>
+
     <view class="content">
       <view class="form">
         <view class="form-title">门头照片</view>
@@ -83,7 +88,7 @@
           </uv-form>
         </view>
       </view>
-      <view class="tools">
+      <view class="tools" v-if="status != '1'">
         <button plain class="btn btn-submit" @click="onSubmit">提交</button>
       </view>
     </view>
@@ -91,11 +96,13 @@
 </template>
 
 <script>
-	import Position from '@/utils/position.js'
+import { mapState } from 'vuex'
+
+import Position from '@/utils/position.js'
 
-  import formInput from '../components/formInput.vue'
-  import formUpload from '../components/formUpload.vue'
-  import formTextarea from '../components/formTextarea.vue'
+import formInput from '../components/formInput.vue'
+import formUpload from '../components/formUpload.vue'
+import formTextarea from '../components/formTextarea.vue'
 
 export default {
   components: {
@@ -105,6 +112,9 @@ export default {
   },
   data() {
     return {
+      id: null,
+      status: null,
+      statusDesc: null,
       form: {
         image: null,
         shop: null,
@@ -149,6 +159,15 @@ export default {
       },
     }
   },
+  computed: {
+    ...mapState(['userInfo']),
+  },
+  onLoad() {
+    this.initData()
+  },
+  onPullDownRefresh() {
+    this.updateStatus()
+  },
   methods: {
     //地图上选择地址
     selectAddr() {
@@ -172,6 +191,62 @@ export default {
       }
       this.form.area = '' //用户啥都没选就点击勾选
     },
+    async initData() {
+
+      try {
+        const shopList = (await this.$fetch('queryShopList', { userId: this.userInfo.id }))?.records
+
+        if (!shopList.length) {
+          return
+        }
+
+        const {
+          id,
+          status,
+          status_dictText,
+          image,
+          shop,
+          name,
+          phone,
+          area,
+          latitude,
+          longitude,
+          address,
+        } = shopList[0]
+
+        this.form = {
+          image,
+          shop,
+          name,
+          phone,
+          area,
+          latitude,
+          longitude,
+          address,
+        }
+
+        this.id = id
+        this.status = status
+        this.statusDesc = status_dictText
+
+      } catch (err) {
+        
+      }
+    },
+    async updateStatus() {
+      if (!this.id) {
+        return
+      }
+
+      try {
+        const { status, status_dictText } = await this.$fetch('queryShopById', { id: this.id })
+
+        this.status = status
+        this.statusDesc = status_dictText
+      } catch (err) {
+
+      }
+    },
     async onSubmit() {
       try {
 
@@ -198,8 +273,10 @@ export default {
           longitude,
           address,
         }
+
+        let api = this.id ? 'updateShop' : 'addShop'
     
-        await this.$fetch('addShop', params)
+        await this.$fetch(api, params)
         
         uni.showToast({
           title: '提交成功',
@@ -227,6 +304,14 @@ export default {
 		}
 	}
 
+  .tips {
+    padding: 5rpx 0;
+    font-weight: bold;
+    font-size: 28rpx;
+    color: $uni-color;
+    background-color: rgba($color: #D8FF8F, $alpha: 0.3);
+  }
+
   .content {
     padding: 28rpx 30rpx;
   }
diff --git a/pages_order/mine/voucher.vue b/pages_order/mine/voucher.vue
index 9f2f595..e71b885 100644
--- a/pages_order/mine/voucher.vue
+++ b/pages_order/mine/voucher.vue
@@ -59,7 +59,7 @@
 
   const TAB_AND_API_FIELDS_MAPPING = {
     0: 'queryVouchersList',
-    1: 'queryShopList',
+    1: 'queryVoucherShopList',
   }
 
   export default {
diff --git a/pages_order/order/createOrder.vue b/pages_order/order/createOrder.vue
index 705bb44..eb834fb 100644
--- a/pages_order/order/createOrder.vue
+++ b/pages_order/order/createOrder.vue
@@ -83,6 +83,7 @@
 		},
 		data() {
 			return {
+				orderId: null,
 				selectedCoupon: [],
 				num: 1,
 				coupon: {},
@@ -105,8 +106,9 @@
 			},
 			...mapState(['userInfo', 'payOrderProduct']),
 		},
-		onLoad(args) {
+		onLoad({ id }) {
 			this.$store.commit('getUserInfo')
+			this.orderId = id
 		},
 		onShow() {
 			this.getCouponList()
@@ -128,24 +130,27 @@
 				this.selectedCoupon = [1]
 			},
 
-			async fetchCreateOrder() {
+			async fetchPayOrder() {
 				// todo: check
 				let params = {
-					itemId: this.payOrderProduct[0].id,
-					amount: this.totalPrice,
 					payType : this.payMethod,
 					
 					// id: this.payOrderProduct[0].id,
 					// num: this.payOrderProduct[0].num,
 					// memberNum : 1,
 				}
-			
-				// todo: check
-				// if (this.coupon.id) {
-				// 	data.couponId = this.coupon.id
-				// }
 
-				const res = await this.$fetch('createOrder', params, false)
+				let api = 'createOrder'
+
+				if (this.orderId) { // 支付订单
+					params.orderId = this.orderId
+					api = 'payOrder'
+				} else { // 创建订单
+					params.itemId = this.payOrderProduct[0].id
+					params.amount = this.totalPrice
+				}
+			
+				const res = await this.$fetch(api, params, false)
 
 				return res
 			},
@@ -153,7 +158,7 @@
 
 				try {
 
-					const res = await this.fetchCreateOrder()
+					const res = await this.fetchPayOrder()
 
 					if (!res.success) {
 						return
@@ -162,6 +167,7 @@
 					if (this.payMethod == 1) { // 账户余额
 
 					} else { // 微信支付
+						console.log('--发起支付接口回调', res)
 						await uni.requestPaymentWxPay(res)
 					}
 
@@ -174,59 +180,7 @@
 							url: '/pages/index/order'
 					})
 				} catch (err) {
-					
 				}
-
-				return
-
-				let data = {
-					'massageItem.id': this.payOrderProduct[0].id,
-					// todo: check
-					amount: this.totalPrice,
-
-					// num: this.payOrderProduct[0].num,
-					// id: this.payOrderProduct[0].id,
-					// payType : this.payMethod,
-					// memberNum : 1,
-				}
-				
-				// todo: check
-				// if (this.coupon.id) {
-				// 	data.couponId = this.coupon.id
-				// }
-
-				this.$api('createOrder', data, res => {
-					if (res.code == 200) {
-
-						if(this.payMethod == 1){
-							uni.showToast({
-								title: '下单成功',
-								icon: 'none'
-							})
-							this.paySuccess(res)
-							return
-						}
-						
-						uni.requestPaymentWxPay(res).then(e => {
-							uni.showToast({
-									title: '下单成功',
-									icon: 'none'
-							})
-
-							this.paySuccess(res)
-						}).catch(n => {
-							setTimeout(uni.redirectTo, 700, {
-									url: '/pages/index/order'
-							})
-						})
-					
-					}
-				})
-			},
-			paySuccess(res){
-				setTimeout(uni.redirectTo, 700, {
-						url: '/pages/index/order'
-				})
 			},
 		}
 	}
-- 
2.15.0


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 2/2] =?UTF-8?q?feat:=20=E6=8E=A5=E5=8F=A3=E5=AF=B9?=
 =?UTF-8?q?=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 {
-- 
2.15.0