From 32994e4856b9f9d7fdc3991ea74e6ec175963ae5 Mon Sep 17 00:00:00 2001
From: zhengshuiqi <zhengshiqi@xingtongworld.com>
Date: Thu, 24 Nov 2022 20:36:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=94=AF=E4=BB=98&=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                  | 2 +-
 pages/account/index.vue        | 4 ++--
 pages/account/myOrders.vue     | 5 ++---
 pages/account/myReview.vue     | 8 ++++++++
 pages/account/wishlist.vue     | 4 ++--
 pages/index/index.vue          | 6 +++---
 pages/productDetails/index.vue | 6 +++---
 7 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/manifest.json b/manifest.json
index 1a19141..80874cb 100644
--- a/manifest.json
+++ b/manifest.json
@@ -76,7 +76,7 @@
                 ],
                 "autoSdkPermissions" : true,
                 "minSdkVersion" : 26,
-                "targetSdkVersion" : 31,
+                "targetSdkVersion" : 29,
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ]
             },
             /* ios打包配置 */
diff --git a/pages/account/index.vue b/pages/account/index.vue
index e2119a5..f82afa7 100644
--- a/pages/account/index.vue
+++ b/pages/account/index.vue
@@ -535,7 +535,7 @@
 			align-items: center;
 			position: absolute;
 			width: 100%;
-			top: 15.5%;
+			top: 13.5%;
 			// left: 15%;
 
 				// z-index: 1111;
@@ -553,7 +553,7 @@
 				color: #F7F7F7;
 				margin-bottom: 57px;
 				position: absolute;
-				padding: 100px 50px 0;
+				padding: 150px 50px 0;
 			}
 		}
 
diff --git a/pages/account/myOrders.vue b/pages/account/myOrders.vue
index 3890b96..b064aef 100644
--- a/pages/account/myOrders.vue
+++ b/pages/account/myOrders.vue
@@ -19,8 +19,7 @@
 							<!-- 已取消订单 -->
 							<text v-else-if="item.order_status_code==2">cancelled</text>
 							<!-- 待发货订单 -->
-							<text v-else-if="item.pay_status_code==2 && item.shipping_status_code==0">To be
-								shipped</text>
+							<text v-else-if="item.pay_status_code==2 && item.shipping_status_code==0">To be	shipped</text>
 							<!-- 运输中订单 -->
 							<text
 								v-else-if="item.pay_status_code==2 && item.shipping_status_code==1 || item.shipping_status_code==4">Shipped</text>
@@ -678,7 +677,7 @@
 							})
 						}
 					})
-				} else if (this.pay_index == 0) {
+				} else if (this.pay_index == 1) {
 					let data = {
 						_action: 'payorder',
 						order_id: this.payQuery.order_id,
diff --git a/pages/account/myReview.vue b/pages/account/myReview.vue
index f754a12..4dc05bc 100644
--- a/pages/account/myReview.vue
+++ b/pages/account/myReview.vue
@@ -131,6 +131,13 @@
 	}
 </style>
 <style lang="scss" scoped>
+	.reviews_item {
+		// height: auto !important;
+		// box-sizing: border-box !important;
+		white-space: nowrap;
+		height: auto !important;
+		width: 100%;
+	}
 	.body{
 		padding: 0 32rpx;
 	}
@@ -144,6 +151,7 @@
 		}
 		.more_delete{
 			background-image: url(@/static/img/more_bf.png);
+			background-repeat:no-repeat;
 			background-size: 100% 100%;
 			width: 102.67rpx;
 			height: 67.33rpx;
diff --git a/pages/account/wishlist.vue b/pages/account/wishlist.vue
index bc1f9b0..3224d47 100644
--- a/pages/account/wishlist.vue
+++ b/pages/account/wishlist.vue
@@ -929,14 +929,14 @@
 				}
 		}
 		.bootom_last{
-			 height: 200rpx;
+			 height: 100rpx;
 			 width: 100%;
 			 color: #fff;
 			 background-color: #000;
 			
 			 font-size: 25rpx;
 			 padding-bottom:40rpx;
-			 line-height: 200rpx;
+			 line-height: 100rpx;
 			 text-align: center;
 		}
 		
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 62bd554..0a75ed2 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -57,7 +57,7 @@
 				isbest: 0,
 				popImg: '',
 				countdownTime: 10,
-				countdownTime2: 5,
+				countdownTime2: 8,
 				popUrl: '',
 				myMes: {
 					_action: 'getmessagelist',
@@ -241,7 +241,7 @@
 					}
 				})
 				s++;
-			}, 1);
+			}, 5000);
 			// 轮询时间
 		},
 
@@ -2637,7 +2637,7 @@
 			opacity: 0.5;
 			text-align: center;
 			position: absolute;
-			z-index: 99;
+			z-index: 10000;
 			border-radius: 5rpx;
 		}
 
diff --git a/pages/productDetails/index.vue b/pages/productDetails/index.vue
index cab2caf..2ad8de3 100644
--- a/pages/productDetails/index.vue
+++ b/pages/productDetails/index.vue
@@ -2219,9 +2219,9 @@
 		 line-height: 50px;
 		 text-align: center;
 	}
-	uni-image {
-		margin-top: -2px !important;
-	}
+	// uni-image {
+	// 	margin-top: -2px !important;
+	// }
 	/deep/.nav_left .uni-image .data-v-af9236d6{
 		background-size: 0% !important;
 	}