diff --git a/app.js b/app.js index 8cb325d..3165bc2 100644 --- a/app.js +++ b/app.js @@ -51,7 +51,7 @@ App({ config: null, //门店参数 config2: null, //门店配置 code: null, - user_id: null,//5682094,6520044,6520119 qa 4687 6519901 + user_id:null,//5682094,6520044,6520119 qa 4687 6519901 zs 10153869 buy_now: null, picklist: null, //门店列表 wuliuprice: null, //物流价格表 @@ -61,7 +61,6 @@ App({ getu: null, //记录会员信息 sessionKey: null,//记录会员信息 openid: null, //记录会员信息 - to_group: null, //参团传递的数据 wxapp_buy_obj: null, //微信小程序购买的Object pk_store: null, //选择的门店 @@ -74,15 +73,17 @@ App({ }, auth: o, request: a, - onLaunch: function () { + onLaunch: function (option) { //初始化美图测肤插件 // var plugin = requirePlugin('mtSkinSdk'); // params.login_id = wx.getStorageSync('login_id') || '' // 可将登录id缓存下来，方便下次进入小程序直接获取 // plugin.setConfig(pluginGD) - + if(option) this.globalData.scene=option.scene; wx.hideTabBar(); this.initExt(); + + //检查更新 this.checkUpdateVersion(); @@ -363,7 +364,7 @@ App({ title: t, mask: e, duration: a, - icon: 'error', + icon: 'error', // image: "/images/gt.png", complete: function () { "function" == typeof o && setTimeout(o, a); @@ -430,12 +431,12 @@ App({ }) }, //获取场景值 判断是否是单页面 - is_Single_page(_this,func) { - let scene = wx.getLaunchOptionsSync().scene; + is_Single_page(_this, func) { + let scene = wx.getLaunchOptionsSync().scene; //--判断是否是单页面-- - if(scene !== 1154){ - typeof func =="function" && func.bind(_this)(); - }else{ + if (scene !== 1154) { + typeof func == "function" && func.bind(_this)(); + } else { return false; } // return scene == 1154? false:true; @@ -672,11 +673,11 @@ App({ //清空登录时候缓存的值 onHide: function () { - var th=this; + var th = this; setTimeout(function () { console.log("app onhide"); console.log(th.globalData.no_clear); - if(!th.globalData.no_clear) { + if (!th.globalData.no_clear) { th.globalData.is_test = 0; th.globalData.guide_id = null; //导购清空 th.globalData.first_leader = null; //分享的会员清空 @@ -691,10 +692,11 @@ App({ th.globalData.dis_buy_obj = null; //等级卡的购买记录 th.globalData.storeFooter = null; //底部的导航 th.globalData.full_screen = null; //全屏 - }else{ - th.globalData.no_clear=0; + th.globalData.scene=null + } else { + th.globalData.no_clear = 0; } - },600) + }, 600) }, @@ -803,7 +805,7 @@ App({ if (wx.canIUse('getUpdateManager')) { //创建 UpdateManager 实例 const updateManager = wx.getUpdateManager(); - if(!updateManager) { + if (!updateManager) { return false; } //检测版本更新 @@ -836,33 +838,35 @@ App({ }, //重复函数，统一调用， - pre_img(path){ - this.globalData.no_clear=1; + pre_img(path) { + this.globalData.no_clear = 1; wx.previewImage({ //将图片预览出来 urls: [path] }); }, //b是数组，t是wxml元素返回的 - pre_img2(b,t){ - this.globalData.no_clear=1; + pre_img2(b, t) { + this.globalData.no_clear = 1; wx.previewImage({ current: b[t.currentTarget.dataset.id], urls: b }); }, + + + //联系客服的3个函数 con_wx(th){ var url=th.data.sys_switch.weapp_customertype_url; var id=th.data.sys_switch.weapp_customertype_appid; this.globalData.no_clear=1; wx.openCustomerServiceChat({ - extInfo: {url: url}, + extInfo: { url: url }, corpId: id, - success(res) {} + success(res) { } }) }, - con_Service(){ var th=this; var oss= this.globalData.setting; @@ -871,7 +875,7 @@ App({ th.request.get("/api/weshop/store/get/" + oss.stoid, { isShowLoading: 1, data: {}, - success: function(rs) { + success: function (rs) { th.globalData.config = rs.data.data; if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) { wx.showToast({ @@ -881,46 +885,85 @@ App({ }) return false; } - th.globalData.no_clear=1; + th.globalData.no_clear = 1; wx.makePhoneCall({ phoneNumber: rs.data.data.store_tel, }) } }) } else { - th.globalData.no_clear=1; + th.globalData.no_clear = 1; wx.makePhoneCall({ phoneNumber: t.store_tel, }) } }); }, - - com_call(self) { - self.getTel() - .then(() => { - if(self.data.store_tel) { - wx.showModal({ - title: '联系客服', - content: '客服热线:' + self.data.store_tel, - confirmText: '拨打', - success(res) { - if(res.confirm) { - getApp().globalData.no_clear = 1; - wx.makePhoneCall({ - phoneNumber: self.data.store_tel, - }) - }; - }, - }); - }; - }); - }, + + user_tools_endTime(type) { + //调用接口判断商家工具有没有过期 + return this.request.promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=" + type + "", {}).then(res => { + if (res.data.code == 0) { + var arr = res.data.data.pageData; + if (arr.length > 0) { + var item = arr[0]; + if (item.is_sy == 0) { + var now = Date.parse(new Date()); now = now / 1000; + if (item.end_time < now) { + return 0 + } + return 1; + } + } + } + }) + }, + + com_call(self) { + self.getTel() + .then(() => { + if (self.data.store_tel) { + wx.showModal({ + title: '联系客服', + content: '客服热线:' + self.data.store_tel, + confirmText: '拨打', + success(res) { + if (res.confirm) { + getApp().globalData.no_clear = 1; + wx.makePhoneCall({ + phoneNumber: self.data.store_tel, + }) + }; + }, + }); + }; + }); + }, //检验能不能分享 - check_can_share(){ - if(!this.globalData.user_id) wx.hideShareMenu(); - else wx.showShareMenu(); + check_can_share() { + if (!this.globalData.user_id) wx.hideShareMenu(); + else wx.showShareMenu(); + }, + + //--- 判断是不是皮肤的商品的公共函数 --- + check_skin_face(options,type,goods_id){ + if(options.skinface_id){ + this.globalData.skinface_id=options.skinface_id; + var stoid=this.globalData.setting.stoid; + var user_id=this.globalData.user_id; + if(!user_id) return false; + //点击量的 + this.request.promisePost("/api/weshop/face/skinGoodsBrowse/save",{ + data:{ + store_id:stoid, + goods_id:goods_id, + user_id:user_id, + addtime:ut.gettimestamp(), + skinface_id:options.skinface_id, + goods_type:type + } + }).then(res=>{}) + } } - }); diff --git a/app.json b/app.json index bacfe0c..ed7b276 100644 --- a/app.json +++ b/app.json @@ -31,16 +31,9 @@ "pages/team/team_ping/team_ping", "pages/cart/cart2_pt/cart2_pt", "pages/cart/cart_wk/cart_wk", - "pages/user/member/menber", - "pages/user/member/bring/bring", - "pages/user/member/bring/msg/msg", - "pages/user/member/account/account", - "pages/user/member/account_unable/account_unable", - "pages/user/member/cash_record/cash_record", - "pages/user/coupons/coupons", - "pages/user/integral/integral", - "pages/user/integral/query/index", - "pages/user/integral/msg/msg", + + + "pages/user/userqy/userqy", "pages/user/user_spsy/user_spsy", "pages/user/user_fw/user_fw", @@ -74,9 +67,7 @@ "pages/cart/cart2_inte/cart2_inte", "pages/giftpack/festival/festival", "pages/team/team_more/team_more", - "pages/user/deposit/deposit", - "pages/user/deposit/prepaid/msg/msg", - "pages/user/deposit/prepaid/prepaid", + "pages/distribution/distribution", "pages/template/index" ], @@ -189,7 +180,21 @@ "pages/AI-test-skin/select_photo/select_photo", "pages/AI-test-skin/fail_result/fail_result", "pages/AI-test-skin/success_result/success_result", - "pages/AI-test-skin/analyse/analyse" + "pages/AI-test-skin/analyse/analyse", + + "pages/user/coupons/coupons", + "pages/user/integral/integral", + "pages/user/integral/query/index", + "pages/user/integral/msg/msg", + "pages/user/deposit/deposit", + "pages/user/deposit/prepaid/msg/msg", + "pages/user/deposit/prepaid/prepaid", + "pages/user/member/menber", + "pages/user/member/bring/bring", + "pages/user/member/bring/msg/msg", + "pages/user/member/account/account", + "pages/user/member/account_unable/account_unable", + "pages/user/member/cash_record/cash_record" ] } diff --git a/components/diy_goodsGroup/diy_goodsGroup.js b/components/diy_goodsGroup/diy_goodsGroup.js index 3092772..4680b26 100644 --- a/components/diy_goodsGroup/diy_goodsGroup.js +++ b/components/diy_goodsGroup/diy_goodsGroup.js @@ -29,7 +29,7 @@ Component({ currentPage: 1, requestData: null, requestUrl: "", - goods_array: null, + goods_array: [], total: null, prom_id: 0, classstyle_id: null, @@ -424,7 +424,7 @@ Component({ this.data.currentPage = 1; - this.setData({ goods_array: null, total: null, title_index: title_idx }); + this.setData({ goods_array: [], total: null, title_index: title_idx }); //初始化 this.init(this.data.classstyle_id, this.data.wgroup); setTimeout(function () { wx.hideLoading(); }, 1000) @@ -467,7 +467,6 @@ Component({ item.cardprice3 = val.cardprice3; item.prom_type = val.prom_type; item.prom_id = val.prom_id; - if (val.prom_price) item.prom_price = val.prom_price; if (val.prom_integral) item.prom_integral = val.prom_integral; diff --git a/components/diy_goodsGroup/diy_goodsGroup.json b/components/diy_goodsGroup/diy_goodsGroup.json index e8cfaaf..c886449 100644 --- a/components/diy_goodsGroup/diy_goodsGroup.json +++ b/components/diy_goodsGroup/diy_goodsGroup.json @@ -1,4 +1,6 @@ { "component": true, - "usingComponents": {} + "usingComponents": { + "mp-loading": "weui-miniprogram/loading/loading" + } } \ No newline at end of file diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxml b/components/diy_goodsGroup/diy_goodsGroup.wxml index 4b4ad3c..ddd463f 100644 --- a/components/diy_goodsGroup/diy_goodsGroup.wxml +++ b/components/diy_goodsGroup/diy_goodsGroup.wxml @@ -3,6 +3,7 @@ + @@ -10,9 +11,6 @@ - - - @@ -155,7 +153,25 @@ - 销量：{{item.sales_sum}}件 + + + 销量：{{item.sales_sum}}件 + + + + + + + + 马上抢 + 立即购买 + + + + + + + @@ -303,8 +319,27 @@ - 销量：{{item.sales_sum}}件 - + + + 销量：{{item.sales_sum}}件 + + + + + + + + 马上抢 + 立即购买 + + + + + + + + + @@ -453,7 +488,25 @@ - 销量：{{item.sales_sum}}件 + + + 销量：{{item.sales_sum}}件 + + + + + + + + 马上抢 + 立即购买 + + + + + + + @@ -610,7 +663,26 @@ - 销量：{{item.sales_sum}}件 + + + 销量：{{item.sales_sum}}件 + + + + + + + + 马上抢 + 立即购买 + + + + + + + + @@ -784,7 +856,25 @@ - 销量：{{aitem.sales_sum}}件 + + + 销量：{{aitem.sales_sum}}件 + + + + + + + + 马上抢 + 立即购买 + + + + + + + diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxss b/components/diy_goodsGroup/diy_goodsGroup.wxss index fd5d8d9..095e1fe 100644 --- a/components/diy_goodsGroup/diy_goodsGroup.wxss +++ b/components/diy_goodsGroup/diy_goodsGroup.wxss @@ -31,9 +31,10 @@ .zs_top { width: 100%; min-height: 700rpx; - margin: 0 auto; - margin-bottom: 30rpx; + /* margin: 0 auto; + margin-bottom: 30rpx; */ display: flex; + } .zs_t_img { @@ -43,13 +44,15 @@ } .zs_center { + box-sizing: border-box; width: 100%; /* min-height: 200rpx; */ font-size: 28rpx; color: #333; text-align: left; - margin-left: 25rpx; - padding: 0 10rpx; + padding: 20rpx; + /* margin-left: 25rpx; */ + /* padding: 0 10rpx; */ } .zs_wz1 { @@ -171,6 +174,8 @@ .zs_center_x { /* width: 100%; min-height: 200rpx; */ + box-sizing: border-box; + flex-grow: 1; font-size: 28rpx; color: #333; padding-left: 20rpx; @@ -555,6 +560,10 @@ justify-content: space-around; } +.jc-sb { + justify-content: space-between; +} + .fs24 { font-size: 24rpx; } @@ -870,5 +879,29 @@ top: 10rpx; -webkit-line-clamp: 2; } +.icon-box { + /* width: 50rpx; */ +} + +.icon-box .icon { + display: block; + width: 50rpx; + height: 50rpx; +} + +.icon-box .icon.icon2 { + width: 80rpx; +} + +.icon-box .icon-text { + font-size: 26rpx; + color: red; + padding: 10rpx 20rpx; + border: 2rpx solid red; + border-radius: 40rpx; +} + + + diff --git a/packageA/pages/activity_share/activity_share.js b/packageA/pages/activity_share/activity_share.js index 5ae58a4..7599850 100644 --- a/packageA/pages/activity_share/activity_share.js +++ b/packageA/pages/activity_share/activity_share.js @@ -397,7 +397,7 @@ Page({ get_colloction: async function(){ var list=null; //-- 获取搭配购的从商品的信息 -- - await app.request.promiseGet("/api/weshop/goods/getGoodsPromList/"+oo.stoid+"/"+this.data.hui_active.main_goods_id+"/2",{}).then(res=>{ + await app.request.promiseGet("/api/weshop/goods/getGoodsPromList/"+oo.stoid+"/"+this.data.hui_active.main_goods_id+"/2"+"/"+getApp().globalData.user_id,{}).then(res=>{ if(res.data.code==0){ list=res.data.data.collocationList; } diff --git a/packageA/pages/checkin/checkin.wxml b/packageA/pages/checkin/checkin.wxml index 82cc42f..4f8bb65 100644 --- a/packageA/pages/checkin/checkin.wxml +++ b/packageA/pages/checkin/checkin.wxml @@ -4,7 +4,7 @@ 规则 - + 我的积分 diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml index 4806282..cd90b2d 100644 --- a/packageA/pages/goodsInfo/goodsInfo.wxml +++ b/packageA/pages/goodsInfo/goodsInfo.wxml @@ -696,7 +696,8 @@ 购买数量 - - + - + - + diff --git a/packageA/pages/prom_list/prom_list.js b/packageA/pages/prom_list/prom_list.js index ab3cc72..6b815f2 100644 --- a/packageA/pages/prom_list/prom_list.js +++ b/packageA/pages/prom_list/prom_list.js @@ -268,7 +268,7 @@ Page({ if (!ee.data.collocationList) { /*---获取活动的重表---*/ //调用接口判断订单优惠， - getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + ee.data.gid + "/2", {}).then(res => { + getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + ee.data.gid + "/2"+"/"+oo.user_id, {}).then(res => { if (res.data.code == 0) { var r_data = res.data.data; diff --git a/packageA/pages/quan_list/quan_list.js b/packageA/pages/quan_list/quan_list.js index 3187c68..f76fea9 100644 --- a/packageA/pages/quan_list/quan_list.js +++ b/packageA/pages/quan_list/quan_list.js @@ -1,160 +1,188 @@ var t = require("../../../utils/util.js"), ut = t, - e = require("../../../utils/common.js"), - oo = getApp().globalData, - os = getApp().globalData.setting; -var utils = require('../../../utils/util.js'),ut=utils; + e = require("../../../utils/common.js"), + oo = getApp().globalData, + os = getApp().globalData.setting; +var utils = require('../../../utils/util.js'), ut = utils; Page({ - data: { - stoid: os.stoid, - url: os.url, - resourceUrl: os.resourceUrl, - iurl: os.imghost, - defaultAvatar: os.resourceUrl + "/static/images/user68.jpg", - dataList: null, - config2:null, - curpage:1, - loading:0, - get_item:null, - show_success:0, - getcurday:null, - }, - //------初始化加载---------- - onLoad: function(t) { - var th=this; - getApp().getConfig2(function (conf) { - if(conf.couponset) conf.couponset=conf.couponset.replace(/\ 0 && item.lqnum >= item.everyone_num) { - getApp().my_warnning('领取失败，您已领完该券', 0, this); - return false; - } - var lq_num = item.lqnum; - var pdata = { - 'uid': oo.user_id, - 'cid': cid, - 'store_id': os.stoid, - 'type': 5 - }; - //-- 导购ID -- - if(getApp().globalData.guide_id){ - pdata.guide_id=getApp().globalData.guide_id; - } - var app = getApp(), - th = this; - app.request.post("/api/weshop/couponList/saveCouponList", { - data: pdata, - success: function(res) { - if (res.data.code == 0) { - var text = "dataList[" + index + "].is_get"; - var text2 = "dataList[" + index + "].linging"; - var text3 = "get_item"; - var obj = {};obj[text] = 1; obj[text2] = 0;obj[text3] = item;obj['show_success']=1; - th.setData(obj); - } else { - app.confirmBox(res.data.msg); - var text2 = "dataList[" + index + "].linging"; - th.setData({[text2]:0}); - } - } - }) - }, - close_show:function () { - this.setData({show_success:0,get_item:null}) - }, - go_quan:function () { - getApp().goto("/pages/user/coupons/coupons"); - }, - go_detail:function (e) { - var index=e.currentTarget.dataset.ind; - var item=this.data.dataList[index]; - getApp().goto("/packageA/pages/quan_pro/quan_pro?id="+item.id); - } + //如果券还在领取中，不能再点 + if (item.linging == 1) { + getApp().my_warnning('领取中..', 0, this); + return false; + } + //如果领取的次数到了 + if (item.everyone_num > 0 && item.lqnum >= item.everyone_num) { + getApp().my_warnning('领取失败，您已领完该券', 0, this); + return false; + } + var lq_num = item.lqnum; + var pdata = { + 'uid': oo.user_id, + 'cid': cid, + 'store_id': os.stoid, + 'type': 5 + }; + if (item.useobjecttype == 20 && item.type == 1) { + getApp().request.get('/api/weshop/goods/list', { + data: { + store_id: os.stoid, + erpwareid: item.useobjectid, + }, + success(res) { + if (ut.ajax_ok2(res)) { + good = res.data.data; + } + } + }) + } + //-- 导购ID -- + if (getApp().globalData.guide_id) { + pdata.guide_id = getApp().globalData.guide_id; + } + var app = getApp(), + th = this; + app.request.post("/api/weshop/couponList/saveCouponList", { + data: pdata, + success: function (res) { + if (res.data.code == 0) { + var text = "dataList[" + index + "].is_get"; + var text2 = "dataList[" + index + "].linging"; + var text3 = "get_item"; + var obj = {}; obj[text] = 1; obj[text2] = 0; obj[text3] = item; + th.setData(obj); + if (good.length > 0) { + wx.showToast({ + title: '领取成功', + success() { + let item = good[0]; + let url = `/pages/goods/goodsInfo/goodsInfo?goods_id=${item.goods_id}&prom_type=${item.prom_type}&prom_id=${item.prom_id}` + setTimeout(()=>{ + getApp().goto(url) + },500) + } + }) + } else { + th.setData({ + show_success: 1, + }) + } + } else { + app.confirmBox(res.data.msg); + var text2 = "dataList[" + index + "].linging"; + th.setData({ [text2]: 0 }); + } + } + }) + }, + close_show: function () { + this.setData({ show_success: 0, get_item: null }) + }, + go_quan: function () { + getApp().goto("/pages/user/coupons/coupons"); + }, + go_detail: function (e) { + var index = e.currentTarget.dataset.ind; + var item = this.data.dataList[index]; + getApp().goto("/packageA/pages/quan_pro/quan_pro?id=" + item.id); + } }); diff --git a/packageA/pages/quan_pro/quan_pro.js b/packageA/pages/quan_pro/quan_pro.js index 08981c6..703ce05 100644 --- a/packageA/pages/quan_pro/quan_pro.js +++ b/packageA/pages/quan_pro/quan_pro.js @@ -77,6 +77,7 @@ Page({ var item=this.data.q_data; var cid = this.data.q_data.id; var th=this; + var good = new Array(); //单品且是免费领取专门使用 //--先判断会员状态-- var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { @@ -103,6 +104,19 @@ Page({ 'store_id': os.stoid, 'type': 5 }; + if (item.useobjecttype == 20 && item.type == 1) { + getApp().request.get('/api/weshop/goods/list', { + data: { + store_id: os.stoid, + erpwareid: item.useobjectid, + }, + success(res) { + if (ut.ajax_ok2(res)) { + good = res.data.data; + } + } + }) + } //-- 分享导购ID -- if(getApp().globalData.guide_id){ @@ -118,8 +132,24 @@ Page({ if (res.data.code == 0) { item.lqnum++; var text3="q_data"; - var obj = {};obj[text3] = item;obj['show_success']=1; + var obj = {};obj[text3] = item; th.setData(obj); + if (good.length > 0) { + wx.showToast({ + title: '领取成功', + success() { + let item = good[0]; + let url = `/pages/goods/goodsInfo/goodsInfo?goods_id=${item.goods_id}&prom_type=${item.prom_type}&prom_id=${item.prom_id}` + setTimeout(()=>{ + getApp().goto(url) + },500) + } + }) + } else { + th.setData({ + show_success: 1, + }) + } } else { app.confirmBox(res.data.msg); } @@ -132,7 +162,7 @@ Page({ this.setData({ show_success:0 }) - getApp().goto("/pages/user/coupons/coupons"); + getApp().goto("/packageD/pages/user/coupons/coupons"); }, close_show(){ diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.js b/packageB/pages/luckactivity/luckinfo/luckinfo.js index f9370d2..33feeae 100644 --- a/packageB/pages/luckactivity/luckinfo/luckinfo.js +++ b/packageB/pages/luckactivity/luckinfo/luckinfo.js @@ -1279,7 +1279,7 @@ Page({ }; switch(type) { case 1: { - url = '/pages/user/integral/integral'; + url = '/packageD/pages/user/integral/integral'; break; }; case 2: { @@ -1287,7 +1287,7 @@ Page({ break; }; case 3: { - url = '/pages/user/coupons/coupons'; + url = '/packageD/pages/user/coupons/coupons'; break; }; case 4: { diff --git a/packageC/pages/presell/cart/cart.js b/packageC/pages/presell/cart/cart.js index 64106b5..8475b59 100644 --- a/packageC/pages/presell/cart/cart.js +++ b/packageC/pages/presell/cart/cart.js @@ -2256,7 +2256,7 @@ Page({ //如果优惠促销和搭配购的时候 if ((good.prom_type == 3 || good.prom_type == 5) && good.is_collocation != 1 && good.is_gift != 1) { var p_ok = 1; - await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0", {}).then(res => { + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0"+"/"+getApp().globalData.user_id, {}).then(res => { if (res.data.code == 0) { var r_data = res.data.data; if (!r_data.collocationPromList && good.prom_type == 5) { @@ -2336,7 +2336,7 @@ Page({ //不是赠品的时候 if (!good.is_gift && good.prom_type != 3) { var t_ok = 1; - await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0", {}).then(res => { + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0"+"/"+getApp().globalData.user_id, {}).then(res => { if (res.data.code == 0) { var r_data = res.data.data; //-- 参加了全局的优惠活动 -- diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js index ca13be2..b91693d 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.js +++ b/packageC/pages/presell/goodsInfo/goodsInfo.js @@ -1281,7 +1281,7 @@ Page({ callback(); } else { //-- 判断有没有优惠活动 -- - getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + th.data.sele_g.goods_id + "/0", {}).then(res => { + getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + th.data.sele_g.goods_id + "/0"+"/"+getApp().globalData.user_id, {}).then(res => { if (res.data.code == 0) { var r_data = res.data.data; th.data.prom_goods = r_data.promGoodsLists; diff --git a/packageC/pages/presell/pregoodsInfo/goodsInfo.js b/packageC/pages/presell/pregoodsInfo/goodsInfo.js index 4ed4b77..1e25130 100644 --- a/packageC/pages/presell/pregoodsInfo/goodsInfo.js +++ b/packageC/pages/presell/pregoodsInfo/goodsInfo.js @@ -1278,7 +1278,7 @@ Page({ callback(); } else { //-- 判断有没有优惠活动 -- - getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + th.data.sele_g.goods_id + "/0", {}).then(res => { + getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + th.data.sele_g.goods_id + "/0"+"/"+getApp().globalData.user_id, {}).then(res => { if (res.data.code == 0) { var r_data = res.data.data; th.data.prom_goods = r_data.promGoodsLists; diff --git a/packageD/pages/AI-test-skin/index/aiskin.js b/packageD/pages/AI-test-skin/index/aiskin.js index 72fb316..8ba5e78 100644 --- a/packageD/pages/AI-test-skin/index/aiskin.js +++ b/packageD/pages/AI-test-skin/index/aiskin.js @@ -1,7 +1,7 @@ /* * @Author: abson * @Date: 2022-02-11 14:13:05 - * @LastEditTime: 2022-02-22 15:17:48 + * @LastEditTime: 2022-03-26 17:03:01 * @LastEditors: Please set LastEditors * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath: \MShopWeApp\packageB\pages\AI-test-skin\index\aiskin.js @@ -25,11 +25,13 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function (options) { - var user=getApp().globalData.userInfo; - if(!user){ - let url = "/pages/togoin/togoin"; - app.goto(url); - } + getApp().globalData.user_id = options?.user_id; + getApp().getUserFir(); + var user = getApp().globalData.userInfo; + if (!user || !getApp().globalData.user_id) { + let url = "/pages/togoin/togoin"; + app.goto(url); + } }, /** @@ -57,8 +59,8 @@ Page({ goto(e) { this.check_num(function () { - var user=getApp().globalData.userInfo; - if(!user){ + var user = getApp().globalData.userInfo; + if (!user) { wx.showToast({ title: "请先授权登陆", icon: 'none', @@ -68,14 +70,14 @@ Page({ setTimeout(function () { let url = "/pages/togoin/togoin"; app.goto(url); - },1000) + }, 1000) return false; } let url = e.currentTarget.dataset.url; app.goto(url); }) - + }, /** @@ -102,26 +104,27 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage: function () { getApp().globalData.no_clear=1 + onShareAppMessage: function () { + getApp().globalData.no_clear = 1 }, - check_num:function (func) { + check_num: function (func) { //判断右没有开AI测肤 - getApp().promiseGet("/api/weshop/wx/weappSkin/get/"+setting.stoid,{}).then(rs=>{ - if(rs.data.code!=0 || !rs.data.data){ + getApp().promiseGet("/api/weshop/wx/weappSkin/get/" + setting.stoid, {}).then(rs => { + if (rs.data.code != 0 || !rs.data.data) { wx.showToast({ title: "未开通测肤功能，请联系商家", icon: 'none', duration: 3000 }) - }else if(!rs.data.data.skin_num || rs.data.data.skin_num<=0){ + } else if (!rs.data.data.skin_num || rs.data.data.skin_num <= 0) { wx.showToast({ title: "测肤功能的使用次数已经达到上限，请联系商家", icon: 'none', duration: 3000 }) - }else{ + } else { func(); } }) @@ -139,14 +142,14 @@ Page({ store_id: setting.stoid, user_id: os.user_id, page: 1, - pageSize:1, + pageSize: 1, } }); // initChart.setOption(option); if (res.code == 0 && res.data.pageData.length > 0) { - this.setData({show_his:1}) + this.setData({ show_his: 1 }) } } - - + + }) \ No newline at end of file diff --git a/packageD/pages/AI-test-skin/success_result/success_result.wxml b/packageD/pages/AI-test-skin/success_result/success_result.wxml index 354463c..ae358c7 100644 --- a/packageD/pages/AI-test-skin/success_result/success_result.wxml +++ b/packageD/pages/AI-test-skin/success_result/success_result.wxml @@ -7,7 +7,7 @@ 泪沟 --> - + {{item.name}} diff --git a/packageD/pages/AI-test-skin/success_result/success_result.wxss b/packageD/pages/AI-test-skin/success_result/success_result.wxss index ab8f06b..3093e14 100644 --- a/packageD/pages/AI-test-skin/success_result/success_result.wxss +++ b/packageD/pages/AI-test-skin/success_result/success_result.wxss @@ -6,7 +6,7 @@ page { } .tab_scroll { - position: fixed; + position: sticky; top: 0; z-index: 99; display: flex; diff --git a/pages/user/coupons/coupons.js b/packageD/pages/user/coupons/coupons.js index d597009..24bd321 100644 --- a/pages/user/coupons/coupons.js +++ b/packageD/pages/user/coupons/coupons.js @@ -2,14 +2,14 @@ var t = getApp(), a = t.request, o = t.globalData.setting, os = o, - i = require("../../../utils/util.js"), + i = require("../../../../utils/util.js"), ut = i, - s = require("../../../utils/common.js"); -var regeneratorRuntime = require('../../../utils/runtime.js'); + s = require("../../../../utils/common.js"); +var regeneratorRuntime = require('../../../../utils/runtime.js'); const { barcode, qrcode -} = require('../../../utils/index.js'); +} = require('../../../../utils/index.js'); let _this = null; Page({ diff --git a/pages/user/coupons/coupons.json b/packageD/pages/user/coupons/coupons.json index 8851a02..8851a02 100644 --- a/pages/user/coupons/coupons.json +++ b/packageD/pages/user/coupons/coupons.json diff --git a/pages/user/coupons/coupons.wxml b/packageD/pages/user/coupons/coupons.wxml index 0e79d2a..499c603 100644 --- a/pages/user/coupons/coupons.wxml +++ b/packageD/pages/user/coupons/coupons.wxml @@ -1,5 +1,5 @@ - + @@ -57,8 +57,8 @@ - 使用说明:{{filter.getNum(detail.Sum)}}元优惠券，{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}}，满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":"，不包邮地区:"+region_list_name}};{{detail.Remark1}} - 使用说明: {{filter.getNum(detail.Sum)}}元优惠券，{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}}，满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":"，不包邮地区:"+region_list_name}} + 使用说明:{{filter.getNum(detail.Sum)}}元优惠券，{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}}，满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":"，不包邮地区:"+region_list_name}};{{detail.Remark1}};活动名称：{{detail.ActName}}、活动编号：{{detail.ActNo}} + 使用说明: {{filter.getNum(detail.Sum)}}元优惠券，{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}}，满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":"，不包邮地区:"+region_list_name}};活动名称：{{detail.ActName}}、活动编号：{{detail.ActNo}} diff --git a/pages/user/coupons/coupons.wxss b/packageD/pages/user/coupons/coupons.wxss index 8d98860..8d98860 100644 --- a/pages/user/coupons/coupons.wxss +++ b/packageD/pages/user/coupons/coupons.wxss diff --git a/pages/user/coupons/filter.wxs b/packageD/pages/user/coupons/filter.wxs index 4043c1f..4043c1f 100644 --- a/pages/user/coupons/filter.wxs +++ b/packageD/pages/user/coupons/filter.wxs diff --git a/pages/user/deposit/deposit.js b/packageD/pages/user/deposit/deposit.js index 64ebd7e..78c8c9b 100644 --- a/pages/user/deposit/deposit.js +++ b/packageD/pages/user/deposit/deposit.js @@ -2,10 +2,10 @@ var t = getApp(), a = t.request, o = t.globalData.setting, os = o, - i = require("../../../utils/util.js"), + i = require("../../../../utils/util.js"), ut = i, - s = require("../../../utils/common.js"); -var regeneratorRuntime = require('../../../utils/runtime.js'); + s = require("../../../../utils/common.js"); +var regeneratorRuntime = require('../../../../utils/runtime.js'); Page({ data:{ yucun_money:0, diff --git a/pages/user/deposit/deposit.json b/packageD/pages/user/deposit/deposit.json index 9e26dfe..9e26dfe 100644 --- a/pages/user/deposit/deposit.json +++ b/packageD/pages/user/deposit/deposit.json diff --git a/pages/user/deposit/deposit.wxml b/packageD/pages/user/deposit/deposit.wxml index 2fdc92f..2fdc92f 100644 --- a/pages/user/deposit/deposit.wxml +++ b/packageD/pages/user/deposit/deposit.wxml diff --git a/pages/user/deposit/deposit.wxss b/packageD/pages/user/deposit/deposit.wxss index 8d896b4..8d896b4 100644 --- a/pages/user/deposit/deposit.wxss +++ b/packageD/pages/user/deposit/deposit.wxss diff --git a/pages/user/deposit/prepaid/fil.wxs b/packageD/pages/user/deposit/prepaid/fil.wxs index 20a9079..20a9079 100644 --- a/pages/user/deposit/prepaid/fil.wxs +++ b/packageD/pages/user/deposit/prepaid/fil.wxs diff --git a/pages/user/deposit/prepaid/msg/msg.js b/packageD/pages/user/deposit/prepaid/msg/msg.js index 99706f5..99706f5 100644 --- a/pages/user/deposit/prepaid/msg/msg.js +++ b/packageD/pages/user/deposit/prepaid/msg/msg.js diff --git a/pages/user/deposit/prepaid/msg/msg.json b/packageD/pages/user/deposit/prepaid/msg/msg.json index 8835af0..8835af0 100644 --- a/pages/user/deposit/prepaid/msg/msg.json +++ b/packageD/pages/user/deposit/prepaid/msg/msg.json diff --git a/pages/user/deposit/prepaid/msg/msg.wxml b/packageD/pages/user/deposit/prepaid/msg/msg.wxml index 819e186..819e186 100644 --- a/pages/user/deposit/prepaid/msg/msg.wxml +++ b/packageD/pages/user/deposit/prepaid/msg/msg.wxml diff --git a/pages/user/deposit/prepaid/msg/msg.wxss b/packageD/pages/user/deposit/prepaid/msg/msg.wxss index 5e8634a..5e8634a 100644 --- a/pages/user/deposit/prepaid/msg/msg.wxss +++ b/packageD/pages/user/deposit/prepaid/msg/msg.wxss diff --git a/pages/user/deposit/prepaid/prepaid.js b/packageD/pages/user/deposit/prepaid/prepaid.js index 7de3b9b..b646839 100644 --- a/pages/user/deposit/prepaid/prepaid.js +++ b/packageD/pages/user/deposit/prepaid/prepaid.js @@ -2,10 +2,10 @@ var t = getApp(), a = t.request, o = t.globalData.setting, os = o, - i = require("../../../../utils/util.js"), + i = require("../../../../../utils/util.js"), ut = i, - s = require("../../../../utils/common.js"); -var regeneratorRuntime = require('../../../../utils/runtime.js'); + s = require("../../../../../utils/common.js"); +var regeneratorRuntime = require('../../../../../utils/runtime.js'); Page({ data: { iurl: o.imghost, diff --git a/pages/user/deposit/prepaid/prepaid.json b/packageD/pages/user/deposit/prepaid/prepaid.json index 8835af0..8835af0 100644 --- a/pages/user/deposit/prepaid/prepaid.json +++ b/packageD/pages/user/deposit/prepaid/prepaid.json diff --git a/pages/user/deposit/prepaid/prepaid.wxml b/packageD/pages/user/deposit/prepaid/prepaid.wxml index b0f0384..b0f0384 100644 --- a/pages/user/deposit/prepaid/prepaid.wxml +++ b/packageD/pages/user/deposit/prepaid/prepaid.wxml diff --git a/pages/user/deposit/prepaid/prepaid.wxss b/packageD/pages/user/deposit/prepaid/prepaid.wxss index d027d41..d027d41 100644 --- a/pages/user/deposit/prepaid/prepaid.wxss +++ b/packageD/pages/user/deposit/prepaid/prepaid.wxss diff --git a/pages/user/integral/filter.wxs b/packageD/pages/user/integral/filter.wxs index cb724f7..cb724f7 100644 --- a/pages/user/integral/filter.wxs +++ b/packageD/pages/user/integral/filter.wxs diff --git a/pages/user/integral/integral.js b/packageD/pages/user/integral/integral.js index 23f0272..a65f460 100644 --- a/pages/user/integral/integral.js +++ b/packageD/pages/user/integral/integral.js @@ -3,9 +3,9 @@ var e = function (e) { return e && e.__esModule ? e : { default: e }; -}(require("../../../utils/LoadMore.js")), t = getApp(), a = t.request, o = t.globalData.setting, os = o, - i = require("../../../utils/util.js"), ut = i, b = require("../../../app.js"), app = b, s = require("../../../utils/common.js"), n = new e.default(); -var regeneratorRuntime = require('../../../utils/runtime.js'); +}(require("../../../../utils/LoadMore.js")), t = getApp(), a = t.request, o = t.globalData.setting, os = o, + i = require("../../../../utils/util.js"), ut = i, b = require("../../../../app.js"), app = b, s = require("../../../../utils/common.js"), n = new e.default(); +var regeneratorRuntime = require('../../../../utils/runtime.js'); Page({ /** diff --git a/pages/user/integral/integral.json b/packageD/pages/user/integral/integral.json index 8835af0..8835af0 100644 --- a/pages/user/integral/integral.json +++ b/packageD/pages/user/integral/integral.json diff --git a/pages/user/integral/integral.wxml b/packageD/pages/user/integral/integral.wxml index e980d75..e980d75 100644 --- a/pages/user/integral/integral.wxml +++ b/packageD/pages/user/integral/integral.wxml diff --git a/pages/user/integral/integral.wxss b/packageD/pages/user/integral/integral.wxss index 9fec40e..9fec40e 100644 --- a/pages/user/integral/integral.wxss +++ b/packageD/pages/user/integral/integral.wxss diff --git a/pages/user/integral/msg/msg.js b/packageD/pages/user/integral/msg/msg.js index 8751640..8751640 100644 --- a/pages/user/integral/msg/msg.js +++ b/packageD/pages/user/integral/msg/msg.js diff --git a/pages/user/integral/msg/msg.json b/packageD/pages/user/integral/msg/msg.json index 8835af0..8835af0 100644 --- a/pages/user/integral/msg/msg.json +++ b/packageD/pages/user/integral/msg/msg.json diff --git a/pages/user/integral/msg/msg.wxml b/packageD/pages/user/integral/msg/msg.wxml index 819e186..819e186 100644 --- a/pages/user/integral/msg/msg.wxml +++ b/packageD/pages/user/integral/msg/msg.wxml diff --git a/pages/user/integral/msg/msg.wxss b/packageD/pages/user/integral/msg/msg.wxss index 5e8634a..5e8634a 100644 --- a/pages/user/integral/msg/msg.wxss +++ b/packageD/pages/user/integral/msg/msg.wxss diff --git a/pages/user/integral/query/index.js b/packageD/pages/user/integral/query/index.js index db4d829..67c3a2d 100644 --- a/pages/user/integral/query/index.js +++ b/packageD/pages/user/integral/query/index.js @@ -2,10 +2,10 @@ var t = getApp(), a = t.request, o = t.globalData.setting, os = o, - i = require("../../../../utils/util.js"), + i = require("../../../../../utils/util.js"), ut = i, - s = require("../../../../utils/common.js"); -var regeneratorRuntime = require('../../../../utils/runtime.js'); + s = require("../../../../../utils/common.js"); +var regeneratorRuntime = require('../../../../../utils/runtime.js'); Page({ data: { diff --git a/pages/user/integral/query/index.json b/packageD/pages/user/integral/query/index.json index 9e26dfe..9e26dfe 100644 --- a/pages/user/integral/query/index.json +++ b/packageD/pages/user/integral/query/index.json diff --git a/pages/user/integral/query/index.wxml b/packageD/pages/user/integral/query/index.wxml index 9f291dc..9f291dc 100644 --- a/pages/user/integral/query/index.wxml +++ b/packageD/pages/user/integral/query/index.wxml diff --git a/pages/user/integral/query/index.wxss b/packageD/pages/user/integral/query/index.wxss index 55d080a..55d080a 100644 --- a/pages/user/integral/query/index.wxss +++ b/packageD/pages/user/integral/query/index.wxss diff --git a/pages/user/member/account/account.js b/packageD/pages/user/member/account/account.js index a1eee9d..79147dc 100644 --- a/pages/user/member/account/account.js +++ b/packageD/pages/user/member/account/account.js @@ -2,10 +2,10 @@ var t = getApp(), a = t.request, o = t.globalData.setting, os = o, - i = require("../../../../utils/util.js"), + i = require("../../../../../utils/util.js"), ut = i, - s = require("../../../../utils/common.js"); -var regeneratorRuntime = require('../../../../utils/runtime.js'); + s = require("../../../../../utils/common.js"); +var regeneratorRuntime = require('../../../../../utils/runtime.js'); Page({ data: { details:[],//数据 diff --git a/pages/user/member/account/account.json b/packageD/pages/user/member/account/account.json index 9e26dfe..9e26dfe 100644 --- a/pages/user/member/account/account.json +++ b/packageD/pages/user/member/account/account.json diff --git a/pages/user/member/account/account.wxml b/packageD/pages/user/member/account/account.wxml index 86ee8be..86ee8be 100644 --- a/pages/user/member/account/account.wxml +++ b/packageD/pages/user/member/account/account.wxml diff --git a/pages/user/member/account/account.wxss b/packageD/pages/user/member/account/account.wxss index 376eee0..376eee0 100644 --- a/pages/user/member/account/account.wxss +++ b/packageD/pages/user/member/account/account.wxss diff --git a/pages/user/member/account/index.wxs b/packageD/pages/user/member/account/index.wxs index e247f84..e247f84 100644 --- a/pages/user/member/account/index.wxs +++ b/packageD/pages/user/member/account/index.wxs diff --git a/pages/user/member/account_unable/account_unable.js b/packageD/pages/user/member/account_unable/account_unable.js index 1943da9..58d0728 100644 --- a/pages/user/member/account_unable/account_unable.js +++ b/packageD/pages/user/member/account_unable/account_unable.js @@ -2,10 +2,10 @@ var t = getApp(), a = t.request, o = t.globalData.setting, os = o, - i = require("../../../../utils/util.js"), + i = require("../../../../../utils/util.js"), ut = i, - s = require("../../../../utils/common.js"); -var regeneratorRuntime = require('../../../../utils/runtime.js'); + s = require("../../../../../utils/common.js"); +var regeneratorRuntime = require('../../../../../utils/runtime.js'); Page({ data: { details: [],//数据 diff --git a/pages/user/member/account_unable/account_unable.json b/packageD/pages/user/member/account_unable/account_unable.json index 8835af0..8835af0 100644 --- a/pages/user/member/account_unable/account_unable.json +++ b/packageD/pages/user/member/account_unable/account_unable.json diff --git a/pages/user/member/account_unable/account_unable.wxml b/packageD/pages/user/member/account_unable/account_unable.wxml index cb52919..cb52919 100644 --- a/pages/user/member/account_unable/account_unable.wxml +++ b/packageD/pages/user/member/account_unable/account_unable.wxml diff --git a/pages/user/member/account_unable/account_unable.wxss b/packageD/pages/user/member/account_unable/account_unable.wxss index 3727f39..3727f39 100644 --- a/pages/user/member/account_unable/account_unable.wxss +++ b/packageD/pages/user/member/account_unable/account_unable.wxss diff --git a/pages/user/member/account_unable/index.wxs b/packageD/pages/user/member/account_unable/index.wxs index e247f84..e247f84 100644 --- a/pages/user/member/account_unable/index.wxs +++ b/packageD/pages/user/member/account_unable/index.wxs diff --git a/pages/user/member/bring/bring.js b/packageD/pages/user/member/bring/bring.js index 8e1bb94..ae7c091 100644 --- a/pages/user/member/bring/bring.js +++ b/packageD/pages/user/member/bring/bring.js @@ -2,10 +2,10 @@ var t = getApp(), a = t.request, o = t.globalData.setting, os = o, - i = require("../../../../utils/util.js"), + i = require("../../../../../utils/util.js"), ut = i, - s = require("../../../../utils/common.js"); -var regeneratorRuntime = require('../../../../utils/runtime.js'); + s = require("../../../../../utils/common.js"); +var regeneratorRuntime = require('../../../../../utils/runtime.js'); var oo = t.globalData.setting; Page({ /** diff --git a/pages/user/member/bring/bring.json b/packageD/pages/user/member/bring/bring.json index 9e26dfe..9e26dfe 100644 --- a/pages/user/member/bring/bring.json +++ b/packageD/pages/user/member/bring/bring.json diff --git a/pages/user/member/bring/bring.wxml b/packageD/pages/user/member/bring/bring.wxml index 870889f..870889f 100644 --- a/pages/user/member/bring/bring.wxml +++ b/packageD/pages/user/member/bring/bring.wxml diff --git a/pages/user/member/bring/bring.wxss b/packageD/pages/user/member/bring/bring.wxss index 3497834..3497834 100644 --- a/pages/user/member/bring/bring.wxss +++ b/packageD/pages/user/member/bring/bring.wxss diff --git a/pages/user/member/bring/msg/msg.js b/packageD/pages/user/member/bring/msg/msg.js index 096e2ee..096e2ee 100644 --- a/pages/user/member/bring/msg/msg.js +++ b/packageD/pages/user/member/bring/msg/msg.js diff --git a/pages/user/member/bring/msg/msg.json b/packageD/pages/user/member/bring/msg/msg.json index 8835af0..8835af0 100644 --- a/pages/user/member/bring/msg/msg.json +++ b/packageD/pages/user/member/bring/msg/msg.json diff --git a/pages/user/member/bring/msg/msg.wxml b/packageD/pages/user/member/bring/msg/msg.wxml index ac650ae..ac650ae 100644 --- a/pages/user/member/bring/msg/msg.wxml +++ b/packageD/pages/user/member/bring/msg/msg.wxml diff --git a/pages/user/member/bring/msg/msg.wxss b/packageD/pages/user/member/bring/msg/msg.wxss index 3aab5b6..3aab5b6 100644 --- a/pages/user/member/bring/msg/msg.wxss +++ b/packageD/pages/user/member/bring/msg/msg.wxss diff --git a/pages/user/member/cash_record/cash_record.js b/packageD/pages/user/member/cash_record/cash_record.js index c7aa73f..21ea28e 100644 --- a/pages/user/member/cash_record/cash_record.js +++ b/packageD/pages/user/member/cash_record/cash_record.js @@ -2,10 +2,10 @@ var t = getApp(), a = t.request, o = t.globalData.setting, os = o, - i = require("../../../../utils/util.js"), + i = require("../../../../../utils/util.js"), ut = i, - s = require("../../../../utils/common.js"); -var regeneratorRuntime = require('../../../../utils/runtime.js'); + s = require("../../../../../utils/common.js"); +var regeneratorRuntime = require('../../../../../utils/runtime.js'); Page({ data: { parameter: false,//控制有没有数据的时候 diff --git a/pages/user/member/cash_record/cash_record.json b/packageD/pages/user/member/cash_record/cash_record.json index 9e26dfe..9e26dfe 100644 --- a/pages/user/member/cash_record/cash_record.json +++ b/packageD/pages/user/member/cash_record/cash_record.json diff --git a/pages/user/member/cash_record/cash_record.wxml b/packageD/pages/user/member/cash_record/cash_record.wxml index 9e5eae0..9e5eae0 100644 --- a/pages/user/member/cash_record/cash_record.wxml +++ b/packageD/pages/user/member/cash_record/cash_record.wxml diff --git a/pages/user/member/cash_record/cash_record.wxss b/packageD/pages/user/member/cash_record/cash_record.wxss index 51fcf34..51fcf34 100644 --- a/pages/user/member/cash_record/cash_record.wxss +++ b/packageD/pages/user/member/cash_record/cash_record.wxss diff --git a/pages/user/member/cash_record/index.wxs b/packageD/pages/user/member/cash_record/index.wxs index e247f84..e247f84 100644 --- a/pages/user/member/cash_record/index.wxs +++ b/packageD/pages/user/member/cash_record/index.wxs diff --git a/pages/user/member/filter.wxs b/packageD/pages/user/member/filter.wxs index c352e51..c352e51 100644 --- a/pages/user/member/filter.wxs +++ b/packageD/pages/user/member/filter.wxs diff --git a/pages/user/member/menber.js b/packageD/pages/user/member/menber.js index a5fa887..038452d 100644 --- a/pages/user/member/menber.js +++ b/packageD/pages/user/member/menber.js @@ -2,9 +2,9 @@ var e = function (e) { return e && e.__esModule ? e : { default: e }; -}(require("../../../utils/LoadMore.js")), t = getApp(), a = t.request, o = t.globalData.setting, os = o, - i = require("../../../utils/util.js"), ut = i, s = require("../../../utils/common.js"), n = new e.default(); -var regeneratorRuntime = require('../../../utils/runtime.js'); +}(require("../../../../utils/LoadMore.js")), t = getApp(), a = t.request, o = t.globalData.setting, os = o, + i = require("../../../../utils/util.js"), ut = i, s = require("../../../../utils/common.js"), n = new e.default(); +var regeneratorRuntime = require('../../../../utils/runtime.js'); Page({ /** * 页面的初始数据 diff --git a/pages/user/member/menber.json b/packageD/pages/user/member/menber.json index 9e26dfe..9e26dfe 100644 --- a/pages/user/member/menber.json +++ b/packageD/pages/user/member/menber.json diff --git a/pages/user/member/menber.wxml b/packageD/pages/user/member/menber.wxml index 67fa3c5..67fa3c5 100644 --- a/pages/user/member/menber.wxml +++ b/packageD/pages/user/member/menber.wxml diff --git a/pages/user/member/menber.wxss b/packageD/pages/user/member/menber.wxss index 5e086a0..5e086a0 100644 --- a/pages/user/member/menber.wxss +++ b/packageD/pages/user/member/menber.wxss diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js index b16ff8e..ecbf7aa 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -402,7 +402,7 @@ Page({ }) if (is_g_prom) { - await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + item.goods_id + "/1", {}).then(res => { + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + item.goods_id + "/1"+"/"+getApp().globalData.user_id, {}).then(res => { if (res.data.code == 0) { var r_data = res.data.data; if (!r_data.promGoodsLists) { @@ -611,7 +611,7 @@ Page({ else if(item.prom_type == 0) { //如果有优惠活动，要更新活动 - await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + item.goods_id + "/1", {}).then(res => { + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + item.goods_id + "/1"+"/"+getApp().globalData.user_id, {}).then(res => { if (res.data.code == 0) { var r_data = res.data.data; if (r_data.promGoodsLists) { @@ -2482,7 +2482,7 @@ Page({ //如果是优惠活动话，要看活动有没有过期 if (i_arr[j].prom_type == 3) { //判断有没有活动 - await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + i_arr[j].goods_id + "/1", {}).then(res => { + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + i_arr[j].goods_id + "/1"+"/"+getApp().globalData.user_id, {}).then(res => { if (res.data.code == 0) { if (!res.data.data.promGoodsLists) { t.my_warnning(i_arr[j].goods_name + "优惠活动已经过期", 0, th); diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index 3300684..894f5ef 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -1802,7 +1802,7 @@ Page({ var order_m = 0; //---判断是不是有订单优惠--- await getApp().request.promiseGet("/api/weshop/promorder/getOrderPromotion", { - data: { store_id: os.stoid, orderAmount: o_condition } + data: { store_id: os.stoid, orderAmount: o_condition,user_id:getApp().globalData.user_id} }).then(res => { if (res.data.code == 0) { var ord_prom = res.data.data; @@ -4052,7 +4052,7 @@ Page({ if (this.data.is_b_now == 1) pick = this.data.bn_pick; //---获取订单优惠--- getApp().request.promiseGet("/api/weshop/promorder/getOrderPromotion", { - data: { store_id: os.stoid, orderAmount: condition } + data: { store_id: os.stoid, orderAmount: condition,user_id:getApp().globalData.user_id } }).then(res => { if (res.data.code == 0) { var data = res.data.data; diff --git a/pages/distribution/distribution.wxml b/pages/distribution/distribution.wxml index 1372fc9..7a53c29 100644 --- a/pages/distribution/distribution.wxml +++ b/pages/distribution/distribution.wxml @@ -14,7 +14,7 @@ 可提现金额 - {{filter.show_default(data.liudong_money)}} + {{filter.show_default(data.liudong_money)}} diff --git a/pages/giftpack/buygiftpack/giftpackbuy.js b/pages/giftpack/buygiftpack/giftpackbuy.js index 54eeb67..11fd6c8 100644 --- a/pages/giftpack/buygiftpack/giftpackbuy.js +++ b/pages/giftpack/buygiftpack/giftpackbuy.js @@ -1,4 +1,5 @@ var i = require("../../../utils/util.js"); +var com = require("../public/buy_com.js"); var e = getApp(), a = e.globalData.setting, os = a, @@ -27,6 +28,44 @@ Page({ total: 0, //总数量 ad_data: null, first_leader: e.globalData.first_leader || 0, // 推荐人ID + + //门店相关 + 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: {}, //创建添加默认门店地址的对象 + + store:0, + openSpecModal:0 + }, onLoad: function (options) { this.setData({ @@ -80,6 +119,7 @@ Page({ }, onShow: function () { getApp().check_can_share(); + var th=this; //--先判断会员状态-- getApp().is_Single_page(this, function () { var user_info = getApp().globalData.userInfo; @@ -87,170 +127,114 @@ Page({ getApp().goto('/pages/togoin/togoin'); return false; } + com.wait_for_store_config(th); + com.set_user_mo_store(th,os); + }) this.init(); }, //购买礼包 GetBuyPrice: function (e) { - var that = this.data; + var th = this; - var id = e.currentTarget.dataset.id; //活动id - var my_confirm = th.selectComponent("#my_confirm"); //组件的id - var order_sn = e.currentTarget.dataset.order_sn; //订单号 - var money = e.currentTarget.dataset.money; //支付金额 - my_confirm.open( - "是否确定购买该礼包", - "取消", - "确定", - function () { - my_confirm.open_cancel(0); - }, - function () { - my_confirm.open_cancel(0); - var json = { - "actId": '', //活动Id - "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销 - "buyType": '2', //1=积分兑换 2=余额购买 - "giftBagId": id, //礼包Id - "storeId": that.getStorageID, //商家Id - "userId": that.getUserID, //用户ID - "buyFrom": 2, - "first_leader": that.first_leader, - }; + var index = e.currentTarget.dataset.index; //活动id + var sele_g=th.data.wareCard[index]; + this.data.payMoney=sele_g.payMoney; - //-- 分享导购要记录 -- - if (getApp().globalData.guide_id) { - json.guide_id = getApp().globalData.guide_id; + th.setData({sele_g:sele_g,buyType:2,}) + if(sele_g.is_pickup){ + if(sele_g.pickup_list && th.data.def_pick_store){ + com.check_def_pk(th); } - - var data = JSON.stringify(json); - var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert"; - getApp().request.json_post(url, json, - function (res) { - if (res.data.code == 0 && res.data.data) { - var order_sn = res.data.data.orderSn; - res = res.data.data.result; - if (!res) return false; - var url = "/pages/giftpack/payment/payment?money=" + money + "&order_sn=" + order_sn; - wx.requestPayment({ - timeStamp: String(res.timeStamp), - nonceStr: res.nonceStr, - package: res.packageValue, - signType: res.signType, - paySign: res.paySign, - success: function (res) { - getApp().goto(url); - }, - fail: function (res) { - getApp().my_warnning("取消支付", 0, th); - } - }); - } else { - getApp().my_warnning(res.data.msg, 0, th); + com.get_sto(th,os) + th.setData({ + openSpecModal:1 + }) + }else{ + var my_confirm = th.selectComponent("#my_confirm"); //组件的id + my_confirm.open( + "是否确定购买该礼包", + "取消", + "确定", + function () { + my_confirm.open_cancel(0); + }, + function () { + my_confirm.open_cancel(0); + com.buy_libao(th) } - }, - function (res) { - - } ) + } - } - ) }, // 积分兑换 GetBuyIntegral: function (e) { - var that = this.data; - var th = this; - var id = e.currentTarget.dataset.id; //活动id - var my_confirm = th.selectComponent("#my_confirm"); //组件的id - - my_confirm.open( - "是否确定兑换该礼包", - "取消", - "确定", - function () { - my_confirm.open_cancel(0); - }, - function () { - my_confirm.open_cancel(0); - var json = { - "actId": '', //活动Id - "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销 - "buyType": '1', //1=积分兑换 2=余额购买 3=免费领取 - "giftBagId": id, //礼包Id - "storeId": that.getStorageID, //商家Id - "userId": that.getUserID, //用户ID - "buyFrom": 2, - "first_leader": that.first_leader - }; - - //-- 分享导购要记录 -- - if (getApp().globalData.guide_id) { - json.guide_id = getApp().globalData.guide_id; - } - console.log(json, 'json'); - var data = JSON.stringify(json); - var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert"; - getApp().request.json_post(url, json, - function (res) { - if (res.data.code == 0) { - getApp().my_warnning("兑换成功！", 1, th); - } else { - getApp().my_warnning(res.data.msg, 0, th); - } - }, - function (res) { }) - - }) + var th = this; + var index = e.currentTarget.dataset.index; //活动id + var sele_g=th.data.wareCard[index]; + th.setData({sele_g:sele_g, buyType:1,}) + if(sele_g.is_pickup){ + if(sele_g.pickup_list && th.data.def_pick_store){ + com.check_def_pk(th); + } + com.get_sto(th,os) + th.setData({ + openSpecModal:1 + }) + }else { + var my_confirm = th.selectComponent("#my_confirm"); //组件的id + my_confirm.open( + "是否确定兑换该礼包", + "取消", + "确定", + function () { + my_confirm.open_cancel(0); + }, + function () { + my_confirm.open_cancel(0); + com.buy_libao(th) + }) + } }, //免费领取 GetFree: function (e) { - var that = this.data; - var th = this; - var id = e.currentTarget.dataset.id; //活动id - var my_confirm = th.selectComponent("#my_confirm"); //组件的id - my_confirm.open( - "是否确定领取该礼包", - "取消", - "确定", - function () { - my_confirm.open_cancel(0); - }, - function () { - my_confirm.open_cancel(0); - var json = { - "actId": '', //活动Id - "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销 - "buyType": '3', //1=积分兑换 2=余额购买 3=免费领取 - "giftBagId": id, //礼包Id - "storeId": that.getStorageID, //商家Id - "userId": that.getUserID, //用户ID - "buyFrom": 2, - "first_leader": that.first_leader - }; - //-- 分享导购要记录 -- - if (getApp().globalData.guide_id) { - json.guide_id = getApp().globalData.guide_id; - } - var data = JSON.stringify(json); - var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert"; - getApp().request.json_post(url, json, - function (res) { - if (res.data.code == 0) { - getApp().my_warnning("领取成功！", 1, th); - } else { - getApp().my_warnning(res.data.msg, 0, th); - } - }, - function (res) { }) - }) + + var th = this; + var index = e.currentTarget.dataset.index; //活动id + var sele_g=th.data.wareCard[index]; + th.setData({sele_g:sele_g, buyType:3,}) + + if(sele_g.is_pickup){ + if(sele_g.pickup_list && th.data.def_pick_store){ + com.check_def_pk(th); + } + com.get_sto(th,os) + th.setData({ + openSpecModal:1 + }) + }else { + + + var my_confirm = th.selectComponent("#my_confirm"); //组件的id + my_confirm.open( + "是否确定领取该礼包", + "取消", + "确定", + function () { + my_confirm.open_cancel(0); + }, + function () { + my_confirm.open_cancel(0); + com.buy_libao(th) + }) + } }, getList: function (e) { @@ -327,6 +311,7 @@ Page({ }, onShareAppMessage: function (e) { + getApp().globalData.no_clear=1; var curPage = this; var pagePath = curPage.route; //当前页面url if (pagePath.indexOf('/') != 0) { @@ -341,6 +326,7 @@ Page({ // 分享朋友圈 onShareTimeline() { + getApp().globalData.no_clear=1; var curPage = this; var pagePath = curPage.route; //当前页面url if (pagePath.indexOf('/') != 0) { @@ -354,4 +340,271 @@ Page({ } }, + + //--- 设置一下默认库存的数量 ---- + 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 + }) + }, + // 选择门店 + choice_store: function (ee) { + var th = this; + var ind = ee.currentTarget.dataset.ind; + var bconfig = th.data.bconfig; + + if (!th.data.only_pk && !th.data.def_pickpu_list) { + getApp().confirmBox("门店库存不足", null, 25000, !1); + return false; + } + + if (th.data.only_pk && !th.data.only_pk.length) { + getApp().confirmBox("门店库存不足", null, 25000, !1); + return false; + } + if (th.data.def_pickpu_list && !th.data.def_pickpu_list.length) { + getApp().confirmBox("门店库存不足", null, 25000, !1); + return false; + } + + + if (bconfig && bconfig.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; + th.setData({ + is_gps: 1 + }); + //th.onShow(); + com.get_sto(th,os); + }, + fail: function (res) { + //th.onShow(); + th.data.is_get_local_ok = 1; + com.get_sto(th,os); + if (res.errCode == 2) { + th.setData({ + is_gps: 0 + }); + if (th.data.is_gps == 0) { + getApp().confirmBox("请开启GPS定位", null, 25000, !1); + } + } else { + th.setData({ + is_gps: "3" + }); + } + + } + }) + } else { + th.data.is_get_local_ok = 1; + com.get_sto(th,os); + } + + if (ind != undefined && ind != null) { + this.setData({ + open_ind_store: ind, + store: 1, + openSpecModal: !1, + openSpecModal_pt: !1, + openSpecModal_flash_normal: !1, + }) + } else { + this.setData({ + store: 1, + openSpecModal: !1, + openSpecModal_pt: !1, + openSpecModal_flash_normal: !1 + + }) + } + }, + //关闭选择门店 + close_popup: function (e) { + var th = this; + this.setData({ + store: 0, + choice_sort_store: 0, + sort_store: 0, + fir_pick_index: 0, + sec_pick_index: 0 + }) + + var openindstore = this.data.open_ind_store; + if (openindstore == 1) { + th.setData({ + openSpecModal: !0, + openSpecModal_ind: openindstore, + }); + } else if (openindstore == 2) { + th.setData({ + openSpecModal: !0, + openSpecModal_ind: openindstore, + }); + } + else if (openindstore == 4) { //4就是拼团 + th.setData({ + openSpecModal_pt: 1, //打开拼团购买界面 + store: 0, //关闭门店 + choice_sort_store: 0, //关闭门店2级 + sort_store: 0, //关闭门店2级 + }); + } + else { + th.setData({ + store: 0, + choice_sort_store: 0, + sort_store: 0 + }) + } + + + }, + + //选择更多门店 + 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_sto: item, + sec_pick_index: 0 + }); + }, + + choose_for_store_fir: function (e) { + var index_c = e.currentTarget.dataset.ind; + var th = this; + th.setData({ + fir_pick_index: index_c + }) + + }, + + //确定def_pick为选择的门店 + sure_pick: function (e) { + var th = this; + var item = null; + var openindstore = th.data.open_ind_store; + + if (th.data.choice_sort_store == 0) { + var index = th.data.fir_pick_index; + if (th.data.is_show_sto_cat == 1) { + item = th.data.def_pickpu_list[index]; + } else { + item = th.data.only_pk[index]; //当没有门店分类的时候 + } + + } else { + var index = th.data.sec_pick_index; + item = th.data.sec_sto.s_arr[index]; + } + + if (!th.data.sele_g) return false; + + 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, + }); + + + }, + //---点击二级之后的选择--- + 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 + }) + + }, + //把选择的门店设置成默认的门店def_pick + set_def_pick: function (e) { + var th = this; + var item = null; + if (th.data.choice_sort_store == 0) { + var index = th.data.fir_pick_index; + if (th.data.is_show_sto_cat == 1) { + item = th.data.def_pickpu_list[index]; + } else { + item = th.data.only_pk[index]; //当没有门店分类的时候 + } + } else { + var index = th.data.sec_pick_index; + item = th.data.sec_sto.s_arr[index]; + } + + 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, + openSpecModal: !0, + }); + + var user_id=getApp().globalData.user_id; + var def_pickup_id = item.pickup_id; + getApp().request.put('/api/weshop/users/update', { + data: { + user_id: user_id, + def_pickup_id: def_pickup_id + }, + success: function (res) { + if (res.data.code == 0) { + if (th.data.choice_sort_store == 0) th.setData({ + fir_pick_index: 0 + }); + getApp().globalData.pk_store = item; + } else { + getApp().my_warnning("设置默认门店地址失败", 0, th) + } + + } + }); + + + + }, + closeSpecModal: function () { + this.setData({openSpecModal: 0}); + }, + + buy_libao:function () { + com.buy_libao(this) + } }) \ No newline at end of file diff --git a/pages/giftpack/buygiftpack/giftpackbuy.wxml b/pages/giftpack/buygiftpack/giftpackbuy.wxml index ab4a751..338b8a4 100644 --- a/pages/giftpack/buygiftpack/giftpackbuy.wxml +++ b/pages/giftpack/buygiftpack/giftpackbuy.wxml @@ -62,30 +62,30 @@ - + - + - + - + - + @@ -116,4 +116,6 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/pages/giftpack/buygiftpack/giftpackbuy.wxss b/pages/giftpack/buygiftpack/giftpackbuy.wxss index b9a7391..f77f8bf 100644 --- a/pages/giftpack/buygiftpack/giftpackbuy.wxss +++ b/pages/giftpack/buygiftpack/giftpackbuy.wxss @@ -1,9 +1,6 @@ /*引用样式路径*/ @charset "UTF-8"; - -/* Author XGQ - * 2019-11-12 - */ +@import '../../goods/goodsInfo/goodsInfo.wxss'; page { /* background-color: #fb7454; */ diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js index 548ea43..a9d09ea 100644 --- a/pages/giftpack/giftpacklist/giftpacklist.js +++ b/pages/giftpack/giftpacklist/giftpacklist.js @@ -4,6 +4,7 @@ var e = getApp(), t = e.request, d = e.globalData; var ut = require("../../../utils/util.js"); +var com = require("../public/buy_com.js"); Page({ data: { @@ -30,6 +31,43 @@ Page({ is_lb: 0, //是否有礼包 default_color: null, first_leader: e.globalData.first_leader || 0, // 推荐人ID + + //门店相关 + 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: {}, //创建添加默认门店地址的对象 + + store:0, + openSpecModal:0 }, onLoad: function (options) { this.setData({ @@ -37,7 +75,7 @@ Page({ }) }, init(){ - let options = this.data?.params; + let options = this.data?.params; // this.data == null ? undefined:this.data.params var th = this; this.setData({ getUserID: d.user_id, @@ -47,6 +85,7 @@ Page({ isBuy: options.isBuy, getGiftID: options.lbId, orderSn: options.orderSn, + flag: options.flag, // 如果从商品详情页的促销处点击专享礼包跳转到此页，则flag为1 }) if (options.lbId) th.data.lbId = options.lbId; //-- 获取分享人的ID -- @@ -65,11 +104,17 @@ Page({ }) } th.close(); - if (this.data.isBuy == 0) { - this.GetMyGiftList(); - } else { - this.GetBuyGiftList(); - } + + + if(this.data.flag == 1) { + this.getZxlbDetails(); + } else { + if (this.data.isBuy == 0) { + this.GetMyGiftList(); + } else if (this.data.isBuy == 1) { + this.GetBuyGiftList(); + }; + }; }, onShow: function () { @@ -87,81 +132,37 @@ Page({ GetBuyPrice: function (e) { var that = this.data; var th = this; - // var id = e.currentTarget.dataset.id;//活动id //如果还没有开始的话 if (th.data.isStart != 1) { getApp().my_warnning("活动还没有开始", 0, th); return false; } - - var money = e.currentTarget.dataset.money; - var my_confirm = th.selectComponent("#my_confirm"); //组件的id - my_confirm.open( - "是否确定购买该礼包", - "取消", - "确定", - function () { - my_confirm.open_cancel(0); - }, - function () { - my_confirm.open_cancel(0); - - var json = { - "actId": '', //活动Id - "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销 - "buyType": '2', //1=积分兑换 2=余额购买 - "giftBagId": that.getGiftID, //礼包Id - "storeId": a.stoid, //商家Id - "userId": d.user_id, //用户ID - "buyFrom": 2, - "first_leader": that.first_leader, - }; - - //-- 分享导购要记录 -- - if (getApp().globalData.guide_id) { - json.guide_id = getApp().globalData.guide_id; - } - - var data = JSON.stringify(json); - var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert"; - - getApp().request.json_post(url, json, - function (res) { - if (res.data.code == 0) { - var res = res.data.data; - if (!res) return false; - if (!res.result) return false; - - var order_sn = res.orderSn; - var url = "/pages/giftpack/payment/payment?money=" + money + "&order_sn=" + order_sn; - wx.requestPayment({ - timeStamp: String(res.result.timeStamp), - nonceStr: res.result.nonceStr, - package: res.result.packageValue, - signType: res.result.signType, - paySign: res.result.paySign, - success: function (n) { - getApp().goto(url); - }, - fail: function (n) { - getApp().my_warnning("取消支付", 0, th); - } - }); - } else { - getApp().my_warnning(res.data.msg, 0, th); + this.data.payMoney=th.data.sele_g.payMoney; + th.setData({ buyType:2 }) + if(th.data.sele_g.is_pickup){ + th.setData({ + openSpecModal:1 + }) + }else{ + var my_confirm = th.selectComponent("#my_confirm"); //组件的id + my_confirm.open( + "是否确定购买该礼包", + "取消", + "确定", + function () { + my_confirm.open_cancel(0); + }, + function () { + my_confirm.open_cancel(0); + com.buy_libao(th) } - }, - function (res) { - - } ) + } - } - ) }, GetBuyIntegral: function (e) { @@ -173,48 +174,28 @@ Page({ getApp().my_warnning("活动还没有开始", 0, th); return false; } - // var id = e.currentTarget.dataset.id;//活动id - var my_confirm = th.selectComponent("#my_confirm"); //组件的id - my_confirm.open( - "是否确定兑换该礼包", - "取消", - "确定", - function () { - my_confirm.open_cancel(0); - }, - function () { - my_confirm.open_cancel(0); - var json = { - "actId": '', //活动Id - "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销 - "buyType": '1', //1=积分兑换 2=余额购买 - "giftBagId": that.getGiftID, //礼包Id - "storeId": a.stoid, //商家ID - "userId": d.user_id, //用户ID - "buyFrom": 2, - "first_leader": that.first_leader, - }; - //-- 分享导购要记录 -- - if (getApp().globalData.guide_id) { - json.guide_id = getApp().globalData.guide_id; - } - var data = JSON.stringify(json); - var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert"; - getApp().request.json_post(url, json, - function (res) { - if (res.data.code == 0) { - getApp().my_warnning("兑换成功！", 1, th); - } else { - getApp().my_warnning(res.data.msg, 0, th); - } - }, - function (res) { + th.setData({ buyType:1 }); + if(th.data.sele_g.is_pickup){ + th.setData({ + openSpecModal:1 + }) + }else { + var my_confirm = th.selectComponent("#my_confirm"); //组件的id + my_confirm.open( + "是否确定兑换该礼包", + "取消", + "确定", + function () { + my_confirm.open_cancel(0); + }, + function () { + my_confirm.open_cancel(0); + com.buy_libao(th) + }) + } - } - ) - }) }, @@ -280,6 +261,19 @@ Page({ break; } } + + if(res.data.data.pickup_id){ + getApp().request.get("/api/weshop/pickup/get/"+os.stoid+"/"+res.data.data.pickup_id,{ + success: function (res) { + if(res.data.code==0){ + th.setData({pick_up:res.data.data}); + } + } + }); + + } + + } else { getApp().my_warnning(res.data.msg, 0, th); return false; @@ -334,7 +328,20 @@ Page({ actTitle: res.data.data.actTitle, wareCard: res.data.data.wareCard, isStart: isStart, + sele_g:res.data.data }) + + + var sele_g=res.data.data; + com.wait_for_store_config(_this2); + com.set_user_mo_store(_this2,os,function () { + if(sele_g.pickup_list && _this2.data.def_pick_store){ + com.check_def_pk(_this2); + } + }); + com.get_sto(_this2,os); + + } else { getApp().my_warnning(res.data.msg, 0, _this2); return false; @@ -343,6 +350,84 @@ Page({ }); }, + + getZxlbDetails: function () { + + var th = this; + getApp().request.get('/api/weshop/marketing/giftbag/detail/getNew', { + isShowLoading: true, + data: { + "storeId": a.stoid, //商家ID + //"userId": d.user_id, //用户ID + "giftBagId": th.data.lbId + }, + success: function (res) { + if (res.data.code == 0) { + th.setData({ + giftImage: th.data.iurl + res.data.data.lbUrl, + giftTitle: res.data.data.lbTitle, + default_color: res.data.data.bgcolor + }) + if (res.data.data.lbIntro == '') { + th.setData({ + giftRemark: '暂无详情......' + }) + } else { + th.setData({ + giftRemark: res.data.data.lbIntro.replace(/\ + + + {{pick_up.pickup_name}} + + {{giftTitle}} - - - - {{"活动开始时间："+giftStart}} - - - - {{"兑换结束时间："+giftDate}} - - {{"活动结束时间："+giftDate}} - - - + + + + {{"活动开始时间："+giftStart}} + + + + {{"兑换结束时间："+giftDate}} + + {{"活动结束时间："+giftDate}} + + + + + + {{"兑换时间：领取后"+exchangeDay+"天内兑换"}} + + + {{"兑换时间："+exchangeStartTime+"至"+exchangeEndTime}} + + {{"￥"+giftPrice}} @@ -39,7 +52,8 @@ {{"零售价:"+giftPosPrice+"元"}} - {{"已售:"+giftQty+"件"}} + {{"已售:"+giftQty+"件"}} + {{"数量:"+giftQty+"件"}} @@ -77,7 +91,7 @@ {{"数量:"+item.num}} - + 已核销 @@ -86,21 +100,16 @@ - + + + - - - + - + @@ -121,68 +130,73 @@ - - - - - - - 立即购买 - - - 立即兑换 - - - - - 立即购买 - - - - - 立即兑换 - - - - - - 免费领取 - - - - - - - - - - 活动还未开始 - - - - - - - - - - 无核销商品 - - - - - 立即使用 - - - 商品已核销 - - - 商品兑换时间已过 - - - - - + + + + + + + + + + + 立即购买 + + + 立即兑换 + + + + + 立即购买 + + + + + 立即兑换 + + + + + + 免费领取 + + + + + + + + + + 活动还未开始 + + + + + + + + + + 无核销商品 + + + + + 立即使用 + + + 商品已核销 + + + 商品兑换时间已过 + + + + + + @@ -190,4 +204,6 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/pages/giftpack/giftpacklist/giftpacklist.wxss b/pages/giftpack/giftpacklist/giftpacklist.wxss index 958233b..9fb4397 100644 --- a/pages/giftpack/giftpacklist/giftpacklist.wxss +++ b/pages/giftpack/giftpacklist/giftpacklist.wxss @@ -1,8 +1,5 @@ @charset "UTF-8"; - -/* Author XGQ - * 2019-12-12 - */ +@import '../../goods/goodsInfo/goodsInfo.wxss'; .box.data-v-3a5b7e36 { -webkit-align-content: center; diff --git a/pages/giftpack/public/buy_com.js b/pages/giftpack/public/buy_com.js new file mode 100644 index 0000000..95adf88 --- /dev/null +++ b/pages/giftpack/public/buy_com.js @@ -0,0 +1,506 @@ +module.exports = { + //开启定位 + wait_for_store_config: function (th) { + 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(th,os,func){ + var that=th; + //获取用户的默认门店 + getApp().get_user_store(function (e) { + if (!e) { + th.data.fir_def_store = {}; //赋值空对象 + return false; + } + 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) + }) + + }, + + //---------拿出门店分类和门店------------ + get_sto(th,os) { + 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; + + 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) + + }, + + //-- 统一购买 -- + buy_libao:function (th) { + if(th.data.sele_g.is_pickup){ + if(!th.data.def_pick_store && !th.data.def_pick_store.pickup_id){ + getApp().my_warnning("请先选择门店", 1, th); + return false; + } + + if(th.data.def_pick_store.is_no_dis){ + getApp().my_warnning("门店不匹配，请重新选择", 1, th); + return false; + } + } + + th.setData({submit:1}) + var id=th.data.sele_g.lbId; + var that=th; + var json = { + "actId": '', //活动Id + "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销 + "buyType":""+that.data.buyType, //1=积分兑换 2=余额购买 + "giftBagId": id, //礼包Id + "storeId": that.data.getStorageID, //商家Id + "userId": that.data.getUserID, //用户ID + "buyFrom": 2, + }; + + if(that.data.first_leader){ + json.first_leader=that.data.first_leader + } + if(that.data.guide_id){ + json.guide_id=that.data.guide_id + } + + if(that.data.def_pick_store){ + json.pickup_id=that.data.def_pick_store.pickup_id; + } + + //-- 分享导购要记录 -- + if (getApp().globalData.guide_id) { + json.guide_id = getApp().globalData.guide_id; + } + + var url ="/api/weshop/marketing/buy/receive/gift/record/insert"; + getApp().request.json_post(url, json, + function (res) { + if (res.data.code == 0 && res.data.data) { + switch(that.data.buyType){ + case 1://立即兑换 + th.setData({submit:0}) + getApp().my_warnning("兑换成功！", 1, th); + th.closeSpecModal(); + break; + case 2://立即购买 + var order_sn = res.data.data.orderSn; + res = res.data.data.result; + if (!res) return false; + var money=that.data.payMoney; + var url = "/pages/giftpack/payment/payment?money=" + money + "&order_sn=" + order_sn; + wx.requestPayment({ + timeStamp: String(res.timeStamp), + nonceStr: res.nonceStr, + package: res.packageValue, + signType: res.signType, + paySign: res.paySign, + success: function (res) { + th.setData({submit:0}) + getApp().goto(url); + }, + fail: function (res) { + th.setData({submit:0}) + getApp().my_warnning("取消支付", 0, th); + } + }); + break; + case 3://立即领取 + th.setData({submit:0}) + getApp().my_warnning("领取成功！", 1, th); + th.closeSpecModal(); + break; + } + + } else { + th.setData({submit:0}) + getApp().my_warnning(res.data.msg, 0, th); + } + }, + function (res) { + th.setData({submit: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 (th) { + 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}) + + } + + + + +} \ No newline at end of file diff --git a/pages/giftpack/public/buy_com.wxml b/pages/giftpack/public/buy_com.wxml new file mode 100644 index 0000000..1e03985 --- /dev/null +++ b/pages/giftpack/public/buy_com.wxml @@ -0,0 +1,257 @@ + + + + + + + + {{choice_sort_store==0?'附近的门店':region_name}} + + + + + + {{choice_sort_store==0?'更多门店':'返回'}} + + + + + + + + + + + + + + Г + + + + + + + + {{item.pickup_name}} + + + + 距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+'km':filters.toFix(item.distance,0)+"m"}} + + + + 地址:{{item.fulladdress}} + + + + + + + + + + Г + + + + + + + + {{item.pickup_name}} + + + + 距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}} + + + + 地址:{{item.fulladdress}} + + + + + + + + + + + + Г + + + + + + + + {{item.pickup_name}} + + + + 距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}} + + + + 地址:{{item.fulladdress}} + + + + + + + + + + 确定 + + + 设为默认 + + + + + + + 门店分类选择 + + + + + + 返回 + + + + + + + {{item.name}} + + + + + + + + + + + \ No newline at end of file diff --git a/pages/goods/categoryList/categoryList.wxml b/pages/goods/categoryList/categoryList.wxml index 6be3964..698f371 100644 --- a/pages/goods/categoryList/categoryList.wxml +++ b/pages/goods/categoryList/categoryList.wxml @@ -81,7 +81,7 @@ - + {{item}} diff --git a/pages/goods/categoryList/categoryList.wxss b/pages/goods/categoryList/categoryList.wxss index 70b7982..2ece175 100644 --- a/pages/goods/categoryList/categoryList.wxss +++ b/pages/goods/categoryList/categoryList.wxss @@ -130,6 +130,10 @@ line-height: 50rpx; font-family: Arial, Helvetica, sans-serif; z-index: 99999999999; } +.nav.my-nav { + display: inline; + overflow: visible; +} .letter { width: 35.6rpx; height: 35.6rpx; diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 00e38c7..2ab34f0 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -370,7 +370,7 @@ Page({ } //调用接口判断商家plus有没有过期 - i.promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=3", {}).then(res => { + getApp().request.promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=3", {}).then(res => { if (res.data.code == 0) { var arr = res.data.data.pageData; if (arr.length > 0) { @@ -1248,7 +1248,7 @@ Page({ //让商品带上房间号 //让商品带上房间号 - if (th.data.sys_switch.is_skuroom_id == 1) { + if (!th.data.sys_switch.is_skuroom_id && th.data.sys_switch.is_skuroom_id == 1) { if (th.data.data.goods_id == getApp().globalData.room_goods_id) { newd.room_id = getApp().globalData.room_id; } @@ -1354,7 +1354,7 @@ Page({ //让商品带上房间号 //让商品带上房间号 - if (th.data.sys_switch.is_skuroom_id == 1) { + if (!th.data.sys_switch.is_skuroom_id && th.data.sys_switch.is_skuroom_id == 1) { if (th.data.data.goods_id == getApp().globalData.room_goods_id) { newd.room_id = getApp().globalData.room_id; } @@ -2138,7 +2138,7 @@ Page({ callback(); } else { //-- 判断有没有优惠活动 -- - getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + th.data.sele_g.goods_id + "/0", {}).then(res => { + getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + th.data.sele_g.goods_id + "/0"+"/"+usr.user_id, {}).then(res => { if (res.data.code == 0) { var r_data = res.data.data; th.data.prom_goods = r_data.promGoodsLists; @@ -4243,7 +4243,7 @@ Page({ } //让商品带上房间号 - if (th.data.sys_switch.is_skuroom_id == 1) { + if (!th.data.sys_switch.is_skuroom_id && th.data.sys_switch.is_skuroom_id == 1) { if (th.data.data.goods_id == getApp().globalData.room_goods_id) { newd.room_id = getApp().globalData.room_id; } @@ -6118,9 +6118,8 @@ Page({ } else { //调用接口判断订单优惠， - getApp().request.get("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + gid + "/0", { + getApp().request.get("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + gid + "/0"+"/"+user_id, { success: function (res) { - if (res.data.code == 0 && res.data.data) { var r_data = res.data.data; var max = 0, min = 0; @@ -6552,10 +6551,18 @@ Page({ // 促销 -> 送礼包 -> 查看详情 viewLbDetails(e) { let id = e.currentTarget.dataset.id; // 获取礼包id - let url = `/packageA/pages/myGiftDetails/myGiftDetails?btn=0&index=0&id=${id}`; // btn=0 控制跳转到的页面不显示按钮 + let flag = e.currentTarget.dataset.flag; + let url = ''; + if(flag == 1) { // flag =1 控制跳转到专享礼包 + url = `/pages/giftpack/giftpacklist/giftpacklist?lbId=${id}&flag=1`; + } else { + url = `/packageA/pages/myGiftDetails/myGiftDetails?btn=0&index=0&id=${id}`; // btn=0 控制跳转到的页面不显示按钮 + }; // console.log('myurl', url); getApp().goto(url); }, + + go_more_ladder: function (e) { var prom_id = e.currentTarget.dataset.id; diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml index d041c64..cd7cfa8 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxml +++ b/pages/goods/goodsInfo/goodsInfo.wxml @@ -499,7 +499,7 @@ 促销 - + @@ -519,7 +519,7 @@ 送{{item.couponMoney}}元优惠券 送商品{{item.goods_name}} 送{{item.lbtitle}} - 送{{item.zxlbtitle}} + 送{{item.zxlbtitle}} diff --git a/pages/index/index/index.js b/pages/index/index/index.js index 03fc98f..052a9a3 100644 --- a/pages/index/index/index.js +++ b/pages/index/index/index.js @@ -1,16 +1,16 @@ var e = function (e) { - return e && e.__esModule ? e : { - default: e - }; + return e && e.__esModule ? e : { + default: e + }; }(require("../../../utils/LoadMore.js")), - t = getApp(), - a = t.request, - o = t.globalData.setting, - os = o, - i = require("../../../utils/util.js"), - ut = i, - s = require("../../../utils/common.js"), - n = new e.default(); + t = getApp(), + a = t.request, + o = t.globalData.setting, + os = o, + i = require("../../../utils/util.js"), + ut = i, + s = require("../../../utils/common.js"), + n = new e.default(); var regeneratorRuntime = require('../../../utils/runtime.js'); var api = require('../../../api/api.js'); var d = getApp().globalData; @@ -19,1202 +19,1200 @@ var full_screen = require('full_screen.js'); Page({ - data: { - url: o.imghost, - swiperimage: [{ - image: "/miniapp/images/title.png", - nav_url: 0 - }], - resourceUrl: o.resourceUrl, - logo: o.appLogo, - homeData: null, - saleGoods: null, - sale: { - countTime: { - hour: 0, - minute: 0, - second: 0 - }, - diffTime: 0, - good: null, - }, - timer: null, - recommend: null, - scrollTop: 0, - currentPage: 1, - banner: null, - - appdata: null, - saleGoods: null, //秒杀数据 - pindGoods: null, //拼单数据 - newGoods: null, //新商品 - hotGoods: null, //hot商品 - preGoods:null, //预售商品 - //----控制是是否显示计时器--- - is_timer: 1, - ishow: 0, - //是不是显示自定义模板 - isTemplate: 0, - template_arr: null, - bgcolor_t: '', - - banner_index: 0, - flash_index: 0, - pt_index: 0, - - pt_timer_item: null, - pt_timer_arr: null, - pt_timer: null, - pt_timer_active: 0, - //看下商家是否开通会员权益 - is_boot: 0, - gd_category: null, - is_no_more: 0, - max_sw_height: 0, //banner的最大高度 - is_disgraceful: 0, //是否显示新人广告 - new_image: "", //新人有礼弹窗图片 - new_nav: "", //新人页面跳转地址 - w_holiday_pop: 0, - - showHongbao: false, - showHongbaoSmall: false, - - is_full_screen_show: 0, //全屏显示 - sec_show: 3, //倒计时的秒数 - full_ad: null, //全屏广告 - full_screen: 0, //全屏广告 - is_ok_h5:0, //判断要不要显示关注二维码 - }, - - onLoad: async function (tt) { - var th = this; - var first_leader = tt.first_leader; - if (!first_leader && 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]; - } - } - - getApp().getConfig(function (e) { - //--首页的问题-- - if (getApp().globalData.config && getApp().globalData.config.store_name != undefined && getApp().globalData.config.store_name != null) { - wx.setNavigationBarTitle({ - title: getApp().globalData.config.store_name, - }); - } else { - wx.setNavigationBarTitle({ - title: getApp().globalData.setting.appName, - }); - }; - }); - - - var th = this; - getApp().getConfig2(function (config2) { - if (config2 && config2.is_overdue == 1) { - getApp().promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=5", {}).then(res => { - var o = res; - if (o.data.code == 0) { - var ob = { isout: 0, isbuy: 1 }; - var arr = o.data.data.pageData; - var isbuy = 0; - //----如果数组不为空---- - if (arr.length > 0) { - arr.forEach(function (val, ind) { - if (val.is_sy == 0 && val.type == 5) { - isbuy = 1; - var now = ut.gettimestamp(); - if (now > val.end_time) ob.isout = 1; - return false; - } - }) - } - ob.isbuy = isbuy; - - var pages = getCurrentPages(); //获取加载的页面 - var currentPage = pages[pages.length - 1]; //获取当前页面的对象 - - // console.log("当前路由"); - // console.log(currentPage.route); - - - th.setappdata(ob); - - if (ob.isbuy && !ob.isout) { - th.onload_init(); - } - } else { - th.onload_init(); - } - }) - } - else { - th.onload_init(); - } - }) - - if (first_leader) { - //-- user_id代过来免登录 -- - getApp().globalData.first_leader = first_leader; - //调用接口判断是不是会员 - getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { - if (res.data.code == 0) { - getApp().globalData.guide_id = res.data.data.id; - } - }) - } - - // 判断是否有红包活动 - getApp().request.promiseGet('/api/weshop/redmoney/redConfig/get/' + getApp().globalData.setting.stoid, { - data: {} - }).then(function (data) { - let code = data.data.code; - if (code == 0) { - - th.setData({ - showHongbao: true, - }); - } else if (code == -1) { - th.setData({ - showHongbao: false, - }); - }; - }); - - - // console.log(9090909); - //看一下商家是否开通了权益 - //--初始化是否有打勾-- - getApp().request.promiseGet("/api/weshop/users/grade/vip/init/get", { - data: { - storeId: os.stoid - } - }).then(res => { - if (res.data.data) { - var is_init = res.data.data.isBool; - th.setData({ - is_boot: is_init - }); - - if (!is_init) { - th.setData({ - swiperimage: [] - }); - } - } - }) - - //调用底部导航 - //getApp().globalData.url=th.data.url - //t.editTabBar(th,o.stoid,th.data.url); - - }, - - async onload_init() { - var th = this; - await this.init_load(); - //显示的时候要开启计时器 - this.data.is_timer = 1; - //如果是自定义模板 - if (this.data.isTemplate) { - //---先获取会员--- - //t.getUserFir(function () { - if(getApp().globalData.user_id) { - th.is_festival(); - var new_nav = th.data.new_nav; - if (new_nav == "") { - th.is_new(); - } - // sty - setTimeout(function () { - if (getApp().globalData.user_id) getApp().requestCardNum(th); - }, 500) - } - - //}); - } else { - await this.init_fir(); - wx.setNavigationBarColor({ - frontColor: '#ffffff', // 必写项 - backgroundColor: '#ff7295', // 必写项 - }) - } - - //--正再拼团中的处理-- - var url = "/api/weshop/order/pageTuan?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; - } - }) - if (th.data.pt_timer_arr && th.data.pt_timer_arr.length > 0) { - for (var i in th.data.pt_timer_arr) { - var p_item = th.data.pt_timer_arr[i]; - await getApp().request.promiseGet("/api/weshop/users/get/" + os.stoid + "/" + p_item.user_id, { - 1: 1 - }).then(res => { - th.data.pt_timer_arr[i].head_pic = res.data.data.head_pic; - th.data.pt_timer_arr[i].nickname = res.data.data.nickname; - }) - } - th.Interval_pt(); - } - - //---处理正在6个分类---- - await getApp().request.promiseGet("/api/weshop/goodscategory/page", { - data: { - store_id: os.stoid, - pageSize: 5, - is_show: 1, - level: 1 - } - }).then(res => { - if (res.data.data) { - var gd_category = res.data.data.pageData; - th.setData({ - gd_category: gd_category - }); - } - }) - }, - - - //关闭新用户领取广告 - close_disgraceful: function () { - var th = this; - th.setData({ - is_disgraceful: 0 - }) - }, - - async onShow() { - - getApp().check_can_share(); + data: { + url: o.imghost, + swiperimage: [{ + image: "/miniapp/images/title.png", + nav_url: 0 + }], + resourceUrl: o.resourceUrl, + logo: o.appLogo, + homeData: null, + saleGoods: null, + sale: { + countTime: { + hour: 0, + minute: 0, + second: 0 + }, + diffTime: 0, + good: null, + }, + timer: null, + recommend: null, + scrollTop: 0, + currentPage: 1, + banner: null, + + appdata: null, + saleGoods: null, //秒杀数据 + pindGoods: null, //拼单数据 + newGoods: null, //新商品 + hotGoods: null, //hot商品 + preGoods: null, //预售商品 + //----控制是是否显示计时器--- + is_timer: 1, + ishow: 0, + //是不是显示自定义模板 + isTemplate: 0, + template_arr: null, + bgcolor_t: '', + + banner_index: 0, + flash_index: 0, + pt_index: 0, + + pt_timer_item: null, + pt_timer_arr: null, + pt_timer: null, + pt_timer_active: 0, + //看下商家是否开通会员权益 + is_boot: 0, + gd_category: null, + is_no_more: 0, + max_sw_height: 0, //banner的最大高度 + is_disgraceful: 0, //是否显示新人广告 + new_image: "", //新人有礼弹窗图片 + new_nav: "", //新人页面跳转地址 + w_holiday_pop: 0, + + showHongbao: false, + showHongbaoSmall: false, + + is_full_screen_show: 0, //全屏显示 + sec_show: 3, //倒计时的秒数 + full_ad: null, //全屏广告 + full_screen: 0, //全屏广告 + is_ok_h5: 0, //判断要不要显示关注二维码 + }, + + onLoad: async function (tt) { + wx.showShareMenu({ + withShareTicket:true, + menus:['shareAppMessage','shareTimeline'] + }) + var th = this; + var first_leader = tt.first_leader; + if (!first_leader && 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]; + } + } + + getApp().getConfig(function (e) { + //--首页的问题-- + if (getApp().globalData.config && getApp().globalData.config.store_name != undefined && getApp().globalData.config.store_name != null) { + wx.setNavigationBarTitle({ + title: getApp().globalData.config.store_name, + }); + } else { + wx.setNavigationBarTitle({ + title: getApp().globalData.setting.appName, + }); + }; + }); + + + var th = this; + getApp().getConfig2(function (config2) { + if (config2 && config2.is_overdue == 1) { + getApp().promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=5", {}).then(res => { + var o = res; + if (o.data.code == 0) { + var ob = { isout: 0, isbuy: 1 }; + var arr = o.data.data.pageData; + var isbuy = 0; + //----如果数组不为空---- + if (arr.length > 0) { + arr.forEach(function (val, ind) { + if (val.is_sy == 0 && val.type == 5) { + isbuy = 1; + var now = ut.gettimestamp(); + if (now > val.end_time) ob.isout = 1; + return false; + } + }) + } + ob.isbuy = isbuy; + + var pages = getCurrentPages(); //获取加载的页面 + var currentPage = pages[pages.length - 1]; //获取当前页面的对象 + + // console.log("当前路由"); + // console.log(currentPage.route); + + + th.setappdata(ob); + + if (ob.isbuy && !ob.isout) { + th.onload_init(); + } + } else { + th.onload_init(); + } + }) + } + else { + th.onload_init(); + } + }) + + if (first_leader) { + //-- user_id代过来免登录 -- + getApp().globalData.first_leader = first_leader; + //调用接口判断是不是会员 + getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { + if (res.data.code == 0) { + getApp().globalData.guide_id = res.data.data.id; + } + }) + } + + // 判断是否有红包活动 + getApp().request.promiseGet('/api/weshop/redmoney/redConfig/get/' + getApp().globalData.setting.stoid, { + data: {} + }).then(function (data) { + let code = data.data.code; + if (code == 0) { + + th.setData({ + showHongbao: true, + }); + } else if (code == -1) { + th.setData({ + showHongbao: false, + }); + }; + }); + + + // console.log(9090909); + //看一下商家是否开通了权益 + //--初始化是否有打勾-- + getApp().request.promiseGet("/api/weshop/users/grade/vip/init/get", { + data: { + storeId: os.stoid + } + }).then(res => { + if (res.data.data) { + var is_init = res.data.data.isBool; + th.setData({ + is_boot: is_init + }); + + if (!is_init) { + th.setData({ + swiperimage: [] + }); + } + } + }) + + + + //调用底部导航 + //getApp().globalData.url=th.data.url + //t.editTabBar(th,o.stoid,th.data.url); + + }, + + async onload_init() { + var th = this; + await this.init_load(); + //显示的时候要开启计时器 + this.data.is_timer = 1; + //如果是自定义模板 + if (this.data.isTemplate) { + //---先获取会员--- + //t.getUserFir(function () { + if (getApp().globalData.user_id) { + th.is_festival(); + var new_nav = th.data.new_nav; + if (new_nav == "") { + th.is_new(); + } + // sty + setTimeout(function () { + if (getApp().globalData.user_id) getApp().requestCardNum(th); + }, 500) + } + + //}); + } else { + await this.init_fir(); + wx.setNavigationBarColor({ + frontColor: '#ffffff', // 必写项 + backgroundColor: '#ff7295', // 必写项 + }) + } + + //--正再拼团中的处理-- + var url = "/api/weshop/order/pageTuan?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; + } + }) + if (th.data.pt_timer_arr && th.data.pt_timer_arr.length > 0) { + for (var i in th.data.pt_timer_arr) { + var p_item = th.data.pt_timer_arr[i]; + await getApp().request.promiseGet("/api/weshop/users/get/" + os.stoid + "/" + p_item.user_id, { + 1: 1 + }).then(res => { + th.data.pt_timer_arr[i].head_pic = res.data.data.head_pic; + th.data.pt_timer_arr[i].nickname = res.data.data.nickname; + }) + } + th.Interval_pt(); + } + + //---处理正在6个分类---- + await getApp().request.promiseGet("/api/weshop/goodscategory/page", { + data: { + store_id: os.stoid, + pageSize: 5, + is_show: 1, + level: 1 + } + }).then(res => { + if (res.data.data) { + var gd_category = res.data.data.pageData; + th.setData({ + gd_category: gd_category + }); + } + }) + }, + + + //关闭新用户领取广告 + close_disgraceful: function () { + var th = this; + th.setData({ + is_disgraceful: 0 + }) + }, + + async onShow() { + + getApp().check_can_share(); + + this.getTabBar().setData({ + cartGoodsNum: getApp().globalData.cartGoodsNum + }) + var th = this; + //-- 登录回来判断弹框 -- + var user_id = getApp().globalData.user_id; + + if (!user_id) { + var userinfo = wx.getStorageSync('userinfo'); + if (userinfo) user_id = userinfo.user_id + } + + if (user_id) { + th.is_festival(); + var new_nav = th.data.new_nav; + if (new_nav == "") { + th.is_new(); + } + } + + console.log(this.data.isTemplate, '首页'); + + if (!this.data.isTemplate) { + var pre_data = { store_id: os.stoid, is_end: 0, timetype: 1, isuse: 1 }; + if (user_id) { + pre_data.user_id = user_id; + } + + getApp().request.get("/api/weshop/marketing/marketingPresellList/page", { + data: pre_data, + success: function (e) { + if (e.data.code == 0 && e.data.data.pageData && e.data.data.pageData.length > 0) { + var pre_data = e.data.data.pageData; + var arr = new Array(); + //--三个三个一组--- + for (var i = 0; i < pre_data.length; i += 3) { + arr.push(pre_data.slice(i, i + 3)); + } + th.setData({ + preGoods: arr + }); + } else { + th.setData({ + preGoods: null + }); + } + } + }) + // 获取幸运购活动列表 + getApp().request.promiseGet('/api/weshop/prom/luckyActivity/page', { + data: { + store_id: getApp().globalData.setting.stoid, + is_end: 0, + timetype: 1, + } + }).then(res => { + if (res.data.code == 0) { + th.setData({ + luckGo_list: res.data.data.pageData.slice(0, 3), + }); + } + }); + + //-----秒杀----- + var flash_data = null; + var f_req = { + store_id: os.stoid, + timetype: 2, + is_end: 0, + is_show: 1, + pageSize: 9, + user_id: 0 + }; + if (user_id) f_req.user_id = user_id; + //--获取活动-- + await getApp().request.promiseGet("/api/ms/flash_sale/spikepage", { + data: f_req, + }).then(res => { + var e = res; + if (e.data.code == 0) { + flash_data = e.data.data.pageData; + if (flash_data == null || flash_data.length <= 0) return false; + + //当前时间戳 + var nt = ut.gettimestamp(); + + flash_data.forEach(function (val, ind) { + + if (val.user_price) val.price = val.user_price; + if (val.start_time > nt) { + flash_data[ind].status = 0; + } else if (val.end_time > nt) { + flash_data[ind].status = 1; + } + + if (val.buy_num >= val.goods_num) { + flash_data[ind].status = 2; + } + }); + + var promisies = []; + for (const key in flash_data) { + if (Object.hasOwnProperty.call(flash_data, key)) { + const val = flash_data[key]; + promisies[key] = getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + + os.stoid + "/1/" + val.id, + {} + ).then(res => { + if (res.data.code == 0) { + if (res.data.data <= 0) flash_data[key].status = 2; + }; + }); + } + } + + Promise.all(promisies).then(() => { + var arr = new Array(); + //--三个三个一组--- + for (var i = 0; i < flash_data.length; i += 3) { + arr.push(flash_data.slice(i, i + 3)); + } + + th.setData({ + saleGoods: arr + }); + }); + + + + } + }); + + } + + + + + + + + + + //优惠券要实时更新 + getApp().getConfig2(function (e) { + var json_d = JSON.parse(e.switch_list); + th.setData({ is_closecoupon: json_d.is_closecoupon }) + th.setData({ is_topstore: json_d.is_show_storeselect }) + if (json_d.is_gz_h5) th.setData({ is_gz_h5: json_d.is_gz_h5 }) + }, 1) + + if (typeof this.getTabBar === 'function' && this.getTabBar()) { + var index = getApp().getPageIndex(this); this.getTabBar().setData({ - cartGoodsNum: getApp().globalData.cartGoodsNum + active: index //数字是当前页面在tabbar的索引 }) - var th = this; - //-- 登录回来判断弹框 -- - var user_id=getApp().globalData.user_id; - - if(!user_id){ - var userinfo=wx.getStorageSync('userinfo'); - if(userinfo) user_id=userinfo.user_id - } - - if (user_id) { - th.is_festival(); - var new_nav = th.data.new_nav; - if (new_nav == "") { - th.is_new(); - } - } - - console.log(this.data.isTemplate,'首页'); - - if(!this.data.isTemplate){ - var pre_data={store_id:os.stoid,is_end:0,timetype:1,isuse:1}; - if(user_id){ - pre_data.user_id= user_id; - } - - getApp().request.get("/api/weshop/marketing/marketingPresellList/page",{ - data:pre_data, - success:function (e) { - if(e.data.code==0 && e.data.data.pageData && e.data.data.pageData.length>0 ){ - var pre_data=e.data.data.pageData; - var arr = new Array(); - //--三个三个一组--- - for (var i = 0; i < pre_data.length; i += 3) { - arr.push(pre_data.slice(i, i + 3)); - } - th.setData({ - preGoods: arr - }); - }else{ - th.setData({ - preGoods: null - }); - } - } - }) - - // 获取幸运购活动列表 - getApp().request.promiseGet('/api/weshop/prom/luckyActivity/page', { - data: { - store_id: getApp().globalData.setting.stoid, - is_end: 0, - timetype: 1, - } - }).then(res => { - if(res.data.code == 0) { - th.setData({ - luckGo_list: res.data.data.pageData.slice(0,3), - }); - } - }); - - //-----秒杀----- - var flash_data = null; - var f_req={ - store_id: os.stoid, - timetype: 2, - is_end: 0, - is_show: 1, - pageSize: 9, - user_id:0 - }; - if(user_id) f_req.user_id=user_id; - //--获取活动-- - await getApp().request.promiseGet("/api/ms/flash_sale/spikepage", { - data:f_req , - }).then(res => { - var e = res; - if (e.data.code == 0) { - flash_data = e.data.data.pageData; - if (flash_data == null || flash_data.length <= 0) return false; - - //当前时间戳 - var nt = ut.gettimestamp(); - - flash_data.forEach(function (val, ind) { - - if(val.user_price) val.price=val.user_price; - if (val.start_time > nt) { - flash_data[ind].status = 0; - } else if (val.end_time > nt) { - flash_data[ind].status = 1; - } - - if (val.buy_num >= val.goods_num){ - flash_data[ind].status = 2; - } - }); - - var promisies = []; - for (const key in flash_data) { - if (Object.hasOwnProperty.call(flash_data, key)) { - const val = flash_data[key]; - promisies[key] = getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + - os.stoid + "/1/" + val.id, - {} - ).then(res => { - if (res.data.code == 0) { - if (res.data.data <= 0) flash_data[key].status = 2; - }; - }); - } - } - - Promise.all(promisies).then(() => { - var arr = new Array(); - //--三个三个一组--- - for (var i = 0; i < flash_data.length; i += 3) { - arr.push(flash_data.slice(i, i + 3)); - } - - th.setData({ - saleGoods: arr - }); - }); - - - - } - }); - - } - - - - - - - - - - //优惠券要实时更新 - getApp().getConfig2(function (e) { - var json_d = JSON.parse(e.switch_list); - th.setData({ is_closecoupon: json_d.is_closecoupon }) - th.setData({ is_topstore: json_d.is_show_storeselect }) - if(json_d.is_gz_h5) th.setData({is_gz_h5:json_d.is_gz_h5}) - }, 1) - - if (typeof this.getTabBar === 'function' && this.getTabBar()) { - var index = getApp().getPageIndex(this); - this.getTabBar().setData({ - active: index //数字是当前页面在tabbar的索引 - }) - getApp().requestCardNum(this); - } - - var th = this; - - var show = getApp().globalData.isLoad_ad; - - if(!show){ - setTimeout(function () { - full_screen.get_the_full_screen(th); - }, 800); - getApp().globalData.isLoad_ad=1; - if (!th.data.f_hidden) { - setTimeout(function () { - th.setData({ f_hidden: 1 }) - wx.hideLoading(); - }, 960) - } - } else { - th.setData({ f_hidden: 1 }) - } - - setTimeout(function () { - const query = wx.createSelectorQuery(); - query.select('#off_top').boundingClientRect(); - query.exec((res) => { - if(res && res[0] && res[0].height>0){ - th.setData({is_ok_h5:1}); - } - }) - },3600); - - }, - //当隐藏的时候就关闭计时器 - onHide: function () { - this.data.is_timer = 0; - if (this.data.pt_timer) clearInterval(this.data.pt_timer); - if (this.data.w_holiday_pop) clearInterval(this.data.w_holiday_pop); - if (this.data.full_screen) clearInterval(this.data.full_screen); - this.data.w_holiday_pop = 0; - - }, - - //同步初始加载 - async init_load() { - var th = this; - //因为营销版本的功能包含了自定义模板的功能，是同时的 - //读取全局是否有弄自定义模板 - await api.get_template_fir(o.stoid).then(res => { - var data = res.data.data; - if (data && data.length > 0) { - var temp_data = data[0]; - var t_arr = JSON.parse(temp_data.json_str); - - th.setData({ - template_arr: t_arr, - isTemplate: 1, - bgcolor_t: temp_data.bkcolor - }); - - //---如果有设定顶部的颜色的时候-- - if (temp_data.top_color && temp_data.top_color != 'null') { - - var top_w_color = "#ffffff"; - if (temp_data.top_word_color && temp_data.top_word_color == 'black') { - top_w_color = "#000000"; - } - wx.setNavigationBarColor({ - frontColor: top_w_color, // 必写项 - backgroundColor: temp_data.top_color, // 必写项 - }) - } - } - }) - - - }, - //---读取数据内容--- - async init_fir() { - console.log('init_fir'); - var th = this; - //----广告---- - var e = this; - await getApp().request.promiseGet("/api/weshop/ad/page?pid=2&store_id=" + o.stoid, { - data: { - enabled: 1 - } - }).then(res => { - - if (res.data.code == 0 && res.data.data.pageData && res.data.data.pageData.length > 0) { - var a = res.data.data.pageData; - var arr = new Array(); - for (var i = 0; i < a.length; i++) { - var tt = { - 'ad_code': o.imghost + a[i].ad_code, - 'media_link': '', - 'ad_weapplink': a[i].ad_weapplink - }; - arr.push(tt); - } - if (arr.length > 0) e.setData({ - banner: arr, - }); - - wx.stopPullDownRefresh(); - } - }) - let user_id=getApp().globalData.user_id; - - //----拼单----- - await getApp().request.promiseGet("/api/weshop/teamlist/pageteam/2", { - data: { - store_id: os.stoid, - is_end: 0, - is_show: 1, - pageSize: 6, - user_id, - } - }).then(res => { - var e = res; - if (e.data.code == 0) { - var pd_data = e.data.data.pageData; - - if (pd_data.length == 0) return; - - //获取当前 - var nt = ut.gettimestamp(); - pd_data.forEach(function (val, ind) { - if (val.start_time > nt) pd_data[ind].status = 0; - else if (val.end_time > nt) pd_data[ind].status = 1; - if (val.buy_num >= val.goods_num) pd_data[ind].status = 2; - }); - - //获取当前时间，比较拼团中还在未开始 - var timestamp = new Date().getTime(); - var is_team_tepy; - for (var j = 0; j < pd_data.length; j++) { - pd_data[j].is_team_tepy = 1; - if (timestamp < pd_data[j].start_time * 1000) { - var is_team_tepy; - pd_data[j].is_team_tepy = 0; - } - } - - var arr = new Array(); - //--2个2个一组--- - for (var i = 0; i < pd_data.length; i += 2) { - - arr.push(pd_data.slice(i, i + 2)); - } - - th.setData({ - pindGoods: arr - }); - th.countDown2(); - } - }) - - //------新品------- - await getApp().request.promiseGet("/api/weshop/goods/page?page=1", { - data: { - is_mainshow: 1, - isonsale: 1, - is_on_sale: 1, - store_id: o.stoid, - pageSize: 9, - is_new: 1, - orderField: "sort" - } - }).then(res => { - var e = res; - if (e.data.code == 0) { - var new_data = e.data.data.pageData; - var arr = new Array(); - //--三个三个一组--- - for (var i = 0; i < new_data.length; i += 3) { - arr.push(new_data.slice(i, i + 3)); - } - th.setData({ - newGoods: arr, - }); - } - }) - - //------热卖------- - await getApp().request.promiseGet("/api/weshop/goods/page?page=1", { - data: { - is_mainshow: 1, - isonsale: 1, - is_on_sale: 1, - store_id: o.stoid, - pageSize: 9, - is_hot: 1, - orderField: "sort" - } - }).then(res => { - var e = res; - if (e.data.code == 0) { - var new_data = e.data.data.pageData; - var arr = new Array(); - //--三个三个一组--- - for (var i = 0; i < new_data.length; i += 3) { - arr.push(new_data.slice(i, i + 3)); - } - console.log(arr); - th.setData({ - hotGoods: arr, - }); - } - }) - - //---调用信息--- - // this.requestRecommend(); - this.setData({ - ishow: 1 - }); - - //---先获取会员--- - //t.getUserFir(function () { - if(getApp().globalData.user_id) { - th.is_festival(); - var new_nav = th.data.new_nav; - if (new_nav == "") { - th.is_new(); + getApp().requestCardNum(this); + } + + var th = this; + + var show = getApp().globalData.isLoad_ad; + + if (!show) { + setTimeout(function () { + full_screen.get_the_full_screen(th); + }, 800); + getApp().globalData.isLoad_ad = 1; + if (!th.data.f_hidden) { + setTimeout(function () { + th.setData({ f_hidden: 1 }) + wx.hideLoading(); + }, 960) + } + } else { + th.setData({ f_hidden: 1 }) + } + + setTimeout(function () { + const query = wx.createSelectorQuery(); + query.select('#off_top').boundingClientRect(); + query.exec((res) => { + if (res && res[0] && res[0].height > 0) { + th.setData({ is_ok_h5: 1 }); + } + }) + }, 3600); + + }, + //当隐藏的时候就关闭计时器 + onHide: function () { + this.data.is_timer = 0; + if (this.data.pt_timer) clearInterval(this.data.pt_timer); + if (this.data.w_holiday_pop) clearInterval(this.data.w_holiday_pop); + if (this.data.full_screen) clearInterval(this.data.full_screen); + this.data.w_holiday_pop = 0; + + }, + + //同步初始加载 + async init_load() { + var th = this; + //因为营销版本的功能包含了自定义模板的功能，是同时的 + //读取全局是否有弄自定义模板 + await api.get_template_fir(o.stoid).then(res => { + var data = res.data.data; + if (data && data.length > 0) { + var temp_data = data[0]; + var t_arr = JSON.parse(temp_data.json_str); + + th.setData({ + template_arr: t_arr, + isTemplate: 1, + bgcolor_t: temp_data.bkcolor + }); + + //---如果有设定顶部的颜色的时候-- + if (temp_data.top_color && temp_data.top_color != 'null') { + + var top_w_color = "#ffffff"; + if (temp_data.top_word_color && temp_data.top_word_color == 'black') { + top_w_color = "#000000"; + } + wx.setNavigationBarColor({ + frontColor: top_w_color, // 必写项 + backgroundColor: temp_data.top_color, // 必写项 + }) + } + } + }) + + + }, + //---读取数据内容--- + async init_fir() { + console.log('init_fir'); + var th = this; + //----广告---- + var e = this; + await getApp().request.promiseGet("/api/weshop/ad/page?pid=2&store_id=" + o.stoid, { + data: { + enabled: 1 + } + }).then(res => { + + if (res.data.code == 0 && res.data.data.pageData && res.data.data.pageData.length > 0) { + var a = res.data.data.pageData; + var arr = new Array(); + for (var i = 0; i < a.length; i++) { + var tt = { + 'ad_code': o.imghost + a[i].ad_code, + 'media_link': '', + 'ad_weapplink': a[i].ad_weapplink + }; + arr.push(tt); + } + if (arr.length > 0) e.setData({ + banner: arr, + }); + + wx.stopPullDownRefresh(); + } + }) + let user_id = getApp().globalData.user_id; + + //----拼单----- + await getApp().request.promiseGet("/api/weshop/teamlist/pageteam/2", { + data: { + store_id: os.stoid, + is_end: 0, + is_show: 1, + pageSize: 6, + user_id, + } + }).then(res => { + var e = res; + if (e.data.code == 0) { + var pd_data = e.data.data.pageData; + + if (pd_data.length == 0) return; + + //获取当前 + var nt = ut.gettimestamp(); + pd_data.forEach(function (val, ind) { + if (val.start_time > nt) pd_data[ind].status = 0; + else if (val.end_time > nt) pd_data[ind].status = 1; + if (val.buy_num >= val.goods_num) pd_data[ind].status = 2; + }); + + //获取当前时间，比较拼团中还在未开始 + var timestamp = new Date().getTime(); + var is_team_tepy; + for (var j = 0; j < pd_data.length; j++) { + pd_data[j].is_team_tepy = 1; + if (timestamp < pd_data[j].start_time * 1000) { + var is_team_tepy; + pd_data[j].is_team_tepy = 0; + } + } + + var arr = new Array(); + //--2个2个一组--- + for (var i = 0; i < pd_data.length; i += 2) { + + arr.push(pd_data.slice(i, i + 2)); + } + + th.setData({ + pindGoods: arr + }); + th.countDown2(); + } + }) + + //------新品------- + await getApp().request.promiseGet("/api/weshop/goods/page?page=1", { + data: { + is_mainshow: 1, + isonsale: 1, + is_on_sale: 1, + store_id: o.stoid, + pageSize: 9, + is_new: 1, + orderField: "sort" + } + }).then(res => { + var e = res; + if (e.data.code == 0) { + var new_data = e.data.data.pageData; + var arr = new Array(); + //--三个三个一组--- + for (var i = 0; i < new_data.length; i += 3) { + arr.push(new_data.slice(i, i + 3)); + } + th.setData({ + newGoods: arr, + }); + } + }) + + //------热卖------- + await getApp().request.promiseGet("/api/weshop/goods/page?page=1", { + data: { + is_mainshow: 1, + isonsale: 1, + is_on_sale: 1, + store_id: o.stoid, + pageSize: 9, + is_hot: 1, + orderField: "sort" + } + }).then(res => { + var e = res; + if (e.data.code == 0) { + var new_data = e.data.data.pageData; + var arr = new Array(); + //--三个三个一组--- + for (var i = 0; i < new_data.length; i += 3) { + arr.push(new_data.slice(i, i + 3)); + } + console.log(arr); + th.setData({ + hotGoods: arr, + }); + } + }) + + //---调用信息--- + // this.requestRecommend(); + this.setData({ + ishow: 1 + }); + + //---先获取会员--- + //t.getUserFir(function () { + if (getApp().globalData.user_id) { + th.is_festival(); + var new_nav = th.data.new_nav; + if (new_nav == "") { + th.is_new(); + } + + // sty + setTimeout(function () { + if (getApp().globalData.user_id) getApp().requestCardNum(th); + }, 500) + } + //}); + + setTimeout(function () { + var goods_list = th.selectComponent("#goods_list"); //组件的id + goods_list.init(); + goods_list.get_list(); + }, 2000) + }, + + //--判断小程序是否过期-- + setappdata: function (t) { + if (t && t.isout == 1) + wx.reLaunch({ + url: "/pages/error/error?msg=该商城已到期，暂停浏览！\r\n可联系:" + getApp().globalData.config.store_tel, + }); + if (t && t.isbuy == 0) + wx.reLaunch({ + url: "/pages/error/error?msg=还未购买小程序", + }); + }, + //---加载更多是靠这个函数---- + onReachBottom: function () { + var goods_list = this.selectComponent("#goods_list"); //组件的id + if (goods_list) goods_list.get_list(); + + if (getApp().globalData.func_list) { + for (let i in getApp().globalData.func_list) { + let item = getApp().globalData.func_list[i]; + item.re_show(); + } + } + }, + + onPullDownRefresh: function (e) { + this.data.recommend = null, this.data.currentPage = 1, n.resetConfig(), this.requestHomePage(), + this.requestRecommend(); + }, + requestRecommend() { }, + requestHomePage() { }, + + onUnload: function () { + this.destroyActivityTimer(); + }, + setCountTime: function (e) { + e.diffTime || (e.diffTime = new Date().getTime() - 1e3 * e.server_time), this.setData({ + "sale.diffTime": e.diffTime + }), this.setData({ + "sale.good": e.flash_sale_goods[0] + }), this.destroyActivityTimer(), this.createActivityTimer(); + }, + createActivityTimer: function () { + var e = this.data.sale, + t = this; + this.data.timer = setInterval(function () { + var a = 1e3 * e.good.end_time - new Date().getTime() + e.diffTime, + o = i.transTime(a); + a <= 0 ? t.requestHomePage() : t.setData({ + "sale.countTime": o + }); + }, 1e3); + }, + destroyActivityTimer: function () { + this.data.timer && (clearInterval(this.data.timer), this.data.timer = null); + }, + onPageScroll: function (e) { + this.data.scrollTop = e.scrollTop; + var t = getCurrentPages(); + "pages/index/index/index" == t[t.length - 1].route; + /*--(e.scrollTop > 10 ? wx.setNavigationBarColor({ + frontColor: "#ffffff", + backgroundColor: "#f95959" + }) : wx.setNavigationBarColor({ + frontColor: "#000000", + backgroundColor: "#eeeeee" + }));--*/ + }, + jumpSearch: function () { + wx.navigateTo({ + url: "/pages/goods/search/search" + }); + }, + onShareAppMessage: function (e) { + getApp().globalData.no_clear = 1; + var url = "/pages/index/index/index"; + var userInfo = getApp().globalData.userInfo; + //是分销商才带 + if (userInfo) { + url += "?first_leader=" + userInfo.user_id; + } + console.log("---首页---分享--"); + var title = "商城首页" + //分享 + if (getApp().globalData.config && getApp().globalData.config.store_name) { + title = getApp().globalData.config.store_name; + } else if (getApp().globalData.setting.appName) { + title = getApp().globalData.setting.appName; + } + + var ob = { + title: title, + path: url, + }; + console.log(ob); + return ob; + }, + + //图片失败，默认图片 + bind_bnerr: function (e) { + var _errImg = e.target.dataset.errorimg; + var _errObj = {}; + _errObj[_errImg] = this.data.url + "/miniapp/images/del/logo.jpg"; + this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; + }, + + //图片失败，默认图片 + bind_bnerr2: function (e) { + var _errImg = e.target.dataset.errorimg; + var _errurl = e.target.dataset.url; + var _errObj = {}; + _errObj[_errImg] = "/miniapp/images/default_g_img.gif"; + this.setData(_errObj); //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; + + }, + //图片失败，默认图片 + bind_bnerr3: function (e) { + var _errImg = e.target.dataset.errorimg; + var _Img = e.target.dataset.img; + if (_Img != undefined) { + var _errObj = {}; + _errObj[_errImg] = "/public/images/default_goods_image_240.gif"; + this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; + } + }, + + + //秒杀倒计时 + //---小于10的格式化函数---- + timeFormat(param) { + return param < 10 ? '0' + param : param; + }, + + //----秒杀倒计时函数----- + countDown() { + if (!this.data.is_timer) return false; + var th = this; + // 获取当前时间，同时得到活动结束时间数组 + var newTime = ut.gettimestamp(); + var List = this.data.saleGoods; + for (var j = 0; j < List.length; j++) { + var endTimeList = List[j]; + // 对结束时间进行处理渲染到页面 + for (var i = 0; i < endTimeList.length; i++) { + var o = endTimeList[i]; + var endTime = o.end_time + if (o.status == 0) endTime = o.start_time + + var obj = null; + // 如果活动未结束，对时间进行处理 + if (endTime - newTime > 0) { + var time = (endTime - newTime); + // 获取天、时、分、秒 + var day = parseInt(time / (60 * 60 * 24)); + var hou = parseInt(time % (60 * 60 * 24) / 3600); + var min = parseInt(time % (60 * 60 * 24) % 3600 / 60); + var sec = parseInt(time % (60 * 60 * 24) % 3600 % 60); + obj = { + day: this.timeFormat(day), + hou: this.timeFormat(hou), + min: this.timeFormat(min), + sec: this.timeFormat(sec) + } + } else { + //活动已结束，全部设置为'00' + obj = { + day: '00', + hou: '00', + min: '00', + sec: '00' + } + } + var txt = "saleGoods[" + j + "][" + i + "].djs"; + th.setData({ + [txt]: obj + }); + } + + } + setTimeout(th.countDown, 1000); + }, + + //----拼单倒计时函数----- + countDown2() { + if (!this.data.is_timer) return false; + + var th = this; + // 获取当前时间，同时得到活动结束时间数组 + var newTime = ut.gettimestamp(); + var List = this.data.pindGoods; + for (var j = 0; j < List.length; j++) { + var endTimeList = List[j]; + // 对结束时间进行处理渲染到页面 + for (var i = 0; i < endTimeList.length; i++) { + var o = endTimeList[i]; + var endTime = o.end_time; + if (o.status == 0) endTime = o.start_time; + + let obj = null; + // 如果活动未结束，对时间进行处理 + if (endTime - newTime > 0) { + let time = (endTime - newTime); + // 获取天、时、分、秒 + let day = parseInt(time / (60 * 60 * 24)); + let hou = parseInt(time % (60 * 60 * 24) / 3600); + let min = parseInt(time % (60 * 60 * 24) % 3600 / 60); + let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60); + obj = { + day: this.timeFormat(day), + hou: this.timeFormat(hou), + min: this.timeFormat(min), + sec: this.timeFormat(sec) + } + } else { + //活动已结束，全部设置为'00' + obj = { + day: '00', + hou: '00', + min: '00', + sec: '00' + } + } + var txt = "pindGoods[" + j + "][" + i + "].djs"; + th.setData({ + [txt]: obj + }); + } + } + setTimeout(th.countDown2, 1000); + }, + + bannerSwiperChange: function (e) { + var index = e.detail.current; + this.setData({ + banner_index: index + }); + }, + flashSwiperChange: function (e) { + var index = e.detail.current; + this.setData({ + flash_index: index + }); + }, + ptSwiperChange: function (e) { + var index = e.detail.current; + this.setData({ + pt_index: index + }); + }, + + Interval_pt() { + var th = this; + this.data.pt_timer = setInterval(function () { + var item = ut.get_rand_item(th.data.pt_timer_arr); + th.setData({ + pt_timer_active: 1, + pt_timer_item: item + }); + setTimeout(function () { + th.setData({ + pt_timer_active: 0 + }); + }, 1500) + }, 4000); + }, + + + //---扫一扫的函数--- + getScancode: function () { + var _this = this; + getApp().globalData.no_clear = 1; + // 允许从相机和相册扫码 + wx.scanCode({ + success: (res) => { + var result = res.result; + wx.navigateTo({ + url: "/pages/goods/search/search?s_key=" + result, + }); + } + }) + }, + + //跳转到分类 + go_cate: function () { + getApp().goto("/pages/goods/categoryList/categoryList"); + }, + + // 幸运购跳转 + go_url: function (e) { + + var url = e.currentTarget.dataset.url; + getApp().goto(url); + + }, // + + bind_bnerr_icon: function (e) { + var def = "/miniapp/images/no_cate_def.png"; + var _err = e.currentTarget.dataset.err; + var ob = {}; + ob[_err] = def; + this.setData(ob); + }, + + //跳转到分类的商品列表 + go_cate2: function (t) { + var cid = t.currentTarget.dataset.cid; + var pid = t.currentTarget.dataset.pid; + var lurl = "/pages/goods/goodsList/goodsList?cat_id=" + cid + "&pid=" + pid; + wx.navigateTo({ + url: lurl + }); + }, + new_nav: function (e) { + var th = this; + var new_nav = th.data.new_nav; + getApp().goto(new_nav); + }, + //跳转到权益 + go_quanyi: function (t) { + var user_info = getApp().globalData.userInfo; + if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { + wx.navigateTo({ + url: '/pages/togoin/togoin', + //url: '/pages/getphone/getphone', + }) + return false; + } + getApp().goto("/pages/user/userqy/userqy"); + }, + + imageLoad: function (e) { + var imgwidth = e.detail.width; + var imgheight = e.detail.height; + //宽高比 + var ratio = imgwidth / imgheight; + //计算的高度值 + var viewHeight = 715 / ratio; + if (this.data.max_sw_height < viewHeight) this.setData({ + max_sw_height: viewHeight + }); + }, + //判断该用户是否是新会员 + is_new: function () { + var th = this; + wx.hideLoading(); + getApp().request.promiseGet("/api/weshop/marketing/newpeople/act/judge", { + data: { + storeId: os.stoid, + userId: d.user_id + } + }).then(res => { + if (res.data.code == 0) { + var actid = res.data.data.id; //活动id + var giftBagId = res.data.data.giftBagId; //礼包id + var new_nav = "/pages/giftpack/newvipgift/newvipgift?actId=" + actid + '&' + 'actType=' + 1 + '&' + 'giftBagId=' + giftBagId; + var new_image = res.data.data.imageurl; + var swiperimage = th.data.swiperimage; + var img = { + image: "/miniapp/images/newpeople/newpeople.png", + nav_url: new_nav + } + swiperimage.unshift(img); + th.setData({ + swiperimage: swiperimage, + new_image: new_image, + new_nav: new_nav + }) + + getApp().request.promiseGet("/api/weshop/marketing/newpeople/act/bound/judge", { + data: { + storeId: o.stoid, + userId: d.user_id + } + }).then(res => { + if (res.data.code == 0) { + th.setData({ + is_disgraceful: 1 + }) + } else { + th.check_holiday_pop(); //节日的弹窗 + } + + }) + } else { + th.check_holiday_pop(); //节日的弹窗 + } + + }) + + }, + + is_festival: function (e) { + var th = this; + var url = "/api/weshop/marketing/holiday/act/judge"; + getApp().request.promiseGet(url, { + data: { + storeId: os.stoid, + userId: d.user_id + } + }).then(res => { + if (res.data.code == 0) { + var actid = res.data.data.id; //活动id + var giftBagId = res.data.data.gifBagId; //礼包id + var nav_url = "/pages/giftpack/festival/festival?actId=" + actid + '&' + 'actType=' + 3 + '&' + 'giftBagId=' + giftBagId; + var swiperimage = th.data.swiperimage; + var actBoundImg = res.data.data.actBoundImg ? res.data.data.actBoundImg : '/miniapp/images/default_g_img.gif'; + + th.data.holiday_image = res.data.data.actImg; + th.data.holiday_url = nav_url; + + var img = { + image: actBoundImg, + nav_url: nav_url, + id: res.data.data.id, + type: 'festival' + } + + for (var i in swiperimage) { + var item = swiperimage[i]; + if (item.id == img.id && item.type == img.type) { + return false; + } + } + + swiperimage.unshift(img); + th.setData({ + swiperimage: swiperimage, + new_nav: nav_url + }) + } + }) + }, + + //弹出节日有礼 + check_holiday_pop: function () { + var th = this; + getApp().waitfor2(th, 'w_holiday_pop', 'holiday_image', function () { + //等到结果才显示 + if (th.data.holiday_image) { + th.setData({ + new_image: th.data.holiday_image, + new_nav: th.data.holiday_url, + is_disgraceful: 1 + }) + } + }) + }, + + go_ad: function (e) { + var url = e.currentTarget.dataset.url; + if (!url || url == '') return; + if (url[0] != '/') url = '/' + url; + getApp().goto(url); + }, + + //导航跳转 + nav_goto: function (e) { + var url = e.currentTarget.dataset.url; + if (!url || url == '') return; + if (url[0] != '/') url = '/' + url; + getApp().goto(url); + if (this.data.showHongbao) { + this.setData({ + showHongbao: false, + showHongbaoSmall: true, //显示抢红包小图标 + }); + } + }, + + //----跳转到搭配购买---- + go_test: function () { + wx.navigateTo({ url: "/packageA/pages/goods_share/goods_share", }) + }, + onShareTimeline() { + getApp().globalData.no_clear=1; + var store_name = getApp().globalData.config ? getApp().globalData.config.store_name : ''; + if (!store_name){ + store_name = getApp().globalData.setting.appName; + } + return { + title: '首页-' + '-' + store_name, } + }, - // sty - setTimeout(function () { - if (getApp().globalData.user_id) getApp().requestCardNum(th); - }, 500) - } - //}); - - setTimeout(function () { - var goods_list = th.selectComponent("#goods_list"); //组件的id - goods_list.init(); - goods_list.get_list(); - }, 2000) - }, - - //--判断小程序是否过期-- - setappdata: function (t) { - if (t && t.isout == 1) - wx.reLaunch({ - url: "/pages/error/error?msg=该商城已到期，暂停浏览！\r\n可联系:" + getApp().globalData.config.store_tel, - }); - if (t && t.isbuy == 0) - wx.reLaunch({ - url: "/pages/error/error?msg=还未购买小程序", - }); - }, - //---加载更多是靠这个函数---- - onReachBottom: function () { - var goods_list = this.selectComponent("#goods_list"); //组件的id - if (goods_list) goods_list.get_list(); - - if (getApp().globalData.func_list) { - for (let i in getApp().globalData.func_list) { - let item = getApp().globalData.func_list[i]; - item.re_show(); - } - } - }, - - onPullDownRefresh: function (e) { - this.data.recommend = null, this.data.currentPage = 1, n.resetConfig(), this.requestHomePage(), - this.requestRecommend(); - }, - requestRecommend() { }, - requestHomePage() { }, - - onUnload: function () { - this.destroyActivityTimer(); - }, - setCountTime: function (e) { - e.diffTime || (e.diffTime = new Date().getTime() - 1e3 * e.server_time), this.setData({ - "sale.diffTime": e.diffTime - }), this.setData({ - "sale.good": e.flash_sale_goods[0] - }), this.destroyActivityTimer(), this.createActivityTimer(); - }, - createActivityTimer: function () { - var e = this.data.sale, - t = this; - this.data.timer = setInterval(function () { - var a = 1e3 * e.good.end_time - new Date().getTime() + e.diffTime, - o = i.transTime(a); - a <= 0 ? t.requestHomePage() : t.setData({ - "sale.countTime": o - }); - }, 1e3); - }, - destroyActivityTimer: function () { - this.data.timer && (clearInterval(this.data.timer), this.data.timer = null); - }, - onPageScroll: function (e) { - this.data.scrollTop = e.scrollTop; - var t = getCurrentPages(); - "pages/index/index/index" == t[t.length - 1].route; - /*--(e.scrollTop > 10 ? wx.setNavigationBarColor({ - frontColor: "#ffffff", - backgroundColor: "#f95959" - }) : wx.setNavigationBarColor({ - frontColor: "#000000", - backgroundColor: "#eeeeee" - }));--*/ - }, - jumpSearch: function () { - wx.navigateTo({ - url: "/pages/goods/search/search" - }); - }, - onShareAppMessage: function (e) { - getApp().globalData.no_clear=1; - var url = "/pages/index/index/index"; - var userInfo = getApp().globalData.userInfo; - //是分销商才带 - if (userInfo) { - url += "?first_leader=" + userInfo.user_id; - } - console.log("---首页---分享--"); - var title = "商城首页" - //分享 - if (getApp().globalData.config && getApp().globalData.config.store_name) { - title = getApp().globalData.config.store_name; - } else if (getApp().globalData.setting.appName) { - title = getApp().globalData.setting.appName; - } - - var ob = { - title: title, - path: url, - }; - console.log(ob); - return ob; - }, - - //图片失败，默认图片 - bind_bnerr: function (e) { - var _errImg = e.target.dataset.errorimg; - var _errObj = {}; - _errObj[_errImg] = this.data.url + "/miniapp/images/del/logo.jpg"; - this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; - }, - - //图片失败，默认图片 - bind_bnerr2: function (e) { - var _errImg = e.target.dataset.errorimg; - var _errurl = e.target.dataset.url; - var _errObj = {}; - _errObj[_errImg] = "/miniapp/images/default_g_img.gif"; - this.setData(_errObj); //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; - - }, - //图片失败，默认图片 - bind_bnerr3: function (e) { - var _errImg = e.target.dataset.errorimg; - var _Img = e.target.dataset.img; - if (_Img != undefined) { - var _errObj = {}; - _errObj[_errImg] = "/public/images/default_goods_image_240.gif"; - this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; - } - }, - - - //秒杀倒计时 - //---小于10的格式化函数---- - timeFormat(param) { - return param < 10 ? '0' + param : param; - }, - - //----秒杀倒计时函数----- - countDown() { - if (!this.data.is_timer) return false; - var th = this; - // 获取当前时间，同时得到活动结束时间数组 - var newTime = ut.gettimestamp(); - var List = this.data.saleGoods; - for (var j = 0; j < List.length; j++) { - var endTimeList = List[j]; - // 对结束时间进行处理渲染到页面 - for (var i = 0; i < endTimeList.length; i++) { - var o = endTimeList[i]; - var endTime = o.end_time - if (o.status == 0) endTime = o.start_time - - var obj = null; - // 如果活动未结束，对时间进行处理 - if (endTime - newTime > 0) { - var time = (endTime - newTime); - // 获取天、时、分、秒 - var day = parseInt(time / (60 * 60 * 24)); - var hou = parseInt(time % (60 * 60 * 24) / 3600); - var min = parseInt(time % (60 * 60 * 24) % 3600 / 60); - var sec = parseInt(time % (60 * 60 * 24) % 3600 % 60); - obj = { - day: this.timeFormat(day), - hou: this.timeFormat(hou), - min: this.timeFormat(min), - sec: this.timeFormat(sec) - } - } else { - //活动已结束，全部设置为'00' - obj = { - day: '00', - hou: '00', - min: '00', - sec: '00' - } - } - var txt = "saleGoods[" + j + "][" + i + "].djs"; - th.setData({ - [txt]: obj - }); - } - - } - setTimeout(th.countDown, 1000); - }, - - //----拼单倒计时函数----- - countDown2() { - if (!this.data.is_timer) return false; - - var th = this; - // 获取当前时间，同时得到活动结束时间数组 - var newTime = ut.gettimestamp(); - var List = this.data.pindGoods; - for (var j = 0; j < List.length; j++) { - var endTimeList = List[j]; - // 对结束时间进行处理渲染到页面 - for (var i = 0; i < endTimeList.length; i++) { - var o = endTimeList[i]; - var endTime = o.end_time; - if (o.status == 0) endTime = o.start_time; - - let obj = null; - // 如果活动未结束，对时间进行处理 - if (endTime - newTime > 0) { - let time = (endTime - newTime); - // 获取天、时、分、秒 - let day = parseInt(time / (60 * 60 * 24)); - let hou = parseInt(time % (60 * 60 * 24) / 3600); - let min = parseInt(time % (60 * 60 * 24) % 3600 / 60); - let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60); - obj = { - day: this.timeFormat(day), - hou: this.timeFormat(hou), - min: this.timeFormat(min), - sec: this.timeFormat(sec) - } - } else { - //活动已结束，全部设置为'00' - obj = { - day: '00', - hou: '00', - min: '00', - sec: '00' - } - } - var txt = "pindGoods[" + j + "][" + i + "].djs"; - th.setData({ - [txt]: obj - }); - } - } - setTimeout(th.countDown2, 1000); - }, - - bannerSwiperChange: function (e) { - var index = e.detail.current; - this.setData({ - banner_index: index - }); - }, - flashSwiperChange: function (e) { - var index = e.detail.current; - this.setData({ - flash_index: index - }); - }, - ptSwiperChange: function (e) { - var index = e.detail.current; - this.setData({ - pt_index: index - }); - }, - - Interval_pt() { - var th = this; - this.data.pt_timer = setInterval(function () { - var item = ut.get_rand_item(th.data.pt_timer_arr); - th.setData({ - pt_timer_active: 1, - pt_timer_item: item - }); - setTimeout(function () { - th.setData({ - pt_timer_active: 0 - }); - }, 1500) - }, 4000); - }, - - - //---扫一扫的函数--- - getScancode: function () { - var _this = this; - getApp().globalData.no_clear=1; - // 允许从相机和相册扫码 - wx.scanCode({ - success: (res) => { - var result = res.result; - wx.navigateTo({ - url: "/pages/goods/search/search?s_key=" + result, - }); - } - }) - }, - - //跳转到分类 - go_cate: function () { - getApp().goto("/pages/goods/categoryList/categoryList"); - }, - - // 幸运购跳转 - go_url: function (e) { - - var url = e.currentTarget.dataset.url; - getApp().goto(url); - - }, // - - bind_bnerr_icon: function (e) { - var def = "/miniapp/images/no_cate_def.png"; - var _err = e.currentTarget.dataset.err; - var ob = {}; - ob[_err] = def; - this.setData(ob); - }, - - //跳转到分类的商品列表 - go_cate2: function (t) { - var cid = t.currentTarget.dataset.cid; - var pid = t.currentTarget.dataset.pid; - var lurl = "/pages/goods/goodsList/goodsList?cat_id=" + cid + "&pid=" + pid; - wx.navigateTo({ - url: lurl - }); - }, - new_nav: function (e) { - var th = this; - var new_nav = th.data.new_nav; - getApp().goto(new_nav); - }, - //跳转到权益 - go_quanyi: function (t) { - var user_info = getApp().globalData.userInfo; - if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { - wx.navigateTo({ - url: '/pages/togoin/togoin', - //url: '/pages/getphone/getphone', - }) - return false; - } - getApp().goto("/pages/user/userqy/userqy"); - }, - - imageLoad: function (e) { - var imgwidth = e.detail.width; - var imgheight = e.detail.height; - //宽高比 - var ratio = imgwidth / imgheight; - //计算的高度值 - var viewHeight = 715 / ratio; - if (this.data.max_sw_height < viewHeight) this.setData({ - max_sw_height: viewHeight - }); - }, - //判断该用户是否是新会员 - is_new: function () { - var th = this; - wx.hideLoading(); - getApp().request.promiseGet("/api/weshop/marketing/newpeople/act/judge", { - data: { - storeId: os.stoid, - userId: d.user_id - } - }).then(res => { - if (res.data.code == 0) { - var actid = res.data.data.id; //活动id - var giftBagId = res.data.data.giftBagId; //礼包id - var new_nav = "/pages/giftpack/newvipgift/newvipgift?actId=" + actid + '&' + 'actType=' + 1 + '&' + 'giftBagId=' + giftBagId; - var new_image = res.data.data.imageurl; - var swiperimage = th.data.swiperimage; - var img = { - image: "/miniapp/images/newpeople/newpeople.png", - nav_url: new_nav - } - swiperimage.unshift(img); - th.setData({ - swiperimage: swiperimage, - new_image: new_image, - new_nav: new_nav - }) - - getApp().request.promiseGet("/api/weshop/marketing/newpeople/act/bound/judge", { - data: { - storeId: o.stoid, - userId: d.user_id - } - }).then(res => { - if (res.data.code == 0) { - th.setData({ - is_disgraceful: 1 - }) - } else { - th.check_holiday_pop(); //节日的弹窗 - } - - }) - } else { - th.check_holiday_pop(); //节日的弹窗 - } - - }) - - }, - - is_festival: function (e) { - var th = this; - var url = "/api/weshop/marketing/holiday/act/judge"; - getApp().request.promiseGet(url, { - data: { - storeId: os.stoid, - userId: d.user_id - } - }).then(res => { - if (res.data.code == 0) { - var actid = res.data.data.id; //活动id - var giftBagId = res.data.data.gifBagId; //礼包id - var nav_url = "/pages/giftpack/festival/festival?actId=" + actid + '&' + 'actType=' + 3 + '&' + 'giftBagId=' + giftBagId; - var swiperimage = th.data.swiperimage; - var actBoundImg = res.data.data.actBoundImg ? res.data.data.actBoundImg : '/miniapp/images/default_g_img.gif'; - - th.data.holiday_image = res.data.data.actImg; - th.data.holiday_url = nav_url; - - var img = { - image: actBoundImg, - nav_url: nav_url, - id: res.data.data.id, - type: 'festival' - } + // 关闭首页抢红包主弹窗，显示侧边栏抢红包小图标 + closeHongbao() { + this.setData({ + showHongbao: false, //关闭抢红包主弹窗 + showHongbaoSmall: true, //显示抢红包小图标 + }); + }, + + /*-- 全屏广告 --*/ + close_full_screen() { + this.setData({ is_full_screen_show: 0, sec_show: 0 }); + }, + //-- 跳转到满屏广告的链接 -- + go_full_ad() { + if (!this.data.full_ad) return false; + if (!this.data.full_ad.ad_weapplink) return false; + getApp().goto(this.data.full_ad.ad_weapplink); + this.close_full_screen(); + }, + + go_pre: function (e) { + var userInfo = getApp().globalData.userInfo; + if (!userInfo) { + getApp().goto("/pages/togoin/togoin"); + return false; + } + var url = e.currentTarget.dataset.url; + getApp().goto(url); + }, - for (var i in swiperimage) { - var item = swiperimage[i]; - if (item.id == img.id && item.type == img.type) { - return false; - } - } - swiperimage.unshift(img); - th.setData({ - swiperimage: swiperimage, - new_nav: nav_url - }) - } - }) - }, - - //弹出节日有礼 - check_holiday_pop: function () { - var th = this; - getApp().waitfor2(th, 'w_holiday_pop', 'holiday_image', function () { - //等到结果才显示 - if (th.data.holiday_image) { - th.setData({ - new_image: th.data.holiday_image, - new_nav: th.data.holiday_url, - is_disgraceful: 1 - }) - } - }) - }, - - go_ad: function (e) { - var url = e.currentTarget.dataset.url; - if (!url || url == '') return; - if (url[0] != '/') url = '/' + url; - getApp().goto(url); - }, - - //导航跳转 - nav_goto: function (e) { - var url = e.currentTarget.dataset.url; - if (!url || url == '') return; - if (url[0] != '/') url = '/' + url; - getApp().goto(url); - if (this.data.showHongbao) { - this.setData({ - showHongbao: false, - showHongbaoSmall: true, //显示抢红包小图标 - }); - } - }, - - //----跳转到搭配购买---- - go_test: function () { - wx.navigateTo({ url: "/packageA/pages/goods_share/goods_share", }) - }, - - - onShareTimeline() { - getApp().globalData.no_clear=1; - - // getApp().getConfig(function(t) { - // return { - // title: '首页-' + getApp().globalData.config.store_name, - // } - // }); - var store_name = getApp().globalData.config ? getApp().globalData.config.store_name : ''; - if (!store_name) - store_name = getApp().globalData.setting.appName; - return { - title: '首页-' + store_name, - } - }, - - - // 关闭首页抢红包主弹窗，显示侧边栏抢红包小图标 - closeHongbao() { - this.setData({ - showHongbao: false, //关闭抢红包主弹窗 - showHongbaoSmall: true, //显示抢红包小图标 - }); - }, - - /*-- 全屏广告 --*/ - close_full_screen() { - this.setData({ is_full_screen_show: 0, sec_show: 0 }); - }, - //-- 跳转到满屏广告的链接 -- - go_full_ad() { - if (!this.data.full_ad) return false; - if (!this.data.full_ad.ad_weapplink) return false; - getApp().goto(this.data.full_ad.ad_weapplink); - this.close_full_screen(); - }, - - go_pre:function (e) { - var userInfo=getApp().globalData.userInfo; - if(!userInfo){ - getApp().goto("/pages/togoin/togoin"); - return false; - } - var url=e.currentTarget.dataset.url; - getApp().goto(url); - }, - - diff --git a/pages/user/assistance/giftpacklist.wxml b/pages/user/assistance/giftpacklist.wxml index 53d5937..831da68 100644 --- a/pages/user/assistance/giftpacklist.wxml +++ b/pages/user/assistance/giftpacklist.wxml @@ -79,7 +79,7 @@ - + diff --git a/pages/user/grow_value/grow_value.js b/pages/user/grow_value/grow_value.js index 504a472..9e6556a 100644 --- a/pages/user/grow_value/grow_value.js +++ b/pages/user/grow_value/grow_value.js @@ -182,7 +182,7 @@ Page({ var index=e.currentTarget.dataset.ind; switch (index) { case "0": getApp().goto("/pages/index/index/index");break; - case "1": getApp().goto("/pages/user/coupons/coupons"); break; + case "1": getApp().goto("/packageD/pages/user/coupons/coupons"); break; case "2": getApp().goto("/pages/user/userqy/userqy"); break; } }, diff --git a/pages/user/index/index.js b/pages/user/index/index.js index 23af5a3..02b3f8c 100644 --- a/pages/user/index/index.js +++ b/pages/user/index/index.js @@ -1,966 +1,940 @@ var auth = require("../../../utils/auth.js"), - rq = require("../../../utils/request.js"); + rq = require("../../../utils/request.js"); var e = getApp(), - app = e, - s = e.globalData.setting, - os = s, - app_d = e.globalData; + app = e, + s = e.globalData.setting, + os = s, + app_d = e.globalData; var regeneratorRuntime = require('../../../utils/runtime.js'); const { - barcode, - qrcode + barcode, + qrcode } = require('../../../utils/index.js'); var ut = require("../../../utils/util.js"); let self = null; Page({ - /** - * 页面的初始数据 - */ - data: { - length: 150, - iurl: s.imghost, - defaultAvatar: s.imghost + "/miniapp/images/no-head.jpg", - userInfo: null, - toji: null, //统计相关 - txmon: 0, - byquan: 0, - yuer: 0, - is_no_plus:1, - currentPage: 1, - recommend_list: [], - tc_hide: true, - sw_index: 0, - qy_list: null, - gradeId: null, - is_init: 0, - cz_val: 0, - full_cz_val: 0, - is_dengji: 0, //是不是等级 - is_banner: 0, //是不是有生日活动 - giftbagid: "", //生日活动的类型 - actId: "", //生日活动的id - actImg: "", - is_assistance: 0, //助力活动 - ad_img:"", - add_card_data:'', //等级卡的内容 - - hiddenCS: true, - }, - goto_nav: function(e) { - var th = this; - var url = e.currentTarget.dataset.url; - if (th.data.userInfo != null) { - getApp().goto(url); - } else { - wx.navigateTo({ - url: '/pages/togoin/togoin', - }) - } - }, - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function(options) { - self = this; - var th=this; - getApp().request.get("/api/weshop/ad/page?pid=401&store_id=" + os.stoid, { - data: { - enabled: 1 - }, - success:function(res){ - if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){ - var item=res.data.data.pageData[0]; - if (item && item.ad_code) th.setData({ad_img:item.ad_code}) - } - } - }) - app.getUserFir(); - this.init_user_tool() - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function() { - getApp().check_can_share(); - //看一下小程序是不是过期了 - getApp().getConfig2(function(config2){ - if(config2 && config2.is_overdue==1){ - getApp().promiseGet("/store/storemoduleendtime/page?store_id=" +os.stoid + "&type=5",{}).then(res=>{ - var o=res; - if (o.data.code == 0) { - var ob = { isout: 0, isbuy: 1 }; - var arr = o.data.data.pageData; - var isbuy = 0; - //----如果数组不为空---- - if (arr.length > 0) { - arr.forEach(function (val, ind) { - if (val.is_sy == 0 && val.type == 5) { - isbuy = 1; - var now = ut.gettimestamp(); - if (now > val.end_time) ob.isout = 1; - return false; - } - }) - } - ob.isbuy = isbuy; - th.setappdata(ob); - } - }) - } - }) - - //调用接口判断商家plus有没有过期 - rq.promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=3", {}).then(res => { - if (res.data.code == 0) { - var arr = res.data.data.pageData; - if (arr.length > 0) { - var item = arr[0]; - if (item.is_sy == 0) { - var now = Date.parse(new Date()); now = now / 1000; - if (item.end_time < now) { - th.setData({ is_no_plus: 0 }) - } - } - } - } - }) - var th=this; - + /** + * 页面的初始数据 + */ + data: { + length: 150, + iurl: s.imghost, + defaultAvatar: s.imghost + "/miniapp/images/no-head.jpg", + userInfo: null, + toji: null, //统计相关 + txmon: 0, + byquan: 0, + yuer: 0, + is_no_plus: 1, + currentPage: 1, + recommend_list: [], + tc_hide: true, + sw_index: 0, + qy_list: null, + gradeId: null, + is_init: 0, + cz_val: 0, + full_cz_val: 0, + is_dengji: 0, //是不是等级 + is_banner: 0, //是不是有生日活动 + giftbagid: "", //生日活动的类型 + actId: "", //生日活动的id + actImg: "", + is_assistance: 0, //助力活动 + ad_img: "", + add_card_data: '', //等级卡的内容 + + hiddenCS: true, + }, + goto_nav: function (e) { + var th = this; + var url = e.currentTarget.dataset.url; + if (th.data.userInfo != null) { + getApp().goto(url); + } else { + wx.navigateTo({ + url: '/pages/togoin/togoin', + }) + } + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + self = this; + var th = this; + getApp().request.get("/api/weshop/ad/page?pid=401&store_id=" + os.stoid, { + data: { + enabled: 1 + }, + success: function (res) { + if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length) { + var item = res.data.data.pageData[0]; + if (item && item.ad_code) th.setData({ ad_img: item.ad_code }) + } + } + }) + app.getUserFir(); + this.init_user_tool() + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + getApp().check_can_share(); + //看一下小程序是不是过期了 + getApp().getConfig2(function (config2) { + if (config2 && config2.is_overdue == 1) { + getApp().promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=5", {}).then(res => { + var o = res; + if (o.data.code == 0) { + var ob = { isout: 0, isbuy: 1 }; + var arr = o.data.data.pageData; + var isbuy = 0; + //----如果数组不为空---- + if (arr.length > 0) { + arr.forEach(function (val, ind) { + if (val.is_sy == 0 && val.type == 5) { + isbuy = 1; + var now = ut.gettimestamp(); + if (now > val.end_time) ob.isout = 1; + return false; + } + }) + } + ob.isbuy = isbuy; + th.setappdata(ob); + } + }) + } + }) + + //调用接口判断商家plus有没有过期 + rq.promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=3", {}).then(res => { + if (res.data.code == 0) { + var arr = res.data.data.pageData; + if (arr.length > 0) { + var item = arr[0]; + if (item.is_sy == 0) { + var now = Date.parse(new Date()); now = now / 1000; + if (item.end_time < now) { + th.setData({ is_no_plus: 0 }) + } + } + } + } + }) + var th = this; + // 判断是否开启美业 getApp().promiseGet('/api/weshop/store/getTabSys/' + os.stoid, {}).then(res => { - if(res.data.code == 0) { + if (res.data.code == 0) { th.setData({ enableMeiye: res.data.data.EnableMeiye, }); }; }); - - - getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + os.stoid, {}).then(res => { - if(res.data.code==0){ - var plusCard = res.data.data; - for (var i = 0; i < plusCard.length; i++) { - if(!plusCard[i].IsStopBuy) { th.setData({show_buy_plus:1}); break; } - } - } - }) - - if (typeof this.getTabBar === 'function' && this.getTabBar()) { - var index=getApp().getPageIndex(this); - this.getTabBar().setData({ - active: index //数字是当前页面在tabbar的索引 - }); - //getApp().requestCardNum(this); - } - - - var stoid = app_d.setting.stoid; - var s = this, th = s, - need_money = 0, - cur_g_num = 0; - - /*------会员登录------*/ - var e=getApp().globalData.userInfo; - if (e != undefined && e != null && e.mobile) { - - this.birthday(); - this.is_assistance(); - - s.setData({ - userInfo: e - }); - - //-- 要调用接口，获取卡的钱 -- - var url="/api/weshop/wxuser/getWxCardInfo?storeId="+os.stoid+"&userId="+e.user_id; - rq.get(url,{ - isShowLoading:0, - success: function(su) { - if(su.data.code==0){ - s.setData({ - add_card_data: su.data.data, - }); - } + + + getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + os.stoid, {}).then(res => { + if (res.data.code == 0) { + var plusCard = res.data.data; + for (var i = 0; i < plusCard.length; i++) { + if (!plusCard[i].IsStopBuy) { th.setData({ show_buy_plus: 1 }); break; } + } } + }) + + if (typeof this.getTabBar === 'function' && this.getTabBar()) { + var index = getApp().getPageIndex(this); + this.getTabBar().setData({ + active: index //数字是当前页面在tabbar的索引 + }); + //getApp().requestCardNum(this); + } + + + var stoid = app_d.setting.stoid; + var s = this, th = s, + need_money = 0, + cur_g_num = 0; + + /*------会员登录------*/ + var e = getApp().globalData.userInfo; + if (e != undefined && e != null && e.mobile) { + + this.birthday(); + this.is_assistance(); + + s.setData({ + userInfo: e + }); + + //-- 要调用接口，获取卡的钱 -- + var url = "/api/weshop/wxuser/getWxCardInfo?storeId=" + os.stoid + "&userId=" + e.user_id; + rq.get(url, { + isShowLoading: 0, + success: function (su) { + if (su.data.code == 0) { + s.setData({ + add_card_data: su.data.data, + }); + } + } + }); + + /*-----统计-----*/ + rq.get("/api/weshop/order/waitlist", { + isShowLoading: 0, + data: { + user_id: app_d.user_id + }, + success: function (su) { + s.setData({ + toji: su.data.data, + }); + } + }) + /*-----获取线下会员的预存款和优惠券的数量-----*/ + rq.get("/api/weshop/users/getinfo/" + os.stoid + "/" + e.user_id, { + isShowLoading: 0, + success: function (su) { + if (su.data.code == 0 && su.data.data) { + var data = su.data.data; + if (!data) data = {}; + data.cashcount = parseInt(data.cashcount); + s.setData({ + udata: data, + }); + } + + } + }) + /*-----获取会员提现金额-----*/ + rq.get("/api/weshop/withdrawals/summoney", { + isShowLoading: 0, + data: { + user_id: e.user_id, + store_id: os.stoid, + status: 0 + }, + success: function (su) { + if (su.data.code == 0) { + var yuer = parseFloat(th.data.userInfo.user_money - + th.data.userInfo.frozen_money - su.data.data.summoney).toFixed(2); + th.setData({ + txmon: su.data.data.summoney, + yuer: yuer + }); + } + } + }) + + /*-----获取会员包邮券的数量-----*/ + rq.get("/api/weshop/userfeemail/page", { + isShowLoading: 0, + data: { + user_id: e.user_id, + store_id: os.stoid, + pageSize: 1, + isuse: 0 + }, + success: function (su) { + if (su.data.code == 0) { + th.setData({ + byquan: parseInt(su.data.data.total) + }); + } + } + }); + + /*-----物流信息提醒-----*/ + rq.get('/api/weshop/order/countDadaOrder', { + isShowLoading: 0, + data: { + user_id: e.user_id, + store_id: os.stoid, + }, + success: function (su) { + if (su.data.code == 0) { + th.setData({ + countDadaOrder: su.data.data + }); + } + } + }); + + + + + //--初始化是否有打勾-- + getApp().request.get("/api/weshop/users/grade/vip/init/get", { + data: { + storeId: os.stoid + }, + success: function (rs) { + if (rs.data.code == 0 && rs.data.data.isBool) { + th.setData({ is_init: 1 }); + /*-----获取会员权益列表-----*/ + rq.get("/api/weshop/users/grade/vipprivilegeinfo/page", { + isShowLoading: 0, + data: { + storeId: os.stoid, + pageSize: 100 + }, + success: async function (res) { + + //判断有没有值，没有值返回 + if (!ut.ajax_ok(res)) return false; + + var arr_data = res.data.data.pageData; + var gid = null, + g_qy_list = null, + cz_vals = 0, + need_money = 0, + backClass = null, + + GradeName = ''; + + //获取成长值 + await getApp().request.promiseGet("/api/weshop/users/grade/aftervipinfo/get", { + data: { + storeId: os.stoid, + userId: app_d.user_id + } + }).then(res => { + if (res.data.code == 0 && res.data.data) { + gid = res.data.data.GradeId; + var cz_val = res.data.data.GradeSum; + cz_vals = parseInt(cz_val); + GradeName = res.data.data.GradeName; + } + //th.setData({ cz_val: cz_vals, GradeName: res.data.data.GradeName, is_init: is_init, gradeId: gid}); + }) + var obj = { + cz_val: cz_vals, + GradeName: GradeName, + gradeId: gid, + is_grad_get: 1 + }; + + // 获取最大值 + await getApp().request.promiseGet("/api/weshop/users/grade/vipgradeinfo/page", { + data: { + storeId: os.stoid + } + }).then(res => { + if (res.data.data) + backClass = res.data.data.pageData; + if (backClass) { + var full_cz_val = backClass[backClass.length - 1].BuyGradeSum; + //th.setData({ full_cz_val: full_cz_val}); + obj.full_cz_val = full_cz_val + } + }) + + //--会员权益中心页的修改-- + for (var i in backClass) { + var im = backClass[i]; + if (cz_vals < im.BuyGradeSum && need_money == 0) { + need_money = im.BuyGradeSum; + obj.need_money = need_money; + } + } + + //获取当前等级的特权 + await getApp().request.promiseGet("/api/weshop/users/grade/privilegeform/list/page", { + data: { + storeId: os.stoid, + GradeId: gid, + userId: app_d.user_id, + pageSize: 100 + } + }).then(res => { + if (res.data.data) + g_qy_list = res.data.data.pageData; + }); + + for (var i in arr_data) { + var item = arr_data[i]; + var FromId = th.check_is_has_qy(item, g_qy_list); + arr_data[i].ishas = 0; + if (FromId) { + arr_data[i].ishas = 1; + arr_data[i].FromId = FromId; + } + } + arr_data.sort(function (a, b) { + return b.ishas - a.ishas + }) + + //4个4个一组 + var arr = new Array(); + for (var i = 0; i < arr_data.length; i += 4) { + arr.push(arr_data.slice(i, i + 4)); + } + //th.setData({ qy_list: arr, need_money: need_money}); + obj.qy_list = arr; + th.setData(obj); + } + }) + } + } + }) + + /*-- 获取 --*/ + th.requestRecommend(); + + /*-------系统是否开通等级卡，会员是等级卡-----*/ + getApp().getConfig2(function (e) { + var t_swi = e.switch_list; + if (t_swi) t_swi = JSON.parse(t_swi) + if (t_swi) { + th.setData({ sys_switch: t_swi }); + var user_tool = []; + if (t_swi.usertool) user_tool = JSON.parse(t_swi.usertool); + th.setData({ c_list: user_tool }) + } + if (parseInt(t_swi.rank_switch) == 2) { + var userInfo = th.data.userInfo; + if (userInfo.card_field != null && userInfo.card_field != undefined && userInfo.card_field != "") { + var now = ut.gettimestamp(); + var str = userInfo.card_expiredate; + var end = new Date(str); + end = Date.parse(end) / 1000; + //---判断是不是有过期--- + if (now < end) { + th.setData({ + is_dengji: 1 + }) + } else { + th.setData({ + is_dengji: 3 + }) + } + } else { + th.setData({ + is_dengji: 2 + }) + } + } + }) + //th.requestRecommend(); + } + + //自定义组件一定要等到页面加载完了，才来调用selectComponnent + setTimeout(function () { + if (getApp().globalData.user_id) getApp().requestCardNum(th); + var goods_list = th.selectComponent("#goods_recommend"); //组件的id + goods_list.init(); + goods_list.get_list(); + }, 800) + }, + + //判断会员是后有改服务项目 + check_is_has_qy: function (item, g_qy_list) { + if (!g_qy_list) return false; + + for (var i in g_qy_list) { + var iter = g_qy_list[i]; + if (iter.FormId == item.Id) return g_qy_list[i].FormId; + } + return false; + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + for (var i = 1; i < 100; i++) { + clearInterval(i); + } + }, + setappdata: function (t) { + var t = getApp().globalData.wxapp_buy_obj; + if (t && t.isout == 1) + wx.navigateTo({ + url: "/pages/error/error?msg=小程序已经过期", + }); + if (t && t.isbuy == 0) + wx.navigateTo({ + url: "/pages/error/error?msg=还未购买小程序", + }); + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + //!this.nomore && this.requestRecommend(); + var goods_list = this.selectComponent("#goods_recommend"); //组件的id + goods_list.init(); + setTimeout(function () { + goods_list.get_list(); + }, 300) + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { getApp().globalData.no_clear = 1; }, + + //------卡片的显示和关闭-------- + show_tc: function () { + if (!this.data.userInfo) return false; + //base64_encode($user.mobile.'|'.date('Y-m-d H:i:s') + var val = this.data.userInfo.mobile + "|" + ut.formatTime(); + val = "^" + ut.base64_encode(val); + + qrcode('qrcode', val, 480, 480, this); + this.setData({ + tc_hide: false, }); - - /*-----统计-----*/ - rq.get("/api/weshop/order/waitlist", { - isShowLoading:0, - data: { - user_id: app_d.user_id - }, - success: function(su) { - s.setData({ - toji: su.data.data, - }); - } - }) - /*-----获取线下会员的预存款和优惠券的数量-----*/ - rq.get("/api/weshop/users/getinfo/" + os.stoid + "/" + e.user_id, { - isShowLoading:0, - success: function(su) { - if(su.data.code==0 && su.data.data ) { - var data = su.data.data; - if(!data) data={}; - data.cashcount = parseInt(data.cashcount); - s.setData({ - udata: data, - }); - } - - } - }) - /*-----获取会员提现金额-----*/ - rq.get("/api/weshop/withdrawals/summoney", { - isShowLoading:0, - data: { - user_id: e.user_id, - store_id: os.stoid, - status: 0 - }, - success: function(su) { - if (su.data.code == 0) { - var yuer = parseFloat(th.data.userInfo.user_money - - th.data.userInfo.frozen_money - su.data.data.summoney).toFixed(2); - th.setData({ - txmon: su.data.data.summoney, - yuer: yuer - }); - } - } - }) - - /*-----获取会员包邮券的数量-----*/ - rq.get("/api/weshop/userfeemail/page", { - isShowLoading:0, - data: { - user_id: e.user_id, - store_id: os.stoid, - pageSize: 1, - isuse: 0 - }, - success: function(su) { - if (su.data.code == 0) { - th.setData({ - byquan: parseInt(su.data.data.total) - }); - } - } - }); - - /*-----物流信息提醒-----*/ - rq.get('/api/weshop/order/countDadaOrder', { - isShowLoading:0, - data: { - user_id: e.user_id, - store_id: os.stoid, - }, - success: function(su) { - if (su.data.code == 0) { - th.setData({ - countDadaOrder: su.data.data - }); - } - } - }); - - - - - //--初始化是否有打勾-- - getApp().request.get("/api/weshop/users/grade/vip/init/get", { - data: { - storeId: os.stoid - }, - success:function (rs) { - if(rs.data.code==0 && rs.data.data.isBool){ - th.setData({is_init:1}); - /*-----获取会员权益列表-----*/ - rq.get("/api/weshop/users/grade/vipprivilegeinfo/page", { - isShowLoading:0, - data: { - storeId: os.stoid, - pageSize: 100 - }, - success: async function(res) { - - //判断有没有值，没有值返回 - if(!ut.ajax_ok(res)) return false; - - var arr_data = res.data.data.pageData; - var gid = null, - g_qy_list = null, - cz_vals = 0, - need_money = 0, - backClass = null, - - GradeName = ''; - - //获取成长值 - await getApp().request.promiseGet("/api/weshop/users/grade/aftervipinfo/get", { - data: { - storeId: os.stoid, - userId: app_d.user_id - } - }).then(res => { - if (res.data.code == 0 && res.data.data) { - gid = res.data.data.GradeId; - var cz_val = res.data.data.GradeSum; - cz_vals = parseInt(cz_val); - GradeName = res.data.data.GradeName; - } - //th.setData({ cz_val: cz_vals, GradeName: res.data.data.GradeName, is_init: is_init, gradeId: gid}); - }) - var obj = { - cz_val: cz_vals, - GradeName: GradeName, - gradeId: gid, - is_grad_get:1 - }; - - // 获取最大值 - await getApp().request.promiseGet("/api/weshop/users/grade/vipgradeinfo/page", { - data: { - storeId: os.stoid - } - }).then(res => { - if (res.data.data) - backClass = res.data.data.pageData; - if (backClass) { - var full_cz_val = backClass[backClass.length - 1].BuyGradeSum; - //th.setData({ full_cz_val: full_cz_val}); - obj.full_cz_val = full_cz_val - } - }) - - //--会员权益中心页的修改-- - for (var i in backClass) { - var im = backClass[i]; - if (cz_vals < im.BuyGradeSum && need_money == 0) { - need_money = im.BuyGradeSum; - obj.need_money = need_money; - } - } - - //获取当前等级的特权 - await getApp().request.promiseGet("/api/weshop/users/grade/privilegeform/list/page", { - data: { - storeId: os.stoid, - GradeId: gid, - userId: app_d.user_id, - pageSize: 100 - } - }).then(res => { - if (res.data.data) - g_qy_list = res.data.data.pageData; - }); - - for (var i in arr_data) { - var item = arr_data[i]; - var FromId = th.check_is_has_qy(item, g_qy_list); - arr_data[i].ishas = 0; - if (FromId) { - arr_data[i].ishas = 1; - arr_data[i].FromId = FromId; - } - } - arr_data.sort(function(a, b) { - return b.ishas - a.ishas - }) - - //4个4个一组 - var arr = new Array(); - for (var i = 0; i < arr_data.length; i += 4) { - arr.push(arr_data.slice(i, i + 4)); - } - //th.setData({ qy_list: arr, need_money: need_money}); - obj.qy_list = arr; - th.setData(obj); - } - }) - } - } - }) - - - - /*-- 获取 --*/ - th.requestRecommend(); - - /*-------系统是否开通等级卡，会员是等级卡-----*/ - getApp().getConfig2(function(e) { - var t_swi = e.switch_list; - if (t_swi) t_swi = JSON.parse(t_swi) - if(t_swi){ - th.setData({sys_switch:t_swi}); - - var user_tool=[]; - if(t_swi.usertool) user_tool=JSON.parse(t_swi.usertool); - th.setData({c_list:user_tool}) - - } - - - if (parseInt(t_swi.rank_switch) == 2) { - var userInfo = th.data.userInfo; - if (userInfo.card_field != null && userInfo.card_field != undefined && userInfo.card_field != "") { - var now = ut.gettimestamp(); - var str = userInfo.card_expiredate; - var end = new Date(str); - end = Date.parse(end) / 1000; - //---判断是不是有过期--- - if (now < end) { - th.setData({ - is_dengji: 1 - }) - } else { - th.setData({ - is_dengji: 3 - }) - } - } else { - th.setData({ - is_dengji: 2 - }) - } - } - }) - //th.requestRecommend(); - - - - - - } - - /*-- - var t_swi= getApp().globalData.config2.switch_list - if (t_swi){ - t_swi = JSON.parse(t_swi); - var user_tool=[]; - if(t_swi.usertool) user_tool=JSON.parse(t_swi.usertool); - th.setData({c_list:user_tool}) - } --*/ - - //自定义组件一定要等到页面加载完了，才来调用selectComponnent - setTimeout(function () { - if (getApp().globalData.user_id) getApp().requestCardNum(th); - var goods_list = th.selectComponent("#goods_recommend"); //组件的id - goods_list.init(); - goods_list.get_list(); - },800) - - - - }, - - - - //判断会员是后有改服务项目 - check_is_has_qy: function(item, g_qy_list) { - if (!g_qy_list) return false; - - for (var i in g_qy_list) { - var iter = g_qy_list[i]; - if (iter.FormId == item.Id) return g_qy_list[i].FormId; - } - return false; - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function() { - for(var i = 1; i < 100; i++) { - clearInterval(i); - } - }, - setappdata: function(t) { - var t=getApp().globalData.wxapp_buy_obj; - if (t && t.isout == 1) - wx.navigateTo({ - url: "/pages/error/error?msg=小程序已经过期", - }); - if (t && t.isbuy == 0) - wx.navigateTo({ - url: "/pages/error/error?msg=还未购买小程序", - }); - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function() { - //!this.nomore && this.requestRecommend(); - var goods_list = this.selectComponent("#goods_recommend"); //组件的id - goods_list.init(); - setTimeout(function() { - goods_list.get_list(); - }, 300) - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function() { getApp().globalData.no_clear=1; }, - - //------卡片的显示和关闭-------- - show_tc: function() { - if (!this.data.userInfo) return false; - //base64_encode($user.mobile.'|'.date('Y-m-d H:i:s') - var val=this.data.userInfo.mobile+"|"+ut.formatTime(); - val="^"+ut.base64_encode(val); - - qrcode('qrcode', val, 480, 480, this); - this.setData({ - tc_hide: false, - }); - }, - hide_tc: function() { - this.setData({ - tc_hide: true, - }); - }, - - //--跳转到预存款页面-- - deposit: function() { - if (!this.data.userInfo) return false; - wx.navigateTo({ - url: '../deposit/deposit', - }) - }, - //--跳转到余额页面-- - balance: function() { - if (!this.data.userInfo) return false; - wx.navigateTo({ - url: '../member/menber', - }) - }, - //--跳转到优惠券-- - coupon: function() { - var th = this; - if (!this.data.userInfo) return false; - // th.sendsm(); - wx.navigateTo({ - url: '../coupons/coupons', - }) - }, - //--跳转到积分-- - integral: function() { - if (!this.data.userInfo) return false; - wx.navigateTo({ - url: '../integral/integral', - }) - }, - //--跳到绑定页面-- - gobindtel: function() { - wx.navigateTo({ - url: '/pages/togoin/togoin', - }) - }, - - go_order: function(e) { - if (!this.data.userInfo) return false; - var url = e.currentTarget.dataset.url; - wx.navigateTo({ - url: url, - }) - - }, - - //--加载更多商品-- - requestRecommend: function() { - var e = this, - t = '/api/weshop/goods/page?page=' + e.data.currentPage; - var th_recommend_list = e.data.recommend_list; - getApp().request.get(t, { - data: { - is_mainshow: 1, - isonsale: 1, - is_recommend: 1, - is_on_sale: 1, - store_id: os.stoid, - pageSize: 10 - }, - success: function(ee) { - var recommend_list = ee.data.data.pageData; - if (recommend_list && recommend_list.length > 0) { - var dd = [...th_recommend_list, ...recommend_list]; - e.setData({ - recommend_list, - dd - }); - e.data.currentPage++; - } else { - e.setData({ - nomore: 1 - }); - } - } - }) - }, - - //--跳转到权益页面-- - go_qy: function() { - if (!this.data.userInfo) return false; - var url = "/pages/user/userqy/userqy"; - getApp().goto(url); - }, - - //--跳转到商品详情页面-- - go_goods: function(e) { - var gid = e.currentTarget.dataset.gid; - var url = "/pages/goods/goodsInfo/goodsInfo?goods_id=" + gid; - getApp().goto(url); - }, - - click_next: function() { - var index = this.data.sw_index; - index++; - if (index >= this.data.qy_list.length) return; - this.setData({ - sw_index: index - }) - }, - - click_pre: function() { - var index = this.data.sw_index; - index--; - if (index < 0) return; - this.setData({ - sw_index: index - }) - }, - - onSli: function(e) { - var that = this; - that.setData({ - sw_index: e.detail.current - }) - }, - - //--权益使用-- - go_qy_url: function(e) { - var th = this; - var no = e.currentTarget.dataset.no; - var ind = e.currentTarget.dataset.ind; - var find = e.currentTarget.dataset.find; - var item = th.data.qy_list[find][ind]; - if (item.ishas == undefined || !item.ishas) { - var qt_txt = th.selectComponent("#pop_txt"); //组件的id - var ob = { - title: "温馨提示", - content: "当前会员暂无此权益" - }; - qt_txt.open(ob); - return false; - } - - var url = e.currentTarget.dataset.img; - if(!url || url==""){ - url=`/public/upload/userqy/quanbg.jpg` - } - switch (no) { - case "01": - getApp().goto("/packageB/pages/user/user_coupon/user_coupon?img=" + - url + "&gradeId=" + th.data.gradeId + "&FormId=" + item.Id); - break; - case "02": - getApp().goto("/pages/user/user_fw/user_fw?gradeId=" + th.data.gradeId + "&FormId=" + item.Id); - break; - case "03": - getApp().goto("/pages/user/user_spsy/user_spsy?img=" + - url + "&gradeId=" + th.data.gradeId + "&FormId=" + item.Id); - break; - case "10": - getApp().request.get("/api/weshop/users/grade/vipprivilegelist/other/get", { - data: { - storeId: os.stoid, - formId: item.Id, - userId: getApp().globalData.user_id, - gradeId: th.data.gradeId - }, - success: function(res) { - var val = res.data.data.Remark; - var title = res.data.data.PrivilegeName; - var qt_txt = th.selectComponent("#pop_txt"); //组件的id - var ob = { - title: title, - content: val - }; - qt_txt.open(ob); - } - }) - break; - } - }, - - //跳转到链接 - goto: function(e) { - var url = e.currentTarget.dataset.url; - getApp().goto(url); - }, - - //---------联系客服------------ - contactService: function() { + }, + hide_tc: function () { + this.setData({ + tc_hide: true, + }); + }, + + //--跳转到预存款页面-- + deposit: function () { + if (!this.data.userInfo) return false; + wx.navigateTo({ + url: '/packageD/pages/user/deposit/deposit', + }) + }, + //--跳转到余额页面-- + balance: function () { + if (!this.data.userInfo) return false; + wx.navigateTo({ + url: '/packageD/pages/user/member/menber', + }) + }, + //--跳转到优惠券-- + coupon: function () { + var th = this; + if (!this.data.userInfo) return false; + // th.sendsm(); + wx.navigateTo({ + url: '/packageD/pages/user/coupons/coupons', + }) + }, + //--跳转到积分-- + integral: function () { + if (!this.data.userInfo) return false; + wx.navigateTo({ + url: '/packageD/pages/user/integral/integral', + }) + }, + //--跳到绑定页面-- + gobindtel: function () { + wx.navigateTo({ + url: '/pages/togoin/togoin', + }) + }, + + go_order: function (e) { + if (!this.data.userInfo) return false; + var url = e.currentTarget.dataset.url; + wx.navigateTo({ + url: url, + }) + + }, + + //--加载更多商品-- + requestRecommend: function () { + var e = this, + t = '/api/weshop/goods/page?page=' + e.data.currentPage; + var th_recommend_list = e.data.recommend_list; + getApp().request.get(t, { + data: { + is_mainshow: 1, + isonsale: 1, + is_recommend: 1, + is_on_sale: 1, + store_id: os.stoid, + pageSize: 10 + }, + success: function (ee) { + var recommend_list = ee.data.data.pageData; + if (recommend_list && recommend_list.length > 0) { + var dd = [...th_recommend_list, ...recommend_list]; + e.setData({ + recommend_list, + dd + }); + e.data.currentPage++; + } else { + e.setData({ + nomore: 1 + }); + } + } + }) + }, + + //--跳转到权益页面-- + go_qy: function () { + if (!this.data.userInfo) return false; + var url = "/pages/user/userqy/userqy"; + getApp().goto(url); + }, + + //--跳转到商品详情页面-- + go_goods: function (e) { + var gid = e.currentTarget.dataset.gid; + var url = "/pages/goods/goodsInfo/goodsInfo?goods_id=" + gid; + getApp().goto(url); + }, + + click_next: function () { + var index = this.data.sw_index; + index++; + if (index >= this.data.qy_list.length) return; + this.setData({ + sw_index: index + }) + }, + + click_pre: function () { + var index = this.data.sw_index; + index--; + if (index < 0) return; + this.setData({ + sw_index: index + }) + }, + + onSli: function (e) { + var that = this; + that.setData({ + sw_index: e.detail.current + }) + }, + + //--权益使用-- + go_qy_url: function (e) { + var th = this; + var no = e.currentTarget.dataset.no; + var ind = e.currentTarget.dataset.ind; + var find = e.currentTarget.dataset.find; + var item = th.data.qy_list[find][ind]; + if (item.ishas == undefined || !item.ishas) { + var qt_txt = th.selectComponent("#pop_txt"); //组件的id + var ob = { + title: "温馨提示", + content: "当前会员暂无此权益" + }; + qt_txt.open(ob); + return false; + } + + var url = e.currentTarget.dataset.img; + if (!url || url == "") { + url = `/public/upload/userqy/quanbg.jpg` + } + switch (no) { + case "01": + getApp().goto("/packageB/pages/user/user_coupon/user_coupon?img=" + + url + "&gradeId=" + th.data.gradeId + "&FormId=" + item.Id); + break; + case "02": + getApp().goto("/pages/user/user_fw/user_fw?gradeId=" + th.data.gradeId + "&FormId=" + item.Id); + break; + case "03": + getApp().goto("/pages/user/user_spsy/user_spsy?img=" + + url + "&gradeId=" + th.data.gradeId + "&FormId=" + item.Id); + break; + case "10": + getApp().request.get("/api/weshop/users/grade/vipprivilegelist/other/get", { + data: { + storeId: os.stoid, + formId: item.Id, + userId: getApp().globalData.user_id, + gradeId: th.data.gradeId + }, + success: function (res) { + var val = res.data.data.Remark; + var title = res.data.data.PrivilegeName; + var qt_txt = th.selectComponent("#pop_txt"); //组件的id + var ob = { + title: title, + content: val + }; + qt_txt.open(ob); + } + }) + break; + } + }, + + //跳转到链接 + goto: function (e) { + var url = e.currentTarget.dataset.url; + getApp().goto(url); + }, + + //---------联系客服------------ + contactService: function () { getApp().com_call(this); }, - + // 获取客服热线 getTel() { return new Promise((resolve, reject) => { var self = this; var s = getApp(); - s.getConfig(function(t) { - if (t.store_tel == undefined) { - getApp().request.get("/api/weshop/store/get/" + os.stoid, { - isShowLoading: 1, - data: {}, - success: function(rs) { - getApp().globalData.config = rs.data.data; - if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) { - getApp().showWarning("商家未设置电话"); - return false; - } else { + s.getConfig(function (t) { + if (t.store_tel == undefined) { + getApp().request.get("/api/weshop/store/get/" + os.stoid, { + isShowLoading: 1, + data: {}, + success: function (rs) { + getApp().globalData.config = rs.data.data; + if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) { + getApp().showWarning("商家未设置电话"); + return false; + } else { self.setData({ store_tel: rs.data.data.store_tel, }); // s.confirmBox("客服热线：" + rs.data.data.store_tel); }; - - } - }) - } else { + + } + }) + } else { self.setData({ store_tel: t.store_tel, }); - // s.confirmBox("客服热线：" + t.store_tel); - } + // s.confirmBox("客服热线：" + t.store_tel); + } resolve(); }); }); }, - - - go_info: function() { - getApp().goto("/pages/user/userinfo/userinfo"); - }, - - jump: function() { - getApp().goto("/pages/user/grow_value/grow_value") - }, - // 判断生日营销的页面是不是存在 - birthday: function() { - - var th = this; - rq.get("/api/weshop/marketing/birthday/act/judge", { - data: { storeId: os.stoid, userId: app_d.user_id }, - success: function (res) { - - var code = res.data.code; - if (code == 0) { - var giftbagid = res.data.data.giftBagId; - var actId = res.data.data.id; - var actImg = res.data.data.actImg; - th.setData({ giftbagid: giftbagid, actId: actId, actImg: actImg }); - th.setData({is_banner:1}); - } - - } - }) - }, - clike_banne: function() { - var th = this; - var actId = th.data.actId; - var giftbagid = th.data.giftbagid; - - if (actId != "" && giftbagid != "") { - - getApp().goto("/pages/giftpack/birthdaygift/birthdaygift?actId=" + actId + "&gifbagid=" + giftbagid + "&orderType=" + 3); - } else { - - getApp().showWarning("请稍后重试"); - } - }, - - // 判断助力活动是不是存在 - is_assistance: function() { - var th = this,r=Math.random()*100; - rq.get("/api/weshop/marketing/help/act/judge", { - data: { - storeId: os.stoid, - userId: app_d.user_id, - r:r, - }, - success: function(res) { - var code = res.data.code; - if (code == 0) { - th.setData({ - is_assistance: 1 - }); - }else{ + + + go_info: function () { + getApp().goto("/pages/user/userinfo/userinfo"); + }, + + jump: function () { + getApp().goto("/pages/user/grow_value/grow_value") + }, + // 判断生日营销的页面是不是存在 + birthday: function () { + + var th = this; + rq.get("/api/weshop/marketing/birthday/act/judge", { + data: { storeId: os.stoid, userId: app_d.user_id }, + success: function (res) { + + var code = res.data.code; + if (code == 0) { + var giftbagid = res.data.data.giftBagId; + var actId = res.data.data.id; + var actImg = res.data.data.actImg; + th.setData({ giftbagid: giftbagid, actId: actId, actImg: actImg }); + th.setData({ is_banner: 1 }); + } + + } + }) + }, + clike_banne: function () { + var th = this; + var actId = th.data.actId; + var giftbagid = th.data.giftbagid; + + if (actId != "" && giftbagid != "") { + + getApp().goto("/pages/giftpack/birthdaygift/birthdaygift?actId=" + actId + "&gifbagid=" + giftbagid + "&orderType=" + 3); + } else { + + getApp().showWarning("请稍后重试"); + } + }, + + // 判断助力活动是不是存在 + is_assistance: function () { + var th = this, r = Math.random() * 100; + rq.get("/api/weshop/marketing/help/act/judge", { + data: { + storeId: os.stoid, + userId: app_d.user_id, + r: r, + }, + success: function (res) { + var code = res.data.code; + if (code == 0) { + th.setData({ + is_assistance: 1 + }); + } else { th.setData({ is_assistance: 0 }); } - } - }) - }, - - //导航跳转 - nav_goto:function(e){ - var url=e.currentTarget.dataset.url; - if(!url || url=='') return; - if(url[0]!='/') url='/'+url; - getApp().goto(url); - }, - - //添加卡包 - addcard:function(){ - var res=this.data.add_card_data; - if(!res) return false; - - var arr = new Array(6) - arr[0] = res.code; - arr[1] = res.timestamp; - arr[2] = res.jsapiTicket; - arr[3] = res.openid; - arr[4] = res.cardid; - arr[5] = res.nonceStr; - var c=arr.sort(); - var newstr=""; - for (var i=0;i 0) { - template_id = res.data.data.pageData[0].template_id; - // //授权订阅 - wx.requestSubscribeMessage({ - tmplIds: [template_id], - success(res) { - - }, - fail(res) { - - } - }) - } - } - }) - }, - - con_weixin:function () { - getApp().con_wx(this); - }, - - //初始话按钮图标 - init_user_tool:async function () { - var d_list=null; - //读取user_tool按钮图标 - await getApp().promiseGet("/api/weshop/userTool/page?pageSize=100&store_id="+os.stoid, { - }).then(res=>{ - if(ut.ajax_ok(res)) { - d_list=res.data.data.pageData; - } - }) - if(!d_list) return false; - //过滤掉分销关闭的 - await getApp().promiseGet("/api/weshop/storeDistribut/get/"+os.stoid,{}).then(rs=>{ - if(rs.data.code==0){ - var dis=rs.data.data; - for(var i in d_list){ - if(d_list[i].name=='我的分销' && (!dis || dis.switch==0)){ - d_list.splice(i,1); - } - } - } - }) - - //判断右没有开AI测肤 - await getApp().promiseGet("/api/weshop/wx/weappSkin/get/"+os.stoid,{}).then(rs=>{ - if(rs.data.code!=0 || !rs.data.data){ - for(var i in d_list){ - if(d_list[i].name=='AI测肤'){ - d_list.splice(i,1); - } - } - } - }) - this.setData({user_tool:d_list}); - }, - - - click_contact:function () { - getApp().globalData.no_clear=1; - }, + } + }) + }, + + //导航跳转 + nav_goto: function (e) { + var url = e.currentTarget.dataset.url; + if (!url || url == '') return; + if (url[0] != '/') url = '/' + url; + getApp().goto(url); + }, + + //添加卡包 + addcard: function () { + var res = this.data.add_card_data; + if (!res) return false; + + var arr = new Array(6) + arr[0] = res.code; + arr[1] = res.timestamp; + arr[2] = res.jsapiTicket; + arr[3] = res.openid; + arr[4] = res.cardid; + arr[5] = res.nonceStr; + var c = arr.sort(); + var newstr = ""; + for (var i = 0; i < c.length; i++) { + newstr += c[i]; + } + + var sh1 = ut.sha1(newstr); + wx.addCard({ + cardList: [ + { + cardId: res.cardid, + cardExt: '{"code": "' + res.code + '", "openid": "' + res.openid + '","timestamp": "' + res.timestamp + '","nonce_str":"' + res.nonceStr + '","outer_str":"web", "signature":"' + sh1 + '"}' + } + + ], + success: function (res) { }, + cancel: function (res) { } + }); + }, + + //订阅消息提醒 + sendsm: function () { + var template_id = ""; + rq.get("/api/wx/weappSendlist/page", { + data: { + store_id: os.stoid, + typeid: "1020" + }, + success: function (res) { + if (res.data.code == 0 && res.data.data.pageData.length > 0) { + template_id = res.data.data.pageData[0].template_id; + // //授权订阅 + wx.requestSubscribeMessage({ + tmplIds: [template_id], + success(res) { + + }, + fail(res) { + + } + }) + } + } + }) + }, + + con_weixin: function () { + getApp().con_wx(this); + }, + + //初始话按钮图标 + init_user_tool: async function () { + var d_list = null; + //读取user_tool按钮图标 + await getApp().promiseGet("/api/weshop/userTool/page?pageSize=100&store_id=" + os.stoid, { + }).then(res => { + if (ut.ajax_ok(res)) { + d_list = res.data.data.pageData; + } + }) - //打开客服操作菜单 - openCS() { - // 判断会员状态 - let user_info = getApp().globalData.userInfo; - if (user_info == null || user_info.mobile == undefined || user_info.mobile == '' || user_info.mobile == null) { - wx.navigateTo({ - url: '/pages/togoin/togoin', - }) - return false; - }; - // csType/在线客服设置： - // 0关闭（如果有设置热线电话，则显示拨打热线电话）、 - // 1小程序客服、 - // 2企业微信客服 - if(this.data.sys_switch) { - let csType = this.data.sys_switch.weapp_customertype; - if(csType == 0) { - // 拨打电话号码 - this.contactService(); - } else { - this.getTel() + if (!d_list) return false; + //过滤掉分销关闭的 + let distribut_end_time = await getApp().user_tools_endTime(2);//过滤掉分销到期的 + await getApp().promiseGet("/api/weshop/storeDistribut/get/" + os.stoid, {}).then(rs => { + if (rs.data.code == 0) { + var dis = rs.data.data; + for (var i in d_list) { + if (d_list[i].name == '我的分销' && (!dis || dis.switch == 0) || (d_list[i].name == '我的分销' && !distribut_end_time)) { + d_list.splice(i, 1); + } + } + } + }) + + //判断有没有开AI测肤 + await getApp().promiseGet("/api/weshop/wx/weappSkin/get/" + os.stoid, {}).then(rs => { + if (rs.data.code != 0 || !rs.data.data) { + for (var i in d_list) { + if (d_list[i].name == 'AI测肤') { + d_list.splice(i, 1); + } + } + } + }) + this.setData({ user_tool: d_list }); + }, + + + click_contact: function () { + getApp().globalData.no_clear = 1; + }, + + //打开客服操作菜单 + openCS() { + // 判断会员状态 + let user_info = getApp().globalData.userInfo; + if (user_info == null || user_info.mobile == undefined || user_info.mobile == '' || user_info.mobile == null) { + wx.navigateTo({ + url: '/pages/togoin/togoin', + }) + return false; + }; + // csType/在线客服设置： + // 0关闭（如果有设置热线电话，则显示拨打热线电话）、 + // 1小程序客服、 + // 2企业微信客服 + if (this.data.sys_switch) { + let csType = this.data.sys_switch.weapp_customertype; + if (csType == 0) { + // 拨打电话号码 + this.contactService(); + } else { + this.getTel() .then(() => { self.setData({ hiddenCS: false, }); }); - }; }; - - }, - - //关闭客服操作菜单 - closeCS() { - this.setData({ - hiddenCS: true, - }); - }, + }; + + }, + + //关闭客服操作菜单 + closeCS() { + this.setData({ + hiddenCS: true, + }); + }, diff --git a/pages/user/my_service/i_service.wxml b/pages/user/my_service/i_service.wxml index 360e6bb..4dc9b7e 100644 --- a/pages/user/my_service/i_service.wxml +++ b/pages/user/my_service/i_service.wxml @@ -39,7 +39,8 @@ 剩余次数： - {{item.ObtainTimes}} + 无限次 + {{item.ObtainTimes}} diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js index 960f5e0..1c1ac5f 100644 --- a/pages/user/order_detail/order_detail.js +++ b/pages/user/order_detail/order_detail.js @@ -464,7 +464,7 @@ Page({ } }) if(is_g_prom){ - await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0", {}).then(res => { + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0"+"/"+getApp().globalData.user_id, {}).then(res => { if (res.data.code == 0) { var r_data = res.data.data; if (!r_data.collocationPromList && good.prom_type == 5) { @@ -585,7 +585,7 @@ Page({ //不是赠品的时候 if(!good.is_gift && good.prom_type!=3){ var t_ok=1; - await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => { + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0"+"/"+getApp().globalData.user_id, {}).then(res => { if(res.data.code==0){ var r_data=res.data.data; //-- 参加了全局的优惠活动 -- @@ -1047,7 +1047,7 @@ Page({ }) //调用接口判断订单优惠， - const res = await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + g_item.goods_id + "/0", {}) + const res = await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + g_item.goods_id + "/0"+"/"+getApp().globalData.user_id, {}) if (res.data.code == 0 && res.data.data) { var r_data = res.data.data; if (r_data.ladderLists) { @@ -1215,7 +1215,7 @@ Page({ } }) if(is_g_prom) { - await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/1", {}).then(res => { + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/1"+"/"+getApp().globalData.user_id, {}).then(res => { if (res.data.code == 0) { var r_data = res.data.data; if (r_data.promGoodsLists) { diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index aed79a2..26a8e59 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -717,7 +717,7 @@ Page({ } }) if(is_g_prom){ - await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0", {}).then(res => { + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0"+"/"+getApp().globalData.user_id, {}).then(res => { if (res.data.code == 0) { var r_data = res.data.data; if (!r_data.collocationPromList && good.prom_type == 5) { @@ -838,7 +838,7 @@ Page({ else { if (!good.is_gift && good.prom_type != 3) { var t_ok = 1; - await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0", {}).then(res => { + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0"+"/"+getApp().globalData.user_id, {}).then(res => { if (res.data.code == 0) { var r_data = res.data.data; //-- 参加了全局的优惠活动 -- @@ -1457,7 +1457,7 @@ Page({ } }) if(is_g_prom) { - await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/1", {}).then(res => { + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/1"+"/"+getApp().globalData.user_id, {}).then(res => { if (res.data.code == 0) { var r_data = res.data.data; if (r_data.promGoodsLists) { diff --git a/pages/user/return_goods/return_goods.js b/pages/user/return_goods/return_goods.js index 38435c7..4419264 100644 --- a/pages/user/return_goods/return_goods.js +++ b/pages/user/return_goods/return_goods.js @@ -50,6 +50,7 @@ Page({ data: { goods_id: t.rec_id, order_id: t.order_id, + store_id:os.stoid }, success: function(t) { console.log('requestReturnGoods'); diff --git a/utils/pay.js b/utils/pay.js index ddd33e6..2c66988 100644 --- a/utils/pay.js +++ b/utils/pay.js @@ -32,6 +32,9 @@ module.exports = { }; if (type == 1) dd.type = 1; + if(getApp().globalData.scene) + dd.scene=getApp().globalData.scene; + wx.showLoading(); n.post(this.url, { data: dd, diff --git a/utils/pay2.js b/utils/pay2.js index 11562b3..1d753b9 100644 --- a/utils/pay2.js +++ b/utils/pay2.js @@ -7,6 +7,9 @@ module.exports = { if(wx_paying) return false; wx_paying=1; + if(getApp().globalData.scene) + dd.scene=getApp().globalData.scene; + wx.showLoading(); var i = this; n.post(this.url, { diff --git a/utils/request.js b/utils/request.js index 2ed01bb..95bb025 100644 --- a/utils/request.js +++ b/utils/request.js @@ -244,13 +244,19 @@ module.exports = { promisePut:function(url,data){ var th=this; if(url.indexOf("http")==-1) url=getApp().globalData.setting.url +url; + var post_data=data.data; + var header={"content-type": "application/x-www-form-urlencoded" }; + if(data.is_json){ + header={ 'content-type': 'application/json'}; + post_data=JSON.stringify(post_data); + }; return new Promise((resolve, reject) => { data.isShowLoading && th.showLoading(); wx.request({ url, method: 'PUT', - header: {"content-type": "application/x-www-form-urlencoded" }, - data:data.data, + header: header, + data:post_data, success(res) { data.isShowLoading && th.hideLoading(); resolve(res);