From 2cb08346e1208b16cd5e056d332521789ed7a49f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A0=BC=E8=B0=83main?= <czboosj@gmail.com>
Date: Fri, 27 Feb 2026 16:48:28 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E6=94=AF=E4=BB=98=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                        | 44 ++++++++++++++++--
 api/service.js                 |  8 ++++
 manifest.json                  | 14 +++---
 pages/detail/serviceDetail.vue | 82 +++++++++++++++++++++++++++++++---
 4 files changed, 132 insertions(+), 16 deletions(-)

diff --git a/App.vue b/App.vue
index 935025d..21a69d4 100644
--- a/App.vue
+++ b/App.vue
@@ -11,6 +11,44 @@
 		},
 		onShow: function() {
 			console.log('App Show')
+			// 1. uni-app 中通过 uni.getEnterOptionsSync() 调用（和微信小程序API一致，只是前缀改为uni）
+			const options = uni.getEnterOptionsSync();
+			console.log("查询到的返回数据")
+			console.log(options)
+
+			// 2. 注意：scene 返回的是数字类型，不是字符串！原生代码中写 '1038' 会导致判断失败
+			if (options.scene === 1038 &&
+				options.referrerInfo?.appId === 'wxef277996acc166c3') {
+
+				// 从收银台小程序返回的逻辑
+				const extraData = options.referrerInfo.extraData;
+
+				if (!extraData) {
+					uni.showToast({
+						title: '当前通过物理按键返回，未接收到返参，建议自行查询交易结果',
+						icon: 'none',
+						duration: 3000
+					});
+				} else {
+					if (extraData.code === 'success') {
+						uni.showToast({
+							title: '支付成功',
+							icon: 'success'
+						});
+					} else if (extraData.code === 'cancel') {
+						uni.showToast({
+							title: '支付已取消',
+							icon: 'none'
+						});
+					} else {
+						uni.showToast({
+							title: `支付失败：${extraData.errmsg || '未知错误'}`,
+							icon: 'none',
+							duration: 3000
+						});
+					}
+				}
+			}
 		},
 		onHide: function() {
 			console.log('App Hide')
@@ -19,7 +57,7 @@
 			// 检查登录状态
 			checkLoginStatus() {
 				const token = uni.getStorageSync('token')
-				
+
 				// 如果有token，且当前在登录页，则跳转到首页
 				if (token) {
 					// 延迟一下，确保页面已经初始化
@@ -27,7 +65,7 @@
 						const pages = getCurrentPages()
 						const currentPage = pages[pages.length - 1]
 						const currentRoute = currentPage ? currentPage.route : ''
-						
+
 						// 如果当前在登录页，跳转到首页
 						if (currentRoute === 'pages/login/login') {
 							uni.switchTab({
@@ -49,4 +87,4 @@
 
 <style>
 	/*每个页面公共css */
-</style>
+</style>
\ No newline at end of file
diff --git a/api/service.js b/api/service.js
index faaefd3..199c854 100644
--- a/api/service.js
+++ b/api/service.js
@@ -46,4 +46,12 @@ export function getMessagePage(params = {}) {
 		method: 'GET',
 		data: params,
 	})
+}
+// 获取支付的签名
+export function getPaySign(params = {}){
+	return request({
+		url: '/app-api/member/labor-union-pay-record/sign',
+		method: 'GET',
+		data: params,
+	})
 }
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index a2ccaed..eeff3f4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
-    "name" : "demo",
-    "appid" : "wxa3c0e1381f643f59",
+    "name" : "司机公会用户端",
+    "appid" : "__UNI__BD011FB",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -52,12 +52,11 @@
     "mp-weixin" : {
         "appid" : "wxa3c0e1381f643f59",
         "setting" : {
-            "urlCheck" : false
+            "urlCheck" : false,
+            "minified" : true
         },
         "usingComponents" : true,
-        "requiredPrivateInfos" : [
-            "getLocation"
-        ],
+        "requiredPrivateInfos" : [ "getLocation" ],
         "permission" : {
             "scope.userLocation" : {
                 "desc" : "你的位置信息将用于小程序位置接口的效果展示"
@@ -71,7 +70,8 @@
         "usingComponents" : true
     },
     "mp-toutiao" : {
-        "usingComponents" : true
+        "usingComponents" : true,
+        "appid" : ""
     },
     "uniStatistics" : {
         "enable" : false
diff --git a/pages/detail/serviceDetail.vue b/pages/detail/serviceDetail.vue
index 8dfdd21..b5ae9e9 100644
--- a/pages/detail/serviceDetail.vue
+++ b/pages/detail/serviceDetail.vue
@@ -118,7 +118,7 @@
 </template>
   
   <script>
-import { getGuildStoreDetail, getGuildCoupon } from "@/api/service";
+import { getGuildStoreDetail, getGuildCoupon ,getPaySign } from "@/api/service";
 import NavHeader from "@/components/NavHeader/NavHeader.vue";
 
 export default {
@@ -210,6 +210,7 @@ export default {
     
     // 标记已经检查过登录状态
     this.hasCheckedLogin = true;
+	
   },
   methods: {
     // 加载店铺数据
@@ -305,7 +306,7 @@ export default {
     },
 
     // 去结算
-    handleCheckout() {
+    async handleCheckout() {
       if (this.totalAmount <= 0) {
         return;
       }
@@ -323,11 +324,80 @@ export default {
         return;
       }
 
-      uni.showToast({
-        title: "该功能正在开发中",
-        icon: "none",
-      });
+      // uni.showToast({
+      //   title: "该功能正在开发中",
+      //   icon: "none",
+      // });
+	  // 测试支付进行
+	  const reqsn = 'mini' + Date.now() + '' + Math.floor(Math.random() * 10000);
+	  const randomstr = Math.floor(Math.random() * 10000000);
+	  // 定义请求参数
+	  let params = {
+		"appid": "00390105", //平台分配的appid
+	    "cusid": "56479107531MPMN" ,//"平台分配的商户号"
+	    "orgid": "56479107392N35H",
+	    "version": "12",
+	    "trxamt": "2",
+	    "reqsn": reqsn, // 建议生成唯一值（如时间戳+随机数）
+	    "notify_url": "http://ub6b98bb.natappfree.cc/admin-api/member/labor-union-pay-record/tlNotice",
+	    "body": "test",
+	    "remark": "remark",
+	    "randomstr": randomstr, 
+	    "paytype": "W06",
+	    "signtype": "RSA",
+		"asinfo":"cusid:56479107392N35Htype:01amount:0.01",
+		"sign":""
+	  };
+	  
+	  const sign = await getPaySign(params)
+	  console.log("测试返回的签名:"+sign)
+	  params["sign"] = sign
+	  
+	  console.log(params)
+	  params = this.sortObjectByKey(params);
+	  console.log(params)
+	  // 统一使用 navigateToMiniProgram 跳转小程序
+	  uni.navigateToMiniProgram({
+	    appId: 'wxef277996acc166c3', // 目标小程序appid
+	    extraData: params, // 传递给目标小程序的参数
+	    success(res) {
+	      console.log('小程序跳转成功', res);
+	    },
+	    fail(err) {
+	      console.error('小程序跳转失败', err);
+	      // 可根据需要添加失败后的提示或兜底逻辑
+	      uni.showToast({
+	        title: '跳转失败，请稍后重试',
+	        icon: 'none'
+	      });
+	    },
+	    complete() {
+	      // 无论成功失败都会执行的逻辑（可选）
+	    }
+	  });
+	  
+	  //----  测试支付
+	  
     },
+	
+	/**
+	 * 将对象按键的字典序排序，返回有序对象（和Java TreeMap排序逻辑一致）
+	 * @param {Object} obj 原始参数对象
+	 * @returns {Object} 按键排序后的新对象
+	 */
+	sortObjectByKey(obj) {
+	  // 1. 提取所有键并按字典序排序（和Java String自然排序规则一致）
+	  const sortedKeys = Object.keys(obj).sort();
+	  
+	  // 2. 按排序后的键重新组装对象
+	  const sortedObj = {};
+	  sortedKeys.forEach(key => {
+	    sortedObj[key] = obj[key];
+	  });
+	  
+	  return sortedObj;
+	}
+	
   },
 };
 </script>

From 4598b01c8788ba8d2acc052bfc8d7c04507ac3e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A0=BC=E8=B0=83main?= <czboosj@gmail.com>
Date: Fri, 27 Feb 2026 17:40:57 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E5=88=86=E8=B4=A6=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/detail/serviceDetail.vue | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/pages/detail/serviceDetail.vue b/pages/detail/serviceDetail.vue
index b5ae9e9..b202f03 100644
--- a/pages/detail/serviceDetail.vue
+++ b/pages/detail/serviceDetail.vue
@@ -330,23 +330,25 @@ export default {
       // });
 	  // 测试支付进行
 	  const reqsn = 'mini' + Date.now() + '' + Math.floor(Math.random() * 10000);
-	  const randomstr = Math.floor(Math.random() * 10000000);
+	  const randomstr = Math.floor(Math.random() * 10000000)+'';
 	  // 定义请求参数
+	  // 仅排序，不修改任何字段值，参考对象中没有的字段放在最后
+	  // 注意参数 所有参数的类型用STring 不然会造成意外的报错, 
 	  let params = {
-		"appid": "00390105", //平台分配的appid
-	    "cusid": "56479107531MPMN" ,//"平台分配的商户号"
-	    "orgid": "56479107392N35H",
-	    "version": "12",
-	    "trxamt": "2",
-	    "reqsn": reqsn, // 建议生成唯一值（如时间戳+随机数）
-	    "notify_url": "http://ub6b98bb.natappfree.cc/admin-api/member/labor-union-pay-record/tlNotice",
-	    "body": "test",
-	    "remark": "remark",
-	    "randomstr": randomstr, 
-	    "paytype": "W06",
-	    "signtype": "RSA",
-		"asinfo":"cusid:56479107392N35Htype:01amount:0.01",
-		"sign":""
+	      "appid": "00390105", // 平台分配的appid
+	      "body": "body订单标题", // 
+	      "cusid": "56479107531MPMN", // 平台分配的商户号
+	      "notify_url": "http://ub6b98bb.natappfree.cc/admin-api/member/labor-union-pay-record/tlNotice", // 保持原值不变
+	      "orgid": "56479107392N35H",
+	      "paytype": "W06",
+	      "randomstr": randomstr, 
+	      "remark": "remark备注",
+	      "reqsn": reqsn, 
+	      "sign": "", 
+	      "signtype": "RSA",
+	      "trxamt": "2", 
+	      "version": "12",
+		  //"asinfo":"56479107392MP4J:01:0.01" //(后台已经设置固定比例, 会自动分账) 分账, 第一个是分账商户号,第二个是01 类型, 根据金额分账,0.01 元
 	  };
 	  
 	  const sign = await getPaySign(params)
@@ -354,7 +356,7 @@ export default {
 	  params["sign"] = sign
 	  
 	  console.log(params)
-	  params = this.sortObjectByKey(params);
+	  // params = this.sortObjectByKey(params);
 	  console.log(params)
 	  // 统一使用 navigateToMiniProgram 跳转小程序
 	  uni.navigateToMiniProgram({

From a358523bf6feffd41a2adeec3cafb3e63f6271a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A0=BC=E8=B0=83main?= <czboosj@gmail.com>
Date: Sat, 28 Feb 2026 08:57:39 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=9B=9E=E8=B0=83?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/detail/serviceDetail.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/detail/serviceDetail.vue b/pages/detail/serviceDetail.vue
index b202f03..6b90b7c 100644
--- a/pages/detail/serviceDetail.vue
+++ b/pages/detail/serviceDetail.vue
@@ -338,7 +338,7 @@ export default {
 	      "appid": "00390105", // 平台分配的appid
 	      "body": "body订单标题", // 
 	      "cusid": "56479107531MPMN", // 平台分配的商户号
-	      "notify_url": "http://ub6b98bb.natappfree.cc/admin-api/member/labor-union-pay-record/tlNotice", // 保持原值不变
+	      "notify_url": "http://e989c692.natappfree.cc/admin-api/member/labor-union-pay-record/tlNotice", // 保持原值不变
 	      "orgid": "56479107392N35H",
 	      "paytype": "W06",
 	      "randomstr": randomstr, 
@@ -346,7 +346,7 @@ export default {
 	      "reqsn": reqsn, 
 	      "sign": "", 
 	      "signtype": "RSA",
-	      "trxamt": "2", 
+	      "trxamt": "1", 
 	      "version": "12",
 		  //"asinfo":"56479107392MP4J:01:0.01" //(后台已经设置固定比例, 会自动分账) 分账, 第一个是分账商户号,第二个是01 类型, 根据金额分账,0.01 元
 	  };

From e1d05e5556468090e3e75ca5fe0bcd410922cd6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A0=BC=E8=B0=83main?= <czboosj@gmail.com>
Date: Sat, 28 Feb 2026 10:24:39 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/service.js                 | 2 +-
 pages/detail/serviceDetail.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/service.js b/api/service.js
index 199c854..29b778b 100644
--- a/api/service.js
+++ b/api/service.js
@@ -50,7 +50,7 @@ export function getMessagePage(params = {}) {
 // 获取支付的签名
 export function getPaySign(params = {}){
 	return request({
-		url: '/app-api/member/labor-union-pay-record/sign',
+		url: '/app-api/member/labor-union-pay/sign',
 		method: 'GET',
 		data: params,
 	})
diff --git a/pages/detail/serviceDetail.vue b/pages/detail/serviceDetail.vue
index 6b90b7c..f6b219d 100644
--- a/pages/detail/serviceDetail.vue
+++ b/pages/detail/serviceDetail.vue
@@ -338,7 +338,7 @@ export default {
 	      "appid": "00390105", // 平台分配的appid
 	      "body": "body订单标题", // 
 	      "cusid": "56479107531MPMN", // 平台分配的商户号
-	      "notify_url": "http://e989c692.natappfree.cc/admin-api/member/labor-union-pay-record/tlNotice", // 保持原值不变
+	      "notify_url": "http://e989c692.natappfree.cc/admin-api/member/labor-union-coupon-purchase/tlNotice", // 保持原值不变
 	      "orgid": "56479107392N35H",
 	      "paytype": "W06",
 	      "randomstr": randomstr, 

From 656a3ac3fc55610866c541f4457fa75479a9f122 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A0=BC=E8=B0=83main?= <czboosj@gmail.com>
Date: Sat, 28 Feb 2026 17:10:51 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/service.js                 |  41 +++++++-
 pages/detail/serviceDetail.vue | 179 ++++++++++++++++-----------------
 2 files changed, 124 insertions(+), 96 deletions(-)

diff --git a/api/service.js b/api/service.js
index 29b778b..72f535f 100644
--- a/api/service.js
+++ b/api/service.js
@@ -54,4 +54,43 @@ export function getPaySign(params = {}){
 		method: 'GET',
 		data: params,
 	})
-}
\ No newline at end of file
+}
+// 创建购买订单
+export function appBuy (params = {}){
+	return request({
+		url: '/app-api/member/lu-order/buy',
+		method: 'POST',
+		data: params,
+	})
+}
+// 获取lu(司机公会简称) 订单信息
+export function getLuOrder (id){
+	return request({
+		url: '/app-api/member/lu-order/get?id='+id,
+		method: 'GET',
+	})
+}
+/// 获取我的订单列表
+export function getLuMyOrderPage (params = {}){
+	return request({
+		url: '/app-api/member/lu-order/myPage',
+		method: 'GET',
+		data: params
+	})
+}
+
+// 删除优惠卷购买 (暂时不用) 
+// export function delCouponPurchaseBuy(id){
+// 	return request({
+// 		url: '/app-api/member/labor-union-coupon-purchase/delete?id='+id,
+// 		method: 'DELETE',
+// 	})
+// }
+
+// // 取消优惠卷购买 (暂时不用)
+// export function cancelCouponPurchaseBuy(id){
+// 	return request({
+// 		url: '/app-api/member/labor-union-coupon-purchase/cancel?id='+id,
+// 		method: 'POST',
+// 	})
+// }
\ No newline at end of file
diff --git a/pages/detail/serviceDetail.vue b/pages/detail/serviceDetail.vue
index f6b219d..54cd1b2 100644
--- a/pages/detail/serviceDetail.vue
+++ b/pages/detail/serviceDetail.vue
@@ -80,9 +80,7 @@
                 >-</view
               >
               <text class="quantity-number">{{ item.quantity || 0 }}</text>
-              <view
-                class="quantity-btn plus"
-                @click="increaseQuantity(index)"
+              <view class="quantity-btn plus" @click="increaseQuantity(index)"
                 >+</view
               >
             </view>
@@ -118,12 +116,12 @@
 </template>
   
   <script>
-import { getGuildStoreDetail, getGuildCoupon ,getPaySign } from "@/api/service";
+import { getGuildStoreDetail, getGuildCoupon, getPaySign } from "@/api/service";
 import NavHeader from "@/components/NavHeader/NavHeader.vue";
 
 export default {
   components: {
-    NavHeader
+    NavHeader,
   },
   data() {
     return {
@@ -142,7 +140,8 @@ export default {
       return this.menuList.reduce((total, item) => {
         if (item.selected && item.quantity > 0) {
           // 价格是以分为单位，需要转换为元
-          const price = (item.salePrice || item.currentPrice || item.price || 0) / 100;
+          const price =
+            (item.salePrice || item.currentPrice || item.price || 0) / 100;
           return total + price * item.quantity;
         }
         return total;
@@ -154,14 +153,17 @@ export default {
     },
     // 获取会员等级名称（安全访问）
     memberLevelName() {
-      return (this.userInfo && this.userInfo.level && this.userInfo.level.name) || '普通会员';
+      return (
+        (this.userInfo && this.userInfo.level && this.userInfo.level.name) ||
+        "普通会员"
+      );
     },
   },
   onLoad(options) {
     // 从路由参数获取店铺ID和分类标签
     this.shopId = options.id;
     this.categoryLabel = options.categoryLabel;
-    this.userInfo = uni.getStorageSync('userInfo') || {};
+    this.userInfo = uni.getStorageSync("userInfo") || {};
     if (this.shopId) {
       this.loadStoreData();
     } else {
@@ -177,21 +179,26 @@ export default {
   onShow() {
     // 页面显示时，检查登录状态并更新用户信息
     // 如果之前未登录，现在已登录，重新加载数据
-    const token = uni.getStorageSync('token');
-    const newUserInfo = uni.getStorageSync('userInfo') || {};
-    
+    const token = uni.getStorageSync("token");
+    const newUserInfo = uni.getStorageSync("userInfo") || {};
+
     // 如果之前没有用户信息，现在有了（说明刚登录成功），重新加载数据
-    if (token && (!this.userInfo || !this.userInfo.id) && newUserInfo && newUserInfo.id) {
+    if (
+      token &&
+      (!this.userInfo || !this.userInfo.id) &&
+      newUserInfo &&
+      newUserInfo.id
+    ) {
       this.userInfo = newUserInfo;
       this.isLoadingAfterLogin = true; // 标记正在登录后重新加载
-      
+
       // 设置一个全局标记，表示刚刚登录返回，用于防止 401 弹窗
-      uni.setStorageSync('justBackFromLogin', true);
+      uni.setStorageSync("justBackFromLogin", true);
       // 5秒后清除标记
       setTimeout(() => {
-        uni.removeStorageSync('justBackFromLogin');
+        uni.removeStorageSync("justBackFromLogin");
       }, 5000);
-      
+
       // 延迟一下，确保 token 已经保存并生效，避免与之前的请求冲突
       setTimeout(() => {
         // 如果有店铺ID，重新加载店铺数据（特别是菜单数据，可能需要登录才能查看）
@@ -207,10 +214,9 @@ export default {
       // 如果已登录，更新用户信息（可能用户信息有更新）
       this.userInfo = newUserInfo;
     }
-    
+
     // 标记已经检查过登录状态
     this.hasCheckedLogin = true;
-	
   },
   methods: {
     // 加载店铺数据
@@ -297,7 +303,7 @@ export default {
     // 格式化价格：将分转换为元（除以100，保留两位小数）
     formatPrice(price) {
       if (!price && price !== 0) {
-        return '0.00';
+        return "0.00";
       }
       // 将分转换为元
       const yuan = price / 100;
@@ -323,83 +329,66 @@ export default {
         });
         return;
       }
-
-      // uni.showToast({
-      //   title: "该功能正在开发中",
-      //   icon: "none",
-      // });
-	  // 测试支付进行
-	  const reqsn = 'mini' + Date.now() + '' + Math.floor(Math.random() * 10000);
-	  const randomstr = Math.floor(Math.random() * 10000000)+'';
-	  // 定义请求参数
-	  // 仅排序，不修改任何字段值，参考对象中没有的字段放在最后
-	  // 注意参数 所有参数的类型用STring 不然会造成意外的报错, 
-	  let params = {
-	      "appid": "00390105", // 平台分配的appid
-	      "body": "body订单标题", // 
-	      "cusid": "56479107531MPMN", // 平台分配的商户号
-	      "notify_url": "http://e989c692.natappfree.cc/admin-api/member/labor-union-coupon-purchase/tlNotice", // 保持原值不变
-	      "orgid": "56479107392N35H",
-	      "paytype": "W06",
-	      "randomstr": randomstr, 
-	      "remark": "remark备注",
-	      "reqsn": reqsn, 
-	      "sign": "", 
-	      "signtype": "RSA",
-	      "trxamt": "1", 
-	      "version": "12",
-		  //"asinfo":"56479107392MP4J:01:0.01" //(后台已经设置固定比例, 会自动分账) 分账, 第一个是分账商户号,第二个是01 类型, 根据金额分账,0.01 元
-	  };
-	  
-	  const sign = await getPaySign(params)
-	  console.log("测试返回的签名:"+sign)
-	  params["sign"] = sign
-	  
-	  console.log(params)
-	  // params = this.sortObjectByKey(params);
-	  console.log(params)
-	  // 统一使用 navigateToMiniProgram 跳转小程序
-	  uni.navigateToMiniProgram({
-	    appId: 'wxef277996acc166c3', // 目标小程序appid
-	    extraData: params, // 传递给目标小程序的参数
-	    success(res) {
-	      console.log('小程序跳转成功', res);
-	    },
-	    fail(err) {
-	      console.error('小程序跳转失败', err);
-	      // 可根据需要添加失败后的提示或兜底逻辑
-	      uni.showToast({
-	        title: '跳转失败，请稍后重试',
-	        icon: 'none'
-	      });
-	    },
-	    complete() {
-	      // 无论成功失败都会执行的逻辑（可选）
-	    }
-	  });
-	  
-	  //----  测试支付
-	  
+      // 
+      
+      
     },
-	
-	/**
-	 * 将对象按键的字典序排序，返回有序对象（和Java TreeMap排序逻辑一致）
-	 * @param {Object} obj 原始参数对象
-	 * @returns {Object} 按键排序后的新对象
-	 */
-	sortObjectByKey(obj) {
-	  // 1. 提取所有键并按字典序排序（和Java String自然排序规则一致）
-	  const sortedKeys = Object.keys(obj).sort();
-	  
-	  // 2. 按排序后的键重新组装对象
-	  const sortedObj = {};
-	  sortedKeys.forEach(key => {
-	    sortedObj[key] = obj[key];
-	  });
-	  
-	  return sortedObj;
-	}
-	
+    // 支付调用
+    async handlePay(){
+// 测试支付进行
+      const reqsn =
+        "mini" + Date.now() + "" + Math.floor(Math.random() * 10000);
+      const randomstr = Math.floor(Math.random() * 10000000) + "";
+      // 定义请求参数
+      // 仅排序，不修改任何字段值，参考对象中没有的字段放在最后
+      // 注意参数 所有参数的类型用STring 不然会造成意外的报错,
+      let params = {
+        appid: "00390105", // 平台分配的appid
+        body: "body订单标题", //
+        cusid: "56479107531MPMN", // 平台分配的商户号
+        notify_url:
+          "http://e989c692.natappfree.cc/admin-api/member/labor-union-coupon-purchase/tlNotice", // 保持原值不变
+        orgid: "56479107392N35H",
+        paytype: "W06",
+        randomstr: randomstr,
+        remark: "remark备注",
+        reqsn: reqsn,
+        sign: "",
+        signtype: "RSA",
+        trxamt: "1",
+        version: "12",
+        //"asinfo":"56479107392MP4J:01:0.01" //(后台已经设置固定比例, 会自动分账) 分账, 第一个是分账商户号,第二个是01 类型, 根据金额分账,0.01 元
+      };
+
+      const sign = await getPaySign(params);
+      console.log("测试返回的签名:" + sign);
+      params["sign"] = sign;
+
+      console.log(params);
+      // params = this.sortObjectByKey(params);
+      console.log(params);
+      // 统一使用 navigateToMiniProgram 跳转小程序
+      uni.navigateToMiniProgram({
+        appId: "wxef277996acc166c3", // 目标小程序appid
+        extraData: params, // 传递给目标小程序的参数
+        success(res) {
+          console.log("小程序跳转成功", res);
+        },
+        fail(err) {
+          console.error("小程序跳转失败", err);
+          // 可根据需要添加失败后的提示或兜底逻辑
+          uni.showToast({
+            title: "跳转失败，请稍后重试",
+            icon: "none",
+          });
+        },
+        complete() {
+          // 无论成功失败都会执行的逻辑（可选）
+        },
+      });
+
+      //----  支付
+    }
   },
 };
 </script>

From e7755657fdeffeea0b290cdc1c4ae58f5a36578a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A0=BC=E8=B0=83main?= <czboosj@gmail.com>
Date: Sat, 28 Feb 2026 17:13:32 +0800
Subject: [PATCH 6/9] +`1

---
 pages/detail/serviceDetail.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pages/detail/serviceDetail.vue b/pages/detail/serviceDetail.vue
index 54cd1b2..69ad356 100644
--- a/pages/detail/serviceDetail.vue
+++ b/pages/detail/serviceDetail.vue
@@ -330,7 +330,14 @@ export default {
         return;
       }
       // 
-      
+      // 把选中的数据拼接成这样的数据 couponId:num;couponId:num 例如 2324:1;2325:2
+      const couponStr = selectedItems
+        .map((item) => `${item.couponId}:${item.quantity}`)
+        .join(";");
+        
+        //  this.totalAmount 是元, 要转换成分
+        const trxamt = (this.totalAmount * 100).toFixed(0);
+        
       
     },
     // 支付调用

From a8400f9d95146b0227cbc53e6fddf18e229b53a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A0=BC=E8=B0=83main?= <czboosj@gmail.com>
Date: Sun, 1 Mar 2026 20:21:54 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E6=94=AF=E4=BB=98=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E6=95=B4=E7=90=86=E5=AE=8C=E6=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/detail/serviceDetail.vue | 80 +++++++++++++++++++++++++---------
 1 file changed, 59 insertions(+), 21 deletions(-)

diff --git a/pages/detail/serviceDetail.vue b/pages/detail/serviceDetail.vue
index 69ad356..887411d 100644
--- a/pages/detail/serviceDetail.vue
+++ b/pages/detail/serviceDetail.vue
@@ -116,7 +116,12 @@
 </template>
   
   <script>
-import { getGuildStoreDetail, getGuildCoupon, getPaySign } from "@/api/service";
+import {
+  getGuildStoreDetail,
+  getGuildCoupon,
+  getPaySign,
+  appBuy,
+} from "@/api/service";
 import NavHeader from "@/components/NavHeader/NavHeader.vue";
 
 export default {
@@ -329,40 +334,77 @@ export default {
         });
         return;
       }
-      // 
+      //
       // 把选中的数据拼接成这样的数据 couponId:num;couponId:num 例如 2324:1;2325:2
       const couponStr = selectedItems
-        .map((item) => `${item.couponId}:${item.quantity}`)
+        .map((item) => `${item.id}:${item.quantity}`)
         .join(";");
-        
-        //  this.totalAmount 是元, 要转换成分
-        const trxamt = (this.totalAmount * 100).toFixed(0);
-        
-      
+
+      //  this.totalAmount 是元, 要转换成分
+      const trxamt = (this.totalAmount * 100).toFixed(0);
+
+      console.log("购买信息: " + couponStr);
+      console.log("金额:" + trxamt);
+      const res = await appBuy({
+        shopId: this.shopId,
+        couponData: couponStr,
+        payableAmount: trxamt,
+      });
+      console.log(res);
+      if (!res) {
+        uni.showToast({
+          title: "购买失败,请稍后重试",
+          icon: "none",
+        });
+      }
+      // 调用支付信息 res 为订单信息
+      this.handlePay(res);
     },
     // 支付调用
-    async handlePay(){
-// 测试支付进行
-      const reqsn =
-        "mini" + Date.now() + "" + Math.floor(Math.random() * 10000);
+    async handlePay(order) {
+      // 测试支付进行
+      // const reqsn =
+      //   "mini" + Date.now() + "" + Math.floor(Math.random() * 10000);
+
+      const couponArray = order.couponPurchaseRespVOS || [];
+      const couponMap = new Map();
+
+      couponArray.forEach((item) => {
+        const key = item.couponId;
+        if (!key) return;
+
+        // 从 Map 中获取已有数组，没有则取空数组
+        const currentList = couponMap.get(key) || [];
+        currentList.push(item);
+        // 更新 Map 中的值
+        couponMap.set(key, currentList);
+      });
+      let bodyStr = ''
+      couponMap.forEach((couponList, couponId) => {
+        console.log(`优惠券ID：${couponId}`);
+        console.log(`优惠券列表：`, couponList);
+        bodyStr = bodyStr + couponList[0].couponName + 'x' + couponList.length + ';';
+      });
+
       const randomstr = Math.floor(Math.random() * 10000000) + "";
       // 定义请求参数
       // 仅排序，不修改任何字段值，参考对象中没有的字段放在最后
       // 注意参数 所有参数的类型用STring 不然会造成意外的报错,
       let params = {
         appid: "00390105", // 平台分配的appid
-        body: "body订单标题", //
+        body: bodyStr, //
         cusid: "56479107531MPMN", // 平台分配的商户号
         notify_url:
           "http://e989c692.natappfree.cc/admin-api/member/labor-union-coupon-purchase/tlNotice", // 保持原值不变
         orgid: "56479107392N35H",
         paytype: "W06",
         randomstr: randomstr,
-        remark: "remark备注",
-        reqsn: reqsn,
+        remark: order.orderNumber+ ":" + bodyStr,
+        reqsn: order.orderNumber,
         sign: "",
         signtype: "RSA",
-        trxamt: "1",
+        // trxamt: "" + order.payableAmount, 
+        trxamt: "1",// 测试金额 生产 是上面那条
         version: "12",
         //"asinfo":"56479107392MP4J:01:0.01" //(后台已经设置固定比例, 会自动分账) 分账, 第一个是分账商户号,第二个是01 类型, 根据金额分账,0.01 元
       };
@@ -370,10 +412,6 @@ export default {
       const sign = await getPaySign(params);
       console.log("测试返回的签名:" + sign);
       params["sign"] = sign;
-
-      console.log(params);
-      // params = this.sortObjectByKey(params);
-      console.log(params);
       // 统一使用 navigateToMiniProgram 跳转小程序
       uni.navigateToMiniProgram({
         appId: "wxef277996acc166c3", // 目标小程序appid
@@ -395,7 +433,7 @@ export default {
       });
 
       //----  支付
-    }
+    },
   },
 };
 </script>

From f021c0997561388690e65d5de1b29dd8c70dffb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A0=BC=E8=B0=83main?= <czboosj@gmail.com>
Date: Sun, 1 Mar 2026 21:47:15 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E5=9B=9E=E8=B0=83=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/detail/serviceDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/detail/serviceDetail.vue b/pages/detail/serviceDetail.vue
index 887411d..24019ab 100644
--- a/pages/detail/serviceDetail.vue
+++ b/pages/detail/serviceDetail.vue
@@ -395,7 +395,7 @@ export default {
         body: bodyStr, //
         cusid: "56479107531MPMN", // 平台分配的商户号
         notify_url:
-          "http://e989c692.natappfree.cc/admin-api/member/labor-union-coupon-purchase/tlNotice", // 保持原值不变
+          "http://e989c692.natappfree.cc/admin-api/member/lu-order/tlNotice", // 保持原值不变
         orgid: "56479107392N35H",
         paytype: "W06",
         randomstr: randomstr,

From 5772dccfbdb81906509b4e0a9ec5610546521472 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A0=BC=E8=B0=83main?= <czboosj@gmail.com>
Date: Sun, 1 Mar 2026 22:43:39 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=A4=87=E6=B3=A8?=
 =?UTF-8?q?=E4=BB=A3=E5=85=A5=E7=A7=9F=E6=88=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/detail/serviceDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/detail/serviceDetail.vue b/pages/detail/serviceDetail.vue
index 24019ab..c8526f7 100644
--- a/pages/detail/serviceDetail.vue
+++ b/pages/detail/serviceDetail.vue
@@ -399,7 +399,7 @@ export default {
         orgid: "56479107392N35H",
         paytype: "W06",
         randomstr: randomstr,
-        remark: order.orderNumber+ ":" + bodyStr,
+        remark: "1:"+order.orderNumber+ ":" + bodyStr, // 第一个1 为租户信息, 给代入进去,第二个是订单号,第三个是body 信息
         reqsn: order.orderNumber,
         sign: "",
         signtype: "RSA",