From 9c5bf7f854fc16446faaa9db91257abcdd67aa55 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Fri, 28 May 2021 11:29:17 +0800
Subject: [PATCH 1/3] no message

---
 pages/product/customerservice/index.vue | 33 +++++++++++++------------
 pages/product/goods.vue                 | 18 +++++++++++---
 2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/pages/product/customerservice/index.vue b/pages/product/customerservice/index.vue
index a3356d7..1d4793b 100644
--- a/pages/product/customerservice/index.vue
+++ b/pages/product/customerservice/index.vue
@@ -14,28 +14,29 @@
 		methods: {
 			
 		},
-		onLoad () {
+		onLoad (e) {
+			const params = JSON.parse((decodeURIComponent(e.params)))
 			chat.init({
-				sign: '4a971f4f4ff9637cd9286a0197b0573bf2f65de052c21791f90d4235fca41456e1cc145075567f5f47b8e13c895f3fc8cacec5789f9afee8df670f7cbe5c0f82',  //必传，公司渠道唯一标识，腾讯云智服后台系统创建「小程序插件」渠道后，在「渠道管理」获取
-				token: '', //非必填
-				uid: '',   //用户唯一标识，如果没有则不填写，默认为空
-				title: 'lilishop自营店', //非必填，如果未填写，默认获取配置标题
+				sign: params.mpSign,  //必传，公司渠道唯一标识，腾讯云智服后台系统创建「小程序插件」渠道后，在「渠道管理」获取
+				token: params.token, //非必填
+				uid: params.uuid,   //用户唯一标识，如果没有则不填写，默认为空
+				title: params.storageName, //非必填，如果未填写，默认获取配置标题
 				isRMB: '', //商品是否显示人民币￥,默认显示，false不显示
 				data: {    //参数c1,c2,c3,c4,c5用于传递用户信息，参数d1,d2,d3,d4,d5,d6用于传递商品信息，默认为空
-				  c1: '1',
-				  c2: '2',
-				  c3: '3',
-				  c4: '4',
-				  c5: '5',
-				  d1: '这是描述', //商品描述
-				  d2: '122.00', //价格
-				  d3: '150.00', //原价格
-				  d4: '', //展示商品图片链接
+				  c1: '',
+				  c2: '',
+				  c3: '',
+				  c4: '',
+				  c5: '',
+				  d1: params.goodsName, //商品描述
+				  d2: params.price, //价格
+				  d3: '', //原价格
+				  d4: params.goodsImg, //展示商品图片链接
 				  d5: '', //商品跳转链接
-				  d6: '', //商品id
+				  d6: params.goodsId, //商品id
 				  data: ''//加密串,非必填
 				},
-				viewUrl(res){  //需要跳转的链接，则需要配置一个web-view
+				viewUrl(res){  //需要跳转外部链接，则需要配置一个web-view
 				if (res) {
 				  wx.navigateTo({
 					url: '/pages/webview/index?href=' + res
diff --git a/pages/product/goods.vue b/pages/product/goods.vue
index 2a25917..f20949d 100644
--- a/pages/product/goods.vue
+++ b/pages/product/goods.vue
@@ -472,7 +472,7 @@ export default {
       // 获取店铺基本信息
       this.getstoreBaseInfoFun(this.goodsDetail.storeId);
 
-      // 获取购物车
+      // 获取购物车数量
       this.cartCount();
 
       // 获取店铺推荐商品
@@ -486,9 +486,21 @@ export default {
         this.getGoodsCollectionFun(this.goodsDetail.id);
       }
     },
-	linkMsgDetail () {
+	linkMsgDetail () { // 客服
+		const params = {
+			storeName: this.storeDetail.storeName,
+			goodsName: this.goodsDetail.goodsName,
+			goodsId: this.goodsDetail.goodsId,
+			goodsImg: this.goodsDetail.thumbnail,
+			price: this.goodsDetail.promotionPrice || this.goodsDetail.price,
+			// originalPrice: this.goodsDetail.original || this.goodsDetail.price,
+			uuid: storage.getUuid(),
+			token: storage.getAccessToken(),
+			sign: this.storeDetail.yzfSign || '37ef9b97807d03c6741298ed4eb5b536d2d238e08a3c00fb01fe48f03a569974c99ad767e72c04b3165ef29aca2c488b505fe4ca',
+			mpSign: this.storeDetail.yzfMpSign || '32b8ff6f8d1c240be8d7fe51bdd6d44a6776ea86930afbe5c3c342825e942c914fc6126b6be1f003ab04aee1af9f442d2c33e1427529300671588866edaa4b12'
+		}
 		uni.navigateTo({
-			url: '/pages/product/customerservice/index'
+			url: '/pages/product/customerservice/index?params=' + encodeURIComponent(JSON.stringify(params))
 		})
 	},
     // 格式化金钱  1999 --> [1999,00]

From b7fb67d97518dc2b7c93f375474003b4b0e8a882 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Fri, 28 May 2021 17:18:17 +0800
Subject: [PATCH 2/3] =?UTF-8?q?app=20=E5=AE=A2=E6=9C=8D=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/product/goods.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pages/product/goods.vue b/pages/product/goods.vue
index f20949d..6f78fe7 100644
--- a/pages/product/goods.vue
+++ b/pages/product/goods.vue
@@ -487,6 +487,7 @@ export default {
       }
     },
 	linkMsgDetail () { // 客服
+		// #ifdef MP-WEIXIN
 		const params = {
 			storeName: this.storeDetail.storeName,
 			goodsName: this.goodsDetail.goodsName,
@@ -502,6 +503,13 @@ export default {
 		uni.navigateTo({
 			url: '/pages/product/customerservice/index?params=' + encodeURIComponent(JSON.stringify(params))
 		})
+		// #endif
+		// #ifndef MP-WEIXIN
+		const sign = this.storeDetail.yzfSign || '37ef9b97807d03c6741298ed4eb5b536d2d238e08a3c00fb01fe48f03a569974c99ad767e72c04b3165ef29aca2c488b505fe4ca'
+		uni.navigateTo({
+			url: '/pages/tabbar/home/web-view?src=https://yzf.qq.com/xv/web/static/chat/index.html?sign=' + sign
+		})
+		// #endif
 	},
     // 格式化金钱  1999 --> [1999,00]
     formatPrice(val) {

From de639c808ce6f27011bfc9f7ac370c1e2e6e07ca Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Fri, 4 Jun 2021 17:32:39 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=95=86=E5=93=81=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BF=AB=E6=8D=B7=E5=AF=BC=E8=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/api.js                        |    8 +-
 pages/product/goods.vue              | 1560 +++++++++++++-------------
 pages/product/product/shop/-shop.vue |   21 +-
 pages/product/product/style.scss     |   36 +-
 4 files changed, 845 insertions(+), 780 deletions(-)

diff --git a/config/api.js b/config/api.js
index 5932087..b25e3eb 100644
--- a/config/api.js
+++ b/config/api.js
@@ -5,10 +5,14 @@
 // 开发环境
 const dev = {
   common: "https://common-api.pickmall.cn",
-  buyer: "https://buyer-api.pickmall.cn",
+  buyer: "https://buyer-api.pickmall.cn",
+  // common: 'http://192.168.0.109:8890',
+  // buyer: 'http://192.168.0.109:8888',
 };
 // 生产环境
-const prod = {
+const prod = {
+	// common: 'http://192.168.0.109:8890',
+	// buyer: 'http://192.168.0.109:8888',
   common: "https://common-api.pickmall.cn",
   buyer: "https://buyer-api.pickmall.cn",
  
diff --git a/pages/product/goods.vue b/pages/product/goods.vue
index 6f78fe7..cc9d1b3 100644
--- a/pages/product/goods.vue
+++ b/pages/product/goods.vue
@@ -1,846 +1,868 @@
 <template>
-  <div class="main-page">
+	<div class="main-page">
 
-    <!-- #ifdef APP-PLUS -->
-    <view class="status_bar"></view>
-    <!-- #endif -->
-    <!-- 仅h5有效 打开App -->
+		<!-- #ifdef APP-PLUS -->
+		<view class="status_bar"></view>
+		<!-- #endif -->
+		<!-- 仅h5有效 打开App -->
 
-    <!-- 分享 -->
-    <shares v-if="shareFlage && goodsDetail.id" :skuId="this.routerVal.id" :goodsId="this.routerVal.goodsId" :link="'/pages/product/goods?id='+this.routerVal.id+'&goodsId='+this.routerVal.goodsId"
-      :thumbnail="goodsDetail.thumbnail" :goodsName="goodsDetail.goodsName" type="goods" @close="shareFlage = false" />
-    <view class="index">
-      <u-navbar :background="navbar" :is-back="false" :class="headerFlag ? 'header' : 'header bg-none scoll-hide'">
-        <div class="headerRow">
-          <div class="backs" @click="back()">
-            <u-icon name="arrow-left" color="#8e8e8e"></u-icon>
-          </div>
-          <div class="headerList" :class="headerFlag ? 'tab-bar' : 'tab-bar scoll-hide'">
-            <div class="headerRow">
-              <div style="text-align: center" :span="3" v-for="header in headerList" :key="header.id" :class="{ cur: scrollId === header.id }" @click="headerTab(header.id)">
-                {{ header.text }}
-              </div>
-            </div>
-          </div>
-          <div class="share" @click="shareChange()">
-            <image class="shareImg" src="/static/share.png" alt=""></image>
-          </div>
-        </div>
-      </u-navbar>
+		<!-- 分享 -->
+		<shares v-if="shareFlage && goodsDetail.id" :skuId="this.routerVal.id" :goodsId="this.routerVal.goodsId"
+			:link="'/pages/product/goods?id='+this.routerVal.id+'&goodsId='+this.routerVal.goodsId"
+			:thumbnail="goodsDetail.thumbnail" :goodsName="goodsDetail.goodsName" type="goods"
+			@close="shareFlage = false" />
+		<view class="index">
+			<u-navbar :background="navbar" :is-back="false"
+				:class="headerFlag ? 'header' : 'header bg-none scoll-hide'">
+				<div class="headerRow">
+					<div class="backs" @click="back()">
+						<u-icon name="arrow-left" color="#8e8e8e"></u-icon>
+					</div>
+					<div  :class="headerFlag ? 'tab-bar' : 'tab-bar scoll-hide'">
+						<div class="headerList">
+							<div style="text-align: center" :span="3" v-for="header in headerList" :key="header.id"
+								:class="{ cur: scrollId === header.id }" @click="headerTab(header.id)">
+								{{ header.text }}
+							</div>
+						</div>
+					</div>
+					<div class="share" @click="shareChange()">
+						<u-icon class="fast-icon  fast-icon-dark" name="zhuanfa"></u-icon>
+						<u-icon class="fast-icon  fast-icon-dark" name="list"></u-icon>
+					</div>
+				</div>
+			</u-navbar>
 
-      <view class="showBack" v-show="!headerFlag">
-        <u-row>
-          <u-col :span="2" @click="back()">
-            <div class="iconBag" style="text-align: center">
-              <image class="headerImg" src="/static/bagBack.png" alt=""></image>
-            </div>
-          </u-col>
-          <u-col :span="8"></u-col>
+			<view class="showBack" v-show="!headerFlag">
+				<div class="headerRow">
+					<div @click="back()">
+						<u-icon name="arrow-left" class="fast-icon"></u-icon>
+					</div>
+					<div></div>
+					<div>
+						<u-icon @click="shareChange()" class="fast-icon" name="zhuanfa"></u-icon>
+						<!-- #ifndef MP-WEIXIN -->
+						<u-icon name="list" class="fast-icon ml-20"></u-icon>
+						<!-- #endif -->
+					</div>
+				</div>
+			</view>
+		</view>
+		<view class="product-container" :style="{ height: productRefHeight }" ref="productRef" id="productRef">
+			<scroll-view scroll-anchoring enableBackToTop="true" scroll-with-animation scroll-y class="scoll-page"
+				:scroll-top="tabScrollTop" @scroll="pageScroll">
+				<view>
+					<!-- 轮播图 -->
+					<GoodsSwiper id="main1" :res="imgList" />
 
-          <u-col :span="2" class="share" style="text-align: center" @click="shareChange()">
-            <image class="headerImg" src="/static/bagShare.png" alt=""></image>
-          </u-col>
-        </u-row>
-      </view>
-    </view>
-    <view class="product-container" :style="{ height: productRefHeight }" ref="productRef" id="productRef">
-      <scroll-view scroll-anchoring enableBackToTop="true" scroll-with-animation scroll-y class="scoll-page" :scroll-top="tabScrollTop" @scroll="pageScroll">
-        <view>
-          <!-- 轮播图 -->
-          <GoodsSwiper id="main1" :res="imgList" />
+					<!-- 促销活动条 -->
+					<PromotionAssembleLayout v-if="PromotionList" :detail="goodsDetail" :res="PromotionList" />
 
-          <!-- 促销活动条 -->
-          <PromotionAssembleLayout v-if="PromotionList" :detail="goodsDetail" :res="PromotionList" />
+					<view class="card-box top-radius-0" id="main2">
+						<!-- 活动不显示价钱 -->
+						<view v-if="!is_promotion" class="desc-blod -goods-msg">
+							<view class="-goods-flex">
+								<view class="desc-blod">
+									{{ goodsDetail.goodsName || "" }}
+								</view>
+								<view class="favorite" @click="clickFavorite(goodsDetail.id)">
+									<u-icon size="30" :color="favorite ? '#f2270c' : '#262626'"
+										:name="favorite ? 'heart-fill' : 'heart'"></u-icon>
+									<view :style="{ color: favorite ? '#f2270c' : '#262626' }">
+										{{ favorite ? "已收藏" : "收藏" }}</view>
+								</view>
+							</view>
+							<!-- 商品描述 -->
+							<view class="-goods-desc">
+								{{ goodsDetail.sellingPoint || '' }}
+							</view>
+						</view>
+						<view v-else class="-goods-msg">
+							<!-- 没有拼团，秒杀等活动的情况下 -->
+							<view>
+								<view class="-goods-flex">
+									<!-- 如果有积分显示积分 -->
+									<view class="-goods-price" v-if="goodsDetail.price != undefined">
+										<span v-if="pointDetail.points"> <span
+												class="price">{{pointDetail.points}}</span>
+											<span>积分</span>
+										</span>
 
-          <view class="card-box top-radius-0" id="main2">
-            <!-- 活动不显示价钱 -->
-            <view v-if="!is_promotion" class="desc-blod -goods-msg">
-              <view class="-goods-flex">
-                <view class="desc-blod">
-                  {{ goodsDetail.goodsName || "" }}
-                </view>
-                <view class="favorite" @click="clickFavorite(goodsDetail.id)">
-                  <u-icon size="30" :color="favorite ? '#f2270c' : '#262626'" :name="favorite ? 'heart-fill' : 'heart'"></u-icon>
-                  <view :style="{ color: favorite ? '#f2270c' : '#262626' }">{{ favorite ? "已收藏" : "收藏" }}</view>
-                </view>
-              </view>
-              <!-- 商品描述 -->
-              <view class="-goods-desc">
-                {{ goodsDetail.sellingPoint || '' }}
-              </view>
-            </view>
-            <view v-else class="-goods-msg">
-              <!-- 没有拼团，秒杀等活动的情况下 -->
-              <view>
-                <view class="-goods-flex">
-                  <!-- 如果有积分显示积分 -->
-                  <view class="-goods-price" v-if="goodsDetail.price != undefined">
-                    <span v-if="pointDetail.points"> <span class="price">{{pointDetail.points}}</span>
-                      <span>积分</span>
-                    </span>
-
-                    <span v-else> <span>¥</span><span class="price">{{ formatPrice(goodsDetail.price)[0] }}</span>.{{
+										<span v-else> <span>¥</span><span
+												class="price">{{ formatPrice(goodsDetail.price)[0] }}</span>.{{
                       formatPrice(goodsDetail.price)[1]
                     }} </span>
-                  </view>
-                  <view class="-goods-price" v-else> ¥<span class="price">0 </span>.00 </view>
-                  <view class="favorite" @click="clickFavorite(goodsDetail.id)">
-                    <u-icon size="30" :color="favorite ? '#f2270c' : '#262626'" :name="favorite ? 'heart-fill' : 'heart'"></u-icon>
-                    <view :style="{ color: favorite ? '#f2270c' : '#262626' }">{{ favorite ? "已收藏" : "收藏" }}</view>
-                  </view>
-                </view>
-                <view class="-goods-name desc-blod">
-                  {{ goodsDetail.goodsName || "" }}
-                </view>
-                <view class="-goods-desc">
-                  {{ goodsDetail.sellingPoint || ''  }}
-                </view>
-              </view>
-            </view>
-          </view>
+									</view>
+									<view class="-goods-price" v-else> ¥<span class="price">0 </span>.00 </view>
+									<view class="favorite" @click="clickFavorite(goodsDetail.id)">
+										<u-icon size="30" :color="favorite ? '#f2270c' : '#262626'"
+											:name="favorite ? 'heart-fill' : 'heart'"></u-icon>
+										<view :style="{ color: favorite ? '#f2270c' : '#262626' }">
+											{{ favorite ? "已收藏" : "收藏" }}</view>
+									</view>
+								</view>
+								<view class="-goods-name desc-blod">
+									{{ goodsDetail.goodsName || "" }}
+								</view>
+								<view class="-goods-desc">
+									{{ goodsDetail.sellingPoint || ''  }}
+								</view>
+							</view>
+						</view>
+					</view>
 
-          <view class="card-box">
-            <view class="card-flex" @click="shutMask(1)">
-              <view class="card-title"> 促销 </view>
-              <view class="card-content">
-                <span v-if="PromotionList && emptyPromotion()">暂无促销信息</span>
-                <PromotionLayout v-else @shutMasks="shutMask" :res="PromotionList" />
-              </view>
-              <view class="card-bottom">
-                <u-icon name="more-dot-fill"></u-icon>
-              </view>
-            </view>
-          </view>
+					<view class="card-box">
+						<view class="card-flex" @click="shutMask(1)">
+							<view class="card-title"> 促销 </view>
+							<view class="card-content">
+								<span v-if="PromotionList && emptyPromotion()">暂无促销信息</span>
+								<PromotionLayout v-else @shutMasks="shutMask" :res="PromotionList" />
+							</view>
+							<view class="card-bottom">
+								<u-icon name="more-dot-fill"></u-icon>
+							</view>
+						</view>
+					</view>
 
-          <!-- 拼团用户列表 -->
-          <PromotionAssembleListLayout v-if="isGroup" @to-assemble-buy-now="toAssembleBuyNow" :res="PromotionList" />
+					<!-- 拼团用户列表 -->
+					<PromotionAssembleListLayout v-if="isGroup" @to-assemble-buy-now="toAssembleBuyNow"
+						:res="PromotionList" />
 
-          <view class="card-box">
-            <view class="card-flex" @click="shutMask(4)">
-              <view class="card-title"> 已选 </view>
-              <view class="card-content">
-                <span v-if="selectedGoods.spec">{{ selectedGoods.spec.specName }}-{{
+					<view class="card-box">
+						<view class="card-flex" @click="shutMask(4)">
+							<view class="card-title"> 已选 </view>
+							<view class="card-content">
+								<span v-if="selectedGoods.spec">{{ selectedGoods.spec.specName }}-{{
                     selectedGoods.spec.specValue
                   }}</span>
-                <span v-else>默认</span>
-              </view>
-              <view class="card-bottom">
-                <u-icon name="more-dot-fill"></u-icon>
-              </view>
-            </view>
-            <view class="card-flex" @click="shutMask(3)">
-              <view class="card-title"> 送至 </view>
-              <view class="card-content">
-                <span v-if="delivery">{{
+								<span v-else>默认</span>
+							</view>
+							<view class="card-bottom">
+								<u-icon name="more-dot-fill"></u-icon>
+							</view>
+						</view>
+						<view class="card-flex" @click="shutMask(3)">
+							<view class="card-title"> 送至 </view>
+							<view class="card-content">
+								<span v-if="delivery">{{
                   delivery.consigneeAddressPath | clearStrComma
                 }}</span>
-                <span v-else>暂无地址信息</span>
-              </view>
-              <view class="card-bottom">
-                <u-icon name="more-dot-fill"></u-icon>
-              </view>
-            </view>
-          </view>
+								<span v-else>暂无地址信息</span>
+							</view>
+							<view class="card-bottom">
+								<u-icon name="more-dot-fill"></u-icon>
+							</view>
+						</view>
+					</view>
 
-          <!-- 评价 -->
-          <Evaluation id="main5" :goodsDetail="goodsDetail" v-if="goodsDetail.id" />
+					<!-- 评价 -->
+					<Evaluation id="main5" :goodsDetail="goodsDetail" v-if="goodsDetail.id" />
 
-          <!-- 店铺推荐 -->
-          <storeLayout id="main7" :storeDetail="storeDetail" :goodsDetail="goodsDetail" :res="recommendList" />
+					<!-- 店铺推荐 -->
+					<storeLayout id="main7" :storeDetail="storeDetail" :goodsDetail="goodsDetail"
+						:res="recommendList" />
 
-          <!-- 宝贝详情 -->
-          <GoodsIntro id="main9" :res="goodsDetail" :goodsId="goodsDetail.goodsId" v-if="goodsDetail.id" />
+					<!-- 宝贝详情 -->
+					<GoodsIntro id="main9" :res="goodsDetail" :goodsId="goodsDetail.goodsId" v-if="goodsDetail.id" />
 
-          <!-- 宝贝推荐 -->
-          <GoodsRecommend id="main11" :res="likeGoodsList" />
-        </view>
-      </scroll-view>
+					<!-- 宝贝推荐 -->
+					<GoodsRecommend id="main11" :res="likeGoodsList" />
+				</view>
+			</scroll-view>
 
-      <view class="page-bottom mp-iphonex-bottom" id="pageBottom">
-        <view class="icon-btn">
-          <view class="icon-btn-item" @click="navigateToStore(goodsDetail.storeId)">
-            <u-icon size="34" class="red" name="home-fill"></u-icon>
-            <view class="red icon-btn-name">店铺</view>
-          </view>
-          <view class="icon-btn-item" @click="linkMsgDetail()">
-            <u-icon size="34" name="kefu-ermai"></u-icon>
-            <view class="icon-btn-name">客服</view>
-          </view>
-          <view class="icon-btn-item" @click="reluchToCart()">
-            <u-icon size="34" name="storeping-cart"></u-icon>
-            <view class="icon-btn-name">购物车</view>
-            <view v-if="nums && nums > 0" class="num-icon">{{ nums }}</view>
-          </view>
-        </view>
-        <!-- 正常结算页面 -->
-        <view class="detail-btn" v-if="!isGroup">
-          <view class="to-store-car to-store-btn" @click="shutMask(4)">加入购物车</view>
-          <view class="to-buy to-store-btn" @click="shutMask(4, 'buy')">立即购买</view>
-          <view class="to-store-car to-store-btn" v-if="startTimer">暂未开始</view>
-        </view>
-        <!-- 拼团结算 -->
-        <view class="detail-btn" v-else>
-          <view class="to-store-car pt-buy to-store-btn" @click="shutMask(4, 'buy')">
-            <view>￥{{ goodsDetail.price | unitPrice }}</view>
-            <view>单独购买</view>
-          </view>
-          <view class="to-buy pt-buy to-store-btn" @click="toAssembleBuyNow">
-            <view>￥{{ goodsDetail.promotionPrice | unitPrice }}</view>
-            <view>拼团价格</view>
-          </view>
-        </view>
-      </view>
-      <!-- 规格-模态层弹窗 -->
-      <view class="popup spec" @click="shutMask(false)" v-show="maskFlag">
-        <!-- 促销弹窗 -->
-        <view class="cuxiao mask" v-show="cuxiao">
-          <view ref="mask_title" class="title mask_title">
-            优惠
-            <span @click="shutMask(false)">×</span>
-          </view>
-          <scroll-view class="scroll_mask" :scroll-y="true">
-            <view class="con-cuxiao">
-              <text>促销活动</text>
-              <PromotionDetailsLayout :res="PromotionList" />
-            </view>
-            <view class="con-cuxiao coupons">
-              <text>可领优惠券</text>
-              <PromotionCoupon @getCoupon="getCoupon" :res="PromotionList" />
-            </view>
-          </scroll-view>
-        </view>
+			<view class="page-bottom mp-iphonex-bottom" id="pageBottom">
+				<view class="icon-btn">
+					<view class="icon-btn-item" @click="navigateToStore(goodsDetail.storeId)">
+						<u-icon size="34" class="red" name="home-fill"></u-icon>
+						<view class="red icon-btn-name">店铺</view>
+					</view>
+					<view class="icon-btn-item" @click="linkMsgDetail()">
+						<u-icon size="34" name="kefu-ermai"></u-icon>
+						<view class="icon-btn-name">客服</view>
+					</view>
+					<view class="icon-btn-item" @click="reluchToCart()">
+						<u-icon size="34" name="storeping-cart"></u-icon>
+						<view class="icon-btn-name">购物车</view>
+						<view v-if="nums && nums > 0" class="num-icon">{{ nums }}</view>
+					</view>
+				</view>
+				<!-- 正常结算页面 -->
+				<view class="detail-btn" v-if="!isGroup">
+					<view class="to-store-car to-store-btn" @click="shutMask(4)">加入购物车</view>
+					<view class="to-buy to-store-btn" @click="shutMask(4, 'buy')">立即购买</view>
+					<view class="to-store-car to-store-btn" v-if="startTimer">暂未开始</view>
+				</view>
+				<!-- 拼团结算 -->
+				<view class="detail-btn" v-else>
+					<view class="to-store-car pt-buy to-store-btn" @click="shutMask(4, 'buy')">
+						<view>￥{{ goodsDetail.price | unitPrice }}</view>
+						<view>单独购买</view>
+					</view>
+					<view class="to-buy pt-buy to-store-btn" @click="toAssembleBuyNow">
+						<view>￥{{ goodsDetail.promotionPrice | unitPrice }}</view>
+						<view>拼团价格</view>
+					</view>
+				</view>
+			</view>
+			<!-- 规格-模态层弹窗 -->
+			<view class="popup spec" @click="shutMask(false)" v-show="maskFlag">
+				<!-- 促销弹窗 -->
+				<view class="cuxiao mask" v-show="cuxiao">
+					<view ref="mask_title" class="title mask_title">
+						优惠
+						<span @click="shutMask(false)">×</span>
+					</view>
+					<scroll-view class="scroll_mask" :scroll-y="true">
+						<view class="con-cuxiao">
+							<text>促销活动</text>
+							<PromotionDetailsLayout :res="PromotionList" />
+						</view>
+						<view class="con-cuxiao coupons">
+							<text>可领优惠券</text>
+							<PromotionCoupon @getCoupon="getCoupon" :res="PromotionList" />
+						</view>
+					</scroll-view>
+				</view>
 
-        <!-- 配送地址弹窗 -->
-        <popupAddress @closeAddress="closePopupAddress" @deliveryData="deliveryFun" v-if="goodsDetail.id" :goodsId="goodsDetail.id" :addressFlag="addressFlag" />
+				<!-- 配送地址弹窗 -->
+				<popupAddress @closeAddress="closePopupAddress" @deliveryData="deliveryFun" v-if="goodsDetail.id"
+					:goodsId="goodsDetail.id" :addressFlag="addressFlag" />
 
-        <!-- 商品规格  商品详情，以及默认参与活动的id-->
-        <popupGoods :addr="delivery" ref="popupGoods" @changed="changedGoods" @closeBuy="closePopupBuy" @queryCart="cartCount()" :goodsDetail="goodsDetail" :goodsSpec="goodsSpec" :id="productId"
-          v-if="goodsDetail.id " :pointDetail="pointDetail" @handleClickSku="init" :buyMask="buyMask" />
-      </view>
-    </view>
-  </div>
+				<!-- 商品规格  商品详情，以及默认参与活动的id-->
+				<popupGoods :addr="delivery" ref="popupGoods" @changed="changedGoods" @closeBuy="closePopupBuy"
+					@queryCart="cartCount()" :goodsDetail="goodsDetail" :goodsSpec="goodsSpec" :id="productId"
+					v-if="goodsDetail.id " :pointDetail="pointDetail" @handleClickSku="init" :buyMask="buyMask" />
+			</view>
+		</view>
+	</div>
 </template>
 
 <script>
-/************接口API***************/
-import {
-  getGoods,
-  getGoodsList,
-  getMpScene,
-  getGoodsDistribution,
-} from "@/api/goods.js";
-import * as API_trade from "@/api/trade.js";
-import * as API_Members from "@/api/members.js";
-import * as API_store from "@/api/store.js";
+	/************接口API***************/
+	import {
+		getGoods,
+		getGoodsList,
+		getMpScene,
+		getGoodsDistribution,
+	} from "@/api/goods.js";
+	import * as API_trade from "@/api/trade.js";
+	import * as API_Members from "@/api/members.js";
+	import * as API_store from "@/api/store.js";
 
-/************请求存储***************/
-import storage from "@/utils/storage.js";
+	/************请求存储***************/
+	import storage from "@/utils/storage.js";
 
-/************组件***************/
-import PromotionLayout from "./product/promotion/-promotion"; //促销组件
-import PromotionDetailsLayout from "./product/promotion/-promotion-details"; //促销活动详情
-import PromotionAssembleLayout from "./product/promotion/-promotion-assemble-promotions"; //促销活动条
-import PromotionAssembleListLayout from "./product/promotion/-promotion-assemble-list"; //拼团用户列表
-import PromotionCoupon from "./product/promotion/-promotion-coupon"; //优惠券组件
-import GoodsIntro from "./product/goods/-goods-intro"; //商品介绍组件
-import GoodsRecommend from "./product/goods/-goods-recommend"; //宝贝推荐
-import storeLayout from "./product/shop/-shop"; //店铺组件
-import Evaluation from "./product/evaluation/-evaluation"; //评价组件
-import GoodsSwiper from "./product/goods/-goods-swiper"; //轮播图组件
-import popupGoods from "./product/popup/goods"; //购物车商品的模块
-import popupAddress from "./product/popup/address"; //地址选择模块
-import shares from "@/components/m-share/index"; //分享
-export default {
-  components: {
-    shares,
-    PromotionLayout,
-    PromotionDetailsLayout,
-    PromotionAssembleLayout,
-    PromotionAssembleListLayout,
-    PromotionCoupon,
-    GoodsIntro,
-    GoodsRecommend,
-    storeLayout,
-    Evaluation,
-    GoodsSwiper,
-    popupGoods,
-    popupAddress,
-  },
-  data() {
-    return {
-      shareFlage: false,
-      selectedGoods: "", //选择的商品规格昵称
-      is_promotion: true, //判断显示拼团活动文字
-      isGroup: false, // 是否是拼团活动
-      pointDetail: "", // 是否是积分商品
-      assemble: "", //拼团的sku
-      scroll_mask_height: 0, //促销活动的高度
-      navbar: {
-        background: "#fff",
-      },
+	/************组件***************/
+	import PromotionLayout from "./product/promotion/-promotion"; //促销组件
+	import PromotionDetailsLayout from "./product/promotion/-promotion-details"; //促销活动详情
+	import PromotionAssembleLayout from "./product/promotion/-promotion-assemble-promotions"; //促销活动条
+	import PromotionAssembleListLayout from "./product/promotion/-promotion-assemble-list"; //拼团用户列表
+	import PromotionCoupon from "./product/promotion/-promotion-coupon"; //优惠券组件
+	import GoodsIntro from "./product/goods/-goods-intro"; //商品介绍组件
+	import GoodsRecommend from "./product/goods/-goods-recommend"; //宝贝推荐
+	import storeLayout from "./product/shop/-shop"; //店铺组件
+	import Evaluation from "./product/evaluation/-evaluation"; //评价组件
+	import GoodsSwiper from "./product/goods/-goods-swiper"; //轮播图组件
+	import popupGoods from "./product/popup/goods"; //购物车商品的模块
+	import popupAddress from "./product/popup/address"; //地址选择模块
+	import shares from "@/components/m-share/index"; //分享
+	export default {
+		components: {
+			shares,
+			PromotionLayout,
+			PromotionDetailsLayout,
+			PromotionAssembleLayout,
+			PromotionAssembleListLayout,
+			PromotionCoupon,
+			GoodsIntro,
+			GoodsRecommend,
+			storeLayout,
+			Evaluation,
+			GoodsSwiper,
+			popupGoods,
+			popupAddress,
+		},
+		data() {
+			return {
+				shareFlage: false,
+				selectedGoods: "", //选择的商品规格昵称
+				is_promotion: true, //判断显示拼团活动文字
+				isGroup: false, // 是否是拼团活动
+				pointDetail: "", // 是否是积分商品
+				assemble: "", //拼团的sku
+				scroll_mask_height: 0, //促销活动的高度
+				navbar: {
+					background: "#fff",
+				},
 
-      productRefHeight: "",
-      header: {
-        top: 0,
-        height: 50,
-      },
-      headerFlag: false, //顶部导航显示与否
-      headerList: [
-        //顶部导航文字
-        {
-          text: "商品",
-          id: "1",
-        },
-        {
-          text: "评价",
-          id: "2",
-        },
-        {
-          text: "详情",
-          id: "3",
-        },
-        {
-          text: "推荐",
-          id: "4",
-        },
-      ],
-      oldtabScrollTop: 0,
-      tabScrollTop: null,
-      scrollArr: [],
-      scrollId: "1",
+				productRefHeight: "",
+				header: {
+					top: 0,
+					height: 50,
+				},
+				headerFlag: false, //顶部导航显示与否
+				headerList: [
+					//顶部导航文字
+					{
+						text: "商品",
+						id: "1",
+					},
+					{
+						text: "评价",
+						id: "2",
+					},
+					{
+						text: "详情",
+						id: "3",
+					},
+					{
+						text: "推荐",
+						id: "4",
+					},
+				],
+				oldtabScrollTop: 0,
+				tabScrollTop: null,
+				scrollArr: [],
+				scrollId: "1",
 
-      scrollFlag: true,
-      current: "1", //当前显示的轮播图页
+				scrollFlag: true,
+				current: "1", //当前显示的轮播图页
 
-      goodsDetail: {}, //商品数据
-      goodsSpec: "", //规格数据
-      imgList: [], //轮播图数据
-      favorite: false, //收藏与否flag
-      recommendList: [], //推荐列表
-      maskFlag: false, //模态显示与否
-      cuxiao: false, //促销弹窗
-      goodsInfo: false, //商品介绍弹窗
-      addressFlag: false, //配送地址弹窗
-      buyMask: false, //添加购物车直接购买，查看已选 弹窗
+				goodsDetail: {}, //商品数据
+				goodsSpec: "", //规格数据
+				imgList: [], //轮播图数据
+				favorite: false, //收藏与否flag
+				recommendList: [], //推荐列表
+				maskFlag: false, //模态显示与否
+				cuxiao: false, //促销弹窗
+				goodsInfo: false, //商品介绍弹窗
+				addressFlag: false, //配送地址弹窗
+				buyMask: false, //添加购物车直接购买，查看已选 弹窗
 
-      num: 1, //添加到购物车的数量
+				num: 1, //添加到购物车的数量
 
-      skuId: "", //
-      storeDetail: "", //店铺基本信息,
+				skuId: "", //
+				storeDetail: "", //店铺基本信息,
 
-      // 店铺信息
-      storeParams: {
-        pageNumber: 1,
-        pageSize: 10,
-      },
+				// 店铺信息
+				storeParams: {
+					pageNumber: 1,
+					pageSize: 10,
+				},
 
-      likeGoodsList: "", //相似商品列表
-      PromotionList: "", //活动,促销，列表
-      specList: [],
-      skusCombination: [],
-      selectedSpec: [],
-      nums: 0,
-      delivery: "",
+				likeGoodsList: "", //相似商品列表
+				PromotionList: "", //活动,促销，列表
+				specList: [],
+				skusCombination: [],
+				selectedSpec: [],
+				nums: 0,
+				delivery: "",
 
-      exchange: {},
-      productId: 0,
+				exchange: {},
+				productId: 0,
 
-      startTimer: false, //未开启 是false
+				startTimer: false, //未开启 是false
 
-      routerVal: "",
-    };
-  },
-  watch: {
-    isGroup(val) {
-      if (val) {
-        let timer = setInterval(() => {
-          this.$refs.popupGoods.buyType = "PINTUAN";
+				routerVal: "",
+			};
+		},
+		watch: {
+			isGroup(val) {
+				if (val) {
+					let timer = setInterval(() => {
+						this.$refs.popupGoods.buyType = "PINTUAN";
 
-          clearInterval(timer);
-        }, 100);
+						clearInterval(timer);
+					}, 100);
 
-        this.is_promotion = false;
-      } else {
-        this.is_promotion = true;
-        this.$refs.popupGoods.buyType = "";
-      }
-    },
-  },
-  mounted() {
-    const { windowHeight } = uni.getSystemInfoSync();
-    let bottomHeight = 0;
-    let topHeight = 0;
-    uni.getSystemInfo({
-      success: function (res) {
-        // res - 各种参数
-        let bottom = uni.createSelectorQuery().select(".page-bottom");
-        bottom
-          .boundingClientRect(function (data) {
-            if (data && data.height) {
-              //data - 各种参数
-              bottomHeight = data.height; // 获取元素宽度
-            }
-          })
-          .exec();
-        let top = uni.createSelectorQuery().select(".header");
-        top
-          .boundingClientRect(function (data) {
-            if (data && data.height) {
-              //data - 各种参数
-              topHeight = data.height; // 获取元素宽度
-            }
-          })
-          .exec();
-      },
-    });
+					this.is_promotion = false;
+				} else {
+					this.is_promotion = true;
+					this.$refs.popupGoods.buyType = "";
+				}
+			},
+		},
+		mounted() {
+			const {
+				windowHeight
+			} = uni.getSystemInfoSync();
+			let bottomHeight = 0;
+			let topHeight = 0;
+			uni.getSystemInfo({
+				success: function(res) {
+					// res - 各种参数
+					let bottom = uni.createSelectorQuery().select(".page-bottom");
+					bottom
+						.boundingClientRect(function(data) {
+							if (data && data.height) {
+								//data - 各种参数
+								bottomHeight = data.height; // 获取元素宽度
+							}
+						})
+						.exec();
+					let top = uni.createSelectorQuery().select(".header");
+					top
+						.boundingClientRect(function(data) {
+							if (data && data.height) {
+								//data - 各种参数
+								topHeight = data.height; // 获取元素宽度
+							}
+						})
+						.exec();
+				},
+			});
 
-    this.productRefHeight = windowHeight - bottomHeight + "px";
-  },
-  async onLoad(options) {
-    this.routerVal = options;
-  },
-  async onShow() {
-    this.goodsDetail = {};
-    //如果有参数ids说明事分销短连接，需要获取参数
-    if (this.routerVal.scene) {
-      getMpScene(this.routerVal.scene).then((res) => {
-        if (res.data.success) {
-          let data = res.data.result.split(","); // skuId,goodsId,distributionId
-          this.init(data[0], data[1], data[2]);
-        }
-      });
-    } else {
-      this.init(
-        this.routerVal.id,
-        this.routerVal.goodsId,
-        this.routerVal.distributionId,
-        this.routerVal.whetherPoint
-      );
-    }
-  },
-  methods: {
-    // 循环出当前促销是否为空
-    emptyPromotion() {
-      if (
-        this.PromotionList == "" ||
-        this.PromotionList == null ||
-        this.PromotionList == []
-      ) {
-        return true;
-      }
-    },
-    /**初始化信息 */
-    async init(id, goodsId, distributionId) {
-      this.isGroup = false; //初始化拼团
-      this.productId = id; // skuId
-      // 这里请求获取到页面数据  解析数据
-      uni.showLoading({
-        title: "加载中",
-        mask: true,
-      });
+			this.productRefHeight = windowHeight - bottomHeight + "px";
+		},
+		async onLoad(options) {
+			this.routerVal = options;
+		},
+		async onShow() {
+			this.goodsDetail = {};
+			//如果有参数ids说明事分销短连接，需要获取参数
+			if (this.routerVal.scene) {
+				getMpScene(this.routerVal.scene).then((res) => {
+					if (res.data.success) {
+						let data = res.data.result.split(","); // skuId,goodsId,distributionId
+						this.init(data[0], data[1], data[2]);
+					}
+				});
+			} else {
+				this.init(
+					this.routerVal.id,
+					this.routerVal.goodsId,
+					this.routerVal.distributionId,
+					this.routerVal.whetherPoint
+				);
+			}
+		},
+		methods: {
+			// 循环出当前促销是否为空
+			emptyPromotion() {
+				if (
+					this.PromotionList == "" ||
+					this.PromotionList == null ||
+					this.PromotionList == []
+				) {
+					return true;
+				}
+			},
+			/**初始化信息 */
+			async init(id, goodsId, distributionId) {
+				this.isGroup = false; //初始化拼团
+				this.productId = id; // skuId
+				// 这里请求获取到页面数据  解析数据
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				});
 
-      let response = await getGoods(id, goodsId);
+				let response = await getGoods(id, goodsId);
 
-      // 这里是绑定分销员
-      if (distributionId || this.$store.state.distributionId) {
-        let disResult = await getGoodsDistribution(distributionId);
-        if (!disResult.data.success || disResult.statusCode == 403) {
-          this.$store.state.distributionId = distributionId;
-        }
-      }
-      uni.hideLoading();
-      /**商品信息以及规格信息存储 */
-      this.goodsDetail = response.data.result.data;
-      this.goodsSpec = response.data.result.specs;
-      this.PromotionList = response.data.result.promotionMap;
+				// 这里是绑定分销员
+				if (distributionId || this.$store.state.distributionId) {
+					let disResult = await getGoodsDistribution(distributionId);
+					if (!disResult.data.success || disResult.statusCode == 403) {
+						this.$store.state.distributionId = distributionId;
+					}
+				}
+				uni.hideLoading();
+				/**商品信息以及规格信息存储 */
+				this.goodsDetail = response.data.result.data;
+				this.goodsSpec = response.data.result.specs;
+				this.PromotionList = response.data.result.promotionMap;
 
-      // 判断是否拼团活动或者积分商品 如果有则显示拼团活动信息
-      this.PromotionList &&
-        Object.keys(this.PromotionList).forEach((item) => {
-          // 拼团商品
-          if (item.indexOf("PINTUAN") == 0) {
-            this.isGroup = true;
-          }
-          // 积分
-          if (item.indexOf("POINTS_GOODS") == 0) {
-            this.pointDetail = this.PromotionList[item];
-          }
-        });
-      // 轮播图
-      this.imgList = this.goodsDetail.goodsGalleryList;
+				// 判断是否拼团活动或者积分商品 如果有则显示拼团活动信息
+				this.PromotionList &&
+					Object.keys(this.PromotionList).forEach((item) => {
+						// 拼团商品
+						if (item.indexOf("PINTUAN") == 0) {
+							this.isGroup = true;
+						}
+						// 积分
+						if (item.indexOf("POINTS_GOODS") == 0) {
+							this.pointDetail = this.PromotionList[item];
+						}
+					});
+				// 轮播图
+				this.imgList = this.goodsDetail.goodsGalleryList;
 
-      // 获取店铺基本信息
-      this.getstoreBaseInfoFun(this.goodsDetail.storeId);
+				// 获取店铺基本信息
+				this.getstoreBaseInfoFun(this.goodsDetail.storeId);
 
-      // 获取购物车数量
-      this.cartCount();
+				// 获取购物车数量
+				this.cartCount();
 
-      // 获取店铺推荐商品
-      this.getstoreRecommend();
+				// 获取店铺推荐商品
+				this.getstoreRecommend();
 
-      // 获取商品列表
-      this.getOtherLikeGoods();
-      // 获取商品是否已被收藏 如果未登录不获取
+				// 获取商品列表
+				this.getOtherLikeGoods();
+				// 获取商品是否已被收藏 如果未登录不获取
 
-      if (this.$options.filters.isLogin("auth")) {
-        this.getGoodsCollectionFun(this.goodsDetail.id);
-      }
-    },
-	linkMsgDetail () { // 客服
-		// #ifdef MP-WEIXIN
-		const params = {
-			storeName: this.storeDetail.storeName,
-			goodsName: this.goodsDetail.goodsName,
-			goodsId: this.goodsDetail.goodsId,
-			goodsImg: this.goodsDetail.thumbnail,
-			price: this.goodsDetail.promotionPrice || this.goodsDetail.price,
-			// originalPrice: this.goodsDetail.original || this.goodsDetail.price,
-			uuid: storage.getUuid(),
-			token: storage.getAccessToken(),
-			sign: this.storeDetail.yzfSign || '37ef9b97807d03c6741298ed4eb5b536d2d238e08a3c00fb01fe48f03a569974c99ad767e72c04b3165ef29aca2c488b505fe4ca',
-			mpSign: this.storeDetail.yzfMpSign || '32b8ff6f8d1c240be8d7fe51bdd6d44a6776ea86930afbe5c3c342825e942c914fc6126b6be1f003ab04aee1af9f442d2c33e1427529300671588866edaa4b12'
-		}
-		uni.navigateTo({
-			url: '/pages/product/customerservice/index?params=' + encodeURIComponent(JSON.stringify(params))
-		})
-		// #endif
-		// #ifndef MP-WEIXIN
-		const sign = this.storeDetail.yzfSign || '37ef9b97807d03c6741298ed4eb5b536d2d238e08a3c00fb01fe48f03a569974c99ad767e72c04b3165ef29aca2c488b505fe4ca'
-		uni.navigateTo({
-			url: '/pages/tabbar/home/web-view?src=https://yzf.qq.com/xv/web/static/chat/index.html?sign=' + sign
-		})
-		// #endif
-	},
-    // 格式化金钱  1999 --> [1999,00]
-    formatPrice(val) {
-      if (typeof val == "undefined") {
-        return val;
-      }
-      return val.toFixed(2).split(".");
-    },
+				if (this.$options.filters.isLogin("auth")) {
+					this.getGoodsCollectionFun(this.goodsDetail.id);
+				}
+			},
+			linkMsgDetail() { // 客服
+				// #ifdef MP-WEIXIN
+				const params = {
+					storeName: this.storeDetail.storeName,
+					goodsName: this.goodsDetail.goodsName,
+					goodsId: this.goodsDetail.goodsId,
+					goodsImg: this.goodsDetail.thumbnail,
+					price: this.goodsDetail.promotionPrice || this.goodsDetail.price,
+					// originalPrice: this.goodsDetail.original || this.goodsDetail.price,
+					uuid: storage.getUuid(),
+					token: storage.getAccessToken(),
+					sign: this.storeDetail.yzfSign ||
+						'37ef9b97807d03c6741298ed4eb5b536d2d238e08a3c00fb01fe48f03a569974c99ad767e72c04b3165ef29aca2c488b505fe4ca',
+					mpSign: this.storeDetail.yzfMpSign ||
+						'32b8ff6f8d1c240be8d7fe51bdd6d44a6776ea86930afbe5c3c342825e942c914fc6126b6be1f003ab04aee1af9f442d2c33e1427529300671588866edaa4b12'
+				}
+				uni.navigateTo({
+					url: '/pages/product/customerservice/index?params=' + encodeURIComponent(JSON.stringify(
+						params))
+				})
+				// #endif
+				// #ifndef MP-WEIXIN
+				const sign = this.storeDetail.yzfSign ||
+					'37ef9b97807d03c6741298ed4eb5b536d2d238e08a3c00fb01fe48f03a569974c99ad767e72c04b3165ef29aca2c488b505fe4ca'
+				uni.navigateTo({
+					url: '/pages/tabbar/home/web-view?src=https://yzf.qq.com/xv/web/static/chat/index.html?sign=' +
+						sign
+				})
+				// #endif
+			},
+			// 格式化金钱  1999 --> [1999,00]
+			formatPrice(val) {
+				if (typeof val == "undefined") {
+					return val;
+				}
+				return val.toFixed(2).split(".");
+			},
 
-    /**选择商品 */
-    changedGoods(val) {
-      this.selectedGoods = val;
-    },
+			/**选择商品 */
+			changedGoods(val) {
+				this.selectedGoods = val;
+			},
 
-    /**  点击子级地址回调参数*/
-    deliveryFun(val) {
-      this.delivery = val;
-    },
-    /**
-     * 地址子级关闭回调
-     */
-    closePopupAddress(val) {
-      this.addressFlag = val;
-      this.maskFlag = false;
-    },
-    /**
-     * 商品规格子级关闭回调
-     */
-    closePopupBuy(val) {
-      this.buyMask = val;
-      this.maskFlag = false;
-    },
+			/**  点击子级地址回调参数*/
+			deliveryFun(val) {
+				this.delivery = val;
+			},
+			/**
+			 * 地址子级关闭回调
+			 */
+			closePopupAddress(val) {
+				this.addressFlag = val;
+				this.maskFlag = false;
+			},
+			/**
+			 * 商品规格子级关闭回调
+			 */
+			closePopupBuy(val) {
+				this.buyMask = val;
+				this.maskFlag = false;
+			},
 
-    /** 参与拼团  创建拼团 */
-    toAssembleBuyNow(order) {
-      this.shutMask(4, "PINTUAN", order);
-    },
+			/** 参与拼团  创建拼团 */
+			toAssembleBuyNow(order) {
+				this.shutMask(4, "PINTUAN", order);
+			},
 
-    /**
-     * 查看购物车
-     */
-    reluchToCart() {
-      let obj = {
-        from: "product",
-        id: this.productId,
-      };
-      storage.setCartBackbtn(obj);
-      uni.switchTab({
-        url: "/pages/tabbar/cart/cartList",
-      });
-    },
+			/**
+			 * 查看购物车
+			 */
+			reluchToCart() {
+				let obj = {
+					from: "product",
+					id: this.productId,
+				};
+				storage.setCartBackbtn(obj);
+				uni.switchTab({
+					url: "/pages/tabbar/cart/cartList",
+				});
+			},
 
-    /**
-     * 查询购物车总数量
-     */
-    cartCount() {
-      if (storage.getHasLogin()) {
-        API_trade.getCartNum().then((res) => {
-          this.nums = res.data.result;
-        });
-      }
-    },
+			/**
+			 * 查询购物车总数量
+			 */
+			cartCount() {
+				if (storage.getHasLogin()) {
+					API_trade.getCartNum().then((res) => {
+						this.nums = res.data.result;
+					});
+				}
+			},
 
-    /**
-     * 返回
-     */
-    back() {
-      if (getCurrentPages().length == 1) {
-        uni.switchTab({
-          url: "/pages/tabbar/home/index",
-        });
-      } else {
-        uni.navigateBack();
-      }
-    },
+			/**
+			 * 返回
+			 */
+			back() {
+				if (getCurrentPages().length == 1) {
+					uni.switchTab({
+						url: "/pages/tabbar/home/index",
+					});
+				} else {
+					uni.navigateBack();
+				}
+			},
 
-    /**
-     * 获取店铺信息
-     */
-    getstoreBaseInfoFun(id) {
-      API_store.getstoreBaseInfo(id).then((res) => {
-        if (res.data.success) {
-          this.storeDetail = res.data.result;
-        }
-      });
-    },
+			/**
+			 * 获取店铺信息
+			 */
+			getstoreBaseInfoFun(id) {
+				API_store.getstoreBaseInfo(id).then((res) => {
+					if (res.data.success) {
+						this.storeDetail = res.data.result;
+					}
+				});
+			},
 
-    /**
-     * 删除收藏店铺
-     */
-    deleteGoodsCollectionFun(id) {
-      API_Members.deleteGoodsCollection(id).then((res) => {
-        if (res.statusCode == 200) {
-          uni.showToast({
-            title: "商品已取消收藏!",
-            icon: "none",
-          });
-          this.favorite = !this.favorite;
-        }
-      });
-    },
+			/**
+			 * 删除收藏店铺
+			 */
+			deleteGoodsCollectionFun(id) {
+				API_Members.deleteGoodsCollection(id).then((res) => {
+					if (res.statusCode == 200) {
+						uni.showToast({
+							title: "商品已取消收藏!",
+							icon: "none",
+						});
+						this.favorite = !this.favorite;
+					}
+				});
+			},
 
-    /**
-     * 获取商品是否已被收藏
-     */
-    getGoodsCollectionFun(goodsId) {
-      if (storage.getHasLogin()) {
-        API_Members.getGoodsIsCollect(goodsId, "GOODS").then((res) => {
-          this.favorite = res.data.result;
-        });
-      }
-    },
+			/**
+			 * 获取商品是否已被收藏
+			 */
+			getGoodsCollectionFun(goodsId) {
+				if (storage.getHasLogin()) {
+					API_Members.getGoodsIsCollect(goodsId, "GOODS").then((res) => {
+						this.favorite = res.data.result;
+					});
+				}
+			},
 
-    /**
-     * 获取店铺推荐商品列表
-     */
-    getstoreRecommend() {
-      getGoodsList({
-        pageNumber: 1,
-        pageSize: 6,
-        storeId: this.goodsDetail.storeId,
-        recommend: true,
-      }).then((res) => {
-        this.recommendList = res.data.result.content;
-      });
-    },
+			/**
+			 * 获取店铺推荐商品列表
+			 */
+			getstoreRecommend() {
+				getGoodsList({
+					pageNumber: 1,
+					pageSize: 6,
+					storeId: this.goodsDetail.storeId,
+					recommend: true,
+				}).then((res) => {
+					this.recommendList = res.data.result.content;
+				});
+			},
 
-    /**
-     * 获取相似商品列表
-     */
-    getOtherLikeGoods() {
-      getGoodsList({
-        pageNumber: 1,
-        pageSize: 10,
-        category: this.goodsDetail.categoryId,
-        keyword: this.goodsDetail.name,
-      }).then((res) => {
-        this.likeGoodsList = res.data.result.content;
-      });
-    },
+			/**
+			 * 获取相似商品列表
+			 */
+			getOtherLikeGoods() {
+				getGoodsList({
+					pageNumber: 1,
+					pageSize: 10,
+					category: this.goodsDetail.categoryId,
+					keyword: this.goodsDetail.name,
+				}).then((res) => {
+					this.likeGoodsList = res.data.result.content;
+				});
+			},
 
-    /**
-     * 领取优惠券
-     */
-    receiveCouponsFun(id) {
-      API_Members.receiveCoupons(id).then((res) => {
-        uni.showToast({
-          title: res.data.message,
-          icon: "none",
-        });
-      });
-    },
+			/**
+			 * 领取优惠券
+			 */
+			receiveCouponsFun(id) {
+				API_Members.receiveCoupons(id).then((res) => {
+					uni.showToast({
+						title: res.data.message,
+						icon: "none",
+					});
+				});
+			},
 
-    /**
-     * 跳转到店铺页面
-     */
-    navigateToStore(store_id) {
-      uni.navigateTo({
-        url: `/pages/product/shopPage?id=` + store_id,
-      });
-    },
+			/**
+			 * 跳转到店铺页面
+			 */
+			navigateToStore(store_id) {
+				uni.navigateTo({
+					url: `/pages/product/shopPage?id=` + store_id,
+				});
+			},
 
-    /**
-     * 获取优惠券按钮
-     */
-    getCoupon(item) {
-      this.receiveCouponsFun(item.id);
-    },
+			/**
+			 * 获取优惠券按钮
+			 */
+			getCoupon(item) {
+				this.receiveCouponsFun(item.id);
+			},
 
-    /**
-     * 规格弹窗开关
-     */
-    shutMask(flag, buyFlag, type) {
-      // type是指是否点击底部按钮
-      if (flag) {
-        switch (flag) {
-          case 1: //优惠券弹窗
-            this.maskFlag = true;
-            this.cuxiao = true;
+			/**
+			 * 规格弹窗开关
+			 */
+			shutMask(flag, buyFlag, type) {
+				// type是指是否点击底部按钮
+				if (flag) {
+					switch (flag) {
+						case 1: //优惠券弹窗
+							this.maskFlag = true;
+							this.cuxiao = true;
 
-            break;
+							break;
 
-          case 3:
-            this.maskFlag = true;
-            this.addressFlag = true;
-            break;
-          case 4: //添加购物车直接购买，查看已选 弹窗
-            // 判断是否是一个规格
-            this.maskFlag = true;
-            this.buyMask = true;
-            if (buyFlag == "PINTUAN") {
-              if (type.orderSn) {
-                this.$refs.popupGoods.parentOrder = type;
-              }
-              this.$refs.popupGoods.buyType = "PINTUAN";
-            }
-            if (buyFlag == "buy") {
-              this.$refs.popupGoods.buyType = "";
-            }
+						case 3:
+							this.maskFlag = true;
+							this.addressFlag = true;
+							break;
+						case 4: //添加购物车直接购买，查看已选 弹窗
+							// 判断是否是一个规格
+							this.maskFlag = true;
+							this.buyMask = true;
+							if (buyFlag == "PINTUAN") {
+								if (type.orderSn) {
+									this.$refs.popupGoods.parentOrder = type;
+								}
+								this.$refs.popupGoods.buyType = "PINTUAN";
+							}
+							if (buyFlag == "buy") {
+								this.$refs.popupGoods.buyType = "";
+							}
 
-            break;
-        }
-      } else {
-        this.maskFlag = false;
-        this.cuxiao = false;
-        this.buyMask = false;
-      }
-    },
+							break;
+					}
+				} else {
+					this.maskFlag = false;
+					this.cuxiao = false;
+					this.buyMask = false;
+				}
+			},
 
-    /**
-     * 收藏
-     */
-    clickFavorite(id) {
-      if (this.favorite) {
-        // 取消收藏
-        this.deleteGoodsCollectionFun(id);
-        return false;
-      }
-      API_Members.collectionGoods(id, "GOODS").then((res) => {
-        if (res.data.success) {
-          uni.showToast({
-            title: "收藏成功!",
-            icon: "none",
-          });
-        }
-      });
-      this.favorite = !this.favorite;
-    },
+			/**
+			 * 收藏
+			 */
+			clickFavorite(id) {
+				if (this.favorite) {
+					// 取消收藏
+					this.deleteGoodsCollectionFun(id);
+					return false;
+				}
+				API_Members.collectionGoods(id, "GOODS").then((res) => {
+					if (res.data.success) {
+						uni.showToast({
+							title: "收藏成功!",
+							icon: "none",
+						});
+					}
+				});
+				this.favorite = !this.favorite;
+			},
 
-    /**
-     * 顶部header显示或隐藏
-     */
-    pageScroll(e) {
-      if (this.scrollFlag) {
-        this.calcSize();
-      }
-      if (e.detail.scrollTop > 200) {
-        //当距离大于200时显示回到顶部按钮
-        this.headerFlag = true;
-      } else {
-        //当距离小于200时隐藏回到顶部按钮
-        this.headerFlag = false;
-      }
-      if (e.detail.scrollTop < this.scrollArr[0] - 10) {
-        this.scrollId = "1";
-      }
-      if (e.detail.scrollTop > this.scrollArr[1] - 10) {
-        this.scrollId = "2";
-      }
-      if (e.detail.scrollTop > this.scrollArr[2] - 10) {
-        this.scrollId = "3";
-      }
-      if (e.detail.scrollTop > this.scrollArr[3] - 10) {
-        this.scrollId = "4";
-      }
-    },
+			/**
+			 * 顶部header显示或隐藏
+			 */
+			pageScroll(e) {
+				if (this.scrollFlag) {
+					this.calcSize();
+				}
+				if (e.detail.scrollTop > 200) {
+					//当距离大于200时显示回到顶部按钮
+					this.headerFlag = true;
+				} else {
+					//当距离小于200时隐藏回到顶部按钮
+					this.headerFlag = false;
+				}
+				if (e.detail.scrollTop < this.scrollArr[0] - 10) {
+					this.scrollId = "1";
+				}
+				if (e.detail.scrollTop > this.scrollArr[1] - 10) {
+					this.scrollId = "2";
+				}
+				if (e.detail.scrollTop > this.scrollArr[2] - 10) {
+					this.scrollId = "3";
+				}
+				if (e.detail.scrollTop > this.scrollArr[3] - 10) {
+					this.scrollId = "4";
+				}
+			},
 
-    /**
-     * 计算每个要跳转到的模块高度信息
-     */
-    calcSize() {
-      let h = 0;
-      let that = this;
-      let arr = [
-        "main1",
-        "main2",
-        "main3",
-        "main4",
-        "main5",
-        "main6",
-        "main7",
-        "main8",
-        "main9",
-        "main10",
-        "main11",
-      ];
-      arr.forEach((item) => {
-        let view = uni.createSelectorQuery().select("#" + item);
-        view
-          .fields(
-            {
-              size: true,
-            },
-            (data) => {
-              if (
-                item === "main1" ||
-                item === "main5" ||
-                item === "main9" ||
-                item === "main11"
-              ) {
-                that.scrollArr.push(h);
-              }
-              if (data && data.height) {
-                h += data.height;
-              }
-            }
-          )
-          .exec();
-      });
-      this.scrollFlag = false;
-    },
+			/**
+			 * 计算每个要跳转到的模块高度信息
+			 */
+			calcSize() {
+				let h = 0;
+				let that = this;
+				let arr = [
+					"main1",
+					"main2",
+					"main3",
+					"main4",
+					"main5",
+					"main6",
+					"main7",
+					"main8",
+					"main9",
+					"main10",
+					"main11",
+				];
+				arr.forEach((item) => {
+					let view = uni.createSelectorQuery().select("#" + item);
+					view
+						.fields({
+								size: true,
+							},
+							(data) => {
+								if (
+									item === "main1" ||
+									item === "main5" ||
+									item === "main9" ||
+									item === "main11"
+								) {
+									that.scrollArr.push(h);
+								}
+								if (data && data.height) {
+									h += data.height;
+								}
+							}
+						)
+						.exec();
+				});
+				this.scrollFlag = false;
+			},
 
-    /**
-     * 点击顶部跳转到对应位置
-     */
-    headerTab(id) {
-      if (this.scrollFlag) {
-        this.calcSize();
-      }
-      this.scrollId = id;
+			/**
+			 * 点击顶部跳转到对应位置
+			 */
+			headerTab(id) {
+				if (this.scrollFlag) {
+					this.calcSize();
+				}
+				this.scrollId = id;
 
-      this.$nextTick(() => {
-        this.tabScrollTop = this.scrollArr[id - 1];
-      });
-    },
+				this.$nextTick(() => {
+					this.tabScrollTop = this.scrollArr[id - 1];
+				});
+			},
 
-    /**
-     * 点击分享
-     */
-    async shareChange() {
-      this.shareFlage = true;
-    },
-  },
-};
+			/**
+			 * 点击分享
+			 */
+			async shareChange() {
+				this.shareFlage = true;
+			},
+		},
+	};
 </script>
 
 <style lang="scss" scoped>
-// #ifdef MP-WEIXIN
-@import "./product/mp-goods.scss";
-// #endif
+	// #ifdef MP-WEIXIN
+	@import "./product/mp-goods.scss";
+	// #endif
 
-@import "./product/style.scss";
-@import "./product/product.scss";
-</style>
+	@import "./product/style.scss";
+	@import "./product/product.scss";
+</style>
diff --git a/pages/product/product/shop/-shop.vue b/pages/product/product/shop/-shop.vue
index dcaeed9..feb95f9 100644
--- a/pages/product/product/shop/-shop.vue
+++ b/pages/product/product/shop/-shop.vue
@@ -7,13 +7,17 @@
       </view>
       <view class="name-star star-con">
         <text class="name">{{ storeDetail.storeName }}</text>
-        <view>
+        <!-- <view>
           <text :class="{ star: storeDetail.store_service_credit > 0 }"></text>
           <text :class="{ star: storeDetail.store_service_credit > 1 }"></text>
           <text :class="{ star: storeDetail.store_service_credit > 2 }"></text>
           <text :class="{ star: storeDetail.store_service_credit > 3 }"></text>
           <text :class="{ star: storeDetail.store_service_credit > 4 }"></text>
-        </view>
+        </view> -->
+		<view class="desc">
+			<text>{{storeDetail.goodsNum || 0}}商品</text>
+			<text>{{storeDetail.collectionNum || 0}}关注</text>
+		</view>
       </view>
       <view class="to-store-btn" @click="tostorePage(goodsDetail)">
         <view>进店逛逛</view>
@@ -138,8 +142,17 @@ export default {
       width: 100%;
       font-weight: 700;
       font-size: 28rpx;
-      line-height: 24px;
-    }
+      line-height: 24px;
+	  margin-left: 10px;
+    }
+	.desc {
+		font-size: 12px;
+		color: #999;
+		margin-left: 10px;
+		text{
+			margin-right: 10px;
+		}
+	}
   }
 
   .to-store-btn {
diff --git a/pages/product/product/style.scss b/pages/product/product/style.scss
index 32dae22..fecbe9b 100644
--- a/pages/product/product/style.scss
+++ b/pages/product/product/style.scss
@@ -130,12 +130,22 @@ page{
     display: flex;
     width: 100%;
     background: #fff !important;
-    > div {
-        flex: 1;
-    }
-    > .headerList {
-        flex: 8;
+    > div:nth-child(1) {
+        width: 50rpx;
     }
+	> div:nth-child(2) {
+	    flex: 1;
+		.headerList{
+			display: flex;
+			div{
+				flex: 1;
+			}
+		}
+	}
+	> div:nth-child(3) {
+	    width: 100rpx;
+	}
+    
     justify-content: space-between;
 }
 
@@ -366,4 +376,20 @@ page {
 .status_bar{
     background: #fff;
     height: var(--status-bar-height);
+}
+// 快捷导航
+
+.fast-icon{
+	background-color: #999;
+	border-radius: 50rpx;
+	font-size: 40rpx;
+	padding: 4rpx;
+	color: #FFFFFF;
+}
+.ml-20{
+	margin-left: 20rpx;
+}
+.fast-icon-dark {
+	color: #999;
+	background-color: #fff;
 }
\ No newline at end of file