shish 3 лет назад
Родитель
Сommit
4223592158
2 измененных файлов с 9 добавлено и 9 удалено
  1. 3 3
      ghsApp/src/admin/home/components/OrderItem.vue
  2. 6 6
      ghsApp/src/pagesOrder/detail.vue

+ 3 - 3
ghsApp/src/admin/home/components/OrderItem.vue

@@ -10,7 +10,7 @@
           <view class="tit"> {{ item.customName || "" }}</view>
           <view class="tit"> {{ item.customName || "" }}</view>
 
 
           <view class="other-refund" v-if="item.refund==2">有退款</view>
           <view class="other-refund" v-if="item.refund==2">有退款</view>
-          <view class="other-status" v-if="item.debt == 1">欠款</view>
+          <view class="other-status" v-if="item.debt == 1">赊账</view>
           <text class="other-book" v-if="item.book == 1" >预订单</text>
           <text class="other-book" v-if="item.book == 1" >预订单</text>
           <text class="other-presell" v-if="item.presell == 1" >预售单</text>
           <text class="other-presell" v-if="item.presell == 1" >预售单</text>
           <view :class="['status',item.status == '4' ? 'buleColor' : item.status == '1' ? 'defColor' : '']">{{ statusFormat(item.status) }}</view>
           <view :class="['status',item.status == '4' ? 'buleColor' : item.status == '1' ? 'defColor' : '']">{{ statusFormat(item.status) }}</view>
@@ -169,8 +169,8 @@ export default {
   & > .other-refund{
   & > .other-refund{
     flex: 1.5;
     flex: 1.5;
     text-align: center;
     text-align: center;
-    color: #ff2842;
-    border:2upx solid red;
+    color: #0e7ed8;
+    border:2upx solid #0e7ed8;
     border-radius:30upx;
     border-radius:30upx;
     padding:5upx 12upx;
     padding:5upx 12upx;
     font-size:20upx;
     font-size:20upx;

+ 6 - 6
ghsApp/src/pagesOrder/detail.vue

@@ -79,12 +79,12 @@
 					<view>
 					<view>
 						<block v-if="detailInfo.onlinePay == 2">
 						<block v-if="detailInfo.onlinePay == 2">
 							<text :class="[detailInfo.payWay==3 && detailInfo.clearId == 0 ? 'red-mind' : 'normal-mind']">
 							<text :class="[detailInfo.payWay==3 && detailInfo.clearId == 0 ? 'red-mind' : 'normal-mind']">
-								{{ detailInfo.payWay==0?'微信':detailInfo.payWay==1?'支付宝':detailInfo.payWay==2?'余额':detailInfo.payWay==4?'现金':detailInfo.payWay==5?'银行卡':detailInfo.payWay==3?'欠款':'--' }}
+								{{ detailInfo.payWay==0?'微信':detailInfo.payWay==1?'支付宝':detailInfo.payWay==2?'余额':detailInfo.payWay==4?'现金':detailInfo.payWay==5?'银行卡':detailInfo.payWay==3?'赊账':'--' }}
 							</text>
 							</text>
 						</block>
 						</block>
 						<block v-else>
 						<block v-else>
 							<text :class="[detailInfo.payWay==3 && detailInfo.clearId == 0 ? 'red-mind' : 'normal-mind']">
 							<text :class="[detailInfo.payWay==3 && detailInfo.clearId == 0 ? 'red-mind' : 'normal-mind']">
-								{{ detailInfo.payWay==0?'线下微信':detailInfo.payWay==1?'线下支付宝':detailInfo.payWay==2?'余额':detailInfo.payWay==4?'现金':detailInfo.payWay==5?'银行卡':detailInfo.payWay==3?'欠款':'--' }}
+								{{ detailInfo.payWay==0?'线下微信':detailInfo.payWay==1?'线下支付宝':detailInfo.payWay==2?'余额':detailInfo.payWay==4?'现金':detailInfo.payWay==5?'银行卡':detailInfo.payWay==3?'赊账':'--' }}
 							</text>
 							</text>
 						</block>
 						</block>
 						<text v-if="Number(detailInfo.clearId)>0" style="color:#3385ff;font-weight:bold;">(已结清)</text>
 						<text v-if="Number(detailInfo.clearId)>0" style="color:#3385ff;font-weight:bold;">(已结清)</text>
@@ -93,7 +93,7 @@
 						<button @click="pageTo({url: '/admin/clear/customInfo',query: {id: detailInfo.clearId}})" class="admin-button-com">查看结账单</button>
 						<button @click="pageTo({url: '/admin/clear/customInfo',query: {id: detailInfo.clearId}})" class="admin-button-com">查看结账单</button>
 					</view>
 					</view>
 					<view class="price" v-if="detailInfo.debt == 1">
 					<view class="price" v-if="detailInfo.debt == 1">
-						<button @click='pageTo({url:"/pagesArrears/details",query: {id: detailInfo.customId}})' class="admin-button-com" style="border:1upx solid red;color:red;">全部欠款</button>
+						<button @click='pageTo({url:"/pagesArrears/details",query: {id: detailInfo.customId}})' class="admin-button-com" style="border:1upx solid red;color:red;">全部赊账</button>
 					</view>
 					</view>
 				</view>
 				</view>
 				<view class="order-info_box">
 				<view class="order-info_box">
@@ -594,14 +594,14 @@ export default {
 			}else if(s.type == 'confirm'){
 			}else if(s.type == 'confirm'){
 				let self = this;
 				let self = this;
 				uni.showActionSheet({
 				uni.showActionSheet({
-					itemList: ['结算方式:', '欠款', '已收款'],
+					itemList: ['结算方式:', '赊账', '已收款'],
 					success: function (res) {
 					success: function (res) {
 						if(res.tapIndex == 0){
 						if(res.tapIndex == 0){
 							return false
 							return false
 						}
 						}
 						let payWay = 0
 						let payWay = 0
-						let title = res.tapIndex == 1 ? '确认客户欠款?' : '确认已收款?'
-						//1欠款 2已收款
+						let title = res.tapIndex == 1 ? '确认客户赊账?' : '确认已收款?'
+						//1赊账 2已收款
 						let clearType = res.tapIndex == 1 ? 1 : 2;
 						let clearType = res.tapIndex == 1 ? 1 : 2;
 						//选择的已收款,还需要选择收款方式
 						//选择的已收款,还需要选择收款方式
 						if(clearType == 2){
 						if(clearType == 2){