diff --git a/packageA/pages/cardList/cardList.js b/packageA/pages/cardList/cardList.js
index 86651bd..2044164 100644
--- a/packageA/pages/cardList/cardList.js
+++ b/packageA/pages/cardList/cardList.js
@@ -216,10 +216,43 @@ Page({
 		};
 	},
 	
-	go_goods: function(e) {
-	  var gid = e.currentTarget.dataset.gid;
-	  var url = "/packageA/pages/goodsInfo/goodsInfo?goods_id=" + gid;
-	  app.goto(url);
+	go_goods:async  function(e) {
+	    var gid = e.currentTarget.dataset.gid;
+		var rurl = '/api/weshop/activitylist/listGoodActInfo2New';
+		var req_d = {
+			"store_id": os.stoid,
+			"goods_id": gid,
+			"user_id": getApp().globalData.user_id,
+			"goods_type":1
+		}
+		var res= await getApp().request.promiseGet(rurl, {data: req_d});
+
+		var url = "/packageA/pages/goodsInfo/goodsInfo?goods_id=" + gid;
+		if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
+			var arr = res.data.data;
+			let times = new Date().getTime();
+			//-- 预热也要计算 --
+			var arr2 = arr.filter(function (e) {
+				return e.s_time < ut.gettimestamp() || (e.warm_uptime && e.warm_uptime < ut.gettimestamp())
+			})
+			if(arr2.length==1) {
+                switch(arr2[0].prom_type){
+					case 1:
+						url+="&prom_type=1&prom_id="+arr[0].act_id;
+						break;
+					case 6:
+						url = `/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id=${gid}&prom_type=${arr2[0].prom_type}&prom_id=${arr[0].act_id}`;
+						break;
+					case 8:
+						url = `/packageC/pages/presell/cardInfo/goodsInfo?goods_id=${gid}&prom_id=${arr[0].act_id}`;
+						break;
+				}
+			}
+
+		}
+
+
+	     app.goto(url);
 	},
 	
 	//图片失败，默认图片
diff --git a/packageA/pages/details_serviceCard/details_serviceCard.js b/packageA/pages/details_serviceCard/details_serviceCard.js
index 2b7ae26..9aa7d3c 100644
--- a/packageA/pages/details_serviceCard/details_serviceCard.js
+++ b/packageA/pages/details_serviceCard/details_serviceCard.js
@@ -237,9 +237,44 @@ Page({
 
 
 	// 查看商品详情
-	viewDetails(e) {
+	async viewDetails(e) {
 		let goods_id = e.currentTarget.dataset.gid;
 		let url = '/packageA/pages/goodsInfo/goodsInfo?goods_id=' + goods_id;
+
+		var rurl = '/api/weshop/activitylist/listGoodActInfo2New';
+		var req_d = {
+			"store_id": os.stoid,
+			"goods_id": goods_id,
+			"user_id": getApp().globalData.user_id,
+			"goods_type": 1,
+		}
+		var res= await getApp().request.promiseGet(rurl, {data: req_d});
+
+
+		if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
+			var arr = res.data.data;
+			let times = new Date().getTime();
+			//-- 预热也要计算 --
+			var arr2 = arr.filter(function (e) {
+				return e.s_time < ut.gettimestamp() || (e.warm_uptime && e.warm_uptime < ut.gettimestamp())
+			})
+			if(arr2.length==1) {
+				switch(arr2[0].prom_type){
+					case 1:
+						url+="&prom_type=1&prom_id="+arr[0].act_id;
+						break;
+					case 6:
+						url = `/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id=${goods_id}&prom_type=${arr2[0].prom_type}&prom_id=${arr[0].act_id}`;
+						break;
+					case 8:
+						url = `/packageC/pages/presell/cardInfo/goodsInfo?goods_id=${goods_id}&prom_id=${arr[0].act_id}`;
+						break;
+				}
+			}
+
+		}
+
+
 		app.goto(url);
 	},
 
diff --git a/packageC/pages/presell/cardInfo/goodsInfo.js b/packageC/pages/presell/cardInfo/goodsInfo.js
index 42d44fc..6d7c00e 100644
--- a/packageC/pages/presell/cardInfo/goodsInfo.js
+++ b/packageC/pages/presell/cardInfo/goodsInfo.js
@@ -237,11 +237,6 @@ Page({
 
       var share_openid= t.share_openid;
 
-      if(pre_id || presell_id){
-          if(!presell_id) presell_id=pre_id;
-          if(!pre_id) pre_id=presell_id;
-      }
-
       //检查测肤
       getApp().check_skin_face(t,1,gid);
 				
@@ -3437,7 +3432,7 @@ Page({
 
 
         getApp().request.get("/api/weshop/recharge/rechargePresell/countBuyGoodsSum", {
-            data: { store_id: os.stoid, user_id: user_id, goods_id: th.data.options.goods_id, prom_id: th.data.options.prom_id },
+            data: { store_id: os.stoid, user_id: user_id, goods_id: th.data.options.goods_id, prom_id: th.data.presellForm.id },
             success: function (e) {
                 if (e.data.code == 0) {
 
diff --git a/packageC/pages/presell/cart/cart2_pre.js b/packageC/pages/presell/cart/cart2_pre.js
index 014a738..d85b2a0 100644
--- a/packageC/pages/presell/cart/cart2_pre.js
+++ b/packageC/pages/presell/cart/cart2_pre.js
@@ -353,6 +353,7 @@ Page({
       var err_url="/pages/user/order_list/order_list";
       if(this.data.is_fwk){
         err_url='/pages/user/order_list/order_list?index=2&tabindex=1';
+        ok_url+="&is_fwk=1";
       }
 
       //-- 通联的第三方支付的返回优化 --