From e6f70da676e817329fc58047edf898e2b101bc77 Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Thu, 24 Nov 2022 15:58:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/my/myArticles.vue | 18 ++++++++++++++----
 pages/my/myMedal.vue    | 14 ++++++++------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/pages/my/myArticles.vue b/pages/my/myArticles.vue
index f336605..ee8f49a 100644
--- a/pages/my/myArticles.vue
+++ b/pages/my/myArticles.vue
@@ -50,6 +50,9 @@
 			<!-- <view v-show="statusSelectShow" class="sea-show">
 				<text :class="[articleList.status == status.value? 'sea-active':'','sea-index']" v-for="(status,index) in selectData" :key="index" @click="chooseStatus(status)">{{status.label}}</text>
 			</view> -->
+			<view v-if="articleList.list.length == 0 && loadStatus == 'noMore'" style="text-align: center;margin-top: 100upx;color: #666;">
+				暂未搜索到内容
+			</view>
 			<view style="padding-top: 14upx;">
 				<!-- 文章内容 下面需要把样式提到class中-->
 				<view class="article_one" v-for="(item, index) of articleList.list" :key="item.id">
@@ -167,6 +170,7 @@ export default {
 				uni.hideLoading();
 				if (rs.status == 200) {
 					this.articleList.count = rs.result.count;
+				
 					if (rs.result.list.length != 0) {
 						let userIds = [];
 						rs.result.list.forEach(item => {
@@ -180,11 +184,17 @@ export default {
 							userIds.push(item.sysCreateAid);
 						});
 						await this.loadUserInfos(rs.result.list, userIds);
+						if (this.articleList.list.length < this.articleList.count) {
+							this.loadStatus = 'more';
+						} else {
+							this.loadStatus = 'noMore';
+						}
 					}else{
-						uni.showToast({
-							title: '查无数据',
-							icon: 'none'
-						});
+						this.loadStatus = 'noMore';
+						// uni.showToast({
+						// 	title: '查无数据',
+						// 	icon: 'none'
+						// });
 					}
 				}
 				// uni.hideLoading();
diff --git a/pages/my/myMedal.vue b/pages/my/myMedal.vue
index 3250dbb..340298e 100644
--- a/pages/my/myMedal.vue
+++ b/pages/my/myMedal.vue
@@ -51,14 +51,14 @@
 					 <view class="" style="height: 50upx;">
 					 	<image v-if="showLevel== index+1" style="width:32upx;height:16upx" src="../../static/images/triangle.png" mode=""></image>
 					 </view>
-					 <view  class="medal-img-index">
+					 <view  class="medal-img-index" @click="tabQu(ru,index+1)">
 					 	<image v-if="index+1 < medalData.medalLevel || index+1 == medalData.medalLevel" style="width:104upx;height:120upx" :src="fileBaseUrl+rulesData.icon" mode=""></image>
-						<image @click="tabQu(ru)"  v-else style="width:104upx;height:120upx" :src="fileBaseUrl+rulesData.iconGrey" mode=""></image>
+						<image v-else style="width:104upx;height:120upx" :src="fileBaseUrl+rulesData.iconGrey" mode=""></image>
 						<text  v-if="index+1 < medalData.medalLevel || index+1 == medalData.medalLevel" class="img-name">{{medalData.medalName}} </text>
 						<text class="img-level">LV.{{index+1}}</text>
 					 </view>
 					 <text v-if="index+1 < medalData.medalLevel || index+1 == medalData.medalLevel" style="color: #387DF7;font-size: 24upx;">LV.{{index+1}}</text>
-					<text v-else @click="tabQu(ru)"  style="color: color: #666666;font-size: 24upx;">LV.{{index+1}}</text>
+					<text v-else  style="color: color: #666666;font-size: 24upx;">LV.{{index+1}}</text>
 			   	 </view>
 			   </view>
 		    </view>
@@ -91,9 +91,11 @@
 			this.getConfig();
 		},
 		methods:{
-			tabQu(ru) {
-				this.medalData.requirement = ru.remark;
-				this.showLevel = ru.level;
+			tabQu(ru,index) {
+				if(index == this.medalData.medalLevel || index > this.medalData.medalLevel) {
+					this.medalData.requirement = ru.remark;
+					this.showLevel = ru.level;
+				}
 			},
 			back(){
 			 uni.navigateBack();