From c6b81e2d88e72f6084176040f35e48234c9732bc Mon Sep 17 00:00:00 2001 From: yvan.ni Date: Sat, 17 Jun 2023 17:28:19 +0800 Subject: [PATCH] 1、服务卡项订单详情的bug优化 2、商品详情页面的优化 --- packageA/pages/cart2_ser/cart2_ser.js | 10 +++++++++- packageA/pages/details_serviceCard/details_serviceCard.js | 3 +++ packageA/pages/serviceCard_pd/goodsInfo/buy_pt.wxml | 7 +++---- packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js | 29 +++++++++++++++++------------ packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml | 8 ++++---- packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxss | 4 ++++ pages/cart/cart/cart.js | 2 +- pages/goods/goodsInfo/buy_com_pop.wxml | 4 ++-- pages/goods/goodsInfo/buy_integral.wxml | 6 +++--- pages/goods/goodsInfo/buy_pt.wxml | 9 ++++----- pages/goods/goodsInfo/goodsInfo.wxml | 1 + pages/user/order_list/order_list.js | 1 + pages/user/order_list/order_list.wxml | 4 ++-- 13 files changed, 54 insertions(+), 34 deletions(-) diff --git a/packageA/pages/cart2_ser/cart2_ser.js b/packageA/pages/cart2_ser/cart2_ser.js index e8cce1e..5b3d10e 100644 --- a/packageA/pages/cart2_ser/cart2_ser.js +++ b/packageA/pages/cart2_ser/cart2_ser.js @@ -510,6 +510,9 @@ Page({ 'pickup_id': gg.pick_id, 'pickup_keyid': list[i].keyid, }; + if(gg.is_pd_normal){ + goods.is_pd_normal=1; + } } if(getApp().globalData.skinface_id){ @@ -562,6 +565,11 @@ Page({ goods.skinface_id=getApp().globalData.skinface_id; } + if(this.data.postdata && this.data.postdata.is_pd_normal==1){ + goods.is_pd_normal=1; + } + + //--导购分享过来的id-- if (gg.guide_id) { goods.guide_id = gg.guide_id; @@ -634,7 +642,7 @@ Page({ }); setTimeout(function () { wx.reLaunch({ - url: "/pages/payment/pay_success/pay_success?card=1&order_id=" + order_id, + url: "/pages/payment/pay_success/pay_success?card=1&order_id=" + th.data.order_id, }) }, 1000) diff --git a/packageA/pages/details_serviceCard/details_serviceCard.js b/packageA/pages/details_serviceCard/details_serviceCard.js index be73ad2..401155a 100644 --- a/packageA/pages/details_serviceCard/details_serviceCard.js +++ b/packageA/pages/details_serviceCard/details_serviceCard.js @@ -310,6 +310,9 @@ Page({ var card_id = details.list[i].card_id; var prom_type = details.list[i].prom_type > 0 ? details.list[i].prom_type : 0; var is_pd_normal = details.list[i].is_pd_normal; + if(is_pd_normal){ + newd['is_pd_normal'] = 1; + } // 库存 var redisNums = 0; // 限购数 diff --git a/packageA/pages/serviceCard_pd/goodsInfo/buy_pt.wxml b/packageA/pages/serviceCard_pd/goodsInfo/buy_pt.wxml index 6c95ed3..56239d8 100644 --- a/packageA/pages/serviceCard_pd/goodsInfo/buy_pt.wxml +++ b/packageA/pages/serviceCard_pd/goodsInfo/buy_pt.wxml @@ -38,10 +38,9 @@ - - {{def_pick_store.pickup_name}} - - + + {{def_pick_store.pickup_name}} + 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js index 10ed287..50ef5a6 100644 --- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js +++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js @@ -195,6 +195,8 @@ Page({ prom_r_null: 0, hiddenCS: true, //控制客服操作菜单显示和控制 user_order_pt_state: 0, + + is_retail_price: 0, }, //------初始化加载---------- @@ -311,8 +313,10 @@ Page({ store_config: e, sys_switch: json_d, is_closecoupon: json_d.is_closecoupon, - is_newsales_rules: json_d.is_newsales_rules + is_newsales_rules: json_d.is_newsales_rules, + is_retail_price: json_d.is_retail_price || 0, }); + ee.init(gid); //------几人评价------ @@ -457,20 +461,10 @@ Page({ mapurl_f_img = null; - // ----> 秒杀 - let prom_type = this.data.options.prom_type; let goods_id = this.data.options.goods_id; if (!goods_id) goods_id = this.data.data.goods_id; - if (prom_type) { // 进入商品详情页地址传参有带goods_id、prom_type、prom_id参数, 即从秒杀入口进入 - let prom_id = this.data.options.prom_id; - // 检查活动是否开始 - this.check_prom(goods_id, prom_type, prom_id); - - } - - //------是否收藏---------- await getApp().request.promiseGet("/api/weshop/goodscollect/page", { data: { @@ -609,6 +603,16 @@ Page({ }); + // ----> 秒杀 + let prom_type = that.data.options.prom_type; + + if (prom_type) { // 进入商品详情页地址传参有带goods_id、prom_type、prom_id参数, 即从秒杀入口进入 + let prom_id = that.data.options.prom_id; + // 检查活动是否开始 + that.check_prom(t.data.data.id, prom_type, prom_id); + } + + that.getTaohe(); //-----商品详情--- if (!t.data.data.serviceContent) t.data.data.serviceContent = " "; @@ -730,8 +734,8 @@ Page({ //---判断商品是否超出活动限购,拼团的普通购买不计算活动的限购--- if (th.data.promcardbuynum != -1 && th.data.prom_buy_limit > 0 && th.data.is_normal != 1) { - if (th.data.goodsInputNum + th.data.promcardbuynum > th.data.prom_buy_limit) { + if (th.data.goodsInputNum + th.data.promcardbuynum > th.data.prom_buy_limit) { s.my_warnning('超出商品活动限购', 0, th); var num = th.data.prom_buy_limit - th.data.promcardbuynum; if (num < 0) num = 0; @@ -3024,6 +3028,7 @@ Page({ ee.countDown(endTime2); } } + //-------查看有多少人在开这个团------- th.get_team_group(prom_id); } diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml index e59fca6..fd5a138 100644 --- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml +++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml @@ -79,9 +79,9 @@ ￥ {{prom_price}} - - 零售价￥{{filters.toFix(data.market_price,2)}} - + 零售价￥{{filters.toFix(data.market_price,2)}} + ￥{{filters.toFix(data.shop_price,2)}} + @@ -667,7 +667,7 @@ - + {{item.pickup_name}} (配送不匹配) diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxss b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxss index 75c7304..e4a323a 100644 --- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxss +++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxss @@ -2962,3 +2962,7 @@ button.custom-service::after{ margin: 0; } +.shop_name.max{ + max-width:370rpx; flex-shrink: 0; +} + diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js index dc1ecae..5f908e0 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -1355,7 +1355,7 @@ Page({ continue; } - if (item.prom_type == 0) { + if (item.prom_type == 0 && !item.is_integral_normal && !item.is_pd_normal ) { var prom = null; var now = ut.gettimestamp(); await getApp().request.promiseGet(`/api/weshop/activitylist/listGoodActInfo2`, { diff --git a/pages/goods/goodsInfo/buy_com_pop.wxml b/pages/goods/goodsInfo/buy_com_pop.wxml index d81e608..6967c56 100644 --- a/pages/goods/goodsInfo/buy_com_pop.wxml +++ b/pages/goods/goodsInfo/buy_com_pop.wxml @@ -29,8 +29,8 @@ - - {{def_pick_store.pickup_name}} + + {{def_pick_store.pickup_name}} 距离:{{def_pick_store.distance > 1000 ? filters.toFix(def_pick_store.distance / 1000, 2) + "km" : filters.toFix(def_pick_store.distance, 0) + "m"}} diff --git a/pages/goods/goodsInfo/buy_integral.wxml b/pages/goods/goodsInfo/buy_integral.wxml index fc198a4..9149589 100644 --- a/pages/goods/goodsInfo/buy_integral.wxml +++ b/pages/goods/goodsInfo/buy_integral.wxml @@ -26,9 +26,9 @@ - - {{def_pick_store.pickup_name}} - + + {{def_pick_store.pickup_name}} + 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} diff --git a/pages/goods/goodsInfo/buy_pt.wxml b/pages/goods/goodsInfo/buy_pt.wxml index 62530c5..e34eaf4 100644 --- a/pages/goods/goodsInfo/buy_pt.wxml +++ b/pages/goods/goodsInfo/buy_pt.wxml @@ -47,11 +47,10 @@ - - {{def_pick_store.pickup_name}} - - - + + {{def_pick_store.pickup_name}} + + 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml index 09923ec..5fa3262 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxml +++ b/pages/goods/goodsInfo/goodsInfo.wxml @@ -130,6 +130,7 @@ 零售价：￥{{filters.toFix(data.market_price,2)}} ￥{{filters.toFix(data.shop_price,2)}} + diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index 90b1a9f..48fb99c 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -2469,6 +2469,7 @@ Page({ // 卡项订单 - 立即支付 pay: async function (e) { + let th=this; let index = e.currentTarget.dataset.index; let item = this.data.cardList[index]; let order_sn = item.order_sn; diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml index 3b47699..3a3b5c3 100644 --- a/pages/user/order_list/order_list.wxml +++ b/pages/user/order_list/order_list.wxml @@ -422,10 +422,10 @@ 立即支付 + bindtap="pay" data-index="{{index}}" wx:if="{{item.prom_type!=6 && item.pay_status==0 && item.order_status<2}}">立即支付 立即支付 + bindtap="pay" data-index="{{index}}" wx:if="{{item.prom_type==6 && item.pt_status==0 && item.order_status<2}}">立即支付 支付尾款 -- libgit2 0.21.4