销账

hdApp/src/admin/home/workbench.vue

@@ -221,20 +221,31 @@
               <image class="icon_2" referrerpolicy="no-referrer" src="/static/lanhu_020105gongyingshangliebiao/ps2pvfa1l5i34w5vqj2k7b3kejml3i3nmrba1421bf-caa2-491b-8773-af413df7e96d.png" />
               <text class="waite_clear_order">
                 待结订单&nbsp;{{ghsInfo.debtNum}}笔&nbsp;合计¥{{ghsInfo.debtAmount?parseFloat(ghsInfo.debtAmount):0}}
-                <text style="margin-left:30upx;">选订单结 》</text>
+                <text style="margin-left:30upx;" v-if="ghsInfo.remainDebtAmount>0">选订单结 》</text>
               </text>
             </view>
           </view>
 
-          <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">
-              <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>
+          <block v-if="Number(ghsInfo.balance)>0">
+            <view class="box_6 flex-row" v-if="ghsInfo.remainDebtAmount>0" @click.stop="recharge(ghsInfo)">
+              <view class="show_clear_area flex-row justify-between">
+                <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>
+              </view>
             </view>
-          </view>
+
+            <view class="box_6 flex-row" v-if="ghsInfo.remainDebtAmount<0" @click.stop="recharge(ghsInfo)">
+              <view class="show_clear_area flex-row justify-between">
+                <text class="waite_clear_order" style="color:#3385ff;">
+                    <text>账户余额¥{{ Math.abs(ghsInfo.remainDebtAmount) }}</text>
+                    <text style="margin-left:30upx;">已结清</text>
+                </text>
+              </view>
+            </view>
+          </block>
 
           <block v-if="ghsInfo.live == 1">
             <view class="button_7 flex-col" @click.stop="goKmCg(ghsInfo)" v-if="ghsInfo.openKmCg && ghsInfo.openKmCg == 1"><text class="text_13">昆明直采</text></view>

hdApp/src/pagesPurchase/order.vue

@@ -75,19 +75,32 @@
                   <image class="icon_2" referrerpolicy="no-referrer" src="/static/lanhu_020105gongyingshangliebiao/ps2pvfa1l5i34w5vqj2k7b3kejml3i3nmrba1421bf-caa2-491b-8773-af413df7e96d.png" />
                   <text class="waite_clear_order">
                   待结订单&nbsp;{{ghsInfo.debtNum}}笔&nbsp;合计¥{{ghsInfo.debtAmount?parseFloat(ghsInfo.debtAmount):0}}
-                  <text style="margin-left:30upx;">选订单结 》</text>
+                  <text style="margin-left:30upx;" v-if="ghsInfo.remainDebtAmount>0">选订单结 》</text>
                   </text>
                 </view>
               </view>
-              <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">
-                  <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>
+
+              <block v-if="Number(ghsInfo.balance)>0">
+                <view class="box_6 flex-row" v-if="ghsInfo.remainDebtAmount>0" @click.stop="recharge(ghsInfo)">
+                  <view class="show_clear_area flex-row justify-between">
+                    <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>
+                  </view>
                 </view>
-              </view>
+
+                <view class="box_6 flex-row" v-if="ghsInfo.remainDebtAmount<0" @click.stop="recharge(ghsInfo)">
+                  <view class="show_clear_area flex-row justify-between">
+                    <text class="waite_clear_order" style="color:#3385ff;">
+                      <text>账户余额¥{{ Math.abs(ghsInfo.remainDebtAmount) }}</text>
+                      <text style="margin-left:30upx;">已结清</text>
+                    </text>
+                  </view>
+                </view>
+              </block>
+
               <block v-if="ghsInfo.live == 1">
                 <view class="button_7 flex-col" @click.stop="goKmCg(ghsInfo)" v-if="ghsInfo.openKmCg && ghsInfo.openKmCg == 1"><text class="text_13">昆明直采</text></view>
                 <view class="button_4 flex-col" v-if="ghsInfo.isOpen == 1" @click="enterShop(ghsInfo)"><text class="text_13">买花</text></view>

hdApp/src/pagesPurchase/purDetails.vue

@@ -122,7 +122,7 @@
           <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;">
+            <button @click="clearOrder" class="admin-button-com" style="padding:20upx 15upx;" v-if="detailInfo.remainDebtAmount>0">
             结清本单
             </button>
           </view>
@@ -140,23 +140,31 @@
           <view>累计待结：</view>
           <view style="font-weight:bold;color:red;font-size:29upx;">¥{{detailInfo.debtAmount?parseFloat(detailInfo.debtAmount):0}}</view>
           <view class="price" v-if="loginStyle != 0">
-            <button @click="goToSettle(detailInfo)" class="admin-button-com" style="padding:20upx 15upx;">
+            <button @click="goToSettle(detailInfo)" class="admin-button-com" style="padding:20upx 15upx;" v-if="detailInfo.remainDebtAmount>0">
             选订单结账
             </button>
           </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:#3385ff;font-size:29upx;">
-            ¥{{detailInfo.inMyGhsBalance?parseFloat(detailInfo.inMyGhsBalance):0}} 实欠 ¥{{detailInfo.remainDebtAmount?parseFloat(detailInfo.remainDebtAmount):0}}
+        <block v-if="Number(detailInfo.inMyGhsBalance)>0">
+          <view class="order-info_box" style="margin-top:35upx;" v-if="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;">
+              按金额结账
+              </button>
+            </view>
           </view>
-          <view class="price" v-if="loginStyle != 0">
-            <button @click="goToRecharge(detailInfo)" class="admin-button-com" style="padding:20upx 15upx;">
-            按金额结账
-            </button>
+          <view class="order-info_box" style="margin-top:35upx;" v-if="detailInfo.remainDebtAmount<0">
+            <view>账户余额：</view>
+            <view style="font-weight:bold;color:#3385ff;font-size:29upx;">
+              ¥{{Math.abs(detailInfo.remainDebtAmount)}} 已结清
+            </view>
           </view>
-        </view>
+        </block>
 
       </view>