Merge branch 'test' into 'qa'

Test See merge request !1119

Merge branch 'test' into 'qa'
Test See merge request !1119
后端研发-苏明海
2 parents 2648c3ad d974981e
Showing 2 changed files with 2 additions and 2 deletions
app.js
pages/user/order_detail/order_detail.js
@@ -1064,7 +1064,7 @@ App({
             var third_rate = dis_config.third_rate;      // 三级比例
             if(this.globalData.userInfo.first_leader){
-                return parseFloat(parseFloat(first_money).toFixed(2));
+                return parseFloat(parseFloat(fir_num).toFixed(2));
             }else{
                 return parseFloat((parseFloat(fir_num)+parseFloat(sec_num)+parseFloat(thi_num)).toFixed(2));
             }
@@ -132,7 +132,7 @@ Page({
                //------获取订单商品-------
                rq.get("/api/weshop/ordergoods/list",{
-                    data: { store_id: os.stoid, order_id: oid},
+                    data: { store_id: os.stoid, order_id: oid,pageSize:600},
                     success:async function (eb) {
                          r.order_goods=eb.data.data.pageData;
                          var glist =  r.order_goods;