购物车下单

pages/cart/cart.vue

@@ -118,6 +118,10 @@
 			}
 		},
 		onShow() {
+			this.$store.commit("changeTechanOrderList", []);
+			this.$store.commit("changeTicketOrderList", []);
+			this.$store.commit("changeFoodOrderList", []);
+			this.$store.commit("changeHotelOrderList", []);
 			this.getList()
 		},
 		methods: {
@@ -156,6 +160,7 @@
 									x.startDay = xData.startDay
 									x.endDay = xData.endDay
 									x.differDays = xData.differDays
+									x.price = xData.price
 								}
 								
 							}
@@ -394,9 +399,10 @@
 							differDays: v.differDays
 						}
 						v.sku.buyNum = v.num
+						v.sku.product_title = v.product.title
 						v.allSeldDate = []
 						hotelOrderList.push({
-							skuInfo: v.sku
+							skuInfo: v.sku,
 						})
 					}
 				})

pages/index/index.vue

@@ -84,6 +84,10 @@
 		},
 		onLoad() {
 
+		},
+		// 离开当前页面时获取定位
+		onHide() {
+			this.getLocation()
 		},
 		onReady() {
 			this.sendRequest()

subPackages/food/order.vue

@@ -237,7 +237,7 @@
 				// 如果是购物车下单
 				if (this.isShoppingCart) {
 					this.$store.commit("changeFoodOrderList", this.orderList);
-					uni.setStorageSync("foodOrderList", this.orderList)
+					// uni.setStorageSync("foodOrderList", this.orderList)
 					this.goCartNextPage(3)
 					return
 				}

subPackages/homestay/order.vue

@@ -302,7 +302,7 @@ export default {
 			// 如果是购物车下单
 			if (this.isShoppingCart) {
 				this.$store.commit("changeHotelOrderList", this.skuInfo);
-				uni.setStorageSync("hotelOrderList", this.skuInfo)
+				// uni.setStorageSync("hotelOrderList", this.skuInfo)
 				this.goCartNextPage(4)
 				return
 			}

subPackages/order/cartOrder.vue

@@ -6,7 +6,7 @@
 				<view class="sku-item">
 					<view class="sku-content">
 						<view class="title" style="font-weight: bold;font-size: 35rpx;color: #000000;">
-							{{item.sku_name}}
+							{{item.product_title}}
 						</view>
 						
 						<view class="subtitle text-overflow" style="font-size: 26rpx;">
@@ -209,10 +209,15 @@ export default {
 	},
 	methods: {
 		handleOrderGoods () {
-			// 特产处理
-			let techanOrderList = this.$store.state.user.techanOrderList;
 			// let techanOrderList = JSON.parse(uni.getStorageSync("techanOrderList"))
 			// console.log(techanOrderList)
+			// let ticketOrderList = (uni.getStorageSync("ticketOrderList")) || []
+			// let foodOrderList = (uni.getStorageSync("foodOrderList")) || []
+			// let hotelOrderList = this.$store.state.user.hotelOrderList;
+			// let hotelOrderList = uni.getStorageSync("hotelOrderList")
+			
+			// 特产处理
+			let techanOrderList = this.$store.state.user.techanOrderList;
 			// 邮寄
 			this.postOrderList = techanOrderList.filter(v=>v.is_user_post == 1)
 			// 自提
@@ -220,13 +225,9 @@ export default {
 			// 游玩处理  采摘  农家烟火
 			let ticketOrderList = this.$store.state.user.ticketOrderList;
 			let foodOrderList = this.$store.state.user.foodOrderList;
-			// let ticketOrderList = (uni.getStorageSync("ticketOrderList")) || []
-			// let foodOrderList = (uni.getStorageSync("foodOrderList")) || []
-			console.log(ticketOrderList, foodOrderList)
 			this.playOrderList = ticketOrderList.concat(foodOrderList)
 			// 酒店
-			// let hotelOrderList = this.$store.state.user.hotelOrderList;
-			let hotelOrderList = JSON.parse(uni.getStorageSync("hotelOrderList"))
+			let hotelOrderList = this.$store.state.user.hotelOrderList;
 			this.hotelOrderList = hotelOrderList
 			this.calPrice()
 		},
@@ -294,14 +295,16 @@ export default {
 		order() {
 			let goods = []
 			// 酒店
-			this.playOrderList.forEach(item=>{
+			this.hotelOrderList.forEach(item=>{
 				let param = {
-					// type: item.pInfo.type,
-					// product_id: item.pInfo.id,
-					// sku_id: item.sInfo.id,
-					// product_num: item.sInfo.buyNum,
-					// phone: item.phone,
-					// remark: item.remark,
+					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)
 			})
@@ -370,6 +373,27 @@ export default {
 					this.$store.commit("changeTicketOrderList", []);
 					this.$store.commit("changeFoodOrderList", []);
 					this.$store.commit("changeHotelOrderList", []);
+					this.Post({
+						order_id: res.data.order_id,
+						pay_platform: "miniprogram",
+						pay_method: 'abc'
+					}, '/api/order/pay').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'
+									});
+								}
+							});
+						}
+					});
+					
 				}
 			})
 			

subPackages/techan/order.vue

@@ -485,8 +485,8 @@ export default {
 			// 如果是购物车下单
 			if (this.isShoppingCart) {
 				this.$store.commit("changeTechanOrderList", this.orderList);
-				uni.setStorageSync("techanOrderList", JSON.stringify(this.orderList))
-				console.log(this.orderList)
+				// uni.setStorageSync("techanOrderList", JSON.stringify(this.orderList))
+				// console.log(this.orderList)
 				this.goCartNextPage(1)
 				return
 			}

subPackages/techan/selfPickUpPoint.vue

@@ -59,11 +59,10 @@
 					return
 				}
 				this.pending = true
-				// this.getLocation()
 				let param = {
 					product_id: this.goodsId,
-					lon: uni.getStorageSync('location').lon || '36',
-					lat: uni.getStorageSync('location').lat || '29',
+					lon: uni.getStorageSync('location').lon || '120',
+					lat: uni.getStorageSync('location').lat || '36',
 				}
 				this.Post(param, "/api/product/getDeliverShop").then(res => {
 					if (res) {

subPackages/ticket/order.vue

@@ -415,7 +415,8 @@
 			/*---------------------------价格日历-----------------------------------*/
 			order() {
 				let goods = []
-				if (this.orderList.some(v=>v.allSeldDate).length<=0) {
+				console.log(this.orderList)
+				if (this.orderList.some(v=>!v.showDate.date)) {
 					uni.showToast({title: '请选择价格日历',icon:'none'})
 					return
 				}
@@ -449,7 +450,7 @@
 				// 如果是购物车下单
 				if (this.isShoppingCart) {
 					this.$store.commit("changeTicketOrderList", this.orderList);
-					uni.setStorageSync("ticketOrderList", this.orderList)
+					// uni.setStorageSync("ticketOrderList", this.orderList)
 					this.goCartNextPage(2)
 					return
 				}