From 5e08825013f193942b9c908e36175a497234e8cf Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Sat, 4 Jul 2020 17:27:16 +0800
Subject: [PATCH] 1.    小程序在助力的时候，不需要判断是不是已经关注了公众号 2.    搭配的页面上，点击商品图片时，要能够跳转到商品详情

---
 packageA/pages/prom_list/prom_list.js      | 6 ++++++
 packageA/pages/prom_list/prom_list.wxml    | 4 ++--
 pages/user/assistance/friend_assistance.js | 3 ++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/packageA/pages/prom_list/prom_list.js b/packageA/pages/prom_list/prom_list.js
index 450ce8e..afc24d0 100644
--- a/packageA/pages/prom_list/prom_list.js
+++ b/packageA/pages/prom_list/prom_list.js
@@ -1568,6 +1568,12 @@ Page({
 		 price=price.toFixed(2);		 		 
 		 cut_pirce=cut_pirce.toFixed(2);		 		 
 		 this.setData({dp_price: this.data.dp_price,cut_price:this.data.cut_price});
+	},
+
+	go_goods:function (e) {
+		var gid=e.currentTarget.dataset.gid;
+		var url="/pages/goods/goodsInfo/goodsInfo?goods_id="+gid;
+		getApp().goto(url);
 	}
 	
 
diff --git a/packageA/pages/prom_list/prom_list.wxml b/packageA/pages/prom_list/prom_list.wxml
index 9a4e7cc..3ae62ef 100644
--- a/packageA/pages/prom_list/prom_list.wxml
+++ b/packageA/pages/prom_list/prom_list.wxml
@@ -6,7 +6,7 @@
 <view class="goods_list" wx:if="{{data && data.goods_name}}">
     <view class="item flex ai-center">
        <view style="width:80rpx;height: 100%" class="flex ai-center jc-center"><icon type="success" size="18"></icon></view>
-       <view  class="r_box flex">
+       <view  class="r_box flex" bindtap="go_goods" data-gid="{{data.goods_id}}">
           <view><image class="r_box_img" src="{{data.original_img}}"></image></view>
           <view class="flex jc_sb">
               <view class="fs30" style="margin: 18rpx">
@@ -26,7 +26,7 @@
               <icon bindtap="set_sele"  wx:else data-ind="{{index}}" data-set="1"  type="success" size="18" color="#adadad"></icon>
 
         </view>
-        <view  class="r_box flex">
+        <view  class="r_box flex" bindtap="go_goods" data-gid="{{item.goods_id}}">
             <view><image class="r_box_img" src="{{iurl+item.original_img}}" binderror="bind_bnerr3" data-errorimg="collocationList[{{index}}].original_img"></image></view>
             <view class="flex jc_sb">
                 <view class="fs30" style="margin: 18rpx">
diff --git a/pages/user/assistance/friend_assistance.js b/pages/user/assistance/friend_assistance.js
index a85edeb..ac4c0f7 100644
--- a/pages/user/assistance/friend_assistance.js
+++ b/pages/user/assistance/friend_assistance.js
@@ -126,7 +126,8 @@ Page({
 			id: this.data.tasking,
 			storeId: os.stoid,
 			userId: this.data.userId,
-			zlUserId: t_user_id
+			zlUserId: t_user_id,
+			isWeappUser:1,   //是不是小程序的入口，不需要判断
 		};
 		console.log(data);
 		getApp().request.json_post("/api/weshop/marketing/help/help/task/involve/insert",
--
libgit2 0.21.4