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

yvan.ni
2 parents 37ea7f68 d662d782
Showing 3 changed files with 107 additions and 60 deletions
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
pages/goods/goodsInfo/goodsInfo.wxss
@@ -224,6 +224,7 @@ Page({
     is_get_local_ok:0,//获取坐标是否完成
     region_name:"门店分类",//区域的名字
     is_gps:1,
+    open_ind_store:0,//哪里打开的门店列表的控制属性
   },
   //------初始化加载----------
@@ -256,28 +257,7 @@ Page({
           supportPageScroll: !0
         });
-        if(e.is_sort_storage){
-          wx.getLocation({
-            type: 'wgs84',
-            success: function (res) {
-              th.data.lat=res.latitude;
-              th.data.lon=res.longitude;
-              th.data.is_get_local_ok=1;
-            },
-            fail: function (res) {
-             
-              if (res.errCode == 2) {
-                th.setData({ is_gps: 0 });
-              } else {
-                th.setData({ is_gps: "3" });
-              }
-         
-              th.data.is_get_local_ok=1;
-            }
-          })
-        }else{
-          th.data.is_get_local_ok=1;
-        }
+        
     })
@@ -302,6 +282,32 @@ Page({
         },500)
     })
+
+    if (e.is_sort_storage) {
+      wx.getLocation({
+        type: 'wgs84',
+        success: function (res) {
+          th.data.lat = res.latitude;
+          th.data.lon = res.longitude;
+          th.data.is_get_local_ok = 1;
+        },
+        fail: function (res) {
+          if (res.errCode == 2) {
+            th.setData({ is_gps: 0 });
+            if (th.data.is_gps == 0) {
+              s.showWarning("请开启GPS定位", null, 3800000, !1);
+            }
+           
+          } else {
+            th.setData({ is_gps: "3" });
+          }
+
+          th.data.is_get_local_ok = 1;
+        }
+      })
+    } else {
+      th.data.is_get_local_ok = 1;
+    }
   },
@@ -678,8 +684,10 @@ Page({
   },
   //------------加入购物车--------------
-  addCart: function(t) {
+  addCart: function(t) {  
     var th=this;
+    var ind = t.currentTarget.dataset.openSpecModal_ind;
+    th.setData({open_ind_store: ind});
     //如果是秒杀的话，要看redis够不够
     if(this.data.prom_type==1){
        this.getactLen(function (num) {
@@ -924,8 +932,10 @@ 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
+      store: 0, choice_sort_store: 0, sort_store: 0, open_ind_store: open_store,
     })
     //--先判断会员状态--
     var user_info=getApp().globalData.userInfo;
@@ -1127,7 +1137,14 @@ Page({
   //-----------选择属性的按钮事件----------
   sele_spec: function(e) {
-    var gid = e.target.dataset.gid;
+    var gid = e.currentTarget.dataset.gid;
+    var sku_g = this.data.sku_g;
+    var item = null;
+    for (var i in sku_g) {
+      if (sku_g[i].goods_id == gid) { item = sku_g[i]; break }
+    }
+    if (item) this.setData({ sele_g: item, gid: gid });
+
   },
   //---------拿出门店分类和门店------------
   get_sto(e) {
@@ -2674,6 +2691,7 @@ Page({
         tt();
       },
       fail: function (res) {
+
         ee.data.share_goods_img= "../../../images/share/default_g_img.gif";  //分享的图片不能用网络的
         tt();
       }
@@ -2729,25 +2747,28 @@ Page({
     })
   },
   // 选择门店
- choice_store:function(){
+ choice_store:function(ee){
    var th=this;
+   var ind=ee.currentTarget.dataset.ind;
+   var bconfig = th.data.bconfig;
+   console.log("男士水水水水水", bconfig);
+   if (bconfig.is_sort_storage){
    wx.getLocation({
      type: 'wgs84',
      success: function (res) {
-       console.log("GPS成功的回调是上面");
+       
        th.data.lat = res.latitude;
        th.data.lon = res.longitude;
        th.data.is_get_local_ok = 1;
        th.setData({ is_gps: 1 });
+       th.onShow();
      },
      fail: function (res) {
-       console.log("GPS失败的回调");
+       th.onShow();
        if (res.errCode == 2) {
-         console.log("GPS失败的回调22222222222222222");
          th.setData({ is_gps: 0 });
-         if (this.data.is_gps == 0) {
-           console.log(this.data.is_gps, "GPS提示框");
-           s.showWarning("请开启GPS定位", null, 1000, !1);
+         if (th.data.is_gps == 0) {
+           s.showWarning("请开启GPS定位", null, 25000, !1);
          }
        } else {
          th.setData({ is_gps: "3" });
@@ -2756,17 +2777,20 @@ Page({
        th.data.is_get_local_ok = 1;
      }
    })
-  
+   }
    this.setData({
+     open_ind_store: ind,
      store:1,
      openSpecModal: !1,
      openSpecModal_pt: !1
    })
 },
  //关闭选择门店
-close_popup:function(){
+close_popup:function(e){
+  
   this.setData({
-      store: 0, choice_sort_store: 0,sort_store:0})
+    store: 0, choice_sort_store: 0, sort_store: 0
+  })
 },
 //选择更多门店
   more_store:function(){
@@ -2799,8 +2823,32 @@ close_popup:function(){
   },
   //确定def_pick为选择的门店
-  sure_pick:function () {
+  sure_pick:function (e) {
       var th=this; var item=null;
+    var openindstore = e.currentTarget.dataset.openindstore;
+    console.log("加入购物车 还是立即购买，商品主页", openindstore);
+    if (openindstore == 1) {
+      console.log("加入购物车 ", openindstore);
+      th.setData({
+        openSpecModal: !0,
+        openSpecModal_ind: openindstore, });
+    } else if (openindstore == 2) {
+      console.log("立即购买 ", openindstore);
+      th.setData({
+        openSpecModal: !0,
+        openSpecModal_ind: openindstore, });
+    } else {
+      console.log("商品主页", openindstore);
+      th.setData({
+        store: 0, choice_sort_store: 0, sort_store: 0
+      })
+    }
+
+
+
+
+
+
       if(th.data.choice_sort_store==0 ){
            var index=th.data.fir_pick_index;
           if(th.data.is_show_sto_cat==1){
@@ -43,7 +43,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>
@@ -308,7 +308,7 @@
                       <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
                       <view class="fs28">选择门店</view>
                     </view>
-                    <view class="red_bb fs32" bindtap="choice_store">
+                    <view class="red_bb fs32" bindtap="choice_store"data-ind="0">
                          更多门店
                          <text class="bg_jj"></text>
                     </view>
@@ -320,7 +320,7 @@
                        <text class="fs32 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
                      </view>
-                     <view class="distance fs20">
+                     <view class="distance fs20"wx:if="{{def_pick_store.distance!=null}}">
                       距离:{{filters.toFix(def_pick_store.distance,0)}}m
                      </view>
                   </view>
@@ -755,7 +755,7 @@
       <view class="spec-goods">
         <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 ellipsis-1">{{data.goods_name}}</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>
@@ -782,18 +782,18 @@
                      <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">
+                         <view class="distance fs20 xc-ash"wx:if="{{def_pick_store.distance!=null}}">
                           距离:{{filters.toFix(def_pick_store.distance,0)}}m
                           </view>
                      </view>
                      <!-- 没有门店的时候 -->
-                     <view  class="flex" bindtap="choice_store" wx:else>
+                     <view  class="flex" bindtap="choice_store"wx:else>
                           <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
                            <view class="fs28">选择门店</view>
                       </view>
-                      <view class="red-co fs28" bindtap="choice_store">
+                      <view class="red-co fs28" bindtap="choice_store" >
                          更多门店
                          <text class="right-arrow"></text>
                       </view>
@@ -804,7 +804,7 @@
       <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">
+        <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>
@@ -834,8 +834,8 @@
        <view class="spec-cart-btns">
       <block>
-        <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart" class="spec-cart-btn yellow fs32" data-action="add">加入购物车</view>
-        <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart" class="spec-cart-btn spec-buy" data-action="buy">立即购买</view>
+        <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>
       </block>
     </view>
@@ -896,14 +896,14 @@
       <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}}
+          <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>
       </block>
       <block wx:else>
         <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 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>
       </block>
@@ -1087,7 +1087,7 @@
                        <view class="fs28 xc-black3 address_name">{{item.pickup_name}}</view>
                    </view>
                   <view>
-                    <view class="distance fs20 address-val">距离:{{filters.toFix(item.distance,0)}}m</view>
+                    <view class="distance fs20 address-val"wx:if="{{item.distance!=null}}">距离:{{filters.toFix(item.distance,0)}}m</view>
                   </view>
               </view>
               <view class="fs20">地址:{{item.fulladdress}}</view>
@@ -1112,7 +1112,7 @@
                        <view class="fs28 xc-black3 address_name">{{item.pickup_name}}</view>
                      </view>
                      <view>
-                       <view class="distance fs20 address-val">距离:{{filters.toFix(item.distance,0)}}m</view>
+                       <view class="distance fs20 address-val"wx:if="{{item.distance!=null}}">距离:{{filters.toFix(item.distance,0)}}m</view>
                      </view>
                    </view>
                    <view class="fs20">地址:{{item.fulladdress}}</view>
@@ -1138,7 +1138,7 @@
                           <view class="fs28 xc-black3 address_name">{{item.pickup_name}}</view>
                         </view>
                         <view>
-                          <view class="distance fs20 address-val">距离:{{filters.toFix(item.distance,0)}}m</view>
+                          <view class="distance fs20 address-val"wx:if="{{item.distance!=null}}">距离:{{filters.toFix(item.distance,0)}}m</view>
                         </view>
                       </view>
                       <view class="fs20">地址:{{item.fulladdress}}</view>
@@ -1152,7 +1152,8 @@
            <!-- 门店列表底部 -->
            <view class="store-bottom-frame">
               <view class="store-bottom flex-vertical-between">
-                <view class="determine red-b fs28 white t-c" bindtap="sure_pick">确定</view>
+                <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">设为默认</view>
              </view>
           </view>
@@ -2348,7 +2348,7 @@ height: 70%;
 }
 .store-list .store_choose{
   width: 100%;
-  height: 125rpx;
+  height: 120rpx;
   line-height: 125rpx;
   border-bottom: 1rpx solid #eee;
@@ -2361,10 +2361,10 @@ padding-left: 20rpx;
 }
 .xc-hook{
-  width: 33rpx;
-  height: 33rpx;
+  width: 35rpx;
+  height: 35rpx;
   transform: rotate(-145deg);
-line-height: 35rpx;
+line-height: 37rpx;
 text-align: center;
 }
  .xc-hooks{
@@ -2392,7 +2392,7 @@ line-height: 30rpx;
  .store-bottom{
    width: 85%;
    margin: auto;
-   height: 90rpx;
+   height: 97rpx;
  }
@@ -2411,10 +2411,8 @@ line-height: 30rpx;
  }
  .store-bottom-frame{
    width: 95%;
-     border-top: 3rpx solid #eee;
      margin: auto;
-     margin-top: 10rpx;
-
+   
  }
  /* 门店分类列表 */
 .sort_store_list{