From 127cd4a533c91982553a1b6b027c12c993e4d564 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Wed, 11 Jan 2023 16:07:27 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=962.0=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Utils/Api.js             |  4 +--
 pages/user/news/news.vue | 66 ++++++++++++++++++++++++++++------------
 2 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/Utils/Api.js b/Utils/Api.js
index 5365596..bb2d990 100644
--- a/Utils/Api.js
+++ b/Utils/Api.js
@@ -171,8 +171,8 @@ export const getDiscountByCode = params => {
 
 
 //站内信列表
-export const queryMsgByList = params => {
-	return POST('GET', `${base}/bsMsg/queryMsgByList`, params).then(res => res.data);
+export const getMsgByList = params => {
+	return POST('GET', `${base}//bsMsg/getMsgByList`, params).then(res => res.data);
 }
 // 根据优惠券查卡券
 export const getCouponByDiscount = params => {
diff --git a/pages/user/news/news.vue b/pages/user/news/news.vue
index 30ae517..7821e81 100644
--- a/pages/user/news/news.vue
+++ b/pages/user/news/news.vue
@@ -3,14 +3,14 @@
 		<!-- 顶部类型 -->
 		<scroll-view scroll-x='true' class="srollview width100" :style="{top:headerTop}" scroll-with-animation>
 			<view class="conent" :class="[newstypeid == item.codeValue ? 'activeconent' : 'frontconent']"
-				v-for="(item,index) in newsTyplist" :key="index" @click="queryMsgByList(item.codeValue)">
-				{{item.codeName}}</view>
+				v-for="(item,index) in newsTyplist" :key="index" @click="changeValue(item.codeValue)">
+				{{item.codeName}}
+			</view>
 		</scroll-view>
 		<view class="mart10 height70"></view>
 		<!-- 内容 -->
-		
-		<view v-if="newsList == ''"
-			class="mart60 fotct font14 fcor666">
+
+		<view v-if="newsList == ''" class="mart60 fotct font14 fcor666">
 			<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
 		</view>
 		<view class="newscont width90 border-8r backcorfff mart20" v-for="(item,index) in newsList" :key="index">
@@ -35,7 +35,7 @@
 
 			<!-- 交易信息 -->
 			<view class="width90 mart20" v-if="item.type == 2">
-				<view class="font18 fcor333" >{{item.title}}</view>
+				<view class="font18 fcor333">{{item.title}}</view>
 				<view class="mart10 border-r backcor9">
 					<view class="font20 colore95 fontwig6 paddtop10 fotct">¥{{item.content | msgFormat('price')}}</view>
 					<view class="width94 mart10 alijusstart font14">
@@ -73,7 +73,7 @@
 
 <script>
 	import {
-		queryMsgByList,
+		getMsgByList,
 		getDictionaryByCodeType
 	} from '../../../Utils/Api.js';
 	let app = getApp();
@@ -86,13 +86,16 @@
 				newsTyplist: [], //消息类型
 				newsList: [], // 信内容
 				newstypeid: 1, //类型id
-				headerTop: '0px'
+				headerTop: '0px',
+				pageNum: 1,
+				pageSize: 10,
+				isNoMoreData: false,
 			}
 		},
 		filters: {
 			//过滤器 用于格式化时间
-			msgFormat: function(value,value1) {
-				let a  = JSON.parse(value);
+			msgFormat: function(value, value1) {
+				let a = JSON.parse(value);
 				return a[value1];
 			}
 		},
@@ -100,9 +103,12 @@
 			// #ifdef H5
 			this.headerTop = '44px';
 			// #endif
-		},
-		onShow() {
-			this.getDictionaryByCodeType();
+		},
+		onShow() {
+			this.getDictionaryByCodeType();
+		},
+		onReachBottom() {
+			this.getMsgByList();
 		},
 		methods: {
 			//查询类型
@@ -114,21 +120,41 @@
 					if (res.return_code == '000000') {
 						this.newsTyplist = res.return_data;
 						this.newstypeid = res.return_data[0].codeValue;
-						this.queryMsgByList(res.return_data[0].codeValue);
+						this.getMsgByList(res.return_data[0].codeValue);
 					}
 				})
 			},
+			//切换
+			changeValue(item) {
+				this.pageNum = 1;
+				this.newsList = [];
+				this.isNoMoreData = false;
+				this.getMsgByList(item);
+			},
 			//查询列表
-			queryMsgByList(item) {
+			getMsgByList(item) {
 				this.newstypeid = item;
+				if (this.isNoMoreData) {
+					uni.hideLoading()
+					return false;
+				}
+				let pagenum = this.pageNum;
 				let datas = {
 					companyId: app.globalData.companyId,
-					type: item
+					type: item,
+					pageNum: this.pageNum,
+					pageSize: this.pageSize
 				}
-				queryMsgByList(datas).then(res => {
-					if (res.return_code == '000000' && res.return_data) {
-						this.newsList = res.return_data;
-					}else{
+				getMsgByList(datas).then(res => {
+					if (res.return_code == '000000' && res.return_data.list != '') {
+						this.newsList = res.return_data.list;
+						this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true;
+						if (res.return_data.total == (this.pageNum * this.pageSize)) {
+							this.isNoMoreData = true;
+						}
+						this.newsList = this.newsList.concat(res.return_data.list);
+						this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
+					} else {
 						this.newsList = [];
 					}
 				})