wxd / MShopWeApp

Commit 04e5f512fd2e315f958ae4ea5938402466a97f18

Authored by WXD-SEASON\season
2 parents ee24c49b 171116de

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

Inline Side-by-side
Showing 9 changed files with 30 additions and 16 deletions
packageA/pages/activity_share/activity_share.js
  View file @04e5f51
... ... @@ -329,7 +329,21 @@ Page({
329 329 th.setData({share_hidden:1,share_good:null});
330 330  
331 331 var ind=0;//促销
332   - if(th.data.currentIndex==2){ ind=5;}
  332 + if(th.data.currentIndex==2){
  333 + ind=5;
  334 + //优惠促销单独处理
  335 + if (th.data.currentIndex2==2) {
  336 + let yh_url = `/pages/goods/goodsList/goodsList?prom_type=3&prom_id=${hui_active.id}`
  337 + if(getApp().globalData.user_id){
  338 + yh_url+="?first_leader="+getApp().globalData.user_id;
  339 + }
  340 + ob.path = yh_url
  341 + if (hui_active.img_url) {
  342 + ob.imageUrl = th.data.url + hui_active.img_url
  343 + }
  344 +
  345 + }
  346 + }
333 347  
334 348 //插入活动
335 349 th.insert_act_share(title,hui_active.id,ind,null,null);
... ...
packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js
  View file @04e5f51
... ... @@ -2968,7 +2968,7 @@ Page({
2968 2968 })
2969 2969 //先获取门店的编号
2970 2970 await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + pick, {
2971   - data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
  2971 + //data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
2972 2972 }).then(res => {
2973 2973 if (res.data.code == 0) {
2974 2974 pick_no = res.data.data.pickup_no;
... ... @@ -2976,7 +2976,7 @@ Page({
2976 2976 })
2977 2977 //先获取商品的线下库存
2978 2978 await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + goods_id, {
2979   - data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
  2979 + //data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
2980 2980 }).then(res => {
2981 2981 if (res.data.code == 0) {
2982 2982 erpwareid = res.data.data.erpwareid;
... ...
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
  View file @04e5f51
... ... @@ -2350,7 +2350,7 @@ Page({
2350 2350 })
2351 2351 //先获取门店的编号
2352 2352 await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + pick, {
2353   - data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
  2353 + //data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
2354 2354 }).then(res => {
2355 2355 if (res.data.code == 0) {
2356 2356 pick_no = res.data.data.pickup_no;
... ... @@ -2358,7 +2358,7 @@ Page({
2358 2358 })
2359 2359 //先获取商品的线下库存
2360 2360 await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + goods_id, {
2361   - data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
  2361 + //data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
2362 2362 }).then(res => {
2363 2363 if (res.data.code == 0) {
2364 2364 erpwareid = res.data.data.erpwareid;
... ...
packageC/pages/payForAnother/payForAnother.js
  View file @04e5f51
... ... @@ -2645,7 +2645,7 @@ Page({
2645 2645 })
2646 2646 //先获取门店的编号
2647 2647 await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + pick, {
2648   - data: {storeId: os.stoid, goodsId: t.goods_id, pickupId: pick}
  2648 + //data: {storeId: os.stoid, goodsId: t.goods_id, pickupId: pick}
2649 2649 }).then(res => {
2650 2650 if (res.data.code == 0) {
2651 2651 pick_no = res.data.data.pickup_no;
... ... @@ -2653,7 +2653,7 @@ Page({
2653 2653 })
2654 2654 //先获取商品的线下库存
2655 2655 await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + goods_id, {
2656   - data: {storeId: os.stoid, goodsId: t.goods_id, pickupId: pick}
  2656 + //data: {storeId: os.stoid, goodsId: t.goods_id, pickupId: pick}
2657 2657 }).then(res => {
2658 2658 if (res.data.code == 0) {
2659 2659 erpwareid = res.data.data.erpwareid;
... ...
packageC/pages/presell/cart/cart2.js
  View file @04e5f51
... ... @@ -2166,7 +2166,7 @@ Page({
2166 2166 if (this.data.sales_rules == 2) {
2167 2167 //先获取门店的编号
2168 2168 await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + pick, {
2169   - data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
  2169 + //data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
2170 2170 }).then(res => {
2171 2171 if (res.data.code == 0) {
2172 2172 pick_no = res.data.data.pickup_no;
... ... @@ -2175,7 +2175,7 @@ Page({
2175 2175 }
2176 2176 //先获取商品的线下库存
2177 2177 await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + goods_id, {
2178   - data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
  2178 + //data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
2179 2179 }).then(res => {
2180 2180 if (res.data.code == 0) {
2181 2181 erpwareid = res.data.data.erpwareid;
... ...
packageE/pages/cart/cart2/cart2.js
  View file @04e5f51
... ... @@ -6216,7 +6216,7 @@ Page({
6216 6216 if (this.data.sales_rules == 2) {
6217 6217 //先获取门店的编号
6218 6218 await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + pick, {
6219   - data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
  6219 + //data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
6220 6220 }).then(res => {
6221 6221 if (res.data.code == 0) {
6222 6222 pick_no = res.data.data.pickup_no;
... ... @@ -6226,7 +6226,7 @@ Page({
6226 6226  
6227 6227 //先获取商品的线下库存
6228 6228 await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + goods_id, {
6229   - data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
  6229 + //data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
6230 6230 }).then(res => {
6231 6231 if (res.data.code == 0) {
6232 6232 erpwareid = res.data.data.erpwareid;
... ...
packageE/pages/cart/cart2_inte/cart2_inte.js
  View file @04e5f51
... ... @@ -1607,7 +1607,7 @@ Page({
1607 1607 })
1608 1608 //先获取门店的编号
1609 1609 await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + pick, {
1610   - data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
  1610 + //data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
1611 1611 }).then(res => {
1612 1612 if (res.data.code == 0) {
1613 1613 pick_no = res.data.data.pickup_no;
... ... @@ -1615,7 +1615,7 @@ Page({
1615 1615 })
1616 1616 //先获取商品的线下库存
1617 1617 await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + goods_id, {
1618   - data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
  1618 + //data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
1619 1619 }).then(res => {
1620 1620 if (res.data.code == 0) {
1621 1621 erpwareid = res.data.data.erpwareid;
... ...
packageE/pages/cart/cart2_pt/cart2_pt.js
  View file @04e5f51
... ... @@ -2912,7 +2912,7 @@ Page({
2912 2912 if (this.data.sales_rules == 2) {
2913 2913 //先获取门店的编号
2914 2914 await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + pick, {
2915   - data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
  2915 + //data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
2916 2916 }).then(res => {
2917 2917 if (res.data.code == 0) {
2918 2918 pick_no = res.data.data.pickup_no;
... ... @@ -2922,7 +2922,7 @@ Page({
2922 2922  
2923 2923 //先获取商品的线下库存
2924 2924 await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + goods_id, {
2925   - data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
  2925 + //data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
2926 2926 }).then(res => {
2927 2927 if (res.data.code == 0) {
2928 2928 erpwareid = res.data.data.erpwareid;
... ...
pages/goods/goodsInfo/goodsInfo.js
  View file @04e5f51
... ... @@ -5766,7 +5766,7 @@ Page({
5766 5766 //---通过接口获取门店的线下库存信息--
5767 5767 th.check_CanOutQty(th.data.sele_g, pick, function (CanOutQty) {
5768 5768 if (CanOutQty) {
5769   - if (CanOutQty < e.data.goodsInputNum) {
  5769 + if (CanOutQty < th.data.goodsInputNum) {
5770 5770 wx.hideLoading();
5771 5771 th.data.adding = 0;
5772 5772 wx.showToast({
... ...