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

WXD-SEASON\season
2 parents ee24c49b 171116de
Showing 9 changed files with 30 additions and 16 deletions
packageA/pages/activity_share/activity_share.js
packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
packageC/pages/payForAnother/payForAnother.js
packageC/pages/presell/cart/cart2.js
packageE/pages/cart/cart2/cart2.js
packageE/pages/cart/cart2_inte/cart2_inte.js
packageE/pages/cart/cart2_pt/cart2_pt.js
pages/goods/goodsInfo/goodsInfo.js
@@ -329,7 +329,21 @@ Page({
 			  th.setData({share_hidden:1,share_good:null});	 
 			  var ind=0;//促销
-			  if(th.data.currentIndex==2){ ind=5;}
+			  if(th.data.currentIndex==2){ 
+					ind=5;
+						//优惠促销单独处理
+					if (th.data.currentIndex2==2) {
+						let yh_url = `/pages/goods/goodsList/goodsList?prom_type=3&prom_id=${hui_active.id}`
+						if(getApp().globalData.user_id){
+							yh_url+="?first_leader="+getApp().globalData.user_id;
+						}						
+						ob.path = yh_url
+						if (hui_active.img_url) {
+							ob.imageUrl = th.data.url + hui_active.img_url
+						}
+
+					}
+				}
 			  //插入活动
 			  th.insert_act_share(title,hui_active.id,ind,null,null);
@@ -2968,7 +2968,7 @@ Page({
         })
         //先获取门店的编号
         await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + pick, {
-            data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
+            //data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
         }).then(res => {
             if (res.data.code == 0) {
                 pick_no = res.data.data.pickup_no;
@@ -2976,7 +2976,7 @@ Page({
         })
         //先获取商品的线下库存
         await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + goods_id, {
-            data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
+            //data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
         }).then(res => {
             if (res.data.code == 0) {
                 erpwareid = res.data.data.erpwareid;
@@ -2350,7 +2350,7 @@ Page({
     })
     //先获取门店的编号
     await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + pick, {
-      data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
+      //data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
     }).then(res => {
       if (res.data.code == 0) {
         pick_no = res.data.data.pickup_no;
@@ -2358,7 +2358,7 @@ Page({
     })
     //先获取商品的线下库存
     await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + goods_id, {
-      data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
+      //data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
     }).then(res => {
       if (res.data.code == 0) {
         erpwareid = res.data.data.erpwareid;
@@ -2645,7 +2645,7 @@ Page({
         })
         //先获取门店的编号
         await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + pick, {
-            data: {storeId: os.stoid, goodsId: t.goods_id, pickupId: pick}
+            //data: {storeId: os.stoid, goodsId: t.goods_id, pickupId: pick}
         }).then(res => {
             if (res.data.code == 0) {
                 pick_no = res.data.data.pickup_no;
@@ -2653,7 +2653,7 @@ Page({
         })
         //先获取商品的线下库存
         await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + goods_id, {
-            data: {storeId: os.stoid, goodsId: t.goods_id, pickupId: pick}
+            //data: {storeId: os.stoid, goodsId: t.goods_id, pickupId: pick}
         }).then(res => {
             if (res.data.code == 0) {
                 erpwareid = res.data.data.erpwareid;
@@ -2166,7 +2166,7 @@ Page({
     if (this.data.sales_rules == 2) {
       //先获取门店的编号
       await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + pick, {
-        data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
+        //data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
       }).then(res => {
         if (res.data.code == 0) {
           pick_no = res.data.data.pickup_no;
@@ -2175,7 +2175,7 @@ Page({
     }
     //先获取商品的线下库存
     await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + goods_id, {
-      data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
+      //data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
     }).then(res => {
       if (res.data.code == 0) {
         erpwareid = res.data.data.erpwareid;
@@ -6216,7 +6216,7 @@ Page({
     if (this.data.sales_rules == 2) {
       //先获取门店的编号
       await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + pick, {
-        data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
+        //data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
       }).then(res => {
         if (res.data.code == 0) {
           pick_no = res.data.data.pickup_no;
@@ -6226,7 +6226,7 @@ Page({
     //先获取商品的线下库存
     await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + goods_id, {
-      data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
+      //data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
     }).then(res => {
       if (res.data.code == 0) {
         erpwareid = res.data.data.erpwareid;
@@ -1607,7 +1607,7 @@ Page({
     })
     //先获取门店的编号
     await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + pick, {
-      data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
+      //data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
     }).then(res => {
       if (res.data.code == 0) {
         pick_no = res.data.data.pickup_no;
@@ -1615,7 +1615,7 @@ Page({
     })
     //先获取商品的线下库存
     await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + goods_id, {
-      data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
+      //data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
     }).then(res => {
       if (res.data.code == 0) {
         erpwareid = res.data.data.erpwareid;
@@ -2912,7 +2912,7 @@ Page({
     if (this.data.sales_rules == 2) {
       //先获取门店的编号
       await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + pick, {
-        data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
+        //data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
       }).then(res => {
         if (res.data.code == 0) {
           pick_no = res.data.data.pickup_no;
@@ -2922,7 +2922,7 @@ Page({
     //先获取商品的线下库存
     await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + goods_id, {
-      data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
+      //data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
     }).then(res => {
       if (res.data.code == 0) {
         erpwareid = res.data.data.erpwareid;
@@ -5766,7 +5766,7 @@ Page({
                           //---通过接口获取门店的线下库存信息--
                           th.check_CanOutQty(th.data.sele_g, pick, function (CanOutQty) {
                             if (CanOutQty) {
-                              if (CanOutQty < e.data.goodsInputNum) {
+                              if (CanOutQty < th.data.goodsInputNum) {
                                 wx.hideLoading();
                                 th.data.adding = 0;
                                 wx.showToast({