1

pages/index/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<view class="top" :style="{background:'#'+themeColor}">
+		 <view class="top" :style="{background:'#'+themeColor}">
 			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
 			<view class="logoBox">
 				<image src="../../static/img2/indexlogo.png" mode="" class="logoImg"></image>
@@ -42,10 +42,10 @@
 
 		</view>
 		<view class="contBox">
-			<!-- 中间应用模块 -->
+		<!-- 	 中间应用模块 -->
 			<view class="modular">
 				<view class="modularLine">
-					<view class="modularMk">
+					<view class="modularMk" @click="goShopList">
 						<view class="modularLogoBox">
 							<image src="../../static/img2/icon_1.png" mode="" class="modularLogo"></image>
 						</view>
@@ -99,7 +99,7 @@
 			</view>
 			<!-- 中间应用模块 -->
 		</view>
-		
+		 
 		
 		<view style="height: 60rpx;"></view>
 		<!-- 手机号授权 -->
@@ -134,6 +134,8 @@
 		 	</view>
 		 </view>
 		 
+ 
+		 
 	</view>
 </template>
 
@@ -350,6 +352,11 @@
 					})
 				}
 			},
+			goShopList(){
+				uni.navigateTo({
+					url:'shopList'
+				})
+			},
 			goShop(){
 				
 				uni.switchTab({
@@ -1189,7 +1196,7 @@
 	font-size: 28rpx;
 	color: #222222;line-height: 40rpx;
 }
-.contBox{x`
+.contBox{
 	padding: 20rpx;
 	margin-top: -200rpx;
 }

pages/index/shopList.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="box">
-		<view class="sstop">
+		<!-- <view class="sstop">
 			<image src="../../static/timg/icon_search@2x.png" mode="" class="sstopimg"></image>
 			<input type="text" v-model="shopName" placeholder="请输入门店名称、门店地址" class="sstopInput" @confirm="getqueryShopList2">
 			<image src="../../static/img/icon_close.png" mode="" @click="empty" v-if="inputChShow" class="inputCh"></image>
@@ -12,17 +12,33 @@
 			</view>
 			<view class="regionSx"></view>
 			<view class="regionLine" @click="quCilck">
-				<!-- <picker @change="bindPickerChange" :value="index" :range="areaList" range-key='area' @cancel="cancelHandling">
-					
-				</picker> -->
+				
 				<view class="regionTxt">{{areaName}}</view>
 				<image src="../../static/timg/icon_arrow_def@2x.png" mode="" class="jtbelow"></image>
 			</view>
+		</view> -->
+		<view class="newTop">
+			<view class="newTopSSbox">
+				<view class="newTopSSLeft">
+					<view class="newregionTxt">{{cityName}}</view>
+					<image src="../../static/img2/xia.png" mode="" class="newTopXia"></image>
+				</view>
+				<view class="newTopSSRight">
+					<image class="newSImg" src="../../static/timg/icon_search@2x.png" mode=""></image>
+					<input type="text" v-model="shopName" placeholder="门店名称、地址" class="sstopInput" @confirm="getqueryShopList2">
+				</view>
+				
+			</view>
 		</view>
 		
 		
-		<view style="height: 210rpx;"></view>
+		<view style="height: 135rpx;"></view>
 		<view class="shopline" v-for="(item,index) in queryShopList" @click="goDetail(item)">
+			<view class="newdistance" v-if="item.distance&&item.distance!= '0.00'">
+				 <image src="../../static/img2/dh.png" mode="" class="dhImg"></image>
+				<view><span >{{item.distance}}km</span></view>
+			</view>
+				
 			<view class="shoplineLeft">
 				<image :src="item.photoPath" mode="" class="shopImg" v-if="item.photoPath"></image>
 				<image src="../../static/timg/noimg.png" mode="" class="shopImg" v-else></image>
@@ -37,26 +53,24 @@
 							<view class="brands" v-for="(v,index2) in item.brands.split(',')">{{v}}</view>
 						</view>
 					</view>
-					<view class="yuyuBtnBox" >
-						<view>预约</view>
-						<image style="width: 21rpx;height: 21rpx;margin-top: 4rpx;margin-left: 5rpx;" src="http://dmsphoto.66km.com.cn/thFiles/1D60717A-DC1D-43BC-BBFE-EE0FAFD1A470.png" mode=""></image>
-					</view>
+					
 				</view>	
 				
 				
 
-				<view class="shopTime"><span v-if="item.startTime">{{item.startTime}}</span> - <span
+				<view class="shopTime">
+					营业时间: <span v-if="item.startTime">{{item.startTime}}</span> - <span
 						v-if="item.endTime">{{item.endTime}}</span> </view>
 
 				<view class="shopBottomLeft">
 
 					<span class="shopaddress"
 						v-if="item.address">{{item.address}}</span>
-					<span v-if="item.distance&&item.distance!= '0.00'">{{item.distance}}km</span>
+				
 				</view>
 				<view class="shopdhBox">
 				  <view class="shopcall" @click.stop="makePhoneCall(item.mobilePhone)">
-					  <image class="shopcallIcon" src="http://dmsphoto.66km.com.cn/thFiles/AB063613-7B7A-4BD4-AF43-9ECC082FF5C6.png" mode=""></image>
+					  <image class="shopcallIcon" src="../../static/img2/call.png" mode=""></image>
 				      <view class="shopcallTxt">联系电话</view>
 				  </view>
 				  <view class="shopcall" style="padding-left: 65rpx;" @click.stop="goMap(item)">
@@ -522,6 +536,66 @@
 </script>
 
 <style scoped>
+.newTop{
+	width: 702rpx;
+	height: 70rpx;
+	background: #FFFFFF;
+	padding: 24rpx;
+	position: fixed;
+	top: 0;left: 0;
+}
+.newTopSSbox{
+	height: 50rpx;
+	border-radius: 15rpx;
+	border: 2rpx solid #FCD903;
+	padding: 10rpx 0;
+	display: flex;
+}
+.newTopXia{
+	width: 12rpx;height: 8rpx;margin-top: 20rpx;margin-left: 10rpx;
+}
+.newTopSSLeft{
+	width: 190rpx;
+	display: flex;
+	border-right: 1px solid #EEEEEE;
+	justify-content: center;
+}
+.newSImg{
+	width: 30rpx;height: 30rpx;
+	margin-left: 30rpx;margin-top: 10rpx;
+}
+.sstopInput{
+	width: 400rpx;
+	height: 50rpx;
+	line-height: 50rpx;
+	font-size: 28rpx;
+	padding-left: 16rpx;
+}
+.newTopSSRight{
+	display: flex;
+}
+.newregionTxt{
+	font-size: 26rpx;
+	color: #333333;
+	line-height: 50rpx;
+	 white-space: nowrap; /* 禁止换行 */
+	  overflow: hidden; /* 隐藏溢出内容 */
+	  text-overflow: ellipsis; /* 添加省略号 */
+	  max-width: 150rpx;
+}
+.dhImg{
+	width: 35rpx;height: 35rpx;
+}
+.newdistance{
+	position: absolute;top: 22rpx;right: 18rpx;
+	text-align: center;
+	font-size: 22rpx;
+	color: #666666;
+}
+
+
+
+
 .areaCkIcon{
 	width: 38rpx;height: 28rpx;
 }
@@ -601,8 +675,8 @@
 		padding: 20rpx;
 		background-color: #FFFFFF;
 		border-radius: 10rpx;
-
 		display: flex;
+		position: relative;
 	}
 
 
@@ -622,8 +696,8 @@
 	}
 
 	.shopImg {
-		width: 154rpx;
-		height: 154rpx;
+		width: 160rpx;
+		height: 160rpx;
 		border-radius: 10rpx;
 	}
 
@@ -690,8 +764,7 @@
 		color: #F19D01;
 		height: 28rpx;
 		border: 1px solid #F19D01;
-
-		font-size: 20rpx;
+		font-size: 22rpx;
 		line-height: 28rpx;
 		margin: 5rpx 10rpx 5rpx 0rpx;
 	}
@@ -703,7 +776,7 @@
 
 	.shopTime {
 		color: #666666;
-		font-size: 24rpx;
+		font-size: 26rpx;
 	}
 
 	.addressBox {
@@ -737,14 +810,14 @@
 	}
 
 	.shopright {
-		padding-left: 20rpx;
-		width: 510rpx;
+		padding-left: 28rpx;
+		width: 500rpx;
 	}
 
 	.shopName {
-		font-size: 28rpx;
+		font-size: 32rpx;
 		font-weight: bold;
-		color: #333333;
+		color: #222222;
 		line-height: 40rpx;
 		width: 450rpx;
 		white-space: nowrap;
@@ -882,15 +955,7 @@
 		margin-top: 62rpx;
 		margin-left:71rpx;
 	}
-	.sstopInput{
-		width: 626rpx;
-		height: 72rpx;
-		background: #F4F5F7;
-		border-radius: 36rpx;
-		line-height: 72rpx;
-		font-size: 28rpx;
-		padding-left: 76rpx;
-	}
+
 	.sstop{
 		position: fixed;
 		padding-top: 24rpx;

pages/shop/wp.vue

@@ -61,11 +61,11 @@
 			this.avatar=opt.img;
 			//this.avatar='http://dmsphoto.66km.com.cn/marketing/B7511CA2-CC50-4F2C-867D-DB15783CE3C5.jpg';
 			console.log(this.avatar.slice(0,5))
-			/* if(this.avatar.slice(0,5)=='https'){
+			if(this.avatar.slice(0,5)=='https'){
 				
 			}else{
-			this.avatar=this.avatar.replace('http','https');
-			} */
+			  this.avatar=this.avatar.replace('http','https');
+			} 
 			this.time=opt.time
 			
 			console.log(this.avatar)