Merge branch 'master-2.0' of http://47.96.225.205:8888/r/hmy_farmer-main in...

xuxueyang

2024-10-09 aa82f2ce6aabe78b47c927d7ae2d3ff08c59baaf

 sub_pages/supplier/order-manage/order-manage-settlement.vue

@@ -245,7 +245,8 @@
            if (this.list) {
               for (var item of this.list) {
                  if (!item.status) {
                     v += item.totalAmount || 0
                     // v += item.totalAmount || 0
                     v += item.income || 0
                  } else {
                     v += (item.income || 0)
                  }