From 7601e45078cca3f31723948920ae5248c2cb6c39 Mon Sep 17 00:00:00 2001
From: hu-qi <huqi1024@gmail.com>
Date: Fri, 21 Jun 2024 01:53:20 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/address/address.vue             | 14 +++++++++-----
 pages/address/addressManage.vue       | 10 +++++++---
 pages/index/index.vue                 |  2 +-
 pages/order/order.vue                 |  8 ++++++--
 pages/public/components/checkCode.vue |  4 +---
 pages/public/login.vue                |  2 +-
 utils/requestUtil.js                  |  1 +
 7 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/pages/address/address.vue b/pages/address/address.vue
index ef26ae9..40d44d2 100644
--- a/pages/address/address.vue
+++ b/pages/address/address.vue
@@ -166,17 +166,21 @@
 		position: fixed;
 		left: 30upx;
 		right: 30upx;
-		bottom: 16upx;
+		bottom: constant(safe-area-inset-bottom);
+		bottom: env(safe-area-inset-bottom);
+		/* bottom: 16upx; */
+		width: 100vw;
+		height: 100vh;
+		
 		z-index: 95;
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		width: 690upx;
+		width: 640upx;
 		height: 80upx;
 		font-size: 32upx;
 		color: #fff;
-		background-color: $base-color;
-		border-radius: 10upx;
-		box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
+		background-color: #CC342D;
+		border-radius: 50upx;
 	}
 </style>
diff --git a/pages/address/addressManage.vue b/pages/address/addressManage.vue
index 619ae59..00ff2de 100644
--- a/pages/address/addressManage.vue
+++ b/pages/address/addressManage.vue
@@ -21,11 +21,14 @@
 		</view> -->
 		<view class="row b-b">
 			<text class="tit">收货地区</text>
-			<input class="input" type="text" v-model="addressData.prefixAddress" placeholder="省市区县 乡镇" placeholder-class="placeholder" />
+			<input class="input" type="text" v-model="addressData.prefixAddress" placeholder="省市区县、乡镇" placeholder-class="placeholder" />
 		</view>
 		<view class="row b-b">
 			<text class="tit">详细地址</text>
-			<input class="input" type="text" v-model="addressData.detailAddress" placeholder="街道 楼牌号" placeholder-class="placeholder" />
+			<input class="input" type="text" v-model="addressData.detailAddress" placeholder="街道、楼牌号" placeholder-class="placeholder" />
+		</view>
+		<view class="row b-b">
+			<input class="input" type="textarea" v-model="content" placeholder="粘贴收货人、手机号、收货地址信息" placeholder-class="placeholder" />
 		</view>
 
 		<view class="row default-row">
@@ -56,7 +59,8 @@
 					city: '',
 					region: '',
 					prefixAddress: ''
-				}
+				},
+				content: '',
 			}
 		},
 		onLoad(option) {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index b6cd2f6..4e7a33a 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -204,7 +204,7 @@
 				switch (code) {
 					case 'myOrders':
 						uni.navigateTo({
-							url: '/pages/order/order'
+							url: '/pages/order/order?state=0'
 						})
 						break;
 					case 'collections':
diff --git a/pages/order/order.vue b/pages/order/order.vue
index 4888764..eaae0f3 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -421,8 +421,8 @@
 
 			.goods-img {
 				display: block;
-				width: 120upx;
-				height: 120upx;
+				width: 192upx;
+				height: 192upx;
 			}
 
 			.right {
@@ -431,6 +431,7 @@
 				flex-direction: column;
 				padding: 0 30upx 0 24upx;
 				overflow: hidden;
+				position: relative;
 
 				.title {
 					font-size: $font-base + 2upx;
@@ -447,6 +448,9 @@
 				.price {
 					font-size: $font-base + 2upx;
 					color: $font-color-dark;
+					position: absolute;
+					left: 24upx;
+					bottom: 0;
 
 					&:before {
 						content: '￥';
diff --git a/pages/public/components/checkCode.vue b/pages/public/components/checkCode.vue
index 05a55db..9efd5e8 100644
--- a/pages/public/components/checkCode.vue
+++ b/pages/public/components/checkCode.vue
@@ -9,7 +9,7 @@
 				<view class="tips_text">{{tips.text}} {{data.area}} {{data.mobile}}</view>
 			</view>
 			<view class="numBox">
-				<uni-code-input v-model="data.mobileCheckCode" mode="line" :space="12" :focus="true" borderColor="rgba(0, 0, 0, 0.1)"
+				<uni-code-input v-model="data.mobileCheckCode" mode="line" :size="88" :fontSize="48" :space="24" :focus="true" color="rgba(0, 0, 0, 0.2)" borderColor="rgba(0, 0, 0, 0.1)"
 					hairline :maxlength="6" @finish="finish"></uni-code-input>
 			</view>
 			<view class="cutdownBox">
@@ -23,13 +23,11 @@
 </template>
 
 <script>
-	// import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
 	import uniCodeInput from '@/components/uni-code-input/uni-code-input.vue';
 	export default {
 		name: 'CheckCode',
 		components: {
 			uniCodeInput
-			// uniLoadMore
 		},
 		data() {
 			return {
diff --git a/pages/public/login.vue b/pages/public/login.vue
index 1526fbc..cf2050c 100644
--- a/pages/public/login.vue
+++ b/pages/public/login.vue
@@ -72,7 +72,7 @@
 				// 是否同意隐私策略
 				isRead: false,
 				// 是否显示验证码输入
-				isShowCode: false,
+				isShowCode: true,
 				// 登录中禁用按钮
 				isLogining: false,
 				// 传给验证码输入组件
diff --git a/utils/requestUtil.js b/utils/requestUtil.js
index da45226..5b60bfd 100644
--- a/utils/requestUtil.js
+++ b/utils/requestUtil.js
@@ -77,6 +77,7 @@ http.interceptor.response((response) => {
 					}
 				}
 			});
+			uni.setStorageSync('token', '')
 		}
 		return Promise.reject(response);
 	} else {