shish 3 лет назад
Родитель
Сommit
045baf44a5

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

@@ -83,14 +83,14 @@
 
 			<view class="bills-info_box content-box" style="margin-top:25upx;">
 				<view class="order-info_box" v-if="detailInfo.debt == 1">
-				<view>结算状态:</view>
+				<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>订单状态:</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>

+ 2 - 2
ghsApp/src/pagesOrder/info.vue

@@ -82,11 +82,11 @@
 
 			<view class="bills-info_box content-box" style="margin-top:25upx;">
 				<view class="order-info_box" v-if="detailInfo.debt == 1">
-				<view>结算状态:</view>
+				<view>订单状态:</view>
 					<view style="color:red;font-weight:bold;">欠款</view>
 				</view>
 				<view class="order-info_box" v-else>
-				<view>结算状态:</view>
+				<view>订单状态:</view>
 					<view v-if="detailInfo.clearId > 0">已结清</view>
 					<view class="price" v-if="detailInfo.clearId > 0">
 					</view>

+ 8 - 7
ghsApp/src/pagesPurchase/info.vue

@@ -48,8 +48,8 @@
 				</view>
 
 				<view v-if="detailInfo.refund == 2" class="order-info_box">
-					<view>累计退款:</view>
-					<view style="color:red;font-weight:bold;font-size:30upx;">{{parseFloat(detailInfo.tkPrice)}}</view>
+					<view style="color:red;font-weight:bold;">累计退款:</view>
+					<view style="color:red;font-weight:bold;font-size:30upx;">¥{{detailInfo.tkPrice?parseFloat(detailInfo.tkPrice):0}}</view>
 					<view class="price" v-if="detailInfo.refund==2">
 						<text @click="pageTo({url: '/pagesPurchase/refundList',query: {orderSn: detailInfo.orderSn}})" style="font-weight:normal;color:#3385FF;">退款记录</text>
 					</view>
@@ -59,14 +59,14 @@
 
 			<view class="bills-info_box content-box" style="margin-top:18upx;">
 				<view class="order-info_box" v-if="detailInfo.debt == 1">
-				<view>结算状态:</view>
-					<view style="color:red;">欠款</view>
+				<view>订单状态:</view>
+					<view style="color:red;font-weight:bold;">欠款</view>
 					<view class="price">
 						<text @click="goToClear(detailInfo)" style="font-weight:normal;color:#3385FF;">全部欠款</text>
 					</view>
 				</view>
 				<view class="order-info_box" v-else>
-				<view>结算状态:</view>
+				<view>订单状态:</view>
 					<view v-if="detailInfo.clearId > 0">已结清</view>
 					<view class="price" v-if="detailInfo.clearId > 0">
 					<button @click="pageTo({url: '/admin/clear/info',query: {id: detailInfo.clearId}})" class="admin-button-com">查看结账单</button>
@@ -103,7 +103,7 @@
 					<view class="summary-bar">
 						<view class="operate-view" ></view>
 						<view class="describe-view">
-							共{{ detailInfo.kind || 0 }}种,<text v-if="Number(detailInfo.bigNum)>0">{{ detailInfo.bigNum }}扎</text><text v-if="Number(detailInfo.smallNum)>0">{{detailInfo.smallNum}}支</text>,
+							共<text v-if="Number(detailInfo.bigNum)>0">{{ detailInfo.bigNum }}扎</text><text v-if="Number(detailInfo.smallNum)>0">{{detailInfo.smallNum}}支</text>,
 							合计 ¥<text class="price">{{ detailInfo.price ? parseFloat(detailInfo.price) : 0 }}</text>
 						</view>
 					</view>
@@ -293,7 +293,7 @@ export default {
 	}
 	& .address-des_bx {
 		display: flex;
-		padding: 20upx 10upx 30upx 20upx;
+		padding: 20upx 10upx 20upx 20upx;
 		& > view:nth-child(1) {
 			flex: 1;
 			margin-top: 10upx;
@@ -315,6 +315,7 @@ export default {
 				font-size: 50upx;
 				color: #3385ff;
 				margin-left: 0upx;
+				margin-right:30upx;
 			}
 		}
 	}