Merge pull request 'master upd' (#2) from dev into master

Reviewed-on: https://git.yuzhankeji.cn/TmOct5/dou_fire/pulls/2
2023-03-23 13:51:58 +08:00
parent a24fe7a84c b17d6ccb3b
commit b484e9b4ca
47 changed files with 3351 additions and 226 deletions
--- a/apis/index.js
+++ b/apis/index.js
@@ -10,8 +10,8 @@ import router from '../router'

 // 基础配置
 const config = {
-	apiUrl	: 'https://douhuo.douhuofalv.com/api/',
-	// apiUrl	: 'https://api.douhuotest.douhuofalv.com/api/', //测试环境
+	// apiUrl	: 'https://douhuo.douhuofalv.com/api/',
+	apiUrl	: 'https://api.douhuotest.douhuofalv.com/api/', //测试环境
 	timeout	: 60000
 }

--- a/apis/interfaces/account.js
+++ b/apis/interfaces/account.js
@@ -27,7 +27,8 @@ const log = data => {
 // 业绩账户
 const cash = data => {
 	return request({
-		url: "perf/lists",
+		// 1.3.5^ 版本废弃 url: "perf/lists",
+		url: "perf/new_lists",
 		data
 	})
 }
--- a/apis/interfaces/pay.js
+++ b/apis/interfaces/pay.js
@@ -32,6 +32,7 @@ const umsPay = (orderId, data) => {

 // 银联支付补差价
 const diffUmsPay = (orderId, data) => {
+	console.log(data)
 	return request({
 		url: 'pay/diff/' + orderId + '/ums',
 		data
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
    "name" : "抖火",
    "appid" : "__UNI__C305C03",
    "description" : "纵有疾风起，人生不言弃",
-    "versionName" : "1.3.4",
+    "versionName" : "1.3.7",
    "versionCode" : 103,
    "transformPx" : false,
    /* 5+App特有相关 */
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,6 +9,7 @@
      "version": "1.0.0",
      "license": "MIT",
      "dependencies": {
+        "moment": "^2.29.4",
        "uni-read-pages": "^1.0.5",
        "uni-simple-router": "^2.0.7",
        "uview-ui": "^2.0.31",
@@ -172,6 +173,14 @@
        "sourcemap-codec": "^1.4.8"
      }
    },
+    "node_modules/moment": {
+      "version": "2.29.4",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
+      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
+      "engines": {
+        "node": "*"
+      }
+    },
    "node_modules/nanoid": {
      "version": "3.3.4",
      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
@@ -457,6 +466,11 @@
        "sourcemap-codec": "^1.4.8"
      }
    },
+    "moment": {
+      "version": "2.29.4",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
+      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
+    },
    "nanoid": {
      "version": "3.3.4",
      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
--- a/package.json
+++ b/package.json
@@ -1,5 +1,6 @@
 {
  "dependencies": {
+    "moment": "^2.29.4",
    "uni-read-pages": "^1.0.5",
    "uni-simple-router": "^2.0.7",
    "uview-ui": "^2.0.31",
--- a/pages.json
+++ b/pages.json
@@ -564,6 +564,14 @@
 			"disableScroll": true,
 			"navigationBarBackgroundColor": "#FFFFFF"
 		}
+	}, {
+		"path": "pages/im/msg",
+		"name": "ImMsg",
+		"style": {
+			"navigationBarTitleText": "消息",
+			"enablePullDownRefresh": false,
+			"navigationBarBackgroundColor": "#FFFFFF"
+		}
 	}],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
--- a/pages/account/bonus.vue
+++ b/pages/account/bonus.vue
@@ -10,8 +10,8 @@
 			    <view class="total-btn" @click="$Router.push({name: 'Withdraws'})">提现</view>
 			</view>
           <view class="total-item-2">
-               <view> 已发放 :￥<span>{{sended}}</span></view>
-               <view> 待发放 :￥<span>{{frozen}}</span></view>
+               <view>已发放 :￥<span>{{sended}}</span></view>
+               <view>待发放 :￥<span>{{frozen}}</span></view>
           </view>
 		</view>
 		<!-- 账户记录 -->
@@ -41,7 +41,7 @@
 					</block>
 					<block v-if="type === 'withdraws'">
 						<view class="text">
-							<view class="type nowrap"><text>[{{item.status.status_text}}]</text>{{item.title || '-'}}</view>
+							<view class="withdraws-type nowrap"><span>{{item.status.status_text}}</span>{{item.title || '-'}}</view>
 							<view class="remark nowrap" v-if="item.remark != null">{{item.remark || '-'}}</view>
 							<view class="time nowrap">{{item.created_at}}</view>
 						</view>
@@ -278,11 +278,11 @@
 				font-weight: bold;
 				font-size: 30rpx;
 				color: #666666;
-				text{
-					font-weight: normal;
-					padding-right: 10rpx;
-					color: $main-color;
-				}
+				// text{
+				// 	font-weight: normal;
+				// 	padding-right: 10rpx;
+				// 	color: $main-color;
+				// }
                span{
                   font-size: 22rpx;
                   font-weight: normal;
@@ -298,6 +298,20 @@
                    background-color: rgba(#d90017, 0.4); 
                }
 			}
+			.withdraws-type{
+				font-weight: bold;
+				font-size: 30rpx;
+				color: #666666;
+				span{
+				   font-size: 22rpx;
+				   font-weight: normal;
+				   background-color: rgba(#8E6AFF, 0.4); 
+				   padding: 2rpx 20rpx;
+				   border-radius: 40rpx;
+				   color: #fff;
+				   margin-right: 20rpx;
+				}
+			}
 			.remark{
 				font-size: 28rpx;
 			}
--- a/pages/account/cash.vue
+++ b/pages/account/cash.vue
@@ -7,21 +7,25 @@
 			</view>
 		</u-sticky>
 		<!-- 账户余额 -->
+		<oct-calendar-picker ref="CalendarPicker" @change="onDay" />
 		<view class="total" :style="'background-image: url(' + require('@/static/imgs/cash_back.png') + ');'">
-			<view class="total-value nowrap">{{total}}</view>
+			<view class="total-value nowrap">{{count}}</view>
 			<view class="total-text">{{type == 'self' ? '个人总业绩': '团队总业绩'}}</view>
+			<view class="total-total">筛选区间业绩：{{total}}</view>
 		</view>
 		<!-- 账户记录 -->
 		<view class="logs">
 			<view class="log-item">
-				<view class="tabs">
-					<u-tabs
-						:list="tabs"
-						:activeStyle="{'color': '#446EFE'}"
-						lineColor="#446EFE"
-						:scrollable="false"
-						@click="onDayTab"
-					></u-tabs>
+				<view class="log-header">
+					<view class="log-header-data" @click="onPickeShow()">
+						<label>筛选：</label>
+						<view class="log-header-data-q">
+							<view :class="{'show': dayTime.start_at != ''}">{{dayTime.start_at || "开始日期"}}</view>
+							<view :class="{'show': dayTime.end_at != ''}">{{dayTime.end_at || "结束日期"}}</view>
+						</view>
+						<u-icon name="arrow-right"></u-icon>
+					</view>
+					<view class="log-header-title" @click="onDefaultLog">默认</view>
 				</view>
 				<block v-if="list.length > 0">
 					<view class="log-flex" v-for="(item, index) in list" :key="index">
@@ -60,7 +64,20 @@
 			</view>
 			<u-loadmore v-if="pagesShow" :status="status" />
 		</view>
-		
+		<!-- 筛选时间 -->
+		<!-- <button @click="">打开弹窗</button> -->
+		<!-- <u-calendar
+			v-if="maxDate != ''"
+			:show="dayShow"
+			mode="range"
+			color="#446EFE"
+			:minDate="minDate"
+			:maxDate="maxDate"
+			monthNum="36"
+			title="选择筛选区间"
+			@close="dayShow = false"
+			@confirm="onDay"
+		></u-calendar> -->
 	</view>
 </template>

@@ -69,13 +86,16 @@
 	export default {
 		data() {
 			return {
-				tabs		: [
-					{ name: '当月业绩', value: 'month'},
-					{ name: '当年业绩', value: 'year'}
-				],
-				dayType		: 'month',
+				dayShow		: false,
+				minDate		: '',
+				maxDate		: '',
+				dayTime		: {
+					start_at: '',
+					end_at	: ''
+				},
 				type		: 'self',
 				total		: '0.00',
+				count		: '0.00',
 				list		: [],
 				page		: {
 					current	: 1,
@@ -87,35 +107,64 @@
 		},
 		created() {
 			this.getLog()
+			// 获取当天前日期
+			let date  = new Date()
+			let year  = date.getFullYear()
+			let month = date.getMonth() + 1
+			let day   = date.getDate() + 1
+			this.maxDate = year + '-' + month + '-' + day
 		},
 		methods: {
+			// 打开时间筛选
+			onPickeShow(){
+				this.$refs.CalendarPicker.open()
+			},
+			// 筛选tab
 			onTabs(e){
 				if(this.type === e) return
 				this.type = e
 				this.page.current = 1
 				this.getLog()
 			},
+			// 默认日期
+			onDefaultLog(){
+				this.dayTime = {
+					start_at: '',
+					end_at  : ''
+				}
+				this.page.current = 1
+				this.getLog()
+			},
 			// 选择日期
-			onDayTab(e){
-				if(this.dayType === e.value) return
-				this.dayType = e.value
+			onDay(e){
+				this.dayTime = {
+					start_at: e.startDate,
+					end_at  : e.endDate
+				}
+				this.dayShow = false
 				this.page.current = 1
 				this.getLog()
 			},
 			// 获取列表
 			getLog(){
 				cash({
-					day : this.dayType,
-					type: this.type,
-					page: this.page.current
+					start_at: this.dayTime.start_at,
+					end_at	: this.dayTime.end_at,
+					type	: this.type,
+					page	: this.page.current
 				}).then(res => {
-					let { total, lists } = res;
-					let atList   = lists.page.current == 1 ? [] : this.list
-					this.list = atList.concat(lists.data)
-					this.total = total
-					this.page = lists.page
-					this.pagesShow = false
+					let { total, lists, start, now, count } = res;
+					let atList   	= lists.page.current == 1 ? [] : this.list
+					if(this.minDate == '') this.minDate = start
+					this.list 		= atList.concat(lists.data)
+					this.total 		= total
+					this.count		= count
+					this.page 		= lists.page
+					this.pagesShow 	= false
 				}).catch(err => {
+					
+					console.log(err)
+					
 					uni.showToast({
 						title: err.message,
 						icon : 'none'
@@ -171,6 +220,13 @@
 			line-height: 40rpx;
 			padding-top: 10rpx;
 		}
+		.total-total{
+			margin-top: 30rpx;
+			border-top: solid 1px rgba(255, 255, 255, .7);
+			font-size: 30rpx;
+			line-height: 40rpx;
+			padding-top: 30rpx;
+		}
 	}
 	// 记录空
 	.list-null{
@@ -183,6 +239,35 @@
 	.logs{
 		padding: 30rpx;
 		box-sizing: border-box;
+		// 记录筛选
+		.log-header{
+			border-bottom: solid 1rpx #ddd;
+			display: flex;
+			flex-wrap: wrap;
+			align-items: center;
+			justify-content: space-between;
+			padding: 30rpx 0;
+			.log-header-title{
+				line-height: 70rpx;
+				font-size: 30rpx;
+				color: gray;
+				color: $main-color;
+			}
+			.log-header-data{
+				display: flex;
+				align-items: center;
+				label{
+					font-size: 30rpx;
+				}
+				.log-header-data-q{
+					font-size: 24rpx;
+					line-height: 30rpx;
+					color: gray;
+					.show{ color: $main-color; }
+				}
+			}
+		}
+		// 记录
 		.log-item{
 			background: white;
 			padding: 10rpx 30rpx;
--- a/pages/account/withdraws.vue
+++ b/pages/account/withdraws.vue
@@ -2,24 +2,32 @@
 	<view class="content">
 		<view class="block" v-if="banks.length > 0">
 			<view class="bank">
-				<view class="block-title">到账银行卡</view>
+				<!-- <view class="block-title">到账<text>{{type == 1 ? '本人': '非本人'}}</text>银行卡</view> -->
+				<view class="bank-tabs">
+					<view class="item" :class="{'active': type == 1}" @click="onTypeTab(1)">本人银行卡</view>
+					<view class="item" :class="{'active': type == 2}" @click="onTypeTab(2)">非本人银行卡</view>
+				</view>
 				<view class="bank-input">
 					<label>开户银行</label>
-					<picker class="banks-picker" :range="banks" range-key="name" :value="bankVal" @change="bankVal = $event.detail.value">
+					<picker class="banks-picker" :range="banks" range-key="name" :value="bankVal" @change="bankVal = $event.detail.value" :disabled="isDisabled" >
 						<view class="banks-text" :class="{'gray': bankVal === 0}">{{banks[bankVal].name}}<uni-icons class="banks-icon" type="bottom" size="18" color="gray"></uni-icons></view>
 					</picker>
 				</view>
 				<view class="bank-input">
 					<label>银行卡号</label>
-					<input type="number" placeholder="输入银行卡号" maxlength="20" v-model="bankNo">
+					<input type="number" placeholder="输入银行卡号" maxlength="20" v-model="bankNo" :disabled="isDisabled">
 				</view>
 				<view class="bank-input">
 					<label>预留手机号</label>
-					<input type="number" placeholder="输入银行开户预留手机号" maxlength="11" v-model="mobile">
+					<input type="number" placeholder="输入银行开户预留手机号" maxlength="11" v-model="mobile" :disabled="isDisabled">
 				</view>
 				<view class="bank-input">
 					<label>持卡人姓名</label>
-					<input type="text" placeholder="输入开户人真实姓名" maxlength="15" v-model="name">
+					<input type="text" placeholder="输入开户人真实姓名" maxlength="15" :disabled="isDisabled || type == 1" v-model="name">
+				</view>
+				<view class="bank-input" v-if="type === 2">
+					<label>身份证号</label>
+					<input type="idcard" placeholder="输入开户人身份证号" maxlength="18" v-model="idcard" :disabled="isDisabled">
 				</view>
 			</view>
 			<view class="cny">
@@ -36,6 +44,8 @@
 				<button class="cny-btn" :disabled="greater" @click="onSubmit">申请提现</button>
 			</view>
 		</view>
+		<!-- 提现提醒 -->
+		<view class="withdraws-hint">后台提现管理时间 上午11:00-12:00 下午17:00-18:00</view>
 	</view>
 </template>

@@ -44,15 +54,22 @@
 	export default {
 		data() {
 			return {
-				banks	: [],
-				bankVal : 0,
-				bankNo	: '',
-				mobile	: '',
-				name	: '',
-				amount	: '',
-				min		: 0,
-				rate	: 0,
-				balance	: '0.00'
+				type		: 1,
+				banks		: [],
+				bankVal 	: 0,
+				bankNo		: '',
+				mobile		: '',
+				name		: '',
+				idcard		: '',
+				identity	: {
+					name		: '',
+					id_card_no	: '' 
+				},
+				amount		: '',
+				min			: 0,
+				rate		: 0,
+				balance		: '0.00',
+				isDisabled	: false,
 				
 			};
 		},
@@ -67,28 +84,62 @@
 				mask : true
 			})
 			withdrawsCreate().then(res => {
-				let { bank, tax, min, balance, banks} = res;
-				let bankIndex
-				this.rate 	 = tax
-				this.min  	 = min
-				this.balance = balance
-				this.banks   = [ { id: '', name: '请选择开户银行'}, ...banks ]
-				if(bank.bank_no){
-					bankIndex = this.banks.findIndex(val => val.name === bank.bank_name)
-					this.bankNo	 = bank.bank_no
-					this.mobile	 = bank.mobile
-					this.name	 = bank.name
-					this.bankVal = bankIndex >= 0 ? bankIndex : 0
+				let { bank, tax, min, balance, banks, id_card, has_bank} = res;
+				
+				this.rate 	  	= tax
+				this.min  	  	= min
+				this.balance  	= balance
+				this.banks    	= [ { id: '', name: '请选择开户银行'}, ...banks ]
+				this.identity 	= id_card
+				this.type	  	= bank.message_type
+				this.isDisabled	= has_bank
+				
+				this.name		= id_card.name
+				this.idcard		= id_card.id_card_no
+				if(has_bank){
+					let bankIndex = this.banks.findIndex(val => val.name === bank.bank_name)
+					
+					this.bankNo	 	= bank.bank_no
+					this.mobile	 	= bank.mobile
+					this.bankVal 	= bankIndex >= 0 ? bankIndex : 0
 				}
+		
 				uni.hideLoading()
 			}).catch(err => {
-				uni.showToast({
-					title: err.message,
-					icon : 'none'
+				
+				console.log(err)
+					
+				uni.showModal({
+					content		: err.message,
+					showCancel	: false,
+					success		: ModalRes => {
+						if(ModalRes.confirm){
+							this.$Router.back()
+						}
+					}
 				})
 			})
 		},
 		methods: {
+			onTypeTab(type){
+				if(type == this.type) return
+				if(this.isDisabled){
+					uni.showToast({
+						title: "银行卡信息已绑定，如需变更请联系系统管理员",
+						icon : "none"
+					})
+					return
+				}
+				
+				if(type == 1){
+					this.name 	= this.identity.name
+					this.idcard	= this.identity.id_card_no
+				}else{
+					this.name 	= ''
+					this.idcard	= ''
+				}
+				this.type = type
+			},
 			onSubmit(){
 				if(this.bankVal === 0){
 					uni.showToast({
@@ -107,6 +158,8 @@
 					name  		: this.name,
 					mobileNo	: this.mobile,
 					bank_no		: this.bankNo,
+					id_card		: this.idcard,
+					message_type: this.type,
 				}).then(res => {
 					uni.showModal({
 						title		: '提示',
@@ -134,16 +187,40 @@
 	.content{
 		padding: 30rpx;
 	}
+	.withdraws-hint{
+		padding: 30rpx;
+		font-size: 30rpx;
+		color: gray;
+	}
 	.block{
 		background: white;
 		.block-title{
 			font-size: 30rpx;
 			color: gray;
 			line-height: 50rpx;
+			text{
+				color: $main-color;
+				margin: 0 5rpx;
+			}
 		}
 		.bank{
 			background: #fdfdfd;
 			padding: 50rpx;
+			.bank-tabs{
+				@extend .border-solid;
+				margin-bottom: 30rpx;
+				display: flex;
+				align-items: center;
+				line-height: 100rpx;
+				.item{
+					width: 50%;
+					text-align: center;
+					font-size: 30rpx;
+					&.active{
+						color: $main-color;
+					}
+				}
+			}
 			.bank-input{
 				display: flex;
 				justify-content: space-between;
--- a/pages/im/chat.vue
+++ b/pages/im/chat.vue
@@ -1,16 +1,25 @@
 <template>
 	<view class="chat">
-		<scroll-view class="chat-soll" scroll-y>
+		<list>
+			<cell v-for="(item, index) in 99" :key="index">消息{{index}}</cell>
+		</list>
+		<!-- <view class="chat-soll">
 			<view v-for="(item, index) in 50" :key="index">{{item}}滚动的聊天记录</view>
-		</scroll-view>
+		</view>
 		<view class="chat-footer">
 			<view class="chat-inputs">
-				<view class="">常用语</view>
-				<input type="text" placeholder="输入框" confirm-type="send">
-				<view class="">表情</view>
-				<view class="">加</view>
+				<view class="chat-icon">
+					<image src="@/static/im/icon_01.png" mode="widthFix"></image>
+				</view>
+				<input class="chat-input" type="text" placeholder="输入框" confirm-type="send">
+				<view class="chat-icon">
+					<image src="@/static/im/icon_02.png" mode="widthFix"></image>
+				</view>
+				<view class="chat-icon">
+					<image src="@/static/im/icon_00.png" mode="widthFix"></image>
+				</view>
 			</view>
-		</view>
+		</view> -->
 	</view>
 </template>

@@ -32,7 +41,8 @@
 		flex-direction: column;
 		justify-content: space-between;
 		.chat-soll{
-			height: 50vh;
+			flex: 1;
+			overflow-y: scroll;
 		}
 		.chat-footer{
 			background: white;
@@ -42,6 +52,17 @@
 				background: #f6f7f9;
 				height: 80rpx;
 				border-radius: 40rpx;
+				.chat-input{
+					width: calc(100% - 240rpx);
+					height: 80rpx;
+					line-height: 80rpx;
+				}
+				.chat-icon{
+					width: 80rpx;
+					image{
+						width: 80rpx;
+					}
+				}
 			}
 		}
 	}
--- a/pages/im/msg.vue
+++ b/pages/im/msg.vue
@@ -0,0 +1,126 @@
+<template>
+	<view class="msg">
+		<!-- 消息为空 -->
+		<view class="msg-null" v-if="msgs.length <= 0">
+			<image class="icon" src="@/static/im/icon_03.png" mode="widthFix"></image>
+			<text>暂无好友消息</text>
+		</view>
+		<!-- 消息列表 -->
+		<view class="msg-list" v-else>
+			<view class="item-flex" v-for="(item,index) in msgs" :key="index" @click="onMsg(item.id)">
+				<u-avatar
+					:text="surname(item.nickname)"
+					fontSize="18"
+					size="42"
+					shape="square"
+					randomBgColor
+				></u-avatar>
+				<view class="item-content">
+					<view class="nickname nowrap">
+						<view class="nowrap">{{item.nickname}}</view>
+						<view class="time">{{item.time}}</view>
+					</view>
+					<view class="lastmsg nowrap">{{item.latmsg}}</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				msgs: [
+					{
+						nickname: '张静',
+						cover	: require('@/static/imgs/famous_img.png'),
+						latmsg	: '我的业务办理的怎么样了？',
+						time	: '10:00'
+					}, {
+						nickname: 'Utest',
+						cover	: "",
+						latmsg	: '我的业务办理的怎么样了？',
+						time	: '10:00'
+					}, {
+						nickname: '唐明阳',
+						cover	: "",
+						latmsg	: '我的业务办理的怎么样了？',
+						time	: '10:00'
+					}
+				]
+			};
+		},
+		computed: {
+			surname(){
+				return (nickname) => {
+					return nickname.substring(0,1)
+				}
+			}
+		},
+		methods: {
+			onMsg(id){
+				let cartId = id || null
+				this.$Router.push({
+					name	: 'ImChat',
+					params	: { cartId } 
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.msg{ }
+	// 消息空的
+	.msg-null{
+		height: 88vh;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		.icon{
+			width: 188rpx;
+			opacity: .3;
+		}
+		text{
+			font-size: 32rpx;
+			color: #888;
+		}
+	}
+	// 消息信息
+	.item-flex{
+		display: flex;
+		justify-content: space-between;
+		flex-wrap: wrap;
+		padding: 20rpx 30rpx;
+		align-items: center;
+		.item-content{
+			width: calc(100% - 42px);
+			padding-left: 30rpx;
+			box-sizing: border-box;
+			.nickname{
+				position: relative;
+				padding-right: 230rpx;
+				font-weight: bold;
+				line-height: 50rpx;
+			}
+			.lastmsg{
+				line-height: 42rpx;
+				height: 42rpx;
+				color: gray;
+				font-size: 28rpx;
+			}
+			.time{
+				position: absolute;
+				right: 0;
+				top: 0;
+				width: 200rpx;
+				color: gray;
+				font-size: 28rpx;
+				font-weight: normal;
+				text-align: right;
+			}
+		}
+	}
+</style>
--- a/pages/pay/pay.vue
+++ b/pages/pay/pay.vue
@@ -39,6 +39,26 @@
 				</label>
 			</radio-group>
 		</view>
+		<view class="deduction" v-if="(payMethod == 'wx' || payMethod == 'ali') && payType != 'free'">
+			<view class="deduction-item">
+				<view class="deduction-label">
+					<view class="title">使用火力值抵扣</view>
+					<view class="balance">余额:{{balance}}</view>
+				</view>
+				<u-switch
+					activeColor="#446EFE"
+					size="20"
+					v-model="isDeduction"
+					@change="onDeductionSwitch"
+				></u-switch>
+			</view>
+			<view class="deduction-item" v-if="isDeduction">
+				<view class="deduction-label">
+					<view class="title">使用数量</view>
+				</view>
+				<input class="deduction-input" type="number" placeholder="输入火力值" v-model="deductionVal" @blur="blurDeductionVal">
+			</view>
+		</view>
 		<!-- 确认支付 -->
 		<view class="payBtn">
 			<button size="default" @click="onPay">支付</button>
@@ -49,17 +69,21 @@
 <script>
 	import { info } from '@/apis/interfaces/order.js'
 	import { coinPay, diffCoinPay, umsPay, umsState, diffUmsPay, umsFree, umsFreeInfo } from '@/apis/interfaces/pay.js'
+import mixin from 'uview-ui/libs/mixin/mixin';
 	export default {
 		data() {
 			return {
-				getState  : false,
-				trade_id  : '',
-				orderId	  : '',
-				diffId	  : '',
-				payMethod : 'coin',
-				payType   : 'price',
-				total  	  : '0.00',
-				orderNo	  : '',
+				getState  	: false,
+				trade_id  	: '',
+				orderId	  	: '',
+				diffId	  	: '',
+				payMethod 	: 'coin',
+				payType   	: 'price',
+				total  	  	: '0.00',
+				orderNo	  	: '',
+				balance		: 0,
+				isDeduction	: false,
+				deductionVal: ''
 			};
 		},
 		onShow() {
@@ -109,6 +133,7 @@
 				title: '获取订单信息...',
 				mask : true
 			})
+			// 自由服务包订单信息
 			if(this.$Route.query.paytype === 'free'){
 				this.payMethod = "wx"
 				umsFreeInfo(this.$Route.query.serviceId).then(res => {
@@ -126,13 +151,15 @@
 				})
 				return
 			}
+			// 其他支付方式订单信息
 			info(this.$Route.query.orderId).then(res => {
-				let { total, order_no, business_order_id, diff_prices, diff } = res
+				let { total, order_no, business_order_id, diff_prices, diff, score } = res
 				this.orderId 	= business_order_id
 				this.diffId		= diff.business_order_diff_price_id
 				this.payType 	= this.$Route.query.paytype
 				this.total 		= this.payType === 'diff' ? diff_prices: total
 				this.orderNo 	= order_no
+				this.balance	= score
 				uni.hideLoading()
 			}).catch(err => {
 				uni.showToast({
@@ -142,6 +169,18 @@
 			})
 		},
 		methods: {
+			// 抵扣金额
+			onDeductionSwitch(e){
+				this.deductionVal = ''
+			},
+			// 抵扣金额
+			blurDeductionVal(e){
+				let { value } = e.target
+				let maxVal = Math.min(this.balance, this.total)
+				if(value > maxVal){
+					this.deductionVal = maxVal
+				}
+			},
 			// 支付方式
 			onPay(){
 				switch(this.payMethod){
@@ -156,32 +195,38 @@
 						})
 						break;
 					case 'wx':
-						if(this.payType == 'price') this.onUmsPay('mp')
-						if(this.payType == 'diff') this.onDiffUmsPay('mp')
-						if(this.payType == 'free') this.onFreePay('mp')
+						if(this.payType == 'price') this.onUmsPay('app')
+						if(this.payType == 'diff') this.onDiffUmsPay('app')
+						if(this.payType == 'free') this.onFreePay('app')
 						break;
 					case 'ali':
-						if(this.payType == 'price') this.onUmsPay('mp_alipay')
-						if(this.payType == 'diff') this.onDiffUmsPay('mp_alipay')
-						if(this.payType == 'free') this.onFreePay('mp_alipay')
+						if(this.payType == 'price') this.onUmsPay('app_alipay')
+						if(this.payType == 'diff') this.onDiffUmsPay('app_alipay')
+						if(this.payType == 'free') this.onFreePay('app_alipay')
 						break;
 				}
 			},
+			// 混合支付
+			
 			// 银联三方支付
 			onUmsPay(type){
 				uni.showLoading({
 					title: '加载中...',
 					mask : true
 				})
-				umsPay(this.orderId, { type }).then(res => {
+				umsPay(this.orderId, {
+					type,
+					use_fire: this.isDeduction ? 1 : 0,
+					fire	: this.deductionVal || 0,
+				}).then(res => {
 					uni.hideLoading()
 					this.getState = true
 					this.trade_id = res.trade_id
 					switch (type){
-						case 'mp':
+						case 'app':
 							this.onMiniWx()
 							break;
-						case 'mp_alipay':
+						case 'app_alipay':
 							plus.runtime.openURL(res.alipay)
 							break;
 					}
@@ -198,15 +243,19 @@
 					title: '加载中...',
 					mask : true
 				})
-				diffUmsPay(this.diffId, {type}).then(res => {
+				diffUmsPay(this.diffId, {
+					type,
+					use_fire: this.isDeduction ? 1 : 0,
+					fire	: this.deductionVal || 0
+				}).then(res => {
 					uni.hideLoading()
 					this.getState = true
 					this.trade_id = res.trade_id
 					switch (type){
-						case 'mp':
+						case 'app':
 							this.onMiniWx()
 							break;
-						case 'mp_alipay':
+						case 'app_alipay':
 							plus.runtime.openURL(res.alipay)
 							break;
 					}
@@ -228,10 +277,10 @@
 					this.getState = true
 					this.trade_id = res.trade_id
 					switch (type){
-						case 'mp':
+						case 'app':
 							this.onMiniWx()
 							break;
-						case 'mp_alipay':
+						case 'app_alipay':
 							plus.runtime.openURL(res.alipay)
 							break;
 					}
@@ -340,6 +389,33 @@
 				color: gray;
 			}
 		}
+		// 支付抵扣
+		.deduction{
+			background: white;
+			border-radius: 20rpx;
+			padding: 10rpx 30rpx;
+			margin-top: 30rpx;
+			.deduction-item{
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				padding: 20rpx 0;
+				.deduction-label{
+					display: flex;
+					flex-direction: column;
+					justify-content: center;
+					width: 300rpx;
+					.title{ font-size: 32rpx; line-height: 40rpx; }
+					.balance{ font-size: 26rpx; color: gray; line-height: 30rpx; margin-top: 5rpx; }
+				}
+				.deduction-input{
+					height: 85rpx;
+					width: calc(100% - 300rpx);
+					text-align: right;
+					font-size: 32rpx;
+				}
+			}
+		}
 		// 选择支付方式
 		.choose{
 			background-color: white;
--- a/pages/user/certification.vue
+++ b/pages/user/certification.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="content">
+	<view class="content" v-if="!loding">
 		<block v-if="!eSign">
 			<!-- 上传身份证 -->
 			<view class="identity-from">
@@ -54,7 +54,7 @@
 		<view class="identity-from" v-if="eSign">
 			<view class="identity-inpus">
 				<label>经营城市</label>
-				<view class="identity-inpus-text">{{province}} {{city}}</view>
+				<view class="identity-inpus-text">{{province}} {{city || '-'}}</view>
 				<!-- <input type="text" placeholder="-" v-model="city" disabled> -->
 			</view>
 		</view>
@@ -71,6 +71,7 @@
 	export default {
 		data() {
 			return {
+				loding		: true,
 				idCard		: false,
 				eSign		: false,
 				isPathChange: false,
@@ -123,7 +124,8 @@
 				certified().then(res => {
 					let { id_card, e_sign } = res;
 					this.idCard = id_card;
-					this.eSign = e_sign;
+					this.eSign 	= e_sign;
+					this.loding = false
 					if(this.idCard){
 						this.getInfo()
 						return
@@ -187,6 +189,7 @@
 						showpath: res.back_card,
 						path	: res.back_card_path
 					}
+					
 					if(res.province.id != 0){
 						this.province = res.province.name
 						this.provincesVal = this.provinces.findIndex(val => val.id === res.province.id)
--- a/pages/work/index.vue
+++ b/pages/work/index.vue
@@ -17,7 +17,7 @@
 			<!-- 未认证或未考试 -->
 			<block v-if="!isManager">
 				<view class="block open-interest">
-					<view class="title">业务员专属权益</view>
+					<view class="title">实习顾问专属权益</view>
 					<view class="open-interest-flex">
 						<view class="open-interest-item" v-for="(item, index) in rightsArr" :key="index" @click="onToast(item)">
 							<image class="open-interest-icon" :src="item.icon"></image>
@@ -26,7 +26,7 @@
 					</view>
 				</view>
 				<view class="block open-interest">
-					<view class="title">仅需3步即可成为业务员</view>
+					<view class="title">仅需3步即可成为实习顾问</view>
 					<view class="open-interest-block">
 						<image class="open-interest-icon" :src="isCertification ? require('@/static/icons/work_icon_25.png'): require('@/static/icons/work_icon_24.png')"></image>
 						<view class="open-interest-text">
@@ -38,7 +38,7 @@
 					<view class="open-interest-block">
 						<image class="open-interest-icon" :src="isAnswer ? require('@/static/icons/work_icon_25.png'): require('@/static/icons/work_icon_23.png')"></image>
 						<view class="open-interest-text">
-							<view class="open-interest-title">通过业务员考试</view>
+							<view class="open-interest-title">通过实习顾问考试</view>
 							<view class="open-interest-submit">通过线上考试即可完成</view>
 						</view>
 						<button class="open-interest-btn" size="mini" :disabled="isAnswer" @click="$Router.pushTab({name: 'CollegeTest'})">{{isAnswer ? '已通过': '去考试'}}</button>
@@ -46,8 +46,8 @@
 					<view class="open-interest-block">
 						<image class="open-interest-icon" :src="sign.isSign ? require('@/static/icons/work_icon_25.png'): require('@/static/icons/work_icon_27.png')"></image>
 						<view class="open-interest-text">
-							<view class="open-interest-title">业务员签约</view>
-							<view class="open-interest-submit">完成业务员在线签约</view>
+							<view class="open-interest-title">实习顾问签约</view>
+							<view class="open-interest-submit">完成实习顾问在线签约</view>
 						</view>
 						<button class="open-interest-btn" size="mini" :disabled="sign.isSign" @click="onSign">{{sign.isSign ? '已签约': '去签约'}}</button>
 					</view>
@@ -68,22 +68,22 @@
 				<view class="block">
 					<view class="block-title">统计数据</view>
 					<view class="total-flex">
-						<view class="total-item">
+						<view class="total-item" @click="onNav('Orders', { 'type': 2 })">
 							<image class="icon" src="@/static/icons/work_icon_00.png"></image>
 							<view class="title">预约咨询单</view>
 							<view class="number">{{orderCount.init_payed}}<text>单</text></view>
 						</view>
-						<view class="total-item">
+						<view class="total-item" @click="onNav('Orders', { 'type': 4 })">
 							<image class="icon" src="@/static/icons/work_icon_01.png"></image>
 							<view class="title">已缴费</view>
 							<view class="number">{{orderCount.service_payed}}<text>单</text></view>
 						</view>
-						<view class="total-item">
+						<view class="total-item" @click="onNav('Orders', { 'type': 10 })">
 							<image class="icon" src="@/static/icons/work_icon_02.png"></image>
 							<view class="title">办理完成</view>
 							<view class="number">{{orderCount.b_complete}}<text>单</text></view>
 						</view>
-						<view class="total-item">
+						<view class="total-item" @click="onNav('RefundOrder')">
 							<image class="icon" src="@/static/icons/work_icon_03.png"></image>
 							<view class="title">已退款</view>
 							<view class="number">{{orderCount.refund}}<text>单</text></view>
@@ -93,11 +93,12 @@
 							<view class="title">完成结算</view>
 							<view class="number">{{orderCount.settlement_count}}<text>单</text></view>
 						</view>
-						<view class="total-item">
+						<view class="total-item" @click="onNav('AccountBonus')">
 							<image class="icon" src="@/static/icons/work_icon_05.png"></image>
 							<view class="title">结算金额</view>
 							<view class="number">{{orderCount.settlement_price}}<text>元</text></view>
 						</view>
+						
 					</view>
 				</view>
 				<view class="block">
@@ -150,7 +151,7 @@
 						</view>
 						<view class="tool-flex-item" @click="onNav('Orders', { 'type': 10 })">
 							<image class="icon" src="@/static/icons/work_icon_15.png"></image>
-							<view class="number" v-if="orderCount.b_complete > 0">{{orderCount.b_complete}}</view>
+							<!-- <view class="number" v-if="orderCount.b_complete > 0">{{orderCount.b_complete}}</view> -->
 							<view class="text">办理完成</view>
 						</view>
 					</view>
--- a/pages/work/perfectBasis.vue
+++ b/pages/work/perfectBasis.vue
@@ -101,6 +101,27 @@
 				<view class="from-item from-item-100">
 					<textarea class="from-textarea" auto-height type="text" v-model="baseInfo.tmp_address" placeholder="输入详细地址"></textarea>
 				</view>
+				<view class="from-item from-item-100">
+					<label>
+						<text>*</text>现居住地址
+						<uni-icons v-if="baseInfo.check_params.now_domicile" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.now_domicile.description)"></uni-icons>
+					</label>
+					<input class="from-input" type="number" v-model="baseInfo.now_domicile" placeholder="输入现居住地址">
+				</view>
+				<view class="from-item from-item-100">
+					<label>
+						<text>*</text>现单位地址
+						<uni-icons v-if="baseInfo.check_params.now_company_address" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.now_company_address.description)"></uni-icons>
+					</label>
+					<input class="from-input" type="number" v-model="baseInfo.now_company_address" placeholder="输入现单位地址">
+				</view>
+				<view class="from-item from-item-100">
+					<label>
+						<text>*</text>现单位名称
+						<uni-icons v-if="baseInfo.check_params.now_company_name" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.now_company_name.description)"></uni-icons>
+					</label>
+					<input class="from-input" type="number" v-model="baseInfo.now_company_name" placeholder="输入现单位名称">
+				</view>
 			</view>
 			<view class="btn">
 				<button size="default" @click="onSubmit">提交基础资料</button>
@@ -142,7 +163,7 @@
 				perfectBase(this.$Route.query.orderId).then(res => {
 					let { base, province } = res;
 					this.baseInfo = base;
-					this.isCheck = base.check_params.toString() != ''
+					this.isCheck  = base.check_params.toString() != ''
 					this.loding   = false;
 					uni.hideLoading()
 				}).catch(err => {
@@ -162,15 +183,18 @@
 			// 提交基础资料
 			onSubmit(){
 				let data = {
-					mobile		: this.baseInfo.mobile,
-					marriage	: this.baseInfo.marriage,
-					mate		: this.baseInfo.mate,
-					education	: this.baseInfo.education,
-					school		: this.baseInfo.school,
-					tmp_address	: this.baseInfo.tmp_address,
-					province_id	: this.baseInfo.district_id,
-					city_id		: this.baseInfo.city_id,
-					district_id	: this.baseInfo.province_id
+					mobile				: this.baseInfo.mobile,
+					marriage			: this.baseInfo.marriage,
+					mate				: this.baseInfo.mate,
+					education			: this.baseInfo.education,
+					school				: this.baseInfo.school,
+					tmp_address			: this.baseInfo.tmp_address,
+					province_id			: this.baseInfo.district_id,
+					city_id				: this.baseInfo.city_id,
+					district_id			: this.baseInfo.province_id,
+					now_domicile		: this.baseInfo.now_domicile,
+					now_company_address	: this.baseInfo.now_company_address,
+					now_company_name	: this.baseInfo.now_company_name
 				}
 				uni.showModal({
 					title		: '提示',
--- a/static/icons/tabs_icon_04.png
+++ b/static/icons/tabs_icon_04.png
--- a/static/icons/tabs_show_04.png
+++ b/static/icons/tabs_show_04.png
--- a/static/im/icon_03.png
+++ b/static/im/icon_03.png
--- a/uni_modules/oct-calendar-picker/changelog.md
+++ b/uni_modules/oct-calendar-picker/changelog.md
--- a/uni_modules/oct-calendar-picker/components/oct-calendar-picker/oct-calendar-picker.vue
+++ b/uni_modules/oct-calendar-picker/components/oct-calendar-picker/oct-calendar-picker.vue
@@ -0,0 +1,455 @@
+<template>
+	<view>
+		<uni-popup ref="calendarPikerPopup">
+			<view class="calendar--piker">
+				<!-- header -->
+				<view class="calendar--piker--header">
+					<view class="calendar--piker--tabs">
+						<view class="calendar--piker--tabs--item" :class="{ 'acitve': tabVal == item.val }" v-for="(item, index) in tabs" :key="index" @click="onCalendarTabs(item)">{{item.title}}</view>
+					</view>
+					<uni-icons type="closeempty" size="20" color="#999" @click="close"></uni-icons>
+				</view>
+				<!-- 按月筛选 -->
+				<view class="calendar--piker--content" v-if="tabVal == 0">
+					<picker-view :indicator-style="indicatorStyle" :value="monthValue" @change="bindChangeMonth" class="calendar--piker--content--view">
+						<picker-view-column>
+							<view class="item" v-for="(item,index) in monthYM.years" :key="index">{{item}}年</view>
+						</picker-view-column>
+						<picker-view-column>
+							<view class="item" v-for="(item,index) in monthYM.months" :key="index">{{item}}月</view>
+						</picker-view-column>
+					</picker-view>
+				</view>
+				<!-- 按日筛选 -->
+				<view class="calendar--piker--content" v-if="tabVal == 1">
+					<view class="calendar--piker--content--subtitle">交易时间</view>
+					<view class="calendar--piker--content--flex">
+						<view class="item" :class="{ 'active': recentlyNum == 3 }" @click="getRecentlyDate(3)">近三月</view>
+						<view class="item" :class="{ 'active': recentlyNum == 6 }" @click="getRecentlyDate(6)">近半年</view>
+						<view class="item" :class="{ 'active': recentlyNum == 12 }" @click="getRecentlyDate(12)">近一年</view>
+					</view>
+					<view class="calendar--piker--content--subtitle">自定义</view>
+					<view class="calendar--piker--content--date">
+						<view class="date-item" @click="onDateTypeKey('start')" :class="{'date--active': dateTypeKey == 'start'}">{{ startDate || '开始时间' }}</view>
+						<view class="date-text">至</view>
+						<view class="date-item" @click="onDateTypeKey('end')" :class="{'date--active': dateTypeKey == 'end'}">{{ endDate || '结束时间' }}</view>
+					</view>
+					<view class="calendar--piker--content--hint">最长可查询一年的账户记录</view>
+					<block v-if="dateTypeKey == 'start'">
+						<picker-view :indicator-style="indicatorStyle" :value="startValue" @change="bindChange" class="calendar--piker--content--view">
+							<picker-view-column>
+								<view class="item" v-for="(item,index) in startYMD.years" :key="index">{{item}}年</view>
+							</picker-view-column>
+							<picker-view-column>
+								<view class="item" v-for="(item,index) in startYMD.months" :key="index">{{item}}月</view>
+							</picker-view-column>
+							<picker-view-column>
+								<view class="item" v-for="(item,index) in startYMD.days" :key="index">{{item}}日</view>
+							</picker-view-column>
+						</picker-view>
+					</block>
+					<block v-if="dateTypeKey == 'end'">
+						<picker-view :indicator-style="indicatorStyle" :value="endValue" @change="bindChange" class="calendar--piker--content--view">
+							<picker-view-column>
+								<view class="item" v-for="(item,index) in endYMD.years" :key="index">{{item}}年</view>
+							</picker-view-column>
+							<picker-view-column>
+								<view class="item" v-for="(item,index) in endYMD.months" :key="index">{{item}}月</view>
+							</picker-view-column>
+							<picker-view-column>
+								<view class="item" v-for="(item,index) in endYMD.days" :key="index">{{item}}日</view>
+							</picker-view-column>
+						</picker-view>
+					</block>
+				</view>
+				<!-- 确定 -->
+				<view class="calendar--piker--btn">
+					<button size="default" @click="onCalendarChange">确定</button>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+<script>
+	/*
+	 * 
+	 * 
+	 * */
+	var moment = require('moment')
+	export default{
+		data(){
+			const monthYM  	 = { years: [], months: [] }
+			const monthValue = [ 0, 0 ]
+			for(let i = 2022; i <= moment().get('year'); i++){
+				monthYM.years.push(i)
+			}
+			for(let i = 1; i <= (moment().get('month') + 1); i++){
+				monthYM.months.push(i)
+			}
+			monthValue[0] = monthYM.years.length - 1;
+			monthValue[1] = monthYM.months.length - 1;
+			return {
+				tabs			: [
+					{ val: 0, title: '月份选择' },
+					{ val: 1, title: '自定义时间' }
+				],
+				tabVal			: 0,
+				
+				// 月份选择
+				monthYM,
+				monthValue,
+				
+				// 自定义时间
+				startYMD		: { years: [], months: [], days: [] },
+				startValue		: [0,0,0],
+				startDate		: '',
+				
+				endYMD			: { years: [], months: [], days: [] },
+				endValue		: [0,0,0],
+				endDate			: '',
+				
+				dateTypeKey		: 'start',
+				indicatorStyle	: `height: 35px;`,
+				
+				// 快捷筛选选项
+				recentlyNum		: ''
+			}
+		},
+		created() {
+			let year   = moment().get('year')
+			let month  = moment().get('month') + 1
+			let date   = moment().get('date')
+		},
+		methods: {
+			// 打开弹出层
+			open(type){
+				this.$refs.calendarPikerPopup.open(type || 'bottom')
+			},
+			// 关闭弹出层
+			close(){
+				this.$refs.calendarPikerPopup.close()
+			},
+			// 获取初始化时间
+			onCalendarTabs(e){
+				let { val } = e
+				if(val == this.tabVal) return
+				if(val == 1 && this.startYMD.days == ''){
+					let { Ymd, Val, Date } = this.getAtData()
+					this.startYMD	= Ymd
+					this.startValue	= Val
+					this.startDate	= Date
+				}
+				this.tabVal = val
+			},
+			// 获取初始化时间
+			getAtData(){
+				let Ymd  = { years: [], months: [], days: [] }
+				let Val  = [ 0,0,0 ]
+				let Date = ''
+				
+				for(let i = 2022; i <= moment().get('year'); i++){
+					Ymd.years.push(i)
+				}
+				for(let i = 1; i <= (moment().get('month') + 1); i++){
+					Ymd.months.push(i)
+				}
+				for(let i = 1; i <= moment().get('date'); i++){
+					Ymd.days.push(i)
+				}
+				
+				Val[0] = Ymd.years.length - 1
+				Val[1] = Ymd.months.length - 1
+				Val[2] = Ymd.days.length - 1
+				
+				let year  = Ymd.years[Val[0]];
+				let month = Ymd.months[Val[1]];
+				let day   = Ymd.days[Val[2]]
+				
+				Date =  year + '-' + (month <= 9 ? '0' + month : month ) + '-' + (day <= 9 ? '0' + day : day )
+				
+				return { Ymd, Val, Date }
+			},
+			// 月份选择
+			bindChangeMonth(e){
+				let { value } 	= e.detail
+				let atMonthVal 	= this.monthValue
+				let yearVal		= this.monthYM.years[value[0]]
+				let isAtYear	= yearVal == moment().get('year')
+				let monthsArr  	= []
+				if(value[0] != atMonthVal[0]){
+					for(let i = 1; i <= Number(isAtYear ? moment().get('month') + 1 : 12); i++ ){
+						monthsArr.push(i)
+					}
+					this.$set(this.monthYM, 'months', monthsArr)
+				}
+				this.monthValue = value
+			},
+			// 选择时间类型
+			onDateTypeKey(type){
+				if(type == this.dateTypeKey) return
+				if(this[type + 'Date'] == ''){
+					let { Ymd, Val, Date } = this.getAtData()
+					this[type + 'YMD'] 	 = Ymd
+					this[type + 'Value'] = Val
+					this[type + 'Date']  = Date
+				}
+				if(this.endDate != '' && type == 'end'){
+					let years 			 = []
+					let values			 = [ 0, 0, 0 ]
+					let endDateArr 		 = this.endDate.split('-')
+					let { months, days } = this.getNewYM(endDateArr[0], endDateArr[1])
+					for(let i = 2022; i <= endDateArr[0]; i++){
+						years.push(i)
+					}
+					values[0] = years.length - 1
+					values[1] = months.length - 1
+					values[2] = days.length - 1
+					this.endYMD 	= { years, months, days}
+					this.endValue	= values
+				}
+				this.dateTypeKey = type
+			},
+			// 选择日期
+			bindChange(e){
+				let { value } = e.detail
+				let typeKEY   = this.dateTypeKey
+				let year	  = this[typeKEY + 'YMD'].years[value[0]]
+				let month	  = this[typeKEY + 'YMD'].months[value[1]]
+				let day		  = this[typeKEY + 'YMD'].days[value[2]]
+				
+				if(value[0] != this[typeKEY + 'Value'][0] || value[1] != this[typeKEY + 'Value'][1]){
+					let { months, days } = this.getNewYM(year, month)
+					this.$set(this[typeKEY + 'YMD'], 'months', months)
+					this.$set(this[typeKEY + 'YMD'], 'days', days)
+				}
+				
+				this[typeKEY + 'Value'] = value
+				this[typeKEY + 'Date']  = year + '-' + (month <= 9 ? '0' + month : month ) + '-' + (day <= 9 ? '0' + day : day )
+				this.recentlyNum 		= ''
+			},
+			// 获取最新的月份和日数据
+			getNewYM(year, month){
+				let months  = []
+				let days    = []
+				let lastDay = new Date(year, month, 0).getDate()
+				if(year == moment().get('year') && month == moment().get('month') + 1){
+					lastDay = moment().get('date')
+				}
+				for(let i = 1; i <= (year == moment().get('year') ? moment().get('month') + 1 : 12); i++){
+					months.push(i)
+				}
+				for(let i = 1; i <= lastDay; i++){
+					days.push(i)
+				}
+				return { months, days }
+			},
+			// 计算就近时间
+			getRecentlyDate(num){
+				let year   = moment().get('year')
+				let month  = moment().get('month') + 1
+				let today  = moment().get('date')
+				let start  = moment([year, month, today]).month(-(num - 2)).format('YYYY-MM-DD')
+				let ymdArr = start.split('-')
+				
+				let { months, days } = this.getNewYM(ymdArr[0], ymdArr[1])
+				
+				this.$set(this.startYMD, 'months', months)
+				this.$set(this.startYMD, 'days', days)
+				
+				let yearIndex = this.startYMD.years.findIndex(val => val == ymdArr[0]) || 0
+				let monthIndex = this.startYMD.months.findIndex(val => val == ymdArr[1]) || 0
+				let dayIndex = this.startYMD.days.findIndex(val => val == ymdArr[2]) || 0
+				
+				this.startValue	 = [yearIndex, monthIndex, dayIndex]
+				this.startDate	 = start
+				this.endDate	 = year + '-' + (month <= 9 ? '0' + month : month ) + '-' + (today <= 9 ? '0' + today : today )
+				
+				if(this.dateTypeKey == 'end'){
+					let years 			 = []
+					let values			 = [ 0, 0, 0 ]
+					let endDateArr 		 = this.endDate.split('-')
+					let { months, days } = this.getNewYM(endDateArr[0], endDateArr[1])
+					for(let i = 2022; i <= endDateArr[0]; i++){
+						years.push(i)
+					}
+					values[0] = years.length - 1
+					values[1] = months.length - 1
+					values[2] = days.length - 1
+					this.endYMD 	= { years, months, days}
+					this.endValue	= values
+				}
+				
+				this.recentlyNum = num
+			},
+			// 确认日期
+			onCalendarChange(){
+				let monthYM 	= this.monthYM, monthValue = this.monthValue
+				let startDate	= ''
+				let endDate		= ''
+				switch(this.tabVal){
+					case 0:
+						let yearsVal = monthYM.years[monthValue[0]]
+						let monthVal = monthYM.months[monthValue[1]]
+						let lastDay  = new Date(yearsVal, monthVal, 0).getDate()
+						let isAt	 = yearsVal == moment().get('year') && monthVal == (moment().get('month') + 1)
+						
+						startDate = yearsVal + '-' + (monthVal <= 9 ? '0' + monthVal: monthVal) + '-01'
+						endDate	  = yearsVal + '-' + (monthVal <= 9 ? '0' + monthVal: monthVal) + '-' + (isAt ? moment().get('date'): lastDay)
+						break;
+					case 1:
+						if(this.startDate == ''){
+							uni.showToast({
+								title: '开始时间不能为空',
+								icon : 'none'
+							})
+							return
+						}
+						if(this.endDate == ''){
+							uni.showToast({
+								title: '结束时间不能为空',
+								icon : 'none'
+							})
+							return
+						}
+						if(new Date(this.startDate).getTime() > new Date(this.endDate).getTime()){
+							uni.showToast({
+								title: '结束时间不能大于开始时间',
+								icon : 'none'
+							})
+							return
+						}
+						startDate = this.startDate
+						endDate	  = this.endDate
+						break;
+				}
+				this.$refs.calendarPikerPopup.close()
+				this.$emit('change', {
+					startDate,
+					endDate
+				})
+			}
+		}
+	}
+</script>
+<style lang="scss" scoped>
+	.calendar--piker{
+		background: white;
+		border-radius: 20rpx 20rpx 0 0;
+		padding: 0 30rpx 80rpx;
+		// header
+		&--header{
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 20rpx 0;
+			border-bottom: solid 1rpx #eaeaea;
+		}
+		// tabs
+		&--tabs{
+			display: flex;
+			justify-content: flex-start;
+			&--item{
+				margin-right: 50rpx;
+				line-height: 70rpx;
+				font-size: 28rpx;
+				position: relative;
+				&:last-child{
+					margin-right: 0;
+				}
+				&.acitve{
+					color: #446EFE;
+					&::after{
+						content: " ";
+						position: absolute;
+						bottom: -22rpx;
+						left: 0;
+						right: 0;
+						height: 1rpx;
+						background: #446EFE;
+					}
+				}
+			}
+		}
+		// 日期筛选
+		&--content{
+			padding-top: 50rpx;
+			&--subtitle{
+				font-size: 28rpx;
+				color: gray;
+			}
+			&--flex{
+				display: flex;
+				flex-wrap: wrap;
+				padding: 30rpx 0 50rpx;
+				font-size: 26rpx;
+				& > .item{
+					margin-right: 20rpx;
+					border: solid 1rpx #999;
+					color: gray;
+					border-radius: 5rpx;
+					padding: 0 20rpx;
+					height: 45rpx;
+					line-height: 43rpx;
+					&.active{
+						border-color: #446EFE;
+						color: #446EFE;
+						background-color: rgba(68, 110, 254, .1);
+					}
+				}
+			}
+			&--date{
+				padding-top: 30rpx;
+				display: flex;
+				align-items: center;
+				.date-text{
+					color: 333;
+					font-size: 30rpx;
+					width: 100rpx;
+					text-align: center;
+					font-weight: bold;
+				}
+				.date-item{
+					border-bottom: solid 6rpx #ddd;
+					width: calc(50% - 50rpx);
+					text-align: center;
+					height: 90rpx;
+					line-height: 84rpx;
+					&.date--active{
+						border-color: #446EFE;
+						color: #446EFE;
+					}
+				}
+			}
+			&--hint{
+				text-align: center;
+				font-size: 28rpx;
+				color: #FFAB3F;
+				padding: 30rpx 0;
+				line-height: 50rpx;
+			}
+			&--view{
+				height: 300rpx;
+				& .item{
+					line-height: 35px;
+					text-align: center;
+				}
+			}
+		}
+		// 按钮
+		&--btn{
+			padding-top: 50rpx;
+			& > button[size='default']{
+				background: #446EFE;
+				color: white;
+				height: 100rpx;
+				line-height: 100rpx;
+				padding: 0;
+				border-radius: 4rpx;
+				font-size: 34rpx;
+				&::after{
+					display: none;
+				}
+			}
+		}
+	}
+</style>
--- a/uni_modules/oct-calendar-picker/package.json
+++ b/uni_modules/oct-calendar-picker/package.json
@@ -0,0 +1,81 @@
+{
+  "id": "oct-calendar-picker",
+  "displayName": "oct-calendar-picker",
+  "version": "1.0.0",
+  "description": "oct-calendar-picker",
+  "keywords": [
+    "oct-calendar-picker"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "type": "component-vue",
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "",
+      "data": "",
+      "permissions": ""
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "u",
+        "aliyun": "u"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "u",
+          "vue3": "u"
+        },
+        "App": {
+          "app-vue": "u",
+          "app-nvue": "u"
+        },
+        "H5-mobile": {
+          "Safari": "u",
+          "Android Browser": "u",
+          "微信浏览器(Android)": "u",
+          "QQ浏览器(Android)": "u"
+        },
+        "H5-pc": {
+          "Chrome": "u",
+          "IE": "u",
+          "Edge": "u",
+          "Firefox": "u",
+          "Safari": "u"
+        },
+        "小程序": {
+          "微信": "u",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+          "QQ": "u",
+          "钉钉": "u",
+          "快手": "u",
+          "飞书": "u",
+          "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  }
+}
--- a/uni_modules/oct-calendar-picker/readme.md
+++ b/uni_modules/oct-calendar-picker/readme.md
@@ -0,0 +1 @@
+# oct-calendar-picker
--- a/uni_modules/oct-im/changelog.md
+++ b/uni_modules/oct-im/changelog.md
--- a/uni_modules/oct-im/components/oct-im/oct-im.vue
+++ b/uni_modules/oct-im/components/oct-im/oct-im.vue
@@ -0,0 +1,9 @@
+<template>
+	<list></list>
+</template>
+<script>
+	
+</script>
+<style>
+	
+</style>
--- a/uni_modules/oct-im/package.json
+++ b/uni_modules/oct-im/package.json
@@ -0,0 +1,81 @@
+{
+  "id": "oct-im",
+  "displayName": "oct-im",
+  "version": "1.0.0",
+  "description": "oct-im",
+  "keywords": [
+    "oct-im"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "type": "component-vue",
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "",
+      "data": "",
+      "permissions": ""
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "u",
+        "aliyun": "u"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "u",
+          "vue3": "u"
+        },
+        "App": {
+          "app-vue": "u",
+          "app-nvue": "u"
+        },
+        "H5-mobile": {
+          "Safari": "u",
+          "Android Browser": "u",
+          "微信浏览器(Android)": "u",
+          "QQ浏览器(Android)": "u"
+        },
+        "H5-pc": {
+          "Chrome": "u",
+          "IE": "u",
+          "Edge": "u",
+          "Firefox": "u",
+          "Safari": "u"
+        },
+        "小程序": {
+          "微信": "u",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+          "QQ": "u",
+          "钉钉": "u",
+          "快手": "u",
+          "飞书": "u",
+          "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  }
+}
--- a/uni_modules/oct-im/readme.md
+++ b/uni_modules/oct-im/readme.md
@@ -0,0 +1 @@
+# oct-im
--- a/uni_modules/uni-popup/changelog.md
+++ b/uni_modules/uni-popup/changelog.md
@@ -0,0 +1,66 @@
+## 1.8.2（2023-02-02）
+- uni-popup-dialog 组件新增 inputType 属性
+## 1.8.1（2022-12-01）
+- 修复 nvue 下 v-show 报错
+## 1.8.0（2022-11-29）
+- 优化 主题样式
+## 1.7.9（2022-04-02）
+- 修复 弹出层内部无法滚动的bug
+## 1.7.8（2022-03-28）
+- 修复 小程序中高度错误的bug
+## 1.7.7（2022-03-17）
+- 修复 快速调用open出现问题的Bug
+## 1.7.6（2022-02-14）
+- 修复 safeArea 属性不能设置为false的bug
+## 1.7.5（2022-01-19）
+- 修复 isMaskClick 失效的bug
+## 1.7.4（2022-01-19）
+- 新增 cancelText \ confirmText 属性 ，可自定义文本
+- 新增 maskBackgroundColor 属性 ，可以修改蒙版颜色
+- 优化 maskClick属性 更新为 isMaskClick ，解决微信小程序警告的问题
+## 1.7.3（2022-01-13）
+- 修复 设置 safeArea 属性不生效的bug
+## 1.7.2（2021-11-26）
+- 优化 组件示例
+## 1.7.1（2021-11-26）
+- 修复 vuedoc 文字错误
+## 1.7.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-popup](https://uniapp.dcloud.io/component/uniui/uni-popup)
+## 1.6.2（2021-08-24）
+- 新增 支持国际化
+## 1.6.1（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.6.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.5.0（2021-06-23）
+- 新增 mask-click 遮罩层点击事件
+## 1.4.5（2021-06-22）
+- 修复 nvue 平台中间弹出后，点击内容，再点击遮罩无法关闭的Bug
+## 1.4.4（2021-06-18）
+- 修复 H5平台中间弹出后，点击内容，再点击遮罩无法关闭的Bug
+## 1.4.3（2021-06-08）
+- 修复 错误的 watch 字段
+- 修复 safeArea 属性不生效的问题
+- 修复 点击内容，再点击遮罩无法关闭的Bug
+## 1.4.2（2021-05-12）
+- 新增 组件示例地址
+## 1.4.1（2021-04-29）
+- 修复 组件内放置 input 、textarea 组件，无法聚焦的问题
+## 1.4.0 （2021-04-29）
+- 新增 type 属性的 left\right 值，支持左右弹出
+- 新增 open(String:type) 方法参数 ，可以省略 type 属性 ，直接传入类型打开指定弹窗
+- 新增 backgroundColor 属性，可定义主窗口背景色,默认不显示背景色
+- 新增 safeArea 属性，是否适配底部安全区
+- 修复 App\h5\微信小程序底部安全区占位不对的Bug
+- 修复 App 端弹出等待的Bug
+- 优化 提升低配设备性能，优化动画卡顿问题
+- 优化 更简单的组件自定义方式
+## 1.2.9（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+## 1.2.8（2021-02-05）
+- 调整为uni_modules目录规范
+## 1.2.7（2021-02-05）
+- 调整为uni_modules目录规范
+- 新增 支持 PC 端
+- 新增 uni-popup-message 、uni-popup-dialog扩展组件支持 PC 端
--- a/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js
+++ b/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js
@@ -0,0 +1,45 @@
+// #ifdef H5
+export default {
+  name: 'Keypress',
+  props: {
+    disable: {
+      type: Boolean,
+      default: false
+    }
+  },
+  mounted () {
+    const keyNames = {
+      esc: ['Esc', 'Escape'],
+      tab: 'Tab',
+      enter: 'Enter',
+      space: [' ', 'Spacebar'],
+      up: ['Up', 'ArrowUp'],
+      left: ['Left', 'ArrowLeft'],
+      right: ['Right', 'ArrowRight'],
+      down: ['Down', 'ArrowDown'],
+      delete: ['Backspace', 'Delete', 'Del']
+    }
+    const listener = ($event) => {
+      if (this.disable) {
+        return
+      }
+      const keyName = Object.keys(keyNames).find(key => {
+        const keyName = $event.key
+        const value = keyNames[key]
+        return value === keyName || (Array.isArray(value) && value.includes(keyName))
+      })
+      if (keyName) {
+        // 避免和其他按键事件冲突
+        setTimeout(() => {
+          this.$emit(keyName, {})
+        }, 0)
+      }
+    }
+    document.addEventListener('keyup', listener)
+    this.$once('hook:beforeDestroy', () => {
+      document.removeEventListener('keyup', listener)
+    })
+  },
+	render: () => {}
+}
+// #endif
--- a/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
+++ b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
@@ -0,0 +1,275 @@
+<template>
+	<view class="uni-popup-dialog">
+		<view class="uni-dialog-title">
+			<text class="uni-dialog-title-text" :class="['uni-popup__'+dialogType]">{{titleText}}</text>
+		</view>
+		<view v-if="mode === 'base'" class="uni-dialog-content">
+			<slot>
+				<text class="uni-dialog-content-text">{{content}}</text>
+			</slot>
+		</view>
+		<view v-else class="uni-dialog-content">
+			<slot>
+				<input class="uni-dialog-input" v-model="val" :type="inputType" :placeholder="placeholderText" :focus="focus" >
+			</slot>
+		</view>
+		<view class="uni-dialog-button-group">
+			<view class="uni-dialog-button" @click="closeDialog">
+				<text class="uni-dialog-button-text">{{closeText}}</text>
+			</view>
+			<view class="uni-dialog-button uni-border-left" @click="onOk">
+				<text class="uni-dialog-button-text uni-button-color">{{okText}}</text>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import popup from '../uni-popup/popup.js'
+	import {
+	initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from '../uni-popup/i18n/index.js'
+	const {	t } = initVueI18n(messages)
+	/**
+	 * PopUp 弹出层-对话框样式
+	 * @description 弹出层-对话框样式
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} value input 模式下的默认值
+	 * @property {String} placeholder input 模式下输入提示
+	 * @property {String} type = [success|warning|info|error] 主题样式
+	 *  @value success 成功
+	 * 	@value warning 提示
+	 * 	@value info 消息
+	 * 	@value error 错误
+	 * @property {String} mode = [base|input] 模式、
+	 * 	@value base 基础对话框
+	 * 	@value input 可输入对话框
+	 * @property {String} content 对话框内容
+	 * @property {Boolean} beforeClose 是否拦截取消事件
+	 * @event {Function} confirm 点击确认按钮触发
+	 * @event {Function} close 点击取消按钮触发
+	 */
+
+	export default {
+		name: "uniPopupDialog",
+		mixins: [popup],
+		emits:['confirm','close'],
+		props: {
+			inputType:{
+				type: String,
+				default: 'text'
+			},
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			placeholder: {
+				type: [String, Number],
+				default: ''
+			},
+			type: {
+				type: String,
+				default: 'error'
+			},
+			mode: {
+				type: String,
+				default: 'base'
+			},
+			title: {
+				type: String,
+				default: ''
+			},
+			content: {
+				type: String,
+				default: ''
+			},
+			beforeClose: {
+				type: Boolean,
+				default: false
+			},
+			cancelText:{
+				type: String,
+				default: ''
+			},
+			confirmText:{
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				dialogType: 'error',
+				focus: false,
+				val: ""
+			}
+		},
+		computed: {
+			okText() {
+				return this.confirmText || t("uni-popup.ok")
+			},
+			closeText() {
+				return this.cancelText || t("uni-popup.cancel")
+			},
+			placeholderText() {
+				return this.placeholder || t("uni-popup.placeholder")
+			},
+			titleText() {
+				return this.title || t("uni-popup.title")
+			}
+		},
+		watch: {
+			type(val) {
+				this.dialogType = val
+			},
+			mode(val) {
+				if (val === 'input') {
+					this.dialogType = 'info'
+				}
+			},
+			value(val) {
+				this.val = val
+			}
+		},
+		created() {
+			// 对话框遮罩不可点击
+			this.popup.disableMask()
+			// this.popup.closeMask()
+			if (this.mode === 'input') {
+				this.dialogType = 'info'
+				this.val = this.value
+			} else {
+				this.dialogType = this.type
+			}
+		},
+		mounted() {
+			this.focus = true
+		},
+		methods: {
+			/**
+			 * 点击确认按钮
+			 */
+			onOk() {
+				if (this.mode === 'input'){
+					this.$emit('confirm', this.val)
+				}else{
+					this.$emit('confirm')
+				}
+				if(this.beforeClose) return
+				this.popup.close()
+			},
+			/**
+			 * 点击取消按钮
+			 */
+			closeDialog() {
+				this.$emit('close')
+				if(this.beforeClose) return
+				this.popup.close()
+			},
+			close(){
+				this.popup.close()
+			}
+		}
+	}
+</script>
+
+<style lang="scss" >
+	.uni-popup-dialog {
+		width: 300px;
+		border-radius: 11px;
+		background-color: #fff;
+	}
+
+	.uni-dialog-title {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		padding-top: 25px;
+	}
+
+	.uni-dialog-title-text {
+		font-size: 16px;
+		font-weight: 500;
+	}
+
+	.uni-dialog-content {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		padding: 20px;
+	}
+
+	.uni-dialog-content-text {
+		font-size: 14px;
+		color: #6C6C6C;
+	}
+
+	.uni-dialog-button-group {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		border-top-color: #f5f5f5;
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-dialog-button {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+
+		flex: 1;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 45px;
+	}
+
+	.uni-border-left {
+		border-left-color: #f0f0f0;
+		border-left-style: solid;
+		border-left-width: 1px;
+	}
+
+	.uni-dialog-button-text {
+		font-size: 16px;
+		color: #333;
+	}
+
+	.uni-button-color {
+		color: #007aff;
+	}
+
+	.uni-dialog-input {
+		flex: 1;
+		font-size: 14px;
+		border: 1px #eee solid;
+		height: 40px;
+		padding: 0 10px;
+		border-radius: 5px;
+		color: #555;
+	}
+
+	.uni-popup__success {
+		color: #4cd964;
+	}
+
+	.uni-popup__warn {
+		color: #f0ad4e;
+	}
+
+	.uni-popup__error {
+		color: #dd524d;
+	}
+
+	.uni-popup__info {
+		color: #909399;
+	}
+</style>
--- a/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue
+++ b/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue
@@ -0,0 +1,143 @@
+<template>
+	<view class="uni-popup-message">
+		<view class="uni-popup-message__box fixforpc-width" :class="'uni-popup__'+type">
+			<slot>
+				<text class="uni-popup-message-text" :class="'uni-popup__'+type+'-text'">{{message}}</text>
+			</slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	import popup from '../uni-popup/popup.js'
+	/**
+	 * PopUp 弹出层-消息提示
+	 * @description 弹出层-消息提示
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} type = [success|warning|info|error] 主题样式
+	 *  @value success 成功
+	 * 	@value warning 提示
+	 * 	@value info 消息
+	 * 	@value error 错误
+	 * @property {String} message 消息提示文字
+	 * @property {String} duration 显示时间，设置为 0 则不会自动关闭
+	 */
+
+	export default {
+		name: 'uniPopupMessage',
+		mixins:[popup],
+		props: {
+			/**
+			 * 主题 success/warning/info/error	  默认 success
+			 */
+			type: {
+				type: String,
+				default: 'success'
+			},
+			/**
+			 * 消息文字
+			 */
+			message: {
+				type: String,
+				default: ''
+			},
+			/**
+			 * 显示时间，设置为 0 则不会自动关闭
+			 */
+			duration: {
+				type: Number,
+				default: 3000
+			},
+			maskShow:{
+				type:Boolean,
+				default:false
+			}
+		},
+		data() {
+			return {}
+		},
+		created() {
+			this.popup.maskShow = this.maskShow
+			this.popup.messageChild = this
+		},
+		methods: {
+			timerClose(){
+				if(this.duration === 0) return
+				clearTimeout(this.timer) 
+				this.timer = setTimeout(()=>{
+					this.popup.close()
+				},this.duration)
+			}
+		}
+	}
+</script>
+<style lang="scss" >
+	.uni-popup-message {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+	}
+
+	.uni-popup-message__box {
+		background-color: #e1f3d8;
+		padding: 10px 15px;
+		border-color: #eee;
+		border-style: solid;
+		border-width: 1px;
+		flex: 1;
+	}
+
+	@media screen and (min-width: 500px) {
+		.fixforpc-width {
+			margin-top: 20px;
+			border-radius: 4px;
+			flex: none;
+			min-width: 380px;
+			/* #ifndef APP-NVUE */
+			max-width: 50%;
+			/* #endif */
+			/* #ifdef APP-NVUE */
+			max-width: 500px;
+			/* #endif */
+		}
+	}
+
+	.uni-popup-message-text {
+		font-size: 14px;
+		padding: 0;
+	}
+
+	.uni-popup__success {
+		background-color: #e1f3d8;
+	}
+
+	.uni-popup__success-text {
+		color: #67C23A;
+	}
+
+	.uni-popup__warn {
+		background-color: #faecd8;
+	}
+
+	.uni-popup__warn-text {
+		color: #E6A23C;
+	}
+
+	.uni-popup__error {
+		background-color: #fde2e2;
+	}
+
+	.uni-popup__error-text {
+		color: #F56C6C;
+	}
+
+	.uni-popup__info {
+		background-color: #F2F6FC;
+	}
+
+	.uni-popup__info-text {
+		color: #909399;
+	}
+</style>
--- a/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
+++ b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
@@ -0,0 +1,187 @@
+<template>
+	<view class="uni-popup-share">
+		<view class="uni-share-title"><text class="uni-share-title-text">{{shareTitleText}}</text></view>
+		<view class="uni-share-content">
+			<view class="uni-share-content-box">
+				<view class="uni-share-content-item" v-for="(item,index) in bottomData" :key="index" @click.stop="select(item,index)">
+					<image class="uni-share-image" :src="item.icon" mode="aspectFill"></image>
+					<text class="uni-share-text">{{item.text}}</text>
+				</view>
+
+			</view>
+		</view>
+		<view class="uni-share-button-box">
+			<button class="uni-share-button" @click="close">{{cancelText}}</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import popup from '../uni-popup/popup.js'
+	import {
+	initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from '../uni-popup/i18n/index.js'
+	const {	t	} = initVueI18n(messages)
+	export default {
+		name: 'UniPopupShare',
+		mixins:[popup],
+		emits:['select'],
+		props: {
+			title: {
+				type: String,
+				default: ''
+			},
+			beforeClose: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				bottomData: [{
+						text: '微信',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/c2b17470-50be-11eb-b680-7980c8a877b8.png',
+						name: 'wx'
+					},
+					{
+						text: '支付宝',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/d684ae40-50be-11eb-8ff1-d5dcf8779628.png',
+						name: 'wx'
+					},
+					{
+						text: 'QQ',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/e7a79520-50be-11eb-b997-9918a5dda011.png',
+						name: 'qq'
+					},
+					{
+						text: '新浪',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/0dacdbe0-50bf-11eb-8ff1-d5dcf8779628.png',
+						name: 'sina'
+					},
+					// {
+					// 	text: '百度',
+					// 	icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/1ec6e920-50bf-11eb-8a36-ebb87efcf8c0.png',
+					// 	name: 'copy'
+					// },
+					// {
+					// 	text: '其他',
+					// 	icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/2e0fdfe0-50bf-11eb-b997-9918a5dda011.png',
+					// 	name: 'more'
+					// }
+				]
+			}
+		},
+		created() {},
+		computed: {
+			cancelText() {
+				return t("uni-popup.cancel")
+			},
+		shareTitleText() {
+				return this.title || t("uni-popup.shareTitle")
+			}
+		},
+		methods: {
+			/**
+			 * 选择内容
+			 */
+			select(item, index) {
+				this.$emit('select', {
+					item,
+					index
+				})
+				this.close()
+
+			},
+			/**
+			 * 关闭窗口
+			 */
+			close() {
+				if(this.beforeClose) return
+				this.popup.close()
+			}
+		}
+	}
+</script>
+<style lang="scss" >
+	.uni-popup-share {
+		background-color: #fff;
+		border-top-left-radius: 11px;
+		border-top-right-radius: 11px;
+	}
+	.uni-share-title {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		height: 40px;
+	}
+	.uni-share-title-text {
+		font-size: 14px;
+		color: #666;
+	}
+	.uni-share-content {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		padding-top: 10px;
+	}
+
+	.uni-share-content-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		flex-wrap: wrap;
+		width: 360px;
+	}
+
+	.uni-share-content-item {
+		width: 90px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		padding: 10px 0;
+		align-items: center;
+	}
+
+	.uni-share-content-item:active {
+		background-color: #f5f5f5;
+	}
+
+	.uni-share-image {
+		width: 30px;
+		height: 30px;
+	}
+
+	.uni-share-text {
+		margin-top: 10px;
+		font-size: 14px;
+		color: #3B4144;
+	}
+
+	.uni-share-button-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		padding: 10px 15px;
+	}
+
+	.uni-share-button {
+		flex: 1;
+		border-radius: 50px;
+		color: #666;
+		font-size: 16px;
+	}
+
+	.uni-share-button::after {
+		border-radius: 50px;
+	}
+</style>
--- a/uni_modules/uni-popup/components/uni-popup/i18n/en.json
+++ b/uni_modules/uni-popup/components/uni-popup/i18n/en.json
@@ -0,0 +1,7 @@
+{
+	"uni-popup.cancel": "cancel",
+	"uni-popup.ok": "ok",
+	"uni-popup.placeholder": "pleace enter",
+	"uni-popup.title": "Hint",
+	"uni-popup.shareTitle": "Share to"
+}
--- a/uni_modules/uni-popup/components/uni-popup/i18n/index.js
+++ b/uni_modules/uni-popup/components/uni-popup/i18n/index.js
@@ -0,0 +1,8 @@
+import en from './en.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}
--- a/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json
+++ b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json
@@ -0,0 +1,7 @@
+{
+	"uni-popup.cancel": "取消",
+	"uni-popup.ok": "确定",
+	"uni-popup.placeholder": "请输入",
+		"uni-popup.title": "提示",
+		"uni-popup.shareTitle": "分享到"
+}
--- a/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json
+++ b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json
@@ -0,0 +1,7 @@
+{
+	"uni-popup.cancel": "取消",
+	"uni-popup.ok": "確定",
+	"uni-popup.placeholder": "請輸入",
+	"uni-popup.title": "提示",
+	"uni-popup.shareTitle": "分享到"
+}
--- a/uni_modules/uni-popup/components/uni-popup/keypress.js
+++ b/uni_modules/uni-popup/components/uni-popup/keypress.js
@@ -0,0 +1,45 @@
+// #ifdef H5
+export default {
+  name: 'Keypress',
+  props: {
+    disable: {
+      type: Boolean,
+      default: false
+    }
+  },
+  mounted () {
+    const keyNames = {
+      esc: ['Esc', 'Escape'],
+      tab: 'Tab',
+      enter: 'Enter',
+      space: [' ', 'Spacebar'],
+      up: ['Up', 'ArrowUp'],
+      left: ['Left', 'ArrowLeft'],
+      right: ['Right', 'ArrowRight'],
+      down: ['Down', 'ArrowDown'],
+      delete: ['Backspace', 'Delete', 'Del']
+    }
+    const listener = ($event) => {
+      if (this.disable) {
+        return
+      }
+      const keyName = Object.keys(keyNames).find(key => {
+        const keyName = $event.key
+        const value = keyNames[key]
+        return value === keyName || (Array.isArray(value) && value.includes(keyName))
+      })
+      if (keyName) {
+        // 避免和其他按键事件冲突
+        setTimeout(() => {
+          this.$emit(keyName, {})
+        }, 0)
+      }
+    }
+    document.addEventListener('keyup', listener)
+    // this.$once('hook:beforeDestroy', () => {
+    //   document.removeEventListener('keyup', listener)
+    // })
+  },
+	render: () => {}
+}
+// #endif
--- a/uni_modules/uni-popup/components/uni-popup/popup.js
+++ b/uni_modules/uni-popup/components/uni-popup/popup.js
@@ -0,0 +1,26 @@
+
+export default {
+	data() {
+		return {
+			
+		}
+	},
+	created(){
+		this.popup = this.getParent()
+	},
+	methods:{
+		/**
+		 * 获取父元素实例
+		 */
+		getParent(name = 'uniPopup') {
+			let parent = this.$parent;
+			let parentName = parent.$options.name;
+			while (parentName !== name) {
+				parent = parent.$parent;
+				if (!parent) return false
+				parentName = parent.$options.name;
+			}
+			return parent;
+		},
+	}
+}
--- a/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
+++ b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
@@ -0,0 +1,474 @@
+<template>
+	<view v-if="showPopup" class="uni-popup" :class="[popupstyle, isDesktop ? 'fixforpc-z-index' : '']">
+		<view @touchstart="touchstart">
+			<uni-transition key="1" v-if="maskShow" name="mask" mode-class="fade" :styles="maskClass"
+				:duration="duration" :show="showTrans" @click="onTap" />
+			<uni-transition key="2" :mode-class="ani" name="content" :styles="transClass" :duration="duration"
+				:show="showTrans" @click="onTap">
+				<view class="uni-popup__wrapper" :style="{ backgroundColor: bg }" :class="[popupstyle]" @click="clear">
+					<slot />
+				</view>
+			</uni-transition>
+		</view>
+		<!-- #ifdef H5 -->
+		<keypress v-if="maskShow" @esc="onTap" />
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	// #ifdef H5
+	import keypress from './keypress.js'
+	// #endif
+
+	/**
+	 * PopUp 弹出层
+	 * @description 弹出层组件，为了解决遮罩弹层的问题
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} type = [top|center|bottom|left|right|message|dialog|share] 弹出方式
+	 * 	@value top 顶部弹出
+	 * 	@value center 中间弹出
+	 * 	@value bottom 底部弹出
+	 * 	@value left		左侧弹出
+	 * 	@value right  右侧弹出
+	 * 	@value message 消息提示
+	 * 	@value dialog 对话框
+	 * 	@value share 底部分享示例
+	 * @property {Boolean} animation = [true|false] 是否开启动画
+	 * @property {Boolean} maskClick = [true|false] 蒙版点击是否关闭弹窗(废弃)
+	 * @property {Boolean} isMaskClick = [true|false] 蒙版点击是否关闭弹窗
+	 * @property {String}  backgroundColor 主窗口背景色
+	 * @property {String}  maskBackgroundColor 蒙版颜色
+	 * @property {Boolean} safeArea		   是否适配底部安全区
+	 * @event {Function} change 打开关闭弹窗触发，e={show: false}
+	 * @event {Function} maskClick 点击遮罩触发
+	 */
+
+	export default {
+		name: 'uniPopup',
+		components: {
+			// #ifdef H5
+			keypress
+			// #endif
+		},
+		emits: ['change', 'maskClick'],
+		props: {
+			// 开启动画
+			animation: {
+				type: Boolean,
+				default: true
+			},
+			// 弹出层类型，可选值，top: 顶部弹出层；bottom：底部弹出层；center：全屏弹出层
+			// message: 消息提示 ; dialog : 对话框
+			type: {
+				type: String,
+				default: 'center'
+			},
+			// maskClick
+			isMaskClick: {
+				type: Boolean,
+				default: null
+			},
+			// TODO 2 个版本后废弃属性 ，使用 isMaskClick
+			maskClick: {
+				type: Boolean,
+				default: null
+			},
+			backgroundColor: {
+				type: String,
+				default: 'none'
+			},
+			safeArea: {
+				type: Boolean,
+				default: true
+			},
+			maskBackgroundColor: {
+				type: String,
+				default: 'rgba(0, 0, 0, 0.4)'
+			},
+		},
+
+		watch: {
+			/**
+			 * 监听type类型
+			 */
+			type: {
+				handler: function(type) {
+					if (!this.config[type]) return
+					this[this.config[type]](true)
+				},
+				immediate: true
+			},
+			isDesktop: {
+				handler: function(newVal) {
+					if (!this.config[newVal]) return
+					this[this.config[this.type]](true)
+				},
+				immediate: true
+			},
+			/**
+			 * 监听遮罩是否可点击
+			 * @param {Object} val
+			 */
+			maskClick: {
+				handler: function(val) {
+					this.mkclick = val
+				},
+				immediate: true
+			},
+			isMaskClick: {
+				handler: function(val) {
+					this.mkclick = val
+				},
+				immediate: true
+			},
+			// H5 下禁止底部滚动
+			showPopup(show) {
+				// #ifdef H5
+				// fix by mehaotian 处理 h5 滚动穿透的问题
+				document.getElementsByTagName('body')[0].style.overflow = show ? 'hidden' : 'visible'
+				// #endif
+			}
+		},
+		data() {
+			return {
+				duration: 300,
+				ani: [],
+				showPopup: false,
+				showTrans: false,
+				popupWidth: 0,
+				popupHeight: 0,
+				config: {
+					top: 'top',
+					bottom: 'bottom',
+					center: 'center',
+					left: 'left',
+					right: 'right',
+					message: 'top',
+					dialog: 'center',
+					share: 'bottom'
+				},
+				maskClass: {
+					position: 'fixed',
+					bottom: 0,
+					top: 0,
+					left: 0,
+					right: 0,
+					backgroundColor: 'rgba(0, 0, 0, 0.4)'
+				},
+				transClass: {
+					position: 'fixed',
+					left: 0,
+					right: 0
+				},
+				maskShow: true,
+				mkclick: true,
+				popupstyle: this.isDesktop ? 'fixforpc-top' : 'top'
+			}
+		},
+		computed: {
+			isDesktop() {
+				return this.popupWidth >= 500 && this.popupHeight >= 500
+			},
+			bg() {
+				if (this.backgroundColor === '' || this.backgroundColor === 'none') {
+					return 'transparent'
+				}
+				return this.backgroundColor
+			}
+		},
+		mounted() {
+			const fixSize = () => {
+				const {
+					windowWidth,
+					windowHeight,
+					windowTop,
+					safeArea,
+					screenHeight,
+					safeAreaInsets
+				} = uni.getSystemInfoSync()
+				this.popupWidth = windowWidth
+				this.popupHeight = windowHeight + (windowTop || 0)
+				// TODO fix by mehaotian 是否适配底部安全区 ,目前微信ios 、和 app ios 计算有差异，需要框架修复
+				if (safeArea && this.safeArea) {
+					// #ifdef MP-WEIXIN
+					this.safeAreaInsets = screenHeight - safeArea.bottom
+					// #endif
+					// #ifndef MP-WEIXIN
+					this.safeAreaInsets = safeAreaInsets.bottom
+					// #endif
+				} else {
+					this.safeAreaInsets = 0
+				}
+			}
+			fixSize()
+			// #ifdef H5
+			// window.addEventListener('resize', fixSize)
+			// this.$once('hook:beforeDestroy', () => {
+			// 	window.removeEventListener('resize', fixSize)
+			// })
+			// #endif
+		},
+		// #ifndef VUE3
+		// TODO vue2
+		destroyed() {
+			this.setH5Visible()
+		},
+		// #endif
+		// #ifdef VUE3
+		// TODO vue3
+		unmounted() {
+			this.setH5Visible()
+		},
+		// #endif
+		created() {
+			// this.mkclick =  this.isMaskClick || this.maskClick
+			if (this.isMaskClick === null && this.maskClick === null) {
+				this.mkclick = true
+			} else {
+				this.mkclick = this.isMaskClick !== null ? this.isMaskClick : this.maskClick
+			}
+			if (this.animation) {
+				this.duration = 300
+			} else {
+				this.duration = 0
+			}
+			// TODO 处理 message 组件生命周期异常的问题
+			this.messageChild = null
+			// TODO 解决头条冒泡的问题
+			this.clearPropagation = false
+			this.maskClass.backgroundColor = this.maskBackgroundColor
+		},
+		methods: {
+			setH5Visible() {
+				// #ifdef H5
+				// fix by mehaotian 处理 h5 滚动穿透的问题
+				document.getElementsByTagName('body')[0].style.overflow = 'visible'
+				// #endif
+			},
+			/**
+			 * 公用方法，不显示遮罩层
+			 */
+			closeMask() {
+				this.maskShow = false
+			},
+			/**
+			 * 公用方法，遮罩层禁止点击
+			 */
+			disableMask() {
+				this.mkclick = false
+			},
+			// TODO nvue 取消冒泡
+			clear(e) {
+				// #ifndef APP-NVUE
+				e.stopPropagation()
+				// #endif
+				this.clearPropagation = true
+			},
+
+			open(direction) {
+				// fix by mehaotian 处理快速打开关闭的情况
+				if (this.showPopup) {
+					clearTimeout(this.timer)
+					this.showPopup = false
+				}
+				let innerType = ['top', 'center', 'bottom', 'left', 'right', 'message', 'dialog', 'share']
+				if (!(direction && innerType.indexOf(direction) !== -1)) {
+					direction = this.type
+				}
+				if (!this.config[direction]) {
+					console.error('缺少类型：', direction)
+					return
+				}
+				this[this.config[direction]]()
+				this.$emit('change', {
+					show: true,
+					type: direction
+				})
+			},
+			close(type) {
+				this.showTrans = false
+				this.$emit('change', {
+					show: false,
+					type: this.type
+				})
+				clearTimeout(this.timer)
+				// // 自定义关闭事件
+				// this.customOpen && this.customClose()
+				this.timer = setTimeout(() => {
+					this.showPopup = false
+				}, 300)
+			},
+			// TODO 处理冒泡事件，头条的冒泡事件有问题 ，先这样兼容
+			touchstart() {
+				this.clearPropagation = false
+			},
+
+			onTap() {
+				if (this.clearPropagation) {
+					// fix by mehaotian 兼容 nvue
+					this.clearPropagation = false
+					return
+				}
+				this.$emit('maskClick')
+				if (!this.mkclick) return
+				this.close()
+			},
+			/**
+			 * 顶部弹出样式处理
+			 */
+			top(type) {
+				this.popupstyle = this.isDesktop ? 'fixforpc-top' : 'top'
+				this.ani = ['slide-top']
+				this.transClass = {
+					position: 'fixed',
+					left: 0,
+					right: 0,
+					backgroundColor: this.bg
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+				this.$nextTick(() => {
+					if (this.messageChild && this.type === 'message') {
+						this.messageChild.timerClose()
+					}
+				})
+			},
+			/**
+			 * 底部弹出样式处理
+			 */
+			bottom(type) {
+				this.popupstyle = 'bottom'
+				this.ani = ['slide-bottom']
+				this.transClass = {
+					position: 'fixed',
+					left: 0,
+					right: 0,
+					bottom: 0,
+					paddingBottom: this.safeAreaInsets + 'px',
+					backgroundColor: this.bg
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+			},
+			/**
+			 * 中间弹出样式处理
+			 */
+			center(type) {
+				this.popupstyle = 'center'
+				this.ani = ['zoom-out', 'fade']
+				this.transClass = {
+					position: 'fixed',
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column',
+					/* #endif */
+					bottom: 0,
+					left: 0,
+					right: 0,
+					top: 0,
+					justifyContent: 'center',
+					alignItems: 'center'
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+			},
+			left(type) {
+				this.popupstyle = 'left'
+				this.ani = ['slide-left']
+				this.transClass = {
+					position: 'fixed',
+					left: 0,
+					bottom: 0,
+					top: 0,
+					backgroundColor: this.bg,
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column'
+					/* #endif */
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+			},
+			right(type) {
+				this.popupstyle = 'right'
+				this.ani = ['slide-right']
+				this.transClass = {
+					position: 'fixed',
+					bottom: 0,
+					right: 0,
+					top: 0,
+					backgroundColor: this.bg,
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column'
+					/* #endif */
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+			}
+		}
+	}
+</script>
+<style lang="scss">
+	.uni-popup {
+		position: fixed;
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+
+		/* #endif */
+		&.top,
+		&.left,
+		&.right {
+			/* #ifdef H5 */
+			top: var(--window-top);
+			/* #endif */
+			/* #ifndef H5 */
+			top: 0;
+			/* #endif */
+		}
+
+		.uni-popup__wrapper {
+			/* #ifndef APP-NVUE */
+			display: block;
+			/* #endif */
+			position: relative;
+
+			/* iphonex 等安全区设置，底部安全区适配 */
+			/* #ifndef APP-NVUE */
+			// padding-bottom: constant(safe-area-inset-bottom);
+			// padding-bottom: env(safe-area-inset-bottom);
+			/* #endif */
+			&.left,
+			&.right {
+				/* #ifdef H5 */
+				padding-top: var(--window-top);
+				/* #endif */
+				/* #ifndef H5 */
+				padding-top: 0;
+				/* #endif */
+				flex: 1;
+			}
+		}
+	}
+
+	.fixforpc-z-index {
+		/* #ifndef APP-NVUE */
+		z-index: 999;
+		/* #endif */
+	}
+
+	.fixforpc-top {
+		top: 0;
+	}
+</style>
--- a/uni_modules/uni-popup/package.json
+++ b/uni_modules/uni-popup/package.json
@@ -0,0 +1,87 @@
+{
+	"id": "uni-popup",
+	"displayName": "uni-popup 弹出层",
+	"version": "1.8.2",
+	"description": " Popup 组件，提供常用的弹层",
+	"keywords": [
+        "uni-ui",
+        "弹出层",
+        "弹窗",
+        "popup",
+        "弹框"
+    ],
+	"repository": "https://github.com/dcloudio/uni-ui",
+	"engines": {
+		"HBuilderX": ""
+	},
+	"directories": {
+		"example": "../../temps/example_temps"
+	},
+    "dcloudext": {
+        "sale": {
+			"regular": {
+				"price": "0.00"
+			},
+			"sourcecode": {
+				"price": "0.00"
+			}
+		},
+		"contact": {
+			"qq": ""
+		},
+		"declaration": {
+			"ads": "无",
+			"data": "无",
+			"permissions": "无"
+		},
+        "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+        "type": "component-vue"
+	},
+	"uni_modules": {
+		"dependencies": [
+			"uni-scss",
+			"uni-transition"
+		],
+		"encrypt": [],
+		"platforms": {
+			"cloud": {
+				"tcb": "y",
+				"aliyun": "y"
+			},
+			"client": {
+				"App": {
+					"app-vue": "y",
+					"app-nvue": "y"
+				},
+				"H5-mobile": {
+					"Safari": "y",
+					"Android Browser": "y",
+					"微信浏览器(Android)": "y",
+					"QQ浏览器(Android)": "y"
+				},
+				"H5-pc": {
+					"Chrome": "y",
+					"IE": "y",
+					"Edge": "y",
+					"Firefox": "y",
+					"Safari": "y"
+				},
+				"小程序": {
+					"微信": "y",
+					"阿里": "y",
+					"百度": "y",
+					"字节跳动": "y",
+					"QQ": "y"
+				},
+				"快应用": {
+					"华为": "u",
+					"联盟": "u"
+                },
+                "Vue": {
+                    "vue2": "y",
+                    "vue3": "y"
+                }
+			}
+		}
+	}
+}
--- a/uni_modules/uni-popup/readme.md
+++ b/uni_modules/uni-popup/readme.md
@@ -0,0 +1,17 @@
+
+
+## Popup 弹出层
+> **组件名：uni-popup**
+> 代码块： `uPopup`
+> 关联组件：`uni-transition`
+
+
+弹出层组件，在应用中弹出一个消息提示窗口、提示框等
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-popup)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
+
+
+
--- a/uni_modules/uni-transition/changelog.md
+++ b/uni_modules/uni-transition/changelog.md
@@ -0,0 +1,20 @@
+## 1.3.1（2021-11-23）
+- 修复 init 方法初始化问题
+## 1.3.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-transition](https://uniapp.dcloud.io/component/uniui/uni-transition)
+## 1.2.1（2021-09-27）
+- 修复 init 方法不生效的 Bug
+## 1.2.0（2021-07-30）
+- 组件兼容 vue3，如何创建 vue3 项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.1（2021-05-12）
+- 新增 示例地址
+- 修复 示例项目缺少组件的 Bug
+## 1.1.0（2021-04-22）
+- 新增 通过方法自定义动画
+- 新增 custom-class 非 NVUE 平台支持自定义 class 定制样式
+- 优化 动画触发逻辑，使动画更流畅
+- 优化 支持单独的动画类型
+- 优化 文档示例
+## 1.0.2（2021-02-05）
+- 调整为 uni_modules 目录规范
--- a/uni_modules/uni-transition/components/uni-transition/createAnimation.js
+++ b/uni_modules/uni-transition/components/uni-transition/createAnimation.js
@@ -0,0 +1,128 @@
+// const defaultOption = {
+// 	duration: 300,
+// 	timingFunction: 'linear',
+// 	delay: 0,
+// 	transformOrigin: '50% 50% 0'
+// }
+// #ifdef APP-NVUE
+const nvueAnimation = uni.requireNativePlugin('animation')
+// #endif
+class MPAnimation {
+	constructor(options, _this) {
+		this.options = options
+		this.animation = uni.createAnimation(options)
+		this.currentStepAnimates = {}
+		this.next = 0
+		this.$ = _this
+
+	}
+
+	_nvuePushAnimates(type, args) {
+		let aniObj = this.currentStepAnimates[this.next]
+		let styles = {}
+		if (!aniObj) {
+			styles = {
+				styles: {},
+				config: {}
+			}
+		} else {
+			styles = aniObj
+		}
+		if (animateTypes1.includes(type)) {
+			if (!styles.styles.transform) {
+				styles.styles.transform = ''
+			}
+			let unit = ''
+			if(type === 'rotate'){
+				unit = 'deg'
+			}
+			styles.styles.transform += `${type}(${args+unit}) `
+		} else {
+			styles.styles[type] = `${args}`
+		}
+		this.currentStepAnimates[this.next] = styles
+	}
+	_animateRun(styles = {}, config = {}) {
+		let ref = this.$.$refs['ani'].ref
+		if (!ref) return
+		return new Promise((resolve, reject) => {
+			nvueAnimation.transition(ref, {
+				styles,
+				...config
+			}, res => {
+				resolve()
+			})
+		})
+	}
+
+	_nvueNextAnimate(animates, step = 0, fn) {
+		let obj = animates[step]
+		if (obj) {
+			let {
+				styles,
+				config
+			} = obj
+			this._animateRun(styles, config).then(() => {
+				step += 1
+				this._nvueNextAnimate(animates, step, fn)
+			})
+		} else {
+			this.currentStepAnimates = {}
+			typeof fn === 'function' && fn()
+			this.isEnd = true
+		}
+	}
+
+	step(config = {}) {
+		// #ifndef APP-NVUE
+		this.animation.step(config)
+		// #endif
+		// #ifdef APP-NVUE
+		this.currentStepAnimates[this.next].config = Object.assign({}, this.options, config)
+		this.currentStepAnimates[this.next].styles.transformOrigin = this.currentStepAnimates[this.next].config.transformOrigin
+		this.next++
+		// #endif
+		return this
+	}
+
+	run(fn) {
+		// #ifndef APP-NVUE
+		this.$.animationData = this.animation.export()
+		this.$.timer = setTimeout(() => {
+			typeof fn === 'function' && fn()
+		}, this.$.durationTime)
+		// #endif
+		// #ifdef APP-NVUE
+		this.isEnd = false
+		let ref = this.$.$refs['ani'] && this.$.$refs['ani'].ref
+		if(!ref) return
+		this._nvueNextAnimate(this.currentStepAnimates, 0, fn)
+		this.next = 0
+		// #endif
+	}
+}
+
+
+const animateTypes1 = ['matrix', 'matrix3d', 'rotate', 'rotate3d', 'rotateX', 'rotateY', 'rotateZ', 'scale', 'scale3d',
+	'scaleX', 'scaleY', 'scaleZ', 'skew', 'skewX', 'skewY', 'translate', 'translate3d', 'translateX', 'translateY',
+	'translateZ'
+]
+const animateTypes2 = ['opacity', 'backgroundColor']
+const animateTypes3 = ['width', 'height', 'left', 'right', 'top', 'bottom']
+animateTypes1.concat(animateTypes2, animateTypes3).forEach(type => {
+	MPAnimation.prototype[type] = function(...args) {
+		// #ifndef APP-NVUE
+		this.animation[type](...args)
+		// #endif
+		// #ifdef APP-NVUE
+		this._nvuePushAnimates(type, args)
+		// #endif
+		return this
+	}
+})
+
+export function createAnimation(option, _this) {
+	if(!_this) return
+	clearTimeout(_this.timer)
+	return new MPAnimation(option, _this)
+}
--- a/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
+++ b/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
@@ -0,0 +1,277 @@
+<template>
+	<view v-if="isShow" ref="ani" :animation="animationData" :class="customClass" :style="transformStyles" @click="onClick"><slot></slot></view>
+</template>
+
+<script>
+import { createAnimation } from './createAnimation'
+
+/**
+ * Transition 过渡动画
+ * @description 简单过渡动画组件
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=985
+ * @property {Boolean} show = [false|true] 控制组件显示或隐藏
+ * @property {Array|String} modeClass = [fade|slide-top|slide-right|slide-bottom|slide-left|zoom-in|zoom-out] 过渡动画类型
+ *  @value fade 渐隐渐出过渡
+ *  @value slide-top 由上至下过渡
+ *  @value slide-right 由右至左过渡
+ *  @value slide-bottom 由下至上过渡
+ *  @value slide-left 由左至右过渡
+ *  @value zoom-in 由小到大过渡
+ *  @value zoom-out 由大到小过渡
+ * @property {Number} duration 过渡动画持续时间
+ * @property {Object} styles 组件样式，同 css 样式，注意带’-‘连接符的属性需要使用小驼峰写法如：`backgroundColor:red`
+ */
+export default {
+	name: 'uniTransition',
+	emits:['click','change'],
+	props: {
+		show: {
+			type: Boolean,
+			default: false
+		},
+		modeClass: {
+			type: [Array, String],
+			default() {
+				return 'fade'
+			}
+		},
+		duration: {
+			type: Number,
+			default: 300
+		},
+		styles: {
+			type: Object,
+			default() {
+				return {}
+			}
+		},
+		customClass:{
+			type: String,
+			default: ''
+		}
+	},
+	data() {
+		return {
+			isShow: false,
+			transform: '',
+			opacity: 1,
+			animationData: {},
+			durationTime: 300,
+			config: {}
+		}
+	},
+	watch: {
+		show: {
+			handler(newVal) {
+				if (newVal) {
+					this.open()
+				} else {
+					// 避免上来就执行 close,导致动画错乱
+					if (this.isShow) {
+						this.close()
+					}
+				}
+			},
+			immediate: true
+		}
+	},
+	computed: {
+		// 生成样式数据
+		stylesObject() {
+			let styles = {
+				...this.styles,
+				'transition-duration': this.duration / 1000 + 's'
+			}
+			let transform = ''
+			for (let i in styles) {
+				let line = this.toLine(i)
+				transform += line + ':' + styles[i] + ';'
+			}
+			return transform
+		},
+		// 初始化动画条件
+		transformStyles() {
+			return 'transform:' + this.transform + ';' + 'opacity:' + this.opacity + ';' + this.stylesObject
+		}
+	},
+	created() {
+		// 动画默认配置
+		this.config = {
+			duration: this.duration,
+			timingFunction: 'ease',
+			transformOrigin: '50% 50%',
+			delay: 0
+		}
+		this.durationTime = this.duration
+	},
+	methods: {
+		/**
+		 *  ref 触发 初始化动画
+		 */
+		init(obj = {}) {
+			if (obj.duration) {
+				this.durationTime = obj.duration
+			}
+			this.animation = createAnimation(Object.assign(this.config, obj),this)
+		},
+		/**
+		 * 点击组件触发回调
+		 */
+		onClick() {
+			this.$emit('click', {
+				detail: this.isShow
+			})
+		},
+		/**
+		 * ref 触发 动画分组
+		 * @param {Object} obj
+		 */
+		step(obj, config = {}) {
+			if (!this.animation) return
+			for (let i in obj) {
+				try {
+					if(typeof obj[i] === 'object'){
+						this.animation[i](...obj[i])
+					}else{
+						this.animation[i](obj[i])
+					}
+				} catch (e) {
+					console.error(`方法 ${i} 不存在`)
+				}
+			}
+			this.animation.step(config)
+			return this
+		},
+		/**
+		 *  ref 触发 执行动画
+		 */
+		run(fn) {
+			if (!this.animation) return
+			this.animation.run(fn)
+		},
+		// 开始过度动画
+		open() {
+			clearTimeout(this.timer)
+			this.transform = ''
+			this.isShow = true
+			let { opacity, transform } = this.styleInit(false)
+			if (typeof opacity !== 'undefined') {
+				this.opacity = opacity
+			}
+			this.transform = transform
+			// 确保动态样式已经生效后，执行动画，如果不加 nextTick ，会导致 wx 动画执行异常
+			this.$nextTick(() => {
+				// TODO 定时器保证动画完全执行，目前有些问题，后面会取消定时器
+				this.timer = setTimeout(() => {
+					this.animation = createAnimation(this.config, this)
+					this.tranfromInit(false).step()
+					this.animation.run()
+					this.$emit('change', {
+						detail: this.isShow
+					})
+				}, 20)
+			})
+		},
+		// 关闭过度动画
+		close(type) {
+			if (!this.animation) return
+			this.tranfromInit(true)
+				.step()
+				.run(() => {
+					this.isShow = false
+					this.animationData = null
+					this.animation = null
+					let { opacity, transform } = this.styleInit(false)
+					this.opacity = opacity || 1
+					this.transform = transform
+					this.$emit('change', {
+						detail: this.isShow
+					})
+				})
+		},
+		// 处理动画开始前的默认样式
+		styleInit(type) {
+			let styles = {
+				transform: ''
+			}
+			let buildStyle = (type, mode) => {
+				if (mode === 'fade') {
+					styles.opacity = this.animationType(type)[mode]
+				} else {
+					styles.transform += this.animationType(type)[mode] + ' '
+				}
+			}
+			if (typeof this.modeClass === 'string') {
+				buildStyle(type, this.modeClass)
+			} else {
+				this.modeClass.forEach(mode => {
+					buildStyle(type, mode)
+				})
+			}
+			return styles
+		},
+		// 处理内置组合动画
+		tranfromInit(type) {
+			let buildTranfrom = (type, mode) => {
+				let aniNum = null
+				if (mode === 'fade') {
+					aniNum = type ? 0 : 1
+				} else {
+					aniNum = type ? '-100%' : '0'
+					if (mode === 'zoom-in') {
+						aniNum = type ? 0.8 : 1
+					}
+					if (mode === 'zoom-out') {
+						aniNum = type ? 1.2 : 1
+					}
+					if (mode === 'slide-right') {
+						aniNum = type ? '100%' : '0'
+					}
+					if (mode === 'slide-bottom') {
+						aniNum = type ? '100%' : '0'
+					}
+				}
+				this.animation[this.animationMode()[mode]](aniNum)
+			}
+			if (typeof this.modeClass === 'string') {
+				buildTranfrom(type, this.modeClass)
+			} else {
+				this.modeClass.forEach(mode => {
+					buildTranfrom(type, mode)
+				})
+			}
+
+			return this.animation
+		},
+		animationType(type) {
+			return {
+				fade: type ? 1 : 0,
+				'slide-top': `translateY(${type ? '0' : '-100%'})`,
+				'slide-right': `translateX(${type ? '0' : '100%'})`,
+				'slide-bottom': `translateY(${type ? '0' : '100%'})`,
+				'slide-left': `translateX(${type ? '0' : '-100%'})`,
+				'zoom-in': `scaleX(${type ? 1 : 0.8}) scaleY(${type ? 1 : 0.8})`,
+				'zoom-out': `scaleX(${type ? 1 : 1.2}) scaleY(${type ? 1 : 1.2})`
+			}
+		},
+		// 内置动画类型与实际动画对应字典
+		animationMode() {
+			return {
+				fade: 'opacity',
+				'slide-top': 'translateY',
+				'slide-right': 'translateX',
+				'slide-bottom': 'translateY',
+				'slide-left': 'translateX',
+				'zoom-in': 'scale',
+				'zoom-out': 'scale'
+			}
+		},
+		// 驼峰转中横线
+		toLine(name) {
+			return name.replace(/([A-Z])/g, '-$1').toLowerCase()
+		}
+	}
+}
+</script>
+
+<style></style>
--- a/uni_modules/uni-transition/package.json
+++ b/uni_modules/uni-transition/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-transition",
+  "displayName": "uni-transition 过渡动画",
+  "version": "1.3.1",
+  "description": "元素的简单过渡动画",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "动画",
+    "过渡",
+    "过渡动画"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
--- a/uni_modules/uni-transition/readme.md
+++ b/uni_modules/uni-transition/readme.md
@@ -0,0 +1,11 @@
+
+
+## Transition 过渡动画
+> **组件名：uni-transition**
+> 代码块： `uTransition`
+
+
+元素过渡动画
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-transition)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,98 +2,226 @@
 # yarn lockfile v1


-"@babel/parser@^7.18.4":
-  version "7.20.5"
-  resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.20.5.tgz"
-  integrity sha512-r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA==
+"@babel/parser@^7.16.4", "@babel/parser@^7.18.4":
+  "integrity" "sha512-r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA=="
+  "resolved" "https://registry.npmjs.org/@babel/parser/-/parser-7.20.5.tgz"
+  "version" "7.20.5"
+
+"@vue/compiler-core@3.2.45":
+  "integrity" "sha512-rcMj7H+PYe5wBV3iYeUgbCglC+pbpN8hBLTJvRiK2eKQiWqu+fG9F+8sW99JdL4LQi7Re178UOxn09puSXvn4A=="
+  "resolved" "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.45.tgz"
+  "version" "3.2.45"
+  dependencies:
+    "@babel/parser" "^7.16.4"
+    "@vue/shared" "3.2.45"
+    "estree-walker" "^2.0.2"
+    "source-map" "^0.6.1"
+
+"@vue/compiler-dom@3.2.45":
+  "integrity" "sha512-tyYeUEuKqqZO137WrZkpwfPCdiiIeXYCcJ8L4gWz9vqaxzIQRccTSwSWZ/Axx5YR2z+LvpUbmPNXxuBU45lyRw=="
+  "resolved" "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.45.tgz"
+  "version" "3.2.45"
+  dependencies:
+    "@vue/compiler-core" "3.2.45"
+    "@vue/shared" "3.2.45"

 "@vue/compiler-sfc@2.7.14":
-  version "2.7.14"
-  resolved "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.14.tgz"
-  integrity sha512-aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA==
+  "integrity" "sha512-aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA=="
+  "resolved" "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.14.tgz"
+  "version" "2.7.14"
  dependencies:
    "@babel/parser" "^7.18.4"
-    postcss "^8.4.14"
-    source-map "^0.6.1"
+    "postcss" "^8.4.14"
+    "source-map" "^0.6.1"
+
+"@vue/compiler-sfc@3.2.45":
+  "integrity" "sha512-1jXDuWah1ggsnSAOGsec8cFjT/K6TMZ0sPL3o3d84Ft2AYZi2jWJgRMjw4iaK0rBfA89L5gw427H4n1RZQBu6Q=="
+  "resolved" "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.45.tgz"
+  "version" "3.2.45"
+  dependencies:
+    "@babel/parser" "^7.16.4"
+    "@vue/compiler-core" "3.2.45"
+    "@vue/compiler-dom" "3.2.45"
+    "@vue/compiler-ssr" "3.2.45"
+    "@vue/reactivity-transform" "3.2.45"
+    "@vue/shared" "3.2.45"
+    "estree-walker" "^2.0.2"
+    "magic-string" "^0.25.7"
+    "postcss" "^8.1.10"
+    "source-map" "^0.6.1"
+
+"@vue/compiler-ssr@3.2.45":
+  "integrity" "sha512-6BRaggEGqhWht3lt24CrIbQSRD5O07MTmd+LjAn5fJj568+R9eUD2F7wMQJjX859seSlrYog7sUtrZSd7feqrQ=="
+  "resolved" "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.45.tgz"
+  "version" "3.2.45"
+  dependencies:
+    "@vue/compiler-dom" "3.2.45"
+    "@vue/shared" "3.2.45"

 "@vue/devtools-api@^6.0.0-beta.11":
-  version "6.4.5"
-  resolved "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.4.5.tgz"
-  integrity sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ==
+  "integrity" "sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ=="
+  "resolved" "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.4.5.tgz"
+  "version" "6.4.5"

-core-js@^2.6.5:
-  version "2.6.12"
-  resolved "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz"
-  integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
-
-csstype@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz"
-  integrity sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==
-
-nanoid@^3.3.4:
-  version "3.3.4"
-  resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz"
-  integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
-
-picocolors@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"
-  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
-
-postcss@^8.4.14:
-  version "8.4.20"
-  resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.20.tgz"
-  integrity sha512-6Q04AXR1212bXr5fh03u8aAwbLxAQNGQ/Q1LNa0VfOI06ZAlhPHtQvE4OIdpj4kLThXilalPnmDSOD65DcHt+g==
+"@vue/reactivity-transform@3.2.45":
+  "integrity" "sha512-BHVmzYAvM7vcU5WmuYqXpwaBHjsS8T63jlKGWVtHxAHIoMIlmaMyurUSEs1Zcg46M4AYT5MtB1U274/2aNzjJQ=="
+  "resolved" "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.45.tgz"
+  "version" "3.2.45"
  dependencies:
-    nanoid "^3.3.4"
-    picocolors "^1.0.0"
-    source-map-js "^1.0.2"
+    "@babel/parser" "^7.16.4"
+    "@vue/compiler-core" "3.2.45"
+    "@vue/shared" "3.2.45"
+    "estree-walker" "^2.0.2"
+    "magic-string" "^0.25.7"

-source-map-js@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz"
-  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
-
-source-map@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
-  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-
-uni-read-pages@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.npmjs.org/uni-read-pages/-/uni-read-pages-1.0.5.tgz"
-  integrity sha512-GkrrZ0LX0vn9R5k6RKEi0Ez3Q3e2vUpjXQ8Z6/K/d28KudI9ajqgt8WEjQFlG5EPm1K6uTArN8LlqmZTEixDUA==
-
-uni-simple-router@^2.0.7:
-  version "2.0.7"
-  resolved "https://registry.npmjs.org/uni-simple-router/-/uni-simple-router-2.0.7.tgz"
-  integrity sha512-8FKv5dw7Eoonm0gkO8udprrxzin0fNUI0+AvIphFkFRH5ZmP5ZWJ2pvnWzb2NiiqQSECTSU5VSB7HhvOSwD5eA==
-
-uview-ui@^2.0.31:
-  version "2.0.31"
-  resolved "https://registry.npmjs.org/uview-ui/-/uview-ui-2.0.31.tgz"
-  integrity sha512-I/0fGuvtiKHH/mBb864SGYk+SJ7WaF32tsBgYgeBOsxlUp+Th+Ac2tgz2cTvsQJl6eZYWsKZ3ixiSXCAcxZ8Sw==
-
-vue-canvas-poster@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.npmjs.org/vue-canvas-poster/-/vue-canvas-poster-1.2.1.tgz"
-  integrity sha512-YY5ygbeQSqhiJyj6QXYgSRZ6Ywhvi1gVsfcvBIoCx4Yq9E/gAV32uOhnZz45qsklP86uGc9ypKJAXiX6Dzrdxw==
+"@vue/reactivity@3.2.45":
+  "integrity" "sha512-PRvhCcQcyEVohW0P8iQ7HDcIOXRjZfAsOds3N99X/Dzewy8TVhTCT4uXpAHfoKjVTJRA0O0K+6QNkDIZAxNi3A=="
+  "resolved" "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.45.tgz"
+  "version" "3.2.45"
  dependencies:
-    core-js "^2.6.5"
-    vue "^2.6.10"
+    "@vue/shared" "3.2.45"

-vue@^2.6.10:
-  version "2.7.14"
-  resolved "https://registry.npmjs.org/vue/-/vue-2.7.14.tgz"
-  integrity sha512-b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ==
+"@vue/runtime-core@3.2.45":
+  "integrity" "sha512-gzJiTA3f74cgARptqzYswmoQx0fIA+gGYBfokYVhF8YSXjWTUA2SngRzZRku2HbGbjzB6LBYSbKGIaK8IW+s0A=="
+  "resolved" "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.45.tgz"
+  "version" "3.2.45"
+  dependencies:
+    "@vue/reactivity" "3.2.45"
+    "@vue/shared" "3.2.45"
+
+"@vue/runtime-dom@3.2.45":
+  "integrity" "sha512-cy88YpfP5Ue2bDBbj75Cb4bIEZUMM/mAkDMfqDTpUYVgTf/kuQ2VQ8LebuZ8k6EudgH8pYhsGWHlY0lcxlvTwA=="
+  "resolved" "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.45.tgz"
+  "version" "3.2.45"
+  dependencies:
+    "@vue/runtime-core" "3.2.45"
+    "@vue/shared" "3.2.45"
+    "csstype" "^2.6.8"
+
+"@vue/server-renderer@3.2.45":
+  "integrity" "sha512-ebiMq7q24WBU1D6uhPK//2OTR1iRIyxjF5iVq/1a5I1SDMDyDu4Ts6fJaMnjrvD3MqnaiFkKQj+LKAgz5WIK3g=="
+  "resolved" "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.45.tgz"
+  "version" "3.2.45"
+  dependencies:
+    "@vue/compiler-ssr" "3.2.45"
+    "@vue/shared" "3.2.45"
+
+"@vue/shared@3.2.45":
+  "integrity" "sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg=="
+  "resolved" "https://registry.npmjs.org/@vue/shared/-/shared-3.2.45.tgz"
+  "version" "3.2.45"
+
+"core-js@^2.6.5":
+  "integrity" "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="
+  "resolved" "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz"
+  "version" "2.6.12"
+
+"csstype@^2.6.8":
+  "integrity" "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w=="
+  "resolved" "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz"
+  "version" "2.6.21"
+
+"csstype@^3.1.0":
+  "integrity" "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw=="
+  "resolved" "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz"
+  "version" "3.1.1"
+
+"estree-walker@^2.0.2":
+  "integrity" "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
+  "resolved" "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz"
+  "version" "2.0.2"
+
+"magic-string@^0.25.7":
+  "integrity" "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ=="
+  "resolved" "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz"
+  "version" "0.25.9"
+  dependencies:
+    "sourcemap-codec" "^1.4.8"
+
+"moment@^2.29.4":
+  "integrity" "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
+  "resolved" "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz"
+  "version" "2.29.4"
+
+"nanoid@^3.3.4":
+  "integrity" "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="
+  "resolved" "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz"
+  "version" "3.3.4"
+
+"picocolors@^1.0.0":
+  "integrity" "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+  "resolved" "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"
+  "version" "1.0.0"
+
+"postcss@^8.1.10", "postcss@^8.4.14":
+  "integrity" "sha512-6Q04AXR1212bXr5fh03u8aAwbLxAQNGQ/Q1LNa0VfOI06ZAlhPHtQvE4OIdpj4kLThXilalPnmDSOD65DcHt+g=="
+  "resolved" "https://registry.npmjs.org/postcss/-/postcss-8.4.20.tgz"
+  "version" "8.4.20"
+  dependencies:
+    "nanoid" "^3.3.4"
+    "picocolors" "^1.0.0"
+    "source-map-js" "^1.0.2"
+
+"source-map-js@^1.0.2":
+  "integrity" "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="
+  "resolved" "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz"
+  "version" "1.0.2"
+
+"source-map@^0.6.1":
+  "integrity" "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+  "resolved" "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
+  "version" "0.6.1"
+
+"sourcemap-codec@^1.4.8":
+  "integrity" "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="
+  "resolved" "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz"
+  "version" "1.4.8"
+
+"uni-read-pages@^1.0.5":
+  "integrity" "sha512-GkrrZ0LX0vn9R5k6RKEi0Ez3Q3e2vUpjXQ8Z6/K/d28KudI9ajqgt8WEjQFlG5EPm1K6uTArN8LlqmZTEixDUA=="
+  "resolved" "https://registry.npmjs.org/uni-read-pages/-/uni-read-pages-1.0.5.tgz"
+  "version" "1.0.5"
+
+"uni-simple-router@^2.0.7":
+  "integrity" "sha512-8FKv5dw7Eoonm0gkO8udprrxzin0fNUI0+AvIphFkFRH5ZmP5ZWJ2pvnWzb2NiiqQSECTSU5VSB7HhvOSwD5eA=="
+  "resolved" "https://registry.npmjs.org/uni-simple-router/-/uni-simple-router-2.0.7.tgz"
+  "version" "2.0.7"
+
+"uview-ui@^2.0.31":
+  "integrity" "sha512-I/0fGuvtiKHH/mBb864SGYk+SJ7WaF32tsBgYgeBOsxlUp+Th+Ac2tgz2cTvsQJl6eZYWsKZ3ixiSXCAcxZ8Sw=="
+  "resolved" "https://registry.npmjs.org/uview-ui/-/uview-ui-2.0.31.tgz"
+  "version" "2.0.31"
+
+"vue-canvas-poster@^1.2.1":
+  "integrity" "sha512-YY5ygbeQSqhiJyj6QXYgSRZ6Ywhvi1gVsfcvBIoCx4Yq9E/gAV32uOhnZz45qsklP86uGc9ypKJAXiX6Dzrdxw=="
+  "resolved" "https://registry.npmjs.org/vue-canvas-poster/-/vue-canvas-poster-1.2.1.tgz"
+  "version" "1.2.1"
+  dependencies:
+    "core-js" "^2.6.5"
+    "vue" "^2.6.10"
+
+"vue@^2.6.10":
+  "integrity" "sha512-b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ=="
+  "resolved" "https://registry.npmjs.org/vue/-/vue-2.7.14.tgz"
+  "version" "2.7.14"
  dependencies:
    "@vue/compiler-sfc" "2.7.14"
-    csstype "^3.1.0"
+    "csstype" "^3.1.0"

-vuex@^4.0.2:
-  version "4.1.0"
-  resolved "https://registry.npmjs.org/vuex/-/vuex-4.1.0.tgz"
-  integrity sha512-hmV6UerDrPcgbSy9ORAtNXDr9M4wlNP4pEFKye4ujJF8oqgFFuxDCdOLS3eNoRTtq5O3hoBDh9Doj1bQMYHRbQ==
+"vue@^3.2.0", "vue@3.2.45":
+  "integrity" "sha512-9Nx/Mg2b2xWlXykmCwiTUCWHbWIj53bnkizBxKai1g61f2Xit700A1ljowpTIM11e3uipOeiPcSqnmBg6gyiaA=="
+  "resolved" "https://registry.npmjs.org/vue/-/vue-3.2.45.tgz"
+  "version" "3.2.45"
+  dependencies:
+    "@vue/compiler-dom" "3.2.45"
+    "@vue/compiler-sfc" "3.2.45"
+    "@vue/runtime-dom" "3.2.45"
+    "@vue/server-renderer" "3.2.45"
+    "@vue/shared" "3.2.45"
+
+"vuex@^4.0.2":
+  "integrity" "sha512-hmV6UerDrPcgbSy9ORAtNXDr9M4wlNP4pEFKye4ujJF8oqgFFuxDCdOLS3eNoRTtq5O3hoBDh9Doj1bQMYHRbQ=="
+  "resolved" "https://registry.npmjs.org/vuex/-/vuex-4.1.0.tgz"
+  "version" "4.1.0"
  dependencies:
    "@vue/devtools-api" "^6.0.0-beta.11"