From e594a9c6ac51c51581345f9a3131e8de44d42510 Mon Sep 17 00:00:00 2001
From: tmkook <tmkook@gmail.com>
Date: Sat, 11 Jun 2022 12:12:48 +0800
Subject: [PATCH] fix

---
 pages/order/order.vue | 24 ++++++++++--------------
 service/grading.js    | 22 ++++++++++++++++++++--
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/pages/order/order.vue b/pages/order/order.vue
index 8186bfc..0d6fbd3 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -31,22 +31,17 @@
 			        </view>
 			      </view>
 			    </view>
-			    <view class="flex-col group_11">
-			      <text class="text_15">按送评信息</text>
-			      <view class="flex-row group_12">
-			        <view class="flex-col items-center text-wrapper_2">
-					  <u-input v-model="filterGather.name" placeholder="输入送评人姓名或手机号"></u-input>
-			        </view>
-			        <view class="flex-col items-start text-wrapper_3">
-					  <u-input v-model="filterGather.label" placeholder="输入标签"></u-input>
-			        </view>
-			      </view>
+			    <view class="flex-col group_13">
+					<text class="text_18">按送评信息</text>
+					<view class="flex-col items-start text-wrapper_4">
+					  <u-input v-model="filterGather.name" placeholder="输入送评人姓名或手机号" class="text-wrapper_4-input"></u-input>
+					</view>
 			    </view>
 			    <view class="flex-col group_13">
-			      <text class="text_18">按送评信息</text>
-			      <view class="flex-col items-start text-wrapper_4">
-					<u-input v-model="filterGather.order_num" placeholder="输入评级编号" class="text-wrapper_4-input" ></u-input>
-			      </view>
+					<text class="text_18">按送评信息</text>
+					<view class="flex-col items-start text-wrapper_4">
+						<u-input v-model="filterGather.order_num" placeholder="输入评级编号" class="text-wrapper_4-input" ></u-input>
+					</view>
 			    </view>
 			    <view class="flex-row group_14">
 			      <view class="flex-col items-center text-wrapper_5" @click="reset">
@@ -307,6 +302,7 @@
 			},
 			// 筛选
 			confirm(){
+				this.tabIndex = 0;
 				let tabItem = this.tabList[this.tabIndex];
 				tabItem.page = 1;
 				tabItem.isPage = true;
diff --git a/service/grading.js b/service/grading.js
index 6b5e310..665bcdb 100644
--- a/service/grading.js
+++ b/service/grading.js
@@ -9,15 +9,33 @@ export async function addGrading(data) {
 	})
 }
 
+function scoreFormat(s){
+	if(s <= 0){
+		s = '-';
+	}
+	return s;
+}
+
 // 送评详情
 export async function gradingDetail(order_id) {
-	return await request({
+	let ret = await request({
 		url: '/api/v1/grading_detail',
 		method: 'post',
 		data: {
 			order_id
 		}
-	})
+	});
+	let subs = ret.data.datas.order.sub_orders;
+	for(var i in subs){
+		subs[i].center_s = scoreFormat(subs[i].center_s);
+		subs[i].border_s = scoreFormat(subs[i].border_s);
+		subs[i].corner_s = scoreFormat(subs[i].corner_s);
+		subs[i].front_s = scoreFormat(subs[i].front_s);
+		subs[i].sign_s = scoreFormat(subs[i].sign_s);
+		subs[i].total_s = scoreFormat(subs[i].total_s);
+	}
+	ret.data.datas.order.sub_orders = subs;
+	return ret;
 }
 
 // 评级轨迹