Commit 9826748742fad597906ea8f652ff9ed4754c783c
1 parent
d422ca57
3.0分享推送的bug优化
Showing
5 changed files
with
17 additions
and
6 deletions
packageA/pages/activity_share/activity_share.js
| @@ -1120,7 +1120,7 @@ Page({ | @@ -1120,7 +1120,7 @@ Page({ | ||
| 1120 | shareType:3, | 1120 | shareType:3, |
| 1121 | shareUserId:th.data.first_leader, | 1121 | shareUserId:th.data.first_leader, |
| 1122 | shareStaffId:th.data.StaffId, | 1122 | shareStaffId:th.data.StaffId, |
| 1123 | - shareStorageId:os.stoid, | 1123 | + shareStorageId:th.data.StorageId, |
| 1124 | shareTime:ut.gettimestamp(), | 1124 | shareTime:ut.gettimestamp(), |
| 1125 | storeId:os.stoid | 1125 | storeId:os.stoid |
| 1126 | } | 1126 | } |
packageA/pages/goods_share/goods_share.js
| @@ -33,6 +33,8 @@ Page({ | @@ -33,6 +33,8 @@ Page({ | ||
| 33 | var th=this; | 33 | var th=this; |
| 34 | //接受有没有导购的参数 | 34 | //接受有没有导购的参数 |
| 35 | var first_leader=options.first_leader; | 35 | var first_leader=options.first_leader; |
| 36 | + var StaffId=options.StaffId; | ||
| 37 | + var StorageId=options.StorageId; | ||
| 36 | if(first_leader){ | 38 | if(first_leader){ |
| 37 | //-- user_id代过来免登陆 -- | 39 | //-- user_id代过来免登陆 -- |
| 38 | getApp().globalData.user_id=first_leader; | 40 | getApp().globalData.user_id=first_leader; |
| @@ -822,7 +824,7 @@ Page({ | @@ -822,7 +824,7 @@ Page({ | ||
| 822 | shareType:2, | 824 | shareType:2, |
| 823 | shareUserId:th.data.first_leader, | 825 | shareUserId:th.data.first_leader, |
| 824 | shareStaffId:th.data.StaffId, | 826 | shareStaffId:th.data.StaffId, |
| 825 | - shareStorageId:os.stoid, | 827 | + shareStorageId:th.data.StorageId, |
| 826 | shareTime:ut.gettimestamp(), | 828 | shareTime:ut.gettimestamp(), |
| 827 | storeId:os.stoid | 829 | storeId:os.stoid |
| 828 | } | 830 | } |
packageA/pages/goods_share/goods_share.wxml
| 1 | <wxs module="g_filter" src="g_filter.wxs"></wxs> | 1 | <wxs module="g_filter" src="g_filter.wxs"></wxs> |
| 2 | +<wxs module="filters" src="../../../utils/filter.wxs"></wxs> | ||
| 2 | <view class="container"> | 3 | <view class="container"> |
| 3 | <!-- 搜索框 --> | 4 | <!-- 搜索框 --> |
| 4 | <view class="search-container"> | 5 | <view class="search-container"> |
| @@ -59,7 +60,7 @@ | @@ -59,7 +60,7 @@ | ||
| 59 | <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | 60 | <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> |
| 60 | <text class="card_name">{{card_name}}</text> | 61 | <text class="card_name">{{card_name}}</text> |
| 61 | </view> | 62 | </view> |
| 62 | - <view class="fs28">￥{{filter.toFix(item[card_field],2)}}</view> | 63 | + <view class="fs28">￥{{filters.toFix(item[card_field],2)}}</view> |
| 63 | 64 | ||
| 64 | </block> | 65 | </block> |
| 65 | <!-- 当会员不是等级卡的时候,且卡有钱的时候 --> | 66 | <!-- 当会员不是等级卡的时候,且卡有钱的时候 --> |
packageA/pages/live_share/live_share.js
| @@ -28,10 +28,14 @@ Page({ | @@ -28,10 +28,14 @@ Page({ | ||
| 28 | var th=this; | 28 | var th=this; |
| 29 | //接受有没有导购的参数 | 29 | //接受有没有导购的参数 |
| 30 | var first_leader=options.first_leader; | 30 | var first_leader=options.first_leader; |
| 31 | + var StaffId=options.StaffId; | ||
| 32 | + var StorageId=options.StorageId; | ||
| 31 | if(first_leader){ | 33 | if(first_leader){ |
| 32 | //-- user_id代过来免登陆 -- | 34 | //-- user_id代过来免登陆 -- |
| 33 | - getApp().globalData.user_id=first_leader; | 35 | + getApp().globalData.user_id=first_leader; |
| 34 | getApp().getUserFir(); | 36 | getApp().getUserFir(); |
| 37 | + //设置分享会员和导购id和归属门店ID | ||
| 38 | + this.setData({first_leader:first_leader,StaffId:StaffId,StorageId:StorageId}); | ||
| 35 | } | 39 | } |
| 36 | this.requestGoodsList(); | 40 | this.requestGoodsList(); |
| 37 | 41 | ||
| @@ -201,7 +205,7 @@ Page({ | @@ -201,7 +205,7 @@ Page({ | ||
| 201 | shareType:4, | 205 | shareType:4, |
| 202 | shareUserId:th.data.first_leader, | 206 | shareUserId:th.data.first_leader, |
| 203 | shareStaffId:th.data.StaffId, | 207 | shareStaffId:th.data.StaffId, |
| 204 | - shareStorageId:os.stoid, | 208 | + shareStorageId:th.data.StorageId, |
| 205 | shareTime:ut.gettimestamp(), | 209 | shareTime:ut.gettimestamp(), |
| 206 | storeId:os.stoid | 210 | storeId:os.stoid |
| 207 | } | 211 | } |
packageA/pages/quan/quan.js
| @@ -26,10 +26,14 @@ Page({ | @@ -26,10 +26,14 @@ Page({ | ||
| 26 | var th=this; | 26 | var th=this; |
| 27 | //接受有没有导购的参数 | 27 | //接受有没有导购的参数 |
| 28 | var first_leader=options.first_leader; | 28 | var first_leader=options.first_leader; |
| 29 | + var StaffId=options.StaffId; | ||
| 30 | + var StorageId=options.StorageId; | ||
| 29 | if(first_leader){ | 31 | if(first_leader){ |
| 30 | //-- user_id代过来免登陆 -- | 32 | //-- user_id代过来免登陆 -- |
| 31 | getApp().globalData.user_id=first_leader; | 33 | getApp().globalData.user_id=first_leader; |
| 32 | getApp().getUserFir(); | 34 | getApp().getUserFir(); |
| 35 | + //设置分享会员和导购id和归属门店ID | ||
| 36 | + this.setData({first_leader:first_leader,StaffId:StaffId,StorageId:StorageId}); | ||
| 33 | } | 37 | } |
| 34 | this.requestGoodsList(); | 38 | this.requestGoodsList(); |
| 35 | this.setData({getcurday:ut.gettimestamp()}); | 39 | this.setData({getcurday:ut.gettimestamp()}); |
| @@ -183,7 +187,7 @@ Page({ | @@ -183,7 +187,7 @@ Page({ | ||
| 183 | shareType:1, | 187 | shareType:1, |
| 184 | shareUserId:th.data.first_leader, | 188 | shareUserId:th.data.first_leader, |
| 185 | shareStaffId:th.data.StaffId, | 189 | shareStaffId:th.data.StaffId, |
| 186 | - shareStorageId:os.stoid, | 190 | + shareStorageId:th.data.StorageId, |
| 187 | shareTime:ut.gettimestamp(), | 191 | shareTime:ut.gettimestamp(), |
| 188 | storeId:os.stoid | 192 | storeId:os.stoid |
| 189 | } | 193 | } |