From 5b6787aa4969ebe28e7932e9782ca4a0bf65e44a Mon Sep 17 00:00:00 2001
From: sszdot <szdot@qq.com>
Date: Wed, 18 Dec 2024 17:59:59 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=B1=BB=20=20=E5=9E=8B=E3=80=91?=
 =?UTF-8?q?=EF=BC=9Adocs=20=E3=80=90=E5=8E=9F=20=20=E5=9B=A0=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=E5=92=8Cmain=E7=9B=AE=E5=BD=95=E4=B8=8B=20=E7=9A=84or?=
 =?UTF-8?q?der=E7=BB=84=E4=BB=B6=E9=87=8D=E5=90=8D=20=E3=80=90=E8=BF=87=20?=
 =?UTF-8?q?=20=E7=A8=8B=E3=80=91=EF=BC=9Ashop=E7=9B=AE=E5=BD=95=E4=B8=8Bor?=
 =?UTF-8?q?der=E7=BB=84=E4=BB=B6=E6=9B=B4=E5=90=8D=E4=B8=BAconfirm=20?=
 =?UTF-8?q?=E3=80=90=E5=BD=B1=20=20=E5=93=8D=E3=80=91=EF=BC=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# 类型 包含:
# feat：新功能（feature）
# fix：修补bug
# docs：文档（documentation）
# style： 格式（不影响代码运行的变动）
# refactor：重构（即不是新增功能，也不是修改bug的代码变动）
# test：增加测试
# chore：构建过程或辅助工具的变动
---
 App.vue              |   4 +-
 pages.json           |   2 +-
 pages/shop/list.vue  |   2 +-
 pages/shop/order.vue | 249 -------------------------------------------
 4 files changed, 4 insertions(+), 253 deletions(-)
 delete mode 100644 pages/shop/order.vue

diff --git a/App.vue b/App.vue
index 369f5f1..232fa8a 100644
--- a/App.vue
+++ b/App.vue
@@ -3,8 +3,8 @@
 		// 数据初始化
 		onLaunch: function(options) {
 			//从二维码获取站点id 商铺id
-			this.$store.commit('setShopId', String(options.query.s));
-			this.$store.commit('setSiteId', String(options.query.z));
+			this.$store.commit('setShopId', String(options.query.s))
+			this.$store.commit('setSiteId', String(options.query.z))
 			//异步加载商铺信息
 			this.$store.dispatch('fetchShopCon')
 			//异步加载站点列表
diff --git a/pages.json b/pages.json
index 4990f47..f2ecf47 100644
--- a/pages.json
+++ b/pages.json
@@ -34,7 +34,7 @@
 			}
 		},
 		{
-			"path": "pages/shop/order",
+			"path": "pages/shop/confirm",
 			"style": {
 				"navigationStyle": "custom"
 			}
diff --git a/pages/shop/list.vue b/pages/shop/list.vue
index 6b27788..a230a9e 100644
--- a/pages/shop/list.vue
+++ b/pages/shop/list.vue
@@ -283,7 +283,7 @@
 				const regex = /^(\+?\d{1,4}[\s-]?)?\d{3}\*{4}\d{4}$/
 				if (regex.test(this.$store.state.userInfo.tel)) { //手机号合法
 					uni.navigateTo({ //跳转到订单页面
-						url: '/pages/shop/order'
+						url: '/pages/shop/confirm'
 					})
 				} else { //手机号不合法 获取为空
 					uni.navigateTo({ //跳转到获取手机号页面
diff --git a/pages/shop/order.vue b/pages/shop/order.vue
deleted file mode 100644
index 41be0b2..0000000
--- a/pages/shop/order.vue
+++ /dev/null
@@ -1,249 +0,0 @@
-<template>
-	<view class="flex column">
-		<!-- topbar -->
-		<u-navbar title="确认订单" bgColor="#d43030" :titleStyle="{ color: '#FFF'}" :autoBack="true" placeholder>
-			<view class="u-nav-slot" slot="left">
-				<u-icon name="arrow-left" color="#fff" size="19"></u-icon>
-			</view>
-		</u-navbar>
-		<!-- 地址框 -->
-		<view class="m-l-24 m-r-24 m-t-24 p-t-24 p-b-24 bg-w rad8 boxshadow">
-			<view class="flex md msb p-b-24 p-l-24 p-r-24">
-				<view class="flex md">
-					<u--image src="/static/icons/site-48.svg" width="75rpx" height="75rpx" />
-					<view class="m-l-24 fz36 fb">收货站点：<font class="fcm">{{siteCon.sitename}}</font>
-					</view>
-				</view>
-				<view>
-					<u--image src="/static/icons/pulldown-40.svg" width="40rpx" height="40rpx" />
-				</view>
-			</view>
-			<view class="colorBar"></view>
-			<view class="flex m-t-24 p-l-24 p-r-24 fz28 msb">
-				<view>配置物流</view>
-				<view>{{shopCon.name}}</view>
-			</view>
-			<view class="flex m-t-12 p-l-24 p-r-24 fz28 msb">
-				<view>送达时间</view>
-				<view>预估{{estimated}}分钟之后送达</view>
-			</view>
-		</view>
-		<!-- 订单详情 -->
-		<view class="m-l-24 m-r-24 m-t-24 p-24 bg-w rad8 boxshadow">
-			<view class="fb fz36 m-b-24">餐品详情</view>
-			<!-- cart -->
-			<view class="flex m-t-24 msb" v-for="(item,index) in cartList" :key="index">
-				<view class="flex">
-					<u--image :src="item.photo" width="192rpx" height="144rpx" />
-					<view class="m-l-24 flex column">
-						<view class="fz32 m-b-12">{{item.spu_name}}</view>
-						<view class="fz24 fcb" v-for="(i,index) in item.sku_nameG" :key="index"
-							v-if="item.sku_nameG.length>1">
-							X1 {{i}}
-						</view>
-						<view class="fz24 m-t-12">X{{item.countG[0]}}</view>
-					</view>
-				</view>
-				<view class="fz36 fb m-l-12">¥{{item | calculateTotal}}</view>
-			</view>
-		</view>
-		<!-- 价格明细 -->
-		<view class="m-l-24 m-r-24 m-t-24 p-24 bg-w rad8 boxshadow">
-			<view class="fb fz36 m-b-24 borderBDas p-b-12">价格明细</view>
-			<view class="flex msb fb m-b-12">
-				<view class="fz28">商品小计</view>
-				<view class="fz36">¥{{total | formatPrice}}</view>
-			</view>
-			<view class="flex msb fz28 m-b-12">
-				<view>外送费</view>
-				<view>¥{{transportPrice | formatPrice}}</view>
-			</view>
-			<view class="flex msb fz28 m-b-24 p-b-24 borderBDas">
-				<view>打包服务费</view>
-				<view>¥{{packPrice | formatPrice}}</view>
-			</view>
-			<view class="flex mr mac">
-				<view class="fcb fz24">合计</view>
-				<view class="m-l-12 fz36 fb">¥{{fullPrice | formatPrice}}</view>
-			</view>
-		</view>
-		<!-- 客户备注 -->
-		<view class="flex msb m-l-24 m-r-24 m-t-24 p-24 bg-w rad8 boxshadow backBox">
-			<view class="fz28">备注</view>
-			<view class="fcb fz28 flex mac">
-				<view class="fz24">口味、偏好等要求</view>
-				<u-icon name="arrow-right" size="28rpx"></u-icon>
-			</view>
-		</view>
-		<!-- 提交订单 -->
-		<view class="subBox flex mr mu p-t-24 p-b-24">
-			<view class="fz24 fcb m-r-12 l-h-18">
-				合计
-			</view>
-			<view class="flex column m-r-12">
-				<view class="fb fz36">¥{{fullPrice | formatPrice}}</view>
-				<view class="fz24">共{{totalCount}}件</view>
-			</view>
-			<view class="fz32 flex column mac mc fci rad8 m-r-24" style="width:220rpx;height:100rpx;"
-				@click="handleCheckout" :class="isPressed?'bg-g':'bg-m'">
-				<view>提交订单</view>
-				<view>Checkout</view>
-			</view>
-		</view>
-	</view>
-	</view>
-</template>
-
-<script>
-	import {
-		calculateTotal,
-		formatPrice,
-		totalPrice
-	} from '@/utils/index.js'
-
-	export default {
-		data() {
-			return {
-				isPressed: false, //提交按钮是否锁定
-				remark: '' //用户备注
-			}
-		},
-		computed: {
-			//站点信息
-			siteCon() {
-				return this.$store.state.siteList.find(item => item.id === this.$store.state.site_id.toString())
-			},
-			//商铺信息
-			shopCon() {
-				return this.$store.state.shopCon
-			},
-			//预估送达时间
-			estimated() {
-				return 30
-			},
-			//购物车列表
-			cartList() {
-				return this.$store.state.cartList
-			},
-			//购物车总价
-			total() {
-				return Number(this.totalPrice(this.$store.state.cartList))
-			},
-			//外送费
-			transportPrice() {
-				return Number(this.$store.state.shopCon.default_transport_price)
-			},
-			//打包服务费
-			packPrice() {
-				return Number(this.$store.state.shopCon.default_pack_price)
-			},
-			//购物车货品总数 ps:sku的总数 即单品总数
-			totalCount() {
-				let total = 0
-				for (let i = 0; i < this.cartList.length; i++) {
-					for (let j = 0; j < this.cartList[i].countG.length; j++) {
-						total += this.cartList[i].countG[j]
-					}
-				}
-				return total
-			},
-			//所有总价包括 商品总价 打包费 等总和
-			fullPrice() {
-				return Number(this.total) + Number(this.transportPrice) + Number(this.packPrice)
-			},
-			//用户信息
-			userInfo() {
-				return this.$store.state.userInfo
-			}
-		},
-		methods: {
-			//计算购物车总价
-			totalPrice,
-			//提交订单
-			handleCheckout() {
-				if (this.isPressed) { //防止提交订单按钮重复点击
-					return
-				}
-				this.isPressed = true
-				//提交订单
-				uni.$u.http.post('/Api/Check/checkout', {
-					cartList: JSON.stringify(this.cartList), //购物车列表
-					shop_id: this.$store.state.shop_id, //商铺id
-					total: this.total, //商品总价格
-					transport_price: this.transportPrice, //运费
-					pack_price: this.packPrice, //打包费
-					site_id: this.$store.state.site_id, //站点id
-					remark: this.remark //客户订单备注
-				}, {
-					header: {
-						'Token': this.$store.state.userInfo.token,
-						'Content-Type': 'application/x-www-form-urlencoded'
-					}
-				}).then(res => {
-					//订单添加成功
-					if (res.data.status === 1) {
-						let fullPrice = String(this.fullPrice)
-						//清空购物车
-						this.$store.commit('clearCartList')
-						//跳转到支付页面
-						uni.navigateTo({
-							url: `/pages/shop/pay?order_sn=${res.data.order_sn}&fullPrice=${fullPrice}`
-						})
-					} else if (res.data.status === -1) {
-						uni.removeStorage({ //清除用户信息 跳转首页
-							key: 'userInfo',
-							success: (res) => {
-								this.$store.commit('clearUserInfo')
-								uni.redirectTo({
-									url: '/pages/index/index'
-								})
-							}
-						})
-					} else {
-						uni.showToast({
-							title: res.data.msg,
-							icon: 'error'
-						})
-						this.isPressed = false
-					}
-				})
-			}
-		},
-		filters: {
-			calculateTotal, //计算spu单价
-			formatPrice, //格式化价格
-		},
-		onShow() {
-			//购物车没有信息 跳转到订单查询页面
-			if (this.$store.state.cartList.length === 0) {
-				uni.redirectTo({
-					url: '/pages/main/order'
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.subBox {
-		height: 122rpx;
-		background-color: $uni-bg-color;
-		z-index: 10076;
-		width: 100vw;
-		position: fixed;
-		bottom: 0rpx;
-	}
-
-	.backBox {
-		margin-bottom: 194rpx;
-	}
-
-	.colorBar {
-		height: 5rpx;
-		background-image: url('/static/colorBar.png');
-		background-size: contain;
-		/* 防止图像重复 */
-		background-position: center;
-		/* 居中显示 */
-	}
-</style>
\ No newline at end of file