Merge branch 'test' of http://git.vipzhuang.cn/wxd/MShopWeApp into qa

WXD-SEASON\season
2 parents 06aa3711 43cb360a
Showing 2 changed files with 30 additions and 30 deletions
packageE/pages/cart/cart2_inte/cart2_inte.js
pages/goods/goodsInfo/goodsInfo.js
@@ -972,35 +972,6 @@ Page({
     }
-
-    //预存金额使用参与计算
-    if (th.data.udata && th.data.udata.Balance > 0 && order_m * 1 > 0) {
-      if (!th.data.bn_goods.keyid) {
-        //获取门店信息
-        await getApp().request.promiseGet("/api/weshop/pickup/list", {
-          data: {
-            store_id: os.stoid,
-            ids: th.data.bn_pick
-          }
-        }).then(res => {
-          if (ut.ajax_ok(res)) {
-            console.log(res);
-            if (res.data.code == 0) {
-              let resData = res.data.data.pageData
-              if (resData && resData[0]) {
-                let keyid = resData[0].keyid
-                let txt = 'bn_goods.keyid'
-                th.setData({
-                  [txt]: keyid
-                })
-              }
-            }
-          }
-        })
-      }
-
-
-
     //判断是否同城配送,而且没有调用过
     if(th.data.bn_exp_type==2 && th.data.user_addr) {
@@ -1072,6 +1043,35 @@ Page({
     }
+    //预存金额使用参与计算
+    if (th.data.udata && th.data.udata.Balance > 0 && order_m * 1 > 0) {
+      if (!th.data.bn_goods.keyid) {
+        //获取门店信息
+        await getApp().request.promiseGet("/api/weshop/pickup/list", {
+          data: {
+            store_id: os.stoid,
+            ids: th.data.bn_pick
+          }
+        }).then(res => {
+          if (ut.ajax_ok(res)) {
+            console.log(res);
+            if (res.data.code == 0) {
+              let resData = res.data.data.pageData
+              if (resData && resData[0]) {
+                let keyid = resData[0].keyid
+                let txt = 'bn_goods.keyid'
+                th.setData({
+                  [txt]: keyid
+                })
+              }
+            }
+          }
+        })
+      }
+
+
+
+
       var yc_order_m=order_m;
@@ -1823,7 +1823,7 @@ Page({
-          ut.m_toast('商品详情，购买globalData中导购id:'+getApp().globalData.guide_id );
+         // ut.m_toast('商品详情，购买globalData中导购id:'+getApp().globalData.guide_id );
           //---是不是从收藏夹出来的---
           if (th.data.c_guide_id) {