diff --git a/app.js b/app.js index 7d15619..638efc4 100644 --- a/app.js +++ b/app.js @@ -275,8 +275,8 @@ App({ getwuliu: function (t, o){ this.globalData.wuliu=null; var th = this, st = this.globalData.setting; - this.globalData.wuliu && !o ? - "function" == typeof t && t(this.globalData.wuliu) : a.get("/api/weshop/storeshipping/list", { + //获取物流不缓存 + a.get("/api/weshop/storeshipping/list", { data: { store_id: st.stoid, status: 1, pageSize:600 }, success: function (o) { console.log('getwuliu'); @@ -296,8 +296,8 @@ App({ //----------------获取物流价格表-------------------- getwuliuprice: function (t, o) { var e = this,th=e, st = this.globalData.setting; - this.globalData.wuliuprice && !o ? - "function" == typeof t && t(this.globalData.wuliuprice) : a.get("/api/weshop/shippingarea/list",{ + //获取物流不缓存 + a.get("/api/weshop/shippingarea/list",{ data: { store_id: st.stoid,pageSize: 600 }, success: function (o) { console.log('getwuliuprice'); diff --git a/app.json b/app.json index c0d8e82..9adcee3 100644 --- a/app.json +++ b/app.json @@ -168,6 +168,7 @@ "pages/goods/goodsList/goodsList", "pages/payForAnother/payForAnother", "pages/luckyGo/luckyGo_cart/luckyGo_cart", + "pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct", "pages/luckyGo/luckyGo_list/luckyGo_list", "pages/luckyGo/luckyGo_order/luckyGo_order", "pages/luckyGo/luckyGo_details/luckyGo_details", diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxml b/components/diy_goodsGroup/diy_goodsGroup.wxml index 849c7a7..c691911 100644 --- a/components/diy_goodsGroup/diy_goodsGroup.wxml +++ b/components/diy_goodsGroup/diy_goodsGroup.wxml @@ -15,7 +15,8 @@ - + + @@ -169,7 +170,7 @@ - + @@ -208,7 +209,7 @@ - {{item.goods_name}} + {{item.goods_name}} @@ -328,7 +329,7 @@ - + @@ -485,7 +486,7 @@ - + @@ -498,9 +499,15 @@ - + + + + + binderror="bind_bnerr3" mode="widthFix"> @@ -523,7 +530,7 @@ - {{item.goods_name}} + {{item.goods_name}} @@ -662,7 +669,7 @@ - + diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxss b/components/diy_goodsGroup/diy_goodsGroup.wxss index 0895c9f..e7df987 100644 --- a/components/diy_goodsGroup/diy_goodsGroup.wxss +++ b/components/diy_goodsGroup/diy_goodsGroup.wxss @@ -123,12 +123,15 @@ } .zs_goods_xiao_bottom { - width: 100%; - min-height: 300rpx; + /* width: 100%; */ + /* min-height: 300rpx; */ display: flex; border-bottom: 2rpx #eee solid; - padding: 10rpx; + /* padding: 10rpx; */ background-color: white; + padding: 20rpx; + /* background-color: pink; */ + box-sizing: border-box; } .zs_goods_xiao { @@ -141,17 +144,17 @@ } .zs_top_x { - width: 400rpx; - height: 318rpx; - margin-top: 20rpx; - display: flex; + /* width: 400rpx; + height: 318rpx; */ + /* margin-top: 20rpx; */ + /* display: flex; */ position: relative; } .zs_t_img_x { width: 290rpx; height: 290rpx; - margin-left: 20rpx; + /* margin-left: 20rpx; */ } .zs_t_img_x.zj{ border: 1rpx solid #eee;} @@ -159,22 +162,25 @@ .zs_center_x { - width: 100%; - min-height: 200rpx; + /* width: 100%; + min-height: 200rpx; */ font-size: 28rpx; color: #333; - text-align: left; - margin-top: 30rpx; - padding: 0 10rpx; + padding-left: 20rpx; + /* text-align: left; */ + /* margin-top: 30rpx; + padding: 0 10rpx; */ } .zs_wz1_x { - overflow: hidden; - text-overflow: ellipsis; + /* overflow: hidden; + text-overflow: ellipsis; */ + height: 90rpx; margin-bottom: 10rpx; font-size: 28rpx; - white-space: nowrap; - width: 80%; + /* word-break: break-all; */ + /* white-space: nowrap; + width: 80%; */ } .zs_wz2_x { @@ -229,11 +235,12 @@ } .zs_t1_x1 { + position: absolute; width: 56rpx; height: 56rpx; - position: relative; - right: 285rpx; - top: 6rpx; + /* position: relative; */ + left: 10rpx; + top: 10rpx; } .zs_t1_x2 { @@ -302,17 +309,18 @@ font-size: 28rpx; color: #333; text-align: left; - padding: 0 10rpx; + /* padding: 0 10rpx; */ } .zs_wz1_2l { - overflow: hidden; - text-overflow: ellipsis; + /* overflow: hidden; + text-overflow: ellipsis; */ font-size: 28rpx; - white-space: nowrap; - height: 40rpx; - line-height: 40rpx; + /* white-space: nowrap; */ + height: 90rpx; + /* line-height: 40rpx; */ margin-top: 10rpx; + /* word-break: break-all; */ } .zs_wz2_2l { @@ -825,4 +833,16 @@ top: 10rpx; bottom: 10rpx; } -.n_box{ position: absolute !important;z-index: 10} \ No newline at end of file +.n_box{ position: absolute !important;z-index: 10} + +.block { + display: block; +} + +.ellipsis-2 { + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; +} \ No newline at end of file diff --git a/components/diy_goodsGroup/g_filter.wxs b/components/diy_goodsGroup/g_filter.wxs index fc32f2c..9e0910a 100644 --- a/components/diy_goodsGroup/g_filter.wxs +++ b/components/diy_goodsGroup/g_filter.wxs @@ -88,6 +88,16 @@ var g_filters = { return min_name; }, + + get_url_by_type: function(item) { + var url = ''; + if(item.prom_type == 9) { + url = '/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + item.goods_id + '&group_id=' + item.prom_id; + } else { + url = '/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id + '&prom_id=' + item.prom_id + '&prom_type=' + item.prom_type; + }; + return url; + }, } @@ -97,4 +107,5 @@ module.exports = { is_has_rank:g_filters.is_has_rank, get_card_price:g_filters.get_card_price, get_border_type:g_filters.get_border_type, + get_url_by_type: g_filters.get_url_by_type, } diff --git a/components/diy_luckyGo/diy_luckyGo.js b/components/diy_luckyGo/diy_luckyGo.js new file mode 100644 index 0000000..5fac147 --- /dev/null +++ b/components/diy_luckyGo/diy_luckyGo.js @@ -0,0 +1,238 @@ +// var e = function(e) { +// return e && e.__esModule ? e : { +// default: e +// }; +// }(require("../../utils/LoadMore3.js")), +// n = new e.default(), +var t = getApp(), + a = t.request, + o = t.globalData.setting, + os = o, + i = require("../../utils/util.js"), + ut = i, + s = require("../../utils/common.js"); +var regeneratorRuntime = require('../../utils/runtime.js'); +Component({ + properties: { + // 这里定义了innerText属性，属性值可以在组件使用时指定 + object: { + type: Object, + value: null, + }, + goods_array: { + type: Array, + value: [] + }, + newTime: { + type: Number, + value: 0 + }, + }, + data: { + // 这里是一些组件内部数据 + yc: false, + someData: null, + ylp_img: "https://mshopimg.yolipai.net/", + imghost: os.imghost, + timer: null, + }, + + pageLifetimes: { + //要处理一下，游客登录后的界面的变化,主要还该是改变会员 + show: function () { + //会员身份变化 + var th = this; + var g_id = this.data.object; + this.init(g_id); + setTimeout(function () { + if (th.data.goods_array && th.data.goods_array.length > 0) { + th.data.timer = setInterval(function () { + th.countDown2(th); + }, 1000); + } + },600) + } + }, + + ready: function () { + var g_id = this.data.object; + this.init(g_id); + }, + detached() { + // 页面被被销毁的时候，清除定时器 + clearInterval(this.data.timer); + }, + methods: { + // 这里是一个自定义方法 + customMethod: function () { }, + init: function (g_id) { + var th = this, app = getApp(), goodsidlist = ""; + if (g_id.data_type == 2) { + if (g_id.data && g_id.data.length > 0) { + //--先把商品ID串起来-- + g_id.data.forEach(function (val, ind) { + var item = {}; + goodsidlist += val.goodsid + ","; + }) + goodsidlist = ut.sub_last(goodsidlist); + + var user_id=getApp().globalData.user_id; + if(!user_id){ user_id=0;} + + //--调用接口,读取秒杀-- + app.request.promiseGet("/api/weshop/prom/luckyActivity/getGoodsList?store_id=" + + os.stoid + "&goodsidlist=" + goodsidlist + "&type="+ 1, {}).then(res => { + console.log(res); + //如果秒杀的数组为空的时候 + var goodslist = res.data.data; + //就算是添加的活动已经过期，就要用最新的进行中活动 + if (goodslist && goodslist.length > 0) { + th.set_goods_list(g_id.data, goodslist); + } + }); + } + } else { + th.no_gid_set(); + } + }, + + //当是默认的情况 + no_gid_set() { + var user_id=getApp().globalData.user_id; + if(!user_id){ user_id=0;} + // var req={ store_id: os.stoid, is_end: 0, is_show: 1, timetype: 2,user_id:user_id}; 原来的 + var req={ store_id: os.stoid, is_end: 0, timetype: 1}; + getApp().request.promiseGet("/api/weshop/prom/luckyActivity/page", + { isShowLoading: 1, data:req } + ).then(res => { + if (res.data.code == 0 && res.data.data.pageData && res.data.data.pageData.length > 0) { + var goodsidlist = res.data.data.pageData; + this.set_goods_list(null, goodsidlist); + // console.log('goodsidlist', goodsidlist); + } + }); + }, + + //就算是添加的活动已经过期，就要用最新的活动 + set_goods_list(g_id, goodslist) { + // 判断火热，预热 + var newTime = ut.gettimestamp(), all_array = [], th = this; + th.setData({ newTime: newTime }); + if (g_id) { + /*--商品队列按照添加的顺序排列--*/ + g_id.forEach(function (val, ind) { + goodslist.forEach(function (vy, indy) { + if (val.goodsid == vy.goods_id) { + if(!vy.id) vy.id=vy.prom_id; + all_array.push(vy); + } + }) + }) + } else { + all_array = goodslist; + } + + + if (all_array.length == 0) { + all_array = goodslist; + } + + for(let i in all_array){ + let item=all_array[i]; + if(item.user_price) item.price=item.user_price; + } + + var arr = new Array(); + //--三个三个一组--- + for (var i = 0; i < all_array.length; i += 3) { + arr.push(all_array.slice(i, i + 3)); + } + /*--熏染到前台--*/ + + th.setData({ goods_array: arr }); + console.log('goods_array', arr); + + th.data.timer = setInterval(function () { + th.countDown2(th); + }, 1000); + }, + + + + //---小于10的格式化函数---- + timeFormat: function (param) { + return param < 10 ? '0' + param : param; + }, + //----秒杀倒计时函数----- + countDown2: function (ob) { + if (ob == undefined) return false; + var ee = ob; + // 获取当前时间，同时得到活动结束时间数组 + var newTime = ut.gettimestamp(); + this.setData({ newTime: newTime }); + + var List = ee.data.goods_array; + if (List.length == 0) return false; + for (var j = 0; j < List.length; j++) { + // 对结束时间进行处理渲染到页面 + var endTimeList = List[j]; + for (var i = 0; i < endTimeList.length; i++) { + var o = endTimeList[i]; + var endTime = o.end_time; + if (newTime < o.start_time) endTime = o.start_time; + let obj = null; + // 如果活动未结束，对时间进行处理 + if (endTime - newTime > 0) { + let time = (endTime - newTime); + // 获取天、时、分、秒 + let day = parseInt(time / (60 * 60 * 24)); + let hou = parseInt(time % (60 * 60 * 24) / 3600); + let min = parseInt(time % (60 * 60 * 24) % 3600 / 60); + let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60); + obj = { + day: this.timeFormat(day), + hou: this.timeFormat(hou), + min: this.timeFormat(min), + sec: this.timeFormat(sec) + } + } else { + //活动已结束，全部设置为'00' + obj = { + day: '00', + hou: '00', + min: '00', + sec: '00' + } + } + var txt = "goods_array[" + j + "][" + i + "].djs"; + ee.setData({ + [txt]: obj + }); + } + } + }, + + + //图片失败，默认图片 + bind_bnerr3: function (e) { + var _errImg = e.target.dataset.errorimg; + var _errObj = {}; + _errObj[_errImg] = "/public/images/default_goods_image_240.gif"; + this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; + }, + + go: function (e) { + let url = e.currentTarget.dataset.url; + getApp().goto(url); + }, + + alert: function() { + wx.showToast({ + title: '本活动商品已抢光！', + icon: 'none', + }) + }, + }, + + +}) \ No newline at end of file diff --git a/components/diy_luckyGo/diy_luckyGo.json b/components/diy_luckyGo/diy_luckyGo.json new file mode 100644 index 0000000..e8cfaaf --- /dev/null +++ b/components/diy_luckyGo/diy_luckyGo.json @@ -0,0 +1,4 @@ +{ + "component": true, + "usingComponents": {} +} \ No newline at end of file diff --git a/components/diy_luckyGo/diy_luckyGo.wxml b/components/diy_luckyGo/diy_luckyGo.wxml new file mode 100644 index 0000000..5fba46f --- /dev/null +++ b/components/diy_luckyGo/diy_luckyGo.wxml @@ -0,0 +1,85 @@ + + + + + 幸运购 + + + + + + + + + + + + + + + + + + + + {{aitem.title}} + + + {{filters.price(aitem.group_price)}} + {{aitem.market_price}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{aitem.title}} + + + {{filters.price(aitem.group_price)}} + 零售价:{{aitem.market_price}} + + + + 已抢光 + 去参团 + + + + + *{{aitem.group_num}}人成团，{{aitem.group_win}}人得商品，{{aitem.group_num - aitem.group_win}}人全额退款并得惊喜礼品！ + + + + + + + diff --git a/components/diy_luckyGo/diy_luckyGo.wxss b/components/diy_luckyGo/diy_luckyGo.wxss new file mode 100644 index 0000000..21c614c --- /dev/null +++ b/components/diy_luckyGo/diy_luckyGo.wxss @@ -0,0 +1,149 @@ +@import '../../app.wxss'; + + + +.s_it { + width: 100%; + display: flex; + background-color: white; +} + + + + + + +swiper { + height: 450rpx; +} + +.nav { + width: calc(100% / 3); + box-sizing: border-box; +} + +.arrow-r { + width: 30rpx; + height: 30rpx; +} + +.icon-luck { + color: #ED6064; + margin-right: 4rpx; +} + + + + +.list-item { + background-color: white; + padding: 20rpx; +} + +.img-container { + width: 220rpx; + height: 220rpx; + border-radius: 14rpx; + overflow: hidden; + flex-shrink: 0; + position: relative; +} + +.img-container::before { + content: '幸运购'; + position: absolute; + left: 0; + top: 0; + padding: 4rpx; + background-color: rgba(255,103,103,.7); + color: white; + font-size: 22rpx; + border-radius: 0 0 14rpx 0; +} + + + +.img-container.row::before { + content: attr(data-content); + position: absolute; + left: 0; + top: 0; + padding: 4rpx; + background-color: rgba(255,103,103,.7); + color: white; + font-size: 22rpx; + border-radius: 0 0 14rpx 0; +} + +.name::before { + content: attr(data-content); + background-color: #FF6768; + color: white; + font-size: 24rpx; + padding-left: 10rpx; + padding-right: 10rpx; + border-radius: 20rpx; + margin-right: 10rpx; +} + +.name.clearbadge::before { + content: none; +} + +.rmb::before { + content: '￥'; + font-size: 24rpx; +} + +.del { + text-decoration: line-through; +} + +.btn { + background-color: #FF6768; + border-radius: 20rpx; + padding-left:20rpx; + padding-right: 20rpx; + color: white; +} + +.name { + height: 88rpx; +} + +.no-more { + font-size: 24rpx; + line-height: 2; + text-align: center; + padding-top: 20rpx; + padding-bottom: 20rpx; + color: #ccc; +} + +.progress { + position: relative; +} +.progress::before { + position: absolute; + width: 100%; + content: attr(data-content); + font-size: 20rpx; + color: white; + text-align: center; +} + +.btn.gray { + background-color: #ccc; +} + +.img-container.active::after { + content: '已抢光'; + position: absolute; + font-size: 24rpx; + color: white; + bottom: 0; + left: 0; + width: 100%; + text-align: center; + background-color: rgba(0,0,0,.4); +} \ No newline at end of file diff --git a/components/diy_seckill/diy_seckill.js b/components/diy_seckill/diy_seckill.js index 0559c57..e1bdff7 100644 --- a/components/diy_seckill/diy_seckill.js +++ b/components/diy_seckill/diy_seckill.js @@ -81,7 +81,7 @@ Component({ //--调用接口,读取秒杀-- app.request.promiseGet("/api/ms/flash_sale/getGoodsList?store_id=" - + os.stoid + "&goodsidlist=" + goodsidlist+"&user_id="+user_id, {}).then(res => { + + os.stoid + "&goodsidlist=" + goodsidlist+"&user_id="+user_id+"&type=1", {}).then(res => { console.log(res); //如果秒杀的数组为空的时候 var goodslist = res.data.data; @@ -113,6 +113,11 @@ Component({ //就算是添加的活动已经过期，就要用最新的活动 set_goods_list(g_id, goodslist) { + + goodslist.forEach(function (vy, indy) { + if(!vy.id) vy.id=vy.prom_id; + }) + // 判断火热，预热 var newTime = ut.gettimestamp(), all_array = [], th = this; th.setData({ newTime: newTime }); @@ -121,16 +126,14 @@ Component({ g_id.forEach(function (val, ind) { goodslist.forEach(function (vy, indy) { if (val.goodsid == vy.goods_id) { - if(!vy.id) vy.id=vy.prom_id; all_array.push(vy); } }) }) } else { - all_array = goodslist; + all_array = goodslist; } - if (all_array.length == 0) { all_array = goodslist; } diff --git a/components/diy_seckill/diy_seckill.wxml b/components/diy_seckill/diy_seckill.wxml index 3892d1b..ceafe44 100644 --- a/components/diy_seckill/diy_seckill.wxml +++ b/components/diy_seckill/diy_seckill.wxml @@ -62,7 +62,7 @@ - {{aitem.goods_name}} + {{aitem.goods_name}} ￥{{aitem.price}} ￥{{aitem.market_price}} @@ -85,7 +85,7 @@ - {{aitem.title}} + {{aitem.title}} {{aitem.djs.day}} 天 {{aitem.djs.hou}} : diff --git a/components/diy_seckill/diy_seckill.wxss b/components/diy_seckill/diy_seckill.wxss index 6ebabda..c410259 100644 --- a/components/diy_seckill/diy_seckill.wxss +++ b/components/diy_seckill/diy_seckill.wxss @@ -112,13 +112,14 @@ swiper { font-size: 30rpx; border-bottom: 2rpx solid #dcdcdc; width: 100%; - text-align: left; + /* text-align: left; */ padding: 4rpx 0; - overflow: hidden; - height: 48rpx; - text-overflow: ellipsis; + /* overflow: hidden; */ + height: 90rpx; + word-break: break-all; + /* text-overflow: ellipsis; white-space: nowrap; - line-height: 48rpx; + line-height: 48rpx; */ } .sp_wz .sp_jg { @@ -222,12 +223,12 @@ swiper { .o1_right .sp_wzi { font-size: 30rpx; margin-bottom: 6rpx; - text-align: left; + /* text-align: left; */ padding: 4rpx 0; - height: 48rpx; - overflow: hidden; + height: 90rpx; + /* overflow: hidden; white-space: nowrap; - text-overflow: ellipsis; + text-overflow: ellipsis; */ } .o1_right .o1_sj_kill { @@ -287,4 +288,13 @@ swiper { align-items: center; } -.sp .sp_top .s_top_kill.gray{background-color:#bdbdc1;color: #fff;font-weight: normal} \ No newline at end of file +.sp .sp_top .s_top_kill.gray{background-color:#bdbdc1;color: #fff;font-weight: normal} + + +.ellipsis-2 { + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; +} \ No newline at end of file diff --git a/components/goods_list/goods_list.wxml b/components/goods_list/goods_list.wxml index 7790e1f..ef89b5a 100644 --- a/components/goods_list/goods_list.wxml +++ b/components/goods_list/goods_list.wxml @@ -4,15 +4,16 @@ - - + + + {{item.goods_name}} - + {{item.prom_integral}}积分 diff --git a/components/qr_code/qr_code.js b/components/qr_code/qr_code.js index c46b356..812d7c8 100644 --- a/components/qr_code/qr_code.js +++ b/components/qr_code/qr_code.js @@ -24,6 +24,7 @@ Component({ //关闭 close: function (e) { this.setData({q_show: 0,barcode_canvas:null,qrcode_canvas:null }); + this.triggerEvent('close',{},{bubbles: true}); }, //打开 diff --git a/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js b/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js index 24cf8d3..c1ad43f 100644 --- a/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js +++ b/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js @@ -12,8 +12,20 @@ Page({ pageNum: 1, // 当前页数 }, - onLoad: function () { + onLoad: function (options) { self = this; + + var first_leader = options.first_leader; + if(first_leader) { + app.globalData.first_leader = first_leader; + //调用接口判断是不是会员 + // app.request.promiseGet("/api/weshop/shoppingGuide/get/" + app.globalData.setting.stoid + "/" + first_leader, {}).then(res => { + // if (res.data.code == 0) { + // getApp().globalData.guide_id = res.data.data.id; + // } + // }) + }; + app.isLogin().then(function(data) { self.setData({ userInfo: data, @@ -173,5 +185,42 @@ Page({ }; }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function (e) { + var pagePath = this.route; //当前页面url + if (pagePath.indexOf('/') != 0) { + pagePath = '/' + pagePath; + } + if(getApp().globalData.user_id){ + + if(pagePath.indexOf("?")>0){ + pagePath+="&first_leader="+getApp().globalData.user_id; + }else{ + pagePath+="?first_leader="+getApp().globalData.user_id; + } + } + return { + title: "幸运购活动列表", + path: pagePath, + } + }, + + // onShareTimeline() { + // var store_name = getApp().globalData.config ? getApp().globalData.config.store_name:''; + // var pagePath = this.route; //当前页面url + + // if(!store_name) store_name = getApp().globalData.setting.appName; + // if (pagePath.indexOf('/') != 0) { + // pagePath = '/' + pagePath; + // } + // return { + // title: store_name + '-幸运购活动列表', + // path: pagePath, + // } + // }, + }) diff --git a/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxml b/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxml index bf4862b..434ce73 100644 --- a/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxml +++ b/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxml @@ -11,7 +11,7 @@ - + - 去参团 + 已抢光 + 去参团 diff --git a/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxss b/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxss index 2f254c1..ff7eb2b 100644 --- a/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxss +++ b/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxss @@ -20,8 +20,8 @@ page { } .img-container { - width: 200rpx; - height: 200rpx; + width: 220rpx; + height: 220rpx; border-radius: 14rpx; overflow: hidden; flex-shrink: 0; @@ -70,6 +70,7 @@ page { .name { height: 88rpx; + word-break: break-all; } .no-more { @@ -92,3 +93,7 @@ page { color: white; text-align: center; } + +.btn.gray { + background-color: #ccc; +} diff --git a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js index 3fda55e..6fbbaae 100644 --- a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js +++ b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js @@ -126,6 +126,7 @@ Page({ user_note:{}, zuhe_map_good:{}, }, + onLoad: function (t) { wx.setNavigationBarTitle({title: "填写订单",}) var th = this; @@ -139,10 +140,7 @@ Page({ success: function (s) { } }); - - // console.log('t=======================>', t); - - + }, onUnload: function () { @@ -808,13 +806,12 @@ Page({ } } - + gd.prom_type=gg.prom_type; gd.prom_id=gg.prom_id; - + switch (gd.prom_type) { case 0: - case 2: case 3: case 4: case 5: @@ -987,6 +984,7 @@ Page({ //t.data.data.shop_price = tt.data.data.prom_price; t.data.data.shop_price = tt.data.data.prom_user_price; th.data.ckeck_quan_price=0; + gd.is_xz_yh=1; } else { t.data.data.prom_id = 0; t.data.data.prom_type = 0; @@ -1013,6 +1011,45 @@ Page({ }); break; + + case 2: //--- 团购 --- + var quanlist = null; + getApp().request.get("/api/weshop/goods/groupBuy/getActInfo/" +os.stoid + "/" +gd.goods_id+"/"+ gd.prom_id, { + success: async function (tt) { + if (tt.data.code == 0) { + //t.data.data.shop_price = tt.data.data.prom_price; + t.data.data.shop_price = tt.data.data.price; + } else { + t.data.data.prom_id = 0; + t.data.data.prom_type = 0; + } + + if(tt.data.data.isQuan){ + th.data.ckeck_quan_price = t.data.data.shop_price * gg.goods_num; + th.data.check_quan_price_list = t.data.data.shop_price * gg.goods_num + ""; + th.data.check_quan_ware_list = t.data.data.erpwareid + ""; + }else{ + gd.is_xz_yh=1; + } + + th.setData({ + bn_goods: gd, + bn_pickname: gg.pick_name, + bn_exp_type: et, + index: m_wind, + bn_pick: gg.pick_id, + bn_t_exp_t: distr_t, + bn_exp_type: et + }); + + //-- 计算价格 -- + th.calculatePrice2(); + //获取优惠券,如果有券的钱，就调用 + if(th.data.ckeck_quan_price>0) th.get_buy_now_quan(); + } + }); + + break; } }, }); @@ -1389,7 +1426,7 @@ Page({ } //--如果是物流，且选择了地址，就要开始显示包邮券，且包邮券也已经优惠了优惠活动的金额-- - if (cart_item.exp_type == 0 && th.data.user_addr != null) { + if (cart_item.exp_type == 0 && th.data.user_addr != null && !cart_item.is_xz_yh) { //看是不是有调用过包邮券 if (!th.data.isget_by_quan[pickid]) { //--判断要不要显示包邮券,调用接口，因为有for循环--- @@ -1397,7 +1434,8 @@ Page({ data: { store_id: os.stoid, isuse: 0, - condition: q_conditin, + //condition: q_conditin, + condition:cart_item.ckeck_quan_price, user_id: getApp().globalData.user_id, pageSize: 2000 } @@ -1422,10 +1460,10 @@ Page({ } if (arr) { th.data.get_by_quan_list_cart[pickid] = arr; - //th.setData({get_by_quan_list_cart:th.data.get_by_quan_list_cart}); - if (th.data.is_b_now) { - th.setData({get_by_quan_list: arr}); - } + th.setData({get_by_quan_list_cart:th.data.get_by_quan_list_cart}); + //if (th.data.is_b_now) { + // th.setData({get_by_quan_list: arr}); + //} } th.data.isget_by_quan[pickid] = 1; } @@ -2030,29 +2068,9 @@ Page({ }); }); }, - - - submitConfirm(e) { - var th = this; - wx.showModal({ - title: '温馨提示', - content: this.data.param.alert, - success (res) { - if (res.confirm) { - console.log('用户点击确定'); - th.submitForm(e); - } else if (res.cancel) { - console.log('用户点击取消') - } - } - }) - }, //--------------------提交订单----------------------- - async submitForm(t) { - - - + async submitForm(t){ var sub_value = t; if (this.data.is_summit_ing == 1) return false; //--提交中退出-- @@ -2178,10 +2196,8 @@ Page({ 'goods_price': th.data.bn_goods.shop_price, 'member_goods_price': th.data.bn_goods.shop_price, 'store_id': oo.stoid, - //'prom_type': th.data.bn_goods.prom_type, //促销活动类型 - 'prom_type': 9, //促销活动类型 - 'prom_id': th.data.param.group_id, //促销活动id - // 'prom_id': 118, + 'prom_type': th.data.bn_goods.prom_type, //促销活动类型 + 'prom_id': th.data.bn_goods.prom_id, //促销活动id }; //-- 把导购的信息填入-- @@ -2445,6 +2461,7 @@ Page({ //--判断活动的类型-- switch (g_item.prom_type) { case 1: + case 2: goods.prom_type = g_item.prom_type; goods.prom_id = g_item.prom_id; break; @@ -2583,42 +2600,19 @@ Page({ var dd = { parent_sn: data.data, store_id: oo.stoid, - type: 1, + type: 2, }; - wx.showLoading({ - title: '支付中', - mask: true, - }); a.post("/api/weshop/order/pay/createOrder", { data: dd, - isShowLoading: false, success: function (t) { //console.log(t); - wx.hideLoading(); if (t.data.code == 0) { //app.my_warnning("支付成功",1,th); //setTimeout(function () { th.setData({isclose: 0}); - - wx.showToast({ - title: '支付成功', - icon: 'success', - duration: 2000, - success: function() { - // 幸运购 - setTimeout(function() { - wx.redirectTo({ - url: "/packageC/pages/luckyGo/luckyGo_details/luckyGo_details?type=1&ordersn=" + data.data + "&group_id=" + th.data.param.group_id + "&goods_id=" + th.data.param.goods_id + "&goods_name=" + th.data.bn_goods.goods_name, - }); - }, 0); - - }, - }) - - // wx.redirectTo({ - // url: "/pages/payment/pay_success/pay_success?type=1&order_sn=" + data.data, - // }) - + wx.redirectTo({ + url: "/pages/payment/pay_success/pay_success?type=2&order_sn=" + data.data, + }) //}, 1000) } }, @@ -3441,6 +3435,19 @@ Page({ if (gd.prom_type == 1 || gd.is_gift || gd.prom_type == 7) { continue; } + + //--如果是团购，要判断有没有限制使用优惠券 + if(gd.prom_type == 2){ + var prom1=null; + await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + gd.goods_id + "/" + gd.prom_id, { + }).then(res => { + if (res.data.code == 0) prom1 = res.data.data; + }) + if(!prom1.isQuan){ + continue; + } + } + //如果有限制使用优惠券，就要返回 if (gd.prom_type == 3) { if (th.data.prom_goods_map[pickup_id][gd.prom_id].is_xz_yh) continue; @@ -3479,6 +3486,7 @@ Page({ arr[ind].ckeck_quan_price = ckeck_quan_price - cut_price; arr[ind].check_quan_ware_list = check_quan_ware_list; arr[ind].check_quan_price_list = check_quan_price_list; + arr[ind].is_xz_yh = is_xz_yh; //是否关闭使用优惠券 if (th.data.is_close_quan != 1 && !is_xz_yh) { @@ -3488,7 +3496,7 @@ Page({ data: { storeId: oo.stoid, userId: app.globalData.user_id, - BuySum: ckeck_quan_price, + BuySum: arr[ind].ckeck_quan_price, WareIds: check_quan_ware_list, pageSize: 100 } @@ -3843,7 +3851,6 @@ Page({ } }, - //取消使用线下取价 cancle_offline: function () { //判断是不是立即购买 diff --git a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.wxml b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.wxml index 6c3b5dd..1350caf 100644 --- a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.wxml +++ b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.wxml @@ -2,7 +2,7 @@ -
+ @@ -268,6 +268,7 @@ + ￥{{filters.toFix(bn_goods.shop_price,2)}} x{{bn_goods.buynum}} @@ -426,6 +427,7 @@ 优惠活动 - ￥ {{filters.toFix(formData.cut_price,2)}}元 + 组合购优惠 diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js new file mode 100644 index 0000000..f568ee8 --- /dev/null +++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js @@ -0,0 +1,1286 @@ +var t = getApp(), + app = t, + a = t.request, + e = require("../../../../utils/common.js"), + s = require("../../../../utils/util.js"), + o = require("../../../../utils/md5.js"), + to = getApp(); +var oo = t.globalData.setting, + os = oo; +var regeneratorRuntime = require('../../../../utils/runtime.js'); +var util_pay = require("../../../../utils/pay.js"); +let self = null; + +Page({ + data: { + prom_type: 9, + + url: t.globalData.setting.url, + resourceUrl: t.globalData.setting.resourceUrl, + imgUrl: t.globalData.setting.imghost, + goods: null, + order: null, + orderPrices: null, + coupons: null, + coupon: null, + invoiceToggle: !0, + payWithUserMoney: !0, + payWithPoints: !0, + maxWord: 0, + enterAddressPage: !1, + firstEnter: !0, + //页面获取的参数 + param: null, + postdata: null, + //提交订单的格式 + formData: { + order_amount: 0, //支付金额 + total_amount: 0, //总价 + all_price: 0, //商品卖的总价 + pay_points: 0, //使用积分 + user_money: 0, //使用余额 + couponCode: "", //使用优惠券(多单就用逗号隔开) + shipping_price: 0, //物流费用 + }, + + /*----------------立即购买---------------------*/ + is_b_now: 0, //0是购物车结算 1立即购买 + bn_goods: null, //立即购买时候的调用商品 + bn_use_money: 0, //是否使用余额 + bn_exp_type: 1, //0是物流 1自提 + bn_pick: 0, //选择的门店 + bn_pickname: "", //选择的门店名称 + bn_t_exp_t: 0, //判断商品和门店一起决定的物流自提的方式0 都可以 1自提 2物流 + /*------------------------*/ + user_addr: null, //物流 + userinfo: null, //获取会员 + /*----------物流选择--------*/ + wu_arr: null, + index: 0, + + //判断页面是返回回来的还是 首次进入的 + isclose: 1, + kt_type: 0, //开团类型 + is_pt_tz: 0, //是否开团团长 + qh: '', //期号 + pt_listno: '', //期号 + is_normal: 0, + is_express: 0, //选择物流的控制器 + yuer: 0, + + rank_switch: 0, //是不是开同等级卡 + show_card: null, //显示的等级卡 + card_name: '', //显示的卡的名称 + card_cut_price: null, //减价多少钱 + }, + + onLoad: function(t) { + + // console.log('收到的传参', t); + wx.setNavigationBarTitle({ + title: '填写订单', + }); + self = this; + this.setData({ + is_b_now: t.is_bnow == undefined ? 0 : t.is_bnow, + param: t, + }); + + var appD = getApp().get_b_now(); + + this.data.postdata = appD; + + + // 获取幸运购活动团team_id + this.get_teamId({ + store_id: oo.stoid, + user_id: getApp().globalData.user_id, + aid: t.group_id, + }); + + + + + //如果期号有值01 + // if (appD.qh) { + // th.data.qh = appD.qh; + // th.data.pt_listno = appD.qh; + // } + + + + this.setData({//01 + // kt_type: appD.kt_type + }); + + // 01 + // if (appD.is_pt_tz) th.data.is_pt_tz = appD.is_pt_tz; + + + //先获取物流，再获取用户信息，再展示页面 + // this.get_wuliu(th.get_info(th.show_page)); + }, + + onUnload: function() { + this.setData({ + isclose: 1 + }) + }, + + //------获取会员信息-----先获取用户信息，在进行下一步--- + get_info: function(func) { + var user_id = t.globalData.user_id; + to.auth.get_u(func); + }, + + //-------------------获取物流--------------- + get_wuliu(func) { + var th = this; + // console.log("getwuliu4545"); + to.getwuliu(function(e) { + if (th.data.is_default_logistics) { + //如果第一个不是开启默认，说明要让用户自己选 + if (!e[0].is_default) { + th.setData({ + is_default_logistics: 0 + }); + } + } + th.setData({ + wu_arr: e + }) + typeof func == "function" && func(); + }) + }, + + //------获取会员收货地址----- + getuser_addr: function(func) { + if (to.globalData.baddr != null) { + var user_addr = to.globalData.baddr; + to.globalData.baddr = null; + func(user_addr); + } else { + a.get("/api/weshop/useraddress/page", { + data: { + user_id: to.globalData.user_id, + store_id: oo.stoid, + pageSize: 600 + }, + success: function(su) { + + var user_addr = su.data.data.pageData; + var item = null; + var def_item = null; + for (var i = 0; i < user_addr.length; i++) { + if (user_addr[i]['is_default'] == 1) { + def_item = user_addr[i]; + } + if (user_addr[i]['is_pickup'] == 1) { + item = user_addr[i]; + } + } + if (item == null) item = def_item; + if (item == null) item = user_addr[0]; + if (item == undefined) item = null; + func(item); + } + }); + } + }, + //----------------展示页面,是再获取用户信息之后-------------- + show_page: function() { + var th = this; + //th.setData({ userinfo: to.globalData.userInfo}); 会员信息要时时获取 + var user = getApp().globalData.userInfo; + getApp().request.get("/api/weshop/users/get/" + oo.stoid + "/" + user.user_id, { + data: { + r: Math.random() + }, + success: function(e) { + + getApp().globalData.userInfo = e.data.data; + th.setData({ + userinfo: e.data.data + }); + //获取立即购买的商品信息 + th.get_buy_goods(); + + //获取提现金额 + getApp().request.get("/api/weshop/withdrawals/summoney", { + data: { + user_id: to.globalData.user_id, + store_id: oo.stoid, + status: 0 + }, + success: function(su) { + if (su.data.code == 0) { + var yuer = parseFloat(th.data.userinfo.user_money - + (th.data.userinfo.frozen_money > 0 ? th.data.userinfo.frozen_money : 0) - su.data.data.summoney).toFixed( + 2); + if (yuer < 0) yuer = 0; + th.setData({ + txmon: su.data.data.summoney, + yuer: yuer + }); + } + } + }); + } + }); + }, + + //-----获取立即购买的商品信息---- + get_buy_goods: function() { + var th = this, + a = getApp().request; + var gg = th.data.postdata; + //调用商品 + a.get("/api/weshop/goods/get/" + oo.stoid + "/" + gg.goods_id, { + success: function(t) { + var gd = t.data.data; + if (!gd) return false; + + t.data.data.original_img = oo.imghost + t.data.data.original_img; + t.data.data['buynum'] = gg.goods_num; + // console.log(t.data.data); + var distr_t = 0, + et = 0 + if (t.data.data.distr_type == 0) { + distr_t = gg.pick_dis; + } else { + //distr_type配送方式 0=用户自选 1=自提 2=物流 + distr_t = t.data.data.distr_type; + } + switch (distr_t) { + case 0: + et = 1; + //-- 系统后台有设置要默认的 -- + if (th.data.json_d.pickupway && th.data.json_d.pickupway == 1) et = 0; + break; + case 1: + et = 1; + break; + case 2: + et = 0; + break; + } + + t.data.data.shop_price = gg.goods_price; + //--如果是普通购买的时候-- + if (gg.is_normal == 1) { + t.data.data.prom_id = 0; + t.data.data.prom_type = 0; + t.data.data.is_normal = 0; + + var gd = t.data.data; + //-- 用商品的手店价来显示 -- + gg.goods_price = gd.shop_price; + //---是不是购买等级卡成功的返回---等级卡显示的判断--- + var is_card_back = getApp().globalData.is_card_back; + if (is_card_back) { + gg.goods_price = gd[th.data.card_name]; + t.data.data.shop_price = gg.goods_price; + getApp().globalData.is_card_back = 0; + th.setData({ + card_cut_price: 0 + }); + } else { + //--- 商品不能是搭配购，商家等级卡开通的情况下, 会员不是等级会员的情况， 商品有设置等级卡价格，同时等级卡价格小于商品的价格 + if (th.data.card_name && gd[th.data.card_name] > 0 && gg.goods_price > gd[th.data.card_name] && !th.data.userinfo + .card_field) { + var cut_p = gg.goods_price - gd[th.data.card_name]; + th.setData({ + card_cut_price: cut_p + }); + } + } + + if (th.data.bn_goods) { + et = th.data.bn_exp_type; + } + + + th.setData({ + bn_goods: t.data.data, + bn_pickname: gg.pick_name, + bn_pick: gg.pick_id, + bn_t_exp_t: distr_t, + is_normal: 1, + bn_exp_type: et + }); + + + + th.calculatePrice2(); + } + + else { //01 + + //--阶梯团很特殊，不能用总表来拿价格-- + getApp().request.get("/api/weshop/teamlist/get/" + oo.stoid + "/" + gd.prom_id, { + success: function(tt) { + + if (tt.data.code == 0) { + var pt_data = tt.data.data; + var now = s.gettimestamp(); + + if (pt_data.is_end == 1) { + t.data.data.prom_id = 0; + t.data.data.prom_type = 0; + // t.data.data.is_normal=1; + } else if (now > pt_data.end_time) { + t.data.data.prom_id = 0; + t.data.data.prom_type = 0; + // t.data.data.is_normal=1; + } else { + t.data.data.shop_price = tt.data.data.price; //活动价格 + t.data.data.is_normal = 0; + if (pt_data.kttype == 3) { + t.data.data.shop_price = tt.data.data.yf_price; //用定金来购买 + } + } + } else { + t.data.data.prom_id = 0; + t.data.data.prom_type = 0; + // t.data.data.is_normal=1; + } + + if (th.data.bn_goods) { + et = th.data.bn_exp_type; + } + + th.setData({ + bn_goods: t.data.data, + bn_pickname: gg.pick_name, + bn_pick: gg.pick_id, + bn_t_exp_t: distr_t, + bn_exp_type: et + }); + + + //计算价格 + th.calculatePrice2(); + } + }); + } + + } + }); + }, + + //----------子页返回父页触发---------- + onShow: function() { + var th = this; + + if (th.data.isclose == 0) { + wx.navigateTo({ + url: "/pages/index/index/index" + }) + } else { + this.getuser_addr(function(ie) { + //更换地址回来要重新调用计算价钱的接口 + th.setData({ + user_addr: ie + }); + if (!th.data.user_addr || th.data.user_addr.address_id != ie.address_id) { + th.setData({ + add_back: 1 + }); + if (this.data.bn_goods) th.calculatePrice2(); + } + }) + //--更新默认地址--,看一下是不是跳到地址页面 + if (!getApp().globalData.is_cart_old) { + this.update_code(); + } else { + getApp().globalData.is_cart_old = 0; + } + } + + + //先获取是否有关闭使用优惠券 + getApp().getConfig2(function(ee) { + var json_d = JSON.parse(ee.switch_list); + th.data.json_d = json_d; + th.data.ispt_goods = json_d.ispt_goods; //是不是平摊到单品的控制参数赋值 + var is_default_logistics = json_d.is_default_logistics; + + th.setData({ + is_close_quan: json_d.is_close_quan, + sales_rules: ee.sales_rules, + rank_switch: json_d.rank_switch, + is_default_logistics: is_default_logistics + }); + + var rank_switch = json_d.rank_switch; + var max_price = -1; + var show_card = null; + var name = ""; + //如果有开等级卡的时候, + //因为都是调接口，要返回在计算 + if (rank_switch == 2) { + //-- 获取所有的等级卡, -- + getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?storeId=" + os.stoid, {}).then(res => { + if (res.data.code == 0) { + var plusCard = res.data.data; + //-- 循环判断，拿到最贵的那张卡 -- + for (var ih in plusCard) { + if (plusCard[ih].IsStopBuy == true) { + continue; + } + if (max_price < 0) { + max_price = plusCard[ih].CardFee; + name = 'card' + plusCard[ih]['CorrPrice']; + show_card = plusCard[ih]; + } else { + if (max_price < plusCard[ih].CardFee) { + max_price = plusCard[ih].CardFee; + name = 'card' + plusCard[ih]['CorrPrice']; + show_card = plusCard[ih]; + } + } + } + + if (show_card) { + name = name.toLowerCase(); + th.setData({ + card_name: name, + show_card: show_card + }) + } + } + //-----先获取物流，再获取用户信息，再展示页面----- + th.get_wuliu(th.get_info(th.show_page)); + }) + } else { + //-----先获取物流，再获取用户信息，再展示页面----- + th.get_wuliu(th.get_info(th.show_page)); + } + }, 1) + + }, + //---------------检查是否有收货地址------------------- + checkAddressList: function() { + var t = this; + return !(!this.data.order || null == this.data.order.userAddress) || (wx.showModal({ + title: "请先填写或选择收货地址~", + success: function(a) { + a.confirm ? t.enterAddressPage() : wx.navigateBack(); + }, + fail: function() { + wx.navigateBack(); + } + }), !1); + }, + showInvoice: function() { + this.setData({ + invoiceToggle: !this.data.invoiceToggle + }); + }, + keyUpChangePay1: function(t) { + this.setData({ + payWithUserMoney: !(t.detail.value.length > 0) + }); + }, + keyUpChangePay2: function(t) { + this.setData({ + payWithPoints: !(t.detail.value.length > 0) + }); + }, + keyUpChangeNum: function(t) { + this.setData({ + maxWord: t.detail.value.length + }); + }, + //---------计算立即购买---------- + calculatePrice2: function() { + console.log('calculatePrice2'); + var th = this, + good = this.data.bn_goods; + //-----------计算商品总价-------------- + var allpice = good.shop_price * good.buynum; + allpice = parseFloat(allpice).toFixed(2); + var txt = "formData.all_price"; + th.setData({ + [txt]: allpice, + }); + console.log(th.data.formData); + + to.getConfig2(function(ee) { + to.getwuliuprice(function(rs) { + console.log('calculatePrice2222'); + console.log(rs); + var o_shipping_price = 0, + goods_weight = -1, + goods_piece = -1; + //-----------当地址不为空，且是物流时，计算物流费用,同时阶梯团不计算拼团价格---------- + if (th.data.user_addr != null && th.data.bn_exp_type == 0 && good.is_free_shipping == 0 && (th.data.kt_type != + 3 || th.data.bn_goods.is_normal == 1)) { + switch (good['exp_sum_type']) { + case 1: + //统一运费 + o_shipping_price += good['uniform_exp_sum']; + break; + case 2: + if (goods_weight < 0) goods_weight = 0; + //累积商品重量 每种商品的重量 * 数量 + goods_weight += good['weight'] * good['buynum']; + break; + case 3: + if (goods_piece < 0) goods_piece = 0; + //累积商品数量 + goods_piece += good['buynum']; + break; + } + + console.log(o_shipping_price + ":" + goods_weight + ":" + goods_piece); + console.log(th.data.wu_arr); + var code = th.data.wu_arr[th.data.index].code; + var freight_free = ee.freight_free; //全场满多少包邮 + var shipping_price = + th.calculatewuliu(code, o_shipping_price, goods_weight, + goods_piece, th.data.user_addr, freight_free, allpice, rs); + + shipping_price = parseFloat(shipping_price).toFixed(2); + var wl_txt = "formData.shipping_price"; + th.setData({ + [wl_txt]: shipping_price, + }) + + } else { + var wl_txt = "formData.shipping_price"; + th.setData({ + [wl_txt]: 0, + }) + } + //-----------------总价----------------- + // 幸运购 01 + // var total_m = parseFloat(allpice) + parseFloat( th.data.formData.shipping_price); + var total_m = parseFloat(th.data.param.goods_price) + parseFloat(th.data.formData.shipping_price); + total_m = parseFloat(total_m).toFixed(2); + + var atxt = "formData.total_amount"; + th.setData({ + [atxt]: total_m, + }) + var order_m = total_m; + + var txt = "formData.user_money"; + var txt2 = "formData.order_amount"; + //--------------如果使用余额--------------------- + if (th.data.bn_use_money == 1 && th.data.yuer > 0) { + if (parseFloat(th.data.yuer) > total_m) { + th.setData({ + [txt]: total_m, + [txt2]: 0 + }) + } else { + order_m = parseFloat(order_m) - parseFloat(th.data.yuer); + order_m = order_m.toFixed(2); + th.setData({ + [txt]: th.data.yuer, + [txt2]: order_m + }) + } + } else { + th.setData({ + [txt]: 0, + [txt2]: order_m + }) + } + + }); + }); + }, + + + // 提交订单前弹出确认对话框 + submitConfirm(e) { + // is_show为0不显示温馨提示，为1显示温馨提示 + if(this.data.param.is_show == 1) { + wx.showModal({ + title: '温馨提示', + content: this.data.param.alert, + success(res) { + if (res.confirm) { + console.log('用户点击确定'); + self.submitForm(e); + } else if (res.cancel) { + console.log('用户点击取消'); + } + } + }); + } else { + this.submitForm(e); + }; + + }, + + + //--------------------提交订单----------------------- + submitForm: async function(t) { + if (this.data.is_summit_ing == 1) return false; //--提交中退出-- + this.data.is_summit_ing = 1; + + var th = this, + pdata = new Array(); + var ff = true; + //------------立即购买------------- + // console.log("buy_new"); + + //如果不是阶梯团，或者是普通购买，商家选择了物流，以及地址为空的时候 + if (th.data.bn_exp_type == 0 && th.data.user_addr == null && (th.data.kt_type != 3 || th.data.bn_goods.is_normal == + 1)) { + ff = false; + getApp().my_warnning("请选择收货地址", 0, this); + this.data.is_summit_ing = 0; + } + if (!ff) return false; + var addr = th.data.user_addr; + if (th.data.bn_exp_type == 1) addr = null; + + console.log(th.data.formData); + console.log(th.data.wu_arr); + console.log(th.data.bn_exp_type); + + if (th.data.bn_exp_type == 0 && (th.data.kt_type != 3 || th.data.bn_goods.is_normal == 1)) { + if (th.data.wu_arr == null || th.data.wu_arr.length <= 0) { + getApp().my_warnning("读取物流失败", 0, this); + this.data.is_summit_ing = 0; + return false; + } + } + + //阶梯团强制带1，自提~~~01 + // if (th.data.kt_type == 3) { + // th.data.bn_exp_type = 1; + // } + + var item = { + 'user_id': to.globalData.user_id, + 'consignee': addr == null ? "" : addr.consignee, + 'province': addr == null ? 0 : addr.province, + 'city': addr == null ? 0 : addr.city, + 'district': addr == null ? 0 : addr.district, + 'twon': addr == null ? 0 : addr.twon, + 'address': addr == null ? "" : addr.address, + 'more_address': addr == null ? "" : addr.more_address, + 'mobile': addr == null ? th.data.userinfo.mobile : addr.mobile, + 'email': '', + 'invoice_title': '', + 'goods_price': th.data.param.goods_price, //商品总价 + //'goods_price': th.data.formData.all_price, //商品总价 + 'shipping_price': th.data.formData.shipping_price, //物流金额 + 'shipping_code': th.data.bn_exp_type == 1 ? 0 : th.data.wu_arr[th.data.index].code, + 'shipping_name': th.data.bn_exp_type == 1 ? '' : th.data.wu_arr[th.data.index].name, + 'user_money': th.data.formData.user_money, //使用余额 + 'total_amount': th.data.formData.total_amount, //订单总价 + 'order_amount': th.data.formData.order_amount, //应付 + 'user_note': t.detail.value.user_note, //用户备注 + 'store_id': oo.stoid, //商家 + 'pickup_id': th.data.bn_pick, //门店 + 'exp_type': th.data.bn_exp_type, //配送方式 + 'is_normal': th.data.bn_goods.is_normal, //是否是普通购买 + //'pt_prom_id': th.data.bn_goods.prom_id, //拼单ID 01 + //'is_pt_tz': th.data.is_pt_tz, //开团类型 01 + 'order_goods': new Array(), + }; + + //如果不是阶梯团，或者是普通购买，01 + // if ((th.data.kt_type != 3 || th.data.bn_goods.is_normal == 1)) { + if (th.data.bn_goods.is_normal == 1) { + item['shipping_code'] = th.data.bn_exp_type == 1 ? 0 : th.data.wu_arr[th.data.index].code; + item['shipping_name'] = th.data.bn_exp_type == 1 ? '' : th.data.wu_arr[th.data.index].name; + } + + // if (!th.data.bn_goods.is_normal) { + // item.is_zsorder = th.data.kt_type + 1; //开团类型 01 + // } + + + //老会员成为分销下线需要的参数 + if (getApp().globalData.first_leader && !getApp().globalData.userInfo.first_leader) { + //判断一下分享人是不是分享商 + await app.request.promiseGet("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.first_leader, {}).then( + res => { + if (res.data.code == 0) { + var user = res.data.data; + if (user.is_distribut == 1) { + item.first_leader = parseInt(getApp().globalData.first_leader); + } + } + }) + } + + if (th.data.qh != '') { + item.team_qh = th.data.qh; + item.pt_listno = th.data.qh; + } + + + var gg = to.get_b_now(); + var goods = { + 'goods_id': gg.goods_id, + 'goods_name': gg.goods_name, + 'goods_sn': gg.goods_sn, + 'goods_num': gg.goods_num, + 'market_price': th.data.bn_goods.market_price, + 'goods_price': th.data.param.goods_price, + // 'goods_price': th.data.bn_goods.shop_price, + 'member_goods_price': th.data.bn_goods.shop_price, + 'store_id': oo.stoid, + // 'prom_type':th.data.bn_goods.prom_type, //促销活动类型 01 + // 'prom_id': th.data.bn_goods.prom_id, //促销活动id 01 + + 'prom_type': 9, //促销活动类型 + 'prom_id': th.data.param.group_id, //促销活动id + }; + + //--导购分享过来的id-- + if (gg.guide_id) { + goods.guide_id = gg.guide_id; + goods.guide_type = gg.guide_type; + //调用接口判断是不是会员 + await getApp().request.promiseGet("/api/weshop/shoppingGuide/getId/" + oo.stoid + "/" + gg.guide_id, {}).then(res => { + if (res.data.code == 0) { + goods.guide_name = res.data.data.salesman; + goods.guide_sn = res.data.data.salesman_no; + } + }) + } + + //--商品的房间号-- + if (gg.room_id && gg.room_id > 0) { + item.room_ids = gg.room_id; + goods.room_id = gg.room_id; + } + + // if (th.data.bn_goods.is_normal) { + // goods.is_pd_normal = 0; + // } + + item.order_goods.push(goods); + pdata.push(item); + + if (pdata.length == 0) return; + var str = JSON.stringify(pdata); + console.log("支付数据"); + console.log(str); + //return false; + wx.showLoading({ + title: "加载中" + }); + wx.request({ + url: oo.url + '/api/weshop/order/createWxdOrder', + data: str, + method: 'POST', + header: { + 'content-type': 'application/json' + }, // 设置请求的 header + success: function(res) { + + wx.hideLoading(); + if (res.statusCode == 200) { + var data = res.data; + if (data.code == 0) { + console.log(th.data.is_b_now); + //如果是购物车结算，还要删除购物车 + if (th.data.is_b_now == 0) { + console.log(th.data.cartlist_y); + var list = th.data.cartlist_y; + for (var i = 0; i < list.length; i++) { + //删除购物车 + getApp().request.delete("/api/weshop/cart/del/" + oo.stoid + "/" + list[i].id, {}); + } + } + var order_amount = 0; + pdata.forEach(function(em, ind) { + order_amount += em.order_amount; + }) + //要进行判断，如果是用微信支付，就要跳转到支付界面 + if (order_amount > 0) { + th.setData({ + isclose: 0 + }); + //void e.jumpToCart4({ + // order_sn: data.data, + // type:1, + // }, 1); + util_pay.pay(data.data, function() { + setTimeout(function() { + // wx.reLaunch({ + // //url: "/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data, + // url: "/pages/team/team_success/team_success?ordersn=" + data.data, + // }) + + wx.redirectTo({ + url: "/packageC/pages/luckyGo/luckyGo_details/luckyGo_details?type=1&ordersn=" + data.data + + "&group_id=" + th.data.param.group_id + "&goods_id=" + th.data.param.goods_id + + "&goods_name=" + th.data.bn_goods.goods_name, + }); + + }, 1000) + }, function() { + //支付失败 + setTimeout(function() { + //wx.navigateBack({ delta: 1 }) + wx.reLaunch({ + url: "/pages/user/order_list/order_list", + }) + }, 1000) + + }, oo.stoid, 1); + + } else { + var dd = { + parent_sn: data.data, + store_id: oo.stoid, + type: 1, + }; + wx.showLoading({ + title: '支付中', + mask: true, + }); + //return false; + getApp().request.post("/api/weshop/order/pay/createOrder", { + data: dd, + success: function(t) { + // console.log(t); + // app.my_warnning("支付成功",1,th); + wx.hideLoading(); + if (t.data.code == 0) { + + // setTimeout(function () { + th.setData({ + isclose: 0 + }); + + wx.showToast({ + title: '支付成功', + icon: 'success', + duration: 2000, + success: function() { + // 幸运购 + setTimeout(function() { + wx.redirectTo({ + url: "/packageC/pages/luckyGo/luckyGo_details/luckyGo_details?type=1&ordersn=" + data.data + + "&group_id=" + th.data.param.group_id + "&goods_id=" + th.data.param.goods_id + + "&goods_name=" + th.data.bn_goods.goods_name, + }); + }, 0); + + }, + }) + + + // if(th.data.is_normal==1){ + // /*-- + // wx.navigateTo({ + // url: "/pages/user/order_list/order_list", + // })--*/ + + // // var url="/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data; + // // wx.reLaunch({ + // // url: url + // // }) + + // }else{ + // // wx.reLaunch({ + // // url: "/pages/team/team_success/team_success?ordersn=" + data.data, + // // }) + // } + + + // }, 1000) + + } else { + wx.showToast({ + title: t.data.msg, + icon: 'none', + duration: 2000, + success: function() { + + // wx.reLaunch({ + // url: "/pages/user/order_list/order_list", + // }) + + }, + }) + }; + + + } + }); + } + } else { + th.data.is_summit_ing = 0; //是否提交中 + getApp().confirmBox(data.msg); + } + } else { + th.data.is_summit_ing = 0; //是否提交中 + console.log("index.js wx.request CheckCallUser statusCode" + res.statusCode); + } + }, + fail: function() { + th.data.is_summit_ing = 0; //是否提交中 + wx.hideLoading(); + console.log("index.js wx.request CheckCallUser fail"); + }, + complete: function() {} + }) + }, + + + + + + useCoupon: function() { + if (this.data.order.couponNum <= 0) { + //return t.showWarning("无可用优惠券"); + getApp().my_warnning("无可用优惠券", 0, this); + return; + } + var a = { + lid: this.data.coupon ? this.data.coupon.id : "0" + }; + wx.navigateTo({ + url: "/pages/user/checkcoupon/checkcoupon?" + s.Obj2Str(a) + }); + }, + + + + + enterAddressPage: function() { + getApp().globalData.is_cart_old = 1; + this.data.enterAddressPage = !0, wx.navigateTo({ + url: "/pages/user/address_list/address_list" + }); + }, + + + + + //--------立即购买时，选择自提和物流----------- + setexptype_w: function(t) { + var th = this; + var ty = t.currentTarget.dataset.t, + txt = t.currentTarget.dataset.txt; + th.setData({ + [txt]: ty + }); + var iszt = 1; + if (ty == 0) { + th.setData({ + is_all_zt: 0 + }); + } else { + for (var i = 0; i < th.data.cartlist.length; i++) { + var item = th.data.cartlist[i]; + if (item.exp_type == 0) { + iszt = 0; + break; + } + } + th.setData({ + is_all_zt: iszt + }); + } + //----计算此时购物车的价格---- + th.calculatePrice(); + }, + + + + + //--------立即购买时，选择自提和物流---------- + setexptype: function(t) { + var th = this; + var ty = t.currentTarget.dataset.t; + th.setData({ + bn_exp_type: ty + }); + //当物流为空的时候。 + if (ty == 0 && th.data.wu_arr == null) { + return th.get_wuliu(th.calculatePrice2()); + } + th.calculatePrice2() + console.log('setexptype'); + }, + + + + + //--------立即购买时，使用余额-------- + set_bn_useyuer: function() { + var th = this; + th.setData({ + bn_use_money: !th.data.bn_use_money + }); + th.calculatePrice2(); + }, + + + + + + set_js_useyuer: function() { + var th = this; + th.setData({ + js_use_money: !th.data.js_use_money + }); + th.calculatePrice(); + }, + + + + + //-------------------计算物流--------------- + calculatewuliu: function(code, o_shipping_price, goods_weight, + goods_piece, user_addr, freight_free, o_price, rs) { + var price = 0, + th = this; + price += parseFloat(o_shipping_price); + //如果是包邮 + if (freight_free > 0 && o_price > freight_free) { + return 0; + } + if (user_addr == null) { + return 0; + } + //计算物流的config item; + var item = null; + //先根据 镇 县 区找计算的config + item = th.get_wuliu_config(user_addr.district, code, rs); + if (item == null) item = th.get_wuliu_config(user_addr.city, code, rs); + if (item == null) item = th.get_wuliu_config(user_addr.province, code, rs); + if (item == null) item = th.get_wuliu_default(code, rs); + if (item == null) return o_shipping_price; + var fw_price = 0, + fp_price = 0; + item = item.config; + if (item == null) return o_shipping_price; + //------按重量---------- + if (goods_weight > 0) { + fw_price = parseFloat(item['money']); + if (goods_weight > item['first_weight']) { + var fw = goods_weight - item['first_weight']; + var n = Math.ceil(fw / item['second_weight']) + fw_price = fw_price + n * parseFloat(item['add_money']); + } + } + //------按件数---------- + if (goods_piece > 0) { + fp_price = parseFloat(item['piecemoney']); + if (goods_piece > item['first_piece']) { + var fp = goods_piece - item['first_piece']; + var m = Math.ceil(fp / item['second_piece']) + fp_price = fp_price + m * parseFloat(item['add_piecemoney']); + } + } + var rspice = parseFloat(price + fw_price + fp_price); + return rspice; + }, + + + + //------------循环获取config----------- + get_wuliu_config: function(region_id, code, rs) { + var item = null, + rslist = rs.pageData; + for (var i = 0; i < rslist.length; i++) { + if (rslist[i].code == code && rslist[i].region_id == region_id) { + item = rslist[i]; + } + } + return item; + }, + + + + + //-------循环获取config,code default------- + get_wuliu_default: function(code, rs) { + var item = null, + rslist = rs.pageData; + for (var i = 0; i < rslist.length; i++) { + if (rslist[i].shipping_code == code && rslist[i].is_default == 1) { + item = rslist[i]; + } + } + return item; + }, + + + + + + + //----------立即购买，选择物流------------- + bindPickerChange: function(e) { + var ind = e.detail.value + this.setData({ + index: ind + }); + this.calculatePrice2(); + }, + + + + + + //----------购物车结算，选择物流------------- 01 + // bindPickerChange_w: function(e) { + // var ind = e.detail.value, + // txt = e.currentTarget.dataset.txt; + // this.setData({ + // [txt]: ind + // }); + // this.calculatePrice(); + // }, + + + + + cart_set_err: function(e) { + var txt = e.currentTarget.dataset.err; + var ob = {}; + ob[txt] = this.data.imgUrl + "/miniapp/images/default_g_img.gif"; + this.setData(ob); + }, + + + + + // 开启物流的弹窗 + show_wu_arr: function(e) { + this.setData({ + open_express: 1 + }); + }, + + + + //更新下默认，在onshow里面 + update_code() { + var th = this, + m_wind = 0, + def_exp_code = getApp().globalData.userInfo.def_exp_code; + + var uii = setInterval(function() { + if (th.data.wu_arr) { + clearInterval(uii); + for (var k = 0; k < th.data.wu_arr.length; k++) { + var item = th.data.wu_arr[k]; + if (def_exp_code == item.code) { + m_wind = k; + } + } + //--如果是立即购买-- + th.setData({ + index: m_wind, + is_express: m_wind + }); + } + }, 500) + }, + + + + // 关闭物流的弹窗 + close_express: function() { + this.setData({ + open_express: 0 + }); + }, + + + + + // 选择物流 + click_express_name: function(e) { + var express_name = e.currentTarget.dataset.name, + shippingcode = e.currentTarget.dataset.shippingcode; + var index = e.currentTarget.dataset.idxe; + var ob = { + is_express: index, + is_shipping_code: shippingcode, + index: index + }; + this.setData(ob); + }, + + + + + //点击确定物流 + determine_expres: function(e) { + this.setData({ + open_express: 0 + }); + this.calculatePrice2(); + }, + + + + + //设置默认物流 + select_default_logistics: function() { + var th = this; + var is_shipping_code = this.data.is_shipping_code + getApp().request.put("/api/weshop/users/update", { + data: { + user_id: getApp().globalData.user_id, + store_id: oo.stoid, + def_exp_code: is_shipping_code + }, + success: function(rse) { + if (rse.data.code == 0) { + getApp().globalData.userInfo.def_exp_code = is_shipping_code; + th.setData({ + open_express: 0 + }); + //----计算此时购物车的价格，这个页面没有calculatePrice(),2021.7.19---- + //if(th.data.is_b_now==1) th.calculatePrice2(); + //else th.calculatePrice(); + th.calculatePrice2(); + } + } + }) + }, + + + + + //跳转到购买卡 + buycard: function() { + getApp().goto("/pages/user/plus/plus"); + getApp().globalData.plus_buy_back = 1; + }, + + + // 获取team_id + get_teamId(options) { + let aid = options.aid; + let store_id = options.store_id; + let user_id = options.user_id; + let url = `/api/weshop/prom/luckyActivity/page?store_id=${store_id}&is_end=0&timetype=1&id=${aid}`; + getApp().request.get(url, { + success: function(res) { + if(res.data.code == 0) { + let team_id = res.data.data.pageData[0]['team_id']; + wx.setStorage({ + key: 'team_id', + data: team_id, + }); + }; + } + }); + }, + + + + + + +}); diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.json b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.json new file mode 100644 index 0000000..0cfb931 --- /dev/null +++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.json @@ -0,0 +1,7 @@ +{ + "navigationBarTitleText": "填写订单", + "enablePullDownRefresh": false, + "usingComponents": { + "warn": "/components/long_warn/long_warn" + } +} \ No newline at end of file diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml new file mode 100644 index 0000000..d8ac4ac --- /dev/null +++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml @@ -0,0 +1,211 @@ + + + + + + + + + + + + + + + + + + + + + + + {{bn_pickname}} + + + + + + {{bn_goods.goods_name}} + + + {{filters.show_gui_ge(bn_goods.goods_spec,bn_goods.goods_color)}} + + + + + ￥{{filters.toFix(param.goods_price,2)}} + x{{bn_goods.buynum}} + + + + + + + + + + + {{show_card.CardName}} + + 立减 {{filters.toFix(card_cut_price,2) }} 元 + + + vip超级会员仅需{{show_card.CardFee}}元 + + + + + 立即开通 + + + + + {{order.store_prom}} + + + + + + 选择物流 + + {{wu_arr[index].name}} + + + + + + + + + + + 留言 + + + + + + + + + + + + + 使用余额 :￥{{yuer}} + + + + 商品金额 + + ￥ {{param.goods_price}}元 + + + + 定金金额 + ￥ {{formData.all_price}}元 + + + + 配送费用 + ￥ {{formData.shipping_price}}元 + + + 使用余额 + - ￥ {{formData.user_money}}元 + + + + + + + + 应付金额：￥{{formData.order_amount}} + + + + + + + + + + + + + + + + 选择物流名字 + + + + × + + + + + + + + Γ + + + + + {{express_list.name}} + + + + + + + 确定 + + + 设为默认 + + + + + + + diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxss b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxss new file mode 100644 index 0000000..686099e --- /dev/null +++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxss @@ -0,0 +1,983 @@ +.bdr_t-14 { + border-top-left-radius: 14rpx; + border-top-right-radius: 14rpx; +} +.bdr_b-14 { + border-bottom-left-radius: 14rpx; + border-bottom-right-radius: 14rpx; +} +.bdr14 { + border-radius: 14rpx; +} +.mgt20 { + margin-top: 20rpx; +} +.shadow { + box-shadow: 0 4rpx 12px #e7e9eb; +} +.shadow-1 { + box-shadow: 16rpx 0px 12px #e7e9eb; +} + + +page { + /* background-color: #FAFAFA; */ + background-color: #F0F0F0; + padding: 0 22rpx; + box-sizing: border-box; +} +.container { + background-color: #F0F0F0; + /* padding-top: 28rpx; */ + padding-bottom: 120rpx; +} +.user-mes { + position: relative; + background-color: #fff; + font-size: 32rpx; + color: #444; + /* margin-top: 28rpx; */ + border-radius: 14rpx; +} +.user-contact { + padding: 24rpx 26rpx; + font-weight: 600; +} + +.location { + position: relative; + padding: 0 70rpx 24rpx; +} + +.pos-icon { + position: absolute; + left: 28rpx; + top: 6rpx; + width: 30rpx; + height: 36rpx; +} + +.border-img { + width: 100%; + height: 12rpx; +} + +.update-logistics { + position: absolute; + right: 0; + top: 0; + width: 80rpx; + height: 100%; + display: flex; + align-items: center; + justify-content: center; +} + +.arrow-rigth { + width: 32rpx; + height: 32rpx; +} + +.order-meg { + margin-bottom: 20rpx; + font-size: 28rpx; + +} + +.order-detail { + padding: 30rpx 0; + border-bottom: 2rpx solid #eee; + color: #777; + min-height: 190rpx; + background-color: #fff; + +} + +.goods-img { + float: left; + width: 200rpx; + height: 200rpx; + margin: 0 20rpx; +} + +.order-cont { + float: left; + width: 438rpx; +} + +.goods-name { + height: 74rpx; + line-height: 40rpx; + overflow: hidden; + margin-bottom: 16rpx; + font-size: 28rpx; + color: #333; + +} + +.goods-color { + font-size: 24rpx; +} + +.order-num { + margin-top: 25rpx; + font-size: 24rpx; + line-height: 42rpx; +} + +.set-mes{ + background-color: #fff; + /* margin-top: 20rpx; */ +} +.use-item{ + display: flex; + align-items: center; + height: 80rpx; + /* border-bottom: 1px solid #ddd; */ + font-size: 30rpx; + /* width:95%; +margin:auto; */ + padding: 0 26rpx; +} +.use-item>view{ + display: flex; + /* margin-right: 12rpx; */ +} +.use-item.bfff{ + background-color: #fff; +} +.use-item .dp{ + display: block; + width: 50rpx; + height: 50rpx; + margin-left: -6rpx; +} + +.set-item { + justify-content: space-between; + background-color: #fff; +} + +.set-btn { + display: flex; + font-size: 24rpx; +} + +.set-mes input { + width: 380rpx; + height: 50rpx; + line-height: 50rpx; + border: 1px solid #ddd; +} + +.use-btn { + width: 100rpx; + height: 50rpx; + margin-left: 20rpx; + line-height: 50rpx; + text-align: center; + background-color: #f23030; + color: #fff; +} + +.coupon-mes { + /* box-sizing: border-box; */ + height:95rpx; + padding: 0 26rpx; + background-color: #fff; + font-size: 30rpx; + color: #444; + /* width: 100%; */ + border-radius: 14rpx; + margin-top: 20rpx; + margin-bottom: 20rpx; +} + +.coupon-title { + display: flex; + justify-content: space-between; + align-items: center; + height: 92rpx; +} + +.coupon-title>view { + display: flex; +} + +.coupon-num { + height: 36rpx; + margin-left: 20rpx; + padding: 0 16rpx; + line-height: 36rpx; + text-align: center; + background-color: #f23030; + color: #fff; + font-size: 24rpx; +} + +.leave-word { + position: relative; + font-size: 24rpx; + margin-left: 20rpx; + flex-grow: 1; +} + +.word-box { + font-size: 26rpx; + /* width: 600rpx; */ + padding: 10rpx; + height: 28rpx; + line-height: 40rpx; +} + +.max-word { + position: absolute; + right: 0; + bottom: 0; +} + +.information { + padding: 0 26rpx; + background-color: #fff; + /* margin-bottom: 120rpx; */ +} + +.information .item { + display: flex; + justify-content: space-between; + height: 60rpx; + line-height: 60rpx; + font-size: 26rpx; + color: #777; +} + +.btn-wrap { + height: 94rpx; + box-sizing: border-box; + display: flex; + justify-content: space-between; + background-color: white; + align-items: center; + position: fixed; + bottom: 0; + left: 0; + width: 100%; + padding: 0 30rpx; +} + +.tips-btn { + /* float: right; + width: 200rpx; + height: 100rpx; + line-height: 100rpx; + text-align: center; + font-size: 30rpx; + color: #fff; + background-color: #f23030; */ + color: white; + background-color: #FE4445; + height: 72rpx; + line-height: 72rpx; + padding: 0 42rpx; + border-radius: 36rpx; + margin-left: 0; + margin-right: 0; +} + +.pay-amount { + /* float: right; + display: flex; + align-items: center; + height: 100rpx; + font-size: 26rpx; + margin-right: 40rpx; */ +} + +.payable { + color: #444; + /* margin-right: 20rpx; */ +} + +.shipping-modal { + z-index: 20; + position: fixed; + bottom: 0; + left: 0; + right: 0; + overflow-y: hidden; + color: #666666; + background-color: white; +} + +.shipping-nav { + text-align: center; + font-size: 35rpx; + padding-top: 30rpx; +} + +.shipping-list { + padding: 20rpx 30rpx 40rpx; + font-size: 28rpx; +} + +.shipping-item { + display: block; + padding: 20rpx 0; +} + +.shipping-btn { + width: 100%; + color: white; + background-color: #f23030; + line-height: 90rpx; + text-align: center; + font-size: 40rpx; +} + +/*----------nyf新增，地址---------*/ +.add_new{ + height: 90rpx; + display: flex; + align-items: center; + padding: 0 26rpx; +} +.addr_jia{width: 45rpx; height: 45rpx; border: 1rpx solid #ddd; + margin-right: 15rpx;vertical-align: middle;} +.yu_er{ + margin-left: 10rpx; + /* margin-right: 60rpx; */ +} +.wuliu{margin-left: 20rpx;} + + +/*---- 优惠券列表 -----*/ +.xc-coupon-frame{ + width: 100%; + height: 92rpx; + +} +.xc-coupon-frame .work-frame{ + width: 100%; + height: 100%; + border-bottom:3rpx solid #eee; + padding: 0 26rpx; + background-color: white; +} +.xc-right{ + width:20rpx; + height:20rpx; + border-top:2rpx solid #000; + border-right:2rpx solid #000; + transform:rotate(45deg); + display:inline-block; +} + +.xc-coupon-frame .work-frame .work{ font-size: 30rpx; line-height: 92rpx; } +.xc-right-frame{font-size: 30rpx;line-height: 92rpx; margin-right: 10rpx } + +/* 自定义弹出窗口 */ +.cx-popup{ + width:100%; + height:880rpx; + background: #fff; + z-index: 35; + border-top-left-radius: 20rpx; + border-top-right-radius: 20rpx; + position:fixed; + bottom:0; + left: 0; + /* padding-bottom: 25rpx; */ +} + +.cx-popup .top{ + width:95%; + height:100rpx; + border-bottom:3rpx solid #ddd; + margin: auto; + margin-top: 30rpx; + +} +.xc-top-content{ + width: 93%; + height:85rpx; + padding-top: 30rpx; + font-size: 34rpx; + font-weight: 600; + +} + + +.xc-valid-coupon{ + width: 90%; + height:40rpx; + padding-top: 24rpx; + overflow: hidden; +} +.xc-frame{ + width: 100%; + height:60%; +} + +.xc-frame .list-frame{ + width: 95%; + height: 100%; + overflow-y:scroll; + +} +.xc-close-frame{ + margin-top:-10rpx; + +} + +.xc-close{ + width: 37rpx; +height: 37rpx; +border-radius: 50%; +border: 3rpx solid #333; +text-align: center; +line-height: 34rpx; +font-size: 29rpx; +color: #333; + +} +.xc-money{ + color: #af2346; + font-size: 35rpx; +} + +.xc-money-frame{ + margin-left:35rpx; + +} +.xc-coupon-effect{ + width: 99%; + min-height: 100rpx; + border-bottom:3rpx solid #ddd; + + +} +.xc-goods-coupon{ + width: 85%; + height:100%; + +} +.xc-title{ + width:50%; + margin-left:222rpx; + +} +.xc-coupon-money0{ + color: #c91e31; + font-size: 35rpx; + line-height: 40rpx; + +} +.xc-coupon-money{ + color: #c91e31; + font-size: 35rpx; + line-height: 40rpx; + padding-top: 10px; + +} +.xc-coupon-money1{ + color: #444; + font-size: 28rpx; + line-height: 60rpx; + + +} +.xc-coupon-time{ + height: 50rpx; + font-size: 27rpx; + color: #a4a4a4; +} +.xc-coupon-time .time{ + margin-left: 15rpx; + font-size: 27rpx; +} +.xc-coupon-selection{ + height:100%; +} + +.xc-confirm { + width: 50%; + border-radius: 50rpx; + height: 80rpx; + margin:0 auto; + background:#d60021; + color:#fff; + font-size:28rpx; + margin-top: 28rpx; +} + +.up{ animation: up .7s; } +.down{ animation: down 1s; } +@keyframes up { 0% { transform: translateY(550rpx); } 100% { transform: translateY(0); } } +@keyframes down { 0% { transform: translateY(0); } 100% { transform: translateY(550rpx); } } + +.xc-not-Selection{ + width: 40rpx; +height: 40rpx; + background: #eeeeee; +} + + +.xc-close-express{ + width: 40rpx; +height: 40rpx; +border-radius: 50%; +border: 3rpx solid #333; +text-align: center; +font-size:32rpx; +line-height: 38rpx; +color: #333; +margin-top: 5rpx; +} +.cx-popup .tops{ + width: 100%; +height: 145rpx; +border-bottom: 3rpx solid #eee; + +} +.top-content { + width: 82%; +padding-top: 33px; +height: 100%; +padding-left: 40rpx; +} +.close-frame{ + margin-top: 30rpx; + +} + +.xc-hook { +width: 33rpx; +height: 33rpx; +transform: rotate(-135deg); +line-height: 35rpx; +text-align: center; +margin-right: 20rpx + + +} +.xc-hooks { +width: 30rpx; +height: 30rpx; +border: 1rpx solid #999; +margin-right: 20rpx; +} +.express_list_frame{ + display: flex; +height: 80rpx; +align-items: center; +padding-left: 40rpx; +border-bottom: 1rpx solid #eee; + +} +.express_list{ + width: 100%; + height: 65%; + overflow-y: auto; + margin-bottom: 40rpx; + +} +.xc-confirms { + box-sizing: border-box; + width: 40%; + border-radius: 50rpx; + height: 80rpx; + margin:0 auto; + font-size:28rpx; + background: #fff; + color: #333; + border: 2rpx solid #333; +} + + +/* 优惠券的改版样式 */ +.xc-coupon-frame{ + /* width: 710rpx; */ + width: 100%; + height:auto; + margin: 0 auto; + +} +.xc-coupon-frame .coupon-frame{ + width: 100%; + height: 200rpx; + margin-top:10rpx; + border-bottom: 1rpx solid #eee; + +} +.xc-coupon-frame .coupon-frame .coupon-left{ + width: 215rpx; + height:100%; + overflow: hidden; +} +.xc-money-frames{ + width:96%; + margin-top: -10px; +} + +.xc-rmb-symbol{ + font-size:40rpx; + +} + +.xc-rmb-val{ + font-size:60rpx; + +} +.coupon-explain{ + font-size:25rpx; +width:100%; + + +} +.xc-valuer{ + margin-top:39rpx; + margin-left:28rpx; + font-size:25rpx; +} +.coupon-frame .oval{ + width:155rpx; + height:83rpx; + border-radius: 50%; + right:-78rpx; + top:-37rpx; +} +.coupon-right{ + /* width:490rpx; */ + height: 99%; + border-top: 1rpx solid #eaeaea; + /* //border-bottom: 1rpx solid #eaeaea; */ + border-right: 1rpx solid #eaeaea; + flex-grow: 1; +} +.coupon-annotation{ + width: 95%; + height: 100%; + +} +.xc-brand{ + width:100rpx; + height:35rpx; + line-height: 35rpx; + font-size:21rpx; + border-radius:10rpx; position: relative; top:-1px; + margin-right: 8rpx +} +.top-frame{ + width:82%; + height: 75rpx; + margin-top:10rpx; +} +.top-frame .coupon-wode{ + font-size: 25rpx; + margin-left:10rpx; + width:340rpx; + height:88rpx; +} +.coupon-code{ + width:60rpx; + height:60rpx; + margin-top:5rpx; + +} +.frame{ + width: 100% +} +.coupon-time{ + font-size: 23rpx; + line-height:33rpx; + color: #333; +} + +.clik-get{ + width:125rpx; + height:45rpx; + border-radius: 25rpx; + line-height: 45rpx; + font-size:25rpx; + bottom:67rpx; + right:6px; +} + +.code-img{ + margin-left:20rpx; +} +.bottmo-explain{ +top:145rpx; +width:94%; +border-top:1rpx dashed #eee; +padding-top:8rpx; +height:38rpx; +line-height: 51rpx; + +} +.font-word{ + font-size: 22rpx; +} +.circle-size{ + background: #a0a0a0; + width: 27rpx; + height: 27rpx; + margin-top:13rpx; +margin-left:8rpx; +display: flex; + +align-items: center; +} +.xc-jiantou{ + /* width: 9rpx; + height: 9rpx; */ + /* border-top: 2rpx solid #fff; + border-right: 2rpx solid #fff; */ + transform: rotate(-90deg); + color: #fff; + font-size: 15rpx; + /* display:inline-block; + margin-top: 6.5rpx; */ + text-align: center; +width: 24rpx; +} +.xc-buttom{ + box-sizing: border-box; + width:100%; + min-height:76rpx; + height:auto; + line-height:40rpx; + border-left:1rpx solid #eee; + border-right:1rpx solid #eee; + border-bottom:1rpx solid #eee; +/* margin-left: 6rpx; */ +} + +.goods-num{ + font-size: 28rpx; + color: #333; +} + +.explain-coupon{ + font-size:25rpx; + padding: 10rpx 10rpx +} +.circle-frame{ + width: 20rpx; + height: auto; + z-index:1; + left:210rpx; + +} +.circle-sawtooth{ + width: 11rpx; + height: 11rpx; + background: #fff; +} + +.red{background-color: #fe7496;} +.green{ background-color: #22c7c1;} +.blue{background-color:#5e82e3;} +.g_gray{background-color: #aaaaaa} + +.f_text{text-align: center; height:96rpx; } +.xc-hook.sn { + margin-top:12%; +width:45rpx; +height:45rpx; +font-size:28rpx; +line-height:44rpx; + + +} +.xc-hooks.on{ + margin-top:12%; +width:42rpx; +height:42rpx; +} +.may_use_coupon{ + /* width: 95%; */ + /* height: 68rpx; */ + line-height:78rpx; + padding: 0 26rpx; + justify-content: space-between; + align-items: center; +} +.determine-frame{ + width: 100%; + height: 130rpx; + +} +.xc-determine{ + height: 80rpx; + width: 40%; + border-radius: 50rpx; +background: #d60021; +color: #fff; +font-size: 28rpx; +margin: 0 auto; + +} +.click-buttem{ +width: 90%; +margin: auto; +} +.logistics-name{ + margin-right:20rpx; +} +.xc-border{ + border-top:8rpx solid #eee; +width: 100% +} +.main-top{ +margin-top: 20rpx; + +} +.xc-hookts{ +border: 1rpx solid #999; + +} +.xc-hookts.on{ + width:30rpx; +height:30rpx; + +} +.xc-hookt.sn{ + width: 32rpx; +height: 32rpx; +font-size: 28rpx; +line-height: 34rpx; +} +.xc-hookt{ + transform: rotate(-135deg); +text-align: center; + +} +.main-bottom{ + margin-bottom: 20rpx; + +} +.xc-hookst{ + border: 1rpx solid #999; + +} +.xc-hookst.ons{ + width: 42rpx; +height: 42rpx; +margin-left: 20rpx; + +} +.is_use_coupon{ + width: 65%; +justify-content: flex-end; +padding-top: 10rpx; + + +} +.xc-hooka{ + transform: rotate(-135deg); +text-align: center; + +} +.xc-hooka.sn{ + width: 45rpx; +height: 45rpx; +font-size: 28rpx; +line-height: 44rpx; +margin-left: 20rpx; + +} +.color-gray{ + color: #808080; +} +.n_guige{ display: inline-block; background:rgb(236, 236, 236); color: rgb(63,63,63); padding: 3rpx 10rpx; border-radius: 3rpx } +.gift_image{ width: 60rpx; height: 60rpx; position: absolute; top: 0; left: 0} + +.quan_num_show{ padding: 4rpx 6rpx; background-color:#ea5551; color:#fff; border-radius: 6rpx;margin-left:10rpx;font-size:24rpx;} + +.navigator-hover { + background: none; + opacity: 1; +} + +.plus_buy{ + background-color: #fff; + margin:15rpx 0; + padding: 20rpx 10rpx; + position: relative; +} + + +.card_bg { + box-sizing: border-box; + padding: 2rpx 10rpx; + height: 28rpx; + border-radius: 26rpx; + font-size: 18rpx; + line-height: 28rpx; + max-width: 210rpx; + background: #333; + color: #fff; + margin-left: 8rpx; + position:relative; + top:7rpx; +} + +.card_bg image { + width: 19rpx; + height: 19rpx; + margin-right: 8rpx; +} + +/* .card_bg .card_name { + max-width: 76rpx; + width: auto; + overflow: hidden; + white-space: nowrap; +} */ + +.card_name { + position: relative; + top: -4rpx; + margin-left: 6px; +} + +.car_tri_up { + width: 0;height: 0; + border-left: 20rpx solid transparent; + border-right: 20rpx solid transparent; + border-bottom: 20rpx solid #fff; + position: absolute; + right: 20rpx; + top:-10rpx +} +.card_op{ + position: absolute; + right: 20rpx; + top:36rpx +} + + +.tab-container { + font-size: 28rpx; + margin-top: 20rpx; + display: flex; +} + +.tab-wrapper { + background-color: #ccc; + display: flex; + border-radius: 40rpx; + overflow: hidden; +} + +.tab { + padding: 20rpx 30rpx; + +} + + +.tab.active { + background-color: white; + border-radius: 40rpx; +} diff --git a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js index 1ee2e18..7405e0f 100644 --- a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js +++ b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js @@ -9,6 +9,8 @@ var t = require("../../../../utils/util.js"), o = s.globalData.setting, os = o; var regeneratorRuntime = require('../../../../utils/runtime.js'); + +let self = null; Page({ data: { @@ -48,8 +50,13 @@ Page({ showRules: false, isSuccess: false, showPoster: false, + + luckyGoMembers: [], + // team_id: 0, }, + onLoad: function (t) { + self = this; if(t.team_id != null && t.team_id !=undefined) { this.setData({ team_id: t.team_id, @@ -71,7 +78,7 @@ Page({ this.init(order_sn); //-- 自定义海报 -- - getApp().request.promiseGet("/api/weshop/goods/poster/page",{ + getApp().request.promiseGet("/api/weshop/goods/poster/page", { data:{store_id:os.stoid, type:1, is_use:1 } }).then(res=>{ if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0] ){ @@ -107,9 +114,16 @@ Page({ onUnload: function () { // 开团成功后,清除storage里的team_id - if(this.data.luckyGoInfo.num && this.data.luckyGoInfo.num == 0) { - wx.removeStorageSync('team_id'); - }; + // if(this.data.luckyGoInfo && this.data.luckyGoInfo.num == 0) { + // wx.removeStorageSync('team_id'); + // }; + // // 如果是从会员中心的幸运购列表点击进来的,退出时清除storage里的team_id + // if(this.data.param.from == 1) { + // let team_id = wx.getStorageSync('team_id'); + // if(team_id != null && team_id != undefined) wx.removeStorageSync('team_id'); + // }; + + wx.removeStorageSync('team_id'); }, //关闭展开列表 @@ -169,7 +183,7 @@ Page({ pt_listno = "",//团编号 pt_prom_id = 0, //活动id ee = this, - team_id = 0,//活动id + //team_id = 0,//活动id ordertx=[],//头像图片 share_img=null,//分享图片 teamlist=null,//活动表 @@ -306,16 +320,18 @@ Page({ // if(ct_price==0) ct_price=min_price; // } + //获取大家都在团信息 - getApp().request.promiseGet("/api/weshop/teamlist/pageteam/1?store_id="+ os.stoid +"&is_end=0&is_show=1" , { - data:{page:1,pageSize:2} - }).then(res => { - if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ - pageteam = res.data.data.pageData; - ee.setData({pageteam: pageteam,}) - } + // getApp().request.promiseGet("/api/weshop/teamlist/pageteam/1?store_id="+ os.stoid +"&is_end=0&is_show=1" , { + // data:{page:1,pageSize:2} + // }).then(res => { + // if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ + // pageteam = res.data.data.pageData; + // ee.setData({pageteam: pageteam,}) + // } - }) + // }) + //--当是成团的时候的操作-- // if(order.pt_status==2 || order.pt_status==4 || order.pt_status==5){ @@ -343,9 +359,9 @@ Page({ wx.hideLoading(); - wx.setNavigationBarTitle({ - title: "拼团详情", - }); + // wx.setNavigationBarTitle({ + // title: "拼团详情", + // }); // ee.countDown2(); @@ -467,8 +483,10 @@ Page({ scene += "_" + getApp().globalData.room_id; }; ///二微码 - var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + - os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo"; + // var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + + // os.stoid + "?sceneValue=" + scene + "&pageValue=packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo"; + var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + + os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo"; // 读取文件成功则OK-- @@ -954,32 +972,41 @@ Page({ //------ 分享配置 -------- onShareAppMessage: function (e) { - var th=this; - var scene=this.data.teamgroup.id; - var url="/pages/team/team_show/team_show?tg_id="+scene; - //--分享图片-- - var img=th.data.iurl+th.data.teamlist.share_imgurl; - //--把会员分享出去-- - if(getApp().globalData.user_id){ - if(url.indexOf("?")>0) - url+="&first_leader="+getApp().globalData.user_id; - else - url+="?first_leader="+getApp().globalData.user_id; - } - // console.log('url+++++>>>>>', url, th.data.teamlist.title); - - var share_title=th.data.teamlist.title; - if(th.data.teamlist.share_title){ - share_title=th.data.teamlist.share_title; + var pagePath = `packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=${this.data.param.goods_id}&prom_type=9&group_id=${this.data.param.group_id}`; //当前页面url + // console.log('pagePath=====xxxxxx>', pagePath); + var imgPath = this.data.iurl + this.data.luckyGoInfo.original_img; + if (pagePath.indexOf('/') != 0) { + pagePath = '/' + pagePath; } - + // if(getApp().globalData.user_id){ + + // if(pagePath.indexOf("?")>0){ + // pagePath+="&first_leader="+getApp().globalData.user_id; + // }else{ + // pagePath+="?first_leader="+getApp().globalData.user_id; + // } + // } return { - path:url, - title: share_title, - imageUrl: img, + title: "邀您一起参加幸运购", + path: pagePath, + imageUrl: imgPath, } }, + // onShareTimeline() { + // // var store_name = getApp().globalData.config ? getApp().globalData.config.store_name:''; + // // var pagePath = this.route; //当前页面url + + // // if(!store_name) store_name = getApp().globalData.setting.appName; + // // if (pagePath.indexOf('/') != 0) { + // // pagePath = '/' + pagePath; + // // } + // // return { + // // title: store_name + '-幸运购活动列表', + // // path: pagePath, + // // } + // }, + clickShare() { this.setData({ share_hidden: true, @@ -1123,55 +1150,153 @@ Page({ // 获取幸运购参团情况 async get_team_info () { - var th = this; - // 幸运购成团信息 - await getApp().request.promiseGet("/api/weshop/prom/luckyActivity/page", { - data: { - store_id: o.stoid, - is_end: 0, - timetype: 1, - id: this.data.param.group_id, - } - }).then(res => { - var luckyGoInfo = res.data.data.pageData[0]; - var team_id = luckyGoInfo.team_id; + var th = this; + var team_id; + var luckyGoInfo; + var user_id = getApp().globalData.user_id; - th.setData({ - luckyGoInfo, - team_id, + + + // 邀请链接待完善 + + getApp().request.promiseGet("/api/weshop/prom/luckyActivity/page", { + data: { + store_id: o.stoid, + is_end: 0, + timetype: 1, + id: th.data.param.group_id, + } + }).then(res => { + if(res.data.code == 0) { + + luckyGoInfo = res.data.data.pageData[0]; + + + + // else { + // team_id = luckyGoInfo.team_id; + + // // 待完善 + // if(luckyGoInfo.team_id == 0) { + // team_id = wx.getStorageSync('team_id'); + // }; + + // }; + + th.setData({ + luckyGoInfo, + }); + + //参团成功后,检查team_id + //如果team_id为0, 表示当前已开启新的一期，文字提示应改为’参团成功，本期幸运购已开团，中奖结果可点击下方查看参团列表‘ + //如果team_id为0，取出之前保存的team_id替换掉，请求上一期已成团的幸运购活动 + //如果从会员中心的幸运购列表邀请好友点击进来，不执行storage操作 + if(th.data.param.from == 1) return false; + // if(team_id > 0) { + // wx.setStorage({ + // key: 'team_id', + // data: team_id, + // }); + // console.log('存储team_id', team_id); + // } else { + // let team_id2 = wx.getStorageSync('team_id'); + // console.log('获取team_id', team_id2); + // th.setData({ + // team_id: team_id2, + // // isSuccess: true, + // }); + // }; + + // th.setData({ + // luckyGoInfo, + // team_id, + // }); + + }; + + }); + + if(th.data.param.from == 1) { +   team_id = th.data.param.team_id; +  } else { + + // 单独获取最新的team_id; + await getApp().request.promiseGet("/api/weshop/prom/luckyOrder/getUserOrderLastInfo/" + o.stoid + "/" + user_id + "/" + th.data.param.group_id, { + data: { + } + }).then(res => { + + if(res.data.code == 0) { + + // if(th.data.param.from == 1) { + //   team_id = luckyGoInfo.team_id; + //  } else { + // team_id = res.data.data.team_id; + // }; + + team_id = res.data.data.team_id; + + + th.setData({ + team_id, + }); + + }; + }); - //参团成功后,检查team_id - //如果team_id为0, 表示当前已开启新的一期，文字提示应改为’参团成功，本期幸运购已开团，中奖结果可点击下方查看参团列表‘ - //如果team_id为0，取出之前保存的team_id替换掉，请求上一期已成团的幸运购活动 - if(team_id != 0) { - wx.setStorage({ - key: 'team_id', - data: team_id, - }); - } else { - let team_id = wx.getStorageSync('team_id'); - th.setData({ - team_id: team_id, - isSuccess: true, - }); - }; - - }); + }; + // wx.removeStorageSync('team_id'); + + // 幸运购成团成员 await getApp().request.promiseGet("/api/weshop/prom/luckyOrder/page", { data: { store_id: o.stoid, - team_id: this.data.team_id, + team_id: team_id, } }).then(res => { - th.setData({ - luckyGoMembers: res.data.data.pageData, - }); - }); + if(res.data.code == 0) { + console.log('当前参团成员', res, team_id); + let myId = getApp().globalData.userInfo.user_id; + let luckyGoMembers = res.data.data.pageData; + th.setData({ + luckyGoMembers, + }); + + self.isMe(myId, luckyGoMembers); + }; + + }); + + + }, + + // 判断自己是否中奖 + isMe(myId, list) { + list.some((item, index) => { + if(item.team_status == 2) { + if(item.user_id == myId) { + self.setData({ + iWin: true + }); + return true; + }; + } + }); + }, + + + //-----图片失败，默认图片----- + bind_bnerr: function (e) { + var _errImg = e.target.dataset.errorimg; + var _errObj = {}; + _errObj[_errImg] = '/miniapp/images/default_g_img.gif'; + this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; + }, diff --git a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.json b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.json index b175d83..aab5bad 100644 --- a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.json +++ b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.json @@ -2,6 +2,7 @@ "navigationBarTitleText": "参团详情", "enablePullDownRefresh": false, "usingComponents": { - "share": "/components/share/share" + "share": "/components/share/share", + "nav_box": "/components/nav_box/nav_box" } } \ No newline at end of file diff --git a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxml b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxml index 2155d60..0d3d155 100644 --- a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxml +++ b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxml @@ -4,9 +4,9 @@ - - + + + @@ -16,12 +16,17 @@ {{filters.price(luckyGoInfo.group_price)}} - 零售价{{luckyGoInfo.market_price}} + + + + - - 待成团 + + 已成团 + 待成团 @@ -39,7 +44,7 @@ 规则 - + - + - 参团成功，还差{{filters.show_default(luckyGoInfo.group_num, '0') - filters.show_default(luckyGoInfo.num, '0')}}人即可成团，请留意成员开奖通知！ - 参团成功，本期幸运购已开团！ + + 参团成功，本期幸运购已开团！ + {{iWin ? '恭喜您团中该商品，请等待商家发货~':'很遗憾您未团中，可获得一份帮团奖励，再接再厉噢~'}} + + 您已参团成功，还差{{filters.show_default(luckyGoInfo.group_num, '0') - filters.show_default(luckyGoInfo.num, '0')}}人参与即可成团！ + 组团中，还差{{filters.show_default(luckyGoInfo.group_num, '0') - filters.show_default(luckyGoInfo.num, '0')}}人即可成团！ - 未团中可获得帮团奖励 + + + @@ -81,16 +92,16 @@ - + - + @@ -162,7 +173,7 @@ 拼团成功, 规定时间内支付尾款即发货 - + 点击下方按钮分享给小伙伴,可快速成团！ @@ -188,11 +199,11 @@ - 查看拼团列表 + 查看参团成员 {{item.nickname}} - 参团编号：{{item.team_sn}} + @@ -229,7 +240,7 @@ - + - + @@ -346,7 +357,6 @@ - 规则详情 @@ -365,9 +375,13 @@ - 我知道了 + 我知道了 - + . + + + + diff --git a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxss b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxss index 0d64a21..c8fb84e 100644 --- a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxss +++ b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxss @@ -145,7 +145,7 @@ margin-top: 30rpx; height:100rpx; border-radius: 50%; overflow: hidden; - background-color: white; + background-color: #f2f2f2; } .d ~ .d { @@ -979,6 +979,7 @@ height:40rpx; height: 60rpx; border-radius: 50%; overflow: hidden; + background-color: #f2f2f2; } diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml index 80bc77c..790ecba 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml @@ -18,7 +18,8 @@ ￥ {{sele_g.shop_price}}
- ￥ {{prom_price || filters.div100(luckGoInfo.group_price)}} + ￥ {{filters.div100(luckGoInfo.group_price)}} + @@ -28,7 +29,7 @@ 可售：{{def_pick_store.CanOutQty}} 可售:0 - 可售：{{sele_g.store_count}} + 可售：{{sele_g.store_count}} - + 规则 @@ -29,8 +29,8 @@ - 恭喜{{item.nickname}} - 获得了"{{item.goods_name}}" + 恭喜{{item.nickname}}获得了{{item.goods_name}} + @@ -71,7 +71,35 @@ - + + + + + + 距活动结束还有 + 距活动开始还有 + + + + {{djs.day}} + + 天 + + + {{djs.hou}} + + 时 + + {{djs.min}} + + 分 + + {{djs.sec}} + + 秒 + + + @@ -82,22 +110,18 @@ ￥ - {{filters.toFix(data.shop_price,2)}} + + {{filters.toFix(luckGoInfo.group_price/100,2)}} - 零售价￥{{filters.toFix(data.market_price,2)}} + 手店价 + + {{sele_g[card_field]}} + {{sele_g.shop_price}} - + @@ -174,7 +198,7 @@ - @@ -1568,7 +1609,7 @@ 服务项目-{{i.name}} - 数量：{{i.num}} + 数量：{{i.num}} @@ -1578,7 +1619,7 @@ {{luckGoInfo[item.name]}} - 金额：{{filters.div100(luckGoInfo[item.num])}} + 金额：{{filters.div100(luckGoInfo[item.num])}} @@ -1591,7 +1632,7 @@ {{item.name}} - 数量：{{luckGoInfo[item.num]}} + 数量：{{luckGoInfo[item.num]}} @@ -1603,3 +1644,6 @@ + + + diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss index 5670482..cc55fd8 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss @@ -2889,7 +2889,7 @@ button.custom-service::after{ .mt20{ margin-top: 20rpx} .group .group-list.luck { - padding: 0 20rpx; + padding: 0 20rpx 20rpx 20rpx; justify-content: flex-start; } diff --git a/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.js b/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.js index 2726629..d892b75 100644 --- a/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.js +++ b/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.js @@ -253,7 +253,7 @@ Page({ case 3: { //优惠券 app.request.promiseGet('/api/weshop/prom/luckyCoupon/page', { data: { - store_id: os.stoid, + store_id: app.globalData.setting.stoid, aid: self.data.currentItemAid, } }).then(res => { @@ -268,7 +268,7 @@ Page({ case 4: { //服务项目 app.request.promiseGet('/api/weshop/prom/luckyService/page', { data: { - store_id: os.stoid, + store_id: app.globalData.setting.stoid, aid: self.data.currentItemAid, } }).then(res => { diff --git a/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxml b/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxml index bee6b31..eacf839 100644 --- a/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxml +++ b/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxml @@ -8,7 +8,8 @@ - + + 参团中，还差{{filters.difference(item.num, item.group_num)}}人 已团中，{{item.shipping_status == 0 ? '待发货':'已发货'}} 未团中，已退款 @@ -28,10 +29,10 @@ - 共1件，实付金额：{{item.user_money}} + 共1件，实付金额：{{filters.toFix(item.order_amount+item.user_money,2)}} - 查看订单 - 邀请好友 + 查看订单 + 邀请好友 查看奖励 @@ -74,7 +75,7 @@ {{list.pageData[currentItemIndex][item.name]}} - 金额：{{filters.div100(list.pageData[currentItemIndex][item.num])}} + 金额：{{filters.div100((list.pageData[currentItemIndex][item.num]))}} diff --git a/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxss b/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxss index 2f13299..1559feb 100644 --- a/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxss +++ b/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxss @@ -49,7 +49,7 @@ page { } .title { - height: 88rpx; + /* max-height: 88rpx; */ } .tab-bd { diff --git a/packageC/pages/luckyGo/luckyGo_members/luckyGo_members.js b/packageC/pages/luckyGo/luckyGo_members/luckyGo_members.js index 8d64802..78e8384 100644 --- a/packageC/pages/luckyGo/luckyGo_members/luckyGo_members.js +++ b/packageC/pages/luckyGo/luckyGo_members/luckyGo_members.js @@ -47,6 +47,7 @@ Page({ self.getData(true, '/api/weshop/prom/luckyOrder/page', { store_id: app.globalData.setting.stoid, team_id: self.data.team_id, + pageSize: 20, }); @@ -84,6 +85,7 @@ Page({ this.scrollToLower('/api/weshop/prom/luckyOrder/page', { store_id: app.globalData.setting.stoid, team_id: self.data.team_id, + pageSize: 20, }); }, diff --git a/packageC/pages/luckyGo/luckyGo_members/luckyGo_members.json b/packageC/pages/luckyGo/luckyGo_members/luckyGo_members.json index 8ca2b8e..f83e184 100644 --- a/packageC/pages/luckyGo/luckyGo_members/luckyGo_members.json +++ b/packageC/pages/luckyGo/luckyGo_members/luckyGo_members.json @@ -1,5 +1,5 @@ { - "navigationBarTitleText": "参团成员", + "navigationBarTitleText": "本期参团成员", "enablePullDownRefresh": false, "usingComponents": {} } \ No newline at end of file diff --git a/packageC/pages/luckyGo/luckyGo_members/luckyGo_members.wxml b/packageC/pages/luckyGo/luckyGo_members/luckyGo_members.wxml index 7cfbe75..5025062 100644 --- a/packageC/pages/luckyGo/luckyGo_members/luckyGo_members.wxml +++ b/packageC/pages/luckyGo/luckyGo_members/luckyGo_members.wxml @@ -4,12 +4,12 @@ - {{item.nickname}} - 参团编号：{{item.team_sn}} + {{item.nickname}} + - {{filters.format_time(item.create_time, 1)}} + {{filters.format_time(item.add_time, 1)}} 待成团 未团中 已团中 diff --git a/packageC/pages/luckyGo/luckyGo_members/luckyGo_members.wxss b/packageC/pages/luckyGo/luckyGo_members/luckyGo_members.wxss index e03db31..69028f6 100644 --- a/packageC/pages/luckyGo/luckyGo_members/luckyGo_members.wxss +++ b/packageC/pages/luckyGo/luckyGo_members/luckyGo_members.wxss @@ -1,6 +1,10 @@ +page { + background-color: #f2f2f2; +} .list { padding-left: 20rpx; padding-right: 20rpx; + background-color: white; } .list-item { display: flex; diff --git a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js index e9b51a2..d6c761b 100644 --- a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js +++ b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js @@ -17,7 +17,8 @@ Page({ onLoad: function(e) { var th=this; var r = void 0 !== e.isGoup && e.isGoup; - + // console.log('e*************>>>>>>', e); + this.data.group_id = e.group_id; getApp().getConfig2(function (e) { th.setData({conf: e,sales_rules:e.sales_rules, userInfo: getApp().globalData.userInfo}); @@ -317,429 +318,40 @@ Page({ //--------立即支付---------- async jumpToCart4(e) { - var th=this; - if(this.data.optionIsGoup) - wx.navigateTo({ - url: "/pages/team/team_confirm/team_confirm?orderSn=" + this.data.order.order_sn + "&orderPay=true" - }) - var order=this.data.order; - var order_goods=order.order_goods; - var user_id=order.user_id; - - var wlist=""; - for(var i in order_goods){ - var good=order_goods[i]; - //线下取价功能已经关闭或者过期 - if(!th.data.is_open_offline && good.offline_cut>0){ - wx.showModal({ - title: '提示', - content: '线下取价功能已经关闭或者过期！' - }); - return false; - } - - //要每件每件的商品进行检查，看有么有超出库存，超出限购 - var good= order_goods[i],goodsbuynum=0,promgoodsbuynum=0,gg=null; - //获取单品的现在的活动状态 - await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + good.goods_id, { - }).then(res=>{ - gg=res.data.data; - }) - var limit = gg.viplimited; - var store_count = gg.store_count; - good.erpwareid=gg.erpwareid; - - //---要获得商品，该用户买了多少件,同步应用--- - await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", { - data: { - store_id: os.stoid, - user_id: getApp().globalData.user_id, - goods_id: good.goods_id, - prom_type: good.prom_type, - prom_id: good.prom_id - }, - }).then(res => { - var buy_num_data = res.data.data; - if (buy_num_data.promgoodsbuynum) promgoodsbuynum = buy_num_data.promgoodsbuynum; - goodsbuynum = buy_num_data.goodsbuynum; - }) - - var buyed_mum2=goodsbuynum+good.goods_num; - if (buyed_mum2 > limit && limit > 0) { - - var content=gg.goods_name+'购买数量超出商品限购,请取消订单'; - th.toast(content); - return false; - } - - //当是组合优惠的时候 - if(good.prom_type==7){ - //如果有组合购 - var isok = 1; - var url="/api/weshop/prom/zhbuy/get/"+os.stoid+"/"+good.prom_id+"/"+getApp().globalData.userInfo.user_id; - await getApp().request.promiseGet(url, {}).then(res => { - if(res.data.code==0 && res.data.data){ - if(res.data.data.is_show!=1){ - isok=0; - } - //如果活动已经结束 - if(res.data.data.is_end==1){ - isok=0; - } - //已经结束 - if(ut.gettimestamp()>res.data.data.end_time){ - isok=0; - } - //还未开始 - if(ut.gettimestamp() { - if (ut.ajax_ok(res)) { - var gdlist = res.data.data.pageData[0]; - good.buyqty=gdlist.buyqty; - } - }) - var num=good['buyqty']; - console.log(1111); - console.log(num); - //---- 要计算商品的限购 ----- - if(good['buyqty']>0){ - if(good.goods_num+promgoodsbuynum>good['buyqty']){ + // 幸运购检查库存量 api/weshop/activitylist/getActLen/{store_id}/{prom_type}/{prom_id} + if (parseInt(this.data.order.order_goods['0']['prom_type']) == 9) { + var aid = this.data.order.order_goods['0']['prom_id']; + var knum = 0; + await r.promiseGet('/api/weshop/activitylist/getActLen/' + os.stoid + '/9/' + aid, { + }).then(res => { + if (res.data.code == 0) { + knum = res.data.data; + } + + }); - var content= good['goods_name']+"超出活动限购\n"; - th.toast(content); - return false; - } - } - } + if (knum <= 0) { + getApp().confirmBox("库存为0，支付失败"); + return false; + } - //如果优惠促销和搭配购的时候 - if((good.prom_type==3 || good.prom_type==5) && good.is_collocation!=1 && good.is_gift!=1){ - var p_ok=1; - await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => { - if(res.data.code==0){ - var r_data=res.data.data; - if(!r_data.collocationPromList && good.prom_type==5){ - - var content=good.goods_name+'未找到活动,请取消订单重新购买'; - th.toast(content); - p_ok=0; - } - if(!r_data.promGoodsLists && good.prom_type==3){ - - var content=good.goods_name+'未找到活动,请取消订单重新购买'; - th.toast(content); - p_ok=0; - } - }else{ - - var content=good.goods_name+'未找到活动,请取消订单重新购买'; - th.toast(content); - p_ok=0; - } - }) - if(!p_ok) return false; } - - //商品的普通购买 ，不要进行判断 - if((good.prom_type==1 || good.prom_type==2 || good.prom_type==6 || good.prom_type==4) && !good.is_gift && !good.is_collocation && !good.is_integral_normal && !good.is_pd_normal){ - if(gg.prom_type!=good.prom_type && gg.prom_type>0) { - var content=gg.goods_name+'商品的活动发生了变化,请取消订单重新购买'; - th.toast(content); - return false; - } - }else{ - if((gg.prom_type==1 || gg.prom_type==3 || gg.prom_type==5 || gg.prom_type==6 || gg.prom_type==4) - && !good.is_collocation && !good.is_gift && !good.is_integral_normal && !good.is_pd_normal) { - var prom=null; - //---如果是活动的时候--- - var prom=null,th=this; - if(gg.prom_type==1){ - await getApp().request.promiseGet("/api/ms/flash_sale/getNew/"+os.stoid+"/"+user_id+"/"+gg.prom_id,{ - }).then(res=>{ - if(res.data.code==0){ - prom=res.data.data; - prom.price=prom.user_price; - } - }) - } - - if (gg.prom_type == 2) { - await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/"+ gg.goods_id + "/" + gg.prom_id, {}).then(res => { - if (res.data.code == 0) { - prom = res.data.data; - prom.price=prom.price; - } - }) - } - - - if(gg.prom_type==6){ - await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+gg.prom_id,{ - }).then(res=>{ - if(res.data.code==0){ - prom=res.data.data; - } - }) - } - - if(gg.prom_type==4){ - await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1",{ - data:{store_id:os.stoid,goods_id:gg.goods_id} - }).then(res=>{ - if(res.data.code==0 && res.data.data && res.data.data.pageData){ - prom=res.data.data.pageData[0]; - } - }) - } - - if(prom){ - var t_now=ut.gettimestamp(); - if(prom.is_end==0 && prom.start_timet_now){ - - var content=gg.goods_name+'商品的活动发生了变化,请取消订单重新购买'; - th.toast(content); - return false; - } - } - } - else{ - //不是赠品的时候 - if(!good.is_gift && good.prom_type!=3){ - var t_ok=1; - await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => { - if(res.data.code==0){ - var r_data=res.data.data; - //-- 参加了全局的优惠活动 -- - if(r_data.promGoodsLists){ - - var content=gg.goods_name+'商品的活动发生了变化,请取消订单重新购买'; - th.toast(content); - t_ok=0; - } - } - }) - if(!t_ok) return false; - } - - //-- 如果有参加线下取价 -- - if(good.offline_cut>0) wlist+=encodeURIComponent(gg.erpwareid)+","; - } - //赠品和搭配购不判断商品金额 - var isok=1; - var card_field=th.data.card_field; - //如果会员是等级会员,商品有等级价,且不是活动商品 - if(!good.is_gift && !good.is_collocation) { - if (card_field && gg[card_field] > 0) { - if (good.goods_price != gg[card_field] && good.offline_cut<=0) isok = 0; - if (good.goods_price >gg[card_field] && good.offline_cut>0) isok = 0; //如果线下价格比较贵，则不通过 - - } else { - if (good.goods_price != gg.shop_price && good.offline_cut<=0) isok = 0; - if (good.goods_price> gg.shop_price && good.offline_cut>0) isok = 0; //如果线下价格比较贵，则不通过 - } - var is_h=0; - if (!isok) { - - var content=gg.goods_name + '商品的价格发生了变化,请取消订单重新购买'; - th.toast(content); - return false; - } - } - - //--如果是线下库存的时候-- - if(th.data.conf.sales_rules==2){ - var ob={}; - await th.check_down_line_next(gg,good.goods_num,order.pickup_id,function(obj){ - ob=obj; - }) - if(ob.code==-1){ - - var content=gg.goods_name+'门店库存不足,请取消订单'; - th.toast(content); - return false; - } - - }else{ - if(good.goods_num>store_count){ - - var content=gg.goods_name+'商品的库存不足,请取消订单'; - th.toast(content); - return false; - } - - } - } - - console.log("------------------------------------"); - //---如果是活动的时候--- - var prom=null,goodsinfo=good,th=this; - if(goodsinfo.prom_type==1){ - await getApp().request.promiseGet("/api/ms/flash_sale/getNew/"+os.stoid+"/"+user_id+"/"+goodsinfo.prom_id,{ - }).then(res=>{ - if(res.data.code==0){ - prom=res.data.data; - prom.price=prom.user_price; - } - }) - } - - if (goodsinfo.prom_type == 2) { - await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/"+ good.goods_id + "/" + goodsinfo.prom_id, {}).then(res => { - if (res.data.code == 0) { - prom = res.data.data; - prom.price=prom.price; - } - }) - } - - - if(goodsinfo.prom_type==6 && !good.is_pd_normal){ - await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+goodsinfo.prom_id,{ - }).then(res=>{ - if(res.data.code==0){ - prom=res.data.data; - } - }) - } - - if(goodsinfo.prom_type==4 && !good.is_integral_normal){ - await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1",{ - data:{store_id:os.stoid,goods_id:goodsinfo.goods_id} - }).then(res=>{ - if(res.data.code==0 && res.data.data && res.data.data.pageData){ - prom=res.data.data.pageData[0]; - } - }) - } - - //----------如果有活动，并且在进行中，就不计算线下库存--------------- - if(prom){ - var now=ut.gettimestamp(); - if(prom.is_end==1 && prom.end_time prom.buy_limit && prom.buy_limit > 0) { - - var content=goodsinfo.goods_name+'购买数量超出商品活动限购,请取消订单重新购买'; - th.toast(content); - return false; - } - //看一下会员的秒杀价格是不是发生了变化 - if(goodsinfo.prom_type==1 && goodsinfo.goods_price!=prom.price){ - var content=goodsinfo.goods_name+'秒杀活动的价格发生了变化'; - th.toast(content); - return false; - } - - //看一下会员的团购价格是不是发生了变化 - if(goodsinfo.prom_type==2 && goodsinfo.goods_price!=prom.price){ - var content=goodsinfo.goods_name+'秒杀活动的价格发生了变化'; - th.toast(content); - return false; - } - if(goodsinfo.prom_type==4){ - if (good.goods_num > prom.limitqty-prom.buy_num) { - - var content=goodsinfo.goods_name+'购买数量超出商品活动库存,请取消订单'; - th.toast(content); - return false; - } - }else if(goodsinfo.prom_type == 1 || goodsinfo.prom_type == 2 || goodsinfo.prom_type == 6 ) { - if(order.add_time+5*600){ - wlist=ut.sub_last(wlist); - var keyid=order.pickup_id; - var user_info=getApp().globalData.userInfo; - if(!keyid) return false; - var offarr=null; - await getApp().request.promiseGet("/api/weshop/goods/listWarePrice", { - data:{ - VIPId:encodeURIComponent(user_info.erpvipid), - store_id:os.stoid, - PickupId:keyid, - WareIds:wlist}, - }, - ).then(res=>{ - if(res.data.code==0 && res.data.data && res.data.data.length>0){ - offarr=res.data.data; - } - }) - if(!offarr && offarr.length<=0 ){ - wx.showModal({ title: '获取线下取价失败',}); - } - var newarr=ut.convert_arr_key(offarr,'WareId'); - //-- 循环判断线下的价格 -- - for(var k in order_goods){ - var good=order_goods[k]; - //判断线下取价是不是一样 - if(newarr[good.erpwareid] && - parseFloat(newarr[good.erpwareid].WarePrice)!=parseFloat(good.goods_price)){ - - var content=good.goods_name + '商品的价格发生了变化,请取消订单重新购买'; - th.toast(content); - return false; - } - } - - } - - /*--- - o.jumpToCart4({ - order_sn: this.data.order.order_sn, - order_amount: this.data.order.order_amount, - type: 1 //正常单 - }, 1);--*/ - py.pay(this.data.order.order_sn, function() { - wx.showToast({title: '支付成功'}) - wx.navigateBack(); + wx.showToast({title: '支付成功'}) + wx.navigateBack(); },null,os.stoid,1); - }, + }, + checkTeam: function() { wx.navigateTo({ url: "/pages/team/team_detail/team_detail?foundId=" + this.data.order.orderTeamFound.found_id @@ -1472,27 +1084,41 @@ Page({ //跳转到商品 go_gd:function (e) { + // console.log(e); var gd= e.currentTarget.dataset.gd; - var good_url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + gd; - var url="/api/weshop/activitylist/getGoodActInfo"; - var req_data={ - store_id:os.stoid,goodsidlist:gd,is_detail:1 - }; + var prom_type = this.data.order.order_goods[0].prom_type; + // var good_url=''; + // if(prom_type == 9) { + // good_url = ''; + // } else { + // good_url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + gd; + // }; + + var good_url="/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=" + gd + '&group_id=' + this.data.group_id; + getApp().goto(good_url); + + // var url="/api/weshop/activitylist/getGoodActInfo"; + // var req_data={ + // store_id:os.stoid,goodsidlist:gd,is_detail:1 + // }; //获取秒杀的多规格 - getApp().request.promiseGet(url, {data:req_data}).then(res=>{ - if(res.data.code==0 && res.data.data){ - if(res.data.data.length==1){ - good_url+="&prom_type="+res.data.data[0].prom_type+"&prom_id="+res.data.data[0].act_id; - } - getApp().goto(good_url); + // getApp().request.promiseGet(url, {data:req_data}).then(res=>{ + // if(res.data.code==0 && res.data.data){ + // if(res.data.data.length==1){ + // good_url+="&prom_type="+res.data.data[0].prom_type+"&prom_id="+res.data.data[0].act_id; + // } + // getApp().goto(good_url); - }else{ - getApp().goto(good_url); - } - }) + // }else{ + // getApp().goto(good_url); + // } + // }) }, + + + diff --git a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml index 24652f6..dc1198b 100644 --- a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml +++ b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml @@ -30,16 +30,16 @@ data-errorimg="order.order_goods[{{index}}].original_img"> - + {{item.goods_name}} {{filters.show_gui_ge(item.goods_spec,item.goods_color)}} - + - ￥{{item.member_goods_price}} + ￥{{item.goods_price}} ×{{item.goods_num}} @@ -84,9 +84,10 @@ {{order.addTimeFormat}} - + 配送方式 - {{(order.shipping_name!=''&& order.shipping_name!=null) ?order.shipping_name:'无'}} + {{order.shipping_name}} + 自提 买家留言 @@ -173,7 +174,7 @@ - + @@ -205,12 +206,9 @@ url="/packageB/pages/user/comment/comment?status=0&order_id={{order.order_id}}">评价 去评价 - --> - - + + + diff --git a/packageC/pages/luckyGo/luckyGo_winners/luckyGo_winners.js b/packageC/pages/luckyGo/luckyGo_winners/luckyGo_winners.js index a1e4b4e..e3c1c24 100644 --- a/packageC/pages/luckyGo/luckyGo_winners/luckyGo_winners.js +++ b/packageC/pages/luckyGo/luckyGo_winners/luckyGo_winners.js @@ -68,6 +68,7 @@ Page({ store_id: app.globalData.setting.stoid, team_status: 2, goods_id: self.data.options.goods_id, + pageSize: 20, }); @@ -104,8 +105,9 @@ Page({ onReachBottom: function () { this.scrollToLower('/api/weshop/prom/luckyOrder/page', { store_id: app.globalData.setting.stoid, - team_status: 1, + team_status: 2, goods_id: this.data.options.goods_id, + pageSize: 20, }); }, diff --git a/packageC/pages/luckyGo/luckyGo_winners/luckyGo_winners.wxss b/packageC/pages/luckyGo/luckyGo_winners/luckyGo_winners.wxss index 43b561d..73bf1d4 100644 --- a/packageC/pages/luckyGo/luckyGo_winners/luckyGo_winners.wxss +++ b/packageC/pages/luckyGo/luckyGo_winners/luckyGo_winners.wxss @@ -8,11 +8,11 @@ page { } .img-container { - width: 60rpx; - height: 60rpx; + width: 80rpx; + height: 80rpx; border-radius: 50%; overflow: hidden; - margin-right: 10rpx; + margin-right: 20rpx; flex-shrink: 0; } @@ -32,7 +32,7 @@ page { display: flex; align-items: center; text-align: center; - font-size: 26rpx; + font-size: 28rpx; } .list-hd { diff --git a/packageC/pages/payForAnother/payForAnother.wxml b/packageC/pages/payForAnother/payForAnother.wxml index 2aac459..517f2cc 100644 --- a/packageC/pages/payForAnother/payForAnother.wxml +++ b/packageC/pages/payForAnother/payForAnother.wxml @@ -21,7 +21,7 @@ 代付订单信息 - + {{bn_pickname}}门店名称 diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js index 56341a8..680b6cf 100644 --- a/pages/cart/cart2_pt/cart2_pt.js +++ b/pages/cart/cart2_pt/cart2_pt.js @@ -793,7 +793,7 @@ Page({ item=item.config; if (item == null) return o_shipping_price; //------按重量---------- - if (goods_weight>0) { + if (goods_weight>=0) { fw_price =parseFloat(item['money']); if (goods_weight > item['first_weight']){ var fw = goods_weight - item['first_weight']; diff --git a/pages/giftpack/buygiftpack/giftpackbuy.js b/pages/giftpack/buygiftpack/giftpackbuy.js index 2e90b3a..34c9d82 100644 --- a/pages/giftpack/buygiftpack/giftpackbuy.js +++ b/pages/giftpack/buygiftpack/giftpackbuy.js @@ -25,39 +25,55 @@ Page({ curpage: 1, //当前分页数 pageSize: 10, //页大小 total: 0, //总数量 - ad_data:null, + ad_data: null, + first_leader: e.globalData.first_leader || 0, // 推荐人ID }, - onLoad: function(options) { - + onLoad: function (options) { var th = this; var my_confirm = th.selectComponent("#my_confirm"); //组件的id my_confirm.open_cancel(0); th.setData({ getStorageID: a.stoid, getUserID: d.user_id + }); + //-- 获取分享人的ID -- + var first_leader = options.first_leader || getApp().globalData.first_leader; + if (first_leader) { + this.setData({ + first_leader, + }) + //-- user_id代过来免登录 -- + getApp().globalData.first_leader = first_leader; + //调用接口判断是不是会员 + getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { + if (res.data.code == 0) { + getApp().globalData.guide_id = res.data.data.id; + } + }) + } + + getApp().request.promiseGet("/api/weshop/ad/page?pid=901&store_id=" + os.stoid, { + data: { + enabled: 1 + } + }).then(res => { + if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length > 0) { + var a = res.data.data.pageData; + var tt = { + 'ad_code': os.imghost + a[0].ad_code, + 'media_link': '', + 'ad_weapplink': a[0].ad_weapplink, + 'bgcolor': a[0].bgcolor, + }; + th.setData({ + ad_data: tt + }); + } }) - - - getApp().request.promiseGet("/api/weshop/ad/page?pid=901&store_id=" + os.stoid, { - data: { - enabled: 1 - } - }).then(res => { - if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ - var a = res.data.data.pageData; - var tt = { - 'ad_code': os.imghost + a[0].ad_code, - 'media_link': '', - 'ad_weapplink':a[0].ad_weapplink, - 'bgcolor':a[0].bgcolor, - }; - th.setData({ad_data:tt}); - } - }) - + }, - onShow: function() { + onShow: function () { //--先判断会员状态-- var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { @@ -68,7 +84,8 @@ Page({ }, - GetBuyPrice: function(e) { + //购买礼包 + GetBuyPrice: function (e) { var that = this.data; var th = this; var id = e.currentTarget.dataset.id; //活动id @@ -79,10 +96,10 @@ Page({ "是否确定购买该礼包", "取消", "确定", - function() { + function () { my_confirm.open_cancel(0); }, - function() { + function () { my_confirm.open_cancel(0); var json = { "actId": '', //活动Id @@ -91,25 +108,23 @@ Page({ "giftBagId": id, //礼包Id "storeId": that.getStorageID, //商家Id "userId": that.getUserID, //用户ID - "buyFrom": 2 + "buyFrom": 2, + "first_leader": that.first_leader, }; - - //-- 分享导购要记录 -- - if(getApp().globalData.guide_id){ - json.guide_id=getApp().globalData.guide_id; - } - - + + //-- 分享导购要记录 -- + if (getApp().globalData.guide_id) { + json.guide_id = getApp().globalData.guide_id; + } + var data = JSON.stringify(json); var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert"; getApp().request.json_post(url, json, - function(res) { + function (res) { if (res.data.code == 0 && res.data.data) { - - var order_sn = res.data.data.orderSn; - res = res.data.data.result; - if(!res) return false; - + var order_sn = res.data.data.orderSn; + res = res.data.data.result; + if (!res) return false; var url = "/pages/giftpack/payment/payment?money=" + money + "&order_sn=" + order_sn; wx.requestPayment({ timeStamp: String(res.timeStamp), @@ -117,10 +132,10 @@ Page({ package: res.packageValue, signType: res.signType, paySign: res.paySign, - success: function(res) { + success: function (res) { getApp().goto(url); }, - fail: function(res) { + fail: function (res) { getApp().my_warnning("取消支付", 0, th); } }); @@ -128,7 +143,7 @@ Page({ getApp().my_warnning(res.data.msg, 0, th); } }, - function(res) { + function (res) { } @@ -141,19 +156,21 @@ Page({ }, - GetBuyIntegral: function(e) { + // 积分兑换 + GetBuyIntegral: function (e) { var that = this.data; var th = this; var id = e.currentTarget.dataset.id; //活动id var my_confirm = th.selectComponent("#my_confirm"); //组件的id + my_confirm.open( "是否确定兑换该礼包", "取消", "确定", - function() { + function () { my_confirm.open_cancel(0); }, - function() { + function () { my_confirm.open_cancel(0); var json = { "actId": '', //活动Id @@ -162,72 +179,74 @@ Page({ "giftBagId": id, //礼包Id "storeId": that.getStorageID, //商家Id "userId": that.getUserID, //用户ID - "buyFrom": 2 + "buyFrom": 2, + "first_leader": that.first_leader }; - - //-- 分享导购要记录 -- - if(getApp().globalData.guide_id){ - json.guide_id=getApp().globalData.guide_id; - } + //-- 分享导购要记录 -- + if (getApp().globalData.guide_id) { + json.guide_id = getApp().globalData.guide_id; + } + console.log(json,'json'); var data = JSON.stringify(json); var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert"; getApp().request.json_post(url, json, - function(res) { + function (res) { if (res.data.code == 0) { getApp().my_warnning("兑换成功！", 1, th); } else { getApp().my_warnning(res.data.msg, 0, th); } }, - function(res) {}) + function (res) {}) }) }, //免费领取 - GetFree:function (e){ + GetFree: function (e) { var that = this.data; var th = this; var id = e.currentTarget.dataset.id; //活动id var my_confirm = th.selectComponent("#my_confirm"); //组件的id my_confirm.open( - "是否确定领取该礼包", - "取消", - "确定", - function() { - my_confirm.open_cancel(0); - }, - function() { - my_confirm.open_cancel(0); - var json = { - "actId": '', //活动Id - "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销 - "buyType": '3', //1=积分兑换 2=余额购买 3=免费领取 - "giftBagId": id, //礼包Id - "storeId": that.getStorageID, //商家Id - "userId": that.getUserID, //用户ID - "buyFrom": 2 - }; - //-- 分享导购要记录 -- - if(getApp().globalData.guide_id){ - json.guide_id=getApp().globalData.guide_id; - } - var data = JSON.stringify(json); - var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert"; - getApp().request.json_post(url, json, - function(res) { - if (res.data.code == 0) { - getApp().my_warnning("领取成功！", 1, th); - } else { - getApp().my_warnning(res.data.msg, 0, th); - } - }, - function(res) {}) - }) + "是否确定领取该礼包", + "取消", + "确定", + function () { + my_confirm.open_cancel(0); + }, + function () { + my_confirm.open_cancel(0); + var json = { + "actId": '', //活动Id + "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销 + "buyType": '3', //1=积分兑换 2=余额购买 3=免费领取 + "giftBagId": id, //礼包Id + "storeId": that.getStorageID, //商家Id + "userId": that.getUserID, //用户ID + "buyFrom": 2, + "first_leader": that.first_leader + }; + //-- 分享导购要记录 -- + if (getApp().globalData.guide_id) { + json.guide_id = getApp().globalData.guide_id; + } + var data = JSON.stringify(json); + var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert"; + getApp().request.json_post(url, json, + function (res) { + if (res.data.code == 0) { + getApp().my_warnning("领取成功！", 1, th); + } else { + getApp().my_warnning(res.data.msg, 0, th); + } + }, + function (res) {}) + }) }, - getList: function(e) { + getList: function (e) { var th = this; getApp().request.get('/api/weshop/marketing/giftbag/page', { isShowLoading: true, @@ -237,7 +256,7 @@ Page({ page: th.data.curpage, pageSize: th.data.pageSize }, - success: function(res) { + success: function (res) { if (res.data.code == 0) { th.data.curpage++; var arr1 = th.data.wareCard; @@ -254,7 +273,7 @@ Page({ } else { th.setData({ is_read: 1, - ismore:1 + ismore: 1 }) } } @@ -262,7 +281,7 @@ Page({ }, //销毁界面跳转 - redirectTo: function(e) { + redirectTo: function (e) { var th = this; var url = e.currentTarget.dataset.url; //销毁跳转 @@ -271,14 +290,14 @@ Page({ }); }, //不销毁界面跳转 - navigateTo: function(e) { + navigateTo: function (e) { var th = this; var url = e.currentTarget.dataset.url; getApp().goto(url); }, //下拉事件 - onReachBottom: function() { + onReachBottom: function () { var th = this; if (th.data.total <= th.data.pageSize) return; if (th.data.ismore) return; @@ -286,41 +305,44 @@ Page({ th.getList(); }, //图片失败，默认图片 - bind_bnerr2: function(e) { + bind_bnerr2: function (e) { var _errImg = e.target.dataset.errorimg; var _errObj = {}; _errObj[_errImg] = "/miniapp/images/default_g_img.gif"; this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; }, - goto: function(e) { + goto: function (e) { var th = this; var url = e.currentTarget.dataset.url; getApp().goto(url); }, - - onShareAppMessage: function (e) { - var curPage=this; - var pagePath = curPage.route; //当前页面url - if (pagePath.indexOf('/') != 0) { - pagePath = '/' + pagePath; - } - return { - title: "专享礼包", - path:pagePath, - } - }, - - onShareTimeline() { - var curPage=this; - var pagePath = curPage.route; //当前页面url - if (pagePath.indexOf('/') != 0) { - pagePath = '/' + pagePath; - } - return { - title: '专享礼包', - imageUrl: this.data.ad_data.ad_code, - path: pagePath, - } - }, - + + onShareAppMessage: function (e) { + var curPage = this; + var pagePath = curPage.route; //当前页面url + if (pagePath.indexOf('/') != 0) { + pagePath = '/' + pagePath; + } + pagePath += "?first_leader="+this.data.getUserID; + return { + title: "专享礼包", + path: pagePath, + } + }, + + // 分享朋友圈 + onShareTimeline() { + var curPage = this; + var pagePath = curPage.route; //当前页面url + if (pagePath.indexOf('/') != 0) { + pagePath = '/' + pagePath; + } + pagePath += "?first_leader="+this.data.getUserID; + return { + title: '专享礼包', + imageUrl: this.data.ad_data.ad_code, + path: pagePath, + } + }, + }) \ No newline at end of file diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js index 53b28b0..46f0caa 100644 --- a/pages/giftpack/giftpacklist/giftpacklist.js +++ b/pages/giftpack/giftpacklist/giftpacklist.js @@ -28,33 +28,36 @@ Page({ code: "", //核销码 c_state: "0", //判断是否已经使用, 0正常 1已使用 2已过期 is_lb: 0, //是否有礼包 - default_color:null, + default_color: null, + first_leader: e.globalData.first_leader || 0, // 推荐人ID }, - onLoad: function(options) { + onLoad: function (options) { var th = this; th.setData({ isBuy: options.isBuy, getGiftID: options.lbId, - orderSn: options.orderSn + orderSn: options.orderSn, + getUserID: d.user_id, }) - - //-- 获取分享人的ID -- - var first_leader=options.first_leader; - if(first_leader){ - //-- user_id代过来免登录 -- - getApp().globalData.first_leader=first_leader; - //调用接口判断是不是会员 - getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{ - if(res.data.code==0){ - getApp().globalData.guide_id=res.data.data.id; - } - }) - } - + //-- 获取分享人的ID -- + var first_leader = options.first_leader || getApp().globalData.first_leader; + if (first_leader) { + this.setData({ + first_leader, + }) + //-- user_id代过来免登录 -- + getApp().globalData.first_leader = first_leader; + //调用接口判断是不是会员 + getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { + if (res.data.code == 0) { + getApp().globalData.guide_id = res.data.data.id; + } + }) + } th.close(); }, - - onShow: function() { + + onShow: function () { //--先判断会员状态-- var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { @@ -68,14 +71,14 @@ Page({ } }, - GetBuyPrice: function(e) { + GetBuyPrice: function (e) { var that = this.data; var th = this; // var id = e.currentTarget.dataset.id;//活动id //如果还没有开始的话 - if(th.data.isStart!=1){ - getApp().my_warnning("活动还没有开始", 0, th); - return false; + if (th.data.isStart != 1) { + getApp().my_warnning("活动还没有开始", 0, th); + return false; } @@ -85,10 +88,10 @@ Page({ "是否确定购买该礼包", "取消", "确定", - function() { + function () { my_confirm.open_cancel(0); }, - function() { + function () { my_confirm.open_cancel(0); var json = { @@ -98,24 +101,25 @@ Page({ "giftBagId": that.getGiftID, //礼包Id "storeId": a.stoid, //商家Id "userId": d.user_id, //用户ID - "buyFrom": 2 + "buyFrom": 2, + "first_leader": that.first_leader, }; - - //-- 分享导购要记录 -- - if(getApp().globalData.guide_id){ - json.guide_id=getApp().globalData.guide_id; - } - + + //-- 分享导购要记录 -- + if (getApp().globalData.guide_id) { + json.guide_id = getApp().globalData.guide_id; + } + var data = JSON.stringify(json); var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert"; getApp().request.json_post(url, json, - function(res) { + function (res) { if (res.data.code == 0) { var res = res.data.data; - if(!res) return false; - if(!res.result) return false; - + if (!res) return false; + if (!res.result) return false; + var order_sn = res.orderSn; var url = "/pages/giftpack/payment/payment?money=" + money + "&order_sn=" + order_sn; wx.requestPayment({ @@ -124,10 +128,10 @@ Page({ package: res.result.packageValue, signType: res.result.signType, paySign: res.result.paySign, - success: function(n) { + success: function (n) { getApp().goto(url); }, - fail: function(n) { + fail: function (n) { getApp().my_warnning("取消支付", 0, th); } }); @@ -135,7 +139,7 @@ Page({ getApp().my_warnning(res.data.msg, 0, th); } }, - function(res) { + function (res) { } @@ -147,12 +151,12 @@ Page({ ) }, - GetBuyIntegral: function(e) { + GetBuyIntegral: function (e) { var that = this.data; var th = this; //如果还没有开始的话 - if(th.data.isStart!=1){ + if (th.data.isStart != 1) { getApp().my_warnning("活动还没有开始", 0, th); return false; } @@ -162,10 +166,10 @@ Page({ "是否确定兑换该礼包", "取消", "确定", - function() { + function () { my_confirm.open_cancel(0); }, - function() { + function () { my_confirm.open_cancel(0); var json = { "actId": '', //活动Id @@ -174,26 +178,25 @@ Page({ "giftBagId": that.getGiftID, //礼包Id "storeId": a.stoid, //商家ID "userId": d.user_id, //用户ID - "buyFrom":2 + "buyFrom": 2, + "first_leader": that.first_leader, }; - - //-- 分享导购要记录 -- - if(getApp().globalData.guide_id){ - json.guide_id=getApp().globalData.guide_id; - } - - + //-- 分享导购要记录 -- + if (getApp().globalData.guide_id) { + json.guide_id = getApp().globalData.guide_id; + } + var data = JSON.stringify(json); var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert"; getApp().request.json_post(url, json, - function(res) { + function (res) { if (res.data.code == 0) { getApp().my_warnning("兑换成功！", 1, th); } else { getApp().my_warnning(res.data.msg, 0, th); } }, - function(res) { + function (res) { } @@ -203,7 +206,7 @@ Page({ }, - GetMyGiftList: function() { + GetMyGiftList: function () { var _this = this; var th = this; getApp().request.get('/api/weshop/marketing/my/giftbag/detail/get', { @@ -213,12 +216,12 @@ Page({ "userId": d.user_id, //用户ID "orderSn": th.data.orderSn }, - success: function(res) { + success: function (res) { if (res.data.code == 0) { th.setData({ giftImage: th.data.iurl + res.data.data.lbUrl, giftTitle: res.data.data.giftTitle, - default_color:res.data.data.bgcolor + default_color: res.data.data.bgcolor }) if (res.data.data.giftRemark == '') { th.setData({ @@ -272,7 +275,7 @@ Page({ }); }, - GetBuyGiftList: function() { + GetBuyGiftList: function () { var _this2 = this; var th = this.data; getApp().request.get('/api/weshop/marketing/giftbag/detail/get', { @@ -287,7 +290,7 @@ Page({ _this2.setData({ giftImage: th.iurl + res.data.data.lbUrl, giftTitle: res.data.data.giftTitle, - default_color:res.data.data.bgcolor + default_color: res.data.data.bgcolor }) if (res.data.data.giftRemark == '') { _this2.setData({ @@ -299,13 +302,13 @@ Page({ }) } - var isStart=0; - var now=ut.gettimestamp(); + var isStart = 0; + var now = ut.gettimestamp(); - var str = res.data.data.starTime.replace(/-/g,'/'); + var str = res.data.data.starTime.replace(/-/g, '/'); var start = Date.parse(new Date(str)); start = start / 1000; - if(start 礼包内容 - + @@ -73,15 +73,23 @@ - + - {{"数量:"+item.num}} - + {{"数量:"+item.num}} + + + + 已核销 + + + 未核销 + + - + - + diff --git a/pages/goods/search/g_filter.wxs b/pages/goods/search/g_filter.wxs index 848e4cd..814e187 100644 --- a/pages/goods/search/g_filter.wxs +++ b/pages/goods/search/g_filter.wxs @@ -88,6 +88,11 @@ var g_filters = { if(item.prom_type==8){ url1="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id } + // 如果是幸运购活动商品 + if(item.prom_type == 9){ + url1 = "/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=" + item.goods_id + "&group_id=" + item.prom_id + } + if(item.prom_type==1 && item.prom_id>0){ url1="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id+"&prom_type=1"; } diff --git a/pages/goods/search/search.js b/pages/goods/search/search.js index 00d5f6f..ae5119f 100644 --- a/pages/goods/search/search.js +++ b/pages/goods/search/search.js @@ -146,7 +146,6 @@ Page({ for(let i in res.data.data.pageData){ let item=res.data.data.pageData[i]; item.original_img = th.data.url + item.original_img; - var url="/api/weshop/activitylist/getGoodActInfo"; var req_data={ store_id:oo.stoid,goodsidlist:item.goods_id,is_detail:1 @@ -184,7 +183,7 @@ Page({ var rd= { store_id: oo.stoid, presell_id: presell_id, - goods_id: val.goods_id + goods_id: item.goods_id } //------获取预售从表---------- await getApp().request.promiseGet(url1, { @@ -220,14 +219,13 @@ Page({ } th.data.requestData.push(item); e.setData({requestData: e.data.requestData}); - e.closeSearchModal(); } } - + e.closeSearchModal(); }) - }, onReachBottom: function() { + this.data.currentPage++ this.data.openSearchModal || e.canloadMore() && this.requestSearch(this.data.requestUrl); }, openFilterModal: function() { @@ -289,7 +287,7 @@ Page({ search: function(t) { if ("string" != typeof t || "" == t) return a.showWarning("请输入搜索关键词"); this.data.key_str=t; - this.historyRecord(); + this.historyRecord(); this.resetData(), this.requestSearch(this.data.baseUrl + "&key_str=" + encodeURIComponent(t)); }, diff --git a/pages/goods/search/search.wxml b/pages/goods/search/search.wxml index 91cdcf4..9f915b0 100644 --- a/pages/goods/search/search.wxml +++ b/pages/goods/search/search.wxml @@ -35,7 +35,7 @@ {{item.goods_name}} - + {{item.prom_integral}}积分 diff --git a/pages/index/index/index.js b/pages/index/index/index.js index 6111093..6d00fb1 100644 --- a/pages/index/index/index.js +++ b/pages/index/index/index.js @@ -87,7 +87,15 @@ Page({ }, onLoad: async function (tt) { - var th = this; + // onLoad生命周期内判断 + let obj = wx.getLaunchOptionsSync(); + console.log(obj.scene,'launch_scene'); + if (obj.scene === 1011 || obj.scene === 1012 || obj.scene === 1013 || obj.scene === 1017 || + obj.scene === 1047 ||obj.scene === 1089 || obj.scene === 1038) { + this.setData({is_ok_h5:1}) + } + + var th = this; var first_leader = tt.first_leader; if (!first_leader && tt.scene) { var first_leader_str = decodeURIComponent(tt.scene); @@ -383,6 +391,7 @@ Page({ var json_d = JSON.parse(e.switch_list); th.setData({ is_closecoupon: json_d.is_closecoupon }) th.setData({ is_topstore: json_d.is_show_storeselect }) + th.setData({is_gz_h5:json_d.is_gz_h5}) }, 1) if (typeof this.getTabBar === 'function' && this.getTabBar()) { @@ -439,7 +448,6 @@ Page({ }); - }, //当隐藏的时候就关闭计时器 onHide: function () { @@ -617,14 +625,7 @@ Page({ }); } }) - - - - - - - - + //---调用信息--- // this.requestRecommend(); this.setData({ @@ -937,10 +938,13 @@ Page({ getApp().goto("/pages/goods/categoryList/categoryList"); }, + // 幸运购跳转 go_url: function (e) { + var url = e.currentTarget.dataset.url; getApp().goto(url); - }, + + }, // bind_bnerr_icon: function (e) { var def = "/miniapp/images/no_cate_def.png"; diff --git a/pages/index/index/index.json b/pages/index/index/index.json index 0f62f01..c7badaa 100644 --- a/pages/index/index/index.json +++ b/pages/index/index/index.json @@ -19,7 +19,8 @@ "service": "/components/diy_service/diy_service", "scan": "/components/diy_scan/diy_scan", "store_select": "/components/diy_store_select/diy_store_select", - "presell": "/components/diy_pregoods/diy_pregoods" + "presell": "/components/diy_pregoods/diy_pregoods", + "luckyGo": "/components/diy_luckyGo/diy_luckyGo" }, "enablePullDownRefresh": false } \ No newline at end of file diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml index 46111fc..fa0ac72 100644 --- a/pages/index/index/index.wxml +++ b/pages/index/index/index.wxml @@ -11,14 +11,17 @@ - + - + + + + + - @@ -41,7 +44,9 @@ - + + + @@ -229,9 +234,8 @@ - - + @@ -243,8 +247,8 @@ - - + + @@ -258,7 +262,8 @@ - 去参团 + 已抢光 + 去参团 @@ -406,6 +411,9 @@ + + + @@ -420,6 +428,8 @@ + + @@ -505,6 +515,11 @@ + + + + + diff --git a/pages/index/index/index.wxss b/pages/index/index/index.wxss index 78f38b3..8189432 100644 --- a/pages/index/index/index.wxss +++ b/pages/index/index/index.wxss @@ -64,7 +64,7 @@ width: 48rpx; height: 48rpx; margin: 0 18rpx; - border-radius: 50%; + /* border-radius: 50%; */ overflow: hidden; } @@ -663,6 +663,7 @@ border-radius: 8rpx; white-space: nowrap; height: 28rpx; + align-items: center; } .xc-people-val-frame .val-img { @@ -1014,7 +1015,7 @@ page { } .container.nor{ - padding-top: 140rpx; + padding-top: 80rpx; } /* page, @@ -1130,8 +1131,8 @@ page { } .luck .img-container { - width: 200rpx; - height: 200rpx; + width: 220rpx; + height: 220rpx; border-radius: 14rpx; overflow: hidden; flex-shrink: 0; @@ -1180,6 +1181,7 @@ page { .luck .name { height: 88rpx; + word-break: break-all; } @@ -1195,3 +1197,7 @@ page { text-align: center; } +.luck .btn.gray { + background-color: #ccc; +} + diff --git a/pages/user/index/index.js b/pages/user/index/index.js index 7b79d40..d326f5d 100644 --- a/pages/user/index/index.js +++ b/pages/user/index/index.js @@ -462,11 +462,11 @@ Page({ }, setappdata: function(t) { var t=getApp().globalData.wxapp_buy_obj; - if (t.isout == 1) + if (t && t.isout == 1) wx.navigateTo({ url: "/pages/error/error?msg=小程序已经过期", }); - if (t.isbuy == 0) + if (t && t.isbuy == 0) wx.navigateTo({ url: "/pages/error/error?msg=还未购买小程序", }); @@ -642,7 +642,9 @@ Page({ } var url = e.currentTarget.dataset.img; - + if(!url || url==""){ + url=`/public/upload/userqy/quanbg.jpg` + } switch (no) { case "01": getApp().goto("/packageB/pages/user/user_coupon/user_coupon?img=" + @@ -652,7 +654,8 @@ Page({ getApp().goto("/pages/user/user_fw/user_fw?gradeId=" + th.data.gradeId + "&FormId=" + item.Id); break; case "03": - getApp().goto("/pages/user/user_spsy/user_spsy"); + getApp().goto("/pages/user/user_spsy/user_spsy?img=" + + url + "&gradeId=" + th.data.gradeId + "&FormId=" + item.Id); break; case "10": getApp().request.get("/api/weshop/users/grade/vipprivilegelist/other/get", { diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js index ff80bfd..06114b2 100644 --- a/pages/user/order_detail/order_detail.js +++ b/pages/user/order_detail/order_detail.js @@ -316,6 +316,7 @@ Page({ //--------立即支付---------- async jumpToCart4(e) { + var th=this; if(this.data.optionIsGoup) wx.navigateTo({ @@ -567,8 +568,7 @@ Page({ return false; } } - } - else{ + }else{ //不是赠品的时候 if(!good.is_gift && good.prom_type!=3){ var t_ok=1; @@ -592,7 +592,7 @@ Page({ } //赠品和搭配购不判断商品金额 var isok=1; - var card_field=th.data.card_field; + var card_field=th.data.card_field; // 会员等级 //如果会员是等级会员,商品有等级价,且不是活动商品 if(!good.is_gift && !good.is_collocation) { if (card_field && gg[card_field] > 0) { @@ -606,7 +606,7 @@ Page({ var is_h=0; if (!isok) { - var content=gg.goods_name + '商品的价格发生了变化,请取消订单重新购买'; + var content=gg.goods_name + '商品的价格发生了变化,请取消订单重新购买22'; th.toast(content); return false; } diff --git a/pages/user/order_detail/order_detail.wxml b/pages/user/order_detail/order_detail.wxml index 6d4f920..a3e3417 100644 --- a/pages/user/order_detail/order_detail.wxml +++ b/pages/user/order_detail/order_detail.wxml @@ -77,7 +77,7 @@ 配送方式 - {{(order.shipping_name!=''&& order.shipping_name!=null) ?order.shipping_name:'无'}} + {{(order.shipping_name!=''&& order.shipping_name!=null) ?order.shipping_name:'自提'}} 买家留言 diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index fc677ee..c73fdd1 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -195,6 +195,28 @@ Page({ } }) } + // 如果是幸运购活动 + if(glist[0].prom_type==9){ + await getApp().request.promiseGet('/api/weshop/prom/luckyOrder/list', { + data: { + store_id: os.stoid, + user_id: oo.user_id, + order_id: item.order_id, + } + }).then(res => { + if(res.data.code==0){ + // console.log('luckyGo+++++++++>>>', res.data.data); + // data[ind]['team_status'] = res.data.data[0]['team_status']; + if(res.data.data[0] && res.data.data[0]['team_status']) { + data[ind]['team_status'] = res.data.data[0]['team_status']; + } else { + data[ind]['team_status'] = 0; + }; + + // data[ind]['ord_url']='/packageC/pages/presell/cart/cart'; + } + }) + } //------------对比一下有没有退款记录------------ await getApp().request.promiseGet("/api/weshop/order/returngoods/page", { data: { @@ -462,6 +484,7 @@ Page({ }, /*----------跳转支付-----------*/ async jumpToCart4(t) { + var o_index = t.currentTarget.dataset.idx; var e = this.data.orderList[o_index]; var th = this; @@ -469,6 +492,25 @@ Page({ var order_goods = e.order_goods; var user_id=getApp().globalData.userInfo.user_id; + // 幸运购检查库存量 api/weshop/activitylist/getActLen/{store_id}/{prom_type}/{prom_id} + if (parseInt(order_goods['0']['prom_type']) == 9) { + var aid = order_goods['0']['prom_id']; + var knum = 0; + await r.promiseGet('/api/weshop/activitylist/getActLen/' + os.stoid + '/9/' + aid, { + }).then(res => { + if (res.data.code == 0) { + knum = res.data.data; + } + + }); + + if (knum <= 0) { + getApp().confirmBox("库存为0，支付失败"); + return false; + } + + } + var wlist = ""; for (var i in order_goods) { var good = order_goods[i]; @@ -577,7 +619,7 @@ Page({ } //如果是预售的时候， - if(good.prom_type==8){ + if(good.prom_type==8) { await getApp().request.promiseGet("/api/weshop/order/orderPresell/countBuyGoodsSum",{ data: {store_id: os.stoid, user_id: user_id, goods_id: good.goods_id, prom_id: good.prom_id}, }).then(e=>{ @@ -699,7 +741,7 @@ Page({ return false; } - } else { + } else { if ((gg.prom_type == 1 || good.prom_type == 2 || gg.prom_type == 3 || gg.prom_type == 5 || gg.prom_type == 6 || gg.prom_type == 4) && !good.is_collocation && !good.is_gift && !good.is_integral_normal && !good.is_pd_normal) { var prom = null; @@ -776,7 +818,7 @@ Page({ var card_field = th.data.card_field; //-- 如果会员是等级会员,商品有等级价,且不是活动商品，同时线下取价的要放在最后来判断 -- - if (!good.is_gift && !good.is_collocation) { + if (!good.is_gift && !good.is_collocation && gg.prom_type != 9) { if (card_field && gg[card_field] > 0) { if (good.goods_price != gg[card_field] && good.offline_cut <= 0) isok = 0; if (good.goods_price > gg[card_field] && good.offline_cut > 0) isok = 0; //如果线下价格比较贵，则不通过 diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml index 4735e7b..aeb9884 100644 --- a/pages/user/order_list/order_list.wxml +++ b/pages/user/order_list/order_list.wxml @@ -40,7 +40,7 @@ 订单编号：{{item.order_sn}} - + 尾款支付失败 @@ -64,6 +64,19 @@ 退款中 + + + 已退款 + 已支付,待成团 + 未支付 + 待发货 + 待收货 + 待评价 + 已评价 + 已取消 + + + 组团中 @@ -82,6 +95,8 @@ 退款中 + + @@ -91,7 +106,9 @@ - + + @@ -128,7 +145,10 @@ ￥ - {{filters.toFix(goods.member_goods_price,2)}} + + + {{filters.toFix(goods.goods_price,2)}} + {{filters.toFix(goods.member_goods_price,2)}} x{{goods.goods_num}} @@ -162,7 +182,8 @@ 合计(改): ￥ - {{filters.toFix(item.order_amount+item.user_money,2)}} + + {{filters.toFix(item.order_amount+item.user_money,2)}} +{{item.coupon_price}}元优惠券 +{{item.integral}}积分 @@ -196,7 +217,7 @@ - 订单详情 + 订单详情 订单详情 diff --git a/pages/user/plus/plus.js b/pages/user/plus/plus.js index 92502be..2b4b28b 100644 --- a/pages/user/plus/plus.js +++ b/pages/user/plus/plus.js @@ -1,12 +1,14 @@ var t = getApp(), a = t.request, - o = t.globalData.setting, + o = t.globalData.setting, os = o, i = require("../../../utils/util.js"), ut = i, s = require("../../../utils/common.js"), - w = require("../../../utils/wxParse/wxParse.js"),t_pay = require("../../../utils/pay2.js"); - var regeneratorRuntime = require('../../../utils/runtime.js'); + w = require("../../../utils/wxParse/wxParse.js"), + t_pay = require("../../../utils/pay2.js"); +var regeneratorRuntime = require('../../../utils/runtime.js'); + Page({ /** @@ -19,24 +21,27 @@ Page({ screenheight: 0, canvasHidden: true, shareImgPath: null, - is_plusCard: "",//卡的列表 + is_plusCard: "", //卡的列表 imagePath: "", - is_pulscardname: "",//plus会员的名字 - is_card: 0,//用于判断是否是续费页和购买页面 0不是PLUS会员 - content: "",//等级卡规则 - is_card_rule: "",//等级卡规则判断用 - is_show: 0, //页面要加载完才能显示 - open_yq: 0, //显示打开邀请码的弹窗 - by_index:null, //购买卡的下班 + is_pulscardname: "", //plus会员的名字 + is_card: 0, //用于判断是否是续费页和购买页面 0不是PLUS会员 + content: "", //等级卡规则 + is_card_rule: "", //等级卡规则判断用 + is_show: 0, //页面要加载完才能显示 + open_yq: 0, //显示打开邀请码的弹窗 + by_index: null, //购买卡的下班 - isyaoqingma:0, //是否邀请码 - is_salesman:0, //是否营业员 - inp_recommon: null, //输入的邀请码 + isyaoqingma: 0, //是否邀请码 + is_salesman: 0, //是否营业员 + inp_recommon: null, //输入的邀请码 inp_serviceman: null, //输入的营业员 - is_fengxiang: 0, //是不是分享过来的 - def_recommon: null, //分享人的手机号 - def_serviceman: null, //分享人的营业员 - fir_leader:0, //分享人的ID + is_fengxiang: 0, //是不是分享过来的 + def_recommon: null, //分享人的手机号 + def_serviceman: null, //分享人的营业员 + fir_leader: 0, //分享人的ID + staffNo_arr: [], //多个营业员 + focus:false, + is_select: false, //是否选择营业员过 }, swiperChange: function (e) { var currentId = e.detail.current; @@ -48,34 +53,41 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function (options) { - var that = this,th=that; - var store_id=getApp().globalData.setting.stoid; + var that = this, + th = that; + var store_id = getApp().globalData.setting.stoid; //获取用户设备信息，屏幕宽度 wx.getSystemInfo({ success: res => { - that.setData({screenWidth: res.screenWidth}) + that.setData({ + screenWidth: res.screenWidth + }) } }) var fir_leader = options.scene; - if (fir_leader) that.setData({fir_leader:fir_leader}) + if (fir_leader) that.setData({ + fir_leader: fir_leader + }) //--先判断会员状态-- var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { - wx.navigateTo({ url: '/pages/togoin/togoin?first_leader=' + fir_leader, }) - return false; - } + wx.navigateTo({ + url: '/pages/togoin/togoin?first_leader=' + fir_leader, + }) + return false; + } //-----------商家配置信息----- 等级卡规则，是否又开邀请码，营业员------------ getApp().request.get("/api/weshop/storeconfig/get/" + store_id, { success: function (res) { var is_cardrule = res.data.data.cardrules; - var switch_list= res.data.data.switch_list; - var swi_arr=JSON.parse(switch_list); + var switch_list = res.data.data.switch_list; + var swi_arr = JSON.parse(switch_list); w.wxParse("content", "html", is_cardrule, that, 6); that.setData({ - is_card_rule: is_cardrule, - isyaoqingma:parseInt(swi_arr.isyaoqingma), - is_salesman:parseInt(swi_arr.is_staffno) + is_card_rule: is_cardrule, + isyaoqingma: parseInt(swi_arr.isyaoqingma), + is_salesman: parseInt(swi_arr.is_staffno) }); } }); @@ -85,12 +97,14 @@ Page({ * 生命周期函数--监听页面显示 */ onShow: function () { - var user_info = getApp().globalData.userInfo; - if(!user_info) return false; - - var th=this,that=th,app_d=getApp().globalData; - var store_id=os.stoid; - var fir_leader=this.data.fir_leader; + var user_info = getApp().globalData.userInfo; + if (!user_info) return false; + + var th = this, + that = th, + app_d = getApp().globalData; + var store_id = os.stoid; + var fir_leader = this.data.fir_leader; if (fir_leader != null && fir_leader != undefined && fir_leader != "") { var r_url = "/api/weshop/plus/vip/mem/list?storeId=" + store_id + "&userId=" + fir_leader @@ -126,8 +140,12 @@ Page({ } if (is_ok == 1) { //--保存或者更新会员信息-- - that.setData({ def_recommon: user_information.MobileTel, def_serviceman: user_information.StaffNo, is_fengxiang: 1 }) - th.save_th_plus_user(); + that.setData({ + def_recommon: user_information.MobileTel, + def_serviceman: user_information.StaffNo, + is_fengxiang: 1 + }) + th.save_th_plus_user(); } } }); @@ -138,14 +156,16 @@ Page({ getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + app_d.user_id, { success: function (e) { var userInfo = e.data.data; - if(userInfo['card_field'] && !getApp().globalData.is_card_back){ - var u_url = "/pages/user/cardinfo/cardinfo"; - wx.reLaunch({url: u_url}) + if (userInfo['card_field'] && !getApp().globalData.is_card_back) { + var u_url = "/pages/user/cardinfo/cardinfo"; + wx.reLaunch({ + url: u_url + }) } }, }); - this.getPlusCardType(); + this.getPlusCardType(); }, /** @@ -170,18 +190,23 @@ Page({ var plusCard = res.data.data; var arr = [1219, 2089, 3031]; var new_arr = new Array(); - var parr=[]; + var parr = []; for (var i = 0; i < plusCard.length; i++) { - //plusCard[i].free=arr[i]; - if(plusCard[i].IsStopBuy) { continue; } - if (plusCard[i].CardImg == "") plusCard[i].CardImg = th.data.url + "/miniapp/images/plus/bg"+(i + 1)+ ".jpg?v=1"; - var item = {"fee": plusCard[i].CardFee, 'index': i} - new_arr.push(item); - parr.push(plusCard[i]); + //plusCard[i].free=arr[i]; + if (plusCard[i].IsStopBuy) { + continue; + } + if (plusCard[i].CardImg == "") plusCard[i].CardImg = th.data.url + "/miniapp/images/plus/bg" + (i + 1) + ".jpg?v=1"; + var item = { + "fee": plusCard[i].CardFee, + 'index': i + } + new_arr.push(item); + parr.push(plusCard[i]); } //看是不是还有卡项是可以购买的 - if(new_arr && new_arr.length>0){ + if (new_arr && new_arr.length > 0) { //根據距離遠近排序，越近在前面，升序 new_arr.sort(function (a, b) { if (a.fee < b.fee) { @@ -195,39 +220,48 @@ Page({ //里面和外面要显示统一 switch (new_arr.length) { - case 1:arr=[3031]; break; - case 2: arr = [2089, 3031]; break; - case 3: arr = [1219, 2089, 3031];break; + case 1: + arr = [3031]; + break; + case 2: + arr = [2089, 3031]; + break; + case 3: + arr = [1219, 2089, 3031]; + break; } //---给数组添加立省多少钱--- for (i = 0; i < parr.length; i++) { - //判断是否停用 - for (var j = 0; j < new_arr.length; j++) { - if (i == new_arr[j].index) { - parr[i].free = arr[j]; - break; - } + //判断是否停用 + for (var j = 0; j < new_arr.length; j++) { + if (i == new_arr[j].index) { + parr[i].free = arr[j]; + break; + } } } th.setData({ - is_plusCard: parr, is_show: 1 + is_plusCard: parr, + is_show: 1 }) - }else{ - th.setData({is_show: 1}); - wx.showToast({ - title: "暂无可购买的等级卡项", - icon: 'none', - duration: 4000 - }) + } else { + th.setData({ + is_show: 1 + }); + wx.showToast({ + title: "暂无可购买的等级卡项", + icon: 'none', + duration: 4000 + }) - } - setTimeout(function(){ - var goods_list = th.selectComponent("#goods_list"); //组件的id - goods_list.init(); - goods_list.get_list(); - },1000) + } + setTimeout(function () { + var goods_list = th.selectComponent("#goods_list"); //组件的id + goods_list.init(); + goods_list.get_list(); + }, 1000) }) }, @@ -241,33 +275,73 @@ Page({ th.buy_card(); } else { //--如果后台都没有勾邀请码，营业员，立即购买-- - if (!th.data.isyaoqingma && !th.data.is_salesman) {th.buy_card(); return false;} - th.setData({open_yq: 1}) + if (!th.data.isyaoqingma && !th.data.is_salesman) { + th.buy_card(); + return false; + } + th.setData({ + open_yq: 1 + }) } }, + //选择营业员 + select_serviceman(e) { + let StaffNo = e.currentTarget.dataset.staffno; + let {req_data,req} = this.data; + if (StaffNo && StaffNo !== "") { + req_data.staffNo = StaffNo; + req.serviceman = StaffNo; + }; + this.setData({ + is_select: 1, + staffNo_arr:[], + }) + this.check_serviceman(req_data,req) + }, + //--绑定邀请码的输入-- + b_input: function (e) { + var value = e.detail.value.trim(); + // let { isyaoqingma, is_salesman }=this.data; + var name = e.currentTarget.dataset.name; + // if((name=="isyaoqingma" && isyaoqingma) || (name=="is_salesman" && is_salesman) ){ + // if(!value){ + // wx.showToast({ + // title: '不能为空', + // }) + // return false; + // } + // } + var ob = {}; + ob[name] = value; + this.setData(ob); + }, //--立即购买卡-- buy_card: async function () { + console.log(11111); var th = this; var is_card = 0; //--商家是不是有等级卡功能，开通的人数是不是够用，开通是时间是不是到期-- - await getApp().request.promiseGet("/api/weshop/plus/plus/card/register", - {data: {storeId: os.stoid}}).then(res => { + await getApp().request.promiseGet("/api/weshop/plus/plus/card/register", { + data: { + storeId: os.stoid + } + }).then(res => { if (res.data.code == 0) is_card = 1; }) if (is_card == 0) { - getApp().my_warnning("请联系商家升级plus功能", 0, th); - return false; - } - + getApp().my_warnning("请联系商家升级plus功能", 0, th); + return false; + } + var item = th.data.is_plusCard[th.data.by_index]; var req = {}; req.cardId = item.CardId; req.rechargeType = 3; //如果不是你导购，也不是等级会员分享 if (th.data.is_fengxiang == 1) { - if (th.data.def_recommon) req.recommon = th.data.def_recommon - if (th.data.def_serviceman) req.serviceman = th.data.def_serviceman + if (th.data.def_recommon) req.recommon = th.data.def_recommon + if (th.data.def_serviceman) req.serviceman = th.data.def_serviceman } else { //---后台要求要输入邀请码--- if (th.data.isyaoqingma) { @@ -275,19 +349,21 @@ Page({ getApp().my_warnning("请输入邀请码", 0, th); return false; } - - //--邀请人不能是自己的手机号-- - if(th.data.inp_recommon==getApp().globalData.userInfo.mobile){ - getApp().my_warnning("邀请人不能填自已", 0, th); - return false; - } - + + //--邀请人不能是自己的手机号-- + if (th.data.inp_recommon == getApp().globalData.userInfo.mobile) { + getApp().my_warnning("邀请人不能填自已", 0, th); + return false; + } req.recommon = th.data.inp_recommon } //--后台要求要输入营业员-- if (th.data.is_salesman) { if (!th.data.inp_serviceman) { getApp().my_warnning("请输入营业员", 0, th); + th.setData({ + focus:true + }) return false; } req.serviceman = th.data.inp_serviceman @@ -296,137 +372,222 @@ Page({ req.storeId = os.stoid; req.userId = getApp().globalData.user_id; //--如果有邀请码，和营业员的情况下-- - if(req.recommon || req.serviceman ) { - var req_data = {storeId: os.stoid, userId: req.userId}; - if(req.recommon) req_data.inviteCode=req.recommon; - if(req.serviceman) req_data.staffNo=req.serviceman; - getApp().request.get("/api/weshop/plus/vip/mem/referee/code/check", { - data:req_data, - success:function(res){ - if(res.data.code==0) { - t_pay.pay(req, th.success, function () { - getApp().my_warnning("支付失败", 0, th); - }); - }else{ - getApp().my_warnning(res.data.msg, 0, th); - } - } + if (req.recommon || req.serviceman) { + + var req_data = { + storeId: os.stoid, + userId: req.userId + }; + if (req.recommon) req_data.inviteCode = req.recommon; + if (req.serviceman) req_data.staffNo = req.serviceman; + th.setData({ + req_data, + req, }) - }else{ + th.check_serviceman(req_data,req) + // getApp().request.get("/api/weshop/plus/vip/mem/referee/code/check", { + // data: req_data, + // success: function (res) { + // if (res.data.code == 0) { + // if(res.data.data.length > 1 && !th.data.is_select){ + // th.setData({ + // staffNo_arr:res.data.data + // }) + // }else{ + // t_pay.pay(req, th.success, function () { + // getApp().my_warnning("支付失败", 0, th); + // th.setData({ + // is_select:0, + // }) + // }); + // } + // } else { + // getApp().my_warnning(res.data.msg, 0, th); + // th.setData({ + // is_select:0, + // }) + // } + // } + // }) + } else { t_pay.pay(req, th.success, function () { getApp().my_warnning("支付失败", 0, th); + th.setData({ + is_select:0, + focus:true, + }) }); - } + } }, //返回会员页面 - OpeningClose: function() { - this.setData({open_yq:0}); + OpeningClose: function () { + this.setData({ + open_yq: 0, + inp_serviceman:"" + }); + }, + dialog_close() { + this.setData({ + staffNo_arr: [], + }); + }, + check_serviceman(data,req) { + let th = this; + getApp().request.get("/api/weshop/plus/vip/mem/referee/code/check", { + data, + isShowLoading:true, + success: function (res) { + if (res.data.code == 0) { + if (res.data.data.length > 1 && !th.data.is_select) { + th.setData({ + staffNo_arr: res.data.data + }) + }else{ + t_pay.pay(req, th.success, function () { + getApp().my_warnning("支付失败", 0, th); + th.setData({ + is_select:0, + focus:true, + }) + }); + } + } else { + getApp().my_warnning(res.data.msg, 0, th); + th.setData({ + is_select:0, + focus:true, + }) + } + } + }) }, - //返回会员中心 - back_user:function () { + back_user: function () { setTimeout(function () { - wx.reLaunch({url:"/pages/user/index/index"}); - },1000) + wx.reLaunch({ + url: "/pages/user/index/index" + }); + }, 1000) }, - + //--支付成功，跳转到等级卡续费页面-- - success:function () { - //调一次就不再调用了 - if(getApp().globalData.is_card_back) return false; - if(getApp().globalData.plus_buy_back){ - //值在这里换 - getApp().globalData.is_card_back=1; - getApp().globalData.plus_buy_back=0; - //返回购物车购买 - wx.navigateBack({ delta: 1,}); - return false; - }else{ - var u_url = "/pages/user/cardinfo/cardinfo"; - wx.reLaunch({url: u_url}) - } - + success: function () { + //调一次就不再调用了 + if (getApp().globalData.is_card_back) return false; + if (getApp().globalData.plus_buy_back) { + //值在这里换 + getApp().globalData.is_card_back = 1; + getApp().globalData.plus_buy_back = 0; + //返回购物车购买 + wx.navigateBack({ + delta: 1, + }); + return false; + } else { + var u_url = "/pages/user/cardinfo/cardinfo"; + wx.reLaunch({ + url: u_url + }) + } }, - //--绑定邀请码的输入-- - b_input:function (e) { - var value=e.detail.value; - var name=e.currentTarget.dataset.name; - var ob={}; - ob[name]=value - this.setData(ob); - }, - get_user_plus:async function(){ - var user_id=getApp().globalData.user_id; - var fuser=null; - var user_information =null; - var store_id = os.stoid; - var that=this; - //--获取登记卡邀请信息-- - await getApp().request.promiseGet("/api/weshop/usersPlus/get/" + os.stoid + "/" + user_id,{1:1}).then(res=>{ - if (res.data.code==0){ - fuser=res.data.data; - } - }) - if (!fuser) return false; - var r_url = "/api/weshop/plus/vip/mem/list?storeId=" + store_id + "&userId=" + fuser.plus_user_id; - //--获取等级卡信息-- - await getApp().request.promiseGet(r_url,{1:1}).then(res=>{ - if (res.data.code == 0) { - user_information = res.data.data[0]; - } - }) - if (user_information){ - var now = ut.gettimestamp(); - var is_ok = 1; - if (user_information['ExpiryDate']) { - var str = user_information['ExpiryDate'].replace(/-/g, '/'); - var end = new Date(str); - end = Date.parse(end) / 1000; - if (end < now) { is_ok = 0;} - } else { + + get_user_plus: async function () { + var user_id = getApp().globalData.user_id; + var fuser = null; + var user_information = null; + var store_id = os.stoid; + var that = this; + //--获取登记卡邀请信息-- + await getApp().request.promiseGet("/api/weshop/usersPlus/get/" + os.stoid + "/" + user_id, { + 1: 1 + }).then(res => { + if (res.data.code == 0) { + fuser = res.data.data; + } + }) + if (!fuser) return false; + var r_url = "/api/weshop/plus/vip/mem/list?storeId=" + store_id + "&userId=" + fuser.plus_user_id; + //--获取等级卡信息-- + await getApp().request.promiseGet(r_url, { + 1: 1 + }).then(res => { + if (res.data.code == 0) { + user_information = res.data.data[0]; + } + }) + if (user_information) { + var now = ut.gettimestamp(); + var is_ok = 1; + if (user_information['ExpiryDate']) { + var str = user_information['ExpiryDate'].replace(/-/g, '/'); + var end = new Date(str); + end = Date.parse(end) / 1000; + if (end < now) { is_ok = 0; } + } else { + is_ok = 0; + } - if (is_ok == 1) { - var fir_leader=fuser.plus_user_id - that.setData({ def_recommon: user_information.MobileTel, def_serviceman: user_information.StaffNo, is_fengxiang: 1,fir_leader:fir_leader }) - //--先判断会员状态-- - var user_info = getApp().globalData.userInfo; - if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { - wx.navigateTo({ url: '/pages/togoin/togoin?first_leader=' + fir_leader, }) - return false; - } + if (is_ok == 1) { + var fir_leader = fuser.plus_user_id + that.setData({ + def_recommon: user_information.MobileTel, + def_serviceman: user_information.StaffNo, + is_fengxiang: 1, + fir_leader: fir_leader + }) + //--先判断会员状态-- + var user_info = getApp().globalData.userInfo; + if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { + wx.navigateTo({ + url: '/pages/togoin/togoin?first_leader=' + fir_leader, + }) + return false; + } } - } + } }, - - save_th_plus_user:async function(){ - var f_user_id=this.data.fir_leader; - if (f_user_id){ + + save_th_plus_user: async function () { + var f_user_id = this.data.fir_leader; + if (f_user_id) { var user_id = getApp().globalData.user_id; var user_plus = null; - var now=ut.gettimestamp(); + var now = ut.gettimestamp(); //--获取登记卡邀请信息-- - await getApp().request.promiseGet("/api/weshop/usersPlus/get/" + os.stoid + "/" + user_id, { 1: 1 }).then(res => { + await getApp().request.promiseGet("/api/weshop/usersPlus/get/" + os.stoid + "/" + user_id, { + 1: 1 + }).then(res => { if (res.data.code == 0) { user_plus = res.data.data; } - }) - + }) + //--如果有值，要更新-- - if (!user_plus){ - getApp().request.post("/api/weshop/usersPlus/save", { - data: { store_id: os.stoid, user_id: user_id, plus_user_id: f_user_id, addtime: now }, - success: function (res) { } - }) - }else{ - getApp().request.put("/api/weshop/usersPlus/update",{ - data: { store_id: os.stoid, user_id: user_id, plus_user_id: f_user_id, edittime: now}, - success:function(res){ } - }) + if (!user_plus) { + getApp().request.post("/api/weshop/usersPlus/save", { + data: { + store_id: os.stoid, + user_id: user_id, + plus_user_id: f_user_id, + addtime: now + }, + success: function (res) {} + }) + } else { + getApp().request.put("/api/weshop/usersPlus/update", { + data: { + store_id: os.stoid, + user_id: user_id, + plus_user_id: f_user_id, + edittime: now + }, + success: function (res) {} + }) } - } + } } }) \ No newline at end of file diff --git a/pages/user/plus/plus.wxml b/pages/user/plus/plus.wxml index 8e71b06..b434572 100644 --- a/pages/user/plus/plus.wxml +++ b/pages/user/plus/plus.wxml @@ -1,23 +1,23 @@ - - - - - - - + + + + + + + - - - - - - + + + + + + - + {{item.CardName}} @@ -32,7 +32,7 @@ - + 按去年用户消费计算，开卡后一年预计省￥{{item.free}}元 @@ -41,76 +41,80 @@ + - - + - - + + + + + + + 开通PLUS会员尊享礼遇 + - - - - 开通PLUS会员尊享礼遇 - - - - + + - - PLUS会员可享受以下特权 + + PLUS会员可享受以下特权 + + + + + + - + + + + + - - - - - - - + + + + + + + + + + + + - - - - - - - - - - + 好物推荐 - 好物推荐 + + + + + + - - - - + + + + GOOD HOT THING + - - - - - GOOD HOT THING - + + + - - - - - @@ -127,32 +131,55 @@ 请完善下面信息 - + - + - + - + 确认购买 + + + + + + + + + 请选择营业员 + X + + + 编号 + 姓名 + + + + {{item.StaffNo}} + {{item.StaffName}} + + + + + \ No newline at end of file diff --git a/pages/user/plus/plus.wxss b/pages/user/plus/plus.wxss index f169837..e6912d3 100644 --- a/pages/user/plus/plus.wxss +++ b/pages/user/plus/plus.wxss @@ -16,7 +16,48 @@ page { width: 100%; height: 100%; } - +.dialogful{ + position: fixed; + left: 0; + top: 15%; + right: 0; + bottom: 0; + z-index: 11; + background: rgba(0, 0, 0, 0.6); + width: 100%; + height: 100%; +} +.dialog_body { + margin:30% auto; + width: 660rpx; +} +.dialog_close{ + float: right; + width: 50rpx; + height: 50rpx; + text-align: right; +} +.dialog_choose{ + position: relative; + padding: 20rpx; + border-bottom: 1rpx solid #eee; +} +.dialog_name, +.dialog_content { + padding: 10rpx; + display: flex; + border-bottom: 1rpx solid #f7f7f7; + justify-content: space-around; + +} +.weui-active{ + opacity: 0.9; + background: #f7f7f7; +} +.w50 { + width: 50%; + text-align: center; +} .Opening_bk image { position: absolute; z-index: 2; diff --git a/pages/user/user_spsy/user_spsy.js b/pages/user/user_spsy/user_spsy.js index e43903d..5ee5215 100644 --- a/pages/user/user_spsy/user_spsy.js +++ b/pages/user/user_spsy/user_spsy.js @@ -1,6 +1,7 @@ // pages/user/usersy/usersy.js -var e = getApp(),os = e.globalData.setting; -var utils = require('../../../utils/util.js'); +var e = getApp(), + os = e.globalData.setting; +var ut = require('../../../utils/util'); var regeneratorRuntime = require('../../../utils/runtime.js'); Page({ @@ -8,27 +9,102 @@ Page({ * 页面的初始数据 */ data: { - qr_code_object:{val:"12121",content:"请将二维码展示给核销员，取货更快捷！"}, - xp_list:null, - iurl:os.imghost, + qr_code_object: {}, + xp_list: null, + iurl: os.imghost, + page: 1, + isLoading: 0, + no_more: 0, + is_use: 0 //领取状态 }, /** * 生命周期函数--监听页面加载 */ - onLoad: function (options) { }, + onLoad: function (options) { + var h_pic = options.img; + if (h_pic.indexOf("http") == -1) { + h_pic = os.imghost + h_pic; + } + var FormId = options.FormId; + var GradeId = options.gradeId; + var now = ut.gettimestamp(); + this.setData({ + h_pic, + GradeId, + FormId, + now, + }); + this.requestData() + this.getQrCode(FormId,GradeId) + }, /** * 生命周期函数--监听页面显示 */ - onShow:async function () { - var th = this; - var xp_list=null; - //--获取列表-- - await getApp().request.promiseGet("http://172.20.3.102:8080/api/user_qy/xp_list", { - 1: 1 - }).then(res => { - xp_list = res.data; - }) - th.setData({xp_list:xp_list}); + onShow: function () { + + + }, + async getQrCode(FormId,GradeId) { + const res = await getApp().request.promiseGet("/api/weshop/users/grade/wares/code/get", { + data: { + privilegeId: FormId, + storeId: os.stoid, + GradeId:GradeId, + userId: getApp().globalData.user_id, + }, + }); + if (res.data.code == 0 && res.data.data) { + if (res.data.data.VerifyDate || res.data.data.VerifyNo) { + this.setData({ + is_use: 1 + }) + } else { + this.setData({ + qr_code_object: res.data.data, + }) + } + } + }, + async requestData() { + if (this.data.no_more) return false; + if (this.data.isLoading) return false; + this.data.isLoading = 1; + let { + GradeId, + FormId, + page, + xp_list + } = this.data; + let req_data = { + page, + GradeId, + FormId, + storeId: os.stoid, + userId: getApp().globalData.user_id, + } + const res = await getApp().request.promiseGet("/api/weshop/users/grade/wechat/wares/page", { + data: req_data, + isShowLoading:true, + }); + + if (ut.ajax_ok(res)) { + if (res.data.data.page > 1) { + xp_list = xp_list.concat(res.data.data.pageData); + } else { + xp_list = res.data.data.pageData; + } + this.setData({ + xp_list, + isLoading: 0, + no_more: 0, + }) + } else { + this.setData({ + xp_list: [], + isLoading: 0, + no_more: 0, + }) + } }, /** * 页面上拉触底事件的处理函数 @@ -46,26 +122,43 @@ Page({ /*-- 打开服务项目 --*/ - open_xp:function (e) { - var th=this; + open_xp: function (e) { + var th = this; var qc_com = this.selectComponent("#qc_com"); //组件的id qc_com.open(th.data.qr_code_object) }, //--领取商品-- - get_xp:function (e) { - var th=this,index=e.currentTarget.dataset.ind; - getApp().request.post("http://172.20.3.102:8080/api/user_qy/get_gd",{ - data:{}, - success:function (e) { - if(e.data.code==0){ - var txt="xp_list["+index+"].is_get" - var obj={};obj[txt]=1; - th.setData(obj); - } - } - }) - } - + async show_hxm(e) { + setTimeout(() => { + let qr_code_object = this.data.qr_code_object; + if (qr_code_object !== {}) { + let { + WriteOffCode: val, + BeginDate, + EndDate + } = qr_code_object; + let qr_code = this.selectComponent("#qc_com"); + let obj = { + val, + content: "当前核销码仅限当面使用", + now: BeginDate, + validay: EndDate, + is_quan: 0, + is_fw:0, + }; + qr_code.open(obj) + } else { + wx.showToast({ + title: "获取失败", + icon: 'none', + duration: 1000 + }) + } + }, 500); + }, + close: function () { + this.getQrCode(this.data.FormId) + } }) \ No newline at end of file diff --git a/pages/user/user_spsy/user_spsy.json b/pages/user/user_spsy/user_spsy.json index 468dc50..678c7b1 100644 --- a/pages/user/user_spsy/user_spsy.json +++ b/pages/user/user_spsy/user_spsy.json @@ -1,5 +1,5 @@ { - "navigationBarTitleText": "新品试用", + "navigationBarTitleText": "免费领取", "usingComponents": { "qr_code": "/components/qr_code/qr_code" } diff --git a/pages/user/user_spsy/user_spsy.wxml b/pages/user/user_spsy/user_spsy.wxml index 1fb85c4..d2ea4d5 100644 --- a/pages/user/user_spsy/user_spsy.wxml +++ b/pages/user/user_spsy/user_spsy.wxml @@ -1,28 +1,22 @@ - - - - - - - - {{item.goods_name}} - - ￥ - - - {{item.goods_price}} - - 立即使用 - 免费领取 - - + + + + 单品名称 + 数量 + + + {{item.PrivilegeName}} + x{{item.SecondNo}} + + + + 已使用 + 立即使用 + + - - - - - - - + \ No newline at end of file diff --git a/pages/user/user_spsy/user_spsy.wxss b/pages/user/user_spsy/user_spsy.wxss index ec604ef..2f78a2c 100644 --- a/pages/user/user_spsy/user_spsy.wxss +++ b/pages/user/user_spsy/user_spsy.wxss @@ -3,66 +3,34 @@ page{ height: 100%; background:#f4f5fa; } -.xc-page{ - width: 100%; - height: 100%; - background: #f4f5fa; -} -.xc-page .items{ - display: inline-block; - width: 345rpx; - height:450rpx; - margin-left:20rpx; - margin-top: 25rpx; - border-radius: 15rpx; - background:#fff; -} - -.xc-page .items .zimg{ - width: 120rpx; - height: 120rpx; - left:50%; top:50%; - margin-left: -60rpx; margin-top: -60rpx; -} - -.new-product{ - width:345rpx; - height:325rpx; - border-radius:15rpx 15rpx 0 0; -} -.product-explain{ - width: 90%; - word-break:break-all; - height: 40rpx; - margin-left:15rpx; - -} -.xc-bottom{ - margin-top: 13rpx; +.xc-coupon-img{ width: 100%; - margin-left: 15rpx; + height: 330rpx; +} +.btn-container { + position: fixed; + left: 0; + bottom: 0; + width: 100%; + /* padding: 20rpx 30rpx; */ + box-sizing: border-box; + background-color: white; + border-top: 2rpx solid #f2f2f2; + z-index: 1; } -.xc-bottom .xc-goods-money{ -color: #ca4e59; - padding-top: 12rpx; -} -.xc-bottom .xc-money{ - color: #ca4e59; - font-size: 40rpx; - height: 100%; - line-height:50rpx +.btn { + background-color: #FF6768; + color: white; + padding: 26rpx; + text-align: center; + /* border-radius: 8rpx; */ +} +.btn1 { + background-color: #ccc; + color: white; + padding: 26rpx; + text-align: center; + /* border-radius: 8rpx; */ } - -.xc-clike-get{ - width: 120rpx; - height: 36rpx; - border-radius: 20rpx; - background: #ca4e59; - line-height:28rpx; - font-size:27rpx; - margin-left: 120rpx; -padding-top: 10rpx -} - diff --git a/pages/user/userqy/userqy.js b/pages/user/userqy/userqy.js index 9a244d0..2343904 100644 --- a/pages/user/userqy/userqy.js +++ b/pages/user/userqy/userqy.js @@ -187,7 +187,9 @@ Page({ } var url=e.currentTarget.dataset.img; - + if(!url || url==""){ + url=`/public/upload/userqy/quanbg.jpg` + } switch (no) { case "01": getApp().goto("/packageB/pages/user/user_coupon/user_coupon?img=" @@ -197,7 +199,7 @@ Page({ getApp().goto("/pages/user/user_fw/user_fw?gradeId="+th.data.gradeId+"&FormId="+item.Id); break; case "03": - getApp().goto("/pages/user/user_spsy/user_spsy"); + getApp().goto("/pages/user/user_spsy/user_spsy?img="+url+"&gradeId="+th.data.gradeId+"&FormId="+item.Id); break; case "10": getApp().request.get("/api/weshop/users/grade/vipprivilegelist/other/get",{ diff --git a/pages/user/userqy/userqy.wxml b/pages/user/userqy/userqy.wxml index 28f1f24..9c8cfd6 100644 --- a/pages/user/userqy/userqy.wxml +++ b/pages/user/userqy/userqy.wxml @@ -88,12 +88,13 @@ + - {{item.PrivilegeName}} + {{item.PrivilegeName}} diff --git a/utils/filter.wxs b/utils/filter.wxs index ca5d0a3..0717a64 100644 --- a/utils/filter.wxs +++ b/utils/filter.wxs @@ -143,6 +143,10 @@ var filters = { return val / 100; }, + div100: function(val) { + return val / 100; + }, + // 计算百分比, 不带百分号 percent: function(num1, num2) { // console.log('百分比',Math.round(num1/num2 * 10000) / 100); @@ -188,5 +192,6 @@ module.exports = { difference: filters.difference, multiply: filters.multiply, price: filters.price, + div100: filters.div100, JSONStringify: filters.JSONStringify, } \ No newline at end of file