欠款

hdApp/src/admin/home/order.vue

@@ -3,11 +3,11 @@
     <app-tabs :tabs="tabs" :isFixed="true" :currentTab="tabIndex" :height="100" @change="change" itemWidth="20%" />
 		<view class="input-wrap" >
 			<view class="search-bar">
-				<app-search-module v-model="py" placeholder="输入订花人 / 编号" @input="searchFn" />
+				<app-search-module v-model="py" placeholder="输入价格搜索" @input="searchFn" />
 			</view>
 			<view style="float:right">
       <button class="admin-button-com middle blue" style="margin-right:10upx;" @click="selectStaffFn()">开单人</button>
-      <button class="admin-button-com middle blue" style="margin-right:10upx;" @click="debtChangeFn()">有尾款</button>
+      <button class="admin-button-com middle blue" style="margin-right:10upx;" @click="debtChangeFn()">有欠款</button>
       <button class="admin-button-com middle blue" @click="cancelFn()">取消</button>
 			</view>
 		</view>
@@ -16,7 +16,7 @@
         <view class="list" v-for="(item, index) in list.data" :key="index" @click="pageTo({ url: '/admin/order/detail', query: { id: item.id } })" >
           <view class="list-top flex-center-between" style="border-bottom:1upx solid #EEEEEE;">
             <view class="app-color-3" style="font-size:28upx;font-weight:bold;color:#333333;">编号 {{ item.sendNum }}<text v-if="item.bookName!=''" style="margin-left:12upx;">| {{item.bookName}}</text></view>
-            <view style="border:1upx solid red;border-radius:18upx;font-size:19upx;color:red;padding:5upx 10upx;" v-if="item.debt == 1">有尾款</view>
+            <view style="border:1upx solid red;border-radius:18upx;font-size:19upx;color:red;padding:5upx 10upx;" v-if="item.debt == 1">有欠款</view>
             <view style="border:1upx solid red;border-radius:18upx;font-size:19upx;color:red;padding:5upx 10upx;" v-if="item.refund == 1">有退款</view>
             <view style="font-size:28upx;" class='app-price app-green'>{{ item.status | constantfilter('ORDER_STATUS') }}</view>
           </view>

hdApp/src/admin/order/detail.vue

@@ -148,19 +148,19 @@
               <view class="label">原价：</view>
               <view class="value">￥{{ orderInfo.prePrice ? parseFloat(orderInfo.prePrice) : 0 }}</view>
             </view>
+            <view class="msg-list">
+              <view class="label">应付：</view>
+              <view class="value">￥{{ orderInfo.orderPrice ? parseFloat(orderInfo.orderPrice) : 0 }}</view>
+            </view>
             <view v-if="orderInfo.discountAmount > 0" class="msg-list">
               <view class="label">优惠：</view>
               <view class="value">-￥{{ orderInfo.discountAmount ? parseFloat(orderInfo.discountAmount) : 0 }}</view>
             </view>
             <view class="msg-list" v-if="Number(orderInfo.tkPrice)>0">
               <view class="label">退款：</view>
-              <view class="value">-￥{{ orderInfo.tkPrice ? parseFloat(orderInfo.tkPrice) : 0 }}</view>
+              <view class="value" style="color:red;font-weight:bold;">-￥{{ orderInfo.tkPrice ? parseFloat(orderInfo.tkPrice) : 0 }}</view>
               <view style="color: #3385ff;margin-left:50upx;" @click="pageTo({url: '/admin/order/refundList',query: {orderSn: orderInfo.orderSn}})">退款记录</view>
             </view>
-            <view class="msg-list">
-              <view class="label">应付：</view>
-              <view class="value">￥{{ orderInfo.orderPrice ? parseFloat(orderInfo.orderPrice) : 0 }}</view>
-            </view>
             <view class="msg-list">
               <view class="label">实际：</view>
               <view class="value">￥{{ orderInfo.realPrice ? parseFloat(orderInfo.realPrice) : 0 }}</view>