加入购物车，门店地址修改

后端开发-许程
1 parent d3022c2a
Showing 4 changed files with 110 additions and 74 deletions
app.wxss
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
pages/goods/goodsInfo/goodsInfo.wxss
@@ -303,6 +303,17 @@ justify-content:space-around;
 .xc-ash{
 color: #b9b9b9;
 }
+.xc-ash-9f{
+  color: #9fa1a0;
+
+}
+
+.xc-ash_c999{
+color: #999;
+}
+.xc-ash-b{
+background: #b9b9b9;
+}
 .xc-black{
   color: #000;
 }
@@ -415,7 +415,7 @@ Page({
            mapurl_f_img=res1.data.data.video_img;
        }
     })
-
+    console.log(fir_com,"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
     ee.setData({
       gallery: gallery,
       is_collect: is_collect,
@@ -916,7 +916,7 @@ Page({
   },
   openSpecModel: function(t) {
     var open_store = t.currentTarget.dataset.ind;
-    console.log(t,"加入购物车头",open_store);
+ 
     this.setData({
       store: 0, choice_sort_store: 0, sort_store: 0, open_ind_store: open_store,
     })
@@ -2744,10 +2744,12 @@ Page({
        th.data.lon = res.longitude;
        th.data.is_get_local_ok = 1;
        th.setData({ is_gps: 1 });
-       th.onShow();
+       //th.onShow();
+       th.get_sto();
      },
      fail: function (res) {
-       th.onShow();
+       //th.onShow();
+       th.get_sto();
        if (res.errCode == 2) {
          th.setData({ is_gps: 0 });
          if (th.data.is_gps == 0) {
@@ -2791,17 +2793,14 @@ close_popup:function(e){
       var index=e.currentTarget.dataset.index;
     var region_name = e.currentTarget.dataset.region;
       var item = this.data.all_sto[index];
-    this.setData({ region_name: region_name, sort_store: 0, choice_sort_store:1, sec_sto: item,sec_pick_index:0 });
+      this.setData({ region_name: region_name, sort_store: 0, choice_sort_store:1, sec_sto: item,sec_pick_index:0 });
    },
  
-  //---点击二级之后的选择---
-  choose_for_store:function (e) {
-      var index_c=e.currentTarget.dataset.ind;
-      this.setData({sec_pick_index:index_c,fir_pick_index:0})
-  },
+  
  
   choose_for_store_fir:function (e) {
     var index_c=e.currentTarget.dataset.ind;
+    console.log("选择门店的id+",index_c);
     this.setData({fir_pick_index:index_c})
   },
  
@@ -2836,45 +2835,37 @@ close_popup:function(e){
          var index=th.data.sec_pick_index;
          item=th.data.sec_sto.s_arr[index];
       }
-    console.log("王朝马汉吱吱吱吱666666666666", item);
+   
      th.setData({def_pick_store:item,sto_sele_name:item.pickup_name,
       sto_sele_id:item.pickup_id,sto_sele_distr:item.distr_type,store:0,choice_sort_store:0});
   },
-
+  //---点击二级之后的选择---
+  choose_for_store: function (e) {
+    var index_c = e.currentTarget.dataset.ind;
+    console.log("qqqqqqqqqqqqqqqqqqqqqqqqq", index_c),
+      this.setData({ sec_pick_index: index_c, fir_pick_index: index_c })
+  },
   //把选择的门店设置成默认的门店def_pick
   set_def_pick:function (e) { 
-    var th = this; var item = null;
-    var openindstore = e.currentTarget.dataset.openindstore;
-    if (openindstore == 1) {
-
-      th.setData({
-        openSpecModal: !0,
-        openSpecModal_ind: openindstore,
-        store: 0, choice_sort_store: 0, sort_store: 0, 
-      });
-    } else if (openindstore == 2) {
-
-      th.setData({
-        openSpecModal: !0,
-        openSpecModal_ind: openindstore,
-        store: 0, choice_sort_store: 0, sort_store: 0, 
-      });
-    } else {
-      th.setData({
-        store: 0, choice_sort_store: 0, sort_store: 0, 
-      })
-    }
-     
+      var th = this; var item = null;
+   
       if(th.data.choice_sort_store==0 ){
+        
         var index=th.data.fir_pick_index;
+        console.log("分类的门店地址0",index);
         if(th.data.is_show_sto_cat==1){
+        
           item=th.data.def_pickpu_list[index];
+          console.log(item,"分类的门店地址1", index);
         }else{
+          console.log("分类的门店地址22222", index);
           item=th.data.only_pk[index];  //当没有门店分类的时候
+          console.log(item,"分类的门店地址22222", index);
         }
       }else{
         var index=th.data.sec_pick_index;
         item=th.data.sec_sto.s_arr[index];
+        console.log(item,"分类的门店地址333333333333", index);
       }
  
     var store_id=o.stoid;
@@ -2885,8 +2876,8 @@ close_popup:function(e){
       data: { user_id,def_pickup_id},
         success:function(res){
           console.log("是什么",res.data.code);
-          if (res.data.code!=-1){
-            th.setData({fir_pick_index:0});
+          if (res.data.code==0){
+            if (th.data.choice_sort_store == 0) th.setData({fir_pick_index:0});
             s.showWarning("设置门店地址成功", null, 500, !1);
           }else{
             console.log("门店地址失败");
@@ -2900,6 +2891,26 @@ close_popup:function(e){
       def_pick_store: item, sto_sele_name: item.pickup_name,
       sto_sele_id: item.pickup_id, sto_sele_distr: item.distr_type, store: 0, choice_sort_store: 0
     });
+
+
+    var openindstore = e.currentTarget.dataset.openindstore;
+    if (openindstore == 1) {
+      th.setData({
+        openSpecModal: !0,
+        openSpecModal_ind: openindstore,
+        store: 0, choice_sort_store: 0, sort_store: 0,
+      });
+    } else if (openindstore == 2) {
+      th.setData({
+        openSpecModal: !0,
+        openSpecModal_ind: openindstore,
+        store: 0, choice_sort_store: 0, sort_store: 0,
+      });
+    } else {
+      th.setData({
+        store: 0, choice_sort_store: 0, sort_store: 0,
+      })
+    }
  
   },
  
@@ -302,13 +302,13 @@
  
             <!-- 门店收货地址 -->
             <view class="xc-address_frame flex-vertical xc-ash {{def_pick_store!=null?'sn_height':'on_height'}}" >
-                 <view class="address_frame">
+                 <view class="address_frame" bindtap="choice_store"  data-ind="0">
                   <view class="flex-vertical-between "> 
-                    <view class="flex">
+                    <view class="flex-vertical select_store_height">
                       <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
-                      <view class="fs28">选择门店</view>
+                      <view class="fs30 xc-ash-9f">选择门店</view>
                     </view>
-                    <view class="red_bb fs32" bindtap="choice_store"data-ind="0">
+                    <view class="red_bb fs32">
                          更多门店
                          <text class="bg_jj"></text>
                     </view>
@@ -317,14 +317,13 @@
                   <view wx:if="{{def_pick_store}}">
                   <view  class="flex-space-between address ai_end  ">
                      <view>
-                       <text class="fs32 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
-                    
+                       <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
                      </view>
-                     <view class="distance fs20"wx:if="{{def_pick_store.distance!=null}}">
-                      距离:{{filters.toFix(def_pick_store.distance,0)}}m
+                     <view class="distance fs24"wx:if="{{def_pick_store.distance!=null}}">
+                      距离：{{filters.toFix(def_pick_store.distance,0)}}m
                      </view>
                   </view>
-                  <view class="fs20">地址:{{def_pick_store.fulladdress}}</view>
+                  <view class="fs24 xc-ash-9f">地址:{{def_pick_store.fulladdress}}</view>
                   </view>
                  </view>   
  
@@ -370,11 +369,11 @@
               <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>
@@ -603,9 +602,9 @@
            <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>
@@ -673,11 +672,20 @@
       </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}}">
+    <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 class="is_stock cart-btn is_stock xc-ash-b " style="width:55.5%">
+      库存不足
+      </view>
+      </block>
     </block>
  
+
     <!-------秒杀-------->
     <block wx:if="{{prom_type==1}}">
       <block wx:if="{{prom_st==1 && !prom_r_null}}">
@@ -781,8 +789,8 @@
          <view  class="flex-space-between address ai_end xc-width ">
  
                      <view class="flex ai_end" wx:if="{{def_pick_store}}">
-                       <text class="fs28 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
-                         <view class="distance fs20 xc-ash"wx:if="{{def_pick_store.distance!=null}}">
+                       <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}}">
                           距离:{{filters.toFix(def_pick_store.distance,0)}}m
                           </view>
                      </view>
@@ -790,7 +798,7 @@
                      <!-- 没有门店的时候 -->
                      <view  class="flex" bindtap="choice_store"wx:else>
                           <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
-                           <view class="fs28">选择门店</view>
+                           <view class="fs28 xc-ash-9f">选择门店</view>
                       </view>
  
                       <view class="red-co fs28" bindtap="choice_store" >
@@ -798,7 +806,7 @@
                          <text class="right-arrow"></text>
                       </view>
                   </view>
-                  <view class="fs20 xc-ash xc-distance-top "wx:if="{{def_pick_store}}">地址:{{def_pick_store.fulladdress}}</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">
@@ -1055,7 +1063,7 @@
               <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="fs22 red-co" wx:if="{{is_show_sto_cat}}">{{choice_sort_store==0?'选择更多门店':'返回'}}</text>
+              <text class="fs26 red-co" wx:if="{{is_show_sto_cat}}">{{choice_sort_store==0?'更多门店':'返回'}}</text>
              <view class="bg_rights"></view>
            </view>
           </view>
@@ -1078,13 +1086,14 @@
                 <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 class="fs30 xc-black3 address_name">{{item.pickup_name}}</view>
                    </view>
                   <view>
-                    <view class="distance fs20 address-val"wx:if="{{item.distance!=null}}">距离:{{filters.toFix(item.distance,0)}}m</view>
+                    <view class="distance fs24 address-val"wx:if="{{item.distance!=null}}">
+                    距离:{{filters.toFix(item.distance/1000,2)}}km</view>
                   </view>
               </view>
-              <view class="fs20">地址:{{item.fulladdress}}</view>
+              <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
             </view>
             </view>
                  </view>
@@ -1103,13 +1112,13 @@
                  <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 class="fs30 xc-black3 address_name">{{item.pickup_name}}</view>
                      </view>
                      <view>
-                       <view class="distance fs20 address-val"wx:if="{{item.distance!=null}}">距离:{{filters.toFix(item.distance,0)}}m</view>
+                       <view class="distance fs24 address-val"wx:if="{{item.distance!=null}}">距离:{{filters.toFix(item.distance/1000,2)}}km</view>
                      </view>
                    </view>
-                   <view class="fs20">地址:{{item.fulladdress}}</view>
+                   <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
                  </view>
                </view>
              </view>
@@ -1132,10 +1141,10 @@
                           <view class="fs28 xc-black3 address_name">{{item.pickup_name}}</view>
                         </view>
                         <view>
-                          <view class="distance fs20 address-val"wx:if="{{item.distance!=null}}">距离:{{filters.toFix(item.distance,0)}}m</view>
+                          <view class="distance fs24 address-val"wx:if="{{item.distance!=null}}">                         距离:{{filters.toFix(item.distance/1000,2)}}km</view>
                         </view>
                       </view>
-                      <view class="fs20">地址:{{item.fulladdress}}</view>
+                      <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
                     </view>
                   </view>
                 </view>
@@ -1163,7 +1172,7 @@
               <icon bindtap="close_popup" class="modal-closes" color="black" size="22"       type="cancel"></icon>
            </view>
            <view class="felx choose_mores" bindtap="returns">
-              <text class="fs22 red-co">返回</text>
+              <text class="fs26 red-co">返回</text>
            </view>
           </view>
        </view>
@@ -1171,7 +1180,7 @@
  
           <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="fs28" di>{{item.name}}</view>
+                  <view class="fs30" di>{{item.name}}</view>
                   <view class="black_rights-frame">
                       <view class="black_rights"></view>
                 </view>
@@ -2281,6 +2281,7 @@ width: 40rpx;
   background: #eee;
   border-radius: 20rpx;
   margin-right: 5rpx;
+  color: #999;
 }
 /* 选择门店的弹窗 */
 .mongolia-layer{
@@ -2306,10 +2307,10 @@ height: 70%;
 }
 .popup-top{
   border-bottom: 1rpx solid #eee;
-  height: 140rpx;
+  height: 155rpx;
   width: 95%;
   margin: auto;
-  line-height: 140rpx;
+  line-height: 155rpx;
  
 }
 .bg_rights{ 
@@ -2323,12 +2324,12 @@ height: 70%;
 .modal-closes {
     position: absolute;
     right: 30rpx;
-    top: -10rpx;
+    top: -15rpx;
     height: 25rpx;
  
 }
 .choose_more{
-  margin-top: 30rpx;
+  margin-top: 40rpx;
   margin-right: 20rpx;
  
 }
@@ -2384,8 +2385,8 @@ margin-left: 17rpx;
  
  }
  .address-val{
-   height: 30rpx;
-line-height: 30rpx;
+   height: 38rpx;
+line-height: 38rpx;
  
  }
  .store-bottom{
@@ -2397,16 +2398,16 @@ line-height: 30rpx;
  }
  .determine{
    width: 260rpx;
-  height: 44rpx;
+  height: 55rpx;
   border-radius: 50rpx;
-  line-height: 44rpx;
+  line-height: 55rpx;
  }
  .default{
    width: 260rpx;
-  height: 44rpx;
+  height: 55rpx;
   border:3rpx solid #c8c8c8;
     border-radius: 50rpx;
-    line-height: 44rpx;
+    line-height: 55rpx;
  }
  .store-bottom-frame{
    width: 95%;
@@ -2473,4 +2474,8 @@ margin-bottom:40rpx;
 .is_stock{
 width: 58%;
 height: 70rpx;
+border-radius: 55rpx;
+}
+.select_store_height{
+  height: 50rpx;
 }
 \ No newline at end of file