Merge branch 'work1.1_20190926' of http://git.vipzhuang.cn/wxd/MShopWeApp into work1.1_20190926

后端开发-许程
2 parents 1e90deda d4c0574c
Showing 4 changed files with 9 additions and 4 deletions
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
pages/user/collect_list/collect_list.wxml
pages/user/collect_list/collect_list.wxss
@@ -2766,6 +2766,9 @@ Page({
      }
    })
    }
+   else{
+     th.get_sto();
+   }
    this.setData({
      //open_ind_store: ind,
      store:1,
@@ -2813,7 +2816,7 @@ close_popup:function(e){
       var openindstore = e.currentTarget.dataset.openindstore;
  
       if(th.data.choice_sort_store==0 ){
-           var index=th.data.fir_pick_index;
+          var index=th.data.fir_pick_index;
           if(th.data.is_show_sto_cat==1){
               item=th.data.def_pickpu_list[index];
           }else{
@@ -1063,7 +1063,7 @@
   <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>
@@ -91,14 +91,14 @@
 <view class="abs flex-vertical" wx:if="{{editEd && collects.length>0}}">
   <view class="left">
     <!-- 全选收藏按钮 -->
-    <view class="flex-vertical fs28" bindtap="allClick">
+    <view class="flex-vertical fs32" bindtap="allClick">
       <radio class="iconUn" color="rgb(214,1,33)" checked="{{isall}}"></radio>
       <view>全选</view>
     </view>
  
     <view class="Number flex-vertical">
       已选
-      <text class="co-red">{{sum>0?sum:'0'}}</text> 件
+      <text class="co-red" style="top:2rpx; position:relative">{{sum>0?sum:'0'}}</text> 件
     </view>
   </view>
   <view class="delete fs30 flex-center white {{isdelete==1?'Deleting':''}}" bindtap="alldelete">
@@ -480,6 +480,7 @@ page {
   height: 100rpx;
   background-color: rgb(255, 255, 255);
   width: 100%;
+  border-top: 1rpx solid #eee;
 }
  
 .abs .left {
@@ -508,4 +509,5 @@ page {
 .abs .Number {
   margin-right: 18rpx;
   letter-spacing: 0rpx;
+  font-size: 32rpx;
 }