diff --git a/app.wxss b/app.wxss index 447ec7f..cfd7bca 100644 --- a/app.wxss +++ b/app.wxss @@ -293,7 +293,6 @@ justify-content:space-around; - /* 7.26 */ .white{ color: #fff; @@ -413,4 +412,5 @@ background: #ffe3e2; .lh1 { line-height: 1; -} \ No newline at end of file +} + diff --git a/components/diy_searchbox/diy_searchbox.js b/components/diy_searchbox/diy_searchbox.js index 283717d..75b51e0 100644 --- a/components/diy_searchbox/diy_searchbox.js +++ b/components/diy_searchbox/diy_searchbox.js @@ -5,7 +5,6 @@ var t = getApp(), Component({ properties: { // 这里定义了innerText属性，属性值可以在组件使用时指定 - object: { type: Object, value: null, @@ -15,19 +14,49 @@ Component({ // 这里是一些组件内部数据 yc:false, imghost: o.imghost, - someData: {} + someData: {}, + first:1, + inputShowed:1, + inputval:'在店铺内搜索', + keyword:'', }, ready: function() { - console.log("ready"); + var th=this; + getApp().getConfig2(function(e) { + //看有没有热搜 + if(e.hot_keywords) + th.setData({keyword:e.hot_keywords}); + }) }, methods: { //智能跳转 go_url:function (e) { var url=e.currentTarget.dataset.url; getApp().goto(url); - } - - - + }, + click_sear:function(){ + //如果搜索的单词为空的时候，就要跳到搜索页 + if(this.data.keyword!=''){ + getApp().goto("/pages/goods/search/search"); + return false; + } + this.setData({first:0,inputShowed:1,inputval:''}); + }, + + onblur:function(){ + var val=this.data.inputval; + if(val==''){ + this.setData({first:1,}); + } + }, + set_input:function(e){ + var val=e.detail.value; + this.setData({inputval:val}); + }, + sear:function(){ + var url="/pages/goods/search/search?s_key="+this.data.inputval; + getApp().goto(url); + } + } }) \ No newline at end of file diff --git a/components/diy_searchbox/diy_searchbox.wxml b/components/diy_searchbox/diy_searchbox.wxml index 2ce8ff1..6a874f3 100644 --- a/components/diy_searchbox/diy_searchbox.wxml +++ b/components/diy_searchbox/diy_searchbox.wxml @@ -2,12 +2,22 @@ - - - - 在店铺内搜索 + + + + 在店铺内搜索 + + + + + + + + + @@ -24,10 +34,15 @@ - - - 在店铺内搜索 + + + 在店铺内搜索 + + + + diff --git a/components/diy_searchbox/diy_searchbox.wxss b/components/diy_searchbox/diy_searchbox.wxss index f00f7c1..8df14d5 100644 --- a/components/diy_searchbox/diy_searchbox.wxss +++ b/components/diy_searchbox/diy_searchbox.wxss @@ -60,9 +60,6 @@ height: 30rpx; margin-left: 10rpx; margin-right: 4rpx; - margin-bottom:-6rpx; -margin-top:20rpx; - } .s1_gk_a1{ @@ -83,4 +80,9 @@ margin-top:20rpx; .abs_top2{ position: fixed; z-index: 10; -} \ No newline at end of file +} + +.flex{ display: flex; align-items: center;} +.find_img{margin: 0 20rpx; } +.find_inp{text-align: left; width: 620rpx;} +.find_inp2{text-align: left; width: 520rpx;} \ No newline at end of file diff --git a/components/goods_list/g_filter.wxs b/components/goods_list/g_filter.wxs index 8a9998e..608fb4d 100644 --- a/components/goods_list/g_filter.wxs +++ b/components/goods_list/g_filter.wxs @@ -59,7 +59,7 @@ var g_filters = { } if(type==0) return min_price; - if(min_name.length>4 ) min_name=min_name.substring(0, 4); + if(min_name.length>4 ) min_name=min_name.substring(0, 8); return min_name; }, } diff --git a/components/goods_list/goods_list.js b/components/goods_list/goods_list.js index fffb4dc..460fbe6 100644 --- a/components/goods_list/goods_list.js +++ b/components/goods_list/goods_list.js @@ -62,7 +62,7 @@ Component({ //--- 判断是等级会员，且在有效期范围内 --- if (user.card_field && now < end) { var card_name = ob.name_map.get(user.card_field); - if (card_name.length > 4) card_name = card_name.substring(0, 4); + if (card_name.length > 4) card_name = card_name.substring(0, 8); th.setData({ card_field: user.card_field, card_name: card_name, @@ -166,7 +166,6 @@ Component({ card_name_map.set(name, plusCard[i].CardName); new_arr.push(plusCard[i]); - } } var ob = { diff --git a/custom-tab-bar/index.wxml b/custom-tab-bar/index.wxml index fceecd7..f5dcea0 100644 --- a/custom-tab-bar/index.wxml +++ b/custom-tab-bar/index.wxml @@ -1,13 +1,13 @@ - + {{cartGoodsNum}} - + - + {{item.nav_name}} diff --git a/custom-tab-bar/index.wxss b/custom-tab-bar/index.wxss index 934d857..571e147 100644 --- a/custom-tab-bar/index.wxss +++ b/custom-tab-bar/index.wxss @@ -2,11 +2,11 @@ width:100%; border-top: 1rpx solid #ebebeb; position: fixed; bottom: 0; left: 0; z-index: 10000; } .tabbar_item{ - position:relative;height:100%;float:left;text-align:center;padding:5px 0; + position:relative;height:100%;float:left;text-align:center;padding:0px 0; } .tab_img{display: flex; justify-content: center;align-items: center} .nav_imgage{ - height: 56rpx; width: 56rpx;background-position: center;background-repeat: no-repeat;background-size: auto 85%; + height: 58rpx; width: 58rpx;background-position: center;background-repeat: no-repeat;background-size: auto 92%; } .cart_num{ top:0;background-color: red;color: #fff;font-size: 20rpx;border-radius: 50%;width: 40rpx;line-height:40rpx;height: 40rpx;position: absolute;z-index: 100;right:30rpx; diff --git a/images/share/hui_hear_pic.png b/images/share/hui_hear_pic.png index 91144c7..9ea7b6d 100644 --- a/images/share/hui_hear_pic.png +++ b/images/share/hui_hear_pic.png diff --git a/images/share/mackground.png b/images/share/mackground.png index 6bcf62e..39396ac 100644 --- a/images/share/mackground.png +++ b/images/share/mackground.png diff --git a/images/share/s_gou.png b/images/share/s_gou.png index 5e4e765..02a8b0a 100644 --- a/images/share/s_gou.png +++ b/images/share/s_gou.png diff --git a/packageA/images/gt.png b/packageA/images/gt.png new file mode 100644 index 0000000..354851e --- /dev/null +++ b/packageA/images/gt.png diff --git a/packageA/pages/liveStream/liveStream.js b/packageA/pages/liveStream/liveStream.js index 4b167e1..108618c 100644 --- a/packageA/pages/liveStream/liveStream.js +++ b/packageA/pages/liveStream/liveStream.js @@ -57,7 +57,7 @@ Page({ let self = this; getApp().request.put("/api/weshop/wx/livelist/updatelivelist", { data: { - storeId: 1 + storeId: o.stoid }, success: function (res) { console.log('我发起了PUT请求,请求结果：', res.data); diff --git a/packageA/pages/prom_list/prom_list.js b/packageA/pages/prom_list/prom_list.js index 5fef675..6fc346f 100644 --- a/packageA/pages/prom_list/prom_list.js +++ b/packageA/pages/prom_list/prom_list.js @@ -770,7 +770,9 @@ Page({ data: { store_id: o.stoid, is_show: 1, - pageSize: 1000 + pageSize: 1000, + orderField:"sort", + orderType:'asc', }, success: function(ee) { if (ee.data.code == 0) { @@ -795,12 +797,12 @@ Page({ //----要进行门店分组-------- for (var i = 0; i < sto_arr.length; i++) { //找一下这个门店有没有在分类数组内 - var find2 = 0, - find2name = ""; + var find2 = 0, find2name = "",sort=0; for (var m = 0; m < sto_cate.length; m++) { if (sto_arr[i].category_id == sto_cate[m].cat_id) { find2 = sto_cate[m].cat_id; find2name = sto_cate[m].cat_name; + sort=sto_cate[m].sort; break; } } @@ -822,6 +824,7 @@ Page({ var item = { cat_id: find2, name: find2name, + sort:sort, s_arr: arr0 }; newarr.push(item); @@ -837,6 +840,7 @@ Page({ var item = { cat_id: find2, name: find2name, + sort:sort, s_arr: arr0 }; newarr.push(item); @@ -845,6 +849,18 @@ Page({ } } } + + //门店分类要排序下 + function compare(property){ + return function(a,b){ + var value1 = a[property]; + var value2 = b[property]; + return value1 - value2; + } + } + if(newarr.length>0) + newarr.sort(compare("sort")); + //----安排其他的分类----- if (qita.length > 0) { @@ -1135,7 +1151,7 @@ Page({ if (bconfig.is_sort_storage) { wx.getLocation({ - type: 'wgs84', + type: 'gcj02', success: function(res) { th.data.lat = res.latitude; @@ -1464,7 +1480,7 @@ Page({ var e = th.data.bconfig; if (e.is_sort_storage) { wx.getLocation({ - type: 'wgs84', + type: 'gcj02', success: function(res) { th.data.lat = res.latitude; th.data.lon = res.longitude; diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js index 1a41adc..d273477 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -159,6 +159,15 @@ Page({ await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + item.goods_id, {}).then(res => { good = res.data.data; }) + if(!good){ + var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; + getApp().request.delete(url, { + success: function (t) { + } + }); + continue; + } + var tt = ut.gettimestamp(); //如果商品下架了，或者商品是赠品，一开始都要清除 if ((good.down_time > 0 && good.down_time < tt) || good.is_on_sale == 0 || item.is_gift) { @@ -821,13 +830,21 @@ Page({ var g_arr = new Array(); //已选的商品列表 var user_id = getApp().globalData.user_id; var th = this; - + //用于判断是不是积分购的普通购买 + var normal_arr={}; var ab = 0; //选中 wx.showLoading(); for (var i = 0; i < this.data.requestData.length; i++) { var i_arr = this.data.requestData[i].goods; + + for (var j = 0; j < i_arr.length; j++) { if (i_arr[j].selected && i_arr[j].is_gift!=1) { + + if(i_arr[j].is_pd_normal) { + normal_arr[i_arr[j].goods_id]=1; + } + //map 的key是不会重复，会覆盖，， var ie = { goods_id: i_arr[j].goods_id, @@ -972,13 +989,13 @@ Page({ } } - if (num > val.redisnum && val.redisnum) { + if (num > val.redisnum && val.redisnum && !normal_arr[val.goods_id]) { isok = 0; gname = val.goods_name; throw "超出活动库存"; return false; } - if (num > val.goods_num - val.buy_num && val.goods_num) { + if (num > val.goods_num - val.buy_num && val.goods_num && !normal_arr[val.goods_id]) { isok = 0; gname = val.goods_name; throw "超出活动库存"; @@ -993,7 +1010,7 @@ Page({ return false; } - if (num + buyed.promgoodsbuynum > val.buy_limit && val.buy_limit > 0) { + if (num + buyed.promgoodsbuynum > val.buy_limit && val.buy_limit > 0 && !normal_arr[val.goods_id]) { isok = 0; gname = val.goods_name; throw "超出活动限购"; @@ -1006,7 +1023,7 @@ Page({ if (g_arr[i].goods_id == val.goods_id) { //如果会员是等级会员,商品有等级价,且不是活动商品 - if(card_field && val[card_field]>0 && (val.prom_type==0 || val.prom_type==3 || val.prom_type==4 || val.prom_type==5) ){ + if(card_field && val[card_field]>0 && (val.prom_type==0 || val.prom_type==3 || val.prom_type==4 || val.prom_type==5 || normal_arr[val.goods_id]) ){ if (g_arr[i].goods_price != val[card_field]){ isok = 0; gname = val.goods_name; diff --git a/pages/cart/cart/cart.wxml b/pages/cart/cart/cart.wxml index cde5553..3afb2e6 100644 --- a/pages/cart/cart/cart.wxml +++ b/pages/cart/cart/cart.wxml @@ -107,7 +107,7 @@ - + diff --git a/pages/cart/cart/cart.wxss b/pages/cart/cart/cart.wxss index 71c30e3..29e91c9 100644 --- a/pages/cart/cart/cart.wxss +++ b/pages/cart/cart/cart.wxss @@ -138,12 +138,11 @@ radio { } .pay-for { - width: 100%; - height: 100rpx; + height: 110rpx; position: fixed; left: 0; - bottom: 90rpx; + bottom: 110rpx; font-size: 28rpx; color: #666; background-color: rgb(255, 255, 255); diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index f1978fe..a0ff763 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -46,7 +46,9 @@ Page({ bn_exp_type:1, //0是物流 1自提 bn_pick:0, //选择的门店 bn_pickname: "", //选择的门店名称 - bn_t_exp_t:0, //判断商品和门店一起决定的物流自提的方式0 都可以 1自提 2物流 + bn_t_exp_t:0, //判断商品和门店一起决定的物流自提的方式0 都可以 1自提 2物流 + + bn_plus_cut_price:0, //显示等级卡会优惠多少钱 /*------------------------*/ user_addr:null,//物流 userinfo:null, //获取会员 @@ -105,15 +107,18 @@ Page({ //-- order_prom_list -- order_prom_list_cart:null, - ispt_goods:0, //是否平摊至单品，0要平摊 1不平摊 + ispt_goods:0, //是否平摊至单品，0要平摊 1不平摊 + rank_switch:0, //是不是开同等级卡 + show_card:null, //显示的等级卡 + card_name:'', //显示的卡的名称 + card_cut_price:null,//减价多少钱 }, onLoad: function(t) { - wx.setNavigationBarTitle({ title: "填写订单",}) var th = this; this.setData({ is_b_now: t.is_bnow == undefined ? 0 : t.is_bnow,}); th.data.param=t; - + //清空is_pick_up getApp().request.put("/api/weshop/useraddress/updatePickUp", { data: {user_id: getApp().globalData.user_id, is_pickup: 0}, @@ -121,15 +126,7 @@ Page({ } }); - //先获取是否有关闭使用优惠券 - getApp().getConfig2(function (ee) { - var json_d = JSON.parse(ee.switch_list); - th.data.ispt_goods=json_d.ispt_goods; //是不是平摊到单品的控制参数赋值 - th.setData({ is_close_quan: json_d.is_close_quan,sales_rules:ee.sales_rules}); - //-----先获取物流，再获取用户信息，再展示页面----- - th.get_wuliu(th.get_info(th.show_page)); - }) - + }, onUnload: function () { this.setData({ isclose: 1 })}, onHide: function () { @@ -155,7 +152,6 @@ Page({ console.log("getuser_addr") console.log(ie) - //地址切换要把包邮券清空 if( !th.data.user_addr || th.data.user_addr.address_id!=ie.address_id){ var using_quan=th.data.using_quan; @@ -174,10 +170,12 @@ Page({ th.setData({user_addr: ie }); if (th.data.is_b_now == 1) { if(th.data.bn_goods) { + th.setData({add_back:1}); th.calculatePrice2(); } }else{ if (th.data.cartlist){ + th.setData({add_back:1}); th.calculatePrice(); } } @@ -209,6 +207,58 @@ Page({ getApp().globalData.is_cart2_old=0; } } + + //先获取是否有关闭使用优惠券 + getApp().getConfig2(function (ee) { + var json_d = JSON.parse(ee.switch_list); + th.data.ispt_goods=json_d.ispt_goods; //是不是平摊到单品的控制参数赋值 + th.setData({ is_close_quan: json_d.is_close_quan,sales_rules:ee.sales_rules,rank_switch:json_d.rank_switch}); + + 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_priceitem[th.data.card_name] ){ + item.goods_price=item[th.data.card_name]; + carr[i].goods_price=item[th.data.card_name]; + + } + }else{ + // 拼团,搭配购不计算,赠品也不计算,同时会员还未购买等级会员 + if(item[th.data.card_name]>0 && item['prom_type']!=5 && item['prom_type']!=6 && !th.data.userinfo.card_field + && !item.is_gift && !item['is_collocation'] && item.goods_price>item[th.data.card_name] ){ + item.cut_price= item.goods_price-item[th.data.card_name]; + carr[i].cut_price=(item.goods_price-item[th.data.card_name])*item.goods_num; + } + + } + + item.original_img = oo.imghost + item.original_img; /*----接口要弄出来的，先顶着-----*/ var pcid = item.pick_id; @@ -320,7 +399,9 @@ Page({ if (arr.length > 0) { for (var j = 0; j < arr.length; j++) { if (arr[j].pickup_id == pcid) { - arr[j].goods.push(item); + arr[j].goods.push(item); + //-- 把等级卡会优惠多少钱装进去 -- + if(item.cut_price) arr[j].card_cut_price+=item.cut_price; find = 1;break; } } @@ -348,6 +429,7 @@ Page({ //如果是物流的话，全部自提的控制要弄成0 if (e_t == 0) th.setData({ is_all_zt:0}); + var narr = new Array(); narr.push(item); //-----------拼装购物车结算的数组,如果有默认物流时要用默认物流编号----------------- @@ -359,9 +441,16 @@ Page({ } var ie = { - pickup_id: pcid, pname: pikname, goods: narr, exp_type: e_t, wind: m_wind, distr_t: dis_t, + pickup_id: pcid, pname: pikname, goods: narr, exp_type: e_t, wind: m_wind, distr_t: dis_t,card_cut_price:0, goods_price: 0, shipping_price: 0, user_money: 0, total_amount: 0, order_amount: 0, user_note:0}; + + if(!th.data.add_back){ + ie.exp_type= et; + } + //-- 把等级卡会优惠多少钱装进去 -- + if(item.cut_price) ie.card_cut_price+=item.cut_price; arr.push(ie); + } } //深拷贝 @@ -414,6 +503,25 @@ Page({ var item=th.data.wu_arr[k]; if(def_exp_code==item.code){ m_wind=k; } } } + + //---是不是购买等级卡成功的返回---等级卡显示的判断--- + var is_card_back=getApp().globalData.is_card_back; + if(is_card_back){ + th.data.card_name=th.data.userinfo.card_field; + gg.goods_price=gd[th.data.card_name]; + getApp().globalData.is_card_back=0; + th.setData({card_cut_price:0}); + //如果是秒杀的返回 + if(gd.prom_type==1) gd.prom_type=0; + }else{ + //--- 商家等级卡开通的情况下, 会员不是等级会员的情况， 商品有设置等级卡价格，同时等级卡价格小于商品的价格 + //-- 搭配购的商品也可以单独购买，所以此时搭配购的商品要进行计算优惠 -- + if(!gg.collocation_goods && gd['prom_type']!=6 && 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])*gg.goods_num; + th.setData({card_cut_price:cut_p}); + } + } + switch (gd.prom_type){ case 0: case 2: @@ -432,7 +540,7 @@ Page({ t.data.data.prom_id = 0; t.data.data.prom_type = 0; - + //如果立即购买那边过来，就要读取接口，查看活动的优惠内容 if(gg.prom_type==3){ t.data.data.prom_id = gg.prom_id ; @@ -444,7 +552,7 @@ Page({ var num=1; if(data.is_bz==1){ num=data.bs; - if (num > data.gift_limitnum) num = 0; + if (num > data.gift_limit_num) num = 0; } //如果赠品数量超出礼品库存，就取消 if(num>data['gift_storecount']) num=0; @@ -470,17 +578,19 @@ Page({ } th.setData({ - bn_goods: data, bn_pickname: gg.pick_name, bn_exp_type: et,index:m_wind, + bn_goods: data, bn_pickname: gg.pick_name,index:m_wind, bn_pick: gg.pick_id, bn_t_exp_t: distr_t }); - + + if(!th.data.add_back){ + th.setData({ bn_exp_type: et }) + } //计算价格 th.calculatePrice2(); //获取优惠券 th.get_buy_now_quan(); }) - }else{ //--看是不是搭配促销-- if(gg.prom_type==5){ @@ -504,9 +614,13 @@ Page({ th.data.old_cartlist=cart_arr; } th.setData({ - bn_goods: t.data.data, bn_pickname: gg.pick_name, bn_exp_type: et,index:m_wind, + bn_goods: t.data.data, bn_pickname: gg.pick_name,index:m_wind, bn_pick: gg.pick_id, bn_t_exp_t: distr_t }); + + if(!th.data.add_back){ + th.setData({ bn_exp_type: et }) + } //--搭配促销也是按照购物车的方式来计算优惠券-- if(gg.prom_type==5){ @@ -546,6 +660,11 @@ Page({ bn_goods: t.data.data, bn_pickname: gg.pick_name, bn_exp_type: et,index:m_wind, bn_pick: gg.pick_id, bn_t_exp_t: distr_t }); + + if(!th.data.add_back){ + th.setData({ bn_exp_type: et }) + } + //计算价格 th.calculatePrice2(); //获取优惠券 @@ -1524,7 +1643,10 @@ Page({ if(gg.room_id && gg.room_id>0){ goods.room_id=gg.room_id; } - + + //积分购，先要带is_integral_normal=1 + if(gg.is_integral_normal) goods.is_integral_normal=1; + //如果不立即购买或者秒杀，如果是线下库存购买的时候 if(goods.prom_type!=1 && goods.prom_type!=6 && th.data.sales_rules==2){ var isok=1; @@ -2942,7 +3064,13 @@ Page({ } } return is_use; - } + }, + + //跳转到购买卡 + buycard:function(){ + getApp().goto("/pages/user/plus/plus"); + getApp().globalData.plus_buy_back=1; + } diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml index e8552aa..43f4e80 100644 --- a/pages/cart/cart2/cart2.wxml +++ b/pages/cart/cart2/cart2.wxml @@ -3,518 +3,588 @@
- - - - - - - - - - - 门店：{{item.pname}} - - - - - - - - - {{items.goods_name}} - - - - {{filters.show_gui_ge(items.goods_spec,items.goods_color)}} - - - - - - - - - - - - ￥{{filters.toFix(items.goods_price,2)}} - x{{items.goods_num}} - - - - - - - - - 优惠券{{item.can_num}}张可用 - - 不使用 - ￥{{using_quan[item.pickup_id].money}}元优惠券 - 包邮券 + + + + + + + + + + + + {{item.pname}} + + + + + + + + + + {{items.goods_name}} + + + + {{filters.show_gui_ge(items.goods_spec,items.goods_color)}} + + + + + + + + + + + + ￥{{filters.toFix(items.goods_price,2)}} + x{{items.goods_num}} + + + + + + + + + + + {{show_card.CardName}} + + 立减 {{filters.toFix(item.card_cut_price,2) }} 元 + + + vip超级会员仅需{{show_card.CardFee}}元 + + + + + 立即开通 + + + + + + + 优惠券{{item.can_num}}张可用 + + 不使用 + ￥{{using_quan[item.pickup_id].money}}元优惠券 + 包邮券 - - - - - - - - - {{order.store_prom}} - - - - - - - - - - - - - - - - 门店自提 - - - - - - - - - - - - - 快递邮寄 - - - - - - {{wu_arr[item.wind].name}} - - - - - + + + + + + + + + + + 门店自提 + + + + + + + + + + + + + 快递邮寄 + + + + + + {{wu_arr[item.wind].name}} + + + + + + - - - - - - - 留言 - - - - - - - - - - - - - 使用余额 :￥{{yuer}} - - - - - - - - - - 门店：{{bn_pickname}} - - - - - - {{bn_goods.goods_name}} - - - - {{filters.show_gui_ge(bn_goods.goods_spec,bn_goods.goods_color)}} - - - - - - - - - - - ￥{{filters.toFix(bn_goods.shop_price,2)}} - x{{bn_goods.buynum}} - - - - - - - - - - - - - {{buy_now_gift_goods.goods_name}} - - - - {{filters.show_gui_ge(buy_now_gift_goods.goods_spec,buy_now_gift_goods.goods_color)}} - - - - - ￥0 - x{{buy_now_gift_goods.buynum}} - - - - - - - - - - - - - {{item.goods_name}} - - - - {{filters.show_gui_ge(item.goods_spec,item.goods_color)}} - - - - - ￥{{item.price}} - x{{item.goods_num}} - - - - - - - - {{order.store_prom}} - - - - - - 优惠券 {{(selected_quan_list?selected_quan_list.length:0)+ (get_by_quan_list?get_by_quan_list.length:0)}}张可用 - - - 不使用 - - ￥{{using_quan[bn_pick].money}}元优惠券 - 包邮券 - - - - - - - - - - - 自提 - - - - 物流 - - - - {{wu_arr[index].name}} - - - - - - - - - 使用余额 :￥{{yuer}} - - - - 留言 - - - - - - - - - - 商品金额 - ￥ {{formData.all_price}}元 - - - 配送费用 - ￥ {{formData.shipping_price}}元 - - - 使用优惠券 - - ￥ {{formData.coupon_price}}元 - - - - 优惠活动 - - ￥ {{filters.toFix(formData.cut_price,2)}}元 - - - - 订单优惠 - - ￥ {{filters.toFix(formData.order_prom_amount,2)}}元 - - - 使用余额 - - ￥ {{formData.user_money}}元 - - - - - - - - 应付金额 : - ￥ {{formData.order_amount}}元 - - + + + + + + 留言 + + + + + + + + + + + + + 使用余额 :￥{{yuer}} + + + + + + + + + + + {{bn_pickname}} + + + + + + + + {{bn_goods.goods_name}} + + + + {{filters.show_gui_ge(bn_goods.goods_spec,bn_goods.goods_color)}} + + + + + + + + + + + ￥{{filters.toFix(bn_goods.shop_price,2)}} + x{{bn_goods.buynum}} + + + + + + + + + + + + + {{buy_now_gift_goods.goods_name}} + + + + {{filters.show_gui_ge(buy_now_gift_goods.goods_spec,buy_now_gift_goods.goods_color)}} + + + + + ￥0 + x{{buy_now_gift_goods.buynum}} + + + + + + + + + + + + + {{item.goods_name}} + + + + {{filters.show_gui_ge(item.goods_spec,item.goods_color)}} + + + + + ￥{{item.price}} + x{{item.goods_num}} + + + + + + + + + + + {{show_card.CardName}} + + 立减 {{filters.toFix(card_cut_price,2) }} 元 + + + vip超级会员仅需{{show_card.CardFee}}元 + + + + + 立即开通 + + + + + + {{order.store_prom}} + + + + + + 优惠券 {{(selected_quan_list?selected_quan_list.length:0)+ (get_by_quan_list?get_by_quan_list.length:0)}}张可用 + + + 不使用 + + ￥{{using_quan[bn_pick].money}}元优惠券 + 包邮券 + + + + + + + + + + + 门店自提 + + + + 快递邮寄 + + + + + {{wu_arr[index].name}} + + + + + + + + 留言 + + + + + + + + + + 使用余额 :￥{{yuer}} + + + + + + + + 商品金额 + ￥ {{formData.all_price}}元 + + + 配送费用 + ￥ {{formData.shipping_price}}元 + + + 使用优惠券 + - ￥ {{formData.coupon_price}}元 + + + + 优惠活动 + - ￥ {{filters.toFix(formData.cut_price,2)}}元 + + + + 订单优惠 + - ￥ {{filters.toFix(formData.order_prom_amount,2)}}元 + + + 使用余额 + - ￥ {{formData.user_money}}元 + + + + + + + 应付金额：￥{{formData.order_amount}} + + + +
- - - + + + - - 优惠券使用 - × - - - 可使用的优惠券 - 不使用优惠券 - Γ - - - - - - - - - + + + 优惠券使用 + + + × + + + + 可使用的优惠券 + 不使用优惠券 + + Γ + + + + + + + + + + + + + + + + + + + ￥{{item.Sum}} + 满{{item.BuySum}}元可用 + 满0元可用 + + + + + + + + + {{filter.get_type_card(item.UseObjectType)}} + {{item.Sum}}元优惠券 + + {{filters.replace_time2(item.BeginDate)}}至{{item.ValidDate?filters.replace_time2(item.ValidDate):'不限'}} + + + + Γ + + + + + + + + + + + + + + + + + + + + + + + 包邮券 + 满{{item.condition}}元可用 + 满0元可用 + + + + + + + + + {{filter.get_type_card(0)}} + 包邮券 + + {{filters.format_time(item.use_start_time)}}至{{item.use_end_time?filters.format_time(item.use_end_time):'不限'}} + + + + Γ + + + + + + + + + + + + + + + + + + - - - - - - ￥{{item.Sum}} - 满{{item.BuySum}}元可用 - 满0元可用 - - - - - - - - - {{filter.get_type_card(item.UseObjectType)}} - {{item.Sum}}元优惠券 - - {{filters.replace_time2(item.BeginDate)}}至{{item.ValidDate?filters.replace_time2(item.ValidDate):'不限'}} - - - Γ - - - - - - - + + + + + + 包邮券 + 满{{item.condition}}元可用 + 满0元可用 + + + + + + + + + {{filter.get_type_card(0)}} + 包邮券 + + {{filters.format_time(item.use_start_time)}}至{{item.use_end_time?filters.format_time(item.use_end_time):'不限'}} + + + + Γ + + + + + + + + + + - - - - - - - - - - - - 包邮券 - 满{{item.condition}}元可用 - 满0元可用 - - - - - - - - - {{filter.get_type_card(0)}} - 包邮券 - - {{filters.format_time(item.use_start_time)}}至{{item.use_end_time?filters.format_time(item.use_end_time):'不限'}} - - - Γ - - - - - - - - - - - - - - - - - - - - - - 包邮券 - 满{{item.condition}}元可用 - 满0元可用 - - - - - - - - - {{filter.get_type_card(0)}} - 包邮券 - - {{filters.format_time(item.use_start_time)}}至{{item.use_end_time?filters.format_time(item.use_end_time):'不限'}} - - - Γ - - - - - - - - - - - - - - - - 确定 - + + + + + + + + + 确定 + + - - - - - - - - 选择物流名字 - - - × - - - - - - - - Γ - - - - - {{express_list.name}} - - + + + + + + + + 选择物流名字 + + + × + + + + + + + + Γ + + + + + {{express_list.name}} + - - - 确定 - - - 设为默认 - - - - + + + + 确定 + + + 设为默认 + + + + - \ No newline at end of file + diff --git a/pages/cart/cart2/cart2.wxss b/pages/cart/cart2/cart2.wxss index 90f871c..a3ed00c 100644 --- a/pages/cart/cart2/cart2.wxss +++ b/pages/cart/cart2/cart2.wxss @@ -1,11 +1,46 @@ +.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 70rpx; + padding: 24rpx 26rpx; font-weight: 600; } @@ -16,10 +51,10 @@ .pos-icon { position: absolute; - left: 22rpx; - top: 9rpx; - width: 32rpx; - height: 37.5rpx; + left: 28rpx; + top: 6rpx; + width: 30rpx; + height: 36rpx; } .border-img { @@ -32,7 +67,7 @@ right: 0; top: 0; width: 80rpx; - height: 148rpx; + height: 100%; display: flex; align-items: center; justify-content: center; @@ -51,7 +86,7 @@ .order-detail { padding: 30rpx 0; - border-bottom: 6rpx solid #eee; + border-bottom: 2rpx solid #eee; color: #777; min-height: 190rpx; background-color: #fff; @@ -60,8 +95,8 @@ .goods-img { float: left; - width: 191rpx; - height: 191rpx; + width: 200rpx; + height: 200rpx; margin: 0 20rpx; } @@ -90,22 +125,33 @@ line-height: 42rpx; } -.set-mes{background-color: #fff; } +.set-mes{ + background-color: #fff; + /* margin-top: 20rpx; */ +} .use-item{ display: flex; align-items: center; height: 80rpx; - border-bottom: 1px solid #ddd; + /* border-bottom: 1px solid #ddd; */ font-size: 30rpx; - width:95%; -margin:auto; - + /* width:95%; +margin:auto; */ + padding: 0 26rpx; } .use-item>view{ - display: flex;margin-right: 12rpx; + display: flex; + /* margin-right: 12rpx; */ +} +.use-item.bfff{ + background-color: #fff; +} +.use-item .dp{ + display: block; + width: 50rpx; + height: 50rpx; + margin-left: -6rpx; } -.use-item.bfff{ background-color: #fff;} -.use-item .dp{width: 56rpx; height: 56rpx; margin-left: -5rpx} .set-item { justify-content: space-between; @@ -135,14 +181,16 @@ margin:auto; } .coupon-mes { + /* box-sizing: border-box; */ height:95rpx; - padding: 0 20rpx; + padding: 0 26rpx; background-color: #fff; font-size: 30rpx; color: #444; - width: 100%; - - + /* width: 100%; */ + border-radius: 14rpx; + margin-top: 20rpx; + margin-bottom: 20rpx; } .coupon-title { @@ -169,15 +217,14 @@ margin:auto; .leave-word { position: relative; - font-size: 24rpx; margin-left: 20rpx; - + flex-grow: 1; } .word-box { - - width: 600rpx; + font-size: 26rpx; + /* width: 600rpx; */ padding: 10rpx; height: 28rpx; line-height: 40rpx; @@ -190,9 +237,9 @@ margin:auto; } .information { - padding: 0 20rpx; + padding: 0 26rpx; background-color: #fff; - margin-bottom: 120rpx; + /* margin-bottom: 120rpx; */ } .information .item { @@ -205,36 +252,50 @@ margin:auto; } .btn-wrap { - height: 100rpx; width: 100%; - background-color: #fff; - position: fixed; bottom: 0;left: 0; - border-top:1rpx solid #dee; - z-index:9999 + 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; + /* float: right; width: 200rpx; height: 100rpx; line-height: 100rpx; text-align: center; font-size: 30rpx; color: #fff; - background-color: #f23030; + 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; + /* float: right; display: flex; align-items: center; height: 100rpx; font-size: 26rpx; - margin-right: 40rpx; + margin-right: 40rpx; */ } .payable { color: #444; - margin-right: 20rpx; + /* margin-right: 20rpx; */ } .shipping-modal { @@ -274,10 +335,19 @@ margin:auto; } /*----------nyf新增，地址---------*/ -.add_new{height: 60rpx; line-height: 60rpx;} +.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; margin-left: 20rpx; vertical-align: middle;} -.yu_er{margin-left: 10rpx;margin-right: 60rpx;} .wuliu{margin-left: 20rpx;} + margin-right: 15rpx;vertical-align: middle;} +.yu_er{ + margin-left: 10rpx; + /* margin-right: 60rpx; */ +} +.wuliu{margin-left: 20rpx;} /*---- 优惠券列表 -----*/ @@ -290,8 +360,8 @@ margin:auto; width: 100%; height: 100%; border-bottom:3rpx solid #eee; - - + padding: 0 26rpx; + background-color: white; } .xc-right{ width:20rpx; @@ -300,7 +370,6 @@ margin:auto; border-right:2rpx solid #000; transform:rotate(45deg); display:inline-block; - } .xc-coupon-frame .work-frame .work{ font-size: 30rpx; line-height: 92rpx; } @@ -309,15 +378,15 @@ margin:auto; /* 自定义弹出窗口 */ .cx-popup{ width:100%; - height:920rpx; + height:880rpx; background: #fff; z-index: 35; border-top-left-radius: 20rpx; border-top-right-radius: 20rpx; position:fixed; bottom:0; - padding-bottom: 25rpx; - + left: 0; + /* padding-bottom: 25rpx; */ } .cx-popup .top{ @@ -431,9 +500,9 @@ color: #333; } .xc-confirm { - width: 48%; + width: 50%; border-radius: 50rpx; - height: 50rpx; + height: 80rpx; margin:0 auto; background:#d60021; color:#fff; @@ -509,31 +578,32 @@ border-bottom: 1rpx solid #eee; width: 100%; height: 65%; overflow-y: auto; - margin-bottom: 10rpx; + margin-bottom: 40rpx; } .xc-confirms { - width: 40%; - border-radius: 50rpx; - height: 55rpx; - margin:0 auto; - font-size:28rpx; - background: #fff; - color: #333; - border: 2rpx solid #333; - + 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: 710rpx; */ + width: 100%; height:auto; margin: 0 auto; } .xc-coupon-frame .coupon-frame{ - width: 99%; + width: 100%; height: 200rpx; margin-top:10rpx; border-bottom: 1rpx solid #eee; @@ -577,12 +647,12 @@ width:100%; top:-37rpx; } .coupon-right{ - width:490rpx; + /* 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%; @@ -672,15 +742,15 @@ align-items: center; width: 24rpx; } .xc-buttom{ - width:99%; -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; - + 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{ @@ -726,10 +796,12 @@ width:42rpx; height:42rpx; } .may_use_coupon{ - width: 95%; - height: 68rpx; + /* width: 95%; */ + /* height: 68rpx; */ line-height:78rpx; - margin: auto; + padding: 0 26rpx; + justify-content: space-between; + align-items: center; } .determine-frame{ width: 100%; @@ -737,7 +809,7 @@ height:42rpx; } .xc-determine{ - height: 55rpx; + height: 80rpx; width: 40%; border-radius: 50rpx; background: #d60021; @@ -821,4 +893,68 @@ margin-left: 20rpx; .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: 6rpx 10rpx; background-color:#ea5551; color:#fff; border-radius: 6rpx } \ No newline at end of file +.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 +} + diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js index c1dd1d7..985c22f 100644 --- a/pages/cart/cart2_pt/cart2_pt.js +++ b/pages/cart/cart2_pt/cart2_pt.js @@ -1,6 +1,6 @@ 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; +var oo=t.globalData.setting,os=oo; var regeneratorRuntime = require('../../../utils/runtime.js'); var util_pay = require("../../../utils/pay.js"); @@ -58,6 +58,11 @@ Page({ 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("onLoad_pt_cart"); @@ -75,7 +80,7 @@ Page({ if(appD.is_pt_tz) th.data.is_pt_tz=appD.is_pt_tz; th.data.param=t; //先获取物流，再获取用户信息，再展示页面 - th.get_wuliu(th.get_info(th.show_page)); + //th.get_wuliu(th.get_info(th.show_page)); }, onUnload: function () { this.setData({ isclose: 1 })}, @@ -178,10 +183,33 @@ Page({ t.data.data.prom_id = 0; t.data.data.prom_type = 0; t.data.data.is_normal=1; + + 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}); + } + } + th.setData({ - bn_goods: t.data.data, bn_pickname: gg.pick_name, bn_exp_type: et, + bn_goods: t.data.data, bn_pickname: gg.pick_name, bn_pick: gg.pick_id, bn_t_exp_t: distr_t, is_normal:1 - }); + }); + if(!th.data.add_back){ + th.setData({ bn_exp_type: et }) + } + th.calculatePrice2(); }else{ @@ -214,9 +242,13 @@ Page({ t.data.data.is_normal=1; } th.setData({ - bn_goods: t.data.data, bn_pickname: gg.pick_name, bn_exp_type: et, + bn_goods: t.data.data, bn_pickname: gg.pick_name, bn_pick: gg.pick_id, bn_t_exp_t: distr_t }); + + if(!th.data.add_back){ + th.setData({ bn_exp_type: et }) + } //计算价格 th.calculatePrice2(); } @@ -235,7 +267,12 @@ Page({ }) }else{ this.getuser_addr(function(ie){ - th.setData({user_addr: 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}); + th.calculatePrice2(); + } }) //--更新默认地址--,看一下是不是跳到地址页面 if(!getApp().globalData.is_cart2_old){ @@ -244,6 +281,57 @@ Page({ getApp().globalData.is_cart2_old=0; } } + + + //先获取是否有关闭使用优惠券 + getApp().getConfig2(function (ee) { + var json_d = JSON.parse(ee.switch_list); + th.data.ispt_goods=json_d.ispt_goods; //是不是平摊到单品的控制参数赋值 + th.setData({ is_close_quan: json_d.is_close_quan,sales_rules:ee.sales_rules,rank_switch:json_d.rank_switch}); + + 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 -