From 55385c7402e05cacc064ffdec9f6389e96c3dd3a Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Mon, 16 Jun 2025 17:55:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                     |  6 +++++
 pages/login/login.vue          | 31 ++++++++++-----------
 pages/user/user.vue            | 10 +++----
 static/js/request.js           |  6 ++---
 subPackages/homestay/index.vue |  2 +-
 subPackages/homestay/order.vue | 49 ++++++++++++++++++----------------
 subPackages/line/index.vue     |  1 -
 subPackages/line/orders.vue    | 11 ++++----
 8 files changed, 63 insertions(+), 53 deletions(-)

diff --git a/pages.json b/pages.json
index 3d654b3..766363f 100644
--- a/pages.json
+++ b/pages.json
@@ -31,6 +31,12 @@
 			"style": {
 				"navigationBarTitleText": "uni-app"
 			}
+		},
+		{
+			"path": "pages/login/login",
+			"style": {
+				"navigationBarTitleText": "登录"
+			}
 		}
 	],
 	"subPackages": [{
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 0e7dd00..5ab064a 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -1,24 +1,24 @@
 <template>
-    <div style="padding-top: 88rpx;">
-        <div class="login-tip">项目名称 申请获得</div>
-        <div class="login-tip2">以下权限</div>
-        <div class="login-tip-box">
+    <view style="padding-top: 88rpx;">
+        <view class="login-tip">时味苏州 申请获得</view>
+        <view class="login-tip2">以下权限</view>
+        <view class="login-tip-box">
             <text>获得你的公开信息（昵称、头像、地区及性别）</text>
-        </div>
-        <div class="btn-box">
+        </view>
+        <view class="btn-box">
             <button bindtap="cancel" type="default" @click="redirectIndex">取消</button>
             <button type="primary" @click="getUserInfo">同意</button>
-        </div>
-        <div class="flex-center article-box">
+        </view>
+        <view class="flex-center article-box">
             <radio-group @change="toggleAgreement">
                 <radio value="1" :checked="isAgreed" style="transform:scale(0.7)"></radio>
             </radio-group>
-            <div>同意<text @click="gotoInfo">《用户服务协议》、《隐私政策》</text></div>
-        </div>
+            <view>同意<text @click="gotoInfo(9)">《用户服务协议》、</text><text @click="gotoInfo(12)">《隐私政策》</text></view>
+        </view>
         <uni-popup ref="popup" type="bottom" background-color="#fff">
             <button type="default" open-type="getPhoneNumber" @getphonenumber="handlePhoneNumber" style="width: 100%;height: 12vh;line-height: 12vh;">点击授权手机号</button>
         </uni-popup>
-    </div>
+    </view>
 </template>
 
 <script>
@@ -68,9 +68,9 @@ export default {
             }
         },
         // 跳转到协议页面
-        gotoInfo() {
+        gotoInfo(id) {
             uni.navigateTo({
-                url: '/subPackages/user/privacy'
+                url: '/subPackages/user/privacyInfo?id=' + id
             });
         },
         // 切换协议同意状态
@@ -103,8 +103,9 @@ export default {
                                 userInfo: res.userInfo,
                                 encryptedData: res.encryptedData,
                                 iv: res.iv,
-                                wechat_qrcode: uni.getStorageSync('wechat_qrcode') || ''
-                            }, '/api/mini_program/login')
+                                wechat_qrcode: uni.getStorageSync('wechat_qrcode') || '',
+								loginType: 3
+                            }, '/api/uservice/user/wxLogin')
                            .then(resTwo => {
                                 this.$store.commit('changeUserInfo', resTwo.data.userinfo);
                                 if (resTwo.data.userinfo.mobile) {
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 8ff162f..550a866 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -176,11 +176,11 @@
 		},
 		onShow() {
 			// 根据token获取个人信息
-			this.Post({
-				token: ''
-			},'/api/uservice/user/getMyInfo').then(res => {
-				this.$store.commit('changeUserInfo', res.data);
-			})
+			// this.Post({
+			// 	token: ''
+			// },'/api/uservice/user/getMyInfo').then(res => {
+			// 	this.$store.commit('changeUserInfo', res.data);
+			// })
 			
 			this.userInfo = (uni.getStorageSync('userInfo') && JSON.parse(uni.getStorageSync('userInfo'))) || this.$store.state.user.userInfo || {}
 			console.log(this.userInfo)
diff --git a/static/js/request.js b/static/js/request.js
index 95da9eb..4b9a3b8 100644
--- a/static/js/request.js
+++ b/static/js/request.js
@@ -2,8 +2,8 @@ import Vue from 'vue';
 import store from '@/store';
 
 // 定义 API URL
-const DEV_API_URL = 'https://api.cloud.sz-trip.com';
-const PROD_API_URL = 'https://api.cloud.sz-trip.com';
+const DEV_API_URL = 'https://swsz.api.js-dyyj.com';
+const PROD_API_URL = 'https://swsz.api.js-dyyj.com';
 const NEWAPIURL = process.env.NODE_ENV === 'development' ? DEV_API_URL : PROD_API_URL;
 
 // 获取token
@@ -39,7 +39,7 @@ Vue.prototype.NEWAPIURL = '/api';
 // #endif
 
 Vue.prototype.Post = (params = {}, apiurl) => {
-    const token = getToken() || '0caa10fc-6d65-4d9c-8e57-b344be3fc526';
+    const token = getToken() || 'a090644d-2bdb-4807-833b-bb5bc2182ac5';
     if (token) {
         params.token = token;
     }
diff --git a/subPackages/homestay/index.vue b/subPackages/homestay/index.vue
index 63c34d8..6870f80 100644
--- a/subPackages/homestay/index.vue
+++ b/subPackages/homestay/index.vue
@@ -41,7 +41,7 @@
 					offset: this.list.length,
 					limit: 10,
 					tag_id: 8,
-					title: '青年'
+					title: ''
 				}, '/api/scene/get_scene_by_tag').then(res => {
 					if (res) {
 						this.list = [...res.data.list, ...this.list]
diff --git a/subPackages/homestay/order.vue b/subPackages/homestay/order.vue
index 682b063..c90d364 100644
--- a/subPackages/homestay/order.vue
+++ b/subPackages/homestay/order.vue
@@ -97,8 +97,9 @@
 			    <text>优惠券</text>
 			    <view style="display: flex;align-items: center;">
 					<view class="add-btn" v-if="!coupon">选择优惠券</view>
-					<view style="display: flex;align-items: center;color: #6A8A2D;font-weight: bold;" v-if="coupon && coupon.CouponActivity">
-						<view>-￥{{coupon.CouponActivity.discounts/100}}</view>
+					<view style="display: flex;align-items: center;color: #6A8A2D;font-weight: bold;" v-if="coupon && coupon.activity">
+						<view v-if="coupon.activity.discount_type == 'pricebreak'">-￥{{coupon.activity.money/100}}</view>
+						<view v-else>{{coupon.activity.fold}}折</view>
 					</view>
 					<img src="https://static.ticket.sz-trip.com/changyoutaihu/images/user/rightIcon.png" class="icon-coupon">
 				</view>
@@ -121,17 +122,17 @@
 			<view class="popup-content-date">
 				<view class="popup-content-title flex">
 					<view class="flex-1 w-1rpx text-overflow">
-						{{skuInfo.title}}
+						{{skuInfo.sku_name}}
 					</view>
 					<img src="https://static.ticket.sz-trip.com/taizhou/images/cha.png" @click="closePopupRule"
 						style="width: 31rpx;height: 31rpx;" class="flex-shrink-0">
 				</view>
 				<view class="content">
-					<view class="swipe-box" style="height: 347rpx;" v-if="skuInfo.list_images">
+					<view class="swipe-box" style="height: 347rpx;" v-if="skuInfo.listimg && skuInfo.listimg.length > 0">
 						<swiper class="swiper" :autoplay="true" :interval="3000" :duration="1000" circular
 							indicator-dots indicator-color="rgba(255,255,255,.5)" indicator-active-color="#fff"
 							@change="popSwiperChange" :current="0">
-							<swiper-item v-for="(item, index) in skuInfo.list_images.split(',')" :key="item.id">
+							<swiper-item v-for="(item, index) in skuInfo.listimg" :key="item.id">
 								<view class="swiper-item" style="height: 347rpx;">
 									<image class="item-img pop-swiper-image" :src="showImg(item)" mode="aspectFill">
 									</image>
@@ -140,13 +141,13 @@
 						</swiper>
 
 						<view class="swiper-pointer" style="right:30rpx;bottom: 20rpx;">
-							{{popSwiperCurrent}}/{{skuInfo.list_images.split(',').length}}
+							{{popSwiperCurrent}}/{{skuInfo.listimg.length}}
 						</view>
 					</view>
 
 					<view class="pop-detail-container">
 						<view class="pop-detail-title">房型信息</view>
-						<view v-html="formateRichText(skuInfo.use_explain)"></view>
+						<view v-html="formateRichText(skuInfo.sku_name)"></view>
 					</view>
 				</view>
 			</view>
@@ -188,6 +189,7 @@
 		},
 		onShow() {
 			this.coupon = this.$store.state.user.coupon
+			console.log(this.coupon)
 		},
 		onLoad(options) {
 			this.initOrderDate()
@@ -252,10 +254,10 @@
 				this.price = ((disfferMoney * this.buyNum) || 0).toFixed(2)
 				
 				if(this.coupon) {
-					if (this.coupon.percent == 0) {
-						disfferMoney = disfferMoney - this.coupon.CouponActivity.discounts
+					if (this.coupon.activity.discount_type == 'pricebreak') {
+						disfferMoney = disfferMoney - this.coupon.activity.money
 					} else{
-						disfferMoney = disfferMoney - (disfferMoney * this.coupon.CouponActivity.percent/100)
+						disfferMoney = disfferMoney - (disfferMoney * this.coupon.activity.fold/10)
 					}
 				}
 				return disfferMoney < 0 ? 0 : disfferMoney
@@ -294,28 +296,29 @@
 					return;
 				}
 
-				let goods = []
-				let goodsItem = {
-					num: this.buyNum,
-					specifications_id: this.skuInfo.id,
-					start_date: this.selectDate.startDay,
-					end_date: this.selectDate.endDay,
-				}
-				goods.push(goodsItem)
-
 				let data = {
-					goods: goods,
-					reserve_name: roomNames.toString(),
-					reserve_phone: this.phone,
 					coupon_id: this.coupon ? this.coupon.id : null,
+					product_list: [
+						{
+							type: 'hotel',
+							customer_name: roomNames.toString(),
+							reserve_mobile: this.phone,
+							product_id: this.skuInfo.product_id,
+							sku_id: this.skuInfo.id,
+							start_date: this.selectDate.startDay,
+							end_date: this.selectDate.endDay,
+							product_num: this.buyNum
+						}
+					]
 				}
 
 				this.Post({
 					method: 'POST',
 					data: JSON.stringify(data)
-				}, '/api/order/place').then(res => {
+				}, '/api/order/create').then(res => {
 					console.log('成功');
 					if (res.code == 1) {
+						return;
 						uni.removeStorageSync('hotelOrderInfo')
 						this.Post({
 							order_id: res.data.order_id,
diff --git a/subPackages/line/index.vue b/subPackages/line/index.vue
index efe63ea..2bdf8c2 100644
--- a/subPackages/line/index.vue
+++ b/subPackages/line/index.vue
@@ -41,7 +41,6 @@
 				this.Post({
 					offset: this.list.length,
 					limit: 10,
-					type_id: 23,
 					tag_id: 17,
 					sort: 'weight'
 				},'/api/product/get_product_by_tag').then(res => {
diff --git a/subPackages/line/orders.vue b/subPackages/line/orders.vue
index feb5223..3918ef3 100644
--- a/subPackages/line/orders.vue
+++ b/subPackages/line/orders.vue
@@ -46,8 +46,9 @@
 		    <text>优惠券</text>
 		    <view style="display: flex;align-items: center;">
 				<view class="add-btn" v-if="!coupon">选择优惠券</view>
-				<view style="display: flex;align-items: center;color: #6A8A2D;font-weight: bold;" v-if="coupon && coupon.CouponActivity">
-					<view>-￥{{coupon.CouponActivity.discounts/100}}</view>
+				<view style="display: flex;align-items: center;color: #6A8A2D;font-weight: bold;" v-if="coupon && coupon.activity">
+					<view v-if="coupon.activity.discount_type == 'pricebreak'">-￥{{coupon.activity.money/100}}</view>
+					<view v-else>{{coupon.activity.fold}}折</view>
 				</view>
 				<img src="https://static.ticket.sz-trip.com/changyoutaihu/images/user/rightIcon.png" class="icon-coupon">
 			</view>
@@ -291,10 +292,10 @@
 			priceTotal() {
 				let price = 0
 				if(this.coupon) {
-					if (this.coupon.percent == 0) {
-						price = this.price - this.coupon.CouponActivity.discounts
+					if (this.coupon.activity.discount_type == 'pricebreak') {
+						price = this.price - this.coupon.activity.money
 					} else{
-						price = this.price - (this.price * this.coupon.CouponActivity.percent/100)
+						price = this.price - (this.price * this.coupon.activity.fold/10)
 					}
 				}else {
 					price = this.price