From d982f16924438e6b254460fe07304053479739e0 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Fri, 3 Nov 2023 18:33:00 +0800
Subject: [PATCH] 点击跳转的优化

---
 packageA/pages/cardDetails/cardDetails.js  |  3 ++-
 packageA/pages/cardList/cardList.js        |  5 +++--
 packageC/pages/presell/cart/cart2.js       | 12 ++++++++++++
 packageC/pages/presell/cart/cart2.wxml     |  2 +-
 packageC/pages/presell/cart/cart2_pre.js   | 12 ++++++++++++
 packageC/pages/presell/cart/cart2_pre.wxml |  2 +-
 6 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/packageA/pages/cardDetails/cardDetails.js b/packageA/pages/cardDetails/cardDetails.js
index 602f1d6..1cbd8c5 100644
--- a/packageA/pages/cardDetails/cardDetails.js
+++ b/packageA/pages/cardDetails/cardDetails.js
@@ -1,6 +1,7 @@
 // pages/i_service/cardDetails/cardDetails.js
 const app = getApp();
-let self = null;
+let self = null,
+ut = require("../../../utils/util.js");
 
 Page({
 
diff --git a/packageA/pages/cardList/cardList.js b/packageA/pages/cardList/cardList.js
index 2044164..7f525e1 100644
--- a/packageA/pages/cardList/cardList.js
+++ b/packageA/pages/cardList/cardList.js
@@ -1,6 +1,7 @@
 // pages/i_service/cardList/cardList.js
 const app = getApp();
-let self = null;
+let self = null,ut = require("../../../utils/util.js");
+
 
 Page({
 
@@ -220,7 +221,7 @@ Page({
 	    var gid = e.currentTarget.dataset.gid;
 		var rurl = '/api/weshop/activitylist/listGoodActInfo2New';
 		var req_d = {
-			"store_id": os.stoid,
+			"store_id": app.globalData.setting.stoid,
 			"goods_id": gid,
 			"user_id": getApp().globalData.user_id,
 			"goods_type":1
diff --git a/packageC/pages/presell/cart/cart2.js b/packageC/pages/presell/cart/cart2.js
index 65a9247..263347c 100644
--- a/packageC/pages/presell/cart/cart2.js
+++ b/packageC/pages/presell/cart/cart2.js
@@ -3166,6 +3166,18 @@ Page({
         var index = e.currentTarget.dataset.index;
         var txt = "cartlist[" + index + "].focus";
         this.setData({ [txt]: 0 })
+    },
+
+    go_detail:function(e){
+        var gid=e.currentTarget.dataset.gid;
+        var act=this.data.act;
+        var url='';
+        if(this.data.is_fwk){
+            url = `/packageC/pages/presell/cardInfo/goodsInfo?goods_id=${gid}&prom_id=${act.id}`;
+        }else{
+            url= "/pages/goods/goodsInfo/goodsInfo?goods_id="+gid;
+        }
+        getApp().goto(url);
     }
 
 
diff --git a/packageC/pages/presell/cart/cart2.wxml b/packageC/pages/presell/cart/cart2.wxml
index 15f0101..c7636bb 100644
--- a/packageC/pages/presell/cart/cart2.wxml
+++ b/packageC/pages/presell/cart/cart2.wxml
@@ -62,7 +62,7 @@
 				<view class="goods-img">
 					<image class="wh100 bdr14" src="{{bn_goods.original_img}}" binderror='cart_set_err' data-err="bn_goods.original_img"></image>
 				</view>
-				<navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{bn_goods.goods_id}}">
+				<navigator  catchtap="go_detail"   class="order-cont" data-gid="{{bn_goods.goods_id}}">
 					<view class="goods-name ellipsis-2">{{bn_goods.goods_name}}</view>
 					<!-- 商品属性 -->
 					<view class="flex-vertical fs28 xc-ash color-gray n_guige">
diff --git a/packageC/pages/presell/cart/cart2_pre.js b/packageC/pages/presell/cart/cart2_pre.js
index d85b2a0..25ed6a8 100644
--- a/packageC/pages/presell/cart/cart2_pre.js
+++ b/packageC/pages/presell/cart/cart2_pre.js
@@ -1504,6 +1504,18 @@ Page({
   switchChange: function (e) {
     console.log(e, 111);
     this.setData({ agree_no_ref: e.detail.value });
+  },
+
+  go_detail:function(e){
+      var gid=e.currentTarget.dataset.gid;
+      var act=this.data.act;
+      var url='';
+      if(this.data.is_fwk){
+        url = `/packageC/pages/presell/cardInfo/goodsInfo?goods_id=${gid}&prom_id=${act.id}`;
+      }else{
+        url= "/pages/goods/goodsInfo/goodsInfo?goods_id="+gid;
+      }
+      getApp().goto(url);
   }
 
 });
diff --git a/packageC/pages/presell/cart/cart2_pre.wxml b/packageC/pages/presell/cart/cart2_pre.wxml
index 0d7bbc6..b466740 100644
--- a/packageC/pages/presell/cart/cart2_pre.wxml
+++ b/packageC/pages/presell/cart/cart2_pre.wxml
@@ -48,7 +48,7 @@
                           <image class="wh100 bdr14" src="{{bn_goods.original_img}}" 
                             binderror='cart_set_err' data-err="bn_goods.original_img"></image>
                       </view>
-                      <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{bn_goods.goods_id}}">
+                      <navigator catchtap="go_detail"  class="order-cont" data-gid="{{bn_goods.goods_id}}">
                           <view class="goods-name ellipsis-2">{{bn_goods.goods_name}}</view>
                                <!-- 商品属性 -->
                           <view class="flex-vertical fs28 color-gray n_guige">
--
libgit2 0.21.4