wxd / MShopWeApp

Commit d974981e917ed14600b154967d30e777df727b02

Authored by 后端研发-苏明海
2 parents f986009b 7172a50a

Merge branch 'dev' into 'test' 

Dev

See merge request !1118
Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
... ... @@ -1064,7 +1064,7 @@ App({
1064 1064 var third_rate = dis_config.third_rate; // 三级比例
1065 1065  
1066 1066 if(this.globalData.userInfo.first_leader){
1067   - return parseFloat(parseFloat(first_money).toFixed(2));
  1067 + return parseFloat(parseFloat(fir_num).toFixed(2));
1068 1068 }else{
1069 1069 return parseFloat((parseFloat(fir_num)+parseFloat(sec_num)+parseFloat(thi_num)).toFixed(2));
1070 1070 }
... ...
pages/user/order_detail/order_detail.js
  View file @d974981
... ... @@ -132,7 +132,7 @@ Page({
132 132  
133 133 //------获取订单商品-------
134 134 rq.get("/api/weshop/ordergoods/list",{
135   - data: { store_id: os.stoid, order_id: oid},
  135 + data: { store_id: os.stoid, order_id: oid,pageSize:600},
136 136 success:async function (eb) {
137 137 r.order_goods=eb.data.data.pageData;
138 138 var glist = r.order_goods;
... ...