From c43e6db6951884852b80f6a8699bd2817fe19886 Mon Sep 17 00:00:00 2001
From: taiwan <taiwan.su@meidd.com>
Date: Sat, 9 Apr 2022 10:14:33 +0800
Subject: [PATCH] 拼单点击增加传参

---
 components/diy_pingd_buy/diy_pingd_buy.wxml |  4 ++--
 pages/activity/pind_list/pind_list.wxml     | 18 +++++++++---------
 pages/index/index/index.wxml                |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/components/diy_pingd_buy/diy_pingd_buy.wxml b/components/diy_pingd_buy/diy_pingd_buy.wxml
index 26bd686..5488e5a 100644
--- a/components/diy_pingd_buy/diy_pingd_buy.wxml
+++ b/components/diy_pingd_buy/diy_pingd_buy.wxml
@@ -15,7 +15,7 @@
     <view class='sp_p' wx:if="{{object.style==1}}">
       <swiper-item class="s_it" wx:for="{{goods_array}}">
         <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
-          <navigator url="{{aitem.goods_type == 0 ? ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id)}}" class="s1_gk_a1">
+          <navigator url="{{!aitem.goods_type ? ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?prom_type=6&goods_id=' + aitem.goods_id + '&prom_id=' + aitem.id)}}" class="s1_gk_a1">
             <view class='one_p'>
               <view class='sp_top_p'>
 
@@ -72,7 +72,7 @@
   <view class="sp2_p" wx:if="{{object.style==2}}">
     <block wx:for="{{goods_array}}">
       <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
-        <navigator url="{{aitem.goods_type == 0 ? ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id)}}" class="s1_gk_a1">
+        <navigator url="{{!aitem.goods_type ? ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?prom_type=6&goods_id=' + aitem.goods_id + '&prom_id=' + aitem.id)}}" class="s1_gk_a1">
           <view class='one1_p'>
             <block>
               <view class="o1_img_p">
diff --git a/pages/activity/pind_list/pind_list.wxml b/pages/activity/pind_list/pind_list.wxml
index ea3d322..5f7b5ce 100644
--- a/pages/activity/pind_list/pind_list.wxml
+++ b/pages/activity/pind_list/pind_list.wxml
@@ -29,13 +29,13 @@
 
 <view class="kill-list">
     <view class="kill-item" wx:for="{{goodlist}}" wx:if="{{item.djs.hide==1}}">
-        <navigator class="kill-pic " url="{{item.goods_type == 0 ? ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id=' + item.goods_id)}}">
+        <navigator class="kill-pic " url="{{!item.goods_type ? ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?prom_type=6&goods_id=' + item.goods_id + '&prom_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>
         <view class="kill-cont">
-            <navigator class="goods-name ellipsis-2" url="{{item.goods_type == 0 ? ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id=' + item.goods_id)}}">{{item.title}}</navigator>
+            <navigator class="goods-name ellipsis-2" url="{{!item.goods_type ? ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?prom_type=6&goods_id=' + item.goods_id + '&prom_id=' + item.id)}}">{{item.title}}</navigator>
             <view class="flex">
             <view class="tneirong red-b flex-vertical rel" wx:if="{{type==1}}">
             <image class="xc-team-img abs" src="{{url}}/miniapp/images/fril.png"></image>
@@ -74,15 +74,15 @@
                   
                 </view>
                 <view class="kill-btn">
-                     <navigator class="huise"style="background-color: #059de5;"   url="{{item.goods_type == 0 ? ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id=' + item.goods_id)}}" wx:if="{{type==0 && item.kttype==1 }}">即将开始</navigator>
-                     <navigator class="huise"style="background-color: #059de5;"   url="{{item.goods_type == 0 ? ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id=' + item.goods_id)}}" wx:if="{{type==0 && item.kttype==2 }}" >即将开始</navigator>
-                     <navigator class="huise"style="background-color: #059de5;"   url="{{item.goods_type == 0 ? ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id=' + item.goods_id)}}" wx:if="{{type==0 && item.kttype==3 }}" >即将开始</navigator>
+                     <navigator class="huise"style="background-color: #059de5;"   url="{{!item.goods_type ? ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?prom_type=6&goods_id=' + item.goods_id + '&prom_id=' + item.id)}}" wx:if="{{type==0 && item.kttype==1 }}">即将开始</navigator>
+                     <navigator class="huise"style="background-color: #059de5;"   url="{{!item.goods_type ? ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?prom_type=6&goods_id=' + item.goods_id + '&prom_id=' + item.id)}}" wx:if="{{type==0 && item.kttype==2 }}" >即将开始</navigator>
+                     <navigator class="huise"style="background-color: #059de5;"   url="{{!item.goods_type ? ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?prom_type=6&goods_id=' + item.goods_id + '&prom_id=' + item.id)}}" wx:if="{{type==0 && item.kttype==3 }}" >即将开始</navigator>
 
-                    <navigator class="blue_b" url="{{item.goods_type == 0 ? ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id=' + item.goods_id)}}" wx:if="{{item.status==1 && type==1 && item.kttype==1}}">去参团</navigator>
-                    <navigator url="{{item.goods_type == 0 ? ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id=' + item.goods_id)}}" wx:if="{{item.status==1 && type==1 && item.kttype==2}}">去开团</navigator>
-                    <navigator url="{{item.goods_type == 0 ? ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id=' + item.goods_id)}}" wx:if="{{item.status==1 && type==1 && item.kttype==3}}">去开团</navigator>
+                    <navigator class="blue_b" url="{{!item.goods_type ? ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?prom_type=6&goods_id=' + item.goods_id + '&prom_id=' + item.id)}}" wx:if="{{item.status==1 && type==1 && item.kttype==1}}">去参团</navigator>
+                    <navigator url="{{!item.goods_type ? ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?prom_type=6&goods_id=' + item.goods_id + '&prom_id=' + item.id)}}" wx:if="{{item.status==1 && type==1 && item.kttype==2}}">去开团</navigator>
+                    <navigator url="{{!item.goods_type ? ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?prom_type=6&goods_id=' + item.goods_id + '&prom_id=' + item.id)}}" wx:if="{{item.status==1 && type==1 && item.kttype==3}}">去开团</navigator>
                                                       
-                    <navigator class="huise"   url="{{item.goods_type == 0 ? ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id=' + item.goods_id)}}" wx:if="{{item.status==3 && type==1}}">已抢光</navigator>
+                    <navigator class="huise"   url="{{!item.goods_type ? ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?prom_type=6&goods_id=' + item.goods_id + '&prom_id=' + item.id)}}" wx:if="{{item.status==3 && type==1}}">已抢光</navigator>
                 </view>
             </view>
         </view>
diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml
index 839040e..e9e0d5e 100644
--- a/pages/index/index/index.wxml
+++ b/pages/index/index/index.wxml
@@ -312,7 +312,7 @@
         <swiper-item wx:for="{{pindGoods}}" wx:key="{{index}}" wx:for-index="pix">
           <view class="teamheight" style='display:block;' wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
             <view class="kill-item">
-              <navigator class="flex navwidth" url="{{aitem.goods_type == 0 ? ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id)}}" hover-class="none">
+              <navigator class="flex navwidth" url="{{!aitem.goods_type ? ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?prom_type=6&goods_id=' + aitem.goods_id + '&prom_id=' + aitem.id)}}" hover-class="none">
                 <view class="kill-pic">
                   <image class="wh100" src="{{url+aitem.original_img}}" data-val="{{aitem.original_img}}" data-errorimg="pindGoods[{{pix}}][{{aind}}].original_img" binderror="bind_bnerr2" lazy-load="true">
                   </image>
--
libgit2 0.21.4