From 0a363bbe48093110aef4fa887ed2bc3b7566b064 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 20 Jun 2025 15:02:33 +0800
Subject: [PATCH] 1

---
 pages.json                      |  6 +++---
 pages/user/user.vue             | 15 +++++++++++----
 subPackages/order/cartOrder.vue | 29 +++++++++++++++--------------
 3 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/pages.json b/pages.json
index b018799..ac18b3f 100644
--- a/pages.json
+++ b/pages.json
@@ -17,19 +17,19 @@
 		{
 			"path": "pages/map/map",
 			"style": {
-				"navigationBarTitleText": "uni-app"
+				"navigationBarTitleText": "特产地图"
 			}
 		},
 		{
 			"path": "pages/cart/cart",
 			"style": {
-				"navigationBarTitleText": "uni-app"
+				"navigationBarTitleText": "购物车"
 			}
 		},
 		{
 			"path": "pages/coupon/coupon",
 			"style": {
-				"navigationBarTitleText": "uni-app"
+				"navigationBarTitleText": "领取中心"
 			}
 		},
 		{
diff --git a/pages/user/user.vue b/pages/user/user.vue
index a2a76a6..fc07926 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -51,7 +51,7 @@
 
 		<view class="cygj">
 			<view v-for="(item,index) in cyList" :key="index"
-				@click="gotoUrl(item.path,index)" v-if="item.isShow">
+				@click="gotoUrl(item,index)" v-if="item.isShow">
 				<button id="contact" class="cyItem flex-between" open-type="contact" bindcontact="handleContact" session-from="sessionFrom" v-if="index == 2">
 					<view class="flex-center">
 						<img src="https://static.ticket.sz-trip.com/shiweisuzhou/images/user/lxkf.png" class="headIcon">
@@ -152,7 +152,8 @@
 						src: 'https://static.ticket.sz-trip.com/shiweisuzhou/images/user/shhx.png',
 						title: '商户核销',
 						path: '',
-						isShow: true
+						isShow: true,
+						webUrl: "https://swsz.supplier-h5.js-dyyj.com/Login",
 					},
 					{
 						src: 'https://static.ticket.sz-trip.com/shiweisuzhou/images/user/yhxy.png',
@@ -298,13 +299,19 @@
 			// open(){
 			//   this.$refs.popup.open('center')
 			// },
-			gotoUrl(path, index) {
+			gotoUrl(item, index) {
 				if (index == 2) {
 					// this.$refs.popup.open()
 					return;
 				}
+				if (index == 4) {
+					uni.navigateTo({
+						url:'/subPackages/webPage/webPage?url='+item.webUrl
+					})
+					return
+				}
 				uni.navigateTo({
-					url: path
+					url: item.path
 				})
 			},
 			qidai() {
diff --git a/subPackages/order/cartOrder.vue b/subPackages/order/cartOrder.vue
index 83c30a8..feddb19 100644
--- a/subPackages/order/cartOrder.vue
+++ b/subPackages/order/cartOrder.vue
@@ -294,20 +294,7 @@ export default {
 		// 下单
 		order() {
 			let goods = []
-			// 酒店
-			this.hotelOrderList.forEach(item=>{
-				let param = {
-					type: 'hotel',
-					customer_name: item.roomNames.toString(),
-					reserve_mobile: item.phone,
-					product_id: item.product_id,
-					sku_id: item.id,
-					start_date: item.selectDate.startDay,
-					end_date: item.selectDate.endDay,
-					product_num: item.buyNum
-				}
-				goods.push(param)
-			})
+			
 			
 			// 游玩
 			this.playOrderList.forEach(item=>{
@@ -353,6 +340,20 @@ export default {
 				}
 				goods.push(param)
 			})
+			// 酒店
+			this.hotelOrderList.forEach(item=>{
+				let param = {
+					type: 'hotel',
+					customer_name: item.roomNames.toString(),
+					reserve_mobile: item.phone,
+					product_id: item.product_id,
+					sku_id: item.id,
+					start_date: item.selectDate.startDay,
+					end_date: item.selectDate.endDay,
+					product_num: item.buyNum
+				}
+				goods.push(param)
+			})