From 9ec15c027209a776b430f11ce90494dee79a360b Mon Sep 17 00:00:00 2001
From: chen <2659004835@qq.com>
Date: Thu, 7 Apr 2022 18:14:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Evuex=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       |   2 +-
 components/dates/yy-mm-dd-hh-ss.vue           | 295 ++++++++++++++
 components/list/list-one.vue                  |  75 ----
 components/list/list-two.vue                  | 163 --------
 components/lw-notice/iconFont.vue             |  61 ---
 components/lw-notice/icons.js                 |   6 -
 components/lw-notice/lw-notice.vue            | 373 ------------------
 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
 components/{rate.vue => rates/rate-one.vue}   |   0
 components/shareAll.vue                       |  42 --
 components/status-nav.vue                     | 188 ---------
 jsFile/tools.js                               | 254 ++++++++----
 main.js                                       |   7 +-
 pages/tabbar/pagehome/pagehome.vue            |  81 +++-
 pages/tabbar/project-list/project-list.vue    |   5 +-
 pagesB/i-want-evaluate/i-want-evaluate.vue    |   8 +-
 store/actions.js                              |   1 +
 store/index.js                                |  16 +
 store/modules/moduleA.js                      |  88 +++++
 store/modules/moduleB.js                      |  87 ++++
 store/mutations.js                            |   1 +
 store/readme.md                               |   0
 26 files changed, 1301 insertions(+), 1003 deletions(-)
 create mode 100644 components/dates/yy-mm-dd-hh-ss.vue
 delete mode 100644 components/list/list-one.vue
 delete mode 100644 components/list/list-two.vue
 delete mode 100644 components/lw-notice/iconFont.vue
 delete mode 100644 components/lw-notice/icons.js
 delete mode 100644 components/lw-notice/lw-notice.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
 rename components/{rate.vue => rates/rate-one.vue} (100%)
 delete mode 100644 components/shareAll.vue
 delete mode 100644 components/status-nav.vue
 create mode 100644 store/actions.js
 create mode 100644 store/index.js
 create mode 100644 store/modules/moduleA.js
 create mode 100644 store/modules/moduleB.js
 create mode 100644 store/mutations.js
 create mode 100644 store/readme.md

diff --git a/App.vue b/App.vue
index 6523090..87d5562 100644
--- a/App.vue
+++ b/App.vue
@@ -20,7 +20,7 @@
 			// #endif
 		},
 		onShow: function() {
-			if(uni.getStorageSync('phone_active')){
+			if(uni.getStorageSync('token')){
 				// 刷新token
 				this.$toolAll.tools.refreshToken();
 			}
diff --git a/components/dates/yy-mm-dd-hh-ss.vue b/components/dates/yy-mm-dd-hh-ss.vue
new file mode 100644
index 0000000..eab00e0
--- /dev/null
+++ b/components/dates/yy-mm-dd-hh-ss.vue
@@ -0,0 +1,295 @@
+<template>
+	<view class="datetime-picker">
+		<view class="mask" :class="{ show: open }" @touchmove.stop.prevent catchtouchmove="true"></view>
+		<view class="wrap" :class="{ show: open }">
+			<view class="picker-header" @touchmove.stop.prevent catchtouchmove="true">
+				<view class="btn-picker cancel" @click="open = false">取消</view>
+				<view class="btn-picker submit" @click="_onSubmit">确定</view>
+			</view>
+			<view class="picker-body">
+				<picker-view :value="value" @change="_onChange">
+					<picker-view-column>
+						<view class="column-item" v-for="item in years" :key="item">
+							{{ item + "年" }}
+						</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="column-item" v-for="item in months" :key="item">
+							{{ formatNum(item) + "月" }}
+						</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="column-item" v-for="item in days" :key="item">
+							{{ formatNum(item) + "日" }}
+						</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="column-item" v-for="item in hours" :key="item">
+							{{ formatNum(item) + "时" }}
+						</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="column-item" v-for="item in minutes" :key="item">
+							{{ formatNum(item) + "分" }}
+						</view>
+					</picker-view-column>
+				</picker-view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "buuug7-simple-datetime-picker",
+		props: {
+			startYear: {
+				type: Number,
+				default: 2000,
+			},
+			endYear: {
+				type: Number,
+				default: 2030,
+			},
+		},
+
+		data() {
+			return {
+				open: false,
+				years: [],
+				months: [],
+				days: [],
+				hours: [],
+				minutes: [],
+				currentDate: new Date(),
+				year: "",
+				month: "",
+				day: "",
+				hour: "",
+				minute: "",
+				value: [0, 0, 0, 0, 0],
+			};
+		},
+
+		mounted() {
+			this.init();
+		},
+
+		watch: {
+			month() {
+				this.initDays();
+			},
+		},
+
+		methods: {
+			init() {
+				this.initYears();
+				this.initMonths();
+				this.initDays();
+				this.initHours();
+				this.initMinutes();
+				this.setSelectValue();
+			},
+
+			initYears() {
+				const years = [];
+				for (let year = this.startYear; year <= this.endYear; year++) {
+					years.push(year);
+					if (this.currentDate.getFullYear() === year) {
+						this.$set(this.value, 0, year - this.startYear);
+					}
+				}
+				this.years = years;
+			},
+
+			initMonths() {
+				const months = [];
+				for (let month = 1; month <= 12; month++) {
+					months.push(month);
+					if (this.currentDate.getMonth() + 1 === month) {
+						this.$set(this.value, 1, month - 1);
+					}
+				}
+				this.months = months;
+			},
+
+			initDays() {
+				const value = this.value;
+				const selectedYear = this.years[value[0]];
+				const selectedMonth = this.months[value[1]];
+				const days = [];
+				const totalDays = new Date(selectedYear, selectedMonth, 0).getDate();
+				for (let day = 1; day <= totalDays; day++) {
+					days.push(day);
+					if (this.currentDate.getDate() === day) {
+						this.$set(value, 2, day - 1);
+					}
+				}
+				this.days = days;
+			},
+
+			initHours() {
+				const hours = [];
+				for (let hour = 0; hour <= 23; hour++) {
+					hours.push(hour);
+					if (this.currentDate.getHours() === hour) {
+						this.$set(this.value, 3, hour);
+					}
+				}
+				this.hours = hours;
+			},
+
+			initMinutes() {
+				const minutes = [];
+				for (let minute = 0; minute < 60; minute++) {
+					minutes.push(minute);
+					if (this.currentDate.getMinutes() === minute) {
+						this.$set(this.value, 4, minute);
+					}
+				}
+				this.minutes = minutes;
+			},
+
+			show() {
+				this.open = true;
+			},
+
+			hide() {
+				this.open = false;
+			},
+
+			_onChange(e) {
+				this.value = e.detail.value;
+				this.setSelectValue();
+			},
+
+			setSelectValue() {
+				const v = this.value;
+
+				this.year = this.years[v[0]];
+				this.month = this.months[v[1]];
+				this.day = this.days[v[2]];
+				this.hour = this.hours[v[3]];
+				this.minute = this.minutes[v[4]];
+			},
+
+			_onSubmit() {
+				const {
+					year,
+					month,
+					day,
+					hour,
+					minute,
+					formatNum
+				} = this;
+				const result = {
+					year: formatNum(year),
+					month: formatNum(month),
+					day: formatNum(day),
+					hour: formatNum(hour),
+					minute: formatNum(minute),
+				};
+				this.$emit("submit", result);
+				this.hide();
+			},
+
+			formatNum(num) {
+				return num < 10 ? "0" + num : num + "";
+			},
+		},
+	};
+</script>
+
+<style lang="scss">
+	$transition: all 0.3s ease;
+	$primary: #488ee9;
+
+	.datetime-picker {
+		position: relative;
+		z-index: 999;
+
+		picker-view {
+			height: 100%;
+		}
+
+		.mask {
+			position: fixed;
+			z-index: 1000;
+			top: 0;
+			right: 0;
+			bottom: 0;
+			left: 0;
+			background-color: rgba(0, 0, 0, 0.6);
+			visibility: hidden;
+			opacity: 0;
+			transition: $transition;
+
+			&.show {
+				visibility: visible;
+				opacity: 1;
+			}
+		}
+
+		.wrap {
+			z-index: 1001;
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			width: 100%;
+			transition: $transition;
+			transform: translateY(100%);
+
+			&.show {
+				transform: translateY(0);
+			}
+		}
+
+		.picker-header {
+			display: flex;
+			flex-direction: row;
+			justify-content: space-between;
+			align-items: center;
+			padding: 8px 8px;
+			background-color: darken(#fff, 2%);
+			background-color: #fff;
+		}
+
+		.picker-body {
+			width: 100%;
+			height: 420rpx;
+			overflow: hidden;
+			background-color: #fff;
+		}
+
+		.column-item {
+			text-overflow: ellipsis;
+			white-space: nowrap;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+
+		.btn-picker {
+			position: relative;
+			display: inline-block;
+			padding-left: 10px;
+			padding-right: 10px;
+			box-sizing: border-box;
+			text-align: center;
+			text-decoration: none;
+			line-height: 2;
+			-webkit-tap-highlight-color: transparent;
+			overflow: hidden;
+			background-color: #eee;
+			font-size: 14px;
+			// border-radius: 2px;
+			color: #000;
+			cursor: pointer;
+		}
+
+		.btn-picker.submit {
+			background-color: $primary;
+			color: #fff;
+		}
+	}
+</style>
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/lw-notice/iconFont.vue b/components/lw-notice/iconFont.vue
deleted file mode 100644
index 2a9093d..0000000
--- a/components/lw-notice/iconFont.vue
+++ /dev/null
@@ -1,61 +0,0 @@
-<template>
-     <text :style="{ color: color, 'font-size': size + 'rpx' }" :class="{isTheme:isTheme}" class="lw-icons"
-         @click="_onClick">{{icons[icon]}}</text>
- </template>
-
- <script>
-     import icons from './icons.js';
-     // #ifdef APP-NVUE
-     var domModule = weex.requireModule('dom');
-     domModule.addRule('fontFace', {
-         'fontFamily': 'iconfont',
-         'src': 'url(\'https://at.alicdn.com/t/font_2294175_vq7ymlkpbtm.ttf\')',
-     });
-     // #endif
-     export default {
-         name: 'UniIcons',
-         props: {
-             icon: {
-                 type: String,
-                 default: ''
-             },
-             color: {
-                 type: String,
-                 default: '#333333'
-             },
-             size: {
-                 type: [Number, String],
-                 default: 50
-             },
-             isTheme: {
-                 type: Boolean,
-                 default: false
-             }
-         },
-         data() {
-             return {
-                 icons: icons
-             }
-         },
-         methods: {
-             _onClick() {
-                 this.$emit('click')
-             }
-         }
-     }
- </script>
-
- <style lang="scss" scoped>
-     /* #ifndef APP-NVUE */
-     @font-face {
-         font-family: iconfont;
-         src: url('https://at.alicdn.com/t/font_2294175_vq7ymlkpbtm.ttf')
-     }
-
-     /* #endif */
-     .lw-icons {
-         font-family: iconfont;
-         text-decoration: none;
-         text-align: center;
-     }
- </style>
diff --git a/components/lw-notice/icons.js b/components/lw-notice/icons.js
deleted file mode 100644
index 67e17e3..0000000
--- a/components/lw-notice/icons.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export default {
-	'aixin':'\ue8ab',
-	'rules':'\ue909',
-	'sound':'\ue8ea',
-	'arrowright':'\uee02'
-}
diff --git a/components/lw-notice/lw-notice.vue b/components/lw-notice/lw-notice.vue
deleted file mode 100644
index 3e15a24..0000000
--- a/components/lw-notice/lw-notice.vue
+++ /dev/null
@@ -1,373 +0,0 @@
-<template>
-    <view>
-        <view class="contentBox" v-if="list.length" @click="toEmit()"
-            :style="'color:' + color + ';background-color:' + backgroundColor + ';height:' + height+'rpx;'">
-            <view v-if="showIcon" class="supBox">
-                <lwIcon :size="32" :color="iconColor" icon="sound"></lwIcon>
-            </view>
-            <view v-if="list.length > 1" class="content">
-                <view v-for="(item, index) in list" :key="index" @tap.stop="dangGao(index)">
-                    <view class="loopItemBase" :class="index==0&&firstIn?'fistInClass':''"
-                        :animation="realAnimation(index)" v-if="aindexArr.includes(index)"
-                        :style="'line-height:'+height+'rpx;'">
-                        {{ item }}
-                    </view>
-                </view>
-            </view>
-            <view v-if="list.length == 1" class="content">
-                <view :style="'line-height:'+height+'rpx;'" @tap.stop="dangGao(0)" class="loopItemBaseShow">{{ list[0] }}</view>
-            </view>
-            <view v-if="showMore" class="offBox">
-                <lwIcon :size="32" :color="moreColor" icon="arrowright"></lwIcon>
-            </view>
-        </view>
-    </view>
-</template>
-
-<script>
-    /*
-lw-notice公告上下轮询组件（组件内依赖了自有的字体图标组件，可自行替换为uni或自身项目的图标组件）
-color:字体颜色
-backgroundColor:背景色
-list:要循环的列表数据
-height:组件高度
-showScale:是否有缩放动画
-runTime:间隔切换时间
-showIcon:是否显示头部小喇叭
-iconColor:小喇叭的颜色
-showMore:是否显示尾部更多
-moreColor:显示更多的颜色
-*/
-    import lwIcon from './iconFont.vue'
-    export default {
-        components: {
-            lwIcon
-        },
-        props: {
-            color: {
-                type: String,
-                default: '#666666'
-            },
-            backgroundColor: {
-                type: String,
-                default: '#f5f5f5'
-            },
-            list: {
-                type: Array,
-                default: function(){
-                    return []
-                }
-            },
-            height: {
-                type: Number,
-                default: 40
-            },
-            showScale: {
-                type: Boolean,
-                default: false
-            },
-            runTime: {
-                type: Number,
-                default: 4000
-            },
-            showIcon: {
-                type: Boolean,
-                default: false
-            },
-            showMore: {
-                type: Boolean,
-                default: false
-            },
-            iconColor: {
-                type: String,
-                default: '#aaaaaa'
-            },
-            moreColor: {
-                type: String,
-                default: '#aaaaaa'
-            }
-        },
-        data() {
-            return {
-                // 第一次展示
-                firstIn: true,
-                // 当前显示的项
-                aindexArr: [],
-                // 创建动画的实例
-                animation: null,
-                // 动画对象一
-                animationData: null,
-                // 动画对象二
-                animationDataTwo: null,
-                // 显示项和动画之间的映射关系
-                indexLinkAnimationObj: {},
-                setTimerOne: null,
-                setTimerTwo: null,
-                setTimerThree: null,
-                setTimerFour: null,
-                setTimerFive: null
-            };
-        },
-        beforeDestroy() {
-            this.resetPage()
-        },
-        computed: {
-            // 计算展示项应该展示的动画
-            realAnimation() {
-                return function(value) {
-                    if (this.indexLinkAnimationObj[value]) {
-                        return this[this.indexLinkAnimationObj[value]]
-                    } else {
-                        return {}
-                    }
-                }
-            }
-        },
-        methods: {
-            // 开始 按3000毫秒的运行示例图
-            // 1.a显示 执行动画1 锁定动画1 0ms
-            // 2.b显示 执行动画2 锁定动画2 200ms
-            // 3.a隐藏 停止动画1 释放动画1 300ms
-            // 4.c显示 执行动画1 锁定动画1 400ms
-            // 5.b隐藏 停止动画2 释放动画2 500ms
-            // 6.a显示 执行动画2 锁定动画2 600ms
-            // 7.c隐藏 停止动画1 释放动画1 700ms
-            // 8.b显示 执行动画1 锁定动画1 800ms
-            // 9.a隐藏 停止动画2 释放动画2 900ms
-            // 10.c显示 执行动画2 锁定动画2 1000ms
-            initPage() {
-                this.resetPage();
-                if (this.list && this.list.length) {
-                    if (this.list.length > 1) {
-                        this.aindexArr.push(0);
-                        this.animation = uni.createAnimation({
-                            timingFunction: 'linear',
-                        })
-                        // #ifdef H5
-                        this.animationDataH5 = this.animation.translateY(-100).step({
-                            duration: 10000
-                        }).export()
-                        // #endif
-                        this.runAnimation(0, true);
-                    }
-                }
-            },
-            // 重置页面动画
-            resetPage() {
-                // 移除所有定时器
-                clearTimeout(this.setTimerOne);
-                clearTimeout(this.setTimerTwo);
-                clearTimeout(this.setTimerThree);
-                clearTimeout(this.setTimerFour);
-                clearTimeout(this.setTimerFive);
-                // 重置页面属性
-                this.aindexArr = [];
-                this.animation = null;
-                this.animationData = null;
-                this.animationDataTwo = null;
-                this.indexLinkAnimationObj = {};
-            },
-            // 执行动画方法(此方法内不要清除赋值的定时器)
-            runAnimation(value, firstIn) {
-                let that = this;
-                if (!firstIn) {
-                    that.aindexArr.push(value);
-                }
-                // 获取执行动画对象
-                let lockText = that.createAni(firstIn);
-                // 延迟50毫秒执行(等待dom渲染)
-                that.setTimerOne = setTimeout(() => {
-                    // 创建执行动画和执行方之间的映射关系
-                    that.indexLinkAnimationObj[value] = lockText;
-                    // console.log('已经创建完成绑定关系')
-                    // console.log(that.indexLinkAnimationObj)
-                    // 获取基础执行时间单位
-                    let unitRunTime = (that.runTime - 50) / 6;
-                    let waitTime = firstIn ? unitRunTime * 4 : unitRunTime * 5;
-                    let waitTimeTwo = firstIn ? (that.runTime - unitRunTime) : that.runTime;
-                    // #ifdef H5
-                    waitTimeTwo = firstIn ? (that.runTime - (1.5 * unitRunTime)) : that.runTime;
-                    //H5重新刷新一下动画绑定关系
-                    if (firstIn) {
-                        that.aindexArr.splice(0, 1);
-                        that.aindexArr.push(0);
-                    }
-                    // #endif
-
-                    // 开启下一个动画
-                    that.setTimerTwo = setTimeout(() => {
-                        let Index = value == that.list.length - 1 ? 0 : value + 1;
-                        that.runAnimation(Index)
-                    }, waitTime)
-                    // 释放上一个执行方
-                    that.setTimerThree = setTimeout(() => {
-                        let index = that.aindexArr.indexOf(value);
-                        that.aindexArr.splice(index, 1)
-                        that.firstIn = false;
-                        delete that.indexLinkAnimationObj[value]
-                    }, waitTimeTwo)
-                }, 50)
-            },
-            // 创建动画方法
-            createAni(firstIn) {
-                let that = this;
-                let unitRunTime = (that.runTime - 50) / 6;
-
-                let delayTime = unitRunTime * 4;
-                let durationTime = unitRunTime;
-                let dispairTime = unitRunTime;
-                // #ifdef H5
-                delayTime = unitRunTime * 3.5;
-                dispairTime = unitRunTime * 1.5;
-                // #endif
-
-                let showTransformHeight = -uni.upx2px(that.height);
-                let hideTransformHeight = showTransformHeight * 2;
-                // 创建动画
-                if (that.showScale) {
-                    if (firstIn) {
-                        // that.animation.translateY(1).scale(1,1).step({ duration: 5 });
-                        that.animation.translateY(showTransformHeight).scale(0.5, 0.5).step({
-                            delay: delayTime,
-                            duration: dispairTime
-                        });
-                    } else {
-                        that.animation.translateY(showTransformHeight).scale(1, 1).step({
-                            duration: durationTime
-                        });
-                        that.animation.translateY(hideTransformHeight).scale(0.5, 0.5).step({
-                            delay: delayTime,
-                            duration: dispairTime
-                        });
-                    }
-                } else {
-                    if (firstIn) {
-                        // that.animation.translateY(1).step({ duration: 5 });
-                        that.animation.translateY(showTransformHeight).step({
-                            delay: delayTime,
-                            duration: dispairTime
-                        });
-                    } else {
-                        that.animation.translateY(showTransformHeight).step({
-                            duration: durationTime
-                        });
-                        that.animation.translateY(hideTransformHeight).step({
-                            delay: delayTime,
-                            duration: dispairTime
-                        });
-                    }
-                }
-                // 判断动画赋值项并赋值
-                if (!that.animationData) {
-                    that.animationData = that.animation.export()
-                    that.setTimerFour = setTimeout(() => {
-                        clearTimeout(that.setTimerFour)
-                        that.animationData = false;
-                    }, that.runTime)
-                    return 'animationData'
-                } else {
-                    that.animationDataTwo = that.animation.export()
-                    that.setTimerFive = setTimeout(() => {
-                        clearTimeout(that.setTimerFive)
-                        that.animationDataTwo = false;
-                    }, that.runTime)
-                    return 'animationDataTwo'
-                }
-            },
-            // 抛出点击事件
-            toEmit() {
-                let that = this
-                if (that.list.length == 1) {
-                    that.$emit('itemClick', that.list[0])
-                } else {
-                    that.$emit('itemClick', that.list[that.aindexArr[0]])
-                }
-            },
-			dangGao(index){
-				let that = this
-				if (that.list.length != 0) {
-				    that.$emit('dangGao', index)
-				}
-			}
-        },
-        created() {
-
-        },
-        mounted() {
-            // 判断list有值后开启动画
-            // setTimeout()
-            this.initPage()
-        },
-        watch: {
-            list(value) {
-                this.initPage()
-            }
-        }
-    };
-</script>
-
-<style lang="scss" scoped>
-    .contentBox {
-        width: 100%;
-        display: flex;
-        // padding: 0 20rpx;
-        align-items: center;
-        box-sizing: border-box;
-        font-size: 24rpx;
-        .supBox {
-            width: 50rpx;
-            display: flex;
-            justify-content: flex-start;
-        }
-
-        .offBox {
-            width: 50rpx;
-            display: flex;
-            justify-content: flex-end;
-        }
-
-        .content {
-            width: 100%;
-            flex-grow: 1;
-            height: 100%;
-            display: flex;
-            overflow: hidden;
-            position: relative;
-            align-items: center;
-            box-sizing: border-box;
-            justify-content: center;
-
-            .loopItemBase {
-                left: 0;
-                top: 100%;
-                width: 100%;
-                height: 100%;
-                overflow: hidden;
-                font-size: 28rpx;
-                text-align: left;
-                position: absolute;
-                white-space: nowrap;
-                align-items: center;
-                text-overflow: ellipsis;
-
-                &.fistInClass {
-                    top: 0;
-                }
-            }
-
-            .loopItemBaseShow {
-				position: absolute;
-                top: 0;
-                left: 0;
-                width: 100%;
-                // height: 100%;
-                overflow: hidden;
-                font-size: 28rpx;
-                text-align: left;
-                white-space: nowrap;
-                align-items: center;
-                text-overflow: ellipsis;
-            }
-        }
-    }
-</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/components/rate.vue b/components/rates/rate-one.vue
similarity index 100%
rename from components/rate.vue
rename to components/rates/rate-one.vue
diff --git a/components/shareAll.vue b/components/shareAll.vue
deleted file mode 100644
index 7cbd813..0000000
--- a/components/shareAll.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-<template>
-    <view>
-        <view v-if="showShare" @tap="closeShare" style="position: fixed;top: 0;right: 0;left: 0;bottom: 0;background-color: rgba(0,0,0,.5);z-index: 10;">
-        </view>
-        <view v-if="showShare" style="display: flex;flex-direction: column;justify-content: space-around;
-        position: fixed;bottom: 0;left: 0;right: 0;z-index: 100; background-color: #FFFFFF;padding: 40rpx;">
-            <view class="posir" v-for="(item,index) in cateArr" :key="index" style="display: flex;justify-content: center;align-items: center;flex-direction: column;width: 25%;">
-                <image style="width: 100rpx;height: 100rpx;margin-bottom: 10rpx;" :src="item.src" mode=""></image>
-                <view class="fon28 color33">{{item.title}}</view>
-                <button data-name="shareBtn" open-type="share" plain="true" class="posia" style="top: 0;left: 0;right: 0;bottom: 0;opacity: 0;">分享</button>
-            </view>
-        </view>
-    </view>
-</template>
-
-<script>
-    export default {
-        name:'shareAll',
-        props:{
-            showShare:{
-                type:Boolean,
-                default:false
-            }
-        },
-        data() {
-            return {
-                cateArr:[
-                    {src:'/static/img/share/weix.png',title:'微信好友'},
-                ]
-            };
-        },
-        methods:{
-            closeShare(){
-                this.$emit('closeShare')
-            }
-        }
-    }
-</script>
-
-<style>
-
-</style>
diff --git a/components/status-nav.vue b/components/status-nav.vue
deleted file mode 100644
index b0ed12c..0000000
--- a/components/status-nav.vue
+++ /dev/null
@@ -1,188 +0,0 @@
-<template>
-    <view class="status-box statusHNH">
-		<!-- 网络、电量栏 start -->
-        <view :style="{height: statusBarHeight+'px',background: backgroudColor}"></view>
-		<!-- 网络、电量栏 end -->
-		
-		<!-- 头部状态栏 start -->
-        <view class="status-nav" 
-			:style="{background: backgroudColor,height: navBarHeight+'px'}">
-            <!-- 返回键 -->
-			<view class="return-box" @tap="backEv" v-if="ifReturn" 
-				:style="{height: navBarHeight+'px'}">
-				<slot name="leftContent">
-					<i class="icon icon-return" style="font-size: 32rpx;"
-						:style="{color: returnColor}"></i>
-				</slot>
-			</view>
-            <!-- 标题 -->
-			<view class="tab-title" v-if="ifTitle && ifNet" 
-				:style="{
-					color: titleColor,
-					justifyContent: ifCenter ? 'center' : '',
-					padding: ifCenter ? '0px' : `${ifReturn ? '0 38' : '0 15'}px`}">
-				<view class="title-box" :class="['','clips1','clips2'][clipNumber]" :style="{maxWidth: ifCenter ? '360rpx' : '70%'}">{{navBarTitle}}</view>
-			</view>
-			<view class="tab-title" v-if="!ifNet"
-				:style="{
-					color: titleColor,
-					justifyContent: ifCenter ? 'center' : '',
-					padding: ifCenter ? '0px' : `${ifReturn ? '0 38' : '0 15'}px`}">
-				<view class="title-box" :class="['','clips1','clips2'][clipNumber]" :style="{maxWidth: ifCenter ? '360rpx' : '70%'}">{{netText}}<text @tap="refreshEv" style="color: #3875F6;margin-left: 20rpx;">刷新</text></view>
-			</view>
-        </view>
-		<!-- 头部状态栏 end -->
-    </view>
-</template>
-
-<script>
-    export default {
-		name:'status-nav',
-        props:{
-			//状态栏、导航栏背景颜色
-			backgroudColor:{
-			    type:String,
-			    default:'#FFFFFF'
-			},
-			// 默认导航栏高度
-			navBarHeight: {
-				type:Number,
-				default:40
-			},
-			//是否显示返回键
-            ifReturn:{
-                type:Boolean,
-                default:true
-            },
-			// 返回键颜色
-			returnColor: {
-				type:String,
-				default:'#000'
-			},
-			//是否显示标题
-			ifTitle:{
-			    type:Boolean,
-			    default:true
-			},
-			// 导航栏标题
-			navBarTitle: {
-				type:String,
-				default:''
-			},
-			// 标题最多几行显示
-			clipNumber: {
-				type:Number,
-				default:1
-			},
-			//标题颜色
-            titleColor:{
-                type:String,
-                default:'#333333'
-            },
-			// 标题是否居中
-			ifCenter: {
-				type:Boolean,
-				default: true
-			},
-			// 来自哪里
-			fromWhere: {
-				type:Number,
-				default:0
-			}
-        },
-		data(){
-			return {
-				statusBarHeight: uni.getSystemInfoSync().statusBarHeight,
-				ifNet:true ,// 是否有网络
-				netText:'当前无网络',
-				netTimer:null
-			}
-		},
-		mounted() {
-			// 网络监测
-			this.$toolAll.tools.networkStatus();
-			// 缓存状态栏+标题栏的高度
-			// const query = wx.createSelectorQuery().in(this)
-			// query.select('.statusHNH').boundingClientRect((rect) => {
-			// 	uni.setStorageSync('statusHNH',rect.height)
-			// }).exec();
-			
-			// 获取当前页面路径
-			this.$toolAll.tools.obtainUrl();
-			this.$toolAll.tools.obtainUrlParam();
-			setTimeout(()=>{
-				this.ifNet = uni.getStorageSync('isNet');
-			},500)
-		},
-		methods:{
-			// 刷新网络事件
-			refreshEv(){
-				this.netText = '正在刷新...';
-				let outTime = 0;//十秒超时
-				this.netTimer = setInterval(()=>{
-					outTime++;
-					this.$toolAll.tools.networkStatus();
-					if(uni.getStorageSync('isNet')) {
-						clearInterval(this.netTimer);
-						this.ifNet = true;
-					} 
-					if(outTime==10) {
-						clearInterval(this.netTimer);
-						this.netText = '刷新失败';
-						outTime = 0;
-					}
-				},1000)
-			},
-			//返回事件
-			backEv(){
-				if(uni.getStorageSync('outside')*1==2){
-					this.fromWhere = uni.getStorageSync('outside')*1;
-				}
-				switch (this.fromWhere){
-					case 1:
-					case 2:
-					uni.navigateTo({
-						url:'/pages/tabbar/pagehome/pagehome'
-					})
-					uni.setStorageSync('outside',0)
-						break;
-					case 0:
-					uni.navigateBack({
-						delta:1
-					})
-						break;
-					default:
-						break;
-				}
-			}
-		}
-    }
-</script>
-
-<style scoped>
-	.clips1{display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 1;overflow: hidden;text-overflow: ellipsis;word-wrap: break-word;word-break:break-all;}
-	.clips2{display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 2;overflow: hidden;text-overflow: ellipsis;word-wrap: break-word;word-break:break-all;}
-	
-	.status-box{
-		position: fixed;top: 0;left: 0;right: 0;z-index: 10;
-	}
-	.status-nav{
-		width: 100%;
-		position: relative;
-		display: flex;
-		align-items: center;
-	}
-	.return-box {
-		display: flex;justify-content: center;align-items: center;flex-shrink: 0;
-		position: absolute;
-		padding: 0rpx 10rpx;
-	}
-	.return-box i {font-size: 56rpx;}
-	.tab-title{
-		width: 100%;
-		font-size: 32rpx;
-		display: flex;
-        font-weight: bold;
-	}
-	.tab-title .title-box{margin-top: -4rpx;}
-</style>
diff --git a/jsFile/tools.js b/jsFile/tools.js
index 531362d..2f5df27 100644
--- a/jsFile/tools.js
+++ b/jsFile/tools.js
@@ -1,6 +1,6 @@
+const app = getApp();
 const tools = {
 	timer:'',
-	timerNot:'',
 	// 埋点倒计时
 	daoTime(){
 		let daoTime = uni.getStorageSync('daoTime')
@@ -9,13 +9,10 @@ const tools = {
 			daoTime = uni.getStorageSync('daoTime')
 			this.timer = setInterval(()=>{
 				uni.setStorageSync('daoTime',daoTime--)//设置倒计时
-				// console.log('埋点倒计时初次：',daoTime);
-				// console.log('埋点长度初次：',uni.getStorageSync('maiList').length);
 				if(uni.getStorageSync('daoTime')<=0 || uni.getStorageSync('maiList').length==5){
 					uni.removeStorageSync('daoTime')//清空倒计时
 					clearInterval(this.timer)//关闭倒计时
 					// console.log('上/报，埋点');
-					// reportBuriedPoint(uni.getStorageSync('maiList'))//上报事件
 					uni.removeStorageSync('maiList')//清空上报参数
 					this.daoTime()//重新倒计时
 				}
@@ -23,13 +20,10 @@ const tools = {
 		} else {//继续当前倒计时倒计
 			this.timer = setInterval(()=>{
 				uni.setStorageSync('daoTime',daoTime--)//设置倒计时
-				// console.log('埋点倒计时：',daoTime);
-				// console.log('埋点长度：',uni.getStorageSync('maiList').length);
 				if(uni.getStorageSync('daoTime')<=0 || uni.getStorageSync('maiList').length==5){
 					uni.removeStorageSync('daoTime')//清空倒计时
 					clearInterval(this.timer)//关闭倒计时
 					// console.log('上报，埋点');
-					// reportBuriedPoint(uni.getStorageSync('maiList'))//上报事件
 					uni.removeStorageSync('maiList')//清空上报参数
 					this.daoTime()//重新倒计时
 				}
@@ -39,15 +33,6 @@ const tools = {
 	closeTimer(){
 		clearInterval(this.timer)//关闭倒计时
 		console.log('倒计时清空了');
-		clearInterval(this.timerNot)//关闭倒计时
-	},
-	maiDian(data){//埋点事件
-		let maiList = uni.getStorageSync('maiList')
-		// console.log(maiList);
-		if(maiList==''){
-			maiList = [data]
-		} else maiList.push(data)
-		uni.setStorageSync('maiList',maiList)
 	},
 	weekDate(){//获取未来七天星期几，几号
 		let date = new Date()
@@ -63,10 +48,6 @@ const tools = {
     isPhone:function(phone){
         // 手机号正则表达式
         let reg_tel = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
-        // if(!reg_tel.test(phone)){
-        //     return true
-        // }
-        // return false
 		return !reg_tel.test(phone);
     },
 	// 电子邮箱验证
@@ -83,6 +64,21 @@ const tools = {
     hideMPhone(phone){
         return `${phone.substr(0, 3)}****${phone.substr(7)}`
     },
+	// 手机号中间加字符
+	phoneAddChat(phone,startNum=3,endNum=7,character=' '){
+		let phoneStr = phone;
+		phoneStr = phoneStr.replace(/\s*/g, "");
+		var phoneArr = [];
+		for(var i = 0; i < phoneStr.length; i++){
+			if (i==startNum||i==endNum){
+				phoneArr.push(`${character}` + phoneStr.charAt(i));
+			} else {
+				phoneArr.push(phoneStr.charAt(i));
+			}
+		}
+		phone = phoneArr.join("");
+		return phone;
+	},
 	// 昵称从第一个字开始，后面的都用"*"代替
 	hideName(name,num){
 	    return `${name.substr(0, 1)}****${name.substr(name.length-1)}`
@@ -113,7 +109,7 @@ const tools = {
 			str = str.toFixed(2);
 			str = str+'';
 		}
-		return str.includes('.') ? str*1 : str = num + '.00';
+		return str.includes('.') ? str : str = num + '.00';
 	},
 	// type:+加、-减、*乘、/除
 	// len:小数后保留几位
@@ -229,6 +225,65 @@ const tools = {
 		// console.log(time2);//1398250549123
 		// console.log(time3);//1398250549000
 	},
+	// 返回当前时间
+	returnCurrentTime(format,type) {
+		let date = new Date();
+		let year = date.getFullYear(); // 年
+		let month = date.getMonth() + 1; // 月
+		let day = date.getDate(); // 日
+		let time = date.getHours(); // 时
+		let minu = date.getSeconds(); // 分
+		let second = date.getMinutes(); // 秒
+		
+		let newTime = '';
+		switch (type){
+			case 0:
+			newTime = `${year}${format}${month < 10? '0' + month : month}${format}${day < 10 ? '0' + day : day} ${time < 10 ? '0' + time : time}:${minu < 10 ? '0' + minu : minu}`; // 2022-03-31 16:05
+				break;
+			case 1:
+			newTime = `${year}${format}${month < 10? '0' + month : month}${format}${day < 10 ? '0' + day : day} ${time < 10 ? '0' + time : time}:${minu < 10 ? '0' + minu : minu}:${second < 10 ? '0' + second : second}`; // 2022-03-31 16:10:07
+				break;
+		}
+		return newTime;
+	},
+	// 返回时间xx天xx小时xx分钟
+	returnTimeFormat(startTime,endTime){
+		console.log(startTime,endTime);
+		let newTimeFormat = '';
+		let currentTimestamp = this.timeToTimestamp(endTime) - this.timeToTimestamp(startTime);
+		return this.returnTimestampToTime(currentTimestamp);
+	},
+	// 返回时间戳转时、分对象
+	returnTimestampToTime(timestamp){
+		let timeStr = '';
+		var day = parseInt((timestamp % (1000 * 60 * 60 * 24 * 12)) / (1000 * 60 * 60 * 24));
+		var hours = parseInt((timestamp % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
+		var seconds = parseInt((timestamp % (1000 * 60 * 60)) / (1000 * 60));
+		day = day < 10 ?  ('0' + day) : day;
+		hours = hours < 10 ? ('0' + hours) : hours;
+		seconds = seconds < 10 ? ('0' + seconds) : seconds;
+		if(day*1==0) {
+			if(hours*1==0) {
+				seconds*1==0 ? timeStr = 0 : timeStr = `${seconds}分钟`;
+			} else {
+				timeStr = `${hours}小时${seconds}分钟`;
+			}
+		} else {
+			timeStr = `${day}天${hours}小时${seconds}分钟`;
+		}
+		return timeStr;
+	},
+	// 时间戳转时分秒 00 : 00 : 00
+	formatDuring: function(mss) {
+		// let dangTime = Math.round(new Date()/1000)//获取当前时间戳
+		var hours = parseInt((mss % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
+		var seconds = parseInt((mss % (1000 * 60 * 60)) / (1000 * 60));
+		var minutes = (mss % (1000 * 60)) / 1000;
+		hours = hours < 10 ? ('0' + hours) : hours;
+		seconds = seconds < 10 ? ('0' + seconds) : seconds;
+		minutes = minutes < 10 ? ('0' + minutes) : minutes;
+		return hours + ' : ' + seconds + ' : ' + minutes;
+	},
 	// 随机数生成
 	randomStr(){
 		var strData = "";
@@ -268,30 +323,18 @@ const tools = {
         return newObj
     },
     // 提示方法
-    showToast: function(msg, icon,time) {
-        // 弹框图标：none默认无图标、loading、success
-        var newIncon = 'none';
-        if (icon) {newIncon = icon;}
+    showToast: function(msg, icon='none',time) {
         // 弹框显示时间：默认2秒
         var newTime = 2000
         if (time) {newTime = time;}
         return uni.showToast({
             title: msg,
-            icon: newIncon,
+            icon: icon,
             duration:newTime
         })
     },
-	formatDuring: function(mss) {
-		// let dangTime = Math.round(new Date()/1000)//获取当前时间戳
-		var hours = parseInt((mss % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
-		var minutes = parseInt((mss % (1000 * 60 * 60)) / (1000 * 60));
-		var seconds = (mss % (1000 * 60)) / 1000;
-		hours = hours < 10 ? ('0' + hours) : hours;
-		minutes = minutes < 10 ? ('0' + minutes) : minutes;
-		seconds = seconds < 10 && seconds >= 1 ? ('0' + seconds) : seconds;
-		return hours + ' : ' + minutes + ' : ' + seconds;
-	},
-	escape2Html(str) {//富文本
+	// 富文本
+	escape2Html(str) {
 		var arrEntities = { 'lt': '<', 'gt': '>', 'nbsp': ' ', 'amp': '&', 'quot': '"' };
 		return str.replace(/&(lt|gt|nbsp|amp|quot|src);/ig, function (all, t) { 
 			return arrEntities[t];
@@ -300,39 +343,10 @@ const tools = {
 		.replace(/\<img/g, '<img @tap="pre" style="max-width:100%!important;height:auto" ')
 		.replace(/src=\"/g,'src="https://oss.hmzfyy.cn');
 	},
-	updaX(){//检测小程序版本以及更新小程序
-		// #ifdef MP-WEIXIN
-			// 获取小程序的运行环境、版本号、appId		注意：线上小程序版本号仅支持在正式版小程序中获取，开发版和体验版中无法获取。
-			const accountInfo = wx.getAccountInfoSync();//使用详情：https://developers.weixin.qq.com/miniprogram/dev/api/open-api/account-info/wx.getAccountInfoSync.html
-			var version = accountInfo.miniProgram.version;
-			console.log(version,319);
-			// 检测小程序的更新
-			const updateManager = wx.getUpdateManager()//以下使用详情：https://developers.weixin.qq.com/miniprogram/dev/api/base/update/UpdateManager.html#%E7%A4%BA%E4%BE%8B%E4%BB%A3%E7%A0%81
-			updateManager.onCheckForUpdate(function (res) {
-				// 请求完新版本信息的回调
-				// console.log('检测是否有更新：',res.hasUpdate)
-			})
-			updateManager.onUpdateReady(function (res) {
-				wx.showModal({
-					title: `更新`,
-					content: `新版本${version}已上线，是否重启应用`,
-					success:(res)=> {
-						if (res.confirm) {
-							// 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
-							updateManager.applyUpdate()
-						}
-					}
-				})
-			})
-			updateManager.onUpdateFailed(function (res) {
-				// 新版本下载失败
-				// console.log('新版本下载失败:',res);
-			})
-		// #endif
-	},
-	networkStatus(){//检查网络状态
+	// 检查网络状态
+	networkStatus(){
 		uni.getNetworkType({
-			success: function (res) {
+			success: (res)=> {
 				console.log('当前网络状态：',res.networkType);//none：当前无网络连接
 				if(res.networkType=='none'){
 					uni.setStorageSync('isNet',false)
@@ -341,12 +355,84 @@ const tools = {
 					// 微信小程序原生API性能优化
 					// #ifdef MP-WEIXIN
 						// 连网下，检测小程序是否有更新
-						tools.updaX();
+						this.checkUpdate();
 					// #endif
 				}
 			}
 		});
 	},
+	// app、小程序的检测版本并更新
+	checkUpdate(){
+		// 检测app
+		// #ifdef APP-PLUS
+			
+		// #endif
+		//检测小程序
+		// #ifdef MP-WEIXIN
+			var self = this;
+			// 获取小程序更新机制兼容
+			if (wx.canIUse('getUpdateManager')) {
+				const updateManager = wx.getUpdateManager();//1. 检查小程序是否有新版本发布
+				updateManager.onCheckForUpdate(function(res) {// 请求完新版本信息的回调
+					if (res.hasUpdate) {
+						//检测到新版本，需要更新，给出提示          
+						wx.showModal({
+							title: '更新提示',
+							content: '检测到新版本，是否下载新版本并重启小程序？',
+							success: function(res) {              
+								if (res.confirm) {                
+									//2. 用户确定下载更新小程序，小程序下载及更新静默进行                
+									self.downLoadAndUpdate(updateManager)
+									// 清除所有缓存
+									uni.clearStorage();
+									uni.clearStorageSync();
+								} else if (res.cancel) {                
+									//用户点击取消按钮的处理，如果需要强制更新，则给出二次弹窗，如果不需要，则这里的代码都可以删掉了                
+									wx.showModal({
+										title: '温馨提示~',
+										content: '本次版本更新涉及到新的功能添加，旧版本无法正常访问的哦~',
+										showCancel:false,//隐藏取消按钮
+										confirmText:"确定更新",//只保留确定更新按钮
+										success: function(res) {                    
+											if (res.confirm) {                      
+												//下载新版本，并重新应用                      
+												self.downLoadAndUpdate(updateManager)
+											}
+										}
+									})
+								}
+							}
+						})
+					}
+				})
+			} else { // 如果希望用户在最新版本的客户端上体验您的小程序，可以这样子提示      
+				wx.showModal({
+					title: '提示',
+					content: '当前微信版本过低，无法使用该功能，请升级到最新微信版本后重试。'
+				})
+			}
+		// #endif
+	},
+	/**
+	* 下载小程序新版本并重启应用   
+	* */
+	downLoadAndUpdate(updateManager){    
+		var self = this;
+	    wx.showLoading(); //静默下载更新小程序新版本
+	    updateManager.onUpdateReady(function () {
+			wx.hideLoading(); //新的版本已经下载好，调用 applyUpdate 应用新版本并重启      
+			updateManager.applyUpdate();
+			// 清除缓存
+			uni.clearStorageSync();
+			uni.clearStorage();
+	    })
+	    updateManager.onUpdateFailed(function () { // 新的版本下载失败      
+			wx.showModal({
+				title: '已经有新版本了哟~',
+				content: '新版本已经上线啦~，请您删除当前小程序，重新搜索打开哟~',
+			})
+	    })
+	},
 	// 文本复制
 	clickCopy(data){
 		uni.setClipboardData({
@@ -405,7 +491,7 @@ const tools = {
 					if (res.code) {
 						var params = {code:res.code}
 						uni.request({
-							url: `${uni.getStorageSync('hostapi')}/api/user/login`,
+							url: `${app.globalData.hostapi}/api/user/login`,
 							method: 'post',
 							data: params,
 							header: {
@@ -430,16 +516,17 @@ const tools = {
 		}
 	},
 	// 判断是否授权，没授权，前往登录页面授权
+	authTimer:null,
 	judgeAuth(){
-		let auth = true;
-		switch (uni.getStorageSync('phone_active')*1){
-			case 0: // 未注册
-			uni.navigateTo({url:'/pages/login/login'});
-			auth = false
-				break;
-			case 1: // 已注册
-			auth = true
-				break;
+		let auth = false;
+		clearTimeout(this.authTimer);
+		if(!uni.getStorageSync('token')) {
+			this.showToast('请登录');
+			this.authTimer = setTimeout(()=>{
+				uni.navigateTo({url:'/pages/login/login'});
+			},2000)
+		} else {
+			auth = true;
 		}
 		return auth;
 	},
@@ -456,13 +543,10 @@ const tools = {
 			// console.log(hInfo.envVersion);//develop:开发版	trial：体验版	release：正式版
 			// if(hInfo.miniProgram.envVersion == "develop"){
 			if(hInfo.miniProgram.envVersion == "develop" || hInfo.miniProgram.envVersion == "trial"){
-				// (开发版,体验版)-配置全局域名
-				// uni.setStorageSync('hostapi','https://hengmei.scdxtc.cn/api/');
+				
 			} else { 
 				// 清除所有输出日志
 				console.log = () =>{};
-				// 正式版-配置全局域名
-				// uni.setStorageSync('hostapi','https://hm.hmzfyy.cn/api/');
 				// 开启埋点倒计时
 				this.daoTime();//开启埋点倒计时
 			}
@@ -523,7 +607,7 @@ const tools = {
 		const res = uni.getSystemInfoSync();
 		if(res.platform=='ios'){
 			uni.makePhoneCall({
-				phoneNumber:phone,
+				phoneNumber:phone*1,
 				success: () => {},
 				fail: () => {}
 			})
diff --git a/main.js b/main.js
index e8eecc4..d6c7be2 100644
--- a/main.js
+++ b/main.js
@@ -1,5 +1,7 @@
 import Vue from 'vue';
 import App from './App';
+import store from './store'
+Vue.prototype.$store = store
 
 import nothingPage from './components/nothing/nothing-page.vue';//引入无内容组件
 Vue.component('nothing-page',nothingPage);//全局注册无内容组件
@@ -10,10 +12,12 @@ Vue.component('status-nav',statusNav);//全局注册头部状态栏与导航栏
 import containerSubgroupTwo from './components/containers/container-subgroup-two.vue';//引入头部状态栏与导航栏组件
 Vue.component('container-subgroup',containerSubgroupTwo);//全局注册头部状态栏与导航栏组件
 
+// #ifdef MP-WEIXIN
 import share from './jsFile/share.js';// 全局注册分享事件
 Vue.mixin(share); 
+// #endif
 
-// 常用工具
+// 常用便捷式公共方法
 import tools from '@/jsFile/tools.js';
 Vue.prototype.$toolAll = tools;
 // 响应数据
@@ -23,6 +27,7 @@ Vue.prototype.$requst = requst;
 App.mpType = 'app';
 
 const app = new Vue({
+	store,
     ...App
 })
 app.$mount()
diff --git a/pages/tabbar/pagehome/pagehome.vue b/pages/tabbar/pagehome/pagehome.vue
index 60465a1..257ae62 100644
--- a/pages/tabbar/pagehome/pagehome.vue
+++ b/pages/tabbar/pagehome/pagehome.vue
@@ -48,7 +48,6 @@
 						<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>
 							</view>
 						</view>
 					</view>
@@ -228,14 +227,13 @@
 	// 暂无更多组件
 	import pitera from '@/components/nothing/pitera.vue';
 	// 公告
-	import lwNotice from '@/components/lw-notice/lw-notice.vue';
 	import footTabOne from '@/components/foot-tabs/foot-tab-one.vue';
 	import containerSubgroupTwo from '@/components/containers/container-subgroup-two.vue';
+	import { mapState,mapGetters,mapMutations } from 'vuex'//引入mapState
 	export default {
 		components:{
 			pitera,
 			statusNavSlot,
-			lwNotice,
 			'foot-tab' :footTabOne,
 			containerSubgroupTwo
 		},
@@ -313,6 +311,62 @@
 				faultsList:[],
 			}
 		},
+		// computed:{
+		// 	tokenEv() {
+		// 		return this.$store.state.token;
+		// 	}
+		// },
+		// computed:mapState({
+		// 	// 从state中拿到数据 箭头函数可使代码更简练
+		// 	token: state => state.token,
+		// }),
+		// computed:mapState(['token']),
+		// computed: {
+		// 	...mapState({
+		// 		token: function (state) {
+		// 			return '追加的' +  state.token 
+		// 		},
+		// 		userInfo: state => state.userInfo,
+		// 	})
+		// },
+		// computed: {
+		// 	todos() {
+		// 		return this.$store.getters.doneTodos
+		// 	}
+		// },
+		// computed: {
+		// 	doneTodosCount() {
+		// 		return this.$store.getters.doneTodosCount
+		// 	}
+		// },
+		// computed: {
+		// 	getTodoById() {
+		// 		return this.$store.getters.getTodoById(1)
+		// 	}
+		// },
+		// computed: {
+		// 	// 使用对象展开运算符将 getter 混入 computed 对象中
+		// 	...mapGetters([
+		// 		'doneTodos',
+		// 		'doneTodosCount',
+		// 		'getTodoById'
+		// 		// ...
+		// 	])
+		// },
+		// computed:{
+		// 	...mapState([
+		// 		'token',
+		// 		'userInfo',
+		// 		'count',
+		// 		'obj'
+		// 	])
+		// },
+		computed: {
+			...mapState({
+				token: state => state.moduleA.token,
+				count: state => state.moduleB.count
+			}),
+		},
 		onLoad(options) {
 			// 获取当前页面url
 			this.$toolAll.tools.obtainUrl();
@@ -322,8 +376,29 @@
 			// this.getIncrementServiceType();
 			// 调用获取常见故障列表事件
 			this.getFaultsList();
+			// this.$store.commit('setToken', 'token已改变');
+			// this.$store.commit('updateUserInfo',{userInfo:'用户信息'})
+			// this.$store.commit({
+			// 	type: 'updateUserInfo',
+			// 	userInfo: '新方式更新用户信息'
+			// })
+			// console.log(this.userInfo,374);
+			// this.add();
+			// console.log(this.obj);
+			// this.$store.commit('newProp',{c:'吃火锅'})
+			// console.log(this.obj,382);
+			// this.$store.dispatch('addCountAction')
+			// this.$store.dispatch('addCountAction2',{amount:10})
+			// this.$store.dispatch('addCountAction3',{amount:30})
+			// setTimeout(()=>{
+			// 	console.log(this.count,388);
+			// },3000)
+			// console.log(this.count,390);
+			console.log(this.token,397);
+			console.log(this.count,398);
 		},
 		methods: {
+			// ...mapMutations(['add']),//对象展开运算符直接拿到add
             // 工单跳转
             goWorkOrder(index){
                 if(index==0){
diff --git a/pages/tabbar/project-list/project-list.vue b/pages/tabbar/project-list/project-list.vue
index b693514..fef511d 100644
--- a/pages/tabbar/project-list/project-list.vue
+++ b/pages/tabbar/project-list/project-list.vue
@@ -1,16 +1,19 @@
 <template>
 	<view>
+		<notice-one direction="row"></notice-one>
 		<!-- 底部tab -->
 		<foot-tab :current="1"></foot-tab> 
 	</view>
 </template>
 
 <script>
+	import noticeOne from '@/components/notices/notice-one/notice-one.vue';
 	// 底部组件
 	import footTabOne from '@/components/foot-tabs/foot-tab-one.vue';
 	export default {
 		components:{
-			'foot-tab' :footTabOne
+			'foot-tab' :footTabOne,
+			noticeOne
 		},
 		data() {
 			return {
diff --git a/pagesB/i-want-evaluate/i-want-evaluate.vue b/pagesB/i-want-evaluate/i-want-evaluate.vue
index 836b44a..78318bb 100644
--- a/pagesB/i-want-evaluate/i-want-evaluate.vue
+++ b/pagesB/i-want-evaluate/i-want-evaluate.vue
@@ -24,8 +24,8 @@
 				<view class="bacf fon28 pad-sx30 pad-zy40 mar-s20">
 					<view class="fon30 bold mar-sx30">您的评价</view>
 					<view class="mar-s40 mar-x50" style="color: #545454;">
-						<view class="mar-x40 disac"><text class="mar-y40">技术服务</text><rate :size="42" :gutter="40" :curentClick="0" v-model="rateNum" @change="chooseRate"></rate></view>
-						<view class="disac"><text class="mar-y40">客服态度</text><rate :size="42" :gutter="40" :curentClick="1" v-model="attitudeNum" @change="chooseRate"></rate></view>
+						<view class="mar-x40 disac"><text class="mar-y40">技术服务</text><rate-one :size="42" :gutter="40" :curentClick="0" v-model="rateNum" @change="chooseRate"></rate-one></view>
+						<view class="disac"><text class="mar-y40">客服态度</text><rate-one :size="42" :gutter="40" :curentClick="1" v-model="attitudeNum" @change="chooseRate"></rate-one></view>
 					</view>
 				</view>
 				<!-- 提交保存 -->
@@ -36,10 +36,10 @@
 </template>
 
 <script>
-	import rate from '@/components/rate.vue';
+	import rateOne from '@/components/rates/rate-one.vue';
 	export default {
 	    components:{
-	        rate
+	        rateOne
 	    },
 		data() {
 			return {
diff --git a/store/actions.js b/store/actions.js
new file mode 100644
index 0000000..c126b1b
--- /dev/null
+++ b/store/actions.js
@@ -0,0 +1 @@
+// 根级别的 action
\ No newline at end of file
diff --git a/store/index.js b/store/index.js
new file mode 100644
index 0000000..8bc4203
--- /dev/null
+++ b/store/index.js
@@ -0,0 +1,16 @@
+// 组装模块并导出 store 的地方
+import Vue from 'vue'
+import Vuex from 'vuex'
+import moduleA from '@/store/modules/moduleA'
+import moduleB from '@/store/modules/moduleB'
+
+Vue.use(Vuex);//vue的插件机制
+
+//Vuex.modules 模块选项
+const store = new Vuex.Store({
+	modules: {
+		moduleA,
+		moduleB
+	}
+})
+export default store
\ No newline at end of file
diff --git a/store/modules/moduleA.js b/store/modules/moduleA.js
new file mode 100644
index 0000000..f7a9f03
--- /dev/null
+++ b/store/modules/moduleA.js
@@ -0,0 +1,88 @@
+// 购物车模块
+export default {
+	state:{//存放状态
+		token:'token已生成',
+		userInfo:{},
+		count:0,
+		publicColor:'',
+		todos: [{
+				id: 1,
+				text: '我是内容一',
+				done: true
+			},
+			{
+				id: 2,
+				text: '我是内容二',
+				done: false
+			}
+		],
+		obj:{
+			a:'吃鸡腿',
+			b:'吃自助餐'
+		}
+	},
+	// Vuex中store数据改变的唯一方法就是mutations 不适合异步方法
+	mutations: {
+		add(state) {
+			state.count = 7;
+		},
+		add2(state, payload) {
+			state.count = payload.amount;
+		},
+		// 单个属性处理方法
+		setToken(state,str) {
+			state.token = str;
+		},
+		// 对象处理方法
+		updateUserInfo(state, payload) {
+			// 变更状态
+			state.userInfo = payload.userInfo;
+		},
+		// 新增字段方法
+		newProp(state,payload) {
+			state.obj = { ...state.obj, c: payload.c };
+		}
+	},
+	// 可以执行任意的同步和异步操作
+	actions:{
+		addCountAction ({commit}) {
+			commit('add')
+		},
+		addCountAction2 (context , payload) {
+			 context.commit('add2', payload)
+		},
+		// 异步方法
+		addCountAction3 (context , payload) {
+			setTimeout(function () {
+				context.commit('add2', payload)
+			 }, 2000)
+		},
+		actionA ({ commit }) {
+			return new Promise((resolve, reject) => {
+				setTimeout(() => {
+					commit('someMutation')
+					resolve()
+				}, 1000)
+			})
+		},
+		actionB ({ dispatch, commit }) {
+			return dispatch('actionA').then(() => {
+				commit('someOtherMutation')
+			})
+		}
+	},
+	// Vuex 允许我们在 store 中定义“getter”（可以认为是 store 的计算属性），对 state 的加工，是派生出来的数据。 可以在多组件中共享 getter 函数，这样做还可以提高运行效率。
+	getters: {
+		doneTodos: state => {
+			return state.todos.filter(todo => todo.done)
+		},
+		doneTodosCount: (state, getters) => {
+			//state ：可以访问数据
+			//getters：访问其他函数，等同于 store.getters
+			return getters.doneTodos.length
+		},
+		getTodoById: (state) => (id) => {
+			return state.todos.find(todo => todo.id === id)
+		}
+	}
+}
\ No newline at end of file
diff --git a/store/modules/moduleB.js b/store/modules/moduleB.js
new file mode 100644
index 0000000..9e63dbc
--- /dev/null
+++ b/store/modules/moduleB.js
@@ -0,0 +1,87 @@
+export default {
+	state:{//存放状态
+		token:'token已生成',
+		userInfo:{},
+		count:0,
+		publicColor:'',
+		todos: [{
+				id: 1,
+				text: '我是内容一',
+				done: true
+			},
+			{
+				id: 2,
+				text: '我是内容二',
+				done: false
+			}
+		],
+		obj:{
+			a:'吃鸡腿',
+			b:'吃自助餐'
+		}
+	},
+	// Vuex中store数据改变的唯一方法就是mutations 不适合异步方法
+	mutations: {
+		add(state) {
+			state.count = 7;
+		},
+		add2(state, payload) {
+			state.count = payload.amount;
+		},
+		// 单个属性处理方法
+		setToken(state,str) {
+			state.token = str;
+		},
+		// 对象处理方法
+		updateUserInfo(state, payload) {
+			// 变更状态
+			state.userInfo = payload.userInfo;
+		},
+		// 新增字段方法
+		newProp(state,payload) {
+			state.obj = { ...state.obj, c: payload.c };
+		}
+	},
+	// 可以执行任意的同步和异步操作
+	actions:{
+		addCountAction ({commit}) {
+			commit('add')
+		},
+		addCountAction2 (context , payload) {
+			 context.commit('add2', payload)
+		},
+		// 异步方法
+		addCountAction3 (context , payload) {
+			setTimeout(function () {
+				context.commit('add2', payload)
+			 }, 2000)
+		},
+		actionA ({ commit }) {
+			return new Promise((resolve, reject) => {
+				setTimeout(() => {
+					commit('someMutation')
+					resolve()
+				}, 1000)
+			})
+		},
+		actionB ({ dispatch, commit }) {
+			return dispatch('actionA').then(() => {
+				commit('someOtherMutation')
+			})
+		}
+	},
+	// Vuex 允许我们在 store 中定义“getter”（可以认为是 store 的计算属性），对 state 的加工，是派生出来的数据。 可以在多组件中共享 getter 函数，这样做还可以提高运行效率。
+	getters: {
+		doneTodos: state => {
+			return state.todos.filter(todo => todo.done)
+		},
+		doneTodosCount: (state, getters) => {
+			//state ：可以访问数据
+			//getters：访问其他函数，等同于 store.getters
+			return getters.doneTodos.length
+		},
+		getTodoById: (state) => (id) => {
+			return state.todos.find(todo => todo.id === id)
+		}
+	}
+}
\ No newline at end of file
diff --git a/store/mutations.js b/store/mutations.js
new file mode 100644
index 0000000..d15562c
--- /dev/null
+++ b/store/mutations.js
@@ -0,0 +1 @@
+// 根级别的 mutation
\ No newline at end of file
diff --git a/store/readme.md b/store/readme.md
new file mode 100644
index 0000000..e69de29