结账

hdApp/src/admin/ghs/pay.vue

@@ -9,7 +9,7 @@
 			</div>
 			<div style="padding:10upx 0 25upx 10upx;font-size:30upx;">
 				{{ customInfo.name?customInfo.name:'' }}，
-				<text v-if="Number(customInfo.remainDebtAmount)>0">您的待结款<text style="color:red;font-weight:bold;">{{ customInfo.remainDebtAmount }}元</text>，这里可直接付款</text>
+				<text v-if="Number(customInfo.remainDebtAmount)>0">您的待结款<text style="color:red;font-weight:bold;">{{ customInfo.remainDebtAmount }}元</text>，这里直接付款销账</text>
 				<text v-else>您的账单已结清</text>
 			</div>
 			<div class="module-com pay-input-wrap">

hdApp/src/admin/home/workbench.vue

@@ -216,28 +216,27 @@
             <view class="tag_2" @click="pageTo({url:'/pagesPurchase/shopping'})"> <text>买花记录</text> </view>
             <view class="tag_2" @click.stop="callUp(ghsInfo.telephone)" style="color:green;font-weight:bold;"> <text>联系我们</text> </view>
           </view>
-          <view class="box_6 flex-row" v-if="Number(ghsInfo.balance)>0" @click.stop="whyHave()">
+          <view class="box_6 flex-row" @click="settleAccounts(ghsInfo)" v-if="Number(ghsInfo.debtAmount)>0">
             <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" @click.stop="goBalanceChange(ghsInfo)">
-                余额&nbsp;¥{{ ghsInfo.balance ? parseFloat(ghsInfo.balance) : 0 }}
+              <text class="waite_clear_order">
+                待结订单&nbsp;{{ghsInfo.debtNum}}笔&nbsp;合计¥{{ghsInfo.debtAmount?parseFloat(ghsInfo.debtAmount):0}}
+                <text style="margin-left:30upx;">选订单结 》</text>
               </text>
             </view>
-            <view class="image-text_9 flex-row justify-between">
-              <text class="text-group_4"></text>
-              <image referrerpolicy="no-referrer" :src="`${constant.imgUrl}/ghs/why2.png`" style="width:33upx;height:31upx;" />
-            </view>
           </view>
-          <view class="box_6 flex-row" @click="settleAccounts(ghsInfo)" v-if="Number(ghsInfo.debtAmount)>0">
+
+          <view class="box_6 flex-row" v-if="Number(ghsInfo.balance)>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">待结订单&nbsp;{{ghsInfo.debtNum}}笔&nbsp;¥{{ghsInfo.debtAmount?parseFloat(ghsInfo.debtAmount):0}}</text>
-            </view>
-            <view class="image-text_9 flex-row justify-between">
-              <text class="text-group_4">去结账</text>
-              <image class="icon_3" referrerpolicy="no-referrer" src="/static/lanhu_020105gongyingshangliebiao/ps83ag7scu3a8bfq22ciodg5hiu0x9cesxjbfb4c9ca-ee3f-45ec-a6d7-6f166e13d6e6.png" />
+              <text class="waite_clear_order">
+                  <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>
+
           <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>
@@ -274,7 +273,6 @@
 
   <uni-popup ref="toShowMore" background-color="#fff" type="center" :animation="true" class="class-popup-style">
 			<view style="display:flex;width:100vw;padding:20upx 20upx 40upx 20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
-        <view style="width:100vw;margin-top:8upx;"><button @click="recharge()">充值销账</button></view>
         <view style="width:100vw;margin-top:8upx;"><button @click="rechargeChange()">充值记录</button></view>
 				<view style="width:100vw;margin-top:8upx;"><button @click="balanceChange()">余额变动明细</button></view>
 				<view style="width:100vw;margin-top:8upx;"><button @click="bpSj()">屏蔽此商家</button></view>
@@ -517,9 +515,8 @@ export default {
         that.confirmPb(that.currentGhs)
 			})
     },
-    recharge(){
-      this.closeToShow()
-      this.pageTo({url: '/admin/ghs/pay?id='+this.currentGhs.id+'&salt='+this.currentGhs.salt})
+    recharge(currentGhs){
+      this.pageTo({url: '/admin/ghs/pay?id='+currentGhs.id+'&salt='+currentGhs.salt})
     },
     confirmPb(ghs){
       let that = this
@@ -1066,7 +1063,7 @@ export default {
       .box_6 {
         background-color: rgb(248, 242, 242);
         width: 750upx;
-        height:85upx;
+        height:95upx;
         .show_clear_area {
           width: 247upx;
           height: 29upx;
@@ -1081,7 +1078,7 @@ export default {
             height: 29upx;
             overflow-wrap: break-word;
             color: rgba(255, 40, 66, 1);
-            font-size: 30upx;
+            font-size: 31upx;
             font-weight:bold;
             text-align: left;
             white-space: nowrap;

hdApp/src/pagesPurchase/order.vue

@@ -75,24 +75,19 @@
                   <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:50upx;">
-                    按单去结账 》》
-                  </text>
+                  <text style="margin-left:30upx;">选订单结 》</text>
                   </text>
                 </view>
- 
               </view>
               <view class="box_6 flex-row" v-if="Number(ghsInfo.balance)>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">
-                    余额&nbsp;¥{{ ghsInfo.balance ? parseFloat(ghsInfo.balance) : 0 }}&nbsp;待结余款
-                    <text style="margin-left:50upx;">
-                    输金额结账 》》
-                    </text>
+                    <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>
               <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>
@@ -199,7 +194,6 @@ export default {
       this.pageTo({url: '/admin/ghs/rechargeChange?ghsId='+this.currentGhs.id})
     },
     recharge(currentGhs){
-      this.closeToShow()
       this.pageTo({url: '/admin/ghs/pay?id='+currentGhs.id+'&salt='+currentGhs.salt})
     },
     balanceChange(){
@@ -480,7 +474,7 @@ export default {
       .box_6 {
         background-color: rgb(248, 242, 242);
         width: 750upx;
-        height:85upx;
+        height:95upx;
         .show_clear_area {
           width: 247upx;
           height: 29upx;
@@ -495,7 +489,7 @@ export default {
             height: 29upx;
             overflow-wrap: break-word;
             color: rgba(255, 40, 66, 1);
-            font-size: 30upx;
+            font-size: 31upx;
             font-weight:bold;
             text-align: left;
             white-space: nowrap;

hdApp/src/pagesPurchase/purDetails.vue

@@ -128,21 +128,43 @@
           </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>
           </view>
         </view>
+
         <view class="order-info_box" style="margin-top:35upx;" v-if="Number(detailInfo.debtAmount)>0">
-          <view>总共赊账：</view>
+          <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>
+          </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 class="price" v-if="loginStyle != 0">
+            <button @click="goToRecharge(detailInfo)" class="admin-button-com" style="padding:20upx 15upx;">
+            按金额结账
             </button>
           </view>
         </view>
+
+
       </view>
 
       <view class="module-com content-box proInfo">
@@ -459,6 +481,9 @@ export default {
         url: '/pagesPurchase/gathering?id='+item.supplierId
       })
     },
+    goToRecharge(info){
+      this.pageTo({url: '/admin/ghs/pay?id='+info.ghsId+'&salt='+info.ghsSalt})
+    },
     copy (val) {
       const self = this;
       uni.setClipboardData({