From 4e04c7b752e8d310632f98ef1317991dc932b4c7 Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Wed, 28 Aug 2024 09:15:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=9B=BE=E6=A0=87=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                  |  3 ++-
 static/css/base.css                         | 14 ++++++--------
 subPackages/eventCalendar/eventCalendar.vue |  5 ++---
 subPackages/food/foodList.vue               |  5 ++---
 subPackages/line/lineList.vue               |  5 ++---
 subPackages/techan/techanList.vue           |  5 ++---
 6 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/pages.json b/pages.json
index afb3b9f..e687bc9 100644
--- a/pages.json
+++ b/pages.json
@@ -84,7 +84,8 @@
 			{
 				"path": "eventCalendar/eventCalendar",
 				"style": {
-					"navigationBarTitleText": "活动日历"
+					"navigationBarTitleText": "活动日历",
+					"navigationStyle": "custom"
 				}
 			},
 			{
diff --git a/static/css/base.css b/static/css/base.css
index 39ffd6f..9aff423 100644
--- a/static/css/base.css
+++ b/static/css/base.css
@@ -16,15 +16,13 @@ view {
 	box-sizing: border-box;
 }
 
+/* 在线链接服务仅供平台体验和调试使用，平台不承诺服务的稳定性，企业客户需下载字体包自行发布使用并做好备份。 */
 @font-face {
-	font-family: 'iconfont';
-	/* project id 1988252 */
-	src: url('https://at.alicdn.com/t/font_1988252_zoswujxrhq9.eot');
-	src: url('https://at.alicdn.com/t/font_1988252_zoswujxrhq9.eot?#iefix') format('embedded-opentype'),
-		url('https://at.alicdn.com/t/font_1988252_zoswujxrhq9.woff2') format('woff2'),
-		url('https://at.alicdn.com/t/font_1988252_zoswujxrhq9.woff') format('woff'),
-		url('https://at.alicdn.com/t/font_1988252_zoswujxrhq9.ttf') format('truetype'),
-		url('https://at.alicdn.com/t/font_1988252_zoswujxrhq9.svg#iconfont') format('svg');
+  font-family: 'iconfont';  /* Project id 3763927 */
+  src: 
+       url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAQkAAsAAAAACZAAAAPWAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHFQGYACDXAqFAINzATYCJAMgCxIABCAFhGcHgSkbLAjILiEnG16kjaBpWNZCluPdIMmvcgKOdywe/l37vC/JwM4sYNEh6q0iXVZAqHpqgYQj4yo0ySokI/7UzW9oAlG2vMtKfEybNiZhFNH2sTQqn/vtp2k7BDcVVzciC6wQ7v3L3cekH1CJoZ0SnbUbW9MCWmDHRtUYUk3K/1dgsMCsJtziZ1Go2X2aV761LEDj+qSoULq4NE4p1dfSyWLWaqVKlY4SjAcoQF96Ifx58Gd/jfBsOujhijf6JQKdDTjw1u3nVzB1/kjGsAClloOiO86fsQpGFn5lgBVaV009sYinKtK99AZ4kvx8/LcaLUmVqcvsOHmgof9zwA17d5Akf+CXBOycUCFjzYUF4/Zw/KpOVl8D0XVVB2wH/PBWkn4d5hZyQxBOYIb51uKdcb0TUFRqjXSwf17UlH0YuOO25vEZrITCL5WEil9qLUv4pYGe6nDDK8ERgleG4wbjC7xRC8YBPV7Ge5SizoqH/Er0OpvnMMI8cYIyMXEMTPkn9W+ZUU8xQapRqdGhGqtJm5Z1JRzKzei/qpLsR4VeS9IMyWq5zoDr3A5zUdECh3bTkYmY97LvrCZrFSaAXKyRilS1LeJqkg4lGykPMxKyjZQNdoZt7PTlRkjl/O+Hza93qTceI9YH0XqSwEmjuDw84n8qXnfdUhwvjtlVcQeZ15O7a4dUHkYNvYlfkzzqqV0o/ys0EDojuGIEjHHRugLuQYPB2cOf5wNM116ucrq5HChtWg17VNKhKdWWAz/t7LsEoOvnQ5AK7g8XP+1yajD3wPQ0cuvwDFkw8Z7tZgWt0ZuHC9O0WAJFITG1bb6YPDB4/stzCbovRX6XflQPwECOvJOUvv5FC8HjucHrNPvX9gV8zT3eo9xAQdd/xQ5M/4dw7CciFl6gLV2z2R0FWmshvJFenZ7jf5CetB8yOQUU0dAuDICksRCy1iJUwa2CSm8T1FqbobMaf3pviqUjyhCWySMI40pIRr2CbFyFKrgBKnMcUBv3Q2dfYBfrLYtjWxJSGWmUQmjqhY1xZcm6F2TzUCVtlRtKUg8lZNZtqLeOiCnZxyGu3656XoOaWyIUZrejMBS03OKTky0a3qy3S60/2fUti7Ijgj0JomSIhiQ1ZHIIZjxyVv19F4iVCykJEXVTT6Q8rI8YJJqAOrIzaeKFbO4qWKs8GTPZTZMQESTwKAl1XSCrezsfcWQWGTtUe3ZRMZJGtS+e3hm9zSvQUR/URoocJaqoo4k2hvTXjrDvKdFS8rxrlDzNJUQV25YmZ5LPTlOVp+bafIHtsH06HmEGpl5Lzmty8QEAAA==') format('woff2'),
+       url('//at.alicdn.com/t/c/font_3763927_93nx1qpcc6t.woff?t=1700792142328') format('woff'),
+       url('//at.alicdn.com/t/c/font_3763927_93nx1qpcc6t.ttf?t=1700792142328') format('truetype');
 }
 
 .iconfont {
diff --git a/subPackages/eventCalendar/eventCalendar.vue b/subPackages/eventCalendar/eventCalendar.vue
index 7de40f2..8802b86 100644
--- a/subPackages/eventCalendar/eventCalendar.vue
+++ b/subPackages/eventCalendar/eventCalendar.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="bg">
-		<img src="https://static.ticket.sz-trip.com/hsrNewTown/images/calendar/topLeft.png" class="topLeft" @click="goBack"/>
+		<span class="iconfont topLeft" @click="goBack">&#xe660;</span>
 		
 		<view class="calendar">
 			<view class="calendar-top flex-between">
@@ -374,8 +374,7 @@
 		position: absolute;
 		left: 26rpx;
 		top: 101rpx;
-		width: 53.33rpx;
-		height: 53.33rpx;
+		font-size: 40rpx;
 		z-index: 2;
 	}
 	
diff --git a/subPackages/food/foodList.vue b/subPackages/food/foodList.vue
index 4447020..bb2fc2e 100644
--- a/subPackages/food/foodList.vue
+++ b/subPackages/food/foodList.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="bg">
-		<img src="https://static.ticket.sz-trip.com/hsrNewTown/images/calendar/topLeft.png" class="topLeft" @click="goBack"/>
+		<span class="iconfont topLeft" @click="goBack">&#xe660;</span>
 		<img :src="showImg('/uploads/20240826/7329f5c692bfee0c3a3acacc0205761d.png')" class="topImg" />
 		<navigator :url="'/subPackages/food/foodDetail?id=' + item.id" class="item" v-for="item in list" :key="item.id">
 			<image class="img" :src="showImg(item.image)" mode=""></image>
@@ -75,8 +75,7 @@
 		position: absolute;
 		left: 26rpx;
 		top: 101rpx;
-		width: 53.33rpx;
-		height: 53.33rpx;
+		font-size: 40rpx;
 		z-index: 2;
 	}
 	
diff --git a/subPackages/line/lineList.vue b/subPackages/line/lineList.vue
index cc076fc..ec98905 100644
--- a/subPackages/line/lineList.vue
+++ b/subPackages/line/lineList.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="bg">
-		<img src="https://static.ticket.sz-trip.com/hsrNewTown/images/calendar/topLeft.png" class="topLeft" @click="goBack"/>
+		<span class="iconfont topLeft" @click="goBack">&#xe660;</span>
 		<img :src="showImg('/uploads/20240826/97282395bdd31e0b1fe20e5356cc4fc4.png')" class="topImg" />
 		<view class="item" v-for="item in list" :key="item.id">
 			<image class="img" :src="showImg(item.image)" mode=""></image>
@@ -69,8 +69,7 @@
 		position: absolute;
 		left: 26rpx;
 		top: 101rpx;
-		width: 53.33rpx;
-		height: 53.33rpx;
+		font-size: 40rpx;
 		z-index: 2;
 	}
 	
diff --git a/subPackages/techan/techanList.vue b/subPackages/techan/techanList.vue
index 1bb0560..598c6ef 100644
--- a/subPackages/techan/techanList.vue
+++ b/subPackages/techan/techanList.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="bg">
-		<img src="https://static.ticket.sz-trip.com/hsrNewTown/images/calendar/topLeft.png" class="topLeft" @click="goBack"/>
+		<span class="iconfont topLeft" @click="goBack">&#xe660;</span>
 		<img :src="showImg('/uploads/20240826/53bbad9d231e7e0eb2404efb0c0903f4.png')" class="topImg" />
 		<view class="box">
 			<view class="item" v-for="item in list" :key="item.id" @click="goDetail(item)">
@@ -75,8 +75,7 @@
 		position: absolute;
 		left: 26rpx;
 		top: 101rpx;
-		width: 53.33rpx;
-		height: 53.33rpx;
+		font-size: 40rpx;
 		z-index: 2;
 	}
 	

From 43b5960539b1daf4c6e32f9d768d79d0b3608892 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Wed, 28 Aug 2024 14:58:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 store/modules/user.js           |   5 +
 subPackages/food/foodDetail.vue |  32 +++--
 subPackages/food/foodOrder.vue  | 239 +++++++++++++++++++++++++++++---
 3 files changed, 244 insertions(+), 32 deletions(-)

diff --git a/store/modules/user.js b/store/modules/user.js
index 2704c9c..2c86df9 100644
--- a/store/modules/user.js
+++ b/store/modules/user.js
@@ -5,6 +5,7 @@ export default {
 			token: ""
 		}, //保存用户登录信息,
 		toPath: "", //要跳转过去的页面,
+		foodInfo:"", //美食套餐信息
 	},
 	// 类似 vue 里的 mothods(同步方法)
 	mutations: {
@@ -23,5 +24,9 @@ export default {
 				url: '/pages/login/login'
 			})
 		},
+		// 线路下单
+		changeFoodInfo(state, data){
+			state.foodInfo = data
+		}
 	}
 }
diff --git a/subPackages/food/foodDetail.vue b/subPackages/food/foodDetail.vue
index 2fbc3b7..b08c0ba 100644
--- a/subPackages/food/foodDetail.vue
+++ b/subPackages/food/foodDetail.vue
@@ -30,7 +30,7 @@
 						{{info.title}}
 					</view>
 					<view class="collect">
-						<image :src="showImg('/uploads/20240827/8a55a8936b9324fa1c7b85c2da9c015b.png')" mode="" v-if="info.is_collect == 0" @click="collect"></image>
+						<image :src="showImg('/uploads/20240827/8a55a8936b9324fa1c7b85c2da9c015b.png')" mode="" v-if="isCollect == 0" @click="collect"></image>
 						<image v-else :src="showImg('/uploads/20240827/6bf73216f19c756961496031f8aed053.png')" mode="" @click="collect"></image>
 						<view style="padding-top: 3rpx;">收藏</view>
 					</view>
@@ -55,26 +55,26 @@
 				</view>
 			</view>
 			<view class="box-title">美食下单</view>
-			<view class="item" v-for="item in sku" :key="item.goods_id">
-				<image class="img" :src="showImg(item.image)" mode=""></image>
+			<view class="item" v-for="skuItem in sku" :key="skuItem.id" @click="taocanDetail(skuItem)">
+				<image class="img" :src="showImg(skuItem.image)" mode=""></image>
 				<view class="content">
 					<view class="content-top flex-between">
 						<view class="center">
 							<view class="item-title text-overflowRows">
-								{{item.title}}
+								{{skuItem.title}}
 							</view>
 							<image class="right" :src="showImg('/uploads/20240827/0e777c1006a15612a0d449178472fd13.png')" mode=""></image>
 						</view>
-						<view class="price">{{item.price/100}}</view>
+						<view class="price">{{skuItem.price/100}}</view>
 					</view>
 					<view class="content-bottom flex-between">
 						<view class="tags">
-							<view class="tag" v-for="tag in item.specifications_new_tag.split(',').slice(0,3)">
+							<view class="tag" v-for="tag in skuItem.specifications_new_tag.split(',').slice(0,3)">
 								{{tag}}
 								<text class="shu">|</text>
 							</view>
 						</view>
-						<view class="order" @click="order(item)">购买</view>
+						<view class="order" @click.stop="order(skuItem)">购买</view>
 					</view>
 					
 				</view>
@@ -96,6 +96,9 @@
 				isCollect: 0,
 			};
 		},
+		onShow() {
+			this.$store.commit('changeFoodInfo', null);
+		},
 		onLoad(option) {
 			this.id = option.id;
 			this.getDetail();
@@ -107,6 +110,7 @@
 					goods_id: this.id
 				},'/api/goods/getGoodDetail').then(res => {
 					res.data.goods_new_tag = (res.data.goods_new_tag ? res.data.goods_new_tag.split(',') : []).splice(0, 2);
+					this.isCollect = res.data.is_collect
 					this.info = res.data
 				})
 			},
@@ -124,7 +128,7 @@
 			// 收藏
 			collect() {
 				this.Post({
-						type: 16,
+						type: 3,
 						id: this.id
 					},
 					'/api/scenic/collect'
@@ -141,10 +145,16 @@
 				});
 			},
 			order(item) {
-				uni.setStorageSync('order', JSON.stringify(item)); //规格
-				uni.setStorageSync('info', JSON.stringify(this.info)); //商品
+				// uni.setStorageSync('order', JSON.stringify(item)); //规格
+				// uni.setStorageSync('info', JSON.stringify(this.info)); //商品
+				this.$store.commit('changeFoodInfo', item);
+				uni.navigateTo({
+					url: '/subPackages/food/foodOrder'
+				});
+			},
+			taocanDetail() {
 				uni.navigateTo({
-					url: '/subPackages/oneplus/oneplusOrder'
+					url: '/subPackages/food/taocanDetail'
 				});
 			},
 		},
diff --git a/subPackages/food/foodOrder.vue b/subPackages/food/foodOrder.vue
index 23dec02..05bd1c1 100644
--- a/subPackages/food/foodOrder.vue
+++ b/subPackages/food/foodOrder.vue
@@ -2,51 +2,64 @@
 	<view class="bg">
 		<view class="box">
 			<view class="info">
-				<image class="img" src="" mode=""></image>
+				<image class="img" :src="showImg(info.image)" mode=""></image>
 				<view class="main">
 					<view class="title text-overflowRows">
-						名称名称名称名称名称名称名称名称名称名称名称名称名称名称名称名称名称名称
+						{{info.title}}
 					</view>
 					<view class="main-bottom">
 						<view class="price">
-							9.9
+							{{info.money/100}}
 						</view>
 						<view class="num-box">
-							<view class="del">-</view>
-							<view class="num">1</view>
-							<view class="add">+</view>
+							<view class="del" @click="reduce">-</view>
+							<view class="num">{{num}}</view>
+							<view class="add" @click="plus">+</view>
 						</view>
 					</view>
 				</view>
 			</view>
-			<view class="msg-box">
-				<view class="left-text">
-					优惠券
-				</view>
-				<view class="coupon" v-if="!coupon">
-					暂无可用优惠券
-					<image class="rightIcon" :src="showImg('/uploads/20240827/96dee582e7ce3b8293e659bb1dc87433.png')" mode=""></image>
-				</view>
-			</view>
+			<!-- 优惠券 -->
+			<navigator :url="'/subPackages/order/OrderCoupon?allprice='+ allprice*100 + '&sku_ids='+ info.id" class="tickets-box flex-between msg-box">
+			    <div class="order-title">优惠券</div>
+			    <div class="coupon-btn" v-if="coupon==''">
+					请选择
+				</div>
+			    <div class="coupon-price" v-else>
+					<span v-if="coupon.percent == 0">-￥{{coupon.discounts/100}}</span>
+					<span v-else>-{{coupon.percent}}%</span>
+					<span style="margin:0 31rpx 0 8rpx;color: #6C7A94;">></span>
+				</div>
+			 </navigator>
 			<view class="name-box">
 				<view class="left-text">
 					联系人：
 				</view>
-				<input type="text" placeholder="输入您的名字" />
+				<input type="text" placeholder="输入您的名字" v-model="reserve_name" />
 			</view>
 			<view class="phone-box">
 				<view class="" style="display: flex;">
 					<view class="left-text">
 						手机号：
 					</view>
-					<input type="number" />
+					<input type="number" v-model="reserve_phone" maxlength="11"  />
 				</view>
-				<image class="cha" :src="showImg('/uploads/20240827/5e5970926e92a2109da55bfe32a47e4b.png')" mode=""></image>
+				<image class="cha" @click="cha" v-if="reserve_phone!= ''" :src="showImg('/uploads/20240827/5e5970926e92a2109da55bfe32a47e4b.png')" mode=""></image>
 			</view>
 		</view>
 		
 		<view class="bottom">
-			
+			<view class="center">
+				<view class="totalText">
+					合计：
+				</view>
+				<view class="totalPrice">
+					￥{{ allprice }}
+				</view>
+			</view>
+			<view class="order" @click="order">
+				去支付
+			</view>
 		</view>
 	</view>
 </template>
@@ -55,11 +68,131 @@
 	export default {
 		data() {
 			return {
-				coupon:null,
+				coupon:"",
+				reserve_name: '',
+				reserve_phone: '',
+				info:null,
+				detail:null,//商品的信息
+				allprice: 0,
+				num:0,
+			}
+		},
+		onShow() {
+			this.coupon = this.$store.state.user.coupon
+			console.log('传过来的优惠券',this.coupon);
+			this.total()
+		},
+		onLoad(option) {
+			this.$store.commit("choseCoupon", "");
+			this.info = this.$store.state.user.foodInfo
+			// this.info = JSON.parse(uni.getStorageSync('order'))
+			// this.detail = JSON.parse(uni.getStorageSync('detail'));
+			this.num = this.info.buyNum?this.info.buyNum:1
+			if (!this.info) {
+				uni.navigateBack();
 			}
+			console.log(this.info);
+			this.total()
 		},
 		methods: {
-			
+			cha() {
+				this.reserve_phone = ''
+			},
+			order() {
+				if (!this.reserve_name) {
+					uni.showToast({
+						title: '请输入姓名',
+						icon: 'none'
+					});
+					return;
+				}
+				if (!this.reserve_phone) {
+					uni.showToast({
+						title: '请输入电话',
+						icon: 'none'
+					});
+					return;
+				}
+				let goods = [];
+				let goodsItem = {
+					specifications_id: this.info.id,
+					num: this.num,
+				};
+				goods.push(goodsItem);
+				let data = {
+					goods: goods,
+					coupon: this.coupon ? this.coupon.id : null,
+					is_post: this.info.is_post,
+					reserve_name: this.reserve_name,
+					reserve_phone: this.reserve_phone
+				};
+				this.Post(
+					{
+						method: 'POST',
+						data: JSON.stringify(data)
+					},
+					'/api/order/place'
+				).then(res => {
+					if (res.code == 200) {
+						this.Post(
+							{
+								order_id: res.data.order_id,
+								type: 'miniprogram',
+								platform: 'miniprogram'
+							},
+							'/api/pay/unify'
+						).then(res => {
+							if (res.data) {
+								uni.requestPayment({
+									nonceStr: res.data.nonceStr,
+									package: res.data.package,
+									paySign: res.data.paySign,
+									signType: res.data.signType,
+									timeStamp: res.data.timeStamp,
+									complete() {
+										uni.navigateTo({
+											url: '/subPackages/order/trades'
+										});
+									}
+								});
+							}
+						});
+					}
+				});
+			},
+			plus() {
+				this.num = Number(this.num);
+				this.coupon = ''
+				this.$nextTick(() => {
+					this.num += 1;
+					this.total()
+				});
+			},
+			reduce() {
+				this.num = Number(this.num);
+				this.coupon = ''
+				if (this.num > 1) {
+					this.$nextTick(() => {
+						this.num -= 1;
+						this.total()
+					});
+				}
+			},
+			// 总价
+			total() {
+				let price = 0
+				if (this.coupon) {
+					if (this.coupon.percent == 0) {
+						price = this.info.money * this.num - this.coupon.discounts
+					} else{
+						price = this.info.money * this.num - ((this.info.money * this.num + this.post) * this.coupon.percent)
+					}
+				} else{
+					price = this.info.money * this.num
+				}
+				price < 0 ? 0 : price
+				this.allprice = price / 100
+			},
 		}
 	}
 </script>
@@ -88,6 +221,8 @@
 	    left: 0;
 	    right: 0;
 	    bottom: 0;
+		display: flex;
+		justify-content: space-between;
 	}
 	
 	.img {
@@ -176,6 +311,7 @@
 		border-bottom: 1rpx solid #CCC;
 		display: flex;
 		justify-content: space-between;
+		align-items: center;
 	}
 	
 	.name-box {
@@ -220,5 +356,66 @@
 		margin-left: 20rpx;
 	}
 	
+	.totalText {
+		margin-right: 20rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		font-size: 29rpx;
+		color: #333333;
+	}
+	
+	.totalPrice {
+		font-family: PingFang SC;
+		font-weight: 500;
+		font-size: 36rpx;
+		color: #F84A56;
+	}
+	
+	.order {
+		width: 267rpx;
+		height: 87rpx;
+		background: #F84A56;
+		border-radius: 43rpx;
+		font-family: PingFang;
+		font-weight: bold;
+		font-size: 36rpx;
+		color: #FFFFFF;
+		text-align: center;
+		line-height: 87rpx;
+	}
+	
+	.center {
+		display: flex;
+		align-items: center;
+	}
+	
+	.coupon-btn {
+		width: 140rpx;
+		height: 57rpx;
+		border: 1px solid #333333;
+		border-radius: 29rpx;
+		font-size: 28rpx;
+		font-family: PingFangSC;
+		font-weight: 400;
+		color: #000000;
+		text-align: center;
+		line-height: 57rpx;
+		
+		.select {
+			padding: 10rpx 18rpx;
+			background: #ED9230;
+			border-radius: 10rpx;
+			font-size: 28rpx;
+			font-weight: 400;
+			color: #fff;
+		}
+	}
+	
+	.coupon-price {
+		color:#DD0000;
+		font-size: 30rpx;
+		font-weight: 500;
+	}
+	
 
 </style>