fix

virgo.wzfrontend/yui_wx/App.vue

@@ -12,7 +12,6 @@
 			}
 			if (this.$store.getters.user.userId) this.$chat.connect(this.$store.getters.user.userId);
 			uni.$YeIM.intoApp();
-			this.$chat.listenerList();
 		},
 		// 在页面的onHide生命周期中
 		onHide() {

virgo.wzfrontend/yui_wx/config/index.js

@@ -1,5 +1,4 @@
 export default {
 	baseUrl: 'https://www.waywish.com',
-	imBaseUrl: 'https://www.waywish.com/im',
 	socketURL: 'wss://www.waywish.com/im/im'
 }

virgo.wzfrontend/yui_wx/pages.json

@@ -190,20 +190,31 @@
 		"style": {
 			"navigationBarTitleText": "发票详情"
 		}
-	},
-	{
-		"path" : "pages/billRecord/billRecord",
-		"style" : 
-		{
-			"navigationBarTitleText" : "账单付款"
-		}
-	},
-	{
-		"path" : "pages/billInvoice/billInvoice",
-		"style" : 
-		{
-			"navigationBarTitleText" : "账单发票"
-		}
+	}, {
+		"path": "pages/billRecord/billRecord",
+		"style": {
+			"navigationBarTitleText": "账单付款"
+		}
+	}, {
+		"path": "pages/billInvoice/billInvoice",
+		"style": {
+			"navigationBarTitleText": "账单发票"
+		}
+	}, {
+		"path": "pages/messageSystem/messageSystem",
+		"style": {
+			"navigationBarTitleText": "系统通知"
+		}
+	}, {
+		"path": "pages/messageList/messageList",
+		"style": {
+			"navigationBarTitleText": "通知列表"
+		}
+	}, {
+		"path": "pages/messageDetail/messageDetail",
+		"style": {
+			"navigationBarTitleText": "通知详情"
+		}
 	}],
 	"tabBar": {
 		"color": "#8c8c8c",

virgo.wzfrontend/yui_wx/pages/chat/chat.vue

@@ -67,6 +67,7 @@
 			});
 			this.nowUserId = this.$store.getters.user.userId;
 			this.userId = body.userId;
+			console.log(this.userId);
 			this.getHistoryMsg();
 		},
 		onPageScroll(e) {
@@ -190,7 +191,8 @@
 			// 发送信息
 			send() {
 				if (!this.message) return this.$toast('内容不能为空');
-				this.$chat.sendText(this.userId, this.message, this.sendSuccess);
+				// this.$chat.sendText(this.userId, this.message, this.sendSuccess);
+				this.$chat.sendSystemMessage();
 			},
 			sendSuccess(res) {
 				this.chatList.push(res.data);

virgo.wzfrontend/yui_wx/pages/message/message.vue

@@ -1,7 +1,20 @@
 <template>
 	<view class="message">
-		<mescroll-empty :option="option" v-if="chatList.length === 0" @emptyclick="$navigateTo('/pages/login/login')"
-			:key="reloadMecroll">
+		<view class="message-system" @click="$navigateTo('/pages/messageSystem/messageSystem')">
+			<uni-badge class="uni-badge-left-margin" :text="systemCount" absolute="rightTop" size="small">
+				<view class="message-system-icon">
+					<uni-icons type="email-filled" size="30" color="#fff"></uni-icons>
+				</view>
+			</uni-badge>
+			<view class="message-content">
+				<view class="message-title">系统通知</view>
+				<view class="message-sub-content">
+					{{systemCount === 0 ?'暂无消息通知' : `您有${systemCount}条未读消息，请点击查看～`}}
+				</view>
+			</view>
+		</view>
+		<view class="message-titles">即时会话</view>
+		<mescroll-empty :option="option" v-if="chatList.length === 0" @emptyclick="$navigateTo('/pages/login/login')">
 		</mescroll-empty>
 		<view class="message-list" v-else>
 			<!-- 消息提示 -->
@@ -17,7 +30,8 @@
 					</view>
 				</view>
 				<view class="message-date">
-					<uni-dateformat class="visitor-time" :date="item.updatedAt" :threshold="[60000,3600000 * 24 * 365]">
+					<uni-dateformat class="visitor-time" :date="item.updatedAt || item.createdAt"
+						:threshold="[60000,3600000 * 24 * 365]">
 					</uni-dateformat>
 				</view>
 			</view>
@@ -30,26 +44,34 @@
 		YeIMUniSDK,
 		YeIMUniSDKDefines
 	} from '@/uni_modules/wzJun1-YeIM-Uni-SDK/js_sdk/yeim-uni-sdk.min.js'
+	import {
+		getMessageTest
+	} from '@/request/api/message.js'
 	export default {
 		data() {
 			return {
 				chatList: [],
 				option: {
-					tip: '暂无消息'
+					tip: '暂无会话'
 				},
-				reloadMecroll: false
+				systemCount: 0,
+				systemDate: ''
 			}
 		},
 		onLoad() {
-			if (uni.getStorageSync('token')) {
-				this.$chat.getConversationList(res => {
+			uni.$on('changeChatList', (list) => {
+				this.chatList = list.filter(node => node.conversationId !== 'system');
+				// this.$store.getters.user.userId
+				getMessageTest(3).then(res => {
 					if (res.code == 200) {
-						this.chatList = res.data;
+						this.systemCount = res.data.length;
+						this.unread();
 					}
-				})
-			}
+				});
+			})
 		},
 		onShow() {
+			console.log('on show');
 			if (!uni.getStorageSync('token')) {
 				this.chatList = [];
 				this.option = {
@@ -58,18 +80,44 @@
 				}
 			} else {
 				this.option = {
-					tip: '暂无消息'
+					tip: '暂无会话'
 				}
-				uni.$on('changeChatList', (res) => {
-					this.chatList = res;
-				})
+				this.$chat.listenerList();
+				this.init();
 			}
-			this.reloadMecroll = !this.reloadMecroll;
 		},
 		methods: {
+			init() {
+				this.$chat.getConversationList((data) => {
+					this.chatList = data.data.filter(node => node.conversationId !== 'system');
+					getMessageTest(3).then(res => {
+						if (res.code == 200) {
+							this.systemCount = res.data.length;
+							this.unread();
+						}
+					});
+				});
+			},
 			linkTo(item) {
 				this.$chat.clearConversationUnread(item.conversationId);
 				this.$navigateTo('/pages/chat/chat?userId=' + item.conversationId + '&userName=' + item.userInfo.nickname)
+			},
+			unread() {
+				let badge = this.systemCount;
+				let list = this.chatList;
+				for (let i = 0; i < list.length; i++) {
+					badge += list[i].unread
+				}
+				if (!badge) {
+					uni.removeTabBarBadge({
+						index: 1
+					})
+				} else {
+					uni.setTabBarBadge({
+						index: 1,
+						text: String(badge)
+					})
+				}
 			}
 		}
 	}
@@ -77,9 +125,56 @@
 
 <style lang="scss">
 	.message {
-		.message-list {
-			margin-top: 20rpx;
+		.message-system {
+			background: #fff;
+			display: flex;
+			padding: 24rpx 30rpx;
+			position: relative;
+			margin-top: 30rpx;
 
+			.message-image {
+				width: 100rpx;
+				height: 100rpx;
+				border-radius: 16rpx;
+				overflow: hidden;
+			}
+
+			.message-content {
+				flex: 1;
+				width: 0;
+				margin-left: 20rpx;
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+			}
+
+			.message-title {
+				font-size: 32rpx;
+				font-weight: 600;
+				margin-bottom: 10rpx;
+			}
+
+			.message-sub-content {
+				font-weight: 300;
+				color: $uni-secondary-color;
+			}
+
+			.message-system-icon {
+				width: 100rpx;
+				height: 100rpx;
+				border-radius: 16rpx;
+				text-align: center;
+				line-height: 100rpx;
+				background: $uni-primary;
+			}
+		}
+
+		.message-titles {
+			font-weight: 300;
+			padding: 30rpx 30rpx 10rpx 30rpx;
+		}
+
+		.message-list {
 			.message-item {
 				background: #fff;
 				display: flex;

virgo.wzfrontend/yui_wx/pages/messageDetail/messageDetail.vue

@@ -0,0 +1,160 @@
+<template>
+	<view class="message-detail-index">
+		<view class="message-detail-content">
+			<text v-if="detail.id">{{detail.sendUserName}}{{detail.message}}</text>
+		</view>
+		<view class="hui-button-box" v-if="dataDetail.status === 1">
+			<view class="hui-button hui-button-light" @click="btnClick('拒绝',3)">
+				拒绝
+			</view>
+			<view class="hui-button" @click="btnClick('同意',2)">
+				同意
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getMessageDetailById,
+		bindProject,
+		getCustomerDetailById,
+		updateCustomer,
+		getAgentDetailById,
+		updateAgent
+	} from '@/request/api/message.js'
+	export default {
+		data() {
+			return {
+				messageId: '',
+				detail: {},
+				dataDetail: {}
+			}
+		},
+		onLoad(body) {
+			this.messageId = body.id;
+			this.init();
+		},
+		methods: {
+			init() {
+				getMessageDetailById(this.messageId).then(res => {
+					if (res.code == 200) {
+						this.detail = res.data;
+						this.detail = Object.assign(this.detail, JSON.parse(this.detail.json));
+						this.initDetail();
+					}
+				})
+			},
+			initDetail() {
+				if (this.detail.identityId === 1) { //客户
+					getCustomerDetailById(this.detail.dataId).then(res => {
+						if (res.code == 200) {
+							this.dataDetail = res.data;
+						}
+					})
+				} else if (this.detail.identityId === 2) { //经纪人
+					getAgentDetailById(this.detail.dataId).then(res => {
+						if (res.code == 200) {
+							this.dataDetail = res.data;
+						}
+					})
+				}
+			},
+			btnClick(msg, type) {
+				uni.showModal({
+					title: '有极提示',
+					content: '是否' + msg + '加入该项目',
+					success: (res) => {
+						if (res.confirm) {
+							if (this.detail.identityId === 1) { //客户
+								updateCustomer({
+									id: this.dataDetail.id,
+									status: type
+								}).then(res => {
+									if (res.code == 200) {
+										if (type === 2) return this.operationProject();
+										this.initDetail();
+										this.$toast('操作成功');
+									}
+								})
+							} else if (this.detail.identityId === 2) { //经纪人
+								updateAgent({
+									id: this.dataDetail.id,
+									status: type
+								}).then(res => {
+									if (res.code == 200) {
+										if (type === 2) return this.operationProject();
+										this.initDetail();
+										this.$toast('操作成功');
+									}
+								})
+							}
+						}
+					}
+				});
+			},
+			operationProject() {
+				let postData = {
+					organizationId: this.detail.organizationId,
+					projectId: this.detail.projectId,
+					userId: this.$store.getters.user.userId,
+					identityId: this.detail.identityId
+				}
+				if (this.detail.identityId === 1) { //客户
+					postData['clientId'] = this.detail.dataId
+				} else if (this.detail.identityId === 2) { //经纪人
+					postData['agentId'] = this.detail.dataId
+				}
+				bindProject(postData).then(res => {
+					if (res.code === 200) {
+						this.$toast('操作成功');
+						this.initDetail();
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.message-detail-index {
+		background: $uni-white;
+		padding: 20rpx;
+		padding-bottom: 0;
+		margin: 20rpx 30rpx;
+		border-radius: 10rpx;
+
+		.message-detail-content {
+			min-height: 200rpx;
+			padding-bottom: 40rpx;
+		}
+
+		.message-btn-box {
+			width: 100%;
+			display: flex;
+			height: 80rpx;
+			align-items: center;
+			border-top: 1px solid $uni-border-3;
+
+			.line {
+				width: 1px;
+				height: 40rpx;
+				background: $uni-border-3;
+			}
+
+			.message-btn {
+				text-align: center;
+				flex: 1;
+			}
+
+			.red {
+				color: $uni-error;
+			}
+
+			.primary {
+				color: $uni-primary;
+			}
+		}
+
+	}
+</style>

virgo.wzfrontend/yui_wx/pages/messageList/messageList.vue

@@ -0,0 +1,118 @@
+<template>
+	<view class="message-list">
+		<mescroll-empty :option="{tip:'暂无消息'}" v-if="list.length === 0">
+		</mescroll-empty>
+		<view class="message-item" :class="item.viewed ? 'viewed':''" v-for="item in list" :key="item.id"
+			@click="clickMessage(item)">
+			<view class="message-title">{{item.sendUserName}}{{item.message}}</view>
+			<view class="message-content">
+				<view class="content-item">
+					<uni-icons class="sub-label-icon inherit-icons" type="calendar" size="16"></uni-icons>
+					<text class="name">{{item.date}}</text>
+				</view>
+				<view class="content-item">
+					<uni-icons class="sub-label-icon inherit-icons" type="person" size="16"></uni-icons>
+					<text class="name">{{item.sendUserName}}</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getMessageList,
+		setMessageViewed
+	} from '@/request/api/message.js'
+	export default {
+		data() {
+			return {
+				list: [],
+				type: ''
+			}
+		},
+		onLoad(body) {
+			this.type = body.type;
+			this.init()
+		},
+		methods: {
+			init() {
+				getMessageList(3, this.type).then(res => {
+					if (res.code === 200) {
+						this.list = res.data.map(node => {
+							node = Object.assign(node, JSON.parse(node.json))
+							return node;
+						});
+					}
+				})
+			},
+			clickMessage(item) {
+				setMessageViewed(item.id).then(res => {
+					if (res.code === 200) {
+						this.init();
+					}
+				})
+				this.$navigateTo('/pages/messageDetail/messageDetail?id=' + item.id);
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.message-list {
+		padding: 30rpx;
+
+		.message-item {
+			background: $uni-white;
+			padding: 20rpx 30rpx;
+			border-radius: 20rpx;
+			margin-bottom: 30rpx;
+		}
+
+		.message-title {
+			font-size: 32rpx;
+			font-weight: 500;
+			margin-bottom: 10rpx;
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+		}
+
+		.viewed {
+			.message-title {
+				color: $uni-secondary-color;
+			}
+		}
+
+		.message-content {
+			font-size: 12px;
+			display: flex;
+			justify-content: space-between;
+		}
+
+		.content-item {
+			display: flex;
+			align-items: center;
+			height: 40rpx;
+
+			.name {
+				font-size: 24rpx;
+				color: $uni-extra-color;
+				margin-left: 8rpx;
+			}
+
+			.sub-label-icon {
+				/* #ifdef H5 */
+				color: $uni-extra-color !important;
+
+				/* #endif */
+				/* #ifdef MP-WEIXIN */
+				text {
+					color: $uni-extra-color !important;
+				}
+
+				/* #endif */
+			}
+		}
+	}
+</style>

virgo.wzfrontend/yui_wx/pages/messageSystem/messageSystem.vue

@@ -0,0 +1,116 @@
+<template>
+	<view class="message-list">
+		<!-- 消息提示 -->
+		<view class="message-item" @click="$navigateTo('/pages/messageList/messageList?type=2')">
+			<uni-badge class="uni-badge-left-margin" :text="testCount[2]" absolute="rightTop" size="small">
+				<view class="message-system-icon">
+					<uni-icons type="icon-jigoukehudaishenheshuliang" custom-prefix="iconfont" size="30" color="#fff">
+					</uni-icons>
+				</view>
+			</uni-badge>
+			<view class="message-content">
+				<view class="message-title">项目邀请通知</view>
+				<view class="message-sub-content">
+					{{!testCount[2] ?'暂无消息通知' : `您有${testCount[2]}条未读消息，请查看～`}}
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getMessageTest
+	} from '@/request/api/message.js'
+	export default {
+		data() {
+			return {
+				testCount: {}
+			}
+		},
+		onShow() {
+			this.init();
+		},
+		methods: {
+			init() {
+				getMessageTest(3).then(res => {
+					if (res.code == 200) {
+						let obj = {};
+						for (var i = 0; i < res.data.length; i++) {
+							obj[res.data[i].messageType] = res.data[i].count;
+						}
+						this.testCount = obj;
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.message-list {
+		margin-top: 30rpx;
+
+		.message-item {
+			background: #fff;
+			display: flex;
+			padding: 24rpx 30rpx;
+			position: relative;
+
+			&::before {
+				content: '';
+				position: absolute;
+				bottom: 0;
+				right: 0;
+				left: 150rpx;
+				height: 2rpx;
+				background: $uni-border-1;
+			}
+		}
+
+		.message-system-icon {
+			width: 100rpx;
+			height: 100rpx;
+			border-radius: 16rpx;
+			text-align: center;
+			line-height: 100rpx;
+			background: $uni-primary;
+		}
+
+		.message-image {
+			width: 100rpx;
+			height: 100rpx;
+			border-radius: 16rpx;
+			overflow: hidden;
+		}
+
+		.message-content {
+			flex: 1;
+			width: 0;
+			margin-left: 20rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+		}
+
+		.message-title {
+			font-size: 32rpx;
+			font-weight: 600;
+			margin-bottom: 10rpx;
+		}
+
+		.message-sub-content {
+			font-weight: 300;
+			color: $uni-secondary-color;
+		}
+
+		.message-date {
+			position: absolute;
+			top: 34rpx;
+			right: 30rpx;
+			font-size: 24rpx;
+			font-weight: 300;
+			color: $uni-secondary-color;
+		}
+	}
+</style>

virgo.wzfrontend/yui_wx/request/api/chat.js

@@ -1,50 +1,26 @@
-import config from "@/config";
-
-function request(options) {
-	return new Promise((resolve, reject) => {
-		let header = options.header || {
-			'Content-Type': 'application/json'
-		}
-		if (uni.getStorageSync('token')) header['token'] = uni.getStorageSync('token');
-		uni.request({
-			url: config.imBaseUrl + options.url, // 服务器url
-			method: options.method || 'GET', // 请求方法，默认为GET
-			data: options.data || {}, // 请求参数
-			header: header, // 设置请求的 header
-			success: (res) => {
-				// 请求成功
-				if (res.statusCode === 200) {
-					resolve(res.data);
-					if (res.data.code != 200) uni.showToast({
-						title: res.data.message,
-						icon: 'none'
-					})
-				} else {
-					// 可以根据项目要求修改错误处理
-					reject(res.data);
-					uni.hideLoading();
-				}
-			},
-			fail: (err) => {
-				// 请求失败处理
-				uni.showToast({
-					title: '出错了，请联系管理员～',
-					icon: 'none'
-				})
-				reject(err);
-				uni.hideLoading();
-			},
-		});
-	});
-}
+import {
+	request
+} from '@/request/request.js';
 /* 
- * 获取公海
+ * 聊天登录
  * 
  * 
  */
 export function login(data) {
 	return request({
-		url: `/user/token/get`,
+		url: `/im/user/token/get`,
+		method: 'post',
+		data: data
+	})
+}
+/* 
+ * 发送聊天消息
+ * 
+ * 
+ */
+export function sendSystem(data) {
+	return request({
+		url: `/im/message/save`,
 		method: 'post',
 		data: data
 	})

virgo.wzfrontend/yui_wx/request/request.js

@@ -5,6 +5,7 @@ export function request(options) {
 			'Content-Type': 'application/json'
 		}
 		if (uni.getStorageSync('token')) header['token'] = uni.getStorageSync('token');
+		if (options.url === '/im/message/save') header['token'] = uni.getStorageSync('systemChatToken');
 		uni.request({
 			url: config.baseUrl + options.url, // 服务器url
 			method: options.method || 'GET', // 请求方法，默认为GET

virgo.wzfrontend/yui_wx/uitls/chat.js

@@ -3,7 +3,8 @@ import {
 	YeIMUniSDKDefines
 } from '@/uni_modules/wzJun1-YeIM-Uni-SDK/js_sdk/yeim-uni-sdk.min.js'
 import {
-	login
+	login,
+	sendSystem
 } from '@/request/api/chat.js'
 import md5 from '@/js_sdk/js-md5/build/md5.min.js';
 import config from "@/config";
@@ -20,6 +21,7 @@ const connect = success => {
 		token: uni.getStorageSync('chatToken'),
 		success: (response) => {
 			if (response.code === 200) {
+				$chat.listenerList();
 				if (success) success();
 			}
 		},
@@ -42,12 +44,12 @@ const logins = () => {
 		}
 	})
 }
-export default {
+const $chat = {
 	init() {
 		//初始化YeIMUniSDK
 		uni.$YeIMUniSDKDefines = YeIMUniSDKDefines;
 		uni.$YeIM = YeIMUniSDK.init({
-			baseURL: config.imBaseUrl, // YeIMServer http url （如无特殊需求，服务端启动后仅需修改ip或者域名即可）
+			baseURL: config.baseUrl + '/im', // YeIMServer http url （如无特殊需求，服务端启动后仅需修改ip或者域名即可）
 			socketURL: config.socketURL, // YeIMServer socket url（如无特殊需求，服务端启动后仅需修改ip或者域名即可）
 			/**
 			 * 	日志等级
@@ -103,24 +105,25 @@ export default {
 						src: res.tempFilePaths[0],
 						success: image => {
 							//创建图片消息
-							let message = YeIMUniSDK.getInstance().createImageMessage({
-								toId: userId, //接收者用户ID字符串
-								conversationType: YeIMUniSDKDefines
-									.CONVERSATION_TYPE
-									.PRIVATE, //会话类型：私聊
-								body: {
-									file: {
-										tempFilePath: res.tempFilePaths[
-											0], //本地图片临时路径
-										width: image.width, //图片宽度
-										height: image.height //图片高度
+							let message = YeIMUniSDK.getInstance()
+								.createImageMessage({
+									toId: userId, //接收者用户ID字符串
+									conversationType: YeIMUniSDKDefines
+										.CONVERSATION_TYPE
+										.PRIVATE, //会话类型：私聊
+									body: {
+										file: {
+											tempFilePath: res.tempFilePaths[
+												0], //本地图片临时路径
+											width: image.width, //图片宽度
+											height: image.height //图片高度
+										}
+									},
+									extra: "",
+									onProgress: (progress) => {
+										console.log(progress);
 									}
-								},
-								extra: "",
-								onProgress: (progress) => {
-									console.log(progress);
-								}
-							});
+								});
 							//发送消息
 							YeIMUniSDK.getInstance().sendMessage({
 								message: message,
@@ -176,20 +179,6 @@ export default {
 			//监听会话列表更新
 			YeIMUniSDK.getInstance().addEventListener(YeIMUniSDKDefines.EVENT.CONVERSATION_LIST_CHANGED, (
 				list) => {
-				let badge = 0;
-				for (let i = 0; i < list.length; i++) {
-					badge += list[i].unread
-				}
-				if (!badge) {
-					uni.removeTabBarBadge({
-						index: 1
-					})
-				} else {
-					uni.setTabBarBadge({
-						index: 1,
-						text: String(badge)
-					})
-				}
 				uni.$emit('changeChatList', list);
 			});
 		})
@@ -197,5 +186,37 @@ export default {
 	clearConversationUnread(conversationId) {
 		//清除指定会话未读数，并给对方发送已读回执
 		YeIMUniSDK.getInstance().clearConversationUnread(conversationId);
+	},
+	sendSystemMessage(success) {
+		let timestamp = (new Date()).getTime() + 86400 * 1000; //1000天后过期
+		let sign = md5('system' + timestamp + "50abd47112ebe8c5a73f4694c96a49ce");
+		login({
+			userId: 'system',
+			timestamp: timestamp,
+			sign: sign
+		}).then(res => {
+			if (res.code === 200) {
+				uni.setStorageSync('systemChatToken', res.data.token);
+				sendSystem({
+					body: {
+						text: "2"
+					},
+					conversationId: "4",
+					conversationType: "private",
+					extra: "",
+					from: 'system',
+					fromUserInfo: {},
+					isDeleted: 0,
+					isRead: 0,
+					isRevoke: 0,
+					status: "unSend",
+					time: new Date().getTime(),
+					to: 1,
+					type: "text",
+				})
+			}
+		})
+
 	}
-}
+}
+export default $chat;

virgo.wzfrontend/yui_wx/uni_modules/uni-dateformat/components/uni-dateformat/date-format.js

@@ -120,7 +120,7 @@ export function friendlyDate(time, {
 			ago: '前',
 			later: '后',
 			justNow: '刚刚',
-			soon: '马上',
+			soon: '刚刚',
 			template: '{num}{unit}{suffix}'
 		},
 		en: {

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/app.json

@@ -39,7 +39,10 @@
     "pages/invoice/invoice",
     "pages/invoiceDetail/invoiceDetail",
     "pages/billRecord/billRecord",
-    "pages/billInvoice/billInvoice"
+    "pages/billInvoice/billInvoice",
+    "pages/messageSystem/messageSystem",
+    "pages/messageList/messageList",
+    "pages/messageDetail/messageDetail"
   ],
   "subPackages": [],
   "window": {

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/common/navbar.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/login/imageCode.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/sin-signature/sin-signature.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/message/message.json

@@ -1,8 +1,9 @@
 {
   "navigationBarTitleText": "消息",
   "usingComponents": {
-    "mescroll-empty": "/uni_modules/mescroll-uni/components/mescroll-empty/mescroll-empty",
     "uni-badge": "/uni_modules/uni-badge/components/uni-badge/uni-badge",
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
+    "mescroll-empty": "/uni_modules/mescroll-uni/components/mescroll-empty/mescroll-empty",
     "uni-dateformat": "/uni_modules/uni-dateformat/components/uni-dateformat/uni-dateformat"
   }
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/message/message.wxss

@@ -6,8 +6,47 @@
  以下变量是默认值，如不需要修改可以不用给下面的变量重新赋值
  */
 /* 水平间距 */
-.message .message-list {
-  margin-top: 20rpx;
+.message .message-system {
+  background: #fff;
+  display: flex;
+  padding: 24rpx 30rpx;
+  position: relative;
+  margin-top: 30rpx;
+}
+.message .message-system .message-image {
+  width: 100rpx;
+  height: 100rpx;
+  border-radius: 16rpx;
+  overflow: hidden;
+}
+.message .message-system .message-content {
+  flex: 1;
+  width: 0;
+  margin-left: 20rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
+.message .message-system .message-title {
+  font-size: 32rpx;
+  font-weight: 600;
+  margin-bottom: 10rpx;
+}
+.message .message-system .message-sub-content {
+  font-weight: 300;
+  color: #8c8c8c;
+}
+.message .message-system .message-system-icon {
+  width: 100rpx;
+  height: 100rpx;
+  border-radius: 16rpx;
+  text-align: center;
+  line-height: 100rpx;
+  background: #08979c;
+}
+.message .message-titles {
+  font-weight: 300;
+  padding: 30rpx 30rpx 10rpx 30rpx;
 }
 .message .message-list .message-item {
   background: #fff;

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/messageDetail/messageDetail.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "通知详情",
+  "usingComponents": {}
+}

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/messageDetail/messageDetail.wxss

@@ -0,0 +1,42 @@
+@charset "UTF-8";
+/* 需要放到文件最上面 */
+/* 水平间距 */
+/* 水平间距 */
+/*
+ 以下变量是默认值，如不需要修改可以不用给下面的变量重新赋值
+ */
+/* 水平间距 */
+.message-detail-index {
+  background: #ffffff;
+  padding: 20rpx;
+  padding-bottom: 0;
+  margin: 20rpx 30rpx;
+  border-radius: 10rpx;
+}
+.message-detail-index .message-detail-content {
+  min-height: 200rpx;
+  padding-bottom: 40rpx;
+}
+.message-detail-index .message-btn-box {
+  width: 100%;
+  display: flex;
+  height: 80rpx;
+  align-items: center;
+  border-top: 1px solid #DCDCDC;
+}
+.message-detail-index .message-btn-box .line {
+  width: 1px;
+  height: 40rpx;
+  background: #DCDCDC;
+}
+.message-detail-index .message-btn-box .message-btn {
+  text-align: center;
+  flex: 1;
+}
+.message-detail-index .message-btn-box .red {
+  color: #ff4d4f;
+}
+.message-detail-index .message-btn-box .primary {
+  color: #08979c;
+}
+

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/messageList/messageList.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "通知列表",
+  "usingComponents": {
+    "mescroll-empty": "/uni_modules/mescroll-uni/components/mescroll-empty/mescroll-empty",
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+  }
+}

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/messageList/messageList.wxss

@@ -0,0 +1,47 @@
+@charset "UTF-8";
+/* 需要放到文件最上面 */
+/* 水平间距 */
+/* 水平间距 */
+/*
+ 以下变量是默认值，如不需要修改可以不用给下面的变量重新赋值
+ */
+/* 水平间距 */
+.message-list {
+  padding: 30rpx;
+}
+.message-list .message-item {
+  background: #ffffff;
+  padding: 20rpx 30rpx;
+  border-radius: 20rpx;
+  margin-bottom: 30rpx;
+}
+.message-list .message-title {
+  font-size: 32rpx;
+  font-weight: 500;
+  margin-bottom: 10rpx;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+.message-list .viewed .message-title {
+  color: #8c8c8c;
+}
+.message-list .message-content {
+  font-size: 12px;
+  display: flex;
+  justify-content: space-between;
+}
+.message-list .content-item {
+  display: flex;
+  align-items: center;
+  height: 40rpx;
+}
+.message-list .content-item .name {
+  font-size: 24rpx;
+  color: #bfbfbf;
+  margin-left: 8rpx;
+}
+.message-list .content-item .sub-label-icon text {
+  color: #bfbfbf !important;
+}
+

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/messageSystem/messageSystem.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "系统通知",
+  "usingComponents": {
+    "uni-badge": "/uni_modules/uni-badge/components/uni-badge/uni-badge",
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+  }
+}

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/messageSystem/messageSystem.wxss

@@ -0,0 +1,66 @@
+@charset "UTF-8";
+/* 需要放到文件最上面 */
+/* 水平间距 */
+/* 水平间距 */
+/*
+ 以下变量是默认值，如不需要修改可以不用给下面的变量重新赋值
+ */
+/* 水平间距 */
+.message-list {
+  margin-top: 30rpx;
+}
+.message-list .message-item {
+  background: #fff;
+  display: flex;
+  padding: 24rpx 30rpx;
+  position: relative;
+}
+.message-list .message-item::before {
+  content: '';
+  position: absolute;
+  bottom: 0;
+  right: 0;
+  left: 150rpx;
+  height: 2rpx;
+  background: #d9d9d9;
+}
+.message-list .message-system-icon {
+  width: 100rpx;
+  height: 100rpx;
+  border-radius: 16rpx;
+  text-align: center;
+  line-height: 100rpx;
+  background: #08979c;
+}
+.message-list .message-image {
+  width: 100rpx;
+  height: 100rpx;
+  border-radius: 16rpx;
+  overflow: hidden;
+}
+.message-list .message-content {
+  flex: 1;
+  width: 0;
+  margin-left: 20rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
+.message-list .message-title {
+  font-size: 32rpx;
+  font-weight: 600;
+  margin-bottom: 10rpx;
+}
+.message-list .message-sub-content {
+  font-weight: 300;
+  color: #8c8c8c;
+}
+.message-list .message-date {
+  position: absolute;
+  top: 34rpx;
+  right: 30rpx;
+  font-size: 24rpx;
+  font-weight: 300;
+  color: #8c8c8c;
+}
+

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/mescroll-uni/components/mescroll-body/mescroll-body.json

@@ -1,6 +1,6 @@
 {
+  "component": true,
   "usingComponents": {
     "mescroll-empty": "/uni_modules/mescroll-uni/components/mescroll-empty/mescroll-empty"
-  },
-  "component": true
+  }
 }