bug修改

pages/index/index.vue

@@ -329,10 +329,10 @@
 			</view>
 			
 			<!-- 热门活动 -->
-			<view class="qiehuanBox" v-if="openMActivity&&tabType==3">
+			<view class="" v-if="openMActivity&&tabType==3">
 				<view v-if="openMActivity.openCollectingList">
 			
-				<view class="Hot" v-if="openMActivity.openCollectingList.length>0">
+				<view class="Hot qiehuanBox" v-if="openMActivity.openCollectingList.length>0">
 					<!-- <view class="hotTop">
 						<view class="hotLeft">
 							<view class="hotSx" :style="{background:'#'+themeColor}"></view>

pages/index/paintShopList.vue

@@ -45,7 +45,11 @@
 		<!-- 上拉 加载更多 -->
 		<view class="noMore" v-if="noMoreShow && (queryShopList.length!=0)">没有更多数据</view>
 		<!-- 无数据空白页 -->
-		<nodata v-if="queryShopList.length==0"></nodata>
+		<!-- <nodata v-show="queryShopList.length==0&&loading"></nodata> -->
+		<view  class="nodataBox" v-if="queryShopList.length==0&&loading">
+			<image src="http://dmsphoto.66km.com.cn/thFiles/3C95A4C5-73F8-4B34-902B-703B8A0825C9.png" mode="widthFix" class="nodataImg"></image>
+			<view class="noTxt">暂无数据</view>
+		</view>
         <uni-popup ref="popup" type="right" :mask-click="true">
         	<view class="popup-content">
         		<scroll-view class="brandList" scroll-y="true">
@@ -90,6 +94,7 @@
 		},
 
 		onLoad(opt) {
+			console.log("onLoad")
 			var that = this;
 			uni.removeStorageSync('selectCity');
 			uni.authorize({
@@ -118,10 +123,12 @@
 			//this.getqueryShopList() //获取全部门店列表
 		},
 		onShow() {
+			console.log("onShow")
 			const selectCity = uni.getStorageSync('selectCity');
 			//console.log("onShow")
 			//console.log(selectCity)
 			if(selectCity){
+				this.loading=false
 				this.cityName=selectCity.city
 				this.cityCode=selectCity.code
 				this.areaName='区域'
@@ -156,12 +163,14 @@
 				uni.showLoading({
 					title: '加载中'
 				})
+				this.loading=false
 				this.$http('openSheetMetalSprayPaint/queryBpshopList', {
                       city:this.cityCode,
                       area:this.area,
 					  lat: this.location.lat ? this.location.lat : '',
 					  lng: this.location.lng ? this.location.lng : '',
 				}, 'GET').then(res => {
+					this.loading=true
 					uni.hideLoading();
 					this.queryShopList = res.data
 					//console.log('list+=', this.queryShopList);
@@ -323,12 +332,14 @@
 
 	.brandsBg {
 		display: flex;
-        height: 38rpx;
-		flex-wrap: wrap;
 		align-items: center;
+		padding: 10rpx 0rpx;
+		flex-wrap: wrap;
+		    height: 34rpx;
+		/* 隐藏文字显示 ...不换行 */
 		overflow: hidden;
-		padding: 5rpx 0rpx;
-
+		text-overflow: ellipsis;
+		white-space: nowrap;
 	}
 
 	.brands {
@@ -351,6 +362,7 @@
 	.shopTime {
 		color: #666666;
 		font-size: 26rpx;
+		padding-top: 4rpx;
 	}
 
 	.addressBox {
@@ -394,9 +406,10 @@
 	}
 
 	.shopName {
-		font-size: 26rpx;
-		color: #333333;
-		line-height: 37rpx;
+		font-size: 32rpx;
+		font-weight: bold;
+		color: #222222;
+		line-height: 40rpx;
 		width: 450rpx;
 		white-space: nowrap;
 		overflow: hidden;

pages/index/shopList.vue

@@ -202,6 +202,7 @@
 			//console.log("onShow")
 			//console.log(selectCity)
 			if(selectCity){
+				this.loading=false
 				this.cityName=selectCity.city
 				this.cityCode=selectCity.code
 				this.areaName='区域'

pages/integral/integralgoodsDetail.vue

@@ -78,13 +78,47 @@
 						<view class="numJj" @click="calculation(2)">+</view>
 					</view>
 				</view>
-				<view class="buySHop" @click="ckShop" style="border-bottom: 1px solid #EEEEEE;">
+				<!-- <view class="buySHop" @click="ckShop" style="border-bottom: 1px solid #EEEEEE;">
 					<view>服务门店</view>
 					<view class="buyShopRight" >
 						<view v-if="shopInfo.shopId">{{shopInfo.shopName}}</view>
 						<view v-else>请选择</view>
 						<image src="../../static/timg/icon_arrow_right.png" mode="" class="buyShopRightJt"></image>
 					</view>
+				</view> -->
+				<view class="buySHop" @click="ckShop">
+					<view>服务门店</view>
+					<view class="buyShopRight" >
+						<view v-if="shopInfo.shopId">切换门店</view><!-- {{shopInfo.shopName}} -->
+						<view v-else>请选择</view>
+						<image src="../../static/timg/icon_arrow_right.png" mode="" class="buyShopRightJt"></image>
+					</view>
+				</view>
+				<view class="buyShopBox" v-if="shopInfo.shopId">
+					<view class="buyShop">
+								<view class="buyShopTop">
+									<view class="buyShopTleft">
+										<!-- <view class="shopbq">距离最近</view> -->
+										<view class="buyshopName">{{shopInfo.shopName}}</view>
+									</view>
+									<view class="buyShopTRgiht">
+									
+										<image src="/static/timg/icon_checked@2x.png" mode="" class="duihao"></image>
+									</view>
+								</view>
+								<view class="buyShopCont">
+									<image :src="shopInfo.doorImg1" v-if="shopInfo.doorImg1" mode="" class="buyShopContImg"></image>
+									<image :src="shopInfo.doorImg2" v-else-if="shopInfo.doorImg2" mode="" class="buyShopContImg"></image>
+									<image src="/static/timg/noimg.png" v-else class="buyShopContImg"></image>
+									<view class="buyShopContAdress">
+										<span v-if="shopInfo.provinceName">{{shopInfo.provinceName}}</span> 
+										<span v-if="shopInfo.cityName">{{shopInfo.cityName}}</span> 
+										<span v-if="shopInfo.areaName">{{shopInfo.areaName}}</span> 
+									    <span v-if="shopInfo.address">{{shopInfo.address}}</span> 
+									</view>
+									<view class="buyShopJl" v-if="shopInfo.distance&&shopInfo.distance!= '0.00'">{{shopInfo.distance}}km</view>
+								</view>
+							</view>
 				</view>
 				<view class="buySHop" v-if="info.oneCount&&info.dayCount">
 					<view>兑换限制</view>
@@ -1092,6 +1126,77 @@ button{
 		margin-top: 62rpx;
 		margin-left:71rpx;
 	}
+.buySHop{
+	display: flex;
+	justify-content: space-between;
+	font-size:28rpx ;
+	color: #666666;
+	padding-top: 30rpx;
+}
+.buyShopBox{
+		/* padding: 0 24rpx; */
+		/* padding-top: 20rpx; */
+	}
+	.nobuyShopBox{
+		height: 220rpx;
+	}
+	.duihao{
+		width: 28rpx;height: 28rpx;
+	}
+	.buyShopTRgiht{
+		    display: flex;
+		    align-items: center;
+	}
+	.buyShop{
+		background: #F9F9F9;
+		border-radius:6rpx;
+		overflow: hidden;
+	}
+	.buyShopTop{
+		display: flex;justify-content: space-between;
+		padding: 16rpx 22rpx;
+		background: #F9EFF0;
+	}
+	.shopbq{
+		color: #FF063A;font-size: 22rpx;
+		border-radius: 6rpx;
+		border: 1rpx solid #FF063A;
+		padding: 0rpx 6rpx;
+		height: 30rpx;line-height: 30rpx;
+	    margin-top: 4rpx;
+	}
+	.buyShopTleft{
+		display: flex;
+	}
+	.buyshopName{
+		font-size: 26rpx;
+		color: #222222;
+		line-height: 37rpx;
+		/* padding-left: 8rpx; */
+	}
+	.buyShopCont{
+		display: flex;
+		padding: 22rpx;
+	}
+	.buyShopContImg{
+		width: 102rpx;
+		height: 102rpx;
+		border-radius: 6rpx;
+	}
+	.buyShopContAdress{
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #666E80;
+		line-height: 34rpx;
+		width: 440rpx;
+		padding-left: 12rpx;
+	}
+	.buyShopJl{
+		font-size: 22rpx;
+		color: #666E80;	line-height: 34rpx;
+		    width: 110rpx;
+		    text-align: right;
+	}
 </style>
 <!-- 
 

pages/shop/ckshopList.vue

@@ -46,7 +46,11 @@
 		<!-- 上拉 加载更多 -->
 		<view class="noMore" v-if="noMoreShow && (queryShopList.length!=0)">没有更多数据</view>
 		<!-- 无数据空白页 -->
-		<nodata v-if="queryShopList.length==0&&loading"></nodata>
+		<!-- <nodata v-if="queryShopList.length==0&&loading"></nodata> -->
+		<view  class="nodataBox" v-if="queryShopList.length==0&&loading">
+			<image src="http://dmsphoto.66km.com.cn/thFiles/3C95A4C5-73F8-4B34-902B-703B8A0825C9.png" mode="widthFix" class="nodataImg"></image>
+			<view class="noTxt">暂无数据</view>
+		</view>
         <uni-popup ref="popup" type="right" :mask-click="true">
         	<view class="popup-content">
         		<scroll-view class="brandList" scroll-y="true">
@@ -134,6 +138,7 @@
 				this.cityCode=selectCity.code
 				this.areaName='区域'
 				this.area=''
+				this.loading=false
 				this.getAreaList()
 				this.getqueryShopList() //获取门店列表
 			}
@@ -402,12 +407,14 @@
 
 	.brandsBg {
 		display: flex;
-        height: 38rpx;
-		flex-wrap: wrap;
 		align-items: center;
+		padding: 10rpx 0rpx;
+		flex-wrap: wrap;
+		    height: 34rpx;
+		/* 隐藏文字显示 ...不换行 */
 		overflow: hidden;
-		padding: 5rpx 0rpx;
-
+		text-overflow: ellipsis;
+		white-space: nowrap;
 	}
 
 	.brands {
@@ -430,6 +437,7 @@
 	.shopTime {
 		color: #666666;
 		font-size: 26rpx;
+		padding-top: 4rpx;
 	}
 
 	.addressBox {
@@ -473,9 +481,7 @@
 	}
 
 	.shopName {
-		font-size: 26rpx;
-		color: #333333;
-		line-height: 37rpx;
+		
 		width: 450rpx;
 		white-space: nowrap;
 		overflow: hidden;

pages/shop/goodsDetail.vue

@@ -233,7 +233,12 @@
 								<image :src="shopInfo.doorImg1" v-if="shopInfo.doorImg1" mode="" class="buyShopContImg"></image>
 								<image :src="shopInfo.doorImg2" v-else-if="shopInfo.doorImg2" mode="" class="buyShopContImg"></image>
 								<image src="/static/timg/noimg.png" v-else class="buyShopContImg"></image>
-								<view class="buyShopContAdress">{{shopInfo.provinceName}}{{shopInfo.cityName}}{{shopInfo.areaName}}{{shopInfo.address}}</view>
+								<view class="buyShopContAdress">
+									<span v-if="shopInfo.provinceName">{{shopInfo.provinceName}}</span> 
+									<span v-if="shopInfo.cityName">{{shopInfo.cityName}}</span> 
+									<span v-if="shopInfo.areaName">{{shopInfo.areaName}}</span> 
+								    <span v-if="shopInfo.address">{{shopInfo.address}}</span> 
+								</view>
 								<view class="buyShopJl" v-if="shopInfo.distance&&shopInfo.distance!= '0.00'">{{shopInfo.distance}}km</view>
 							</view>
 						</view>