From 399ac9a33a2e3c340c4654325d2ddaccc4204867 Mon Sep 17 00:00:00 2001
From: zhengshuiqi <zhengshiqi@xingtongworld.com>
Date: Fri, 25 Nov 2022 18:04:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/account/addAddress.vue   |  4 ++
 pages/account/myProfile.vue    |  6 ++-
 pages/index/index.vue          | 69 +---------------------------------
 pages/login/index.vue          |  2 +-
 pages/productDetails/index.vue |  8 ++--
 pages/specialTitle/index.vue   | 17 +++++----
 6 files changed, 24 insertions(+), 82 deletions(-)

diff --git a/pages/account/addAddress.vue b/pages/account/addAddress.vue
index 6d77673..12b6ee3 100644
--- a/pages/account/addAddress.vue
+++ b/pages/account/addAddress.vue
@@ -574,6 +574,10 @@
 				input{
 					font-size: 24rpx;
 					padding-left: 10rpx;
+					height: 100%;
+					z-index: 1;
+					position: relative;
+					// padding-bottom: 4px;
 				}
 			}
 		}
diff --git a/pages/account/myProfile.vue b/pages/account/myProfile.vue
index 3991a29..0495bf6 100644
--- a/pages/account/myProfile.vue
+++ b/pages/account/myProfile.vue
@@ -9,11 +9,13 @@
 				<image src="../../static/img/right1.png" alt="" class="right_img"></image>
 			</view>
 		</view>
-		<view class="profile_item " @click="$refs.inputDialog.open()">
+		<view class="profile_item ">
+		<!-- <view class="profile_item " @click="$refs.inputDialog.open()"> -->
 			<text>Name</text>
 			<view class="profile_item_right">
 				<text>{{user_info.nickname}}</text>
-				<image src="../../static/img/right1.png" alt="" class="right_img"></image>
+				<image src="" alt="" class="right_img"></image>
+				<!-- <image v-show="" src="../../static/img/right1.png" alt="" class="right_img"></image> -->
 			</view>
 		</view>
 		<view class="profile_item ">
diff --git a/pages/index/index.vue b/pages/index/index.vue
index a1248ca..70f0df8 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -188,7 +188,6 @@
 							title: '网络不佳,请重新打开........',
 							duration: 20000
 						});
-
 					} else {
 						that.typee = 2
 						console.log("有网络", that.typee);
@@ -196,13 +195,11 @@
 							title: '网络不佳,请重新打开........',
 							duration: 2000
 						});
-
 					}
 				}, 3000)
 			}
 		}); */
 		// },
-
 		onLoad() {
 			let that = this; 
 			let s = 0;
@@ -384,7 +381,6 @@
 						// 计算图片渲染高度
 						let showH = (50 * image.height) / image.width
 						// console.log(Swiper_H)	
-
 					}
 				})
 				return this.hotheight
@@ -434,7 +430,6 @@
 								this.popUrl = item.zone_more_link
 								this.open()
 								// console.log(this.popImg,item.zone_code)
-
 							}
 						})
 					}
@@ -463,14 +458,10 @@
 				// 	if (this.countdownTime < 1) {
 				// 		clearInterval(timer)
 				// 		this.countdownTime = 0
-
 				// 	}
-
 				// }, 1000)
-
 				let timer2 = setInterval(() => {
 					// uni.hideTabBar();
-
 					this.countdownTime2--;
 
 					console.log(this.countdownTime2)
@@ -571,13 +562,11 @@
 							if (item.zone_code == 'HONLIST3') {
 								item.blocks.map(item1 => {
 									// console.log('HONLIST3',item1)
-
 								})
 							}
 							if (item.zone_code == 'HONLIST2') {
 								item.blocks.map(item1 => {
 									// console.log('HONLIST2',item1)
-
 								})
 							}
 							if (this.info.length > 1) {
@@ -691,7 +680,6 @@
 									// if(item.attr_name){
 									// 	this.sizenum=item.goods_attrs.length
 									// }
-
 									// if(item.attr_name=="Color"){
 									// 	this.colorNum=item.goods_attrs.length
 									// 	console.log(this.colorNum)
@@ -707,11 +695,9 @@
 									// }
 									// else if(item.attr_name=="Size"){
 									// 	Size_list = item.goods_attrs
-
 									// 	console.log(this.sizenum)
 									// 	Size_list.map( item =>{
 									// 		 this.Size_list  +=item.attr_value + ' '
-
 									// 	 })
 									// 	  this.Size_list= this.Size_list.substring(0, this.Size_list.length-1)
 									// }
@@ -744,7 +730,6 @@
 						}
 
 						// this.catQuery.cat=res.data.cat_id
-
 					}
 				})
 			},
@@ -916,7 +901,6 @@
 
 					// ////console.log(sum)
 
-
 				})
 			},
 			gotoSearch() {
@@ -961,9 +945,7 @@
 						// 			  skillList.push(mm)
 						// 			  this.skillList = skillList
 
-
 						// }
-
 					}
 				})
 			},
@@ -1100,7 +1082,6 @@
 				let code = item.zone_code
 				this.getIndex(code)
 				// this.getCatList()
-
 			},
 			start(e) {
 				// console.log(e)
@@ -1135,7 +1116,6 @@
 				// console.log('滚动了',this.hot_index)	
 				// this.start(this.hot_index)
 				// this.end(this.hot_index)
-
 			},
 
 			gridSwiper(e) {
@@ -1206,7 +1186,6 @@
 	<view v-if="typee == 2" class="body" :class="isScrollShow?'body_pad':''">
 		<!-- 进入页面部分 -->
 		<view v-show="!open_img || countdownTime2==0">
-
 			<!-- 头部导航栏 -->
 			<view class="navigation ">
 				<view class="status_bar"></view>
@@ -1219,11 +1198,8 @@
 										<image src="../../static/img/msg_white.png" mode=""></image>
 									</uni-badge>
 								</navigator>
-
 								<image src="/static/img/dope plus_white.png" mode="" class="index_logo"></image>
 							</template>
-
-
 							<view class="navigation_title_right" :class="isScrollShow?'navigation_title_padding':'' ">
 								<navigator>
 									<image src="../../static/img/like_white.png" mode="" @click="Iswish()"></image>
@@ -1233,17 +1209,14 @@
 										<image src="../../static/img/shop_cart1.png" mode=""></image>
 									</uni-badge>
 								</navigator>
-
 							</view>
 						</view>
-
 						<navigator>
 							<view v-if="isScrollShow " :class="isScrollShow?'isScrollShow3':'' ">
 								<image src="/static/icon/home_white.png" mode=""></image>
 							</view>
 							<view class="navigation_seach" :class="isScrollShow?'isScrollShow1':'' "
 								@click="gotoSearch()">
-
 								<image src="../../static/img/seach.png" mode=""></image>
 								<text>search</text>
 							</view>
@@ -1262,9 +1235,7 @@
 						@click="scrollChange(item,index)" :key="item.zone_name">{{item.zone_name}}</view>
 				</scroll-view>
 			</view>
-
 			<view style="max-width: 100%" v-for="(item,index) in indexDate.zones" :key="item.zone_id">
-
 				<!-- 轮播图 -->
 				<view class="uni-margin-wrap page_padding_left1" style="padding-left: 0; padding-right: 0;"
 					v-if="item.zone_code=='BANNER' && item.zone_status=='NORMAL'">
@@ -1278,7 +1249,6 @@
 						</swiper-item>
 					</swiper>
 				</view>
-
 				<!-- 宫格 -->
 				<uni-swiper-dot :info="info" :current="current" field="content" mode="default"
 					v-if="item.zone_code=='ICON' && item.zone_status=='NORMAL' && item.zone_code!=indexDate.zones[index-1].zone_code">
@@ -1292,13 +1262,11 @@
 										</view>
 										<text>{{item2.block_title}}</text>
 									</template>
-
 								</view>
 							</view>
 						</swiper-item>
 					</swiper>
 				</uni-swiper-dot>
-
 				<!-- ONEPIC -->
 				<view class="ONEPIC" v-if="item.zone_code=='ONEPIC' && item.zone_status=='NORMAL'">
 				<!-- class="discount page_padding" -->
@@ -1349,9 +1317,6 @@
 						mode="" @click="imgTo(item1)" v-for="(item1,index1) in item.blocks" :key="item1.block_id">
 					</image>
 				</view>
-
-
-
 				<!-- 标题 -->
 				<navigator url="/pages/index/flashSale" v-if="item.zone_code=='SPIKE1' && item.zone_status=='NORMAL'">
 					<view class="index_title page_padding">
@@ -1363,8 +1328,6 @@
 						</view>
 					</view>
 				</navigator>
-
-
 				<!-- SPIKE 1 -->
 				<scroll-view class="spike1 page_padding" scroll-x="true" :show-scrollbar="false"
 					v-if="item.zone_code=='SPIKE1' && item.zone_status=='NORMAL'">
@@ -1378,10 +1341,8 @@
 							<text>US${{item1.promote_price}}</text>
 							<view class="spike1_item_text">US${{item1.shop_price}}</view>
 						</view>
-
 					</view>
 				</scroll-view>
-
 				<!-- 标题 -->
 				<view class="index_title page_padding" v-if="item.zone_code=='TITLE' && item.zone_status=='NORMAL'">
 					<text>{{item.blocks[0].block_title}}</text>
@@ -1389,9 +1350,7 @@
 						<image src="../../static/icon/right_white.png" mode="" @click="Hotgoto(item.blocks)"></image>
 					</view>
 				</view>
-
 				<!-- HOT SELLS 1 -->
-
 				<view class="hotSells1 page_padding"
 					v-if="item.zone_code=='GOODSTWO1' || item.zone_code=='GOODSTHREE1'">
 					<template v-if="item.zone_code=='GOODSTWO1' && item.zone_status=='NORMAL'">
@@ -1415,7 +1374,6 @@
 						</view>
 					</template>
 				</view>
-
 				<!-- 标题 -->
 				<!-- <view class="index_title page_padding">
 				<text>Hot Selle</text>
@@ -1423,8 +1381,6 @@
 					<image src="../../static/img/right.png" mode=""></image>
 				</view>
 			</view> -->
-
-
 				<!-- HOT SELLS 2 -->
 				<scroll-view class="spike1 page_padding" scroll-x="true" @change="handlechange" :show-scrollbar="false"
 					:indicator-dots="true" :circular="true" :interval="3000" :duration="1000"
@@ -1464,7 +1420,6 @@
 						</swiper>
 					</view> -->
 				</scroll-view>
-
 				<!-- 标题 -->
 				<!-- <view class="index_title page_padding">
 				<text>Hot Selle</text>
@@ -1472,7 +1427,6 @@
 					<image src="../../static/img/right.png" mode=""></image>
 				</view>
 				</view> -->
-
 				<!-- HOT SELLS 3 -->
 				<scroll-view class="spike1 page_padding" scroll-x="true" :show-scrollbar="false"
 					v-if="item.zone_code=='HONLIST3' && item.zone_status=='NORMAL'" @scroll="scrollhot">
@@ -1485,7 +1439,6 @@
 							<text>{{item1.block_title}}</text>
 							<view class="spike1_item_text1">{{item1.block_title2}}</view>
 						</view>
-
 					</view>
 				</scroll-view>
 				<!-- HOT SELLS 1 -->
@@ -1502,14 +1455,12 @@
 						<text>{{item1.block_title}}</text>
 						<view class="spike1_item_text1">{{item1.block_title2}}</view>
 					</view> -->
-
 					</view>
 				</scroll-view>
 				<!-- GOODSTHREE 2 -->
 				<!-- <view class="goodsthree2">
 				<view class="goodsthree2_item" v-for="(item,index) in 3"  :key="index"></view>
 			</view> -->
-
 				<!-- 轮播图 -->
 				<!-- <view class="uni-margin-wrap">
 				<swiper class="swiper" circular :indicator-dots="true" :autoplay="true" >
@@ -1524,7 +1475,6 @@
 					</swiper-item>
 				</swiper>
 			</view> -->
-
 				<!-- SPIKE 1 -->
 				<!-- <scroll-view class="spike1 page_padding_left" scroll-x="true" :show-scrollbar="false">
 				<view class="spike1_item" v-for="(item,index) in 8"  :key="index">
@@ -1538,7 +1488,6 @@
 			</view>
 			<!-- 瀑布流标题 -->
 			<!-- <view class="index_title1" v-if="bestlist.length>0">PRODUCTS FRO YOU</view> -->
-
 			<!-- <view class="waterfall" v-if="bestlist.length>0" >
 			<custom-waterfalls-flow :value="bestlist" imageKey="block_pic"@imageClick="imgTo(bestlist)">
 				<template v-slot:default="item2">
@@ -1587,7 +1536,6 @@
 							</view>
 						</view>
 					</view>
-
 				</view>
 			</view>
 			<!-- //购物车 -->
@@ -1619,13 +1567,11 @@
 							</view>
 						</view>
 					</view>
-
 					<view class="quantity">
 						<text>Quantity</text>
 						<uni-number-box background="#FFFFFF" v-model="cartQuery.goods_number" :min="1"></uni-number-box>
 					</view>
 				</scroll-view>
-
 				<button @click="addCart">ADD TO CART</button>
 			</view>
 			<view class="mask" @click="isCart=false" v-show="isCart"></view>
@@ -1633,7 +1579,6 @@
 			<view v-show="popImg">
 				<!-- <button @click="open">打开弹窗</button> -->
 				<uni-popup ref="popup" :mask-click="false">
-
 					<view class="Popup">
 						<view class="popup_close">
 							<image mode=" " @click="close" src="../../static/img/close2.png"></image>
@@ -1647,7 +1592,6 @@
 				</uni-popup>
 			</view>
 		</view>
-
 		<!-- 启动页广告 -->
 		<view class="open_bg" ref="imgRef" v-show="countdownTime2>0?true:false">
 			<!-- <view class="open_text"><text @click="countdownTime2 =0">{{ countdownTime2 }}s skip</text></view> -->
@@ -1661,7 +1605,6 @@
 					<image :src="item.block_pic" mode="" @click="imgTo(item)"></image>
 				</swiper-item>
 			</swiper>
-
 		</view>
 		<view class="bootom_last" v-if="bootom == 1">-THE END-</view>
 		<view class="tarbar">
@@ -1873,7 +1816,6 @@
 		z-index: 99;
 		background: rgba(0, 0, 0, 0.7) !important;
 		// margin-top: -150rpx;
-
 	}
 
 	.isScrollShow3 {
@@ -2016,7 +1958,6 @@
 			// 	height: 0;
 			// 	background-color: #000;
 			// } 
-
 			view {
 				margin-left: 46.67rpx;
 				display: inline-block;
@@ -2085,7 +2026,6 @@
 	.grid_swiper {
 		// height: 380rpx;
 		// margin: 0 10rpx 0 10rpx;
-
 		.grid_content {
 			display: flex;
 			flex-wrap: wrap;
@@ -2127,7 +2067,6 @@
 			// .grid_item:nth-child(n+4){
 			// 	margin-right: 0;
 			// }
-
 		}
 	}
 
@@ -2361,7 +2300,6 @@
 				// margin-top: 24.67rpx;
 				margin-top: 14.67rpx;
 				// margin-bottom: 32.67rpx;
-
 			}
 
 			.title1 {
@@ -2409,7 +2347,6 @@
 		margin: 0 10rpx 0 10rpx;
 		//  width: 80vw;
 		//  height:400rpx ;
-
 		.best_one {
 			width: 45vw;
 			height: 400rpx;
@@ -2444,7 +2381,6 @@
 		background-color: #000;
 		color: white;
 		// padding-bottom: 50rpx;
-
 		.uni-view {}
 
 	}
@@ -2464,7 +2400,6 @@
 		// margin-top: 24.67rpx;
 		color: #fff;
 		// margin-bottom: 10.67rpx;
-
 	}
 
 	.title1 {
@@ -2607,7 +2542,6 @@
 		z-index: 9999999;
 		position: fixed;
 		// padding-top: 50rpx;
-
 		overflow: hidden;
 		background-size: cover;
 		background-repeat: no-repeat;
@@ -2663,9 +2597,8 @@
 	// 	width: 100%;
 	// 	height: 100%;
 	// 	margin: -6px 0;
-
 	// 	image {
 	// 		width: 100%;
 	// 	}
 	// }
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/login/index.vue b/pages/login/index.vue
index b5f76a7..bea51aa 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -18,7 +18,7 @@
 				    <image :src="eye" mode ="" class="see login_see" @click="seePwd"></image>
 				</view>
 				
-				<view class="tips" v-show="loginErr"><image src="../../static/img/att.png" mode=""></image>ooo{{errMsg}}</view>
+				<view class="tips" v-show="loginErr"><image src="../../static/img/att.png" mode=""></image>{{errMsg}}</view>
 				<view class="forgot" @click="forgotPwd">Forgot your Password?</view>
 				<button class="login_submit"  :disabled="isLogin" @click="login()" >SIGN IN</button>
 				<!-- <view class="agreement">
diff --git a/pages/productDetails/index.vue b/pages/productDetails/index.vue
index 3474470..f060596 100644
--- a/pages/productDetails/index.vue
+++ b/pages/productDetails/index.vue
@@ -36,8 +36,8 @@
 							</video></view>
 					</swiper-item> -->
 					<swiper-item :touchable="true" v-if="goodsDate.goods_video">
-						<view class="swiper-item uni-bg-black"
-							:style="{ background: 'url(' + goodsDate.gallery_list[0].img_url + ')' }">
+						<view class="swiper-item uni-bg-black" 
+							:style="{ background: 'url(' + goodsDate.gallery_list[0].img_url + ')'}">
 							<video v-if="video" :autoplay="true" :enable-progress-gesture="true"
 								:mobilenet-hint-type="1" class="video_play" :http-cache="true" @pause="VideoPuse()"
 								object-fit="contain" :direction="0" :src=" goodsDate.goods_video" :show-mute-btn="true"
@@ -1881,7 +1881,9 @@
 
 			.uni-bg-black {
 				background-color: #000000;
-
+				background-repeat: no-repeat !important;
+				height: 100%;
+				background-size: cover !important;
 			}
 		}
 	}
diff --git a/pages/specialTitle/index.vue b/pages/specialTitle/index.vue
index ac43872..323b7fa 100644
--- a/pages/specialTitle/index.vue
+++ b/pages/specialTitle/index.vue
@@ -8,10 +8,12 @@
 		color="#fff" :title="title" :fixed="true" :border="false" :top="100 +rpx"/> -->
 		<view v-for="(item,index) in list " :key="item.zone_id">
 			<view v-for="(item1,index1) in item.blocks " :key="item1.block_pic">
-				<view class="ONEPIC" v-if="item.zone_code=='ONEPIC' && item.zone_status=='NORMAL'"
+				<view style="position: relative;" class="ONEPIC" v-if="item.zone_code=='ONEPIC' && item.zone_status=='NORMAL'"
 					:style="{height:(item.zone_code=='ONEPIC')?item.zone_column+'rpx':''}">
 					<!-- class="discount page_padding" -->
-					<image :src="item1.block_pic" mode="" @click="imgTo(item1)"></image>
+					<image :src="item1.block_pic" mode="" @click="imgTo(item1)">
+						<a style="display: block;width: 100%;height: 100%;top: 0;position: absolute;" :href="item1.block_link"></a>
+					</image>
 				</view>
 			</view>
 			<!-- TWOPIC -->
@@ -77,7 +79,6 @@
 		},
 		methods: {
 			getpage() {
-
 				let imglist
 				defaultRequest(this.data).then(res => {
 					if (res.error == 0) {
@@ -97,14 +98,14 @@
 				})
 			},
 			imgTo(item) {
-				console.log(item, 'item')
-				//console.log(item.block_link.includes('dope.youhui'))
+				console.log(item, 'item数据？')
+				// console.log(item.block_link)
+				// console.log(item.block_link.includes('dope.youhui'))
 				let goodid
-
 				if (item.goodid) {
-
 					uni.navigateTo({
-						url: '../productDetails/index?goodid=' + item.goodid
+						// url: '../productDetails/index?goodid=' + item.goodid
+						url: './paypalWebview?src' + item.goodid
 					})
 				} else if (item.block_link) {
 					const i = item.block_link.indexOf('?')