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 @@
-
-
-
-
-
- {{item.name}}
- {{item.subtitle}}
-
-
- 限时优惠
-
-
-
-
-
-
-
-
- {{item.name}}
- ¥{{item.price}}
- 限时优惠
-
-
-
-
-
-
-
-
-
-
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 @@
-
-
-
-
-
- {{item.title}}
- ¥{{item.price}}
- 限时优惠
-
-
-
-
-
-
-
-
-
-
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 @@
+
+
+
+
+
+ {{item[theKey]}}
+
+
+ {{list[0][theKey]}}
+
+ 更多
+
+
+
+
+
+
+
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
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+```
+
+```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 @@
+
+ {{icons[type]}}
+
+
+
+
+
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 0000000..60a1968
Binary files /dev/null and b/components/notices/notice-one/uni-icons/uni.ttf differ
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 @@
-
+
+
@@ -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 @@
+
+ 删除所有
+ 删除({{delNum}})
+
-
-
+
+
- 活动消息
- 2020.06.17 18:30
+ {{item.title}}{{item.id}}
+ {{item.time}}
- 恭喜您成为第99位会员,我们将赠送您一张优惠 券,您可以享受8折优惠购买....
+ {{item.content}}
+
+