From 98752b4b66d9c97bf0a62ff53bd6846efc550b78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Sun, 8 May 2022 17:50:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ratingQueryDetail/ratingQueryDetail.vue   |  5 +--
 packages/sonpingDetail/sonpingDetail.vue      |  4 +-
 packages/sonpingDetail/viewDetail.vue         | 39 ++++++++++---------
 pages/index/index.vue                         |  6 ++-
 pages/login/login.vue                         |  2 +-
 pages/order/order.vue                         |  2 +-
 pages/ratingQuery/ratingQuery.vue             |  5 +++
 pages/settings/settings.vue                   |  2 +-
 8 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/packages/ratingQueryDetail/ratingQueryDetail.vue b/packages/ratingQueryDetail/ratingQueryDetail.vue
index bc35fa9..fb0f551 100644
--- a/packages/ratingQueryDetail/ratingQueryDetail.vue
+++ b/packages/ratingQueryDetail/ratingQueryDetail.vue
@@ -1,9 +1,8 @@
 <template>
   <view class="flex-col page">
     <view class="flex-col group_4">
-      <view class="flex-col section_2">
+      <!-- <view class="flex-col section_2">
         <view class="flex-row equal-division">
-			<!-- todo 评卡详情图 -->
           <image
             src="https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/62677e395a7e3f03107ffc5f/62677e4a35a7e10011e93a80/16509497793576171527.png"
             class="equal-division-item"
@@ -13,7 +12,7 @@
             class="equal-division-item image_7"
           />
         </view>
-      </view>
+      </view> -->
       <view class="flex-col section_3">
         <view class="flex-row">
           <text class="text_2">编号</text>
diff --git a/packages/sonpingDetail/sonpingDetail.vue b/packages/sonpingDetail/sonpingDetail.vue
index d6dd4cc..8dff7ae 100644
--- a/packages/sonpingDetail/sonpingDetail.vue
+++ b/packages/sonpingDetail/sonpingDetail.vue
@@ -9,7 +9,7 @@
         <text class="text_4">评级中</text>
       </view>
       <view class="section_3 flex-col">
-        <view class="justify-between" @click="$url('/packages/sonpingDetail/viewDetail')">
+        <view class="justify-between" @click="$url('/packages/sonpingDetail/viewDetail?id='+ id)">
           <view class="flex-row">
             <text class="text_5">明细：</text>
             <text class="text_6">共3件</text>
@@ -19,7 +19,7 @@
             class="image_6"
           />
         </view>
-        <view class="justify-between group_8" @click="$url('/packages/sonpingDetail/expenseDetail')">
+        <view class="justify-between group_8" @click="$url('/packages/sonpingDetail/expenseDetail?id='+ id)">
           <view class="flex-row">
             <text class="text_7">费用：</text>
             <text class="text_8">暂无</text>
diff --git a/packages/sonpingDetail/viewDetail.vue b/packages/sonpingDetail/viewDetail.vue
index 86652d2..0c15c09 100644
--- a/packages/sonpingDetail/viewDetail.vue
+++ b/packages/sonpingDetail/viewDetail.vue
@@ -4,68 +4,69 @@
 	  <view class="section_2 flex-col view_2">
 		  <view class="flex-row">
 			<text class="text_3">鉴定结果：</text>
-			<text class="text_4">共3件</text>
+			<text class="text_4">共{{ order.num }}件</text>
 		  </view>
 	  </view>
 	  
-	  <view class="section_2 flex-col view_3" v-for="item in 3" :key="item">
+	  <view class="section_2 flex-col view_3" v-for="(item, index) in order.sub_orders" :key="index">
 		<view class="flex-row">
 		  <text class="text_19">评级编号：</text>
-		  <text class="text_20" style="margin-left: 86rpx;">81193920347</text>
+		  <text class="text_20" style="margin-left: 86rpx;">{{ item.series_num }}</text>
 		</view>
 		<view class="flex-row group_13">
 		  <text class="text_19">名称：</text>
-		  <text class="text_20" style="margin-left: 142rpx;">FUIWE UEIF</text>
+		  <text class="text_20" style="margin-left: 142rpx;">{{ item.title }}</text>
 		</view>
 		<view class="flex-row group_13">
 		  <text class="text_19">分数：</text>
-		  <text class="text_20" style="margin-left: 142rpx;">NM-MT+8.5</text>
+		  <text class="text_20" style="margin-left: 142rpx;">{{ item.score }}</text>
 		</view>
 		
 		<view class="flex-row group_13">
 		  <text class="text_11">年份：</text>
-		  <text class="text_12">2014</text>
+		  <text class="text_12">{{ item.years }}</text>
 		</view>
 		<view class="flex-row group_10">
 		  <text class="text_13">发行商：</text>
-		  <text class="text_14">PANINI</text>
+		  <text class="text_14">{{ item.publisher }}</text>
 		</view>
 		<view class="flex-row group_11">
 		  <text class="text_15">卡片系列名称：</text>
-		  <text class="text_16">CONRT KINGS</text>
+		  <text class="text_16">{{ item.card_series }}</text>
 		</view>
 		<view class="flex-row group_12">
 		  <text class="text_17">边子系列名称：</text>
-		  <text class="text_18">HEIR APPARENT</text>
+		  <text class="text_18">{{ item.sub_card_series }}</text>
 		</view>
 		<view class="flex-row group_13">
 		  <text class="text_19">卡片编码：</text>
-		  <text class="text_20">#HA-AW</text>
+		  <text class="text_20">{{ item.card_code }}</text>
 		</view>
 		<view class="flex-row group_13">
 		  <text class="text_19">居中分数：</text>
-		  <text class="text_20">9.5</text>
+		  <text class="text_20">{{ item.center_s }}</text>
 		</view>
 		<view class="flex-row group_13">
 		  <text class="text_19">边框分数：</text>
-		  <text class="text_20">8.5</text>
+		  <text class="text_20">{{ item.border_s }}</text>
 		</view>
 		<view class="flex-row group_13">
 		  <text class="text_19">卡角分数：</text>
-		  <text class="text_20">8.5</text>
+		  <text class="text_20">{{ item.corner_s }}</text>
 		</view>
 		<view class="flex-row group_13">
 		  <text class="text_19">表面分数：</text>
-		  <text class="text_20">9.5</text>
+		  <text class="text_20">{{ item.front }}</text>
 		</view>
 		<view class="flex-row group_13">
 		  <text class="text_19">签字分数：</text>
-		  <text class="text_20">10</text>
+		  <text class="text_20">{{ item.sign_s }}</text>
 		</view>
 		
 		<view class="flex-row group_13">
 		  <text class="text_19">鉴定结果：</text>
-		  <text class="text_20">正常</text>
+		  <!-- <text class="text_20">{{ ['不正常','正常'][item.result_type] }}</text> -->
+		  <text class="text_20">{{ item.result_type_text }}</text>
 		</view>
 	  </view>
     </view>
@@ -78,17 +79,19 @@
   export default {
     data() {
       return {
-		  id: ''
+		  id: '',
+		  order: {}
 	  };
     },
 	onLoad(options){
 		this.id = options.id;
+		this.getViewGradingDetail();
 	},
 	methods: {
 		async getViewGradingDetail(){
-			// todo 更换接口？
 			let res = await gradingDetail(this.id);
 			console.log("res", res)
+			this.order = res.data.datas.order;
 		},
 		previewImage(){
 			uni.previewImage({
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 3d15569..ab20080 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -152,7 +152,7 @@
 						</view>
 						<view class="flex-row equal-division_1">
 							<view class="flex-col items-center equal-division-item_3" @click="$url('/packages/sonpingDetail/sonpingDetail?id='+ item.id)" v-for="(item, index) in evaluated_order" :key="index">
-								<image :src="item.images" class="image_23" mode="aspectFill" />
+								<image :src="item.itemImage" class="image_23" mode="aspectFill" />
 								<text class="text_27">{{ item.title }}</text>
 							</view>
 						</view>
@@ -195,7 +195,9 @@
 				let res = await my();
 				this.user = res.data.datas.user;
 				this.dots = res.data.datas.dots;
-				this.evaluated_order = res.data.datas.evaluated_order;
+				let evaluated_order = res.data.datas.evaluated_order;
+				evaluated_order.forEach(item => item.itemImage = item.images.split(',')[0]);
+				this.evaluated_order = evaluated_order;
 			},
 			nextToGrading(){
 				if(!this.isConsentAgreement) return this.$msg('请先阅读并同意协议');
diff --git a/pages/login/login.vue b/pages/login/login.vue
index b5f0b7e..6ae8853 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -22,7 +22,7 @@
 				<view class="mask" v-if="!checked" @click="$msg('您未同意协议条款')"></view>
 			</block>
 		</view>
-		<!-- 服务条款 todo -->
+		<!-- 服务条款 -->
 		<view class="fixed-bottom lf-flex">
 			<checkbox-group @change="checkboxChange" style="display: inline-block;">
 				<checkbox class="lf-text-vertical" :checked="checked" value="agreement"></checkbox>
diff --git a/pages/order/order.vue b/pages/order/order.vue
index 9d57411..f76b7ef 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -84,7 +84,7 @@
 						        src="https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/62677e395a7e3f03107ffc5f/62677e4a35a7e10011e93a80/16509497798740970822.png"
 						        class="image_7"
 						      />
-						      <text class="text_7">在线送评 todo</text>
+						      <text class="text_7">在线送评</text>
 						    </view>
 						    <text class="text_8">{{ ['','待确认','评级中','待付款','待收货'][item.status] }}</text>
 						  </view>
diff --git a/pages/ratingQuery/ratingQuery.vue b/pages/ratingQuery/ratingQuery.vue
index 59d40b1..59bd162 100644
--- a/pages/ratingQuery/ratingQuery.vue
+++ b/pages/ratingQuery/ratingQuery.vue
@@ -26,6 +26,11 @@
 	methods: {
 		async search(){
 			if(!this.value) return this.$msg('请输入评级编号');
+			let userInfo = uni.getStorageSync('userInfo') || {};
+			if(!this.$isRight(userInfo)){
+				return this.$url('/pages/login/login')
+			}
+			
 			let res = await ratingSearch(this.value);
 			let data = res.data.datas.data;
 			
diff --git a/pages/settings/settings.vue b/pages/settings/settings.vue
index de5f149..fcdfd9a 100644
--- a/pages/settings/settings.vue
+++ b/pages/settings/settings.vue
@@ -8,7 +8,7 @@
 				<u-cell title="手机号码" :isLink="true" :border="false" @click="$msg('敬请期待')"></u-cell>
 				<u-cell title="收货地址" :isLink="true" :border="false" url="/packages/address/address"></u-cell>
 				<u-cell title="系统消息" :isLink="true" :border="false" @click="$msg('敬请期待')">
-					<u-badge class="badge" slot="value" numberType="overflow" max="99" :value="99"></u-badge>
+					<!-- <u-badge class="badge" slot="value" numberType="overflow" max="99" :value="99"></u-badge> -->
 				</u-cell>
 		</u-cell-group>
 		<view class="fixed-tips">{{ version ? 'v'+ version : '' }}</view>