diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 72c2ac7..f45f4b9 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -1,21 +1,21 @@
 <import src="../../../utils/wxParse/wxParse.wxml"></import>
 <wxs module="filters" src="../../../utils/filter.wxs"></wxs>
 <wxs module="g_filters" src="g_filter.wxs"></wxs>
-
 <wxs module="" src="filter.wxs"></wxs>
+<!-- 商品内容区域,普通商品,秒杀,拼团 -->
 <block wx:if="{{isshow}}">  
   <view class="container">
-    <view class="type-navbar"> 
+    <view class="type-navbar">
       <view class="type-box" wx:for="{{categories}}" wx:key="categories">
         <view bindtap="tabClick" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}" id="{{item.id}}">
           {{item.name}}
-        </view>
+        </view> 
       </view>
     </view>
 
     <view class="goods-detail">
       <view class="goods-info" hidden="{{activeCategoryId==0?false:true}}">
-        <!--  视频,滚动图bannar  -->
+        <!--  视频  -->
         <!-- <swiper bindchange="swiperChange"class="xc-pictures  swiperContainer rel" current="{{swiperCurrent}}"
 	  indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}"> -->
         <view id="id" bindtouchstart="handletouchtart" bindtouchmove="handletouchmove">
@@ -44,7 +44,7 @@
               </view>
               <view class="xc-video-picture abs">
                 <view class="xc-video" data-vipi="0" bindtap="videopicture">
-                  <view class="  {{videopicture==0 ? 'xc-video-button':'xc-video-buttons'}}  {{videopicture==0 ? 'xc-sn':''}}">
+                  <view class="{{videopicture==0 ? 'xc-video-button':'xc-video-buttons'}}  {{videopicture==0 ? 'xc-sn':''}}">
                     视频
                   </view>
                 </view>
@@ -57,6 +57,8 @@
             </block>
           </view>
         </view>
+
+
         <!----显示秒杀价,团购，积分购---->
         <view class="prom_show rel" wx:if="{{prom_type==1}}">
           
@@ -78,6 +80,7 @@
             <view class="time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">秒</view>
           </view>
         </view>
+
         <!----拼单---->
         <view class="pt_show " wx:if="{{prom_type==6}}">
           <view class="pt_view rel">
@@ -225,10 +228,11 @@
             </view>
           </view>
         </view>
+
         <block wx:if="{{prom_type!=6}}">
           <view class="goods-price rel">
             <view class="co-red" style="overflow: hidden" wx:if="{{prom_type==0 || prom_type==3}}">
-              <view class="market-price" style="overflow: hidden">
+                <view class="market-price" style="overflow: hidden">
 				  <block wx:if="{{card_field && data[card_field]>0}}">
 				     <view class="flex ai-center  grade-card-frame" style="margin-left:12rpx;"> 
 					  <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
@@ -244,6 +248,7 @@
                      <view class='yj'><text>原价:￥{{data.market_price}}</text></view>
 				  </block>
               </view>
+
             </view>
 
             <!-- 这个是分享按钮 -->
@@ -251,9 +256,14 @@
               <image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image>
               <view class="share-font">分享</view>
             </view>
-            
-			<!-- 等级卡的价格,不是等级卡会员，且商品又有设置等级级价，商家后台有开通升级卡同能 -->
+
+
+
+
+	<!-- 等级卡的价格,不是等级卡会员，且商品又有设置等级级价，商家后台有开通升级卡同能 -->
+
             <view class="flex ai_and" wx:if="{{!card_field && g_filters.is_has_rank(rank_switch,data)}}">
+           
                   <view class="flex ai-center  grade-card-frame card-frame"style="padding-right:0rpx" >
 					    	<image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
 					        <view class="fs24 white view card-name ellipsis-1">{{g_filters.get_card_price(data,card_list,1)}}</view>
@@ -263,10 +273,13 @@
                   ￥</text>{{g_filters.get_card_price(data,card_list,0)}}
                   </view>
 			</view>
-			
-				
-            <!-- 等级卡的显示,购买, 等级卡近30天要显示续费-->
+
+
+
+                   <!-- 等级卡的显示,购买, 等级卡近30天要显示续费-->
+                <view>{{g_filters.is_has_rank(rank_switch,data)}}</view>
 			<block wx:if="{{g_filters.is_has_rank(rank_switch,data)}}">	
+         
             <view wx:if="{{!card_field }}">
 			   <view class="beauty-makeup-frame flex ai-center">
 				   <view class="left flex ai-center">
@@ -309,15 +322,8 @@
 			</view>
 			
 			</block>
-			
-			
-			
-		
-			
-			
-			
-           
-            <!-- 商品名称 -->
+            <!--许程商品名字-->
+
             <view wx:if="{{prom_type!=1}}">
               <view class="goods-title">
                 <view class="goods-name elli">{{data.goods_name}}</view>
@@ -325,7 +331,7 @@
             </view>
 
             <view class="goods-num" wx:if="{{prom_type!=1}}">
-              <view class="sales">销量:{{data.sales_sum}}件</view>
+              <view class="sales">销量：{{data.sales_sum}}件</view>
               <view class="stock">折扣：{{data.disc}}折</view>
               <view class="stock">{{categories3[0].num}}人评价</view>
             </view>
@@ -344,7 +350,7 @@
                 </view>
               </view>
             </view>
-            <view style='height:42rpx'></view>
+           
             <view class="xc-explain fs32 ellipsis-2" wx:if="{{prom_type!=0}}">
               {{data.goods_name}}
             </view>
@@ -371,6 +377,37 @@
 
           </view>
         </block>
+
+            <!-- 门店收货地址 -->
+            <view class="xc-address_frame flex-vertical xc-ash {{def_pick_store!=null?'sn_height':'on_height'}}" >
+                 <view class="address_frame" bindtap="choice_store"  data-ind="0">
+                  <view class="flex-vertical-between "> 
+                    <view class="flex-vertical select_store_height">
+                      <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
+                      <view class="fs30 xc-ash-9f">选择门店</view>
+                    </view>
+                    <view class="red_bb fs32">
+                         更多门店
+                         <text class="bg_jj"></text>
+                    </view>
+                  </view>
+
+                  <view wx:if="{{def_pick_store}}">
+                  <view  class="flex-space-between address ai_end  ">
+                     <view>
+                       <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
+                     </view>
+                     <view class="distance fs24"wx:if="{{def_pick_store.distance!=null}}">
+                      距离：{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
+                     
+                     </view>
+                  </view>
+                  <view class="fs24 xc-ash-9f">地址:{{def_pick_store.fulladdress}}</view>
+                  </view>
+                 </view>   
+
+            </view>
+
         <!--许程 7.24暂时注释 -->
         <view wx:if="{{prom_type!=1&&prom_act.kttype!=3&&prom_act.kttype!=2&&prom_act.kttype!=1 && is_closecoupon!=1}}">
           <view class="cx-frame flex" style="position: relative" wx:if="{{fir_quan.length>0}}">
@@ -412,16 +449,16 @@
               <view class="xc_comment-left">
                 <view class="xc_comment-user">
                   <view class="xc_user-img">
-                    <image class="xc_imgs" src='{{item.head_pic}}' binderror="bind_bnerr2" data-errorimg="fir_comments[{{index}}].head_pic"></image>
+                    <image class="xc_imgs" src='{{item.is_anonymous!=1?item.head_pic:iurl+"/miniapp/images/hui_hear_pic.png"}}' binderror="bind_bnerr2" data-errorimg="fir_comments[{{index}}].head_pic"></image>
                   </view>
 
                   <view class="xc_user">
-                    <view class="xc_user-name five-level-word">{{item.username}}</view>
+                    <view class="xc_user-name five-level-word">{{item.is_anonymous!=1?item.username:'匿名'}}</view>
                     <image class="xc_comment-img" src="{{iurl}}/miniapp/images/star-red.png" wx:for="{{item.sum_rank}}" wx:key="{{index}}"></image>
                   </view>
                 </view>
-                <view class="xc_comment-font fs22 ellipsis-2">
-                  {{item.content?item.content:''}}
+                <view class="xc_comment-font pj_word_size ellipsis-2">
+                 {{item.content?item.content:''}}
                 </view>
                 <view class="xc_comment-val">
                   <view class="xc_comment-time">{{item.add_time}}</view>
@@ -429,7 +466,8 @@
                 </view>
               </view>
               <view class="xc_goods-img-frame">
-                    <image wx:if="{{item.img[0]!=undefined && item.img[0]!=null}}" class="xc_goods-img" src='{{iurl+item.img[0]}}'></image>
+                  <image wx:if="{{item.img[0]!=undefined && item.img[0]!=null}}" class="xc_goods-img" src='{{iurl+item.img[0]}}'></image>
+                  <image wx:elif="{{item.weapp_img[0]!=undefined && item.weapp_img[0]!=null}}" class="xc_goods-img" src='{{item.weapp_img[0]}}'></image>
                   <image wx:else class="xc_goods-img" src='{{gallery[0].image_url}}'></image>
               </view>
             </view>
@@ -503,7 +541,7 @@
                 <text>规格</text>
               </view>
               <view class="item_right">
-                <text>{{data.goods_spec==""?"规格1":data.goods_spec}}</text>
+                <text>{{filters.show_gui_ge(data.goods_spec,data.goods_color)}}</text>
               </view>
             </view>
             <view class="tb_item tb-l">
@@ -532,11 +570,27 @@
         </view>
 
         <!-- 显示商品 -->
-        <goods_recommend id="goods_list"></goods_recommend>
+        <view class="xc-goods ">
+          <view>
+            <view bindtap="go_goods" data-gid="{{item.goods_id}}" class="rel xc-goods-recommend {{index%2==0?'':'ml'}}" wx:for="{{recommend_list}}">
+              <image class="xc-goods-imgs" src="{{iurl+item.original_img}}"></image>
+              <view class='xc-goods-bottom abs'>
+                <view class="flex  monry-frame">
+                  <view class="flex">
+                    <view class="three-level-word money-color-val rmb-symbol">￥</view>
+                    <view class="two-level-word money-color-val" style='margin-top:8rpx;'>{{item.shop_price}}</view>
+                  </view>
+                  <view class="word-lines xc-original-price"> 原价￥{{item.market_price}}</view>
+                </view>
+                <view class="xc-good-explain ellipsis-2">{{item.goods_name}}</view>
+              </view>
+            </view>
+          </view>
+        </view>
 
       </view>
 
-      <!------------商品详情图片页面-------------->
+      <!------------商品详情图片页面---------------->
       <view class="goods-norms" hidden="{{activeCategoryId==1?false:true}}">
         <view class="table_s">
           <view class="tb_item tb-l">
@@ -609,7 +663,7 @@
           <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
         </view>
       </view>
-      <!------------评价页面-------------->
+      <!---------------评价页面-------------->
       <view class="goods-comment" hidden="{{activeCategoryId==2?false:true}}">
         <view class="topframe">
           <view class="topframe-top">
@@ -629,26 +683,33 @@
            <view style='border-bottom:4rpx solid #eee;'>
           <view class="middle">
             <view class="middle-img-frame">
-              <image class="middle-img" src="{{item.head_pic}}" binderror="bind_bnerr2" data-errorimg="comments[{{cIdx}}].head_pic"></image>
+              <image class="middle-img" src="{{item.is_anonymous!=1?item.head_pic:iurl+'/miniapp/images/hui_hear_pic.png'}}" binderror="bind_bnerr2" data-errorimg="comments[{{cIdx}}].head_pic"></image>
               <view class="middle-user-frame">
-                <view class="middle-user">{{item.username==''?'匿名用户':item.username}}</view>
+                <view class="middle-user">{{item.username==''||item.is_anonymous==1 ?'匿名用户':item.username}}</view>
                 <image class="star" src="{{iurl}}/miniapp/images/star-red.png" wx:for="{{item.sum_rank}}" wx:key="{{index}}"></image>
               </view>
             </view>
-            <view class="xc-pirces" >
-            <text class="middle-font">
+            <view class="xc-pirces">
+            <view class="middle-font {{item.seeMore==true?'ellipsis-3':''}}" >
               {{item.content?item.content:''}}
-            </text> 
+            </view> 
             </view>
+            <view wx:if='{{item.seeMore}}' data-index='{{cIdx}}' class="s_btn fs30 red-co" catchtap='toggleHandler'>全部显示</view>
+            <view wx:if='{{!item.seeMore && item.auto}}' data-index='{{cIdx}}' class="s_btn fs30 red-co"  catchtap='toggleContent'>收起</view>
             <view class="img-ul">
-              <view class="img-li" wx:for="{{item.img}}" wx:key="{{index}}">
-                <image bindtap="previewCommentImgs" class="wh100" data-cidx="{{cIdx}}"
-                       data-id="{{index}}" src="{{iurl}}{{item}}"></image>
-              </view>
-            </view>
 
-            <view class="iddle-goods-img">
-              <image bindtap="previewCommentImgs" class="goods-img" wx:for="{{item.img}}" wx:key="{{index}}" data-cidx="{{cIdx}}" data-id="{{index}}" src="{{iurl}}{{item}}"></image>
+              <block wx:if="{{item.source_type==0}}">
+                  <view class="img-li"  wx:for="{{item.img}}" wx:key="{{index}}">
+                    <image bindtap="previewCommentImgs" class="wh100" data-cidx="{{cIdx}}"
+                           data-id="{{index}}" src="{{iurl}}{{item}}"></image>
+                  </view>
+              </block>
+              <block wx:if="{{item.source_type==1}}">
+                  <view class="img-li" wx:for="{{item.weapp_img}}" wx:if="{{aitem.length>10}}" wx:key="{{index}}" wx:for-item="aitem">
+                     <image bindtap="previewCommentImgs_w" class="wh100" data-cidx="{{cIdx}}"
+                           data-id="{{index}}" src="{{aitem}}"></image>
+                  </view>
+              </block>
             </view>
 
             <view class="z_parameter">
@@ -670,8 +731,11 @@
           </view>
           </view>
         </block>
-        <block wx:if="{{comments.length==0 && get_c}}">
-               <text class="no_pj_list">暂无评价</text>
+        <block wx:if="{{(!comments || comments.length==0) && get_c }}">
+             <text class="no_pj_list">暂无评价</text>
+        </block>
+        <block wx:if="{{comments.length>10 && comments_no_more}}">
+          <text class="no_pj_list">已经加载到底部</text>
         </block>
       </view>
     </view>
@@ -680,6 +744,7 @@
   <view bindtap="doScrollTop" class="toTop" wx:if="{{supportPageScroll}}">
     <image class="wh100" src="{{iurl}}/miniapp/images/topup.png"></image>
   </view>
+
   <!-------------------底部按钮-------------------->
   <view class="join-cart">
     <view bindtap="contactService" class="custom-service cart-ico new_split">
@@ -698,15 +763,19 @@
         <view>购物车</view>
       </navigator>
     </view>
-    <!---<view bindtap="openSpecModel" class="buy-btn cart-btn cart-btn-lg" wx:if="{{data.goods.is_virtual}}">立即购买</view>-->
-    <block wx:if="{{prom_type==0}}">
+    <view bindtap="openSpecModel" class="buy-btn cart-btn cart-btn-lg" wx:if="{{data.goods.is_virtual}}">立即购买</view>
 
-      <block wx:if="{{data.store_count>0}}">
-         <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn">加入购物车</view>
-         <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn">立即购买</view>
+    <!---- 普通商品购买 ----->
+    <block wx:if="{{prom_type==0 || prom_type==2 || prom_type==3 || prom_type==4}}">
+
+    <block wx:if="{{sele_g.store_count>0}}">
+      <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn">加入购物车</view>
+      <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn">立即购买</view>
       </block>
-      <block wx:else>
-        <view  data-ind="1" class="join-btn cart-btn no_store">库存不足</view>
+       <block wx:else>
+      <view class="is_stock cart-btn is_stock xc-ash-b " style="width:55.5%">
+      库存不足
+      </view>
       </block>
 
     </block>
@@ -731,13 +800,7 @@
     <!-------拼单-------->
     <block wx:if="{{prom_type==6}}">
       <view bindtap="openSpecModel_pt" data-it="1" data-ind="1" class="join-btn cart-btn line-h">
-		<block wx:if="{{card_field && data[card_field]>0}}">
-            <view class="fir-v">￥{{filters.toFix(data[card_field],2)}}</view>
-		</block> 
-		<block wx:else>
-			<view class="fir-v">￥{{filters.toFix(data.shop_price,2)}}</view>
-		</block>
-		
+        <view class="fir-v">￥{{filters.toFix(data.shop_price,2)}}</view>
         <view>单独购买</view>
       </view>
 
@@ -784,59 +847,75 @@
   <nav_box></nav_box>
 
 </block>
-
 <!----弹起来,选择规格数量,普通商品购买和秒杀------>
 <view hidden="{{!openSpecModal}}">
   <view bindtap="closeSpecModal" class="cover-layer"></view>
   <view class="spec-model">
-    <view class="pding">
-      <icon bindtap="closeSpecModal" class="modal-close" color="gray" size="22" type="cancel"></icon>
+    <view class="pding"> 
+      <icon bindtap="closeSpecModal" class="modal-close" color="black" size="22" type="cancel"></icon>
       <view class="spec-goods">
-        <image class="wh100 spec-img" src="{{data.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image>
+        <image class="wh100 spec-img xc-distance-bottom" src="{{data.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image>
         <view class="spec-goods-info">
-          <!--<view class="spec-goods-name">{{data.goods_name}}</view>-->
-          <view class="spec-goods-price" wx:if="{{prom_price==null}}">
-			 <!-- 如果是等级会员，且有等级价 --> 
-			 <block wx:if="{{card_field && sele_g[card_field]>0}}">
-			   ￥ {{sele_g[card_field]}}
-			 </block> 		 
-			 <block wx:else>
-			   ￥ {{sele_g.shop_price}} 
-			 </block>			 
-		  </view>
-          <view class="spec-goods-price" wx:else>￥ {{prom_price}}</view>
+          <view class="spec-goods-name ellipsis-1">{{sele_g.goods_name}}</view>
+          <view class="flex ai_end xc-val-money">
+          <view class="spec-goods-price" wx:if="{{prom_price==null}}"><text class="fs20">￥</text>{{sele_g.shop_price}}</view>
+          <view class="spec-goods-price" wx:else><text class="fs20">￥</text>{{prom_price}}</view>
+        </view>
+       
           <block wx:if="{{prom_type==0}}">
+          <view class="flex">
             <view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view>
             <view class="spec-goods-stock">可售：{{sele_g.store_count}}</view>
-            <view class="spec-goods-stock">已选：{{sele_g.gg}}</view>
+       
+            </view>
           </block>
           <block wx:if="{{prom_type==1}}">
+           <view class="flex">
             <view class="spec-goods-stock" wx:if="{{prom_st>0}}">已售：{{prom_act.buy_num+prom_act.virtual}}</view>
             <view class="spec-goods-stock" wx:else >已售：{{prom_act.buy_num}}</view>
             <view class="spec-goods-stock">可售：{{prom_act.goods_num-prom_act.buy_num}}</view>
-            <view class="spec-goods-stock">已选：{{sele_g.gg}}</view>
+
+          
+               </view>
           </block>
         </view>
-      </view>
+
+        <!-- 选择门店模块 -->
+         <view  class="flex-space-between address ai_end xc-width ">
+
+                     <view class="flex ai_end" wx:if="{{def_pick_store}}">
+                       <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
+                         <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}">
+                          距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
+                         
+                          </view>
+                     </view>
+
+                     <!-- 没有门店的时候 -->
+                     <view  class="flex" bindtap="choice_store"wx:else>
+                          <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
+                           <view class="fs28 xc-ash-9f">选择门店</view>
+                      </view>
+
+                      <view class="red-co fs28" bindtap="choice_store" >
+                         更多门店
+                         <text class="right-arrow"></text>
+                      </view>
+                  </view>
+                  <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store}}">地址:{{def_pick_store.fulladdress}}</view>
+         </view>
+
       <!----商品的属性项目---->
+      <view  class="xc-goods-attribute">
       <view hidden="{{ismend==1}}" class="spec-name">商品属性</view>
       <view hidden="{{ismend==1}}" class="flex">
         <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-gid='{{item.goods_id}}' wx:for="{{sku_g}}" wx:key="sku_g">
           {{item.gg}}
         </view>
       </view>
+</view>
+  
 
-      <!----点击选择门店的时候要隐藏---->
-      <view hidden="{{ismend==1}}">
-        <view bindtap="getmendian" class="quhuo logistics-item">
-          <view wx:if="{{sto_sele_name==''}}">取货门店
-            <text class='small'>（选择门店）</text>
-          </view>
-          <view wx:else>取货门店({{sto_sele_name}})</view>
-          <view class="item-img">
-            <image class="wh100" src="{{iurl}}/miniapp/images/icon-arrowdown.png"></image>
-          </view>
-        </view>
         <view class="b_num">
           <view>购买数量</view>
           <view class="count">
@@ -846,6 +925,14 @@
           </view>
         </view>
       </view>
+       <view class="spec-cart-btns">
+   
+    
+        <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}"  class="spec-cart-btn yellow fs32" data-action="add">加入购物车</view>
+        <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn spec-buy" data-action="buy">立即购买</view>
+    
+    </view>
+
       <view class="clear"></view>
       <!---选择门店的列表--->
       <view hidden="{{ismend==0}}" class="sto_v">
@@ -871,51 +958,72 @@
         </view>
       </view>
     </view>
-    <view class="spec-cart-btns">
-      <block>
-        <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart" class="spec-cart-btn spec-buy" data-action="add">加入购物车</view>
-        <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart" class="spec-cart-btn spec-buy" data-action="buy">立即购买</view>
-      </block>
-    </view>
-  </view>
+   
 </view>
-
 <!----弹起来,选择规格数量,拼单商品购买------>
 <view hidden="{{!openSpecModal_pt}}">
   <view bindtap="closeSpecModal" class="cover-layer"></view>
   <view class="spec-model">
     <view class="pding">
       <icon bindtap="closeSpecModal" class="modal-close" color="gray" size="22" type="cancel"></icon>
+
+      <!-- 商品名称 -->
       <view class="spec-goods">
-        <image class="wh100 spec-img" src="{{data.original_img}}"  binderror="pop_err_img"  data-errorimg="data.original_img"></image>
+        <image class="wh100 spec-img xc-distance-bottom" src="{{data.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image>
         <view class="spec-goods-info">
-          <!--<view class="spec-goods-name">{{data.goods_name}}</view>-->
-          <view class="spec-goods-price" wx:if="{{is_normal==1}}">
-			  <!-- 如果是等级会员，且有等级价 -->
-			  <block wx:if="{{card_field && sele_g[card_field]>0}}">
-			    ￥ {{sele_g[card_field]}}
-			  </block> 		 
-			  <block wx:else>
-			    ￥ {{sele_g.shop_price}} 
-			  </block>	  
-		  </view>
-          <view class="spec-goods-price" wx:else>￥ {{prom_price}}</view>
+          <view class="spec-goods-name ellipsis-1">{{sele_g.goods_name}}</view>
+          <view class="flex ai_end xc-val-money">
+            <view class="spec-goods-price" wx:if="{{is_normal==1}}">￥ {{sele_g.shop_price}}</view>
+            <view class="spec-goods-price" wx:else>￥ {{prom_price}}</view>
+          </view>
 
-          <block wx:if="{{is_normal==0}}">
-            <view class="spec-goods-stock">已售：{{prom_act.buy_num}}</view>
-            <view class="spec-goods-stock">可售：{{prom_act.goods_num-prom_act.buy_num}}</view>
-            <view class="spec-goods-stock">已选：{{sele_g.gg}}</view>
+          <block wx:if="{{is_normal==1}}">
+            <view class="flex">
+              <view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view>
+              <view class="spec-goods-stock">可售：{{sele_g.store_count}}</view>
+            </view>
           </block>
-          <block wx:else>
-            <view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view>
-            <view class="spec-goods-stock">可售：{{sele_g.store_count}}</view>
-            <view class="spec-goods-stock">已选：{{sku_g_pt[0].gg}}</view>
+          <block wx:if="{{is_normal==0}}">
+            <view class="flex">
+              <view class="spec-goods-stock" wx:if="{{prom_st>0}}">已售：{{prom_act.buy_num}}</view>
+              <view class="spec-goods-stock" wx:else >已售：{{prom_act.buy_num}}</view>
+              <view class="spec-goods-stock">可售：{{prom_act.goods_num-prom_act.buy_num}}</view>
+            </view>
           </block>
         </view>
+
+      </view>
+
+
+
+      <view style="clear: both"></view>
+      <view style="margin-top: 20rpx">
+        <view  class="flex-space-between address ai_end xc-width ">
+
+          <view class="flex ai_end" wx:if="{{def_pick_store}}">
+            <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
+            <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}">
+              距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
+
+            </view>
+          </view>
+
+          <!-- 没有门店的时候 -->
+          <view  class="flex" bindtap="choice_store"wx:else>
+            <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
+            <view class="fs28 xc-ash-9f">选择门店</view>
+          </view>
+
+          <view class="red-co fs28" bindtap="choice_store" >
+            更多门店
+            <text class="right-arrow"></text>
+          </view>
+        </view>
+        <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store}}">地址:{{def_pick_store.fulladdress}}</view>
       </view>
       <!----商品的属性项目---->
+     <view> 
       <view hidden="{{ismend==1}}" class="spec-name">商品属性</view>
-
       <block wx:if="{{is_normal==0}}">
         <view hidden="{{ismend==1}}" class="flex">
           <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-gid='{{item.goods_id}}' wx:for="{{sku_g}}" wx:key="sku_g">{{item.gg}}
@@ -930,22 +1038,26 @@
         </view>
       </block>
       <view class="clear"></view>
+     </view>
 
-      <view>
-        <view bindtap="getmendian" class="quhuo logistics-item" hidden="{{ismend==1}}">
-          <view wx:if="{{sto_sele_name==''}}">取货门店
-            <text class='small'>（选择门店）</text>
-          </view>
-          <view wx:else>{{sto_sele_name}}</view>
-          <view class="item-img">
-            <image class="wh100" src="{{iurl}}/miniapp/images/icon-arrowdown.png"></image>
-          </view>
-        </view>
-        <view class="b_num" hidden="{{ismend==1}}">
+
+     <view>
+        <!--<view bindtap="getmendian" class="quhuo logistics-item" hidden="{{ismend==1}}">-->
+          <!--<view wx:if="{{sto_sele_name==''}}">取货门店-->
+            <!--<text class='small'>（选择门店）</text>-->
+          <!--</view>-->
+          <!--<view wx:else>{{sto_sele_name}}</view>-->
+          <!--<view class="item-img">-->
+            <!--<image class="wh100" src="{{iurl}}/miniapp/images/icon-arrowdown.png"></image>-->
+          <!--</view>-->
+        <!--</view>-->
+
+
+        <view class="b_num" hidden="{{ismend==1}}" style="margin-top: 20rpx">
           <view>购买数量</view>
           <view class="count">
             <view bindtap="subCartNum" class="sub">-</view>
-            <input bindblur="inputCartNum" type="number" value="{{goodsInputNum}}"></input>
+            <input bindblur="inputCartNum xc-val-fream" type="number" value="{{goodsInputNum}}"></input>
             <view bindtap="addCartNum" class="add">+</view>
           </view>
         </view>
@@ -958,7 +1070,7 @@
           </view>
           <!-----第一级显示------>
           <view class="itemlists" hidden="{{is_sec_mend==1}}">
-            <block wx:if="{{is_show_sto_cat}}">
+            <block wx:if="{{is_show_sto_cat>0}}">
               <view wx:for="{{all_sto}}" wx:key="all_sto" class="item" bindtap="show_sec" data-index="{{index}}">{{item.name}}</view>
             </block>
             <block wx:else>
@@ -975,12 +1087,13 @@
           </view>
         </view>
       </view>
-    </view>
+    </view> 
     <view class="pt_qd">
       <view bindtap="addCart_pt" class="spec-cart-btn spec-buy w100" data-action="buy">确定</view>
     </view>
   </view>
 </view>
+<!----弹起来优惠信息------>
 <view hidden="{{!openPromModal}}">
   <view bindtap="closePromModal" class="cover-layer"></view>
   <view class="prom-model">
@@ -1035,7 +1148,7 @@
     <view class="xc-frame">
       <view class="top-frame">
         <view class="xc-coupon-frame ">
-            <!--单张的券-->
+            <!---单张的券--->
             <view class="rel" wx:for="{{quan_list}}" wx:key="{{index}}">
               <view class="coupon flex">
                 <view class="circle xc-circular-one"></view>
@@ -1070,9 +1183,151 @@
   </view>
 </view>
 
+<!-- 选择门店的弹框，1.1版最新的 -->
+<block wx:if="{{store==1}}">
+  <view class="mongolia-layer" bindtap="close_popup"></view>
+  <view class="popup-frame">
+  <block  wx:if="{{sort_store==0}}">
+  <!-- 头部 标题 -->
+     <view class="popup-top flex-space-between">
+       <text class="fs32 nearby_store">{{choice_sort_store==0?'附近的门店':region_name}}</text>
+        <view>
+           <view>
+              <icon bindtap="close_popup" class="modal-closes" color="black" size="22"       type="cancel"></icon>
+           </view>
+           <view class="felx choose_more" bindtap="more_store">
+              <text class="fs26 red-co" wx:if="{{is_show_sto_cat}}">{{choice_sort_store==0?'更多门店':'返回'}}</text>
+              <view class="bg_rights" wx:if="{{is_show_sto_cat}}"></view>
+           </view>
+          </view>
+       </view>
+          <!-- 门店列表，最外层的门店列表，一开始 -->
+          <view class="store-list">
+              <!--如果还没有点击更多门店的时候  -->
+              <block wx:if="{{choice_sort_store==0}}">
+                  <!-- 需要for循环 -->
+                  <block wx:if="{{is_show_sto_cat==1}}">
+                      <view class="store_choose flex" wx:for="{{def_pickpu_list}}" bindtap="choose_for_store_fir" data-ind="{{index}}">
+                  <view class="store flex-vertical">
+                <!-- 需要点击事件 -->
+                <block wx:if="{{index==fir_pick_index}}">
+               <view class="circle white xc-hook fs20 red-b">Г</view>
+             </block>
+                <block wx:else>
+               <view class="circle  xc-hooks"></view>
+             </block>
+                <view class="address-frame xc-ash">
+              <view class="flex-vertical-between butttem5">
+                  <view class="flex xc-ash">
+                       <view class="fs30 xc-black3 address_name">{{item.pickup_name}}</view>
+                   </view>
+                  <view>
+                    <view class="distance fs24 address-val"wx:if="{{item.distance!=null}}">
+                    距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+'km':filters.toFix(item.distance,0)+"m"}}</view>
+                  </view>
+              </view>
+              <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
+            </view>
+            </view>
+                 </view>
+                  </block>
+                  <block wx:else>
+                           <view class="store_choose flex" wx:for="{{only_pk}}" bindtap="choose_for_store_fir" data-ind="{{index}}">
+               <view class="store flex-vertical">
+                 <!-- 需要点击事件 -->
+                 <block wx:if="{{index==fir_pick_index}}" >
+                   <view  class="circle white xc-hook fs20 red-b">Г</view>
+                 </block>
+                 <block wx:else>
+                   <view  class="circle  xc-hooks"></view>
+                 </block>
+
+                 <view class="address-frame xc-ash">
+                   <view class="flex-vertical-between ">
+                     <view class="flex xc-ash">
+                       <view class="fs30 xc-black3 address_name">{{item.pickup_name}}</view>
+                     </view>
+                     <view>
+                       <view class="distance fs24 address-val"
+                       wx:if="{{item.distance!=null}}">距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}}
+                     </view>
+                     </view>
+                   </view>
+                   <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
+                 </view>
+               </view>
+             </view>
+                   </block>
+              </block>
+              <block wx:else> <!-- 如果是点击选择门店分类后显示分类下的门店  -->
+                   <view class="store_choose flex" wx:for="{{sec_sto.s_arr}}" data-ind="{{index}}"  bindtap="choose_for_store">
+                  <view class="store flex-vertical">
+                    <!-- 需要点击事件 -->
+                    <block wx:if="{{index==sec_pick_index}}">
+                      <view  class="circle white xc-hook fs20 red-b">Г</view>
+                    </block>
+                    <block wx:else>
+                      <view class="circle  xc-hooks"></view>
+                    </block>
+
+                    <view class="address-frame xc-ash">
+                      <view class="flex-vertical-between ">
+                        <view class="flex xc-ash">
+                          <view class="fs28 xc-black3 address_name">{{item.pickup_name}}</view>
+                        </view>
+                        <view>
+                          <view class="distance fs24 address-val"wx:if="{{item.distance!=null}}">                         距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}}</view>
+                        </view>
+                      </view>
+                      <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
+                    </view>
+                  </view>
+                </view>
+              </block>
+
+           </view>
+
+           <!-- 门店列表底部 -->
+           <view class="store-bottom-frame">
+              <view class="store-bottom flex-vertical-between">
+                <view class="determine red-b fs28 white t-c" bindtap="sure_pick" 
+                data-openindstore="{{open_ind_store}}">确定</view>
+                <view class="default  t-c fs28" bindtap="set_def_pick"data-openindstore="{{open_ind_store}}">设为默认</view>
+             </view>
+          </view>
+       
+     </block>
+
+
+       <block wx:else>
+         <view class="popup-top flex-space-between">
+       <text class="fs32 nearby_store">门店分类选择</text>
+        <view>
+           <view>
+              <icon bindtap="close_popup" class="modal-closes" color="black" size="22"       type="cancel"></icon>
+           </view>
+           <view class="felx choose_mores" bindtap="returns">
+              <text class="fs26 red-co">返回</text>
+           </view>
+          </view>
+       </view>
+       <view class="sort_store_list"> 
+
+          <view class="sort-store-frame" wx:for="{{all_sto}}" data-index="{{index}}" bindtap="choice_sort_store" data-region="{{item.name}}">
+              <view class="sort-store flex-vertical-between" >
+                  <view class="fs30" di>{{item.name}}</view>
+                  <view class="black_rights-frame">
+                      <view class="black_rights"></view>
+                </view>
+             </view>
+          </view>
+
+       </view>
+       </block>
+  </view>
+</block>  
+
 <!--  ---------------分享弹窗--------------- -->
 <!--二维码显示页面-->
 <canvas canvas-id='share' style='width:750rpx;height:1217rpx;' wx:if='{{!canvasHidden}}'></canvas>
-
-
 <warn id="warn"></warn>
\ No newline at end of file
diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss
index 0c0dc69..a0170c5 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxss
+++ b/pages/goods/goodsInfo/goodsInfo.wxss
@@ -6,7 +6,7 @@ image {
 .goods-detail{overflow: hidden}
 
 .type-navbar {
-    display: flex; 
+    display: flex;
     justify-content: center;
     width: 100%;
     height: 80rpx;
@@ -26,6 +26,9 @@ image {
 }
 .type-navbar-item {
     border-bottom: 4rpx solid #fff;
+    display: flex;
+    justify-content: center;
+    width: 100%;
 }
 .type-item-on {
     border-bottom: 4rpx solid #333;
@@ -282,6 +285,7 @@ image {
     width: 150rpx;
     height: 150rpx;
     margin-top: 8rpx;
+    margin-right: 10rpx;
 }
 
 .comment-btn {
@@ -321,6 +325,9 @@ image {
     height: 100rpx;
     background-color: #fff;
     text-align: center;
+    z-index: 9;
+    border-top: 4rpx solid #eee;
+
 }
 
 .join-cart>view {
@@ -355,7 +362,7 @@ image {
 .cart-num {
     position: absolute;
     left: 50%;
-    top: 0;
+    top: 1rpx;
     width: 40rpx;
     height: 40rpx;
     line-height: 40rpx;
@@ -368,11 +375,19 @@ image {
 .cart-btn {
     font-size: 28rpx;
     color: #fff;
-    line-height: 100rpx;
+    line-height: 70rpx;
+   margin-top: 16rpx;
+
+
 }
 
 .join-btn {
     background-color: #ffb03f;
+    height: 70rpx;
+border-radius: 55rpx 0rpx 0rpx 55rpx;
+margin-top: 16rpx;
+
+
 }
 
 view.cart-btn-lg {
@@ -381,6 +396,9 @@ view.cart-btn-lg {
 
 .buy-btn {
     background-color: #f23030;
+    height: 70rpx;
+border-radius: 0 56rpx 55rpx 0;
+
 }
 
 .toTop {
@@ -505,24 +523,23 @@ view.cart-btn-lg {
     /* padding: 0 30rpx; */
     font-size: 32rpx;
     box-sizing: border-box;
-
+    border-radius: 20rpx;
+     height: 72%;
 }
 
 .spec-model .pding{padding: 0 30rpx;}
 
 .spec-goods {
-    padding: 15rpx 0 10rpx;
+    padding: 30rpx 0 20rpx;
     float: left;
     width: 100%;
-    border-bottom: 1px solid #f8f8f8;
+    border-bottom:2rpx solid #eee;
 }
 
 .spec-img {
     float: left;
     height: 186rpx;
     width: 186rpx;
-    position: relative;
-    top:-40rpx;
      border: 4rpx solid #eee
 }
 
@@ -542,7 +559,7 @@ view.cart-btn-lg {
 }
 
 .spec-goods-price {
-    color: #ec5151;
+    color: #d60021;
     font-size: 33rpx;
     font-weight: bold;
 }
@@ -551,6 +568,7 @@ view.cart-btn-lg {
     margin-top: 3rpx;
     font-size: 24rpx;
     color: #999999;
+    margin-right: 15rpx;
 }
 
 .spec-name {
@@ -568,7 +586,7 @@ view.cart-btn-lg {
     position: fixed;
     display: flex;
     height: 50rpx;
-    border: 1rpx solid #f8f8f8;
+    border: 1rpx solid #000;
     font-size: 28rpx;
     right: 30rpx;
 }
@@ -581,15 +599,15 @@ view.cart-btn-lg {
     text-align: center;
 }
 .spec_bt{
-  background: fff;color: #333; margin-left: 10rpx;padding: 8rpx 12rpx; border-radius: 5px;font-size: 24rpx;border: 1rpx solid #ccc;
+  background: fff;color: #333; margin-left: 10rpx;padding: 4rpx 15rpx 4rpx; border-radius:30rpx;font-size: 24rpx;border: 1rpx solid #ccc;
 }
-.spec_bt.act{background: #C4182E;color: #fff;border: 1rpx solid #C4182E;}
+.spec_bt.act{background: #d60021;color: #fff;border: 1rpx solid #d60021;}
 .sub {
-    border-right: 1px solid #ddd;
+    border-right: 1px solid #000;
 }
 
 .add {
-    border-left: 1px solid #ddd;
+    border-left: 1px solid #000;
 }
 
 .spec-btn {
@@ -611,22 +629,24 @@ view.cart-btn-lg {
 }
 
 .spec-cart-btns {
-    /* background-color: #f8f8f8;
-    margin: 40rpx -30rpx 0;
-    padding: 20rpx 34rpx; */
-    float: left;
-    width: 100%;
-    line-height: 80rpx;
-	margin-top: 40rpx;
+    width: 92%;
+    line-height: 70rpx;
+    margin: 0rpx auto;
+	margin-top: 160rpx;
+  border-radius: 20rpx;
+position: fixed;
+bottom: 50rpx;
+left: 4%;
+
 }
 
 .spec-cart-btn {
-    float: left;
-    width: 100%;
+ 
+    width:100%;
     font-size: 30rpx;
     text-align: center;
     color: white;
-    border-radius: 4rpx;
+    border-radius: 40rpx;
 }
 
 .spec-add-cart {
@@ -718,7 +738,8 @@ left:31rpx;}
 
 .pt_fir .pt_fir_title .js{padding: 0 15rpx;height: 40rpx;background:#e9030d; text-align: center; border-radius: 8rpx; color: #fff; margin-left: 10rpx;}
 .pt_fir .pt_fir_title .tuannum{color: #e9030d; position: absolute; right: 20rpx; font-size: 26rpx;}
-.pding{padding-top: 20rpx;padding-left: 20rpx; padding-right: 20rpx;font-size: 26rpx;color: #ea120f}
+.pding{padding-top: 20rpx;padding-left: 20rpx;height: 81%;
+ padding-right: 20rpx;font-size: 26rpx;color: #ea120f}
 .pdres{margin-left: 10rpx;color: #8f8f94}
 .ptgz{position: relative;font-size: 30rpx;padding-left: 20rpx;margin-top: 10rpx; overflow: hidden }
 .shuxian{width: 6rpx;height: 28rpx; background: #ea120f; display: inline-block;top: 5rpx;position: relative; margin-right: 5rpx}
@@ -741,7 +762,7 @@ left:31rpx;}
 .wf .item .item_txy.hs{ background: #cbcbcb;}
 .po{margin-bottom: 20rpx;}
 
-.cart-btn.line-h{ line-height: 40rpx;}
+.cart-btn.line-h{ line-height: 26rpx;}
 .cart-btn .fir-v{ margin-top: 10rpx;}
 
 .hyt{ padding: 0 20rpx; font-size: 30rpx; display: flex; align-items:center; margin-top: 10rpx;}
@@ -777,7 +798,7 @@ left:31rpx;}
 .juzhong .xq .title .close{position: absolute;top: 0; right: 0; width: 45rpx; height: 45rpx;}
 
 .pt_qd{margin-top: 40rpx; height: auto;}
-.spec-cart-btn.w100{width: 100%; margin-left: 0; height: 80rpx; line-height: 80rpx;}
+.spec-cart-btn.w100{width: 95%; margin-left: 0; height: 75rpx; line-height:75rpx;margin: auto; }
 
 .sto_v{color: #333;}
 .ellipsis{overflow: hidden; white-space: nowrap; text-overflow: ellipsis;}
@@ -927,14 +948,13 @@ left:31rpx;}
     border-bottom: 3rpx solid #eee; border-top: 3rpx solid #eee; line-height: 100rpx }
 
 .bb_view{ display: flex;align-items: center;justify-content: space-between; padding: 0 34rpx; color: #333;
-    font-size: 32rpx; height: 104rpx; line-height: 104rpx; overflow: hidden; padding-right:31rpx }
+    font-size: 32rpx; height: 104rpx; line-height: 104rpx; overflow: hidden; padding-right:26rpx }
 .red_bb{ color: #d70026; min-width:158rpx;width: auto;}
 .bg_jj{ width: 18rpx; height:18rpx;
         border-top: 2rpx solid #d70026;
         border-right: 2rpx solid #d70026;
         transform: rotate(45deg);display:inline-block;
         margin-bottom:3rpx;
-
 }
 /* 顶部边框 */
 .topframe{
@@ -952,7 +972,7 @@ left:31rpx;}
     margin-bottom: 36rpx;
     color: #7d7d7d;
     padding-left: 20rpx;
-    font-size: 28rpx;
+    font-size: 32rpx;
 }
 /*评价人数量*/
 .topframe .topframe-top .topframe-top-val{
@@ -980,7 +1000,7 @@ left:31rpx;}
 
 .buttem-list .item{
     min-width: 17%;
-    font-size: 23rpx;
+    font-size: 24rpx;
     border-radius: 20rpx;
     background:#ffe3e2;
     height:38rpx;
@@ -996,16 +1016,11 @@ left:31rpx;}
 
 /* 用户评价 */
 .middle{
-   
     width: 95%;
-    height:auto;
-    
     margin:0 auto;
-
-
 }
 .middle-img-frame{
-    height:65rp;
+    height:65rpx;
     display: flex;
     margin-top: 32rpx;
   
@@ -1035,11 +1050,13 @@ left:31rpx;}
     text-align: center;
     margin-bottom:20rpx;
     margin-left:5rpx;
-
+}
+.xc-pirces{
+  margin-top: 14rpx;
 }
 /* 评价文字 */
 .middle-font{
-    font-size: 24rpx;
+    font-size: 30rpx;
    
 }
 .iddle-goods-img{
@@ -1065,11 +1082,12 @@ left:31rpx;}
     height: 45rpx;
     display:flex;
     line-height: 45rpx;
+    margin-top: 20rpx;
     margin-bottom: 14rpx;
     justify-content : space-between;
 }
 .parameter-font{
-    font-size: 24rpx;
+    font-size: 26rpx;
   
 }
 /* 规格 */
@@ -1091,13 +1109,13 @@ left:31rpx;}
 }
 /* 点赞图片 */
 .parameter-img{
-    width: 25rpx;
-    height: 25rpx;
+    width: 27rpx;
+    height: 27rpx;
     margin-top: 3rpx;
 }
 .parameter-val{
     margin-left:25rpx;
-    font-size: 24rpx;
+    font-size: 26rpx;
     color: #999;
 }
 /* 回复 */
@@ -1170,7 +1188,7 @@ left:31rpx;}
     width: 524rpx;
     margin-left: 34rpx;
     border-radius: 25rpx;
-    border: 1rpx solid #d6d4d5;
+    border: 2rpx solid #d6d4d5;
     overflow: hidden;
 }
 
@@ -1197,19 +1215,20 @@ left:31rpx;}
     margin-right: 5rpx
 }
 .xc_comment-font{
-    height: 65rpx;
+    height: 75rpx;
     margin-left: 22rpx;
     white-space:normal;
     overflow: hidden;
     margin-top: 8rpx;
+    
 }
 .xc_comment-val{
     width: 88%;
     height: 30rpx;
     margin-left: 22rpx;
     display: flex;
-    margin-top: 28rpx;
-    margin-bottom:8rpx;
+    margin-top: 15rpx;
+    margin-bottom:15rpx;
 }
 
 .xc_comment-time{
@@ -1266,7 +1285,7 @@ left:31rpx;}
     height: 100%;
     line-height: 100rpx;
     overflow: hidden;
-    margin-left: 7rpx;
+    margin-left: 10rpx;
 }
 .xc-coupon-fram{
     position: relative;
@@ -1306,7 +1325,7 @@ left:31rpx;}
     padding-left:15rpx;
     color: #d70025;
     position: absolute;
-    right: 7rpx;
+    right: 5rpx;
 }
 
 /* 自定义弹出窗口 */
@@ -2221,12 +2240,248 @@ right:17rpx; top:55rpx;
 .pd_top1{padding-top: 10rpx}
 .s_ms_bth{margin-top: 85rpx}
 
-.xc-pirces{
 
-  line-height:25rpx;
-margin-top: -13rpx;
+.no_pj_list{text-align: center; width: 100%; color: #999; margin: 30rpx 0; display: inline-block; font-size: 28rpx}
+/* 门店地址 */
+.xc-address_frame{
+  border-top:1rpx solid #eee;
+  width: 100%;
+  height: auto;
+}
+.on_height{
+height: 90rpx;
+}
+.sn_height{
+  height: 170rpx;
+}
+.xc-address_frame .address_frame{
+  width: 92%;
+padding-left: 10rpx;
+margin: auto;
+
+}
+.shop_name{
+
+}
+.stores-img{
+width: 40rpx;
+  height: 35rpx;
+  margin-right: 10rpx;
+}
+.shop_name{
+  margin-right: 10rpx;
+}
+.address{
+  width: 87%;
+  margin-top: 5rpx;
+  margin-bottom: 5rpx;
+}
+.distance{
+  padding-left: 15rpx;
+  padding-right: 15rpx;
+  background: #eee;
+  border-radius: 20rpx;
+  margin-right: 5rpx;
+  color: #999;
+  height: 38rpx;
+line-height: 38rpx;
+
+}
+/* 选择门店的弹窗 */
+.mongolia-layer{
+  position: fixed;
+left: 0;
+top: 0;
+right: 0;
+bottom: 0;
+z-index: 11;
+background: rgba(0,0,0,0.4);
+width: 100%;
+height: 91.9%;
+
+}
+.popup-frame{
+  position: fixed;
+bottom:99rpx;
+z-index: 20;
+background: white;
+width: 100%;
+border-radius: 20rpx 20rpx 0 0;
+height: 72%;
+}
+.popup-top{
+  border-bottom: 1rpx solid #eee;
+  height: 155rpx;
+  width: 95%;
+  margin: auto;
+  line-height: 155rpx;
 
 }
+.bg_rights{ 
+        border-top: 2rpx solid ;
+        border-right: 2rpx solid ;
+        transform: rotate(45deg);
+        display:inline-block;
+        width:15rpx;height:15rpx;
+        border-color:#da0b31;
+}
+.modal-closes {
+    position: absolute;
+    right: 30rpx;
+    top: -15rpx;
+    height: 25rpx;
+
+}
+.choose_more{
+  margin-top: 40rpx;
+  margin-right: 20rpx;
+
+}
+.choose_mores{
+  margin-top: 30rpx;
+  margin-right: 15rpx;
+
+}
+.store-list{
+  width: 95%;
+  height: 72%;
+  overflow-y: scroll;
+  margin: auto;
+}
+.store-list .store_choose{
+  width: 100%;
+  height: 120rpx;
+  line-height: 125rpx;
+  border-bottom: 1rpx solid #eee;
+
+}
+.store-list .store_choose .store{
+width: 100%;
+margin: auto;
+line-height: 37rpx;
+padding-left: 20rpx;
+
+}
+.xc-hook{
+  width: 35rpx;
+  height: 35rpx;
+  transform: rotate(-145deg);
+line-height: 37rpx;
+text-align: center;
+}
+ .xc-hooks{
+   width: 30rpx;
+  height: 30rpx;
+  border: 1rpx solid #999; 
+ }
+ .address-frame{
+   width: 93%;
+margin-left: 7rpx;
+
+ }
+ .nearby_store{
+margin-left: 17rpx;
+ }
+ .address_name{
+   margin-right: 10rpx;
+
+ }
+ .address-val{
+   height: 38rpx;
+line-height: 38rpx;
+
+ }
+ .store-bottom{
+   width: 85%;
+   margin: auto;
+   height: 70rpx;
+ }
+ .determine{
+   width: 260rpx;
+  height: 55rpx;
+  border-radius: 50rpx;
+  line-height: 55rpx;
+ }
+ .default{
+   width: 260rpx;
+  height: 55rpx;
+  border:3rpx solid #c8c8c8;
+    border-radius: 50rpx;
+    line-height: 55rpx;
+ }
+ .store-bottom-frame{
+   width: 95%;
+     margin: auto;
+   
+ }
+ /* 门店分类列表 */
+.sort_store_list{
+  height: 82%;
+  overflow: hidden;
+  overflow-y: scroll;
+  width: 95%;
+  margin: auto;
+}
+.sort_store_list .sort-store-frame{
+  width: 100%;
+height: 100rpx;
+line-height:100rpx;
+border-bottom: 1rpx solid #eee;
+
+}
+.sort_store_list .sort-store-frame .sort-store{
+  width: 94.5%;
+  margin: auto;
+}
+.black_rights-frame{
+width: 50%；
+}
+.black_rights-frame .black_rights{
+  border-top: 3rpx solid;
+border-right: 3rpx solid;
+transform: rotate(45deg);
+display: inline-block;
+width: 20rpx;
+height: 20rpx;
+}
+.xc-val-money{
+  height:80rpx;
+}
+
+.xc-distance-bottom{
+ margin-bottom: 40rpx;
+}
+.xc-distance-top{
+margin-top: 10rpx;
+}
+.xc-width{
+  width: 100%;
+}
+.right-arrow{ width: 15rpx; height:15rpx;
+        border-top: 2rpx solid #d70026;
+        border-right: 2rpx solid #d70026;
+        transform: rotate(45deg);display:inline-block;
+        margin-bottom:3rpx;
+}
+.xc-goods-attribute{
+  border-bottom: 1px solid #eee;
+padding-bottom: 15px;
+margin-bottom:40rpx;
+}
+.xc-val-fream{
+  width: 105rpx;
+}
+.is_stock{
+width: 58%;
+height: 70rpx;
+border-radius: 55rpx;
+}
+.select_store_height{
+  height: 50rpx;
+}
+.butttem5{
+  margin-bottom: 5rpx;
+}
 
 .no_pj_list{text-align: center; width: 100%; color: #999; margin-top: 30rpx; display: inline-block; font-size: 28rpx}
 
@@ -2235,8 +2490,7 @@ margin-top: -13rpx;
   width: 58%; background-color: #adadad;
 }
 
-
-
+.s_btn{ margin-top: 25rpx; }
 /* 美妆价的样式 */
 .beauty-makeup-frame{
   width: 101.5%;