diff --git a/components/diy_goodsGroup/diy_goodsGroup.js b/components/diy_goodsGroup/diy_goodsGroup.js index 5334302..eabd4ee 100644 --- a/components/diy_goodsGroup/diy_goodsGroup.js +++ b/components/diy_goodsGroup/diy_goodsGroup.js @@ -421,7 +421,7 @@ Component({ this.data.currentPage = 1; - this.setData({ goods_array: [], total: null, title_index: title_idx }); + this.setData({ goods_array: [], total: null, title_index: title_idx,is_get: 0 }); //初始化 this.init(this.data.classstyle_id, this.data.wgroup); setTimeout(function () { wx.hideLoading(); }, 1000) diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxml b/components/diy_goodsGroup/diy_goodsGroup.wxml index 98c1a79..97b65a3 100644 --- a/components/diy_goodsGroup/diy_goodsGroup.wxml +++ b/components/diy_goodsGroup/diy_goodsGroup.wxml @@ -45,16 +45,22 @@ - + - + - - - - + + + + @@ -95,7 +101,7 @@ - + @@ -110,7 +116,7 @@ {{item.market_price}} - + @@ -161,7 +167,7 @@ ￥{{item.shop_price}} - ￥{{item.market_price}} + ￥{{item.market_price}} @@ -214,16 +220,21 @@ - + - - - - + + + + @@ -264,7 +275,7 @@ - + @@ -279,7 +290,7 @@ {{item.market_price}} - + @@ -383,16 +394,22 @@ - + - + - - - - + + + + @@ -433,7 +450,7 @@ - + @@ -448,7 +465,7 @@ {{item.market_price}} - + @@ -555,16 +572,22 @@ - + - + - - - - + + + + @@ -606,7 +629,7 @@ - + @@ -621,7 +644,7 @@ {{item.market_price}} - + @@ -747,16 +770,22 @@ - + - + - - - - + + + + @@ -799,7 +828,7 @@ - + @@ -814,7 +843,7 @@ {{aitem.market_price}} - + diff --git a/components/diy_store_select/diy_store_select.js b/components/diy_store_select/diy_store_select.js index efc2641..97a8f04 100644 --- a/components/diy_store_select/diy_store_select.js +++ b/components/diy_store_select/diy_store_select.js @@ -146,7 +146,7 @@ Component({ if (th.data.is_show_sto_cat == 1) { item = th.data.def_pickpu_list[index]; } else { - item = th.data.only_pk[index]; //当没有门店分类的时候 + item = th.data.only_pk?th.data.only_pk[index]:null; //当没有门店分类的时候 } } //如果是跳转到门店分类里面的时候 @@ -155,6 +155,10 @@ Component({ item = th.data.sec_sto.s_arr[index]; } + if(!item){ + return false; + } + //--回调函数的用法-- th.setData({ top_store: item, diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js index 0bb8c73..bae351a 100644 --- a/packageA/pages/goodsInfo/goodsInfo.js +++ b/packageA/pages/goodsInfo/goodsInfo.js @@ -2649,7 +2649,7 @@ Page({ if (th.data.is_show_sto_cat == 1) { item = th.data.def_pickpu_list[index]; } else { - item = th.data.only_pk[index]; //当没有门店分类的时候 + item = th.data.only_pk?th.data.only_pk[index]:null; //当没有门店分类的时候 } } else { @@ -2657,6 +2657,9 @@ Page({ item = th.data.sec_sto.s_arr[index]; } + if(!item) return false; + + var ser_card=this.data.data; //判断门店的配送方式是不是匹配 if(ser_card.storageId!=null && ser_card.storageId!="" && ser_card.storageId.indexOf(item.keyid)==-1){ @@ -2728,12 +2731,14 @@ Page({ if (th.data.is_show_sto_cat == 1) { item = th.data.def_pickpu_list[index]; } else { - item = th.data.only_pk[index]; //当没有门店分类的时候 + item = th.data.only_pk?th.data.only_pk[index]:null; //当没有门店分类的时候 } } else { var index = th.data.sec_pick_index; item = th.data.sec_sto.s_arr[index]; } + + if(!item) return false; //判断门店的配送方式是不是匹配 var ser_card=this.data.data; @@ -3842,7 +3847,7 @@ Page({ if (th.data.goodsInputNum <= 0) return s.my_warnning("商品数量不能为0", 0, th); if (th.data.sto_sele_name == null || th.data.sto_sele_name == undefined) - this.setData({ + th.setData({ sto_sele_name: "" }); if (th.data.sto_sele_name == "") return s.my_warnning("请选择门店", 0, th); diff --git a/packageA/pages/profile/profile.js b/packageA/pages/profile/profile.js index 8253aea..b3d9a6d 100644 --- a/packageA/pages/profile/profile.js +++ b/packageA/pages/profile/profile.js @@ -1,21 +1,22 @@ function e(e, a, r) { - return a in e ? Object.defineProperty(e, a, { - value: r, - enumerable: !0, - configurable: !0, - writable: !0 - }) : e[a] = r, e; + return a in e ? Object.defineProperty(e, a, { + value: r, + enumerable: !0, + configurable: !0, + writable: !0 + }) : e[a] = r, e; } + const app = getApp(); let self = null; var a = getApp(), - r = a.globalData.setting, - t = a.request, - s = require("../../../utils/common.js"), - util = require("../../../utils/util.js"), - ut = util, - d = getApp().globalData; + r = a.globalData.setting, + t = a.request, + s = require("../../../utils/common.js"), + util = require("../../../utils/util.js"), + ut = util, + d = getApp().globalData; var timestamp = Date.parse(new Date()); var date = new Date(timestamp); @@ -26,896 +27,928 @@ var date = new Date(timestamp); var regeneratorRuntime = require('../../../utils/runtime.js'); Page({ - data: { - phone: "", - url: r.url, - resourceUrl: r.resourceUrl, - iurl: r.imghost, - defaultAvatar: r.resourceUrl + "/static/images/user68.jpg", - user: null, - tc_hide: true, - stoname: "请选择", - checkDate: false, - datet: "", - year: date.getFullYear(), - store: 0, - all_sto: "", - region_name: "", - def_pick_store: "", - sort_store: 0, //门店分类 - sec_sto: "", - more_store: 0, //选择门店 - choice_sort_store: 0, //选择分类门店 - more_store: 0, //选择门店 - lat: null, //维度 - lon: null, //经度 - fir_pick_index: 0, - sec_pick_index: 0, - is_gps: 1, - lon: 0, - only_pk: 0, - open_ind_store: 0, //哪里打开的门店列表的控制属性 - ispwhid: 1, //是否隐藏密码显示 - isstcsp: 0, //是否启用密码消费 - isGender: 0, //什么性别 - iscalendar: 0, //是否是农历 - consumption: "", //消费密码 - identity_card: "", //身份证值 - address: "", //地址 - openid: "", //openid - pulscardname: "", //PLUS会员的卡 - gradename: "", //会员权益的卡 - isBool: "", - sto_sele_id: "", //所属门店id - is_zy: 0, //是否执行onshow - is_lable_set: "", //是否启用我的兴趣标签 - check_label: [], //我选择的兴趣标签 - fir_guide_id:null, //存储会员详情接口出来的美导ID - isLunar: 0, - lat: null, //维度 - lon: null, //经度 - loading:0, - - }, - //通过路径跳转到其他页面 - goto: function(e) { - var url = e.currentTarget.dataset.url; - getApp().goto(url); - }, - - - //查找会员选择的兴趣标签 - query_checklabels: function() { - var th = this; - var url = "/api/weshop/marketing/holiday/vip/interest/label/get"; - var interest_lables = th.data.interest_lables; //兴趣标签 - getApp().request.promiseGet(url, { - data: { - userId: d.user_id, - storeId: r.stoid - } - }).then(res => { - if (res.data.code == 0) { - var data = res.data.data; - var VipLabel = th.data.check_label; //通过id标签找到已选择的标签 - var dateList = data.VipLabel.split(","); - for (var i in dateList) { - if (dateList[i] != "") { - VipLabel.push(dateList[i]); - } + data: { + phone: "", + url: r.url, + resourceUrl: r.resourceUrl, + iurl: r.imghost, + defaultAvatar: r.resourceUrl + "/static/images/user68.jpg", + user: null, + tc_hide: true, + stoname: "请选择", + checkDate: false, + datet: "", + year: date.getFullYear(), + store: 0, + all_sto: "", + region_name: "", + def_pick_store: "", + sort_store: 0, //门店分类 + sec_sto: "", + more_store: 0, //选择门店 + choice_sort_store: 0, //选择分类门店 + more_store: 0, //选择门店 + lat: null, //维度 + lon: null, //经度 + fir_pick_index: 0, + sec_pick_index: 0, + is_gps: 1, + lon: 0, + only_pk: 0, + open_ind_store: 0, //哪里打开的门店列表的控制属性 + ispwhid: 1, //是否隐藏密码显示 + isstcsp: 0, //是否启用密码消费 + isGender: 0, //什么性别 + iscalendar: 0, //是否是农历 + consumption: "", //消费密码 + identity_card: "", //身份证值 + address: "", //地址 + openid: "", //openid + pulscardname: "", //PLUS会员的卡 + gradename: "", //会员权益的卡 + isBool: "", + sto_sele_id: "", //所属门店id + is_zy: 0, //是否执行onshow + is_lable_set: "", //是否启用我的兴趣标签 + check_label: [], //我选择的兴趣标签 + fir_guide_id: null, //存储会员详情接口出来的美导ID + isLunar: 0, + lat: null, //维度 + lon: null, //经度 + loading: 0, + + }, + //通过路径跳转到其他页面 + goto: function (e) { + var url = e.currentTarget.dataset.url; + getApp().goto(url); + }, + + + //查找会员选择的兴趣标签 + query_checklabels: function () { + var th = this; + var url = "/api/weshop/marketing/holiday/vip/interest/label/get"; + var interest_lables = th.data.interest_lables; //兴趣标签 + getApp().request.promiseGet(url, { + data: { + userId: d.user_id, + storeId: r.stoid + } + }).then(res => { + if (res.data.code == 0) { + var data = res.data.data; + var VipLabel = th.data.check_label; //通过id标签找到已选择的标签 + var dateList = data.VipLabel.split(","); + for (var i in dateList) { + if (dateList[i] != "") { + VipLabel.push(dateList[i]); + } + } + th.setData({ + check_label: VipLabel + }) + } else { + getApp().my_warnning("系统繁忙，请稍后再试", 0, th); + } + }) + }, + + + //出生日期是否是农历 + iscalendar: function () { + + if (this.data.user.birthday) return false; + var th = this; + var iscalendar = th.data.iscalendar; + if (iscalendar == 0) { + th.setData({ + iscalendar: 1 + }) + } else { + th.setData({ + iscalendar: 0 + }) + } + }, + + + checkDate: function () { + var th = this; + if (th.data.checkDate) { + th.setData({ + checkDate: false + }) + } else { + th.setData({ + checkDate: true + }) + } + }, + + //---点击二级之后的选择--- + choose_for_store: function (e) { + var index_c = e.currentTarget.dataset.ind; + + this.setData({ + sec_pick_index: index_c, + fir_pick_index: index_c + }) + }, + + + //确定def_pick为选择的门店 + sure_pick: function (e) { + var th = this; + var item = null; + var openindstore = th.data.open_ind_store; + if (th.data.choice_sort_store == 0) { + var index = th.data.fir_pick_index; + if (th.data.is_show_sto_cat == 1) { + item = th.data.def_pickpu_list[index]; + } else { + item =th.data.only_pk?th.data.only_pk[index]:null; //当没有门店分类的时候 + } + + } else { + var index = th.data.sec_pick_index; + item = th.data.sec_sto.s_arr[index]; } + + if (!item) return false; th.setData({ - check_label: VipLabel + def_pick_store: item, + stoname: item.pickup_name, + sto_sele_name: item.pickup_name, + sto_sele_id: item.pickup_id, + sto_sele_distr: item.distr_type, + store: 0, + choice_sort_store: 0, + fir_pick_index: 0 + }); + + if (openindstore == 1) { + th.setData({ + openSpecModal: !0, + openSpecModal_ind: openindstore, + }); + } else if (openindstore == 2) { + th.setData({ + openSpecModal: !0, + openSpecModal_ind: openindstore, + openSpecModal_pt: 1 + }); + } + }, + choose_for_store_fir: function (e) { + var index_c = e.currentTarget.dataset.ind; + this.setData({ + fir_pick_index: index_c + }) + }, + wait_for_store_config: function () { + var th = this; + wx.getLocation({ + type: 'gcj02', + 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) { + getApp().confirmBox("请开启GPS定位", null, 10000, !1); + } + } else { + th.setData({ + is_gps: "3" + }); + } + th.data.is_get_local_ok = 1; + } }) - } else { - getApp().my_warnning("系统繁忙，请稍后再试", 0, th); - } - }) - }, - - - //出生日期是否是农历 - iscalendar: function() { - - if(this.data.user.birthday) return false; - var th = this; - var iscalendar = th.data.iscalendar; - if (iscalendar == 0) { - th.setData({ - iscalendar: 1 - }) - } else { - th.setData({ - iscalendar: 0 - }) - } - }, - - - checkDate: function() { - var th = this; - if (th.data.checkDate) { - th.setData({ - checkDate: false - }) - } else { - th.setData({ - checkDate: true - }) - } - }, - - //---点击二级之后的选择--- - choose_for_store: function(e) { - var index_c = e.currentTarget.dataset.ind; - - this.setData({ - sec_pick_index: index_c, - fir_pick_index: index_c - }) - }, - - - //确定def_pick为选择的门店 - sure_pick: function(e) { - var th = this; - var item = null; - var openindstore = th.data.open_ind_store; - if (th.data.choice_sort_store == 0) { - var index = th.data.fir_pick_index; - if (th.data.is_show_sto_cat == 1) { - item = th.data.def_pickpu_list[index]; - } else { - item = th.data.only_pk[index]; //当没有门店分类的时候 - } - - } else { - var index = th.data.sec_pick_index; - item = th.data.sec_sto.s_arr[index]; - } - - if(!item) return false; - th.setData({ - def_pick_store: item, - stoname: item.pickup_name, - sto_sele_name: item.pickup_name, - sto_sele_id: item.pickup_id, - sto_sele_distr: item.distr_type, - store: 0, - choice_sort_store: 0, - fir_pick_index: 0 - }); - - if (openindstore == 1) { - th.setData({ - openSpecModal: !0, - openSpecModal_ind: openindstore, - }); - } else if (openindstore == 2) { - th.setData({ - openSpecModal: !0, - openSpecModal_ind: openindstore, - openSpecModal_pt: 1 - }); - } - }, - choose_for_store_fir: function(e) { - var index_c = e.currentTarget.dataset.ind; - this.setData({ - fir_pick_index: index_c - }) - }, - wait_for_store_config: function() { - var th = this; - wx.getLocation({ - type: 'gcj02', - 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) { - getApp().confirmBox("请开启GPS定位", null, 10000, !1); - } + }, + onclickstore: function () { + var th = this; + if (th.data.store == 0) { + th.setData({ + store: 1 + }) } else { - th.setData({ - is_gps: "3" - }); + th.setData({ + store: 0 + }) + } + var dd = { + store_id: r.stoid, + isstop: 0, + pageSize: 2000 } - th.data.is_get_local_ok = 1; - } - }) - }, - onclickstore: function() { - var th = this; - if (th.data.store == 0) { - th.setData({ - store: 1 - }) - } else { - th.setData({ - store: 0 - }) - } - var dd = { - store_id: r.stoid, - isstop: 0, - pageSize: 2000 - } - th.setData({ - sort_store: 0 - }); - var i = getApp().request; - //如果有距离的话 - if (th.data.lat != null) { - dd.lat = th.data.lat; - dd.lon = th.data.lon; - } - //----------获取门店---------------- - getApp().request.get("/api/weshop/pickup/list", { - data: dd, - success:function(res){ - var e = res; - if (e.data.code == 0 && e.data.data && e.data.data.pageData && e.data.data.pageData.length>0) { - - var ishas_cate=0; - for(let i in e){ - let item=e[i]; - if(item.category_id>0) { - ishas_cate=1;break; - } - } - - //-- 如果有默认选择门店的时候，要把默认门店放在第一位 -- - if (th.data.def_pick_store) { - for (var k = 0; k < e.data.data.pageData.length; k++) { - if (e.data.data.pageData[k].pickup_id == th.data.def_pick_store.pickup_id) { - e.data.data.pageData.splice(k, 1); //删除 - break; - } - } - e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加 - } - - //单总量超出5个的时候 - if (e.data.data.total > 10 && ishas_cate) { - i.get("/api/weshop/storagecategory/page", { - data: { - store_id: r.stoid, - pageSize: 1000, - orderField:"sort", - orderType:'asc', - }, - success: function(ee) { - if (ee.data.code == 0) { - - var check_all_cate=0; - if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0){ - for(let i in ee.data.data.pageData){ - let item=ee.data.data.pageData[i]; - if(item.is_show==1){ - check_all_cate=1;break - } - } - } - - if (check_all_cate) { - - var sto_cate = ee.data.data.pageData; - var sto_arr = e.data.data.pageData; - var newarr = new Array(); - var qita = new Array(); - - var is_del_pk=0; - //----要进行门店分组-------- - for (var i = 0; i < sto_arr.length; i++) { - //找一下这个门店有没有在分类数组内 - var find2 = 0,find2name = "",sort=0; - is_del_pk=0; - for (var m = 0; m < sto_cate.length; m++) { - if (sto_arr[i].category_id == sto_cate[m].cat_id) { - if(sto_cate[m].is_show!=1){ - is_del_pk=1; sto_arr.splice(i,1); - i--; - }else { - find2 = sto_cate[m].cat_id; - find2name = sto_cate[m].cat_name; - sort = sto_cate[m].sort; - is_del_pk=0; - } - break; - } - } - if(is_del_pk) continue; - - if (newarr.length > 0) { - var find = 0; - //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 - if (find2 != 0) { - for (var ii = 0; ii < newarr.length; ii++) { - if (sto_arr[i].category_id == newarr[ii].cat_id) { - newarr[ii].s_arr.push(sto_arr[i]); - find = 1; - break; - } - } - if (find == 0) { - var arr0 = new Array(); - arr0.push(sto_arr[i]); - var item = { - cat_id: find2, - name: find2name, - sort:sort, - s_arr: arr0 - }; - newarr.push(item); - } - } else { - qita.push(sto_arr[i]); - } - } else { - //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 - if (find2 != 0) { - var arr0 = new Array(); - arr0.push(sto_arr[i]); - var item = { - cat_id: find2, - name: find2name, - sort:sort, - s_arr: arr0 - }; - newarr.push(item); - } else { - qita.push(sto_arr[i]); - } - } - } - - var def_arr = new Array(); - //-- 开始就看10个门店 -- - for (var k = 0; k < 10; k++) { - if (k == e.data.data.pageData.length) break; - def_arr.push(e.data.data.pageData[k]); + th.setData({ + sort_store: 0 + }); + var i = getApp().request; + //如果有距离的话 + if (th.data.lat != null) { + dd.lat = th.data.lat; + dd.lon = th.data.lon; + } + //----------获取门店---------------- + getApp().request.get("/api/weshop/pickup/list", { + data: dd, + success: function (res) { + var e = res; + if (e.data.code == 0 && e.data.data && e.data.data.pageData && e.data.data.pageData.length > 0) { + + var ishas_cate = 0; + for (let i in e) { + let item = e[i]; + if (item.category_id > 0) { + ishas_cate = 1; + break; + } + } + + //-- 如果有默认选择门店的时候，要把默认门店放在第一位 -- + if (th.data.def_pick_store) { + for (var k = 0; k < e.data.data.pageData.length; k++) { + if (e.data.data.pageData[k].pickup_id == th.data.def_pick_store.pickup_id) { + e.data.data.pageData.splice(k, 1); //删除 + break; } + } + e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加 + } - th.setData({ - def_pickpu_list: def_arr, - pickpu_list: ee.data.data.pageData - }); - - //门店分类要排序下 - function compare(property){ - return function(a,b){ - var value1 = a[property]; - var value2 = b[property]; - return value1 - value2; + //单总量超出5个的时候 + if (e.data.data.total > 10 && ishas_cate) { + i.get("/api/weshop/storagecategory/page", { + data: { + store_id: r.stoid, + pageSize: 1000, + orderField: "sort", + orderType: 'asc', + }, + success: function (ee) { + if (ee.data.code == 0) { + + var check_all_cate = 0; + if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0) { + for (let i in ee.data.data.pageData) { + let item = ee.data.data.pageData[i]; + if (item.is_show == 1) { + check_all_cate = 1; + break + } + } + } + + if (check_all_cate) { + + var sto_cate = ee.data.data.pageData; + var sto_arr = e.data.data.pageData; + var newarr = new Array(); + var qita = new Array(); + + var is_del_pk = 0; + //----要进行门店分组-------- + for (var i = 0; i < sto_arr.length; i++) { + //找一下这个门店有没有在分类数组内 + var find2 = 0, find2name = "", sort = 0; + is_del_pk = 0; + for (var m = 0; m < sto_cate.length; m++) { + if (sto_arr[i].category_id == sto_cate[m].cat_id) { + if (sto_cate[m].is_show != 1) { + is_del_pk = 1; + sto_arr.splice(i, 1); + i--; + } else { + find2 = sto_cate[m].cat_id; + find2name = sto_cate[m].cat_name; + sort = sto_cate[m].sort; + is_del_pk = 0; + } + break; + } + } + if (is_del_pk) continue; + + if (newarr.length > 0) { + var find = 0; + //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 + if (find2 != 0) { + for (var ii = 0; ii < newarr.length; ii++) { + if (sto_arr[i].category_id == newarr[ii].cat_id) { + newarr[ii].s_arr.push(sto_arr[i]); + find = 1; + break; + } + } + if (find == 0) { + var arr0 = new Array(); + arr0.push(sto_arr[i]); + var item = { + cat_id: find2, + name: find2name, + sort: sort, + s_arr: arr0 + }; + newarr.push(item); + } + } else { + qita.push(sto_arr[i]); + } + } else { + //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 + if (find2 != 0) { + var arr0 = new Array(); + arr0.push(sto_arr[i]); + var item = { + cat_id: find2, + name: find2name, + sort: sort, + s_arr: arr0 + }; + newarr.push(item); + } else { + qita.push(sto_arr[i]); + } + } + } + + var def_arr = new Array(); + //-- 开始就看10个门店 -- + for (var k = 0; k < 10; k++) { + if (k == e.data.data.pageData.length) break; + def_arr.push(e.data.data.pageData[k]); + } + + th.setData({ + def_pickpu_list: def_arr, + pickpu_list: ee.data.data.pageData + }); + + //门店分类要排序下 + function compare(property) { + return function (a, b) { + var value1 = a[property]; + var value2 = b[property]; + return value1 - value2; + } + } + + if (newarr.length > 0) + newarr.sort(compare("sort")); + + + //----安排其他的分类----- + if (qita.length > 0) { + var item = { + cat_id: -1, + name: "其他", + s_arr: qita + }; + newarr.push(item); + } + th.setData({ + is_show_sto_cat: 1, + all_sto: newarr + }); + + } else { + th.setData({ + is_show_sto_cat: -1, + only_pk: e.data.data.pageData + }); + } + } else { + th.setData({ + is_show_sto_cat: -1, + only_pk: e.data.data.pageData + }); } } - if(newarr.length>0) - newarr.sort(compare("sort")); - - - //----安排其他的分类----- - if (qita.length > 0) { - var item = { - cat_id: -1, - name: "其他", - s_arr: qita - }; - newarr.push(item); - } - th.setData({ - is_show_sto_cat: 1, - all_sto: newarr - }); - - } else { - th.setData({ - is_show_sto_cat: -1, - only_pk: e.data.data.pageData - }); - } - } else { - th.setData({ - is_show_sto_cat: -1, - only_pk: e.data.data.pageData - }); - } - } - }); - } else { - th.setData({ - is_show_sto_cat: 0, - only_pk: e.data.data.pageData - }); - } - } - - } - }) - - }, - - //选择更多门店 - more_store: function() { - this.setData({ - sort_store: 1 - }); - }, - - //---选择分类门店--- - choice_sort_store: 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 - }); - }, - // 返回按钮 - returns: function() { - this.setData({ - sort_store: 0, - choice_sort_store: 0 - }); - }, - - - //身份证号严格校验 - IdentityIDCard: function(e) { - var code = e.detail.value; - //身份证号前两位代表区域 - var city = { - 11: "北京", - 12: "天津", - 13: "河北", - 14: "山西", - 15: "内蒙古", - 21: "辽宁", - 22: "吉林", - 23: "黑龙江 ", - 31: "上海", - 32: "江苏", - 33: "浙江", - 34: "安徽", - 35: "福建", - 36: "江西", - 37: "山东", - 41: "河南", - 42: "湖北 ", - 43: "湖南", - 44: "广东", - 45: "广西", - 46: "海南", - 50: "重庆", - 51: "四川", - 52: "贵州", - 53: "云南", - 54: "西藏 ", - 61: "陕西", - 62: "甘肃", - 63: "青海", - 64: "宁夏", - 65: "新疆", - 71: "台湾", - 81: "香港", - 82: "澳门", - 91: "国外 " - }; - //身份证格式正则表达式 - var idCardReg = /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[012])(0[1-9]|[12]\d|3[01])\d{3}(\d|X)$/i; - var errorMess = ""; //错误提示信息 - var isPass = true; //身份证验证是否通过（true通过、false未通过） - - //如果身份证不满足格式正则表达式 - if (!code || !idCardReg.test(code)) { - errorMess = "您输入的身份证号格式有误！"; - isPass = false; - } - - //区域数组中不包含需验证的身份证前两位 - else if (!city[code.substr(0, 2)]) { - errorMess = "您输入的身份证号格式有误！"; - isPass = false; - } else { - //18位身份证需要验证最后一位校验位 - if (code.length == 18) { - code = code.split(''); - //∑(ai×Wi)(mod 11) - //加权因子 - var factor = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2]; - //校验位 - var parity = [1, 0, 'X', 9, 8, 7, 6, 5, 4, 3, 2]; - var sum = 0; - var ai = 0; - var wi = 0; - for (var i = 0; i < 17; i++) { - ai = code[i]; - wi = factor[i]; - sum += ai * wi; + }); + } else { + th.setData({ + is_show_sto_cat: 0, + only_pk: e.data.data.pageData + }); + } + } + + } + }) + + }, + + //选择更多门店 + more_store: function () { + this.setData({ + sort_store: 1 + }); + }, + + //---选择分类门店--- + choice_sort_store: 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 + }); + }, + // 返回按钮 + returns: function () { + this.setData({ + sort_store: 0, + choice_sort_store: 0 + }); + }, + + + //身份证号严格校验 + IdentityIDCard: function (e) { + var code = e.detail.value; + //身份证号前两位代表区域 + var city = { + 11: "北京", + 12: "天津", + 13: "河北", + 14: "山西", + 15: "内蒙古", + 21: "辽宁", + 22: "吉林", + 23: "黑龙江 ", + 31: "上海", + 32: "江苏", + 33: "浙江", + 34: "安徽", + 35: "福建", + 36: "江西", + 37: "山东", + 41: "河南", + 42: "湖北 ", + 43: "湖南", + 44: "广东", + 45: "广西", + 46: "海南", + 50: "重庆", + 51: "四川", + 52: "贵州", + 53: "云南", + 54: "西藏 ", + 61: "陕西", + 62: "甘肃", + 63: "青海", + 64: "宁夏", + 65: "新疆", + 71: "台湾", + 81: "香港", + 82: "澳门", + 91: "国外 " + }; + //身份证格式正则表达式 + var idCardReg = /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[012])(0[1-9]|[12]\d|3[01])\d{3}(\d|X)$/i; + var errorMess = ""; //错误提示信息 + var isPass = true; //身份证验证是否通过（true通过、false未通过） + + //如果身份证不满足格式正则表达式 + if (!code || !idCardReg.test(code)) { + errorMess = "您输入的身份证号格式有误！"; + isPass = false; } - var last = parity[sum % 11]; - if (parity[sum % 11] != code[17]) { - errorMess = "您输入的身份证号不存在！"; - isPass = false; + + //区域数组中不包含需验证的身份证前两位 + else if (!city[code.substr(0, 2)]) { + errorMess = "您输入的身份证号格式有误！"; + isPass = false; + } else { + //18位身份证需要验证最后一位校验位 + if (code.length == 18) { + code = code.split(''); + //∑(ai×Wi)(mod 11) + //加权因子 + var factor = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2]; + //校验位 + var parity = [1, 0, 'X', 9, 8, 7, 6, 5, 4, 3, 2]; + var sum = 0; + var ai = 0; + var wi = 0; + for (var i = 0; i < 17; i++) { + ai = code[i]; + wi = factor[i]; + sum += ai * wi; + } + var last = parity[sum % 11]; + if (parity[sum % 11] != code[17]) { + errorMess = "您输入的身份证号不存在！"; + isPass = false; + } + } + ; } - }; - }; - var returnParam = { - 'errorMess': errorMess, - 'isPass': isPass - }; - if (errorMess != "") { - // wx.showModal({ - // title: errorMess, - // content: '', - // showCancel: false, - // confirmText: '确定', - // confirmColor: '', - // success: function(res) {}, - // fail: function(res) {}, - // complete: function(res) {}, - // }) - - getApp().my_warnning(errorMess, 0, this); - this.setData({ - id: null, - }); - }; - return returnParam; - }, - //------初始化加载---------- - onLoad: function(t) { - - self = this; - let url1 = '/api/weshop/storeconfig/get/'; - let url3 = '/api/weshop/users/getErpvipidPickup'; - url1 += r.stoid; - - var uu=getApp().globalData.zc_dd; - if(uu){ - this.setData({head_pic:uu.head_pic,nickname:uu.nickname}) + ; + var returnParam = { + 'errorMess': errorMess, + 'isPass': isPass + }; + if (errorMess != "") { + // wx.showModal({ + // title: errorMess, + // content: '', + // showCancel: false, + // confirmText: '确定', + // confirmColor: '', + // success: function(res) {}, + // fail: function(res) {}, + // complete: function(res) {}, + // }) + + getApp().my_warnning(errorMess, 0, this); + this.setData({ + id: null, + }); } + ; + return returnParam; + }, + //------初始化加载---------- + onLoad: function (t) { - if(getApp().globalData.first_leader){ + self = this; + let url1 = '/api/weshop/storeconfig/get/'; + let url3 = '/api/weshop/users/getErpvipidPickup'; + url1 += r.stoid; + + var uu = getApp().globalData.zc_dd; + if (uu) { + this.setData({head_pic: uu.head_pic, nickname: uu.nickname}) + } + + if (getApp().globalData.first_leader) { //--生成会员 -- - getApp().promiseGet("/api/weshop/users/get/" + r.stoid + "/" + getApp().globalData.first_leader,{}).then(res=>{ - if(res.data.code==0){ + getApp().promiseGet("/api/weshop/users/get/" + r.stoid + "/" + getApp().globalData.first_leader, {}).then(res => { + if (res.data.code == 0) { //更新会员 self.setData({ - fir_user:res.data.data + fir_user: res.data.data }) } }) } - app.request.get(url1, { - success:async function(res) { - if(res.data.code == 0) { - let reg_type = res.data.data.reg_type; - let reg_info = res.data.data.reg_info; - if(reg_type) { //reg_type为1才显示积分信息 - if(reg_info) { - reg_info = JSON.parse(reg_info); - var user_id=0; - - //-- 获取会员信息 - - await getApp().request.promiseGet("/api/weshop/users/page", {data:{ - store_id:r.stoid,mobile:uu.mobile - }}).then(res=>{ - if(ut.ajax_ok(res)){ - user_id=res.data.data.pageData[0].user_id; - } - }) - - if(reg_info.reginfo_coupon){ - //判断有没有领过券 - self.check_is_send_quan(reg_info.reginfo_coupon,user_id); - } - - if(reg_info.reginfo_lb_id){ + app.request.get(url1, { + success: async function (res) { + if (res.data.code == 0) { + let reg_type = res.data.data.reg_type; + let reg_info = res.data.data.reg_info; + if (reg_type) { //reg_type为1才显示积分信息 + if (reg_info) { + reg_info = JSON.parse(reg_info); + var user_id = 0; + + //-- 获取会员信息 - + await getApp().request.promiseGet("/api/weshop/users/page", { + data: { + store_id: r.stoid, mobile: uu.mobile + } + }).then(res => { + if (ut.ajax_ok(res)) { + user_id = res.data.data.pageData[0].user_id; + } + }) + + if (reg_info.reginfo_coupon) { + //判断有没有领过券 + self.check_is_send_quan(reg_info.reginfo_coupon, user_id); + } + + if (reg_info.reginfo_lb_id) { //判断有没有领过礼包 - self.check_is_send_libao(reg_info.reginfo_lb_id,user_id); + self.check_is_send_libao(reg_info.reginfo_lb_id, user_id); } - }; - }; - self.setData({ - reg_type, - reg_info, - }); - } - }, - }); + } + ; + } + ; + self.setData({ + reg_type, + reg_info, + }); + } + }, + }); //-- 获取线下会员的情况 -- - var req_data={ - stoid:r.stoid, - mobile:getApp().globalData.zc_dd.mobile + var req_data = { + stoid: r.stoid, + mobile: getApp().globalData.zc_dd.mobile }; - if(getApp().globalData.zc_dd.first_leader) - req_data.first_leader=getApp().globalData.zc_dd.first_leader + if (getApp().globalData.zc_dd.first_leader) + req_data.first_leader = getApp().globalData.zc_dd.first_leader wx.showLoading(); - getApp().request.promiseGet(url3, {data:req_data}).then(res=>{ - if(res.data.code==0){ - var back_data=res.data.data; back_data=JSON.parse(back_data); - var set_data={is_fx:0}; - //-- 如果有包含会员的线下的信息 -- - if(back_data && back_data.erpviplist){ - //-- data.data就是门店的数据 -- - if(back_data.data){ - back_data.erpviplist.pickup_id=back_data.data.pickup_id; - if(!back_data.erpviplist.pick) set_data.is_fx=1; - set_data.stoname=back_data.data.pickup_name; - set_data.sto_sele_id=back_data.data.pickup_id; - } - - //-- 推荐人姓名 -- - if(back_data.erpviplist.fromuser) { - set_data.tjrname=back_data.erpviplist.fromuser; - back_data.erpviplist.fromuser_id=back_data.erpviplist.fromuser; - } - //性别 - if(back_data.erpviplist.sex) set_data.isGender=back_data.erpviplist.sex; - //名称 - if(back_data.erpviplist.vipname) set_data.name=back_data.erpviplist.vipname; - //身份证 - if(back_data.erpviplist.idcard) set_data.id=back_data.erpviplist.idcard; - //地址 - if(back_data.erpviplist.address) set_data.address=back_data.erpviplist.address; - //生日 - if(back_data.erpviplist.birthday) { - set_data.datet=back_data.erpviplist.birthday; - set_data.isLunar=back_data.erpviplist.islunar; - } - set_data.user=back_data.erpviplist; - } - - //-- 新的会员 -- - if(back_data && back_data.data && back_data.data.pickup_id && !set_data.sto_sele_id){ - set_data.stoname=back_data.data.pickup_name; - set_data.sto_sele_id=back_data.data.pickup_id; - } - - self.setData(set_data); - if(!self.data.sto_sele_id){ - self.get_store_set(); - } - } + getApp().request.promiseGet(url3, {data: req_data}).then(res => { + if (res.data.code == 0) { + var back_data = res.data.data; + back_data = JSON.parse(back_data); + var set_data = {is_fx: 0}; + //-- 如果有包含会员的线下的信息 -- + if (back_data && back_data.erpviplist) { + //-- data.data就是门店的数据 -- + if (back_data.data) { + back_data.erpviplist.pickup_id = back_data.data.pickup_id; + if (!back_data.erpviplist.pick) set_data.is_fx = 1; + set_data.stoname = back_data.data.pickup_name; + set_data.sto_sele_id = back_data.data.pickup_id; + } + + //-- 推荐人姓名 -- + if (back_data.erpviplist.fromuser) { + set_data.tjrname = back_data.erpviplist.fromuser; + back_data.erpviplist.fromuser_id = back_data.erpviplist.fromuser; + } + //性别 + if (back_data.erpviplist.sex) set_data.isGender = back_data.erpviplist.sex; + //名称 + if (back_data.erpviplist.vipname) set_data.name = back_data.erpviplist.vipname; + //身份证 + if (back_data.erpviplist.idcard) set_data.id = back_data.erpviplist.idcard; + //地址 + if (back_data.erpviplist.address) set_data.address = back_data.erpviplist.address; + //生日 + if (back_data.erpviplist.birthday) { + set_data.datet = back_data.erpviplist.birthday; + set_data.isLunar = back_data.erpviplist.islunar; + + } else { + //----获取系统参数----- + getApp().getConfig2(function (e) { + var json_d = JSON.parse(e.switch_list); + if (json_d.is_brithday != 1) { + self.setData({isLunar: 1}) + } + }, 1) + } + + + set_data.user = back_data.erpviplist; + } + + //-- 新的会员 -- + if (back_data && back_data.data && back_data.data.pickup_id && !set_data.sto_sele_id) { + set_data.stoname = back_data.data.pickup_name; + set_data.sto_sele_id = back_data.data.pickup_id; + } + + self.setData(set_data); + if (!self.data.sto_sele_id) { + self.get_store_set(); + } + } else { + //----获取系统参数----- + getApp().getConfig2(function (e) { + var json_d = JSON.parse(e.switch_list); + if (json_d.is_brithday != 1) { + self.setData({isLunar: 1}) + } + }, 1) + } + + wx.hideLoading(); - }) - - var is_back=t.is_back; - if(is_back) this.data.is_back=1; - - }, - - onShow: function() { - - getApp().check_can_share(); - - if (this.data.is_zy) return false; - - //如果有传值进行跳转的话 - var choice_guide=null; - if(getApp().globalData.choice_guide){ - choice_guide=JSON.parse(JSON.stringify(getApp().globalData.choice_guide)); - getApp().globalData.choice_guide=null; - } - - }, - - check_is_send_quan:function(cid,uid){ - var self=this; - let url2 = '/api/weshop/prom/coupon/get/'; - //-- 如果没有会员信息的时候 -- - if(!uid){ - //获取优惠券 - url2 += cid; - app.request.get(url2, { - success: function(r) { - if(r.data.code == 0) { - self.setData({ - couponInfo: r.data.data.name, - }); - }; - }, - }); - - }else{ - //看一下会员有没有领过注册的券 - getApp().promiseGet("/api/weshop/couponList/page",{ - data:{store_id:r.stoid,uid:uid,cid:cid} - }).then(res=>{ - var is_ling=0; - if(res.data.code==0 && res.data.data && res.data.data.total>0){ - is_ling=1; - } - - //没有领过券，就显示 - if(!is_ling){ - //获取优惠券 - url2 += cid; - app.request.get(url2, { - success: function(r) { - if(r.data.code == 0) { - console.log('000res==>', r.data.data.name); - self.setData({ - couponInfo: r.data.data.name, - }); - }; - }, - }); - } - - }) - } - - - - - }, - - //-- 有没有送过礼包 -- - check_is_send_libao:function(lbid,uid){ - var self=this; - let url2 = '/api/weshop/marketing/giftbag/get'; - if(!uid){ - //获取礼包 - app.request.get(url2, { - data:{storeId:r.stoid,giftBagId:lbid}, - success: function(r) { - if(r.data.code == 0) { - console.log('000res==>', r.data.data.name); - self.setData({ - libao: r.data.data.lbTitle, - }); - } - } - }); - - }else{ - //看一下会员有没有领过注册的券 - getApp().promiseGet("/api/weshop/marketing/gift/getgiveone",{ - data:{store_id:r.stoid,user_id:uid,lbid:lbid,act_type:7} - }).then(res=>{ - var is_ling=0; - //-1就表示有领过 - if(res.data.code==-1 ){ - is_ling=1; - } - //没有领过礼包，就显示 - if(!is_ling){ - //获取礼包 - app.request.get(url2, { - data:{storeId:r.stoid,giftBagId:lbid}, - success: function(r) { - if(r.data.code == 0) { - self.setData({ - libao: r.data.data.lbTitle, - }); - } - } - }); - } - - }) - } + }) + + var is_back = t.is_back; + if (is_back) this.data.is_back = 1; + + + }, + + onShow: function () { + + getApp().check_can_share(); + + if (this.data.is_zy) return false; + + //如果有传值进行跳转的话 + var choice_guide = null; + if (getApp().globalData.choice_guide) { + choice_guide = JSON.parse(JSON.stringify(getApp().globalData.choice_guide)); + getApp().globalData.choice_guide = null; + } + + }, + + check_is_send_quan: function (cid, uid) { + var self = this; + let url2 = '/api/weshop/prom/coupon/get/'; + //-- 如果没有会员信息的时候 -- + if (!uid) { + //获取优惠券 + url2 += cid; + app.request.get(url2, { + success: function (r) { + if (r.data.code == 0) { + self.setData({ + couponInfo: r.data.data.name, + }); + } + ; + }, + }); + + } else { + //看一下会员有没有领过注册的券 + getApp().promiseGet("/api/weshop/couponList/page", { + data: {store_id: r.stoid, uid: uid, cid: cid} + }).then(res => { + var is_ling = 0; + if (res.data.code == 0 && res.data.data && res.data.data.total > 0) { + is_ling = 1; + } + + //没有领过券，就显示 + if (!is_ling) { + //获取优惠券 + url2 += cid; + app.request.get(url2, { + success: function (r) { + if (r.data.code == 0) { + console.log('000res==>', r.data.data.name); + self.setData({ + couponInfo: r.data.data.name, + }); + } + ; + }, + }); + } + + }) + } + + + }, + + //-- 有没有送过礼包 -- + check_is_send_libao: function (lbid, uid) { + var self = this; + let url2 = '/api/weshop/marketing/giftbag/get'; + if (!uid) { + //获取礼包 + app.request.get(url2, { + data: {storeId: r.stoid, giftBagId: lbid}, + success: function (r) { + if (r.data.code == 0) { + console.log('000res==>', r.data.data.name); + self.setData({ + libao: r.data.data.lbTitle, + }); + } + } + }); + + } else { + //看一下会员有没有领过注册的券 + getApp().promiseGet("/api/weshop/marketing/gift/getgiveone", { + data: {store_id: r.stoid, user_id: uid, lbid: lbid, act_type: 7} + }).then(res => { + var is_ling = 0; + //-1就表示有领过 + if (res.data.code == -1) { + is_ling = 1; + } + //没有领过礼包，就显示 + if (!is_ling) { + //获取礼包 + app.request.get(url2, { + data: {storeId: r.stoid, giftBagId: lbid}, + success: function (r) { + if (r.data.code == 0) { + self.setData({ + libao: r.data.data.lbTitle, + }); + } + } + }); + } + + }) + } + + }, + + + //------卡片的显示和关闭-------- + show_tc: function () { + if (!getApp().globalData.userInfo) return false; + //base64_encode($user.mobile.'|'.date('Y-m-d H:i:s') + var val = getApp().globalData.userInfo.mobile + "|" + ut.formatTime(); + val = "^" + ut.base64_encode(val); + + qrcode('qrcode', val, 480, 480, this); + + this.setData({ + tc_hide: false, + }); + }, + hide_tc: function () { + this.setData({ + tc_hide: true, + }); + }, + //地址 + address: function (e) { + var val = e.detail; + this.setData({ + address: val.value + }); }, + //点击确认修改信息 + confirm_revision: function () { + var th = this; + var isstcsp = th.data.isstcsp; //是否启用消费密码 + var phone = th.data.phone; //手机号码 + if (phone == "" || phone == null) { + getApp().my_warnning("手机不能为空", 0, th); + return false; + } + var consumption = th.data.consumption; //消费密码 + var isstcsp = th.data.isstcsp; + if (isstcsp == 1) { + + if (consumption == null || consumption == "" || consumption == undefined) { + getApp().my_warnning("消费密码不能为空", 0, th); + return false; + } + if (consumption.length < 6) { + getApp().my_warnning("消费密码不能小于6位", 0, th); + return false; + } + } + var sex = th.data.isGender; //性别 + + if (sex != "1" && sex != "2") { + getApp().my_warnning("请选择性别", 0, th); + return false; + } + var user_name = th.data.user.vipname; //用户姓名 + if (user_name == "" || user_name == null) { + getApp().my_warnning("请输入名字", 0, th); + return false; + } + var identity_card = th.data.identity_card; //身份证 + + if (identity_card != null && identity_card != undefined && identity_card != "" && !(/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(identity_card))) { + getApp().my_warnning("身份证号码错误", 0, th); + return false; + } + var address = th.data.address; //地址 + var sto_sele_id = th.data.sto_sele_id; + var datas = { + mobile: phone, //手机号码 + store_id: r.stoid, + user_id: getApp().globalData.user_id, + vipnopwd: isstcsp, + vippass: consumption, //消费密码 + sex: sex, //性别 + vipname: user_name, //昵称 + idcard: identity_card, //身份证 + address: address, //地址 + pickup_id: sto_sele_id,//自提门店 所属门店 + islunar: th.data.iscalendar, + birthday: th.data.datet + } + //往上提交美导的ID + if (th.data.fir_guide_id != th.data.user.staffId) { + datas.staffId = th.data.user.staffId; + } + + var post_data = {...getApp().globalData.zc_dd, ...datas} + this.zu_ce(post_data); + }, - //------卡片的显示和关闭-------- - show_tc: function() { - if (!getApp().globalData.userInfo) return false; - //base64_encode($user.mobile.'|'.date('Y-m-d H:i:s') - var val=getApp().globalData.userInfo.mobile+"|"+ut.formatTime(); - val="^"+ut.base64_encode(val); - - qrcode('qrcode', val, 480, 480, this); - - this.setData({ - tc_hide: false, - }); - }, - hide_tc: function() { - this.setData({ - tc_hide: true, - }); - }, - - //地址 - address: function(e) { - var val = e.detail; - this.setData({ - address: val.value - }); - }, - - - //点击确认修改信息 - confirm_revision: function() { - var th = this; - var isstcsp = th.data.isstcsp; //是否启用消费密码 - var phone = th.data.phone; //手机号码 - if (phone == "" || phone == null) { - getApp().my_warnning("手机不能为空", 0, th); - return false; - } - var consumption = th.data.consumption; //消费密码 - var isstcsp = th.data.isstcsp; - if (isstcsp == 1) { - - if (consumption == null || consumption == "" || consumption == undefined) { - getApp().my_warnning("消费密码不能为空", 0, th); - return false; - } - if (consumption.length < 6) { - getApp().my_warnning("消费密码不能小于6位", 0, th); - return false; - } - } - var sex = th.data.isGender; //性别 - - if (sex != "1" && sex != "2") { - getApp().my_warnning("请选择性别", 0, th); - return false; - } - var user_name = th.data.user.vipname; //用户姓名 - if (user_name == "" || user_name == null) { - getApp().my_warnning("请输入名字", 0, th); - return false; - } - var identity_card = th.data.identity_card; //身份证 - - if (identity_card!=null && identity_card!=undefined && identity_card != "" && !(/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(identity_card))) { - getApp().my_warnning("身份证号码错误", 0, th); - return false; - } - var address = th.data.address; //地址 - var sto_sele_id = th.data.sto_sele_id; - var datas = { - mobile: phone, //手机号码 - store_id: r.stoid, - user_id: getApp().globalData.user_id, - vipnopwd: isstcsp, - vippass: consumption, //消费密码 - sex: sex, //性别 - vipname: user_name, //昵称 - idcard: identity_card, //身份证 - address: address, //地址 - pickup_id: sto_sele_id ,//自提门店 所属门店 - islunar:th.data.iscalendar, - birthday:th.data.datet - } - //往上提交美导的ID - if(th.data.fir_guide_id!=th.data.user.staffId){ - datas.staffId=th.data.user.staffId; - } - - var post_data={ ...getApp().globalData.zc_dd, ...datas } - this.zu_ce(post_data); - }, - - - zu_ce:function (dd) { - var th=this; + zu_ce: function (dd) { + var th = this; wx.showLoading({ title: "处理中.", - mask:true + mask: true }) app.request.get("/api/weshop/users/thirdLogin", { @@ -923,342 +956,340 @@ Page({ success: function (e) { wx.hideLoading(); - th.setData({loading:0}) ; + th.setData({loading: 0}); if (e.data.code == 0) { app.globalData.user_id = e.data.data.user_id; } else { - return app.showWarning("授权登入失败！"+e.data.msg); + return app.showWarning("授权登入失败！" + e.data.msg); } - getApp().globalData.login_back=1; - wx.setStorageSync("userinfo",e.data.data); + getApp().globalData.login_back = 1; + wx.setStorageSync("userinfo", e.data.data); wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = s.getFullUrl(a.globalData.userInfo.head_pic); - wx.navigateBack({ delta: 1}) + wx.navigateBack({delta: 1}) }, failStatus: function (t) { wx.hideLoading(); - th.setData({loading:0}) ; + th.setData({loading: 0}); return app.my_warnning("授权登入失败,请稍后再试!", 0, that); }, fail: function (t) { wx.hideLoading(); - th.setData({loading:0}) ; + th.setData({loading: 0}); return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1; } }); }, - //选择地址 - goto_address: function() { - // this.setData({ is_zy: 1 }); - }, - - //--点击分享事件--- - onShareAppMessage: function(t) { - getApp().globalData.no_clear=1 - return o.share; - }, - - //-- 跳转到获取导购的列表 -- - go_get_guide:function () { - this.check_click_ok(function(){ - getApp().goto("/packageB/pages/user/choice_guide/choice_guide"); - },1) - }, - - //点击门店，导购的次数判断, type 1=导购 2=门店 - check_click_ok:function(func,idx){ - var th=this; - var userId=getApp().globalData.user_id; - getApp().request.get("/api/weshop/users/getGuideNum/"+r.stoid+"/"+userId+"/"+idx, { - success: function(res) { - if(res.data.code==0){ - func(); - }else{ - getApp().my_warnning(res.data.msg, 0, th); - } - } - }); - }, - - //获取输入框内容 - getInput(e) { - return e.detail.value; - }, - - verifyInput(e) { - let value = e.detail.value; - if (value == "" || value == null || value == undefined) { - app.my_warnning("请输入", 0, this); - } - }, - - //获取推荐人 - getReferee(e) { - let referee = this.getInput(e); - this.data.referee = referee; - console.log(referee); - }, - - //获取姓名 - getName(e) { - let name = this.getInput(e); - this.data.name = name; - }, - - //获取性别 - getGender(e) { - let sex = e.currentTarget.dataset.sex; - this.setData({ - isGender: sex, - }); - }, - - //获取身份证 - getId(e) { - let id = this.getInput(e); - this.data.id = id; - }, - - //验证身份证号码 - // verifyId(e) { - // let id = this.data.id; - // if(id) { - // if (id != null && id != undefined && id != "" && !(/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(id))) { - // getApp().my_warnning("身份证号码无效！", 0, this); - // } - // }; - // }, - - //获取地址 - getAddress(e) { - let address = this.getInput(e); - this.data.address = address; - }, - - //获取生日 - bindChange: function(e) { - let strBirthday = e.detail.value; - let age = this.verifyBirthday(strBirthday); - - if(age <= 10) { - app.my_warnning("会员年龄不能小于10岁(含10岁)", 0, this); - } else if(age >= 70) { - app.my_warnning("会员年龄不能超过70岁(含70岁)", 0, this); - } else { - this.setData({ - datet: e.detail.value, - }); - } - - }, - - // 生日判断 - verifyBirthday(strBirthday) { - var returnAge; - var strBirthdayArr = strBirthday.split("-"); - var birthYear = strBirthdayArr[0]; - var birthMonth = strBirthdayArr[1]; - var birthDay = strBirthdayArr[2]; - - d = new Date(); - var nowYear = d.getFullYear(); - var nowMonth = d.getMonth() + 1; - var nowDay = d.getDate(); - - if(nowYear == birthYear){ - returnAge = 0;//同年 则为0岁 - } else { - var ageDiff = nowYear - birthYear ; //年之差 - if(ageDiff > 0){ - if(nowMonth == birthMonth) { - var dayDiff = nowDay - birthDay;//日之差 - if(dayDiff < 0) - { - returnAge = ageDiff - 1; - } - else - { - returnAge = ageDiff ; - } - } - else - { - var monthDiff = nowMonth - birthMonth;//月之差 - if(monthDiff < 0) - { - returnAge = ageDiff - 1; - } - else - { - returnAge = ageDiff ; - } - } - } - else - { - returnAge = -1;//返回-1 表示出生日期输入错误 晚于今天 - } - } - return returnAge;//返回周岁年龄 - }, - - //是否为农历 - isLunar(e) { - let isLunar = null; - if(e.detail.value[0]) { - isLunar = 1; - } else { - isLunar = 0; - }; - this.data.isLunar = isLunar; - // console.log(isLunar); - }, - - // 是否同意协议 - isAgree(e) { - let isAgree = null; - if(e.detail.value[0]) { - isAgree = true; - } else { - isAgree = false; - }; - // this.data.isAgree = isAgree; - this.setData({ - isAgree, - }); - console.log(isAgree); - }, - - - //保存 - save: function() { - var th = this; - var sto_sele_id = this.data.sto_sele_id; - var user=app.globalData.userInfo; - - var data = { - store_id: r.stoid, - }; - - //-- 需要推荐人 -- - if(this.data.reg_info.introducer_state){ - - var tj= this.data.fir_user?this.data.fir_user.mobile:''; - if(!tj){ - tj=this.data.user['fromuser_id']?this.data.user['fromuser_id']:''; + //选择地址 + goto_address: function () { + // this.setData({ is_zy: 1 }); + }, + + //--点击分享事件--- + onShareAppMessage: function (t) { + getApp().globalData.no_clear = 1 + return o.share; + }, + + //-- 跳转到获取导购的列表 -- + go_get_guide: function () { + this.check_click_ok(function () { + getApp().goto("/packageB/pages/user/choice_guide/choice_guide"); + }, 1) + }, + + //点击门店，导购的次数判断, type 1=导购 2=门店 + check_click_ok: function (func, idx) { + var th = this; + var userId = getApp().globalData.user_id; + getApp().request.get("/api/weshop/users/getGuideNum/" + r.stoid + "/" + userId + "/" + idx, { + success: function (res) { + if (res.data.code == 0) { + func(); + } else { + getApp().my_warnning(res.data.msg, 0, th); } + } + }); + }, + + //获取输入框内容 + getInput(e) { + return e.detail.value; + }, - let tjrname = this.data.referee || tj; - if (tjrname == "" || tjrname == null) { - //app.my_warnning("请输入推荐人", 0, this); - //return false; - }; - if(tjrname) data.tjrname=tjrname; - } - - //-- 需要姓名 -- - if(this.data.reg_info.name_state){ - let vipname = this.data.name; - if (vipname == "" || vipname == null) { - app.my_warnning("请输入姓名", 0, this); - return false; - }; - data.vipname=vipname; - } - //需要性别 - if(this.data.reg_info.sex_state){ - let sex = this.data.isGender; - if (sex != "1" && sex != "2") { - app.my_warnning("请选择性别", 0, this); - return false; - }; - data.sex=sex; - } - //需要生日 - if(this.data.reg_info.birthday_state){ - let birthday = this.data.datet; - if (birthday == "" || birthday == null) { - app.my_warnning("请选择出生日期", 0, this); - return false; - }; - - data.birthday=birthday; - data.islunar=self.data.isLunar?1:0; - } - - //-- 需要身份证 -- - if(this.data.reg_info.idcard_state){ - let idcard = this.data.id; - if (idcard == "" || idcard == null) { - app.my_warnning("请输入身份证号码", 0, this); - return false; - }; - data.idcard=idcard; - } - //需要地址 - if(this.data.reg_info.address_state){ - let address = this.data.address; - if (address == "" || address == null) { - app.my_warnning("请输入地址", 0, this); - return false; - }; - data.address=address; - } - //需要门店 - if(this.data.reg_info.pick_state){ - let pickup_id = sto_sele_id; - if (pickup_id == "" || pickup_id == null) { - app.my_warnning("请输入门店", 0, this); - return false; - }; - data.pickup_id=sto_sele_id; - } - - let isAgree = this.data.isAgree; - if(!isAgree) { - app.my_warnning("请您先阅读和勾选指定的内容", 0, this); - return false; - }; - - - - - var post_data={ ...getApp().globalData.zc_dd, ...data }; + verifyInput(e) { + let value = e.detail.value; + if (value == "" || value == null || value == undefined) { + app.my_warnning("请输入", 0, this); + } + }, + + //获取推荐人 + getReferee(e) { + let referee = this.getInput(e); + this.data.referee = referee; + console.log(referee); + }, + + //获取姓名 + getName(e) { + let name = this.getInput(e); + this.data.name = name; + }, + + //获取性别 + getGender(e) { + let sex = e.currentTarget.dataset.sex; + this.setData({ + isGender: sex, + }); + }, + + //获取身份证 + getId(e) { + let id = this.getInput(e); + this.data.id = id; + }, + + //验证身份证号码 + // verifyId(e) { + // let id = this.data.id; + // if(id) { + // if (id != null && id != undefined && id != "" && !(/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(id))) { + // getApp().my_warnning("身份证号码无效！", 0, this); + // } + // }; + // }, + + //获取地址 + getAddress(e) { + let address = this.getInput(e); + this.data.address = address; + }, + + //获取生日 + bindChange: function (e) { + let strBirthday = e.detail.value; + let age = this.verifyBirthday(strBirthday); + + if (age <= 10) { + app.my_warnning("会员年龄不能小于10岁(含10岁)", 0, this); + } else if (age >= 70) { + app.my_warnning("会员年龄不能超过70岁(含70岁)", 0, this); + } else { + this.setData({ + datet: e.detail.value, + }); + } + + }, + + // 生日判断 + verifyBirthday(strBirthday) { + var returnAge; + var strBirthdayArr = strBirthday.split("-"); + var birthYear = strBirthdayArr[0]; + var birthMonth = strBirthdayArr[1]; + var birthDay = strBirthdayArr[2]; + + d = new Date(); + var nowYear = d.getFullYear(); + var nowMonth = d.getMonth() + 1; + var nowDay = d.getDate(); + + if (nowYear == birthYear) { + returnAge = 0;//同年 则为0岁 + } else { + var ageDiff = nowYear - birthYear; //年之差 + if (ageDiff > 0) { + if (nowMonth == birthMonth) { + var dayDiff = nowDay - birthDay;//日之差 + if (dayDiff < 0) { + returnAge = ageDiff - 1; + } else { + returnAge = ageDiff; + } + } else { + var monthDiff = nowMonth - birthMonth;//月之差 + if (monthDiff < 0) { + returnAge = ageDiff - 1; + } else { + returnAge = ageDiff; + } + } + } else { + returnAge = -1;//返回-1 表示出生日期输入错误 晚于今天 + } + } + return returnAge;//返回周岁年龄 + }, + + //是否为农历 + isLunar(e) { + let isLunar = null; + if (e.detail.value[0]) { + isLunar = 1; + } else { + isLunar = 0; + } + ; + this.data.isLunar = isLunar; + // console.log(isLunar); + }, + + // 是否同意协议 + isAgree(e) { + let isAgree = null; + if (e.detail.value[0]) { + isAgree = true; + } else { + isAgree = false; + } + ; + // this.data.isAgree = isAgree; + this.setData({ + isAgree, + }); + console.log(isAgree); + }, + + + //保存 + save: function () { + var th = this; + var sto_sele_id = this.data.sto_sele_id; + var user = app.globalData.userInfo; + + var data = { + store_id: r.stoid, + }; + + //-- 需要推荐人 -- + if (this.data.reg_info.introducer_state) { + + var tj = this.data.fir_user ? this.data.fir_user.mobile : ''; + if (!tj) { + tj = this.data.user['fromuser_id'] ? this.data.user['fromuser_id'] : ''; + } + + let tjrname = this.data.referee || tj; + if (tjrname == "" || tjrname == null) { + //app.my_warnning("请输入推荐人", 0, this); + //return false; + } + ; + if (tjrname) data.tjrname = tjrname; + } + + //-- 需要姓名 -- + if (this.data.reg_info.name_state) { + let vipname = this.data.name; + if (vipname == "" || vipname == null) { + app.my_warnning("请输入姓名", 0, this); + return false; + } + ; + data.vipname = vipname; + } + //需要性别 + if (this.data.reg_info.sex_state) { + let sex = this.data.isGender; + if (sex != "1" && sex != "2") { + app.my_warnning("请选择性别", 0, this); + return false; + } + ; + data.sex = sex; + } + //需要生日 + if (this.data.reg_info.birthday_state) { + let birthday = this.data.datet; + if (birthday == "" || birthday == null) { + app.my_warnning("请选择出生日期", 0, this); + return false; + } + ; + + data.birthday = birthday; + data.islunar = self.data.isLunar ? 1 : 0; + } + + //-- 需要身份证 -- + if (this.data.reg_info.idcard_state) { + let idcard = this.data.id; + if (idcard == "" || idcard == null) { + app.my_warnning("请输入身份证号码", 0, this); + return false; + } + ; + data.idcard = idcard; + } + //需要地址 + if (this.data.reg_info.address_state) { + let address = this.data.address; + if (address == "" || address == null) { + app.my_warnning("请输入地址", 0, this); + return false; + } + ; + data.address = address; + } + //需要门店 + if (this.data.reg_info.pick_state) { + let pickup_id = sto_sele_id; + if (pickup_id == "" || pickup_id == null) { + app.my_warnning("请输入门店", 0, this); + return false; + } + ; + data.pickup_id = sto_sele_id; + } + + let isAgree = this.data.isAgree; + if (!isAgree) { + app.my_warnning("请您先阅读和勾选指定的内容", 0, this); + return false; + } + ; + + + var post_data = {...getApp().globalData.zc_dd, ...data}; delete post_data.sessionKey; delete post_data.encryptedData; delete post_data.iv; - if(th.data.loading) return false; - th.setData({loading:1}) ; + if (th.data.loading) return false; + th.setData({loading: 1}); this.zu_ce(post_data); - - }, + + }, - get_store_set:function () { - var th=this; + get_store_set: function () { + var th = this; //如果是扫码进来的 - if(getApp().globalData.store_number){ + if (getApp().globalData.store_number) { var dd = { store_id: r.stoid, isstop: 0, pageSize: 1, - page:1, - pickup_no:getApp().globalData.store_number + page: 1, + pickup_no: getApp().globalData.store_number }; //获取扫码的门店 getApp().request.promiseGet("/api/weshop/pickup/list", { data: dd, }).then(res => { - if(ut.ajax_ok(res)){ - var top_store=res.data.data.pageData[0]; + if (ut.ajax_ok(res)) { + var top_store = res.data.data.pageData[0]; th.setData({ stoname: top_store.pickup_name, sto_sele_name: top_store.pickup_name, @@ -1268,16 +1299,16 @@ Page({ } }) - }else{ + } else { wx.getLocation({ type: 'gcj02', - success: function(res) { + success: function (res) { th.data.lat = res.latitude; th.data.lon = res.longitude; th.set_fir_store_to_def(); }, - fail: function(res) { - if(res.errCode == 2) { + fail: function (res) { + if (res.errCode == 2) { getApp().confirmBox("请开启GPS定位", null, 25000, !1); } } @@ -1287,28 +1318,28 @@ Page({ //-- 设置最近的店为默认的店,一开始加载的时候 -- - set_fir_store_to_def(){ - var th=this; + set_fir_store_to_def() { + var th = this; var dd = { store_id: r.stoid, isstop: 0, pageSize: 1, - page:1, + page: 1, }; dd.lat = th.data.lat; dd.lon = th.data.lon; - var top_store=getApp().globalData.pk_store; - if(top_store){ - dd.pickup_id=top_store.pickup_id; + var top_store = getApp().globalData.pk_store; + if (top_store) { + dd.pickup_id = top_store.pickup_id; } //----------获取门店,最近的门店---------------- getApp().request.promiseGet("/api/weshop/pickup/list", { data: dd, }).then(res => { - if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ - var top_store=res.data.data.pageData[0]; + if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length > 0) { + var top_store = res.data.data.pageData[0]; th.setData({ stoname: top_store.pickup_name, sto_sele_name: top_store.pickup_name, @@ -1318,10 +1349,6 @@ Page({ } }) }, - - - - }); \ No newline at end of file diff --git a/packageA/pages/prom_list/prom_list.js b/packageA/pages/prom_list/prom_list.js index 0ba35d8..9296207 100644 --- a/packageA/pages/prom_list/prom_list.js +++ b/packageA/pages/prom_list/prom_list.js @@ -268,9 +268,10 @@ Page({ } if (!ee.data.collocationList) { + var user_id=getApp().globalData.user_id || 0; /*---获取活动的重表---*/ //调用接口判断订单优惠， - getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + ee.data.gid + "/2"+"/"+getApp().globalData.user_id, {}).then(res => { + getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + ee.data.gid + "/2"+"/"+user_id, {}).then(res => { if (res.data.code == 0) { var r_data = res.data.data; @@ -1455,13 +1456,16 @@ Page({ if (th.data.is_show_sto_cat == 1) { item = th.data.def_pickpu_list[index]; } else { - item = th.data.only_pk[index]; //当没有门店分类的时候 + item =th.data.only_pk?th.data.only_pk[index]:null; //当没有门店分类的时候 } } else { var index = th.data.sec_pick_index; item = th.data.sec_sto.s_arr[index]; } + + if(!item) return false; + //--回调函数的用法-- th.check_the_pick(item,function(){ @@ -1522,12 +1526,14 @@ Page({ if (th.data.is_show_sto_cat == 1) { item = th.data.def_pickpu_list[index]; } else { - item = th.data.only_pk[index]; //当没有门店分类的时候 + item = th.data.only_pk?th.data.only_pk[index]:null; //当没有门店分类的时候 } } else { var index = th.data.sec_pick_index; item = th.data.sec_sto.s_arr[index]; } + + if(!item) return false; //先设置之前,要判断是不是有库存 th.check_the_pick(item,function(){ diff --git a/packageB/pages/zuhegou/index/index.js b/packageB/pages/zuhegou/index/index.js index 1aae439..bcbb70a 100644 --- a/packageB/pages/zuhegou/index/index.js +++ b/packageB/pages/zuhegou/index/index.js @@ -1123,7 +1123,7 @@ Page({ return s.my_warnning("商品数量不能为0", 0, th); } if (th.data.sto_sele_name == null || th.data.sto_sele_name == undefined) - this.setData({ + th.setData({ sto_sele_name: "" }); if (th.data.sto_sele_name == "") { @@ -1680,13 +1680,15 @@ Page({ if (th.data.is_show_sto_cat == 1) { item = th.data.def_pickpu_list[index]; } else { - item = th.data.only_pk[index]; //当没有门店分类的时候 + item = th.data.only_pk?th.data.only_pk[index]:null; //当没有门店分类的时候 } } else { var index = th.data.sec_pick_index; item = th.data.sec_sto.s_arr[index]; } + if(!item) return false; + //判断门店的配送方式是不是匹配 var g_distr_type = 0; if (th.data.sele_g) @@ -1749,12 +1751,14 @@ Page({ if (th.data.is_show_sto_cat == 1) { item = th.data.def_pickpu_list[index]; } else { - item = th.data.only_pk[index]; //当没有门店分类的时候 + item = th.data.only_pk?th.data.only_pk[index]:null; //当没有门店分类的时候 } } else { var index = th.data.sec_pick_index; item = th.data.sec_sto.s_arr[index]; } + if(!item) return false; + //判断门店的配送方式是不是匹配 var g_distr_type = th.data.sele_g.distr_type; diff --git a/packageB/pages/zuhegou/preindex/index.js b/packageB/pages/zuhegou/preindex/index.js index 5f69ea5..fa0b9da 100644 --- a/packageB/pages/zuhegou/preindex/index.js +++ b/packageB/pages/zuhegou/preindex/index.js @@ -992,7 +992,7 @@ Page({ return s.my_warnning("商品数量不能为0", 0, th); } if (th.data.sto_sele_name == null || th.data.sto_sele_name == undefined) - this.setData({ + th.setData({ sto_sele_name: "" }); if (th.data.sto_sele_name == "") { @@ -1548,13 +1548,15 @@ Page({ if (th.data.is_show_sto_cat == 1) { item = th.data.def_pickpu_list[index]; } else { - item = th.data.only_pk[index]; //当没有门店分类的时候 + item = th.data.only_pk?th.data.only_pk[index]:null; //当没有门店分类的时候 } } else { var index = th.data.sec_pick_index; item = th.data.sec_sto.s_arr[index]; } + if(!item) return false; + //判断门店的配送方式是不是匹配 var g_distr_type = 0; if (th.data.sele_g) @@ -1609,13 +1611,15 @@ Page({ if (th.data.is_show_sto_cat == 1) { item = th.data.def_pickpu_list[index]; } else { - item = th.data.only_pk[index]; //当没有门店分类的时候 + item = th.data.only_pk?th.data.only_pk[index]:null; //当没有门店分类的时候 } } else { var index = th.data.sec_pick_index; item = th.data.sec_sto.s_arr[index]; } + if(!item) return false; + //判断门店的配送方式是不是匹配 var g_distr_type = th.data.sele_g.distr_type; if (item.distr_type != 0 && g_distr_type != 0 && item.distr_type != g_distr_type) { diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js index a80fb7a..c27de39 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js @@ -1389,7 +1389,7 @@ Page({ if (th.data.goodsInputNum <= 0) return s.my_warnning("商品数量不能为0", 0, th); if (th.data.sto_sele_name == null || th.data.sto_sele_name == undefined) - this.setData({ + th.setData({ sto_sele_name: "" }); if (th.data.sto_sele_name == "") return s.my_warnning("请选择门店", 0, th); @@ -1493,7 +1493,7 @@ Page({ if (th.data.goodsInputNum <= 0) return s.my_warnning("商品数量不能为0", 0, th); if (th.data.sto_sele_name == null || th.data.sto_sele_name == undefined) - this.setData({ + th.setData({ sto_sele_name: "" }); if (th.data.sto_sele_name == "") return s.my_warnning("请选择门店", 0, th); @@ -4162,7 +4162,7 @@ Page({ // } if (th.data.sto_sele_name == null || th.data.sto_sele_name == undefined) - this.setData({ + th.setData({ sto_sele_name: "" }); if (th.data.sto_sele_name == "") return s.my_warnning("请选择门店", 0, th); @@ -5742,7 +5742,7 @@ Page({ if (th.data.is_show_sto_cat == 1) { item = th.data.def_pickpu_list[index]; } else { - item = th.data.only_pk[index]; //当没有门店分类的时候 + item = th.data.only_pk?th.data.only_pk[index]:null; //当没有门店分类的时候 } } else { @@ -5750,6 +5750,8 @@ Page({ item = th.data.sec_sto.s_arr[index]; } + if(!item) return false; + if (!th.data.sele_g) return false; //判断门店的配送方式是不是匹配 var g_distr_type = th.data.sele_g.distr_type; @@ -5826,13 +5828,15 @@ Page({ if (th.data.is_show_sto_cat == 1) { item = th.data.def_pickpu_list[index]; } else { - item = th.data.only_pk[index]; //当没有门店分类的时候 + item = th.data.only_pk?th.data.only_pk[index]:null; //当没有门店分类的时候 } } else { var index = th.data.sec_pick_index; item = th.data.sec_sto.s_arr[index]; } + if(!item) return false; + //判断门店的配送方式是不是匹配 var g_distr_type = th.data.sele_g.distr_type; if (item.distr_type != 0 && g_distr_type != 0 && item.distr_type != g_distr_type) { diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js index bfac070..e95fa43 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.js +++ b/packageC/pages/presell/goodsInfo/goodsInfo.js @@ -1019,7 +1019,7 @@ Page({ if (th.data.goodsInputNum <= 0) return s.my_warnning("商品数量不能为0", 0, th); if (th.data.sto_sele_name == null || th.data.sto_sele_name == undefined) - this.setData({ + th.setData({ sto_sele_name: "" }); if (th.data.sto_sele_name == "") return s.my_warnning("请选择门店", 0, th); @@ -4265,7 +4265,7 @@ Page({ if (th.data.is_show_sto_cat == 1) { item = th.data.def_pickpu_list[index]; } else { - item = th.data.only_pk[index]; //当没有门店分类的时候 + item = th.data.only_pk?th.data.only_pk[index]:null; //当没有门店分类的时候 } } else { @@ -4273,6 +4273,8 @@ Page({ item = th.data.sec_sto.s_arr[index]; } + if(!item) return false; + if (!th.data.sele_g) return false; //判断门店的配送方式是不是匹配 var g_distr_type = th.data.sele_g.distr_type; @@ -4346,13 +4348,15 @@ Page({ if (th.data.is_show_sto_cat == 1) { item = th.data.def_pickpu_list[index]; } else { - item = th.data.only_pk[index]; //当没有门店分类的时候 + item = th.data.only_pk?th.data.only_pk[index]:null; //当没有门店分类的时候 } } else { var index = th.data.sec_pick_index; item = th.data.sec_sto.s_arr[index]; } + if(!item) return false; + //判断门店的配送方式是不是匹配 var g_distr_type = th.data.sele_g.distr_type; if (item.distr_type != 0 && g_distr_type != 0 && item.distr_type != g_distr_type) { diff --git a/packageC/pages/presell/list/list.wxml b/packageC/pages/presell/list/list.wxml index 9d3eef6..92486e1 100644 --- a/packageC/pages/presell/list/list.wxml +++ b/packageC/pages/presell/list/list.wxml @@ -40,12 +40,14 @@ 剩余{{filters.toFix(100-(item.buy_goodnum+item.virtual_qty)/(item.presell_sumqty+item.virtual_qty)*100,0)||100}}% - 已预售{{filters.toFix((item.buy_goodnum+item.virtual_qty)/(item.presell_sumqty+item.virtual_qty)*100,0)||0}}% + 已预售0 - 库存还剩{{item.presell_sumqty+item.virtual_qty}}件 + 库存还剩{{item.presell_sumqty-item.buy_goodnum}}件 + 库存还剩{{item.presell_sumqty+item.virtual_qty}}件 + diff --git a/packageC/pages/presell/pregoodsInfo/goodsInfo.js b/packageC/pages/presell/pregoodsInfo/goodsInfo.js index 0ba4d9d..2d63582 100644 --- a/packageC/pages/presell/pregoodsInfo/goodsInfo.js +++ b/packageC/pages/presell/pregoodsInfo/goodsInfo.js @@ -1006,7 +1006,7 @@ Page({ if (th.data.goodsInputNum <= 0) return s.my_warnning("商品数量不能为0", 0, th); if (th.data.sto_sele_name == null || th.data.sto_sele_name == undefined) - this.setData({ + th.setData({ sto_sele_name: "" }); if (th.data.sto_sele_name == "") return s.my_warnning("请选择门店", 0, th); @@ -3423,7 +3423,7 @@ Page({ if (th.data.is_show_sto_cat == 1) { item = th.data.def_pickpu_list[index]; } else { - item = th.data.only_pk[index]; //当没有门店分类的时候 + item = th.data.only_pk?th.data.only_pk[index]:null; //当没有门店分类的时候 } } else { @@ -3431,6 +3431,8 @@ Page({ item = th.data.sec_sto.s_arr[index]; } + if(!item) return false; + if (!th.data.sele_g) return false; //判断门店的配送方式是不是匹配 var g_distr_type = th.data.sele_g.distr_type; @@ -3504,13 +3506,15 @@ Page({ if (th.data.is_show_sto_cat == 1) { item = th.data.def_pickpu_list[index]; } else { - item = th.data.only_pk[index]; //当没有门店分类的时候 + item = th.data.only_pk?th.data.only_pk[index]:null; //当没有门店分类的时候 } } else { var index = th.data.sec_pick_index; item = th.data.sec_sto.s_arr[index]; } + if(!item) return false; + //判断门店的配送方式是不是匹配 var g_distr_type = th.data.sele_g.distr_type; if (item.distr_type != 0 && g_distr_type != 0 && item.distr_type != g_distr_type) { diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js index 8298329..ff3c1d8 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -95,6 +95,7 @@ Page({ freight_free:e.freight_free, weight_free:e.weight_free, sales_rules:e.sales_rules, + appoint_pick_keyid:json_d.appoint_pick_keyid }); getApp().request.promiseGet("/store/storemoduleendtime/page?store_id=" +os.stoid + "&type=6",{}).then(res=>{ //未购买 @@ -2137,7 +2138,7 @@ Page({ function normal_check(store_count, goodsinfo, wareIds) { //--- 看一下是不是线下库存 --- - if (th.data.sales_rules == 2 && !goodsinfo.whsle_id) { + if (th.data.sales_rules >= 2 && !goodsinfo.whsle_id) { th.check_down_line(t, pitem, item, wareIds); } else { if (t.goods_num > store_count) { @@ -2717,6 +2718,17 @@ Page({ var goodsinfo = this.data.requestData[pitem].goods[item]; var lock = 0, pick_no, plist; + + var lock_rq={ + store_id: os.stoid, wareId: t.goods_id, + storageId: goodsinfo.pick_id, pageSize: 1000 + } + + if(this.data.sales_rules==3){ + lock_rq.appoint_pick_keyid=this.data.appoint_pick_keyid; + delete lock_rq.storageId + } + //先读取门店的lock await getApp().request.promiseGet("/api/weshop/order/ware/lock/page", { data: { @@ -2731,21 +2743,33 @@ Page({ lock += res.data.data.pageData[i].outQty; } }) - //先获取门店的编号 - await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + goodsinfo.pick_id, { - data: { - storeId: os.stoid, - goodsId: t.goods_id, - pickupId: goodsinfo.pick_id - } - }).then(res => { - if (res.data.code == 0) { - pick_no = res.data.data.pickup_no; - } - }) + + + + if(this.data.sales_rules==2) { + //先获取门店的编号 + await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + goodsinfo.pick_id, { + data: { + storeId: os.stoid, + goodsId: t.goods_id, + pickupId: goodsinfo.pick_id + } + }).then(res => { + if (res.data.code == 0) { + pick_no = res.data.data.pickup_no; + } + }) + } + + var sto_rq={storageNos:pick_no,wareIds:encodeURIComponent(erpwareid),storeId:os.stoid}; + + if(this.data.sales_rules==3){ + sto_rq.storageIds=this.data.appoint_pick_keyid; + delete sto_rq.storageNos + } //读取线下的门店库存 await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{ - data:{storageNos:pick_no,wareIds:encodeURIComponent(erpwareid),storeId:os.stoid} + data:sto_rq }).then(res=>{ if(ut.ajax_ok(res)){ plist=res.data.data.pageData[0]; @@ -2897,7 +2921,7 @@ Page({ ab = 1; //--普通商品，如果有开启线下库存的功能，要调用线下库存进行计算,赠品不要进行调用线下库存--- if ((i_arr[j].prom_type == 0 || i_arr[j].prom_type == 3 || i_arr[j].prom_type == 5 || - i_arr[j].need_downlow_num) && th.data.sales_rules == 2 && i_arr[j].is_gift != 1 && !i_arr[j].whsle_id) { + i_arr[j].need_downlow_num) && th.data.sales_rules >= 2 && i_arr[j].is_gift != 1 && !i_arr[j].whsle_id) { //--获取商品的线下商品ID-- var gd = null; await getApp().request.promiseGet("/api/weshop/goods/get/" + oo.stoid + "/" + i_arr[j].goods_id, {}).then(res => { @@ -3035,7 +3059,7 @@ Page({ } } - if (th.data.sales_rules != 2) { + if (th.data.sales_rules == 1) { if (num > val.store_count) { isok = 0; gname = val.goods_name; diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index c0089ad..127a41e 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -219,7 +219,7 @@ Page({ } - th.data.prom_goods_map = {}; + //th.data.prom_goods_map = {}; th.data.is_summit_ing = 0; //更换地址回来要重新调用计算价钱的接口 if (!th.data.user_addr || th.data.user_addr.address_id != ie.address_id) { @@ -263,6 +263,7 @@ Page({ rank_switch: json_d.rank_switch, is_default_logistics: is_default_logistics, is_same_city: is_same_city, + appoint_pick_keyid:json_d.appoint_pick_keyid }); var rank_switch = json_d.rank_switch; @@ -395,8 +396,10 @@ Page({ //to.get_allsto(function (e) { //th.setData({ allsto: e }); //-------获取购物车已经选择的商品-------- - if(!th.data.old_cartlist) + if(!th.data.old_cartlist){ + th.data.prom_goods_map = {}; th.get_cart(); + } else{ th.calculatePrice(); } @@ -3028,6 +3031,39 @@ Page({ }) }, + + //分配代发商品 + add_df_goods(good,df_goods,whsle_id,room_id){ + var df_price = parseFloat(good.goods_num * good.goods_price); + + var index=df_goods.findIndex(function (e){ + return e.whsle_id==whsle_id + }) + if(index>-1){ + df_goods[index].df_price+=df_price; + df_goods[index].df_goods.push(good); + + if(room_id){ + if(!df_goods[index].df_room_ids) + df_goods[index].df_room_ids=""; + df_goods[index].df_room_ids+=room_id+","; + + } + + }else{ + var e={ + whsle_id:whsle_id, + df_price:df_price, + df_goods:[] + } + if(room_id) e.df_room_ids=room_id+',' + + e.df_goods.push(good); + df_goods.push(e); + } + + }, + //--------------------提交订单----------------------- async submit_func() { @@ -3171,6 +3207,7 @@ Page({ if(th.data.bn_goods.whsle_id){ item.is_whsle=1; + item.whsle_id=th.data.bn_goods.whsle_id; goods.is_whsle_goods=1; } @@ -3207,10 +3244,8 @@ Page({ } - - //如果不立即购买或者秒杀，如果是线下库存购买的时候 - if (goods.prom_type != 1 && goods.prom_type != 6 && goods.prom_type != 2 && th.data.sales_rules == 2 && !th.data.bn_goods.whsle_id) { + if (goods.prom_type != 1 && goods.prom_type != 6 && goods.prom_type != 2 && th.data.sales_rules >= 2 && !th.data.bn_goods.whsle_id) { var isok = 1; await th.check_store_num(goods.goods_id, th.data.bn_pick, gg.goods_num, function (res) { isok = res; @@ -3327,7 +3362,7 @@ Page({ return false; } - var order_prom_list_cart = th.data.order_prom_list_cart;; + var order_prom_list_cart = th.data.order_prom_list_cart; //--组装推送数据-- for (var i = 0; i < order_prom_list_cart.length; i++) { @@ -3464,6 +3499,9 @@ Page({ var df_price = 0; var df_room_ids = ""; + + var check_map={}; + //-------------让商品添加到商品列表-------------------- for (var k = 0; k < t_item.goods.length; k++) { @@ -3528,8 +3566,17 @@ Page({ goods.prom_id = 0; } + var txt=goods.prom_id+','+goods.prom_type+','+goods.goods_id+','+goods.is_gift; + //--赠品的时候,阶梯促销会右重复的情况 -- + if(check_map[txt] && goods.prom_type!=10){ + getApp().confirmBox(goods.goods_name + "计算金额错误，请重新刷新"); + return false; + }else{ + check_map[txt]=1; + } + //如果不立即购买或者秒杀，如果是线下库存购买的时候 - if (goods.prom_type == 0 && th.data.sales_rules == 2) { + if (goods.prom_type == 0 && th.data.sales_rules >= 2) { var isok = 1; await th.check_store_num(goods.goods_id, t_item.pickup_id, goods.goods_num, function (res) { isok = res; @@ -3570,14 +3617,17 @@ Page({ if (g_item.whsle_id && t_item.goods.length>1) { df_price += parseFloat(g_item.goods_num * g_item.goods_price); goods.is_whsle_goods = 1; - df_goods.push(goods); - df_room_ids += g_item.room_id + ","; + th.add_df_goods(goods,df_goods,g_item.whsle_id, g_item.room_id); + + //df_goods.push(goods); + // df_room_ids += g_item.room_id + ","; } else { //-- 如果只有一件的时候，商品又是代发商品，订单的状态要改成代发订单 -- if(g_item.whsle_id){ goods.is_whsle_goods=1; item.is_whsle=1; + item.whsle_id=g_item.whsle_id } item.order_goods.push(goods); @@ -3590,58 +3640,75 @@ Page({ } + + //如果房间号不为空的时候 if (room_ids != "") item.room_ids = ut.sub_last(room_ids); //处理代发商品的拆分 - if(df_goods.length>0 && item.order_goods.length>0 ){ - var df_item=JSON.parse(JSON.stringify(item)); + if(df_goods.length>0){ + + + item.goods_price= parseFloat(item.goods_price-df_price).toFixed(2); item.total_amount= parseFloat(item.total_amount-df_price).toFixed(2); - df_item.is_whsle=1; - df_item.is_discount_amount=0; - df_item.goods_price=df_price; - df_item.total_amount=df_price; - df_item.shipping_price=0; //没有运费 - if(df_item.order_prom_list) df_item.order_prom_list={}; - if(df_item.coupon_price) delete(df_item.coupon_price); - if(df_item.coupon_no) delete(df_item.coupon_no); - - //看一下是用余额比较多，还是用钱比较多 - if(item.order_amount>item.user_money){ - if(item.order_amount>df_price){ - item.order_amount=parseFloat(item.order_amount-df_price).toFixed(2); - df_item.order_amount=df_price.toFixed(2); + for (let j = 0; j < df_goods.length; j++) { + + var df_item=JSON.parse(JSON.stringify(item)); + + var ddff_item=df_goods[j]; + + df_item.is_whsle=1; + df_item.whsle_id=ddff_item.whsle_id; + df_item.is_discount_amount=0; + df_item.goods_price=ddff_item.df_price; + df_item.total_amount=ddff_item.df_price; + df_item.shipping_price=0; //没有运费 + if(df_item.order_prom_list) df_item.order_prom_list={}; + if(df_item.coupon_price) delete(df_item.coupon_price); + if(df_item.coupon_no) delete(df_item.coupon_no); + + //看一下是用余额比较多，还是用钱比较多 + if(item.order_amount>item.user_money){ + if(item.order_amount>ddff_item.df_price){ + item.order_amount=parseFloat(item.order_amount-ddff_item.df_price).toFixed(2); + df_item.order_amount=ddff_item.df_price.toFixed(2); }else { - var more_p=parseFloat(df_price-item.order_amount).toFixed(2); + var more_p=parseFloat(ddff_item.df_price-item.order_amount).toFixed(2); item.order_amount=0; item.user_money=parseFloat(item.user_money-more_p).toFixed(2); df_item.user_money=more_p; } - }else{ - if(item.user_money>df_price){ - item.user_money=parseFloat(item.user_money-df_price).toFixed(2); - df_item.user_money=df_price.toFixed(2); - }else { - var more_p=parseFloat(df_price-item.user_money).toFixed(2); - item.user_money=0; - item.order_amount=parseFloat(item.user_money-more_p).toFixed(2); - df_item.order_amount=more_p; + }else{ + if(item.user_money>ddff_item.df_price){ + item.user_money=parseFloat(item.user_money-ddff_item.df_price).toFixed(2); + df_item.user_money=ddff_item.df_price.toFixed(2); + }else { + var more_p=parseFloat(ddff_item.df_price-item.user_money).toFixed(2); + item.user_money=0; + item.order_amount=parseFloat(item.user_money-more_p).toFixed(2); + df_item.order_amount=more_p; + + } } + + if (ddff_item.df_room_ids) + df_item.room_ids = ut.sub_last(ddff_item.df_room_ids); + df_item.order_goods=ddff_item.df_goods; + pdata.push(df_item); } - if (df_room_ids != "") df_item.room_ids = ut.sub_last(df_room_ids); - df_item.order_goods=df_goods; - pdata.push(df_item); + } //如果只有代发商品的时候 - if(df_goods.length>0 && item.order_goods.length<=0){ - item.order_goods=df_goods; - item.is_whsle=1; + if(item.order_goods.length>0){ + //item.order_goods=df_goods; + //item.is_whsle=1; + pdata.push(item); } - pdata.push(item); + } } @@ -3692,6 +3759,9 @@ Page({ //},1000) }, function () { + + + return false; //支付失败 setTimeout(function () { var cps = getCurrentPages(); @@ -3788,23 +3858,33 @@ Page({ //---确认线下门店的数量足不足--- async check_store_num(goods_id, pick, goods_num, func) { var lock = 0, pick_no, plist, erpwareid; + + var lock_rq={ store_id: os.stoid, wareId: goods_id, storageId: pick, pageSize: 1000 }; + if(this.data.sales_rules==3){ + lock_rq.appoint_pick_keyid=this.data.appoint_pick_keyid; + delete lock_rq.storageId + } //先读取门店的lock await getApp().request.promiseGet("/api/weshop/order/ware/lock/page", { - data: { store_id: os.stoid, wareId: goods_id, storageId: pick, pageSize: 1000 } + data: lock_rq }).then(res => { if (res.data.code == 0 && res.data.data.total > 0) { for (var i in res.data.data.pageData) lock += res.data.data.pageData[i].outQty; } }) - //先获取门店的编号 - await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + 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; - } - }) + + 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} + }).then(res => { + if (res.data.code == 0) { + pick_no = res.data.data.pickup_no; + } + }) + } + //先获取商品的线下库存 await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + goods_id, { data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick } @@ -3813,14 +3893,23 @@ Page({ erpwareid = res.data.data.erpwareid; } }) + + + var sto_rq={ storageNos: pick_no, wareIds: encodeURIComponent(erpwareid), storeId: os.stoid, pageSize: 2000 }; + if(this.data.sales_rules==3){ + sto_rq.storageIds=this.data.appoint_pick_keyid; + delete sto_rq.storageNos + } + //读取线下的门店库存 await getApp().request.promiseGet("/api/weshop/goods/getWareStorages", { - data: { storageNos: pick_no, wareIds: encodeURIComponent(erpwareid), storeId: os.stoid, pageSize: 2000 } + data: sto_rq }).then(res => { if (res.data.code == 0) { plist = res.data.data.pageData[0]; } }) + var isok = 1; if (goods_num > plist.CanOutQty - lock) { isok = 0; @@ -4562,8 +4651,11 @@ Page({ //如果有限制使用优惠券，就要返回 if (gd.prom_type == 3) { - if (th.data.prom_goods_map[pickup_id][gd.prom_id].is_xz_yh) continue; - th.data.prom_goods_map[pickup_id][gd.prom_id].coupon_sele = 1; + + if(th.data.prom_goods_map && th.data.prom_goods_map[pickup_id] && th.data.prom_goods_map[pickup_id][gd.prom_id] ) { + if (th.data.prom_goods_map[pickup_id][gd.prom_id].is_xz_yh) continue; + th.data.prom_goods_map[pickup_id][gd.prom_id].coupon_sele = 1; + } } var item_price = gd.goods_price * gd.goods_num; var item_price2 = item_price; @@ -4865,7 +4957,16 @@ Page({ if (map[pickid]) { if (map[pickid][item.prom_id]) { + var ob = map[pickid][item.prom_id]; + //-- 避免同一件商品重复添加 -- + if(ob.goods && ob.goods.length){ + var fid=ob.goods.findIndex(function (e){ + e.goods_id==item.goods_id + }) + if(fid>-1) return false; + } + ob.price += item.goods_price * item.goods_num; ob.goods_num += item.goods_num; ob.goods.push({ goods_id: item.goods_id, goods_price: item.goods_price, goods_num: item.goods_num }); diff --git a/pages/giftpack/buygiftpack/giftpackbuy.js b/pages/giftpack/buygiftpack/giftpackbuy.js index 2fe33c6..040bc72 100644 --- a/pages/giftpack/buygiftpack/giftpackbuy.js +++ b/pages/giftpack/buygiftpack/giftpackbuy.js @@ -537,7 +537,7 @@ Page({ if (th.data.is_show_sto_cat == 1) { item = th.data.def_pickpu_list[index]; } else { - item = th.data.only_pk[index]; //当没有门店分类的时候 + item = th.data.only_pk?th.data.only_pk[index]:null; //当没有门店分类的时候 } } else { @@ -545,6 +545,8 @@ Page({ item = th.data.sec_sto.s_arr[index]; } + if(!item) return false; + if (!th.data.sele_g) return false; th.setData({ @@ -579,13 +581,15 @@ Page({ if (th.data.is_show_sto_cat == 1) { item = th.data.def_pickpu_list[index]; } else { - item = th.data.only_pk[index]; //当没有门店分类的时候 + item = th.data.only_pk?th.data.only_pk[index]:null; //当没有门店分类的时候 } } else { var index = th.data.sec_pick_index; item = th.data.sec_sto.s_arr[index]; } + if(!item) return false; + th.setData({ def_pick_store: item, sto_sele_name: item.pickup_name, diff --git a/pages/giftpack/buygiftpack/giftpackbuy.wxss b/pages/giftpack/buygiftpack/giftpackbuy.wxss index f77f8bf..9c70071 100644 --- a/pages/giftpack/buygiftpack/giftpackbuy.wxss +++ b/pages/giftpack/buygiftpack/giftpackbuy.wxss @@ -116,7 +116,7 @@ page { } .content_ware_price { - font-size: 20rpx; + font-size: 30rpx; color: #b9b5b5; margin-top: 2rpx; text-decoration: line-through; diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js index 853bdcd..f83e6cd 100644 --- a/pages/giftpack/giftpacklist/giftpacklist.js +++ b/pages/giftpack/giftpacklist/giftpacklist.js @@ -819,7 +819,7 @@ Page({ if (th.data.is_show_sto_cat == 1) { item = th.data.def_pickpu_list[index]; } else { - item = th.data.only_pk[index]; //当没有门店分类的时候 + item = th.data.only_pk?th.data.only_pk[index]:null; //当没有门店分类的时候 } } else { @@ -827,6 +827,8 @@ Page({ item = th.data.sec_sto.s_arr[index]; } + if(!item) return false; + if (!th.data.sele_g) return false; th.setData({ @@ -861,12 +863,15 @@ Page({ if (th.data.is_show_sto_cat == 1) { item = th.data.def_pickpu_list[index]; } else { - item = th.data.only_pk[index]; //当没有门店分类的时候 + item = th.data.only_pk?th.data.only_pk[index]:null; //当没有门店分类的时候 } } else { var index = th.data.sec_pick_index; item = th.data.sec_sto.s_arr[index]; } + + if(!item) return false; + th.setData({ def_pick_store: item, sto_sele_name: item.pickup_name, diff --git a/pages/giftpack/mygiftpack/mygiftpack.wxss b/pages/giftpack/mygiftpack/mygiftpack.wxss index ec5986b..ae16935 100644 --- a/pages/giftpack/mygiftpack/mygiftpack.wxss +++ b/pages/giftpack/mygiftpack/mygiftpack.wxss @@ -153,7 +153,7 @@ } .content_ware_price { - font-size: 20rpx; + font-size: 30rpx; color: #b9b5b5; margin-top: 2rpx; text-decoration: line-through; diff --git a/pages/goods/categoryList/categoryList.js b/pages/goods/categoryList/categoryList.js index 43e3a73..d325583 100644 --- a/pages/goods/categoryList/categoryList.js +++ b/pages/goods/categoryList/categoryList.js @@ -112,7 +112,13 @@ Page({ getApp().globalData.first_leader = first_leader; } - if (tt.type) this.data.type = parseInt(tt.type); + //if (tt.type) this.data.type = parseInt(tt.type); + //switchTab无法传参数 + if(getApp().globalData.cat_type){ + this.data.type = parseInt(getApp().globalData.cat_type); + getApp().globalData.cat_type=0; + } + that.get_brand(); clearInterval(that.data.timer); @@ -1192,12 +1198,15 @@ Page({ getPlusCardType: function (func) { var storid = oo.stoid; var th = this; + var user = getApp().globalData.userInfo; + if(!user) return false; + getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => { var plusCard = res.data.data; var arr = [1219, 2089, 3031]; var new_arr = new Array(); var card_name_map = new Map(); - var user = getApp().globalData.userInfo; + for (var i = 0; i < plusCard.length; i++) { if ((user.card_field == null || user.card_field == "") && (plusCard[i].IsStopBuy == true)) { continue; diff --git a/pages/goods/goodsInfo/buy_com_pop.wxml b/pages/goods/goodsInfo/buy_com_pop.wxml index 656509d..c5d6e0d 100644 --- a/pages/goods/goodsInfo/buy_com_pop.wxml +++ b/pages/goods/goodsInfo/buy_com_pop.wxml @@ -47,12 +47,13 @@ bindtap="choice_store">更多门店 + (库存不足) (库存不足) (配送不匹配) - + (库存不足) diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 4238887..5304f48 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -427,7 +427,9 @@ Page({ sys_switch: json_d, is_closecoupon: json_d.is_closecoupon, is_newsales_rules: json_d.is_newsales_rules, - is_retail_price: json_d.is_retail_price || 0 + is_retail_price: json_d.is_retail_price || 0, + appoint_pick_keyid:json_d.appoint_pick_keyid + }); ee.init(gid); //------几人评价------- @@ -471,9 +473,6 @@ Page({ ee.is_no_dis = 1; } - - - var appd = getApp().globalData; var w_time = setInterval(function () { if (that.data.is_get_local_ok == 0) return false; @@ -538,55 +537,69 @@ Page({ var that = this, th = this; getApp().getConfig2(function (e) { var sales_rules = e.sales_rules; - if (sales_rules == 2 && [1,2,4,6,8,9].indexOf(th.data.prom_type)==-1 && !th.data.sele_g.whsle_id ) { + if (sales_rules >=2 && [1,2,4,6,8,9].indexOf(th.data.prom_type)==-1 && !th.data.sele_g.whsle_id ) { getApp().waitfor2(that, "wait_for_user_store", "fir_goods", function () { var lock = 0, plist = null; var gd = that.data.fir_goods; //先读取门店的lock,采用链式写法，少用await - getApp().request.promiseGet("/api/weshop/order/ware/lock/page", { - data: { - store_id: os.stoid, - wareId: that.data.fir_goods.goods_id, - storageId: ee.pickup_id, - pageSize: 1000 - } - }).then(res => { - if (res.data.code == 0 && res.data.data.total > 0) { - for (var i in res.data.data.pageData) - lock += res.data.data.pageData[i].outQty - } - //---通过接口获取门店的线下库存信息-- - return getApp().request.promiseGet("/api/weshop/goods/getWareStorages", { - data: { - storageNos: ee.pickup_no, - wareIds: encodeURIComponent(th.data.data.erpwareid), - storeId: os.stoid - } - }) - }).then(res => { - if (res.data.code == 0 && res.data.data.total > 0) { - plist = res.data.data.pageData[0]; - } else { - wx.showToast({ - title: '库存不足，请更换其他门店', - icon: 'none', - }); - } - - if (plist && plist.CanOutQty - lock > 0) { - ee.CanOutQty = plist.CanOutQty - lock; - } else { - ee.CanOutQty = 0; - } - //--给门店赋值线下库存-- - that.data.fir_def_store = ee; - that.setData({ - def_pick_store: ee, - sto_sele_name: ee.pickup_name, - sto_sele_id: ee.pickup_id, - sto_sele_distr: ee.distr_type - }) + // getApp().request.promiseGet("/api/weshop/order/ware/lock/page", { + // data: { + // store_id: os.stoid, + // wareId: that.data.fir_goods.goods_id, + // storageId: ee.pickup_id, + // pageSize: 1000 + // } + // }).then(res => { + // if (res.data.code == 0 && res.data.data.total > 0) { + // for (var i in res.data.data.pageData) + // lock += res.data.data.pageData[i].outQty + // } + // //---通过接口获取门店的线下库存信息-- + // return getApp().request.promiseGet("/api/weshop/goods/getWareStorages", { + // data: { + // storageNos: ee.pickup_no, + // wareIds: encodeURIComponent(th.data.data.erpwareid), + // storeId: os.stoid + // } + // }) + // }).then(res => { + // if (res.data.code == 0 && res.data.data.total > 0) { + // plist = res.data.data.pageData[0]; + // } else { + // wx.showToast({ + // title: '库存不足，请更换其他门店', + // icon: 'none', + // }); + // } + // + // if (plist && plist.CanOutQty - lock > 0) { + // ee.CanOutQty = plist.CanOutQty - lock; + // } else { + // ee.CanOutQty = 0; + // } + // //--给门店赋值线下库存-- + // that.data.fir_def_store = ee; + // that.setData({ + // def_pick_store: ee, + // sto_sele_name: ee.pickup_name, + // sto_sele_id: ee.pickup_id, + // sto_sele_distr: ee.distr_type + // }) + // }) + //最新的获取线下门店库存 + th.check_CanOutQty(gd,ee,function (CanOutQty){ + ee.CanOutQty = CanOutQty; + //--给门店赋值线下库存-- + that.data.fir_def_store = ee; + that.setData({ + def_pick_store: ee, + sto_sele_name: ee.pickup_name, + sto_sele_id: ee.pickup_id, + sto_sele_distr: ee.distr_type + }) }) + + }) } else { that.data.fir_def_store = ee; @@ -850,7 +863,13 @@ Page({ title: '商品已经到期下架', showCancel: !1, complete: function () { - wx.navigateBack(); + + let pages = getCurrentPages(); + if(pages[pages.length - 2]){ + wx.navigateBack(); + }else{ + getApp().goto('/pages/index/index/index') + } } }); } @@ -1248,7 +1267,7 @@ Page({ if (th.data.goodsInputNum <= 0) return s.my_warnning("商品数量不能为0", 0, th); if (th.data.sto_sele_name == null || th.data.sto_sele_name == undefined) - this.setData({ + th.setData({ sto_sele_name: "" }); if (th.data.sto_sele_name == "") return s.my_warnning("请选择门店", 0, th); @@ -1374,7 +1393,7 @@ Page({ if (th.data.goodsInputNum <= 0) return s.my_warnning("商品数量不能为0", 0, th); if (th.data.sto_sele_name == null || th.data.sto_sele_name == undefined) - this.setData({ + th.setData({ sto_sele_name: "" }); if (th.data.sto_sele_name == "") return s.my_warnning("请选择门店", 0, th); @@ -1448,69 +1467,87 @@ Page({ newd.is_pd_normal=1; //---如果是线下门店销售的时候--- - if (th.data.sales_rules == 2) { + if (th.data.sales_rules>= 2) { var pick = th.get_pick_from_list(th.data.sto_sele_id) //---通过接口获取门店的线下库存信息-- - getApp().request.get("/api/weshop/goods/getWareStorages", { - data: { - storageNos: pick.pickup_no, - wareIds: encodeURIComponent(th.data.sele_g.erpwareid), - storeId: os.stoid - }, - success: function (res) { - if (res.data.code == 0) { - if (res.data.data.pageData.length > 0) { - var CanOutQty = res.data.data.pageData[0].CanOutQty; - if (CanOutQty < e.data.goodsInputNum) { - wx.showToast({ - title: '库存不足！', - icon: 'none', - }); - return false; - // return s.my_warnning("库存不足！", 0, th); - } - //在调一次接口,读取商品的预出库的数量，lock - getApp().request.get("/api/weshop/order/ware/lock/page", { - data: { - store_id: os.stoid, - wareId: th.data.sele_g.goods_id, - storageId: pick.pickup_id, - pageSize: 1000 - }, - success: function (res_data) { - if (res_data.data.code == 0 && res_data.data.data.total > 0) { - - var lock = 0; - for (var i in res_data.data.data.pageData) { - lock += res_data.data.data.pageData[i].outQty; - } - - if (CanOutQty <= lock) { - wx.showToast({ - title: '库存不足！', - icon: 'none', - }); - return false; - //return s.my_warnning("库存不足！", 0, th); - } - th.add_cart_next(e, t, a, o, newd, CanOutQty - lock); - } else { - th.add_cart_next(e, t, a, o, newd, CanOutQty); - } - } - }) - } else { - wx.showToast({ - title: '库存不足！', - icon: 'none', - }); - return false; - // return s.my_warnning("库存不足！", 0, th); - } - + // getApp().request.get("/api/weshop/goods/getWareStorages", { + // data: { + // storageNos: pick.pickup_no, + // wareIds: encodeURIComponent(th.data.sele_g.erpwareid), + // storeId: os.stoid + // }, + // success: function (res) { + // if (res.data.code == 0) { + // if (res.data.data.pageData.length > 0) { + // var CanOutQty = res.data.data.pageData[0].CanOutQty; + // if (CanOutQty < e.data.goodsInputNum) { + // wx.showToast({ + // title: '库存不足！', + // icon: 'none', + // }); + // return false; + // // return s.my_warnning("库存不足！", 0, th); + // } + // //在调一次接口,读取商品的预出库的数量，lock + // getApp().request.get("/api/weshop/order/ware/lock/page", { + // data: { + // store_id: os.stoid, + // wareId: th.data.sele_g.goods_id, + // storageId: pick.pickup_id, + // pageSize: 1000 + // }, + // success: function (res_data) { + // if (res_data.data.code == 0 && res_data.data.data.total > 0) { + // + // var lock = 0; + // for (var i in res_data.data.data.pageData) { + // lock += res_data.data.data.pageData[i].outQty; + // } + // + // if (CanOutQty <= lock) { + // wx.showToast({ + // title: '库存不足！', + // icon: 'none', + // }); + // return false; + // //return s.my_warnning("库存不足！", 0, th); + // } + // th.add_cart_next(e, t, a, o, newd, CanOutQty - lock); + // } else { + // th.add_cart_next(e, t, a, o, newd, CanOutQty); + // } + // } + // }) + // } else { + // wx.showToast({ + // title: '库存不足！', + // icon: 'none', + // }); + // return false; + // // return s.my_warnning("库存不足！", 0, th); + // } + // + // } + // } + // }) + th.check_CanOutQty(th.data.sele_g,pick,function (CanOutQty){ + if(CanOutQty){ + if (CanOutQty < e.data.goodsInputNum) { + wx.showToast({ + title: '库存不足！', + icon: 'none', + }); + return false; } + + th.add_cart_next(e, t, a, o, newd, CanOutQty); + }else{ + wx.showToast({title: '库存不足！',icon: 'none',}); + return false; } }) + + } else { if (o.store_count <= 0) { wx.showToast({ @@ -1588,64 +1625,83 @@ Page({ return false; } else { //---如果是线下门店销售的时候--- - if (th.data.sales_rules == 2) { + if (th.data.sales_rules >= 2) { var pick = th.get_pick_from_list(th.data.sto_sele_id) //---通过接口获取门店的线下库存信息-- - getApp().request.get("/api/weshop/goods/getWareStorages", { - data: { - storageNos: pick.pickup_no, - wareIds: encodeURIComponent(th.data.sele_g.erpwareid), - storeId: os.stoid - }, - success: function (res) { - if (res.data.code == 0) { - if (res.data.data.pageData.length > 0) { - var CanOutQty = res.data.data.pageData[0].CanOutQty; - if (CanOutQty < e.data.goodsInputNum) { - wx.showToast({ - title: '库存不足！', - icon: 'none', - }); - return false; - //return s.my_warnning("库存不足！", 0, th); - } - //在调一次接口,读取商品的预出库的数量，lock - getApp().request.get("/api/weshop/order/ware/lock/page", { - data: { - store_id: os.stoid, - wareId: th.data.sele_g.goods_id, - storageId: pick.pickup_id, - pageSize: 1000 - }, - success: function (res_data) { - if (res_data.data.code == 0 && res_data.data.data.total > 0) { - - var lock = 0; - for (var i in res_data.data.data.pageData) { - lock += res_data.data.data.pageData[i].outQty; - } - - if (CanOutQty <= lock) { - wx.showToast({ - title: '库存不足！', - icon: 'none', - }); - return false; - //return s.my_warnning("库存不足！", 0, th); - } - th.add_cart_next(e, t, a, o, newd, CanOutQty - lock); - } else { - th.add_cart_next(e, t, a, o, newd, CanOutQty); - } - } - }) - } else { - return s.my_warnning("库存不足！", 0, th); - } + // getApp().request.get("/api/weshop/goods/getWareStorages", { + // data: { + // storageNos: pick.pickup_no, + // wareIds: encodeURIComponent(th.data.sele_g.erpwareid), + // storeId: os.stoid + // }, + // success: function (res) { + // if (res.data.code == 0) { + // if (res.data.data.pageData.length > 0) { + // var CanOutQty = res.data.data.pageData[0].CanOutQty; + // if (CanOutQty < e.data.goodsInputNum) { + // wx.showToast({ + // title: '库存不足！', + // icon: 'none', + // }); + // return false; + // //return s.my_warnning("库存不足！", 0, th); + // } + // //在调一次接口,读取商品的预出库的数量，lock + // getApp().request.get("/api/weshop/order/ware/lock/page", { + // data: { + // store_id: os.stoid, + // wareId: th.data.sele_g.goods_id, + // storageId: pick.pickup_id, + // pageSize: 1000 + // }, + // success: function (res_data) { + // if (res_data.data.code == 0 && res_data.data.data.total > 0) { + // + // var lock = 0; + // for (var i in res_data.data.data.pageData) { + // lock += res_data.data.data.pageData[i].outQty; + // } + // + // if (CanOutQty <= lock) { + // wx.showToast({ + // title: '库存不足！', + // icon: 'none', + // }); + // return false; + // //return s.my_warnning("库存不足！", 0, th); + // } + // th.add_cart_next(e, t, a, o, newd, CanOutQty - lock); + // } else { + // th.add_cart_next(e, t, a, o, newd, CanOutQty); + // } + // } + // }) + // } else { + // return s.my_warnning("库存不足！", 0, th); + // } + // + // } + // } + // }) + + th.check_CanOutQty(th.data.sele_g,pick,function (CanOutQty){ + if(CanOutQty){ + if (CanOutQty < e.data.goodsInputNum) { + wx.showToast({ + title: '库存不足！', + icon: 'none', + }); + return false; } + + th.add_cart_next(e, t, a, o, newd, CanOutQty); + }else{ + wx.showToast({title: '库存不足！',icon: 'none',}); + return false; } }) + } else { if (o.store_count <= 0) { wx.showToast({ @@ -1679,69 +1735,88 @@ Page({ } //---如果是线下门店销售的时候--- - if (th.data.sales_rules == 2 && !th.data.sele_g.whsle_id ) { + if (th.data.sales_rules >= 2 && !th.data.sele_g.whsle_id ) { var pick = th.get_pick_from_list(th.data.sto_sele_id) //---通过接口获取门店的线下库存信息-- - getApp().request.get("/api/weshop/goods/getWareStorages", { - data: { - storageNos: pick.pickup_no, - wareIds: encodeURIComponent(th.data.sele_g.erpwareid), - storeId: os.stoid - }, - success: function (res) { - if (res.data.code == 0) { - if (res.data.data.pageData.length > 0) { - var CanOutQty = res.data.data.pageData[0].CanOutQty; - if (CanOutQty < e.data.goodsInputNum) { - wx.showToast({ - title: '库存不足！', - icon: 'none', - }); - return false; - //return s.my_warnning("库存不足！", 0, th); - } - //在调一次接口,读取商品的预出库的数量，lock - getApp().request.get("/api/weshop/order/ware/lock/page", { - data: { - store_id: os.stoid, - wareId: th.data.sele_g.goods_id, - storageId: pick.pickup_id, - pageSize: 1000 - }, - success: function (res_data) { - if (res_data.data.code == 0 && res_data.data.data.total > 0) { - - var lock = 0; - for (var i in res_data.data.data.pageData) { - lock += res_data.data.data.pageData[i].outQty; - } - - if (CanOutQty <= lock) { - wx.showToast({ - title: '库存不足！', - icon: 'none', - }); - return false; - //return s.my_warnning("库存不足！", 0, th); - } - th.add_cart_next(e, t, a, o, newd, CanOutQty - lock); - } else { - th.add_cart_next(e, t, a, o, newd, CanOutQty); - } - } - }) - } else { - wx.showToast({ - title: '库存不足！', - icon: 'none', - }); - return false; - //return s.my_warnning("库存不足！", 0, th); - } - + // getApp().request.get("/api/weshop/goods/getWareStorages", { + // data: { + // storageNos: pick.pickup_no, + // wareIds: encodeURIComponent(th.data.sele_g.erpwareid), + // storeId: os.stoid + // }, + // success: function (res) { + // if (res.data.code == 0) { + // if (res.data.data.pageData.length > 0) { + // var CanOutQty = res.data.data.pageData[0].CanOutQty; + // if (CanOutQty < e.data.goodsInputNum) { + // wx.showToast({ + // title: '库存不足！', + // icon: 'none', + // }); + // return false; + // //return s.my_warnning("库存不足！", 0, th); + // } + // //在调一次接口,读取商品的预出库的数量，lock + // getApp().request.get("/api/weshop/order/ware/lock/page", { + // data: { + // store_id: os.stoid, + // wareId: th.data.sele_g.goods_id, + // storageId: pick.pickup_id, + // pageSize: 1000 + // }, + // success: function (res_data) { + // if (res_data.data.code == 0 && res_data.data.data.total > 0) { + // + // var lock = 0; + // for (var i in res_data.data.data.pageData) { + // lock += res_data.data.data.pageData[i].outQty; + // } + // + // if (CanOutQty <= lock) { + // wx.showToast({ + // title: '库存不足！', + // icon: 'none', + // }); + // return false; + // //return s.my_warnning("库存不足！", 0, th); + // } + // th.add_cart_next(e, t, a, o, newd, CanOutQty - lock); + // } else { + // th.add_cart_next(e, t, a, o, newd, CanOutQty); + // } + // } + // }) + // } else { + // wx.showToast({ + // title: '库存不足！', + // icon: 'none', + // }); + // return false; + // //return s.my_warnning("库存不足！", 0, th); + // } + // + // } + // } + // }) + + th.check_CanOutQty(th.data.sele_g,pick,function (CanOutQty){ + if(CanOutQty){ + + if (CanOutQty < e.data.goodsInputNum) { + wx.showToast({ + title: '库存不足！', + icon: 'none', + }); + return false; } + + th.add_cart_next(e, t, a, o, newd, CanOutQty); + }else{ + wx.showToast({title: '库存不足！',icon: 'none',}); + return false; } }) + } else { if (o.store_count <= 0) { wx.showToast({ @@ -2104,7 +2179,7 @@ Page({ } var e = th.data.sele_g.store_count; var p_type = th.data.prom_type; //&& p_type!=1 && p_type!=4 - if (th.data.sales_rules == 2 && (p_type != 1 && p_type != 4 && p_type != 6 || th.data.openSpecModal_inte_normal == 1 || th.data.is_normal == 1)) { + if (th.data.sales_rules >= 2 && (p_type != 1 && p_type != 4 && p_type != 6 || th.data.openSpecModal_inte_normal == 1 || th.data.is_normal == 1)) { if (!th.data.def_pick_store) { wx.showToast({ title: '请选择门店', @@ -2210,7 +2285,7 @@ Page({ var e = th.data.sele_g.store_count; var p_type = th.data.prom_type; //&& p_type!=1 && p_type!=4 - if (th.data.sales_rules == 2 && (p_type != 1 && p_type != 4 && p_type != 6 || th.data.openSpecModal_inte_normal == 1 || th.data.is_normal == 1)) { + if (th.data.sales_rules >= 2 && (p_type != 1 && p_type != 4 && p_type != 6 || th.data.openSpecModal_inte_normal == 1 || th.data.is_normal == 1)) { if (!th.data.def_pick_store) { wx.showModal({title: '请选择门店',}); return false; @@ -2826,6 +2901,8 @@ Page({ sku_g = this.data.sku_g_pt; } + that.data.change=1; + var item = null; for (var i in sku_g) { if (sku_g[i].goods_id == gid) { @@ -2858,41 +2935,48 @@ Page({ if(!item.whsle_id) that.check_is_youhui(gid, that.data.is_normal); //默认门店要拿下门店库存 - if (that.data.sales_rules == 2 && that.data.def_pick_store && !that.data.sele_g.whsle_id ) { + if (that.data.sales_rules >= 2 && that.data.def_pick_store && !that.data.sele_g.whsle_id ) { var lock = 0, plist = null; //先读取门店的lock,采用链式写法，少用await - getApp().request.promiseGet("/api/weshop/order/ware/lock/page", { - data: { - store_id: os.stoid, - wareId: that.data.sele_g.goods_id, - storageId: that.data.def_pick_store.pickup_id, - pageSize: 1000 - } - }).then(res => { - if (res.data.code == 0 && res.data.data.total > 0) { - for (var i in res.data.data.pageData) - lock += res.data.data.pageData[i].outQty - } - //---通过接口获取门店的线下库存信息-- - return getApp().request.promiseGet("/api/weshop/goods/getWareStorages", { - data: { - storageNos: that.data.def_pick_store.pickup_no, - wareIds: encodeURIComponent(that.data.sele_g.erpwareid), - storeId: os.stoid - } - }) - }).then(res => { - if (res.data.code == 0 && res.data.data.total > 0) { - plist = res.data.data.pageData[0]; - } - if (plist && plist.CanOutQty - lock > 0) { - that.data.def_pick_store.CanOutQty = plist.CanOutQty - lock; - } else { - that.data.def_pick_store.CanOutQty = 0; - } + // getApp().request.promiseGet("/api/weshop/order/ware/lock/page", { + // data: { + // store_id: os.stoid, + // wareId: that.data.sele_g.goods_id, + // storageId: that.data.def_pick_store.pickup_id, + // pageSize: 1000 + // } + // }).then(res => { + // if (res.data.code == 0 && res.data.data.total > 0) { + // for (var i in res.data.data.pageData) + // lock += res.data.data.pageData[i].outQty + // } + // //---通过接口获取门店的线下库存信息-- + // return getApp().request.promiseGet("/api/weshop/goods/getWareStorages", { + // data: { + // storageNos: that.data.def_pick_store.pickup_no, + // wareIds: encodeURIComponent(that.data.sele_g.erpwareid), + // storeId: os.stoid + // } + // }) + // }).then(res => { + // if (res.data.code == 0 && res.data.data.total > 0) { + // plist = res.data.data.pageData[0]; + // } + // if (plist && plist.CanOutQty - lock > 0) { + // that.data.def_pick_store.CanOutQty = plist.CanOutQty - lock; + // } else { + // that.data.def_pick_store.CanOutQty = 0; + // } + // //--给门店赋值线下库存-- + // that.setData({def_pick_store: that.data.def_pick_store}); + // }) + + that.check_CanOutQty(th.data.sele_g,that.data.def_pick_store,function (CanOutQty){ + that.data.def_pick_store.CanOutQty = CanOutQty; //--给门店赋值线下库存-- that.setData({def_pick_store: that.data.def_pick_store}); }) + } this.sele_spec_chech_activity(); }, @@ -3086,7 +3170,7 @@ Page({ th.setData({all_pick_list: e.data.data.pageData}); //--获取线下库存,而且不是新的门店规则, 同时是普通购买的时候，或者同时不能是活动，秒杀，拼团，积分购-- - if (th.data.sales_rules == 2 && !th.data.is_newsales_rules && !th.data.sele_g.whsle_id && ((th.data.prom_type != 1 && th.data.prom_type != 6 && th.data.prom_type != 4) || is_normal == 1)) { + if (th.data.sales_rules >= 2 && !th.data.is_newsales_rules && !th.data.sele_g.whsle_id && ((th.data.prom_type != 1 && th.data.prom_type != 6 && th.data.prom_type != 4) || is_normal == 1)) { setTimeout(function () { th.deal_pickup_dline(e); }, 800) @@ -3322,86 +3406,141 @@ Page({ var g_distr_type = th.data.sele_g.distr_type; var lock = []; + + var lock_rq={store_id: os.stoid, wareId: th.data.sele_g.goods_id, pageSize: 1000}; + + if(th.data.sales_rules==3){ + lock_rq.appoint_pick_keyid=th.data.appoint_pick_keyid; + } + //先读取门店的lock,采用链式写法，少用await getApp().request.promiseGet("/api/weshop/order/ware/lock/page", { - data: {store_id: os.stoid, wareId: th.data.sele_g.goods_id, pageSize: 1000} + data: lock_rq }).then(res => { if (res.data.code == 0 && res.data.data.total > 0) { lock = res.data.data.pageData } + var sto_rq={ + wareIds: encodeURIComponent(th.data.sele_g.erpwareid), + storeId: os.stoid, + pageSize: 2000 + } + + if(th.data.sales_rules==3){ + sto_rq.storageIds=th.data.appoint_pick_keyid; + }else{ + sto_rq.storageNos=pkno_str; + } + //---通过接口获取门店的线下库存信息-- return getApp().request.promiseGet("/api/weshop/goods/getWareStorages", { - data: { - storageNos: pkno_str, - wareIds: encodeURIComponent(th.data.sele_g.erpwareid), - storeId: os.stoid, - pageSize: 2000 - } + data: sto_rq }) }).then(res => { wx.hideLoading(); if (res.data.code == 0) { - if (res.data.data.pageData && res.data.data.pageData.length > 0) { - var plist = res.data.data.pageData; - var def_pick_store = th.data.def_pick_store; - //以原来的数组为外循环，保证距离的顺序 - for (var kk in o_plist) { - for (var ii in plist) { - //线下的门店小心 - var n_item = plist[ii]; - if (n_item.StorageNo == o_plist[kk].pickup_no) { - - //拿到锁库的数量 - var lock_num = th.find_lock_num(o_plist[kk].pickup_id, lock); - //可出库数大于预出库库存的数量，可以判断为有库存 - if (n_item.CanOutQty > lock_num) { - o_plist[kk].CanOutQty = n_item.CanOutQty - lock_num; + + if (res.data.data.pageData && res.data.data.pageData.length > 0) { + + var plist = res.data.data.pageData; + if(th.data.sales_rules==3) { + var lock_num = 0; + var Qty = 0; + //-- 计算锁住的库存 -- + for (var i in lock) lock_num += lock[i].outQty; + Qty=plist[0].CanOutQty - lock_num; + + if(Qty>0) { + for (var kk in o_plist) { + o_plist[kk].CanOutQty = Qty; new_list.push(o_plist[kk]); - //--如果找到默认门店,同时也应该判断配送方式对不对-- - if (th.data.fir_def_store && n_item.StorageNo == th.data.fir_def_store.pickup_no && (g_distr_type == 0 || th.data.fir_def_store.distr_type == 0 || th.data.def_pick_store.distr_type == g_distr_type)) { - th.data.fir_def_store.CanOutQty = n_item.CanOutQty - lock_num; - if (def_pick_store.pickup_id == th.data.fir_def_store.pickup_id) - th.setData({def_pick_store: th.data.fir_def_store}) - is_find_def_store = 1; + } + if (th.data.fir_def_store && (g_distr_type == 0 || th.data.fir_def_store.distr_type == 0 || th.data.def_pick_store.distr_type == g_distr_type)) { + th.data.fir_def_store.Qty; + if (def_pick_store.pickup_id == th.data.fir_def_store.pickup_id) + th.setData({def_pick_store: th.data.fir_def_store}) + is_find_def_store = 1; + } + + }else{ + th.setData({all_sto: null, only_pk: null, def_pickpu_list: null}); + return false; + } + + }else { + + var def_pick_store = th.data.def_pick_store; + //以原来的数组为外循环，保证距离的顺序 + for (var kk in o_plist) { + for (var ii in plist) { + //线下的门店小心 + var n_item = plist[ii]; + if (n_item.StorageNo == o_plist[kk].pickup_no) { + + //拿到锁库的数量 + var lock_num = th.find_lock_num(o_plist[kk].pickup_id, lock); + //可出库数大于预出库库存的数量，可以判断为有库存 + if (n_item.CanOutQty > lock_num) { + o_plist[kk].CanOutQty = n_item.CanOutQty - lock_num; + new_list.push(o_plist[kk]); + //--如果找到默认门店,同时也应该判断配送方式对不对-- + if (th.data.fir_def_store && n_item.StorageNo == th.data.fir_def_store.pickup_no && (g_distr_type == 0 || th.data.fir_def_store.distr_type == 0 || th.data.def_pick_store.distr_type == g_distr_type)) { + th.data.fir_def_store.CanOutQty = n_item.CanOutQty - lock_num; + if (def_pick_store.pickup_id == th.data.fir_def_store.pickup_id) + th.setData({def_pick_store: th.data.fir_def_store}) + is_find_def_store = 1; + } + } + break; } } - break; } + } - } - //数据组装下 - var em = {}; - em.data = {}; - em.data.data = {}; - em.data.data.total = new_list.length; - em.data.data.pageData = new_list; - em.data.data.pageData = new_list; - - //--如果找到默认门店,同时也应该判断配送方式对不对-- - if (th.data.fir_def_store && !is_find_def_store && th.data.fir_def_store.pickup_id && (g_distr_type == 0 || th.data.fir_def_store.distr_type == 0 || th.data.def_pick_store.distr_type == g_distr_type)) { - th.data.fir_def_store.CanOutQty = 0; - //--当选择的门店是客户默认的门店的时候-- - if (th.data.def_pick_store && th.data.fir_def_store.pickup_id == th.data.def_pick_store.pickup_id) { - th.setData({def_pick_store: th.data.fir_def_store}); - em.data.data.pageData.unshift(th.data.def_pick_store); - } else { - em.data.data.pageData.splice(1, 0, th.data.fir_def_store); + //数据组装下 + var em = {}; + em.data = {}; + em.data.data = {}; + em.data.data.total = new_list.length; + em.data.data.pageData = new_list; + + + //--如果找到默认门店,同时也应该判断配送方式对不对-- + if (th.data.fir_def_store && !is_find_def_store && th.data.fir_def_store.pickup_id + && (g_distr_type == 0 || th.data.fir_def_store.distr_type == 0 || th.data.def_pick_store.distr_type == g_distr_type)) { + th.data.fir_def_store.CanOutQty = 0; + //--当选择的门店是客户默认的门店的时候-- + if (th.data.def_pick_store && th.data.fir_def_store.pickup_id == th.data.def_pick_store.pickup_id) { + th.setData({def_pick_store: th.data.fir_def_store}); + em.data.data.pageData.unshift(th.data.def_pick_store); + } else { + em.data.data.pageData.splice(1, 0, th.data.fir_def_store); + } + } + + for (let j = 0; j < em.data.data.pageData.length; j++) { + var iu = em.data.data.pageData[j]; + if (iu.CanOutQty <= 0) iu.is_no_qyt = 1; + } + + //---把数组组装进去--- + th.deal_pickup(em); + + } else { + th.setData({all_sto: null, only_pk: null, def_pickpu_list: null}) } - //---把数组组装进去--- - th.deal_pickup(em); - } else { - th.setData({all_sto: null, only_pk: null, def_pickpu_list: null}) - } } else { th.setData({all_sto: null, only_pk: null, def_pickpu_list: null}) } }) }, + + find_lock_num(pick_id, lock) { var lock_num = 0; if (!lock) return 0; @@ -4439,7 +4578,7 @@ Page({ } if (th.data.sto_sele_name == null || th.data.sto_sele_name == undefined) - this.setData({ + th.setData({ sto_sele_name: "" }); if (th.data.sto_sele_name == "") return s.my_warnning("请选择门店", 0, th); @@ -5832,7 +5971,7 @@ Page({ return false; } - if (!th.data.only_pk && !th.data.def_pickpu_list) { + if (!th.data.only_pk && !th.data.def_pickpu_list && !th.data.change) { // getApp().confirmBox("门店库存不足", null, 25000, !1); wx.showToast({ title: '门店库存不足', @@ -5840,6 +5979,7 @@ Page({ }); return false; } + th.data.change=0; if (th.data.only_pk && !th.data.only_pk.length) { // getApp().confirmBox("门店库存不足", null, 25000, !1); @@ -6003,7 +6143,7 @@ Page({ }, //如果开启线下库存，已经急速库存才会使用 - async check_the_pick(item, func) { + check_the_pick(item, func) { var th = this; var goodsinfo = th.data.sele_g; var erpwareid = goodsinfo.erpwareid; @@ -6011,45 +6151,83 @@ Page({ var lock = 0; //---如果是活动的时候,同时不是普通购买--- - if (th.data.sele_g.whsle_id || (th.data.prom_type == 1 || th.data.prom_type == 6 || th.data.prom_type == 4) && !th.data.is_normal) { + if (th.data.sele_g.whsle_id || [1,2,4,6,8,9].indexOf(th.data.prom_type)>-1 && !th.data.is_normal) { func(); return false; } - if (this.data.sales_rules != 2) { + if (this.data.sales_rules == 1) { func(); } else { - - //先读取门店的lock - await getApp().request.promiseGet("/api/weshop/order/ware/lock/page", { - data: {store_id: os.stoid, wareId: goodsinfo.goods_id, storageId: item.pickup_id, pageSize: 1000} - }).then(res => { - if (res.data.code == 0 && res.data.data.total > 0) { - for (var i in res.data.data.pageData) - lock += res.data.data.pageData[i].outQty; - } - }) - //读取线下的门店库存 - await getApp().request.promiseGet("/api/weshop/goods/getWareStorages", { - data: {storageNos: item.pickup_no, wareIds: encodeURIComponent(erpwareid), storeId: os.stoid} - }).then(res => { - if (res.data.code == 0 && res.data.data.total > 0) { - plist = res.data.data.pageData[0]; + // if (plist && plist.CanOutQty - lock > 0) { + // item.CanOutQty = plist.CanOutQty - lock; + // func(); + // return false; + // } + this.check_CanOutQty(goodsinfo,item,function (CanOutQty){ + + // let str = item.pickup_name + '库存不足！'; + if(!CanOutQty){ + wx.showToast({ + title: item.pickup_name + '库存不足！', + icon: 'none', + }); + return false; } - }) - - if (plist && plist.CanOutQty - lock > 0) { - item.CanOutQty = plist.CanOutQty - lock; + item.CanOutQty=CanOutQty; func(); - return false; + + }); + + } + }, + + //统一一下获取线下库存的函数 + async check_CanOutQty(goodsinfo,item,func){ + + var sales_rules= this.data.sales_rules; + + var lock_rq= {store_id: os.stoid, wareId: goodsinfo.goods_id, pageSize: 1000}; + if(sales_rules==2){ + lock_rq.storageId=item.pickup_id + }else{ + lock_rq.appoint_pick_keyid=encodeURIComponent(this.data.appoint_pick_keyid) + } + + var lock=0; + var CanOutQty=0; + var plist=null; + //先读取门店的lock + await getApp().request.promiseGet("/api/weshop/order/ware/lock/page", { + data:lock_rq + }).then(res => { + if (res.data.code == 0 && res.data.data.total > 0) { + for (var i in res.data.data.pageData) + lock += res.data.data.pageData[i].outQty; } - // let str = item.pickup_name + '库存不足！'; - wx.showToast({ - title: item.pickup_name + '库存不足！', - icon: 'none', - }); + }) + var sto_req= { wareIds: encodeURIComponent(goodsinfo.erpwareid), storeId: os.stoid} + if(sales_rules==2){ + sto_req.storageNos=item.pickup_no + }else{ + sto_req.storageIds=encodeURIComponent(this.data.appoint_pick_keyid) } + //读取线下的门店库存 + await getApp().request.promiseGet("/api/weshop/goods/getWareStorages", { + data:sto_req + }).then(res => { + if (res.data.code == 0 && res.data.data.total > 0) { + plist = res.data.data.pageData[0]; + } + }) + + if (plist && plist.CanOutQty - lock > 0) { + CanOutQty=plist.CanOutQty - lock; + } + + if(func) func(CanOutQty); + }, @@ -6064,7 +6242,7 @@ Page({ if (th.data.is_show_sto_cat == 1) { item = th.data.def_pickpu_list[index]; } else { - item = th.data.only_pk[index]; //当没有门店分类的时候 + item = th.data.only_pk?th.data.only_pk[index]:null; //当没有门店分类的时候 } } else { @@ -6072,6 +6250,8 @@ Page({ item = th.data.sec_sto.s_arr[index]; } + if(!item) return false; + if (!th.data.sele_g) return false; //判断门店的配送方式是不是匹配 var g_distr_type = th.data.sele_g.distr_type; @@ -6147,13 +6327,15 @@ Page({ if (th.data.is_show_sto_cat == 1) { item = th.data.def_pickpu_list[index]; } else { - item = th.data.only_pk[index]; //当没有门店分类的时候 + item = th.data.only_pk?th.data.only_pk[index]:null; //当没有门店分类的时候 } } else { var index = th.data.sec_pick_index; item = th.data.sec_sto.s_arr[index]; } + if(!item) return false; + //判断门店的配送方式是不是匹配 var g_distr_type = th.data.sele_g.distr_type; if (item.distr_type != 0 && g_distr_type != 0 && item.distr_type != g_distr_type) { diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml index d46b7a7..8997ae4 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxml +++ b/pages/goods/goodsInfo/goodsInfo.wxml @@ -125,7 +125,7 @@ {{prom_price}} - ￥{{filters.toFix(data.market_price,2)}} + 零售价：￥{{filters.toFix(data.market_price,2)}} ￥{{filters.toFix(data.shop_price,2)}} @@ -262,7 +262,7 @@ 0积分 -    ￥{{filters.toFix(data.market_price,2)}} +    零售价：￥{{filters.toFix(data.market_price,2)}} @@ -310,7 +310,7 @@ {{filters.toFix(data[card_field],2)}} - 零售价:￥{{filters.toFix(data.market_price,2)}} + 零售价：￥{{filters.toFix(data.market_price,2)}} @@ -324,7 +324,7 @@ ￥ {{filters.toFix(data.shop_price,2)}} - 零售价:￥{{filters.toFix(data.market_price,2)}} + 零售价：￥{{filters.toFix(data.market_price,2)}} @@ -427,7 +427,7 @@ ￥ {{prom_price}} - ￥{{filters.toFix(data.market_price,2)}} + 零售价：￥{{filters.toFix(data.market_price,2)}} ￥{{filters.toFix(data.shop_price,2)}} @@ -623,7 +623,7 @@ - + 领券 @@ -634,7 +634,7 @@ - + @@ -1062,7 +1062,7 @@ - + 加入购物车 立即购买 @@ -1197,6 +1197,8 @@ - + 库存不足 @@ -1363,7 +1365,7 @@ - 库存不足5 + 库存不足 @@ -1558,7 +1560,9 @@ - {{item.pickup_name}} + {{item.pickup_name}} + (无货) + @@ -1584,7 +1588,9 @@ - {{item.pickup_name}} + {{item.pickup_name}} + (无货) + @@ -1612,7 +1618,9 @@ - {{item.pickup_name}} + {{item.pickup_name}} + (无货) + diff --git a/pages/team/team_show/team_show.js b/pages/team/team_show/team_show.js index 7c90eb8..e817ea0 100644 --- a/pages/team/team_show/team_show.js +++ b/pages/team/team_show/team_show.js @@ -1448,7 +1448,7 @@ Page({ if (th.data.is_show_sto_cat == 1) { item = th.data.def_pickpu_list[index]; } else { - item = th.data.only_pk[index]; //当没有门店分类的时候 + item = th.data.only_pk?th.data.only_pk[index]:null; //当没有门店分类的时候 } } else { @@ -1490,12 +1490,14 @@ Page({ if (th.data.is_show_sto_cat == 1) { item = th.data.def_pickpu_list[index]; } else { - item = th.data.only_pk[index]; //当没有门店分类的时候 + item = th.data.only_pk?th.data.only_pk[index]:null; //当没有门店分类的时候 } } else { var index = th.data.sec_pick_index; item = th.data.sec_sto.s_arr[index]; } + + if(!item) return false; var store_id = o.stoid; diff --git a/pages/template/index.js b/pages/template/index.js index f8b6b28..11800b3 100644 --- a/pages/template/index.js +++ b/pages/template/index.js @@ -122,9 +122,10 @@ Page({ onShareAppMessage:async function(e) { + var th=this; getApp().globalData.no_clear=1; getApp().getConfig(await function(e){ - this.setData({ + th.setData({ store_config:e }) }.bind(this)) @@ -148,9 +149,11 @@ Page({ * 用户分享朋友圈 */ async onShareTimeline(){ + + var th=this; getApp().globalData.no_clear=1; getApp().getConfig(await function(e){ - this.setData({ + th.setData({ store_config:e }) }.bind(this)) diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js index 0a32e1a..7ee4a77 100644 --- a/pages/user/order_detail/order_detail.js +++ b/pages/user/order_detail/order_detail.js @@ -19,12 +19,13 @@ Page({ var r = void 0 !== e.isGoup && e.isGoup; getApp().getConfig2(function (e) { + th.setData({conf: e,sales_rules:e.sales_rules, userInfo: getApp().globalData.userInfo}); //--- 看后台是不是有开通等级卡 --- if(e.switch_list){ var s_list=JSON.parse(e.switch_list); - th.setData({sys_switch: s_list}); + th.setData({sys_switch: s_list,appoint_pick_keyid:s_list.appoint_pick_keyid}); var is_open_offline=s_list.is_pricing_open; var user=getApp().globalData.userInfo; //如果后台有开启等级价的功能 @@ -942,26 +943,42 @@ Page({ async check_down_line_next(gg,num,pick_id,func){ var lock=0,pick_no,plist; + var lock_rq={store_id:os.stoid,wareId:gg.goods_id,storageId:pick_id}; + if(this.data.sales_rules==3){ + log_rq.appoint_pick_keyid=this.data.appoint_pick_keyid; + delete log_rq.storageId + } + //先读取门店的lock await getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{ - data:{store_id:os.stoid,wareId:gg.goods_id,storageId:pick_id} + data:lock_rq }).then(res=>{ if(res.data.code==0 && res.data.data.total>0){ for(var i in res.data.data.pageData) lock+=res.data.data.pageData[i].outQty; } }) - //先获取门店的编号 - await getApp().request.promiseGet("/api/weshop/pickup/get/"+os.stoid+"/"+pick_id,{ - data:{storeId:os.stoid,goodsId:gg.goods_id,pickupId:pick_id} - }).then(res=>{ - if(res.data.code==0){ - pick_no=res.data.data.pickup_no; - } - }) + + if(this.data.sales_rules==2) { + //先获取门店的编号 + await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + pick_id, { + data: {storeId: os.stoid, goodsId: gg.goods_id, pickupId: pick_id} + }).then(res => { + if (res.data.code == 0) { + pick_no = res.data.data.pickup_no; + } + }) + } + + var sto_rq={storageNos:pick_no,wareIds:encodeURIComponent(gg.erpwareid),storeId:os.stoid}; + if(this.data.sales_rules==3){ + sto_rq.storageIds=this.data.appoint_pick_keyid; + delete sto_rq.storageNos + } + //读取线下的门店库存 await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{ - data:{storageNos:pick_no,wareIds:encodeURIComponent(gg.erpwareid),storeId:os.stoid} + data:sto_rq }).then(res=>{ if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ plist=res.data.data.pageData[0]; @@ -1248,7 +1265,7 @@ Page({ //判断是不是线下库存的购买， 是不是秒杀活动 - if(th.data.sales_rules==2 && !prom && !good.whsle_id){ + if(th.data.sales_rules>=2 && !prom && !good.whsle_id){ //-- 看一下购物车上有多少商品 -- var cart_num=0; @@ -1273,9 +1290,17 @@ Page({ var lock=0,plist=null; if(b_item.prom_type!=7) { + + + var lock_rq={store_id: os.stoid, wareId: good.goods_id, storageId: b_item.pickup_id, pageSize: 1000}; + if(th.data.sales_rules==3){ + lock_rq.appoint_pick_keyid=th.data.appoint_pick_keyid; + delete lock_rq.storageId; + } + //先读取门店的lock, await getApp().request.promiseGet("/api/weshop/order/ware/lock/page", { - data: {store_id: os.stoid, wareId: good.goods_id, storageId: b_item.pickup_id, pageSize: 1000} + data:lock_rq }).then(res => { if (res.data.code == 0 && res.data.data.total > 0) { for (var i in res.data.data.pageData) @@ -1283,13 +1308,15 @@ Page({ } }) + var sto_rq={storageNos: pickup.pickup_no,wareIds: encodeURIComponent(good.erpwareid),storeId: os.stoid }; + if(th.data.sales_rules==3){ + sto_rq.storageIds=th.data.appoint_pick_keyid; + delete sto_rq.storageNos; + } + //---通过接口获取门店的线下库存信息-- await getApp().request.promiseGet("/api/weshop/goods/getWareStorages", { - data: { - storageNos: pickup.pickup_no, - wareIds: encodeURIComponent(good.erpwareid), - storeId: os.stoid - } + data: sto_rq }).then(res => { if (res.data.code == 0 && res.data.data.total > 0) { plist = res.data.data.pageData[0]; diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index 5d167d0..ea9dea2 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -110,10 +110,15 @@ Page({ var th=this; //---查看会员的等级价--- getApp().getConfig2(function(e) { - th.setData({conf: e,sales_rules:e.sales_rules }); + + + + th.setData({conf: e,sales_rules:e.sales_rules }); //--- 看后台是不是有开通等级卡 --- if(e.switch_list){ var s_list=JSON.parse(e.switch_list); + th.setData({appoint_pick_keyid:s_list.appoint_pick_keyid}) + var user=getApp().globalData.userInfo; var is_open_offline=s_list.is_pricing_open; //-- 如果后台有开启等级价的功能 -- @@ -964,7 +969,7 @@ Page({ } //--如果是线下库存的时候-- - if (th.data.conf.sales_rules == 2 && !gg.whsle_id) { + if (th.data.conf.sales_rules >= 2 && !gg.whsle_id) { var ob = {}; await th.check_down_line_next(gg, good.goods_num, order.pickup_id, function (obj) { ob = obj; @@ -1173,26 +1178,41 @@ Page({ async check_down_line_next(gg,num,pick_id,func){ var lock=0,pick_no,plist; + var log_rq={store_id:os.stoid,wareId:gg.goods_id,storageId:pick_id}; + if(this.data.sales_rules==3){ + log_rq.appoint_pick_keyid=this.data.appoint_pick_keyid; + delete log_rq.storageId + } //先读取门店的lock await getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{ - data:{store_id:os.stoid,wareId:gg.goods_id,storageId:pick_id} + data:log_rq }).then(res=>{ if(res.data.code==0 && res.data.data.total>0){ for(var i in res.data.data.pageData) lock+=res.data.data.pageData[i].outQty; } }) - //先获取门店的编号 - await getApp().request.promiseGet("/api/weshop/pickup/get/"+os.stoid+"/"+pick_id,{ - data:{storeId:os.stoid,goodsId:gg.goods_id,pickupId:pick_id} - }).then(res=>{ - if(res.data.code==0){ - pick_no=res.data.data.pickup_no; - } - }) + + if(this.data.sales_rules==2) { + //先获取门店的编号 + await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + pick_id, { + data: {storeId: os.stoid, goodsId: gg.goods_id, pickupId: pick_id} + }).then(res => { + if (res.data.code == 0) { + pick_no = res.data.data.pickup_no; + } + }) + } + + var sto_rq={storageNos:pick_no,wareIds:encodeURIComponent(gg.erpwareid),storeId:os.stoid}; + if(this.data.sales_rules==3){ + sto_rq.storageIds=this.data.appoint_pick_keyid; + delete sto_rq.storageNos + } + //读取线下的门店库存 await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{ - data:{storageNos:pick_no,wareIds:encodeURIComponent(gg.erpwareid),storeId:os.stoid} + data:sto_rq }).then(res=>{ if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ plist=res.data.data.pageData[0]; @@ -1212,8 +1232,7 @@ Page({ } func(ob) }, - - + //------图片失败，默认图片--------- bind_bnerr: function(e) { @@ -1565,7 +1584,7 @@ Page({ //判断是不是线下库存的购买， 是不是秒杀活动 - if(th.data.sales_rules==2 && !prom && !good.whsle_id){ + if(th.data.sales_rules>=2 && !prom && !good.whsle_id){ //-- 看一下购物车上有多少商品 -- var cart_num=0; @@ -1590,9 +1609,15 @@ Page({ var lock=0,plist=null; if(b_item.prom_type!=7) { + + var lock_rq= {store_id: os.stoid, wareId: good.goods_id, storageId: b_item.pickup_id, pageSize: 1000}; + if(th.data.sales_rules==3){ + lock_rq.appoint_pick_keyid=th.data.appoint_pick_keyid; + delete lock_rq.storageId; + } //先读取门店的lock, await getApp().request.promiseGet("/api/weshop/order/ware/lock/page", { - data: {store_id: os.stoid, wareId: good.goods_id, storageId: b_item.pickup_id, pageSize: 1000} + data: lock_rq }).then(res => { if (res.data.code == 0 && res.data.data.total > 0) { for (var i in res.data.data.pageData) @@ -1600,13 +1625,14 @@ Page({ } }) + var sto_rq= { storageNos: pickup.pickup_no, wareIds: encodeURIComponent(good.erpwareid), storeId: os.stoid } + if(th.data.sales_rules==3){ + sto_rq.storageIds=th.data.appoint_pick_keyid; + delete sto_rq.storageNos; + } //---通过接口获取门店的线下库存信息-- await getApp().request.promiseGet("/api/weshop/goods/getWareStorages", { - data: { - storageNos: pickup.pickup_no, - wareIds: encodeURIComponent(good.erpwareid), - storeId: os.stoid - } + data: sto_rq }).then(res => { if (res.data.code == 0 && res.data.data.total > 0) { plist = res.data.data.pageData[0]; diff --git a/pages/user/userinfo/userinfo.js b/pages/user/userinfo/userinfo.js index 26c8251..ade2db8 100644 --- a/pages/user/userinfo/userinfo.js +++ b/pages/user/userinfo/userinfo.js @@ -225,7 +225,7 @@ Page({ if (th.data.is_show_sto_cat == 1) { item = th.data.def_pickpu_list[index]; } else { - item = th.data.only_pk[index]; //当没有门店分类的时候 + item = th.data.only_pk?th.data.only_pk[index]:null; //当没有门店分类的时候 } } else {