From 9826748742fad597906ea8f652ff9ed4754c783c Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Tue, 8 Dec 2020 10:30:08 +0800
Subject: [PATCH] 3.0分享推送的bug优化

---
 packageA/pages/activity_share/activity_share.js | 2 +-
 packageA/pages/goods_share/goods_share.js       | 4 +++-
 packageA/pages/goods_share/goods_share.wxml     | 3 ++-
 packageA/pages/live_share/live_share.js         | 8 ++++++--
 packageA/pages/quan/quan.js                     | 6 +++++-
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/packageA/pages/activity_share/activity_share.js b/packageA/pages/activity_share/activity_share.js
index 5eafa28..d6c092e 100644
--- a/packageA/pages/activity_share/activity_share.js
+++ b/packageA/pages/activity_share/activity_share.js
@@ -1120,7 +1120,7 @@ Page({
 	 			shareType:3,
 	 			shareUserId:th.data.first_leader,
 	 			shareStaffId:th.data.StaffId,
-	 			shareStorageId:os.stoid,
+	 			shareStorageId:th.data.StorageId,
 	 			shareTime:ut.gettimestamp(),
 	 			storeId:os.stoid
 	 		 }
diff --git a/packageA/pages/goods_share/goods_share.js b/packageA/pages/goods_share/goods_share.js
index eac13c6..13fbcbe 100644
--- a/packageA/pages/goods_share/goods_share.js
+++ b/packageA/pages/goods_share/goods_share.js
@@ -33,6 +33,8 @@ Page({
 	 var th=this; 
      //接受有没有导购的参数
      var first_leader=options.first_leader;
+	 var StaffId=options.StaffId;
+	 var StorageId=options.StorageId;
      if(first_leader){
 		  //--  user_id代过来免登陆 --
           getApp().globalData.user_id=first_leader;
@@ -822,7 +824,7 @@ Page({
 			shareType:2,
 			shareUserId:th.data.first_leader,
 			shareStaffId:th.data.StaffId,
-			shareStorageId:os.stoid,
+			shareStorageId:th.data.StorageId,
 			shareTime:ut.gettimestamp(),
 			storeId:os.stoid
 		 }
diff --git a/packageA/pages/goods_share/goods_share.wxml b/packageA/pages/goods_share/goods_share.wxml
index 57dee07..61f3f51 100644
--- a/packageA/pages/goods_share/goods_share.wxml
+++ b/packageA/pages/goods_share/goods_share.wxml
@@ -1,4 +1,5 @@
 <wxs module="g_filter" src="g_filter.wxs"></wxs>
+<wxs module="filters" src="../../../utils/filter.wxs"></wxs>
 <view class="container">
 	<!-- 搜索框 -->
 	<view class="search-container">
@@ -59,7 +60,7 @@
 							   <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
 							   <text class="card_name">{{card_name}}</text>
 							 </view>
-							 <view class="fs28">￥{{filter.toFix(item[card_field],2)}}</view>							 
+							 <view class="fs28">￥{{filters.toFix(item[card_field],2)}}</view>							 
 							 
 						 </block>
 						 <!-- 当会员不是等级卡的时候,且卡有钱的时候 -->
diff --git a/packageA/pages/live_share/live_share.js b/packageA/pages/live_share/live_share.js
index 53eed72..92abb02 100644
--- a/packageA/pages/live_share/live_share.js
+++ b/packageA/pages/live_share/live_share.js
@@ -28,10 +28,14 @@ Page({
 	  var th=this;
 	  //接受有没有导购的参数
 	  var first_leader=options.first_leader;
+	  var StaffId=options.StaffId;
+	  var StorageId=options.StorageId;
 	  if(first_leader){
 	  		  //--  user_id代过来免登陆 --
-	       getApp().globalData.user_id=first_leader;
+	          getApp().globalData.user_id=first_leader;
 	  		  getApp().getUserFir();
+			  //设置分享会员和导购id和归属门店ID
+			  this.setData({first_leader:first_leader,StaffId:StaffId,StorageId:StorageId});
 	   }
 	   this.requestGoodsList();	   
 
@@ -201,7 +205,7 @@ Page({
 				shareType:4,
 				shareUserId:th.data.first_leader,
 				shareStaffId:th.data.StaffId,
-				shareStorageId:os.stoid,
+				shareStorageId:th.data.StorageId,
 				shareTime:ut.gettimestamp(),
 				storeId:os.stoid
 			 }
diff --git a/packageA/pages/quan/quan.js b/packageA/pages/quan/quan.js
index 6a9f3d4..6dde361 100644
--- a/packageA/pages/quan/quan.js
+++ b/packageA/pages/quan/quan.js
@@ -26,10 +26,14 @@ Page({
 	  var th=this;
 	  //接受有没有导购的参数
 	  var first_leader=options.first_leader;
+	  var StaffId=options.StaffId;
+	  var StorageId=options.StorageId;
 	  if(first_leader){
 	  	   //--  user_id代过来免登陆 --
 	       getApp().globalData.user_id=first_leader;
 	  	   getApp().getUserFir();
+		   //设置分享会员和导购id和归属门店ID
+		   this.setData({first_leader:first_leader,StaffId:StaffId,StorageId:StorageId}); 
 	   }
 	   this.requestGoodsList();	   
 	   this.setData({getcurday:ut.gettimestamp()});
@@ -183,7 +187,7 @@ Page({
   			shareType:1,
   			shareUserId:th.data.first_leader,
   			shareStaffId:th.data.StaffId,
-  			shareStorageId:os.stoid,
+  			shareStorageId:th.data.StorageId,
   			shareTime:ut.gettimestamp(),
   			storeId:os.stoid
   		 }
--
libgit2 0.21.4