Commit d4c0574c15247b7e50a1a37c6090bb965f668ec9

Authored by yvan.ni
1 parent 1916b93d

git版本,门店确定按钮,我的收藏修改提交~~

pages/goods/goodsInfo/goodsInfo.js
@@ -2766,6 +2766,9 @@ Page({ @@ -2766,6 +2766,9 @@ Page({
2766 } 2766 }
2767 }) 2767 })
2768 } 2768 }
  2769 + else{
  2770 + th.get_sto();
  2771 + }
2769 this.setData({ 2772 this.setData({
2770 //open_ind_store: ind, 2773 //open_ind_store: ind,
2771 store:1, 2774 store:1,
@@ -2813,7 +2816,7 @@ close_popup:function(e){ @@ -2813,7 +2816,7 @@ close_popup:function(e){
2813 var openindstore = e.currentTarget.dataset.openindstore; 2816 var openindstore = e.currentTarget.dataset.openindstore;
2814 2817
2815 if(th.data.choice_sort_store==0 ){ 2818 if(th.data.choice_sort_store==0 ){
2816 - var index=th.data.fir_pick_index; 2819 + var index=th.data.fir_pick_index;
2817 if(th.data.is_show_sto_cat==1){ 2820 if(th.data.is_show_sto_cat==1){
2818 item=th.data.def_pickpu_list[index]; 2821 item=th.data.def_pickpu_list[index];
2819 }else{ 2822 }else{
pages/goods/goodsInfo/goodsInfo.wxml
@@ -1063,7 +1063,7 @@ @@ -1063,7 +1063,7 @@
1063 <view class="mongolia-layer" bindtap="close_popup"></view> 1063 <view class="mongolia-layer" bindtap="close_popup"></view>
1064 <view class="popup-frame"> 1064 <view class="popup-frame">
1065 <block wx:if="{{sort_store==0}}"> 1065 <block wx:if="{{sort_store==0}}">
1066 - <!-- 头部 标题 --> 1066 + <!-- 头部 标题 -->
1067 <view class="popup-top flex-space-between"> 1067 <view class="popup-top flex-space-between">
1068 <text class="fs32 nearby_store">{{choice_sort_store==0?'附近的门店':region_name}}</text> 1068 <text class="fs32 nearby_store">{{choice_sort_store==0?'附近的门店':region_name}}</text>
1069 <view> 1069 <view>
pages/user/collect_list/collect_list.wxml
@@ -91,14 +91,14 @@ @@ -91,14 +91,14 @@
91 <view class="abs flex-vertical" wx:if="{{editEd && collects.length>0}}"> 91 <view class="abs flex-vertical" wx:if="{{editEd && collects.length>0}}">
92 <view class="left"> 92 <view class="left">
93 <!-- 全选收藏按钮 --> 93 <!-- 全选收藏按钮 -->
94 - <view class="flex-vertical fs28" bindtap="allClick"> 94 + <view class="flex-vertical fs32" bindtap="allClick">
95 <radio class="iconUn" color="rgb(214,1,33)" checked="{{isall}}"></radio> 95 <radio class="iconUn" color="rgb(214,1,33)" checked="{{isall}}"></radio>
96 <view>全选</view> 96 <view>全选</view>
97 </view> 97 </view>
98 98
99 <view class="Number flex-vertical"> 99 <view class="Number flex-vertical">
100 已选 100 已选
101 - <text class="co-red">{{sum>0?sum:'0'}}</text> 件 101 + <text class="co-red" style="top:2rpx; position:relative">{{sum>0?sum:'0'}}</text> 件
102 </view> 102 </view>
103 </view> 103 </view>
104 <view class="delete fs30 flex-center white {{isdelete==1?'Deleting':''}}" bindtap="alldelete"> 104 <view class="delete fs30 flex-center white {{isdelete==1?'Deleting':''}}" bindtap="alldelete">
pages/user/collect_list/collect_list.wxss
@@ -480,6 +480,7 @@ page { @@ -480,6 +480,7 @@ page {
480 height: 100rpx; 480 height: 100rpx;
481 background-color: rgb(255, 255, 255); 481 background-color: rgb(255, 255, 255);
482 width: 100%; 482 width: 100%;
  483 + border-top: 1rpx solid #eee;
483 } 484 }
484 485
485 .abs .left { 486 .abs .left {
@@ -508,4 +509,5 @@ page { @@ -508,4 +509,5 @@ page {
508 .abs .Number { 509 .abs .Number {
509 margin-right: 18rpx; 510 margin-right: 18rpx;
510 letter-spacing: 0rpx; 511 letter-spacing: 0rpx;
  512 + font-size: 32rpx;
511 } 513 }