欠款和结账

ghsApp/src/pagesOrder/detail.vue

@@ -63,7 +63,18 @@
 				</view>
 				<view class="order-info_box" v-if="detailInfo.status != 1 && detailInfo.status!=5">
 					<view>付款方式：</view>
-					<view>{{ detailInfo.payWay==0?'微信':detailInfo.payWay==1?'支付宝':detailInfo.payWay==2?'余额':detailInfo.payWay==4?'现金':detailInfo.payWay==5?'银行卡':'--' }}</view>
+					<view>
+						<text :class="[detailInfo.payWay==3 ? 'red-mind' : '']">
+							{{ detailInfo.payWay==0?'微信':detailInfo.payWay==1?'支付宝':detailInfo.payWay==2?'余额':detailInfo.payWay==4?'现金':detailInfo.payWay==5?'银行卡':detailInfo.payWay==3?'欠款':'--' }}
+						</text>
+						<text v-if="Number(detailInfo.clearId)>0" style="color:#3385ff;font-weight:bold;">（已结清）</text>
+					</view>
+					<view class="price" v-if="detailInfo.clearId > 0">
+						<button @click="pageTo({url: '/admin/clear/customInfo',query: {id: detailInfo.clearId}})" class="admin-button-com">查看结账单</button>
+					</view>
+					<view class="price" v-if="detailInfo.debt == 1">
+						<button @click='pageTo({url:"/pagesArrears/details",query: {id: detailInfo.customId}})' class="admin-button-com">全部欠款单</button>
+					</view>
 				</view>
 				<view class="order-info_box">
 					<view>订单状态：</view>
@@ -86,24 +97,6 @@
 				</view>
 			</view>
 
-			<view class="bills-info_box content-box" style="margin-top:25upx;">
-				<view class="order-info_box" v-if="detailInfo.debt == 1">
-				<view>订单状态：</view>
-					<view style="color:red;font-weight:bold;">欠款</view>
-					<view class="price">
-						<button @click='pageTo({url:"/pagesArrears/details",query: {id: detailInfo.customId}})' class="admin-button-com">全部欠款单</button>
-					</view>
-				</view>
-				<view class="order-info_box" v-else>
-				<view>订单状态：</view>
-					<view v-if="detailInfo.clearId > 0">已结清</view>
-					<view class="price" v-if="detailInfo.clearId > 0">
-					<button @click="pageTo({url: '/admin/clear/customInfo',query: {id: detailInfo.clearId}})" class="admin-button-com">查看结账单</button>
-					</view>
-					<view v-if="detailInfo.clearId == 0">--</view>          
-				</view>
-			</view>
-
 			<view class="content-box shipping-address" v-if="detailInfo.expressProgress!=''">
 				<view> 配送进展：<text>{{ detailInfo.expressProgress.progressName }}</text> </view>
 				<i class="iconfont iconqishouyinying"></i>
@@ -680,6 +673,10 @@ export default {
 					margin-left: 12upx;
 				}
 			}
+			.red-mind{
+				color:red;
+				font-weight:bold;
+			}
 		}
 	}
 	.content-box {

hdApp/src/admin/order/detail.vue

@@ -87,14 +87,14 @@
         <view class="module-det">
           <view class="order-msg-blo">
 
-            <view class="msg-list" v-if="Number(dj)>0 && Number(orderInfo.debtPrice)>0">
+            <view class="msg-list" v-if="Number(dj)>0 && Number(orderInfo.remainDebtPrice)>0">
               <view class="label">订金：</view>
               <view class="value">￥{{dj}}</view>
             </view>
-            <view class="msg-list" v-if="Number(orderInfo.debtPrice)>0" style="position:relative;">
-              <view class="label" style="color:red;">尾款：</view>
+            <view class="msg-list" v-if="Number(orderInfo.remainDebtPrice)>0" style="position:relative;">
+              <view class="label" style="color:red;">欠款：</view>
               <view class="value" style="color:red;font-weight:bold;">
-                ￥{{ orderInfo.debtPrice ? parseFloat(orderInfo.debtPrice) : 0 }}
+                ￥{{ orderInfo.remainDebtPrice ? parseFloat(orderInfo.remainDebtPrice) : 0 }}
                 <text v-if="Number(orderInfo.remainDebtPrice)<=0" style="margin-left:20upx;">已结清</text>
                 </view>
               <button class="admin-button-com mini-btn" v-if="Number(orderInfo.remainDebtPrice)>0" @click="clear(orderInfo)" style="position:absolute;right:0upx;top:0">结清</button>
@@ -116,8 +116,9 @@
             <view class="msg-list" v-if="orderInfo.payStatus == 1">
               <view class="label">支付：</view>
               <view class="value">
-                {{ orderInfo.payWay == 0 ? '微信支付':orderInfo.payWay==1?'支付宝':orderInfo.payWay==4?'现金':orderInfo.payWay==5 ?'银行卡':'其它'}}
+                {{ orderInfo.payWay == 0 ? '微信支付':orderInfo.payWay==1?'支付宝':orderInfo.payWay==4?'现金':orderInfo.payWay==5 ?'银行卡' : orderInfo.payWay==3 ?'欠款':'其它'}}
                 <text v-if="Number(orderInfo.mainPay)>0 && Number(orderInfo.cash)>0">（现金付￥{{ orderInfo.cash ? parseFloat(orderInfo.cash) : 0 }}）</text>
+                <text v-if="Number(orderInfo.settleId)>0" style="color:red;font-weight:bold;">（已结清）</text>
               </view>
             </view>
             <view class="msg-list">