结账

hdApp/src/admin/home/workbench.vue

@@ -226,11 +226,10 @@
             </view>
           </view>
 
-          <view class="box_6 flex-row" v-if="Number(ghsInfo.balance)>0" @click.stop="recharge(ghsInfo)">
+          <view class="box_6 flex-row" v-if="Number(ghsInfo.balance)>0 && ghsInfo.remainDebtAmount>0" @click.stop="recharge(ghsInfo)">
             <view class="show_clear_area flex-row justify-between">
-              <image class="icon_2" referrerpolicy="no-referrer" src="/static/lanhu_020105gongyingshangliebiao/ps2pvfa1l5i34w5vqj2k7b3kejml3i3nmrba1421bf-caa2-491b-8773-af413df7e96d.png" />
-              <text class="waite_clear_order">
-                  <text v-if="Number(ghsInfo.balance)>0">有余额¥{{ ghsInfo.balance ? parseFloat(ghsInfo.balance) : 0 }}</text>
+              <text class="waite_clear_order" style="color:#3385ff;">
+                  <text v-if="Number(ghsInfo.balance)>0">减去余额¥{{ ghsInfo.balance ? parseFloat(ghsInfo.balance) : 0 }}</text>
                   <text v-if="ghsInfo.remainDebtAmount>0" style="margin-left:15upx;">实欠¥{{ ghsInfo.remainDebtAmount }}</text>
                   <text style="margin-left:30upx;">按金额结 》</text>
               </text>

hdApp/src/pagesPurchase/order.vue

@@ -79,11 +79,10 @@
                   </text>
                 </view>
               </view>
-              <view class="box_6 flex-row" v-if="Number(ghsInfo.balance)>0" @click.stop="recharge(ghsInfo)">
+              <view class="box_6 flex-row" v-if="Number(ghsInfo.balance)>0 && ghsInfo.remainDebtAmount>0" @click.stop="recharge(ghsInfo)">
                 <view class="show_clear_area flex-row justify-between">
-                  <image class="icon_2" referrerpolicy="no-referrer" src="/static/lanhu_020105gongyingshangliebiao/ps2pvfa1l5i34w5vqj2k7b3kejml3i3nmrba1421bf-caa2-491b-8773-af413df7e96d.png" />
-                  <text class="waite_clear_order">
-                    <text v-if="Number(ghsInfo.balance)>0">有余额¥{{ ghsInfo.balance ? parseFloat(ghsInfo.balance) : 0 }}</text>
+                  <text class="waite_clear_order" style="color:#3385ff;">
+                    <text v-if="Number(ghsInfo.balance)>0">减去余额¥{{ ghsInfo.balance ? parseFloat(ghsInfo.balance) : 0 }}</text>
                     <text v-if="ghsInfo.remainDebtAmount>0" style="margin-left:15upx;">实欠¥{{ ghsInfo.remainDebtAmount }}</text>
                     <text style="margin-left:30upx;">按金额结 》</text>
                   </text>

hdApp/src/pagesPurchase/purDetails.vue

@@ -119,7 +119,7 @@
 
       <view v-if="detailInfo.debt == 1 || detailInfo.clearId > 0" class="bills-info_box content-box">
         <view class="order-info_box" v-if="detailInfo.debt == 1">
-          <view>本单赊账：</view>
+          <view>本单待结：</view>
           <view style="font-weight:bold;color:red;font-size:29upx;">¥{{ detailInfo.realPrice ? parseFloat(detailInfo.realPrice) : 0}}</view>
           <view class="price">
             <button @click="clearOrder" class="admin-button-com" style="padding:20upx 15upx;">
@@ -127,8 +127,9 @@
             </button>
           </view>
         </view>
+
         <view class="order-info_box" v-else>
-          <view>本单待结：</view>
+          <view>本单金额：</view>
           <view v-if="detailInfo.clearId > 0" style="font-weight:bold;color:#3385FF;font-size:29upx;">已结清</view>
           <view class="price" v-if="detailInfo.clearId > 0">
             <button style="padding:20upx 15upx;" @click="pageTo({url: '/admin/clear/info',query: {id: detailInfo.clearId}})" class="admin-button-com">查看账单</button>
@@ -145,17 +146,10 @@
           </view>
         </view>
 
-        <view class="order-info_box" style="margin-top:35upx;" v-if="Number(detailInfo.inMyGhsBalance)>0">
-          <view>账户余额：</view>
-          <view style="font-weight:bold;color:red;font-size:29upx;">
-            ¥{{detailInfo.inMyGhsBalance?parseFloat(detailInfo.inMyGhsBalance):0}}
-          </view>
-        </view>
-
         <view class="order-info_box" style="margin-top:35upx;" v-if="Number(detailInfo.inMyGhsBalance)>0 && detailInfo.remainDebtAmount>0">
-          <view>实际欠款：</view>
-          <view style="font-weight:bold;color:red;font-size:29upx;">
-            ¥{{detailInfo.remainDebtAmount?parseFloat(detailInfo.remainDebtAmount):0}}
+          <view>减去余额：</view>
+          <view style="font-weight:bold;color:#3385ff;font-size:29upx;">
+            ¥{{detailInfo.inMyGhsBalance?parseFloat(detailInfo.inMyGhsBalance):0}} 实欠 ¥{{detailInfo.remainDebtAmount?parseFloat(detailInfo.remainDebtAmount):0}}
           </view>
           <view class="price" v-if="loginStyle != 0">
             <button @click="goToRecharge(detailInfo)" class="admin-button-com" style="padding:20upx 15upx;">
@@ -164,7 +158,6 @@
           </view>
         </view>
 
-
       </view>
 
       <view class="module-com content-box proInfo">