diff --git a/app.json b/app.json index 26e284a..fcf1cf0 100644 --- a/app.json +++ b/app.json @@ -85,12 +85,17 @@ "pages/video/index", "pages/template/index", "pages/store/index" - ], + + ], "subPackages": [{ "root": "packageA/", "name":"pack1", - "pages": ["pages/prom_list/prom_list"] + "pages": [ + "pages/prom_list/prom_list", + "pages/quan_list/quan_list", + "pages/quan_pro/quan_pro" + ] }], "permission": { diff --git a/app.wxss b/app.wxss index 1c9cadb..6f4643d 100644 --- a/app.wxss +++ b/app.wxss @@ -94,7 +94,7 @@ button { text-align: center; } .no-data .no-data-title { - color: #9b9b9b; + color: #444; margin-bottom: 30rpx; font-size: 35rpx; } diff --git a/packageA/pages/quan_list/filter.wxs b/packageA/pages/quan_list/filter.wxs new file mode 100644 index 0000000..5051751 --- /dev/null +++ b/packageA/pages/quan_list/filter.wxs @@ -0,0 +1,27 @@ +var is_has = function (text,val) { + if(text.indexOf(","+val+",")==-1) return false; + return true +} + +function get_guige(color,spece){ + if(color=="" && spece==""){return "规格1"} + if(spece!="" && color==""){return spece} + if(spece=="" && color!=""){return color} + if(spece!="" && color!=""){return spece+"/"+color} + return ""; +} + +function get_color(index){ + var i=index%3; + switch(i){ + case 0: return "red"; + case 1: return "blue"; + case 2: return "purple"; + } +} + +module.exports = { + is_has: is_has, + get_guige:get_guige, + get_color:get_color +} diff --git a/packageA/pages/quan_list/g_filter.wxs b/packageA/pages/quan_list/g_filter.wxs new file mode 100644 index 0000000..e998151 --- /dev/null +++ b/packageA/pages/quan_list/g_filter.wxs @@ -0,0 +1,87 @@ +var g_filters = { + //-- 判断是不是有等级价 -- + is_has_rank:function(rank_switch,item){ + if(!rank_switch) return false; + if(item.cardprice1 || item.cardprice2 || item.cardprice3) {return true} + return false; + }, + + //-- 判断,不是等级会员时候，要显示的最低等级价和名称 -- + get_card_price:function(goods,all_card,type){ + var price1=parseFloat(goods['cardprice1']); + var price2=parseFloat(goods['cardprice2']); + var price3=parseFloat(goods['cardprice3']); + if(!all_card){ + if(type==0) return 0; + return ""; + } + + var arr=[]; + var min_price= 0; + var min_name=""; + + var min_price=null; + var min_name=null; + //---设置对应的价格名字---- + for(var i=0;i<3;i++) { + var vl=all_card[i]; + if(!vl) continue; + if(vl['CorrPrice']=="Price1" && price1>0) + { + if(min_price==null) { + min_price=price1;min_name=vl['CardName']; + } + else if(price10) + { + if(min_price==null) { + min_price=price2;min_name=vl['CardName']; + } + else if(price20) + { + if(min_price==null) { + min_price=price3;min_name=vl['CardName']; + } + else if(price34 ) min_name=min_name.substring(0, 4); + return min_name; + }, +} +module.exports = { + is_has_rank:g_filters.is_has_rank, + get_card_price:g_filters.get_card_price, +} \ No newline at end of file diff --git a/packageA/pages/quan_list/quan_list.js b/packageA/pages/quan_list/quan_list.js new file mode 100644 index 0000000..66bcb83 --- /dev/null +++ b/packageA/pages/quan_list/quan_list.js @@ -0,0 +1,140 @@ +var t = require("../../../utils/util.js"), ut = t, + e = require("../../../utils/common.js"), + oo = getApp().globalData, + os = getApp().globalData.setting; +var utils = require('../../../utils/util.js'),ut=utils; + + + +Page({ + data: { + stoid: os.stoid, + url: os.url, + resourceUrl: os.resourceUrl, + iurl: os.imghost, + defaultAvatar: os.resourceUrl + "/static/images/user68.jpg", + dataList: null, + config2:null, + curpage:1, + loading:0, + get_item:null, + show_success:0, + }, + //------初始化加载---------- + onLoad: function(t) { + var th=this; + getApp().getConfig2(function (conf) { + conf.couponset=conf.couponset.replace(/\ { + th.data.loading=0; + if(res.data.code==0){ + if(!th.data.dataList) th.data.dataList=new Array(); + th.data.dataList=th.data.dataList.concat(res.data.data.pageData); + th.data.curpage++; + th.setData({dataList:th.data.dataList}); + } + }); + }, + + //---加载更多是靠这个函数---- + onReachBottom: function() { + this.get_quan_list(); + }, + + + //--滚动到顶部-- + doScrollTop: function() { + wx.pageScrollTo({ scrollTop: 0 }); + }, + + //-----领取券----- + get_quan: function(e) { + var cid = e.currentTarget.dataset.cid; + var index = e.currentTarget.dataset.ind; + var item = this.data.dataList[index]; + + //--先判断会员状态-- + 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/getphone/getphone', + }) + return false; + } + + //如果券还在领取中，不能再点 + if (item.linging == 1) { + getApp().my_warnning('领取中..', 0, this); + return false; + } + + //如果领取的次数到了 + if (item.everyone_num > 0 && item.lqnum >= item.everyone_num) { + getApp().my_warnning('领取失败，您已领完该券', 0, this); + return false; + } + var lq_num = item.lqnum; + var pdata = { + 'uid': oo.user_id, + 'cid': cid, + 'store_id': os.stoid, + 'type': 5 + }; + var app = getApp(), + th = this; + app.request.post("/api/weshop/couponList/saveCouponList", { + data: pdata, + success: function(res) { + if (res.data.code == 0) { + var text = "dataList[" + index + "].is_get"; + var text2 = "dataList[" + index + "].linging"; + var text3 = "get_item"; + var obj = {};obj[text] = 1; obj[text2] = 0;obj[text3] = item;obj['show_success']=1; + th.setData(obj); + } else { + app.confirmBox(res.data.msg); + var text2 = "dataList[" + index + "].linging"; + th.setData({[text2]:0}); + } + } + }) + }, + close_show:function () { + this.setData({show_success:0,get_item:null}) + }, + go_quan:function () { + getApp().goto("/pages/user/coupons/coupons"); + }, + go_detail:function (e) { + var index=e.currentTarget.dataset.ind; + var item=this.data.dataList[index]; + getApp().goto("/packageA/pages/quan_pro/quan_pro?id="+item.id); + } + + +}); diff --git a/packageA/pages/quan_list/quan_list.json b/packageA/pages/quan_list/quan_list.json new file mode 100644 index 0000000..04a1287 --- /dev/null +++ b/packageA/pages/quan_list/quan_list.json @@ -0,0 +1,8 @@ +{ + "navigationBarTitleText": "优惠券", + "enablePullDownRefresh": false, + "usingComponents": { + "nav_box": "/components/nav_box/nav_box", + "warn": "/components/long_warn/long_warn" + } +} \ No newline at end of file diff --git a/packageA/pages/quan_list/quan_list.wxml b/packageA/pages/quan_list/quan_list.wxml new file mode 100644 index 0000000..b2fe076 --- /dev/null +++ b/packageA/pages/quan_list/quan_list.wxml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + ￥{{filters.toFix(item.money,2)}} + 满{{filters.toFix(item.condition,2)}}可用 + + + + + {{item.name}} + 所有门店通用 + 有效期 + {{filters.format_time(item.use_start_time)}}至 + {{filters.format_time(item.use_end_time)}}不限 + + 有效期{{item.days}}天不限 + 每人限领：{{item.everyone_num}}不限 + + + 已领取 + 立即领取 + + + + + + + + + + + + 恭喜您获得【{{get_item.name}}】优惠券 + + + 查看我的优惠券 + + + + + + diff --git a/packageA/pages/quan_list/quan_list.wxss b/packageA/pages/quan_list/quan_list.wxss new file mode 100644 index 0000000..9f69ee1 --- /dev/null +++ b/packageA/pages/quan_list/quan_list.wxss @@ -0,0 +1,32 @@ +page{background-color: #f8f8f8;} +.co-w{color: #ffffff;} +.co_g{color:#b399b3} +.co_b{color:#333;} + +.header{padding: 0 10rpx;} +.r_txt{line-height: 45rpx; } +.content{padding: 0 20rpx; margin-top: 20rpx} +.quan_item{ height: 213rpx; margin-bottom: 20rpx } +.quan_item .left{overflow: hidden;width: 35%; height: 213rpx;border-top-left-radius:10rpx;border-bottom-left-radius:10rpx;position: relative} +.quan_item .right{width: 65%; height: 210rpx; border-top-right-radius:10rpx;border-bottom-right-radius:10rpx;position: relative; + background-position: center;background-size: 100% 100%; background-repeat: no-repeat} +.quan_item .left.red {background: url(https://mshopimg.yolipai.net/miniapp/images/coupon_img/red.png) no-repeat;background-position: center;background-size: 100% 100%;} +.quan_item .left.blue {background: url(https://mshopimg.yolipai.net/miniapp/images/coupon_img/blue.png) no-repeat;background-position: center;background-size: 100% 100%;} +.quan_item .left.purple {background: url(https://mshopimg.yolipai.net/miniapp/images/coupon_img/purple.png) no-repeat;background-position: center;background-size: 100% 100%;} + +.quan_item .right.pding{padding-left: 40rpx} +.btn{position: absolute;right: 20rpx; bottom: 20rpx; border-radius: 5px; border: 1rpx solid #c4182e; width: 132rpx; height: 40rpx; color: #c4182e } +.btn.is_get{border: 0;background-color: #dcdcdc;color: #adb3be; width: 94rpx;} + +.suc_content{ + height: 300rpx; width: 84%; margin-left:8%;position: fixed; border-radius:25rpx; + top:50%; margin-top: -150rpx;background-color: #fff; z-index: 999999; +} + +.suc_content .up{ height:200rpx } +.suc_content .up image{ width: 280rpx; height: 220rpx; margin-top: -130rpx} +.suc_content .down{ background-color: #c4182e; height:106rpx; line-height: 106rpx; +border-bottom-right-radius:25rpx; +border-bottom-left-radius:25rpx; +} + diff --git a/packageA/pages/quan_pro/filter.wxs b/packageA/pages/quan_pro/filter.wxs new file mode 100644 index 0000000..fa5ed5a --- /dev/null +++ b/packageA/pages/quan_pro/filter.wxs @@ -0,0 +1,17 @@ +var is_has = function (text,val) { + if(text.indexOf(","+val+",")==-1) return false; + return true +} + +function get_guige(color,spece){ + if(color=="" && spece==""){return "规格1"} + if(spece!="" && color==""){return spece} + if(spece=="" && color!=""){return color} + if(spece!="" && color!=""){return spece+"/"+color} + return ""; +} + +module.exports = { + is_has: is_has, + get_guige:get_guige +} diff --git a/packageA/pages/quan_pro/g_filter.wxs b/packageA/pages/quan_pro/g_filter.wxs new file mode 100644 index 0000000..e998151 --- /dev/null +++ b/packageA/pages/quan_pro/g_filter.wxs @@ -0,0 +1,87 @@ +var g_filters = { + //-- 判断是不是有等级价 -- + is_has_rank:function(rank_switch,item){ + if(!rank_switch) return false; + if(item.cardprice1 || item.cardprice2 || item.cardprice3) {return true} + return false; + }, + + //-- 判断,不是等级会员时候，要显示的最低等级价和名称 -- + get_card_price:function(goods,all_card,type){ + var price1=parseFloat(goods['cardprice1']); + var price2=parseFloat(goods['cardprice2']); + var price3=parseFloat(goods['cardprice3']); + if(!all_card){ + if(type==0) return 0; + return ""; + } + + var arr=[]; + var min_price= 0; + var min_name=""; + + var min_price=null; + var min_name=null; + //---设置对应的价格名字---- + for(var i=0;i<3;i++) { + var vl=all_card[i]; + if(!vl) continue; + if(vl['CorrPrice']=="Price1" && price1>0) + { + if(min_price==null) { + min_price=price1;min_name=vl['CardName']; + } + else if(price10) + { + if(min_price==null) { + min_price=price2;min_name=vl['CardName']; + } + else if(price20) + { + if(min_price==null) { + min_price=price3;min_name=vl['CardName']; + } + else if(price34 ) min_name=min_name.substring(0, 4); + return min_name; + }, +} +module.exports = { + is_has_rank:g_filters.is_has_rank, + get_card_price:g_filters.get_card_price, +} \ No newline at end of file diff --git a/packageA/pages/quan_pro/quan_pro.js b/packageA/pages/quan_pro/quan_pro.js new file mode 100644 index 0000000..a3e9906 --- /dev/null +++ b/packageA/pages/quan_pro/quan_pro.js @@ -0,0 +1,109 @@ +var t = require("../../../utils/util.js"), ut = t, + e = require("../../../utils/common.js"), + oo = getApp().globalData, + os = getApp().globalData.setting; + var utils = require('../../../utils/util.js'),ut=utils; + +Page({ + data: { + stoid: os.stoid, + url: os.url, + resourceUrl: os.resourceUrl, + iurl: os.imghost, + defaultAvatar: os.resourceUrl + "/static/images/user68.jpg", + q_data: null, + id:null, + config2:null, + + }, + //------初始化加载---------- + onLoad: function(t) { + var id=t.id; + this.data.id=id; + var goods_list = this.selectComponent("#goods_list"); //组件的id + goods_list.init(); + setTimeout(function() { + goods_list.get_list(); + }, 300) + }, + + //---展示,显示券的信息--- + onShow: function() { + var th=this; + var user_id=getApp().globalData.user_id; + getApp().request.promiseGet("/api/weshop/prom/coupon/pageCouponList", { + data:{store_id:os.stoid,type:1,id:th.data.id,user_id:user_id} + }).then(res => { + if(res.data.code==0){ + th.setData({q_data:res.data.data.pageData[0]}); + } + }); + }, + + onHide: function() { + + }, + //--滚动到顶部-- + doScrollTop: function() { + wx.pageScrollTo({ scrollTop: 0 }); + }, + + //---加载更多是靠这个函数---- + onReachBottom: function() { + var goods_list = this.selectComponent("#goods_list"); //组件的id + if (goods_list) goods_list.get_list(); + }, + + //-----领取券----- + get_quan: function() { + var item=this.data.q_data; + var cid = this.data.q_data.id; + var th=this; + //--先判断会员状态-- + 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/getphone/getphone', + }) + return false; + } + //如果券还在领取中，不能再点 + if (th.data.linging == 1) { + getApp().my_warnning('领取中..', 0, this); + return false; + } + th.data.linging = 1; + //如果领取的次数到了 + if (item.everyone_num > 0 && item.lqnum >= item.everyone_num) { + getApp().my_warnning('领取失败，您已领完该券', 0, this); + return false; + } + var lq_num = item.lqnum; + var pdata = { + 'uid': oo.user_id, + 'cid': cid, + 'store_id': os.stoid, + 'type': 5 + }; + var app = getApp(), + th = this; + app.request.post("/api/weshop/couponList/saveCouponList", { + data: pdata, + success: function(res) { + th.data.linging = 0; + if (res.data.code == 0) { + item.lqnum++; + var text = "dataList[" + index + "].is_get"; + var text2 = "dataList[" + index + "].linging"; + var text3="q_data"; + var obj = {};obj[text] = 1; obj[text2] = 0;obj[text3] = item;obj['show_success']=1; + th.setData(obj); + } else { + app.confirmBox(res.data.msg); + } + } + }) + }, + + +}); diff --git a/packageA/pages/quan_pro/quan_pro.json b/packageA/pages/quan_pro/quan_pro.json new file mode 100644 index 0000000..06e6a38 --- /dev/null +++ b/packageA/pages/quan_pro/quan_pro.json @@ -0,0 +1,9 @@ +{ + "navigationBarTitleText": "优惠券", + "enablePullDownRefresh": false, + "usingComponents": { + "nav_box": "/components/nav_box/nav_box", + "warn": "/components/long_warn/long_warn", + "goods_recommend":"/components/goods_list/goods_list" + } +} \ No newline at end of file diff --git a/packageA/pages/quan_pro/quan_pro.wxml b/packageA/pages/quan_pro/quan_pro.wxml new file mode 100644 index 0000000..3ff4c39 --- /dev/null +++ b/packageA/pages/quan_pro/quan_pro.wxml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + {{q_data.name}} + + + 全场通用 + 仅限{{q_data.useobjectname}}使用 + + + + ￥{{filters.toFix(q_data.money,2)}} + 满{{filters.toFix(q_data.condition,2)}}可用 + + + 有效期 + {{filters.format_time(q_data.use_start_time)}}至 + {{filters.format_time(q_data.use_end_time)}}不限 + + 有效期{{q_data.days}}天不限 + + + + + + 已领取 + 立即领取 + + + 猜你喜欢 + + + + + + + + + + + + + + + + 恭喜您获得【{{get_item.name}}】优惠券 + + + 查看我的优惠券 + + + + + + + + diff --git a/packageA/pages/quan_pro/quan_pro.wxss b/packageA/pages/quan_pro/quan_pro.wxss new file mode 100644 index 0000000..90cdbc8 --- /dev/null +++ b/packageA/pages/quan_pro/quan_pro.wxss @@ -0,0 +1,29 @@ +page{background-color: #f8f8f8;} +.co-w{color: #ffffff;} +.co_g{color:#b399b3} +.co_b{color:#333;} + +.up_part{background-color: #fff;padding-bottom: 20rpx} +.img_part{ padding: 0 20rpx; position: relative} +.btn{ width: 90%; height: 72rpx; border-radius: 10rpx; background-color: #ff6c6c; color: #fff;} +.love{ width: 60rpx; height: 50rpx} +.q_content{ position: absolute;top: 0; left: 0; width: 100%; height: 450rpx;padding: 0 20rpx; } +.upper{ height:330rpx;} +.lower{ height: 120rpx; line-height: 170rpx;color:#7a668f} + +.upper .left{ margin-left:30rpx; margin-top: 30rpx } +.t_circle{ width: 10rpx; height: 10rpx; border-radius: 50%; background-color: #fff; margin-right: 8rpx} + +.suc_content{ + height: 300rpx; width: 84%; margin-left:8%;position: fixed; border-radius:25rpx; + top:50%; margin-top: -150rpx;background-color: #fff; z-index: 999999; +} + +.suc_content .up{ height:200rpx;} +.suc_content .up image{ width: 280rpx; height: 220rpx; margin-top: -130rpx} +.suc_content .down{ background-color: #c4182e; height:106rpx; line-height: 106rpx; + border-bottom-right-radius:25rpx; + border-bottom-left-radius:25rpx; +} + +.btn.gray{background-color: #dcdcdc; color: #adb3be;} diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js index 9dbc7a6..e571570 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -747,8 +747,13 @@ Page({ plist=res.data.data.pageData[0]; } }) - var ob={}; ob.code=1; - if(t.goods_num>plist.CanOutQty-lock){ + var ob={}; ob.code=1; + + if(!plist){ + ob.code=-1;ob.CanOutQty=0;func(ob); return false; + } + + if( t.goods_num>plist.CanOutQty-lock){ ob.code=-1; ob.CanOutQty=plist.CanOutQty-lock if(ob.CanOutQty<0) ob.CanOutQty=0; @@ -1104,6 +1109,7 @@ Page({ //检查莫个门店下的商品是不是优惠活动，有的话，看要不要送礼品，同时有没有倍增 check_prom_activity:async function (cindex) { + var make_up_arr=new Array(); var th=this; var map=new Map(); var list=this.data.requestData[cindex]; @@ -1170,7 +1176,7 @@ Page({ is_bz: prom.is_bz } }).then(res=>{ - if(res.data.code==0) discount=res.data.data[0]; + if(res.data.code==0) discount=res.data.data; }) //---如果有打折的信息，赠送的信息--- if(discount && discount['goods_id']){ @@ -1223,10 +1229,46 @@ Page({ } } } + //-- 获取 -- + await getApp().request.promiseGet("/api/weshop/promgoodslist/list",{ + data:{prom_id:prom.id} + }).then(res=>{ + if(res.data.code==0){ + var list=res.data.data; + for(var i in list){ + var item=list[i]; + if(item.prom_type==0){ + if(ob.price0){ + this.setData({[diff_text]:make_up_arr}); + }else{ + this.setData({[diff_text]:null}); + } + }, + + //去凑单 + go_cou_dang:function (e) { + var prom_id=e.currentTarget.dataset.prom_id; + var url="/pages/goods/goodsList/goodsList?prom_type=3&prom_id="+prom_id; + getApp().goto(url); } }); \ No newline at end of file diff --git a/pages/cart/cart/cart.wxml b/pages/cart/cart/cart.wxml index e55e708..b2f7906 100644 --- a/pages/cart/cart/cart.wxml +++ b/pages/cart/cart/cart.wxml @@ -84,6 +84,24 @@ + + + + 再买{{item.diff}}元 + 件 + ， + 免{{item.content.is_money}}元| + 打{{item.content.sale}}折| + 包邮| + 送优惠券| + 送积分| + 送赠品| + 送礼包| + + + 去凑单> + + diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index f5c8c71..2a8bd22 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -165,8 +165,23 @@ Page({ th.data.isget_by_quan={}; } - th.setData({user_addr: ie }); - var going=0; + //更换地址回来要重新调用计算价钱的接口 + if(!th.data.user_addr || th.data.user_addr.address_id!=ie.address_id){ + if (th.data.is_b_now == 1) { + if(th.data.bn_goods) { + th.calculatePrice2(); + } + }else{ + if (th.data.cartlist){ + th.calculatePrice(); + } + } + } + + th.setData({user_addr: ie }); + var going=0; + + //使用计时器，避免空现象 /*--- var jishi= setInterval(function () { @@ -597,7 +612,7 @@ Page({ }; var c_arr=JSON.parse(JSON.stringify(th.data.old_cartlist)); //---循环购物车--- - for(var i=0;i { - if (res.data.code == 0) { + if (res.data.code == 0 && res.data.data.condition) { var get_data = res.data.data; item_map.is_bz = get_data.is_bz; //是不是倍增 - item_map.is_xz_yh = get_data.is_xz_yh; //是不是优惠 item_map.bs = get_data.bs; //是不是倍数 item_map.is_past = get_data.is_past; //是不是包邮 - item_map.prom_price = get_data.price?get_data.price:0; + item_map.prom_price = get_data.price?get_data.price:item_map.price; item_map.s_intValue = get_data.intValue; item_map.s_coupon_id = get_data.coupon_id; item_map.s_coupon_num = get_data.coupon_num; @@ -674,6 +688,10 @@ Page({ } } + var q_conditin=0; + //判断包邮券的钱 + q_conditin=o_price; + if(!item_map.is_xz_yh) q_conditin=o_price-item_map.price; //--看有没有减价-- if(item_map.prom_price && item_map.price-item_map.prom_price){ if(cart_item.prom_pt_json){ @@ -681,7 +699,10 @@ Page({ }else{ cart_item.prom_pt_json=[{"prom_id":item_map.prom_id,"dis":item_map.price-item_map.prom_price,"ispt":0}]; } + o_price-=(item_map.price-item_map.prom_price); + //如果有限制使用优惠券，就要减掉参与的活动商品的钱 + if(!item_map.is_xz_yh) q_conditin=o_price; } //--优惠多少钱-- @@ -742,7 +763,7 @@ Page({ if(!th.data.isget_by_quan[pickid]){ //--判断要不要显示包邮券,调用接口，因为有for循环--- await getApp().request.promiseGet("/api/weshop/userfeemail/pageAndArea",{ - data:{store_id:os.stoid,isuse:0,condition:o_price,user_id:getApp().globalData.user_id,pageSize:2000} + data:{store_id:os.stoid,isuse:0,condition:q_conditin,user_id:getApp().globalData.user_id,pageSize:2000} }).then(res=>{ if(res.data.code==0 && res.data.data.total>0){ //此时要循环判断包邮的地区，不包邮商品是不是符合 @@ -808,6 +829,8 @@ Page({ for(var j=0;j=freight_free && freight_free>0 && !is_good_no_by && th.data.is_no_by[pickid]!=1){ - var i=1; continue; } //--如果是包邮券使用的情况下，如果商品是包邮的，那么就不进行计算-- if(th.data.using_quan[pickid] && th.data.using_quan[pickid].isby==1 && !is_good_no_by){ - var i=1; continue; } @@ -1029,7 +1050,7 @@ Page({ 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 && good.is_past!=1){ + if (th.data.user_addr != null && th.data.bn_exp_type == 0 && good.is_free_shipping == 0 && good.is_past!=1 && good.is_xz_yh!=1){ //看是不是有调用过包邮券 if(!th.data.isget_by_quan[th.data.bn_pick]){ var condition=allpice-cut_price; @@ -1349,7 +1370,7 @@ Page({ } if(th.data.formData.give_coupon_id>0){ order_prom_list.give_coupon_id=th.data.formData.give_coupon_id; - order_prom_list.give_coupon_id=th.data.formData.g_coupon_num; + order_prom_list.g_coupon_num=th.data.formData.g_coupon_num; } if(th.data.formData.give_lb_id>0){ order_prom_list.give_lb_id=th.data.formData.give_lb_id; @@ -2417,7 +2438,7 @@ Page({ storeId: oo.stoid, userId: app.globalData.user_id, BuySum: th.data.ckeck_quan_price, - WareIds: th.data.check_quan_ware_list, + WareIds: encodeURIComponent(th.data.check_quan_ware_list), pageSize: 100 }, success: function (res) { @@ -2470,9 +2491,10 @@ Page({ //立即购买获取优惠活动的内容 buy_now_prom_goods:function (prom_id,arr,func) { var price=arr.shop_price*arr.goods_num; + var prom=null; getApp().request.promiseGet("/api/weshop/promgoods/get/"+os.stoid+"/"+prom_id,{}).then(res=>{ if(res.data.code==0){ - var prom=res.data.data; + prom=res.data.data; return getApp().request.promiseGet("/api/weshop/goods/getDiscount", { data: { price: price, @@ -2488,24 +2510,27 @@ Page({ }).then(res=>{ if(res.data.code==0){ var get_data=res.data.data; - arr.is_bz=get_data.is_bz; //是不是倍增 - arr.is_xz_yh=get_data.is_xz_yh; //是不是优惠 + arr.is_bz=prom.is_bz; //是不是倍增 + arr.is_xz_yh=prom.is_xz_yh; //是不是优惠 arr.bs=get_data.bs; //是不是倍数 arr.is_past=get_data.is_past; //是不是包邮 - arr.prom_price=get_data.price; + arr.prom_price=get_data.price?get_data.price:price; arr.s_intValue=get_data.intValue; arr.s_coupon_id=get_data.coupon_id; arr.s_coupon_num=get_data.coupon_num; - arr.gift_id=get_data.gift_id; - arr.gift_goods_id=get_data.goods_id; - arr.gift_goods_name=get_data.goods_name; - arr.gift_goods_color=get_data.goodsinfo.goods_color; - arr.gift_goods_spec=get_data.goodsinfo.goods_spec; - arr.gift_original_img=get_data.goodsinfo.original_img; - arr.gift_weight=get_data.goodsinfo.weight; - arr.gift_exp_sum_type=get_data.goodsinfo.exp_sum_type; - arr.gift_limit_num=get_data.limit_num; - arr.gift_storecount=get_data.gift_storecount; + //-- 看是不是有赠品 -- + if(get_data.gift_id) { + arr.gift_id = get_data.gift_id; + arr.gift_goods_id = get_data.goods_id; + arr.gift_goods_name = get_data.goods_name; + arr.gift_goods_color = get_data.goodsinfo.goods_color; + arr.gift_goods_spec = get_data.goodsinfo.goods_spec; + arr.gift_original_img = get_data.goodsinfo.original_img; + arr.gift_weight = get_data.goodsinfo.weight; + arr.gift_exp_sum_type = get_data.goodsinfo.exp_sum_type; + arr.gift_limit_num = get_data.limit_num; + arr.gift_storecount = get_data.gift_storecount; + } arr.s_libao=get_data.libao; arr.s_lb_num=get_data.lb_num; } @@ -2550,6 +2575,7 @@ Page({ ob.price=item.goods_price*item.goods_num; ob.goods_num=item.goods_num; ob.is_bz=prom.is_bz; + ob.is_xz_yh=prom.is_xz_yh; map[pickid][item.prom_id]=ob; } }else{ @@ -2562,6 +2588,7 @@ Page({ ob.price=item.goods_price*item.goods_num; ob.goods_num=item.goods_num; ob.is_bz=prom.is_bz; + ob.is_xz_yh=prom.is_xz_yh; var obj={}; obj[item.prom_id]=ob; map[pickid]=obj; @@ -2572,8 +2599,9 @@ Page({ //计算立即购买赠品的物流费用 get_now_gift_goods_wuliu:function (code, o_shipping_price, user_addr, gift_freight_free,allpice, rs,shipping_price,no_by_data) { var good=this.data.buy_now_gift_goods; - var goods_weight=-1, goods_piece=-1; + var goods_weight=-1, goods_piece=-1; var gift_shipping_price=0; + var th=this; switch (good['exp_sum_type']) { case 1: //统一运费 @@ -2596,7 +2624,7 @@ Page({ } } //如果有设置不包邮商品 - if(no_by_data && no_by_data.goods_list && freight_free){ + if(no_by_data && no_by_data.goods_list && gift_freight_free){ if(th.check_by_goods(no_by_data.goods_list)){ gift_freight_free=0; th.data.is_no_by[th.data.bn_pick]=1; diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml index 364db1e..e3b798b 100644 --- a/pages/cart/cart2/cart2.wxml +++ b/pages/cart/cart2/cart2.wxml @@ -296,11 +296,11 @@ - + 商品金额 ￥ {{formData.all_price}}元 - + 配送费用 ￥ {{formData.shipping_price}}元 @@ -318,7 +318,7 @@ 订单优惠 - ￥ {{formData.order_prom_amount}}元 - + 使用余额 - ￥ {{formData.user_money}}元 diff --git a/pages/cart/cart2_pt/cart2_pt.wxml b/pages/cart/cart2_pt/cart2_pt.wxml index feba63e..4de1c84 100644 --- a/pages/cart/cart2_pt/cart2_pt.wxml +++ b/pages/cart/cart2_pt/cart2_pt.wxml @@ -129,11 +129,11 @@ ￥ {{formData.all_price}}元 - + 配送费用 ￥ {{formData.shipping_price}}元 - + 使用余额 - ￥ {{formData.user_money}}元 diff --git a/pages/cart/cart_wk/cart_wk.wxml b/pages/cart/cart_wk/cart_wk.wxml index a4aa7a6..b083181 100644 --- a/pages/cart/cart_wk/cart_wk.wxml +++ b/pages/cart/cart_wk/cart_wk.wxml @@ -96,7 +96,7 @@ - + 配送费用 ￥{{exp_price}} diff --git a/pages/goods/categoryList/categoryList.wxml b/pages/goods/categoryList/categoryList.wxml index 3d3047e..0486107 100644 --- a/pages/goods/categoryList/categoryList.wxml +++ b/pages/goods/categoryList/categoryList.wxml @@ -460,10 +460,11 @@ - + - 该类别暂无推荐商品 {{countDownNum}} 秒后自动跳到下一个类别 - 该类别暂无推荐商品 + + 该类别暂无推荐商品 {{countDownNum}} 秒后自动跳到下一个类别 + 该类别暂无推荐商品 diff --git a/pages/goods/categoryList/categoryList.wxss b/pages/goods/categoryList/categoryList.wxss index 8052175..2a79d0e 100644 --- a/pages/goods/categoryList/categoryList.wxss +++ b/pages/goods/categoryList/categoryList.wxss @@ -264,7 +264,7 @@ width: 60%; width: 90%; margin: auto; height: 70rpx; - border-bottom: 1rpx solid #eee; + border-bottom: 1rpx solid #f5f6f6; line-height: 85rpx; font-weight: 600; diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml index acf59e9..095eded 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxml +++ b/pages/goods/goodsInfo/goodsInfo.wxml @@ -448,8 +448,8 @@ 减价{{item.money}}元; 打{{item.sale}}折; 包邮; - 送{{tem.int}}积分; - 送{{item.coupon}}元优惠券; + 送{{tem.intValue}}积分; + 送{{item.couponMoney}}元优惠券; 送商品{{item.goods_name}}; 送{{item.lbtitle}}; diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss index 708899b..32585e9 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxss +++ b/pages/goods/goodsInfo/goodsInfo.wxss @@ -2571,7 +2571,7 @@ button.custom-service::after{ border: 0; } .no_store{color:#d60021; font-size: 26rpx;} -.cx_show_view{ width: 580rpx; line-height: 30rpx; margin-bottom: 20rpx; } +.cx_show_view{ width: 580rpx; line-height: 30rpx; margin-bottom: 6rpx; } .cx_show_view .word{ width: 400rpx} .prom_condition { color: #d60021; diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js index 275713c..4eb1bd2 100644 --- a/pages/goods/goodsList/goodsList.js +++ b/pages/goods/goodsList/goodsList.js @@ -3,6 +3,7 @@ default: t }; }(require("../../../utils/LoadMore.js")), e = getApp(), a = new t.default(), oo = e.globalData.setting, ut = require("../../../utils/util.js"); +var regeneratorRuntime = require('../../../utils/runtime.js'); Page({ data: { @@ -19,7 +20,9 @@ Page({ adname:"desc", //升降的字段 is_new:0, is_hot:0, + prom_goods_list:null, }, + onLoad: function(t) { var th=this; a.init(this, "", "requestData"); @@ -47,8 +50,22 @@ Page({ if (0 != t.is_new && t.is_new != undefined) { url += "&is_new=" + t.is_new; } if (0 != t.is_hot && t.is_hot != undefined) { url += "&is_hot=" + t.is_hot; } + + //优惠活动的凑单 + if(t.prom_type==3){ + if (0 != t.prom_id && t.prom_id != undefined) { url += "&prom_id=" + t.prom_id; } + if (0 != t.prom_type && t.prom_type != undefined) { url += "&prom_type=" + t.prom_type; } + //-- 获取 -- + getApp().request.promiseGet("/api/weshop/promgoodslist/list",{ + data:{prom_id:t.prom_id } + }).then(res=>{ + if(res.data.code==0){ + var arr= res.data.data.pageData; + th.set_prom_list(arr); + } + }) + } this.requestGoodsList(url); - getApp().getConfig2(function(rs){ //计算等级价相关 var swithc_list=rs.switch_list; @@ -80,8 +97,45 @@ Page({ },500) } }); - }, + + //设置优惠券的 + set_prom_list:async function(arr){ + var th=this; + for(var i in arr){ + //优惠的实际内容 + arr[i].preferential_type=JSON.parse(arr[i].preferential_type); + //--送优惠券- + if(arr[i].preferential_type.is_coupon){ + //-- 获取券的内容 -- + await getApp().request.promiseGet(" /api/weshop/prom/coupon/get/"+arr[i].coupon, { + }).then(res => { + if(res.data.code==0) + arr[i].quan_name=res.data.data.name; + }) + } + //--送礼包-- + if(arr[i].is_libao) { + //-- 获取 -- + await getApp().request.promiseGet("/api/weshop/libao/libaoForm/page?id="+arr[i].is_libao+"&store_id="+oo.stoid, { + }).then(res => { + if(res.data.code==0) + arr[i].ib_name=res.data.data.pageData[0].lbtitle; + }) + } + //--送赠品-- + if(arr[i].is_gift) { + //-- 获取 -- + await getApp().request.promiseGet("/api/weshop/prom/gift/page?id="+arr[i].gift+"&store_id="+oo.stoid, { + }).then(res => { + if(res.data.code==0) + arr[i].gift_name=res.data.data.pageData[0].goods_name; + }) + } + } + th.setData({prom_goods_list:arr}); + }, + changeTab: function(t) { var ord = t.currentTarget.dataset.href; var ad = t.currentTarget.dataset.ad; diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml index c918332..5f49343 100644 --- a/pages/goods/goodsList/goodsList.wxml +++ b/pages/goods/goodsList/goodsList.wxml @@ -1,5 +1,15 @@ + + + 满50.00元 减5元 包邮 送10积分 送8元优惠券 送海飞丝洗发水丝质 顺滑& + + + + + + +