From 6adc2f669ebb41830c33a0626e0a1b6d48348d12 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Sat, 4 Nov 2023 16:32:46 +0800
Subject: [PATCH] 1、服务卡项预售分享的优化 2、服务卡项列表点击跳转的优化

---
 packageC/pages/presell/cardInfo/goodsInfo.js | 61 +++++++++++++++++++++----------------------------------------
 packageC/pages/presell/list/list.wxml        |  2 +-
 2 files changed, 22 insertions(+), 41 deletions(-)

diff --git a/packageC/pages/presell/cardInfo/goodsInfo.js b/packageC/pages/presell/cardInfo/goodsInfo.js
index 6d7c00e..cc39cfc 100644
--- a/packageC/pages/presell/cardInfo/goodsInfo.js
+++ b/packageC/pages/presell/cardInfo/goodsInfo.js
@@ -1328,21 +1328,20 @@ Page({
 	
     var th = this;
     var price = th.data.data.shop_price;
-    if (th.data.prom_act) {
-      price = th.data.prom_act.price;
 
-    }
-    var title= th.data.data.goods_name;
-    var img=th.data.iurl+th.data.data.image_url;
-    if(th.data.prom_type==6){
-      title=th.data.prom_act.share_title;
-      img=th.data.iurl+th.data.prom_act.share_imgurl;
-    }
-		
-		
+    var title= th.data.data.service_name;
+    var img=th.data.iurl+th.data.data.img_url;
+
+
 
-	
     var url="/packageA/pages/goodsInfo/goodsInfo?goods_id=" + th.data.gid;
+    if(th.data.prom_act){
+        title=th.data.prom_act.share_title;
+        img=th.data.iurl+th.data.prom_act.share_img;
+        url="/packageC/pages/presell/cardInfo/goodsInfo?goods_id=" + th.data.gid+"&pre_id="+th.data.presellList.id;
+        price= th.data.presellList.presell_price;
+    }
+
     if(getApp().globalData.user_id) {
       url+="&first_leader="+getApp().globalData.user_id;
     }
@@ -1354,25 +1353,12 @@ Page({
 	   ){	
 		url+="&room_id="+getApp().globalData.room_id+"&room_user_share=1";
 	}
-	
-	
+
 	var ob={
       title: price + "元  " +title,
       path:url,
       imageUrl: img,
     };
-			
-	// 如果服务卡参加秒杀活动，且后台设置了分享标题和分享图片
-	if(th.data.prom_type == 1) {
-		if(th.data.sele_g && th.data.sele_g.share_title) {
-			title = th.data.sele_g.share_title;
-			ob.title = title;
-		};
-		if(th.data.sele_g && th.data.sele_g.share_imgurl) {
-			img = th.data.iurl + th.data.sele_g.share_imgurl;
-			ob.imageUrl = img;
-		}
-	}
 
     return ob;
 	
@@ -2965,20 +2951,11 @@ Page({
         getApp().globalData.no_clear=1
 
         var th = this;
-        var price = th.data.data.shop_price;
-        if (th.data.prom_act) {
-            price = th.data.prom_act.price;
+        var price = th.data.presellList.presell_price;
+        var title= th.data.prom_act.share_title;
+        var img=th.data.iurl+th.data.prom_act.share_img;
 
-        }
-        var title= th.data.data.goods_name;
-        // var img=th.data.data.original_img;
-        var img=th.data.iurl+th.data.data.image_url;
-        if(th.data.prom_type==6){
-            title=th.data.prom_act.share_title;
-            img=th.data.iurl+th.data.prom_act.share_imgurl;
-        }
-
-        var url="goods_id=" + th.data.gid;
+        var url="goods_id=" + th.data.gid+"&pre_id="+th.data.presellList.id;
         if(getApp().globalData.user_id) {
             url+="&first_leader="+getApp().globalData.user_id;
         }
@@ -3739,13 +3716,17 @@ Page({
                     //   ut.wx_back();
                     // }, 2000)
                     // gnext = 0;
-                    th.setData({ show: true });
+                    th.setData({ type: 0 });
                     // return false;
+                }else{
+                    th.setData({ type: 1 });
                 }
 
                 th.setData({
                     presellForm: res.data.data,
                 });
+
+                th.data.prom_act=res.data.data;
                 th.countDown(res.data.data.end_time)
             }
         })
diff --git a/packageC/pages/presell/list/list.wxml b/packageC/pages/presell/list/list.wxml
index 6bc2abf..caa76c1 100644
--- a/packageC/pages/presell/list/list.wxml
+++ b/packageC/pages/presell/list/list.wxml
@@ -27,7 +27,7 @@
 
 <view class="kill-list seckill_list"> 
     <view class="kill-item" wx:for="{{goodlist}}" wx:key="gs">
-        <navigator class="kill-pic rel" url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&pre_id={{item.id}}">
+        <navigator class="kill-pic rel" url="/packageC/pages/presell/{{item.goods_type?'cardInfo':'goodsInfo'}}/goodsInfo?goods_id={{item.goods_id}}&pre_id={{item.id}}">
             <image class="wh100" src="{{url+item.original_img}}" data-val="{{item.original_img}}"
                 data-errorimg="goodlist[{{index}}].original_img" binderror="bind_bnerr2" lazy-load="true"></image>
         </navigator>
--
libgit2 0.21.4