Merged
Merge Request #1119 · created by 后端研发-苏明海


Test


From test into qa

Merged by 后端研发-苏明海

1 participants


app.js
@@ -1064,7 +1064,7 @@ App({ @@ -1064,7 +1064,7 @@ App({
1064 var third_rate = dis_config.third_rate; // 三级比例 1064 var third_rate = dis_config.third_rate; // 三级比例
1065 1065
1066 if(this.globalData.userInfo.first_leader){ 1066 if(this.globalData.userInfo.first_leader){
1067 - return parseFloat(parseFloat(first_money).toFixed(2)); 1067 + return parseFloat(parseFloat(fir_num).toFixed(2));
1068 }else{ 1068 }else{
1069 return parseFloat((parseFloat(fir_num)+parseFloat(sec_num)+parseFloat(thi_num)).toFixed(2)); 1069 return parseFloat((parseFloat(fir_num)+parseFloat(sec_num)+parseFloat(thi_num)).toFixed(2));
1070 } 1070 }
pages/user/order_detail/order_detail.js
@@ -132,7 +132,7 @@ Page({ @@ -132,7 +132,7 @@ Page({
132 132
133 //------获取订单商品------- 133 //------获取订单商品-------
134 rq.get("/api/weshop/ordergoods/list",{ 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 success:async function (eb) { 136 success:async function (eb) {
137 r.order_goods=eb.data.data.pageData; 137 r.order_goods=eb.data.data.pageData;
138 var glist = r.order_goods; 138 var glist = r.order_goods;