diff --git a/apis/index.js b/apis/index.js
index 917ef93..bc86f66 100644
--- 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
}
diff --git a/apis/interfaces/account.js b/apis/interfaces/account.js
index 1523f04..b7cb453 100644
--- 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
})
}
diff --git a/apis/interfaces/pay.js b/apis/interfaces/pay.js
index 71dcf40..12085dc 100644
--- 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
diff --git a/manifest.json b/manifest.json
index a9eb27f..5fe86fe 100644
--- 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特有相关 */
diff --git a/package-lock.json b/package-lock.json
index 0ad570c..9dc54dc 100644
--- 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",
diff --git a/package.json b/package.json
index 0056288..30c9a9a 100644
--- 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",
diff --git a/pages.json b/pages.json
index dde56ef..4df438c 100644
--- a/pages.json
+++ b/pages.json
@@ -343,16 +343,16 @@
"navigationBarTitleText": "机构信息",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#446EFE",
- "navigationBarTextStyle": "white",
- "app-plus": {
- "titleNView": {
- "buttons": [{
- "text": "使用账户信息",
- "color": "#ffffff",
- "fontSize": "30rpx",
- "width": "180rpx"
- }]
- }
+ "navigationBarTextStyle": "white",
+ "app-plus": {
+ "titleNView": {
+ "buttons": [{
+ "text": "使用账户信息",
+ "color": "#ffffff",
+ "fontSize": "30rpx",
+ "width": "180rpx"
+ }]
+ }
}
}
}, {
@@ -363,16 +363,16 @@
"navigationBarTitleText": "基础信息",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#446EFE",
- "navigationBarTextStyle": "white",
- "app-plus": {
- "titleNView": {
- "buttons": [{
- "text": "使用账户信息",
- "color": "#ffffff",
- "fontSize": "30rpx",
- "width": "180rpx"
- }]
- }
+ "navigationBarTextStyle": "white",
+ "app-plus": {
+ "titleNView": {
+ "buttons": [{
+ "text": "使用账户信息",
+ "color": "#ffffff",
+ "fontSize": "30rpx",
+ "width": "180rpx"
+ }]
+ }
}
}
}, {
@@ -555,13 +555,21 @@
"navigationBarBackgroundColor": "#FFFFFF"
}
}, {
- "path": "pages/im/chat",
- "auth": true,
+ "path": "pages/im/chat",
+ "auth": true,
"name": "ImChat",
"style": {
"navigationBarTitleText": "聊天窗口",
+ "enablePullDownRefresh": false,
+ "disableScroll": true,
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ }, {
+ "path": "pages/im/msg",
+ "name": "ImMsg",
+ "style": {
+ "navigationBarTitleText": "消息",
"enablePullDownRefresh": false,
- "disableScroll": true,
"navigationBarBackgroundColor": "#FFFFFF"
}
}],
diff --git a/pages/account/bonus.vue b/pages/account/bonus.vue
index 3f88037..5ec1150 100644
--- a/pages/account/bonus.vue
+++ b/pages/account/bonus.vue
@@ -10,8 +10,8 @@
提现
- 已发放 :￥{{sended}}
- 待发放 :￥{{frozen}}
+ 已发放 :￥{{sended}}
+ 待发放 :￥{{frozen}}
@@ -41,7 +41,7 @@
- [{{item.status.status_text}}]{{item.title || '-'}}
+ {{item.status.status_text}}{{item.title || '-'}}
{{item.created_at}}
@@ -130,7 +130,7 @@
this.page = logs.page
this.pagesShow = false
uni.hideLoading()
- }).catch(err => {
+ }).catch(err => {
this.errMsg(err)
})
},
@@ -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;
}
diff --git a/pages/account/cash.vue b/pages/account/cash.vue
index a39d17b..405061a 100644
--- a/pages/account/cash.vue
+++ b/pages/account/cash.vue
@@ -7,21 +7,25 @@
+
- {{total}}
+ {{count}}
{{type == 'self' ? '个人总业绩': '团队总业绩'}}
+ 筛选区间业绩：{{total}}
-
-
+
@@ -60,7 +64,20 @@
-
+
+
+
@@ -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;
diff --git a/pages/account/withdraws.vue b/pages/account/withdraws.vue
index 14136df..8a3a630 100644
--- a/pages/account/withdraws.vue
+++ b/pages/account/withdraws.vue
@@ -2,24 +2,32 @@
- 到账银行卡
+
+
+ 本人银行卡
+ 非本人银行卡
+
-
+
{{banks[bankVal].name}}
-
+
-
+
-
+
+
+
+
+
@@ -36,6 +44,8 @@
+
+ 后台提现管理时间 上午11:00-12:00 下午17:00-18:00
@@ -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;
diff --git a/pages/im/chat.vue b/pages/im/chat.vue
index 3ae221e..5388f64 100644
--- a/pages/im/chat.vue
+++ b/pages/im/chat.vue
@@ -1,16 +1,25 @@
-
+
+ | 消息{{index}} |
+
+
@@ -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;
+ }
+ }
}
}
}
diff --git a/pages/im/msg.vue b/pages/im/msg.vue
new file mode 100644
index 0000000..3361986
--- /dev/null
+++ b/pages/im/msg.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+ 暂无好友消息
+
+
+
+
+
+
+
+ {{item.nickname}}
+ {{item.time}}
+
+ {{item.latmsg}}
+
+
+
+
+
+
+
+
+
diff --git a/pages/pay/pay.vue b/pages/pay/pay.vue
index 9c8c5d1..4494f1f 100644
--- a/pages/pay/pay.vue
+++ b/pages/pay/pay.vue
@@ -39,6 +39,26 @@
+
+
+
+ 使用火力值抵扣
+ 余额:{{balance}}
+
+
+
+
+
+ 使用数量
+
+
+
+
@@ -49,17 +69,21 @@
+
diff --git a/uni_modules/oct-calendar-picker/package.json b/uni_modules/oct-calendar-picker/package.json
new file mode 100644
index 0000000..c2e3645
--- /dev/null
+++ 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"
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/uni_modules/oct-calendar-picker/readme.md b/uni_modules/oct-calendar-picker/readme.md
new file mode 100644
index 0000000..5b6c48b
--- /dev/null
+++ b/uni_modules/oct-calendar-picker/readme.md
@@ -0,0 +1 @@
+# oct-calendar-picker
\ No newline at end of file
diff --git a/uni_modules/oct-im/changelog.md b/uni_modules/oct-im/changelog.md
new file mode 100644
index 0000000..e69de29
diff --git a/uni_modules/oct-im/components/oct-im/oct-im.vue b/uni_modules/oct-im/components/oct-im/oct-im.vue
new file mode 100644
index 0000000..e27286a
--- /dev/null
+++ b/uni_modules/oct-im/components/oct-im/oct-im.vue
@@ -0,0 +1,9 @@
+
+
+
+
+
diff --git a/uni_modules/oct-im/package.json b/uni_modules/oct-im/package.json
new file mode 100644
index 0000000..d56881d
--- /dev/null
+++ 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"
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/uni_modules/oct-im/readme.md b/uni_modules/oct-im/readme.md
new file mode 100644
index 0000000..6bff57a
--- /dev/null
+++ b/uni_modules/oct-im/readme.md
@@ -0,0 +1 @@
+# oct-im
\ No newline at end of file
diff --git a/uni_modules/uni-popup/changelog.md b/uni_modules/uni-popup/changelog.md
new file mode 100644
index 0000000..41abeb4
--- /dev/null
+++ 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 端
diff --git a/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js b/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js
new file mode 100644
index 0000000..a747b9f
--- /dev/null
+++ 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
diff --git 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
new file mode 100644
index 0000000..9bc87fc
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
@@ -0,0 +1,275 @@
+
+
+
+
+
+
+
diff --git 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
new file mode 100644
index 0000000..7f27a1e
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue
@@ -0,0 +1,143 @@
+
+
+
+
+
+
diff --git 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
new file mode 100644
index 0000000..ab08656
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
@@ -0,0 +1,187 @@
+
+
+
+
+
+
diff --git a/uni_modules/uni-popup/components/uni-popup/i18n/en.json b/uni_modules/uni-popup/components/uni-popup/i18n/en.json
new file mode 100644
index 0000000..8c0f5f3
--- /dev/null
+++ 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"
+}
diff --git a/uni_modules/uni-popup/components/uni-popup/i18n/index.js b/uni_modules/uni-popup/components/uni-popup/i18n/index.js
new file mode 100644
index 0000000..fa8f0f3
--- /dev/null
+++ 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
+}
diff --git a/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json
new file mode 100644
index 0000000..8e5b99f
--- /dev/null
+++ 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": "分享到"
+}
diff --git a/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json
new file mode 100644
index 0000000..06ce162
--- /dev/null
+++ 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": "分享到"
+}
diff --git a/uni_modules/uni-popup/components/uni-popup/keypress.js b/uni_modules/uni-popup/components/uni-popup/keypress.js
new file mode 100644
index 0000000..16a5818
--- /dev/null
+++ 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
diff --git a/uni_modules/uni-popup/components/uni-popup/popup.js b/uni_modules/uni-popup/components/uni-popup/popup.js
new file mode 100644
index 0000000..a37fb9f
--- /dev/null
+++ 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;
+ },
+ }
+}
diff --git a/uni_modules/uni-popup/components/uni-popup/uni-popup.vue b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
new file mode 100644
index 0000000..db90c59
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
@@ -0,0 +1,474 @@
+
+
+
+
+
+
diff --git a/uni_modules/uni-popup/package.json b/uni_modules/uni-popup/package.json
new file mode 100644
index 0000000..8a17034
--- /dev/null
+++ 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"
+ }
+ }
+ }
+ }
+}
diff --git a/uni_modules/uni-popup/readme.md b/uni_modules/uni-popup/readme.md
new file mode 100644
index 0000000..fdad4b3
--- /dev/null
+++ 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
+
+
+
+
+
diff --git a/uni_modules/uni-transition/changelog.md b/uni_modules/uni-transition/changelog.md
new file mode 100644
index 0000000..ad489f1
--- /dev/null
+++ 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 目录规范
diff --git a/uni_modules/uni-transition/components/uni-transition/createAnimation.js b/uni_modules/uni-transition/components/uni-transition/createAnimation.js
new file mode 100644
index 0000000..af47dbc
--- /dev/null
+++ 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)
+}
diff --git a/uni_modules/uni-transition/components/uni-transition/uni-transition.vue b/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
new file mode 100644
index 0000000..be5e794
--- /dev/null
+++ b/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
@@ -0,0 +1,277 @@
+
+
+
+
+
+
+
diff --git a/uni_modules/uni-transition/package.json b/uni_modules/uni-transition/package.json
new file mode 100644
index 0000000..379e9aa
--- /dev/null
+++ 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"
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-transition/readme.md b/uni_modules/uni-transition/readme.md
new file mode 100644
index 0000000..1e104fe
--- /dev/null
+++ 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
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index e7a0d4b..acaff64 100644
--- 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"