From 85847171d4ee86c9ea7f0660445868fb6f822f12 Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Fri, 14 Jan 2022 16:42:54 +0800
Subject: [PATCH] ...

---
 pages/essentialInfo/index.vue  |   3 +-
 pages/evaluation/index.vue     |   6 +-
 pages/evaluation/introduce.vue |   2 +-
 pages/evaluation/list.vue      | 348 +++++++++++++++------------------
 4 files changed, 169 insertions(+), 190 deletions(-)

diff --git a/pages/essentialInfo/index.vue b/pages/essentialInfo/index.vue
index fb2c96d..159f379 100644
--- a/pages/essentialInfo/index.vue
+++ b/pages/essentialInfo/index.vue
@@ -23,6 +23,7 @@
 				<u-line-progress :percentage="percentplan3" activeColor="#34ce98" width="200rpx" class="line-progress" :showText="false" />
 			</view>
 		</view>
+		
 		<!-- 进度1 基本信息 -->
 		<view>
 			<!-- 进度1 基本信息页面展示 性别 -->
@@ -84,6 +85,7 @@
 				</view>
 			</view>
 		</view>
+		
 		<!-- 进度2 健康目标 -->
 		<view>
 			<!-- 减脂类型 -->
@@ -154,7 +156,6 @@
 		</view>
 
 		<!-- 进度3 行为习惯 -->
-
 		<!-- 减脂类型 -->
 		<view v-if="behaviorShow" class="plan-content target-content">
 			<u-image class="sex-item-avatar" width="100rpx" height="100rpx" :src="require('../../static/imgs/avatar-1.png')" :lazy-load="true" shape="circle" />
diff --git a/pages/evaluation/index.vue b/pages/evaluation/index.vue
index 0fd3658..e97b152 100644
--- a/pages/evaluation/index.vue
+++ b/pages/evaluation/index.vue
@@ -99,7 +99,7 @@ export default {
 				this.page = this.page + 1;
 				this.getList();
 			} else {
-				if(this.option_ids.length !== this.page){
+				if (this.option_ids.length !== this.page) {
 					this.option_ids.push(this.currentId);
 					this.currentId = '';
 				}
@@ -124,8 +124,8 @@ export default {
 					})
 					.catch(err => {
 						uni.showToast({
-							title:err.message
-						})
+							title: err.message
+						});
 					});
 			}
 		}
diff --git a/pages/evaluation/introduce.vue b/pages/evaluation/introduce.vue
index a0a0805..8850f9d 100644
--- a/pages/evaluation/introduce.vue
+++ b/pages/evaluation/introduce.vue
@@ -52,7 +52,7 @@ export default {
 			});
 		},
 		toResult() {
-			console.log('点击了测试')
+			console.log('点击了测试');
 			uni.navigateTo({
 				url: `/pages/evaluation/result?id=${this.$Route.query.id}`
 			});
diff --git a/pages/evaluation/list.vue b/pages/evaluation/list.vue
index f0fe424..c2a4daa 100644
--- a/pages/evaluation/list.vue
+++ b/pages/evaluation/list.vue
@@ -6,205 +6,183 @@
  * @LastEditTime: 2022-01-14 08:40:36
 -->
 <template>
-    <view class="evaluation-list ">
-        <view
-            class="evaluation-item"
-            v-for="(item,index) in evalList"
-            :key="index"
-        >
-            <!-- 评测列表主要内容 标题 图片 描述 -->
-            <view class="--content">
-                <u-image
-                    class="content-img"
-                    width="170rpx"
-                    height="170rpx"
-                    radius="20rpx"
-                    :src="item.cover?item.cover:require('../../static/imgs/test.png')"
-                    :lazy-load="true"
-                />
-                <view class="title-des">
-                    <view class="title">{{item.title}}</view>
-                    <view class="des">{{item.description  || '--'}}</view>
-                </view>
-            </view>
+	<view class="evaluation-list ">
+		<view class="evaluation-item" v-for="(item, index) in evalList" :key="index">
+			<!-- 评测列表主要内容 标题 图片 描述 -->
+			<view class="--content">
+				<u-image class="content-img" width="170rpx" height="170rpx" radius="20rpx" :src="item.cover ? item.cover : require('../../static/imgs/test.png')" :lazy-load="true" />
+				<view class="title-des">
+					<view class="title">{{ item.title }}</view>
+					<view class="des">{{ item.description || '--' }}</view>
+				</view>
+			</view>
 
-            <!-- 分数 -->
-            <view
-                class="score"
-                v-if="item.is_answer"
-            ><span>{{item.answer.total}}</span>分</view>
+			<!-- 分数 -->
+			<view class="score" v-if="item.is_answer">
+				<span>{{ item.answer.total }}</span>
+				分
+			</view>
 
-            <!-- 评测状态 -->
-            <view class="--status">
-                <!-- 已测试展示 状态-->
-                <view
-                    class="status"
-                    v-if="item.is_answer"
-                >
-                    <span class="dian">·</span>{{item.remark}}
-                </view>
-                <view
-                    v-if="item.is_answer"
-                    class="history"
-                    @click="toResult(item)"
-                >
-                    查看历史结果
-                </view>
-                <!-- 未测试展示 状态-->
-                <view
-                    class="status"
-                    v-if="!item.is_answer"
-                >
-                    <span class="dian">·</span>
-                    <span class="person">{{item.remark}}</span>
-                    人已测 | 约4~8分钟
-                </view>
-                <u-icon
-                    name="arrow-right"
-                    :color="item.is_answer?'#26a377':'#faa81a'"
-                    size="14"
-                    :bold="true"
-                    :label="item.is_answer?'重新评测':'开始测评'"
-                    labelPos="left"
-                    labelSize="14"
-                    space="1"
-                    :labelColor="item.is_answer?'#26a377':'#faa81a'"
-                    @click="nowEva(item)"
-                />
-            </view>
-        </view>
-        <!-- 没有更多 -->
-        <view class="no-more">没有更多~</view>
-    </view>
+			<!-- 评测状态 -->
+			<view class="--status">
+				<!-- 已测试展示 状态-->
+				<view class="status" v-if="item.is_answer">
+					<span class="dian">·</span>
+					{{ item.remark }}
+				</view>
+				<view v-if="item.is_answer" class="history" @click="toResult(item)">查看历史结果</view>
+				<!-- 未测试展示 状态-->
+				<view class="status" v-if="!item.is_answer">
+					<span class="dian">·</span>
+					<span class="person">{{ item.remark }}</span>
+					人已测 | 约4~8分钟
+				</view>
+				<u-icon
+					name="arrow-right"
+					:color="item.is_answer ? '#26a377' : '#faa81a'"
+					size="14"
+					:bold="true"
+					:label="item.is_answer ? '重新评测' : '开始测评'"
+					labelPos="left"
+					labelSize="14"
+					space="1"
+					:labelColor="item.is_answer ? '#26a377' : '#faa81a'"
+					@click="nowEva(item)"
+				/>
+			</view>
+		</view>
+		<!-- 没有更多 -->
+		<view class="no-more">没有更多~</view>
+	</view>
 </template>
 
 <script>
-import { evaluations } from "@/apis/interfaces/evaluation.js";
+import { evaluations } from '@/apis/interfaces/evaluation.js';
 export default {
-    data() {
-        return {
-            evalList: [],
-        };
-    },
-    onShow() {
-        this.getList();
-    },
-    methods: {
-        // 测试列表
-        getList() {
-            evaluations().then((res) => {
-                this.evalList = res;
-            });
-        },
-        // nowEva
-        nowEva(item) {
-            uni.navigateTo({
-                url: `/pages/evaluation/introduce?id=${item.evaluation_id}`,
-            });
-        },
-        //测评结果
-        toResult(item) {
-            uni.navigateTo({
-                url: `/pages/evaluation/result?id=${item.evaluation_id}`,
-            });
-        },
-    },
+	data() {
+		return {
+			evalList: []
+		};
+	},
+	onShow() {
+		this.getList();
+	},
+	methods: {
+		// 测试列表
+		getList() {
+			evaluations().then(res => {
+				this.evalList = res;
+			});
+		},
+		// nowEva
+		nowEva(item) {
+			uni.navigateTo({
+				url: `/pages/evaluation/introduce?id=${item.evaluation_id}`
+			});
+		},
+		//测评结果
+		toResult(item) {
+			uni.navigateTo({
+				url: `/pages/evaluation/result?id=${item.evaluation_id}`
+			});
+		}
+	}
 };
 </script>
 
 <style lang="scss" scoped>
 // 列表
 .evaluation-item {
-    background-color: #fff;
-    padding: $padding;
-    margin: $margin;
-    box-shadow: 0 0 10rpx 4rpx rgba($color: $main-color, $alpha: 0.1);
-    border-radius: $radius;
-    position: relative;
-    // 评测列表主要内容
-    .--content {
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        justify-content: flex-start;
-        box-sizing: border-box;
-        .content-img {
-            box-shadow: 0 0 10rpx 4rpx rgba($color: $main-color, $alpha: 0.1);
-            border-radius: 30rpx;
-        }
-        .title-des {
-            padding-left: $padding - 10;
-            width: 440rpx;
-            .title {
-                font-size: $title-size + 4;
-                font-weight: bold;
-                overflow: hidden;
-                text-overflow: ellipsis;
-                white-space: nowrap;
-                width: 340rpx;
-            }
-            .des {
-                font-size: $title-size-lg;
-                color: $text-gray;
-                overflow: hidden;
-                text-overflow: ellipsis;
-                white-space: nowrap;
-                padding-top: $padding - 8;
-            }
-        }
-    }
-    // .测试状态
-    .--status {
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        justify-content: space-between;
-        box-sizing: border-box;
-        color: $text-gray-m;
-        font-size: $title-size-m;
-        padding-top: $padding;
-        .status {
-            display: flex;
-            flex-direction: row;
-            align-items: center;
-            justify-content: center;
-            box-sizing: border-box;
-            .dian {
-                font-size: $title-size-lg;
-                margin-right: $padding * 0.2;
-                font-weight: bold;
-            }
-            .person {
-                color: #faa81a;
-            }
-        }
-        .history {
-            text-decoration: underline;
-        }
-    }
-    // 分数
-    .score {
-        font-size: $title-size-m - 2;
-        color: $text-gray-m;
-        position: absolute;
-        right: $padding;
-        top: $padding - 10;
-        span {
-            font-size: 50rpx;
-            color: $main-color;
-            font-weight: bold;
-        }
-    }
+	background-color: #fff;
+	padding: $padding;
+	margin: $margin;
+	box-shadow: 0 0 10rpx 4rpx rgba($color: $main-color, $alpha: 0.1);
+	border-radius: $radius;
+	position: relative;
+	// 评测列表主要内容
+	.--content {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: flex-start;
+		box-sizing: border-box;
+		.content-img {
+			box-shadow: 0 0 10rpx 4rpx rgba($color: $main-color, $alpha: 0.1);
+			border-radius: 30rpx;
+		}
+		.title-des {
+			padding-left: $padding - 10;
+			width: 440rpx;
+			.title {
+				font-size: $title-size + 4;
+				font-weight: bold;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				width: 340rpx;
+			}
+			.des {
+				font-size: $title-size-lg;
+				color: $text-gray;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				padding-top: $padding - 8;
+			}
+		}
+	}
+	// .测试状态
+	.--status {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		box-sizing: border-box;
+		color: $text-gray-m;
+		font-size: $title-size-m;
+		padding-top: $padding;
+		.status {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: center;
+			box-sizing: border-box;
+			.dian {
+				font-size: $title-size-lg;
+				margin-right: $padding * 0.2;
+				font-weight: bold;
+			}
+			.person {
+				color: #faa81a;
+			}
+		}
+		.history {
+			text-decoration: underline;
+		}
+	}
+	// 分数
+	.score {
+		font-size: $title-size-m - 2;
+		color: $text-gray-m;
+		position: absolute;
+		right: $padding;
+		top: $padding - 10;
+		span {
+			font-size: 50rpx;
+			color: $main-color;
+			font-weight: bold;
+		}
+	}
 }
 // 没有更多
 .no-more {
-    color: $uni-text-color-disable;
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: center;
-    box-sizing: border-box;
-    padding: $padding;
-    font-size: $title-size-m;
+	color: $uni-text-color-disable;
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	justify-content: center;
+	box-sizing: border-box;
+	padding: $padding;
+	font-size: $title-size-m;
 }
 </style>