Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy

pageB/sdetails/index.vue

@@ -135,14 +135,14 @@
         </u-popup>
 		<!-- 普通商品 tool -->
         <view class="tloos" v-if="type == 1">
-            <view class="navs" @click="toOthersPage('pageC/merchant/index?id=' + storeInfo.store_id)">
+           <view class="navs" @click="toOthersPage('pageC/merchant/index?id=' + storeInfo.store_id)">
                 <image src="/static/image/common/18.png"></image>
                 店铺
             </view>
             <view class="navs" style="margin-right:30rpx">
                 <image src="/static/image/common/19.png"></image>
                 客服
-            </view>
+            </view> 
             <view class="button" style="background:rgba(253,211,96,0.6);" v-if="goodsInfo.goods_try == 1" @click="tryDress">试穿试送</view>
             <view class="button" style="background:rgba(253,211,96,1);" @click="addCart">加入购物车</view>
             <view class="button" style="background:rgba(255,120,15,1);" @click="settlementOrder">立即购买</view>