1、服务卡项订单详情的bug优化

2、商品详情页面的优化

1、服务卡项订单详情的bug优化
2、商品详情页面的优化
yvan.ni
1 parent a24be348
Showing 13 changed files with 54 additions and 34 deletions
packageA/pages/cart2_ser/cart2_ser.js
packageA/pages/details_serviceCard/details_serviceCard.js
packageA/pages/serviceCard_pd/goodsInfo/buy_pt.wxml
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxss
pages/cart/cart/cart.js
pages/goods/goodsInfo/buy_com_pop.wxml
pages/goods/goodsInfo/buy_integral.wxml
pages/goods/goodsInfo/buy_pt.wxml
pages/goods/goodsInfo/goodsInfo.wxml
pages/user/order_list/order_list.js
pages/user/order_list/order_list.wxml
@@ -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)
@@ -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;
 					// 限购数
@@ -38,10 +38,9 @@
       <view style="margin-top: 20rpx">
         <view  class="flex-space-between address ai_end xc-width ">
-          <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
-            <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
-			
-			
+          <view class="flex" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
+            <text class="fs30 xc-black3 shop_name {{def_pick_store.distance!=null?'max':''}} ">{{def_pick_store.pickup_name}}</text>
+
             <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}">
               距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
@@ -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);
                     }
@@ -79,9 +79,9 @@
 				        <view class="flex fs35 xc-qtsign">￥</view>
 				        <view class="fs50 val">{{prom_price}}</view>
 				      </view>
-				      <view class="word-line fs20 xc-qtunit-price">
-				        零售价￥{{filters.toFix(data.market_price,2)}}
-				      </view>
+				      <view wx:if="{{is_retail_price}}" class="fs20 xc-qtunit-price t-l" >零售价￥{{filters.toFix(data.market_price,2)}}</view>
+				      <view wx:else class="fs20 xc-qtunit-price t-l">￥{{filters.toFix(data.shop_price,2)}}</view>
+
 				    </view>
 				    <view class="abs white xc-nanber">
@@ -667,7 +667,7 @@
 								</block>
 								<view class="address-frame xc-ash">
 									<view class="flex-vertical-between butttem5">
-										<view class="flex xc-ash">
+										<view class="flex xc-ash" style="flex-shrink:0;max-width: 69%;" >
 											<view class="fs30 xc-black3 address_name">{{item.pickup_name}}
 												<block wx:if="{{tool.is_no_dis(sele_g.storageId,item.keyid)}}">
 													<text class="no_store">(配送不匹配)</text>
@@ -2962,3 +2962,7 @@ button.custom-service::after{
     margin: 0;
 }
+.shop_name.max{
+    max-width:370rpx; flex-shrink: 0;
+}
+
@@ -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`, {
@@ -29,8 +29,8 @@
     <!-- 选择门店模块 -->
     <view class="flex-space-between address ai_end xc-width ">
-        <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
-            <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
+        <view class="flex" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
+            <text class="fs30 xc-black3 shop_name {{def_pick_store.distance!=null?'max':''}}">{{def_pick_store.pickup_name}}</text>
             <view class="distance fs24 xc-ash" wx:if="{{def_pick_store.distance!=null}}">
                 距离:{{def_pick_store.distance > 1000 ? filters.toFix(def_pick_store.distance / 1000, 2) + "km" : filters.toFix(def_pick_store.distance, 0) + "m"}}
@@ -26,9 +26,9 @@
 		              <!-- 选择门店模块 -->
 		               <view  class="flex-space-between address ai_end xc-width ">
-		                           <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
-		                             <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
-		                               <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}">
+		                           <view class="flex" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
+		                             <text class="fs30 xc-black3 shop_name {{def_pick_store.distance!=null?'max':''}} ">{{def_pick_store.pickup_name}}</text>
+		                               <view class="distance fs24 xc-ash" wx:if="{{def_pick_store.distance!=null}}">
 		                                距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
 		                                </view>
@@ -47,11 +47,10 @@
       <view style="margin-top: 20rpx">
         <view  class="flex-space-between address ai_end xc-width ">
-          <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
-            <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
-			
-			
-            <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}">
+          <view class="flex" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
+            <text class="fs30 xc-black3 shop_name {{def_pick_store.distance!=null?'max':''}}">{{def_pick_store.pickup_name}}</text>
+
+            <view class="distance fs24 xc-ash" wx:if="{{def_pick_store.distance!=null}}">
               距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
             </view>
@@ -130,6 +130,7 @@
               <view wx:if="{{is_retail_price}}" class="word-line fs20 xc-qtunit-price no_line_c">零售价：￥{{filters.toFix(data.market_price,2)}}</view>
               <view wx:else class="word-line no_line_x fs20 xc-qtunit-price">￥{{filters.toFix(data.shop_price,2)}}</view>
+
             </view>
             <view class="abs white xc-nanber">
@@ -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;
@@ -422,10 +422,10 @@
 				</block>
 				<navigator class="commodity_To_evaluate flex-level comment_go"
-						   bindtap="pay" data-index="{{index}}" wx:if="{{item.prom_type!=6 && item.pay_status==0}}">立即支付</navigator>
+						   bindtap="pay" data-index="{{index}}" wx:if="{{item.prom_type!=6 && item.pay_status==0 && item.order_status<2}}">立即支付</navigator>
 				<navigator class="commodity_To_evaluate flex-level comment_go"
-						   bindtap="pay" data-index="{{index}}" wx:if="{{item.prom_type==6 && item.pt_status==0}}">立即支付</navigator>
+						   bindtap="pay" data-index="{{index}}" wx:if="{{item.prom_type==6 && item.pt_status==0 && item.order_status<2}}">立即支付</navigator>
 				<navigator class="commodity_To_evaluate flex-level comment_go" url="/packageA/pages/serviceCard_pd/cart_wk/cart_wk?order_id={{item.order_id}}"
 						   data-idx="{{index}}" wx:if="{{item.pt_status==2 && item.pt_tail_money>0}}">支付尾款</navigator>