From 12ea9433a91e5872650a132381ee77989e065f3c Mon Sep 17 00:00:00 2001
From: shuxiaoquan <853623962@qq.com>
Date: Tue, 19 Mar 2024 08:57:26 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/login/index.vue                | 27 +++++++++++++++++----------
 pages/news/recycling/order.vue       | 19 ++++++++++++-------
 pages/news/recycling/orderDetail.vue | 18 ++++++++++++------
 pages/user/index.vue                 | 17 +++++++----------
 4 files changed, 48 insertions(+), 33 deletions(-)

diff --git a/pages/login/index.vue b/pages/login/index.vue
index 52a8bcd..e630e43 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -18,7 +18,7 @@
       <view class="b">
         <input v-model="semCode" placeholder="请输入验证码" />
         <text @click="getCode" v-if="!showCountDown">获取验证码</text>
-        <text v-if="showCountDown">{{ countdown }}</text>
+        <text v-if="showCountDown">{{ countdown }}s</text>
       </view>
       <view class="c" style="display: flex; align-items: center">
         <u-checkbox
@@ -101,6 +101,10 @@ export default {
     getCode() {
       // 获取验证码
       const that = this;
+	  if (that.isCheckout == false) {
+	    that.$toast("请勾选用户协议");
+	    return;
+	  }
       if (!that.validatePhoneNumber(that.phoneNum)) {
         uni.showToast({
           title: "请输入正确的手机号",
@@ -108,26 +112,29 @@ export default {
         return;
       }
       that.showCountDown = !that.showCountDown;
-      that.countDownFun = setInterval(() => {
-        if (that.countdown >= 1) {
-          that.countdown = that.countdown - 1;
-        } else {
-          that.showCountDown = false;
-          that.countdown = 60;
-          clearInterval(that.countDownFun);
-        }
-      }, 1000);
+      
       CaptchaApi.sendSmsCaptcha({
         form: {
           mobile: that.phoneNum,
         },
       }).then((res) => {
         if (res.status == 200) {
+			that.countDownFun = setInterval(() => {
+			  if (that.countdown >= 1) {
+				that.countdown = that.countdown - 1;
+			  } else {
+				that.showCountDown = false;
+				that.countdown = 60;
+				clearInterval(that.countDownFun);
+			  }
+			}, 1000);
           uni.showToast({
+			  icon:"none",
             title: res.message,
           });
         } else {
           uni.showToast({
+			    icon:"none",
             title: res.message,
           });
         }
diff --git a/pages/news/recycling/order.vue b/pages/news/recycling/order.vue
index bdb975d..21ed10c 100644
--- a/pages/news/recycling/order.vue
+++ b/pages/news/recycling/order.vue
@@ -11,8 +11,10 @@
 						{{infor.username}}
 						<text>{{infor.mobile}}</text>
 					</view>
-					<image @click="copyOrderNumber(infor.mobile)" class="copy"
-						:src="$picUrl+'/static/news/icon-recycling-order-02.png'"></image>
+					
+					<view class="address" v-if="infor &&infor.shipping_address">{{infor.shipping_address+infor.house_number}}</view>
+					<!-- <image @click="copyOrderNumber(infor.mobile)" class="copy"
+						:src="$picUrl+'/static/news/icon-recycling-order-02.png'"></image> -->
 				</view>
 				<view class="b">
 					<image class="pic" :src="$picUrl+'/static/home/phone.jpg'"></image>
@@ -301,7 +303,7 @@
 
 			.l {
 				width: 694rpx;
-				height: 276rpx;
+				min-height: 276rpx;
 				background: #FFFFFF;
 				border-radius: 10rpx;
 				padding: 30rpx;
@@ -310,10 +312,13 @@
 				margin-top: 30rpx;
 
 				.a {
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-
+					overflow: hidden;
+					.address{
+						margin-left: 40rpx;
+						margin-top: 10rpx;
+						font-size: 26rpx;
+						color: #666;
+					}
 					.name {
 						display: flex;
 						align-items: center;
diff --git a/pages/news/recycling/orderDetail.vue b/pages/news/recycling/orderDetail.vue
index 79b10cd..bea532f 100644
--- a/pages/news/recycling/orderDetail.vue
+++ b/pages/news/recycling/orderDetail.vue
@@ -9,8 +9,10 @@
 					<view class="name">
 						<image class="user" :src="$picUrl+'/static/news/icon-recycling-order-01.png'"></image>{{info.username}}
 						<text>{{info.mobile}}</text>
-					</view>
-					<image class="copy" @click="openPage(1,info.mobile)" :src="$picUrl+'/static/news/icon-recycling-order-02.png'"></image>
+					</view>
+					
+					<view class="address" v-if="info &&info.shipping_address">{{info.shipping_address+info.house_number}}</view>
+					<!-- <image class="copy" @click="openPage(1,info.mobile)" :src="$picUrl+'/static/news/icon-recycling-order-02.png'"></image> -->
 				</view>
 				<view class="b">
 					<image class="pic" :src="info.server_image"></image>
@@ -253,7 +255,7 @@
 	&-hd{
 		.l{
 			width: 694rpx;
-			height: 276rpx;
+			min-height: 276rpx;
 			background: #FFFFFF;
 			border-radius: 10rpx;
 			padding: 30rpx;
@@ -261,9 +263,13 @@
 			margin: 0 auto;
 			margin-top: 30rpx;
 			.a{
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
+				overflow: hidden;
+				.address{
+					margin-left: 40rpx;
+					margin-top: 10rpx;
+					font-size: 26rpx;
+					color: #666;
+				}
 				.name{
 					display: flex;
 					align-items: center;
diff --git a/pages/user/index.vue b/pages/user/index.vue
index fd8178f..c261c59 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -203,8 +203,8 @@
 					<view class="image-text_21" @click="goGoodsOrder('complete')">
 						<image :src="$picUrl+'/static/user/over.png'" class="label_11"></image>
 						<view class="text-group_21">
-							<text class="text_71"
-								v-if="orderTodoInfo.goods_order.finish_number">{{orderTodoInfo.goods_order.finish_number>=100?"99+":orderTodoInfo.goods_order.finish_number}}</text>
+							<!-- <text class="text_71" 
+								v-if="orderTodoInfo.goods_order.finish_number">{{orderTodoInfo.goods_order.finish_number>=100?"99+":orderTodoInfo.goods_order.finish_number}}</text>-->
 							<text class="text_81">已完成</text>
 						</view>
 					</view>
@@ -244,8 +244,8 @@
 					<view class="image-text_21" @click="toFuwu(4)">
 						<image :src="$picUrl+'/static/user/detail.png'" class="label_11"></image>
 						<view class="text-group_21">
-							<text class="text_71"
-								v-if="orderTodoInfo.service_order.check_number">{{orderTodoInfo.service_order.check_number}}</text>
+							<!-- <text class="text_71" 
+								v-if="orderTodoInfo.service_order.check_number">{{orderTodoInfo.service_order.check_number}}</text>-->
 							<text class="text_81">已完成</text>
 						</view>
 					</view>
@@ -277,16 +277,14 @@
 					<view class="image-text_21" @click="toRecovery(3)">
 						<image :src="$picUrl+'/static/user/untake.png'" class="label_11"></image>
 						<view class="text-group_21">
-							<text class="text_71"
-								v-if="orderTodoInfo.recovery_order.cancel_number">{{orderTodoInfo.recovery_order.cancel_number>=100?"99+":orderTodoInfo.recovery_order.cancel_number}}</text>
+							<!-- <text class="text_71" v-if="orderTodoInfo.recovery_order.cancel_number">{{orderTodoInfo.recovery_order.cancel_number>=100?"99+":orderTodoInfo.recovery_order.cancel_number}}</text> -->
 							<text class="text_81">已取消</text>
 						</view>
 					</view>
 					<view class="image-text_21" @click="toRecovery(2)">
 						<image :src="$picUrl+'/static/user/detail.png'" class="label_11"></image>
 						<view class="text-group_21">
-							<text class="text_71"
-								v-if="orderTodoInfo.recovery_order.finish_number">{{orderTodoInfo.recovery_order.finish_number>=100?"99+":orderTodoInfo.recovery_order.finish_number}}</text>
+							<!-- <text class="text_71" v-if="orderTodoInfo.recovery_order.finish_number">{{orderTodoInfo.recovery_order.finish_number>=100?"99+":orderTodoInfo.recovery_order.finish_number}}</text> -->
 							<text class="text_81">已完成</text>
 						</view>
 					</view>
@@ -329,8 +327,7 @@
 					<view class="image-text_21" @click="goJump('/pages/news3/shopDealerOrder?type=complete')">
 						<image :src="$picUrl+'/static/user/over.png'" class="label_11"></image>
 						<view class="text-group_21">
-							<text lines="1" class="text_7"
-								v-if="orderTodoInfo.distribution_order.finish_number">{{orderTodoInfo.distribution_order.finish_number}}</text>
+							<!-- <text lines="1" class="text_7" v-if="orderTodoInfo.distribution_order.finish_number">{{orderTodoInfo.distribution_order.finish_number}}</text> -->
 							<text lines="1" class="text_8">已完成</text>
 						</view>
 					</view>