充值优化

ghsApp/src/admin/billing/result.vue

@@ -12,7 +12,7 @@
     分享给<text style="font-weight:bold;margin-left:12upx;">{{customName}}</text>
   </button>
   <!-- #endif -->
-	<button v-if="option.title != '报损成功'" class="admin-button-com big" @click="gotoOrderDetail">订单详情</button>
+	<button v-if="option.title != '报损成功'" class="admin-button-com big" @click="gotoOrderDetail()">订单详情</button>
   <button v-if="option.title != '报损成功'" class="admin-button-com big" @click="printOrder()">打印(无价)</button>
 	<button class="admin-button-com big" @click="goBackHome">返回首页</button>
 

ghsApp/src/admin/billing/toPay.vue

@@ -25,7 +25,10 @@
                 <button style="width:25vh;" @click="beginScan()" class="admin-button-com big blue">点击扫码</button>
             </view>
             <view style="margin-top:20upx;">
-                <button style="width:25vh;" class="admin-button-com big default" @click="checkResult()">查询支付结果</button>
+                <button style="width:25vh;" class="admin-button-com big blue" @click="checkResult()">查询支付结果</button>
+            </view>
+            <view style="margin-top:20upx;">
+                <button style="width:25vh;" class="admin-button-com big blue" @click="gotoOrderDetail()">订单详情</button>
             </view>
             <view style="margin-top:20upx;">
                 <button style="width:25vh;" @click="changePayWay(2)" class="admin-button-com big default">记赊账</button>
@@ -98,6 +101,10 @@ export default {
     })
 	},
   methods: {
+    gotoOrderDetail() {
+      let id = this.option.orderId ? this.option.orderId : 0
+      this.$util.pageTo({url: "/pagesOrder/detail?id="+id,type:2})
+    },
     beginScan(){
       // #ifdef MP-WEIXIN
       this.toScan()

ghsApp/src/pagesClient/member/detail.vue

@@ -39,9 +39,16 @@
                 <view class="list-num">{{ parseFloat(userInfo.buyAmount) || 0 }}</view>
               </view>
             </view>
-            <text v-if="Number(userInfo.debtAmount) > Number(userInfo.remainDebtAmount) && Number(userInfo.debtAmount)>0" style="font-size:30upx;color:#3385FF;font-weight:bold;">
-              实际剩余欠款<text style="color:red;margin-left:10upx;">{{ userInfo.remainDebtAmount?parseFloat(userInfo.remainDebtAmount):0 }}</text>
-            </text>
+            <block v-if="Number(userInfo.remainDebtAmount)>0">
+              <text v-if="Number(userInfo.debtAmount) > Number(userInfo.remainDebtAmount) && Number(userInfo.debtAmount)>0" style="font-size:34upx;color:red;font-weight:bold;width:450upx;text-align: center;display: inline-block;">
+                实际欠款<text style="color:red;margin-left:10upx;">{{ userInfo.remainDebtAmount?parseFloat(userInfo.remainDebtAmount):0 }}</text>
+              </text>
+            </block>
+            <block v-else>
+              <text v-if="Number(userInfo.debtAmount) > Number(userInfo.remainDebtAmount) && Number(userInfo.debtAmount)>0" style="font-size:34upx;color:#3385FF;font-weight:bold;width:450upx;text-align: center;display: inline-block;">
+                余额<text style="color:#3385FF;margin-left:10upx;">{{ userInfo.remainDebtAmount?Math.abs(parseFloat(userInfo.remainDebtAmount)):0 }}</text>
+              </text>
+            </block>
         </view>
       </view>
       <view class="module-com user-address_bx">
@@ -198,7 +205,7 @@
       </template>
 		</modal-module>
 
-		<modal-module :show="czShow" @click="confirmRecharge" :maskClosable="true" title="充值清账" padding="10rpx 10rpx" >
+		<modal-module :show="czShow" @click="confirmRecharge" :maskClosable="true" title="充值销账" padding="10rpx 10rpx" >
       <template v-slot:content>
         <div class="app-modal-input-wrap">
 

ghsApp/src/pagesOrder/detail.vue

@@ -1129,6 +1129,9 @@ export default {
 				if(this.detailInfo.tkPrice && Number(this.detailInfo.tkPrice)>0){
 					this.title = this.title+' 已退¥'+parseFloat(this.detailInfo.tkPrice)
 				}
+				if(this.detailInfo.status == 1){
+					this.title = this.title+' 请点击付款，10分钟后失效'
+				}
 
 				this.settlePrice = Number(this.detailInfo.bookPrice) - Number(this.detailInfo.orderPrice)
 				this.settlePrice = parseFloat(this.settlePrice.toFixed(2))

hdApp/src/pagesPurchase/order.vue

@@ -70,27 +70,29 @@
                 <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.stop="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:50upx;">
+                    按单去结账 》》
+                  </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">
+                    余额&nbsp;¥{{ ghsInfo.balance ? parseFloat(ghsInfo.balance) : 0 }}&nbsp;待结余款
+                    <text style="margin-left:50upx;">
+                    输金额结账 》》
+                    </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>
@@ -122,7 +124,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>
@@ -197,9 +198,9 @@ export default {
       this.closeToShow()
       this.pageTo({url: '/admin/ghs/rechargeChange?ghsId='+this.currentGhs.id})
     },
-    recharge(){
+    recharge(currentGhs){
       this.closeToShow()
-      this.pageTo({url: '/admin/ghs/pay?id='+this.currentGhs.id+'&salt='+this.currentGhs.salt})
+      this.pageTo({url: '/admin/ghs/pay?id='+currentGhs.id+'&salt='+currentGhs.salt})
     },
     balanceChange(){
       this.closeToShow()