From 9964f9d5c03ebddc447ef118a09a284d977eaa21 Mon Sep 17 00:00:00 2001
From: zhengshuiqi <zhengshiqi@xingtongworld.com>
Date: Thu, 24 Nov 2022 13:54:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E8=A6=81=E4=BF=AE=E6=94=B9=E6=94=B6?=
 =?UTF-8?q?=E8=97=8F=E5=8A=9F=E8=83=BD=20pages/account/wishlist.vue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/common.scss         | 79 +++++---------------------------------
 pages/account/index.vue    |  2 +-
 pages/account/wishlist.vue |  7 ++--
 pages/index/index.vue      |  8 ++--
 4 files changed, 20 insertions(+), 76 deletions(-)

diff --git a/common/common.scss b/common/common.scss
index 4ffba17..08c8561 100644
--- a/common/common.scss
+++ b/common/common.scss
@@ -21,9 +21,10 @@
 		display: flex;
 		color:#707070;
 		justify-content: space-around;
-		.tarbar_img image {
+		.tarbar_img image{
 			height: 50rpx;
 			width: 50rpx;
+			
 			// background-color: #fff;
 		}
 		.img_m image{
@@ -508,20 +509,22 @@
 		flex-direction: column;
 		font-size: 25.33rpx;
 		font-weight: 500;
-		width: 33%;
+		width: 48%;
 		margin-top: 33.33rpx;
 		// margin-right: 18.67rpx;
-		&:nth-child(3n+3){
-			margin-right: 0;
+		&:nth-child(even){
+			margin-left: 10px;
 		}
 		
 		.wishlist_item_img{
-			width: 220rpx;
-			height: 220rpx;
+			width: 100%;
+			height: 180px;
+			// height: 220rpx;
 			margin-bottom: 25.33rpx;
 			background-color: #999999;
 			position: relative;
 			border-radius: 10rpx;
+			object-fit: cover;
 			.wishlist_item_img_goods{
 				width: 100%;
 				height: 100%;
@@ -538,7 +541,7 @@
 		.wishlist_item_bottom{
 			display: flex;
 			align-items: center;
-		    padding-right: 18.67rpx;
+		   padding-right: 18.67rpx;
 			justify-content: space-between;
 			
 			.wishlist_item_bottom_icon{
@@ -549,7 +552,6 @@
 	}
 }
 
-
 .wishlist_foot{
 	padding: 33.33rpx 26.67rpx;
 	position: fixed;
@@ -1110,64 +1112,3 @@
 			}
 		}
 	}
-
-
-
-.wishlist-modification{
-	padding: 0 2.67rpx 40rpx 10rpx;
-	display: flex;
-	// padding-top: 40rpx;
-	
-	// justify-content: space-between;
-	flex-wrap: wrap;
-	
-	.wishlist_item{
-		display: flex;
-		flex-direction: column;
-		font-size: 25.33rpx;
-		font-weight: 500;
-		width: 50%;
-		margin-top: 33.33rpx;
-		// margin-right: 18.67rpx;
-		box-sizing: border-box;
-		&:nth-child(2n+0){
-			padding-left: 10px;
-		}
-		
-		.wishlist_item_img{
-			width: 100%;
-			height: 190px;
-			object-fit: cover;
-			margin-bottom: 20rpx;
-			background-color: #999999;
-			position: relative;
-			border-radius: 10rpx;
-			.wishlist_item_img_goods{
-				width: 100%;
-				height: 100%;
-				border-radius: 10rpx;
-			}
-			.select{
-				position: absolute;
-				width: 28rpx;
-				height: 28rpx;
-				top: 8rpx;
-				right: 8rpx;
-			}
-		}
-		.wishlist_item_bottom{
-			display: flex;
-			align-items: center;
-		    padding-right: 18.67rpx;
-			justify-content: space-between;
-			
-			.wishlist_item_bottom_icon{
-				width: 30rpx;
-				height: 30rpx;
-			}
-		}
-	}
-}
-.uni-page-refresh {
-	background: #000 !important;
-}
\ No newline at end of file
diff --git a/pages/account/index.vue b/pages/account/index.vue
index 6a0d53d..e2119a5 100644
--- a/pages/account/index.vue
+++ b/pages/account/index.vue
@@ -535,7 +535,7 @@
 			align-items: center;
 			position: absolute;
 			width: 100%;
-			top: 18%;
+			top: 15.5%;
 			// left: 15%;
 
 				// z-index: 1111;
diff --git a/pages/account/wishlist.vue b/pages/account/wishlist.vue
index 1ff3bd2..bc1f9b0 100644
--- a/pages/account/wishlist.vue
+++ b/pages/account/wishlist.vue
@@ -9,14 +9,14 @@
 				<view class="wishlist_item_img "@click="isDelete?selectGoods(item.goods_id,index): goDetails(item.goods_id)">
 					<image :src="item.goods_img" mode="" class="wishlist_item_img_goods"></image>
 					<image src="../../static/img/select1.png" @click="deleteTap(item)" mode=" "  class="select" v-if="isDelete && item.goods_id==deletelist[index].id || isAll"></image> 
-				<image src="../../static/img/select.png" mode=""  class="select" v-else-if=" isDelete &&item.goods_id!=deletelist[index].id"></image>
+					<image src="../../static/img/select.png" mode=""  class="select" v-else-if=" isDelete &&item.goods_id!=deletelist[index].id"></image>
 				    <!-- <image :src="Src" @click="deleteTap(item)" mode=" " v-model="item.goods_id" class="select" v-if="isDelete || item.goods_id==goods_id"></image> -->
 				</view>
 				<view class="wishlist_item_bottom">
 					<text style="margin-left: 4px;">US${{item.promote_price?item.promote_price:item.shop_price}}</text>
 					<image src="../../static/icon/cat_white.png" mode="" style="margin-right: 0px;" class="wishlist_item_bottom_icon" @click="isCart=true,getDate(item)"></image>
-					<text>US${{item.promote_price?item.promote_price:item.shop_price}}</text>
-					<image src="../../static/icon/cat_white.png" mode="" class="wishlist_item_bottom_icon" @click="isCart=true,getDate(item)"></image>
+					<!-- <text>US${{item.promote_price?item.promote_price:item.shop_price}}</text> -->
+					<!-- <image src="../../static/icon/cat_white.png" mode="" class="wishlist_item_bottom_icon" @click="isCart=true,getDate(item)"></image> -->
 					<!-- <image src="../../static/img/delete.png" mode="" class="wishlist_item_bottom_icon" @click="removeL(item)"> --></image>
 				</view>
 			</view>
@@ -939,4 +939,5 @@
 			 line-height: 200rpx;
 			 text-align: center;
 		}
+		
 </style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index a380fc5..ae7ca41 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -204,8 +204,9 @@
 		// },
 			
 		onLoad() {
-			let that = this;
+			let that = this;	// 作用域
 			let s = 0;
+			// 定时轮询网络 （IOS网络判断）
 			let time = setInterval(()=>{
 				console.log('6666')
 				uni.getNetworkType({
@@ -213,8 +214,8 @@
 						console.log(res.networkType,s);
 						if(res.networkType !== 'none'){
 							that.typee =  2;
-							// clearInterval(time);
-							// console.log('清楚网络..')
+							clearInterval(time);
+							console.log('清楚网络..')
 							let home = 'HOME'
 							this.getIndex(home)
 							this.isLogin = uni.getStorageSync('isLogin')
@@ -240,6 +241,7 @@
 				})
 				s++;
 			},5000);
+			// 轮询时间
 		},
 
 		mounted() {