From f66abb2002d6dd5214fde061872c53071ea9df15 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Wed, 12 Jun 2024 13:55:17 +0800
Subject: [PATCH] add

---
 .gitignore                   |   2 +
 config/app.js                |   4 +-
 pagesOrder/settle/settle.vue | 822 +++++++++++++++++------------------
 3 files changed, 415 insertions(+), 413 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1fd55e8..9a021a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,5 @@ components.d.ts
 .env.development
 .env.production
 /unpackage/
+
+helper.json
\ No newline at end of file
diff --git a/config/app.js b/config/app.js
index ff2f711..01e3316 100644
--- a/config/app.js
+++ b/config/app.js
@@ -1,8 +1,8 @@
 let BASE_URL
 import store from "@/store/user.js"
 // 环境
-// let env = "dev"
-let env = "prod"
+let env = "dev"
+// let env = "prod"
 // let env = "liu";
 
 switch (env) {
diff --git a/pagesOrder/settle/settle.vue b/pagesOrder/settle/settle.vue
index 919a7c6..e0811b9 100644
--- a/pagesOrder/settle/settle.vue
+++ b/pagesOrder/settle/settle.vue
@@ -1,73 +1,73 @@
 <template>
 	<view class="">
 		<view class="m-card m-address">
-			<view class="address-info" @click="showAddress = true" v-if='orderInfo.shipping_type==1'>
+			<view class="address-info" @click="showAddress = true" v-if='orderInfo.shipping_type == 1'>
 				<view class="top">
 					<up-icon name="account"></up-icon>
-					<view class="t-name">{{addressInfo.real_name}}</view>
-					<view>{{addressInfo.phone}}</view>
+					<view class="t-name">{{ addressInfo.real_name }}</view>
+					<view>{{ addressInfo.phone }}</view>
 				</view>
 				<view class="bottom u-line-2">
-					{{addressInfo.detail}}
+					{{ addressInfo.detail }}
 				</view>
 			</view>
 			<view class="address-info" v-else>
 				<view class="top">
-					{{STORE_INFO.name}}
+					{{ STORE_INFO.name }}
 				</view>
 				<view class="bottom u-line-2">
-					{{STORE_INFO.detailed_address}}
+					{{ STORE_INFO.detailed_address }}
 				</view>
 			</view>
 			<view class="address-btn item-center">
 				<view class='ship-type' style="">
-					<view class="ship-type-item" :class='{actShipItem:orderInfo.shipping_type==2 }'
-						@click='orderInfo.shipping_type=2'>
+					<view class="ship-type-item" :class='{ actShipItem: orderInfo.shipping_type == 2 }'
+						@click='orderInfo.shipping_type = 2'>
 						自提
 					</view>
-					<view class="ship-type-item" @click='orderInfo.shipping_type=1'
-						:class='{actShipItem:orderInfo.shipping_type==1 }' v-if='orderInfo.default_delivery==1'>
+					<view class="ship-type-item" @click='orderInfo.shipping_type = 1'
+						:class='{ actShipItem: orderInfo.shipping_type == 1 }' v-if='orderInfo.default_delivery == 1'>
 						配送
 					</view>
 				</view>
 			</view>
 		</view>
-		<view class="m-card m-good" v-for="(item,index) in cartList" :key="index">
+		<view class="m-card m-good" v-for="(item, index) in cartList" :key="index">
 			<view class="image">
 				<up-image width="160rpx" height="160rpx" :src="item.imgs"></up-image>
 			</view>
 			<view class="body-content">
 				<view>
 					<view class="title">
-						<view>{{item.name}}</view>
-						<view>¥{{item.price}}</view>
+						<view>{{ item.name }}</view>
+						<view>¥{{ item.price }}</view>
 					</view>
 					<view class="tips">
-						<view>{{item.unit_name}}</view>
-						<view>x{{item.cart_num}}</view>
+						<view>{{ item.unit_name }}</view>
+						<view>x{{ item.cart_num }}</view>
 					</view>
 				</view>
 				<view class="time">
-					{{orderInfo.delivery_msg}}
+					{{ orderInfo.delivery_msg }}
 				</view>
 			</view>
 		</view>
 		<view class="m-card good-info">
 			<view class="head-title">价格明细</view>
 			<view class="row">
-				<view>商品总价 <text>共计{{cartList.length}}款商品</text></view>
+				<view>商品总价 <text>共计{{ cartList.length }}款商品</text></view>
 				<view>
-					<text>¥</text>{{c_price(orderInfo.total_price, 0)}}<text>.{{c_price(orderInfo.total_price, 1)}}</text>
+					<text>¥</text>{{ c_price(orderInfo.total_price, 0) }}<text>.{{ c_price(orderInfo.total_price, 1) }}</text>
 				</view>
 			</view>
 			<view class="row">
 				<view>运费</view>
 				<view><text>¥</text>0<text>.00</text></view>
 			</view>
-			<view class="row" v-if="orderInfo.activities==1" style="color: red;">
-				<view>活动折扣 <text>{{orderInfo.activity}}</text></view>
+			<view class="row" v-if="orderInfo.activities == 1" style="color: red;">
+				<view>活动折扣 <text>{{ orderInfo.activity }}</text></view>
 				<view>
-					-¥<text>{{orderInfo.activity_price}}</text>
+					-¥<text>{{ orderInfo.activity_price }}</text>
 				</view>
 			</view>
 		</view>
@@ -119,8 +119,8 @@
 					<text style="color: #000;">合计: </text>
 					<text>￥</text>
 					<block v-if="orderInfo.total_price">
-						<text style="font-size: 32rpx;font-weight: bold;">{{c_price(orderInfo.pay_price, 0)}}</text>
-						<text>.{{c_price(orderInfo.pay_price, 1)}}</text>
+						<text style="font-size: 32rpx;font-weight: bold;">{{ c_price(orderInfo.pay_price, 0) }}</text>
+						<text>.{{ c_price(orderInfo.pay_price, 1) }}</text>
 					</block>
 				</view>
 			</view>
@@ -129,9 +129,9 @@
 			</view>
 		</view>
 
-		<addressPopup ref="addressRef" :show="showAddress" :list="addressList" @close="showAddress=false"
+		<addressPopup ref="addressRef" :show="showAddress" :list="addressList" @close="showAddress = false"
 			@change="changeAddress" />
-		<shopListPopupVue ref="shopRef" :show="shopListShow" :list="merchantList" @close="shopListShow=false"
+		<shopListPopupVue ref="shopRef" :show="shopListShow" :list="merchantList" @close="shopListShow = false"
 			@change="changeShop" @search="searchShop" />
 		<modal title="尚未设置收货地址" content="您还没有添加收货地址，请点击添加" cancleText="添加地址" confirmText="继续支付" :show="toastAddressShow"
 			@close="addAddress" @change="goPay" />
@@ -141,449 +141,449 @@
 </template>
 
 <script setup>
-	import {
-		onLoad,
-		onShow
-	} from "@dcloudio/uni-app"
-	import {
-		nextTick,
-		ref
-	} from "vue"
-	import addressPopup from "@/components/addressPopup.vue";
-	import shopListPopupVue from "@/components/shopListPopup.vue";
-	import useCartStore from "@/store/cart.js";
-	import modal from "@/components/modal.vue";
-	import {
-		checkOrderApi
-	} from "@/api/cart.js";
-	import {
-		addressListsApi,
-		merchantListApi
-	} from "@/api/user.js";
-	import {
-		createOrderApi
-	} from "@/api/order.js";
+import {
+	onLoad,
+	onShow
+} from "@dcloudio/uni-app"
+import {
+	nextTick,
+	ref
+} from "vue"
+import addressPopup from "@/components/addressPopup.vue";
+import shopListPopupVue from "@/components/shopListPopup.vue";
+import useCartStore from "@/store/cart.js";
+import modal from "@/components/modal.vue";
+import {
+	checkOrderApi
+} from "@/api/cart.js";
+import {
+	addressListsApi,
+	merchantListApi
+} from "@/api/user.js";
+import {
+	createOrderApi
+} from "@/api/order.js";
 
-	//  用户选择的门店信息
-	let STORE_INFO = uni.getStorageSync('STORE_INFO');
-	if (STORE_INFO)
-		STORE_INFO = JSON.parse(STORE_INFO)
+//  用户选择的门店信息
+let STORE_INFO = uni.getStorageSync('STORE_INFO');
+if (STORE_INFO)
+	STORE_INFO = JSON.parse(STORE_INFO)
 
-	const cartStore = useCartStore();
-	const reservation_time = ref('')
+const cartStore = useCartStore();
+const reservation_time = ref('')
 
-	const formData = ref({
-		remark: ""
+const formData = ref({
+	remark: ""
+})
+
+const isAddress = ref(false);
+const toastAddressShow = ref(false);
+
+const onChoosePaytype = (e) => {
+	pay_type.value = e;
+}
+
+// 选择地址
+const addressRef = ref(null);
+const showAddress = ref(false);
+const addressInfo = ref({});
+const changeAddress = (e) => {
+	addressInfo.value = e;
+	showAddress.value = false;
+	isAddress.value = true;
+}
+const openAddress = () => {
+	if (addressList.length > 0) showAddress.value = true;
+	else uni.navigateTo({
+		url: '/pagesOrder/addressEdit/addressEdit'
 	})
+}
 
-	const isAddress = ref(false);
-	const toastAddressShow = ref(false);
-
-	const onChoosePaytype = (e) => {
-		pay_type.value = e;
-	}
-
-	// 选择地址
-	const addressRef = ref(null);
-	const showAddress = ref(false);
-	const addressInfo = ref({});
-	const changeAddress = (e) => {
-		addressInfo.value = e;
-		showAddress.value = false;
-		isAddress.value = true;
-	}
-	const openAddress = () => {
-		if (addressList.length > 0) showAddress.value = true;
-		else uni.navigateTo({
-			url: '/pagesOrder/addressEdit/addressEdit'
-		})
-	}
-
-	// 地址相关
-	const addressList = ref([]);
-	const getAddressList = () => {
-		addressListsApi().then(res => {
-			addressList.value = res.data.lists;
-			addressList.value.forEach(item => {
-				if (item.is_default) {
-					addressInfo.value = item;
-					isAddress.value = true;
-				}
-			})
-			if (!isAddress.value && addressList.value.length > 0) {
-				addressInfo.value = addressList.value[0];
+// 地址相关
+const addressList = ref([]);
+const getAddressList = () => {
+	addressListsApi().then(res => {
+		addressList.value = res.data.lists;
+		addressList.value.forEach(item => {
+			if (item.is_default) {
+				addressInfo.value = item;
 				isAddress.value = true;
 			}
-			if (addressInfo.value.address_id) {
-				nextTick(() => {
-					addressRef.value.setCheck(addressInfo.value.address_id);
-				})
-			}
 		})
-	}
-
-	// 提货点相关
-	const shopRef = ref(null);
-	const shopListShow = ref(false);
-	const merchantList = ref([]);
-	const myAddressInfo = ref({
-		long: "",
-		lat: ""
+		if (!isAddress.value && addressList.value.length > 0) {
+			addressInfo.value = addressList.value[0];
+			isAddress.value = true;
+		}
+		if (addressInfo.value.address_id) {
+			nextTick(() => {
+				addressRef.value.setCheck(addressInfo.value.address_id);
+			})
+		}
 	})
-	const shopInfo = ref({
-		mer_id: ''
-	});
+}
 
-	const getMerchantList = (mer_name = null) => {
-		merchantListApi({
-			...myAddressInfo.value,
-			mer_name: mer_name ? mer_name : ''
-		}).then(res => {
-			merchantList.value = res.data.lists;
-			if (mer_name === null && myAddressInfo.value.long && merchantList.value.length > 0 && !shopInfo
-				.value.mer_id) {
-				shopInfo.value = merchantList.value[0];
-				shopInfo.value.recommend = 1;
-				nextTick(() => {
-					shopRef.value.setCheck(shopInfo.value.mer_id);
-				})
-			}
-		})
-	}
+// 提货点相关
+const shopRef = ref(null);
+const shopListShow = ref(false);
+const merchantList = ref([]);
+const myAddressInfo = ref({
+	long: "",
+	lat: ""
+})
+const shopInfo = ref({
+	mer_id: ''
+});
 
-	// getMerchantList();
-	// 定位
-	const LoadAddress = () => {
-		uni.getLocation({
-			success: (res) => {},
-			fail: (err) => {
-				uni.$u.toast('定位失败, 请手动选择提货点!')
-			},
-			complete: (res) => {
-				myAddressInfo.value.long = res.longitude || "";
-				myAddressInfo.value.lat = res.latitude || "";
-				getMerchantList();
-			}
-		})
-	}
-	// LoadAddress();
+const getMerchantList = (mer_name = null) => {
+	merchantListApi({
+		...myAddressInfo.value,
+		mer_name: mer_name ? mer_name : ''
+	}).then(res => {
+		merchantList.value = res.data.lists;
+		if (mer_name === null && myAddressInfo.value.long && merchantList.value.length > 0 && !shopInfo
+			.value.mer_id) {
+			shopInfo.value = merchantList.value[0];
+			shopInfo.value.recommend = 1;
+			nextTick(() => {
+				shopRef.value.setCheck(shopInfo.value.mer_id);
+			})
+		}
+	})
+}
 
-	const changeShop = (e) => {
-		shopInfo.value = e;
-		shopListShow.value = false;
-	}
-	const searchShop = (e) => {
-		getMerchantList(e)
-	}
+// getMerchantList();
+// 定位
+const LoadAddress = () => {
+	uni.getLocation({
+		success: (res) => { },
+		fail: (err) => {
+			uni.$u.toast('定位失败, 请手动选择提货点!')
+		},
+		complete: (res) => {
+			myAddressInfo.value.long = res.longitude || "";
+			myAddressInfo.value.lat = res.latitude || "";
+			getMerchantList();
+		}
+	})
+}
+// LoadAddress();
 
-	// 拨打电话
-	// const callShow = ref(false)
-	// const phone = ref('');
-	// const callphone = (e) => {
-	//   callShow.value = true;
-	//   phone.value = e;
+const changeShop = (e) => {
+	shopInfo.value = e;
+	shopListShow.value = false;
+}
+const searchShop = (e) => {
+	getMerchantList(e)
+}
+
+// 拨打电话
+// const callShow = ref(false)
+// const phone = ref('');
+// const callphone = (e) => {
+//   callShow.value = true;
+//   phone.value = e;
+// }
+const onCall = (e) => {
+	uni.makePhoneCall({
+		phoneNumber: e,
+		success() {
+			callShow.value = false
+		}
+	})
+}
+
+// 选择地址
+const addAddress = () => {
+	toastAddressShow.value = false;
+	nextTick(() => {
+		showAddress.value = true;
+	})
+}
+// 继续支付
+const goPay = () => {
+	toastAddressShow.value = false;
+	isAddress.value = true;
+	submitOrder();
+}
+
+// 提交订单
+const submitOrder = () => {
+	// if (!shopInfo.value.mer_id) {
+	//   uni.$u.toast('请先选择提货点');
+	//   return shopListShow.value = true;
 	// }
-	const onCall = (e) => {
-		uni.makePhoneCall({
-			phoneNumber: e,
-			success() {
-				callShow.value = false
-			}
-		})
-	}
+	if (!isAddress.value && orderInfo.value.shipping_type == 1) return toastAddressShow.value = true;
+	createOrder();
+}
+// 订单相关
+const cartList = ref([]);
+const orderInfo = ref({});
+const checkOrder = () => {
+	checkOrderApi({
+		cart_id: cartStore.cartList,
+		store_id: STORE_INFO.id || 0
+	}).then(res => {
+		cartList.value = res.data.cart_list;
+		orderInfo.value = res.data.order;
+		if (orderInfo.value.default_delivery == 0) {
+			orderInfo.value.shipping_type = 2
+		}
+	})
+}
 
-	// 选择地址
-	const addAddress = () => {
-		toastAddressShow.value = false;
-		nextTick(() => {
-			showAddress.value = true;
-		})
-	}
-	// 继续支付
-	const goPay = () => {
-		toastAddressShow.value = false;
-		isAddress.value = true;
-		submitOrder();
-	}
+const pay_type = ref('');
 
-	// 提交订单
-	const submitOrder = () => {
-		// if (!shopInfo.value.mer_id) {
-		//   uni.$u.toast('请先选择提货点');
-		//   return shopListShow.value = true;
-		// }
-		if (!isAddress.value && orderInfo.value.shipping_type == 1) return toastAddressShow.value = true;
-		createOrder();
-	}
-	// 订单相关
-	const cartList = ref([]);
-	const orderInfo = ref({});
-	const checkOrder = () => {
-		checkOrderApi({
-			cart_id: cartStore.cartList,
-			store_id: STORE_INFO.id || 0
-		}).then(res => {
-			cartList.value = res.data.cart_list;
-			orderInfo.value = res.data.order;
-			if (orderInfo.value.default_delivery == 0) {
-				orderInfo.value.shipping_type = 2
-			}
-		})
-	}
+const createOrder = () => {
+	if (!pay_type.value) return uni.$u.toast('请选择支付方式');
 
-	const pay_type = ref('');
+	createOrderApi({
+		cart_id: cartStore.cartList,
+		address_id: addressInfo.value.address_id,
+		pay_type: pay_type.value,
+		store_id: STORE_INFO.id || 0,
+		reservation_time: reservation_time.value,
+		shipping_type: orderInfo.value.shipping_type,
+		mark: formData.value.remark
 
-	const createOrder = () => {
-		if (!pay_type.value) return uni.$u.toast('请选择支付方式');
-
-		createOrderApi({
-			cart_id: cartStore.cartList,
-			address_id: addressInfo.value.address_id,
-			pay_type: pay_type.value,
-			store_id: STORE_INFO.id || 0,
-			reservation_time: reservation_time.value,
-			shipping_type: orderInfo.value.shipping_type,
-			mark: formData.value.remark
-
-		}).then(res => {
-			console.log(res);
-			if (pay_type.value == 3) {
-				if (res.code == 1) {
-					uni.showToast({
-						title: res.msg,
-						icon: "none",
-						success() {
-							setTimeout(() => {
-								uni.redirectTo({
-									url: '/pagesOrder/order/order?back=-1&type=2'
-								})
-							}, 1500)
-						}
-					})
-				} else {
-					uni.$u.toast(res.msg);
-				}
-			} else {
-				if (!res.data?.nonceStr) return uni.$u.toast('支付失败!');
-				uni.requestPayment({
-					provider: 'wxpay',
-					timeStamp: res.data.timeStamp,
-					nonceStr: res.data.nonceStr,
-					package: res.data.package,
-					signType: res.data.signType,
-					paySign: res.data.paySign,
-					success: (e) => {
-						if (e.errMsg == 'requestPayment:ok') {
-							uni.showModal({
-								title: '订单支付成功',
-								confirmText: '查看订单',
-								cancelText: '继续购买',
-								success: (e) => {
-									if (e.confirm) uni.redirectTo({
-										url: '/pagesOrder/order/order?back=-1&type=2'
-									})
-									else uni.navigateBack();
-								}
+	}).then(res => {
+		console.log(res);
+		if (pay_type.value == 3) {
+			if (res.code == 1) {
+				uni.showToast({
+					title: res.msg,
+					icon: "none",
+					success() {
+						setTimeout(() => {
+							uni.redirectTo({
+								url: '/pagesOrder/order/order?back=-1&type=2'
 							})
-						} else uni.$u.toast('支付失败')
-					},
-					fail: (e) => {
-						uni.$u.toast('用户取消支付');
-						uni.redirectTo({
-							url: '/pagesOrder/order/order?back=-1&type=1'
-						})
+						}, 1500)
 					}
 				})
+			} else {
+				uni.$u.toast(res.msg);
 			}
-		}).catch(err => {
-			uni.$u.toast(err.msg || '网络错误')
-		})
-	}
-
-	const c_price = (price, index = 0) => {
-		price = price + '';
-		return price.split('.')[index] || (index ? '00' : '0');
-	}
-
-	onLoad(options => {
-		checkOrder();
-	})
-	onShow(() => {
-		getAddressList();
+		} else {
+			if (!res.data?.nonceStr) return uni.$u.toast('支付失败!');
+			uni.requestPayment({
+				provider: 'wxpay',
+				timeStamp: res.data.timeStamp,
+				nonceStr: res.data.nonceStr,
+				package: res.data.package,
+				signType: res.data.signType,
+				paySign: res.data.paySign,
+				success: (e) => {
+					if (e.errMsg == 'requestPayment:ok') {
+						uni.showModal({
+							title: '订单支付成功',
+							confirmText: '查看订单',
+							cancelText: '继续购买',
+							success: (e) => {
+								if (e.confirm) uni.redirectTo({
+									url: '/pagesOrder/order/order?back=-1&type=2'
+								})
+								else uni.navigateBack();
+							}
+						})
+					} else uni.$u.toast('支付失败')
+				},
+				fail: (e) => {
+					uni.$u.toast('用户取消支付');
+					uni.redirectTo({
+						url: '/pagesOrder/order/order?back=-1&type=1'
+					})
+				}
+			})
+		}
+	}).catch(err => {
+		uni.$u.toast(err.msg || '网络错误')
 	})
+}
+
+const c_price = (price, index = 0) => {
+	price = price + '';
+	return price.split('.')[index] || (index ? '00' : '0');
+}
+
+onLoad(options => {
+	checkOrder();
+})
+onShow(() => {
+	getAddressList();
+})
 </script>
 
 <style lang="scss">
-	.m-card {
-		margin: 20rpx;
-		border-radius: 14rpx;
-		background-color: #fff;
-		padding: 20rpx;
-	}
+.m-card {
+	margin: 20rpx;
+	border-radius: 14rpx;
+	background-color: #fff;
+	padding: 20rpx;
+}
 
-	.row {
-		padding: 0;
+.row {
+	padding: 0;
+	overflow: hidden;
+}
+
+.m-address {
+	margin-bottom: 20rpx;
+	display: flex;
+	justify-content: space-between;
+	color: #999999;
+
+	.address-info {
+		width: 450rpx;
+
+		.top {
+			display: flex;
+			font-size: 28rpx;
+
+			.t-name {
+				color: #444;
+				margin: 0 10rpx;
+			}
+		}
+
+		.bottom {
+			font-size: 24rpx;
+		}
+	}
+}
+
+.m-good {
+	display: flex;
+	justify-content: space-between;
+	margin-bottom: 20rpx;
+
+	.image {
+		width: 160rpx;
+		height: 160rpx;
+		margin-right: 20rpx;
+		border-radius: 14rpx;
 		overflow: hidden;
 	}
 
-	.m-address {
-		margin-bottom: 20rpx;
+	.body-content {
+		width: 490rpx;
 		display: flex;
+		flex-direction: column;
 		justify-content: space-between;
-		color: #999999;
+		color: #989898;
 
-		.address-info {
-			width: 450rpx;
-
-			.top {
-				display: flex;
-				font-size: 28rpx;
-
-				.t-name {
-					color: #444;
-					margin: 0 10rpx;
-				}
-			}
-
-			.bottom {
-				font-size: 24rpx;
-			}
-		}
-	}
-
-	.m-good {
-		display: flex;
-		justify-content: space-between;
-		margin-bottom: 20rpx;
-
-		.image {
-			width: 160rpx;
-			height: 160rpx;
-			margin-right: 20rpx;
-			border-radius: 14rpx;
-			overflow: hidden;
-		}
-
-		.body-content {
-			width: 490rpx;
+		.title {
 			display: flex;
-			flex-direction: column;
 			justify-content: space-between;
-			color: #989898;
+			font-size: 28rpx;
+			color: #444;
+		}
 
-			.title {
-				display: flex;
-				justify-content: space-between;
-				font-size: 28rpx;
-				color: #444;
-			}
+		.tips {
+			display: flex;
+			justify-content: space-between;
+			font-size: 24rpx;
+			margin-top: 10rpx;
+		}
 
-			.tips {
-				display: flex;
-				justify-content: space-between;
-				font-size: 24rpx;
-				margin-top: 10rpx;
-			}
-
-			.time {
-				background-color: #F6F6F6;
-				padding: 5rpx 10rpx;
-				font-size: 26rpx;
-				color: #444;
-				border-radius: 10rpx;
-			}
+		.time {
+			background-color: #F6F6F6;
+			padding: 5rpx 10rpx;
+			font-size: 26rpx;
+			color: #444;
+			border-radius: 10rpx;
 		}
 	}
+}
 
-	.good-info {
-		margin-bottom: 20rpx;
+.good-info {
+	margin-bottom: 20rpx;
 
-		.head-title {
-			margin-bottom: 18rpx;
-			color: #000;
-			font-weight: bold;
+	.head-title {
+		margin-bottom: 18rpx;
+		color: #000;
+		font-weight: bold;
+	}
+
+	.row {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		margin-bottom: 18rpx;
+
+		.red {
+			color: #F55726;
 		}
 
-		.row {
+		.icon-text {
 			display: flex;
 			align-items: center;
-			justify-content: space-between;
-			margin-bottom: 18rpx;
-
-			.red {
-				color: #F55726;
-			}
-
-			.icon-text {
-				display: flex;
-				align-items: center;
-			}
-
-			.icon {
-				image {
-					width: 40rpx;
-					height: 40rpx;
-				}
-			}
 		}
 
-		.row-need {
-			display: flex;
-			justify-content: flex-end;
-			color: #F55726;
-		}
-
-		text {
-			font-size: 22rpx;
+		.icon {
+			image {
+				width: 40rpx;
+				height: 40rpx;
+			}
 		}
 	}
 
-	.order-remark {
-		.head-title {
-			margin-bottom: 18rpx;
-			display: flex;
-			justify-content: space-between;
-		}
-	}
-
-	.tips {
-		font-size: 28rpx;
-		color: #999;
+	.row-need {
 		display: flex;
 		justify-content: flex-end;
-		align-items: center;
-		flex: 1;
-		margin-right: 20rpx;
-
-		.all {
-			color: #F55726;
-		}
+		color: #F55726;
 	}
 
-	.item-center {
-		display: flex;
-		align-items: center;
-		position: relative;
+	text {
+		font-size: 22rpx;
 	}
+}
 
-	.ship-type {
+.order-remark {
+	.head-title {
+		margin-bottom: 18rpx;
 		display: flex;
-		z-index: 9;
-		background-color: #F6F6F6;
+		justify-content: space-between;
+	}
+}
+
+.tips {
+	font-size: 28rpx;
+	color: #999;
+	display: flex;
+	justify-content: flex-end;
+	align-items: center;
+	flex: 1;
+	margin-right: 20rpx;
+
+	.all {
+		color: #F55726;
+	}
+}
+
+.item-center {
+	display: flex;
+	align-items: center;
+	position: relative;
+}
+
+.ship-type {
+	display: flex;
+	z-index: 9;
+	background-color: #F6F6F6;
+	border-radius: 30rpx;
+
+	.ship-type-item {
+		width: 82rpx;
+		height: 54rpx;
+		line-height: 54rpx;
+		text-align: center;
+		transition: background-color 0.3s ease;
 		border-radius: 30rpx;
-
-		.ship-type-item {
-			width: 82rpx;
-			height: 54rpx;
-			line-height: 54rpx;
-			text-align: center;
-			transition: background-color 0.3s ease;
-			border-radius: 30rpx;
-		}
-
-		.actShipItem {
-			background-color: #27B52F;
-			color: white;
-		}
 	}
+
+	.actShipItem {
+		background-color: #27B52F;
+		color: white;
+	}
+}
 </style>
\ No newline at end of file