From ed153574a71d170f3dad5383932866cedd973950 Mon Sep 17 00:00:00 2001
From: J_yt <1592211625@qq.com>
Date: Wed, 20 Apr 2022 21:55:39 +0800
Subject: [PATCH] =?UTF-8?q?=E2=80=98=E6=B6=88=E6=81=AF=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.js                    |   3 +-
 manifest.json                |   4 +-
 pages/index/customer.vue     |   4 +-
 pages/index/index.vue        |   4 +-
 pages/index/learning.vue     |   4 +-
 pages/index/personal.vue     |   4 +-
 pages/mine/messageDetail.vue |  48 +++++++++++++-
 pages/mine/messageList.vue   | 123 ++++++++++++++++++++++++++++-------
 8 files changed, 159 insertions(+), 35 deletions(-)

diff --git a/config.js b/config.js
index cf933e3..967ba07 100644
--- a/config.js
+++ b/config.js
@@ -77,7 +77,8 @@ var config = {
 	updatePopup: `${host}/zkMessage/showMessage`,
 	//首页首次更新弹框
 	firstShowPopup: `${host}/zkMessage/firstShow`,
-	
+	//消息未读数
+	notReadNum: `${host}/zkMessage/findFlagCount`,
 	}
 };
 module.exports = config;
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 1fa64e0..8003bb7 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,5 +1,5 @@
 {
-    "name" : "去房智控管家",
+    "name" : "数智工牌",
     "appid" : "__UNI__D88F14A",
     "description" : "AI营销助理",
     "versionName" : "1.1.0",
@@ -91,7 +91,7 @@
     },
     "quickapp" : {},
     "mp-weixin" : {
-        "appid" : "wx8f883dca5ecc5510",
+        "appid" : "wxe044603515ff2cb5",
         "setting" : {
             "urlCheck" : false,
             "es6" : true,
diff --git a/pages/index/customer.vue b/pages/index/customer.vue
index 0656483..708322f 100644
--- a/pages/index/customer.vue
+++ b/pages/index/customer.vue
@@ -99,12 +99,12 @@
 			console.log(this.menulist)
 			this.init()
 			this.queryHaveDept()
-			// this.updateInit()
+			this.updateInit()
 		},
 		methods: {
 			updateInit() {
 				uni.request({
-					url: config.service.updateList,
+					url: config.service.notReadNum,
 					method: "GET",
 					data: {
 						id: uni.getStorageSync('weapp_session_userInfo_data').accountId
diff --git a/pages/index/index.vue b/pages/index/index.vue
index e3e8f7a..ba5048a 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -335,7 +335,7 @@
 			}
 			this.initworkThisWeek()
 			this.initrealTimeStatistics()
-			// this.updateInit()
+			this.updateInit()
 		},
 		onPullDownRefresh() {
 			this.getMenu()
@@ -439,7 +439,7 @@
 			},
 			updateInit() {
 				uni.request({
-					url: config.service.updateList,
+					url: config.service.notReadNum,
 					method: "GET",
 					data: {
 						id: uni.getStorageSync('weapp_session_userInfo_data').accountId
diff --git a/pages/index/learning.vue b/pages/index/learning.vue
index 6fbed04..eddf962 100644
--- a/pages/index/learning.vue
+++ b/pages/index/learning.vue
@@ -80,7 +80,7 @@
 			this.buildingID=uni.getStorageSync('buildingID').id;
 			this.clocktab(i)
 			
-			// this.updateInit()
+			this.updateInit()
     },
 	onPullDownRefresh() {
 		var i=uni.getStorageSync('fendianindex')
@@ -92,7 +92,7 @@
     methods: {
 		updateInit() {
 			uni.request({
-				url: config.service.updateList,
+				url: config.service.notReadNum,
 				method: "GET",
 				data: {
 					id: uni.getStorageSync('weapp_session_userInfo_data').accountId
diff --git a/pages/index/personal.vue b/pages/index/personal.vue
index fdfc76e..4326c07 100644
--- a/pages/index/personal.vue
+++ b/pages/index/personal.vue
@@ -114,12 +114,12 @@
 			this.name = userInfos.name,
 			this.photo = userInfos.picUrl,
 			this.mobile = userInfos.loginName
-			// this.updateInit()
+			this.updateInit()
 		},
 		methods: {
 			updateInit() {
 				uni.request({
-					url: config.service.updateList,
+					url: config.service.notReadNum,
 					method: "GET",
 					data: {
 						id: uni.getStorageSync('weapp_session_userInfo_data').accountId
diff --git a/pages/mine/messageDetail.vue b/pages/mine/messageDetail.vue
index fdb794e..cfabcbf 100644
--- a/pages/mine/messageDetail.vue
+++ b/pages/mine/messageDetail.vue
@@ -12,7 +12,7 @@
 	
 	var util = require("../../utils/util.js");
 	var config = require("../../config");
-	import uParse from '../../components/gaoyia-parse/parse.vue'
+	import uParse from '@/components/gaoyia-parse/parse.vue'
 	export default {
 		data() {
 			return {
@@ -47,7 +47,7 @@
 				console.log(href,111)
 			    //比如点击a标签，打开某个传输url 
 			     uni.navigateTo({ 
-			        url: href
+			        url: href,
 			     }) 
 			},
 			read(){
@@ -81,6 +81,49 @@
 			    text-align: center;
 			    margin-bottom: 16rpx;
 		}
+	}  
+	.ql-editor{
+		    font-size: 32rpx;
+		.strong {
+			font-weight: bold;
+		}
+		.ol{
+			padding-left: 16rpx;
+			.li{
+				font-size: 34rpx;
+				&::before{
+					content: "·";
+					font-size: 34rpx;
+				}
+			}
+		}
+		.ql-indent-1{
+			text-indent: 10px;
+		}
+		.h1{
+			font-size: 5em;
+		}
+		.h2{
+			font-size: 4em;
+		}
+		.h3{
+			font-size: 3em;
+		}
+		.h4{
+			font-size: 2em;
+		}
+		.h4{
+			font-size: 1em;
+		}
+		.em{
+			font-style: italic
+		}
+		.u{
+			text-decoration:underline
+		}
+		.blockquote{
+			text-decoration: line-through;
+		}
 	}
 .ql-container {
   box-sizing: border-box;
@@ -90,6 +133,7 @@
   margin: 0px;
   position: relative;
 }
+
 .ql-editor h1 {
   font-size: 2em;
 }
diff --git a/pages/mine/messageList.vue b/pages/mine/messageList.vue
index aeb7ab4..ee74eb5 100644
--- a/pages/mine/messageList.vue
+++ b/pages/mine/messageList.vue
@@ -3,26 +3,31 @@
 		<!-- <u-tabs :list="list" :show-bar="false" :is-scroll="false" :current="current" @change="change"></u-tabs> -->
 		<view class="listMain">
 			<view class="upgradeList">
-				<block v-if="updateAnnList.length!=0">
-					<block v-for="(item,index) in updateAnnList" :key="index">
-						<view class="upgradeItem" @click="goDetail(item.content,item.id,item.title)">
-							<view class="notRead">
-								<view v-if="item.readFlag==0" class="red"></view>
-							</view>
-							<view class="right">
-								<view class="title">{{item.title}}</view>
-								<view class="time">{{item.createTime}}</view>
+				<scroll-view :scroll-top="scrollTop" refresher-enabled="true" :refresher-triggered="triggered"
+					@refresherpulling="onPulling" @refresherrefresh="onRefresh" @refresherrestore="onRestore"
+					:scroll-y="true" class="scroll-Y" @scrolltolower="lower">
+					<block v-if="updateAnnList.length!=0">
+						<block v-for="(item,index) in updateAnnList" :key="index">
+							<view class="upgradeItem" @click="goDetail(item.content,item.id,item.title)">
+								<view class="notRead">
+									<view v-if="item.readFlag==0" class="red"></view>
+								</view>
+								<view class="right">
+									<view class="title">{{item.title}}</view>
+									<view class="time">{{item.createTime}}</view>
+								</view>
 							</view>
+						</block>
+					</block>
+					<block v-else>
+						<view style="    padding: 100rpx 0;">
+							<u-empty text="暂无数据" mode="list"></u-empty>
 						</view>
 					</block>
-				</block>
-				<block v-else>
-					<view style="    padding: 100rpx 0;">
-						<u-empty text="暂无数据" mode="list"></u-empty>
-					</view>
-				</block>
+				</scroll-view>
+
 			</view>
-			
+
 			<!-- <view class="systemList" v-if="current==0">
 				<block v-if="sysItemList.length!=0">
 					<block v-for="(item,index) in sysItemList" :key="index">
@@ -80,6 +85,11 @@
 	export default {
 		data() {
 			return {
+				triggered: true,
+				scrollTop: 0,
+				old: {
+					scrollTop: 0
+				},
 				updateAnnList: [],
 				sysItemList: [],
 				list: [{
@@ -88,34 +98,97 @@
 					name: `升级公告`,
 					count: "",
 				}],
-				current: 0
+				current: 0,
+				pageNum: 1,
+				pageSize: 10,
 			};
 		},
 		onShow() {
+			this.updateAnnList = []
+			this.pageNum = 1
+			this.updateInit()
+		},
+		onLoad() {
+			this._freshing = false;
+			setTimeout(() => {
+				this.triggered = true;
+			}, 1000)
+		},
+		onPullDownRefresh() {
 			this.updateInit()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
 		},
+		// onReachBottom(){
+		// 	this.pageNum++
+		// 	this.updateInit()
+		// },
 		methods: {
+			onPulling(e) {
+				console.log("onpulling", e);
+			},
+			onRefresh() {
+				if (this._freshing) return;
+
+				this.updateInit()
+				this._freshing = true;
+				setTimeout(() => {
+					this.triggered = false;
+					this._freshing = false;
+				}, 3000)
+			},
+			onRestore() {
+				this.triggered = 'restore'; // 需要重置
+				console.log("onRestore");
+			},
+			// uppers(e) {
+			// 	this.pageNum = 1
+			// 	this.updateInit()
+			// },
+			lower(e) {
+				this.pageNum++
+				this.updateInit()
+			}, 
 			updateInit() {
 				uni.request({
 					url: config.service.updateList,
 					method: "GET",
 					data: {
-						id: uni.getStorageSync('weapp_session_userInfo_data').accountId
+						id: uni.getStorageSync('weapp_session_userInfo_data').accountId,
+						num: this.pageNum,
+						size: this.pageSize
 					},
 					header: {
 						'content-type': 'application/json',
 						'Access-Token': uni.getStorageSync('weapp_session_login_data').token
 					},
 					success: (res) => {
-						this.updateAnnList = res.data.data.list
-						this.list[1].count = res.data.data.count
+						// this.updateAnnList = res.data.data.list.results
+						if (res.data.data != null) {
+							this.list[1].count = res.data.data.count
+						}
+						if (res.data.data == null) {
+							console.log(11)
+							uni.showToast({
+								title: '已经到底了！',
+								duration: 2000
+							});
+						} else {
+							if(this.pageNum!=1){
+								this.updateAnnList = [...this.updateAnnList, ...res.data.data.list.results];
+							}else{
+								this.updateAnnList = res.data.data.list.results
+							}
+						}
+
 					}
 				})
 			},
-			goDetail(text, id,title) {
+			goDetail(text, id, title) {
 				let link = encodeURIComponent(JSON.stringify(text))
 				uni.navigateTo({
-					url: "./messageDetail?content=" + link + "&id=" + id+"&tit="+title
+					url: "./messageDetail?content=" + link + "&id=" + id + "&tit=" + title
 				})
 			},
 			change(index) {
@@ -129,6 +202,12 @@
 </script>
 
 <style lang="scss">
+	.scroll-Y {
+		height: 100%;
+		width: 100%;
+		position: fixed;
+	}
+
 	.message_list {
 		.u-tab-item {
 			border: 0.5rpx solid #dedede;