diff --git a/app.js b/app.js index 7d15619..638efc4 100644 --- a/app.js +++ b/app.js @@ -275,8 +275,8 @@ App({ getwuliu: function (t, o){ this.globalData.wuliu=null; var th = this, st = this.globalData.setting; - this.globalData.wuliu && !o ? - "function" == typeof t && t(this.globalData.wuliu) : a.get("/api/weshop/storeshipping/list", { + //获取物流不缓存 + a.get("/api/weshop/storeshipping/list", { data: { store_id: st.stoid, status: 1, pageSize:600 }, success: function (o) { console.log('getwuliu'); @@ -296,8 +296,8 @@ App({ //----------------获取物流价格表-------------------- getwuliuprice: function (t, o) { var e = this,th=e, st = this.globalData.setting; - this.globalData.wuliuprice && !o ? - "function" == typeof t && t(this.globalData.wuliuprice) : a.get("/api/weshop/shippingarea/list",{ + //获取物流不缓存 + a.get("/api/weshop/shippingarea/list",{ data: { store_id: st.stoid,pageSize: 600 }, success: function (o) { console.log('getwuliuprice'); diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxml b/components/diy_goodsGroup/diy_goodsGroup.wxml index 53b91cc..c691911 100644 --- a/components/diy_goodsGroup/diy_goodsGroup.wxml +++ b/components/diy_goodsGroup/diy_goodsGroup.wxml @@ -15,7 +15,8 @@ - + + @@ -169,7 +170,7 @@ - + @@ -328,7 +329,7 @@ - + @@ -485,7 +486,7 @@ - + @@ -668,7 +669,7 @@ - + diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxss b/components/diy_goodsGroup/diy_goodsGroup.wxss index 40ef592..e7df987 100644 --- a/components/diy_goodsGroup/diy_goodsGroup.wxss +++ b/components/diy_goodsGroup/diy_goodsGroup.wxss @@ -178,6 +178,7 @@ height: 90rpx; margin-bottom: 10rpx; font-size: 28rpx; + /* word-break: break-all; */ /* white-space: nowrap; width: 80%; */ } @@ -319,6 +320,7 @@ height: 90rpx; /* line-height: 40rpx; */ margin-top: 10rpx; + /* word-break: break-all; */ } .zs_wz2_2l { diff --git a/components/diy_goodsGroup/g_filter.wxs b/components/diy_goodsGroup/g_filter.wxs index fc32f2c..9e0910a 100644 --- a/components/diy_goodsGroup/g_filter.wxs +++ b/components/diy_goodsGroup/g_filter.wxs @@ -88,6 +88,16 @@ var g_filters = { return min_name; }, + + get_url_by_type: function(item) { + var url = ''; + if(item.prom_type == 9) { + url = '/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + item.goods_id + '&group_id=' + item.prom_id; + } else { + url = '/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id + '&prom_id=' + item.prom_id + '&prom_type=' + item.prom_type; + }; + return url; + }, } @@ -97,4 +107,5 @@ module.exports = { is_has_rank:g_filters.is_has_rank, get_card_price:g_filters.get_card_price, get_border_type:g_filters.get_border_type, + get_url_by_type: g_filters.get_url_by_type, } diff --git a/components/diy_luckyGo/diy_luckyGo.js b/components/diy_luckyGo/diy_luckyGo.js new file mode 100644 index 0000000..5fac147 --- /dev/null +++ b/components/diy_luckyGo/diy_luckyGo.js @@ -0,0 +1,238 @@ +// var e = function(e) { +// return e && e.__esModule ? e : { +// default: e +// }; +// }(require("../../utils/LoadMore3.js")), +// n = new e.default(), +var t = getApp(), + a = t.request, + o = t.globalData.setting, + os = o, + i = require("../../utils/util.js"), + ut = i, + s = require("../../utils/common.js"); +var regeneratorRuntime = require('../../utils/runtime.js'); +Component({ + properties: { + // 这里定义了innerText属性，属性值可以在组件使用时指定 + object: { + type: Object, + value: null, + }, + goods_array: { + type: Array, + value: [] + }, + newTime: { + type: Number, + value: 0 + }, + }, + data: { + // 这里是一些组件内部数据 + yc: false, + someData: null, + ylp_img: "https://mshopimg.yolipai.net/", + imghost: os.imghost, + timer: null, + }, + + pageLifetimes: { + //要处理一下，游客登录后的界面的变化,主要还该是改变会员 + show: function () { + //会员身份变化 + var th = this; + var g_id = this.data.object; + this.init(g_id); + setTimeout(function () { + if (th.data.goods_array && th.data.goods_array.length > 0) { + th.data.timer = setInterval(function () { + th.countDown2(th); + }, 1000); + } + },600) + } + }, + + ready: function () { + var g_id = this.data.object; + this.init(g_id); + }, + detached() { + // 页面被被销毁的时候，清除定时器 + clearInterval(this.data.timer); + }, + methods: { + // 这里是一个自定义方法 + customMethod: function () { }, + init: function (g_id) { + var th = this, app = getApp(), goodsidlist = ""; + if (g_id.data_type == 2) { + if (g_id.data && g_id.data.length > 0) { + //--先把商品ID串起来-- + g_id.data.forEach(function (val, ind) { + var item = {}; + goodsidlist += val.goodsid + ","; + }) + goodsidlist = ut.sub_last(goodsidlist); + + var user_id=getApp().globalData.user_id; + if(!user_id){ user_id=0;} + + //--调用接口,读取秒杀-- + app.request.promiseGet("/api/weshop/prom/luckyActivity/getGoodsList?store_id=" + + os.stoid + "&goodsidlist=" + goodsidlist + "&type="+ 1, {}).then(res => { + console.log(res); + //如果秒杀的数组为空的时候 + var goodslist = res.data.data; + //就算是添加的活动已经过期，就要用最新的进行中活动 + if (goodslist && goodslist.length > 0) { + th.set_goods_list(g_id.data, goodslist); + } + }); + } + } else { + th.no_gid_set(); + } + }, + + //当是默认的情况 + no_gid_set() { + var user_id=getApp().globalData.user_id; + if(!user_id){ user_id=0;} + // var req={ store_id: os.stoid, is_end: 0, is_show: 1, timetype: 2,user_id:user_id}; 原来的 + var req={ store_id: os.stoid, is_end: 0, timetype: 1}; + getApp().request.promiseGet("/api/weshop/prom/luckyActivity/page", + { isShowLoading: 1, data:req } + ).then(res => { + if (res.data.code == 0 && res.data.data.pageData && res.data.data.pageData.length > 0) { + var goodsidlist = res.data.data.pageData; + this.set_goods_list(null, goodsidlist); + // console.log('goodsidlist', goodsidlist); + } + }); + }, + + //就算是添加的活动已经过期，就要用最新的活动 + set_goods_list(g_id, goodslist) { + // 判断火热，预热 + var newTime = ut.gettimestamp(), all_array = [], th = this; + th.setData({ newTime: newTime }); + if (g_id) { + /*--商品队列按照添加的顺序排列--*/ + g_id.forEach(function (val, ind) { + goodslist.forEach(function (vy, indy) { + if (val.goodsid == vy.goods_id) { + if(!vy.id) vy.id=vy.prom_id; + all_array.push(vy); + } + }) + }) + } else { + all_array = goodslist; + } + + + if (all_array.length == 0) { + all_array = goodslist; + } + + for(let i in all_array){ + let item=all_array[i]; + if(item.user_price) item.price=item.user_price; + } + + var arr = new Array(); + //--三个三个一组--- + for (var i = 0; i < all_array.length; i += 3) { + arr.push(all_array.slice(i, i + 3)); + } + /*--熏染到前台--*/ + + th.setData({ goods_array: arr }); + console.log('goods_array', arr); + + th.data.timer = setInterval(function () { + th.countDown2(th); + }, 1000); + }, + + + + //---小于10的格式化函数---- + timeFormat: function (param) { + return param < 10 ? '0' + param : param; + }, + //----秒杀倒计时函数----- + countDown2: function (ob) { + if (ob == undefined) return false; + var ee = ob; + // 获取当前时间，同时得到活动结束时间数组 + var newTime = ut.gettimestamp(); + this.setData({ newTime: newTime }); + + var List = ee.data.goods_array; + if (List.length == 0) return false; + 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 (newTime < o.start_time) 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 = "goods_array[" + j + "][" + i + "].djs"; + ee.setData({ + [txt]: obj + }); + } + } + }, + + + //图片失败，默认图片 + bind_bnerr3: function (e) { + var _errImg = e.target.dataset.errorimg; + var _errObj = {}; + _errObj[_errImg] = "/public/images/default_goods_image_240.gif"; + this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; + }, + + go: function (e) { + let url = e.currentTarget.dataset.url; + getApp().goto(url); + }, + + alert: function() { + wx.showToast({ + title: '本活动商品已抢光！', + icon: 'none', + }) + }, + }, + + +}) \ No newline at end of file diff --git a/components/diy_luckyGo/diy_luckyGo.json b/components/diy_luckyGo/diy_luckyGo.json new file mode 100644 index 0000000..e8cfaaf --- /dev/null +++ b/components/diy_luckyGo/diy_luckyGo.json @@ -0,0 +1,4 @@ +{ + "component": true, + "usingComponents": {} +} \ No newline at end of file diff --git a/components/diy_luckyGo/diy_luckyGo.wxml b/components/diy_luckyGo/diy_luckyGo.wxml new file mode 100644 index 0000000..5fba46f --- /dev/null +++ b/components/diy_luckyGo/diy_luckyGo.wxml @@ -0,0 +1,85 @@ + + + + + 幸运购 + + + + + + + + + + + + + + + + + + + + {{aitem.title}} + + + {{filters.price(aitem.group_price)}} + {{aitem.market_price}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{aitem.title}} + + + {{filters.price(aitem.group_price)}} + 零售价:{{aitem.market_price}} + + + + 已抢光 + 去参团 + + + + + *{{aitem.group_num}}人成团，{{aitem.group_win}}人得商品，{{aitem.group_num - aitem.group_win}}人全额退款并得惊喜礼品！ + + + + + + + diff --git a/components/diy_luckyGo/diy_luckyGo.wxss b/components/diy_luckyGo/diy_luckyGo.wxss new file mode 100644 index 0000000..21c614c --- /dev/null +++ b/components/diy_luckyGo/diy_luckyGo.wxss @@ -0,0 +1,149 @@ +@import '../../app.wxss'; + + + +.s_it { + width: 100%; + display: flex; + background-color: white; +} + + + + + + +swiper { + height: 450rpx; +} + +.nav { + width: calc(100% / 3); + box-sizing: border-box; +} + +.arrow-r { + width: 30rpx; + height: 30rpx; +} + +.icon-luck { + color: #ED6064; + margin-right: 4rpx; +} + + + + +.list-item { + background-color: white; + padding: 20rpx; +} + +.img-container { + width: 220rpx; + height: 220rpx; + border-radius: 14rpx; + overflow: hidden; + flex-shrink: 0; + position: relative; +} + +.img-container::before { + content: '幸运购'; + position: absolute; + left: 0; + top: 0; + padding: 4rpx; + background-color: rgba(255,103,103,.7); + color: white; + font-size: 22rpx; + border-radius: 0 0 14rpx 0; +} + + + +.img-container.row::before { + content: attr(data-content); + position: absolute; + left: 0; + top: 0; + padding: 4rpx; + background-color: rgba(255,103,103,.7); + color: white; + font-size: 22rpx; + border-radius: 0 0 14rpx 0; +} + +.name::before { + content: attr(data-content); + background-color: #FF6768; + color: white; + font-size: 24rpx; + padding-left: 10rpx; + padding-right: 10rpx; + border-radius: 20rpx; + margin-right: 10rpx; +} + +.name.clearbadge::before { + content: none; +} + +.rmb::before { + content: '￥'; + font-size: 24rpx; +} + +.del { + text-decoration: line-through; +} + +.btn { + background-color: #FF6768; + border-radius: 20rpx; + padding-left:20rpx; + padding-right: 20rpx; + color: white; +} + +.name { + height: 88rpx; +} + +.no-more { + font-size: 24rpx; + line-height: 2; + text-align: center; + padding-top: 20rpx; + padding-bottom: 20rpx; + color: #ccc; +} + +.progress { + position: relative; +} +.progress::before { + position: absolute; + width: 100%; + content: attr(data-content); + font-size: 20rpx; + color: white; + text-align: center; +} + +.btn.gray { + background-color: #ccc; +} + +.img-container.active::after { + content: '已抢光'; + position: absolute; + font-size: 24rpx; + color: white; + bottom: 0; + left: 0; + width: 100%; + text-align: center; + background-color: rgba(0,0,0,.4); +} \ No newline at end of file diff --git a/components/diy_seckill/diy_seckill.js b/components/diy_seckill/diy_seckill.js index 0559c57..e1bdff7 100644 --- a/components/diy_seckill/diy_seckill.js +++ b/components/diy_seckill/diy_seckill.js @@ -81,7 +81,7 @@ Component({ //--调用接口,读取秒杀-- app.request.promiseGet("/api/ms/flash_sale/getGoodsList?store_id=" - + os.stoid + "&goodsidlist=" + goodsidlist+"&user_id="+user_id, {}).then(res => { + + os.stoid + "&goodsidlist=" + goodsidlist+"&user_id="+user_id+"&type=1", {}).then(res => { console.log(res); //如果秒杀的数组为空的时候 var goodslist = res.data.data; @@ -113,6 +113,11 @@ Component({ //就算是添加的活动已经过期，就要用最新的活动 set_goods_list(g_id, goodslist) { + + goodslist.forEach(function (vy, indy) { + if(!vy.id) vy.id=vy.prom_id; + }) + // 判断火热，预热 var newTime = ut.gettimestamp(), all_array = [], th = this; th.setData({ newTime: newTime }); @@ -121,16 +126,14 @@ Component({ g_id.forEach(function (val, ind) { goodslist.forEach(function (vy, indy) { if (val.goodsid == vy.goods_id) { - if(!vy.id) vy.id=vy.prom_id; all_array.push(vy); } }) }) } else { - all_array = goodslist; + all_array = goodslist; } - if (all_array.length == 0) { all_array = goodslist; } diff --git a/components/diy_seckill/diy_seckill.wxss b/components/diy_seckill/diy_seckill.wxss index a770d0a..c410259 100644 --- a/components/diy_seckill/diy_seckill.wxss +++ b/components/diy_seckill/diy_seckill.wxss @@ -116,6 +116,7 @@ swiper { padding: 4rpx 0; /* overflow: hidden; */ height: 90rpx; + word-break: break-all; /* text-overflow: ellipsis; white-space: nowrap; line-height: 48rpx; */ diff --git a/components/goods_list/goods_list.wxml b/components/goods_list/goods_list.wxml index 7790e1f..ef89b5a 100644 --- a/components/goods_list/goods_list.wxml +++ b/components/goods_list/goods_list.wxml @@ -4,15 +4,16 @@ - - + + + {{item.goods_name}} - + {{item.prom_integral}}积分 diff --git a/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js b/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js index 24cf8d3..c1ad43f 100644 --- a/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js +++ b/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js @@ -12,8 +12,20 @@ Page({ pageNum: 1, // 当前页数 }, - onLoad: function () { + onLoad: function (options) { self = this; + + var first_leader = options.first_leader; + if(first_leader) { + app.globalData.first_leader = first_leader; + //调用接口判断是不是会员 + // app.request.promiseGet("/api/weshop/shoppingGuide/get/" + app.globalData.setting.stoid + "/" + first_leader, {}).then(res => { + // if (res.data.code == 0) { + // getApp().globalData.guide_id = res.data.data.id; + // } + // }) + }; + app.isLogin().then(function(data) { self.setData({ userInfo: data, @@ -173,5 +185,42 @@ Page({ }; }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function (e) { + var pagePath = this.route; //当前页面url + if (pagePath.indexOf('/') != 0) { + pagePath = '/' + pagePath; + } + if(getApp().globalData.user_id){ + + if(pagePath.indexOf("?")>0){ + pagePath+="&first_leader="+getApp().globalData.user_id; + }else{ + pagePath+="?first_leader="+getApp().globalData.user_id; + } + } + return { + title: "幸运购活动列表", + path: pagePath, + } + }, + + // onShareTimeline() { + // var store_name = getApp().globalData.config ? getApp().globalData.config.store_name:''; + // var pagePath = this.route; //当前页面url + + // if(!store_name) store_name = getApp().globalData.setting.appName; + // if (pagePath.indexOf('/') != 0) { + // pagePath = '/' + pagePath; + // } + // return { + // title: store_name + '-幸运购活动列表', + // path: pagePath, + // } + // }, + }) diff --git a/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxml b/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxml index bf4862b..434ce73 100644 --- a/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxml +++ b/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxml @@ -11,7 +11,7 @@ - + - 去参团 + 已抢光 + 去参团 diff --git a/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxss b/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxss index 2f254c1..ff7eb2b 100644 --- a/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxss +++ b/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxss @@ -20,8 +20,8 @@ page { } .img-container { - width: 200rpx; - height: 200rpx; + width: 220rpx; + height: 220rpx; border-radius: 14rpx; overflow: hidden; flex-shrink: 0; @@ -70,6 +70,7 @@ page { .name { height: 88rpx; + word-break: break-all; } .no-more { @@ -92,3 +93,7 @@ page { color: white; text-align: center; } + +.btn.gray { + background-color: #ccc; +} diff --git a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js index c311c38..6fbbaae 100644 --- a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js +++ b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js @@ -126,6 +126,7 @@ Page({ user_note:{}, zuhe_map_good:{}, }, + onLoad: function (t) { wx.setNavigationBarTitle({title: "填写订单",}) var th = this; diff --git a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.json b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.json index c78ad85..0cfb931 100644 --- a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.json +++ b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.json @@ -1,5 +1,5 @@ { - "navigationBarTitleText": "提交订单", + "navigationBarTitleText": "填写订单", "enablePullDownRefresh": false, "usingComponents": { "warn": "/components/long_warn/long_warn" diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js index 35637e2..f568ee8 100644 --- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js +++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js @@ -75,6 +75,11 @@ Page({ }, onLoad: function(t) { + + // console.log('收到的传参', t); + wx.setNavigationBarTitle({ + title: '填写订单', + }); self = this; this.setData({ is_b_now: t.is_bnow == undefined ? 0 : t.is_bnow, @@ -85,6 +90,17 @@ Page({ this.data.postdata = appD; + + // 获取幸运购活动团team_id + this.get_teamId({ + store_id: oo.stoid, + user_id: getApp().globalData.user_id, + aid: t.group_id, + }); + + + + //如果期号有值01 // if (appD.qh) { // th.data.qh = appD.qh; @@ -102,7 +118,7 @@ Page({ //先获取物流，再获取用户信息，再展示页面 - //th.get_wuliu(th.get_info(th.show_page)); + // this.get_wuliu(th.get_info(th.show_page)); }, onUnload: function() { @@ -580,18 +596,24 @@ Page({ // 提交订单前弹出确认对话框 submitConfirm(e) { - wx.showModal({ - title: '温馨提示', - content: this.data.param.alert, - success(res) { - if (res.confirm) { - console.log('用户点击确定'); - self.submitForm(e); - } else if (res.cancel) { - console.log('用户点击取消'); + // is_show为0不显示温馨提示，为1显示温馨提示 + if(this.data.param.is_show == 1) { + wx.showModal({ + title: '温馨提示', + content: this.data.param.alert, + success(res) { + if (res.confirm) { + console.log('用户点击确定'); + self.submitForm(e); + } else if (res.cancel) { + console.log('用户点击取消'); + } } - } - }) + }); + } else { + this.submitForm(e); + }; + }, @@ -604,7 +626,7 @@ Page({ pdata = new Array(); var ff = true; //------------立即购买------------- - console.log("buy_new"); + // console.log("buy_new"); //如果不是阶梯团，或者是普通购买，商家选择了物流，以及地址为空的时候 if (th.data.bn_exp_type == 0 && th.data.user_addr == null && (th.data.kt_type != 3 || th.data.bn_goods.is_normal == @@ -649,6 +671,8 @@ Page({ 'goods_price': th.data.param.goods_price, //商品总价 //'goods_price': th.data.formData.all_price, //商品总价 'shipping_price': th.data.formData.shipping_price, //物流金额 + 'shipping_code': th.data.bn_exp_type == 1 ? 0 : th.data.wu_arr[th.data.index].code, + 'shipping_name': th.data.bn_exp_type == 1 ? '' : th.data.wu_arr[th.data.index].name, 'user_money': th.data.formData.user_money, //使用余额 'total_amount': th.data.formData.total_amount, //订单总价 'order_amount': th.data.formData.order_amount, //应付 @@ -784,10 +808,17 @@ Page({ // }, 1); util_pay.pay(data.data, function() { setTimeout(function() { - wx.reLaunch({ - //url: "/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data, - url: "/pages/team/team_success/team_success?ordersn=" + data.data, - }) + // wx.reLaunch({ + // //url: "/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data, + // url: "/pages/team/team_success/team_success?ordersn=" + data.data, + // }) + + wx.redirectTo({ + url: "/packageC/pages/luckyGo/luckyGo_details/luckyGo_details?type=1&ordersn=" + data.data + + "&group_id=" + th.data.param.group_id + "&goods_id=" + th.data.param.goods_id + + "&goods_name=" + th.data.bn_goods.goods_name, + }); + }, 1000) }, function() { //支付失败 @@ -1228,5 +1259,28 @@ Page({ }, + // 获取team_id + get_teamId(options) { + let aid = options.aid; + let store_id = options.store_id; + let user_id = options.user_id; + let url = `/api/weshop/prom/luckyActivity/page?store_id=${store_id}&is_end=0&timetype=1&id=${aid}`; + getApp().request.get(url, { + success: function(res) { + if(res.data.code == 0) { + let team_id = res.data.data.pageData[0]['team_id']; + wx.setStorage({ + key: 'team_id', + data: team_id, + }); + }; + } + }); + }, + + + + + }); diff --git a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js index d668d04..7405e0f 100644 --- a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js +++ b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js @@ -9,6 +9,8 @@ var t = require("../../../../utils/util.js"), o = s.globalData.setting, os = o; var regeneratorRuntime = require('../../../../utils/runtime.js'); + +let self = null; Page({ data: { @@ -48,8 +50,13 @@ Page({ showRules: false, isSuccess: false, showPoster: false, + + luckyGoMembers: [], + // team_id: 0, }, + onLoad: function (t) { + self = this; if(t.team_id != null && t.team_id !=undefined) { this.setData({ team_id: t.team_id, @@ -71,7 +78,7 @@ Page({ this.init(order_sn); //-- 自定义海报 -- - getApp().request.promiseGet("/api/weshop/goods/poster/page",{ + getApp().request.promiseGet("/api/weshop/goods/poster/page", { data:{store_id:os.stoid, type:1, is_use:1 } }).then(res=>{ if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0] ){ @@ -107,9 +114,16 @@ Page({ onUnload: function () { // 开团成功后,清除storage里的team_id - if(this.data.luckyGoInfo.num && this.data.luckyGoInfo.num == 0) { - wx.removeStorageSync('team_id'); - }; + // if(this.data.luckyGoInfo && this.data.luckyGoInfo.num == 0) { + // wx.removeStorageSync('team_id'); + // }; + // // 如果是从会员中心的幸运购列表点击进来的,退出时清除storage里的team_id + // if(this.data.param.from == 1) { + // let team_id = wx.getStorageSync('team_id'); + // if(team_id != null && team_id != undefined) wx.removeStorageSync('team_id'); + // }; + + wx.removeStorageSync('team_id'); }, //关闭展开列表 @@ -169,7 +183,7 @@ Page({ pt_listno = "",//团编号 pt_prom_id = 0, //活动id ee = this, - team_id = 0,//活动id + //team_id = 0,//活动id ordertx=[],//头像图片 share_img=null,//分享图片 teamlist=null,//活动表 @@ -306,16 +320,18 @@ Page({ // if(ct_price==0) ct_price=min_price; // } + //获取大家都在团信息 - getApp().request.promiseGet("/api/weshop/teamlist/pageteam/1?store_id="+ os.stoid +"&is_end=0&is_show=1" , { - data:{page:1,pageSize:2} - }).then(res => { - if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ - pageteam = res.data.data.pageData; - ee.setData({pageteam: pageteam,}) - } + // getApp().request.promiseGet("/api/weshop/teamlist/pageteam/1?store_id="+ os.stoid +"&is_end=0&is_show=1" , { + // data:{page:1,pageSize:2} + // }).then(res => { + // if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ + // pageteam = res.data.data.pageData; + // ee.setData({pageteam: pageteam,}) + // } - }) + // }) + //--当是成团的时候的操作-- // if(order.pt_status==2 || order.pt_status==4 || order.pt_status==5){ @@ -467,8 +483,10 @@ Page({ scene += "_" + getApp().globalData.room_id; }; ///二微码 - var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + - os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo"; + // var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + + // os.stoid + "?sceneValue=" + scene + "&pageValue=packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo"; + var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + + os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo"; // 读取文件成功则OK-- @@ -954,32 +972,41 @@ Page({ //------ 分享配置 -------- onShareAppMessage: function (e) { - var th=this; - var scene=this.data.teamgroup.id; - var url="/pages/team/team_show/team_show?tg_id="+scene; - //--分享图片-- - var img=th.data.iurl+th.data.teamlist.share_imgurl; - //--把会员分享出去-- - if(getApp().globalData.user_id){ - if(url.indexOf("?")>0) - url+="&first_leader="+getApp().globalData.user_id; - else - url+="?first_leader="+getApp().globalData.user_id; + var pagePath = `packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=${this.data.param.goods_id}&prom_type=9&group_id=${this.data.param.group_id}`; //当前页面url + // console.log('pagePath=====xxxxxx>', pagePath); + var imgPath = this.data.iurl + this.data.luckyGoInfo.original_img; + if (pagePath.indexOf('/') != 0) { + pagePath = '/' + pagePath; } - // console.log('url+++++>>>>>', url, th.data.teamlist.title); - - var share_title=th.data.teamlist.title; - if(th.data.teamlist.share_title){ - share_title=th.data.teamlist.share_title; - } - + // if(getApp().globalData.user_id){ + + // if(pagePath.indexOf("?")>0){ + // pagePath+="&first_leader="+getApp().globalData.user_id; + // }else{ + // pagePath+="?first_leader="+getApp().globalData.user_id; + // } + // } return { - path:url, - title: share_title, - imageUrl: img, + title: "邀您一起参加幸运购", + path: pagePath, + imageUrl: imgPath, } }, + // onShareTimeline() { + // // var store_name = getApp().globalData.config ? getApp().globalData.config.store_name:''; + // // var pagePath = this.route; //当前页面url + + // // if(!store_name) store_name = getApp().globalData.setting.appName; + // // if (pagePath.indexOf('/') != 0) { + // // pagePath = '/' + pagePath; + // // } + // // return { + // // title: store_name + '-幸运购活动列表', + // // path: pagePath, + // // } + // }, + clickShare() { this.setData({ share_hidden: true, @@ -1123,55 +1150,153 @@ Page({ // 获取幸运购参团情况 async get_team_info () { - var th = this; - // 幸运购成团信息 - await getApp().request.promiseGet("/api/weshop/prom/luckyActivity/page", { - data: { - store_id: o.stoid, - is_end: 0, - timetype: 1, - id: this.data.param.group_id, - } - }).then(res => { - var luckyGoInfo = res.data.data.pageData[0]; - var team_id = luckyGoInfo.team_id; + var th = this; + var team_id; + var luckyGoInfo; + var user_id = getApp().globalData.user_id; + - th.setData({ - luckyGoInfo, - team_id, + + // 邀请链接待完善 + + getApp().request.promiseGet("/api/weshop/prom/luckyActivity/page", { + data: { + store_id: o.stoid, + is_end: 0, + timetype: 1, + id: th.data.param.group_id, + } + }).then(res => { + if(res.data.code == 0) { + + luckyGoInfo = res.data.data.pageData[0]; + + + + // else { + // team_id = luckyGoInfo.team_id; + + // // 待完善 + // if(luckyGoInfo.team_id == 0) { + // team_id = wx.getStorageSync('team_id'); + // }; + + // }; + + th.setData({ + luckyGoInfo, + }); + + //参团成功后,检查team_id + //如果team_id为0, 表示当前已开启新的一期，文字提示应改为’参团成功，本期幸运购已开团，中奖结果可点击下方查看参团列表‘ + //如果team_id为0，取出之前保存的team_id替换掉，请求上一期已成团的幸运购活动 + //如果从会员中心的幸运购列表邀请好友点击进来，不执行storage操作 + if(th.data.param.from == 1) return false; + // if(team_id > 0) { + // wx.setStorage({ + // key: 'team_id', + // data: team_id, + // }); + // console.log('存储team_id', team_id); + // } else { + // let team_id2 = wx.getStorageSync('team_id'); + // console.log('获取team_id', team_id2); + // th.setData({ + // team_id: team_id2, + // // isSuccess: true, + // }); + // }; + + // th.setData({ + // luckyGoInfo, + // team_id, + // }); + + }; + + }); + + if(th.data.param.from == 1) { +   team_id = th.data.param.team_id; +  } else { + + // 单独获取最新的team_id; + await getApp().request.promiseGet("/api/weshop/prom/luckyOrder/getUserOrderLastInfo/" + o.stoid + "/" + user_id + "/" + th.data.param.group_id, { + data: { + } + }).then(res => { + + if(res.data.code == 0) { + + // if(th.data.param.from == 1) { + //   team_id = luckyGoInfo.team_id; + //  } else { + // team_id = res.data.data.team_id; + // }; + + team_id = res.data.data.team_id; + + + th.setData({ + team_id, + }); + + }; + }); - //参团成功后,检查team_id - //如果team_id为0, 表示当前已开启新的一期，文字提示应改为’参团成功，本期幸运购已开团，中奖结果可点击下方查看参团列表‘ - //如果team_id为0，取出之前保存的team_id替换掉，请求上一期已成团的幸运购活动 - if(team_id != 0) { - wx.setStorage({ - key: 'team_id', - data: team_id, - }); - } else { - let team_id = wx.getStorageSync('team_id'); - th.setData({ - team_id: team_id, - isSuccess: true, - }); - }; - - }); + }; + // wx.removeStorageSync('team_id'); + + // 幸运购成团成员 await getApp().request.promiseGet("/api/weshop/prom/luckyOrder/page", { data: { store_id: o.stoid, - team_id: this.data.team_id, + team_id: team_id, } }).then(res => { - th.setData({ - luckyGoMembers: res.data.data.pageData, - }); - }); + if(res.data.code == 0) { + console.log('当前参团成员', res, team_id); + let myId = getApp().globalData.userInfo.user_id; + let luckyGoMembers = res.data.data.pageData; + th.setData({ + luckyGoMembers, + }); + + self.isMe(myId, luckyGoMembers); + }; + + }); + + + }, + + // 判断自己是否中奖 + isMe(myId, list) { + list.some((item, index) => { + if(item.team_status == 2) { + if(item.user_id == myId) { + self.setData({ + iWin: true + }); + return true; + }; + } + }); + }, + + + //-----图片失败，默认图片----- + bind_bnerr: function (e) { + var _errImg = e.target.dataset.errorimg; + var _errObj = {}; + _errObj[_errImg] = '/miniapp/images/default_g_img.gif'; + this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; + }, diff --git a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.json b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.json index b175d83..aab5bad 100644 --- a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.json +++ b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.json @@ -2,6 +2,7 @@ "navigationBarTitleText": "参团详情", "enablePullDownRefresh": false, "usingComponents": { - "share": "/components/share/share" + "share": "/components/share/share", + "nav_box": "/components/nav_box/nav_box" } } \ No newline at end of file diff --git a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxml b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxml index 2155d60..0d3d155 100644 --- a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxml +++ b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxml @@ -4,9 +4,9 @@ - - + + + @@ -16,12 +16,17 @@ {{filters.price(luckyGoInfo.group_price)}} - 零售价{{luckyGoInfo.market_price}} + + + + - - 待成团 + + 已成团 + 待成团 @@ -39,7 +44,7 @@ 规则 - + - + - 参团成功，还差{{filters.show_default(luckyGoInfo.group_num, '0') - filters.show_default(luckyGoInfo.num, '0')}}人即可成团，请留意成员开奖通知！ - 参团成功，本期幸运购已开团！ + + 参团成功，本期幸运购已开团！ + {{iWin ? '恭喜您团中该商品，请等待商家发货~':'很遗憾您未团中，可获得一份帮团奖励，再接再厉噢~'}} + + 您已参团成功，还差{{filters.show_default(luckyGoInfo.group_num, '0') - filters.show_default(luckyGoInfo.num, '0')}}人参与即可成团！ + 组团中，还差{{filters.show_default(luckyGoInfo.group_num, '0') - filters.show_default(luckyGoInfo.num, '0')}}人即可成团！ - 未团中可获得帮团奖励 + + + @@ -81,16 +92,16 @@ - + - + @@ -162,7 +173,7 @@ 拼团成功, 规定时间内支付尾款即发货 - + 点击下方按钮分享给小伙伴,可快速成团！ @@ -188,11 +199,11 @@ - 查看拼团列表 + 查看参团成员 {{item.nickname}} - 参团编号：{{item.team_sn}} + @@ -229,7 +240,7 @@ - + - + @@ -346,7 +357,6 @@ - 规则详情 @@ -365,9 +375,13 @@ - 我知道了 + 我知道了 - + . + + + + diff --git a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxss b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxss index 0d64a21..c8fb84e 100644 --- a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxss +++ b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxss @@ -145,7 +145,7 @@ margin-top: 30rpx; height:100rpx; border-radius: 50%; overflow: hidden; - background-color: white; + background-color: #f2f2f2; } .d ~ .d { @@ -979,6 +979,7 @@ height:40rpx; height: 60rpx; border-radius: 50%; overflow: hidden; + background-color: #f2f2f2; } diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml index c283a6e..790ecba 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml @@ -18,7 +18,8 @@ ￥ {{sele_g.shop_price}} - ￥ {{prom_price || filters.div100(luckGoInfo.group_price)}} + ￥ {{filters.div100(luckGoInfo.group_price)}} + @@ -28,7 +29,7 @@ 可售：{{def_pick_store.CanOutQty}} 可售:0 - 可售：{{sele_g.store_count}} + 可售：{{sele_g.store_count}} @@ -114,7 +114,10 @@ {{filters.toFix(luckGoInfo.group_price/100,2)}} - 手店价￥{{filters.toFix(data.shop_price,2)}} + 手店价 + + {{sele_g[card_field]}} + {{sele_g.shop_price}} @@ -195,7 +198,7 @@ - @@ -1598,7 +1619,7 @@ {{luckGoInfo[item.name]}} - 金额：{{filters.div100(luckGoInfo[item.num])}} + 金额：{{filters.div100(luckGoInfo[item.num])}} @@ -1611,7 +1632,7 @@ {{item.name}} - 数量：{{luckGoInfo[item.num]}} + 数量：{{luckGoInfo[item.num]}} @@ -1623,3 +1644,6 @@ + + + diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss index 5670482..cc55fd8 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss @@ -2889,7 +2889,7 @@ button.custom-service::after{ .mt20{ margin-top: 20rpx} .group .group-list.luck { - padding: 0 20rpx; + padding: 0 20rpx 20rpx 20rpx; justify-content: flex-start; } diff --git a/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.js b/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.js index 2726629..d892b75 100644 --- a/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.js +++ b/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.js @@ -253,7 +253,7 @@ Page({ case 3: { //优惠券 app.request.promiseGet('/api/weshop/prom/luckyCoupon/page', { data: { - store_id: os.stoid, + store_id: app.globalData.setting.stoid, aid: self.data.currentItemAid, } }).then(res => { @@ -268,7 +268,7 @@ Page({ case 4: { //服务项目 app.request.promiseGet('/api/weshop/prom/luckyService/page', { data: { - store_id: os.stoid, + store_id: app.globalData.setting.stoid, aid: self.data.currentItemAid, } }).then(res => { diff --git a/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxml b/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxml index bee6b31..eacf839 100644 --- a/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxml +++ b/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxml @@ -8,7 +8,8 @@ - + + 参团中，还差{{filters.difference(item.num, item.group_num)}}人 已团中，{{item.shipping_status == 0 ? '待发货':'已发货'}} 未团中，已退款 @@ -28,10 +29,10 @@ - 共1件，实付金额：{{item.user_money}} + 共1件，实付金额：{{filters.toFix(item.order_amount+item.user_money,2)}} - 查看订单 - 邀请好友 + 查看订单 + 邀请好友 查看奖励 @@ -74,7 +75,7 @@ {{list.pageData[currentItemIndex][item.name]}} - 金额：{{filters.div100(list.pageData[currentItemIndex][item.num])}} + 金额：{{filters.div100((list.pageData[currentItemIndex][item.num]))}} diff --git a/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxss b/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxss index 2f13299..1559feb 100644 --- a/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxss +++ b/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxss @@ -49,7 +49,7 @@ page { } .title { - height: 88rpx; + /* max-height: 88rpx; */ } .tab-bd { diff --git a/packageC/pages/luckyGo/luckyGo_members/luckyGo_members.js b/packageC/pages/luckyGo/luckyGo_members/luckyGo_members.js index 8d64802..78e8384 100644 --- a/packageC/pages/luckyGo/luckyGo_members/luckyGo_members.js +++ b/packageC/pages/luckyGo/luckyGo_members/luckyGo_members.js @@ -47,6 +47,7 @@ Page({ self.getData(true, '/api/weshop/prom/luckyOrder/page', { store_id: app.globalData.setting.stoid, team_id: self.data.team_id, + pageSize: 20, }); @@ -84,6 +85,7 @@ Page({ this.scrollToLower('/api/weshop/prom/luckyOrder/page', { store_id: app.globalData.setting.stoid, team_id: self.data.team_id, + pageSize: 20, }); }, diff --git a/packageC/pages/luckyGo/luckyGo_members/luckyGo_members.json b/packageC/pages/luckyGo/luckyGo_members/luckyGo_members.json index 8ca2b8e..f83e184 100644 --- a/packageC/pages/luckyGo/luckyGo_members/luckyGo_members.json +++ b/packageC/pages/luckyGo/luckyGo_members/luckyGo_members.json @@ -1,5 +1,5 @@ { - "navigationBarTitleText": "参团成员", + "navigationBarTitleText": "本期参团成员", "enablePullDownRefresh": false, "usingComponents": {} } \ No newline at end of file diff --git a/packageC/pages/luckyGo/luckyGo_members/luckyGo_members.wxml b/packageC/pages/luckyGo/luckyGo_members/luckyGo_members.wxml index 7cfbe75..5025062 100644 --- a/packageC/pages/luckyGo/luckyGo_members/luckyGo_members.wxml +++ b/packageC/pages/luckyGo/luckyGo_members/luckyGo_members.wxml @@ -4,12 +4,12 @@ - {{item.nickname}} - 参团编号：{{item.team_sn}} + {{item.nickname}} + - {{filters.format_time(item.create_time, 1)}} + {{filters.format_time(item.add_time, 1)}} 待成团 未团中 已团中 diff --git a/packageC/pages/luckyGo/luckyGo_members/luckyGo_members.wxss b/packageC/pages/luckyGo/luckyGo_members/luckyGo_members.wxss index e03db31..69028f6 100644 --- a/packageC/pages/luckyGo/luckyGo_members/luckyGo_members.wxss +++ b/packageC/pages/luckyGo/luckyGo_members/luckyGo_members.wxss @@ -1,6 +1,10 @@ +page { + background-color: #f2f2f2; +} .list { padding-left: 20rpx; padding-right: 20rpx; + background-color: white; } .list-item { display: flex; diff --git a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js index e9b51a2..d6c761b 100644 --- a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js +++ b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js @@ -17,7 +17,8 @@ Page({ onLoad: function(e) { var th=this; var r = void 0 !== e.isGoup && e.isGoup; - + // console.log('e*************>>>>>>', e); + this.data.group_id = e.group_id; getApp().getConfig2(function (e) { th.setData({conf: e,sales_rules:e.sales_rules, userInfo: getApp().globalData.userInfo}); @@ -317,429 +318,40 @@ Page({ //--------立即支付---------- async jumpToCart4(e) { - var th=this; - if(this.data.optionIsGoup) - wx.navigateTo({ - url: "/pages/team/team_confirm/team_confirm?orderSn=" + this.data.order.order_sn + "&orderPay=true" - }) - var order=this.data.order; - var order_goods=order.order_goods; - var user_id=order.user_id; - - var wlist=""; - for(var i in order_goods){ - var good=order_goods[i]; - //线下取价功能已经关闭或者过期 - if(!th.data.is_open_offline && good.offline_cut>0){ - wx.showModal({ - title: '提示', - content: '线下取价功能已经关闭或者过期！' - }); - return false; - } - - //要每件每件的商品进行检查，看有么有超出库存，超出限购 - var good= order_goods[i],goodsbuynum=0,promgoodsbuynum=0,gg=null; - //获取单品的现在的活动状态 - await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + good.goods_id, { - }).then(res=>{ - gg=res.data.data; - }) - var limit = gg.viplimited; - var store_count = gg.store_count; - good.erpwareid=gg.erpwareid; - - //---要获得商品，该用户买了多少件,同步应用--- - await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", { - data: { - store_id: os.stoid, - user_id: getApp().globalData.user_id, - goods_id: good.goods_id, - prom_type: good.prom_type, - prom_id: good.prom_id - }, - }).then(res => { - var buy_num_data = res.data.data; - if (buy_num_data.promgoodsbuynum) promgoodsbuynum = buy_num_data.promgoodsbuynum; - goodsbuynum = buy_num_data.goodsbuynum; - }) - - var buyed_mum2=goodsbuynum+good.goods_num; - if (buyed_mum2 > limit && limit > 0) { - - var content=gg.goods_name+'购买数量超出商品限购,请取消订单'; - th.toast(content); - return false; - } - - //当是组合优惠的时候 - if(good.prom_type==7){ - //如果有组合购 - var isok = 1; - var url="/api/weshop/prom/zhbuy/get/"+os.stoid+"/"+good.prom_id+"/"+getApp().globalData.userInfo.user_id; - await getApp().request.promiseGet(url, {}).then(res => { - if(res.data.code==0 && res.data.data){ - if(res.data.data.is_show!=1){ - isok=0; - } - //如果活动已经结束 - if(res.data.data.is_end==1){ - isok=0; - } - //已经结束 - if(ut.gettimestamp()>res.data.data.end_time){ - isok=0; - } - //还未开始 - if(ut.gettimestamp() { - if (ut.ajax_ok(res)) { - var gdlist = res.data.data.pageData[0]; - good.buyqty=gdlist.buyqty; - } - }) - var num=good['buyqty']; - console.log(1111); - console.log(num); - //---- 要计算商品的限购 ----- - if(good['buyqty']>0){ - if(good.goods_num+promgoodsbuynum>good['buyqty']){ + // 幸运购检查库存量 api/weshop/activitylist/getActLen/{store_id}/{prom_type}/{prom_id} + if (parseInt(this.data.order.order_goods['0']['prom_type']) == 9) { + var aid = this.data.order.order_goods['0']['prom_id']; + var knum = 0; + await r.promiseGet('/api/weshop/activitylist/getActLen/' + os.stoid + '/9/' + aid, { + }).then(res => { + if (res.data.code == 0) { + knum = res.data.data; + } + + }); - var content= good['goods_name']+"超出活动限购\n"; - th.toast(content); - return false; - } - } - } + if (knum <= 0) { + getApp().confirmBox("库存为0，支付失败"); + return false; + } - //如果优惠促销和搭配购的时候 - 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 => { - if(res.data.code==0){ - var r_data=res.data.data; - if(!r_data.collocationPromList && good.prom_type==5){ - - var content=good.goods_name+'未找到活动,请取消订单重新购买'; - th.toast(content); - p_ok=0; - } - if(!r_data.promGoodsLists && good.prom_type==3){ - - var content=good.goods_name+'未找到活动,请取消订单重新购买'; - th.toast(content); - p_ok=0; - } - }else{ - - var content=good.goods_name+'未找到活动,请取消订单重新购买'; - th.toast(content); - p_ok=0; - } - }) - if(!p_ok) return false; } - - //商品的普通购买 ，不要进行判断 - if((good.prom_type==1 || good.prom_type==2 || good.prom_type==6 || good.prom_type==4) && !good.is_gift && !good.is_collocation && !good.is_integral_normal && !good.is_pd_normal){ - if(gg.prom_type!=good.prom_type && gg.prom_type>0) { - var content=gg.goods_name+'商品的活动发生了变化,请取消订单重新购买'; - th.toast(content); - return false; - } - }else{ - if((gg.prom_type==1 || gg.prom_type==3 || gg.prom_type==5 || gg.prom_type==6 || gg.prom_type==4) - && !good.is_collocation && !good.is_gift && !good.is_integral_normal && !good.is_pd_normal) { - var prom=null; - //---如果是活动的时候--- - var prom=null,th=this; - if(gg.prom_type==1){ - await getApp().request.promiseGet("/api/ms/flash_sale/getNew/"+os.stoid+"/"+user_id+"/"+gg.prom_id,{ - }).then(res=>{ - if(res.data.code==0){ - prom=res.data.data; - prom.price=prom.user_price; - } - }) - } - - if (gg.prom_type == 2) { - await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/"+ gg.goods_id + "/" + gg.prom_id, {}).then(res => { - if (res.data.code == 0) { - prom = res.data.data; - prom.price=prom.price; - } - }) - } - - - if(gg.prom_type==6){ - await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+gg.prom_id,{ - }).then(res=>{ - if(res.data.code==0){ - prom=res.data.data; - } - }) - } - - if(gg.prom_type==4){ - await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1",{ - data:{store_id:os.stoid,goods_id:gg.goods_id} - }).then(res=>{ - if(res.data.code==0 && res.data.data && res.data.data.pageData){ - prom=res.data.data.pageData[0]; - } - }) - } - - if(prom){ - var t_now=ut.gettimestamp(); - if(prom.is_end==0 && prom.start_timet_now){ - - var content=gg.goods_name+'商品的活动发生了变化,请取消订单重新购买'; - th.toast(content); - return false; - } - } - } - 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 => { - if(res.data.code==0){ - var r_data=res.data.data; - //-- 参加了全局的优惠活动 -- - if(r_data.promGoodsLists){ - - var content=gg.goods_name+'商品的活动发生了变化,请取消订单重新购买'; - th.toast(content); - t_ok=0; - } - } - }) - if(!t_ok) return false; - } - - //-- 如果有参加线下取价 -- - if(good.offline_cut>0) wlist+=encodeURIComponent(gg.erpwareid)+","; - } - //赠品和搭配购不判断商品金额 - var isok=1; - var card_field=th.data.card_field; - //如果会员是等级会员,商品有等级价,且不是活动商品 - if(!good.is_gift && !good.is_collocation) { - if (card_field && gg[card_field] > 0) { - if (good.goods_price != gg[card_field] && good.offline_cut<=0) isok = 0; - if (good.goods_price >gg[card_field] && good.offline_cut>0) isok = 0; //如果线下价格比较贵，则不通过 - - } else { - if (good.goods_price != gg.shop_price && good.offline_cut<=0) isok = 0; - if (good.goods_price> gg.shop_price && good.offline_cut>0) isok = 0; //如果线下价格比较贵，则不通过 - } - var is_h=0; - if (!isok) { - - var content=gg.goods_name + '商品的价格发生了变化,请取消订单重新购买'; - th.toast(content); - return false; - } - } - - //--如果是线下库存的时候-- - if(th.data.conf.sales_rules==2){ - var ob={}; - await th.check_down_line_next(gg,good.goods_num,order.pickup_id,function(obj){ - ob=obj; - }) - if(ob.code==-1){ - - var content=gg.goods_name+'门店库存不足,请取消订单'; - th.toast(content); - return false; - } - - }else{ - if(good.goods_num>store_count){ - - var content=gg.goods_name+'商品的库存不足,请取消订单'; - th.toast(content); - return false; - } - - } - } - - console.log("------------------------------------"); - //---如果是活动的时候--- - var prom=null,goodsinfo=good,th=this; - if(goodsinfo.prom_type==1){ - await getApp().request.promiseGet("/api/ms/flash_sale/getNew/"+os.stoid+"/"+user_id+"/"+goodsinfo.prom_id,{ - }).then(res=>{ - if(res.data.code==0){ - prom=res.data.data; - prom.price=prom.user_price; - } - }) - } - - if (goodsinfo.prom_type == 2) { - await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/"+ good.goods_id + "/" + goodsinfo.prom_id, {}).then(res => { - if (res.data.code == 0) { - prom = res.data.data; - prom.price=prom.price; - } - }) - } - - - if(goodsinfo.prom_type==6 && !good.is_pd_normal){ - await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+goodsinfo.prom_id,{ - }).then(res=>{ - if(res.data.code==0){ - prom=res.data.data; - } - }) - } - - if(goodsinfo.prom_type==4 && !good.is_integral_normal){ - await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1",{ - data:{store_id:os.stoid,goods_id:goodsinfo.goods_id} - }).then(res=>{ - if(res.data.code==0 && res.data.data && res.data.data.pageData){ - prom=res.data.data.pageData[0]; - } - }) - } - - //----------如果有活动，并且在进行中，就不计算线下库存--------------- - if(prom){ - var now=ut.gettimestamp(); - if(prom.is_end==1 && prom.end_time prom.buy_limit && prom.buy_limit > 0) { - - var content=goodsinfo.goods_name+'购买数量超出商品活动限购,请取消订单重新购买'; - th.toast(content); - return false; - } - //看一下会员的秒杀价格是不是发生了变化 - if(goodsinfo.prom_type==1 && goodsinfo.goods_price!=prom.price){ - var content=goodsinfo.goods_name+'秒杀活动的价格发生了变化'; - th.toast(content); - return false; - } - - //看一下会员的团购价格是不是发生了变化 - if(goodsinfo.prom_type==2 && goodsinfo.goods_price!=prom.price){ - var content=goodsinfo.goods_name+'秒杀活动的价格发生了变化'; - th.toast(content); - return false; - } - if(goodsinfo.prom_type==4){ - if (good.goods_num > prom.limitqty-prom.buy_num) { - - var content=goodsinfo.goods_name+'购买数量超出商品活动库存,请取消订单'; - th.toast(content); - return false; - } - }else if(goodsinfo.prom_type == 1 || goodsinfo.prom_type == 2 || goodsinfo.prom_type == 6 ) { - if(order.add_time+5*600){ - wlist=ut.sub_last(wlist); - var keyid=order.pickup_id; - var user_info=getApp().globalData.userInfo; - if(!keyid) return false; - var offarr=null; - await getApp().request.promiseGet("/api/weshop/goods/listWarePrice", { - data:{ - VIPId:encodeURIComponent(user_info.erpvipid), - store_id:os.stoid, - PickupId:keyid, - WareIds:wlist}, - }, - ).then(res=>{ - if(res.data.code==0 && res.data.data && res.data.data.length>0){ - offarr=res.data.data; - } - }) - if(!offarr && offarr.length<=0 ){ - wx.showModal({ title: '获取线下取价失败',}); - } - var newarr=ut.convert_arr_key(offarr,'WareId'); - //-- 循环判断线下的价格 -- - for(var k in order_goods){ - var good=order_goods[k]; - //判断线下取价是不是一样 - if(newarr[good.erpwareid] && - parseFloat(newarr[good.erpwareid].WarePrice)!=parseFloat(good.goods_price)){ - - var content=good.goods_name + '商品的价格发生了变化,请取消订单重新购买'; - th.toast(content); - return false; - } - } - - } - - /*--- - o.jumpToCart4({ - order_sn: this.data.order.order_sn, - order_amount: this.data.order.order_amount, - type: 1 //正常单 - }, 1);--*/ - py.pay(this.data.order.order_sn, function() { - wx.showToast({title: '支付成功'}) - wx.navigateBack(); + wx.showToast({title: '支付成功'}) + wx.navigateBack(); },null,os.stoid,1); - }, + }, + checkTeam: function() { wx.navigateTo({ url: "/pages/team/team_detail/team_detail?foundId=" + this.data.order.orderTeamFound.found_id @@ -1472,27 +1084,41 @@ Page({ //跳转到商品 go_gd:function (e) { + // console.log(e); var gd= e.currentTarget.dataset.gd; - var good_url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + gd; - var url="/api/weshop/activitylist/getGoodActInfo"; - var req_data={ - store_id:os.stoid,goodsidlist:gd,is_detail:1 - }; + var prom_type = this.data.order.order_goods[0].prom_type; + // var good_url=''; + // if(prom_type == 9) { + // good_url = ''; + // } else { + // good_url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + gd; + // }; + + var good_url="/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=" + gd + '&group_id=' + this.data.group_id; + getApp().goto(good_url); + + // var url="/api/weshop/activitylist/getGoodActInfo"; + // var req_data={ + // store_id:os.stoid,goodsidlist:gd,is_detail:1 + // }; //获取秒杀的多规格 - getApp().request.promiseGet(url, {data:req_data}).then(res=>{ - if(res.data.code==0 && res.data.data){ - if(res.data.data.length==1){ - good_url+="&prom_type="+res.data.data[0].prom_type+"&prom_id="+res.data.data[0].act_id; - } - getApp().goto(good_url); + // getApp().request.promiseGet(url, {data:req_data}).then(res=>{ + // if(res.data.code==0 && res.data.data){ + // if(res.data.data.length==1){ + // good_url+="&prom_type="+res.data.data[0].prom_type+"&prom_id="+res.data.data[0].act_id; + // } + // getApp().goto(good_url); - }else{ - getApp().goto(good_url); - } - }) + // }else{ + // getApp().goto(good_url); + // } + // }) }, + + + diff --git a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml index 24652f6..dc1198b 100644 --- a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml +++ b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml @@ -30,16 +30,16 @@ data-errorimg="order.order_goods[{{index}}].original_img"> - + {{item.goods_name}} {{filters.show_gui_ge(item.goods_spec,item.goods_color)}} - + - ￥{{item.member_goods_price}} + ￥{{item.goods_price}} ×{{item.goods_num}} @@ -84,9 +84,10 @@ {{order.addTimeFormat}} - + 配送方式 - {{(order.shipping_name!=''&& order.shipping_name!=null) ?order.shipping_name:'无'}} + {{order.shipping_name}} + 自提 买家留言 @@ -173,7 +174,7 @@ - + @@ -205,12 +206,9 @@ url="/packageB/pages/user/comment/comment?status=0&order_id={{order.order_id}}">评价 去评价 - --> - - + + + diff --git a/packageC/pages/luckyGo/luckyGo_winners/luckyGo_winners.js b/packageC/pages/luckyGo/luckyGo_winners/luckyGo_winners.js index a1e4b4e..e3c1c24 100644 --- a/packageC/pages/luckyGo/luckyGo_winners/luckyGo_winners.js +++ b/packageC/pages/luckyGo/luckyGo_winners/luckyGo_winners.js @@ -68,6 +68,7 @@ Page({ store_id: app.globalData.setting.stoid, team_status: 2, goods_id: self.data.options.goods_id, + pageSize: 20, }); @@ -104,8 +105,9 @@ Page({ onReachBottom: function () { this.scrollToLower('/api/weshop/prom/luckyOrder/page', { store_id: app.globalData.setting.stoid, - team_status: 1, + team_status: 2, goods_id: this.data.options.goods_id, + pageSize: 20, }); }, diff --git a/packageC/pages/luckyGo/luckyGo_winners/luckyGo_winners.wxss b/packageC/pages/luckyGo/luckyGo_winners/luckyGo_winners.wxss index 43b561d..73bf1d4 100644 --- a/packageC/pages/luckyGo/luckyGo_winners/luckyGo_winners.wxss +++ b/packageC/pages/luckyGo/luckyGo_winners/luckyGo_winners.wxss @@ -8,11 +8,11 @@ page { } .img-container { - width: 60rpx; - height: 60rpx; + width: 80rpx; + height: 80rpx; border-radius: 50%; overflow: hidden; - margin-right: 10rpx; + margin-right: 20rpx; flex-shrink: 0; } @@ -32,7 +32,7 @@ page { display: flex; align-items: center; text-align: center; - font-size: 26rpx; + font-size: 28rpx; } .list-hd { diff --git a/packageC/pages/payForAnother/payForAnother.wxml b/packageC/pages/payForAnother/payForAnother.wxml index 2aac459..517f2cc 100644 --- a/packageC/pages/payForAnother/payForAnother.wxml +++ b/packageC/pages/payForAnother/payForAnother.wxml @@ -21,7 +21,7 @@ 代付订单信息 - + {{bn_pickname}}门店名称 diff --git a/pages/giftpack/buygiftpack/giftpackbuy.js b/pages/giftpack/buygiftpack/giftpackbuy.js index e223d8f..34c9d82 100644 --- a/pages/giftpack/buygiftpack/giftpackbuy.js +++ b/pages/giftpack/buygiftpack/giftpackbuy.js @@ -25,40 +25,55 @@ Page({ curpage: 1, //当前分页数 pageSize: 10, //页大小 total: 0, //总数量 - ad_data:null, + ad_data: null, first_leader: e.globalData.first_leader || 0, // 推荐人ID }, - onLoad: function(options) { - + onLoad: function (options) { var th = this; var my_confirm = th.selectComponent("#my_confirm"); //组件的id my_confirm.open_cancel(0); th.setData({ getStorageID: a.stoid, getUserID: d.user_id + }); + //-- 获取分享人的ID -- + var first_leader = options.first_leader || getApp().globalData.first_leader; + if (first_leader) { + this.setData({ + 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/ad/page?pid=901&store_id=" + os.stoid, { + data: { + enabled: 1 + } + }).then(res => { + if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length > 0) { + var a = res.data.data.pageData; + var tt = { + 'ad_code': os.imghost + a[0].ad_code, + 'media_link': '', + 'ad_weapplink': a[0].ad_weapplink, + 'bgcolor': a[0].bgcolor, + }; + th.setData({ + ad_data: tt + }); + } }) - - - getApp().request.promiseGet("/api/weshop/ad/page?pid=901&store_id=" + os.stoid, { - data: { - enabled: 1 - } - }).then(res => { - if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ - var a = res.data.data.pageData; - var tt = { - 'ad_code': os.imghost + a[0].ad_code, - 'media_link': '', - 'ad_weapplink':a[0].ad_weapplink, - 'bgcolor':a[0].bgcolor, - }; - th.setData({ad_data:tt}); - } - }) - + }, - onShow: function() { + onShow: function () { //--先判断会员状态-- var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { @@ -69,7 +84,8 @@ Page({ }, - GetBuyPrice: function(e) { + //购买礼包 + GetBuyPrice: function (e) { var that = this.data; var th = this; var id = e.currentTarget.dataset.id; //活动id @@ -80,10 +96,10 @@ Page({ "是否确定购买该礼包", "取消", "确定", - function() { + function () { my_confirm.open_cancel(0); }, - function() { + function () { my_confirm.open_cancel(0); var json = { "actId": '', //活动Id @@ -93,25 +109,22 @@ Page({ "storeId": that.getStorageID, //商家Id "userId": that.getUserID, //用户ID "buyFrom": 2, - "first_leader": that.first_leader + "first_leader": that.first_leader, }; - - //-- 分享导购要记录 -- - if(getApp().globalData.guide_id){ - json.guide_id=getApp().globalData.guide_id; - } - - + + //-- 分享导购要记录 -- + 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) { + 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 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), @@ -119,10 +132,10 @@ Page({ package: res.packageValue, signType: res.signType, paySign: res.paySign, - success: function(res) { + success: function (res) { getApp().goto(url); }, - fail: function(res) { + fail: function (res) { getApp().my_warnning("取消支付", 0, th); } }); @@ -130,7 +143,7 @@ Page({ getApp().my_warnning(res.data.msg, 0, th); } }, - function(res) { + function (res) { } @@ -144,20 +157,20 @@ Page({ }, // 积分兑换 - GetBuyIntegral: function(e) { + 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() { + function () { my_confirm.open_cancel(0); }, - function() { + function () { my_confirm.open_cancel(0); var json = { "actId": '', //活动Id @@ -169,71 +182,71 @@ Page({ "buyFrom": 2, "first_leader": that.first_leader }; - - - //-- 分享导购要记录 -- - if(getApp().globalData.guide_id){ - json.guide_id=getApp().globalData.guide_id; - } + //-- 分享导购要记录 -- + 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) { + function (res) { if (res.data.code == 0) { getApp().my_warnning("兑换成功！", 1, th); } else { getApp().my_warnning(res.data.msg, 0, th); } }, - function(res) {}) + function (res) {}) }) }, //免费领取 - GetFree:function (e){ + 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 - }; - //-- 分享导购要记录 -- - 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) {}) - }) + "是否确定领取该礼包", + "取消", + "确定", + 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) {}) + }) }, - getList: function(e) { + getList: function (e) { var th = this; getApp().request.get('/api/weshop/marketing/giftbag/page', { isShowLoading: true, @@ -243,7 +256,7 @@ Page({ page: th.data.curpage, pageSize: th.data.pageSize }, - success: function(res) { + success: function (res) { if (res.data.code == 0) { th.data.curpage++; var arr1 = th.data.wareCard; @@ -260,7 +273,7 @@ Page({ } else { th.setData({ is_read: 1, - ismore:1 + ismore: 1 }) } } @@ -268,7 +281,7 @@ Page({ }, //销毁界面跳转 - redirectTo: function(e) { + redirectTo: function (e) { var th = this; var url = e.currentTarget.dataset.url; //销毁跳转 @@ -277,14 +290,14 @@ Page({ }); }, //不销毁界面跳转 - navigateTo: function(e) { + navigateTo: function (e) { var th = this; var url = e.currentTarget.dataset.url; getApp().goto(url); }, //下拉事件 - onReachBottom: function() { + onReachBottom: function () { var th = this; if (th.data.total <= th.data.pageSize) return; if (th.data.ismore) return; @@ -292,42 +305,44 @@ Page({ th.getList(); }, //图片失败，默认图片 - bind_bnerr2: function(e) { + bind_bnerr2: function (e) { var _errImg = e.target.dataset.errorimg; var _errObj = {}; _errObj[_errImg] = "/miniapp/images/default_g_img.gif"; this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; }, - goto: function(e) { + goto: function (e) { var th = this; var url = e.currentTarget.dataset.url; getApp().goto(url); }, - - onShareAppMessage: function (e) { - var curPage=this; - var pagePath = curPage.route; //当前页面url - if (pagePath.indexOf('/') != 0) { - pagePath = '/' + pagePath; - } - return { - title: "专享礼包", - path:pagePath, - } - }, + + onShareAppMessage: function (e) { + var curPage = this; + var pagePath = curPage.route; //当前页面url + if (pagePath.indexOf('/') != 0) { + pagePath = '/' + pagePath; + } + pagePath += "?first_leader="+this.data.getUserID; + return { + title: "专享礼包", + path: pagePath, + } + }, // 分享朋友圈 - onShareTimeline() { - var curPage=this; - var pagePath = curPage.route; //当前页面url - if (pagePath.indexOf('/') != 0) { - pagePath = '/' + pagePath; - } - return { - title: '专享礼包', - imageUrl: this.data.ad_data.ad_code, - path: pagePath, - } - }, - + onShareTimeline() { + var curPage = this; + var pagePath = curPage.route; //当前页面url + if (pagePath.indexOf('/') != 0) { + pagePath = '/' + pagePath; + } + pagePath += "?first_leader="+this.data.getUserID; + return { + title: '专享礼包', + imageUrl: this.data.ad_data.ad_code, + path: pagePath, + } + }, + }) \ No newline at end of file diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js index 53b28b0..46f0caa 100644 --- a/pages/giftpack/giftpacklist/giftpacklist.js +++ b/pages/giftpack/giftpacklist/giftpacklist.js @@ -28,33 +28,36 @@ Page({ code: "", //核销码 c_state: "0", //判断是否已经使用, 0正常 1已使用 2已过期 is_lb: 0, //是否有礼包 - default_color:null, + default_color: null, + first_leader: e.globalData.first_leader || 0, // 推荐人ID }, - onLoad: function(options) { + onLoad: function (options) { var th = this; th.setData({ isBuy: options.isBuy, getGiftID: options.lbId, - orderSn: options.orderSn + orderSn: options.orderSn, + getUserID: d.user_id, }) - - //-- 获取分享人的ID -- - var first_leader=options.first_leader; - 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; - } - }) - } - + //-- 获取分享人的ID -- + var first_leader = options.first_leader || getApp().globalData.first_leader; + if (first_leader) { + this.setData({ + 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; + } + }) + } th.close(); }, - - onShow: function() { + + onShow: function () { //--先判断会员状态-- var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { @@ -68,14 +71,14 @@ Page({ } }, - GetBuyPrice: function(e) { + 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; + if (th.data.isStart != 1) { + getApp().my_warnning("活动还没有开始", 0, th); + return false; } @@ -85,10 +88,10 @@ Page({ "是否确定购买该礼包", "取消", "确定", - function() { + function () { my_confirm.open_cancel(0); }, - function() { + function () { my_confirm.open_cancel(0); var json = { @@ -98,24 +101,25 @@ Page({ "giftBagId": that.getGiftID, //礼包Id "storeId": a.stoid, //商家Id "userId": d.user_id, //用户ID - "buyFrom": 2 + "buyFrom": 2, + "first_leader": that.first_leader, }; - - //-- 分享导购要记录 -- - if(getApp().globalData.guide_id){ - json.guide_id=getApp().globalData.guide_id; - } - + + //-- 分享导购要记录 -- + 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) { + function (res) { if (res.data.code == 0) { var res = res.data.data; - if(!res) return false; - if(!res.result) return false; - + 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({ @@ -124,10 +128,10 @@ Page({ package: res.result.packageValue, signType: res.result.signType, paySign: res.result.paySign, - success: function(n) { + success: function (n) { getApp().goto(url); }, - fail: function(n) { + fail: function (n) { getApp().my_warnning("取消支付", 0, th); } }); @@ -135,7 +139,7 @@ Page({ getApp().my_warnning(res.data.msg, 0, th); } }, - function(res) { + function (res) { } @@ -147,12 +151,12 @@ Page({ ) }, - GetBuyIntegral: function(e) { + GetBuyIntegral: function (e) { var that = this.data; var th = this; //如果还没有开始的话 - if(th.data.isStart!=1){ + if (th.data.isStart != 1) { getApp().my_warnning("活动还没有开始", 0, th); return false; } @@ -162,10 +166,10 @@ Page({ "是否确定兑换该礼包", "取消", "确定", - function() { + function () { my_confirm.open_cancel(0); }, - function() { + function () { my_confirm.open_cancel(0); var json = { "actId": '', //活动Id @@ -174,26 +178,25 @@ Page({ "giftBagId": that.getGiftID, //礼包Id "storeId": a.stoid, //商家ID "userId": d.user_id, //用户ID - "buyFrom":2 + "buyFrom": 2, + "first_leader": that.first_leader, }; - - //-- 分享导购要记录 -- - if(getApp().globalData.guide_id){ - json.guide_id=getApp().globalData.guide_id; - } - - + //-- 分享导购要记录 -- + 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) { + function (res) { if (res.data.code == 0) { getApp().my_warnning("兑换成功！", 1, th); } else { getApp().my_warnning(res.data.msg, 0, th); } }, - function(res) { + function (res) { } @@ -203,7 +206,7 @@ Page({ }, - GetMyGiftList: function() { + GetMyGiftList: function () { var _this = this; var th = this; getApp().request.get('/api/weshop/marketing/my/giftbag/detail/get', { @@ -213,12 +216,12 @@ Page({ "userId": d.user_id, //用户ID "orderSn": th.data.orderSn }, - success: function(res) { + success: function (res) { if (res.data.code == 0) { th.setData({ giftImage: th.data.iurl + res.data.data.lbUrl, giftTitle: res.data.data.giftTitle, - default_color:res.data.data.bgcolor + default_color: res.data.data.bgcolor }) if (res.data.data.giftRemark == '') { th.setData({ @@ -272,7 +275,7 @@ Page({ }); }, - GetBuyGiftList: function() { + GetBuyGiftList: function () { var _this2 = this; var th = this.data; getApp().request.get('/api/weshop/marketing/giftbag/detail/get', { @@ -287,7 +290,7 @@ Page({ _this2.setData({ giftImage: th.iurl + res.data.data.lbUrl, giftTitle: res.data.data.giftTitle, - default_color:res.data.data.bgcolor + default_color: res.data.data.bgcolor }) if (res.data.data.giftRemark == '') { _this2.setData({ @@ -299,13 +302,13 @@ Page({ }) } - var isStart=0; - var now=ut.gettimestamp(); + var isStart = 0; + var now = ut.gettimestamp(); - var str = res.data.data.starTime.replace(/-/g,'/'); + var str = res.data.data.starTime.replace(/-/g, '/'); var start = Date.parse(new Date(str)); start = start / 1000; - if(start 礼包内容 - + @@ -73,15 +73,23 @@ - + - {{"数量:"+item.num}} - + {{"数量:"+item.num}} + + + + 已核销 + + + 未核销 + + - + - + diff --git a/pages/goods/search/g_filter.wxs b/pages/goods/search/g_filter.wxs index 848e4cd..814e187 100644 --- a/pages/goods/search/g_filter.wxs +++ b/pages/goods/search/g_filter.wxs @@ -88,6 +88,11 @@ var g_filters = { if(item.prom_type==8){ url1="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id } + // 如果是幸运购活动商品 + if(item.prom_type == 9){ + url1 = "/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=" + item.goods_id + "&group_id=" + item.prom_id + } + if(item.prom_type==1 && item.prom_id>0){ url1="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id+"&prom_type=1"; } diff --git a/pages/goods/search/search.js b/pages/goods/search/search.js index 00d5f6f..ae5119f 100644 --- a/pages/goods/search/search.js +++ b/pages/goods/search/search.js @@ -146,7 +146,6 @@ Page({ for(let i in res.data.data.pageData){ let item=res.data.data.pageData[i]; item.original_img = th.data.url + item.original_img; - var url="/api/weshop/activitylist/getGoodActInfo"; var req_data={ store_id:oo.stoid,goodsidlist:item.goods_id,is_detail:1 @@ -184,7 +183,7 @@ Page({ var rd= { store_id: oo.stoid, presell_id: presell_id, - goods_id: val.goods_id + goods_id: item.goods_id } //------获取预售从表---------- await getApp().request.promiseGet(url1, { @@ -220,14 +219,13 @@ Page({ } th.data.requestData.push(item); e.setData({requestData: e.data.requestData}); - e.closeSearchModal(); } } - + e.closeSearchModal(); }) - }, onReachBottom: function() { + this.data.currentPage++ this.data.openSearchModal || e.canloadMore() && this.requestSearch(this.data.requestUrl); }, openFilterModal: function() { @@ -289,7 +287,7 @@ Page({ search: function(t) { if ("string" != typeof t || "" == t) return a.showWarning("请输入搜索关键词"); this.data.key_str=t; - this.historyRecord(); + this.historyRecord(); this.resetData(), this.requestSearch(this.data.baseUrl + "&key_str=" + encodeURIComponent(t)); }, diff --git a/pages/goods/search/search.wxml b/pages/goods/search/search.wxml index 91cdcf4..9f915b0 100644 --- a/pages/goods/search/search.wxml +++ b/pages/goods/search/search.wxml @@ -35,7 +35,7 @@ {{item.goods_name}} - + {{item.prom_integral}}积分 diff --git a/pages/index/index/index.js b/pages/index/index/index.js index 6111093..6d00fb1 100644 --- a/pages/index/index/index.js +++ b/pages/index/index/index.js @@ -87,7 +87,15 @@ Page({ }, onLoad: async function (tt) { - var th = this; + // onLoad生命周期内判断 + let obj = wx.getLaunchOptionsSync(); + console.log(obj.scene,'launch_scene'); + if (obj.scene === 1011 || obj.scene === 1012 || obj.scene === 1013 || obj.scene === 1017 || + obj.scene === 1047 ||obj.scene === 1089 || obj.scene === 1038) { + this.setData({is_ok_h5:1}) + } + + var th = this; var first_leader = tt.first_leader; if (!first_leader && tt.scene) { var first_leader_str = decodeURIComponent(tt.scene); @@ -383,6 +391,7 @@ Page({ 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 }) + th.setData({is_gz_h5:json_d.is_gz_h5}) }, 1) if (typeof this.getTabBar === 'function' && this.getTabBar()) { @@ -439,7 +448,6 @@ Page({ }); - }, //当隐藏的时候就关闭计时器 onHide: function () { @@ -617,14 +625,7 @@ Page({ }); } }) - - - - - - - - + //---调用信息--- // this.requestRecommend(); this.setData({ @@ -937,10 +938,13 @@ Page({ 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"; diff --git a/pages/index/index/index.json b/pages/index/index/index.json index 0f62f01..c7badaa 100644 --- a/pages/index/index/index.json +++ b/pages/index/index/index.json @@ -19,7 +19,8 @@ "service": "/components/diy_service/diy_service", "scan": "/components/diy_scan/diy_scan", "store_select": "/components/diy_store_select/diy_store_select", - "presell": "/components/diy_pregoods/diy_pregoods" + "presell": "/components/diy_pregoods/diy_pregoods", + "luckyGo": "/components/diy_luckyGo/diy_luckyGo" }, "enablePullDownRefresh": false } \ No newline at end of file diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml index 46111fc..fa0ac72 100644 --- a/pages/index/index/index.wxml +++ b/pages/index/index/index.wxml @@ -11,14 +11,17 @@ - + - + + + + + - @@ -41,7 +44,9 @@ - + + + @@ -229,9 +234,8 @@ - - + @@ -243,8 +247,8 @@ - - + + @@ -258,7 +262,8 @@ - 去参团 + 已抢光 + 去参团 @@ -406,6 +411,9 @@ + + + @@ -420,6 +428,8 @@ + + @@ -505,6 +515,11 @@ + + + + + diff --git a/pages/index/index/index.wxss b/pages/index/index/index.wxss index 78f38b3..8189432 100644 --- a/pages/index/index/index.wxss +++ b/pages/index/index/index.wxss @@ -64,7 +64,7 @@ width: 48rpx; height: 48rpx; margin: 0 18rpx; - border-radius: 50%; + /* border-radius: 50%; */ overflow: hidden; } @@ -663,6 +663,7 @@ border-radius: 8rpx; white-space: nowrap; height: 28rpx; + align-items: center; } .xc-people-val-frame .val-img { @@ -1014,7 +1015,7 @@ page { } .container.nor{ - padding-top: 140rpx; + padding-top: 80rpx; } /* page, @@ -1130,8 +1131,8 @@ page { } .luck .img-container { - width: 200rpx; - height: 200rpx; + width: 220rpx; + height: 220rpx; border-radius: 14rpx; overflow: hidden; flex-shrink: 0; @@ -1180,6 +1181,7 @@ page { .luck .name { height: 88rpx; + word-break: break-all; } @@ -1195,3 +1197,7 @@ page { text-align: center; } +.luck .btn.gray { + background-color: #ccc; +} + diff --git a/pages/user/index/index.js b/pages/user/index/index.js index f16b45b..d326f5d 100644 --- a/pages/user/index/index.js +++ b/pages/user/index/index.js @@ -462,11 +462,11 @@ Page({ }, setappdata: function(t) { var t=getApp().globalData.wxapp_buy_obj; - if (t.isout == 1) + if (t && t.isout == 1) wx.navigateTo({ url: "/pages/error/error?msg=小程序已经过期", }); - if (t.isbuy == 0) + if (t && t.isbuy == 0) wx.navigateTo({ url: "/pages/error/error?msg=还未购买小程序", }); @@ -642,7 +642,9 @@ Page({ } 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=" + diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js index ff80bfd..06114b2 100644 --- a/pages/user/order_detail/order_detail.js +++ b/pages/user/order_detail/order_detail.js @@ -316,6 +316,7 @@ Page({ //--------立即支付---------- async jumpToCart4(e) { + var th=this; if(this.data.optionIsGoup) wx.navigateTo({ @@ -567,8 +568,7 @@ Page({ return false; } } - } - else{ + }else{ //不是赠品的时候 if(!good.is_gift && good.prom_type!=3){ var t_ok=1; @@ -592,7 +592,7 @@ Page({ } //赠品和搭配购不判断商品金额 var isok=1; - var card_field=th.data.card_field; + var card_field=th.data.card_field; // 会员等级 //如果会员是等级会员,商品有等级价,且不是活动商品 if(!good.is_gift && !good.is_collocation) { if (card_field && gg[card_field] > 0) { @@ -606,7 +606,7 @@ Page({ var is_h=0; if (!isok) { - var content=gg.goods_name + '商品的价格发生了变化,请取消订单重新购买'; + var content=gg.goods_name + '商品的价格发生了变化,请取消订单重新购买22'; th.toast(content); return false; } diff --git a/pages/user/order_detail/order_detail.wxml b/pages/user/order_detail/order_detail.wxml index 6d4f920..a3e3417 100644 --- a/pages/user/order_detail/order_detail.wxml +++ b/pages/user/order_detail/order_detail.wxml @@ -77,7 +77,7 @@ 配送方式 - {{(order.shipping_name!=''&& order.shipping_name!=null) ?order.shipping_name:'无'}} + {{(order.shipping_name!=''&& order.shipping_name!=null) ?order.shipping_name:'自提'}} 买家留言 diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index fc677ee..c73fdd1 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -195,6 +195,28 @@ Page({ } }) } + // 如果是幸运购活动 + if(glist[0].prom_type==9){ + await getApp().request.promiseGet('/api/weshop/prom/luckyOrder/list', { + data: { + store_id: os.stoid, + user_id: oo.user_id, + order_id: item.order_id, + } + }).then(res => { + if(res.data.code==0){ + // console.log('luckyGo+++++++++>>>', res.data.data); + // data[ind]['team_status'] = res.data.data[0]['team_status']; + if(res.data.data[0] && res.data.data[0]['team_status']) { + data[ind]['team_status'] = res.data.data[0]['team_status']; + } else { + data[ind]['team_status'] = 0; + }; + + // data[ind]['ord_url']='/packageC/pages/presell/cart/cart'; + } + }) + } //------------对比一下有没有退款记录------------ await getApp().request.promiseGet("/api/weshop/order/returngoods/page", { data: { @@ -462,6 +484,7 @@ Page({ }, /*----------跳转支付-----------*/ async jumpToCart4(t) { + var o_index = t.currentTarget.dataset.idx; var e = this.data.orderList[o_index]; var th = this; @@ -469,6 +492,25 @@ Page({ var order_goods = e.order_goods; var user_id=getApp().globalData.userInfo.user_id; + // 幸运购检查库存量 api/weshop/activitylist/getActLen/{store_id}/{prom_type}/{prom_id} + if (parseInt(order_goods['0']['prom_type']) == 9) { + var aid = order_goods['0']['prom_id']; + var knum = 0; + await r.promiseGet('/api/weshop/activitylist/getActLen/' + os.stoid + '/9/' + aid, { + }).then(res => { + if (res.data.code == 0) { + knum = res.data.data; + } + + }); + + if (knum <= 0) { + getApp().confirmBox("库存为0，支付失败"); + return false; + } + + } + var wlist = ""; for (var i in order_goods) { var good = order_goods[i]; @@ -577,7 +619,7 @@ Page({ } //如果是预售的时候， - if(good.prom_type==8){ + if(good.prom_type==8) { await getApp().request.promiseGet("/api/weshop/order/orderPresell/countBuyGoodsSum",{ data: {store_id: os.stoid, user_id: user_id, goods_id: good.goods_id, prom_id: good.prom_id}, }).then(e=>{ @@ -699,7 +741,7 @@ Page({ return false; } - } else { + } else { if ((gg.prom_type == 1 || good.prom_type == 2 || gg.prom_type == 3 || gg.prom_type == 5 || gg.prom_type == 6 || gg.prom_type == 4) && !good.is_collocation && !good.is_gift && !good.is_integral_normal && !good.is_pd_normal) { var prom = null; @@ -776,7 +818,7 @@ Page({ var card_field = th.data.card_field; //-- 如果会员是等级会员,商品有等级价,且不是活动商品，同时线下取价的要放在最后来判断 -- - if (!good.is_gift && !good.is_collocation) { + if (!good.is_gift && !good.is_collocation && gg.prom_type != 9) { if (card_field && gg[card_field] > 0) { if (good.goods_price != gg[card_field] && good.offline_cut <= 0) isok = 0; if (good.goods_price > gg[card_field] && good.offline_cut > 0) isok = 0; //如果线下价格比较贵，则不通过 diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml index 4735e7b..aeb9884 100644 --- a/pages/user/order_list/order_list.wxml +++ b/pages/user/order_list/order_list.wxml @@ -40,7 +40,7 @@ 订单编号：{{item.order_sn}} - + 尾款支付失败 @@ -64,6 +64,19 @@ 退款中 + + + 已退款 + 已支付,待成团 + 未支付 + 待发货 + 待收货 + 待评价 + 已评价 + 已取消 + + + 组团中 @@ -82,6 +95,8 @@ 退款中 + + @@ -91,7 +106,9 @@ - + + @@ -128,7 +145,10 @@ ￥ - {{filters.toFix(goods.member_goods_price,2)}} + + + {{filters.toFix(goods.goods_price,2)}} + {{filters.toFix(goods.member_goods_price,2)}} x{{goods.goods_num}} @@ -162,7 +182,8 @@ 合计(改): ￥ - {{filters.toFix(item.order_amount+item.user_money,2)}} + + {{filters.toFix(item.order_amount+item.user_money,2)}} +{{item.coupon_price}}元优惠券 +{{item.integral}}积分 @@ -196,7 +217,7 @@ - 订单详情 + 订单详情 订单详情 diff --git a/pages/user/plus/plus.js b/pages/user/plus/plus.js index 48eff7b..2b4b28b 100644 --- a/pages/user/plus/plus.js +++ b/pages/user/plus/plus.js @@ -9,6 +9,7 @@ var t = getApp(), t_pay = require("../../../utils/pay2.js"); var regeneratorRuntime = require('../../../utils/runtime.js'); + Page({ /** * 页面的初始数据 @@ -38,6 +39,9 @@ Page({ def_recommon: null, //分享人的手机号 def_serviceman: null, //分享人的营业员 fir_leader: 0, //分享人的ID + staffNo_arr: [], //多个营业员 + focus:false, + is_select: false, //是否选择营业员过 }, swiperChange: function (e) { var currentId = e.detail.current; @@ -280,6 +284,21 @@ Page({ }) } }, + + //选择营业员 + select_serviceman(e) { + let StaffNo = e.currentTarget.dataset.staffno; + let {req_data,req} = this.data; + if (StaffNo && StaffNo !== "") { + req_data.staffNo = StaffNo; + req.serviceman = StaffNo; + }; + this.setData({ + is_select: 1, + staffNo_arr:[], + }) + this.check_serviceman(req_data,req) + }, //--绑定邀请码的输入-- b_input: function (e) { var value = e.detail.value.trim(); @@ -299,6 +318,7 @@ Page({ }, //--立即购买卡-- buy_card: async function () { + console.log(11111); var th = this; var is_card = 0; //--商家是不是有等级卡功能，开通的人数是不是够用，开通是时间是不是到期-- @@ -341,6 +361,9 @@ Page({ if (th.data.is_salesman) { if (!th.data.inp_serviceman) { getApp().my_warnning("请输入营业员", 0, th); + th.setData({ + focus:true + }) return false; } req.serviceman = th.data.inp_serviceman @@ -350,37 +373,94 @@ Page({ req.userId = getApp().globalData.user_id; //--如果有邀请码，和营业员的情况下-- if (req.recommon || req.serviceman) { + var req_data = { storeId: os.stoid, userId: req.userId }; if (req.recommon) req_data.inviteCode = req.recommon; if (req.serviceman) req_data.staffNo = req.serviceman; - getApp().request.get("/api/weshop/plus/vip/mem/referee/code/check", { - data: req_data, - success: function (res) { - if (res.data.code == 0) { - t_pay.pay(req, th.success, function () { - getApp().my_warnning("支付失败", 0, th); - }); - } else { - getApp().my_warnning(res.data.msg, 0, th); - } - } + th.setData({ + req_data, + req, }) + th.check_serviceman(req_data,req) + // getApp().request.get("/api/weshop/plus/vip/mem/referee/code/check", { + // data: req_data, + // success: function (res) { + // if (res.data.code == 0) { + // if(res.data.data.length > 1 && !th.data.is_select){ + // th.setData({ + // staffNo_arr:res.data.data + // }) + // }else{ + // t_pay.pay(req, th.success, function () { + // getApp().my_warnning("支付失败", 0, th); + // th.setData({ + // is_select:0, + // }) + // }); + // } + // } else { + // getApp().my_warnning(res.data.msg, 0, th); + // th.setData({ + // is_select:0, + // }) + // } + // } + // }) } else { t_pay.pay(req, th.success, function () { getApp().my_warnning("支付失败", 0, th); + th.setData({ + is_select:0, + focus:true, + }) }); - } + } }, //返回会员页面 OpeningClose: function () { this.setData({ - open_yq: 0 + open_yq: 0, + inp_serviceman:"" }); }, - + dialog_close() { + this.setData({ + staffNo_arr: [], + }); + }, + check_serviceman(data,req) { + let th = this; + getApp().request.get("/api/weshop/plus/vip/mem/referee/code/check", { + data, + isShowLoading:true, + success: function (res) { + if (res.data.code == 0) { + if (res.data.data.length > 1 && !th.data.is_select) { + th.setData({ + staffNo_arr: res.data.data + }) + }else{ + t_pay.pay(req, th.success, function () { + getApp().my_warnning("支付失败", 0, th); + th.setData({ + is_select:0, + focus:true, + }) + }); + } + } else { + getApp().my_warnning(res.data.msg, 0, th); + th.setData({ + is_select:0, + focus:true, + }) + } + } + }) + }, //返回会员中心 back_user: function () { setTimeout(function () { @@ -409,7 +489,6 @@ Page({ url: u_url }) } - }, diff --git a/pages/user/plus/plus.wxml b/pages/user/plus/plus.wxml index 8e71b06..b434572 100644 --- a/pages/user/plus/plus.wxml +++ b/pages/user/plus/plus.wxml @@ -1,23 +1,23 @@ - - - - - - - + + + + + + + - - - - - - + + + + + + - + {{item.CardName}} @@ -32,7 +32,7 @@ - + 按去年用户消费计算，开卡后一年预计省￥{{item.free}}元 @@ -41,76 +41,80 @@ + - - + - - + + + + + + + 开通PLUS会员尊享礼遇 + - - - - 开通PLUS会员尊享礼遇 - - - - + + - - PLUS会员可享受以下特权 + + PLUS会员可享受以下特权 + + + + + + - + + + + + - - - - - - - + + + + + + + + + + + + - - - - - - - - - - + 好物推荐 - 好物推荐 + + + + + + - - - - + + + + GOOD HOT THING + - - - - - GOOD HOT THING - + + + - - - - - @@ -127,32 +131,55 @@ 请完善下面信息 - + - + - + - + 确认购买 + + + + + + + + + 请选择营业员 + X + + + 编号 + 姓名 + + + + {{item.StaffNo}} + {{item.StaffName}} + + + + + \ No newline at end of file diff --git a/pages/user/plus/plus.wxss b/pages/user/plus/plus.wxss index f169837..e6912d3 100644 --- a/pages/user/plus/plus.wxss +++ b/pages/user/plus/plus.wxss @@ -16,7 +16,48 @@ page { width: 100%; height: 100%; } - +.dialogful{ + position: fixed; + left: 0; + top: 15%; + right: 0; + bottom: 0; + z-index: 11; + background: rgba(0, 0, 0, 0.6); + width: 100%; + height: 100%; +} +.dialog_body { + margin:30% auto; + width: 660rpx; +} +.dialog_close{ + float: right; + width: 50rpx; + height: 50rpx; + text-align: right; +} +.dialog_choose{ + position: relative; + padding: 20rpx; + border-bottom: 1rpx solid #eee; +} +.dialog_name, +.dialog_content { + padding: 10rpx; + display: flex; + border-bottom: 1rpx solid #f7f7f7; + justify-content: space-around; + +} +.weui-active{ + opacity: 0.9; + background: #f7f7f7; +} +.w50 { + width: 50%; + text-align: center; +} .Opening_bk image { position: absolute; z-index: 2; diff --git a/pages/user/user_spsy/user_spsy.js b/pages/user/user_spsy/user_spsy.js index b94b66f..5ee5215 100644 --- a/pages/user/user_spsy/user_spsy.js +++ b/pages/user/user_spsy/user_spsy.js @@ -15,7 +15,7 @@ Page({ page: 1, isLoading: 0, no_more: 0, - is_use:0 //领取状态 + is_use: 0 //领取状态 }, /** * 生命周期函数--监听页面加载 @@ -35,7 +35,7 @@ Page({ now, }); this.requestData() - this.getQrCode(FormId) + this.getQrCode(FormId,GradeId) }, /** * 生命周期函数--监听页面显示 @@ -44,20 +44,21 @@ Page({ }, - async getQrCode(id) { + async getQrCode(FormId,GradeId) { const res = await getApp().request.promiseGet("/api/weshop/users/grade/wares/code/get", { data: { - privilegeId: id, + privilegeId: FormId, storeId: os.stoid, + GradeId:GradeId, userId: getApp().globalData.user_id, }, }); if (res.data.code == 0 && res.data.data) { - if(res.data.data.VerifyDate || res.data.data.VerifyNo){ + if (res.data.data.VerifyDate || res.data.data.VerifyNo) { this.setData({ - is_use:1 + is_use: 1 }) - }else{ + } else { this.setData({ qr_code_object: res.data.data, }) @@ -82,7 +83,8 @@ Page({ userId: getApp().globalData.user_id, } const res = await getApp().request.promiseGet("/api/weshop/users/grade/wechat/wares/page", { - data: req_data + data: req_data, + isShowLoading:true, }); if (ut.ajax_ok(res)) { @@ -128,28 +130,35 @@ Page({ //--领取商品-- async show_hxm(e) { - let qr_code_object = this.data.qr_code_object; - if (qr_code_object !== {}) { - let { Number: val, BeginDate, EndDate} = qr_code_object; - let qr_code = this.selectComponent("#qc_com"); - let obj = { - val, - content: "请将二维码展示给核销员，抵券更快捷", - now: BeginDate, - validay: EndDate, - is_quan: 1, - }; - qr_code.open(obj) - }else{ - wx.showToast({ - title: "获取失败", - icon: 'none', - duration: 1000 - }) - } + setTimeout(() => { + let qr_code_object = this.data.qr_code_object; + if (qr_code_object !== {}) { + let { + WriteOffCode: val, + BeginDate, + EndDate + } = qr_code_object; + let qr_code = this.selectComponent("#qc_com"); + let obj = { + val, + content: "当前核销码仅限当面使用", + now: BeginDate, + validay: EndDate, + is_quan: 0, + is_fw:0, + }; + qr_code.open(obj) + } else { + wx.showToast({ + title: "获取失败", + icon: 'none', + duration: 1000 + }) + } + }, 500); }, - close:function (){ + close: function () { this.getQrCode(this.data.FormId) } }) \ No newline at end of file diff --git a/pages/user/user_spsy/user_spsy.wxml b/pages/user/user_spsy/user_spsy.wxml index a785fb0..d2ea4d5 100644 --- a/pages/user/user_spsy/user_spsy.wxml +++ b/pages/user/user_spsy/user_spsy.wxml @@ -12,7 +12,7 @@ - 已使用 + 已使用 立即使用 diff --git a/pages/user/user_spsy/user_spsy.wxss b/pages/user/user_spsy/user_spsy.wxss index c53c4af..2f78a2c 100644 --- a/pages/user/user_spsy/user_spsy.wxss +++ b/pages/user/user_spsy/user_spsy.wxss @@ -27,4 +27,10 @@ page{ text-align: center; /* border-radius: 8rpx; */ } - +.btn1 { + background-color: #ccc; + color: white; + padding: 26rpx; + text-align: center; + /* border-radius: 8rpx; */ +} diff --git a/pages/user/userqy/userqy.js b/pages/user/userqy/userqy.js index f1654ab..2343904 100644 --- a/pages/user/userqy/userqy.js +++ b/pages/user/userqy/userqy.js @@ -187,7 +187,9 @@ Page({ } 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=" diff --git a/pages/user/userqy/userqy.wxml b/pages/user/userqy/userqy.wxml index 28f1f24..9c8cfd6 100644 --- a/pages/user/userqy/userqy.wxml +++ b/pages/user/userqy/userqy.wxml @@ -88,12 +88,13 @@ + - {{item.PrivilegeName}} + {{item.PrivilegeName}} diff --git a/utils/filter.wxs b/utils/filter.wxs index ca5d0a3..0717a64 100644 --- a/utils/filter.wxs +++ b/utils/filter.wxs @@ -143,6 +143,10 @@ var filters = { return val / 100; }, + div100: function(val) { + return val / 100; + }, + // 计算百分比, 不带百分号 percent: function(num1, num2) { // console.log('百分比',Math.round(num1/num2 * 10000) / 100); @@ -188,5 +192,6 @@ module.exports = { difference: filters.difference, multiply: filters.multiply, price: filters.price, + div100: filters.div100, JSONStringify: filters.JSONStringify, } \ No newline at end of file