diff --git a/app.js b/app.js index 81df597..f3995ac 100644 --- a/app.js +++ b/app.js @@ -1351,6 +1351,42 @@ App({ }) }, + //--- 统一跳转到物流的优化 --- + async check_go_fw(goods_id,func){ + + var user_id=this.globalData.user_id?this.globalData.user_id:0; + var flag=null; + //判断拼团的---会员身份-- + await this.promiseGet("/api/weshop/teamlist/pageteam/2", { + data: { + store_id: os.stoid, + is_end: 0, + is_show: 1, + user_id: user_id, + pageSize: 1000, + goods_id:goods_id + } + }).then(res => { + let pd_list = res.data.data.pageData; + if (res.data.code == 0 && pd_list.length > 0) { + flag = pd_list.find(pd => { + return pd.goods_type==1; + }) + } + }) + + var url= "/packageA/pages/goodsInfo/goodsInfo?goods_id="+goods_id; + if(flag){ + url='/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id='+goods_id+'&prom_type=6&prom_id='+flag.id; + } + if(func){ + func(flag,url) + }else{ + this.goto(url); + } + + + }, //-- 如果是新会员没有地址的时候，自提的时候可以不用管 -- is_no_addr(th,exp_type){ exp_type=parseInt(exp_type+''); @@ -1360,7 +1396,7 @@ App({ } return false; }, - //---- 判断是不是虚拟商品狗阿米 ----- + //---- 判断是不是虚拟商品 ----- is_virtual(gd){ if(gd.is_virtual==2) return true; return false; @@ -1411,7 +1447,10 @@ App({ }) } return cx_arr; - } + }, + + + }); -}); + diff --git a/app.json b/app.json index 153f35a..934ee9d 100644 --- a/app.json +++ b/app.json @@ -116,10 +116,12 @@ "pages/cart2_ser/cart2_ser", "pages/libao_payment/payment", "pages/details_serviceCard/details_serviceCard", - "pages/serviceCard_pd/goodsInfo/goodsInfo", - "pages/serviceCard_pd/team_show/team_show", - "pages/serviceCard_pd/cart/cart", - "pages/serviceCard_pd/team_success/team_success" + "pages/serviceCard_pd/goodsInfo/goodsInfo", + "pages/serviceCard_pd/team_show/team_show", + "pages/serviceCard_pd/cart/cart", + "pages/serviceCard_pd/team_success/team_success", + "pages/serviceCard_pd/cart_wk/cart_wk", + "pages/serviceCard_pd/team_more/team_more" ] }, { diff --git a/app.wxss b/app.wxss index 2e197c2..3e5ba4b 100644 --- a/app.wxss +++ b/app.wxss @@ -1211,7 +1211,7 @@ background: #ffe3e2; .no_line_x{ text-decoration: none !important; font-size: 24rpx !important; - color: #acaaaa !important; + /*color: #acaaaa !important;*/ } .no_line_c{ text-decoration: none !important; diff --git a/components/diy_pingd_buy/diy_pingd_buy.js b/components/diy_pingd_buy/diy_pingd_buy.js index 1b5e23d..6957bd9 100644 --- a/components/diy_pingd_buy/diy_pingd_buy.js +++ b/components/diy_pingd_buy/diy_pingd_buy.js @@ -49,12 +49,15 @@ Component({ clearInterval(this.data.timer); } }, - - + ready: function() { console.log("ready"); var g_id = this.data.object.data; + var data_type = this.data.object.data_type; console.log(g_id); + if(data_type!=2){ + g_id=null; + } this.init(g_id); }, detached() { @@ -219,7 +222,7 @@ Component({ bind_bnerr3: function (e) { var _errImg = e.target.dataset.errorimg; var _Img = e.target.dataset.img; - if (_Img != undefined) { + if (_errImg != undefined) { var _errObj = {}; _errObj[_errImg] = "/public/images/default_goods_image_240.gif"; this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; diff --git a/components/store_popup/store_popup.js b/components/store_popup/store_popup.js new file mode 100644 index 0000000..7cf9994 --- /dev/null +++ b/components/store_popup/store_popup.js @@ -0,0 +1,699 @@ +// components/store_popup.js +var e = getApp(), + a = e.globalData.setting, + os = a +Component({ + /** + * 组件的属性列表 + */ + properties: { + store: { + type: Number, + value: 0 + } + }, + lifetimes: { + attached: function () { + // 在组件实例进入页面节点树时执行 + this.init() + }, + detached: function () { + // 在组件实例被从页面节点树移除时执行 + }, + }, + /** + * 组件的初始数据 + */ + data: { + //门店相关 + ismend: 0, + is_sec_mend: 0, + sto_sele_name: "", //选中的门店名称 + sto_sele_id: "", //选中的门店id + sto_sele_distr: "", //选择的门店的配送方式 + is_show_sto_cat: 1, //是否显示门店分类 + only_pk: null, + all_sto: null, + sec_sto: null, //选择了的门店分类 + pickpu_list: null, //读出的所有门店list + def_pickpu_list: null, //一开始5个门店list + sec_pick_index: 0, //第二级门店选择ID + fir_pick_index: 0, //第一级门店选择ID + all_pick_list: null,//所有的门店先记录起来 + + select_store: 0, //选择更多 + index: 1, + more_store: 0, //选择门店 + sort_store: 0, //门店分类 + choice_sort_store: 0, //选择分类门店 + new_user: 0, //新用户 + + def_pick_store: null, // 默认的门店 + fir_def_store: null, //客户默认的门店的 + lat: null, //维度 + lon: null, //经度 + + is_get_local_ok: 0, //获取坐标是否完成 + region_name: "门店分类", //区域的名字 + is_gps: 1, + open_ind_store: 0, //哪里打开的门店列表的控制属性 + default_store: {}, //创建添加默认门店地址的对象 + + + openSpecModal: 0, + + is_get_guide: 0, + keyword: '', //门店搜索 + sec_i: -1,//选中分类门店 下标 + old_all_sto:null, //分类门店数据 + }, + + /** + * 组件的方法列表 + */ + methods: { + init() { + getApp().getConfig2((e) => { + this.setData({ + bconfig: e, + }); + }) + this.wait_for_store_config() + this.set_user_mo_store(() => { + this.get_sto() + }) + }, + //开启定位 + wait_for_store_config: function () { + let th = this + var t_time = setInterval(function () { + if (th.data.bconfig == null) false; + var e = th.data.bconfig; + if (e && e.is_sort_storage) { + 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 { + th.data.is_get_local_ok = 1; + } + clearInterval(t_time); + }, 500) + }, + set_user_mo_store(func) { + let th = this; + let that = th; + + //获取用户的默认门店 + getApp().get_user_store(function (e) { + if (!e) { + th.data.fir_def_store = {}; //赋值空对象 + return false; + } + + if (getApp().globalData.is_dj_pk) th.setData({ has_def: 1 }) + + var ee = JSON.parse(JSON.stringify(e)); + //--定时器推迟一下-- + setTimeout(function () { + if (th.data.fir_goods) var g_distr_type = th.data.fir_goods.distr_type; + //--如果默认门店的配送方式不对，就不能被选择，这里不控制，如果不一样，就说明配送方式不对-- + if (ee.distr_type != 0 && g_distr_type != 0 && ee.distr_type != g_distr_type) { + ee.is_no_dis = 1; + } + + var appd = getApp().globalData; + var w_time = setInterval(function () { + if (that.data.is_get_local_ok == 0) return false; + clearInterval(w_time); + var distance = null; + var e = JSON.parse(JSON.stringify(ee)); + + //如果有开启近距离的话,同时距离优不一样了 + if (that.data.lat != null) { + //如果经纬度有变化的话 + if (e && appd.lat == that.data.lat && appd.lon == that.data.lon && e.distance > 0) { + that.set_def_storage(e); + if (func) func(); + } else { + //要用接口是获取距离，js的计算不准 + getApp().request.promiseGet("/api/weshop/pickup/list", { + data: { + store_id: os.stoid, + pickup_id: e.pickup_id, + lat: th.data.lat, + lon: th.data.lon, + isstop: 0, + is_pos: 1 + }, + }).then(res => { + if (res.data.code == 0) { + e = res.data.data.pageData[0]; + if (e) { + e.is_no_dis = ee.is_no_dis; + appd.pk_store = e; + that.set_def_storage(e); + } + + } + if (func) func(); + }) + } + //e.distance = distance; + appd.lat = that.data.lat; + appd.lon = that.data.lon; + + } else { + if (e) { + e.distance = null; + that.set_def_storage(e); + } + if (func) func(); + } + }, 500) + }, 700) + }) + + }, + //--- 设置一下默认库存的数量 ---- + set_def_storage(ee) { + var that = this, th = this; + 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 + }) + }, + //---------拿出门店分类和门店------------ + get_sto() { + let th = this + var that = th; + var self = this; + var timer_get = setInterval(function () { + if (th.data.is_get_local_ok == 0) return false; + var dd = null; + + dd = { + store_id: os.stoid, + isstop: 0, + is_pos: 1, + pageSize: 2000, + } + + //如果有距离的话 + if (th.data.lat != null) { + dd.lat = th.data.lat; + dd.lon = th.data.lon; + } + + if (th.data.sele_g && th.data.sele_g.pickup_list) { + dd.ids = th.data.sele_g.pickup_list + } + + clearInterval(timer_get); + + //如果会员是有默认的门店话 + if (!th.data.def_pick_store && th.data.fir_def_store) { + th.setData({ def_pick_store: th.data.fir_def_store }); + } + wx.showLoading({ + title: '加载中.' + }); + //----------获取门店---------------- + getApp().request.promiseGet("/api/weshop/pickup/list", { + data: dd, + }).then(res => { + var e = res; + wx.hideLoading() + if (e.data.code == 0 && e.data.data && e.data.data.pageData && e.data.data.pageData.length > 0) { + + var his_cate_num = 0; + for (let i in e.data.data.pageData) { + let item = e.data.data.pageData[i]; + if (item.category_id > 0) { + his_cate_num = 1; + break; + } + } + e.his_cate_num = his_cate_num; + + //如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店 + if (dd.lat && (!th.data.def_pick_store || JSON.stringify(th.data.def_pick_store) == '{}') && th.data.bconfig && th.data.bconfig.is_sort_storage) { + th.setData({ + def_pick_store: e.data.data.pageData[0], + sto_sele_name: e.data.data.pageData[0].pickup_name, + sto_sele_id: e.data.data.pageData[0].pickup_id, + sto_sele_distr: e.data.data.pageData[0].distr_type + }); + th.data.fir_def_store = e.data.data.pageData[0]; + } + + //-- 如果有默认选择门店的时候，要把默认门店放在第一位，修改不要配送方式的判断 -- + if (th.data.def_pick_store && JSON.stringify(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({ all_pick_list: e.data.data.pageData }); + + setTimeout(function () { + + self.deal_pickup(e, th, os); //--普通门店排版-- + }, 800) + + } + }) + }, 200) + + }, + //---点击二级之后的选择--- + choose_for_store: function (e) { + var index_c = e.currentTarget.dataset.ind; + var th = this; + th.setData({ + sec_pick_index: index_c, + fir_pick_index: index_c + }) + + }, + choose_for_store_fir: function (e) { + console.log(e); + var index_c = e.currentTarget.dataset.ind; + var th = this; + th.setData({ + fir_pick_index: index_c + }) + + }, + close_popup() { + this.setData({ + store: 0, + keyword:'' + }) + }, + //选择更多门店 + more_store: function () { + this.setData({ + sort_store: 1 + }); + }, + // 返回按钮 + returns: function () { + this.setData({ + sort_store: 0, + choice_sort_store: 0 + }); + }, + //---选择分类门店--- + 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_i: index, + sec_sto: item, + sec_pick_index: 0 + }); + }, + //------------处理门店--------------- + deal_pickup(e, th, os) { + // if (!th.data.sele_g) return false + wx.hideLoading(); + //单总量超出10个的时候，同时门店有分类 + if (e.data.data.total > 10 && e.his_cate_num) { + getApp().request.get("/api/weshop/storagecategory/page", { + data: { + store_id: os.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 == sto_arr.length) break; + def_arr.push(sto_arr[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); + } + + var sd = { + all_sto: newarr, + is_show_sto_cat: 1 + } + if (!sto_arr || sto_arr.length <= 10) { + sd.is_show_sto_cat = -1; + sd.only_pk = sto_arr; + } + th.setData(sd); + + } else { + th.setData({ + is_show_sto_cat: -1, + only_pk: e.data.data.pageData + }); + //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------ + if (!th.data.def_pick_store) { + th.setData({ + def_pick_store: e.data.data.pageData[0], + sto_sele_name: e.data.data.pageData[0].pickup_name, + sto_sele_id: e.data.data.pageData[0].pickup_id, + sto_sele_distr: e.data.data.pageData[0].distr_type + }) + } + } + } else { + th.setData({ + is_show_sto_cat: -1, + only_pk: e.data.data.pageData + }); + //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------ + if (!th.data.def_pick_store) { + th.setData({ + def_pick_store: e.data.data.pageData[0], + sto_sele_name: e.data.data.pageData[0].pickup_name, + sto_sele_id: e.data.data.pageData[0].pickup_id, + sto_sele_distr: e.data.data.pageData[0].distr_type + }) + } + + } + } + }); + } else { + th.setData({ + is_show_sto_cat: 0, + only_pk: e.data.data.pageData + }); + //-----如果没有默认门店，要取第一个门店作为默认店------ + if (!th.data.def_pick_store && th.data.bconfig && th.data.bconfig.is_sort_storage) { + th.setData({ + def_pick_store: e.data.data.pageData[0], + sto_sele_name: e.data.data.pageData[0].pickup_name, + sto_sele_id: e.data.data.pageData[0].pickup_id, + sto_sele_distr: e.data.data.pageData[0].distr_type + }) + } + } + }, + + check_def_pk: function () { + let th = this + th.data.def_pick_store.is_no_dis = 0; + var def_pick_store = th.data.def_pick_store + var sele_g = th.data.sele_g; + var arr = sele_g.pickup_list.split(','); + + var idx = arr.findIndex(function (e) { + return e == def_pick_store.pickup_id; + }) + + if (idx == -1) { + def_pick_store.is_no_dis = 1; + } + th.setData({ def_pick_store }) + + }, + //获取搜索门店输入的值 + input_store: function (e) { + this.setData({ + keyword: e.detail.value + }) + }, + //搜索门店 + searchfn() { + let choice_sort_store = this.data.choice_sort_store + if (choice_sort_store == 0) { //全局搜索 + let all_pick_list = this.data.all_pick_list + let def_pickpu_list = this.data.def_pickpu_list + let keyword = this.data.keyword + if (keyword) { + let arr = all_pick_list.filter(item => { + let i = item.pickup_name.indexOf(keyword) + if (i > -1) { + return true + } else { + return false + } + }) + if (arr && arr.length > 0) { + if (this.data.is_show_sto_cat == 1) { + this.setData({ + def_pickpu_list: arr + }) + } else { + this.setData({ + only_pk: arr + }) + } + } else { + wx.showToast({ + title: '没有搜索到门店', + icon: 'none', + duration: 2000 + }) + } + } else { + if (this.data.is_show_sto_cat == 1) { + this.setData({ + def_pickpu_list: all_pick_list.slice(0, 10) + }) + } else { + this.setData({ + only_pk: all_pick_list + }) + } + + } + } else { //分类下搜索 + let sec_i = this.data.sec_i + let all_sto = this.data.all_sto + let old_all_sto = this.data.old_all_sto + if (!old_all_sto) { + this.setData({ + old_all_sto:JSON.parse(JSON.stringify(all_sto)) + }) + } + let sec_sto = this.data.sec_sto + let sec_arr = this.data.old_all_sto[sec_i].s_arr + let keyword = this.data.keyword + let text = 'sec_sto.s_arr' + if (keyword) { + let arr = sec_arr.filter(item => { + let i = item.pickup_name.indexOf(keyword) + if (i > -1) { + return true + } else { + return false + } + }) + if (arr && arr.length > 0) { + this.setData({ + [text]: arr + }) + } else { + wx.showToast({ + title: '没有搜索到门店', + icon: 'none', + duration: 2000 + }) + } + } else { + if (this.data.old_all_sto) { + this.setData({ + [text]: this.data.old_all_sto[sec_i].s_arr + }) + }else{ + this.setData({ + [text]: all_sto[sec_i].s_arr + }) + } + } + + + } + }, + //确定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; + + // if (!th.data.sele_g) return false; + + + + this.triggerEvent('callback', item) + + th.setData({ + def_pick_store: item, + 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, + openSpecModal: !0, + }); + + + }, + } +}) diff --git a/components/store_popup/store_popup.json b/components/store_popup/store_popup.json new file mode 100644 index 0000000..e8cfaaf --- /dev/null +++ b/components/store_popup/store_popup.json @@ -0,0 +1,4 @@ +{ + "component": true, + "usingComponents": {} +} \ No newline at end of file diff --git a/components/store_popup/store_popup.wxml b/components/store_popup/store_popup.wxml new file mode 100644 index 0000000..ce8d633 --- /dev/null +++ b/components/store_popup/store_popup.wxml @@ -0,0 +1,147 @@ + + + + + + + + + {{choice_sort_store==0?'附近的门店':region_name}} + + + + + + {{choice_sort_store==0?'更多门店':'返回'}} + + + + + + + 搜索 + + + + + + + + + + + + + Г + + + + + + + + {{item.pickup_name}} + + + + 距离：{{ item.distance>1000 ? filter.toFix(item.distance/1000,2)+'km' : filter.toFix(item.distance,0)+"m"}} + + + + 地址:{{item.fulladdress}} + + + + + + + + + + Г + + + + + + + + {{item.pickup_name}} + + + + 距离：{{ item.distance>1000 ? filter.toFix(item.distance/1000,2)+"km" : filter.toFix(item.distance,0)+"m"}} + + + + 地址:{{item.fulladdress}} + + + + + + + + + + + + Г + + + + + + + + {{item.pickup_name}} + + + + 距离：{{item.distance>1000?filter.toFix(item.distance/1000,2)+"km":filter.toFix(item.distance,0)+"m"}} + + + + 地址:{{item.fulladdress}} + + + + + + + + + + 确定 + + + + + + + + 门店分类选择 + + + + + + 返回 + + + + + + + {{item.name}} + + + + + + + + + diff --git a/components/store_popup/store_popup.wxss b/components/store_popup/store_popup.wxss new file mode 100644 index 0000000..5b8dfd9 --- /dev/null +++ b/components/store_popup/store_popup.wxss @@ -0,0 +1,283 @@ +/* 中间等距两边贴边 */ +.flex-space-between{ + display: flex; + justify-content:space-between; +} +.flex{display: flex} +/* 垂直居中 */ +.flex-vertical{ + display:flex; + align-items:center; + } + /* 圆 */ +.circle{ + border-radius: 50%; + -moz-border-radius: 50%; + -webkit-border-radius: 50%; +} +/* 7.26 */ +.white{ + color: #fff; +} +.red-b{ + background: #d60021; +} +.fs20{ + font-size: 20rpx; +} +.xc-ash{ + color: #b9b9b9; + } +/* 水平垂直 */ +.flex-center{ + display:flex; + justify-content:center; + align-items:center; + } +/* 垂直居中 中间等距两边贴边 7.13*/ +.flex-vertical-between{ + display:flex; + align-items:center; + justify-content:space-between; + } + .xc-ash{ + color: #b9b9b9; + } + .fs30{ + font-size:30rpx; +} +.xc-black3{ + color: #333; +} + .fs28{ + font-size: 28rpx; +} + .fs32{ + font-size:32rpx; +} +.fs26{ + font-size: 26rpx; +} +.red-co{ + color: #d60021; + +} +/* 门店分类列表 */ +.sort_store_list { + max-height: 700rpx; + overflow: hidden; + overflow-y: scroll; + width: 95%; + margin: auto; +} + +.sort_store_list .sort-store-frame { + width: 100%; + height: 100rpx; + line-height: 100rpx; + border-bottom: 1rpx solid #eee; + +} + +.sort_store_list .sort-store-frame .sort-store { + width: 94.5%; + margin: auto; +} +.black_rights-frame { + width: 50%； +} +.black_rights-frame .black_rights { + border-top: 3rpx solid; + border-right: 3rpx solid; + transform: rotate(45deg); + display: inline-block; + width: 20rpx; + height: 20rpx; +} +/* 选择门店的弹窗 */ +.mongolia-layer { + position: fixed; + left: 0; + top: 0; + right: 0; + bottom: 0; + z-index: 11; + background: rgba(0, 0, 0, 0.4); + width: 100%; + height: 91.9%; + +} + +.popup-frame { + position: fixed; + z-index: 20; + background: white; + width: 100%; + border-radius: 20rpx 20rpx 0 0; + height: auto; + bottom: 0; +} + +.popup-top { + border-bottom: 1rpx solid #eee; + height: 155rpx; + width: 95%; + margin: auto; + line-height: 155rpx; + +} +.fs32{ + font-size: 32rpx; +} +.nearby_store { + margin-left: 17rpx; +} +.modal-closes { + position: absolute; + right: 30rpx; + top: -15rpx; + height: 25rpx; + +} +.choose_mores { + margin-top: 30rpx; + margin-right: 15rpx; + +} +.choose_more { + margin-top: 40rpx; + margin-right: 20rpx; + +} +.bg_rights { + border-top: 2rpx solid; + border-right: 2rpx solid; + transform: rotate(45deg); + display: inline-block; + width: 15rpx; + height: 15rpx; + border-color: #da0b31; +} +.searchbar { + height: 95rpx; + border-bottom: 2rpx solid rgb(238, 238, 238); +} +.storeListpadd { + padding: 0rpx 31rpx; +} +.search { + width: 125rpx; + height: 45rpx; + line-height: 45rpx; + background-color: rgb(219, 27, 52); + border-radius: 30rpx; + color: rgb(255, 255, 255); +} +.inputstore { + width: 510rpx; + height: 43rpx; + line-height: 43rpx; + border-radius: 30rpx; + border: 2rpx solid rgb(238, 238, 238); + padding-left: 30rpx; +} + +.store-list { + width: 95%; + min-height: 300rpx; + overflow-y: scroll; + margin: auto; + max-height: 610rpx; +} +.store-list .store_choose { + width: 100%; + height: 120rpx; + line-height: 125rpx; + border-bottom: 1rpx solid #eee; + padding: 10rpx 0; +} + +.store-list .store_choose .store { + width: 100%; + margin: auto; + line-height: 37rpx; + padding-left: 20rpx; + +} +.xc-hook { + width: 35rpx; + height: 35rpx; + transform: rotate(-145deg); + line-height: 37rpx; + text-align: center; +} +.address-frame { + width: 93%; + margin-left: 7rpx; + +} +.address_name { + margin-right: 10rpx; + width: 360rpx; + +} +.fs24{ + font-size: 24rpx !important; +} +.xc-ash-9f{ + color: #9fa1a0; + +} +.t-c { + text-align: center; +} +.distance { + padding-left: 20rpx; + padding-right: 20rpx; + background: #eee; + border-radius: 20rpx; + /* margin-right: 5rpx; */ + color: #999; + height: 38rpx; + line-height: 38rpx; + position: relative; + top: 5rpx; + +} +.address-val { + height: 38rpx; + line-height: 38rpx; + +} +.butttem5 { + margin-bottom: 5rpx; +} +.store-bottom-frame { + width: 95%; + margin: auto; + +} +.store-bottom { + width: 85%; + margin: auto; + height: 90rpx; +} +.determine { + width: 260rpx; + height: 55rpx; + border-radius: 50rpx; + line-height: 55rpx; +} + +.default { + width: 260rpx; + height: 55rpx; + border: 3rpx solid #c8c8c8; + border-radius: 50rpx; + line-height: 55rpx; +} +.xc-hooks { + width: 30rpx; + height: 30rpx; + border: 1rpx solid #999; +} \ No newline at end of file diff --git a/packageA/pages/cart2_ser/cart2_ser.js b/packageA/pages/cart2_ser/cart2_ser.js index 6cd7c92..7a22e7b 100644 --- a/packageA/pages/cart2_ser/cart2_ser.js +++ b/packageA/pages/cart2_ser/cart2_ser.js @@ -510,6 +510,9 @@ Page({ 'pickup_id': gg.pick_id, 'pickup_keyid': list[i].keyid, }; + if(gg.is_pd_normal){ + goods.is_pd_normal=1; + } } if(getApp().globalData.skinface_id){ @@ -562,6 +565,11 @@ Page({ goods.skinface_id=getApp().globalData.skinface_id; } + if(this.data.postdata && this.data.postdata.is_pd_normal==1){ + goods.is_pd_normal=1; + } + + //--导购分享过来的id-- if (gg.guide_id) { goods.guide_id = gg.guide_id; diff --git a/packageA/pages/checkin/checkin.js b/packageA/pages/checkin/checkin.js index f910db6..b96f7b7 100644 --- a/packageA/pages/checkin/checkin.js +++ b/packageA/pages/checkin/checkin.js @@ -2,405 +2,431 @@ var md5 = require("../../../utils/md5.js"); var ut = require("../../../utils/util.js"); const app = getApp(); -const os=app.globalData.setting; +const os = app.globalData.setting; let self; Page({ - /** - * 页面的初始数据 - */ - data: { - year: '', - month: '', - day: '', - weekArr: ['日', '一', '二', '三', '四', '五', '六'], - dateArr: [], - n_dateArr:[], //本月的日期 - s_dateArr:[], //上月的日期 - - firstDay: '', - lastDay: '', - param: null, - clockNum: 3, - - res: null, - isShowRules: false, - isCheckIn: false, - checkInDays: 0, //连续签到天数 - integral: 0, //积分 - checkInNums: 0, //补签次数 - isCheckInDay: '', - - flag: true, - isLogin: false, - imgUrl: app.globalData.setting.imghost, - show_no_integral:false - - }, - - loadQd(callback) { - app.request.get('/api/weshop/qdrecord/getUser/'+ app.globalData.setting.stoid + '/' + app.globalData.user_id, { - success: function (res) { - if(res.data.code==0){ - if(callback) callback(); - self.setData({ - res: res.data.data - }); - self.loadCheckedRecord(); - }else{ - if(res.data.msg.indexOf('未开启签到')!=-1){ - self.setData({ show_no_integral: true }); - }else{ - wx.showToast({ - title: res.data.msg, - icon: 'none', - duration: 2000 - }) - } - - } - }, - }); - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function(options) { - console.log('执行onload'); - self = this; - this.getDate(); - this.setDate(); - var res = wx.getSystemInfoSync(); - this.setData({ - param: res.windowHeight / 12, - }) - - // 判断会员是否授权登录， - // 没有登录则跳转到登录页， - // 已登录则设置已登录状态，请求加载签到数据 - this.isLogin().then(function() { - self.setData({ - isLogin: true - }); - self.loadQd(); - }); - - // 广告 - getApp().request.promiseGet("/api/weshop/ad/page?pid=1205&store_id=" + os.stoid, { - data: { - enabled: 1 - } - }).then(res => { - if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ - var a = res.data.data.pageData; - var narr=[]; - for(var i in a){ - var tt = { - 'ad_code': os.imghost + a[i].ad_code, - 'media_link': '', - 'ad_weapplink':a[i].ad_weapplink - }; - narr.push(tt); - } - self.setData({ad_data:narr}); - } - }); - - - }, - - onShow() { - if(app.globalData.userInfo instanceof Object) { - if(this.data.isLogin) { - return; - } else { - this.setData({ - isLogin: true - }); - this.loadQd(); - }; - } - }, - - onHide() { - console.log('执行onHide'); - }, - - // 是否登录 - isLogin() { - return new Promise(function(resolve, reject) { - let user_info = getApp().globalData.userInfo; - if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { - wx.navigateTo({ - url: '/packageE/pages/togoin/togoin', - }) - return false; - } else { - resolve(); - }; - }); - }, - - // 点击"我的积分"和"去购物"进行跳转 - goto(e) { - let url = e.target.dataset.url; - app.goto(url); - }, - - // 点击显示签到规则 - showRules() { - if(this.data.isShowRules) { - this.setData({ - isShowRules: false - }); - } else { - this.setData({ - isShowRules: true - }); - } - }, - - - // 加载签到记录 - loadCheckedRecord() { - let newDateArr=[]; - let list; - let bqlist; - //--判断什么日子是签到的,上个月的-- - if(this.data.res && this.data.res.qdsdaylist) { - list = this.data.res.qdsdaylist.split(','); - for(var i in this.data.s_dateArr){ - var item=this.data.s_dateArr[i]; - if(this.check_is_qd(item,list)){ - item.isCheckIn = true; - }else{ - item.isCheckIn = false; - } - } - } - newDateArr=newDateArr.concat(this.data.s_dateArr); - //--判断什么日子是签到的，这个月的-- - if(this.data.res && this.data.res.qddaylist) { - list = this.data.res.qddaylist.split(','); - for(var i in this.data.n_dateArr){ - var item=this.data.n_dateArr[i]; - if(this.check_is_qd(item,list)){ - item.isCheckIn = true; - }else{ - item.isCheckIn = false; - } - } - } - newDateArr=newDateArr.concat(this.data.n_dateArr); - - //--判断什么日子是要补签的-- - if(this.data.res && this.data.res.curbqdaynum) { - bqlist = this.data.res.curbqdaynum.split(','); - for(var i in newDateArr){ - var item=newDateArr[i]; - if(this.check_is_bq(item,bqlist)){ - item.isBq = true; - }else{ - item.isBq = false; - } - } - } - this.setData({ - dateArr: newDateArr - }); - }, - - - //判断是不是同一个日期，签到的 - check_is_qd(item,bqlist){ - for(var i in bqlist){ - var c_item=JSON.parse(JSON.stringify(item)); - if(c_item.num<10) c_item.num="0"+c_item.num; - if(c_item.num==bqlist[i]){ - return true; - } - } - return false; - }, - - //判断是不是同一个日期,补签到的 - check_is_bq(item,bqlist){ - for(var i in bqlist){ - if(item.date==bqlist[i]){ - return true; - } - } - return false; - }, - - // 点击签到 - checkInToday() { - const self = this; - // 获取今天的签到状态 - //let isCheckInToday = this.data.dateArr[this.data.day-1].isCheckIn; - var ck=this.data.day; - if(parseInt(ck)<10) ck="0"+ck; - var isCheckInToday=this.data.res.qddaylist.indexOf(ck); - - // 如果还没签到, 可以点击签到 - if(isCheckInToday==-1) { - - var timeid=ut.gettimestamp(); - var key = "rgqsqLYhw67sgaIQBF6dw9JK7CDKSS"; - var str= app.globalData.setting.stoid+":"+app.globalData.user_id+":"+timeid+":"+key - var sign=md5(str); - - app.request.promisePost('/api/weshop/qdrecord/saveQd', { - data: { - store_id: app.globalData.setting.stoid, - user_id: app.globalData.user_id, - timeid:timeid, - sign:sign - } - }).then(res => { - // 改变签到状态,由false置为true - // let newDateArr = self.data.dateArr; - // newDateArr[self.data.day-1].isCheckIn = true; - - for(var i in self.data.dateArr) { - self.data.dateArr[i].isCheckIn=false; - self.data.dateArr[i].isBq=false; - } - self.setData({ - dateArr: self.data.dateArr - }); - - self.loadQd(function() { - wx.showToast({ - title: self.data.res.qdintro, - icon: 'none', - duration: 1500, - success: function() { - - } - }); - }); - - }) - } - }, - - - // 补签 - reCheckIn() { - var self = this; - // var i = 0; - console.log('补签~'); - if(this.data.flag) { - this.data.flag = false; - app.request.promisePost('/api/weshop/qdrecord/saveBQd', { - data: { - store_id: app.globalData.setting.stoid, - user_id: app.globalData.user_id, - daynum: self.data.res.getBQIntegral1, - bqnum: self.data.res.getbqnum2, - bqintegral: self.data.res.getBQIntegral, - } - }).then(res => { - // 改变签到状态,由false置为true - // let newDateArr = self.data.dateArr; - // newDateArr[self.data.day-1].isCheckIn = true; - //var bqlist = self.data.res.curbqdaynum.split(',').sort(); - //var list = []; - /*-- - for(let item of bqlist) { - var date = new Date(item); - list.push(date.getDate()); - }--*/ - - for(var i in self.data.dateArr) { - self.data.dateArr[i].isCheckIn=false; - self.data.dateArr[i].isBq=false; - } - self.setData({ - dateArr: self.data.dateArr - }); - self.loadQd(function() { - self.data.flag = true; - wx.showToast({ - title: '补签成功', - icon: 'success', - duration: 1500, - success: function() { - - } - }); - }); - }) - } - }, - - getDate: function() { //获取当月日期 - var mydate = new Date(); - var year = mydate.getFullYear(); - var month = mydate.getMonth(); //0~11: 一月至十二月 - var months = month + 1; //1~12：一月至十二月 - this.data.year = year; - this.data.month = months; - this.data.day = mydate.getDate(); //获取当月日期: 1~31 - var fist = new Date(year, month, 1); - this.data.firstDay = fist.getDay(); //获取当月第一天 - var last = new Date(year, months, 0); //0表示当月最后一天 - this.data.lastDay = last.getDate(); //获取当月最后一天 - - this.setData({ - year: this.data.year, - month: this.data.month, - day: this.data.day, - firstDay: this.data.firstDay, - lastDay: this.data.lastDay, - fist:fist - }) - console.log("今天：" + this.data.day); - }, - - setDate: function() { - var day; - for(var i=0;i { + if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length > 0) { + var a = res.data.data.pageData; + var narr = []; + for (var i in a) { + var tt = { + 'ad_code': os.imghost + a[i].ad_code, + 'media_link': '', + 'ad_weapplink': a[i].ad_weapplink + }; + narr.push(tt); + } + self.setData({ ad_data: narr }); + } + }); + + + }, + + onShow() { + if (app.globalData.userInfo instanceof Object) { + if (this.data.isLogin) { + return; + } else { + this.setData({ + isLogin: true + }); + this.loadQd(); + }; + } + }, + + onHide() { + console.log('执行onHide'); + }, + + // 是否登录 + isLogin() { + return new Promise(function (resolve, reject) { + let user_info = getApp().globalData.userInfo; + if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { + wx.navigateTo({ + url: '/packageE/pages/togoin/togoin', + }) + return false; + } else { + resolve(); + }; + }); + }, + + // 点击"我的积分"和"去购物"进行跳转 + goto(e) { + let url = e.target.dataset.url; + app.goto(url); + }, + + // 点击显示签到规则 + showRules() { + if (this.data.isShowRules) { + this.setData({ + isShowRules: false + }); + } else { + this.setData({ + isShowRules: true + }); + } + }, + + + // 加载签到记录 + loadCheckedRecord() { + let newDateArr = []; + let list; + let bqlist; + //--判断什么日子是签到的,上个月的-- + if (this.data.res && this.data.res.qdsdaylist) { + list = this.data.res.qdsdaylist.split(','); + for (var i in this.data.s_dateArr) { + var item = this.data.s_dateArr[i]; + if (this.check_is_qd(item, list)) { + item.isCheckIn = true; + } else { + item.isCheckIn = false; + } + } + } + newDateArr = newDateArr.concat(this.data.s_dateArr); + //--判断什么日子是签到的，这个月的-- + if (this.data.res && this.data.res.qddaylist) { + list = this.data.res.qddaylist.split(','); + for (var i in this.data.n_dateArr) { + var item = this.data.n_dateArr[i]; + if (this.check_is_qd(item, list)) { + item.isCheckIn = true; + } else { + item.isCheckIn = false; + } + } + } + newDateArr = newDateArr.concat(this.data.n_dateArr); + + //--判断什么日子是要补签的-- + if (this.data.res && this.data.res.curbqdaynum) { + bqlist = this.data.res.curbqdaynum.split(','); + for (var i in newDateArr) { + var item = newDateArr[i]; + if (this.check_is_bq(item, bqlist)) { + item.isBq = true; + } else { + item.isBq = false; + } + } + } + this.setData({ + dateArr: newDateArr + }); + }, + + + //判断是不是同一个日期，签到的 + check_is_qd(item, bqlist) { + for (var i in bqlist) { + var c_item = JSON.parse(JSON.stringify(item)); + if (c_item.num < 10) c_item.num = "0" + c_item.num; + if (c_item.num == bqlist[i]) { + return true; + } + } + return false; + }, + + //判断是不是同一个日期,补签到的 + check_is_bq(item, bqlist) { + for (var i in bqlist) { + if (item.date == bqlist[i]) { + return true; + } + } + return false; + }, + + // 点击签到 + checkInToday() { + const self = this; + + getApp().request.get("/api/weshop/users/getServerTime", { + success: function (res) { + if (res.data.code == 0) { + var getnowtime = res.data.data; + if (!getnowtime) { + getApp().showWarning("获取服务时间失败"); + return; + } else { + // 获取今天的签到状态 + //let isCheckInToday = this.data.dateArr[this.data.day-1].isCheckIn; + var ck = self.data.day; + if (parseInt(ck) < 10) ck = "0" + ck; + var isCheckInToday = self.data.res.qddaylist.indexOf(ck); + + // 如果还没签到, 可以点击签到 + if (isCheckInToday == -1) { + + var timeid = Date.parse(getnowtime)/1000; + var key = "rgqsqLYhw67sgaIQBF6dw9JK7CDKSS"; + var str = app.globalData.setting.stoid + ":" + app.globalData.user_id + ":" + timeid + ":" + key + var sign = md5(str); + + app.request.promisePost('/api/weshop/qdrecord/saveQd', { + data: { + store_id: app.globalData.setting.stoid, + user_id: app.globalData.user_id, + timeid: timeid, + sign: sign + } + }).then(res2 => { + // 改变签到状态,由false置为true + // let newDateArr = self.data.dateArr; + // newDateArr[self.data.day-1].isCheckIn = true; + if (res2.data.code == 0) { + for (var i in self.data.dateArr) { + self.data.dateArr[i].isCheckIn = false; + self.data.dateArr[i].isBq = false; + } + self.setData({ + dateArr: self.data.dateArr + }); + + self.loadQd(function () { + wx.showToast({ + title: self.data.res.qdintro, + icon: 'none', + duration: 1500, + success: function () { + + } + }); + }); + } else { + getApp().showWarning(res2.data.msg); + } + + + + }) + } + } + + } else { + getApp().showWarning(res.data.msg); + } + } + }) + + }, + + + // 补签 + reCheckIn() { + var self = this; + // var i = 0; + console.log('补签~'); + if (this.data.flag) { + this.data.flag = false; + app.request.promisePost('/api/weshop/qdrecord/saveBQd', { + data: { + store_id: app.globalData.setting.stoid, + user_id: app.globalData.user_id, + daynum: self.data.res.getBQIntegral1, + bqnum: self.data.res.getbqnum2, + bqintegral: self.data.res.getBQIntegral, + } + }).then(res => { + // 改变签到状态,由false置为true + // let newDateArr = self.data.dateArr; + // newDateArr[self.data.day-1].isCheckIn = true; + //var bqlist = self.data.res.curbqdaynum.split(',').sort(); + //var list = []; + /*-- + for(let item of bqlist) { + var date = new Date(item); + list.push(date.getDate()); + }--*/ + if (res.data.code == 0) { + for (var i in self.data.dateArr) { + self.data.dateArr[i].isCheckIn = false; + self.data.dateArr[i].isBq = false; + } + self.setData({ + dateArr: self.data.dateArr + }); + self.loadQd(function () { + self.data.flag = true; + wx.showToast({ + title: '补签成功', + icon: 'success', + duration: 1500, + success: function () { + + } + }); + }); + } else { + getApp().showWarning(res.data.msg); + } + + }) + } + }, + + getDate: function () { //获取当月日期 + var mydate = new Date(); + var year = mydate.getFullYear(); + var month = mydate.getMonth(); //0~11: 一月至十二月 + var months = month + 1; //1~12：一月至十二月 + this.data.year = year; + this.data.month = months; + this.data.day = mydate.getDate(); //获取当月日期: 1~31 + var fist = new Date(year, month, 1); + this.data.firstDay = fist.getDay(); //获取当月第一天 + var last = new Date(year, months, 0); //0表示当月最后一天 + this.data.lastDay = last.getDate(); //获取当月最后一天 + + this.setData({ + year: this.data.year, + month: this.data.month, + day: this.data.day, + firstDay: this.data.firstDay, + lastDay: this.data.lastDay, + fist: fist + }) + console.log("今天：" + this.data.day); + }, + + setDate: function () { + var day; + for (var i = 0; i < this.data.firstDay; i++) { + //获取前几天的时间数组 + var arr_d = this.getNextDate(this.data.fist, i - this.data.firstDay) + day = { num: arr_d[1], date: arr_d[0] }; + this.data.s_dateArr.push(day); + } + + for (var i = 1; i < this.data.lastDay + 1; i++) { + var date = this.data.month + ""; + if (this.data.month < 10) date = "0" + date; + if (i < 10) { + date = date + "-0" + i; + } else { + date = date + "-" + i; + } + day = { num: i, date: date }; + this.data.n_dateArr.push(day); + } + }, + + //获取相隔是多少天的日期 + getNextDate(date, day) { + var dd = date; + dd.setDate(dd.getDate() + day); + //var y = dd.getFullYear(); + var m = dd.getMonth() + 1 < 10 ? "0" + (dd.getMonth() + 1) : dd.getMonth() + 1; + var d = dd.getDate() < 10 ? "0" + dd.getDate() : dd.getDate(); + //return y + "-" + m + "-" + d; + return [m + "-" + d, dd.getDate()]; + }, + go_url(e) { + let url = e.currentTarget.dataset.url; + if (url) { + getApp().goto(url); + } + }, + + back_to() { + wx.navigateBack(); + } }) diff --git a/packageA/pages/details_serviceCard/details_serviceCard.js b/packageA/pages/details_serviceCard/details_serviceCard.js index d8ea6ed..99312e5 100644 --- a/packageA/pages/details_serviceCard/details_serviceCard.js +++ b/packageA/pages/details_serviceCard/details_serviceCard.js @@ -4,6 +4,7 @@ const app = getApp(); const os = app.globalData.setting; let self = null; var util = require('../../../utils/util.js'); +const ut = require("../../../utils/util.js"); Page({ @@ -70,8 +71,13 @@ Page({ }).then(res => { if (res.data.code == 0) { // console.log('请求成功', res); + var dd=res.data.data.pageData[0]; + dd.prom_type=dd.list[0].prom_type; + dd.pt_status=dd.list[0].pt_status; + dd.pt_tail_money=dd.list[0].pt_tail_money; + this.setData({ - details: res.data.data.pageData[0], + details: dd, }); } else { throw (res); @@ -306,6 +312,9 @@ Page({ var card_id = details.list[i].card_id; var prom_type = details.list[i].prom_type > 0 ? details.list[i].prom_type : 0; var is_pd_normal = details.list[i].is_pd_normal; + if(is_pd_normal){ + newd['is_pd_normal'] = 1; + } // 库存 var redisNums = 0; // 限购数 @@ -356,6 +365,12 @@ Page({ } + if(prom_type==6){ + wx.showModal({ + title: details.list[i].service_name +"拼团商品不加入购物车\n" + }); + return false; + } //----先看会员在购物车中是否加入了该商品----- app.request.get("/api/weshop/cartService/page", { @@ -499,7 +514,7 @@ Page({ // 立即支付 - pay() { + async pay() { if(this.data.is_summit_ing) return false; this.data.is_summit_ing=1; @@ -508,54 +523,218 @@ Page({ let order_sn = this.data.details.order_sn; let order_id = this.data.details.order_id; let store_id = app.globalData.setting.stoid; - t_pay.set_pay_url("/api/weshop/order/pay/createRechargeOrder"); - t_pay.pay({ - parentSn: order_sn, - store_id: store_id - }, function () { - app.showWarning('支付成功'); - setTimeout(function() { - wx.reLaunch({ - url: "/pages/payment/pay_success/pay_success?card=1&order_id=" + order_id, - }) - }, 1000) - - }, function (e) { - th.data.is_summit_ing=0; - wx.showToast({ - title: e, - icon: 'none', - duration: 2000 - }); - }) - // app.request.post('/api/weshop/order/pay/createRechargeOrder', { - // data: { - // parentSn: order_sn, - // store_id: store_id, - // }, - // - // success: function(res) { - // var n = res.data.data; - // self.weixinPay(n, function() { - // app.showWarning('支付成功'); - // // setTimeout(function() { - // // wx.reLaunch({ - // // url: "/pages/payment/pay_success/pay_success?card=1&order_id=" + order_id, - // // }) - // // }, 1000) - // }, function() { - // app.showWarning('支付失败'); - // // setTimeout(function() { - // // wx.reLaunch({ - // // url: '/packageA/pages/cardList/cardList', - // // }) - // // }, 1000) - // }); - // } - // }) - }, + let user_id = os.user_id; + + let flag = true; + // 如果是普通购买或单独购买，不用判断 + // 如果是秒杀购买：1、判断活动是否变化；2、是否超出限购 + let list = this.data.details.list; + var pt_act=null; //-- 拼团活动的优化 -- + //秒杀活动和拼团活动要重新计算一下 + for (const it of list) { + if (it.prom_type == 1) { + let act_details = null; + let redis_num = 0; + let promcardbuynum = 0; + let qty = it.qty; + + await getApp().request.promiseGet('/api/ms/flash_sale/getNew/' + store_id + '/' + user_id + '/' + it.prom_id, {}).then(res => { + console.log('11111111====>>>'); + if (res.data.code == 0) { + console.log('当前的秒杀活动信息：', res.data.data); + act_details = res.data.data; + if (act_details.is_end == 1) { + wx.showModal({ + title: '提示', + content: '活动已结束,无法支付,请取消订单！', + showCancel: false, + }); + flag = false; + return false; + }; + if (act_details.id != it.prom_id) { + wx.showModal({ + title: '提示', + content: '活动发生了变化,无法支付,请取消订单,重新购买！', + showCancel: false, + }); + flag = false; + return false; + }; + + + var t_now = ut.gettimestamp(); + if (act_details.is_end == 0 && act_details.start_time < t_now && act_details.end_time > t_now) { + wx.showModal({ + title: '提示', + content: '活动发生了变化,无法支付,请取消订单,重新购买！', + showCancel: false, + }); + flag = false; + return false; + } + + }; + }); + + if(act_details.buy_limit>0 && flag){ + await getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum", { + data: { + store_id: store_id, + user_id: user_id, + card_id: it.card_id, + prom_type: it.prom_type, + prom_id: it.prom_id, + ispay:1 + } + }).then(res => { + + if (res.data.code == 0) { + promcardbuynum = res.data.data.promcardbuynum; + let canBuyNum = act_details.buy_limit - promcardbuynum; // 自己还可购买的数量c + + if (canBuyNum < qty) { + wx.showModal({ + title: '提示', + content: '您已超出活动限购数量,无法支付,请取消订单！', + showCancel: false, + }); + flag = false; + } + } + }) + } + + }; + + if (it.prom_type == 6) { + let act_details = null; + let redis_num = 0; + let promcardbuynum = 0; + let qty = it.qty; + + await getApp().request.promiseGet("/api/weshop/teamlist/get/" + store_id + "/" + it.prom_id, {}).then(res => { + + if (res.data.code == 0) { + + act_details = res.data.data; + + if (act_details.is_end == 1) { + wx.showModal({ + title: '提示', + content: '活动已结束,无法支付,请取消订单！', + showCancel: false, + }); + flag = false; + return false; + } + + if (act_details.id != it.prom_id) { + wx.showModal({ + title: '提示', + content: '活动发生了变化,无法支付,请取消订单,重新购买！', + showCancel: false, + }); + flag = false; + return false; + } + + var t_now = ut.gettimestamp(); + if (act_details.is_end == 1 || act_details.start_time > t_now || act_details.end_time < t_now) { + wx.showModal({ + title: '提示', + content: '活动发生了变化,无法支付,请取消订单,重新购买！', + showCancel: false, + }); + flag = false; + return false; + } + + }; + }); + + if(act_details.buy_limit>0){ + await getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum", { + data: { + store_id: store_id, + user_id: user_id, + card_id: it.card_id, + prom_type: it.prom_type, + prom_id: it.prom_id, + ispay:1 + } + }).then(res => { + if (res.data.code == 0) { + console.log('已经购买的数量：', res.data.data); + promcardbuynum = res.data.data.promcardbuynum; + } + }) + let limited = act_details.buy_limit; // 限购数量a + let canBuyNum = limited - promcardbuynum; // 自己还可购买的数量c + + if (canBuyNum < qty ) { + wx.showModal({ + title: '提示', + content: '您已超出活动限购数量,无法支付,请取消订单！', + showCancel: false, + }); + flag = false; + } + } + pt_act=act_details; + } + } + + if (flag) { + t_pay.set_pay_url("/api/weshop/order/pay/createRechargeOrder"); + t_pay.pay({ + parentSn: order_sn, + store_id: store_id + }, function () { + app.showWarning('支付成功'); + + if(pt_act.kttype==1){ + //--如果商家团的时候--- + getApp().request.promisePost("/api/weshop/order/pay/vipAutoTuan", { + data: {orderSn:order_sn,storeId:os.stoid } + }) + } + + setTimeout(function () { + if(pt_act){ + wx.redirectTo({ + url: "/packageA/pages/serviceCard_pd/team_success/team_success?ordersn=" + order_sn + }); + }else{ + wx.reLaunch({ + url: "/pages/payment/pay_success/pay_success?card=1&order_id=" + order_id, + }) + } + + }, 1000) + + }, function (e) { + th.data.is_summit_ing = 0; + wx.showToast({ + title: e, + icon: 'none', + duration: 2000 + }); + }) + }else{ + this.data.is_summit_ing=0; + } + + }, + + //-- 支付尾款 -- + pay2(){ + var url="/packageA/pages/serviceCard_pd/cart_wk/cart_wk?order_id="+this.data.details.order_id; + getApp().goto(url); + }, + //------调起支付框-------- weixinPay: function(n, success, fail) { if (!n) return false; diff --git a/packageA/pages/details_serviceCard/details_serviceCard.wxml b/packageA/pages/details_serviceCard/details_serviceCard.wxml index 71e61af..c9da4ae 100644 --- a/packageA/pages/details_serviceCard/details_serviceCard.wxml +++ b/packageA/pages/details_serviceCard/details_serviceCard.wxml @@ -8,8 +8,17 @@ {{item.pickup_name}} - 待支付 - 待评价 + + + 未支付 + 组团中 + 待支付尾款 + + + 待支付 + + + 待评价 已评价 已取消 已作废 @@ -39,7 +48,9 @@ - 共{{filter.count(details.list)}}件商品，合计：{{details.account}} + + 共{{filter.count(details.list)}}件商品，合计：{{filter.toFix(details.account+details.pt_tail_money,2) }} + @@ -68,14 +79,24 @@ - + - - + + + + @@ -122,7 +124,7 @@ - + 剩余支付时间: {{obj.hou}}时 @@ -143,7 +145,7 @@ 已经有 - {{ordertx.length}}人参团, 拼团成功。 + {{ordertx.length>teamlist.ct_num?ordertx.length:teamlist.ct_num}}人参团, 拼团成功。 @@ -164,8 +166,8 @@ - - @@ -196,6 +198,7 @@ + - + {{item.pickup_name}} diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss index a117d2a..e6ecb83 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss @@ -3120,6 +3120,7 @@ button.custom-service::after{ overflow-y: auto; } + .searchbar { height: 95rpx; border-bottom: 2rpx solid rgb(238, 238, 238); @@ -3143,3 +3144,7 @@ button.custom-service::after{ border: 2rpx solid rgb(238, 238, 238); padding-left: 30rpx; } +.shop_name.max{ + max-width:370rpx; flex-shrink: 0; +} + diff --git a/packageC/pages/presell/cart/cart.js b/packageC/pages/presell/cart/cart.js index b4532c5..cde6347 100644 --- a/packageC/pages/presell/cart/cart.js +++ b/packageC/pages/presell/cart/cart.js @@ -2756,13 +2756,8 @@ Page({ } //商品的普通购买 ，不要进行判断 - if ((good.prom_type == 1 || good.prom_type == 6 || good.prom_type == 4) && !good.is_gift && !good.is_collocation && !good.is_integral_normal && !good.is_pd_normal) { - if (gg.prom_type != good.prom_type) { + if ((good.prom_type == 1 || good.prom_type == 2 || good.prom_type == 4 || good.prom_type == 6 || good.prom_type == 8 || good.prom_type == 9 ) && !good.is_gift && !good.is_collocation && !good.is_integral_normal && !good.is_pd_normal) { - var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买'; - th.toast(content); - return false; - } } else { if ((gg.prom_type == 1 || gg.prom_type == 3 || gg.prom_type == 5 || gg.prom_type == 6 || gg.prom_type == 4) && !good.is_collocation && !good.is_gift && !good.is_integral_normal && !good.is_pd_normal) { diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js index 3f87ca6..5607945 100644 --- a/packageE/pages/cart/cart2/cart2.js +++ b/packageE/pages/cart/cart2/cart2.js @@ -2200,9 +2200,15 @@ Page({ newd.guide_id=fd_gd.guide_id; newd.guide_type=fd_gd.guide_type; newd.distr_type=fd_gd.distr_type; + newd.is_order_yh = fd_gd.is_order_yh; + newd.is_post_temp = fd_gd.is_post_temp; ord_goods.splice(pos+1,0,newd); th.data.old_cartlist[i].goods.splice(pos2+1,0,newd); + + var txt9 = "cartlist[" + i + "].goods"; + th.setData({ [txt9]: ord_goods }) + } } @@ -7210,6 +7216,11 @@ Page({ }); var pk_list_goods = alllist[index].goods; + + var pos=this.find_pro_last(pk_list_goods,3,this.data.gf_prom_id); + var fd_gd=pk_list_goods[pos] + + var url = "/api/weshop/cart/delGift?store_id=" + os.stoid + "&user_id=" + getApp().globalData.user_id + "&is_gift=1&pick_id=" + this.data.gift_pkid + "&prom_id=" + this.data.gf_prom_id; await getApp().request.promiseDelete(url, {}); @@ -7251,7 +7262,6 @@ Page({ uniform_exp_sum: gf_item.goodsinfo.uniform_exp_sum, goods_spec: gf_item.goodsinfo.goods_spec, goods_color: gf_item.goodsinfo.goods_color, - is_post_temp:1 //赠品暂时的是要包邮运算， 后面和主商品是不是包邮一样 }; var prom_goods_map=th.data.prom_goods_map[gf_pickup_id]; @@ -7262,6 +7272,12 @@ Page({ newd.is_xz_yh=fd.is_xz_yh; } + //赠品的优惠要和商品的一样 + if(fd_gd){ + newd.is_post_temp=fd_gd.is_post_temp; + newd.is_order_yh=fd_gd.is_order_yh; + } + //-- 如果是代发商品的时候 -- if (gf_item.goodsinfo.whsle_id) { newd.whsle_id = gf_item.goodsinfo.whsle_id; diff --git a/packageE/pages/qy/contactMe/contactMe.js b/packageE/pages/qy/contactMe/contactMe.js index 94de10d..9c12f7c 100644 --- a/packageE/pages/qy/contactMe/contactMe.js +++ b/packageE/pages/qy/contactMe/contactMe.js @@ -12,90 +12,90 @@ Page({ first_leader: '', //-- 邀请人 -- config2: null, sub: 0, - phone:'', - id:"", - openuserid:'', - skip_verify:1, - error_arr:{ - '81012':'缺失可见范围', - '81013':'UserID、部门ID、标签ID全部非法或无权限', - '40031':'不合法的UserID列表', - '0032': '不合法的UserID列表长度', - '40058':'不合法的参数', - '40063':'参数为空', - '40094':'不合法的URL', - '40096':'不合法的外部联系人userid', - '40099':'外部联系人的数量已达上限', - '40100':'此用户的外部联系人已经在转移流程中', - '40125':'无效的openuserid参数', - '41001':'缺少access_token参数', - '41009':'缺少userid参数', - '41010':'缺少url参数', - '41035':'缺少外部联系人userid参数', - "41037":'缺少「联系我」type参数', - "41038":'缺少「联系我」scene参数', - "41039":'无效的「联系我」type参数', - "41040":'无效的「联系我」scene参数', - "41041":'「联系我」使用人数超过限制', - "41042":'无效的「联系我」style参数', - "41043":'缺少「联系我」config_id参数', - "41044":'无效的「联系我」config_id参数', - "41045":'API添加「联系我」达到数量上限', - "42001":'access_token已过期', - '43009': '企业未验证主体', - '45009': '接口调用超过限制', - '45022': '应用name参数长度不符合系统限制', - '45024': '帐号数量超过上限', - '45034': 'url必须有协议头', - '46004': '指定的用户不存在', - '48001': 'API功能未授权', - '48002': 'API接口无权限调用', - '48003': '不合法的suite_id', - '48004': '授权关系无效', - '48005': 'API接口已废弃', - '48006': '接口权限被收回', - '60102': 'UserID已存在', - '670010': '负责人数量超出限制', - '81014': '标签添加成员，单次添加user或party过多', - '82001':' 指定的成员/部门/标签全部为空', - '84072': '应用未配置客服', - '84073': '客服userid不在应用配置的客服列表中', - '84074': '没有外部联系人权限', - '84075': '不合法或过期的authcode', - '84076': '缺失authcode', - '84083': '非服务人员', - '84084': '非跟进用户', - '84085': '应用已下架', - '84144': '确认者的gid不在当前服务商的通讯录中', - '84145': '确认者gid所在的企业数不能超过5个', - '84146': '确认者gid最多只能在3个企业下确认合同', - '86001': '参数 chatid 不合法', - '86003': '参数 chatid 不存在', - '86004': '参数 群名不合法', - '86005': '参数 群主不合法', - '86006': '群成员数过多或过少', - '86007': '不合法的群成员', + phone: '', + id: "", + openuserid: '', + skip_verify: 1, + error_arr: { + '81012': '缺失可见范围', + '81013': 'UserID、部门ID、标签ID全部非法或无权限', + '40031': '不合法的UserID列表', + '0032': '不合法的UserID列表长度', + '40058': '不合法的参数', + '40063': '参数为空', + '40094': '不合法的URL', + '40096': '不合法的外部联系人userid', + '40099': '外部联系人的数量已达上限', + '40100': '此用户的外部联系人已经在转移流程中', + '40125': '无效的openuserid参数', + '41001': '缺少access_token参数', + '41009': '缺少userid参数', + '41010': '缺少url参数', + '41035': '缺少外部联系人userid参数', + "41037": '缺少「联系我」type参数', + "41038": '缺少「联系我」scene参数', + "41039": '无效的「联系我」type参数', + "41040": '无效的「联系我」scene参数', + "41041": '「联系我」使用人数超过限制', + "41042": '无效的「联系我」style参数', + "41043": '缺少「联系我」config_id参数', + "41044": '无效的「联系我」config_id参数', + "41045": 'API添加「联系我」达到数量上限', + "42001": 'access_token已过期', + '43009': '企业未验证主体', + '45009': '接口调用超过限制', + '45022': '应用name参数长度不符合系统限制', + '45024': '帐号数量超过上限', + '45034': 'url必须有协议头', + '46004': '指定的用户不存在', + '48001': 'API功能未授权', + '48002': 'API接口无权限调用', + '48003': '不合法的suite_id', + '48004': '授权关系无效', + '48005': 'API接口已废弃', + '48006': '接口权限被收回', + '60102': 'UserID已存在', + '670010': '负责人数量超出限制', + '81014': '标签添加成员，单次添加user或party过多', + '82001': ' 指定的成员/部门/标签全部为空', + '84072': '应用未配置客服', + '84073': '客服userid不在应用配置的客服列表中', + '84074': '没有外部联系人权限', + '84075': '不合法或过期的authcode', + '84076': '缺失authcode', + '84083': '非服务人员', + '84084': '非跟进用户', + '84085': '应用已下架', + '84144': '确认者的gid不在当前服务商的通讯录中', + '84145': '确认者gid所在的企业数不能超过5个', + '84146': '确认者gid最多只能在3个企业下确认合同', + '86001': '参数 chatid 不合法', + '86003': '参数 chatid 不存在', + '86004': '参数 群名不合法', + '86005': '参数 群主不合法', + '86006': '群成员数过多或过少', + '86007': '不合法的群成员', }, }, onLoad: function (tt) { // tt.scene="0_0_16" if (tt && tt.scene) { - var first_leader_str = decodeURIComponent(tt.scene); - var f_arr = first_leader_str.split("_"); - // first_leader = f_arr[0] && parseFloat(f_arr[0]) > 0 ? f_arr[0] : null; - //注册门店 - // if (f_arr[1] && parseFloat(f_arr[1]) > 0) { - // getApp().globalData.store_number = f_arr[1]; + var first_leader_str = decodeURIComponent(tt.scene); + var f_arr = first_leader_str.split("_"); + // first_leader = f_arr[0] && parseFloat(f_arr[0]) > 0 ? f_arr[0] : null; + //注册门店 + // if (f_arr[1] && parseFloat(f_arr[1]) > 0) { + // getApp().globalData.store_number = f_arr[1]; // } //企业微信群id - if (f_arr && f_arr[2] && parseFloat(f_arr[2]) > 0) { + if (f_arr && f_arr[2] && parseFloat(f_arr[2]) > 0) { this.setData({ - id:f_arr[2] + id: f_arr[2] }) this.getopenuserid(f_arr[2]) - // getApp().globalData.groupchat_id = f_arr[2]; + // getApp().globalData.groupchat_id = f_arr[2]; } - + } // if (wx.getUserProfile) { // this.setData({ @@ -146,38 +146,41 @@ Page({ // }) }, - getopenuserid(id){ - let url=`/api/weshop/qyWeChat/qywxStaffcode/get/${id}` - getApp().request.promiseGet(url,{data:{}}).then(res => { + getopenuserid(id) { + let url = `/api/weshop/qyWeChat/qywxStaffcode/get/${id}` + getApp().request.promiseGet(url, { data: {} }).then(res => { console.log(res); if (res.data.code == 0) { // let resdata=JSON.parse(res.data.data); - let openuserid=res.data.data.openuserid; - let skip_verify=res.data.data.skip_verify; - this.setData({ - openuserid, - skip_verify - }) + let openuserid = res.data.data.openuserid; + let skip_verify = res.data.data.skip_verify; + this.setData({ + openuserid, + skip_verify + }) + // if (this.data.phone) { + // this.getqy() + // } } }) }, - async getqy(){ - wx.showLoading({ - title: '加载中', - mask:true - }) - let openuserid=this.data.openuserid - let skip_verify=this.data.skip_verify ? true : false + async getqy() { + // wx.showLoading({ + // title: '加载中', + // mask:true + // }) + let openuserid = this.data.openuserid + let skip_verify = this.data.skip_verify ? true : false let res = await getApp().request.promisePost(`/apib/weshop/admin/qyWeChat/qyWeChatCorpInfo/postAdminQyApi?accdb=${this.data.store.erpid}&url=externalcontact/add_contact_way`, { data: { // accdb: getApp().globalData.config.erpid, // ApiName: 'api.pos.shop.advancesum.seek', // url:'externalcontact/add_contact_way', - user:openuserid, - type:1, - scene:2, - style:1, - state:'手店_'+this.data.phone, + user: openuserid, + type: 1, + scene: 2, + style: 1, + state: '手店_' + this.data.phone, skip_verify // is_temp:true, // store_id: getApp().globalData.setting.stoid, @@ -191,21 +194,22 @@ Page({ is_json: 1 }) wx.hideLoading() - if(res.data && res.data.errcode==0){ + if (res.data && res.data.errcode == 0) { this.setData({ - qr_code:res.data.qr_code + qr_code: res.data.qr_code }) - }else{ - let errcode=res.data.errcode - let msg=errcode + this.saveqy(res.data.config_id, res.data.qr_code) + } else { + let errcode = res.data.errcode + let msg = errcode if (this.data.error_arr[errcode]) { - msg+=this.data.error_arr[errcode] + msg += this.data.error_arr[errcode] } wx.showModal({ title: '提示', - content: '获取失败,错误码:'+msg, - showCancel:false, - success (res) { + content: '获取失败,错误码:' + msg, + showCancel: false, + success(res) { if (res.confirm) { console.log('用户点击确定') } else if (res.cancel) { @@ -222,41 +226,111 @@ Page({ getphone: function (e) { //接下来写业务代码登录 console.log(e); - // return e = e.detail; if (e.code == undefined) { this.setData({ show_bind: 0 }) return app.my_warnning("登录需要授权手机号码！", 0, this); return false; } - // var sessionKey = getApp().globalData.sessionKey; - var req_data = { - js_code: e.code, - store_id: getApp().globalData.setting.stoid, - } - //-- 获取一下手机 --/api/weshop/users/getCodeMobile?store_id=1&js_code=b8451556dd98b2eebec5aa6775625bce192a68fc1a4b15b0c6bf3ed046f90da4 - getApp().request.promiseGet("/api/weshop/users/getCodeMobile", { data: req_data }).then(res => { - // console.log('手机号码'); - // console.log(res); - if (res.data.code == 0) { - let resdata=JSON.parse(res.data.data); - this.setData({ - phone:resdata.phoneNumber - }) - this.getqy() - // getApp().globalData.zc_dd = dd; - // wx.redirectTo({ - // url: "/packageA/pages/profile/profile?is_back=1" - // }) + + var that =this; + app.request.get("/api/weshop/manager/managerConfig/get", { + data: { + storeId: getApp().globalData.setting.stoid + }, + success: function (res2) { + if (res2.data.code == 0) { + var sessionKey = getApp().globalData.sessionKey; + if (res2.data.data.is_newphone == 1) { + + var req_data = { + sessionKey: sessionKey, + code: e.code, + isNewPhone: 1, + store_id: getApp().globalData.setting.stoid, + } + }else{ + var req_data = { + sessionKey: sessionKey, + encryptedData: e.encryptedData, + iv: e.iv, + store_id: getApp().globalData.setting.stoid, + } + } + + + //-- 获取一下手机 --/api/weshop/users/getCodeMobile?store_id=1&js_code=b8451556dd98b2eebec5aa6775625bce192a68fc1a4b15b0c6bf3ed046f90da4 + getApp().request.promiseGet("/api/weshop/users/getmobile", { data: req_data }).then(res => { + // console.log('手机号码'); + // console.log(res); + if (res.data.code == 0) { + let resdata = res.data.data; + that.setData({ + phone: resdata + }) + that.befgetqy() + // getApp().globalData.zc_dd = dd; + // wx.redirectTo({ + // url: "/packageA/pages/profile/profile?is_back=1" + // }) + } + }) + // var sessionKey = getApp().globalData.sessionKey; + // var openid = getApp().globalData.openid; + // var r = getApp().globalData.getu; + // this.save_the_data(r, e, sessionKey, openid) + + + } else { + return app.my_warnning("授权登入失败,请稍后再试!", 0, that); + } + }, + failStatus: function (t) { + return app.my_warnning("授权登入失败,请稍后再试!", 0, that); + }, + fail: function (t) { + return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1; } - }) + }); - // var sessionKey = getApp().globalData.sessionKey; - // var openid = getApp().globalData.openid; - // var r = getApp().globalData.getu; - // this.save_the_data(r, e, sessionKey, openid) }, + async befgetqy() { + wx.showLoading({ + title: '加载中', + mask: true + }) + let openuserid = this.data.openuserid + let res = await getApp().request.promiseGet(`/api/weshop/qyWeChat/qywxConfigList/getMobileInfo/${getApp().globalData.setting.stoid}/${openuserid}/${this.data.phone}`, { data: {} }) + console.log('获取数据库表'); + console.log(res); + if (res.data && res.data.code == 0) { + this.setData({ + qr_code: res.data.data.qrcode + }) + wx.hideLoading() + } else { + this.getqy() + } + }, + async saveqy(config_id, qrcode) { + let openuserid = this.data.openuserid + let mobile = this.data.phone + let addtime = ((Date.now()) / 1000).toFixed(0) + let req_data = { + store_id: getApp().globalData.setting.stoid, + openuserid, + config_id, + qrcode, + mobile, + addtime + } + let res = await getApp().request.promisePost(`/api/weshop/qyWeChat/qywxConfigList/save`, { + data: req_data, + // is_json: 1 + }) + // wx.hideLoading() + }, //-- 会员授权 -- bindGetUserInfo: function (ee) { diff --git a/packageE/pages/togoin/togoin.js b/packageE/pages/togoin/togoin.js index ce5910b..c0cf25d 100644 --- a/packageE/pages/togoin/togoin.js +++ b/packageE/pages/togoin/togoin.js @@ -134,7 +134,7 @@ Page({ app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => { if (res.data.code == 0) { getApp().globalData.guide_id = res.data.data.id; - getApp().globalData.guide_pick_id= res.data.data.pickup_id + getApp().globalData.guide_pick_id = res.data.data.pickup_id } }) @@ -191,93 +191,148 @@ Page({ save_the_data: async function (r, e, sessionKey, openid) { var app = getApp(), a = app, th = this; - var dd = { - oauth: "miniapp", - nickname: a.clear_word(r.nickName), - head_pic: r.avatarUrl, - sex: r.gender, - terminal: "miniapp", - sessionKey: sessionKey, - openid: openid, - encryptedData: e.encryptedData, - iv: e.iv, - store_id: getApp().globalData.setting.stoid, - }; - //--如果有邀请人的时候-- - if (th.data.first_leader) { - dd.first_leader = th.data.first_leader; - } - //-- 导购会员ID -- - if (getApp().globalData.guide_id) { - dd.guide_id = getApp().globalData.guide_id; - } - //门店的扫描识别码 - if (getApp().globalData.store_number) { - dd.SunCode = encodeURIComponent(getApp().globalData.store_number.trim()); - } + app.request.get("/api/weshop/manager/managerConfig/get", { + data: { + storeId: getApp().globalData.setting.stoid + }, + success: function (res2) { + if (res2.data.code == 0) { + if (res2.data.data.is_newphone == 1) { + var dd = { + oauth: "miniapp", + nickname: a.clear_word(r.nickName), + head_pic: r.avatarUrl, + sex: r.gender, + terminal: "miniapp", + sessionKey: sessionKey, + openid: openid, + code: e.code, + isNewPhone: 1, + store_id: getApp().globalData.setting.stoid, + }; + } else { + var dd = { + oauth: "miniapp", + nickname: a.clear_word(r.nickName), + head_pic: r.avatarUrl, + sex: r.gender, + terminal: "miniapp", + sessionKey: sessionKey, + openid: openid, + encryptedData: e.encryptedData, + iv: e.iv, + store_id: getApp().globalData.setting.stoid, + }; + } - console.log("-----会员注册的信息-------"); - console.log(dd); + //--如果有邀请人的时候-- + if (th.data.first_leader) { + dd.first_leader = th.data.first_leader; + } + //-- 导购会员ID -- + if (getApp().globalData.guide_id) { + dd.guide_id = getApp().globalData.guide_id; + } - var need_go = 0; - //如果有需要完善的信息没有完善，就需要跳转 - if (th.data.name_need_go) { need_go = 1; } - if (th.data.birth_need_go) { need_go = 1; } - if (th.data.idcard_need_go) { need_go = 1; } - if (th.data.address_need_go) { need_go = 1; } - if (th.data.pick_need_go) { need_go = 1; } - if (th.data.sex_need_go) { need_go = 1; } - if (th.data.introducer_need_go) { need_go = 1; } + //门店的扫描识别码 + if (getApp().globalData.store_number) { + dd.SunCode = encodeURIComponent(getApp().globalData.store_number.trim()); + } - if (need_go) { + console.log("-----会员注册的信息-------"); + console.log(dd); - var req_data = { - sessionKey: sessionKey, - encryptedData: e.encryptedData, - iv: e.iv, - store_id: getApp().globalData.setting.stoid, - } - //-- 获取一下手机 -- - getApp().request.promiseGet("/api/weshop/users/getmobile", { data: req_data }).then(res => { - if (res.data.code == 0) { - dd.mobile = res.data.data; - getApp().globalData.zc_dd = dd; - wx.redirectTo({ - url: "/packageA/pages/profile/profile?is_back=1" - }) - } - }) - } else { - if (th.data.is_lable_set) { - var req_data = { - sessionKey: sessionKey, - encryptedData: e.encryptedData, - iv: e.iv, - store_id: getApp().globalData.setting.stoid, - } - //-- 获取一下手机 -- - getApp().request.promiseGet("/api/weshop/users/getmobile", { data: req_data }).then(res => { - if (res.data.code == 0) { - dd.mobile = res.data.data; - getApp().globalData.zc_dd = dd; - wx.redirectTo({ - url: "/packageE/pages/user/labels/labels?pageType=1" + var need_go = 0; + //如果有需要完善的信息没有完善，就需要跳转 + if (th.data.name_need_go) { need_go = 1; } + if (th.data.birth_need_go) { need_go = 1; } + if (th.data.idcard_need_go) { need_go = 1; } + if (th.data.address_need_go) { need_go = 1; } + if (th.data.pick_need_go) { need_go = 1; } + if (th.data.sex_need_go) { need_go = 1; } + if (th.data.introducer_need_go) { need_go = 1; } + + if (need_go) { + + if (res2.data.data.is_newphone == 1) { + var req_data = { + sessionKey: sessionKey, + code: e.code, + isNewPhone: 1, + store_id: getApp().globalData.setting.stoid, + } + }else{ + var req_data = { + sessionKey: sessionKey, + encryptedData: e.encryptedData, + iv: e.iv, + store_id: getApp().globalData.setting.stoid, + } + } + //-- 获取一下手机 -- + getApp().request.promiseGet("/api/weshop/users/getmobile", { data: req_data }).then(res => { + if (res.data.code == 0) { + dd.mobile = res.data.data; + getApp().globalData.zc_dd = dd; + wx.redirectTo({ + url: "/packageA/pages/profile/profile?is_back=1" + }) + } }) + + } else { + if (th.data.is_lable_set) { + if (res2.data.data.is_newphone == 1) { + var req_data = { + sessionKey: sessionKey, + code: e.code, + isNewPhone: 1, + store_id: getApp().globalData.setting.stoid, + } + }else{ + var req_data = { + sessionKey: sessionKey, + encryptedData: e.encryptedData, + iv: e.iv, + store_id: getApp().globalData.setting.stoid, + } + } + + //-- 获取一下手机 -- + getApp().request.promiseGet("/api/weshop/users/getmobile", { data: req_data }).then(res => { + if (res.data.code == 0) { + dd.mobile = res.data.data; + getApp().globalData.zc_dd = dd; + wx.redirectTo({ + url: "/packageE/pages/user/labels/labels?pageType=1" + }) + } + }) + } else { + this.setData({ sub: 1 }); + wx.showLoading({ + title: '处理中.', + mask: true + }) + this.zu_ce(dd); //调用注册的函数 + } } - }) - } else { - this.setData({ sub: 1 }); - wx.showLoading({ - title: '处理中.', - mask: true - }) - this.zu_ce(dd); //调用注册的函数 - } - } + + } else { + return app.my_warnning("授权登入失败,请稍后再试!", 0, that); + } + }, + failStatus: function (t) { + return app.my_warnning("授权登入失败,请稍后再试!", 0, that); + }, + fail: function (t) { + return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1; + } + }); }, zu_ce: function (dd) { @@ -298,7 +353,7 @@ Page({ app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => { if (res.data.code == 0) { getApp().globalData.guide_id = res.data.data.id; - getApp().globalData.guide_pick_id= res.data.data.pickup_id + getApp().globalData.guide_pick_id = res.data.data.pickup_id } }) @@ -369,7 +424,7 @@ Page({ app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => { if (res.data.code == 0) { getApp().globalData.guide_id = res.data.data.id; - getApp().globalData.guide_pick_id= res.data.data.pickup_id + getApp().globalData.guide_pick_id = res.data.data.pickup_id } }) diff --git a/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.wxml b/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.wxml index 91c0491..236948d 100644 --- a/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.wxml +++ b/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.wxml @@ -65,7 +65,7 @@ - {{"已售:"+(items.giftQty+items.virtualSales)+"件"}} + {{"已售:"+(items.giftQty+items.virtualSales)+"件"}} diff --git a/packageE/pages/user/monthgiftbag/monthgiftbag.js b/packageE/pages/user/monthgiftbag/monthgiftbag.js index aefb748..ce91e05 100644 --- a/packageE/pages/user/monthgiftbag/monthgiftbag.js +++ b/packageE/pages/user/monthgiftbag/monthgiftbag.js @@ -174,7 +174,16 @@ Page({ navigateTo: function (e) { var th = this; var url = e.currentTarget.dataset.url; - getApp().goto(url); + let is_back = e.currentTarget.dataset.is_back + if (is_back==1) { + wx.showToast({ + title: '该礼包已退款', + icon: 'none', + duration: 2000 + }) + }else{ + getApp().goto(url); + } }, //下拉事件 onReachBottom: function () { diff --git a/packageE/pages/user/monthgiftbag/monthgiftbag.wxml b/packageE/pages/user/monthgiftbag/monthgiftbag.wxml index 1ea2a8a..97e4ca7 100644 --- a/packageE/pages/user/monthgiftbag/monthgiftbag.wxml +++ b/packageE/pages/user/monthgiftbag/monthgiftbag.wxml @@ -23,7 +23,7 @@ - + @@ -93,10 +93,11 @@ - + + 已退款 diff --git a/pages/activity/pind_list/pind_list.js b/pages/activity/pind_list/pind_list.js index 8bece44..015606d 100644 --- a/pages/activity/pind_list/pind_list.js +++ b/pages/activity/pind_list/pind_list.js @@ -85,13 +85,13 @@ Page({ onShow: function (t) { getApp().check_can_share(); this.data.is_timer = 1; - this.data.currentPage = 1; - this.data.ismore = 1; - var th = this; + //this.data.currentPage = 1; + //this.data.ismore = 1; + var th = this; //设置全局定时器 th.data.timer = setInterval(function () { - th.countDown(); + if(th.data.is_get) th.countDown(); }, 1000); }, @@ -229,6 +229,7 @@ Page({ } e.data.currentPage++; } + th.setData({ goodlist: alllist, isshow: 1, @@ -313,6 +314,7 @@ Page({ //图片失败，默认图片 bind_bnerr2: function (e) { + var _errImg = e.target.dataset.errorimg; var val = e.target.dataset.val; if (val != "/public/images/default_goods_image_240.gif") { diff --git a/pages/activity/pind_list/pind_list.wxml b/pages/activity/pind_list/pind_list.wxml index 366bbaa..ecf2ad0 100644 --- a/pages/activity/pind_list/pind_list.wxml +++ b/pages/activity/pind_list/pind_list.wxml @@ -30,7 +30,7 @@ - diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js index 8f40d0d..458bf11 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -900,26 +900,24 @@ Page({ //-- 全部清除不选中 -- rq.promisePut("/api/weshop/cartService/update", { - data: { - id: item.id, - selected: 0, - store_id: oo.stoid - } + data: { + id: item.id, + selected: 0, + store_id: oo.stoid + } }); - await getApp().request.promiseGet("/api/weshop/serviceCard/get/" + oo.stoid + "/" + item.service_id, {}).then(res => { - good = res.data.data; + if(res.data.code==0 && res.data.data){ + good = res.data.data; + } }) if (!good) { - // var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; - // getApp().request.delete(url, { - // success: function (t) {} - // }); - th.disInvalid({ - ...item, - original_img: good.imgUrl - }, 1, 1); + //-- 找不到就要删除 -- + var url = '/api/weshop/cartService/del/' + oo.stoid + '/' + item.id; + getApp().request.delete(url, { + success: function (t) {} + }); continue; } @@ -937,7 +935,7 @@ Page({ continue; } - if (item.prom_type == 0) { + if (item.prom_type == 0 && !item.is_integral_normal && !item.is_pd_normal ) { var prom = null; var now = ut.gettimestamp(); await getApp().request.promiseGet(`/api/weshop/activitylist/listGoodActInfo2`, { @@ -3817,27 +3815,37 @@ Page({ var th = this; var ab = 0; //选中 - var abc = 0; // - for (var i = 0; i < this.data.requestData.length; i++) { - var i_arr = this.data.requestData[i].goods; - for (var j = 0; j < i_arr.length; j++) { - if (i_arr[j].selected) { - glist += i_arr[j].id + ","; - ab = 1; + var abc = 0; + + //如果有普通商品的时候 + if(this.data.requestData && this.data.requestData.length){ + for (var i = 0; i < this.data.requestData.length; i++) { + var i_arr = this.data.requestData[i].goods; + for (var j = 0; j < i_arr.length; j++) { + if (i_arr[j].selected) { + glist += i_arr[j].id + ","; + ab = 1; + } } } } - for (var ii = 0; ii < this.data.service_data.length; ii++) { - var i_arr = this.data.service_data[ii].goods; - for (var jj = 0; jj < i_arr.length; jj++) { - if (i_arr[jj].selected) { - slist += i_arr[jj].id + ","; - abc = 1; + //如果有普通服务卡的时候 + if(this.data.service_data && this.data.service_data.length){ + for (var ii = 0; ii < this.data.service_data.length; ii++) { + var i_arr = this.data.service_data[ii].goods; + for (var jj = 0; jj < i_arr.length; jj++) { + if (i_arr[jj].selected) { + slist += i_arr[jj].id + ","; + abc = 1; + } } } } + + + if (ab == 0 && abc == 0) { t.my_warnning("未选择商品或者服务卡", 0, th); return false; diff --git a/pages/cart/cart_wk/cart_wk.js b/pages/cart/cart_wk/cart_wk.js index a253e05..12d0f9f 100644 --- a/pages/cart/cart_wk/cart_wk.js +++ b/pages/cart/cart_wk/cart_wk.js @@ -311,6 +311,7 @@ Page({ jsarr.forEach(function (value, index) { if (count >= value['rynum']) price = value['price']; }) + var tail_money = (price * order_goods.goods_num - order['order_amount'] - order['user_money']).toFixed(2); tail_money = parseFloat(tail_money); diff --git a/pages/goods/goodsInfo/buy_integral.wxml b/pages/goods/goodsInfo/buy_integral.wxml index 4e47ae6..a15a554 100644 --- a/pages/goods/goodsInfo/buy_integral.wxml +++ b/pages/goods/goodsInfo/buy_integral.wxml @@ -28,6 +28,7 @@ {{def_pick_store.pickup_name}} + 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} diff --git a/pages/goods/goodsInfo/buy_pt.wxml b/pages/goods/goodsInfo/buy_pt.wxml index 896489e..8883f33 100644 --- a/pages/goods/goodsInfo/buy_pt.wxml +++ b/pages/goods/goodsInfo/buy_pt.wxml @@ -51,8 +51,6 @@ {{def_pick_store.pickup_name}} - - 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml index fa45f00..debf06f 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxml +++ b/pages/goods/goodsInfo/goodsInfo.wxml @@ -130,7 +130,6 @@ ￥ {{prom_price}} - 零售价：￥{{filters.toFix(data.market_price,2)}} ￥{{filters.toFix(data.shop_price,2)}} diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss index 3bfe10d..bdc5b7c 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxss +++ b/pages/goods/goodsInfo/goodsInfo.wxss @@ -3135,8 +3135,8 @@ xc-ensure-div { } .xc-qt-price .xc-qtunit-price { - margin-left: 6rpx; - margin-top: -4rpx; + /*margin-left: 6rpx;*/ + /*margin-top: -4rpx;*/ } .xc-nanber { diff --git a/pages/index/index/index.js b/pages/index/index/index.js index 96b7c3d..88aae79 100644 --- a/pages/index/index/index.js +++ b/pages/index/index/index.js @@ -316,7 +316,7 @@ Page({ } //--正再拼团中的处理-- - var url = "/api/weshop/order/pageTuan?pt_status=2&is_pt=1&store_id=" + os.stoid + "&pageSize=6&page=1" + var url = "/api/weshop/order/pageTuanNew?pt_status=2&is_pt=1&store_id=" + os.stoid + "&pageSize=6&page=1" await getApp().request.promiseGet(url, {}).then(res => { if (res.data.code == 0 && res.data.data && res.data.data.pageData) { th.data.pt_timer_arr = res.data.data.pageData; diff --git a/pages/team/team_ping/team_ping.js b/pages/team/team_ping/team_ping.js index dbee1f7..fdf5ece 100644 --- a/pages/team/team_ping/team_ping.js +++ b/pages/team/team_ping/team_ping.js @@ -92,8 +92,7 @@ Page({ //获取订单表的信息根据活动user_id,pt_prom_id>0 AND pay_time>0 - - await getApp().request.promiseGet("/api/weshop/order/pageTuan?"+where, { + await getApp().request.promiseGet("/api/weshop/order/pageTuanNew?"+where, { data: { is_pt:1,store_id: os.stoid, user_id: user_id, pageSize: 6, page: this.data.currentPage,} }).then(res => { order = res.data.data.pageData; @@ -102,82 +101,130 @@ Page({ wx.showLoading({ title: "加载中"}); - for (i = 0; i < order.length; i++) { - //获取订单从表信息 - await getApp().request.promiseGet("/api/weshop/ordergoods/pageGoods", { - data: { store_id: os.stoid, order_id: order[i].order_id } - }).then(res => { - order_goods = res.data.data.pageData; - order[i].order_goods = order_goods; - order[i].gimage = ee.data.imageurl + order_goods[0]?.original_img; - }) + if(order && order.length){ + for (i = 0; i < order.length; i++) { - - //获取订单表信息根据上面查询的订单号order[i].pt_listno - await getApp().request.promiseGet("/api/weshop/order/pagePtList", { - data: { store_id: os.stoid, pt_listno: order[i].pt_listno,pageSize:60,page:1} - }).then(res => { - //console.log("ordertx"); - ordertx = res.data.data.pageData; - //console.log(ordertx); - order[i].tx=ordertx; - }) + //获取teamgroup中的值 + await getApp().request.promiseGet("/api/weshop/teamgroup/page", { + data: { store_id: os.stoid, listno: order[i].pt_listno,pageSize:1,page:1} + }).then(res => { + team_g = res.data.data.pageData[0] + }) - //获取teamgroup中的值 - await getApp().request.promiseGet("/api/weshop/teamgroup/page", { - data: { store_id: os.stoid, listno: order[i].pt_listno,pageSize:1,page:1} - }).then(res => { - team_g = res.data.data.pageData[0] - - }) - //获取预存使用金额 - await getApp().request.promiseGet("/api/weshop/orderMore/get/" + os.stoid + "/" + order[i].order_sn, { - }).then(res => { - if (res.data.code == 0 && res.data.data) { - // data[ind].use_commission = res.data.data.use_commission; - order[i].pre_cut = res.data.data.pre_cut; //是否使用预存，如果是使用预存不能单品退，只能整单退 - order[i].pre_json = res.data.data.pre_json; //是否使用预存，如果是使用预存不能单品退，只能整单退 + switch (team_g.goods_type){ + case 0: + //获取订单从表信息 + await getApp().request.promiseGet("/api/weshop/ordergoods/pageGoods", { + data: { store_id: os.stoid, order_id: order[i].order_id } + }).then(res => { + order_goods = res.data.data.pageData; + order[i].order_goods = order_goods; + order[i].gimage = ee.data.imageurl + order_goods[0]?.original_img; + }) + + //获取订单表信息根据上面查询的订单号order[i].pt_listno + await getApp().request.promiseGet("/api/weshop/order/pagePtList", { + data: { store_id: os.stoid, pt_listno: order[i].pt_listno,pageSize:60,page:1} + }).then(res => { + //console.log("ordertx"); + ordertx = res.data.data.pageData; + //console.log(ordertx); + order[i].tx=ordertx; + }) + //获取预存使用金额 + await getApp().request.promiseGet("/api/weshop/orderMore/get/" + os.stoid + "/" + order[i].order_sn, { + }).then(res => { + if (res.data.code == 0 && res.data.data) { + // data[ind].use_commission = res.data.data.use_commission; + order[i].pre_cut = res.data.data.pre_cut; //是否使用预存，如果是使用预存不能单品退，只能整单退 + order[i].pre_json = res.data.data.pre_json; //是否使用预存，如果是使用预存不能单品退，只能整单退 + } + }) + break; + + case 1: + + order[i].goods_type=1; + order[i].pre_cut=0; + + //获取order信息根据订单编号order_sn + await getApp().request.promiseGet("/api/weshop/rechargeServicelist/page", { + data: { store_id: os.stoid, order_id: order[i].order_id,} + }).then(res => { + order_goods = res.data.data.pageData; + order_goods[0].goods_num=order_goods[0].qty; + order_goods[0].goods_price=order_goods[0].price; + order[i].order_goods = order_goods; + }) + + + //pt_tail_money 在从表 + order[i].pt_tail_money=order_goods[0].pt_tail_money; + + //-- 获取商品信息 -- + await getApp().request.promiseGet("/api/weshop/serviceCard/get/" + os.stoid + "/" + order_goods[0].card_id, { + }).then(res => { + //-- 商品地址 -- + order[i].gimage = ee.data.imageurl + res.data.data.imgUrl + order[i].order_goods[0].goods_name= res.data.data.serviceName; + }) + + //-- 多少人参团头像 -- + await getApp().request.promiseGet("/api/weshop/rechargeServicelist/pagePtList", { + data: { + store_id: o.stoid, + pt_listno: team_g.listno, + } + }).then(res => { + ordertx = res.data.data.pageData; + order[i].tx=ordertx; + }) + + break; } - }) - - if (order[i].is_zsorder== 4) { - var num = 0; - var jt_data = JSON.parse(order[i].ct_rylist); - for (var m in jt_data) { - if (jt_data[m].rynum > num) num = jt_data[m].rynum; + + if (order[i].is_zsorder== 4) { + var num = 0; + var jt_data = JSON.parse(order[i].ct_rylist); + for (var m in jt_data) { + if (jt_data[m].rynum > num) num = jt_data[m].rynum; + } + order[i].max_ct_num = num; } - order[i].max_ct_num = num; - } - var head=[]; - if(team_g.is_xuni_ct) { + var head=[]; + if(team_g.is_xuni_ct) { head=team_g.xuni_head_id.split(","); order[i].is_xuni_ct=1; - } + } + + var sf_num = order[i].ct_num; + if (order[i].ct_num>=3){ sf_num=3;} + sf_num=sf_num-ordertx.length; + if(sf_num>0) { + var arr = []; + for(var j=0;j=3){ sf_num=3;} - sf_num=sf_num-ordertx.length; - if(sf_num>0) { - var arr = []; - for(var j=0;j0}}"> - + @@ -33,7 +33,11 @@ ￥ {{item.order_goods[0].goods_price}} - ￥{{item.order_goods[0].shop_price || item.order_goods[0].market_price}} + diff --git a/pages/team/team_show/team_show.js b/pages/team/team_show/team_show.js index 9980dc6..2e3fcb4 100644 --- a/pages/team/team_show/team_show.js +++ b/pages/team/team_show/team_show.js @@ -982,6 +982,14 @@ Page({ url+="?first_leader="+getApp().globalData.user_id; } + if(url.indexOf('goods_id')==-1){ + url+="&goods_id="+this.data.goods.goods_id; + } + if(url.indexOf('tg_id')==-1){ + url+="&tg_id="+this.data.teamgroup.id; + } + + return { path:url, title: "商品分类", diff --git a/pages/team/team_success/team_success.js b/pages/team/team_success/team_success.js index 17f0cf2..3bb3ff7 100644 --- a/pages/team/team_success/team_success.js +++ b/pages/team/team_success/team_success.js @@ -84,7 +84,11 @@ Page({ th.setData({poster:json_data}) } } - }) + }) + + getApp().getConfig(function (e) { + th.setData({sto_sele_name_1: e.store_name}) + }) }, onShow:function () { getApp().check_can_share(this); @@ -462,223 +466,227 @@ Page({ var share_title=th.data.teamlist.share_title; if(!share_title) share_title=th.data.teamlist.title; - context.drawImage(pg_path, 0, 0, 554 * unit, 899 * unit); - - //-- 是自定义海报的情况下 -- - if(th.data.poster && parseInt(th.data.poster.style)==2){ - //在线上分享人的情况下 - if(parseInt(th.data.poster.show_headpic)){ - //获取坐标 - var x=parseFloat(th.data.poster.head_x)*2; - var y=parseFloat(th.data.poster.head_y)*2; - var x1=(x+90) *unit; - var y1=(y+50) *unit; - //--昵称--- - context.setFontSize(24 * unit) - context.setFillStyle("black") - context.fillText(app.globalData.userInfo.nickname, x1, y1); - var width = 24 * app.globalData.userInfo.nickname.length * unit + 4 * unit; - //强烈推荐 改许程 - var tj_path = "../../../images/share/q_tj.png"; - context.drawImage(tj_path, x1 + width, y1-22*unit, 85 * unit, 30 * unit); - context.setFontSize(16 * unit) - context.setLineJoin('round'); //交点设置成圆角 - context.setFillStyle("white") - context.fillText('强烈推荐', x1 + width+8*unit, y1-1*unit); - } - - }else{ - //--昵称--- - context.setFontSize(24 * unit) - context.setFillStyle("black") - context.fillText(app.globalData.userInfo.nickname, 152 * unit, 76 * unit); - var width = 24 * app.globalData.userInfo.nickname.length * unit + 2 * unit; - //强烈推荐 - var tj_path = "../../../images/share/q_tj.png"; - context.drawImage(tj_path, 152 * unit + width, 54 * unit, 110 * unit, 30 * unit); - context.setFontSize(18 * unit) - context.setFillStyle("white") - context.fillText('强烈推荐', 152 * unit + width + 20 * unit, 76 * unit); - } - - - //---产品名称--- - context.setFontSize(21.3 * unit); - context.setFillStyle("black"); - - - getApp().draw_Text(context,share_title, - 38 * unit, 180 * unit, 200 * unit, 279 * unit, unit); - //------产品的价格------- - context.setFontSize(24 * unit) - context.setFillStyle("red") - - var pri0 = th.data.teamlist.price; - pri0=parseFloat(pri0).toFixed(2); - var wd1=th.data.screenWidth-ut.measureText(pri0, 31 * unit)-25; - context.fillText("￥", wd1-15, 180 * unit); - context.setFontSize(31 * unit) - context.fillText(pri0, wd1, 180 * unit); - - //---市场价划掉--- - context.setFillStyle("gray") - context.setFontSize(22 * unit) - pri0= "￥" + parseFloat(th.data.goods.market_price).toFixed(2); - var wd2=th.data.screenWidth-ut.measureText(pri0, 22 * unit)-25; - context.fillText(pri0, wd2, 210 * unit); - - context.setStrokeStyle('gray') - context.setLineWidth(1 * unit) - context.moveTo(wd2-5, 204 * unit) - context.lineTo(wd2+ut.measureText(pri0, 22 * unit)+5, 204 * unit) - context.stroke(); - console.log(th.data.share_img_localpath); - - - //---中间大图--- - context.drawImage(th.data.share_img_localpath, 68 * unit, 242 * unit, 410 * unit, 410 * unit); - - var g_ct=th.data.teamlist.ct_num-th.data.ordertx.length; - var wz= ""; - if(g_ct>0) wz="还差"+g_ct+"人成团，"; - else{ - g_ct= th.data.max_num -th.data.ordertx.length; - if(g_ct>0){ - wz="还差"+g_ct+"人享最低优惠，"; + + if (!th.data.share_b_img){ // 如果是普通商品，绘制新海报 + th.drawPoster(context, unit, th.data.share_img_localpath, vpath, type); + } else { + context.drawImage(pg_path, 0, 0, 554 * unit, 899 * unit); + //-- 是自定义海报的情况下 -- + if(th.data.poster && parseInt(th.data.poster.style)==2){ + //在线上分享人的情况下 + if(parseInt(th.data.poster.show_headpic)){ + //获取坐标 + var x=parseFloat(th.data.poster.head_x)*2; + var y=parseFloat(th.data.poster.head_y)*2; + var x1=(x+90) *unit; + var y1=(y+50) *unit; + //--昵称--- + context.setFontSize(24 * unit) + context.setFillStyle("black") + context.fillText(app.globalData.userInfo.nickname, x1, y1); + var width = 24 * app.globalData.userInfo.nickname.length * unit + 4 * unit; + //强烈推荐 改许程 + var tj_path = "../../../images/share/q_tj.png"; + context.drawImage(tj_path, x1 + width, y1-22*unit, 85 * unit, 30 * unit); + context.setFontSize(16 * unit) + context.setLineJoin('round'); //交点设置成圆角 + context.setFillStyle("white") + context.fillText('强烈推荐', x1 + width+8*unit, y1-1*unit); + } + }else{ - wz="已享受最优惠，"; + //--昵称--- + context.setFontSize(24 * unit) + context.setFillStyle("black") + context.fillText(app.globalData.userInfo.nickname, 152 * unit, 76 * unit); + var width = 24 * app.globalData.userInfo.nickname.length * unit + 2 * unit; + //强烈推荐 + var tj_path = "../../../images/share/q_tj.png"; + context.drawImage(tj_path, 152 * unit + width, 54 * unit, 110 * unit, 30 * unit); + context.setFontSize(18 * unit) + context.setFillStyle("white") + context.fillText('强烈推荐', 152 * unit + width + 20 * unit, 76 * unit); } - } - //-------大图后面就不一样了----------- - switch (type) { - case 1://会员团和商家团的展示 - //---画线--- - context.setLineWidth(1 * unit) - context.moveTo(32 * unit, 670 * unit) - context.lineTo(520 * unit, 670 * unit) - context.stroke(); - - //---文字--- - context.setFontSize(22 * unit) - context.setFillStyle("black") - context.fillText("好物拼起来,拼拼更划算", 40 * unit, 726 * unit); - - //绘制成团图片 - var ct_img ="../../../images/share/ct_num.png"; - context.drawImage(ct_img, 40 * unit, 740 * unit, 120 * unit, 30 * unit); - var ct_num = th.data.teamlist.ct_num; - context.setFontSize(14 * unit) - - context.setFillStyle("red") - if(ct_num<10){ - context.fillText(ct_num+"人拼团", 92 * unit, 760 * unit); + + //---产品名称--- + context.setFontSize(21.3 * unit); + context.setFillStyle("black"); + + + getApp().draw_Text(context,share_title, + 38 * unit, 180 * unit, 200 * unit, 279 * unit, unit); + //------产品的价格------- + context.setFontSize(24 * unit) + context.setFillStyle("red") + + var pri0 = th.data.teamlist.price; + pri0=parseFloat(pri0).toFixed(2); + var wd1=th.data.screenWidth-ut.measureText(pri0, 31 * unit)-25; + context.fillText("￥", wd1-15, 180 * unit); + context.setFontSize(31 * unit) + context.fillText(pri0, wd1, 180 * unit); + + //---市场价划掉--- + context.setFillStyle("gray") + context.setFontSize(22 * unit) + pri0= "￥" + parseFloat(th.data.goods.market_price).toFixed(2); + var wd2=th.data.screenWidth-ut.measureText(pri0, 22 * unit)-25; + context.fillText(pri0, wd2, 210 * unit); + + context.setStrokeStyle('gray') + context.setLineWidth(1 * unit) + context.moveTo(wd2-5, 204 * unit) + context.lineTo(wd2+ut.measureText(pri0, 22 * unit)+5, 204 * unit) + context.stroke(); + console.log(th.data.share_img_localpath); + + + //---中间大图--- + context.drawImage(th.data.share_img_localpath, 68 * unit, 242 * unit, 410 * unit, 410 * unit); + + var g_ct=th.data.teamlist.ct_num-th.data.ordertx.length; + var wz= ""; + if(g_ct>0) wz="还差"+g_ct+"人成团，"; + else{ + g_ct= th.data.max_num -th.data.ordertx.length; + if(g_ct>0){ + wz="还差"+g_ct+"人享最低优惠，"; }else{ - context.fillText(ct_num+"人拼团", 86 * unit, 760 * unit); + wz="已享受最优惠，"; } - context.setFontSize(22 * unit) - context.fillText("已拼"+th.data.teamlist.buy_num+"份", 166 * unit, 763 * unit); - context.setFillStyle("gray") - context.fillText(wz+"快来和我一起拼团吧！", 40 * unit, 826 * unit); - context.setFillStyle("black") - - context.setFontSize(22 * unit) - context.fillText("长按识别二维码，立即参团", 40 * unit, 856 * unit); - //---二维吗图--- - //-- 自定义海报 -- - if(th.data.poster){ - var erm_x= parseFloat(th.data.poster.ewm_x)*2; - var erm_y= parseFloat(th.data.poster.ewm_y)*2; - context.drawImage(vpath, erm_x * unit, erm_y * unit, 120 * unit, 120 * unit); - }else{ - //---二维吗图--- - context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit); - } - break - case 2://阶梯团的展示 - //---画线--- - context.setLineWidth(1 * unit) - context.moveTo(32 * unit, 670 * unit) - context.lineTo(520 * unit, 670 * unit) - context.stroke(); - //---文字--- - context.setFontSize(22 * unit) - context.setFillStyle("black") - context.fillText("好物拼起来,拼拼更划算", 40 * unit, 726 * unit); - //---绘制中间阶梯的价格--- - var list= JSON.parse(th.data.teamlist.ct_rylist); - for(var i=0; i th.data.pre_arr.presell_sumqty - th.data.pre_arr.buy_goodnum) { + if (goodsinfo.goods_num > pre_arr.presell_sumqty - pre_arr.buy_goodnum) { wx.showToast({ title: "超出活动商品库存", icon: 'none', duration: 3000 }); return false; } diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index d8ff09d..797898e 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -109,62 +109,76 @@ Page({ activeCategoryId: t.type }); s.init(this, "", "orderList"); - }, - onShow: function () { - - - ut.fy_back('',0) - this.setData({ paying: 0 }); - this.data.ser_paying=0; - - t_pay.set_fir(); - t.set_fir(); - - var th = this; - //---查看会员的等级价--- - getApp().getConfig2(function (e) { + setTimeout(()=>{ + if(!getApp().globalData.user_id){ + getApp().goto('/packageE/pages/togoin/togoin') + return false; + } + },1500) - 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 }) + }, + onShow: function () { - var user = getApp().globalData.userInfo; - var is_open_offline = s_list.is_pricing_open; - //-- 如果后台有开启等级价的功能 -- - if (parseInt(s_list.rank_switch) == 2 && user['card_expiredate']) { - var str = user['card_expiredate'].replace(/-/g, '/'); - var end = new Date(str); - end = Date.parse(end) / 1000; - var now = ut.gettimestamp(); - //--- 判断是等级会员，且在有效期范围内 --- - if (user.card_field && now < end) { - th.setData({ card_field: user.card_field }) + wx.showLoading(); + //-- 读取会员的信息先 --，再app.js中有 + setTimeout(()=> { + ut.fy_back('', 0) + this.setData({paying: 0}); + this.data.ser_paying = 0; + + t_pay.set_fir(); + t.set_fir(); + + var th = this; + + //---查看会员的等级价--- + getApp().getConfig2(function (e) { + + + 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; + //-- 如果后台有开启等级价的功能 -- + if (parseInt(s_list.rank_switch) == 2 && user && user['card_expiredate']) { + var str = user['card_expiredate'].replace(/-/g, '/'); + var end = new Date(str); + end = Date.parse(end) / 1000; + var now = ut.gettimestamp(); + //--- 判断是等级会员，且在有效期范围内 --- + if (user.card_field && now < end) { + th.setData({card_field: user.card_field}) + } } - } - //-- 判断有没有过期 -- - getApp().request.promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=6", {}).then(res => { - //未购买 - if (res.data.code != 0 || !res.data.data || !res.data.data.pageData || !res.data.data.pageData.length) { - is_open_offline = 0; - } else { - //已经过期 - var item = res.data.data.pageData[0]; - if (item.end_time < ut.gettimestamp()) { + + //-- 判断有没有过期 -- + getApp().request.promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=6", {}).then(res => { + //未购买 + if (res.data.code != 0 || !res.data.data || !res.data.data.pageData || !res.data.data.pageData.length) { is_open_offline = 0; + } else { + //已经过期 + var item = res.data.data.pageData[0]; + if (item.end_time < ut.gettimestamp()) { + is_open_offline = 0; + } } - } - th.data.is_open_offline = is_open_offline; - }) - } - }, 1) + th.data.is_open_offline = is_open_offline; + }) + } + }, 1) + + this.resetData(), this.requestOrderList(this.data.activeCategoryId); - this.resetData(), this.requestOrderList(this.data.activeCategoryId); - this.clickTab(); + this.clickTab(); + },1500); }, changeTab: function (t) { if (this.data.activeCategoryId == t.currentTarget.id) return false; @@ -372,6 +386,8 @@ Page({ th.setData({ orderList: data, }); + wx.hideLoading(); + }); @@ -688,6 +704,8 @@ Page({ } var wlist = ""; + var the_yh_map={}; //判断那种商品的prom_type为0，正在做的活动是优惠促销 + for (var i in order_goods) { var good = order_goods[i]; @@ -841,8 +859,10 @@ Page({ } }) + if (presellList) { + if (good.goods_num > presellList.presell_sumqty - presellList.buy_goodnum) { var content = good.goods_name + '购买数量超出商品库存,请取消订单'; th.toast(content); @@ -859,7 +879,7 @@ Page({ } } - + //如果优惠促销和搭配购的时候 if ((good.prom_type == 3 || good.prom_type == 5 || good.prom_type == 10) && good.is_gift != 1 && good.is_collocation != 1) { var p_ok = 1, is_g_prom = 0; @@ -1028,12 +1048,9 @@ Page({ } //-- 优惠促销活动没有超出限购的话 -- if(yh_check){ - var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买'; - th.toast(content); - t_ok = 0; - break; + if(!the_yh_map[gg.prom_id]) the_yh_map[gg.prom_id]=[]; + the_yh_map[gg.prom_id].push(good); } - break case 7: //获取组合购活动 @@ -1081,9 +1098,41 @@ Page({ t_ok = 0; break; } - } + } } } + + + //如果有普通商品要判断能不到达到优惠促销的条件 + if(Object.keys(the_yh_map).length){ + for (let rkey in the_yh_map) { + var all_price=0; + var all_num=0; + + for(var ij=0;ij th.data.pre_arr.presell_sumqty - th.data.pre_arr.buy_goodnum) { + if (goodsinfo.goods_num > pre_arr.presell_sumqty - pre_arr.buy_goodnum) { wx.showToast({ title: "超出活动商品库存", icon: 'none', duration: 3000 }); return false; } @@ -1414,7 +1463,9 @@ Page({ success: function (t) { th.setData({ paying: 0 }); if (t.data.code == 0) { - th.onload(); + //th.data.orderList.splice(o_index, 1); + //th.setData({ orderList: th.data.orderList }); + th.onShow(); } else { getApp().confirmBox(t.data.msg + "请您取消该订单"); } @@ -1434,8 +1485,23 @@ Page({ t.pay(e.order_sn, function () { th.setData({ paying: 0 }); wx.showToast({ title: '支付成功' }) - th.data.orderList.splice(o_index, 1); - th.setData({ orderList: th.data.orderList }); + //th.data.orderList.splice(o_index, 1); + //th.setData({ orderList: th.data.orderList }); + + //商家团支付成功后，要让他的团能够建立或者参与 + if(e.is_zsorder==2){ + //--如果商家团的时候--- + getApp().request.promisePost("/api/weshop/order/pay/vipAutoTuan", { + data: {orderSn:e.order_sn,storeId:os.stoid } + }) + } + + setTimeout(()=>{ + th.setData({is_get:0}) + th.onShow(); + },500) + + }, function () { th.setData({ paying: 0 }); }, os.stoid, 1); @@ -2341,7 +2407,17 @@ Page({ }; if (currentIndex == 2) { // 卡项订单 list = th.data.cardList; - list = list.concat(data); + var new_data= data.map((item,index)=>{ + if(item.list && item.list.length){ + item.pt_status=item.list[0].pt_status; + item.pt_tail_money=item.list[0].pt_tail_money; + item.prom_id=item.list[0].prom_id; + item.prom_type=item.list[0].prom_type; + } + return item; + }) + + list = list.concat(new_data); th.setData({ cardList: list }); console.log('currentCard', list); }; @@ -2666,6 +2742,11 @@ Page({ // 卡项订单 - 立即支付 pay: async function (e) { + let th=this; + + if(th.data.ser_paying) return false; + th.data.ser_paying=1; + let index = e.currentTarget.dataset.index; let item = this.data.cardList[index]; let order_sn = item.order_sn; @@ -2673,14 +2754,11 @@ Page({ let store_id = app.globalData.setting.stoid; let user_id = oo.user_id; let flag = true; - - let th=this; - - // 如果是普通购买或单独购买，不用判断 // 如果是秒杀购买：1、判断活动是否变化；2、是否超出限购 - let list = item.list; + var pt_act=null; //-- 拼团活动的优化 -- + for (const it of list) { if (it.prom_type == 1) { let act_details = null; @@ -2690,9 +2768,8 @@ Page({ await getApp().request.promiseGet('/api/ms/flash_sale/getNew/' + store_id + '/' + user_id + '/' + it.prom_id, {}).then(res => { - console.log('11111111====>>>'); + if (res.data.code == 0) { - console.log('当前的秒杀活动信息：', res.data.data); act_details = res.data.data; if (act_details.is_end == 1) { wx.showModal({ @@ -2712,108 +2789,129 @@ Page({ flag = false; return false; }; - }; - }); - await getApp().request.promiseGet('/api/weshop/activitylist/getActLen/' + store_id + '/' + it.prom_type + '/' + it.prom_id, { - 1: 1 - }).then(res => { - console.log('222222222====>>>'); - if (res.data.code == 0) { - // 当前可以购买的数量 - console.log('redis当前可以购买的数量：', res.data.data); - redis_num = res.data.data; - // if(redis_num <=0) { - // wx.showModal({ - // title: '提示', - // content: '活动库存不足,无法支付,请取消订单！', - // showCancel: false, - // }); - // // flag = false; - // return true; - // }; - }; - }); - await getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum", { - data: { - store_id: store_id, - user_id: user_id, - card_id: it.card_id, - prom_type: it.prom_type, - prom_id: it.prom_id, + var t_now = ut.gettimestamp(); + if (act_details.is_end == 1 || act_details.start_time > t_now || act_details.end_time < t_now) { + wx.showModal({ + title: '提示', + content: '活动发生了变化,无法支付,请取消订单,重新购买！', + showCancel: false, + }); + flag = false; + return false; + } + } - }).then(res => { - console.log('333333333====>>>'); - if (res.data.code == 0) { - console.log('已经购买的数量：', res.data.data); - promcardbuynum = res.data.data.promcardbuynum; + }); + if(act_details.buy_limit>0 && flag){ + await getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum", { + data: { + store_id: store_id, + user_id: user_id, + card_id: it.card_id, + prom_type: it.prom_type, + prom_id: it.prom_id, + ispay:1 + } + }).then(res => { + if (res.data.code == 0) { + promcardbuynum = res.data.data.promcardbuynum; + let canBuyNum = act_details.buy_limit - promcardbuynum; // 自己还可购买的数量c + + if (canBuyNum < qty) { + wx.showModal({ + title: '提示', + content: '您已超出活动限购数量,无法支付,请取消订单！', + showCancel: false, + }); + flag = false; + } + } + }) + } - let limited = act_details.buy_limit; // 限购数量a - let buyedNum = promcardbuynum; // 自己已经购买的数量b - let canBuyNum = limited - buyedNum; // 自己还可购买的数量c + }; + if (it.prom_type == 6) { + let act_details = null; + let redis_num = 0; + let promcardbuynum = 0; + let qty = it.qty; + + await getApp().request.promiseGet("/api/weshop/teamlist/get/" + store_id + "/" + it.prom_id, {}).then(res => { + + if (res.data.code == 0) { + + act_details = res.data.data; - if (canBuyNum <= 0) { + if (act_details.is_end == 1) { wx.showModal({ title: '提示', - content: '您已超出活动限购数量,无法支付,请取消订单！', + content: '活动已结束,无法支付,请取消订单！', showCancel: false, }); flag = false; return false; - }; - - if (limited > redis_num) { - if (canBuyNum <= redis_num) { - if (qty > canBuyNum) { - wx.showModal({ - title: '提示', - content: '您已超出活动限购数量,无法支付,请取消订单！', - showCancel: false, - }); - flag = false; - return false; - }; - - }; - - if (canBuyNum > redis_num) { - if (qty > redis_num) { - wx.showModal({ - title: '提示', - content: '活动库存不足,无法支付,请取消订单！', - showCancel: false, - }); - flag = false; - return false; - }; + } - }; - }; + if (act_details.id != it.prom_id) { + wx.showModal({ + title: '提示', + content: '活动发生了变化,无法支付,请取消订单,重新购买！', + showCancel: false, + }); + flag = false; + return false; + } - if (limited <= redis_num) { - if (qty > canBuyNum) { - wx.showModal({ - title: '提示', - content: '您已超出活动限购数量,无法支付,请取消订单！', - showCancel: false, - }); - flag = false; - return false; - }; - }; - }; + var t_now = ut.gettimestamp(); + if (act_details.is_end == 1 || act_details.start_time > t_now || act_details.end_time < t_now) { + wx.showModal({ + title: '提示', + content: '活动发生了变化,无法支付,请取消订单,重新购买！', + showCancel: false, + }); + flag = false; + return false; + } + } }); - }; - - }; + if(act_details.buy_limit>0 && flag){ + await getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum", { + data: { + store_id: store_id, + user_id: user_id, + card_id: it.card_id, + prom_type: it.prom_type, + prom_id: it.prom_id, + ispay:1 + } + }).then(res => { + if (res.data.code == 0) { + console.log('已经购买的数量：', res.data.data); + promcardbuynum = res.data.data.promcardbuynum; + } + }) + let limited = act_details.buy_limit; // 限购数量a + let canBuyNum = limited - promcardbuynum; // 自己还可购买的数量c + + if (canBuyNum < qty ) { + wx.showModal({ + title: '提示', + content: '您已超出活动限购数量,无法支付,请取消订单！', + showCancel: false, + }); + flag = false; + } + } + pt_act=act_details; - if(th.data.ser_paying) return false; - th.data.ser_paying=1; + } + } if (flag) { @@ -2822,12 +2920,28 @@ Page({ parentSn: order_sn, store_id: store_id }, function () { - th.data.ser_paying=0; - wx.showToast({ - title: '支付成功', - icon:'success', - duration: 2000 - }); + th.data.ser_paying=0; + wx.showToast({ + title: '支付成功', + icon:'success', + duration: 2000 + }); + + if(pt_act.kttype==1){ + + //--如果商家团的时候,这个要改,要用服务卡的接口--- + getApp().request.promisePost("/api/weshop/rechargeServicelist/vipAutoTuan", { + data: {orderSn:order_sn,storeId:os.stoid } + }) + } + + setTimeout(()=>{ + th.setData({is_get:0}) + th.onShow(); + },500) + + + }, function (e) { th.data.ser_paying=0; wx.showToast({ @@ -2858,7 +2972,9 @@ Page({ // }); // // } // }); - }; + }else { + th.data.ser_paying=0; + } }, @@ -2925,12 +3041,7 @@ Page({ }, }); - // let index = e.currentTarget.dataset.index; - // let cardList = self.data.cardList; - // cardList.splice(index, 1); - // self.setData({ - // cardList, - // }); + //self.request_list(self.data.currentRequestData); }, @@ -2961,7 +3072,7 @@ Page({ if (action == "buy") { - //--------------此时操作的数据------------ + //-------------- 此时操作的数据 ------------ var newd = { id: th.data.data.id, goods_num: th.data.goodsInputNum, diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml index 93c921b..e504d79 100644 --- a/pages/user/order_list/order_list.wxml +++ b/pages/user/order_list/order_list.wxml @@ -322,19 +322,44 @@ 订单编号：{{item.order_sn}} - - 待支付 - 待评价 - - - 已评价 - - - 已取消 - - - 已作废 - + + + + 未支付 + 组团中 + + + + 待支付 + + + + 待支付尾款 + + + 待评价 + + + + + + 已评价 + + + + + + + 已取消 + + + + 已作废 + 支付尾款失败 + @@ -345,7 +370,8 @@ - + 秒杀 + 团购 @@ -389,7 +415,7 @@ 合计(改): ￥ - {{filters.toFix(item.account,2)}} + {{filters.toFix(item.account+item.pt_tail_money,2)}} @@ -407,18 +433,24 @@ 订单详情 - + 评价 评价 - 立即支付 - + 立即支付 + 立即支付 - + 支付尾款 + + + @@ -467,7 +499,7 @@ - + diff --git a/pages/user/user_spsy/user_spsy.js b/pages/user/user_spsy/user_spsy.js index ca2c563..01f1f68 100644 --- a/pages/user/user_spsy/user_spsy.js +++ b/pages/user/user_spsy/user_spsy.js @@ -5,7 +5,7 @@ var ut = require('../../../utils/util'); var regeneratorRuntime = require('../../../utils/runtime.js'); Page({ - /** + /** * 页面的初始数据 */ data: { @@ -15,7 +15,8 @@ Page({ page: 1, isLoading: 0, no_more: 0, - is_use: 0 //领取状态 + is_use: 0, //领取状态 + is_appoint_storage:0 //是否要登记门店才可以领取 0是不用，1要登记 }, /** * 生命周期函数--监听页面加载 @@ -41,6 +42,14 @@ Page({ * 生命周期函数--监听页面显示 */ onShow: function () { + let th=this + //先获取是否有关闭使用优惠券 + getApp().getConfig2(function (ee) { + var json_d = JSON.parse(ee.switch_list); + th.setData({ + is_appoint_storage:json_d.is_appoint_storage,//是否要登记门店才可以领取 0是不用，1要登记 + }); + }, 1); getApp().check_can_share(); }, async getQrCode(FormId,GradeId) { @@ -64,6 +73,43 @@ Page({ } } }, + //门店回调 + async callback(e){ + let item = e.detail; + console.log('门店信息'); + console.log(item); + if (item && item.pickup_no) { + let qr_code_object=this.data.qr_code_object + let data={ + store_id:os.stoid,//商家编号 + user_id:getApp().globalData.user_id, //会员编号 + // storageId:item.pickup_no, //门店编号 + storageId:item.keyid, + writeOffCode:qr_code_object.WriteOffCode,//核销码 + } + let res = await getApp().request.promisePut("/api/weshop/users/grade/storage/update", { + data: data + }); + if (res && res.data && res.data.code==0) { + let text='qr_code_object.StorageID' + this.setData({ + [text]:item.keyid + }) + }else{ + wx.showToast({ + title: '门店选择失败', + icon: 'none', + duration: 2000 + }) + } + }else{ + wx.showToast({ + title: '门店选择失败', + icon: 'none', + duration: 2000 + }) + } + }, async requestData() { if (this.data.no_more) return false; if (this.data.isLoading) return false; @@ -159,5 +205,11 @@ Page({ close: function () { this.getQrCode(this.data.FormId) + }, + + select_product(){ + this.setData({ + store:1 + }) } }) \ No newline at end of file diff --git a/pages/user/user_spsy/user_spsy.json b/pages/user/user_spsy/user_spsy.json index 678c7b1..7a0404b 100644 --- a/pages/user/user_spsy/user_spsy.json +++ b/pages/user/user_spsy/user_spsy.json @@ -1,6 +1,7 @@ { "navigationBarTitleText": "免费领取", "usingComponents": { - "qr_code": "/components/qr_code/qr_code" + "qr_code": "/components/qr_code/qr_code", + "store_popup":"/components/store_popup/store_popup" } } \ No newline at end of file diff --git a/pages/user/user_spsy/user_spsy.wxml b/pages/user/user_spsy/user_spsy.wxml index d2ea4d5..6b9c677 100644 --- a/pages/user/user_spsy/user_spsy.wxml +++ b/pages/user/user_spsy/user_spsy.wxml @@ -13,10 +13,16 @@ 已使用{{list[0].freebh}} --> 已使用 - 立即使用 + + 立即使用 + 登记取货 + - \ No newline at end of file + + + + \ No newline at end of file