From 28d9667b4efd9427e5e29307c6a78e4eb1c46260 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Thu, 14 Mar 2024 15:32:01 +0800
Subject: [PATCH] 1

---
 pages/store/home/index.vue              | 1092 ++++++++++++++---------
 pages/users/user_address_list/index.vue |  127 ++-
 2 files changed, 778 insertions(+), 441 deletions(-)

diff --git a/pages/store/home/index.vue b/pages/store/home/index.vue
index ceb0198..0a47c2d 100644
--- a/pages/store/home/index.vue
+++ b/pages/store/home/index.vue
@@ -1,187 +1,102 @@
 <template>
-	<view :style="{ 'background-image': `linear-gradient(0deg, rgba(0, 0, 0, 0.9) 0%, rgba(0, 0, 0, 0.5) 100%),url(${store.mer_banner})` }"
-	 class="store-home">
-		<!-- 搜索 -->
-		<!-- #ifdef MP || APP-PLUS -->
-		<view :style="{ height: statusBarHeight }"></view>
+	<view class="store-home">
 		<view class="header">
+			<view style="height: var(--status-bar-height);"></view>
+
 			<view class="head-menu">
 				<view class="iconfont icon-xiangzuo" @click="goback" style="color: #fff;"></view>
-				<view class="iconfont icon-shouye4" @click="goHome" style="color: #fff;"></view>
+				<navigator :url="'/pages/store/list/index?mer_id='+id" hover-class="none"
+					class="search iconfont icon-xiangyou">
+					<text class="iconfont icon-sousuo"></text>
+					<text class="search-txt">搜索商品名称</text>
+					<text class="search-btn">搜索</text>
+				</navigator>
+				<view class="iconfont icon-gouwuche" style="color: #fff;" @click="toGwc"></view>
 			</view>
-			<navigator :url="'/pages/store/list/index?mer_id='+id" hover-class="none" class="search"><text class="iconfont icon-xiazai5"></text>搜索商品</navigator>
-		</view>
-		<!-- #endif -->
-		<!-- #ifdef H5 -->
-		<view class="header" :class="{noPointer : preview}">
-			<view class="head-menu">
-				<view class="iconfont icon-xiangzuo" @click="goback"></view>
-				<view class="iconfont icon-shouye4" @click="goHome"></view>
-			</view>
-			<navigator :url="'/pages/store/list/index?mer_id='+id" hover-class="none" class="search"><text class="iconfont icon-xiazai5"></text>搜索商品</navigator>
-		</view>
-		<!-- #endif -->
-		<view v-show="navShow && tabActive === 3" class="nav" :style="viewColor">
-			<view class="nav-cont" :class="{noPointer : preview}">
-				<view :class="{ active: navActive === 0 }" class="item" @click="navActive = 0;select.show = !select.show">
-					<view class="cont">
-						{{ select.selected ? '评分' : '默认' }}
-						<text :class="['arrow-icon', 'iconfont', select.show ? 'icon-xiangshang' : 'icon-xiangxia']"></text>
-					</view>
+
+			<view class="shop">
+				<view class="shop-img">
+					<u-image width="100rpx" height="154rpx" :lazyLoad="true" :fade="true" :src="store.mer_avatar">
+						<template v-slot:loading>
+							<u-loading-icon color="#999"></u-loading-icon>
+						</template>
+					</u-image>
 				</view>
-				<view :class="{ active: navActive === 1 }" class="item" @click="set_where(2,0)">
-					<view class="cont">销量</view>
-				</view>
-				<view :class="{ active: navActive === 2 }" class="item" @click="set_where(3,0)">
-					<view class="cont">
-						价格
-						<image :src="sortPrice ? domain+'/static/diy/up'+keyColor+'.png' : domain+'/static/diy/down'+keyColor+'.png'"></image>
-					</view>
-				</view>
-				<view class="item" @click="select.show = false;navActive = 4;isColumn = !isColumn">
-					<view class="cont">
-						<text :class="['layout-icon', 'iconfont', isColumn ? 'icon-pailie' : 'icon-tupianpailie']"></text>
-					</view>
-				</view>
-			</view>
-			<view v-show="select.show && navShow" class="select">
-				<view v-for="item in select.options" :key="item.id" :class="{ active: item.id === select.selected }" class="item"
-				 @click="set_where(item.id,0)">
-				 {{ item.name }}
-				 <text v-if="item.id === select.selected" class="iconfont icon-gou"></text>
-				 </view>
-			</view>
-		</view>
-		<!--diy页面的导航-->
-		<view v-show="navShow && tabActive == 1" class="nav" :style="viewColor">
-			<view class="nav-cont" :class="{noPointer : preview}">
-				<view :class="{ active: diyActive == 0 }" class="item" @click="setDiy">
-					<view class="cont">精选</view>
-				</view>
-				<view :class="{ active: diyActive == 1 }" class="item" @click="set_where(4,1)">
-					<view class="cont">新品</view>
-				</view>
-				<view :class="{ active: diyActive ===2 }" class="item" @click="set_where(5,2)">
-					<view class="cont">活动</view>
-				</view>
-				<view :class="{ active: diyActive == 3 }" class="item" @click="getCoupon">
-					<view class="cont">领券</view>
-				</view>
-			</view>
-		</view>
-		<scroll-view class="main" scroll-y="true" @scroll="scrollHome" catchtouchmove :style="viewColor">
-			<!-- 店铺信息 -->
-			<view id="store" class="store" :class="{noPointer : preview}">
-				<image :src="store.mer_avatar"></image>
-				<view class="text">
-					<navigator :url="`/pages/store/detail/index?id=${id}`" hover-class="none">
-						<text v-if="store.type_name" class="font-bg-red">{{store.type_name}}</text>
-						<text v-else-if="store.is_trader" class="font-bg-red">自营</text>
-						<text class="name">{{ store.mer_name }}</text>
-						<image v-if="margin_ico_switch==1 && margin_ico && store.is_margin == 10" :src="margin_ico" class="store-margin"></image>
-						<text class="iconfont icon-xiangyou"></text>
-					</navigator>
-					<view class="score">
+
+				<view class="shop-info">
+					<view class="shop-info-title line1">{{store.mer_name}}</view>
+					<view class="shop-info-eva">
 						<view class="star">
-							<view
-							:style="{width: `${score.star.toFixed(2)}%`, backgroundImage: `url(${domain}/static/diy/score1${keyColor}.png)`}"></view>
+							<u-rate count="5" :value="score.star" size="12" activeColor="#FFBC21"
+								inactiveColor="transparent"></u-rate>
+							<text
+								style="color:#FFBC21;font-size: 12px;margin: 0 10rpx 0 4rpx;">{{ score.number.toFixed(1) }}</text>
 						</view>
-						<view>{{ score.number.toFixed(1) }}</view>
+						<view class="shop-info-sale">月销2000+</view>
+						<view v-if="store.services_type == 0" class="iconfont icon-kefu3" @click="goService"></view>
+						<view v-else-if="store.services_type == 1" class="iconfont icon-kefu3" @click="call(1)"></view>
+						<view v-else class="iconfont icon-kefu3" @click="call(0)"> </view>
 					</view>
+					<view class="shop-info-runtime">营业时间 : 90:00－21:00</view>
+					<view class="shop-info-addr iconfont iconfont-xiangyou">{{store.mer_address}}</view>
 				</view>
-				<view v-if="store.services_type == 0" class="kefu" @click="goService">
-					<text class="iconfont icon-kefu3"></text>
+
+				<view class="shop-logo">
+					<u-image width="192rpx" height="192rpx" :lazyLoad="true" :fade="true"
+						src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/6e86c202403131641068012.webp">
+						<template v-slot:loading>
+							<u-loading-icon color="#999"></u-loading-icon>
+						</template>
+					</u-image>
 				</view>
-				<view v-else-if="store.services_type == 1" class="kefu" @click="call(1)">
-					<text class="iconfont icon-kefu3"></text>
-				</view>
-				<view v-else class="kefu" @click="call(0)">
-					<text class="iconfont icon-kefu3"></text>
-				</view>
-				<button hover-class="none" :class="store.care ? 'care' : ''" v-if="!isLogin" @click="authOpen">
-					<text v-show="!store.care" class="iconfont icon-guanzhu"></text>
-					{{ store.care ? '已关注' : '关注' }}
-				</button>
-				<button v-else hover-class="none" :class="store.care ? 'care' : ''" @click="followToggle">
-					<text v-show="!store.care" class="iconfont icon-guanzhu"></text>
-					{{ store.care ? '已关注' : '关注' }}
-				</button>
 			</view>
+		</view>
+
+		<scroll-view class="main" scroll-y="true" @scroll="scrollHome" catchtouchmove :style="viewColor">
 			<view v-show="!navShow && tabActive === 3" class="nav">
-				<view class="nav-cont" :class="{noPointer : preview}">
-					<view :class="{ active: navActive === 0 }" class="item" @click="navActive = 0;select.show = !select.show">
-						<view class="cont">
-							{{ select.selected ? '评分' : '默认' }}
-							<text :class="['arrow-icon', 'iconfont', select.show ? 'icon-xiangshang' : 'icon-xiangxia']"></text>
+				<view class="nav-cont" :class="{noPointer : preview}" id="nav-cont">
+					<view :class="{ active: navActive === 0 }" class="item" @click="set_where(0,0)">
+						<view class="cont">默认商品</view>
+					</view>
+
+					<view :class="{ active: navActive === 1 }" class="item" @click="set_where(1,0)">
+						<view class="cont">销量</view>
+					</view>
+
+					<view :class="{ active: navActive === 2 }" class="item" @click="set_where(2,0)">
+						<view class="cont"> 价格
+							<image
+								:src="sortPrice ? domain+'/static/diy/up'+keyColor+'.png' : domain+'/static/diy/down'+keyColor+'.png'">
+							</image>
 						</view>
 					</view>
-					<view :class="{ active: navActive === 1 }" class="item" @click="set_where(2,0)">
-						<view class="cont">
-							销量
-						</view>
-					</view>
-					<view :class="{ active: navActive === 2 }" class="item" @click="set_where(3,0)">
-						<view class="cont">
-							价格
-							<image v-if="navActive === 2 && where.order == 'price_asc'" :src="domain+'/static/diy/up'+keyColor+'.png'"></image>
-							<image v-if="navActive === 2 && where.order == 'price_desc'" :src="domain+'/static/diy/down'+keyColor+'.png'"></image>
-						</view>
-					</view>
-					<view class="item" @click="select.show = false;navActive = 4;isColumn = !isColumn">
-						<view class="cont">
-							<text :class="['layout-icon', 'iconfont', isColumn ? 'icon-pailie' : 'icon-tupianpailie']"></text>
-						</view>
+					<view :class="{ active: navActive === 3 }" class="item" @click="set_where(3,0)">
+						<view class="cont">评分</view>
 					</view>
 				</view>
-				<view v-show="select.show && !navShow" class="select">
-					<view v-for="item in select.options" :key="item.id" :class="{ active: item.id === select.selected }" class="item"
-					 @click="set_where(item.id,0)">{{ item.name }}
-					 <text v-if="item.id === select.selected" class="iconfont icon-gou"></text>
-					 </view>
+
+				<view class="guanzhu" :class="{'guanzhu-active':store.care}" v-if="!isLogin" @click="authOpen">
+					{{ store.care ? '已关注' : '关注' }}
+				</view>
+				<view v-else class="guanzhu" :class="{'guanzhu-active':store.care}" @click="followToggle">
+					{{ store.care ? '已关注' : '关注' }}
 				</view>
 			</view>
-			<!--diy导航-->
-			<view v-show="!navShow && tabActive === 1" class="nav">
-				<view class="nav-cont" :class="{noPointer : preview}">
-					<view :class="{ active: diyActive == 0 }" class="item" @click="setDiy">
-						<view class="cont">精选</view>
-					</view>
-					<view :class="{ active: diyActive == 1 }" class="item" @click="set_where(4,1)">
-						<view class="cont">新品</view>
-					</view>
-					<view :class="{ active: diyActive == 2 }" class="item" @click="set_where(5,2)">
-						<view class="cont">活动</view>
-					</view>
-					<view :class="{ active: diyActive == 3 }" class="item" @click="getCoupon">
-						<view class="cont">领券</view>
-					</view>
-				</view>
-				<view v-show="select.show && !navShow" class="select">
-					<view v-for="item in select.options" :key="item.id" :class="{ active: item.id === select.selected }" class="item"
-					 @click="set_where(item.id)">{{ item.name }}
-					 <text v-if="item.id === select.selected" class="iconfont icon-gou"></text>
-					 </view>
-				</view>
-			</view>
-			<view class="tab-cont" :style="viewColor" :class="{noPointer : preview}">
-				<!-- diy组件 -->
+
+			<view class="tab-cont" :style="viewColor,{'height':'calc(100vh - '+listHeight+' - 84rpx)'}"
+				:class="{noPointer : preview}">
 				<view v-show="diyActive == 0 && tabActive == 1">
 					<!-- #ifdef H5 -->
 					<view v-for="(item, index) in styleConfig" :key="index">
 						<block v-if="item.name != 'headerSerch' && item.name != 'tabNav'">
-							<component
-								:is="item.name"
-								:index="index"
-								:dataConfig="item"
-								:merId="id"
-								@detail="goGoodsDetail"
-							></component>
+							<component :is="item.name" :index="index" :dataConfig="item" :merId="id"
+								@detail="goGoodsDetail"></component>
 						</block>
 						</block>
 					</view>
 					<!-- #endif -->
 					<!-- #ifdef MP  || APP-PLUS-->
-					<block v-for="(item, index) in styleConfig" :key="index" >
+					<block v-for="(item, index) in styleConfig" :key="index">
 						<view>
 							<activeParty v-if="item.name == 'activeParty'" :merId="id" :dataConfig="item"></activeParty>
 							<articleList v-if="item.name == 'articleList'" :merId="id" :dataConfig="item"></articleList>
@@ -189,10 +104,12 @@
 							<blankPage v-if="item.name == 'blankPage'" :merId="id" :dataConfig="item"></blankPage>
 							<combination v-if="item.name == 'combination'" :merId="id" :dataConfig="item"></combination>
 							<topic v-if="item.name == 'topic'" :merId="id" :dataConfig="item"></topic>
-							<coupon v-if="item.name == 'coupon'" :merId="id" :dataConfig="item"></coupon>	
-							<goodList v-if="item.name == 'goodList'" :merId="id" :dataConfig="item" @detail="goGoodsDetail"></goodList>
+							<coupon v-if="item.name == 'coupon'" :merId="id" :dataConfig="item"></coupon>
+							<goodList v-if="item.name == 'goodList'" :merId="id" :dataConfig="item"
+								@detail="goGoodsDetail"></goodList>
 							<guide v-if="item.name == 'guide'" :merId="id" :dataConfig="item"></guide>
-							<liveBroadcast v-if="item.name == 'liveBroadcast'" :merId="id" :dataConfig="item"></liveBroadcast>
+							<liveBroadcast v-if="item.name == 'liveBroadcast'" :merId="id" :dataConfig="item">
+							</liveBroadcast>
 							<menus v-if="item.name == 'menus'" :merId="id" :dataConfig="item"></menus>
 							<presellList v-if="item.name == 'presellList'" :merId="id" :dataConfig="item"></presellList>
 							<richText v-if="item.name == 'richText'" :merId="id" :dataConfig="item"></richText>
@@ -205,49 +122,79 @@
 					</block>
 					<!-- #endif -->
 				</view>
+
 				<!-- 首页 -->
 				<view v-show="(tabActive == 3 || diyActive == 1 || diyActive == 2) && tabActive != 5 && tabActive != 2">
 					<!-- 商品 -->
 					<view v-if="goods.length" class="goods-wrap" id="goods" @touchmove="onTouchmove">
 						<view v-if="isColumn" class="goods column">
-							<view v-for="item in goods" :key="item.product_id" class="item" @click="goGoodsDetail(item)">
+							<view v-for="item in goods" :key="item.product_id" class="item"
+								@click="goGoodsDetail(item)">
 								<view class="image">
 									<easy-loadimage mode="widthFix" :image-src="item.image"></easy-loadimage>
 									<view v-if="item.stock == 0" class="sell_out">已售罄</view>
-									<view v-if="item.border_pic" :style="{ backgroundImage: `url(${item.border_pic})` }" class="border-picture"></view>
+									<view v-if="item.border_pic" :style="{ backgroundImage: `url(${item.border_pic})` }"
+										class="border-picture"></view>
 								</view>
 								<view class="text on acea-row row-between-wrapper">
-									<view class="name line2">
+									<view class="name line1">
 										<text class="name_text line1">{{ item.store_name }}</text>
+										<text class="sale_num">已销 {{item.sales}}{{item.sales>0?'+':''}}</text>
 									</view>
-									<view class="item_bot">
+
+									<view class="tag">
+										<view class="tag-item">24H发货</view>
+									</view>
+
+									<view class="shop-detail">
+										<text class="brand">品牌:123123</text>
+										<text class="unit">规格:{{item.unit_name}}</text>
+										<!-- <text class="addr">产地:{{item}}</text> -->
+									</view>
+
+									<view class="price">
+										<view class="price-num">
+											<text class="unit-price">¥{{ item.price }}</text><text
+												class="unit-name">/份</text>
+										</view>
+										<view class="price-icon iconfont icon-gouwuche"></view>
+									</view>
+
+									<!-- <view class="item_bot">
 										<view class="money-wrap acea-row">
 											<view class="money">
 												¥<text>{{ item.price }}</text>
 											</view>
-											<view v-if="item.show_svip_info && item.show_svip_info.show_svip_price && item.svip_price" class="acea-row row-middle">
+											<view
+												v-if="item.show_svip_info && item.show_svip_info.show_svip_price && item.svip_price"
+												class="acea-row row-middle">
 												<text class='vip-money'>￥{{item.svip_price}}</text>
 												<view class="vipImg">
-													<image class="image" :src="`${domain}/static/images/svip.png`"></image>
+													<image class="image" :src="`${domain}/static/images/svip.png`">
+													</image>
 												</view>
 											</view>
 										</view>
-										<view v-if="item.product_type != 0 || item.issetCoupon || item.delivery_free == 1" class="item_tags">
-											<text v-if="item.product_type != 0" :class="'font_bg-red type'+item.product_type">{{item.product_type == 1 ? "秒杀" : item.product_type == 2 ? "预售" : item.product_type == 3 ? "助力" : item.product_type == 4 ? "拼团" : ""}}</text>
+										<view
+											v-if="item.product_type != 0 || item.issetCoupon || item.delivery_free == 1"
+											class="item_tags">
+											<text v-if="item.product_type != 0"
+												:class="'font_bg-red type'+item.product_type">{{item.product_type == 1 ? "秒杀" : item.product_type == 2 ? "预售" : item.product_type == 3 ? "助力" : item.product_type == 4 ? "拼团" : ""}}</text>
 											<text class="tags_item ticket" v-if="item.issetCoupon">领券</text>
 											<text class="tags_item delivery" v-if="item.delivery_free == 1">包邮</text>
 										</view>
 										<view class="score">{{ item.rate }}评分 {{ item.reply_count }}条评论</view>
-									</view>
+									</view> -->
 								</view>
-								<view v-if="item.max_extension>0 && (item.product_type == 0 || item.product_type == 2)" class="foot">
+								<!-- <view v-if="item.max_extension>0 && (item.product_type == 0 || item.product_type == 2)"
+									class="foot">
 									<text v-show="!isColumn" class="iconfont"></text>
 									最高赚 ¥{{ item.max_extension }}
-								</view>
+								</view> -->
 							</view>
 						</view>
 						<view v-else class="goods">
-							<WaterfallsFlow :wfList='goods' @itemTap="goGoodsDetail" :type="1" :isStore="1"/>
+							<WaterfallsFlow :wfList='goods' @itemTap="goGoodsDetail" :type="1" :isStore="1" />
 						</view>
 					</view>
 					<view v-if="goodsLoading" class="acea-row row-center-wrapper loadingicon">
@@ -256,6 +203,7 @@
 					</view>
 					<emptyPage v-if="goods.length == 0 && !goodsLoading" title="暂无商品~"></emptyPage>
 				</view>
+
 				<!-- 分类 -->
 				<view v-show="tabActive == 2">
 					<view class="category">
@@ -271,7 +219,8 @@
 								<view class="iconfont icon-xiangyou"></view>
 							</view>
 							<view v-if="item.children" class="body">
-								<view v-for="value in item.children" :key="value.store_category_id" class="item" @click="goCategoryGoods(value.store_category_id)">{{ value.cate_name }}</view>
+								<view v-for="value in item.children" :key="value.store_category_id" class="item"
+									@click="goCategoryGoods(value.store_category_id)">{{ value.cate_name }}</view>
 							</view>
 						</view>
 					</view>
@@ -279,12 +228,14 @@
 						<text :hidden="!categoryLoading" class="iconfont icon-jiazai loading"></text>
 						{{loadTitle}}
 					</view>
-					
 				</view>
-				<!--生活服务-->
-				<view v-show="tabActive === 5" id="product" @touchmove="onTouchmoves">
+
+
+				<!--生活服务 优惠券-->
+				<!-- <view v-show="tabActive === 5" id="product" @touchmove="onTouchmoves">
 					<view v-if="productList.length" class="goods column">
-						<view v-for="item in productList" :key="item.product_id" class="item" @click="goGoodsDetail(item)">
+						<view v-for="item in productList" :key="item.product_id" class="item"
+							@click="goGoodsDetail(item)">
 							<view class="image">
 								<easy-loadimage mode="widthFix" :image-src="item.image"></easy-loadimage>
 							</view>
@@ -298,22 +249,27 @@
 											¥
 											<text>{{ item.price }}</text>
 										</view>
-										<view v-if="item.show_svip_info && item.show_svip_info.show_svip_price && item.svip_price" class="acea-row row-middle">
+										<view
+											v-if="item.show_svip_info && item.show_svip_info.show_svip_price && item.svip_price"
+											class="acea-row row-middle">
 											<text class='vip-money'>￥{{item.svip_price}}</text>
 											<view class="vipImg">
 												<image class="image" :src="`${domain}/static/images/svip.png`"></image>
 											</view>
 										</view>
 									</view>
-									<view v-if="item.product_type != 0 || item.issetCoupon || item.delivery_free == 1" class="item_tags">
-										<text v-if="item.product_type != 0" :class="'font_bg-red type'+item.product_type">{{item.product_type == 1 ? "秒杀" : item.product_type == 2 ? "预售" : item.product_type == 3 ? "助力" : item.product_type == 4 ? "拼团" : ""}}</text>
+									<view v-if="item.product_type != 0 || item.issetCoupon || item.delivery_free == 1"
+										class="item_tags">
+										<text v-if="item.product_type != 0"
+											:class="'font_bg-red type'+item.product_type">{{item.product_type == 1 ? "秒杀" : item.product_type == 2 ? "预售" : item.product_type == 3 ? "助力" : item.product_type == 4 ? "拼团" : ""}}</text>
 										<text class="tags_item ticket" v-if="item.issetCoupon">领券</text>
 										<text class="tags_item delivery" v-if="item.delivery_free == 1">包邮</text>
 									</view>
 									<view class="score">{{ item.rate }}评分 {{ item.reply_count }}条评论</view>
 								</view>
 							</view>
-							<view v-if="item.max_extension && (item.product_type == 0 || item.product_type == 2)" class="foot">
+							<view v-if="item.max_extension && (item.product_type == 0 || item.product_type == 2)"
+								class="foot">
 								<text v-show="!isColumn" class="iconfont"></text>
 								最高赚 ¥{{ item.max_extension }}
 							</view>
@@ -321,11 +277,11 @@
 					</view>
 					<view v-if="goodsLoading" class="acea-row row-center-wrapper loadingicon">
 						<text :hidden="!goodsLoading" class="iconfont icon-jiazai loading"></text>
-							{{loadTitle}}
+						{{loadTitle}}
 					</view>
 					<emptyPage v-if="productList.length == 0 && !goodsLoading" title="暂无商品~"></emptyPage>
 				</view>
-				<!-- 优惠券 -->
+				
 				<view v-show="diyActive == 3 && tabActive == 1">
 					<view v-if="coupon.length" class="coupon">
 						<view v-for="item in coupon" :key="item.coupon_id" class="item">
@@ -336,7 +292,8 @@
 								</view>
 								<view>满{{ item.use_min_price }}元可用</view>
 							</view>
-							<view class="left" v-else :style="{ 'background-image': `url(${domain}/static/diy/couponBg${keyColor}.png)` }">
+							<view class="left" v-else
+								:style="{ 'background-image': `url(${domain}/static/diy/couponBg${keyColor}.png)` }">
 								<view class="money">
 									¥
 									<text>{{ item.coupon_price }}</text>
@@ -350,7 +307,9 @@
 								</view>
 								<view class="time-wrap" style="justify-content: space-between;">
 									<block v-if="item.coupon_type == 1">
-										<view class="time">{{ item.use_start_time | dateFormat }}-{{ item.use_end_time | dateFormat }}</view>
+										<view class="time">
+											{{ item.use_start_time | dateFormat }}-{{ item.use_end_time | dateFormat }}
+										</view>
 									</block>
 									<block v-if="item.coupon_type == 0">
 										<view>领取后{{ item.coupon_time}}天内可用</view>
@@ -366,12 +325,14 @@
 						</view>
 					</view>
 					<emptyPage v-if="coupon.length == 0" title="暂无优惠券~"></emptyPage>
-				</view>
+				</view> -->
+
 				<!--活动专场-->
-				<view v-show="tabActive === 4">
+				<!-- <view v-show="tabActive === 4">
 					<block v-if="topicList.length>0">
 						<view class="main_count">
-							<navigator v-for="(item,index) in topicList" :key='item.group_data_id' :url="`/pages/activity/topic_detail/index?id=${item.group_data_id}`" hover-class="none">
+							<navigator v-for="(item,index) in topicList" :key='item.group_data_id'
+								:url="`/pages/activity/topic_detail/index?id=${item.group_data_id}`" hover-class="none">
 								<view class='list'>
 									<image :src="item.pic" class="picture"></image>
 								</view>
@@ -384,12 +345,13 @@
 							<view class="txt">暂无活动专场哦~</view>
 						</view>
 					</block>
-				</view>
+				</view> -->
 			</view>
-			
 		</scroll-view>
+
 		<view class="footer" :style="viewColor" :class="{noPointer : preview}">
-			<view v-for="(item, index) in tabs" :key="index" :class="{ active: tabActive === item.value }" class="item" @click="tab(item.value)">
+			<view v-for="(item, index) in tabs3" :key="index" :class="{ active: tabActive === item.value }" class="item"
+				@click="tab(item.value)">
 				<view :class="['iconfont', item.icon]"></view>
 				<view>{{ item.name }}</view>
 			</view>
@@ -410,18 +372,45 @@
 	import request from "@/utils/request.js";
 	import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlow.vue'
 	import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue'
-	import {getStoreDetail,	getStoreGoods, getStoreCategory, followStore, unfollowStore, storeServiceList, hasServiceApi} from '@/api/store.js';
-	import { initiateAssistApi, getTopicList } from '@/api/activity.js';
-	import { getShopCoupons, setCouponReceive, getDiy } from '@/api/api.js';
-	import { getUserInfo } from '@/api/user.js';
-	import { configMap } from "@/utils";
-	import { mapGetters } from "vuex";
-	import { goShopDetail } from '@/libs/order.js';
+	import {
+		getStoreDetail,
+		getStoreGoods,
+		getStoreCategory,
+		followStore,
+		unfollowStore,
+		storeServiceList,
+		hasServiceApi
+	} from '@/api/store.js';
+	import {
+		initiateAssistApi,
+		getTopicList
+	} from '@/api/activity.js';
+	import {
+		getShopCoupons,
+		setCouponReceive,
+		getDiy
+	} from '@/api/api.js';
+	import {
+		getUserInfo
+	} from '@/api/user.js';
+	import {
+		configMap
+	} from "@/utils";
+	import {
+		mapGetters
+	} from "vuex";
+	import {
+		goShopDetail
+	} from '@/libs/order.js';
 	import history from "@/mixins/history";
 	import emptyPage from '@/components/emptyPage.vue'
 	import shareScence from "@/libs/spread";
-	import { HTTP_REQUEST_URL } from '@/config/app';
-	import { toLogin } from '@/libs/login.js';
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
+	import {
+		toLogin
+	} from '@/libs/login.js';
 	import mConfig from '../component/index.js';
 	// #ifdef MP || APP-PLUS
 	import activeParty from '../../index/component/activeParty';
@@ -441,7 +430,7 @@
 	import pictureCube from '../../index/component/pictureCube'
 	import titles from '../../index/component/titles';
 	// #endif
-	const app = getApp();	
+	const app = getApp();
 	export default {
 		components: {
 			...mConfig,
@@ -493,7 +482,7 @@
 				navShow: false,
 				navActive: 0,
 				diyActive: 0,
-				tabActive: 0, // 底部切换
+				tabActive: '', // 底部切换
 				isCoupon: 0,
 				keyword: '',
 				order: '',
@@ -513,77 +502,63 @@
 					show: false,
 					selected: 0,
 					options: [{
-							id: 0,
-							name: '默认'
-						},
-						{
-							id: 1,
-							name: '评分'
-						}
-					]
+						id: 0,
+						name: '默认'
+					}, {
+						id: 1,
+						name: '评分'
+					}]
 				},
 				// 底部菜单
 				tabs1: [{
-						icon: 'icon-yizhan_o',
-						name: '首页',
-						value: 1,
-					},
-					{
-						icon: 'icon-gouwu_o',
-						name: '商品',
-						value: 3,
-					},
-					{
-						icon: 'icon-baoguo_huanbaohe_o',
-						name: '生活服务',
-						value: 5,
-					},
-					{
-						icon: 'icon-yingyongAPP_o',
-						name: '分类',
-						value: 2,
-					},
-					{
-						icon: 'icon-liwu_o',
-						name: '专场',
-						value: 4,
-					}
-				],
+					icon: 'icon-yizhan_o',
+					name: '首页',
+					value: 1,
+				}, {
+					icon: 'icon-gouwu_o',
+					name: '商品',
+					value: 3,
+				}, {
+					icon: 'icon-baoguo_huanbaohe_o',
+					name: '生活服务',
+					value: 5,
+				}, {
+					icon: 'icon-yingyongAPP_o',
+					name: '分类',
+					value: 2,
+				}, {
+					icon: 'icon-liwu_o',
+					name: '专场',
+					value: 4,
+				}],
 				// 底部菜单
 				tabs2: [{
-						icon: 'icon-yizhan_o',
-						name: '首页',
-						value: 1,
-					},
-					{
-						icon: 'icon-gouwu_o',
-						name: '商品',
-						value: 3,
-					},
-					{
-						icon: 'icon-yingyongAPP_o',
-						name: '分类',
-						value: 2,
-					},
-					{
-						icon: 'icon-zhuanti',
-						name: '专场',
-						value: 4,
-					}
-				],
-        // 底部菜单
-        tabs3: [
-        	{
-        		icon: 'icon-gouwu_o',
-        		name: '商品',
-        		value: 3,
-        	},
-        	{
-        		icon: 'icon-yingyongAPP_o',
-        		name: '分类',
-        		value: 2,
-        	}
-        ],
+					icon: 'icon-yizhan_o',
+					name: '首页',
+					value: 1,
+				}, {
+					icon: 'icon-gouwu_o',
+					name: '商品',
+					value: 3,
+				}, {
+					icon: 'icon-yingyongAPP_o',
+					name: '分类',
+					value: 2,
+				}, {
+					icon: 'icon-zhuanti',
+					name: '专场',
+					value: 4,
+				}],
+				// 底部菜单
+				tabs3: [{
+					icon: 'icon-gouwu_o',
+					name: '商品',
+					value: 3,
+				}, {
+					icon: 'icon-yingyongAPP_o',
+					name: '分类',
+					value: 2,
+				}],
 				tabs: [],
 				storeScroll: true,
 				storeTop: 0,
@@ -592,9 +567,9 @@
 				topicList: [],
 				service_open: false,
 				type: 0,
-				statusBarHeight: 0,
 				serviceInfo: {},
 				preview: false,
+				listHeight: 0
 			}
 		},
 		computed: {
@@ -605,7 +580,8 @@
 						number: 0
 					};
 				if ('postage_score' in store) {
-					score.number = (parseFloat(store.postage_score) + parseFloat(store.product_score) + parseFloat(store.service_score)) /
+					score.number = (parseFloat(store.postage_score) + parseFloat(store.product_score) + parseFloat(
+							store.service_score)) /
 						3;
 					score.star = score.number / 5 * 100;
 				}
@@ -614,18 +590,18 @@
 			...configMap({
 				margin_ico_switch: 0,
 				margin_ico: '',
-			}, mapGetters(['isLogin','uid','viewColor','keyColor'])),
+			}, mapGetters(['isLogin', 'uid', 'viewColor', 'keyColor'])),
 		},
 		watch: {
 			tabActive: function(value, old) {
 				switch (value) {
 					case 1:
-						if(this.goods.length == 0 && this.isCoupon == 0){
+						if (this.goods.length == 0 && this.isCoupon == 0) {
 							this.resetParmas();
 							this.where.order = this.order == 1 ? 'is_new' : '';
 							this.where.action = this.order == 2 ? 1 : '';
 							this.getGoods();
-						}else if(this.isCoupon == 1){
+						} else if (this.isCoupon == 1) {
 							this.getCoupon();
 						}
 						break;
@@ -637,11 +613,11 @@
 						this.goods = [];
 						this.getGoods();
 						break;
-					case 4:	
+					case 4:
 						this.getTopic();
 						break;
 					case 5:
-						if(this.productList.length == 0){
+						if (this.productList.length == 0) {
 							this.resetParmas();
 							this.get_service_list();
 						}
@@ -663,10 +639,11 @@
 				this.currSpid = options.spid
 				app.globalData.spid = options.spid;
 			}
+
 			// #ifdef MP
 			if (options.scene) {
 				let value = this.$util.getUrlParams(decodeURIComponent(options.scene));
-				if (value.id ) this.id = value.id || 0;
+				if (value.id) this.id = value.id || 0;
 				//记录推广人uid
 				if (value.spid) {
 					this.currSpid = value.spid
@@ -674,17 +651,14 @@
 				}
 			}
 			// #endif
+
 			this.getStore();
 			this.diyData();
-			shareScence(this.currSpid, this.isLogin)	
-			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
-		},
-		onShow() {
-			
-		},
-		onReady: function() {
+			shareScence(this.currSpid, this.isLogin);
 
+			this.initHeight();
 		},
+
 		/**
 		 * 用户点击右上角分享
 		 */
@@ -715,51 +689,73 @@
 		// #endif
 		mounted: function() {
 			const query = uni.createSelectorQuery().in(this);
-			query.select('#store').boundingClientRect(data => {
-				this.storeHeight = data.height;
-				this.storeTop = data.top;
-			}).exec();
+			// query.select('#store').boundingClientRect(data => {
+			// 	this.storeHeight = data.height;
+			// 	this.storeTop = data.top;
+			// }).exec();
 		},
+
 		methods: {
-			call: function(){
+			// 购物车
+			toGwc() {
+				uni.switchTab({
+					url: "/pages/order_addcart/order_addcart",
+					fail(err) {
+						console.log(err);
+					}
+				})
+			},
+
+			// 列表高度
+			initHeight() {
+				this.$nextTick(async () => {
+					const headHeight = await this.getDomInfo('.header');
+					const footerHeight = await this.getDomInfo('.footer');
+					const navHeight = await this.getDomInfo('#nav-cont');
+
+					this.listHeight = headHeight.height + footerHeight.height + 'px';
+				})
+			},
+
+			call: function() {
 				let that = this;
-				if(that.store.service_phone){
+				if (that.store.service_phone) {
 					uni.showModal({
 						title: '提示',
-						content: '暂无在线客服，确定拨打客服电话:'+that.store.service_phone+'吗？',
+						content: '暂无在线客服，确定拨打客服电话:' + that.store.service_phone + '吗？',
 						success: function(res) {
 							if (res.confirm) {
 								uni.makePhoneCall({
-								  phoneNumber: that.store.service_phone,
+									phoneNumber: that.store.service_phone,
 								});
 							}
 						}
 					})
-				}else{
+				} else {
 					return that.$util.Tips({
 						title: '暂无可用客服'
 					})
 				}
 			},
-			onTouchmove(e){
+			onTouchmove(e) {
 				if (this.loadend) return;
 				if (this.loading) return;
 				if (this.goodsLoading) return;
 				const query = uni.createSelectorQuery().in(this);
 				query.select('#goods').boundingClientRect(data => {
-					if(data.bottom < 1500 && data.top < 0) {
+					if (data.bottom < 1500 && data.top < 0) {
 						this.getGoods();
 					}
 				}).exec();
 				// 模拟触底刷新
 			},
-			onTouchmoves(e){
+			onTouchmoves(e) {
 				if (this.loadend) return;
 				if (this.loading) return;
 				if (this.goodsLoading) return;
 				const query = uni.createSelectorQuery().in(this);
 				query.select('#product').boundingClientRect(data => {
-					if(data.bottom < 1500 && data.top < 0) {
+					if (data.bottom < 1500 && data.top < 0) {
 						this.get_service_list();
 					}
 				}).exec();
@@ -771,10 +767,14 @@
 			setDiy() {
 				this.diyActive = 0;
 			},
+
 			// 获取diy模板数据
 			diyData() {
 				let that = this;
-				getDiy({id: that.id, version: '221'}).then(res => {
+				getDiy({
+					id: that.id,
+					version: '221'
+				}).then(res => {
 					let data = res.data;
 					that.styleConfig = that.objToArr(data.value);
 					that.styleConfig.forEach((item, index, arr) => {
@@ -787,7 +787,7 @@
 					uni.showToast({
 						title: err,
 						icon: 'none'
-					});		
+					});
 				});
 			},
 			// 对象转数组
@@ -796,7 +796,7 @@
 				let m = obj.map(key => data[key]);
 				return m;
 			},
-			goService(){
+			goService() {
 				let that = this;
 				if (that.isLogin === false) {
 					toLogin()
@@ -860,14 +860,15 @@
 			getStore: function() {
 				getStoreDetail(this.id).then(res => {
 					this.store = res.data;
-					if((res.data.delivery_way.length == 1 && res.data.delivery_way[0] == '1') || res.data.delivery_way.length == 2){
+					if ((res.data.delivery_way.length == 1 && res.data.delivery_way[0] == '1') || res.data
+						.delivery_way.length == 2) {
 						this.tabs = this.tabs1
 						this.service_open = true
-					}else{
+					} else {
 						this.tabs = this.tabs2
 						this.service_open = false
-					}	
-					this.tab(this.type)
+					}
+					this.tab(3);
 					// #ifdef H5
 					this.ShareInfo();
 					// #endif
@@ -935,11 +936,14 @@
 				});
 			},
 			// 获取商铺活动专题
-			getTopic(){
+			getTopic() {
 				if (this.topicList.length) {
 					return;
 				}
-				getTopicList(this.id,{page: 1, limit: 999}).then(res => {
+				getTopicList(this.id, {
+					page: 1,
+					limit: 999
+				}).then(res => {
 					this.topicList = res.data;
 				});
 			},
@@ -969,8 +973,9 @@
 			followToggle: function() {
 				this.store.care ? this.unfollow() : this.follow();
 			},
+
 			// 选择条件展示商品
-			set_where: function(param,isDiy) {
+			set_where: function(param, isDiy) {
 				this.select.show = false;
 				this.loading = false;
 				this.loadend = false;
@@ -979,34 +984,34 @@
 				this.where.action = ""
 				switch (param) {
 					case 0:
-						this.select.selected = 0;
+						this.navActive = 0;
 						this.where.order = '';
 						this.getGoods();
 						break;
 					case 1:
-						this.select.selected = 1;
-						this.where.order = 'rate';
-						this.getGoods();
-						break;
-					case 2:
 						this.navActive = 1;
 						this.where.order = 'sales';
 						this.getGoods();
 						break;
-					case 3:
-						this.navActive = 2;
-						this.sortPrice = !this.sortPrice;
+					case 2:
+						this.navActive = 2; //按照价格排序
 						this.where.order = this.sortPrice ? 'price_asc' : 'price_desc';
+						this.sortPrice = !this.sortPrice;
+						this.getGoods();
+						break;
+					case 3:
+						this.navActive = 3; //评分
+						this.where.order = 'rate';
 						this.getGoods();
 						break;
 					case 4:
-						if(isDiy == 1 || isDiy == 2) this.diyActive = isDiy
+						if (isDiy == 1 || isDiy == 2) this.diyActive = isDiy
 						this.navActive = 3;
 						this.where.order = 'is_new';
 						this.getGoods();
 						break;
 					case 5:
-					if(isDiy == 1 || isDiy == 2) this.diyActive = isDiy
+						if (isDiy == 1 || isDiy == 2) this.diyActive = isDiy
 						this.navActive = 5;
 						this.where.action = 1;
 						this.where.order = ""
@@ -1030,7 +1035,7 @@
 							uni.hideLoading();
 							uni.navigateTo({
 								url: '/pages/activity/assist_detail/index?id=' + id
-							});	
+							});
 						}).catch((err) => {
 							uni.showToast({
 								title: err,
@@ -1047,6 +1052,7 @@
 				uni.$emit('scroll');
 				this.navShow = e.detail.scrollTop >= 50;
 			},
+
 			goback: function() {
 				uni.navigateBack();
 			},
@@ -1061,7 +1067,7 @@
 				this.tabActive = param;
 				this.goodsLoading = this.loadend = this.loading = false
 			},
-			resetParmas(){
+			resetParmas() {
 				this.where = {
 					order: '',
 					keyword: '',
@@ -1069,6 +1075,16 @@
 					limit: 30
 				}
 			},
+
+			// 获取dom布局信息
+			getDomInfo(selector) {
+				return new Promise((resolve, reject) => {
+					uni.createSelectorQuery().in(this).select(selector).boundingClientRect((data) => {
+						resolve(data);
+					}).exec();
+				})
+			},
+
 			//#ifdef H5
 			ShareInfo() {
 				let data = this.store;
@@ -1100,36 +1116,40 @@
 		},
 		onReachBottom() {
 			// 模拟触底刷新
-			if(this.tabActive == 0){
-				setTimeout(()=>{
+			if (this.tabActive == 0) {
+				setTimeout(() => {
 					this.goods.push(...this.goods);
-				},500)
+				}, 500)
 			}
 		},
-		onPullDownRefresh(){
+		onPullDownRefresh() {
 			// 模拟上拉刷新
-			setTimeout(()=>{
+			setTimeout(() => {
 				const newList = this.goods.reverse();
 				this.goods = newList;
 				uni.stopPullDownRefresh();
-			},500)
+			}, 500)
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	.tab-cont{
+	.tab-cont {
 		background: #f5f5f5;
 		min-height: 500rpx;
+		overflow: auto;
 	}
-	.noPointer{
+
+	.noPointer {
 		pointer-events: none;
 	}
+
 	/deep/.care {
 		background-image: none !important;
 		border: 1px solid #fff;
 		background-color: transparent;
 	}
+
 	.store-home {
 		position: fixed;
 		top: 0;
@@ -1144,84 +1164,154 @@
 		background: left top/750rpx 390rpx no-repeat fixed;
 		overflow: hidden;
 	}
+
 	.header {
 		position: relative;
-		z-index: 6;
-		display: flex;
-		align-items: center;
-		padding-right: 34rpx;
-		height: 43px;
-		padding-left: 33rpx;
+		padding: 0 34rpx;
+		height: calc(300rpx + var(--status-bar-height));
+		background-color: #40AE36;
+
 		.head-menu {
-			display: -webkit-box;
-			display: -webkit-flex;
 			display: flex;
-			-webkit-box-align: center;
-			-webkit-align-items: center;
 			align-items: center;
-			height: 27px;
-			width: 70px;
-			background: rgba(0, 0, 0, 0.25);
-			border-radius: 13px;
-			.icon-xiangzuo {
-				font-size: 32rpx;
+			height: 88rpx;
+			margin-bottom: 30rpx;
+
+			.icon-xiangzuo,
+			.icon-gouwuche {
+				font-size: 36rpx;
 				color: #FFFFFF;
 			}
+
 			.iconfont {
-				-webkit-box-flex: 1;
-				-webkit-flex: 1;
-				flex: 1;
-				text-align: center;
 				color: #fff;
-				box-sizing: border-box;
-				&.icon-xiangzuo {
-					border-right: 1px solid rgba(255,255,255,.3);
+			}
+
+			.search {
+				position: relative;
+				flex: 1;
+				display: flex;
+				align-items: center;
+				height: 58rpx;
+				border-radius: 29rpx;
+				margin: 0 32rpx;
+				background-color: #FFFFFF;
+
+				.iconfont {
+					margin-right: 13rpx;
+					margin-left: 30rpx;
+					font-size: 32rpx;
+					color: #A1A1A1;
+				}
+
+				.search-txt {
+					font-size: 26rpx;
+					color: #A1A1A1;
+				}
+
+				.search-btn {
+					position: absolute;
+					right: 4rpx;
+					width: 92rpx;
+					height: 50rpx;
+					line-height: 50rpx;
+					background: linear-gradient(139deg, #72BE53 0%, #46B03A 100%);
+					border-radius: 28rpx 28rpx 28rpx 28rpx;
+					font-weight: 400;
+					font-size: 26rpx;
+					color: #F8F9FA;
+					text-align: center;
 				}
 			}
 		}
-		.search {
-			flex: 1;
+
+		.shop {
 			display: flex;
 			align-items: center;
-			min-width: 0;
-			height: 58rpx;
-			border-radius: 29rpx;
-			margin-left: 32rpx;
-			background-color: #FFFFFF;
-			font-weight: 500;
-			font-size: 26rpx;
-			color: #999999;
-			/* #ifdef MP */
-			margin-right: 200rpx;
-			/* #endif */
-			.iconfont {
-				margin-right: 13rpx;
-				margin-left: 30rpx;
-				font-size: 24rpx;
+
+			.shop-logo {
+				position: absolute;
+				right: 0;
+				bottom: 12rpx;
+			}
+
+			.shop-img {
+				margin-right: 20rpx;
+			}
+
+			.shop-info {
+				.shop-info-title {
+					max-width: 400rpx;
+					margin-bottom: 10rpx;
+					font-weight: 600;
+					font-size: 28rpx;
+					color: #FFFFFF;
+				}
+
+				.shop-info-eva {
+					display: flex;
+					align-items: center;
+					margin-bottom: 10rpx;
+
+					.star {
+						display: flex;
+						align-items: center;
+					}
+
+					.shop-info-sale {
+						margin-right: 6rpx;
+						color: #FFFFFF;
+						font-size: 22rpx;
+					}
+
+					.icon-kefu3 {
+						color: #fff;
+					}
+				}
+
+				.shop-info-runtime {
+					margin-bottom: 10rpx;
+					font-size: 22rpx;
+					color: #FFFFFF;
+				}
+
+				.shop-info-addr {
+					width: 440rpx;
+					overflow: hidden;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+					font-size: 22rpx;
+					color: #FFFFFF;
+				}
 			}
 		}
 	}
-	.main_count{
+
+	.main_count {
 		background-color: #ffffff;
 		padding: 30rpx 20rpx;
-		.list{
+
+		.list {
 			width: 710rpx;
 			height: 280rpx;
 			margin-bottom: 30rpx;
 			position: relative;
-			.picture{
+
+			.picture {
 				width: 710rpx;
 				height: 280rpx;
 				border-radius: 16rpx;
 			}
 		}
 	}
+
 	.main {
 		flex: 1;
 		min-height: 0rpx;
 		box-sizing: border-box;
 		padding: 0;
 	}
+
 	.store {
 		position: relative;
 		z-index: 6;
@@ -1231,33 +1321,40 @@
 		padding-left: 20rpx;
 		padding-top: 20rpx;
 		padding-bottom: 22rpx;
+
 		image {
 			width: 74rpx;
 			height: 74rpx;
 			border-radius: 6rpx;
 		}
-		.store-margin{
+
+		.store-margin {
 			width: 26rpx;
 			height: 26rpx;
 			margin-left: 10rpx;
 		}
-		.kefu{
+
+		.kefu {
 			color: #ffffff;
 			margin-right: 26rpx;
 			cursor: pointer;
-			.icon-kefu3{
+
+			.icon-kefu3 {
 				font-size: 34rpx;
 			}
 		}
+
 		.text {
 			flex: 1;
 			min-width: 0;
 			margin-right: 20rpx;
 			margin-left: 20rpx;
+
 			navigator {
 				display: inline-flex;
 				align-items: center;
 				max-width: 100%;
+
 				.name {
 					flex: 1;
 					min-width: 0;
@@ -1269,12 +1366,14 @@
 					line-height: 1;
 					color: #FFFFFF;
 				}
+
 				.iconfont {
 					margin-left: 10rpx;
 					font-size: 17rpx;
 					color: #FFFFFF;
 				}
 			}
+
 			.score {
 				display: flex;
 				align-items: center;
@@ -1283,6 +1382,7 @@
 				font-size: 24rpx;
 				line-height: 1;
 				color: #FFFFFF;
+
 				.star {
 					position: relative;
 					width: 111rpx;
@@ -1290,6 +1390,7 @@
 					margin-right: 10rpx;
 					background: url(../../columnGoods/images/star.png) left top/100% 100% no-repeat;
 					overflow: hidden;
+
 					view {
 						position: absolute;
 						top: 0;
@@ -1297,13 +1398,15 @@
 						width: 100%;
 						height: 100%;
 						background: url(../../columnGoods/images/star_active.png) left top/111rpx 19rpx no-repeat;
-						&.star_purple{
+
+						&.star_purple {
 							background: url(../../columnGoods/images/star_active_purple.png) left top/111rpx 19rpx no-repeat;
 						}
 					}
 				}
 			}
 		}
+
 		button {
 			display: flex;
 			justify-content: center;
@@ -1315,39 +1418,51 @@
 			font-weight: 500;
 			font-size: 22rpx;
 			color: #FFFFFF;
+
 			.iconfont {
 				margin-right: 6rpx;
 				font-size: 22rpx;
 			}
+
 			&.gary {
 				background-color: #999;
 			}
 		}
 	}
+
 	.font-bg-red {
 		background-color: var(--view-theme);
 	}
+
 	.nav.fixed {
 		position: fixed;
 		left: 0;
 		width: 100%;
+
 		.nav-cont {
 			position: absolute;
 			width: 100%;
 		}
 	}
+
 	.nav {
 		position: relative;
+		padding: 0 30rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+
 		.nav-cont {
 			display: flex;
 			align-items: center;
 			height: 84rpx;
+
 			.item {
-				flex: 1;
 				display: flex;
 				justify-content: center;
 				align-items: center;
 				min-width: 0;
+
 				.cont {
 					display: flex;
 					justify-content: center;
@@ -1357,17 +1472,21 @@
 					border-radius: 22rpx;
 					font-weight: 500;
 					font-size: 24rpx;
-					color: #FFFFFF;
+					color: #666666;
+
 					.arrow-icon {
 						margin-left: 10rpx;
 						font-size: 18rpx;
 					}
+
 					.layout-icon {
 						font-size: 32rpx;
 					}
+
 					.icon-pailie {
 						font-size: 32rpx;
 					}
+
 					image {
 						width: 15rpx;
 						height: 21rpx;
@@ -1375,14 +1494,34 @@
 					}
 				}
 			}
+
 			.active {
 				.cont {
-					background-color: #FFFFFF;
+					font-size: 28rpx;
 					font-weight: bold;
 					color: var(--view-theme);
 				}
 			}
 		}
+
+		.guanzhu {
+			width: 146rpx;
+			height: 58rpx;
+			line-height: 58rpx;
+			background: #46B03A;
+			border-radius: 68rpx 68rpx 68rpx 68rpx;
+			font-weight: 600;
+			font-size: 28rpx;
+			color: #FFFFFF;
+			text-align: center;
+		}
+
+		.guanzhu-active {
+			background: transparent;
+			border: 2rpx solid #46B03A;
+			color: #46B03A;
+		}
+
 		.select {
 			position: absolute;
 			top: 100%;
@@ -1396,14 +1535,17 @@
 			border-bottom-left-radius: 24rpx;
 			background-color: #FFFFFF;
 			box-shadow: 0px 2px 10px 0px rgba(0, 0, 0, 0.06);
+
 			.item {
 				margin-top: 28rpx;
 				font-size: 24rpx;
 				color: #454545;
 			}
+
 			.active {
 				color: var(--view-theme);
-				.iconfont{
+
+				.iconfont {
 					color: var(--view-theme);
 					float: right;
 					font-size: 20rpx;
@@ -1411,6 +1553,7 @@
 			}
 		}
 	}
+
 	.goods {
 		display: flex;
 		flex-wrap: wrap;
@@ -1420,12 +1563,14 @@
 		padding-left: 20rpx;
 		background-color: #F5F5F5;
 		width: 750rpx;
+
 		.item {
 			width: 345rpx;
 			border-radius: 16rpx;
 			margin-bottom: 20rpx;
 			background-color: #FFFFFF;
 			overflow: hidden;
+
 			.sell_out {
 				display: flex;
 				width: 110rpx;
@@ -1433,14 +1578,15 @@
 				align-items: center;
 				justify-content: center;
 				border-radius: 100%;
-				background: rgba(0,0,0,.6);
+				background: rgba(0, 0, 0, .6);
 				color: #fff;
 				font-size: 24rpx;
 				position: absolute;
 				top: 50%;
 				left: 50%;
 				margin: -55rpx 0 0 -55rpx;
-				&::before{
+
+				&::before {
 					content: "";
 					display: block;
 					width: 100rpx;
@@ -1452,43 +1598,129 @@
 					left: 5rpx;
 				}
 			}
-			.image,.easy-loadimage,image,uni-image {
+
+			.image,
+			.easy-loadimage,
+			image,
+			uni-image {
 				width: 345rpx;
 				height: 345rpx;
+
 				image {
 					display: block;
 					width: 100%;
 					height: 100%;
 				}
 			}
+
 			.text {
 				padding: 20rpx 20rpx 25rpx;
+
 				.name {
-					font-weight: 500;
-					font-size: 30rpx;
-					line-height: 1;
-					color: #222222;
 					display: flex;
+					justify-content: space-between;
 					align-items: center;
-					.name_text{
+					margin-bottom: 10rpx;
+
+					.name_text {
 						display: inline-block;
-						max-width: 400rpx;
+						max-width: 340rpx;
+						font-size: 26rpx;
+						color: #262626;
+					}
+
+					.sale_num {
+						font-size: 22rpx;
+						color: #9A9A9A;
 					}
 				}
+
+				.tag {
+					margin-bottom: 10rpx;
+
+					.tag-item {
+						padding: 2rpx 6rpx;
+						border-radius: 6rpx;
+						border: 1rpx solid #40AE36;
+						font-size: 18rpx;
+						color: #40AE36;
+					}
+				}
+
+				.shop-detail {
+					display: flex;
+					align-items: center;
+					width: 100%;
+					margin-bottom: 28rpx;
+					font-size: 18rpx;
+					color: #999999;
+
+					.brand {
+						&::after {
+							content: "";
+							display: inline-block;
+							width: 0rpx;
+							height: 12rpx;
+							margin: 0 8rpx;
+							border: 1rpx solid #A1A1A1;
+							border-radius: 1rpx;
+							background-color: #A1A1A1;
+							opacity: .5;
+						}
+					}
+
+					.unit {}
+				}
+
+				.price {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					width: 100%;
+
+					.price-num {
+						.unit-price {
+							font-weight: bold;
+							color: #F55726;
+							font-size: 32rpx;
+						}
+
+						.unit-name {
+							font-size: 22rpx;
+							color: #999999;
+						}
+					}
+
+					.price-icon {
+						display: flex;
+						justify-content: center;
+						align-items: center;
+						width: 48rpx;
+						height: 48rpx;
+						margin-top: 4rpx;
+						border-radius: 50%;
+						background-color: #40AE36;
+						color: #fff;
+					}
+				}
+
 				.money-wrap {
 					display: flex;
 					align-items: center;
 					margin-top: 43rpx;
+
 					.money {
 						font-weight: bold;
 						font-size: 26rpx;
 						color: var(--view-priceColor);
+
 						text {
 							font-size: 34rpx;
 							line-height: 1;
 						}
-					}	
+					}
 				}
+
 				.score {
 					margin-top: 20rpx;
 					font-weight: 500;
@@ -1497,9 +1729,11 @@
 					color: #737373;
 				}
 			}
-			.item_tags{
+
+			.item_tags {
 				margin-top: 8rpx;
 			}
+
 			.item_tags .tags_item {
 				display: inline-block;
 				font-size: 20rpx;
@@ -1509,14 +1743,17 @@
 				line-height: 28rpx;
 				margin-right: 8rpx;
 			}
-			.item_tags .tags_item.ticket{
+
+			.item_tags .tags_item.ticket {
 				border: 1px solid var(--view-theme);
 				color: var(--view-theme);
 			}
-			.item_tags .tags_item.delivery{
+
+			.item_tags .tags_item.delivery {
 				color: #FF9000;
 				border: 1px solid #FF9000;
 			}
+
 			.foot {
 				display: flex;
 				justify-content: center;
@@ -1526,6 +1763,7 @@
 				font-weight: 500;
 				font-size: 24rpx;
 				color: #FFFFFF;
+
 				.iconfont {
 					margin-right: 10rpx;
 					font-size: 22rpx;
@@ -1538,6 +1776,7 @@
 	.column {
 		padding: 0;
 		background-color: #FFFFFF;
+
 		.item {
 			position: relative;
 			display: flex;
@@ -1545,6 +1784,7 @@
 			padding: 30rpx 20rpx;
 			border-radius: 0;
 			margin-bottom: 0;
+
 			&::before {
 				content: " ";
 				position: absolute;
@@ -1553,14 +1793,19 @@
 				left: 250rpx;
 				border-top: 1px solid #F5F5F5;
 			}
-			/deep/.image,/deep/.easy-loadimage,/deep/image,/deep/uni-image {
+
+			/deep/.image,
+			/deep/.easy-loadimage,
+			/deep/image,
+			/deep/uni-image {
 				width: 260rpx;
 				height: 260rpx;
 				border-radius: 16rpx;
 				overflow: hidden;
 				position: relative;
-				
+
 			}
+
 			.border-picture {
 				position: absolute;
 				top: 0;
@@ -1569,6 +1814,7 @@
 				height: 100%;
 				background: center/cover no-repeat;
 			}
+
 			.text {
 				position: relative;
 				width: 450rpx;
@@ -1576,18 +1822,22 @@
 				padding-top: 0;
 				padding-right: 0;
 				padding-bottom: 0;
+
 				.name {
 					color: #282828;
 					width: 100%;
 					display: flex;
 				}
-				.item_bot{
+
+				.item_bot {
 					width: 100%;
 				}
+
 				.money-wrap {
 					display: flex;
 					align-items: center;
 					margin-top: 52rpx;
+
 					.ticket {
 						height: 28rpx;
 						padding-right: 12rpx;
@@ -1601,6 +1851,7 @@
 					}
 				}
 			}
+
 			.foot {
 				position: absolute;
 				right: 20rpx;
@@ -1614,14 +1865,17 @@
 			}
 		}
 	}
+
 	.category {
 		padding-top: 34rpx;
 		padding-right: 20rpx;
 		padding-left: 20rpx;
+
 		.section {
 			border-radius: 10rpx;
 			margin-bottom: 20rpx;
 			background-color: #FFFFFF;
+
 			.head {
 				position: relative;
 				display: flex;
@@ -1631,6 +1885,7 @@
 				padding-left: 36rpx;
 				font-weight: bold;
 				color: #282828;
+
 				&::before {
 					content: " ";
 					position: absolute;
@@ -1641,6 +1896,7 @@
 					background-color: var(--view-theme);
 					transform: translateY(-50%);
 				}
+
 				.title {
 					flex: 1;
 					min-width: 0;
@@ -1649,17 +1905,20 @@
 					text-overflow: ellipsis;
 					font-size: 30rpx;
 				}
+
 				.iconfont {
 					font-size: 22rpx;
 					line-height: 1;
 				}
 			}
+
 			.body {
 				display: flex;
 				flex-wrap: wrap;
 				justify-content: space-between;
 				align-items: center;
 				padding: 9rpx 36rpx 14rpx;
+
 				.item {
 					width: 314rpx;
 					height: 84rpx;
@@ -1679,12 +1938,15 @@
 			}
 		}
 	}
+
 	.coupon {
 		padding: 30rpx;
 		background-color: #F5F5F5;
+
 		.item {
 			display: flex;
 			margin-bottom: 16rpx;
+
 			.left {
 				display: flex;
 				flex-direction: column;
@@ -1696,18 +1958,22 @@
 				line-height: 1;
 				color: #FFFFFF;
 				background-size: 100% 100%;
+
 				&.gary {
 					background-image: url('data:image/png;base64,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');
 				}
+
 				.money {
 					margin-bottom: 25rpx;
 					font-weight: 800;
 					font-size: 36rpx;
+
 					text {
 						font-size: 60rpx;
 					}
 				}
 			}
+
 			.right {
 				flex: 1;
 				min-width: 0;
@@ -1716,6 +1982,7 @@
 				background-color: #FFFFFF;
 				position: relative;
 				overflow: hidden;
+
 				.name {
 					padding-top: 32rpx;
 					padding-bottom: 32rpx;
@@ -1724,6 +1991,7 @@
 					font-size: 30;
 					line-height: 1;
 					color: #282828;
+
 					text {
 						display: inline-block;
 						text-align: center;
@@ -1739,6 +2007,7 @@
 						font-size: 20rpx;
 						color: var(--view-theme);
 						margin-right: 12rpx;
+
 						&.gary {
 							border-color: #BBB;
 							color: #bbb;
@@ -1747,6 +2016,7 @@
 						}
 					}
 				}
+
 				.time-wrap {
 					display: flex;
 					align-items: center;
@@ -1755,10 +2025,12 @@
 					font-weight: 500;
 					font-size: 20rpx;
 					color: #999999;
+
 					.time {
 						flex: 1;
 						min-width: 0;
 					}
+
 					.button {
 						width: 136rpx;
 						height: 44rpx;
@@ -1769,8 +2041,9 @@
 						line-height: 44rpx;
 						text-align: center;
 						color: #FFFFFF;
-					
+
 					}
+
 					.gary {
 						font-size: 130rpx;
 						color: #DFDFDF;
@@ -1782,10 +2055,12 @@
 				}
 			}
 		}
+
 		.disabled {
 			.left {
 				background-image: url(../static/images/coupon2.png);
 			}
+
 			.right {
 				.name {
 					text {
@@ -1793,6 +2068,7 @@
 						color: #C1C1C1;
 					}
 				}
+
 				.time-wrap {
 					.button {
 						background-color: #CCCCCC;
@@ -1802,22 +2078,26 @@
 			}
 		}
 	}
-	.empty-box{
+
+	.empty-box {
 		display: flex;
 		flex-direction: column;
 		justify-content: center;
 		align-items: center;
 		margin-top: 0;
 		padding-top: 200rpx;
-		image{
+
+		image {
 			width: 414rpx;
 			height: 240rpx;
 		}
-		.txt{
+
+		.txt {
 			font-size: 26rpx;
 			color: #999;
 		}
 	}
+
 	.footer {
 		position: fixed;
 		bottom: 0;
@@ -1830,6 +2110,7 @@
 		height: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
 		background-color: #FFFFFF;
 		opacity: 0.96;
+
 		.item {
 			flex: 1;
 			display: flex;
@@ -1839,34 +2120,41 @@
 			font-weight: 500;
 			font-size: 20rpx;
 			color: #282828;
+
 			.iconfont {
 				font-size: 43rpx;
 			}
-			.icon-zhuanti{
+
+			.icon-zhuanti {
 				font-size: 38rpx;
 			}
 		}
+
 		.active {
 			color: var(--view-theme);
 		}
 	}
-	.p-b-75{
+
+	.p-b-75 {
 		padding-bottom: 150rpx;
 	}
+
 	.vip-money {
 		color: #282828;
 		font-size: 22rpx;
 		margin-left: 6rpx;
 		font-weight: bold;
 	}
+
 	.vipImg {
 		width: 65rpx;
 		height: 28rpx;
 		margin-left: 4rpx;
+
 		image {
-			width: 100%!important;
-			height: 100%!important;
+			width: 100% !important;
+			height: 100% !important;
 			display: block;
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/users/user_address_list/index.vue b/pages/users/user_address_list/index.vue
index 2af423d..0b1908f 100644
--- a/pages/users/user_address_list/index.vue
+++ b/pages/users/user_address_list/index.vue
@@ -8,7 +8,9 @@
 				<view class='item' v-for="(item,index) in addressList" :key="index">
 					<view class='address' @click='goOrder(item.address_id)'>
 						<view class='consignee'>收货人：{{item.real_name}}<text class='phone'>{{item.phone}}</text></view>
-						<view>收货地址：{{item.province || ''}}{{item.city || ''}}{{item.district || ''}}{{item.street || ''}}{{item.detail || ''}}</view>
+						<view>
+							收货地址：{{item.province || ''}}{{item.city || ''}}{{item.district || ''}}{{item.street || ''}}{{item.detail || ''}}
+						</view>
 					</view>
 					<view class='operation acea-row row-between-wrapper'>
 						<!-- #ifndef MP -->
@@ -22,7 +24,8 @@
 						</radio>
 						<!-- #endif -->
 						<view class='acea-row row-middle'>
-							<view @click='editAddress(item.address_id)'><text class='iconfont icon-bianji'></text>编辑</view>
+							<view @click='editAddress(item.address_id)'><text class='iconfont icon-bianji'></text>编辑
+							</view>
 							<view @click='delAddress(index)'><text class='iconfont icon-shanchu'></text>删除</view>
 						</view>
 					</view>
@@ -38,7 +41,8 @@
 				<view>暂无地址</view>
 			</view>
 			<view class='footer acea-row row-between-wrapper'>
-				<view class='addressBnt b-color on' @click='addAddress'><text class='iconfont icon-tianjiadizhi'></text>添加新地址</view>
+				<view class='addressBnt b-color on' @click='addAddress'><text
+						class='iconfont icon-tianjiadizhi'></text>添加新地址</view>
 			</view>
 		</view>
 	</view>
@@ -57,7 +61,9 @@
 	// #ifdef H5
 	const jweixin = require('@/plugin/jweixin-module/index.js')
 	// #endif
-	import {getWechatConfig} from '@/api/public.js'
+	import {
+		getWechatConfig
+	} from '@/api/public.js'
 	import {
 		getAddressList,
 		setAddressDefault,
@@ -65,9 +71,15 @@
 		editAddress,
 		postAddress
 	} from '@/api/user.js';
-	import { mapGetters } from "vuex";
-	import { HTTP_REQUEST_URL } from '@/config/app';
-	import { toLogin } from '@/libs/login.js';
+	import {
+		mapGetters
+	} from "vuex";
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
+	import {
+		toLogin
+	} from '@/libs/login.js';
 	export default {
 		components: {},
 		data() {
@@ -81,7 +93,7 @@
 				loadTitle: '加载更多',
 				page: 1,
 				limit: 20,
-				wxConfig:{},
+				wxConfig: {},
 				domain: HTTP_REQUEST_URL,
 			};
 		},
@@ -93,7 +105,7 @@
 				this.couponId = options.couponId || 0;
 				this.getAddressList(true);
 			} else {
-        toLogin()
+				toLogin()
 			}
 		},
 		onReady() {
@@ -114,7 +126,7 @@
 					success: function(res) {
 						uni.chooseAddress({
 							success: function(res) {
-								console.log(res,'res')
+								console.log(res, 'res')
 								let addressP = {};
 								addressP.province = res.provinceName;
 								addressP.city = res.cityName;
@@ -126,10 +138,10 @@
 									// post_code: res.postalCode,
 									phone: res.telNumber,
 									detail: res.detailInfo,
-									province:res.provinceName,
-									district:res.countyName,
-									city:res.cityName,
-									city_id:''
+									province: res.provinceName,
+									district: res.countyName,
+									city: res.cityName,
+									city_id: ''
 								}).then(res => {
 									that.$util.Tips({
 										title: "添加成功",
@@ -144,9 +156,10 @@
 								});
 							},
 							fail: function(res) {
-								if (res.errMsg == 'chooseAddress:cancel') return that.$util.Tips({
-									title: '取消选择'
-								});
+								if (res.errMsg == 'chooseAddress:cancel') return that.$util
+									.Tips({
+										title: '取消选择'
+									});
 							},
 						})
 					},
@@ -186,7 +199,7 @@
 							detail: res.detailInfo,
 							post_code: res.postalCode,
 							is_default: 1,
-							city_id:""
+							city_id: ""
 						})
 						.then(() => {
 							that.$util.Tips({
@@ -273,9 +286,11 @@
 				this.pinkId = '';
 				this.couponId = '';
 				uni.navigateTo({
-					url: '/pages/users/user_address/index?id=' + id + '&cartId=' + cartId + '&pinkId=' + pinkId + '&couponId=' +couponId
+					url: '/pages/users/user_address/index?id=' + id + '&cartId=' + cartId + '&pinkId=' +
+						pinkId + '&couponId=' + couponId
 				})
 			},
+
 			/**
 			 * 删除地址
 			 */
@@ -285,19 +300,32 @@
 				if (address == undefined) return that.$util.Tips({
 					title: '您删除的地址不存在!'
 				});
-				delAddress(address.address_id).then(res => {
-					that.$util.Tips({
-						title: '删除成功',
-						icon: 'success'
-					}, function() {
-						that.addressList.splice(index, 1);
-						that.$set(that, 'addressList', that.addressList);
-					});
-				}).catch(err => {
-					return that.$util.Tips({
-						title: err
-					});
-				});
+				uni.showModal({
+					title: "提示",
+					content: "您确定要删除当前地址吗？",
+					success(res) {
+						if (res.confirm) {
+							delAddress(address.address_id).then(res => {
+								that.$util.Tips({
+									title: '删除成功',
+									icon: 'success'
+								}, function() {
+									that.addressList.splice(index, 1);
+									that.$set(that, 'addressList', that.addressList);
+								});
+							}).catch(err => {
+								return that.$util.Tips({
+									title: err
+								});
+							});
+						} else {
+							that.$util.Tips({
+								title: '您已取消！',
+								icon: 'none'
+							});
+						}
+					}
+				})
 			},
 			/**
 			 * 新增地址
@@ -326,7 +354,8 @@
 					this.pinkId = '';
 					this.couponId = '';
 					uni.redirectTo({
-						url: '/pages/users/order_confirm/index?is_address=1&cartId=' + cartId + '&addressId=' + id + '&pinkId=' +
+						url: '/pages/users/order_confirm/index?is_address=1&cartId=' + cartId + '&addressId=' +
+							id + '&pinkId=' +
 							pinkId + '&couponId=' + couponId
 					})
 				}
@@ -341,62 +370,75 @@
 <style lang="scss" scoped>
 	/deep/radio .wx-radio-input.wx-radio-input-checked,
 	/deep/uni-radio .uni-radio-input.uni-radio-input-checked {
-	 border: 1px solid var(--view-theme)!important;
-	 background-color: var(--view-theme)!important;
+		border: 1px solid var(--view-theme) !important;
+		background-color: var(--view-theme) !important;
 	}
+
 	.address-management.fff {
 		background-color: #fff;
 		height: 100vh;
 	}
+
 	.address-management .line {
 		width: 100%;
 		height: 3rpx;
 	}
+
 	.address-management .line image {
 		width: 100%;
 		height: 100%;
 		display: block;
 	}
+
 	.address-management .item {
 		background-color: #fff;
 		padding: 0 30rpx;
 		margin-bottom: 12rpx;
 	}
+
 	.address-management .item .address {
 		padding: 30rpx 0;
 		border-bottom: 1px solid #eee;
 		font-size: 28rpx;
 		color: #282828;
 	}
+
 	.address-management .item .address .consignee {
 		font-size: 28rpx;
 		font-weight: bold;
 		margin-bottom: 8rpx;
 	}
+
 	.address-management .item .address .consignee .phone {
 		margin-left: 25rpx;
 	}
+
 	.address-management .item .operation {
 		height: 83rpx;
 		font-size: 28rpx;
 		color: #282828;
 	}
+
 	.b-color {
 		background-color: var(--view-theme);
 	}
+
 	.address-management .item .operation .radio text {
 		margin-left: 13rpx;
 	}
+
 	.address-management .item .operation .iconfont {
 		color: #2c2c2c;
 		font-size: 35rpx;
 		vertical-align: -2rpx;
 		margin-right: 10rpx;
 	}
+
 	.address-management .item .operation .iconfont.icon-shanchu {
 		margin-left: 40rpx;
 		font-size: 38rpx;
 	}
+
 	.address-management .footer {
 		position: fixed;
 		width: 100%;
@@ -408,6 +450,7 @@
 		padding: 0 30rpx;
 		box-sizing: border-box;
 	}
+
 	.address-management .footer .addressBnt {
 		width: 330rpx;
 		height: 76rpx;
@@ -417,27 +460,33 @@
 		font-size: 30rpx;
 		color: #fff;
 	}
+
 	.address-management .footer .addressBnt.on {
 		width: 690rpx;
 		margin: 0 auto;
 	}
+
 	.address-management .footer .addressBnt .iconfont {
 		font-size: 35rpx;
 		margin-right: 8rpx;
 		vertical-align: -1rpx;
 	}
+
 	.address-management .footer .addressBnt.wxbnt {
 		background-color: #fe960f;
 	}
-	.noCommodity{
+
+	.noCommodity {
 		text-align: center;
 		border-top: none;
 		margin-top: 15vh;
 	}
-	.noCommodity .pictrue{
+
+	.noCommodity .pictrue {
 		height: 305rpx;
 	}
-	.noCommodity view{
+
+	.noCommodity view {
 		color: #999;
 	}
-</style>
+</style>
\ No newline at end of file