From 6629e9b4d5752b61be49e3fe6bad07cd436e3188 Mon Sep 17 00:00:00 2001
From: chen <2659004835@qq.com>
Date: Thu, 7 Apr 2022 18:16:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A6=96=E9=A1=B5=E5=85=AC?=
 =?UTF-8?q?=E5=91=8A=E3=80=81=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/list/list-one.vue                  |  75 -----
 components/list/list-two.vue                  | 163 ----------
 components/notices/notice-one/notice-one.vue  | 292 ++++++++++++++++++
 components/notices/notice-one/readme.md       |  75 +++++
 .../notices/notice-one/uni-icons/icons.js     | 132 ++++++++
 .../notice-one/uni-icons/uni-icons.vue        |  52 ++++
 .../notices/notice-one/uni-icons/uni.ttf      | Bin 0 -> 26164 bytes
 pages/tabbar/pagehome/pagehome.vue            |   9 +-
 pagesB/message-center/message-center.vue      |  86 +++++-
 9 files changed, 633 insertions(+), 251 deletions(-)
 delete mode 100644 components/list/list-one.vue
 delete mode 100644 components/list/list-two.vue
 create mode 100644 components/notices/notice-one/notice-one.vue
 create mode 100644 components/notices/notice-one/readme.md
 create mode 100644 components/notices/notice-one/uni-icons/icons.js
 create mode 100644 components/notices/notice-one/uni-icons/uni-icons.vue
 create mode 100644 components/notices/notice-one/uni-icons/uni.ttf

diff --git a/components/list/list-one.vue b/components/list/list-one.vue
deleted file mode 100644
index 1eb8ed7..0000000
--- a/components/list/list-one.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-<template>
-	<view id="main-img">
-		<!-- <view class="mar-x40" v-for="(item,index) in list" :key="index"> -->
-			<!-- 活动商品 start -->
-			<view v-for="(item,index) in activityList" :key="index" class="mar-x50">
-				<h1 class="fon36 bold">{{item.name}}</h1>
-				<view class="colpeili fon26 mar-s20 mar-x40 clips1">{{item.subtitle}}</view>
-				<view class="posir" @tap="goDetail(item.id)">
-					<image class="radius30 animated fadeIn" :src="item.cover" mode="aspectFill" lazy-load style="height: 425rpx;width: 100%;" :style="{height:activityHeight + 'px'}"></image>
-					<view v-if="item.tag!=''" class="posia fon24 colf pad-zy10 pad-s10 pad-x20 activity-img">限时优惠</view>
-				</view>
-			</view>
-			<!-- 活动商品 end -->
-			
-			<!-- 子商品 start -->
-			<view class="disjbac fw">
-				<view @tap="goDetail(item.id)" class="width47 mar-x50 posir" v-for="(item,index) in list" :key="index">
-					<image :src="item.cover" mode="aspectFill" lazy-load style="width: 100%;height: 312rpx;border-radius: 30rpx;"></image>
-					<view class="clips2 fon30 col0 linh50" style="height: 100rpx;">{{item.name}}</view>
-					<view class="fon30 colpeili">￥{{item.price}}</view>
-					<view v-if="item.tag!=''" class="posia fon24 colf pad-zy10 pad-s10 pad-x20 activity-img">限时优惠</view>
-				</view>
-			</view>
-			<!-- 子商品 end -->
-		<!-- </view> -->
-	</view>
-</template>
-
-<script>
-	export default {
-		name:"list-one",
-		props:{
-			list:{
-				type:Array,
-				default:()=>{
-					return []
-				}
-			},
-			activityList:{
-				type:Array,
-				default:()=>{
-					return []
-				}
-			}
-		},
-		data() {
-			return {
-				check:uni.getStorageSync('is_active'),
-				activityHeight:''
-			};
-		},
-		mounted() {
-			uni.createSelectorQuery().in(this).select('#main-img').boundingClientRect().exec(rect => {
-				this.activityHeight = rect[0].width;
-				console.log(this.activityHeight,55);
-			});
-		},
-		methods:{
-			goDetail(id){//前往详情页
-				if(this.check){
-					uni.navigateTo({
-						url:`/pagesB/shopDetail/shopDetail?id=${id}`
-					})
-				} else {
-					uni.navigateTo({
-						url:`/pages/login/login`
-					})
-				}
-			}
-		}
-	}
-</script>
-
-<style>
-</style>
diff --git a/components/list/list-two.vue b/components/list/list-two.vue
deleted file mode 100644
index 7e24653..0000000
--- a/components/list/list-two.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<template>
-	<scroll-view scroll-y @scrolltolower="scrollBottomEv" :style="{height: scrollHeight +'px'}">
-		<view class="disjbac fw">
-			<view @tap="goDetail(item.id)" class="width48_5 mar-x50 posir" v-for="(item,index) in dataList" :key="index">
-				<image class="animated fadeIn" :src="item.imgSrc" mode="aspectFill" style="width: 100%;height: 312rpx;border-radius: 30rpx;"></image>
-				<view class="clips2 fon30 col0 linh50" style="height: 100rpx;">{{item.title}}</view>
-				<view class="fon30 colpeili">￥{{item.price}}</view>
-				<view v-if="item.isActivity" class="posia fon24 colf pad-zy10 pad-s10 pad-x20 activity-img">限时优惠</view>
-			</view>
-		</view>
-		<!-- 暂无更多数据 -->
-		<pitera v-if="showpitera"></pitera>
-	</scroll-view>
-</template>
-
-<script>
-	// 暂无更多组件
-	import pitera from '@/components/nothing/pitera.vue';
-	export default {
-		name:"list-two",
-		components:{
-			pitera
-		},
-		props:{
-			// 高度类型
-			scrollCate:{
-				type:Number,
-				default:1
-			},
-			// 页面来源
-			pageSource: {
-				type:Number,
-				default:1
-			}
-		},
-		data() {
-			return {
-				scrollHeight:uni.getStorageSync('scrollHeight'),
-				// 数据
-				dataList:[
-					{
-						id:1,
-						imgSrc:'https://s6.jpg.cm/2022/02/14/L4oDhy.jpg',
-						title:'于亿年宝藏中臻选1的宝',
-						price:'2,000',
-						isActivity:true,
-					},
-					{
-						id:1,
-						imgSrc:'https://s6.jpg.cm/2022/02/14/L4oDhy.jpg',
-						title:'于亿年宝藏中臻选1的宝石级钻石每年开采数级钻石每年开采数',
-						price:'2,000',
-						isActivity:false,
-					},
-					{
-						id:1,
-						imgSrc:'https://s6.jpg.cm/2022/02/14/L4oDhy.jpg',
-						title:'于亿年宝藏中臻选',
-						price:'2,000',
-						isActivity:false,
-					},
-					{
-						id:1,
-						imgSrc:'https://s6.jpg.cm/2022/02/14/L4oDhy.jpg',
-						title:'于亿年宝藏中臻选',
-						price:'2,000',
-						isActivity:true,
-					},
-					{
-						id:1,
-						imgSrc:'https://s6.jpg.cm/2022/02/14/L4oDhy.jpg',
-						title:'于亿年宝藏中臻选',
-						price:'2,000',
-						isActivity:false,
-					},
-					{
-						id:1,
-						imgSrc:'https://s6.jpg.cm/2022/02/14/L4oDhy.jpg',
-						title:'于亿年宝藏中臻选1的宝石级钻石每年开采数',
-						price:'2,000',
-						isActivity:false,
-					},
-					{
-						id:1,
-						imgSrc:'https://s6.jpg.cm/2022/02/14/L4oDhy.jpg',
-						title:'于亿年宝藏中臻选1的宝石级钻石每年开采数的宝石级钻石每年开采数',
-						price:'2,000',
-						isActivity:false,
-					},
-					{
-						id:1,
-						imgSrc:'https://s6.jpg.cm/2022/02/14/L4oDhy.jpg',
-						title:'于亿年宝藏中臻选',
-						price:'2,000',
-						isActivity:false,
-					},
-					{
-						id:1,
-						imgSrc:'https://s6.jpg.cm/2022/02/14/L4oDhy.jpg',
-						title:'于亿年宝藏中臻选1的宝石级钻石每年开采数的宝石级钻石每年开采数',
-						price:'2,000',
-						isActivity:false,
-					}
-				],
-				page:1, // 第几页
-				size:10, // 数量
-				total:0, // 总数
-				showpitera:true, // 是否显示暂无数据
-			};
-		},
-		mounted() {
-			switch (this.scrollCate){
-				case 1:
-				this.scrollHeight = uni.getStorageSync('scrollHeight-one'); // App.vue缓存的数据
-					break;
-				case 2:
-				this.scrollHeight = uni.getStorageSync('scrollHeight-two'); // App.vue缓存的数据
-					break;
-				case 3:
-				this.scrollHeight = uni.getStorageSync('scrollHeight-three'); // App.vue缓存的数据
-					break;
-				case 4:
-				this.scrollHeight = uni.getStorageSync('scrollHeight-four'); // App.vue缓存的数据
-					break;	
-			}
-			switch (this.pageSource){
-				case 1:
-				this.checkList();
-					break;
-			}
-		},
-		methods:{
-			checkList(){
-				console.log('列表事件')
-			},
-			// 视图容器触底事件
-			scrollBottomEv(){
-				console.log('触底了',55)
-				// 判断总数是否等于数组长度，如果相等显示暂无更多，否则继续执行列表事件
-				if(this.total!=this.dataList.length){
-					// 页数每次+1
-					this.page++
-					switch (this.pageSource){
-						case 1:
-						// this.checkList();// 调用列表事件
-							break;
-					}
-				} else {
-					// 显示暂无数据
-					this.pitera = true;
-				}
-			},
-			goDetail(id){//前往详情页
-				uni.navigateTo({
-					url:`/pagesB/shopDetail/shopDetail?id=${id}`
-				})
-			}
-		}
-	}
-</script>
-
-<style>
-</style>
diff --git a/components/notices/notice-one/notice-one.vue b/components/notices/notice-one/notice-one.vue
new file mode 100644
index 0000000..e0cb02c
--- /dev/null
+++ b/components/notices/notice-one/notice-one.vue
@@ -0,0 +1,292 @@
+<template>
+	<view class="xzw_notice" :style="{color:getColor(theme),backgroundColor:getBgColor(theme)}">
+		<uni-icons v-if="showIcon === true || showIcon === 'true'" class="notice_left" type="sound" :color="getColor(theme)" size="22" />
+		<swiper class="notice_center" vertical v-if="direction=='column'" :autoplay="true" :interval="4000" :duration="500" :circular="true" disable-touch>
+			<swiper-item v-for="(item, index) in list" :key="index" class="swiperIn" @click="goItem(item)">
+				<view>{{item[theKey]}}</view>
+			</swiper-item>
+		</swiper>
+		<view :class="['','notice_center1','notice_center2','notice_center3','notice_center4','notice_center5'][speedTime]" v-else><view class="content">{{list[0][theKey]}}</view></view>
+		<view class="notice_right" v-if="showMore">
+			<view @click="goMore">更多</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name:"notice-one",
+		props:{
+			// 速度
+			speed: {
+				type:Number,
+				default:1
+			},
+			//主题色,default|primary|error|warning|success|info
+			theme: {
+				type: String,
+				default: 'default'
+			},
+			// 是否显示左侧icon
+			showIcon: {
+				type: [Boolean, String],
+				default: false
+			},
+			// 是否显示更多
+			showMore: {
+				type: [Boolean, String],
+				default: false
+			},
+			list: {
+				type: Array,
+				default() {
+					return [{id:1,title:'公告1'},{id:2,title:'公告2'}]
+				}
+			},
+			//公告数组的键名
+			theKey:{
+				type: String,
+				default: 'title'
+			},
+			//方向，column垂直，row水平时取第一条公告
+			direction:{
+				type: String,
+				default: 'column'
+			}
+		},
+		data() {
+			return {
+				text:'',
+				speedTime:1
+			};
+		},
+		mounted() {
+			// 缓存状态栏+标题栏的高度
+			const query = wx.createSelectorQuery().in(this)
+			query.select('.content').boundingClientRect((rect) => {
+				console.log(rect.width);
+				let newWidth = rect.width;
+				if(newWidth <=420) {
+					this.speedTime = 1;
+				}
+				if(newWidth >= 420 && newWidth < 720) {
+					this.speedTime = 2;
+				}
+				if(newWidth >= 720 && newWidth < 820) {
+					this.speedTime = 3;
+				}
+				if(newWidth >= 820 && newWidth < 920) {
+					this.speedTime = 4;
+				}
+				if(newWidth >= 920) {
+					this.speedTime = 5;
+				}
+			}).exec()
+		},
+		methods:{
+			getColor(theme){
+				if(theme=="primary"){
+					return "#2979FF"
+				}else if(theme=="error"){
+					return "#FA3534"
+				}else if(theme=="warning"){
+					return "#FF9A43"
+				}else if(theme=="success"){
+					return "#1BBF6C"
+				}else if(theme=="info"){
+					return "#909399"
+				}else{
+					return "#303133"
+				}
+			},
+			getBgColor(theme){
+				if(theme=="primary"){
+					return "#ECF5FF"
+				}else if(theme=="error"){
+					return "#FEF0F0"
+				}else if(theme=="warning"){
+					return "#FDF6EC"
+				}else if(theme=="success"){
+					return "#DBF1E1"
+				}else if(theme=="info"){
+					return "#F4F4F5"
+				}else{
+					return "#FFFFFF"
+				}
+			},
+			goItem(item){
+				uni.navigateTo({
+					url:`/pagesB/notice-detail/notice-detail?id=${item.id}`
+				})
+			},
+			goMore(){
+				uni.navigateTo({
+					url:`/pagesB/notice-list/notice-list`
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.xzw_notice {
+		font-size: 26upx;
+		height: 40upx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 0;
+		box-sizing: border-box;
+		width: 100%;
+		.notice_left{
+			margin: 0 20upx 0 0;
+		}
+		.notice_center{
+			flex:1;
+			height:90upx;
+			.swiperIn{
+				height:80upx;
+				display: flex;
+				align-items: center;
+				view{
+					overflow: hidden;
+					display: -webkit-box;
+					-webkit-line-clamp: 1;
+					-webkit-box-orient: vertical;
+				}
+			}
+		}
+		.notice_center1{
+			flex:1;
+			position: relative;
+			display: flex;
+			align-items: center;
+			height:90upx;
+			overflow: hidden;
+			view{
+				position: absolute;
+				white-space: nowrap;
+				padding-left: 100%;
+				animation: notice 5s 0s linear infinite both;
+			}
+		}
+		.notice_right {
+			margin: 0 0 0 20upx;
+		}
+		@keyframes notice {
+			100% {
+				transform: translate3d(-100%, 0, 0);
+			}
+		}
+		.notice_center1{
+			flex:1;
+			position: relative;
+			display: flex;
+			align-items: center;
+			height:90upx;
+			overflow: hidden;
+			view{
+				position: absolute;
+				white-space: nowrap;
+				padding-left: 100%;
+				animation: notice 5s 0s linear infinite both;
+			}
+		}
+		.notice_right {
+			margin: 0 0 0 20upx;
+		}
+		@keyframes notice {
+			100% {
+				transform: translate3d(-100%, 0, 0);
+			}
+		}
+		.notice_center2{
+			flex:1;
+			position: relative;
+			display: flex;
+			align-items: center;
+			height:90upx;
+			overflow: hidden;
+			view{
+				position: absolute;
+				white-space: nowrap;
+				padding-left: 100%;
+				animation: notice 10s 0s linear infinite both;
+			}
+		}
+		.notice_right {
+			margin: 0 0 0 20upx;
+		}
+		@keyframes notice {
+			100% {
+				transform: translate3d(-100%, 0, 0);
+			}
+		}
+		.notice_center3{
+			flex:1;
+			position: relative;
+			display: flex;
+			align-items: center;
+			height:90upx;
+			overflow: hidden;
+			view{
+				position: absolute;
+				white-space: nowrap;
+				padding-left: 100%;
+				animation: notice 15s 0s linear infinite both;
+			}
+		}
+		.notice_right {
+			margin: 0 0 0 20upx;
+		}
+		@keyframes notice {
+			100% {
+				transform: translate3d(-100%, 0, 0);
+			}
+		}
+		.notice_center4{
+			flex:1;
+			position: relative;
+			display: flex;
+			align-items: center;
+			height:90upx;
+			overflow: hidden;
+			view{
+				position: absolute;
+				white-space: nowrap;
+				padding-left: 100%;
+				animation: notice 20s 0s linear infinite both;
+			}
+		}
+		.notice_right {
+			margin: 0 0 0 20upx;
+		}
+		@keyframes notice {
+			100% {
+				transform: translate3d(-100%, 0, 0);
+			}
+		}
+		.notice_center5{
+			flex:1;
+			position: relative;
+			display: flex;
+			align-items: center;
+			height:90upx;
+			overflow: hidden;
+			view{
+				position: absolute;
+				white-space: nowrap;
+				padding-left: 100%;
+				animation: notice 25s 0s linear infinite both;
+			}
+		}
+		.notice_right {
+			margin: 0 0 0 20upx;
+		}
+		@keyframes notice {
+			100% {
+				transform: translate3d(-100%, 0, 0);
+			}
+		}
+	}
+</style>
diff --git a/components/notices/notice-one/readme.md b/components/notices/notice-one/readme.md
new file mode 100644
index 0000000..0b1af96
--- /dev/null
+++ b/components/notices/notice-one/readme.md
@@ -0,0 +1,75 @@
+### 安装方式
+
+本组件符合[easycom](https://uniapp.dcloud.io/collocation/pages?id=easycom)规范，`HBuilderX 2.5.5`起，只需将本组件导入项目，在页面`template`中即可直接使用，无需在页面中`import`和注册`components`。
+
+### 说明
+由于官方公告组件uni-notice-bar没有垂直滚动的功能, 所以利用swiper加入了垂直滚动, 加入了常用主题色, 可以自己去添加, 需要用到uni-icons
+
+```html
+<template>
+	<view class="container">
+		<!-- 默认垂直滚动 -->
+		<xzw-notice/>
+		<!-- 水平滚动,取数组第一条 -->
+		<xzw-notice theme="info" direction="row"/>
+		<!-- theme主题色,default|primary|error|warning|success|info -->
+		<xzw-notice theme="error" direction="row"/>
+		<!-- 点击公告,点击更多 -->
+		<xzw-notice theme="warning" @goItem="goItem" @goMore="goMore"/>
+		<!-- 绑定公告数组,默认取每一项的title字段,可以通过theKey改变读取的字段 -->
+		<xzw-notice theme="success" :list="list2" theKey="name"/>
+		<!-- 是否显示左侧喇叭,是否显示更多 -->
+		<xzw-notice theme="primary" :list="list2" theKey="name" :showIcon="false" :showMore="false"/>
+	</view>
+</template>
+
+```
+
+```javascript
+	export default {
+		data() {
+			return {
+				list:[{id:1,title:'公告1'},{id:2,title:'公告2'}]
+				list2:[{id:1,name:'公告3'},{id:2,name:'公告4'}]
+			}
+		},
+		methods: {
+			goItem(item){
+				uni.showToast({
+					title:'你点击的公告id是'+item.id,
+					icon:'none'
+				})
+			},
+			goMore(){
+				uni.showToast({
+					title:'点击更多',
+					icon:'none'
+				})
+			}
+		}
+	}
+```
+
+
+
+## API
+
+### Tag Props
+
+|属性名		  |类型		 |默认值	    |说明				|							
+|:-:		  |:-:		 |:-:		|:-:				|								
+|list		  |Array	 |			|公告数组			|										
+|theme	  	  |String	 |default   |主题			    |	
+|showIcon	  |Boolean	 |true      |是否显示左侧icon	|
+|showMore     |Boolean   |true      |是否显示更多		|						
+|theKey	      |String    |title	    |公告数组的键名	    |													
+|direction    |String    |column	|滚动的方向          |
+
+
+### Tag Events
+
+|事件称名		|说明				|返回值	|
+|:-:			|:-:				|:-:	|
+|@goItem		|点击公告			|-		|
+|@goMore	    |点击更多			|-		|
+
diff --git a/components/notices/notice-one/uni-icons/icons.js b/components/notices/notice-one/uni-icons/icons.js
new file mode 100644
index 0000000..60b7332
--- /dev/null
+++ b/components/notices/notice-one/uni-icons/icons.js
@@ -0,0 +1,132 @@
+export default {
+	"pulldown": "\ue588",
+	"refreshempty": "\ue461",
+	"back": "\ue471",
+	"forward": "\ue470",
+	"more": "\ue507",
+	"more-filled": "\ue537",
+	"scan": "\ue612",
+	"qq": "\ue264",
+	"weibo": "\ue260",
+	"weixin": "\ue261",
+	"pengyouquan": "\ue262",
+	"loop": "\ue565",
+	"refresh": "\ue407",
+	"refresh-filled": "\ue437",
+	"arrowthindown": "\ue585",
+	"arrowthinleft": "\ue586",
+	"arrowthinright": "\ue587",
+	"arrowthinup": "\ue584",
+	"undo-filled": "\ue7d6",
+	"undo": "\ue406",
+	"redo": "\ue405",
+	"redo-filled": "\ue7d9",
+	"bars": "\ue563",
+	"chatboxes": "\ue203",
+	"camera": "\ue301",
+	"chatboxes-filled": "\ue233",
+	"camera-filled": "\ue7ef",
+	"cart-filled": "\ue7f4",
+	"cart": "\ue7f5",
+	"checkbox-filled": "\ue442",
+	"checkbox": "\ue7fa",
+	"arrowleft": "\ue582",
+	"arrowdown": "\ue581",
+	"arrowright": "\ue583",
+	"smallcircle-filled": "\ue801",
+	"arrowup": "\ue580",
+	"circle": "\ue411",
+	"eye-filled": "\ue568",
+	"eye-slash-filled": "\ue822",
+	"eye-slash": "\ue823",
+	"eye": "\ue824",
+	"flag-filled": "\ue825",
+	"flag": "\ue508",
+	"gear-filled": "\ue532",
+	"reload": "\ue462",
+	"gear": "\ue502",
+	"hand-thumbsdown-filled": "\ue83b",
+	"hand-thumbsdown": "\ue83c",
+	"hand-thumbsup-filled": "\ue83d",
+	"heart-filled": "\ue83e",
+	"hand-thumbsup": "\ue83f",
+	"heart": "\ue840",
+	"home": "\ue500",
+	"info": "\ue504",
+	"home-filled": "\ue530",
+	"info-filled": "\ue534",
+	"circle-filled": "\ue441",
+	"chat-filled": "\ue847",
+	"chat": "\ue263",
+	"mail-open-filled": "\ue84d",
+	"email-filled": "\ue231",
+	"mail-open": "\ue84e",
+	"email": "\ue201",
+	"checkmarkempty": "\ue472",
+	"list": "\ue562",
+	"locked-filled": "\ue856",
+	"locked": "\ue506",
+	"map-filled": "\ue85c",
+	"map-pin": "\ue85e",
+	"map-pin-ellipse": "\ue864",
+	"map": "\ue364",
+	"minus-filled": "\ue440",
+	"mic-filled": "\ue332",
+	"minus": "\ue410",
+	"micoff": "\ue360",
+	"mic": "\ue302",
+	"clear": "\ue434",
+	"smallcircle": "\ue868",
+	"close": "\ue404",
+	"closeempty": "\ue460",
+	"paperclip": "\ue567",
+	"paperplane": "\ue503",
+	"paperplane-filled": "\ue86e",
+	"person-filled": "\ue131",
+	"contact-filled": "\ue130",
+	"person": "\ue101",
+	"contact": "\ue100",
+	"images-filled": "\ue87a",
+	"phone": "\ue200",
+	"images": "\ue87b",
+	"image": "\ue363",
+	"image-filled": "\ue877",
+	"location-filled": "\ue333",
+	"location": "\ue303",
+	"plus-filled": "\ue439",
+	"plus": "\ue409",
+	"plusempty": "\ue468",
+	"help-filled": "\ue535",
+	"help": "\ue505",
+	"navigate-filled": "\ue884",
+	"navigate": "\ue501",
+	"mic-slash-filled": "\ue892",
+	"search": "\ue466",
+	"settings": "\ue560",
+	"sound": "\ue590",
+	"sound-filled": "\ue8a1",
+	"spinner-cycle": "\ue465",
+	"download-filled": "\ue8a4",
+	"personadd-filled": "\ue132",
+	"videocam-filled": "\ue8af",
+	"personadd": "\ue102",
+	"upload": "\ue402",
+	"upload-filled": "\ue8b1",
+	"starhalf": "\ue463",
+	"star-filled": "\ue438",
+	"star": "\ue408",
+	"trash": "\ue401",
+	"phone-filled": "\ue230",
+	"compose": "\ue400",
+	"videocam": "\ue300",
+	"trash-filled": "\ue8dc",
+	"download": "\ue403",
+	"chatbubble-filled": "\ue232",
+	"chatbubble": "\ue202",
+	"cloud-download": "\ue8e4",
+	"cloud-upload-filled": "\ue8e5",
+	"cloud-upload": "\ue8e6",
+	"cloud-download-filled": "\ue8e9",
+	"headphones":"\ue8bf",
+	"shop":"\ue609"
+}
diff --git a/components/notices/notice-one/uni-icons/uni-icons.vue b/components/notices/notice-one/uni-icons/uni-icons.vue
new file mode 100644
index 0000000..333cc78
--- /dev/null
+++ b/components/notices/notice-one/uni-icons/uni-icons.vue
@@ -0,0 +1,52 @@
+<template>
+	<text :style="{ color: color, 'font-size': size + 'px' }" class="uni-icons" :class="[customIcons,customIcons?type:'']" @click="_onClick">{{icons[type]}}</text>
+</template>
+
+<script>
+	import icons from './icons.js';
+	export default {
+		name: 'UniIcons',
+		props: {
+			type: {
+				type: String,
+				default: ''
+			},
+			color: {
+				type: String,
+				default: '#333333'
+			},
+			size: {
+				type: [Number, String],
+				default: 16
+			},
+			customIcons:{
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				icons: icons
+			}
+		},
+		methods: {
+			_onClick() {
+				this.$emit('click')
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	/* #ifndef APP-NVUE */
+	@font-face {
+		font-family: uniicons;
+		src: url('./uni.ttf') format('truetype');
+	}
+	/* #endif */
+	.uni-icons {
+		font-family: uniicons;
+		text-decoration: none;
+		text-align: center;
+	}
+</style>
diff --git a/components/notices/notice-one/uni-icons/uni.ttf b/components/notices/notice-one/uni-icons/uni.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..60a1968d08cc6056c70b5402b2effac43c6f96a3
GIT binary patch
literal 26164
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

literal 0
HcmV?d00001

diff --git a/pages/tabbar/pagehome/pagehome.vue b/pages/tabbar/pagehome/pagehome.vue
index ebf307d..0b3444d 100644
--- a/pages/tabbar/pagehome/pagehome.vue
+++ b/pages/tabbar/pagehome/pagehome.vue
@@ -48,7 +48,8 @@
 						<view class="disac pad-s30 pad-x10">
 							<image class="mar-zy20" style="width: 64rpx;height: 27rpx;" src="/static/public/icon-home-notice.png" mode=""></image>
 							<view class="fon24 color6 mar-y20 width100 bleft pad-z20">
-								<lwNotice @dangGao="goNoticeDetail" :list="noticeList" :backgroundColor="'#FFFFFF'"></lwNotice>
+								<!-- <lwNotice @dangGao="goNoticeDetail" :list="noticeList" :backgroundColor="'#FFFFFF'"></lwNotice> -->
+								<notice-one direction="row" :list="noticeList"></notice-one>
 							</view>
 						</view>
 					</view>
@@ -229,6 +230,7 @@
 	import pitera from '@/components/nothing/pitera.vue';
 	// 公告
 	import lwNotice from '@/components/lw-notice/lw-notice.vue';
+	import noticeOne from '@/components/notices/notice-one/notice-one.vue';
 	import footTabOne from '@/components/foot-tabs/foot-tab-one.vue';
 	import containerSubgroupTwo from '@/components/containers/container-subgroup-two.vue';
 	const app = getApp();
@@ -238,7 +240,8 @@
 			statusNavSlot,
 			lwNotice,
 			'foot-tab' :footTabOne,
-			containerSubgroupTwo
+			containerSubgroupTwo,
+			noticeOne
 		},
 		data() {
 			return {
@@ -246,7 +249,7 @@
 				role: uni.getStorageSync('type_id'), // 1：业务员 2:表示客户 3:表示客服 4：表示工程师 
 				statusHeight: uni.getSystemInfoSync().statusBarHeight + 50,
 				messageNumber: 16 ,// 消息数量
-				noticeList:['2021年11月06日公司团建，维修服务暂停一天服务暂停一天服务暂停一天。','51akslfj;dkpiojasdjf;j1ij'],//公告
+				noticeList:[{id:1,title:'2021年11月06日公司团建，维修服务暂停一天服务暂停一天服务暂停一天。一天服务暂停一天服务暂停一天。'}],//公告
 				// 故障报修
 				repairList:[
 					{imgsrc:'/static/public/icon-home-repair.png',title:'报修'},
diff --git a/pagesB/message-center/message-center.vue b/pagesB/message-center/message-center.vue
index e6942ed..9d3139b 100644
--- a/pagesB/message-center/message-center.vue
+++ b/pagesB/message-center/message-center.vue
@@ -1,30 +1,54 @@
 <template>
 	<view>
 		<status-nav navBarTitle="消息中心" returnColor="#c2c2c2"></status-nav>
+		<view v-show="ifDel" class="bacf pad-sx20 pad-zy40 fon24 disjbac animated" :class="ifDel ? 'fadeInDown' :'fadeOutUp'" style="position: sticky;" :style="{top: newTop+'px'}">
+			<view @tap="delEv(0)">删除所有</view>
+			<view @tap="delEv(1)">删除（{{delNum}}）</view> 
+		</view>
 		<container-subgroup>
-			<view slot="content">
-				<view class="bacf mar-x10" v-for="(item,index) in 10" :key="index">
+			<view slot="content"> 
+				<view @longtap.stop="longTap(index)" @tap="chooseDel(index,item.id)" class="mar-x10 bacf" :style="{backgroundColor: (ifDel && item.status) ? '#dddddd' :''}" v-for="(item,index) in dataList" :key="index">
 					<view class="pad-sx30 pad-zy20 disjbac">
-						<view class="fon30 message-circle disac" :class="['activity-message','audit-failed','system-notification'][index]">活动消息</view>
-						<view class="fon26 col9">2020.06.17  18:30</view>
+						<view class="fon30 message-circle disac" :class="['activity-message','audit-failed','system-notification'][index]">{{item.title}}{{item.id}}</view>
+						<view class="fon26 col9">{{item.time}}</view>
 					</view>
 					<view class="bbot"></view>
-					<view class="fon27 line-h46 pad-zy20 pad-sx30" style="color: #737373;">恭喜您成为第99位会员，我们将赠送您一张优惠 券，您可以享受8折优惠购买....</view>
+					<view class="fon27 line-h46 pad-zy20 pad-sx30" style="color: #737373;">{{item.content}}</view>
 				</view>
+				<pitera v-if="total==dataList.length" textStr="暂无更多"></pitera>
 			</view>
 		</container-subgroup>
+		<nothing-page v-if="dataList.length==0"></nothing-page>
 	</view>
 </template>
 
 <script>
-	import rate from '@/components/rate.vue';
+	import pitera from '@/components/nothing/pitera.vue';
 	export default {
-	    components:{
-	        rate
-	    },
+		components:{
+			pitera
+		},
 		data() {
 			return {
-				
+				delNum:0,
+				newTop: uni.getSystemInfoSync().statusBarHeight + 40,
+				ifDel:false,
+				total:12,
+				dataList:[
+					{id:1,title:'活动消息',time:'2020.06.17  18:30',content:'恭喜您成为第99位会员，我们将赠送您一张优惠 券，您可以享受8折优惠购买....',status:false},
+					{id:2,title:'活动消息',time:'2020.06.17  18:30',content:'恭喜您成为第99位会员，我们将赠送您一张优惠 券，您可以享受8折优惠购买....',status:false},
+					{id:3,title:'活动消息',time:'2020.06.17  18:30',content:'恭喜您成为第99位会员，我们将赠送您一张优惠 券，您可以享受8折优惠购买....',status:false},
+					{id:4,title:'活动消息',time:'2020.06.17  18:30',content:'恭喜您成为第99位会员，我们将赠送您一张优惠 券，您可以享受8折优惠购买....',status:false},
+					{id:5,title:'活动消息',time:'2020.06.17  18:30',content:'恭喜您成为第99位会员，我们将赠送您一张优惠 券，您可以享受8折优惠购买....',status:false},
+					{id:6,title:'活动消息',time:'2020.06.17  18:30',content:'恭喜您成为第99位会员，我们将赠送您一张优惠 券，您可以享受8折优惠购买....',status:false},
+					{id:7,title:'活动消息',time:'2020.06.17  18:30',content:'恭喜您成为第99位会员，我们将赠送您一张优惠 券，您可以享受8折优惠购买....',status:false},
+					{id:8,title:'活动消息',time:'2020.06.17  18:30',content:'恭喜您成为第99位会员，我们将赠送您一张优惠 券，您可以享受8折优惠购买....',status:false},
+					{id:9,title:'活动消息',time:'2020.06.17  18:30',content:'恭喜您成为第99位会员，我们将赠送您一张优惠 券，您可以享受8折优惠购买....',status:false},
+					{id:10,title:'活动消息',time:'2020.06.17  18:30',content:'恭喜您成为第99位会员，我们将赠送您一张优惠 券，您可以享受8折优惠购买....',status:false},
+					{id:11,title:'活动消息',time:'2020.06.17  18:30',content:'恭喜您成为第99位会员，我们将赠送您一张优惠 券，您可以享受8折优惠购买....',status:false},
+					{id:12,title:'活动消息',time:'2020.06.17  18:30',content:'恭喜您成为第99位会员，我们将赠送您一张优惠 券，您可以享受8折优惠购买....',status:false},
+				],
+				delArrId:[]
 			}
 		},
 		onLoad() {
@@ -36,6 +60,48 @@
 				this.$requst.get('/universal/api.message/message_list',{page: 1,list_rows: 200}).then(res=>{
 					
 				})
+			},
+			// 长按事件
+			longTap(index) {
+				console.log(index);
+				this.ifDel = true;
+				this.dataList[index].status = true;
+				this.delNum++;
+				this.delArrId.push(this.dataList[index].id);
+			},
+			// 删除事件
+			delEv(index) {
+				if(index) {
+					console.log('删除选中项');
+					this.delArrId.forEach(item=>{
+						this.dataList.forEach((item1,index1)=>{
+							if(item == item1.id) {
+								console.log(item);
+								this.dataList.splice(index1,1);
+							}
+						})
+					})
+				} else {
+					console.log('清空所有');
+					this.dataList = [];
+				}
+				this.ifDel = false;
+				this.delNum = 0;
+				this.delArrId = [];
+			},
+			// 选中删除
+			chooseDel(index,id){
+				if(this.ifDel) { 
+					this.dataList[index].status = !this.dataList[index].status;
+					this.delNum = 0;
+					this.delArrId = [];
+					this.dataList.forEach(item=>{
+						if(item.status) {
+							this.delNum++;
+							this.delArrId.push(item.id);
+						}
+					})
+				}
 			}
 		}
 	}