Commit 5c48de7a066274c2e88a82b9ab1106e7c2b86913
Merge branch 'dev' into 'test'
分享修改 See merge request !671
Showing
3 changed files
with
7 additions
and
3 deletions
packageA/pages/activity_share/activity_share.js
| @@ -1147,7 +1147,7 @@ Page({ | @@ -1147,7 +1147,7 @@ Page({ | ||
| 1147 | var url="/api/weshop/sharetypeList/save"; | 1147 | var url="/api/weshop/sharetypeList/save"; |
| 1148 | var req_data={ | 1148 | var req_data={ |
| 1149 | shareActId:actid, | 1149 | shareActId:actid, |
| 1150 | - shareActName:title, | 1150 | + shareActName:title, |
| 1151 | shareType:ind, | 1151 | shareType:ind, |
| 1152 | shareUserId:th.data.first_leader, | 1152 | shareUserId:th.data.first_leader, |
| 1153 | shareStaffId:th.data.StaffId, | 1153 | shareStaffId:th.data.StaffId, |
packageA/pages/goods_share/goods_share.js
| @@ -866,7 +866,9 @@ Page({ | @@ -866,7 +866,9 @@ Page({ | ||
| 866 | var url="/api/weshop/sharetypeList/save"; | 866 | var url="/api/weshop/sharetypeList/save"; |
| 867 | var req_data={ | 867 | var req_data={ |
| 868 | shareActId:item.goods_id, | 868 | shareActId:item.goods_id, |
| 869 | - shareActName:item.goods_name, | 869 | + shareActName:item.goods_name, |
| 870 | + ShareActNo:item.goods_sn, | ||
| 871 | + ActMoney:item.shop_price, | ||
| 870 | shareType:2, | 872 | shareType:2, |
| 871 | shareUserId:th.data.first_leader, | 873 | shareUserId:th.data.first_leader, |
| 872 | shareStaffId:th.data.StaffId, | 874 | shareStaffId:th.data.StaffId, |
packageA/pages/service_share/service_share.js
| @@ -846,7 +846,9 @@ Page({ | @@ -846,7 +846,9 @@ Page({ | ||
| 846 | var item=this.data.share_good; | 846 | var item=this.data.share_good; |
| 847 | var url="/api/weshop/sharetypeList/save"; | 847 | var url="/api/weshop/sharetypeList/save"; |
| 848 | var req_data={ | 848 | var req_data={ |
| 849 | - shareActId:item.id, | 849 | + shareActId:item.id, |
| 850 | + shareActNo:item.service_sn, | ||
| 851 | + ActMoney:item.money, | ||
| 850 | shareActName:item.serviceName, | 852 | shareActName:item.serviceName, |
| 851 | shareType:8, | 853 | shareType:8, |
| 852 | shareUserId:th.data.first_leader, | 854 | shareUserId:th.data.first_leader, |