From eb270bb339d9d15bfb10830e0911f77ce609af08 Mon Sep 17 00:00:00 2001
From: yangjie <812952667@qq.com>
Date: Wed, 4 Aug 2021 20:14:34 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                               |  5 ++++-
 pages/goods/store-list/store-details.vue |  4 ++++
 pages/tabBar/home/home.vue               |  7 ++++++-
 pages/user/positioning/positioning.vue   | 19 ++++++++++++++++---
 4 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/pages.json b/pages.json
index 4f06a08..fb1e3b6 100644
--- a/pages.json
+++ b/pages.json
@@ -304,7 +304,10 @@
 			"path": "pages/goods/store-list/store-details",
 			"style": {
 				"navigationBarTitleText": "门店详情",
-				"enablePullDownRefresh": false
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white"
 			}
 
 		},
diff --git a/pages/goods/store-list/store-details.vue b/pages/goods/store-list/store-details.vue
index ecc5f7d..4995733 100644
--- a/pages/goods/store-list/store-details.vue
+++ b/pages/goods/store-list/store-details.vue
@@ -1,5 +1,9 @@
 <template>
 	<view>
+		<!-- <view class="backcorf06 height100p"></view>
+		<view class="height100p backcorfff backgrd width90">
+			<image :src="imageUrl+merchanList.storeLogo"></image>
+		</view> -->
 		<view class="width90 mart20" style="height: 90px;">
 			<view class="store-des flleft" @click="seeloaction">
 				立即<br>前往
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index 30edcf4..6300faf 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -857,9 +857,14 @@
 
 		.addr {
 			width: 120upx;
-			height: 60upx;
+			height: 45rpx;
 			flex-shrink: 0;
 			display: flex;
+			overflow: hidden;
+			display: -webkit-box;
+			-webkit-line-clamp: 1;
+			-webkit-box-orient: vertical;
+			text-overflow: ellipsis;
 			align-items: center;
 			font-size: 28upx;
 			color: #FFFFFF;
diff --git a/pages/user/positioning/positioning.vue b/pages/user/positioning/positioning.vue
index 44ce932..1ae5730 100644
--- a/pages/user/positioning/positioning.vue
+++ b/pages/user/positioning/positioning.vue
@@ -4,9 +4,9 @@
 			<!-- <uSearchBar @confirm="search" @input="input"></uSearchBar>
 			<view class="line1 mart10"></view> -->
 			<view class="width90 mart20 font15 fcor333">当前定位</view>
-			<view class="posacname actives width90 mart20">{{posName}}</view>
+			<view class="posacname actives mart20">{{posName}}</view>
 			<view class="width90 mart20 font14 fcor333">其他地区</view>
-			<view class="posacname mart20 flleft font14" :class="{'actives':posId===item.regionId}"
+			<view class="posheadname mart20 flleft font14" :class="{'actives':posId===item.regionId}"
 				v-for="(item,index) in posList" @click="change(item)">
 				{{item.regionName}}
 			</view>
@@ -61,10 +61,23 @@
 </script>
 
 <style lang="less">
+	.posheadname {
+		background-color: #f5f5f5;
+		color: #666666;
+		padding-left: 10px;
+		padding-right: 10px;
+		height: 30px;
+		margin-left: 4%;
+		line-height: 30px;
+		text-align: center;
+		border-radius: 5px;
+	}
 	.posacname {
 		background-color: #f5f5f5;
 		color: #666666;
-		width: 20%;
+		display: inline-block;
+		padding-left: 10px;
+		padding-right: 10px;
 		height: 30px;
 		margin-left: 4%;
 		line-height: 30px;