diff --git a/app.js b/app.js index 91af319..f235b5c 100644 --- a/app.js +++ b/app.js @@ -648,6 +648,9 @@ App({ }) } else { + if(th.globalData.pk_store.is_no_dis){ + th.globalData.pk_store.is_no_dis=0; + } func(th.globalData.pk_store); } }) diff --git a/app.json b/app.json index 6601c6c..be7da9b 100644 --- a/app.json +++ b/app.json @@ -235,7 +235,8 @@ "root": "packageF/", "name": "pack6", "pages": [ - "pages/wuliu/wuliu" + "pages/wuliu/wuliu", + "pages/free_delivery/free_delivery" ] } diff --git a/components/diy_public/diy_public.js b/components/diy_public/diy_public.js index ce4cdce..343b329 100644 --- a/components/diy_public/diy_public.js +++ b/components/diy_public/diy_public.js @@ -3,7 +3,7 @@ // default: e // }; // }(require("../../utils/LoadMore3.js")), -// n = new e.default(), +// n = new e.default(), var t = getApp(), a = t.request, o = t.globalData.setting, @@ -47,6 +47,7 @@ Component({ kttypeArr:['','商家','会员','阶梯'], imgobj:{ '1':"/miniapp/images/component/seckill.png", + '2':"/miniapp/images/component/pingd/pingd.png", '6':"/miniapp/images/component/pingd/pingd.png" }, nav1:'/packageA/pages/goodsInfo/goodsInfo?', @@ -84,13 +85,20 @@ Component({ }, ready: function () { - if (this.data.prom_type==6) { + if (this.data.prom_type==6) { //天天拼单 this.setData({ prom_text:'已团', nav1:'/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?', nav2:'/pages/goods/goodsInfo/goodsInfo?' }) } + if (this.data.prom_type==2) { //团购 + this.setData({ + prom_text:'已团', + nav1:'/pages/goods/goodsInfo/goodsInfo?', + nav2:'/pages/goods/goodsInfo/goodsInfo?' + }) + } var g_id = this.data.object; this.init(g_id); @@ -140,6 +148,12 @@ Component({ +os.stoid+"&goodsidlist="+goodsidlist; } + if (th.data.prom_type==2) { //团购 + gUrl="/api/weshop/goods/groupBuy/getGoodsList?store_id=" + +os.stoid+"&aidlist="+goodsidlist + "&user_id="+user_id; + } + + app.request.promiseGet(gUrl, {}).then(res => { @@ -173,6 +187,16 @@ Component({ user_id:user_id, } } + if (this.data.prom_type==2) { //团购 + gUrl="/api/weshop/goods/groupBuy/page?page=1&pageSize=9" + req={ + store_id:os.stoid, + is_end: 0, + is_show: 1, + user_id:user_id, + timetype: 2, + } + } getApp().request.promiseGet(gUrl, { isShowLoading: 1, data:req } @@ -389,6 +413,10 @@ Component({ if (this.data.prom_type==6) { //天天拼单 url="/pages/activity/pind_list/pind_list" } + if (this.data.prom_type==2) { //团购 + url="/packageC/pages/group_list/group_list"; + } + wx.navigateTo({ url }); diff --git a/components/diy_public/diy_public.wxml b/components/diy_public/diy_public.wxml index 6dce2de..aa9b237 100644 --- a/components/diy_public/diy_public.wxml +++ b/components/diy_public/diy_public.wxml @@ -51,12 +51,12 @@ - {{prom_text}}{{aitem.buy_num}}件 + {{prom_text}}{{aitem.buy_num}}件 还剩余{{aitem.status==2 ? '0' : aitem.residue}}件 - - ￥{{aitem.price_n}}.{{aitem.price_xs}} + + ￥{{aitem.price_n}}.{{aitem.price_xs}} ￥{{aitem.shop_price || aitem.market_price}} @@ -97,15 +97,17 @@ - {{aitem.goods_name}} - + {{aitem.goods_name}} + {{aitem.ct_num}}人团 {{kttypeArr[aitem.kttype]}}团 - - {{prom_text}}{{aitem.buy_num}}件 + + + {{prom_text}}{{aitem.buy_num}}件 还剩余{{aitem.residue}}件 + @@ -151,7 +153,7 @@ {{aitem.goods_name}} - {{prom_text}}{{aitem.buy_num}}件 + {{prom_text}}{{aitem.buy_num}}件 剩{{aitem.residue}}件 @@ -202,13 +204,13 @@ {{kttypeArr[aitem.kttype]}}团 --> - {{prom_text}}{{aitem.buy_num}}件 + {{prom_text}}{{aitem.buy_num}}件 剩{{aitem.residue}}件 - ￥{{aitem.price_n}}.{{aitem.price_xs}}￥{{aitem.shop_price || aitem.market_price}} + ￥{{aitem.price_n}}.{{aitem.price_xs}}￥{{aitem.shop_price || aitem.market_price}} @@ -261,12 +263,12 @@ - {{prom_text}}{{aitem.buy_num}}件 + {{prom_text}}{{aitem.buy_num}}件 还剩余{{aitem.status==2 ? '0' : aitem.residue}}件 - - ￥{{aitem.price_n}}.{{aitem.price_xs}} + + ￥{{aitem.price_n}}.{{aitem.price_xs}} ￥{{aitem.shop_price || aitem.market_price}} @@ -297,13 +299,13 @@ - {{aitem.goods_name}} + {{aitem.goods_name}} {{aitem.ct_num}}人团 {{kttypeArr[aitem.kttype]}}团 - {{prom_text}}{{aitem.buy_num}}件 + {{prom_text}}{{aitem.buy_num}}件 还剩余{{aitem.residue}}件 @@ -339,13 +341,13 @@ - {{aitem.goods_name}} + {{aitem.goods_name}} {{aitem.ct_num}}人团 {{kttypeArr[aitem.kttype]}}团 - {{prom_text}}{{aitem.buy_num}}件 + {{prom_text}}{{aitem.buy_num}}件 还剩余{{aitem.residue}}件 @@ -438,7 +440,7 @@ - {{aitem.goods_name}} + {{aitem.goods_name}} {{prom_text}}{{aitem.buy_num}}件 剩{{aitem.residue}}件 diff --git a/components/diy_public/diy_public.wxss b/components/diy_public/diy_public.wxss index 25c399a..abdb465 100644 --- a/components/diy_public/diy_public.wxss +++ b/components/diy_public/diy_public.wxss @@ -545,4 +545,14 @@ swiper { } .lineh24{ line-height: 24rpx !important; + } + .group{ + padding: 10rpx; + background-color:#f23030; + color: #fff; + /* margin-top: 10rpx; */ + line-height: 28rpx; + border-radius: 10rpx; + margin-right: 10rpx; + opacity: .8; } \ No newline at end of file diff --git a/components/diy_seckill/diy_seckill.wxml b/components/diy_seckill/diy_seckill.wxml index 6642b65..08739b1 100644 --- a/components/diy_seckill/diy_seckill.wxml +++ b/components/diy_seckill/diy_seckill.wxml @@ -50,8 +50,8 @@ 还剩余{{aitem.status==2 ? '0' : aitem.residue}}件 - - ￥{{aitem.price_n}}.{{aitem.price_xs}} + + ￥{{aitem.price_n}}.{{aitem.price_xs}} ￥{{aitem.shop_price}} @@ -195,7 +195,7 @@ - ￥{{aitem.price_n}}.{{aitem.price_xs}}￥{{aitem.shop_price}} + ￥{{aitem.price_n}}.{{aitem.price_xs}}￥{{aitem.shop_price}} @@ -248,8 +248,8 @@ 还剩余{{aitem.status==2 ? '0' : aitem.residue}}件 - - ￥{{aitem.price_n}}.{{aitem.price_xs}} + + ￥{{aitem.price_n}}.{{aitem.price_xs}} ￥{{aitem.shop_price}} diff --git a/components/store_popup/store_popup.js b/components/store_popup/store_popup.js index 7cf9994..96d88d7 100644 --- a/components/store_popup/store_popup.js +++ b/components/store_popup/store_popup.js @@ -314,10 +314,12 @@ Component({ }, close_popup() { + this.triggerEvent('closeback',{}) this.setData({ store: 0, keyword:'' }) + }, //选择更多门店 more_store: function () { diff --git a/components/store_popup/store_popup.wxml b/components/store_popup/store_popup.wxml index ce8d633..94f2aab 100644 --- a/components/store_popup/store_popup.wxml +++ b/components/store_popup/store_popup.wxml @@ -28,7 +28,7 @@ - + @@ -54,7 +54,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -133,7 +133,7 @@ - + {{item.name}} diff --git a/packageA/pages/checkin/checkin.js b/packageA/pages/checkin/checkin.js index b96f7b7..05cd0db 100644 --- a/packageA/pages/checkin/checkin.js +++ b/packageA/pages/checkin/checkin.js @@ -254,7 +254,7 @@ Page({ // 如果还没签到, 可以点击签到 if (isCheckInToday == -1) { - + getnowtime = getnowtime.replace(/-/g, "/") var timeid = Date.parse(getnowtime)/1000; var key = "rgqsqLYhw67sgaIQBF6dw9JK7CDKSS"; var str = app.globalData.setting.stoid + ":" + app.globalData.user_id + ":" + timeid + ":" + key diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js index 3281583..02760e7 100644 --- a/packageA/pages/goodsInfo/goodsInfo.js +++ b/packageA/pages/goodsInfo/goodsInfo.js @@ -1574,7 +1574,7 @@ Page({ } var title= th.data.data.goods_name; - var img=th.data.data.original_img; + var img=th.data.iurl+th.data.data.image_url; if(th.data.prom_type==6){ title=th.data.prom_act.share_title; img=th.data.iurl+th.data.prom_act.share_imgurl; diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js index ca43853..d4856aa 100644 --- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js +++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js @@ -1151,9 +1151,7 @@ Page({ } var title = th.data.data.goods_name; - var img = th.data.data.original_img; - - + var img = th.data.iurl+th.data.data.image_url; var url = "/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id=" + th.data.gid; if (getApp().globalData.user_id) { diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.js b/packageB/pages/luckactivity/luckinfo/luckinfo.js index 58b8cd1..b4d65f6 100644 --- a/packageB/pages/luckactivity/luckinfo/luckinfo.js +++ b/packageB/pages/luckactivity/luckinfo/luckinfo.js @@ -4,1406 +4,1489 @@ const app = getApp(); let imghost = app.globalData.setting.imghost; let self = null; let imgDraw = { - "width": "554px", - "height": "899px", - "background": imghost + "miniapp/images/share_bg.png", - "views": [ - { //0.头像 - "type": "image", - // "url": app.globalData.userInfo.head_pic, - "css": { - "background": "white", - "width": "80px", - "height": "80px", - "top": "24px", - "left": "40px", - "borderRadius": "80px", - } - }, - { //1.昵称 - "type": "text", - // "text": "", - "css": { - "color": "#000000", - "width": "400px", - "top": "25px", - "left": "140px", - "fontSize": "26px", - "maxLines": "1", - } - }, - { //2.强烈推荐 - "type": "text", - "text": "强烈推荐", - "css": { - "color": "#fff", - "background": "#FF6768", - "width": "105px", - "height": "26px", - "lineHeight": "26px", - "top": "70px", - "left": "140px", - "borderRadius": "10px", - "fontSize": "18px", - "textAlign": "center" - - } - }, - { //3.分享标题 - "type": "text", - "text": "", - "css": { - "width": "554px", - "padding": "20px", - "left": "20px", - "top": "160px", - "fontSize": "28px", - "textAlign": "left", - "maxLines": "1", - } - }, - { //4.分享内容 - "type": "text", - // "text": "", - "css": { - "color": "#000000", - "width": "554px", - "padding": "20px", - "left": "20px", - "top": "190px", - "fontSize": "26px", - "textAlign": "center", - "maxLines": "1", - } - }, - { //5.分享图片 - "type": "image", - "url": "/packageB/images/luckDraw/jiang.png", - "css": { - "width": "auto", - "height": "380px", - "top": "220px", - "left": "277px", - "align": "center", - "mode": "aspectFill", - } - }, - { //6 - "type": "image", - "url": "/images/share/s_gou.png", - "css": { - "width": "30px", - "height": "30px", - "top": "630px", - "left": "18px", - "rotate": "0", - "borderRadius": "30px", - } - }, - { //7 - "type": "text", - "text": "正品保障", - "css": { - "color": "red", - "width": "110px", - "top": "630px", - "left": "52px", - "fontSize": "22px", - } - }, - { //8 - "type": "image", - "url": "/images/share/s_gou.png", - "css": { - "width": "30px", - "height": "30px", - "top": "630px", - "left": "208px", - "borderRadius": "30px", - } - }, - { //9 - "type": "text", - "text": "纯实体店", - "css": { - "color": "red", - "width": "129px", - "top": "630px", - "left": "243px", - "fontSize": "22px", - } - }, - { //10 - "type": "image", - "url": "/images/share/s_gou.png", - "css": { - "width": "30px", - "height": "30px", - "top": "630px", - "left": "410px", - "borderRadius": "30px", - } - }, - { //11 - "type": "text", - "text": "官方验证", - "css": { - "color": "red", - "width": "121px", - "top": "630px", - "left": "450px", - "fontSize": "22px", - } - }, - { //12.横线 - "type": "rect", - "css": { - "color": "#eee", - "width": "548px", - "height": "1px", - "top": "676px", - "left": "277px", - "align": "center", - } - }, - { //13 - "type": "text", - "text": "特惠活动时间仅限", - "css": { - "color": "#000000", - "width": "245px", - "top": "730px", - "left": "28px", - "fontSize": "24px", - "textAlign": "left" - } - }, - { //14.时间 - "type": "text", - // "text": "", - "css": { - "width": "377px", - "top": "770px", - "left": "28px", - "fontSize": "24px", - } - }, - { //15 - "type": "text", - "text": "长按识别小程序码有惊喜哦！", - "css": { - "color": "#7c7c7c", - "width": "348px", - "top": "820px", - "left": "27px", - "fontSize": "24px", - } - }, - - { //16.码 - "type": "image", - // "url": "", - "css": { - "width": "150px", - "height": "150px", - "top": "715px", - "left": "380px", - "mode": "scaleToFill" - } - }, - - ] - }; - + "width": "554px", + "height": "899px", + "background": imghost + "miniapp/images/share_bg.png", + "views": [ + { //0.头像 + "type": "image", + // "url": app.globalData.userInfo.head_pic, + "css": { + "background": "white", + "width": "80px", + "height": "80px", + "top": "24px", + "left": "40px", + "borderRadius": "80px", + } + }, + { //1.昵称 + "type": "text", + // "text": "", + "css": { + "color": "#000000", + "width": "400px", + "top": "25px", + "left": "140px", + "fontSize": "26px", + "maxLines": "1", + } + }, + { //2.强烈推荐 + "type": "text", + "text": "强烈推荐", + "css": { + "color": "#fff", + "background": "#FF6768", + "width": "105px", + "height": "26px", + "lineHeight": "26px", + "top": "70px", + "left": "140px", + "borderRadius": "10px", + "fontSize": "18px", + "textAlign": "center" + + } + }, + { //3.分享标题 + "type": "text", + "text": "", + "css": { + "width": "554px", + "padding": "20px", + "left": "20px", + "top": "160px", + "fontSize": "28px", + "textAlign": "left", + "maxLines": "1", + } + }, + { //4.分享内容 + "type": "text", + // "text": "", + "css": { + "color": "#000000", + "width": "554px", + "padding": "20px", + "left": "20px", + "top": "190px", + "fontSize": "26px", + "textAlign": "center", + "maxLines": "1", + } + }, + { //5.分享图片 + "type": "image", + "url": "/packageB/images/luckDraw/jiang.png", + "css": { + "width": "auto", + "height": "380px", + "top": "220px", + "left": "277px", + "align": "center", + "mode": "aspectFill", + } + }, + { //6 + "type": "image", + "url": "/images/share/s_gou.png", + "css": { + "width": "30px", + "height": "30px", + "top": "630px", + "left": "18px", + "rotate": "0", + "borderRadius": "30px", + } + }, + { //7 + "type": "text", + "text": "正品保障", + "css": { + "color": "red", + "width": "110px", + "top": "630px", + "left": "52px", + "fontSize": "22px", + } + }, + { //8 + "type": "image", + "url": "/images/share/s_gou.png", + "css": { + "width": "30px", + "height": "30px", + "top": "630px", + "left": "208px", + "borderRadius": "30px", + } + }, + { //9 + "type": "text", + "text": "纯实体店", + "css": { + "color": "red", + "width": "129px", + "top": "630px", + "left": "243px", + "fontSize": "22px", + } + }, + { //10 + "type": "image", + "url": "/images/share/s_gou.png", + "css": { + "width": "30px", + "height": "30px", + "top": "630px", + "left": "410px", + "borderRadius": "30px", + } + }, + { //11 + "type": "text", + "text": "官方验证", + "css": { + "color": "red", + "width": "121px", + "top": "630px", + "left": "450px", + "fontSize": "22px", + } + }, + { //12.横线 + "type": "rect", + "css": { + "color": "#eee", + "width": "548px", + "height": "1px", + "top": "676px", + "left": "277px", + "align": "center", + } + }, + { //13 + "type": "text", + "text": "特惠活动时间仅限", + "css": { + "color": "#000000", + "width": "245px", + "top": "730px", + "left": "28px", + "fontSize": "24px", + "textAlign": "left" + } + }, + { //14.时间 + "type": "text", + // "text": "", + "css": { + "width": "377px", + "top": "770px", + "left": "28px", + "fontSize": "24px", + } + }, + { //15 + "type": "text", + "text": "长按识别小程序码有惊喜哦！", + "css": { + "color": "#7c7c7c", + "width": "348px", + "top": "820px", + "left": "27px", + "fontSize": "24px", + } + }, + + { //16.码 + "type": "image", + // "url": "", + "css": { + "width": "150px", + "height": "150px", + "top": "715px", + "left": "380px", + "mode": "scaleToFill" + } + }, + + ] +}; + Page({ data: { - imgDraw: imgDraw, - - start: false, - list: null, - isLoading: false, // 检测是否已经发送请求,防止重复发送请求 - noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据 - pageNum: 1, // 当前页数 - imghost: imghost, - num: 3, - canStart: false, - - + imgDraw: imgDraw, + + start: false, + list: null, + isLoading: false, // 检测是否已经发送请求,防止重复发送请求 + noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据 + pageNum: 1, // 当前页数 + imghost: imghost, + num: 3, + canStart: false, + // store:1, prizes: [], - defaultConfig: { - offsetDegree: 22.5, - }, + defaultConfig: { + offsetDegree: 22.5, + }, // defaultStyle: { // fontColor: '#d64737', // fontSize: '14px' // }, blocks: [{ - padding: '76rpx', - imgs: [{ - src: imghost + 'miniapp/images/luckDraw/weel.png?v=3', - width: '700rpx', - height: '700rpx', - rotate: true, - }], - }], + padding: '76rpx', + imgs: [{ + src: imghost + 'miniapp/images/luckDraw/weel.png?v=3', + width: '700rpx', + height: '700rpx', + rotate: true, + }], + }], buttons: [{ - radius: '60rpx', - imgs: [{ - src: imghost + 'miniapp/images/luckDraw/pointer.png?v=3', - width: '188rpx', - height: '230rpx', - top: '-130rpx', - }], - }], + radius: '60rpx', + imgs: [{ + src: imghost + 'miniapp/images/luckDraw/pointer.png?v=3', + width: '188rpx', + height: '230rpx', + top: '-130rpx', + }], + }], + }, + + onLoad(options) { + self = this; + let first_leader = null; + this.data.options = options; + + + wx.setNavigationBarTitle({ + title: options.title, + }); + + + app.isLogin().then(function (data) {//进入页面前已经授权登录成功 + self.setData({ + userInfo: data, + }); + }); + + + + //从分享的跳转过来 + if (options.id == undefined || options.id == null || options.id == '') { + var scene = decodeURIComponent(options.scene); + scene = scene.split('_'); + first_leader = scene[0]; + this.data.options.id = scene[1]; + }; + + if (first_leader) { + // console.log("log---", 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) { + app.globalData.guide_id = res.data.data.id; + } + }) + }; + }, - - onLoad(options) { - self = this; - let first_leader = null; - this.data.options = options; - - - wx.setNavigationBarTitle({ - title: options.title, - }); - - - app.isLogin().then(function(data) {//进入页面前已经授权登录成功 - self.setData({ - userInfo: data, - }); - }); - - - - //从分享的跳转过来 - if (options.id == undefined || options.id == null || options.id == '') { - var scene = decodeURIComponent(options.scene); - scene = scene.split('_'); - first_leader = scene[0]; - this.data.options.id = scene[1]; - }; - - if(first_leader) { - // console.log("log---", 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){ - app.globalData.guide_id = res.data.data.id; - } - }) - }; - - }, - - onShow() { - // console.log('show~~`'); - - if(app.globalData.userInfo) { - if(!this.data.isLogin) { - - // 下载头像 - let path = app.globalData.userInfo.head_pic; - path = path.replace("http://thirdwx.qlogo.cn", "https://wx.qlogo.cn"); - path = path.replace("https://thirdwx.qlogo.cn", "https://wx.qlogo.cn"); - wx.downloadFile({ - url: path, //仅为示例，并非真实的资源 - success (res) { - // 只要服务器有响应数据，就会把响应内容写入文件并进入 success 回调，业务需要自行判断是否下载到了想要的内容 - if (res.statusCode === 200) { - self.setData({ - 'imgDraw.views[0].url': res.tempFilePath,//头像 - }); - - } - } - }); - - - this.setData({ - userInfo: app.globalData.userInfo, - isLogin: true, - 'imgDraw.views[1].text': app.globalData.userInfo.nickname,//昵称 - }); - - - // console.log('imgDraw.views[1].text+++++++++', imgDraw.views[1], app.globalData.userInfo.nickname); - let user_id = app.globalData.userInfo.user_id; - let store_id = app.globalData.setting.stoid; - let id = this.data.options.id; - let url = `/api/weshop/marketing/marketingLuckForm/getLuckInfo/${store_id}/${id}/${user_id}`; - - //获取小程序码 - this.getMiniCode({ - url: app.globalData.setting.url, - store_id: app.globalData.setting.stoid, - user_id: app.globalData.userInfo.user_id, - id: this.data.options.id, - }); - - - app.request.get(url, { - success: function(res) { - if(res.data.code == 0) { - self.setData({ - luckInfo: res.data.data, - }); - WxParse.wxParse('content', 'html', self.data.luckInfo.remark, self); - - // 如果is_share为1,隐藏发送给朋友和分享到朋友圈功能 - if(!self.data.luckInfo.is_share) { - wx.hideShareMenu(); - }; - - } else { - wx.showToast({ - title: res.data.msg, - icon: 'none', - }); - self.data.msg = res.data.msg; - // self.setData({ - // bannerUrl: imghost + 'miniapp/images/luckDraw/bg.png?v=2', - // 'blocks[0].imgs[0].src': imghost + 'miniapp/images/luckDraw/weel.png?v=3', //转盘 - // 'buttons[0].imgs[0].src': imghost + 'miniapp/images/luckDraw/pointer.png?v=3', //指针 - // }); - - }; - - // console.log('luckInfo', res.data.data); - let luckInfo = res.data.data; - - - - self.setData({ - 'imgDraw.views[3].text': self.data.luckInfo.act_name,//分享标题 - // 'imgDraw.views[4].text': '快来一起抽奖吧，精美奖品等着你！',//分享内容 - 'imgDraw.views[14].text': util.formar_no_full(luckInfo.begindate) + ' 至 ' + util.formar_no_full(luckInfo.enddate),//活动时间 - }); - - - - let luckStyle = null; - - - if(luckInfo && luckInfo.template_type != null && luckInfo.template_type == 1) { //获取模板 - let url = `/api/weshop/marketing/marketingLuckTemplate/get/0/${luckInfo.template_id}`; - app.request.get(url, { - success: function(res) { - let template = null; - if(res.data.code == 0) { - template = res.data.data; - self.setData({ - template, - bannerUrl: imghost + template.bannerUrl, //背景图 - 'blocks[0].imgs[0].src': imghost + ((template&&template.wheelBaseUrl) ? template.wheelBaseUrl:'miniapp/images/luckDraw/weel.png?v=3'), - 'buttons[0].imgs[0].src': imghost + ((template&&template.wheelPointerUrl) ? template.wheelPointerUrl:'miniapp/images/luckDraw/pointer.png?v=3'), //指针 - 'imgDraw.views[3].text': template.share_title ? template.share_title:self.data.luckInfo.act_name, //分享标题 - 'imgDraw.views[5].url': imghost + (template&&template.share_image ? template.share_image:self.data.luckInfo.imageurl), //分享图片 - - }); - - let color = template&&template.colorCode ? template.colorCode:'#da104b'; - luckStyle = `background: ${color} url(${self.data.bannerUrl}) no-repeat;`; - self.setData({ - luckStyle, - - }); - // self.setData({ - // template: res.data.data, - // bannerUrl: imghost + res.data.data.bannerUrl, //背景图 - // //bannerUrl: imghost + ((res.data.data&&res.data.data.bannerUrl) ? res.data.data.bannerUrl:'miniapp/images/luckDraw/bg.png?v=2'), //背景图 - // 'blocks[0].imgs[0].src': imghost + res.data.data&&res.data.data.wheelBaseUrl) ? res.data.data.wheelBaseUrl:'miniapp/images/luckDraw/weel.png?v=2'), //转盘 - // 'buttons[0].imgs[0].src': imghost + ((res.data.data&&res.data.data.wheelPointerUrl) ? res.data.data.wheelPointerUrl:'miniapp/images/luckDraw/pointer.png?v=2'), //指针 - // 'imgDraw.views[3].text': (res.data.data&&res.data.data.title) ? res.data.data.title : self.data.luckInfo.act_name,//分享标题 - // // 'imgDraw.views[4].text': (res.data.data&&res.data.data.share_content) ? res.data.data.share_content : '快来一起抽奖吧，精美奖品等着你！',//分享内容 - // 'imgDraw.views[5].url': (res.data.data&&res.data.data.share_image) ? (imghost + res.data.data.share_image):(self.data.luckInfo.imageurl ? (imghost + self.data.luckInfo.imageurl):'/packpageB/images/luckDraw/jiang.png'),//分享图片 - // 'imgDraw.views[14].text': util.formar_no_full(self.data.luckInfo.begindate) + ' 至 ' + util.formar_no_full(self.data.luckInfo.enddate),//活动时间 - // }); - } else { - luckStyle = `background: #da104b url(${imghost + 'miniapp/images/luckDraw/bg.png?v=2'}) no-repeat;`; - self.setData({ - luckStyle, - 'imgDraw.views[5].url': self.data.luckInfo.imageurl ? (imghost + self.data.luckInfo.imageurl):'/packageB/images/luckDraw/jiang.png', //分享图片 - 'blocks[0].imgs[0].src': imghost + 'miniapp/images/luckDraw/weel.png?v=3', //转盘 - 'buttons[0].imgs[0].src': imghost + 'miniapp/images/luckDraw/pointer.png?v=3', //指针 - }); - // let color = template&&template.colorCode ? template.colorCode:'#da104b'; - - // self.setData({ - // luckStyle, - // }); - }; - - }, - }); - } else { - - if(luckInfo && luckInfo.imageurl) { - self.setData({ - 'imgDraw.views[5].url': imghost + self.data.luckInfo.imageurl, //分享图片 - }); - }; - - if(luckInfo && luckInfo.store_bannerUrl) { - self.setData({ - bannerUrl: imghost + luckInfo.store_bannerUrl, - custom: true, - }); - } else { - self.setData({ - bannerUrl: imghost + 'miniapp/images/luckDraw/bg.png?v=2', - custom: false, - }); - }; - - let color = self.data.custom ? '#f0f0f0':'#da104b'; - luckStyle = `background: ${color} url(${self.data.bannerUrl}) no-repeat;`; - self.setData({ - luckStyle, - 'blocks[0].imgs[0].src': imghost + 'miniapp/images/luckDraw/weel.png?v=3', //转盘 - 'buttons[0].imgs[0].src': imghost + 'miniapp/images/luckDraw/pointer.png?v=3', //指针 - }); - - }; - - - if(self.data.luckInfo.msgInfo) { - wx.showToast({ - title: self.data.luckInfo.msgInfo, - icon: 'none', - }); - }; - - }, - }); - - // 获取奖品展示的奖品 - app.request.get('/api/weshop/marketing/marketingLuckList/page', { - data: { - store_id, - luck_formid: id, - }, - success: function(res) { - - let award = res.data.data.pageData; - self.setData({ - award, - }); - // console.log('award', award); - self.prizeLayout(award); - - }, - }); - - - //获取兑奖记录 - app.request.get('/api/weshop/marketing/marketingLuckRecord/page', { - isShowLoading: false, - data: { - store_id: app.globalData.setting.stoid, - user_id: app.globalData.userInfo.user_id, - luck_formid: this.data.options.id, - luck_state: 1 - }, - success: function(res) { - if(res.data.code == 0) { - self.setData({ - record: res.data.data.pageData, - }); - } - }, - }); - - - //获取中奖人员名单 - app.request.get('/api/weshop/marketing/marketingLuckRecord/page', { - isShowLoading: false, - data: { - store_id: app.globalData.setting.stoid, - luck_formid: this.data.options.id, - luck_state: 1, - pageSize: 20, - }, - success: function(res) { - if(res.data.code == 0) { - self.setData({ - nameList: res.data.data.pageData, - }); - }; - }, - }); - - - - - }; - }; - }, - - //获取小程序码 - getMiniCode(objData) { - wx.getImageInfo({ - src: `${objData.url}/api/wx/open/app/user/getWeAppEwm/${objData.store_id}?sceneValue=${objData.user_id}_${objData.id}&pageValue=packageB/pages/luckactivity/luckinfo/luckinfo`, - success (res) { - if(res.code != -1) { - self.setData({ - 'imgDraw.views[16].url': res.path, - getMiniCode: true, - }); - }; - } - }); - }, - - // 设置转盘奖品布局 - prizeLayout(award) { - let prizes = []; - // let length = award.length; - if(award) { - var length = award.length; - } else { - wx.showToast({ - title: '请设置奖品', - icon: 'none', - }); - return; - }; - - let thx = {fonts: [{ text: '谢谢\n参与', top: '18%', wordWrap:false, fontColor: 'rgba(255,255,255,.6)'}]}; - - if(length == 1) { - [0,2,4,6].map(function(item, index) { - prizes[item] = { - id: award[0].id, - lbtype: award[0].lbtype, - fonts: [{ text: award[0].luck_goods_name + ' x' + award[0].num, top: '18%', wordWrap:false, fontColor: 'transparent'}], - imgs: [ - { - src: self.prizeSrc(award[0].lbtype) ? self.prizeSrc(award[0].lbtype): (imghost + 'miniapp/images/luckDraw/lb.png'), - width: '135rpx', - height: '107rpx', - top: '12%', - } - ], - }; - }); - - [1,3,5,7].map(function(item, index) { - prizes[item] = thx; - }); - - this.data.thxIndexArr = [1,3,5,7]; - }; - - if(length == 2) { - [0,4].map(function(item, index) { - prizes[item] = { - id: award[0].id, - lbtype: award[0].lbtype, - fonts: [{ text: award[0].luck_goods_name + ' x' + award[0].num, top: '18%', wordWrap:false, fontColor: 'transparent'}], - imgs: [ - { - src: self.prizeSrc(award[0].lbtype) ? self.prizeSrc(award[0].lbtype): (imghost + 'miniapp/images/luckDraw/lb.png'), - width: '135rpx', - height: '107rpx', - top: '12%', - } - ], - }; - }); - - [2,6].map(function(item, index) { - prizes[item] = { - id: award[1].id, - lbtype: award[1].lbtype, - fonts: [{ text: award[1].luck_goods_name + ' x' + award[1].num, top: '18%', wordWrap:false, fontColor: 'transparent'}], - imgs: [ - { - src: self.prizeSrc(award[1].lbtype) ? self.prizeSrc(award[1].lbtype): (imghost + 'miniapp/images/luckDraw/lb.png'), - width: '135rpx', - height: '107rpx', - top: '12%', - } - ], - }; - }); - - [1,3,5,7].map(function(item, index) { - prizes[item] = thx; - }); - this.data.thxIndexArr = [1,3,5,7]; - }; - - - if(length == 3) { - [0,4].map(function(item, index) { - prizes[item] = { - id: award[0].id, - lbtype: award[0].lbtype, - fonts: [{ text: award[0].luck_goods_name + ' x' + award[0].num, top: '18%', wordWrap:false, fontColor: 'transparent'}], - imgs: [ - { - src: self.prizeSrc(award[0].lbtype) ? self.prizeSrc(award[0].lbtype): (imghost + 'miniapp/images/luckDraw/lb.png'), - width: '135rpx', - height: '107rpx', - top: '12%', - } - ], - }; - }); - - [1,5].map(function(item, index) { - prizes[item] = { - id: award[1].id, - lbtype: award[1].lbtype, - fonts: [{ text: award[1].luck_goods_name + ' x' + award[1].num, top: '18%', wordWrap:false, fontColor: 'transparent'}], - imgs: [ - { - src: self.prizeSrc(award[1].lbtype) ? self.prizeSrc(award[1].lbtype): (imghost + 'miniapp/images/luckDraw/lb.png'), - width: '135rpx', - height: '107rpx', - top: '12%', - } - ], - }; - }); - - [2,6].map(function(item, index) { - prizes[item] = { - id: award[2].id, - lbtype: award[2].lbtype, - fonts: [{ text: award[2].luck_goods_name + ' x' + award[2].num, top: '18%', wordWrap:false, fontColor: 'transparent'}], - imgs: [ - { - src: self.prizeSrc(award[2].lbtype) ? self.prizeSrc(award[2].lbtype): (imghost + 'miniapp/images/luckDraw/lb.png'), - width: '135rpx', - height: '107rpx', - top: '12%', - } - ], - }; - }); - - [3,7].map(function(item, index) { - prizes[item] = thx; - }); - - this.data.thxIndexArr = [3,7]; - }; - - - if(length == 4) { - [0,2,4,6].map(function(item, index) { - prizes[item] = { - id: award[index].id, - lbtype: award[index].lbtype, - fonts: [{ text: award[index].luck_goods_name + ' x' + award[index].num, top: '18%', wordWrap:false, fontColor: 'transparent'}], - imgs: [ - { - src: self.prizeSrc(award[index].lbtype) ? self.prizeSrc(award[index].lbtype): (imghost + 'miniapp/images/luckDraw/lb.png'), - width: '135rpx', - height: '107rpx', - top: '12%', - } - ], - }; - }); - - [1,3,5,7].map(function(item, index) { - prizes[item] = thx; - }); - - this.data.thxIndexArr = [1,3,5,7]; - }; - - if(length == 5) { - [0,2,3,5,6].map(function(item, index) { - prizes[item] = { - id: award[index].id, - lbtype: award[index].lbtype, - fonts: [{ text: award[index].luck_goods_name + ' x' + award[index].num, top: '18%', wordWrap:false, fontColor: 'transparent'}], - imgs: [ - { - src: self.prizeSrc(award[index].lbtype) ? self.prizeSrc(award[index].lbtype): (imghost + 'miniapp/images/luckDraw/lb.png'), - width: '135rpx', - height: '107rpx', - top: '12%', - } - ], - }; - }); - - [1,4,7].map(function(item, index) { - prizes[item] = thx; - }); - - this.data.thxIndexArr = [1,4,7]; - }; - - if(length == 6) { - prizes = award.map(function(item, index) { - return { - id: item.id, - lbtype: item.lbtype, - fonts: [{ text: item.luck_goods_name + ' x' + item.num, top: '18%', wordWrap:false, fontColor: 'transparent'}], - imgs: [ - { - src: self.prizeSrc(item.lbtype) ? self.prizeSrc(item.lbtype): (imghost + 'miniapp/images/luckDraw/lb.png'), - width: '135rpx', - height: '107rpx', - top: '12%', - } - ], - }; - }); - - prizes.push(thx); - prizes.splice(3, 0, thx); - - this.data.thxIndexArr = [3,7]; - }; - - // console.log('prizes', prizes); - - this.setData({ - prizes, - }); - }, - - // 根据lbtype指定奖品类别图标 - prizeSrc(lbtype) { - let src = ''; - switch(lbtype) { - case 1: { //积分 - src = imghost + 'miniapp/images/luckDraw/jf.png'; - break; - }; - case 2: { //成长值 - src = imghost + 'miniapp/images/luckDraw/czz.png'; - break; - }; - case 3: { //优惠券 - src = imghost + 'miniapp/images/luckDraw/yhq.png'; - break; - }; - case 4: { //服务项目 - src = imghost + 'miniapp/images/luckDraw/fw.png'; - break; - }; - case 5: { //赠品 - src = imghost + 'miniapp/images/luckDraw/zp.png'; - break; - }; - case 6: { //礼包 - src = imghost + 'miniapp/images/luckDraw/lb.png'; - break; - }; - }; - return src; - }, - - // 获取抽奖结果匹配对应奖品在奖品列表里的所有索引号 - luckyIndex(arr, target) { - var results=[], - len = arr.length, - pos = 0; - while(pos < len){ - // pos = arr[pos].indexOf(target, pos); - if(arr[pos].id == target) { - results.push(pos);//找到就存储索引 - - }; - pos += 1;//并从下个位置开始搜索 - // if(pos === -1){//未找到就退出循环完成搜索 - // break; - // }; - - } - // console.log('当前奖品列表', this.data.prizes); - // console.log('中奖结果在当前奖品列表中的索引', results); - - return results; - }, - - start () { - // self.data.start = true; - if(this.data.start) return; - this.data.start = true; - - if(!this.data.luckInfo) { - wx.showToast({ - title: this.data.msg, - icon: 'none', - }); - return; - }; - - if(this.data.luckInfo.msgInfo) { - wx.showToast({ - title: self.data.luckInfo.msgInfo, - icon: 'none', - success: function() { - self.setData({ - start: false - }); - } - }); - return; - }; - wx.showLoading({ - title: '准备开始抽奖', - mask: true, - }); - // 获取积分 - app.request.promisePost('/api/weshop/marketing/marketingLuckForm/startLuckIntegral', { - isShowLoading: false, - data: { - storeId: app.globalData.setting.stoid, - userId: app.globalData.userInfo.user_id, - LuckId: this.data.options.id, - }, - }) - .then(function(res) { - if(res.data.code == -1) { - //积分不足，弹出提示 - wx.hideLoading(); - self.data.luckInfo.msgInfo = res.data.msg - wx.showToast({ - title: res.data.msg, - icon: 'none', - success: function() { - self.data.start = false; - } - }); - return; - }; - - if(res.data.code == 0) { - - if(self.data.luckInfo.user_LuckNumDay > 0 || self.data.luckInfo.vip_act_num == 0) { - // console.log('start choujiang'); - // let start = false; - if(self.data.start) { - // self.data.start = true; - // 获取抽奖组件实例 - const $lucky = self.selectComponent('#myLucky'); - // 调用play方法开始旋转 - $lucky.play(); - wx.hideLoading(); - // 获取抽奖结果 - app.request.post('/api/weshop/marketing/marketingLuckForm/startLuck', { - isShowLoading: false, - data: { - storeId: app.globalData.setting.stoid, - userId: app.globalData.userInfo.user_id, - LuckId: self.data.options.id, - }, - success: function(res) { - - if(res.data.code == 0) { - // console.log('开始摇奖', res.data.data); - if(self.data.luckInfo.vip_act_num != 0) { - self.setData({ - 'luckInfo.user_LuckNumDay': self.data.luckInfo.user_LuckNumDay - 1, - // isActive: true, - }); - }; - - self.setData({ - // 'luckInfo.user_LuckNumDay': self.data.luckInfo.user_LuckNumDay - 1, - isActive: true, - wow: res.data.data, - }); - // console.log('wow', self.data.wow); - // console.log('请求成功', res.data.data); - let luckyId = res.data.data.id; - let indexArr = self.luckyIndex(self.data.prizes, luckyId); - // console.log('抽奖奖品id', luckyId); - // console.log('奖品列表', self.data.prizes); - // console.log('奖品对应的索引数组', indexArr); - let random = Math.random() * indexArr.length >> 0; - // console.log('random', random); - let index = indexArr[random]; - - $lucky.stop(index); - - // setTimeout(() => { - // Promise.resolve($lucky.stop(index)).then(()=>{ - // self.data.start = false; - // }); - - // }, 2000); - - - //获取兑奖记录 - // app.request.get('/api/weshop/marketing/marketingLuckRecord/page', { - // isShowLoading: false, - // data: { - // store_id: app.globalData.setting.stoid, - // user_id: app.globalData.userInfo.user_id, - // luck_formid: self.data.options.id, - // luck_state: 1 - // }, - // success: function(res) { - // if(res.data.code == 0) { - // // console.log('res===>', res.data.data.pageData); - // self.setData({ - // record: res.data.data.pageData, - // }); - // }; - // }, - // }); - - - } else { - let thxIndexArr = self.data.thxIndexArr; - const random = Math.random() * thxIndexArr.length >> 0; - const index = thxIndexArr[random]; - // console.log('谢谢参与数组', thxIndexArr); - // console.log('请求出错产生谢谢参与的随机数', index); - $lucky.stop(index); - // setTimeout(() => { - // Promise.resolve($lucky.stop(index)).then(()=>{ - // self.data.start = false; - // }); - // }, 2000); - - - - - if(res.data.code == -1) { - wx.showToast({ - title: res.data.msg, - icon: 'none', - success: function() { - self.setData({ - start: false - }); - } - }); - self.data.luckInfo.msgInfo = res.data.msg; - return; - // self.data.start = true; - }; - - - if(res.data.code == -2 && self.data.luckInfo.vip_act_num != 0) { - self.setData({ - 'luckInfo.user_LuckNumDay': self.data.luckInfo.user_LuckNumDay - 1, - }); - }; - - - }; - - - }, - - fail: function(res) { - // console.log('出错'); - wx.showToast({ - title: '数据请求失败', - icon: 'error', - }); - let thxIndexArr = self.data.thxIndexArr; - const random = Math.random() * thxIndexArr.length >> 0; - const index = thxIndexArr[random]; - $lucky.stop(index); - // setTimeout(() => { - // Promise.resolve($lucky.stop(index)).then(()=>{ - // self.data.start = false; - // }); - // }, 2000); - }, - - - - }); - - } - - - } else { - wx.showToast({ - title: '你今天的抽奖次数已用完啦！~', - icon: 'none', - success: function() { - self.setData({ - start: false - }); - } - }); - }; - - }; - }); - - - - - + + onShow() { + // console.log('show~~`'); + + if (app.globalData.userInfo) { + if (!this.data.isLogin) { + + // 下载头像 + let path = app.globalData.userInfo.head_pic; + path = path.replace("http://thirdwx.qlogo.cn", "https://wx.qlogo.cn"); + path = path.replace("https://thirdwx.qlogo.cn", "https://wx.qlogo.cn"); + wx.downloadFile({ + url: path, //仅为示例，并非真实的资源 + success(res) { + // 只要服务器有响应数据，就会把响应内容写入文件并进入 success 回调，业务需要自行判断是否下载到了想要的内容 + if (res.statusCode === 200) { + self.setData({ + 'imgDraw.views[0].url': res.tempFilePath,//头像 + }); + + } + } + }); + + + this.setData({ + userInfo: app.globalData.userInfo, + isLogin: true, + 'imgDraw.views[1].text': app.globalData.userInfo.nickname,//昵称 + }); + + + // console.log('imgDraw.views[1].text+++++++++', imgDraw.views[1], app.globalData.userInfo.nickname); + let user_id = app.globalData.userInfo.user_id; + let store_id = app.globalData.setting.stoid; + let id = this.data.options.id; + let url = `/api/weshop/marketing/marketingLuckForm/getLuckInfo/${store_id}/${id}/${user_id}`; + + //获取小程序码 + this.getMiniCode({ + url: app.globalData.setting.url, + store_id: app.globalData.setting.stoid, + user_id: app.globalData.userInfo.user_id, + id: this.data.options.id, + }); + + + app.request.get(url, { + success: function (res) { + if (res.data.code == 0) { + self.setData({ + luckInfo: res.data.data, + }); + WxParse.wxParse('content', 'html', self.data.luckInfo.remark, self); + + // 如果is_share为1,隐藏发送给朋友和分享到朋友圈功能 + if (!self.data.luckInfo.is_share) { + wx.hideShareMenu(); + }; + + } else { + wx.showToast({ + title: res.data.msg, + icon: 'none', + }); + self.data.msg = res.data.msg; + // self.setData({ + // bannerUrl: imghost + 'miniapp/images/luckDraw/bg.png?v=2', + // 'blocks[0].imgs[0].src': imghost + 'miniapp/images/luckDraw/weel.png?v=3', //转盘 + // 'buttons[0].imgs[0].src': imghost + 'miniapp/images/luckDraw/pointer.png?v=3', //指针 + // }); + + }; + + // console.log('luckInfo', res.data.data); + let luckInfo = res.data.data; + + + + self.setData({ + 'imgDraw.views[3].text': self.data.luckInfo.act_name,//分享标题 + // 'imgDraw.views[4].text': '快来一起抽奖吧，精美奖品等着你！',//分享内容 + 'imgDraw.views[14].text': util.formar_no_full(luckInfo.begindate) + ' 至 ' + util.formar_no_full(luckInfo.enddate),//活动时间 + }); + + + + let luckStyle = null; + + + if (luckInfo && luckInfo.template_type != null && luckInfo.template_type == 1) { //获取模板 + let url = `/api/weshop/marketing/marketingLuckTemplate/get/0/${luckInfo.template_id}`; + app.request.get(url, { + success: function (res) { + let template = null; + if (res.data.code == 0) { + template = res.data.data; + self.setData({ + template, + bannerUrl: imghost + template.bannerUrl, //背景图 + 'blocks[0].imgs[0].src': imghost + ((template && template.wheelBaseUrl) ? template.wheelBaseUrl : 'miniapp/images/luckDraw/weel.png?v=3'), + 'buttons[0].imgs[0].src': imghost + ((template && template.wheelPointerUrl) ? template.wheelPointerUrl : 'miniapp/images/luckDraw/pointer.png?v=3'), //指针 + 'imgDraw.views[3].text': template.share_title ? template.share_title : self.data.luckInfo.act_name, //分享标题 + 'imgDraw.views[5].url': imghost + (template && template.share_image ? template.share_image : self.data.luckInfo.imageurl), //分享图片 + + }); + + let color = template && template.colorCode ? template.colorCode : '#da104b'; + luckStyle = `background: ${color} url(${self.data.bannerUrl}) no-repeat;`; + self.setData({ + luckStyle, + + }); + // self.setData({ + // template: res.data.data, + // bannerUrl: imghost + res.data.data.bannerUrl, //背景图 + // //bannerUrl: imghost + ((res.data.data&&res.data.data.bannerUrl) ? res.data.data.bannerUrl:'miniapp/images/luckDraw/bg.png?v=2'), //背景图 + // 'blocks[0].imgs[0].src': imghost + res.data.data&&res.data.data.wheelBaseUrl) ? res.data.data.wheelBaseUrl:'miniapp/images/luckDraw/weel.png?v=2'), //转盘 + // 'buttons[0].imgs[0].src': imghost + ((res.data.data&&res.data.data.wheelPointerUrl) ? res.data.data.wheelPointerUrl:'miniapp/images/luckDraw/pointer.png?v=2'), //指针 + // 'imgDraw.views[3].text': (res.data.data&&res.data.data.title) ? res.data.data.title : self.data.luckInfo.act_name,//分享标题 + // // 'imgDraw.views[4].text': (res.data.data&&res.data.data.share_content) ? res.data.data.share_content : '快来一起抽奖吧，精美奖品等着你！',//分享内容 + // 'imgDraw.views[5].url': (res.data.data&&res.data.data.share_image) ? (imghost + res.data.data.share_image):(self.data.luckInfo.imageurl ? (imghost + self.data.luckInfo.imageurl):'/packpageB/images/luckDraw/jiang.png'),//分享图片 + // 'imgDraw.views[14].text': util.formar_no_full(self.data.luckInfo.begindate) + ' 至 ' + util.formar_no_full(self.data.luckInfo.enddate),//活动时间 + // }); + } else { + luckStyle = `background: #da104b url(${imghost + 'miniapp/images/luckDraw/bg.png?v=2'}) no-repeat;`; + self.setData({ + luckStyle, + 'imgDraw.views[5].url': self.data.luckInfo.imageurl ? (imghost + self.data.luckInfo.imageurl) : '/packageB/images/luckDraw/jiang.png', //分享图片 + 'blocks[0].imgs[0].src': imghost + 'miniapp/images/luckDraw/weel.png?v=3', //转盘 + 'buttons[0].imgs[0].src': imghost + 'miniapp/images/luckDraw/pointer.png?v=3', //指针 + }); + // let color = template&&template.colorCode ? template.colorCode:'#da104b'; + + // self.setData({ + // luckStyle, + // }); + }; + + }, + }); + } else { + + if (luckInfo && luckInfo.imageurl) { + self.setData({ + 'imgDraw.views[5].url': imghost + self.data.luckInfo.imageurl, //分享图片 + }); + }; + + if (luckInfo && luckInfo.store_bannerUrl) { + self.setData({ + bannerUrl: imghost + luckInfo.store_bannerUrl, + custom: true, + }); + } else { + self.setData({ + bannerUrl: imghost + 'miniapp/images/luckDraw/bg.png?v=2', + custom: false, + }); + }; + + let color = self.data.custom ? '#f0f0f0' : '#da104b'; + luckStyle = `background: ${color} url(${self.data.bannerUrl}) no-repeat;`; + self.setData({ + luckStyle, + 'blocks[0].imgs[0].src': imghost + 'miniapp/images/luckDraw/weel.png?v=3', //转盘 + 'buttons[0].imgs[0].src': imghost + 'miniapp/images/luckDraw/pointer.png?v=3', //指针 + }); + + }; + + + if (self.data.luckInfo.msgInfo) { + wx.showToast({ + title: self.data.luckInfo.msgInfo, + icon: 'none', + }); + }; + + }, + }); + + // 获取奖品展示的奖品 + app.request.get('/api/weshop/marketing/marketingLuckList/page', { + data: { + store_id, + luck_formid: id, + }, + success: function (res) { + + let award = res.data.data.pageData; + self.setData({ + award, + }); + // console.log('award', award); + self.prizeLayout(award); + + }, + }); + + + //获取兑奖记录 + app.request.get('/api/weshop/marketing/marketingLuckRecord/page', { + isShowLoading: false, + data: { + store_id: app.globalData.setting.stoid, + user_id: app.globalData.userInfo.user_id, + luck_formid: this.data.options.id, + luck_state: 1 + }, + success: function (res) { + if (res.data.code == 0) { + self.setData({ + record: res.data.data.pageData, + }); + } + }, + }); + + + //获取中奖人员名单 + app.request.get('/api/weshop/marketing/marketingLuckRecord/page', { + isShowLoading: false, + data: { + store_id: app.globalData.setting.stoid, + luck_formid: this.data.options.id, + luck_state: 1, + pageSize: 20, + }, + success: function (res) { + if (res.data.code == 0) { + self.setData({ + nameList: res.data.data.pageData, + }); + }; + }, + }); + + + + + }; + }; + }, + + //获取小程序码 + getMiniCode(objData) { + wx.getImageInfo({ + src: `${objData.url}/api/wx/open/app/user/getWeAppEwm/${objData.store_id}?sceneValue=${objData.user_id}_${objData.id}&pageValue=packageB/pages/luckactivity/luckinfo/luckinfo`, + success(res) { + if (res.code != -1) { + self.setData({ + 'imgDraw.views[16].url': res.path, + getMiniCode: true, + }); + }; + } + }); + }, + + // 设置转盘奖品布局 + prizeLayout(award) { + let prizes = []; + // let length = award.length; + if (award) { + var length = award.length; + } else { + wx.showToast({ + title: '请设置奖品', + icon: 'none', + }); + return; + }; + + let thx = { fonts: [{ text: '谢谢\n参与', top: '18%', wordWrap: false, fontColor: 'rgba(255,255,255,.6)' }] }; + + if (length == 1) { + [0, 2, 4, 6].map(function (item, index) { + prizes[item] = { + id: award[0].id, + lbtype: award[0].lbtype, + fonts: [{ text: award[0].luck_goods_name + ' x' + award[0].num, top: '18%', wordWrap: false, fontColor: 'transparent' }], + imgs: [ + { + src: self.prizeSrc(award[0].lbtype) ? self.prizeSrc(award[0].lbtype) : (imghost + 'miniapp/images/luckDraw/lb.png'), + width: '135rpx', + height: '107rpx', + top: '12%', + } + ], + }; + }); + + [1, 3, 5, 7].map(function (item, index) { + prizes[item] = thx; + }); + + this.data.thxIndexArr = [1, 3, 5, 7]; + }; + + if (length == 2) { + [0, 4].map(function (item, index) { + prizes[item] = { + id: award[0].id, + lbtype: award[0].lbtype, + fonts: [{ text: award[0].luck_goods_name + ' x' + award[0].num, top: '18%', wordWrap: false, fontColor: 'transparent' }], + imgs: [ + { + src: self.prizeSrc(award[0].lbtype) ? self.prizeSrc(award[0].lbtype) : (imghost + 'miniapp/images/luckDraw/lb.png'), + width: '135rpx', + height: '107rpx', + top: '12%', + } + ], + }; + }); + + [2, 6].map(function (item, index) { + prizes[item] = { + id: award[1].id, + lbtype: award[1].lbtype, + fonts: [{ text: award[1].luck_goods_name + ' x' + award[1].num, top: '18%', wordWrap: false, fontColor: 'transparent' }], + imgs: [ + { + src: self.prizeSrc(award[1].lbtype) ? self.prizeSrc(award[1].lbtype) : (imghost + 'miniapp/images/luckDraw/lb.png'), + width: '135rpx', + height: '107rpx', + top: '12%', + } + ], + }; + }); + + [1, 3, 5, 7].map(function (item, index) { + prizes[item] = thx; + }); + this.data.thxIndexArr = [1, 3, 5, 7]; + }; + + + if (length == 3) { + [0, 4].map(function (item, index) { + prizes[item] = { + id: award[0].id, + lbtype: award[0].lbtype, + fonts: [{ text: award[0].luck_goods_name + ' x' + award[0].num, top: '18%', wordWrap: false, fontColor: 'transparent' }], + imgs: [ + { + src: self.prizeSrc(award[0].lbtype) ? self.prizeSrc(award[0].lbtype) : (imghost + 'miniapp/images/luckDraw/lb.png'), + width: '135rpx', + height: '107rpx', + top: '12%', + } + ], + }; + }); + + [1, 5].map(function (item, index) { + prizes[item] = { + id: award[1].id, + lbtype: award[1].lbtype, + fonts: [{ text: award[1].luck_goods_name + ' x' + award[1].num, top: '18%', wordWrap: false, fontColor: 'transparent' }], + imgs: [ + { + src: self.prizeSrc(award[1].lbtype) ? self.prizeSrc(award[1].lbtype) : (imghost + 'miniapp/images/luckDraw/lb.png'), + width: '135rpx', + height: '107rpx', + top: '12%', + } + ], + }; + }); + + [2, 6].map(function (item, index) { + prizes[item] = { + id: award[2].id, + lbtype: award[2].lbtype, + fonts: [{ text: award[2].luck_goods_name + ' x' + award[2].num, top: '18%', wordWrap: false, fontColor: 'transparent' }], + imgs: [ + { + src: self.prizeSrc(award[2].lbtype) ? self.prizeSrc(award[2].lbtype) : (imghost + 'miniapp/images/luckDraw/lb.png'), + width: '135rpx', + height: '107rpx', + top: '12%', + } + ], + }; + }); + + [3, 7].map(function (item, index) { + prizes[item] = thx; + }); + + this.data.thxIndexArr = [3, 7]; + }; + + + if (length == 4) { + [0, 2, 4, 6].map(function (item, index) { + prizes[item] = { + id: award[index].id, + lbtype: award[index].lbtype, + fonts: [{ text: award[index].luck_goods_name + ' x' + award[index].num, top: '18%', wordWrap: false, fontColor: 'transparent' }], + imgs: [ + { + src: self.prizeSrc(award[index].lbtype) ? self.prizeSrc(award[index].lbtype) : (imghost + 'miniapp/images/luckDraw/lb.png'), + width: '135rpx', + height: '107rpx', + top: '12%', + } + ], + }; + }); + + [1, 3, 5, 7].map(function (item, index) { + prizes[item] = thx; + }); + + this.data.thxIndexArr = [1, 3, 5, 7]; + }; + + if (length == 5) { + [0, 2, 3, 5, 6].map(function (item, index) { + prizes[item] = { + id: award[index].id, + lbtype: award[index].lbtype, + fonts: [{ text: award[index].luck_goods_name + ' x' + award[index].num, top: '18%', wordWrap: false, fontColor: 'transparent' }], + imgs: [ + { + src: self.prizeSrc(award[index].lbtype) ? self.prizeSrc(award[index].lbtype) : (imghost + 'miniapp/images/luckDraw/lb.png'), + width: '135rpx', + height: '107rpx', + top: '12%', + } + ], + }; + }); + + [1, 4, 7].map(function (item, index) { + prizes[item] = thx; + }); + + this.data.thxIndexArr = [1, 4, 7]; + }; + + if (length == 6) { + prizes = award.map(function (item, index) { + return { + id: item.id, + lbtype: item.lbtype, + fonts: [{ text: item.luck_goods_name + ' x' + item.num, top: '18%', wordWrap: false, fontColor: 'transparent' }], + imgs: [ + { + src: self.prizeSrc(item.lbtype) ? self.prizeSrc(item.lbtype) : (imghost + 'miniapp/images/luckDraw/lb.png'), + width: '135rpx', + height: '107rpx', + top: '12%', + } + ], + }; + }); + + prizes.push(thx); + prizes.splice(3, 0, thx); + + this.data.thxIndexArr = [3, 7]; + }; + + // console.log('prizes', prizes); + + this.setData({ + prizes, + }); + }, + + // 根据lbtype指定奖品类别图标 + prizeSrc(lbtype) { + let src = ''; + switch (lbtype) { + case 1: { //积分 + src = imghost + 'miniapp/images/luckDraw/jf.png'; + break; + }; + case 2: { //成长值 + src = imghost + 'miniapp/images/luckDraw/czz.png'; + break; + }; + case 3: { //优惠券 + src = imghost + 'miniapp/images/luckDraw/yhq.png'; + break; + }; + case 4: { //服务项目 + src = imghost + 'miniapp/images/luckDraw/fw.png'; + break; + }; + case 5: { //赠品 + src = imghost + 'miniapp/images/luckDraw/zp.png'; + break; + }; + case 6: { //礼包 + src = imghost + 'miniapp/images/luckDraw/lb.png'; + break; + }; + }; + return src; + }, + + // 获取抽奖结果匹配对应奖品在奖品列表里的所有索引号 + luckyIndex(arr, target) { + var results = [], + len = arr.length, + pos = 0; + while (pos < len) { + // pos = arr[pos].indexOf(target, pos); + if (arr[pos].id == target) { + results.push(pos);//找到就存储索引 + + }; + pos += 1;//并从下个位置开始搜索 + // if(pos === -1){//未找到就退出循环完成搜索 + // break; + // }; + + } + // console.log('当前奖品列表', this.data.prizes); + // console.log('中奖结果在当前奖品列表中的索引', results); + + return results; + }, + + start() { + // self.data.start = true; + if (this.data.start) return; + this.data.start = true; + + if (!this.data.luckInfo) { + wx.showToast({ + title: this.data.msg, + icon: 'none', + }); + return; + }; + + if (this.data.luckInfo.msgInfo) { + wx.showToast({ + title: self.data.luckInfo.msgInfo, + icon: 'none', + success: function () { + self.setData({ + start: false + }); + } + }); + return; + }; + wx.showLoading({ + title: '准备开始抽奖', + mask: true, + }); + // 获取积分 + app.request.promisePost('/api/weshop/marketing/marketingLuckForm/startLuckIntegral', { + isShowLoading: false, + data: { + storeId: app.globalData.setting.stoid, + userId: app.globalData.userInfo.user_id, + LuckId: this.data.options.id, + }, + }) + .then(function (res) { + if (res.data.code == -1) { + //积分不足，弹出提示 + wx.hideLoading(); + self.data.luckInfo.msgInfo = res.data.msg + wx.showToast({ + title: res.data.msg, + icon: 'none', + success: function () { + self.data.start = false; + } + }); + return; + }; + + if (res.data.code == 0) { + + if (self.data.luckInfo.user_LuckNumDay > 0 || self.data.luckInfo.vip_act_num == 0) { + // console.log('start choujiang'); + // let start = false; + if (self.data.start) { + // self.data.start = true; + // 获取抽奖组件实例 + const $lucky = self.selectComponent('#myLucky'); + // 调用play方法开始旋转 + $lucky.play(); + wx.hideLoading(); + // 获取抽奖结果 + app.request.post('/api/weshop/marketing/marketingLuckForm/startLuck', { + isShowLoading: false, + data: { + storeId: app.globalData.setting.stoid, + userId: app.globalData.userInfo.user_id, + LuckId: self.data.options.id, + }, + success: function (res) { + + if (res.data.code == 0) { + // console.log('开始摇奖', res.data.data); + if (self.data.luckInfo.vip_act_num != 0) { + self.setData({ + 'luckInfo.user_LuckNumDay': self.data.luckInfo.user_LuckNumDay - 1, + // isActive: true, + }); + }; + + self.setData({ + // 'luckInfo.user_LuckNumDay': self.data.luckInfo.user_LuckNumDay - 1, + isActive: true, + wow: res.data.data, + }); + // console.log('wow', self.data.wow); + // console.log('请求成功', res.data.data); + let luckyId = res.data.data.id; + let indexArr = self.luckyIndex(self.data.prizes, luckyId); + // console.log('抽奖奖品id', luckyId); + // console.log('奖品列表', self.data.prizes); + // console.log('奖品对应的索引数组', indexArr); + let random = Math.random() * indexArr.length >> 0; + // console.log('random', random); + let index = indexArr[random]; + + $lucky.stop(index); + + // setTimeout(() => { + // Promise.resolve($lucky.stop(index)).then(()=>{ + // self.data.start = false; + // }); + + // }, 2000); + + + //获取兑奖记录 + // app.request.get('/api/weshop/marketing/marketingLuckRecord/page', { + // isShowLoading: false, + // data: { + // store_id: app.globalData.setting.stoid, + // user_id: app.globalData.userInfo.user_id, + // luck_formid: self.data.options.id, + // luck_state: 1 + // }, + // success: function(res) { + // if(res.data.code == 0) { + // // console.log('res===>', res.data.data.pageData); + // self.setData({ + // record: res.data.data.pageData, + // }); + // }; + // }, + // }); + + + } else { + let thxIndexArr = self.data.thxIndexArr; + const random = Math.random() * thxIndexArr.length >> 0; + const index = thxIndexArr[random]; + // console.log('谢谢参与数组', thxIndexArr); + // console.log('请求出错产生谢谢参与的随机数', index); + $lucky.stop(index); + // setTimeout(() => { + // Promise.resolve($lucky.stop(index)).then(()=>{ + // self.data.start = false; + // }); + // }, 2000); + + + + + if (res.data.code == -1) { + wx.showToast({ + title: res.data.msg, + icon: 'none', + success: function () { + self.setData({ + start: false + }); + } + }); + self.data.luckInfo.msgInfo = res.data.msg; + return; + // self.data.start = true; + }; + + + if (res.data.code == -2 && self.data.luckInfo.vip_act_num != 0) { + self.setData({ + 'luckInfo.user_LuckNumDay': self.data.luckInfo.user_LuckNumDay - 1, + }); + }; + + + }; + + + }, + + fail: function (res) { + // console.log('出错'); + wx.showToast({ + title: '数据请求失败', + icon: 'error', + }); + let thxIndexArr = self.data.thxIndexArr; + const random = Math.random() * thxIndexArr.length >> 0; + const index = thxIndexArr[random]; + $lucky.stop(index); + // setTimeout(() => { + // Promise.resolve($lucky.stop(index)).then(()=>{ + // self.data.start = false; + // }); + // }, 2000); + }, + + + + }); + + } + + + } else { + wx.showToast({ + title: '你今天的抽奖次数已用完啦！~', + icon: 'none', + success: function () { + self.setData({ + start: false + }); + } + }); + }; + + }; + }); + + + + + + }, - end (event) { + end(event) { // 中奖奖品详情 // console.log('抽奖结果：',event.detail); - let no_luck_urltype = this.data.luckInfo.no_luck_urltype; - let lbtype = null; - // let good_id = null; - let resultTitle = event.detail.fonts[0].text.replace('\n',''); - // if(event.detail.id) { - // console.log('~~~~~~----++++++',event.detail.id); - // good_id = event.detail.id; - // }; - if(event.detail.lbtype == 5) { - lbtype = 5; - } else { - lbtype = -1; - }; - this.setData({ - num: 3, - hiddenCanvas: true, - showResult: true, - showMask: true, - resultTitle, - showPopup: false, - currentLbtype: lbtype, - // good_id, - }); - - - - - if(no_luck_urltype == 1 && resultTitle == '谢谢参与') { - if(this.data.luckInfo.no_luck_weappurl) { - let num = this.data.num; - let url = this.data.luckInfo.no_luck_weappurl; - self.timer = setInterval(function() { - if(num == 0) { - clearInterval(self.timer); - app.goto(url); - } else { - self.setData({ - num: --num, - }); - } - }, 500); - - }; - - }; - - - if(self.data.luckInfo.give_user) { - if(resultTitle == '谢谢参与') { - if(self.data.luckInfo.give_type == 1) { - if(self.data.luckInfo.give_integral > 0) { - wx.showToast({ - title: `获得游戏奖励积分${self.data.luckInfo.give_integral}`, - icon: 'none', - }); - }; - } else if((self.data.luckInfo.give_type == 2)) { - if(self.data.luckInfo.give_growth > 0) { - wx.showToast({ - title: `获得游戏奖励成长值${self.data.luckInfo.give_growth}`, - icon: 'none', - }); - }; - }; - }; - } else { - if(self.data.luckInfo.give_type == 1) { - if(self.data.luckInfo.give_integral > 0) { - wx.showToast({ - title: `获得游戏奖励积分${self.data.luckInfo.give_integral}`, - icon: 'none', - }); - }; - } else if((self.data.luckInfo.give_type == 2)) { - if(self.data.luckInfo.give_growth > 0) { - wx.showToast({ - title: `获得游戏奖励成长值${self.data.luckInfo.give_growth}`, - icon: 'none', - }); - }; - }; - }; - - + let no_luck_urltype = this.data.luckInfo.no_luck_urltype; + let lbtype = null; + // let good_id = null; + let resultTitle = event.detail.fonts[0].text.replace('\n', ''); + // if(event.detail.id) { + // console.log('~~~~~~----++++++',event.detail.id); + // good_id = event.detail.id; + // }; + if (event.detail.lbtype == 5) { + lbtype = 5; + } else { + lbtype = -1; + }; + this.setData({ + num: 3, + hiddenCanvas: true, + showResult: true, + showMask: true, + resultTitle, + showPopup: false, + currentLbtype: lbtype, + // good_id, + }); + + + + + if (no_luck_urltype == 1 && resultTitle == '谢谢参与') { + if (this.data.luckInfo.no_luck_weappurl) { + let num = this.data.num; + let url = this.data.luckInfo.no_luck_weappurl; + self.timer = setInterval(function () { + if (num == 0) { + clearInterval(self.timer); + app.goto(url); + } else { + self.setData({ + num: --num, + }); + } + }, 500); + + }; + + }; + + + if (self.data.luckInfo.give_user) { + if (resultTitle == '谢谢参与') { + if (self.data.luckInfo.give_type == 1) { + if (self.data.luckInfo.give_integral > 0) { + wx.showToast({ + title: `获得游戏奖励积分${self.data.luckInfo.give_integral}`, + icon: 'none', + }); + }; + } else if ((self.data.luckInfo.give_type == 2)) { + if (self.data.luckInfo.give_growth > 0) { + wx.showToast({ + title: `获得游戏奖励成长值${self.data.luckInfo.give_growth}`, + icon: 'none', + }); + }; + }; + }; + } else { + if (self.data.luckInfo.give_type == 1) { + if (self.data.luckInfo.give_integral > 0) { + wx.showToast({ + title: `获得游戏奖励积分${self.data.luckInfo.give_integral}`, + icon: 'none', + }); + }; + } else if ((self.data.luckInfo.give_type == 2)) { + if (self.data.luckInfo.give_growth > 0) { + wx.showToast({ + title: `获得游戏奖励成长值${self.data.luckInfo.give_growth}`, + icon: 'none', + }); + }; + }; + }; + + + }, + //门店回调 + async callback(e) { + let item = e.detail; + console.log('门店信息'); + console.log(item); + + if (item && item.pickup_id) { + if (this.data.wow) { + let text = 'wow.goods_pickup_id' + this.setData({ + [text]: item.pickup_id + }) + this.showQr() + } else { + let action_item = this.data.action_item + if (!action_item.currentTarget.dataset.verify_pickup_id) { + action_item.verify_pickup_id = item.pickup_id + } + this.showQr(action_item) + } + + + } else { + wx.showToast({ + title: '门店选择失败', + icon: 'none', + duration: 2000 + }) + } + }, + //门店选择1 + select_product() { + if (this.data.luckInfo.is_store==1) { + this.setData({ + store: 1, + showResult: false, + }) + }else{ + this.clickReceive() + } + }, + //门店选择2 + select_product2(e) { + if (e.currentTarget.dataset.verify_pickup_id) { + this.showQr(e) + } else { + if (this.data.luckInfo.is_store==1) { + this.setData({ + store: 1, + showResult: false, + showPopup: false, + action_item: e, + wow: '' + }) + }else{ + this.showQr(e) + } + } + + }, + showPopup() { + this.setData({ + list: null, + pageNum: 1, + noMore: false, + }); + this.getData(true, '/api/weshop/marketing/marketingLuckRecord/page', { + store_id: app.globalData.setting.stoid, + user_id: app.globalData.userInfo.user_id, + luck_formid: this.data.options.id, + luck_state: 1, + }).then(function (res) { + self.setData({ + showPopup: true, + showMask: true, + hiddenCanvas: true, + }); + }); + + // this.setData({ + // showPopup: true, + // showMask: true, + // hiddenCanvas: true, + // 'list.pageData': this.data.record, + // // record: self.data.list.pageData, + // }); + + }, + + closePopup() { + this.setData({ + showPopup: false, + showMask: false, + hiddenCanvas: false, + }); + }, + + /** + * 关闭中奖结果 + */ + closeResult() { + clearInterval(this.timer); + this.setData({ + num: 3, + showResult: false, + showMask: false, + hiddenCanvas: false, + start: false, + }); + }, + + loadmore() { + this.scrollToLower('/api/weshop/marketing/marketingLuckRecord/page', { + store_id: app.globalData.setting.stoid, + user_id: app.globalData.userInfo.user_id, + luck_formid: this.data.options.id, + luck_state: 1, + }); + }, + + + /** + * 请求数据 + */ + getData: function (isInit, url, data) { + let p = app.request.promiseGet(url, { + data: data, + isShowLoading: true, + }) + .then(function (res) { + if (res.data.code == 0) { + + self.setData({ + isLoading: false + }); + + if (isInit) {// 第一次加载 + self.setData({ + list: res.data.data + }); + } else { + self.setData({ + 'list.pageData': self.data.list.pageData.concat(res.data.data.pageData) + }); + }; + + if ((res.data.data.pageData.length == 0) || (res.data.data.pageSize * res.data.data.page >= res.data.data.total)) { + self.setData({ + noMore: true + }); + }; + + } else { + self.setData({ + 'list.pageData': [] + }); + }; + + }); + + return p; + }, + + + /** + * 上拉加载 + */ + scrollToLower(url, requestData) { + // 数据总量 + let total = this.data.list.total; + // 单页最大数据量 + let pageSize = this.data.list.pageSize; + // 如果数据总量不为0且小于或等于单页最大数据量，说明数据已全部加载，显示‘没有更多了’ + if ((total != 0) && (total <= pageSize)) { + this.setData({ + noMore: true + }); + }; + + if (!this.data.isLoading && !this.data.noMore) { + this.setData({ + isLoading: true, + pageNum: this.data.pageNum + 1 + }); + requestData.page = this.data.pageNum; + this.getData(false, url, requestData); + }; + }, + + + goto(e) { + let url = ''; + let type = e.currentTarget.dataset.type; + let ordersn = null; + let buyreceive_id = null; + if (e.currentTarget.dataset.ordersn) { + ordersn = e.currentTarget.dataset.ordersn; + }; + if (e.currentTarget.dataset.buyreceiveid) { + buyreceive_id = e.currentTarget.dataset.buyreceiveid; + }; + switch (type) { + case 1: { + url = '/packageD/pages/user/integral/integral'; + break; + }; + case 2: { + url = '/packageE/pages/user/grow_value/grow_value'; + break; + }; + case 3: { + url = '/packageD/pages/user/coupons/coupons'; + break; + }; + case 4: { + url = '/pages/user/my_service/i_service'; + break; + }; + case 6: { + url = `/pages/giftpack/giftpacklist/giftpacklist?isBuy=0&orderSn=${ordersn}&lbId=${buyreceive_id}`; + break; + }; + }; + app.goto(url); }, - - showPopup() { - this.setData({ - list: null, - pageNum: 1, - noMore: false, - }); - this.getData(true, '/api/weshop/marketing/marketingLuckRecord/page', { - store_id: app.globalData.setting.stoid, - user_id: app.globalData.userInfo.user_id, - luck_formid: this.data.options.id, - luck_state: 1, - }).then(function(res) { - self.setData({ - showPopup: true, - showMask: true, - hiddenCanvas: true, - }); - }); - - // this.setData({ - // showPopup: true, - // showMask: true, - // hiddenCanvas: true, - // 'list.pageData': this.data.record, - // // record: self.data.list.pageData, - // }); - - }, - - closePopup() { - this.setData({ - showPopup: false, - showMask: false, - hiddenCanvas: false, - }); - }, - - /** - * 关闭中奖结果 - */ - closeResult() { - clearInterval(this.timer); - this.setData({ - num: 3, - showResult: false, - showMask: false, - hiddenCanvas: false, - start: false, - }); - }, - - loadmore() { - this.scrollToLower('/api/weshop/marketing/marketingLuckRecord/page', { - store_id: app.globalData.setting.stoid, - user_id: app.globalData.userInfo.user_id, - luck_formid: this.data.options.id, - luck_state: 1, - }); - }, - - - /** - * 请求数据 - */ - getData: function(isInit, url, data) { - let p = app.request.promiseGet(url, { - data: data, - isShowLoading: true, - }) - .then(function(res) { - if(res.data.code == 0) { - - self.setData({ - isLoading: false - }); - - if(isInit) {// 第一次加载 - self.setData({ - list: res.data.data - }); - } else { - self.setData({ - 'list.pageData': self.data.list.pageData.concat(res.data.data.pageData) - }); - }; - - if((res.data.data.pageData.length == 0) || (res.data.data.pageSize * res.data.data.page >= res.data.data.total)) { - self.setData({ - noMore: true - }); - }; - - } else { - self.setData({ - 'list.pageData': [] - }); - }; - - }); - - return p; - }, - - - /** - * 上拉加载 - */ - scrollToLower(url, requestData) { - // 数据总量 - let total = this.data.list.total; - // 单页最大数据量 - let pageSize = this.data.list.pageSize; - // 如果数据总量不为0且小于或等于单页最大数据量，说明数据已全部加载，显示‘没有更多了’ - if((total != 0)&&(total <= pageSize)) { - this.setData({ - noMore: true - }); - }; - - if(!this.data.isLoading && !this.data.noMore) { - this.setData({ - isLoading: true, - pageNum: this.data.pageNum + 1 - }); - requestData.page = this.data.pageNum; - this.getData(false, url, requestData); - }; - }, - - - goto(e) { - let url = ''; - let type = e.currentTarget.dataset.type; - let ordersn = null; - let buyreceive_id = null; - if(e.currentTarget.dataset.ordersn) { - ordersn = e.currentTarget.dataset.ordersn; - }; - if(e.currentTarget.dataset.buyreceiveid) { - buyreceive_id = e.currentTarget.dataset.buyreceiveid; - }; - switch(type) { - case 1: { - url = '/packageD/pages/user/integral/integral'; - break; - }; - case 2: { - url = '/packageE/pages/user/grow_value/grow_value'; - break; - }; - case 3: { - url = '/packageD/pages/user/coupons/coupons'; - break; - }; - case 4: { - url = '/pages/user/my_service/i_service'; - break; - }; - case 6: { - url = `/pages/giftpack/giftpacklist/giftpacklist?isBuy=0&orderSn=${ordersn}&lbId=${buyreceive_id}`; - break; - }; - }; - app.goto(url); - }, - - showQr(e) { - let id = null; - let store_id = app.globalData.setting.stoid; - if(e && e.currentTarget.dataset.id) { - id = e.currentTarget.dataset.id; - } else { - id = this.data.wow.record_id; - }; - let url = `/api/weshop/marketing/marketingLuckList/updateGoodsVerifyCode/${store_id}/${id}`; - // console.log('good_id', id, url); - app.request.put(url, { - success: function(res) { - if(res.data.code == 0) { - let data = res.data.data; - let barcode = self.selectComponent("#qrcode"); - barcode.open({val: data}); - self.setData({ - hiddenCanvas: true, - showPopup: false, - }); - } else { - wx.showToast({ - title: res.data.msg, - icon: 'none', - }); - }; - }, - - }); - }, - - closeQr() { - this.setData({ - hiddenCanvas: false, - showMask: false, - }); - }, - - clickReceive() { - this.setData({ - showResult: false, - }); - this.showQr(); - }, - - - - showPoster() { - - console.log('已经生成图片!!!!!!', self.data.imgPath); - // console.log(Promise.resolve(this.onImgOK)); - wx.showLoading({ - title: '生成海报中', - }); - var timer; - if(this.data.isImgOk && this.data.getMiniCode) { - wx.hideLoading(); - self.setData({ - myimg: self.data.imgPath, - hiddenCanvas: true, - showMask: true, - showPoster: true, - }); - } else { - timer = setInterval(function() { - if(self.data.isImgOk && self.data.getMiniCode) { - clearInterval(timer); - wx.hideLoading(); - self.setData({ - myimg: self.data.imgPath, - hiddenCanvas: true, - showMask: true, - showPoster: true, - }); - }; - }, 500); - }; - }, - - closePoster() { - this.setData({ - showMask: false, - showPoster: false, - hiddenCanvas: false, - }); - }, - - - - onImgOK(e) { - console.log('图片绘制成功', e.detail.path); - // this.setData({ - // imgPath: e.detail.path, - // }); - if(e&&e.detail.path) { - this.setData({ - isImgOk: true, - imgPath: e.detail.path, - }); - }; - - }, - - - + + showQr(e) { + let id = null; + let store_id = app.globalData.setting.stoid; + let goods_pickup_id = '' + let off = false //是否需要携带登记的门店id + + if (e && e.currentTarget.dataset.id) { + id = e.currentTarget.dataset.id; + if (e.verify_pickup_id) { + goods_pickup_id = e.verify_pickup_id; + off = true + } + } else { + id = this.data.wow.record_id; + goods_pickup_id = this.data.wow.goods_pickup_id; + off = true + }; + let url = `/api/weshop/marketing/marketingLuckList/updateGoodsVerifyCode/${store_id}/${id}`; + + //判断是否需要登记门店，才可以核销商品 + if (this.data.luckInfo.is_store == 1 && goods_pickup_id && off) { + url += `/${goods_pickup_id}` + } + + // console.log('good_id', id, url); + app.request.put(url, { + success: function (res) { + if (res.data.code == 0) { + let data = res.data.data; + let barcode = self.selectComponent("#qrcode"); + barcode.open({ val: data }); + self.setData({ + hiddenCanvas: true, + showPopup: false, + }); + } else { + wx.showToast({ + title: res.data.msg, + icon: 'none', + }); + }; + }, + + }); + }, + + closeQr() { + this.setData({ + hiddenCanvas: false, + showMask: false, + }); + }, + + clickReceive() { + this.setData({ + showResult: false, + }); + this.showQr(); + }, + + + + showPoster() { + + console.log('已经生成图片!!!!!!', self.data.imgPath); + // console.log(Promise.resolve(this.onImgOK)); + wx.showLoading({ + title: '生成海报中', + }); + var timer; + if (this.data.isImgOk && this.data.getMiniCode) { + wx.hideLoading(); + self.setData({ + myimg: self.data.imgPath, + hiddenCanvas: true, + showMask: true, + showPoster: true, + }); + } else { + timer = setInterval(function () { + if (self.data.isImgOk && self.data.getMiniCode) { + clearInterval(timer); + wx.hideLoading(); + self.setData({ + myimg: self.data.imgPath, + hiddenCanvas: true, + showMask: true, + showPoster: true, + }); + }; + }, 500); + }; + }, + + closePoster() { + this.setData({ + showMask: false, + showPoster: false, + hiddenCanvas: false, + }); + }, + //门店退出回调 + closeback(){ + console.log('门店关闭回调'); + this.setData({ + store: 0, + showPopup: false, + showMask: false, + hiddenCanvas: false, + }) + }, + + + onImgOK(e) { + console.log('图片绘制成功', e.detail.path); + // this.setData({ + // imgPath: e.detail.path, + // }); + if (e && e.detail.path) { + this.setData({ + isImgOk: true, + imgPath: e.detail.path, + }); + }; + + }, + + + }) \ No newline at end of file diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.json b/packageB/pages/luckactivity/luckinfo/luckinfo.json index 27a7638..4b755f6 100644 --- a/packageB/pages/luckactivity/luckinfo/luckinfo.json +++ b/packageB/pages/luckactivity/luckinfo/luckinfo.json @@ -2,7 +2,8 @@ "usingComponents": { "lucky-wheel":"/packageB/miniprogram_npm/mini-luck-draw/lucky-wheel/index", "qrcode": "/components/my-qrcode/my-qrcode", - "nodata": "/components/nodata/nodata", + "nodata": "/components/nodata/nodata", + "store_popup":"/components/store_popup/store_popup", "painter": "/packageB/components/painter/painter" }, "enablePullDownRefresh": false, diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.wxml b/packageB/pages/luckactivity/luckinfo/luckinfo.wxml index 7b8e08f..46af456 100644 --- a/packageB/pages/luckactivity/luckinfo/luckinfo.wxml +++ b/packageB/pages/luckactivity/luckinfo/luckinfo.wxml @@ -143,9 +143,9 @@ 价值：{{item.luck_goods_price}} - + 兑换截止时间：{{filter.show_default(item.changeDate, '不限')}} - {{item.luck_type == 5 ? (item.state == 1 ? '已兑换':'兑换'):'查看'}} + {{item.luck_type == 5 ? (item.state == 1 ? '已兑换':'兑换'):'查看'}} @@ -179,7 +179,7 @@ - 立即兑换 + 立即兑换 @@ -201,5 +201,7 @@ + + \ No newline at end of file diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml index 26fbc72..a07ac33 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml @@ -72,6 +72,7 @@ (配送不匹配) + (该店不可售) (库存不足) 地址:{{def_pick_store.fulladdress}} @@ -174,6 +175,10 @@ 配送不匹配 + + 该店不可售 + + diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js index b986b98..8eebb31 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js @@ -842,16 +842,14 @@ Page({ return false; } - if(getApp().globalData.is_dj_pk) th.setData({has_def:1}) - var ee = JSON.parse(JSON.stringify(e)); - //--定时器推迟一下-- - setTimeout(function () { + if(getApp().globalData.is_dj_pk) th.setData({has_def:1}) + var ee = JSON.parse(JSON.stringify(e)); + 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; @@ -890,8 +888,8 @@ Page({ that.set_def_storage(e); } } - }, 500) - }, 700) + }, 200) + }); }, @@ -2943,6 +2941,11 @@ Page({ } + }else{ + //只有是普通商品购买的时候，才要给商品赋值指定门店 + if (is_normal && goodsinfo.pick_group_ids) { + goodsinfo.pickup_ids = goodsinfo.pick_up_lists; + } } //---如果有活动，不算在一起--- if (prom) { @@ -2954,8 +2957,11 @@ Page({ } } - var item = arrdata[i], gg = ""; + if (goodsinfo.goods_id != g_id && goodsinfo.pick_group_ids ) { + item.pickup_ids= goodsinfo.pick_up_lists; + } + if (item.goods_spec == "null" || item.goods_spec == null) item.goods_spec = ""; if (item.goods_color == "null" || item.goods_color == null) item.goods_color = ""; @@ -3003,6 +3009,15 @@ Page({ var gid = e.currentTarget.dataset.gid; var nor = e.currentTarget.dataset.nor; + //在切换规格的时候，指定门店不匹配的状态要清理 + if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}'){ + th.data.def_pick_store.is_no_dis_nor=0; + that.setData({ + def_pick_store: th.data.def_pick_store + }) + } + + var sku_g = this.data.sku_g; if (nor) { sku_g = this.data.sku_g_pt; @@ -3179,6 +3194,7 @@ Page({ var timer_get = setInterval(function () { if (th.data.is_get_local_ok == 0) return false; + if (!th.data.fir_def_store) return false; var dd = null, i = getApp().request; if (!th.data.sele_g) return false; @@ -3221,6 +3237,42 @@ Page({ if (e.data.code == 0 && e.data.data && e.data.data.pageData && e.data.data.pageData.length > 0) { + //-- 如果有指定门店的时候 -- + if(th.data.sele_g.pickup_ids && th.data.is_normal){ + + var ok_arr=[]; + for (let i in e.data.data.pageData) { + let ite = e.data.data.pageData[i]; + //-- 查找一下门店有没有在 -- + var idx=th.data.sele_g.pickup_ids.findIndex(function (e){ + return e.pickup_id==ite.pickup_id; + }) + if(idx>-1){ + ok_arr.push(ite) + } + } + + //判断会员的默认的门店是不是匹配指定的门店 + if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}'){ + //-- 查找一下门店有没有在 -- + var idx1=th.data.sele_g.pickup_ids.findIndex(function (e){ + return e.pickup_id==th.data.def_pick_store.pickup_id; + }) + + if(idx1<0){ + th.data.def_pick_store.is_no_dis_nor=1; + that.setData({ + def_pick_store: th.data.def_pick_store + }) + } + } + + + e.data.data.pageData=ok_arr; //数组重新赋值 + e.data.data.total=ok_arr.length; //数组的长度 + } + + var his_cate_num = 0; for (let i in e.data.data.pageData) { let item = e.data.data.pageData[i]; @@ -3630,6 +3682,14 @@ Page({ is_find_def_store = 1; } + //-- 如果库存为0就要重新赋值 -- + def_pick_store.CanOutQty=Qty; + th.setData({ + def_pick_store + }) + + + } else { th.setData({ all_sto: null, @@ -3662,6 +3722,13 @@ Page({ th.setData({def_pick_store: th.data.fir_def_store}) is_find_def_store = 1; } + + //-- 如果库存为0就要重新赋值 -- + if(n_item.StorageNo ==def_pick_store.pickup_no) { + def_pick_store.CanOutQty= o_plist[kk].CanOutQty; + th.setData({ def_pick_store }) + } + } break; } @@ -4497,14 +4564,19 @@ Page({ if (ind == 1) { //如果拼单的sku data是空的，就要先获取一下 if (th.data.sku_g_pt) { + + //要同步指定门店 + th.set_sele_g(th.data.sku_g_pt); + th.get_sto(1); th.setData({ is_normal: ind, openSpecModal_pt: 1 }); } else { - th.get_sto(1); + th.get_sku(o.stoid, th.data.data, th.data.gid, 1, function () { + th.get_sto(1); th.setData({ is_normal: ind, openSpecModal_pt: 1 @@ -7240,5 +7312,17 @@ Page({ }, + //要同步sele_g的指定门店，在有单独购买的时候，积分购和拼团 + set_sele_g:function (sku_list){ + var goods_id=this.data.sele_g.goods_id; + for (var i in sku_list) { + if(goods_id==sku_list[i].goods_id){ + this.data.sele_g.pickup_ids=sku_list[i].pickup_ids; + break; + } + } + } + + }); diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml index 89c9c35..f8fcb1c 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml @@ -1062,7 +1062,6 @@ - 11111111111111 已售：{{sele_g.sales_sum}} @@ -1082,7 +1081,6 @@ - 555555555555 已售：{{prom_act.buy_num+prom_act.virtual}} @@ -1370,6 +1368,8 @@ {{item.pickup_name}} + (配送不匹配) + (该店不可售) @@ -1396,6 +1396,8 @@ {{item.pickup_name}} + (配送不匹配) + (该店不可售) diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss index e6ecb83..cc6f752 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss @@ -3147,4 +3147,7 @@ button.custom-service::after{ .shop_name.max{ max-width:370rpx; flex-shrink: 0; } - +.no_store, .c-red22 { + color: #d60021; + font-size: 26rpx; +} diff --git a/packageE/pages/cart/cart2_pt/cart2_pt.js b/packageE/pages/cart/cart2_pt/cart2_pt.js index 94d3cc8..a542b56 100644 --- a/packageE/pages/cart/cart2_pt/cart2_pt.js +++ b/packageE/pages/cart/cart2_pt/cart2_pt.js @@ -102,6 +102,7 @@ Page({ }, onLoad: function (t) { this.data.fir_in=1; + wx.setNavigationBarTitle({ title: "填写订单", }) var th = this; getApp().getConfig2(function (e) { th.setData({ diff --git a/packageF/pages/free_delivery/free_delivery.js b/packageF/pages/free_delivery/free_delivery.js new file mode 100644 index 0000000..4f0db11 --- /dev/null +++ b/packageF/pages/free_delivery/free_delivery.js @@ -0,0 +1,179 @@ +// packageF/pages/free_delivery/free_delivery.js +var o = getApp().globalData.setting +const app = getApp(); +Page({ + + /** + * 页面的初始数据 + */ + data: { + url: o.imghost, + userInfo:null, + login_title:'暂未登录，请先登录', + login_name:'授权登录', + login_off:false, + hd_id:'', + delHeight:736, //默认窗口高度，用于对比，定位图片用 + delOff:false, //窗口高度对比，false 用默认定位，ture 定位调整 + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + let window_info = wx.getWindowInfo() + if (window_info.screenHeight > this.data.delHeight) { + this.setData({ + delOff:true + }) + } + + if (options && options.id) { + this.setData({ + hd_id:options.id + }) + this.getInfo() + }else{ + wx.showToast({ + title: '获取活动失败', + icon: 'none', + duration: 2000, + mask:true + }) + setTimeout(()=>{ + wx.reLaunch({ + url: '/pages/index/index/index' + }) + },2000) + } + + }, + getInfo(){ + app.promiseGet(`/api/weshop/meitu/storeMeituHdlist/get/${app.globalData.setting.stoid}/${this.data.hd_id}`, {}).then(res => { + if (res.data.code == 0 && res.data.data && res.data.data.hd_name) { + wx.setNavigationBarTitle({ + title: res.data.data.hd_name + }) + } + }) + }, + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + let userInfo = getApp().globalData.userInfo; + this.setData({ + userInfo + }) + if (userInfo) { + this.setData({ + login_title:userInfo.mobile, + login_name:'领取会员' + }) + } + + }, + //--跳到绑定页面-- + gobindtel: function () { + let userInfo = this.data.userInfo + let login_off = this.data.login_off + if (userInfo) { + if (!login_off) { + this.setData({ + login_off:true + }) + wx.showLoading({ + title: '领取中', + mask: true, + }); + app.request.promisePost('/api/weshop/meitu/storeMeituUserlist/save', { + is_json: true, + data: { + store_id: app.globalData.setting.stoid, + user_id: app.globalData.user_id, + hd_id: this.data.hd_id, + }, + }).then((res)=>{ + if(res.data.code == 0) { + wx.showToast({ + title: res.data.msg, + icon: 'none', + duration: 2000, + mask:true, + }); + this.setData({ + login_name:'已领取' + }) + // setTimeout(()=>{ + // wx.reLaunch({ + // url: '/pages/index/index/index' + // }) + // },2000) + // self.getData(true, '/api/weshop/goods/page?isnewwhere=1&is_mainshow=1&isonsale=1&dis_type=1', self.data.currentQuery, false); + } else { + this.setData({ + login_off:false + }) + wx.showToast({ + title: res.data.msg, + icon: 'none', + duration: 2000, + mask:true, + }); + } + + }); + + + + + } + }else{ + wx.navigateTo({ + url: '/packageE/pages/togoin/togoin', + }) + } + }, + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + wx.stopPullDownRefresh() + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/packageF/pages/free_delivery/free_delivery.json b/packageF/pages/free_delivery/free_delivery.json new file mode 100644 index 0000000..b1cb3d1 --- /dev/null +++ b/packageF/pages/free_delivery/free_delivery.json @@ -0,0 +1,5 @@ +{ + "usingComponents": { + + } +} \ No newline at end of file diff --git a/packageF/pages/free_delivery/free_delivery.wxml b/packageF/pages/free_delivery/free_delivery.wxml new file mode 100644 index 0000000..67ebac5 --- /dev/null +++ b/packageF/pages/free_delivery/free_delivery.wxml @@ -0,0 +1,18 @@ + + + + + + + + + + {{login_title}} + {{login_name}} + + + + + + diff --git a/packageF/pages/free_delivery/free_delivery.wxss b/packageF/pages/free_delivery/free_delivery.wxss new file mode 100644 index 0000000..d290d51 --- /dev/null +++ b/packageF/pages/free_delivery/free_delivery.wxss @@ -0,0 +1,96 @@ +/* packageF/pages/free_delivery/free_delivery.wxss */ + +.free_delivery{ + width: 100%; + min-height: 100vh; + padding-bottom:25.6rpx; + box-sizing: border-box; + /* display: flex; + flex-direction: column; + justify-content: space-between; */ + background-position: 50%; + background-repeat: no-repeat; + background-attachment: fixed; + background-size: 100% 100%; + position: relative; +} +.top{ + padding: 50rpx 0 0 40rpx; + + /* width: 100%; + height: 483rpx; + display: flex; + align-items: center; + justify-content: center; */ +} +.main{ + /* position: absolute; + left: 0; + top: 24.5%; */ + width: 670rpx; + margin: 100rpx auto 20rpx; + /* height: 200rpx; + background-color: red; */ + /* opacity: .5; */ + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + background-color: rgba(255, 255, 255, .5); + padding-bottom: 25.6rpx; + border-radius: 30rpx; + /* opacity: .5; */ + /* width: 100%; + flex: 1; + display: flex; + align-items: center; + justify-content: center; + + background-color: darkmagenta; */ +} +.main .imageBox{ + width: 100%; + height: 344.4rpx; + position: relative; + /* background-color: royalblue; */ +} +.main .imageBox image{ + position: absolute; + top: -140rpx; + left: 0; + right: 0; + margin: auto; +} +.main_title{ + margin: 25rpx 0; + +} +.main .main_title , .main .but{ + background-position: 50%; + background-repeat: no-repeat; + background-attachment: fixed; + background-size: 100% 100%; + position: relative; + border: 1rpx solid rgb(194, 194, 194); + border-radius: 5rpx; + overflow: hidden; + text-align: center; + line-height: 80rpx; +} +.but{ + font-weight: bold; +} +.bottom{ + width: 670rpx; + margin: 0 auto; + /* position: absolute; + left: 0; + bottom: 5%; */ + background-color: rgba(255, 255, 255, .5); + padding: 50rpx 0; + border-radius: 30rpx; + display: flex; + align-items: center; + justify-content: center; +} + diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js index 458bf11..f23c841 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -319,6 +319,7 @@ Page({ }, 800) } }, + //失效单选 inCheck_th_item: async function (e) { console.log('失效单选'); @@ -336,6 +337,8 @@ Page({ // this.doCheckAll(); }, + + //清空失效宝贝 delInva_all(obj = null) { @@ -3317,7 +3320,25 @@ Page({ var steep = getApp().get_limit_qty(i_arr[j], act.length, 1); var py_type = parseInt(i_arr[j].prom_type + ''); + //商品只查一次。看一下有没有 + var gd = null; + //获取商品信息，包含线下商品ID，指定门店销售的信息 + await getApp().request.promiseGet("/api/weshop/goods/get/" + oo.stoid + "/" + i_arr[j].goods_id, {}).then(res => { + if (res.data.code == 0) gd = res.data.data; + }) + if ([0, 3, 5, 7, 10].indexOf(py_type) > -1) { + //如果是指定门店，就要判断 + if(gd.pick_group_ids){ + var idx0=gd.pick_up_lists.findIndex(function (e){ + return e.pickup_id==i_arr[j].pick_id; + }) + if(idx0<0){ + getApp().confirmBox(i_arr[j].goods_name + "的门店不可售"); + wx.hideLoading(); + return false; + } + } if (mo_num > i_arr[j].goods_num) { getApp().confirmBox(i_arr[j].goods_name + "的未达到起订数量"); @@ -3342,16 +3363,12 @@ Page({ } - //--普通商品，如果有开启线下库存的功能，要调用线下库存进行计算,赠品不要进行调用线下库存--- if ((i_arr[j].prom_type == 0 || i_arr[j].prom_type == 3 || i_arr[j].prom_type == 5 || i_arr[j].prom_type == 7 || i_arr[j].prom_type == 10 || i_arr[j].need_downlow_num) && th.data.sales_rules >= 2 && i_arr[j].is_gift != 1 && !i_arr[j].whsle_id) { - //--获取商品的线下商品ID-- - var gd = null; - await getApp().request.promiseGet("/api/weshop/goods/get/" + oo.stoid + "/" + i_arr[j].goods_id, {}).then(res => { - if (res.data.code == 0) gd = res.data.data; - }) + + //--判断商品是线下库存-- var ob = {} diff --git a/pages/goods/goodsInfo/buy_com_pop.wxml b/pages/goods/goodsInfo/buy_com_pop.wxml index 9dd9a1c..ec0a0b0 100644 --- a/pages/goods/goodsInfo/buy_com_pop.wxml +++ b/pages/goods/goodsInfo/buy_com_pop.wxml @@ -57,6 +57,7 @@ (库存不足) (配送不匹配) + (该店不可售) (库存不足) @@ -112,6 +113,12 @@ 配送不匹配 + + + 该店不可售 + + + diff --git a/pages/goods/goodsInfo/buy_pt.wxml b/pages/goods/goodsInfo/buy_pt.wxml index 8883f33..eaf853f 100644 --- a/pages/goods/goodsInfo/buy_pt.wxml +++ b/pages/goods/goodsInfo/buy_pt.wxml @@ -47,7 +47,7 @@ - + {{def_pick_store.pickup_name}} @@ -65,17 +65,19 @@ - (配送不匹配) + + (库存不足) (库存不足) (配送不匹配) + (该店不可售) (库存不足) - 地址:{{def_pick_store.fulladdress}} + 地址:{{def_pick_store.fulladdress}} @@ -157,6 +159,11 @@ 配送不匹配 + + + 该店不可售 + + diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index fa186be..ac8c730 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -273,6 +273,7 @@ Page({ cx_prom_group: [], //促销活动，用于显示和判断默认要用什么促销活动 showFold:true, new_share_imgurl:'', //普通商品分享图片 + }, //------初始化加载---------- @@ -298,7 +299,6 @@ Page({ getApp().globalData.groupchat_id = t.groupchat_id } - self = this; //检查测肤 getApp().check_skin_face(t, 0, gid); @@ -847,17 +847,29 @@ Page({ }); 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; + if (!that.data.sele_g) return false; + + 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; + } + + //-- 如果有指定门店的时候,pickup_ids是经过判断是不是普通商品后才会有的 -- + if(th.data.sele_g && th.data.sele_g.pickup_ids && th.data.prom_type==0){ + var idx=th.data.sele_g.pickup_ids.findIndex(function (e){ + return e.pickup_id==ee.pickup_id; + }) + if(idx<0){ + ee.is_no_dis_nor=1; + } + } + clearInterval(w_time); var distance = null; var e = JSON.parse(JSON.stringify(ee)); @@ -900,8 +912,8 @@ Page({ that.set_def_storage(e); } } - }, 500) - }, 700) + }, 200) + }); }, @@ -1103,6 +1115,11 @@ Page({ //if (ee.data.prom_type) { t.data.data.prom_type = ee.data.prom_type; t.data.data.prom_id = ee.data.prom_id; + + //只有是普通商品的时候，才要给商品赋值指定门店 + if ([1, 2, 4, 6, 8, 9].indexOf(parseInt(ee.data.prom_type))<0 && t.data.data.pick_up_lists && t.data.data.pick_up_lists.length) { + t.data.data.pickup_ids = t.data.data.pick_up_lists; + } //} ee.setData({ data: t.data.data, @@ -1110,12 +1127,8 @@ Page({ userInfo: getApp().globalData.userInfo }); - - - //获取统一条形码,普通商品和优惠促销的商品 if (ee.data.data.prom_type == 0 || ee.data.data.prom_type == 3 || ee.data.data.prom_type == 5 || ee.data.data.prom_type == 7 || ee.data.data.prom_type == 9 || ee.data.data.prom_type == 10) { - ee.get_sto(); ee.get_sku(o.stoid, t.data.data, gid); ee.check_has_flash(); @@ -3052,8 +3065,31 @@ Page({ for (var i = 0; i < arrdata.length; i++) { var goodsinfo = arrdata[i], prom = null; + if (goodsinfo.goods_id != g_id) { + + //要判断一下商品的活动是不是多活动，确定一下商品的prom_type + var url = '/api/weshop/activitylist/listGoodActInfo2New'; + var req_d = { + "store_id": os.stoid, + "goods_id": goodsinfo.goods_id, + "user_id": getApp().globalData.user_id, + } + var ck_res=await getApp().request.promiseGet("/api/weshop/activitylist/listGoodActInfo2New", { data:req_d }); + if (ck_res.data.code == 0 && ck_res.data.data && ck_res.data.data.length > 0) { + var arr = ck_res.data.data; + //-- 预热也要计算 -- + var arr2 = arr.filter(function (e) { + return e.s_time < ut.gettimestamp() || (e.warm_uptime && e.warm_uptime < ut.gettimestamp()) + }) + + if (arr2.length == 1) { + goodsinfo.prom_type = arr2[0].prom_type; + goodsinfo.prom_id = arr2[0].act_id; + } + } + switch (goodsinfo.prom_type) { case 1: @@ -3088,20 +3124,36 @@ Page({ continue; } + }else{ + + //只有是普通商品的时候，才要给商品赋值指定门店 + if ([1, 2, 4, 6, 8, 9].indexOf(parseInt(this.data.prom_type)) <0 || is_normal) { + //如果商品有设置分组 + if(goodsinfo.pick_group_ids){ + goodsinfo.pickup_ids = goodsinfo.pick_up_lists; + } + } + } //---如果有活动，不算在一起--- if (prom) { - if (goodsinfo.prom_type == 1 || goodsinfo.prom_type == 6) { + if ([1,2,4,6].indexOf(parseInt(goodsinfo.prom_type))>-1) { console.log(prom); - if (prom.is_end == 0 && prom.end_time > now && prom.start_time < now) continue; + if (prom.is_end == 0 && prom.end_time > now && (prom.start_time < now || (prom.show_time && prom.show_time < now ) ) ) continue; } else { continue; } } + var item = arrdata[i],gg = ""; + + if (goodsinfo.goods_id != g_id) { + //-- 如果商品有设置分组 -- + if(item.pick_group_ids){ + item.pickup_ids = item.pick_up_lists; + } + } - var item = arrdata[i], - gg = ""; if (item.goods_spec == "null" || item.goods_spec == null) item.goods_spec = ""; if (item.goods_color == "null" || item.goods_color == null) item.goods_color = ""; @@ -3145,8 +3197,19 @@ Page({ //-----------选择属性的按钮事件---------- sele_spec: function (e) { + var that = this; var th = this; + + //在切换规格的时候，指定门店不匹配的状态要清理 + if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}'){ + th.data.def_pick_store.is_no_dis_nor=0; + that.setData({ + def_pick_store: th.data.def_pick_store + }) + } + + var gid = e.currentTarget.dataset.gid; var nor = e.currentTarget.dataset.nor; var user_id = getApp().globalData.user_id; @@ -3157,6 +3220,11 @@ Page({ if (nor) this.data.base_nor = nor; } + //要把不匹配还原 + if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}'){ + th.data.def_pick_store.is_no_dis=0; + th.setData({def_pick_store:th.data.def_pick_store}) + } //普通商品多规格的时候，商品切换 if (this.data.base_nor_prom_type) this.data.base_nor_prom_type = parseInt(this.data.base_nor_prom_type); @@ -3214,7 +3282,10 @@ Page({ - if (nor) that.get_sto(1); + if (nor) { + that.set_sele_g(sku_g) + that.get_sto(1); + } else that.get_sto(); @@ -3349,13 +3420,17 @@ Page({ prom = res.data.data; } }) - let times = new Date().getTime() - prom.show_time_off = "" - let atimes = prom.start_time * 1000 - if (atimes > times) { - prom.show_time_off = ut.formatTime(prom.start_time) + if(prom){ + let times = new Date().getTime() + prom.show_time_off = "" + let atimes = prom.start_time * 1000 + + if (atimes > times) { + prom.show_time_off = ut.formatTime(prom.start_time) + } } + } console.log('活动详情------------'); console.log(prom); @@ -3427,7 +3502,6 @@ Page({ }, - //---------拿出门店分类和门店------------ get_sto(e) { console.log('get_sto') @@ -3447,6 +3521,8 @@ Page({ var timer_get = setInterval(function () { if (th.data.is_get_local_ok == 0) return false; + if (!th.data.fir_def_store) return false; + var dd = null, i = getApp().request; if (!th.data.sele_g) return false; @@ -3473,10 +3549,8 @@ Page({ dd.lat = th.data.lat; dd.lon = th.data.lon; } - clearInterval(timer_get); - - + clearInterval(timer_get); //如果会员是有默认的门店话 if (!th.data.def_pick_store && th.data.fir_def_store && Object.keys(th.data.fir_def_store).length > 0) { @@ -3495,6 +3569,42 @@ Page({ if (e.data.code == 0 && e.data.data && e.data.data.pageData && e.data.data.pageData.length > 0) { + //-- 如果有指定门店的时候 -- + if(th.data.sele_g.pickup_ids){ + + var ok_arr=[]; + for (let i in e.data.data.pageData) { + let ite = e.data.data.pageData[i]; + //-- 查找一下门店有没有在 -- + var idx=th.data.sele_g.pickup_ids.findIndex(function (e){ + return e.pickup_id==ite.pickup_id; + }) + if(idx>-1){ + ok_arr.push(ite) + } + } + + //判断会员的默认的门店是不是匹配指定的门店 + if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}'){ + + //-- 查找一下门店有没有在 -- + var idx1=th.data.sele_g.pickup_ids.findIndex(function (e){ + return e.pickup_id==th.data.def_pick_store.pickup_id; + }) + + if(idx1<0){ + th.data.def_pick_store.is_no_dis_nor=1; + that.setData({ + def_pick_store: th.data.def_pick_store + }) + } + } + + + e.data.data.pageData=ok_arr; //数组重新赋值 + e.data.data.total=ok_arr.length; //数组的长度 + } + var his_cate_num = 0; for (let i in e.data.data.pageData) { let item = e.data.data.pageData[i]; @@ -3543,7 +3653,8 @@ Page({ }); //--获取线下库存,而且不是新的门店规则, 同时是普通购买的时候，或者同时不能是活动，秒杀，拼团，积分购-- - if (!getApp().is_virtual(th.data.sele_g) && th.data.sales_rules >= 2 && !th.data.is_newsales_rules && !th.data.sele_g.whsle_id && ([1, 2, 4, 6, 8, 9].indexOf(th.data.prom_type) == -1 || is_normal == 1)) { + if (!getApp().is_virtual(th.data.sele_g) && th.data.sales_rules >= 2 && !th.data.is_newsales_rules + && !th.data.sele_g.whsle_id && ([1, 2, 4, 6, 8, 9].indexOf(th.data.prom_type) == -1 || is_normal == 1)) { setTimeout(function () { th.deal_pickup_dline(e); }, 800) @@ -3925,6 +4036,7 @@ Page({ var def_pick_store = th.data.def_pick_store; var plist = res.data.data.pageData; + if (th.data.sales_rules == 3) { var lock_num = 0; var Qty = 0; @@ -3947,6 +4059,14 @@ Page({ is_find_def_store = 1; } + //-- 如果库存为0就要重新赋值 -- + def_pick_store.CanOutQty=Qty; + th.setData({ + def_pick_store + }) + + + } else { th.setData({ all_sto: null, @@ -3972,6 +4092,13 @@ Page({ if (n_item.CanOutQty > lock_num) { o_plist[kk].CanOutQty = n_item.CanOutQty - lock_num; new_list.push(o_plist[kk]); + + var ck_store=th.data.fir_def_store; + if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}'){ + ck_store=th.data.def_pick_store; + } + + //--如果找到默认门店,同时也应该判断配送方式对不对-- if (th.data.fir_def_store && n_item.StorageNo == th.data.fir_def_store.pickup_no && (g_distr_type == 0 || th.data.fir_def_store.distr_type == 0 || th.data.def_pick_store.distr_type == g_distr_type)) { th.data.fir_def_store.CanOutQty = n_item.CanOutQty - lock_num; @@ -3981,6 +4108,13 @@ Page({ }) is_find_def_store = 1; } + + //-- 如果库存为0就要重新赋值 -- + if(n_item.StorageNo ==def_pick_store.pickup_no) { + def_pick_store.CanOutQty= o_plist[kk].CanOutQty; + th.setData({ def_pick_store }) + } + } break; } @@ -4932,7 +5066,7 @@ Page({ }, //--点击弹起拼单-- - openSpecModel_pt: function (e) { + openSpecModel_pt:function (e) { this.setData({ open_ind_store: 4, @@ -4959,19 +5093,29 @@ Page({ //如果拼单的sku data是空的，就要先获取一下 if (th.data.sku_g_pt) { + + //要同步指定门店 + th.set_sele_g(th.data.sku_g_pt); + th.get_sto(1); th.setData({ is_normal: ind, openSpecModal_pt: 1, }); } else { - th.get_sto(1); + th.get_sku(o.stoid, th.data.data, th.data.gid, 1, function () { + + th.get_sto(1); + th.setData({ is_normal: ind, openSpecModal_pt: 1, }); }); + + + } if (!th.data.sele_g.whsle_id) th.check_is_youhui(th.data.gid, 1); } else { @@ -7811,18 +7955,25 @@ Page({ }, //-- 积分购普通购买 -- - go_pay_integral_normal: function () { + go_pay_integral_normal:async function () { this.data.g_buy_num = new Map(); var th = this; if (th.data.sku_g_pt) { + + //要同步指定门店 + th.set_sele_g(th.data.sku_g_pt); + this.get_sto(1) this.setData({ openSpecModal_inte_normal: 1 }); } else { - th.get_sto(1); + th.get_sku(o.stoid, th.data.data, th.data.gid, 1, function () { + + th.get_sto(1); + th.setData({ is_normal: 1, openSpecModal_inte_normal: 1 @@ -8450,6 +8601,17 @@ Page({ switch_cx_group: function () { var pro_pop = this.selectComponent("#pro_pop"); //组件的id pro_pop.set_init(0, this.data.cx_prom_group); + }, + + //要同步sele_g的指定门店，在有单独购买的时候，积分购和拼团 + set_sele_g:function (sku_list){ + var goods_id=this.data.sele_g.goods_id; + for (var i in sku_list) { + if(goods_id==sku_list[i].goods_id){ + this.data.sele_g.pickup_ids=sku_list[i].pickup_ids; + break; + } + } } diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml index debf06f..3c01209 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxml +++ b/pages/goods/goodsInfo/goodsInfo.wxml @@ -709,6 +709,9 @@ (配送不匹配) + + (该店不可售) + (库存不足) @@ -1322,6 +1325,7 @@ (库存不足) (配送不匹配) + (该店不可售) (库存不足) @@ -1378,6 +1382,9 @@ 配送不匹配 + + 该店不可售 + @@ -1632,6 +1639,8 @@ {{item.pickup_name}} (库存不足) + (配送不匹配) + (该店不可售) @@ -1659,7 +1668,9 @@ {{item.pickup_name}} - (库存不足) + (配送不匹配) + (该店不可售) + (库存不足) diff --git a/pages/index/index/index.json b/pages/index/index/index.json index 4269168..315564c 100644 --- a/pages/index/index/index.json +++ b/pages/index/index/index.json @@ -9,7 +9,7 @@ "searchbox":"/components/diy_searchbox/diy_searchbox", "shopname": "/components/diy_shopname/diy_shopname", "pingd_buy": "/components/diy_pingd_buy/diy_pingd_buy", - "div_public": "/components/diy_public/diy_public", + "diy_public": "/components/diy_public/diy_public", "title": "/components/diy_title/diy_title", "notice": "/components/diy_notice/diy_notice", "voice": "/components/diy_voice/diy_voice", diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml index 5c9ab1d..28bb6eb 100644 --- a/pages/index/index/index.wxml +++ b/pages/index/index/index.wxml @@ -481,7 +481,7 @@ - + @@ -520,6 +520,9 @@ + + + diff --git a/pages/template/index.wxml b/pages/template/index.wxml index 5ac9144..f5ca734 100644 --- a/pages/template/index.wxml +++ b/pages/template/index.wxml @@ -52,7 +52,7 @@ - + @@ -73,7 +73,9 @@ - + + + diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js index b47b72d..2def5cc 100644 --- a/pages/user/order_detail/order_detail.js +++ b/pages/user/order_detail/order_detail.js @@ -24,12 +24,11 @@ Page({ getApp().getConfig2(function (e) { - th.setData({conf: e,sales_rules:e.sales_rules, userInfo: getApp().globalData.userInfo}); //--- 看后台是不是有开通等级卡 --- if(e.switch_list){ var s_list=JSON.parse(e.switch_list); - th.setData({sys_switch: s_list,appoint_pick_keyid:s_list.appoint_pick_keyid}); + th.setData({sys_switch: s_list,appoint_pick_keyid:s_list.appoint_pick_keyid}); var is_open_offline=s_list.is_pricing_open; var user=getApp().globalData.userInfo; //如果后台有开启等级价的功能 @@ -450,6 +449,18 @@ Page({ gg = res.data.data; }) + //-- 要进行判断指定门店的判断优化,先做普通商品 -- + if([0,3,5,7,10].indexOf(parseInt(good.prom_type))>-1 && gg.pick_group_ids){ + var idx0=gg.pick_up_lists.findIndex(function (e){ + return e.pickup_id==order.pickup_id; + }) + if(idx0<0){ + getApp().confirmBox(gg.goods_name + "的门店不可售"); + th.setData({ paying: 0 }); + return false; + } + } + var limit = gg.viplimited; var store_count = gg.store_count; good.erpwareid = gg.erpwareid; diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index 8a68f5e..766eab5 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -745,7 +745,6 @@ Page({ for (var i in order_goods) { var good = order_goods[i]; - //线下取价功能已经关闭或者过期 if (!th.data.is_open_offline && good.offline_cut > 0) { wx.showModal({ @@ -764,6 +763,18 @@ Page({ gg = res.data.data; }) + //-- 要进行判断指定门店的判断优化,先做普通商品 -- + if([0,3,5,7,10].indexOf(parseInt(good.prom_type))>-1 && gg.pick_group_ids){ + var idx0=gg.pick_up_lists.findIndex(function (e){ + return e.pickup_id==order.pickup_id; + }) + if(idx0<0){ + getApp().confirmBox(gg.goods_name + "的门店不可售"); + th.setData({ paying: 0 }); + return false; + } + } + var limit = gg.viplimited; var store_count = gg.store_count; good.erpwareid = gg.erpwareid; diff --git a/pages/user/return_goods_info/return_goods_info.js b/pages/user/return_goods_info/return_goods_info.js index 4480a49..80bdb89 100644 --- a/pages/user/return_goods_info/return_goods_info.js +++ b/pages/user/return_goods_info/return_goods_info.js @@ -11,6 +11,7 @@ Page({ resourceUrl: r.imghost, return_goods: null, goods: null, + loading:0, //是不是在处理中，避免重复点击 }, onLoad: function(e) { if (e.order_id!=undefined){ @@ -130,8 +131,14 @@ Page({ }); }, cancelReturn: function() { + + var e = this, - id = this.data.return_goods.id; + id = this.data.return_goods.id; + + if(this.data.loading) return false; + this.data.loading=1; + wx.showModal({ title: "确定取消售后服务？", success: function(r) { @@ -143,14 +150,18 @@ Page({ remark:'客户取消' }, success: function(r) { + if(r.data.code==0){ getApp().showWarning('取消成功'); setTimeout(function(){ wx.setStorageSync("user:return_goods_list:update", !0), e.requestReturnGoods(id); },1000) - } - - + }else{ + + e.data.loading=0; + s.m_toast(r.data.msg); + } + } }); }