Merge remote-tracking branch 'origin/master-2.0' into master-2.0

陶杰

2024-11-12 15ae4a0daffaa7fdec2566a2fc96409b90822a09

Merge remote-tracking branch 'origin/master-2.0' into master-2.0

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

@@ -9,7 +9,7 @@
            <no-data v-if="!list||list.length==0" style="width: 100%;"></no-data>
            <view v-if="list&&list.length>0">
                <view class="flex title-bold tj-money bg-white m-t-12 p10">
                    <view class="m-r-20">待结算：￥{{tj_total-tj_has||0}}</view>
                    <view class="m-r-20">待结算：￥{{ (tj_total-tj_has).toFixed(2)||0}}</view>
                    <view class="t-red">已结算：￥{{tj_has||0}}</view>
                </view>
            </view>