修复样式&修复tab图片

3 years ago · 45e66b15f7
11 changed files with 160 additions and 132 deletions
--- a/main.js
+++ b/main.js
@ -4,9 +4,9 @@ import ios from '@/ios/index.js'
 // #ifndef VUE3
 import Vue from 'vue'

-Vue.prototype.$onLaunched = new Promise(resolve => {
-    Vue.prototype.$isResolve = resolve
-})
+// Vue.prototype.$onLaunched = new Promise(resolve => {
+//     Vue.prototype.$isResolve = resolve
+// })
 Vue.config.productionTip = false
 App.mpType = 'app'
 const app = new Vue({
--- a/pages.json
+++ b/pages.json
@ -382,7 +382,10 @@
 			"optimization": {
 			    "subPackages": true
 			},
-			
+			"pullToRefresh": {
+				"style": "circle",
+				"color": "#630102"
+			},
 			"runmode" : "liberate" // 开启分包优化后，必须配置资源释放模式
 		}
 	},
--- a/pages/account/index.vue
+++ b/pages/account/index.vue
@ -695,8 +695,8 @@
 					border-top-left-radius: 10rpx !important;
 					border-top-right-radius: 10rpx !important;
 					// border-bottom: #fafafa 1rpx solid !important;
-					background-color: #999999;
-
+					// background-color: #999999;
+					background-color: transparent;
 					image {
 						width: 100%;
 						height: 100%;
--- a/pages/account/message.vue
+++ b/pages/account/message.vue
@ -5,18 +5,18 @@
 			<uni-icons
 				style="z-index: 1111;position: relative; padding-left: 11px;color: white;font-weight: 100;cursor: pointer;"
 				type="back" size="23" @click="backs"></uni-icons>
-			<text style="margin-left: 30%;color: white;">Message</text>
+			<text style="margin-left: 36%;color: white;">Message</text>
 		</view>

 		<view class="empty_item" v-if="app_Mes.length == 0">
 			<view class="empty_item_img">
 				<image src="../../static/img/message.png" mode=""></image>
 			</view>
-			<view>No comment!</view>
+			<!-- <view>No comment!</view> -->
 			<!-- <view><button @click="gotoindex()">Go to see</button></view> -->
 		</view>
 		<view class="mask" v-show="isShwo" @click="isShwo=false"></view>
-		<button class="body-btn" @click="shop()">Continue shopping</button>
+		<button class="body-btn" style="z-index: 10; position: relative;" @click="shop()">Continue shopping</button>

 		<view>
 			<!-- <uni-nav-bar  left-icon="left" :statusBar="true"  title="Message" 
@ -213,8 +213,8 @@
 				})
 			},
 			shop() {
-				uni.navigateTo({
-					url: '../shippingCart/index'
+				uni.navigateBack({
+					delta: 1,
 				})
 			}
 		},
--- a/pages/category/productList.vue
+++ b/pages/category/productList.vue
@ -1170,4 +1170,7 @@
 		line-height: 200rpx;
 		text-align: center;
 	}
+	/deep/ .uni-nav-bar-text {
+		padding-left: 10%;
+	}
 </style>
--- a/pages/index/address.vue
+++ b/pages/index/address.vue
@ -12,7 +12,7 @@
 				<radio class="Radio"v-model="item2.name" :checked="current==item2.name"@click="Active(item2,index2)"></radio>
 			</view> -->
 			<view class="address1"></view>
-			<view style="padding-top: 5px;">
+			<view style="padding-top: 10px;">
 				<view v-for ="(item,index) in list " :key="index" >
 					<text class="color_red">{{ item.title}}</text>
 					<view class="address" v-for="(item1,index1) in item.sur_name" :key="item1.name" >
@ -153,7 +153,7 @@ async onLoad() {
 		width: 100%;
 		z-index: 999;
 		height: 42px;
-		padding-top: 20px;
+		padding-top: 25px;
 		text-align: center;
 		top:0;
 		left: 0;
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@ -204,19 +204,15 @@
 		// },

 		onLoad() {
-			let that = this; // 作用域
+			let that = this; 
 			let s = 0;
-			// 定时轮询网络 （IOS网络判断）
 			let time = setInterval(() => {
-				console.log('6666')
 				uni.getNetworkType({
 					success: (res) => {
 						console.log(res.networkType, s);
 						if (res.networkType !== 'none') {
 							that.typee = 2;
 							clearInterval(time);
-							console.log('清除网络..')
-							console.log('轮询结束...');
 							let home = 'HOME'
 							this.getIndex(home)
 							this.isLogin = uni.getStorageSync('isLogin')
@ -242,7 +238,6 @@
 				})
 				s++;
 			}, 5000);
-			// 轮询时间
 		},

 		mounted() {
@ -537,7 +532,7 @@
 						let height = 0
 						this.indexDate.zones.map(item => {
 							item.blocks.map(item1 => {
-								console.log(item.zone_code, item + '11111111111111')
+								// console.log(item.zone_code, item + '11111111111111')
 								uni.getImageInfo({
 									src: item1.block_pic,
 									success: (image) => {
@ -635,8 +630,7 @@
 					let url
 					if (res.error == 0) {
 						if (res.data.page_code == 'HOMESALEICON') {
-							let src =
-								'https://www.dopeplus.com/images/mapp_customized/202210/1665653173499940520.png'
+							let src = 'https://www.dopeplus.com/images/mapp_customized/202211/1667961215280331818.png'
 							if (src == res.data.zones[0].blocks[0].block_pic) {
 								this.tarbar[2].src = '../../static/img/min.png'
 							} else {
@ -1305,15 +1299,9 @@
 					</swiper>
 				</uni-swiper-dot>

-				<!-- BANNER1 测试 -->
-				<!-- class="discount page_padding" -->
-				<!-- <view class="BANNER1" v-if="item.zone_code=='BANNER1' && item.zone_status=='NORMAL'">
-					<image :src="item.blocks[0].block_pic"
-						:style="{height:(item.zone_code=='BANNER1')?item.zone_column+'rpx':''}" mode=""
-						@click="imgTo(item.blocks[0])"></image>
-				</view> -->
 				<!-- ONEPIC -->
 				<view class="ONEPIC" v-if="item.zone_code=='ONEPIC' && item.zone_status=='NORMAL'">
+				<!-- class="discount page_padding" -->
 					<image :src="item.blocks[0].block_pic"
 						:style="{height:(item.zone_code=='ONEPIC')?item.zone_column+'rpx':''}" mode=""
 						@click="imgTo(item.blocks[0])"></image>
--- a/pages/productDetails/index.vue
+++ b/pages/productDetails/index.vue
@ -1376,7 +1376,8 @@

 		.select_size_item2 {
 			background-color: #1b1b1b;
-			width: 97.67rpx;
+			// width: 97.67rpx;
+			width: auto;
 			height: 37.67rpx;
 			display: flex;
 			background-size: 100% !important;
@ -1495,7 +1496,8 @@
 					background-color: #F9F7FA;
 					border-radius: 6.67rpx;
 					margin-right: 12.67rpx;
-					width: 134.67rpx;
+					width: auto;
+					// width: 134.67rpx;

 					image {
 						width: 134.67rpx;
@ -1522,7 +1524,8 @@
 					}

 					.color_select_item_bottom {
-						padding: 10rpx 0rpx;
+						padding: 10rpx 4rpx;
+						// padding: 10rpx 0rpx;
 						font-size: 24rpx;
 						text-align: center;

--- a/pages/shippingCart/index.vue
+++ b/pages/shippingCart/index.vue
@ -41,10 +41,10 @@
 							@click="cartCheck(1,0,gitem.rec_id,gitem)"></image>
 						<image src="../../static/img/select2.png" mode="" class="cart_select" v-show="gitem.is_check==0"
 							@click="cartCheck(1,1,gitem.rec_id,gitem)"></image>
-						<view class="good_info_left ">
+						<view class="good_info_left " style="background-color: transparent !important;">
 							<!-- 左侧图片 -->
-							<view class="good_info_image" @click="goDetails(gitem.goods_id)">
-								<image :src="gitem.goods_thumb" mode=""></image>
+							<view class="good_info_image" style="background-color: transparent !important;"  @click="goDetails(gitem.goods_id)">
+								<image :src="gitem.goods_thumb" style="border-radius: 5px;" mode=""></image>
 							</view>
 							<view class="left_info">
 								<view class="info_name" style="margin-top: 10px;">{{gitem.goods_name}}</view>
@ -1234,6 +1234,9 @@
 		background-color: #fff !important;
 		// padding: 0 20rpx;
 	}
+	.recommend_content_item_image {
+		background-color: transparent !important;
+	}
 	.recommend_content_item_image_name{
 		color:#333 !important;
 		height:60rpx;
@ -1847,6 +1850,6 @@
 			}
 	}
 	/deep/ .uni-nav-bar-text {
-		padding-left: 16%;
+		padding-left: 10%;
 	}
 </style>
--- a/pages/specialTitle/index.vue
+++ b/pages/specialTitle/index.vue
@ -6,48 +6,67 @@
 		</view>
 		<!-- <uni-nav-bar left-icon="left" @clickLeft="back()" backgroundColor="#000"  
 		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'" :style="{height:(item.zone_code=='ONEPIC')?item.zone_column+'rpx':''}">
-			<!-- class="discount page_padding" -->
-			<image :src="item1.block_pic" mode="" @click="imgTo(item1)" ></image>
+		<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'"
+					:style="{height:(item.zone_code=='ONEPIC')?item.zone_column+'rpx':''}">
+					<!-- class="discount page_padding" -->
+					<image :src="item1.block_pic" mode="" @click="imgTo(item1)"></image>
+				</view>
+			</view>
+			<!-- TWOPIC -->
+			<view class="TWOPIC"
+				:style="{height:(item.zone_code=='TWOPIC'&& item.zone_status=='NORMAL')?item.zone_column+'rpx':''}"
+				v-if="item.zone_code=='TWOPIC' && item.zone_status=='NORMAL'">
+				<image :src="item1.block_pic" @click="imgTo(item1)" mode="" v-for="(item1,index1) in item.blocks"
+					:key="item1.block_id"></image>
+			</view>
+			<!-- THREEPIC -->
+			<view class="THREEPIC"
+				:style="{height:(item.zone_code=='THREEPIC'&& item.zone_status=='NORMAL')?item.zone_column+'rpx':''}"
+				v-if="item.zone_code=='THREEPIC' && item.zone_status=='NORMAL'">
+				<image :src="item1.block_pic" @click="imgTo(item1)" mode="" v-for="(item1,index1) in item.blocks"
+					:key="item1.block_id"></image>
+			</view>
+			<!-- FOURPIC -->
+			<view class="FOURPIC"
+				:style="{height:(item.zone_code=='FOURPIC'&& item.zone_status=='NORMAL')?item.zone_column+'rpx':''}"
+				v-if="item.zone_code=='FOURPIC' && item.zone_status=='NORMAL'">
+				<image :src="item1.block_pic" mode="" @click="imgTo(item1)" v-for="(item1,index1) in item.blocks"
+					:key="item1.block_id"></image>
+			</view>
+			<!-- FIVEPIC -->
+			<view class="FIVEPIC"
+				:style="{height:(item.zone_code=='FIVEPIC'&& item.zone_status=='NORMAL')?item.zone_column+'rpx':''}"
+				v-if="item.zone_code=='FIVEPIC' && item.zone_status=='NORMAL'">
+				<image :src="item1.block_pic" mode="" @click="imgTo(item1)" v-for="(item1,index1) in item.blocks"
+					:key="item1.block_id"></image>
+			</view>
+			<!-- SIXPIC -->
+			<view class="SIXPIC"
+				:style="{height:(item.zone_code=='SIXPIC'&& item.zone_status=='NORMAL')?item.zone_column+'rpx':''}"
+				v-if="item.zone_code=='SIXPIC' && item.zone_status=='NORMAL'">
+				<image :src="item1.block_pic" mode="" @click="imgTo(item1)" v-for="(item1,index1) in item.blocks"
+					:key="item1.block_id"></image>
+			</view>
 		</view>
-		</view>
-		<!-- TWOPIC -->
-		<view class="TWOPIC" :style="{height:(item.zone_code=='TWOPIC'&& item.zone_status=='NORMAL')?item.zone_column+'rpx':''}" v-if="item.zone_code=='TWOPIC' && item.zone_status=='NORMAL'">
-			<image :src="item1.block_pic" @click="imgTo(item1)"mode="" v-for="(item1,index1) in item.blocks" :key="item1.block_id"></image>
-		</view>
-		<!-- THREEPIC -->
-		<view class="THREEPIC":style="{height:(item.zone_code=='THREEPIC'&& item.zone_status=='NORMAL')?item.zone_column+'rpx':''}"   v-if="item.zone_code=='THREEPIC' && item.zone_status=='NORMAL'">
-			<image :src="item1.block_pic"  @click="imgTo(item1)" mode="" v-for="(item1,index1) in item.blocks" :key="item1.block_id"></image>
-		</view>
-		<!-- FOURPIC -->
-		<view class="FOURPIC":style="{height:(item.zone_code=='FOURPIC'&& item.zone_status=='NORMAL')?item.zone_column+'rpx':''}"  v-if="item.zone_code=='FOURPIC' && item.zone_status=='NORMAL'">
-			<image :src="item1.block_pic" mode=""  @click="imgTo(item1)" v-for="(item1,index1) in item.blocks" :key="item1.block_id"></image>
-		</view>
-		<!-- FIVEPIC -->
-		<view class="FIVEPIC" :style="{height:(item.zone_code=='FIVEPIC'&& item.zone_status=='NORMAL')?item.zone_column+'rpx':''}"  v-if="item.zone_code=='FIVEPIC' && item.zone_status=='NORMAL'">
-			<image :src="item1.block_pic" mode=""  @click="imgTo(item1)" v-for="(item1,index1) in item.blocks" :key="item1.block_id"></image>
-		</view>
-		<!-- SIXPIC -->
-		<view class="SIXPIC":style="{height:(item.zone_code=='SIXPIC'&& item.zone_status=='NORMAL')?item.zone_column+'rpx':''}" v-if="item.zone_code=='SIXPIC' && item.zone_status=='NORMAL'">
-			<image :src="item1.block_pic" mode="" @click="imgTo(item1)" v-for="(item1,index1) in item.blocks" :key="item1.block_id"></image>
-		</view>
-	</view>
 	</view>
 	<!-- </view> -->
 </template>
 <script>
-	import {defaultRequest,defaultRequest4} from '../../api/index.js'
+	import {
+		defaultRequest,
+		defaultRequest4
+	} from '../../api/index.js'
 	export default {
 		data() {
 			return {
-				list:[],
+				list: [],
 				data: {
-					_action:'getpagedata',
-					pagecode:''
+					_action: 'getpagedata',
+					pagecode: ''
 				},
-				title:''
+				title: ''
 			}
 		},
 		onLoad(e) {
@ -57,138 +76,147 @@
 			this.getpage()
 		},
 		methods: {
-			getpage(){
-			
-				let imglist 
-				defaultRequest(this.data).then( res =>{
-					if(res.error ==0){
-						
-						console.log(res,'数据')
-						 this.list= res.data.zones
+			getpage() {
+
+				let imglist
+				defaultRequest(this.data).then(res => {
+					if (res.error == 0) {
+
+						console.log(res, '数据')
+						this.list = res.data.zones
 						console.log(this.list)
-						this.list.map( item =>{
-								console.log(item,item.zone_code,item.blocks.length)
+						this.list.map(item => {
+							console.log(item, item.zone_code, item.blocks.length)
 						})
 					}
 				})
 			},
-			back(){
+			back() {
 				uni.navigateBack({
-					delta:1
+					delta: 1
 				})
 			},
-			imgTo(item){
-				console.log(item,'item')
+			imgTo(item) {
+				console.log(item, 'item')
 				//console.log(item.block_link.includes('dope.youhui'))
-				let goodid 
-				
-				if(item.goodid){
-					
+				let goodid
+
+				if (item.goodid) {
+
 					uni.navigateTo({
-						url:'../productDetails/index?goodid='+item.goodid
+						url: '../productDetails/index?goodid=' + item.goodid
 					})
-				}
-				else if(item.block_link){
+				} else if (item.block_link) {
 					const i = item.block_link.indexOf('?')
-					 goodid = item.block_link.substring(i);
+					goodid = item.block_link.substring(i);
 					////console.log(item.block_link)
-					if(item.block_link.includes('goodslist')){
+					if (item.block_link.includes('goodslist')) {
 						uni.navigateTo({
-							url:'../category/productList'+ goodid+'&tag=1'
+							url: '../category/productList' + goodid + '&tag=1'
 						})
-					}
-					else if(item.block_link.includes('goodid')){
+					} else if (item.block_link.includes('goodid')) {
 						uni.navigateTo({
-							url:'../productDetails/index'+goodid+'&img=1'
+							url: '../productDetails/index' + goodid + '&img=1'
 						})
-					}
-					else if(item.block_link.includes('dope.youhui')){
+					} else if (item.block_link.includes('dope.youhui')) {
 						uni.navigateTo({
-							url:'./pickUpCentre'
+							url: './pickUpCentre'
 						})
-					}else if(item.block_link.includes('dope.adspecial')){
+					} else if (item.block_link.includes('dope.adspecial')) {
 						uni.navigateTo({
-							url:'../specialTitle/index2'+goodid
+							url: '../specialTitle/index2' + goodid
 						})
 					}
 				}
-				 
+
 			},
 		}
 	}
 </script>

 <style lang="scss" scoped>
-	page{
+	page {
 		background-color: #000;
 		height: 100vh;
 		// margin: 20rpx;
 	}
-.ONEPIC{
-		  width: 100%;
-		  height: 100%;
-		   margin: -12rpx 0;
-		   z-index:1;
-		image{
-			 height: 100%;
-			 width: 100%;
+
+	.ONEPIC {
+		width: 100%;
+		height: 100%;
+		margin: -12rpx 0;
+		z-index: 1;
+
+		image {
+			height: 100%;
+			width: 100%;
 		}
-		&:nth-last-child(){
+
+		&:nth-last-child() {
 			margin-bottom: 10rpx;
 		}
 	}
-	.TWOPIC{
-		 width: 100%;
+
+	.TWOPIC {
+		width: 100%;
 		display: flex;
-		
-		image{
+
+		image {
 			width: 100%;
 			height: 100%;
 		}
 	}
-	.THREEPIC{
+
+	.THREEPIC {
 		width: 100%;
 		display: flex;
 		justify-content: space-between;
-		image{
+
+		image {
 			width: 100%;
 			height: 100%;
-			
+
 		}
-		
+
 	}
-	.FOURPIC{
-		 width: 100%;
+
+	.FOURPIC {
+		width: 100%;
 		display: flex;
 		justify-content: space-between;
-		image{
+
+		image {
 			width: 100%;
 			height: 100%;
 		}
 	}
-	.FIVEPIC{
+
+	.FIVEPIC {
 		width: 100%;
 		display: flex;
 		justify-content: space-between;
-		image{
+
+		image {
 			width: 100%;
 			height: 100%;
 		}
 	}
-	.SIXPIC{
+
+	.SIXPIC {
 		width: 100%;
 		display: flex;
 		justify-content: space-between;
-		image{
+
+		image {
 			width: 100%;
 			height: 100%;
 		}
 	}
-.body{
-	 padding-top: 150rpx;
-	  height: 100vh;
-	 background-color: #000;
-		
-		
+
+	.body {
+		padding-top: 150rpx;
+		height: auto;
+		// height: 100vh;
+		background-color: #000;
 	}
 </style>
--- a/static/img/min.png
+++ b/static/img/min.png