From bc39196636e90bfbb3b272b97c5928aa1b4dde0a 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 15:34:29 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=20?=
 =?UTF-8?q?=E9=80=81=E8=AF=84=E8=AF=A6=E6=83=85=E7=9A=84=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2UI=20=E3=80=90=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5=E3=80=91=20=E5=8D=A1=E7=A0=96=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=92=8C=E8=AF=84=E7=BA=A7=E6=A0=87=E5=87=86=20=E3=80=90?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=91=20=E4=B8=AA=E4=BA=BA=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E6=9C=AA=E7=99=BB=E5=BD=95=E7=9A=84=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/article/article.vue                  |  22 ++-
 .../ratingQueryDetail/ratingQueryDetail.vue   |   4 +-
 packages/sonpingDetail/viewDetail.vue         | 178 +++++++-----------
 pages/index/index.vue                         |  46 +++--
 pages/ratingCriteria/ratingCriteria.vue       |   4 +-
 service/agreementArticle.js                   |  16 ++
 6 files changed, 146 insertions(+), 124 deletions(-)

diff --git a/packages/article/article.vue b/packages/article/article.vue
index 8d0d991..479e30b 100644
--- a/packages/article/article.vue
+++ b/packages/article/article.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-	import { aboutUs, gradeAgreement, privacyAgreement } from '@/service/agreementArticle.js';
+	import { aboutUs, gradeAgreement, privacyAgreement, cardDesign, ratingStandard } from '@/service/agreementArticle.js';
 	
 	export default {
 		data(){
@@ -23,6 +23,10 @@
 				this.getGradeAgreement();
 			}else if(options.type === 'privacy_agreement'){
 				this.getPrivacyAgreement();
+			}else if(options.type === 'card_design'){
+				this.getCardDesign();
+			}else if(options.type === 'rating_standard'){
+				this.getRatingStandard();
 			}
 		},
 		methods: {
@@ -49,6 +53,22 @@
 				uni.setNavigationBarTitle({
 					title: res.data.datas.title
 				})
+			},
+			// 获取卡砖设计
+			async getCardDesign(){
+				let res = await cardDesign();
+				this.article = res.data.datas.content;
+				uni.setNavigationBarTitle({
+					title: res.data.datas.title
+				})
+			},
+			// 获取评级标准
+			async getRatingStandard(){
+				let res = await ratingStandard();
+				this.article = res.data.datas.content;
+				uni.setNavigationBarTitle({
+					title: res.data.datas.title
+				})
 			}
 		}
 	}
diff --git a/packages/ratingQueryDetail/ratingQueryDetail.vue b/packages/ratingQueryDetail/ratingQueryDetail.vue
index 4951eba..bc35fa9 100644
--- a/packages/ratingQueryDetail/ratingQueryDetail.vue
+++ b/packages/ratingQueryDetail/ratingQueryDetail.vue
@@ -65,9 +65,9 @@
       <view class="flex-col section_6">
         <view class="flex-col group_16">
 			<lf-table :Header="header" :Content="details.history" height="auto" width="686" :showNumber="false" v-if="$isRight(details.history)"></lf-table>
-          <view class="flex-col items-center button" @click="setClipboardData">
+          <!-- <view class="flex-col items-center button" @click="setClipboardData">
             <text>复制拍卖链接</text>
-          </view>
+          </view> -->
         </view>
       </view>
     </view>
diff --git a/packages/sonpingDetail/viewDetail.vue b/packages/sonpingDetail/viewDetail.vue
index c894d7f..86652d2 100644
--- a/packages/sonpingDetail/viewDetail.vue
+++ b/packages/sonpingDetail/viewDetail.vue
@@ -1,112 +1,73 @@
 <template>
   <view class="flex-col page">
     <view class="flex-col group_4">
-      <view class="section_2 flex-col view_2">
-        <text>共3件</text>
-        <view class="flex-row equal-division">
-          <image
-            src="https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/62677e395a7e3f03107ffc5f/62677e4a35a7e10011e93a80/16509497768828992333.png"
-            class="equal-division-item"
-			@click="previewImage"
-          />
-          <image
-            src="https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/62677e395a7e3f03107ffc5f/62677e4a35a7e10011e93a80/16509497768927244914.png"
-            class="equal-division-item image_7"
-			@click="previewImage"
-          />
-          <image
-            src="https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/62677e395a7e3f03107ffc5f/62677e4a35a7e10011e93a80/16509497768986098398.png"
-            class="equal-division-item image_8"
-			@click="previewImage"
-          />
-        </view>
-      </view>
-      <view class="section_2 flex-col view_3">
-        <view class="flex-row">
-          <text class="text_3">鉴定结果：</text>
-          <text class="text_4">共3件</text>
-        </view>
-        <view class="flex-row group_6">
-          <text class="text_5">评级编号：</text>
-          <text class="text_6">81193920347</text>
-        </view>
-        <view class="flex-row group_7">
-          <text class="text_7">名称：</text>
-          <text class="text_8">FUIWE UEIF</text>
-        </view>
-        <view class="flex-row group_8">
-          <text class="text_9">分数：</text>
-          <text class="text_10">NM-MT+8.5</text>
-        </view>
-      </view>
-      <view class="flex-col section_3">
-        <view class="flex-row">
-          <text class="text_11">年份：</text>
-          <text class="text_12">2014</text>
-        </view>
-        <view class="flex-row group_10">
-          <text class="text_13">发行商：</text>
-          <text class="text_14">PANINI</text>
-        </view>
-        <view class="flex-row group_11">
-          <text class="text_15">卡片系列名称：</text>
-          <text class="text_16">CONRT KINGS</text>
-        </view>
-        <view class="flex-row group_12">
-          <text class="text_17">边子系列名称：</text>
-          <text class="text_18">HEIR APPARENT</text>
-        </view>
-        <view class="flex-row group_13">
-          <text class="text_19">卡片编码：</text>
-          <text class="text_20">#HA-AW</text>
-        </view>
-        <view class="flex-row group_14">
-          <text class="text_21">居中分数：</text>
-          <text class="text_22">9.5</text>
-        </view>
-        <view class="flex-row group_15">
-          <text class="text_23">边框分数：</text>
-          <text class="text_24">8.5</text>
-        </view>
-        <view class="flex-row group_16">
-          <text class="text_25">卡角分数：</text>
-          <text class="text_26">8.5</text>
-        </view>
-        <view class="flex-row group_17">
-          <text class="text_27">表面分数：</text>
-          <text class="text_28">9.5</text>
-        </view>
-        <view class="flex-row group_18">
-          <text class="text_29">签字分数：</text>
-          <text class="text_30">10</text>
-        </view>
-      </view>
-      <view class="flex-col section_4">
-        <view class="flex-row">
-          <text class="text_31">鉴定结果：</text>
-          <text class="text_32">正常</text>
-        </view>
-        <view class="flex-col group_20">
-          <view class="flex-row">
-            <image
-              src="https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/62677e395a7e3f03107ffc5f/62677e4a35a7e10011e93a80/16509497768828992333.png"
-              class="equal-division-item"
-			  @click="previewImage"
-            />
-            <image
-              src="https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/62677e395a7e3f03107ffc5f/62677e4a35a7e10011e93a80/16509497768927244914.png"
-              class="equal-division-item image_10"
-			  @click="previewImage"
-            />
-            <image
-              src="https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/62677e395a7e3f03107ffc5f/62677e4a35a7e10011e93a80/16509497768986098398.png"
-              class="equal-division-item image_11"
-			  @click="previewImage"
-            />
-          </view>
-          <view class="section_5"> </view>
-        </view>
-      </view>
+	  <view class="section_2 flex-col view_2">
+		  <view class="flex-row">
+			<text class="text_3">鉴定结果：</text>
+			<text class="text_4">共3件</text>
+		  </view>
+	  </view>
+	  
+	  <view class="section_2 flex-col view_3" v-for="item in 3" :key="item">
+		<view class="flex-row">
+		  <text class="text_19">评级编号：</text>
+		  <text class="text_20" style="margin-left: 86rpx;">81193920347</text>
+		</view>
+		<view class="flex-row group_13">
+		  <text class="text_19">名称：</text>
+		  <text class="text_20" style="margin-left: 142rpx;">FUIWE UEIF</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>
+		</view>
+		
+		<view class="flex-row group_13">
+		  <text class="text_11">年份：</text>
+		  <text class="text_12">2014</text>
+		</view>
+		<view class="flex-row group_10">
+		  <text class="text_13">发行商：</text>
+		  <text class="text_14">PANINI</text>
+		</view>
+		<view class="flex-row group_11">
+		  <text class="text_15">卡片系列名称：</text>
+		  <text class="text_16">CONRT KINGS</text>
+		</view>
+		<view class="flex-row group_12">
+		  <text class="text_17">边子系列名称：</text>
+		  <text class="text_18">HEIR APPARENT</text>
+		</view>
+		<view class="flex-row group_13">
+		  <text class="text_19">卡片编码：</text>
+		  <text class="text_20">#HA-AW</text>
+		</view>
+		<view class="flex-row group_13">
+		  <text class="text_19">居中分数：</text>
+		  <text class="text_20">9.5</text>
+		</view>
+		<view class="flex-row group_13">
+		  <text class="text_19">边框分数：</text>
+		  <text class="text_20">8.5</text>
+		</view>
+		<view class="flex-row group_13">
+		  <text class="text_19">卡角分数：</text>
+		  <text class="text_20">8.5</text>
+		</view>
+		<view class="flex-row group_13">
+		  <text class="text_19">表面分数：</text>
+		  <text class="text_20">9.5</text>
+		</view>
+		<view class="flex-row group_13">
+		  <text class="text_19">签字分数：</text>
+		  <text class="text_20">10</text>
+		</view>
+		
+		<view class="flex-row group_13">
+		  <text class="text_19">鉴定结果：</text>
+		  <text class="text_20">正常</text>
+		</view>
+	  </view>
     </view>
   </view>
 </template>
@@ -139,7 +100,7 @@
   };
 </script>
 
-<style scoped lang="css">
+<style scoped lang="scss">
   .section_2 {
     padding: 40rpx 32rpx;
     background-color: rgb(255, 255, 255);
@@ -178,8 +139,9 @@
   }
   .section_4 {
     margin-top: 30rpx;
-    padding: 40rpx 32rpx 16rpx;
+    padding: 40rpx 32rpx;
     background-color: rgb(255, 255, 255);
+	margin-bottom: 30rpx;
   }
   .equal-division {
     margin-top: 30rpx;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index efff2ee..3d15569 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -13,10 +13,11 @@
 			<view class="flex-col section_2">
 				<view class="flex-col">
 					<!-- 用户信息 -->
-					<view class="flex-col section_3" @click="$url('/pages/settings/settings')">
+					<view class="flex-col section_3" @click="nextToSettings">
 						<view class="bottom-group flex-col items-center view_3">
 							<view class="flex-col items-end image-wrapper">
-								<image class="avatar" :src="user.avatar" mode="aspectFill"></image>
+								<image class="avatar" :src="user.avatar" mode="aspectFill" v-if="user.avatar"></image>
+								<image class="avatar" src="@/static/mrtx.png" mode="aspectFill" v-else></image>
 								<image
 									src="https://project-user-resource-1256085488.cos.ap-guangzhou.myqcloud.com/62677e395a7e3f03107ffc5f/62677e4a35a7e10011e93a80/16509497944681815904.png"
 									class="image_7" />
@@ -26,7 +27,7 @@
 							</view>
 						</view>
 						<view class="justify-center group_5">
-							<view class="user-name">{{ user.nick_name }}</view>
+							<view class="user-name">{{ user.nick_name || '您未登录,点击登录' }}</view>
 							<image src="@/static/icon/rightArrow.png" class="image_8" />
 						</view>
 					</view>
@@ -34,7 +35,7 @@
 					<view class="section_4 flex-col">
 						<view class="justify-between">
 							<text class="text_4">我的订单</text>
-							<view class="right-group flex-row" @click="$url('/pages/order/order')">
+							<view class="right-group flex-row" @click="nextToOrder">
 								<text>全部</text>
 								<image
 									src="@/static/icon/rightArrow.png"
@@ -42,7 +43,7 @@
 							</view>
 						</view>
 						<view class="justify-between equal-division" >
-							<view class="equal-division-item flex-col" @click="$url('/pages/order/order?current=1')">
+							<view class="equal-division-item flex-col" @click="nextToOrder(1)">
 								<view class="top-group flex-col items-center">
 									<image
 										src="https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/62677e395a7e3f03107ffc5f/62677e4a35a7e10011e93a80/16509497746086268452.png"
@@ -53,7 +54,7 @@
 								</view>
 								<text class="text_7">待确认</text>
 							</view>
-							<view class="flex-col items-center equal-division-item_1" @click="$url('/pages/order/order?current=2')">
+							<view class="flex-col items-center equal-division-item_1" @click="nextToOrder(2)">
 								<view class="top-group flex-col items-center">
 									<image
 										src="https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/62677e395a7e3f03107ffc5f/62677e4a35a7e10011e93a80/16509497746226999392.png"
@@ -64,7 +65,7 @@
 								</view>
 								<text class="text_7">评级中</text>
 							</view>
-							<view class="flex-col items-center equal-division-item_2" @click="$url('/pages/order/order?current=3')">
+							<view class="flex-col items-center equal-division-item_2" @click="nextToOrder(3)">
 								<view class="top-group flex-col items-center">
 									<image
 										src="https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/62677e395a7e3f03107ffc5f/62677e4a35a7e10011e93a80/16509497746138565873.png"
@@ -75,7 +76,7 @@
 								</view>
 								<text class="text_11">待付款</text>
 							</view>
-							<view class="equal-division-item flex-col" @click="$url('/pages/order/order?current=4')">
+							<view class="equal-division-item flex-col" @click="nextToOrder(4)">
 								<view class="top-group flex-col items-center">
 									<image
 										src="https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/62677e395a7e3f03107ffc5f/62677e4a35a7e10011e93a80/16509497746181954101.png"
@@ -142,8 +143,8 @@
 						</view>
 					</view>
 					<!-- 已评卡 -->
-					<view class="flex-col section_8">
-						<view class="justify-between group_15" @click="$url('/pages/order/order')">
+					<view class="flex-col section_8" v-if="$isRight(evaluated_order)">
+						<view class="justify-between group_15" @click="nextToOrder">
 							<text>已评卡</text>
 							<image
 								src="@/static/icon/rightArrow.png"
@@ -198,7 +199,30 @@
 			},
 			nextToGrading(){
 				if(!this.isConsentAgreement) return this.$msg('请先阅读并同意协议');
-				this.$url('/pages/write/baseInfo');
+				if(this.$isRight(this.user)){
+					this.$url('/pages/write/baseInfo');
+				}else{
+					this.$url('/pages/login/login');
+				}
+			},
+			nextToOrder(current){
+				if(this.$isRight(this.user)){
+					let url = '/pages/order/order';
+					if(this.$valueType(current) === 'number'){
+						url += '?current='+ current;
+					}
+					this.$url(url);
+				}else{
+					this.$url('/pages/login/login');
+				}
+			},
+			nextToSettings(){
+				if(this.$isRight(this.user)){
+					this.$url('/pages/settings/settings');
+				}else{
+					// this.$url('/pages/login/login', {type: 'redirect'})
+					this.$url('/pages/login/login');
+				}
 			}
 		}
 	};
diff --git a/pages/ratingCriteria/ratingCriteria.vue b/pages/ratingCriteria/ratingCriteria.vue
index d9922e5..47c87e3 100644
--- a/pages/ratingCriteria/ratingCriteria.vue
+++ b/pages/ratingCriteria/ratingCriteria.vue
@@ -14,14 +14,14 @@
               class="image_7"
             />
           </view>
-          <view class="justify-between group_7" @click="$msg('敬请期待')">
+          <view class="justify-between group_7" @click="$url('/packages/article/article?type=card_design')">
             <text>卡砖设计</text>
             <image
               src="https://project-user-resource-1256085488.cos.ap-guangzhou.myqcloud.com/62677e395a7e3f03107ffc5f/62677e4a35a7e10011e93a80/16509497893779891395.png"
               class="image_7"
             />
           </view>
-          <view class="justify-between group_8" @click="$msg('敬请期待')">
+          <view class="justify-between group_8" @click="$url('/packages/article/article?type=rating_standard')">
             <text>评级标准</text>
             <image
               src="https://project-user-resource-1256085488.cos.ap-guangzhou.myqcloud.com/62677e395a7e3f03107ffc5f/62677e4a35a7e10011e93a80/16509497893779891395.png"
diff --git a/service/agreementArticle.js b/service/agreementArticle.js
index 9f2efa9..d491e50 100644
--- a/service/agreementArticle.js
+++ b/service/agreementArticle.js
@@ -22,4 +22,20 @@ export async function privacyAgreement() {
 		url: '/api/v1/content/privacy_agreement',
 		method: 'post'
 	})
+}
+
+// 卡砖设计
+export async function cardDesign() {
+	return await request({
+		url: '/api/v1/content/card_design',
+		method: 'post'
+	})
+}
+
+// 评级标准
+export async function ratingStandard() {
+	return await request({
+		url: '/api/v1/content/rating_standard',
+		method: 'post'
+	})
 }
\ No newline at end of file