diff --git a/babel.config.js b/babel.config.js
index f3acb81..8829a94 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -2,9 +2,12 @@
// https://github.com/NervJS/taro/blob/next/packages/babel-preset-taro/README.md
module.exports = {
presets: [
- ['taro', {
- framework: 'react',
- ts: true
- }]
- ]
+ [
+ 'taro',
+ {
+ framework: 'react',
+ ts: true,
+ },
+ ],
+ ],
}
diff --git a/config/index.js b/config/index.js
index 3b436bc..e60c781 100644
--- a/config/index.js
+++ b/config/index.js
@@ -64,6 +64,21 @@ const config = {
},
},
h5: {
+ router: {
+ mode: 'hash',
+ },
+ output: {
+ filename: 'js/[name].[hash].js',
+ chunkFilename: 'js/[name].[chunkhash].js',
+ },
+ imageUrlLoaderOption: {
+ limit: 5000,
+ name: 'static/images/[name].[hash].[ext]',
+ },
+ miniCssExtractPluginOption: {
+ filename: 'css/[name].[hash].css',
+ chunkFilename: 'css/[name].[chunkhash].css',
+ },
publicPath: '/',
staticDirectory: 'static',
postcss: {
diff --git a/iconfont.json b/iconfont.json
index 33de02e..66a7022 100644
--- a/iconfont.json
+++ b/iconfont.json
@@ -1,5 +1,5 @@
{
- "symbol_url": "//at.alicdn.com/t/c/font_3619513_mrvpsyqxmzr.js",
+ "symbol_url": "//at.alicdn.com/t/c/font_3619513_i9fjrthdbsd.js",
"save_dir": "./src/components/iconfont",
"use_typescript": false,
"platforms": ["weapp","h5"],
diff --git a/package.json b/package.json
index 97bb42b..f799f97 100644
--- a/package.json
+++ b/package.json
@@ -39,13 +39,12 @@
"author": "",
"dependencies": {
"@babel/runtime": "^7.7.7",
- "@tarojs/components": "3.5.4",
+ "@tarojs/components": "3.5.5",
"@tarojs/plugin-framework-react": "^3.4.12",
- "@tarojs/react": "3.5.4",
- "@tarojs/runtime": "3.5.4",
- "@tarojs/taro": "3.5.4",
+ "@tarojs/react": "3.5.5",
+ "@tarojs/runtime": "^3.5.5",
+ "@tarojs/taro": "3.5.5",
"big.js": "^6.2.1",
- "classname": "^0.0.0",
"dayjs": "^1.11.3",
"qs": "^6.10.3",
"react": "^18.2.0",
@@ -60,9 +59,9 @@
"@babel/core": "^7.8.0",
"@pmmmwh/react-refresh-webpack-plugin": "0.5.4",
"@tarojs/plugin-mini-ci": "^3.5.1",
- "@tarojs/plugin-platform-weapp": "^3.5.4",
+ "@tarojs/plugin-platform-weapp": "^3.5.5",
"@tarojs/plugin-react-devtools": "^3.4.13",
- "@tarojs/webpack5-runner": "^3.5.4",
+ "@tarojs/webpack5-runner": "^3.5.5",
"@types/qs": "^6.9.7",
"@types/react": "^18.0.17",
"@types/webpack-env": "^1.13.6",
@@ -71,7 +70,7 @@
"babel-preset-taro": "3.3.10",
"cross-env": "^7.0.3",
"eslint": "^6.8.0",
- "eslint-config-taro": "3.5.4",
+ "eslint-config-taro": "3.5.5",
"eslint-plugin-import": "^2.12.0",
"eslint-plugin-react": "^7.8.2",
"eslint-plugin-react-hooks": "^4.2.0",
diff --git a/project.private.config.json b/project.private.config.json
index 9d9ee30..54c66af 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -8,6 +8,13 @@
"condition": {
"miniprogram": {
"list": [
+ {
+ "name": "登录页面",
+ "pathName": "pages/login/index",
+ "query": "",
+ "launchMode": "default",
+ "scene": null
+ },
{
"name": "",
"pathName": "pages/index/index",
@@ -42,6 +49,20 @@
"query": "",
"launchMode": "default",
"scene": null
+ },
+ {
+ "name": "",
+ "pathName": "pages/addressManager/index",
+ "query": "",
+ "launchMode": "default",
+ "scene": null
+ },
+ {
+ "name": "",
+ "pathName": "pages/addAddress/index",
+ "query": "type=add",
+ "launchMode": "default",
+ "scene": null
}
]
}
diff --git a/src/api/addressList.ts b/src/api/addressList.ts
index 1bed7ec..c713344 100644
--- a/src/api/addressList.ts
+++ b/src/api/addressList.ts
@@ -4,9 +4,9 @@ import { useRequest } from "@/use/useHttp"
/**
* 获取行政地区列表
*/
- export const GetAddressListApi = () => {
+export const GetAddressListApi = () => {
return useRequest({
- url: `/v1/mall/district/list`,
+ url: `/v1/mp/district/list`,
method: "get",
})
}
@@ -18,3 +18,24 @@ export const mppurchaseraddresslist = () => {
method: "get",
})
}
+//新增客户地址
+export const mppurchaseraddress = () => {
+ return useRequest({
+ url: `/v1/mp/purchaser/address`,
+ method: "post",
+ })
+}
+//获取编辑地址信息
+export const mppurchaseraddressget = () => {
+ return useRequest({
+ url: `/v1/mp/purchaser/address`,
+ method: "get",
+ })
+}
+//编辑收货地址信息
+export const mppurchaseraddressput = () => {
+ return useRequest({
+ url: `/v1/mp/purchaser/address`,
+ method: "put",
+ })
+}
\ No newline at end of file
diff --git a/src/api/index.ts b/src/api/index.ts
index f168fac..8068a8b 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -1,5 +1,7 @@
+export {LoginApi} from './login/index'
+
import { useRequest } from "@/use/useHttp"
/**
* 系列列表
diff --git a/src/api/login/index.ts b/src/api/login/index.ts
new file mode 100644
index 0000000..f61273a
--- /dev/null
+++ b/src/api/login/index.ts
@@ -0,0 +1 @@
+export {LoginApi} from './login'
diff --git a/src/api/login/login.ts b/src/api/login/login.ts
new file mode 100644
index 0000000..fb3fd64
--- /dev/null
+++ b/src/api/login/login.ts
@@ -0,0 +1,12 @@
+import { useRequest } from '@/use/useHttp'
+
+/**
+ * 登录
+ * @returns
+ */
+export const LoginApi = () => {
+ return useRequest({
+ url: `/v1/mp/login`,
+ method: 'post',
+ })
+}
diff --git a/src/app.config.ts b/src/app.config.ts
index 1499b6b..f2eaed8 100644
--- a/src/app.config.ts
+++ b/src/app.config.ts
@@ -9,7 +9,9 @@ export default defineAppConfig({
'pages/saleuserPage/index',
'pages/user/index',
'pages/orderDetails/index',
- 'pages/addressManager/index'
+ 'pages/addressManager/index',
+ 'pages/addAddress/index',
+ 'pages/login/index',
],
window: {
backgroundTextStyle: 'light',
diff --git a/src/common/common.ts b/src/common/common.ts
index 9adb0d3..c682644 100644
--- a/src/common/common.ts
+++ b/src/common/common.ts
@@ -1,43 +1,39 @@
-import Taro from "@tarojs/taro"
+import Taro from '@tarojs/taro'
import Qs from 'qs'
/**
* 跳转
- * @param path
- * @param params
+ * @param path
+ * @param params
* @param type false 跳转普通页面,true 跳转tabbar页面
*/
-type ParamLink = 'navigateTo'|'switchTab'|'reLaunch'|'redirectTo'
+type ParamLink = 'navigateTo' | 'switchTab' | 'reLaunch' | 'redirectTo'
export const goLink = (path = '', params = {}, way: ParamLink = 'navigateTo') => {
- if(path) {
- let params_str = Qs.stringify(params)
- console.log('params_str::',params_str)
- path = params_str?path+'?'+params_str:path
- console.log('path::', way)
- Taro[way]({url: path})
-
- }
-
+ if (path) {
+ let params_str = Qs.stringify(params)
+ path = params_str ? path + '?' + params_str : path
+ Taro[way]({ url: path })
+ }
}
/**
* 判断对象为空
- * @param object
- * @returns
+ * @param object
+ * @returns
*/
-export const isEmptyObject = (object: any)=>{
- if(object==undefined||object==null||Number.isNaN(object)){
- return true;
- }else{
- if(object.constructor==Object){
- return Reflect.ownKeys(object).length==0;
- }else if(object.constructor==Array){
- return object.length==0;
- }else if(object.constructor==String){
- return object=="";
- }
+export const isEmptyObject = (object: any) => {
+ if (object == undefined || object == null || Number.isNaN(object)) {
+ return true
+ } else {
+ if (object.constructor == Object) {
+ return Reflect.ownKeys(object).length == 0
+ } else if (object.constructor == Array) {
+ return object.length == 0
+ } else if (object.constructor == String) {
+ return object == ''
}
- return false;
}
+ return false
+}
/**
* 表单检索
@@ -58,86 +54,90 @@ export const isEmptyObject = (object: any)=>{
* @param message
* @returns
*/
-export const retrieval = (data: any, rules?: Object, message: string="请填写完信息")=>{
- return new Promise((resolve, reject)=>{
- if(rules){
- const keys = Reflect.ownKeys(rules);
- const result = keys.some((key:any)=>{
- for(let item of (rules as any)[key]){
-
- let _res = false;
- if(item.validator){
- if(item.validator(data[key],item)){
- _res=true;
- }
- }else if(item.regex){
- if(!item.regex.test(data[key])){
- _res=true;
- }
- }else{
- if(isEmptyObject(data[key])){
- _res=true;
- }
+export const retrieval = (data: any, rules?: Object, message: string = '请填写完信息') => {
+ return new Promise((resolve, reject) => {
+ if (rules) {
+ const keys = Reflect.ownKeys(rules)
+ const result = keys.some((key: any) => {
+ for (let item of (rules as any)[key]) {
+ let _res = false
+ if (item.validator) {
+ if (item.validator(data[key], item)) {
+ _res = true
+ }
+ } else if (item.regex) {
+ if (!item.regex.test(data[key])) {
+ _res = true
+ }
+ } else {
+ if (isEmptyObject(data[key])) {
+ _res = true
}
- message = item.message;
- return _res;
}
- });
- if(result){
- reject(message);
- }
- }else{
- const keys = Reflect.ownKeys(data);
- if(keys.some((key:any)=>isEmptyObject(data[key]))){
- reject(message);
+ message = item.message
+ return _res
}
+ })
+ if (result) {
+ reject(message)
+ }
+ } else {
+ const keys = Reflect.ownKeys(data)
+ if (keys.some((key: any) => isEmptyObject(data[key]))) {
+ reject(message)
}
- resolve(null);
- })
- }
- /**
- * toast提示
- */
- export const alert = {
- success(title: string){
- Taro.showToast({
- title,icon: "success"
- })
- },
- error(title: string){
- Taro.showToast({
- title,icon: "error"
- })
- },
- loading(title: string, mask: true|false = false){
- Taro.showToast({
- title,icon: "loading",
- mask
- })
- },
- none(title: string){
- Taro.showToast({
- title,icon: "none"
- })
-
- },
- showLoading(title: string, mask: true|false = true) {
- Taro.showLoading({title, mask})
- },
- hideLoading() {
- Taro.hideLoading()
}
- }
+ resolve(null)
+ })
+}
+/**
+ * toast提示
+ */
+export const alert = {
+ success(title: string) {
+ Taro.showToast({
+ title,
+ icon: 'success',
+ })
+ },
+ error(title: string) {
+ Taro.showToast({
+ title,
+ icon: 'error',
+ })
+ },
+ loading(title: string, mask: true | false = false) {
+ Taro.showToast({
+ title,
+ icon: 'loading',
+ mask,
+ })
+ },
+ none(title: string) {
+ Taro.showToast({
+ title,
+ icon: 'none',
+ })
+ },
+ showLoading(title: string, mask: boolean = true) {
+ Taro.showLoading({ title, mask })
+ },
+ hideLoading() {
+ Taro.hideLoading()
+ },
+}
// 金额千位分割符
export const formatKbPrice = (number: string) => {
- const ret = Array.from(number).reverse().reduce((result: string[],next,i,arr) => {
- if((i+1)%3 === 0 && (i+1) !== arr.length) {
- result.push(next,',')
- return result;
- }
- result.push(next);
- return result;
- },[])
- return ret.reverse().join('');
+ const ret = Array.from(number)
+ .reverse()
+ .reduce((result: string[], next, i, arr) => {
+ if ((i + 1) % 3 === 0 && i + 1 !== arr.length) {
+ result.push(next, ',')
+ return result
+ }
+ result.push(next)
+ return result
+ }, [])
+ return ret.reverse().join('')
}
diff --git a/src/components/AddressList/index.tsx b/src/components/AddressList/index.tsx
index cd09aca..a4d047b 100644
--- a/src/components/AddressList/index.tsx
+++ b/src/components/AddressList/index.tsx
@@ -2,30 +2,31 @@
import { Button, Navigator, ScrollView, Text, View } from "@tarojs/components"
import { memo, useEffect, useState } from "react"
import "./index.scss"
-// import {addressListApi,addressDeleteApi} from "@/api/addressList"
+import { mppurchaseraddresslist } from "@/api/addressList"
import { alert } from "@/common/common"
-import Taro, { showModal } from "@tarojs/taro"
+import Taro, { showModal, useDidShow } from "@tarojs/taro"
-interface Params{
+interface Params {
refresherEnabled?: boolean,//是否开启刷新
- onSelect?: (item:any,index:number)=>void,//列表选择
+ onSelect?: (item: any, index: number) => void,//列表选择
addButtonEnabled?: boolean, //是否显示添加按钮
focusBorderEnabled?: boolean, //焦点显示蓝色边框
- id?: number, //默认选择值
+ id?: number, //默认选择值,
+ purchaser_id: Number
}
// 地址列表
-const AddressList = memo((props:Params)=>{
- const {addButtonEnabled=true,focusBorderEnabled=false} = props;
- const {fetchData, state} = addressListApi()
+const AddressList = memo((props: Params) => {
+ const { addButtonEnabled = true, focusBorderEnabled = false } = props;
+ const { fetchData, state } = mppurchaseraddresslist()
// 获取数据
- const getData = async ()=>{
- const result = await fetchData();
- if(props.id){
+ const getData = async () => {
+ const result = await fetchData({ purchaser_id: props.purchaser_id });
+ if (props.id) {
setFocusId(props.id as any);
- }else{
- result.data.list?.every(item=>{
- if(item.is_default){
+ } else {
+ result.data.list?.every(item => {
+ if (item.is_default) {
setFocusId(item.id);
return false;
}
@@ -33,90 +34,90 @@ const AddressList = memo((props:Params)=>{
})
}
}
- useEffect(()=>{
+ useDidShow(() => {
getData();
// 监听刷新
Taro.eventCenter.on("addressList:refresh", getData);
- return ()=>{
+ return () => {
Taro.eventCenter.off("addressList:refresh", getData);
}
- },[])
+ })
// 处理刷新
const [refreshState, setRefreshState] = useState(false);
- const handleRefresh = async ()=>{
+ const handleRefresh = async () => {
setRefreshState(true);
await getData();
setRefreshState(false);
}
- const data = Array.from({length:15});
+ const data = Array.from({ length: 15 });
// 焦点
const [focusId, setFocusId] = useState();
// 列表选择
- const handleSelect = (item: any, index: number)=>{
- props.onSelect&&props.onSelect(item,index);
- if(focusBorderEnabled){
+ const handleSelect = (item: any, index: number) => {
+ props.onSelect && props.onSelect(item, index);
+ if (focusBorderEnabled) {
setFocusId(item?.id);
}
}
// 删除地址
- const {fetchData: deleteFetch} = addressDeleteApi()
- const handleDelete = (item:any)=>{
- showModal(({
- title: "提示",
- content: "是否删除地址?",
- async success(ev){
- if(ev.confirm){
- const result = await deleteFetch({id:item.id});
- if(result.success){
- alert.success("删除成功");
- getData();
- }else{
- alert.success(result.msg);
- }
- }
- }
- }))
- }
+ // const { fetchData: deleteFetch } = addressDeleteApi()
+ // const handleDelete = (item: any) => {
+ // showModal(({
+ // title: "提示",
+ // content: "是否删除地址?",
+ // async success(ev) {
+ // if (ev.confirm) {
+ // const result = await deleteFetch({ id: item.id });
+ // if (result.success) {
+ // alert.success("删除成功");
+ // getData();
+ // } else {
+ // alert.success(result.msg);
+ // }
+ // }
+ // }
+ // }))
+ // }
return (
{
- state?.data?.list?.length>0?
- state?.data?.list?.map((item,index)=>{
- // data.length>0?
- // data.map((item,index)=>{
- return(
- handleDelete(item)} onClick={()=>handleSelect(item,index)} className={`address-list ${focusId==item.id&&'address-active'}`}>
-
- {item.name}
- {
- item.is_default?默认:
- {item.phone.replace(item.phone.substring(3,7), "****")}
- }
-
-
-
- {item.province_name+item.city_name+item.district_name}
- {/* {item.address_detail} */}
-
+ state?.data?.list?.length > 0 ?
+ state?.data?.list?.map((item, index) => {
+ // data.length>0?
+ // data.map((item,index)=>{
+ return (
+ handleDelete(item)} onClick={() => handleSelect(item, index)} className={`address-list ${focusId == item.id && 'address-active'}`}>
+
+ {item.name}
{
- item.is_default&&{item.phone.replace(item.phone.substring(3,7), "****")}
+ item.is_default ? 默认 :
+ {item.phone.replace(item.phone.substring(3, 7), "****")}
}
- e.stopPropagation()} url={`/pages/addressAdd/index?type=edit&id=${item.id}`} hoverClass="none" className="address-edit">
-
-
+
+
+ {item.province_name + item.city_name + item.district_name}
+ {/* {item.address_detail} */}
+
+ {
+ item.is_default && {item.phone.replace(item.phone.substring(3, 7), "****")}
+ }
+
+ e.stopPropagation()} url={`/pages/addAddress/index?type=edit&id=${item.id}&&purchaser_id=${642}`} hoverClass="none" className="address-edit">
+
+
+
-
- );
- }):
- 暂未添加地址
+ );
+ }) :
+ 暂未添加地址
}
- {addButtonEnabled&&添加收货地址}
+ {addButtonEnabled && 添加收货地址}
)
})
diff --git a/src/components/Divider/index.module.scss b/src/components/Divider/index.module.scss
index edc7516..8cfddd7 100644
--- a/src/components/Divider/index.module.scss
+++ b/src/components/Divider/index.module.scss
@@ -1,6 +1,8 @@
.divider {
position: relative;
+ font-size: 28px;
+ color: $color_font_one;
// 垂直
&-vertical {
display: inline-block;
@@ -22,9 +24,9 @@
position: absolute;
text-align: center;
padding: 0 40px;
+ font-size: inherit;
font-weight: 500;
- font-size: 28px;
- color: #333;
+ color: currentColor;
background-color: #fff;
}
}
diff --git a/src/components/Divider/index.tsx b/src/components/Divider/index.tsx
index a809ceb..d27bc84 100644
--- a/src/components/Divider/index.tsx
+++ b/src/components/Divider/index.tsx
@@ -1,57 +1,45 @@
/**
* Usage:
- *
+ *
* 巴拉巴拉小魔仙
* 全身变
- *
+ *
*/
-import { View } from "@tarojs/components";
-import { FC, ReactNode } from "react";
-import styles from "./index.module.scss";
-import classnames from "classnames";
+import { View } from '@tarojs/components'
+import { FC, ReactNode } from 'react'
+import styles from './index.module.scss'
+import classnames from 'classnames'
type BorderStype = 'solid' | 'dashed' | 'dotted' | 'double'
interface DividerProps {
- direction?: "horizontal" | "vertical";
- borderStyle?: BorderStype;
- contentPosition?: "left" | "center" | "right";
- children?: ReactNode;
+ direction?: 'horizontal' | 'vertical'
+ borderStyle?: BorderStype
+ contentPosition?: 'left' | 'center' | 'right'
+ children?: ReactNode
+ customClassName?: string
}
-const Divider: FC = props => {
- const {
- direction = "horizontal",
- borderStyle = "solid",
- contentPosition = "center"
- } = props;
+const Divider: FC = (props) => {
+ const { direction = 'horizontal', borderStyle = 'solid', contentPosition = 'center', customClassName='' } = props
- const classname = classnames(
- styles["divider"],
- styles["divider-" + direction]
- );
- const contentClassname = classnames(
- styles["divider-text"],
- styles["is-" + contentPosition]
- );
+ const classname = classnames(styles['divider'], styles['divider-' + direction], customClassName)
+ const contentClassname = classnames(styles['divider-text'], styles['is-' + contentPosition])
const borderTopStyle: { borderTopStyle: BorderStype } = {
- borderTopStyle: borderStyle
- };
+ borderTopStyle: borderStyle,
+ }
const borderLeftStyle: { borderLeftStyle: BorderStype } = {
- borderLeftStyle: borderStyle
- };
+ borderLeftStyle: borderStyle,
+ }
- const dividerStyle =
- direction === "horizontal" ? borderTopStyle : borderLeftStyle;
+ const dividerStyle = direction === 'horizontal' ? borderTopStyle : borderLeftStyle
return (
- {props.children && direction !== "vertical" && (
- {props.children}
- )}
+ {props.children && direction !== 'vertical' && {props.children}}
- );
-};
+ )
+}
export default Divider
diff --git a/src/components/checkbox/index.module.scss b/src/components/checkbox/index.module.scss
index 8224c9a..28acddb 100644
--- a/src/components/checkbox/index.module.scss
+++ b/src/components/checkbox/index.module.scss
@@ -1,32 +1,53 @@
-.checkbox_main{
- width: 50px;
- height: 50px;
- display: flex;
- justify-content: center;
- align-items: center;
+.checkbox {
+ display: flex;
+ align-items: center;
+ &--text {
+ margin-left: 10px;
+ }
}
-.checkbox_item{
+.checkbox_main {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ position: relative;
+ background-color: #fff;
+ border: 1px solid #c2c2c2;
+ text-align: center;
+ line-height: 40px;
+ &--normal {
width: 40px;
height: 40px;
- border: 1px solid #707070;
+ }
+ &--small {
+ width: 30px;
+ height: 30px;
+ }
+ &--round {
border-radius: 50%;
- text-align: center;
- line-height: 40px;
- background-color: #fff;
+ }
+ &--circle {
+ border-radius: 10px;
+ }
+ // 选中
+ &--selected {
+ border-color: $color_main;
+ }
}
-.no_checkbox_item{
- border:0;
- background-color: #DDDDDD;
+.checkbox_item {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+.no_checkbox_item {
+ border: 0;
+ background-color: #dddddd;
+}
+.checkbox_item_select {
+ background-color: $color_main;
+ border: 0;
+ color: #fff;
+ width: 100%;
+ height: 100%;
+ text-align: center;
+ line-height: 40px;
}
-.checkbox_item_select{
- background-color: $color_main;
- border: 0;
- color: #fff;
- width: 40px;
- height: 40px;
- text-align: center;
- line-height: 40px;
- .miconfont{
- font-size: 32px;
- }
-}
\ No newline at end of file
diff --git a/src/components/checkbox/index.tsx b/src/components/checkbox/index.tsx
index 7658fe0..272bc53 100644
--- a/src/components/checkbox/index.tsx
+++ b/src/components/checkbox/index.tsx
@@ -1,39 +1,67 @@
-import { View } from "@tarojs/components"
-import classnames from "classnames";
-import { forwardRef, useEffect, useImperativeHandle, useState } from "react";
-import styles from "./index.module.scss"
+import { View } from '@tarojs/components'
+import classnames from 'classnames'
+import { forwardRef, useEffect, useImperativeHandle, useState } from 'react'
+import IconFont from '../iconfont'
+import styles from './index.module.scss'
+
+type CheckboxSize = 'normal' | 'small'
type params = {
- onSelect?: () => void, //选择触发
- onClose?: () => void, //取消触发
- status?: false|true //是否选中
- disabled?: false|true //是否禁用
+ onSelect?: () => void //选择触发
+ onClose?: () => void //取消触发
+ status?: boolean //是否选中
+ disabled?: boolean //是否禁用
+ circle?: boolean
+ round?: boolean
+ size?: CheckboxSize
+ children?: React.ReactNode
}
-export default forwardRef(({onSelect, onClose, status = false, disabled = false}: params, ref) => {
- const [selected, SetSelected] = useState(false)
- const onSelectEven = () => {
- if(disabled) return false
- let res = !selected
- if(res) {
- onSelect?.()
- } else {
- onClose?.()
- }
- SetSelected(res)
+export default forwardRef((props: params, ref) => {
+ const { onSelect, onClose, status = false, disabled = false, circle = false, round = true, size = 'normal', children } = props
+ const [selected, SetSelected] = useState(false)
+ const onSelectEven = () => {
+ if (disabled) return false
+ let res = !selected
+ if (res) {
+ onSelect?.()
+ } else {
+ onClose?.()
}
- useImperativeHandle(ref, () => ({
- onSelectEven
- }))
- useEffect(() => {
- SetSelected(status)
- }, [status])
- return (
- <>
- onSelectEven()}>
-
- {selected&&}
-
-
- >
- )
-})
\ No newline at end of file
+ SetSelected(res)
+ }
+
+ const getMainClassName = () => {
+ const classObject = {
+ [styles['checkbox_main--selected']]: selected,
+ [styles[`checkbox_main--${size}`]]: size,
+ [styles['checkbox_main--round']]: round,
+ [styles['checkbox_main--circle']]: circle,
+ }
+ return classObject
+ }
+
+ const getClassName = () => {
+ const classObject = {
+ [styles.no_checkbox_item]: disabled,
+ [styles.checkbox_item_select]: selected,
+ }
+ return classObject
+ }
+
+ useImperativeHandle(ref, () => ({
+ onSelectEven,
+ }))
+ useEffect(() => {
+ SetSelected(status)
+ }, [status])
+ return (
+ onSelectEven()}>
+
+
+ {selected && }
+
+
+ {children && {children}}
+
+ )
+})
diff --git a/src/components/iconCard/index.module.scss b/src/components/iconCard/index.module.scss
index d36c6aa..bde9483 100644
--- a/src/components/iconCard/index.module.scss
+++ b/src/components/iconCard/index.module.scss
@@ -3,9 +3,10 @@
flex-flow: column nowrap;
justify-content: center;
align-items: center;
+ color: $color_font_one;
&-name{
font-size: 26px;
- color: #333;
+ color: currentColor;
margin-top: 16px;
}
}
diff --git a/src/components/iconCard/index.tsx b/src/components/iconCard/index.tsx
index 14a8fee..4c834a4 100644
--- a/src/components/iconCard/index.tsx
+++ b/src/components/iconCard/index.tsx
@@ -3,6 +3,8 @@ import { FC, ReactNode } from "react"
import IconFont from "../iconfont"
import styles from './index.module.scss'
+import classname from 'classnames'
+
type IconfontName = Parameters['0']['name']
interface PropsType {
@@ -10,15 +12,17 @@ interface PropsType {
title: string
children?: ReactNode
onClick?: Function
+ customClass?: string
+ iconSize?: number
}
const IconCard: FC = (props) => {
- const { iconName, title, onClick } = props
+ const { iconName, title, onClick, customClass = '', iconSize=72 } = props
const handleClick = (event) => {
onClick && onClick(event)
}
return (
-
-
+
+
{title}
)
diff --git a/src/components/iconfont/h5/IconAJizhumima.js b/src/components/iconfont/h5/IconAJizhumima.js
new file mode 100644
index 0000000..8743883
--- /dev/null
+++ b/src/components/iconfont/h5/IconAJizhumima.js
@@ -0,0 +1,27 @@
+/* eslint-disable */
+
+import React from 'react';
+import { getIconColor } from './helper';
+
+const DEFAULT_STYLE = {
+ display: 'block',
+};
+
+const IconAJizhumima = ({ size, color, style: _style, ...rest }) => {
+ const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
+
+ return (
+
+ );
+};
+
+IconAJizhumima.defaultProps = {
+ size: 18,
+};
+
+export default IconAJizhumima;
diff --git a/src/components/iconfont/h5/IconBianji.js b/src/components/iconfont/h5/IconBianji.js
new file mode 100644
index 0000000..e0188ba
--- /dev/null
+++ b/src/components/iconfont/h5/IconBianji.js
@@ -0,0 +1,27 @@
+/* eslint-disable */
+
+import React from 'react';
+import { getIconColor } from './helper';
+
+const DEFAULT_STYLE = {
+ display: 'block',
+};
+
+const IconBianji = ({ size, color, style: _style, ...rest }) => {
+ const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
+
+ return (
+
+ );
+};
+
+IconBianji.defaultProps = {
+ size: 18,
+};
+
+export default IconBianji;
diff --git a/src/components/iconfont/h5/IconBiyan.js b/src/components/iconfont/h5/IconBiyan.js
new file mode 100644
index 0000000..31cc5a0
--- /dev/null
+++ b/src/components/iconfont/h5/IconBiyan.js
@@ -0,0 +1,27 @@
+/* eslint-disable */
+
+import React from 'react';
+import { getIconColor } from './helper';
+
+const DEFAULT_STYLE = {
+ display: 'block',
+};
+
+const IconBiyan = ({ size, color, style: _style, ...rest }) => {
+ const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
+
+ return (
+
+ );
+};
+
+IconBiyan.defaultProps = {
+ size: 18,
+};
+
+export default IconBiyan;
diff --git a/src/components/iconfont/h5/IconCangku.js b/src/components/iconfont/h5/IconCangku.js
new file mode 100644
index 0000000..df4d192
--- /dev/null
+++ b/src/components/iconfont/h5/IconCangku.js
@@ -0,0 +1,27 @@
+/* eslint-disable */
+
+import React from 'react';
+import { getIconColor } from './helper';
+
+const DEFAULT_STYLE = {
+ display: 'block',
+};
+
+const IconCangku = ({ size, color, style: _style, ...rest }) => {
+ const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
+
+ return (
+
+ );
+};
+
+IconCangku.defaultProps = {
+ size: 18,
+};
+
+export default IconCangku;
diff --git a/src/components/iconfont/h5/IconChakanquanbukehu.js b/src/components/iconfont/h5/IconChakanquanbukehu.js
new file mode 100644
index 0000000..7059887
--- /dev/null
+++ b/src/components/iconfont/h5/IconChakanquanbukehu.js
@@ -0,0 +1,27 @@
+/* eslint-disable */
+
+import React from 'react';
+import { getIconColor } from './helper';
+
+const DEFAULT_STYLE = {
+ display: 'block',
+};
+
+const IconChakanquanbukehu = ({ size, color, style: _style, ...rest }) => {
+ const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
+
+ return (
+
+ );
+};
+
+IconChakanquanbukehu.defaultProps = {
+ size: 18,
+};
+
+export default IconChakanquanbukehu;
diff --git a/src/components/iconfont/h5/IconDaikuan.js b/src/components/iconfont/h5/IconDaikuan.js
new file mode 100644
index 0000000..eda3f8b
--- /dev/null
+++ b/src/components/iconfont/h5/IconDaikuan.js
@@ -0,0 +1,27 @@
+/* eslint-disable */
+
+import React from 'react';
+import { getIconColor } from './helper';
+
+const DEFAULT_STYLE = {
+ display: 'block',
+};
+
+const IconDaikuan = ({ size, color, style: _style, ...rest }) => {
+ const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
+
+ return (
+
+ );
+};
+
+IconDaikuan.defaultProps = {
+ size: 18,
+};
+
+export default IconDaikuan;
diff --git a/src/components/iconfont/h5/IconDingwei.js b/src/components/iconfont/h5/IconDingwei.js
new file mode 100644
index 0000000..c6bb39e
--- /dev/null
+++ b/src/components/iconfont/h5/IconDingwei.js
@@ -0,0 +1,27 @@
+/* eslint-disable */
+
+import React from 'react';
+import { getIconColor } from './helper';
+
+const DEFAULT_STYLE = {
+ display: 'block',
+};
+
+const IconDingwei = ({ size, color, style: _style, ...rest }) => {
+ const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
+
+ return (
+
+ );
+};
+
+IconDingwei.defaultProps = {
+ size: 18,
+};
+
+export default IconDingwei;
diff --git a/src/components/iconfont/h5/IconGuanbi.js b/src/components/iconfont/h5/IconGuanbi.js
new file mode 100644
index 0000000..d256124
--- /dev/null
+++ b/src/components/iconfont/h5/IconGuanbi.js
@@ -0,0 +1,27 @@
+/* eslint-disable */
+
+import React from 'react';
+import { getIconColor } from './helper';
+
+const DEFAULT_STYLE = {
+ display: 'block',
+};
+
+const IconGuanbi = ({ size, color, style: _style, ...rest }) => {
+ const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
+
+ return (
+
+ );
+};
+
+IconGuanbi.defaultProps = {
+ size: 18,
+};
+
+export default IconGuanbi;
diff --git a/src/components/iconfont/h5/IconGuanlidingdan.js b/src/components/iconfont/h5/IconGuanlidingdan.js
new file mode 100644
index 0000000..d7ad8f1
--- /dev/null
+++ b/src/components/iconfont/h5/IconGuanlidingdan.js
@@ -0,0 +1,27 @@
+/* eslint-disable */
+
+import React from 'react';
+import { getIconColor } from './helper';
+
+const DEFAULT_STYLE = {
+ display: 'block',
+};
+
+const IconGuanlidingdan = ({ size, color, style: _style, ...rest }) => {
+ const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
+
+ return (
+
+ );
+};
+
+IconGuanlidingdan.defaultProps = {
+ size: 18,
+};
+
+export default IconGuanlidingdan;
diff --git a/src/components/iconfont/h5/IconJianshao.js b/src/components/iconfont/h5/IconJianshao.js
new file mode 100644
index 0000000..c285021
--- /dev/null
+++ b/src/components/iconfont/h5/IconJianshao.js
@@ -0,0 +1,27 @@
+/* eslint-disable */
+
+import React from 'react';
+import { getIconColor } from './helper';
+
+const DEFAULT_STYLE = {
+ display: 'block',
+};
+
+const IconJianshao = ({ size, color, style: _style, ...rest }) => {
+ const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
+
+ return (
+
+ );
+};
+
+IconJianshao.defaultProps = {
+ size: 18,
+};
+
+export default IconJianshao;
diff --git a/src/components/iconfont/h5/IconJizhumima.js b/src/components/iconfont/h5/IconJizhumima.js
new file mode 100644
index 0000000..77d653c
--- /dev/null
+++ b/src/components/iconfont/h5/IconJizhumima.js
@@ -0,0 +1,31 @@
+/* eslint-disable */
+
+import React from 'react';
+import { getIconColor } from './helper';
+
+const DEFAULT_STYLE = {
+ display: 'block',
+};
+
+const IconJizhumima = ({ size, color, style: _style, ...rest }) => {
+ const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
+
+ return (
+
+ );
+};
+
+IconJizhumima.defaultProps = {
+ size: 18,
+};
+
+export default IconJizhumima;
diff --git a/src/components/iconfont/h5/IconKehuxinxi.js b/src/components/iconfont/h5/IconKehuxinxi.js
new file mode 100644
index 0000000..07c5fbb
--- /dev/null
+++ b/src/components/iconfont/h5/IconKehuxinxi.js
@@ -0,0 +1,32 @@
+/* eslint-disable */
+
+import React from 'react';
+import { getIconColor } from './helper';
+
+const DEFAULT_STYLE = {
+ display: 'block',
+};
+
+const IconKehuxinxi = ({ size, color, style: _style, ...rest }) => {
+ const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
+
+ return (
+
+ );
+};
+
+IconKehuxinxi.defaultProps = {
+ size: 18,
+};
+
+export default IconKehuxinxi;
diff --git a/src/components/iconfont/h5/IconMima.js b/src/components/iconfont/h5/IconMima.js
new file mode 100644
index 0000000..b8d402e
--- /dev/null
+++ b/src/components/iconfont/h5/IconMima.js
@@ -0,0 +1,27 @@
+/* eslint-disable */
+
+import React from 'react';
+import { getIconColor } from './helper';
+
+const DEFAULT_STYLE = {
+ display: 'block',
+};
+
+const IconMima = ({ size, color, style: _style, ...rest }) => {
+ const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
+
+ return (
+
+ );
+};
+
+IconMima.defaultProps = {
+ size: 18,
+};
+
+export default IconMima;
diff --git a/src/components/iconfont/h5/IconPaiming.js b/src/components/iconfont/h5/IconPaiming.js
new file mode 100644
index 0000000..e67379a
--- /dev/null
+++ b/src/components/iconfont/h5/IconPaiming.js
@@ -0,0 +1,27 @@
+/* eslint-disable */
+
+import React from 'react';
+import { getIconColor } from './helper';
+
+const DEFAULT_STYLE = {
+ display: 'block',
+};
+
+const IconPaiming = ({ size, color, style: _style, ...rest }) => {
+ const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
+
+ return (
+
+ );
+};
+
+IconPaiming.defaultProps = {
+ size: 18,
+};
+
+export default IconPaiming;
diff --git a/src/components/iconfont/h5/IconPeihuo.js b/src/components/iconfont/h5/IconPeihuo.js
new file mode 100644
index 0000000..e74196a
--- /dev/null
+++ b/src/components/iconfont/h5/IconPeihuo.js
@@ -0,0 +1,27 @@
+/* eslint-disable */
+
+import React from 'react';
+import { getIconColor } from './helper';
+
+const DEFAULT_STYLE = {
+ display: 'block',
+};
+
+const IconPeihuo = ({ size, color, style: _style, ...rest }) => {
+ const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
+
+ return (
+
+ );
+};
+
+IconPeihuo.defaultProps = {
+ size: 18,
+};
+
+export default IconPeihuo;
diff --git a/src/components/iconfont/h5/IconSaomiao.js b/src/components/iconfont/h5/IconSaomiao.js
new file mode 100644
index 0000000..ebb4447
--- /dev/null
+++ b/src/components/iconfont/h5/IconSaomiao.js
@@ -0,0 +1,27 @@
+/* eslint-disable */
+
+import React from 'react';
+import { getIconColor } from './helper';
+
+const DEFAULT_STYLE = {
+ display: 'block',
+};
+
+const IconSaomiao = ({ size, color, style: _style, ...rest }) => {
+ const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
+
+ return (
+
+ );
+};
+
+IconSaomiao.defaultProps = {
+ size: 18,
+};
+
+export default IconSaomiao;
diff --git a/src/components/iconfont/h5/IconShaixuan.js b/src/components/iconfont/h5/IconShaixuan.js
new file mode 100644
index 0000000..cc79608
--- /dev/null
+++ b/src/components/iconfont/h5/IconShaixuan.js
@@ -0,0 +1,27 @@
+/* eslint-disable */
+
+import React from 'react';
+import { getIconColor } from './helper';
+
+const DEFAULT_STYLE = {
+ display: 'block',
+};
+
+const IconShaixuan = ({ size, color, style: _style, ...rest }) => {
+ const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
+
+ return (
+
+ );
+};
+
+IconShaixuan.defaultProps = {
+ size: 18,
+};
+
+export default IconShaixuan;
diff --git a/src/components/iconfont/h5/IconShanchusousuoxinxi.js b/src/components/iconfont/h5/IconShanchusousuoxinxi.js
new file mode 100644
index 0000000..b67f566
--- /dev/null
+++ b/src/components/iconfont/h5/IconShanchusousuoxinxi.js
@@ -0,0 +1,27 @@
+/* eslint-disable */
+
+import React from 'react';
+import { getIconColor } from './helper';
+
+const DEFAULT_STYLE = {
+ display: 'block',
+};
+
+const IconShanchusousuoxinxi = ({ size, color, style: _style, ...rest }) => {
+ const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
+
+ return (
+
+ );
+};
+
+IconShanchusousuoxinxi.defaultProps = {
+ size: 18,
+};
+
+export default IconShanchusousuoxinxi;
diff --git a/src/components/iconfont/h5/IconShijian.js b/src/components/iconfont/h5/IconShijian.js
new file mode 100644
index 0000000..fbb9408
--- /dev/null
+++ b/src/components/iconfont/h5/IconShijian.js
@@ -0,0 +1,27 @@
+/* eslint-disable */
+
+import React from 'react';
+import { getIconColor } from './helper';
+
+const DEFAULT_STYLE = {
+ display: 'block',
+};
+
+const IconShijian = ({ size, color, style: _style, ...rest }) => {
+ const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
+
+ return (
+
+ );
+};
+
+IconShijian.defaultProps = {
+ size: 18,
+};
+
+export default IconShijian;
diff --git a/src/components/iconfont/h5/IconShouhou.js b/src/components/iconfont/h5/IconShouhou.js
new file mode 100644
index 0000000..fad885e
--- /dev/null
+++ b/src/components/iconfont/h5/IconShouhou.js
@@ -0,0 +1,27 @@
+/* eslint-disable */
+
+import React from 'react';
+import { getIconColor } from './helper';
+
+const DEFAULT_STYLE = {
+ display: 'block',
+};
+
+const IconShouhou = ({ size, color, style: _style, ...rest }) => {
+ const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
+
+ return (
+
+ );
+};
+
+IconShouhou.defaultProps = {
+ size: 18,
+};
+
+export default IconShouhou;
diff --git a/src/components/iconfont/h5/IconSousuo.js b/src/components/iconfont/h5/IconSousuo.js
new file mode 100644
index 0000000..995e4b1
--- /dev/null
+++ b/src/components/iconfont/h5/IconSousuo.js
@@ -0,0 +1,27 @@
+/* eslint-disable */
+
+import React from 'react';
+import { getIconColor } from './helper';
+
+const DEFAULT_STYLE = {
+ display: 'block',
+};
+
+const IconSousuo = ({ size, color, style: _style, ...rest }) => {
+ const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
+
+ return (
+
+ );
+};
+
+IconSousuo.defaultProps = {
+ size: 18,
+};
+
+export default IconSousuo;
diff --git a/src/components/iconfont/h5/IconSousuofanhui.js b/src/components/iconfont/h5/IconSousuofanhui.js
new file mode 100644
index 0000000..c6b9d4f
--- /dev/null
+++ b/src/components/iconfont/h5/IconSousuofanhui.js
@@ -0,0 +1,27 @@
+/* eslint-disable */
+
+import React from 'react';
+import { getIconColor } from './helper';
+
+const DEFAULT_STYLE = {
+ display: 'block',
+};
+
+const IconSousuofanhui = ({ size, color, style: _style, ...rest }) => {
+ const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
+
+ return (
+
+ );
+};
+
+IconSousuofanhui.defaultProps = {
+ size: 18,
+};
+
+export default IconSousuofanhui;
diff --git a/src/components/iconfont/h5/IconSousuoshanchu.js b/src/components/iconfont/h5/IconSousuoshanchu.js
new file mode 100644
index 0000000..36f4528
--- /dev/null
+++ b/src/components/iconfont/h5/IconSousuoshanchu.js
@@ -0,0 +1,27 @@
+/* eslint-disable */
+
+import React from 'react';
+import { getIconColor } from './helper';
+
+const DEFAULT_STYLE = {
+ display: 'block',
+};
+
+const IconSousuoshanchu = ({ size, color, style: _style, ...rest }) => {
+ const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
+
+ return (
+
+ );
+};
+
+IconSousuoshanchu.defaultProps = {
+ size: 18,
+};
+
+export default IconSousuoshanchu;
diff --git a/src/components/iconfont/h5/IconTishi.js b/src/components/iconfont/h5/IconTishi.js
new file mode 100644
index 0000000..b83a12e
--- /dev/null
+++ b/src/components/iconfont/h5/IconTishi.js
@@ -0,0 +1,27 @@
+/* eslint-disable */
+
+import React from 'react';
+import { getIconColor } from './helper';
+
+const DEFAULT_STYLE = {
+ display: 'block',
+};
+
+const IconTishi = ({ size, color, style: _style, ...rest }) => {
+ const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
+
+ return (
+
+ );
+};
+
+IconTishi.defaultProps = {
+ size: 18,
+};
+
+export default IconTishi;
diff --git a/src/components/iconfont/h5/IconTuikuan.js b/src/components/iconfont/h5/IconTuikuan.js
new file mode 100644
index 0000000..681871a
--- /dev/null
+++ b/src/components/iconfont/h5/IconTuikuan.js
@@ -0,0 +1,27 @@
+/* eslint-disable */
+
+import React from 'react';
+import { getIconColor } from './helper';
+
+const DEFAULT_STYLE = {
+ display: 'block',
+};
+
+const IconTuikuan = ({ size, color, style: _style, ...rest }) => {
+ const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
+
+ return (
+
+ );
+};
+
+IconTuikuan.defaultProps = {
+ size: 18,
+};
+
+export default IconTuikuan;
diff --git a/src/components/iconfont/h5/IconWeixindenglu.js b/src/components/iconfont/h5/IconWeixindenglu.js
new file mode 100644
index 0000000..56f4657
--- /dev/null
+++ b/src/components/iconfont/h5/IconWeixindenglu.js
@@ -0,0 +1,32 @@
+/* eslint-disable */
+
+import React from 'react';
+import { getIconColor } from './helper';
+
+const DEFAULT_STYLE = {
+ display: 'block',
+};
+
+const IconWeixindenglu = ({ size, color, style: _style, ...rest }) => {
+ const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
+
+ return (
+
+ );
+};
+
+IconWeixindenglu.defaultProps = {
+ size: 18,
+};
+
+export default IconWeixindenglu;
diff --git a/src/components/iconfont/h5/IconXianxiahuizong.js b/src/components/iconfont/h5/IconXianxiahuizong.js
new file mode 100644
index 0000000..3a6cc3c
--- /dev/null
+++ b/src/components/iconfont/h5/IconXianxiahuizong.js
@@ -0,0 +1,27 @@
+/* eslint-disable */
+
+import React from 'react';
+import { getIconColor } from './helper';
+
+const DEFAULT_STYLE = {
+ display: 'block',
+};
+
+const IconXianxiahuizong = ({ size, color, style: _style, ...rest }) => {
+ const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
+
+ return (
+
+ );
+};
+
+IconXianxiahuizong.defaultProps = {
+ size: 18,
+};
+
+export default IconXianxiahuizong;
diff --git a/src/components/iconfont/h5/IconXinzeng.js b/src/components/iconfont/h5/IconXinzeng.js
new file mode 100644
index 0000000..fa37e05
--- /dev/null
+++ b/src/components/iconfont/h5/IconXinzeng.js
@@ -0,0 +1,27 @@
+/* eslint-disable */
+
+import React from 'react';
+import { getIconColor } from './helper';
+
+const DEFAULT_STYLE = {
+ display: 'block',
+};
+
+const IconXinzeng = ({ size, color, style: _style, ...rest }) => {
+ const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
+
+ return (
+
+ );
+};
+
+IconXinzeng.defaultProps = {
+ size: 18,
+};
+
+export default IconXinzeng;
diff --git a/src/components/iconfont/h5/IconYanjing.js b/src/components/iconfont/h5/IconYanjing.js
new file mode 100644
index 0000000..85c7c22
--- /dev/null
+++ b/src/components/iconfont/h5/IconYanjing.js
@@ -0,0 +1,27 @@
+/* eslint-disable */
+
+import React from 'react';
+import { getIconColor } from './helper';
+
+const DEFAULT_STYLE = {
+ display: 'block',
+};
+
+const IconYanjing = ({ size, color, style: _style, ...rest }) => {
+ const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
+
+ return (
+
+ );
+};
+
+IconYanjing.defaultProps = {
+ size: 18,
+};
+
+export default IconYanjing;
diff --git a/src/components/iconfont/h5/IconYewuyuanqizi.js b/src/components/iconfont/h5/IconYewuyuanqizi.js
new file mode 100644
index 0000000..f9925dd
--- /dev/null
+++ b/src/components/iconfont/h5/IconYewuyuanqizi.js
@@ -0,0 +1,27 @@
+/* eslint-disable */
+
+import React from 'react';
+import { getIconColor } from './helper';
+
+const DEFAULT_STYLE = {
+ display: 'block',
+};
+
+const IconYewuyuanqizi = ({ size, color, style: _style, ...rest }) => {
+ const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
+
+ return (
+
+ );
+};
+
+IconYewuyuanqizi.defaultProps = {
+ size: 18,
+};
+
+export default IconYewuyuanqizi;
diff --git a/src/components/iconfont/h5/IconYonghuming.js b/src/components/iconfont/h5/IconYonghuming.js
new file mode 100644
index 0000000..272f2c6
--- /dev/null
+++ b/src/components/iconfont/h5/IconYonghuming.js
@@ -0,0 +1,27 @@
+/* eslint-disable */
+
+import React from 'react';
+import { getIconColor } from './helper';
+
+const DEFAULT_STYLE = {
+ display: 'block',
+};
+
+const IconYonghuming = ({ size, color, style: _style, ...rest }) => {
+ const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
+
+ return (
+
+ );
+};
+
+IconYonghuming.defaultProps = {
+ size: 18,
+};
+
+export default IconYonghuming;
diff --git a/src/components/iconfont/h5/IconYufukuan.js b/src/components/iconfont/h5/IconYufukuan.js
new file mode 100644
index 0000000..7f7177a
--- /dev/null
+++ b/src/components/iconfont/h5/IconYufukuan.js
@@ -0,0 +1,27 @@
+/* eslint-disable */
+
+import React from 'react';
+import { getIconColor } from './helper';
+
+const DEFAULT_STYLE = {
+ display: 'block',
+};
+
+const IconYufukuan = ({ size, color, style: _style, ...rest }) => {
+ const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
+
+ return (
+
+ );
+};
+
+IconYufukuan.defaultProps = {
+ size: 18,
+};
+
+export default IconYufukuan;
diff --git a/src/components/iconfont/h5/index.js b/src/components/iconfont/h5/index.js
index 52377bf..20c4858 100644
--- a/src/components/iconfont/h5/index.js
+++ b/src/components/iconfont/h5/index.js
@@ -1,6 +1,38 @@
/* eslint-disable */
import React from 'react';
+import IconJizhumima from './IconJizhumima';
+import IconAJizhumima from './IconAJizhumima';
+import IconWeixindenglu from './IconWeixindenglu';
+import IconKehuxinxi from './IconKehuxinxi';
+import IconYewuyuanqizi from './IconYewuyuanqizi';
+import IconChakanquanbukehu from './IconChakanquanbukehu';
+import IconBiyan from './IconBiyan';
+import IconBianji from './IconBianji';
+import IconDaikuan from './IconDaikuan';
+import IconCangku from './IconCangku';
+import IconGuanlidingdan from './IconGuanlidingdan';
+import IconMima from './IconMima';
+import IconGuanbi from './IconGuanbi';
+import IconJianshao from './IconJianshao';
+import IconDingwei from './IconDingwei';
+import IconSaomiao from './IconSaomiao';
+import IconPeihuo from './IconPeihuo';
+import IconShaixuan from './IconShaixuan';
+import IconPaiming from './IconPaiming';
+import IconShanchusousuoxinxi from './IconShanchusousuoxinxi';
+import IconShijian from './IconShijian';
+import IconSousuo from './IconSousuo';
+import IconShouhou from './IconShouhou';
+import IconSousuofanhui from './IconSousuofanhui';
+import IconSousuoshanchu from './IconSousuoshanchu';
+import IconTuikuan from './IconTuikuan';
+import IconTishi from './IconTishi';
+import IconXianxiahuizong from './IconXianxiahuizong';
+import IconXinzeng from './IconXinzeng';
+import IconYonghuming from './IconYonghuming';
+import IconYanjing from './IconYanjing';
+import IconYufukuan from './IconYufukuan';
import IconWodekefu from './IconWodekefu';
import IconDizhi from './IconDizhi';
import IconShouhouzhongxin from './IconShouhouzhongxin';
@@ -27,6 +59,38 @@ import IconGerenzhongxin from './IconGerenzhongxin';
import IconDingdan from './IconDingdan';
import IconShouye from './IconShouye';
import IconGouwu from './IconGouwu';
+export { default as IconJizhumima } from './IconJizhumima';
+export { default as IconAJizhumima } from './IconAJizhumima';
+export { default as IconWeixindenglu } from './IconWeixindenglu';
+export { default as IconKehuxinxi } from './IconKehuxinxi';
+export { default as IconYewuyuanqizi } from './IconYewuyuanqizi';
+export { default as IconChakanquanbukehu } from './IconChakanquanbukehu';
+export { default as IconBiyan } from './IconBiyan';
+export { default as IconBianji } from './IconBianji';
+export { default as IconDaikuan } from './IconDaikuan';
+export { default as IconCangku } from './IconCangku';
+export { default as IconGuanlidingdan } from './IconGuanlidingdan';
+export { default as IconMima } from './IconMima';
+export { default as IconGuanbi } from './IconGuanbi';
+export { default as IconJianshao } from './IconJianshao';
+export { default as IconDingwei } from './IconDingwei';
+export { default as IconSaomiao } from './IconSaomiao';
+export { default as IconPeihuo } from './IconPeihuo';
+export { default as IconShaixuan } from './IconShaixuan';
+export { default as IconPaiming } from './IconPaiming';
+export { default as IconShanchusousuoxinxi } from './IconShanchusousuoxinxi';
+export { default as IconShijian } from './IconShijian';
+export { default as IconSousuo } from './IconSousuo';
+export { default as IconShouhou } from './IconShouhou';
+export { default as IconSousuofanhui } from './IconSousuofanhui';
+export { default as IconSousuoshanchu } from './IconSousuoshanchu';
+export { default as IconTuikuan } from './IconTuikuan';
+export { default as IconTishi } from './IconTishi';
+export { default as IconXianxiahuizong } from './IconXianxiahuizong';
+export { default as IconXinzeng } from './IconXinzeng';
+export { default as IconYonghuming } from './IconYonghuming';
+export { default as IconYanjing } from './IconYanjing';
+export { default as IconYufukuan } from './IconYufukuan';
export { default as IconWodekefu } from './IconWodekefu';
export { default as IconDizhi } from './IconDizhi';
export { default as IconShouhouzhongxin } from './IconShouhouzhongxin';
@@ -56,6 +120,70 @@ export { default as IconGouwu } from './IconGouwu';
const IconFont = ({ name, ...rest }) => {
switch (name) {
+ case 'icon-jizhumima':
+ return ;
+ case 'icon-a-jizhumima':
+ return ;
+ case 'icon-weixindenglu':
+ return ;
+ case 'icon-kehuxinxi':
+ return ;
+ case 'icon-yewuyuanqizi':
+ return ;
+ case 'icon-chakanquanbukehu':
+ return ;
+ case 'icon-biyan':
+ return ;
+ case 'icon-bianji':
+ return ;
+ case 'icon-daikuan':
+ return ;
+ case 'icon-cangku':
+ return ;
+ case 'icon-guanlidingdan':
+ return ;
+ case 'icon-mima':
+ return ;
+ case 'icon-guanbi':
+ return ;
+ case 'icon-jianshao':
+ return ;
+ case 'icon-dingwei':
+ return ;
+ case 'icon-saomiao':
+ return ;
+ case 'icon-peihuo':
+ return ;
+ case 'icon-shaixuan':
+ return ;
+ case 'icon-paiming':
+ return ;
+ case 'icon-shanchusousuoxinxi':
+ return ;
+ case 'icon-shijian':
+ return ;
+ case 'icon-sousuo':
+ return ;
+ case 'icon-shouhou':
+ return ;
+ case 'icon-sousuofanhui':
+ return ;
+ case 'icon-sousuoshanchu':
+ return ;
+ case 'icon-tuikuan':
+ return ;
+ case 'icon-tishi':
+ return ;
+ case 'icon-xianxiahuizong':
+ return ;
+ case 'icon-xinzeng':
+ return ;
+ case 'icon-yonghuming':
+ return ;
+ case 'icon-yanjing':
+ return ;
+ case 'icon-yufukuan':
+ return ;
case 'icon-wodekefu':
return ;
case 'icon-dizhi':
diff --git a/src/components/iconfont/index.d.ts b/src/components/iconfont/index.d.ts
index ff53197..a92822f 100644
--- a/src/components/iconfont/index.d.ts
+++ b/src/components/iconfont/index.d.ts
@@ -2,7 +2,7 @@
import React, { FunctionComponent } from 'react';
interface Props {
- name: 'icon-wodekefu' | 'icon-dizhi' | 'icon-shouhouzhongxin' | 'icon-wodeshoucang' | 'icon-shoukuanliebiao' | 'icon-madanguanli' | 'icon-qusechazhao' | 'icon-pandiansaoma' | 'icon-yaoqingma' | 'icon-duizhang' | 'icon-tihuoliebiao' | 'icon-yangpinduibi' | 'icon-yansequyang' | 'icon-fahuoliebiao' | 'icon-yuncangkucun' | 'icon-xiaoshou' | 'icon-qianzhicangkucun' | 'icon-lingquseka' | 'icon-gouwu1' | 'icon-dingdan1' | 'icon-gerenzhongxin1' | 'icon-shouye1' | 'icon-gerenzhongxin' | 'icon-dingdan' | 'icon-shouye' | 'icon-gouwu';
+ name: 'icon-jizhumima' | 'icon-a-jizhumima' | 'icon-weixindenglu' | 'icon-kehuxinxi' | 'icon-yewuyuanqizi' | 'icon-chakanquanbukehu' | 'icon-biyan' | 'icon-bianji' | 'icon-daikuan' | 'icon-cangku' | 'icon-guanlidingdan' | 'icon-mima' | 'icon-guanbi' | 'icon-jianshao' | 'icon-dingwei' | 'icon-saomiao' | 'icon-peihuo' | 'icon-shaixuan' | 'icon-paiming' | 'icon-shanchusousuoxinxi' | 'icon-shijian' | 'icon-sousuo' | 'icon-shouhou' | 'icon-sousuofanhui' | 'icon-sousuoshanchu' | 'icon-tuikuan' | 'icon-tishi' | 'icon-xianxiahuizong' | 'icon-xinzeng' | 'icon-yonghuming' | 'icon-yanjing' | 'icon-yufukuan' | 'icon-wodekefu' | 'icon-dizhi' | 'icon-shouhouzhongxin' | 'icon-wodeshoucang' | 'icon-shoukuanliebiao' | 'icon-madanguanli' | 'icon-qusechazhao' | 'icon-pandiansaoma' | 'icon-yaoqingma' | 'icon-duizhang' | 'icon-tihuoliebiao' | 'icon-yangpinduibi' | 'icon-yansequyang' | 'icon-fahuoliebiao' | 'icon-yuncangkucun' | 'icon-xiaoshou' | 'icon-qianzhicangkucun' | 'icon-lingquseka' | 'icon-gouwu1' | 'icon-dingdan1' | 'icon-gerenzhongxin1' | 'icon-shouye1' | 'icon-gerenzhongxin' | 'icon-dingdan' | 'icon-shouye' | 'icon-gouwu';
size?: number;
color?: string | string[];
style?: React.CSSProperties;
diff --git a/src/components/iconfont/weapp/weapp.js b/src/components/iconfont/weapp/weapp.js
index 54b2aaf..5217936 100644
--- a/src/components/iconfont/weapp/weapp.js
+++ b/src/components/iconfont/weapp/weapp.js
@@ -1,6 +1,6 @@
Component({
properties: {
- // icon-wodekefu | icon-dizhi | icon-shouhouzhongxin | icon-wodeshoucang | icon-shoukuanliebiao | icon-madanguanli | icon-qusechazhao | icon-pandiansaoma | icon-yaoqingma | icon-duizhang | icon-tihuoliebiao | icon-yangpinduibi | icon-yansequyang | icon-fahuoliebiao | icon-yuncangkucun | icon-xiaoshou | icon-qianzhicangkucun | icon-lingquseka | icon-gouwu1 | icon-dingdan1 | icon-gerenzhongxin1 | icon-shouye1 | icon-gerenzhongxin | icon-dingdan | icon-shouye | icon-gouwu
+ // icon-jizhumima | icon-a-jizhumima | icon-weixindenglu | icon-kehuxinxi | icon-yewuyuanqizi | icon-chakanquanbukehu | icon-biyan | icon-bianji | icon-daikuan | icon-cangku | icon-guanlidingdan | icon-mima | icon-guanbi | icon-jianshao | icon-dingwei | icon-saomiao | icon-peihuo | icon-shaixuan | icon-paiming | icon-shanchusousuoxinxi | icon-shijian | icon-sousuo | icon-shouhou | icon-sousuofanhui | icon-sousuoshanchu | icon-tuikuan | icon-tishi | icon-xianxiahuizong | icon-xinzeng | icon-yonghuming | icon-yanjing | icon-yufukuan | icon-wodekefu | icon-dizhi | icon-shouhouzhongxin | icon-wodeshoucang | icon-shoukuanliebiao | icon-madanguanli | icon-qusechazhao | icon-pandiansaoma | icon-yaoqingma | icon-duizhang | icon-tihuoliebiao | icon-yangpinduibi | icon-yansequyang | icon-fahuoliebiao | icon-yuncangkucun | icon-xiaoshou | icon-qianzhicangkucun | icon-lingquseka | icon-gouwu1 | icon-dingdan1 | icon-gerenzhongxin1 | icon-shouye1 | icon-gerenzhongxin | icon-dingdan | icon-shouye | icon-gouwu
name: {
type: String,
},
diff --git a/src/components/iconfont/weapp/weapp.wxml b/src/components/iconfont/weapp/weapp.wxml
index 9d62d6c..e28ef75 100644
--- a/src/components/iconfont/weapp/weapp.wxml
+++ b/src/components/iconfont/weapp/weapp.wxml
@@ -1,3 +1,99 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/layoutBlock/index.tsx b/src/components/layoutBlock/index.tsx
index 057c0fe..3958048 100644
--- a/src/components/layoutBlock/index.tsx
+++ b/src/components/layoutBlock/index.tsx
@@ -1,6 +1,6 @@
import { View } from '@tarojs/components'
import { FC, ReactNode } from 'react'
-import classnames from 'classname'
+import classnames from 'classnames'
import styles from './index.module.scss'
type FlexDirection = 'row' | 'col'
diff --git a/src/components/normalButton/index.module.scss b/src/components/normalButton/index.module.scss
index f5beb07..bbf8714 100644
--- a/src/components/normalButton/index.module.scss
+++ b/src/components/normalButton/index.module.scss
@@ -1,37 +1,69 @@
.button {
+ $current_color: #fff;
display: flex;
- padding: 0 40px;
- height: 36PX;
- border: 1px solid $color_main;
- background-color: #fff;
- text-align: center;
flex-flow: row nowrap;
justify-content: center;
align-items: center;
+ padding: 0 80px;
+ height: 72px;
+ border: 1px solid $color_main;
+ background-color: #fff;
+ text-align: center;
+ color: #fff;
&--normal {
- height: 36PX;
+ height: 72px;
font-size: $font_size_medium;
}
&--small {
- height: 30PX;
+ height: 60px;
font-size: $font_size_min;
}
&--disabled {
opacity: $opacity-disabled;
}
+ // 按钮类型
&--primary {
border: 1px solid $color_main;
color: $color_main;
+ $current_color: $color_main;
}
&--danger {
border: 1px solid $color_danger;
color: $color_danger;
+ $current_color: $color_danger;
}
&--warning {
border: 1px solid $color_warning;
color: $color_warning;
+ $current_color: $color_warning;
}
- &--circle {
+ &--round {
border-radius: 50px;
}
+ &--circle {
+ border-radius: 16px;
+ }
+ &--plain {
+ background-color: currentColor;
+ border-color: currentColor;
+ .button--text {
+ color: #fff;
+ }
+ }
+ &--text {
+ color: currentColor;
+ }
+ // active 伪类
+ &--primary:active {
+ background-color: rgba($color: $color_main, $alpha: 0.5);
+ color: #fff;
+ }
+ &--danger:active {
+ background-color: rgba($color: $color_danger, $alpha: 0.5);
+ color: #fff;
+ }
+ &--warning:active {
+ background-color: rgba($color: $color_warning, $alpha: 0.5);
+ color: #fff;
+ }
}
diff --git a/src/components/normalButton/index.tsx b/src/components/normalButton/index.tsx
index 89a22a3..bf06a18 100644
--- a/src/components/normalButton/index.tsx
+++ b/src/components/normalButton/index.tsx
@@ -1,4 +1,4 @@
-import { View } from '@tarojs/components'
+import { View, Text } from '@tarojs/components'
import { FC, ReactNode } from 'react'
import classnames from 'classnames'
import styles from './index.module.scss'
@@ -9,21 +9,38 @@ type ButtonSize = 'normal' | 'small'
interface PropsType {
size?: ButtonSize
type?: ButtonType
- circle?: boolean
+ round?: boolean
disabled?: boolean
+ plain?: boolean
+ circle?: boolean
children?: ReactNode
onClick?: Function
+ customClassName?: string
+ customStyles?: React.CSSProperties
}
-const NormalButton: FC = ({ type = 'primary', size = 'normal', circle = false, disabled = false, children, onClick }) => {
+const NormalButton: FC = (props) => {
+ const {
+ type = 'primary',
+ size = 'normal',
+ round = false,
+ disabled = false,
+ children,
+ onClick,
+ plain = false,
+ circle = false,
+ customStyles = {},
+ customClassName = '',
+ } = props
const getClassName = () => {
const classObject = {
[styles[`button--disabled`]]: disabled,
[styles[`button--${size}`]]: size,
[styles[`button--${type}`]]: type,
+ [styles['button--round']]: round,
+ [styles['button--plain']]: plain,
[styles['button--circle']]: circle,
}
- console.log('classObj==>button', classObject)
return classObject
}
@@ -35,8 +52,8 @@ const NormalButton: FC = ({ type = 'primary', size = 'normal', circle
}
return (
-
- {children}
+
+ {children}
)
}
diff --git a/src/constants/userInfo.ts b/src/constants/userInfo.ts
index 14f529a..47eab5f 100644
--- a/src/constants/userInfo.ts
+++ b/src/constants/userInfo.ts
@@ -1,11 +1,25 @@
-export const SET_USERINFO = 'setUserInfo'
-export const SET_ADMINUSERINFO = 'setAdminUserInfo'
-export const SET_TOKEN = 'setToken'
-export const SET_SESSIONKEY = 'setSessionkey'
-export const SET_SORTCODE = 'setSortCode'
-export const CLEAR_TOKEN = 'clearToken'
-export const CLEAR_SESSIONKEY = 'clearSessionkey'
-export const CLEAR_USERINFO = 'clearUserInfo'
-export const CLEAR_ADMINUSERINFO = 'clearAdminUserInfo'
-export const CLEAR_SORTCODE = 'clearSortCode'
-export const LOGIN_STATUS = 'loginStatus'
\ No newline at end of file
+// export const SET_USERINFO = 'setUserInfo'
+// export const SET_ADMINUSERINFO = 'setAdminUserInfo'
+// export const SET_TOKEN = 'setToken'
+// export const SET_SESSIONKEY = 'setSessionkey'
+// export const SET_SORTCODE = 'setSortCode'
+// export const CLEAR_TOKEN = 'clearToken'
+// export const CLEAR_SESSIONKEY = 'clearSessionkey'
+// export const CLEAR_USERINFO = 'clearUserInfo'
+// export const CLEAR_ADMINUSERINFO = 'clearAdminUserInfo'
+// export const CLEAR_SORTCODE = 'clearSortCode'
+// export const LOGIN_STATUS = 'loginStatus'
+
+export const enum UserInfoActionType {
+ SET_USERINFO = 'setUserInfo',
+ SET_ADMINUSERINFO = 'setAdminUserInfo',
+ SET_TOKEN = 'setToken',
+ SET_SESSIONKEY = 'setSessionkey',
+ SET_SORTCODE = 'setSortCode',
+ CLEAR_TOKEN = 'clearToken',
+ CLEAR_SESSIONKEY = 'clearSessionkey',
+ CLEAR_USERINFO = 'clearUserInfo',
+ CLEAR_ADMINUSERINFO = 'clearAdminUserInfo',
+ CLEAR_SORTCODE = 'clearSortCode',
+ LOGIN_STATUS = 'loginStatus',
+}
diff --git a/src/custom-tab-bar/index.tsx b/src/custom-tab-bar/index.tsx
index 539b268..1257395 100644
--- a/src/custom-tab-bar/index.tsx
+++ b/src/custom-tab-bar/index.tsx
@@ -2,7 +2,7 @@ import { CoverImage, View } from '@tarojs/components'
import { FC, useMemo, useState } from 'react'
import styles from './index.module.scss'
import IconFont from '@/components/iconfont'
-import classname from 'classname'
+import classname from 'classnames'
import Taro, { useDidShow, useRouter } from '@tarojs/taro'
import { useSelector } from '@/reducers/hooks'
import { useDispatch } from 'react-redux'
@@ -25,8 +25,6 @@ type TabBarIndexMap = {
const CustomTabBar: FC = () => {
console.log('重新渲染')
-
-
const { selectedId, tabItem } = useSelector((state) => {
console.log('sdfasdfa', state)
return state.tabBarData
diff --git a/src/pages/addAddress/index.config.ts b/src/pages/addAddress/index.config.ts
new file mode 100644
index 0000000..6fc5ca2
--- /dev/null
+++ b/src/pages/addAddress/index.config.ts
@@ -0,0 +1,3 @@
+export default {
+ navigationBarTitleText: '新增地址',
+ }
\ No newline at end of file
diff --git a/src/pages/addAddress/index.module.scss b/src/pages/addAddress/index.module.scss
new file mode 100644
index 0000000..4c6a516
--- /dev/null
+++ b/src/pages/addAddress/index.module.scss
@@ -0,0 +1,207 @@
+.main {
+ background: #FFFFFF;
+ border-radius: 16px;
+ margin: 24px;
+ padding: 40px 32px 50px 32px;
+
+
+ .itemBox {
+ display: flex;
+ align-items: center;
+ padding-bottom: 40px;
+ border-bottom: 1px solid #f7f7f7;
+ margin-bottom: 40px;
+
+
+
+ .leftBox {
+ font-size: 28px;
+ font-family: PingFangSC-Medium, PingFang SC;
+ font-weight: 500;
+ color: #000000;
+ display: flex;
+ align-items: center;
+ margin-right: 50px;
+ }
+
+ .inputClass {
+ font-size: 28px;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #000000;
+ }
+
+
+ }
+
+
+
+}
+
+.itemBox:first-child {
+ display: flex;
+ align-items: center;
+ padding-bottom: 40px;
+ border-bottom: 1px solid #f7f7f7;
+ margin-bottom: 40px;
+
+ .leftBox {
+ font-size: 28px;
+ font-family: PingFangSC-Medium, PingFang SC;
+ font-weight: 500;
+ color: #000000;
+ display: flex;
+ align-items: center;
+ padding-right: 25px;
+ }
+
+ .inputClass {
+ font-size: 28px;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #000000;
+ }
+}
+
+.itemBox:last-child {
+ display: flex;
+ align-items: center;
+ padding-bottom: 40px;
+ margin-bottom: 40px;
+ border-bottom: none;
+
+
+ .leftBox {
+ font-size: 28px;
+ font-family: PingFangSC-Medium, PingFang SC;
+ font-weight: 500;
+ color: #000000;
+ display: flex;
+ align-items: center;
+ margin-right: 50px;
+ }
+
+ .inputClass {
+ font-size: 28px;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #000000;
+ }
+
+}
+
+.checkBox {
+ margin-left: 32px;
+ margin-top: 24px;
+ width: 702px;
+ height: 120px;
+ background: #FFFFFF;
+ border-radius: 16px;
+ overflow: hidden;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+
+ .leftCheck {
+ margin-left: 32px;
+
+ .topFont {
+ margin-top: 24px;
+ font-size: 28px;
+ font-family: PingFangSC-Medium, PingFang SC;
+ font-weight: 500;
+ color: #000000;
+ }
+
+ .bottomFont {
+ margin-top: 8px;
+ font-size: 24px;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #000000;
+ }
+ }
+
+
+
+}
+
+.bottomBox {
+ width: 750px;
+ height: 160px;
+ background: #FFFFFF;
+ bottom: 0;
+ padding-top: 14px;
+ position: fixed;
+ display: flex;
+
+ .btn {
+ margin-left: 32px;
+ width: 702px;
+ height: 80px;
+ background: #337FFF;
+ border-radius: 44px;
+ opacity: 0.5;
+ font-size: 28px;
+ font-family: PingFangSC-Medium, PingFang SC;
+ font-weight: 500;
+ color: #FFFFFF;
+ text-align: center;
+ line-height: 80px;
+ }
+
+ .adtiveBtns {
+ margin-left: 32px;
+ width: 702px;
+ height: 80px;
+ background: #337FFF;
+ border-radius: 44px;
+ font-size: 28px;
+ font-family: PingFangSC-Medium, PingFang SC;
+ font-weight: 500;
+ color: #FFFFFF;
+ text-align: center;
+ line-height: 80px;
+ }
+
+ .delectBox {
+ width: 311px;
+ height: 80px;
+ border-radius: 44px;
+ border: 1px solid #087EFF;
+ margin-left: 48px;
+ font-size: 28px;
+ font-family: PingFangSC-Medium, PingFang SC;
+ font-weight: 500;
+ color: #337FFF;
+ text-align: center;
+ line-height: 80px;
+ }
+
+ .nobtn {
+ width: 311px;
+ height: 80px;
+ background: #337FFF;
+ border-radius: 44px;
+ opacity: 0.5;
+ margin-left: 32px;
+ text-align: center;
+ line-height: 80px;
+ font-size: 28px;
+ color: FFFFFF;
+ }
+
+ .sureBox {
+ width: 311px;
+ height: 80px;
+ background: #337FFF;
+ border-radius: 44px;
+ font-size: 28px;
+ font-family: PingFangSC-Medium, PingFang SC;
+ font-weight: 500;
+ color: #FFFFFF;
+ margin-left: 32px;
+ text-align: center;
+ line-height: 80px;
+ }
+}
\ No newline at end of file
diff --git a/src/pages/addAddress/index.tsx b/src/pages/addAddress/index.tsx
new file mode 100644
index 0000000..2b830b4
--- /dev/null
+++ b/src/pages/addAddress/index.tsx
@@ -0,0 +1,289 @@
+import { alert, retrieval } from "@/common/common"
+import Address from "@/components/address"
+import FromList from "@/components/FromList"
+import { Button, Input, Text, Textarea, View, Switch } from "@tarojs/components"
+import Taro, { setNavigationBarTitle, useDidShow, useRouter, showToast } from "@tarojs/taro"
+import { useEffect, useMemo, useState } from "react"
+import styles from "./index.module.scss"
+import classnames from "classnames";
+import { mppurchaseraddress, mppurchaseraddressget, mppurchaseraddressput } from '@/api/addressList'
+import { getFilterData } from '@/common/util'
+import search from "@/components/search"
+
+export default () => {
+
+ const [itemList, setItemList] = useState(
+ [
+ {
+ title: '联系人',
+ require: true,
+ placeholderFont: '请输入收货人姓名',
+ type: 'text',
+ value: '',
+ },
+ {
+ title: '联系方式',
+ require: true,
+ placeholderFont: '请输入联系方式',
+ type: 'number',
+ value: '',
+ maxLength: 11
+ },
+ {
+ title: '收货地址',
+ require: true,
+ placeholderFont: '请选择/省/市/区',
+ type: 'select',
+ disabled: true,
+ value: '',
+ },
+ {
+ title: '详细地址',
+ require: true,
+ placeholderFont: '请输入详细地址(街道、门牌号等)',
+ type: 'text',
+ value: '',
+ }
+ ]
+ )
+
+ const [ischecked, setIsChecked] = useState(false)
+ const onChange = (eq) => {
+ setIsChecked(eq.detail.value)
+ setFormData((e) => ({ ...e, is_default: eq.detail.value, address_detail: itemList[3].value }))
+ }
+
+ const router = useRouter()
+ useDidShow(() => {
+ if (router.params.type === 'add') {
+ setNavigationBarTitle({ title: "新增收货地址" })
+ } else {
+ setFormData((e) => ({ ...e, id: router.params.id as any }))
+ getInfo()
+ setNavigationBarTitle({ title: "编辑收货地址" })
+ }
+ })
+ const [formData, setFormData] = useState({
+ name: "",
+ phone: "",
+ site: "",
+ siteArray: [],
+ district_id: "",
+ address_detail: "",
+ is_default: false,
+ id: '',
+ })
+ //获取相应id的信息
+ const { fetchData: infoFetch } = mppurchaseraddressget()
+ const getInfo = async () => {
+ let res = await infoFetch({
+ id: router.params.id,
+ })
+ if (res.data) {
+ let arr: any[] = []
+ arr = [
+ { id: res.data.province_id, name: res.data.province_name },
+ { id: res.data.city_id, name: res.data.city_name },
+ { id: res.data.district_id, name: res.data.district_name }
+ ]
+ setFormData({
+ name: res.data.name,
+ phone: res.data.phone,
+ site: res.data.province_name + res.data.city_name + res.data.district_name,
+ siteArray: arr as any,
+ address_detail: res.data.address_detail,
+ district_id: res.data.district_id,
+ is_default: res.data.is_default,
+ id: res.data.id,
+ // purchaser_id: res.data.purchaser_id
+ })
+
+ itemList.map(item => {
+ if (item.title === '联系人') {
+ item.value = res.data.name
+ }
+ if (item.title === '联系方式') {
+ item.value = res.data.phone
+ }
+ if (item.title === '收货地址') {
+ item.value = res.data.province_name, res.data.city_name, res.data.district_name
+ }
+ if (item.title === '详细地址') {
+ item.value = res.data.address_detail
+ }
+ return item
+ })
+ setItemList([...itemList])
+ setIsChecked(res.data.is_default)
+ }
+
+ }
+ // `${res.data.province_name} + ${res.data.city_name} + ${res.data.district_name}`
+
+
+ const btnDisabled = useMemo(() => {
+ let canShow = false
+ const obj = itemList.filter(item => {
+ return item.value !== ''
+ })
+ if (obj.length !== 4) {
+ canShow = true
+ } else {
+ canShow = false
+ }
+ return canShow
+ }, [itemList])
+
+ const [showSiteModal, setShowSiteModal] = useState(false);
+
+ const handleSetSite = (ev: any) => {
+ var addressName: any = []
+ ev.forEach(v => {
+ addressName.push(v.name)
+ })
+ if (ev.length === 3) {
+ itemList.map(it => {
+ if (it.type === 'select') {
+ it.value = addressName
+ }
+ return it
+ })
+ setItemList([...itemList])
+ setShowSiteModal(false)
+
+ }
+ setFormData({
+ name: itemList[0]?.value,
+ phone: itemList[1]?.value,
+ site: addressName.join(' '),
+ district_id: ev[ev.length - 1]?.id,
+ is_default: ischecked,
+ address_detail: itemList[3]?.value,
+ id: router.params.id ? router.params.id : '',
+ siteArray: ev
+ })
+
+ }
+
+ useEffect(() => {
+ setFormData(formData)
+ }, [formData])
+
+ useEffect(() => {
+ setItemList(itemList)
+ }, [itemList])
+ const onClose = () => {
+ setShowSiteModal(false)
+ }
+
+ const changeInput = (e, item) => {
+ itemList.map(it => {
+ if (it.title === item.title) {
+ it.value = e.detail.value
+ }
+ return it
+ })
+ setItemList([...itemList])
+ setFormData((e) => ({ ...e, name: itemList[0].value, phone: itemList[1].value, address_detail: itemList[3].value }))
+
+ }
+
+
+ const showModal = (item) => {
+ if (item.type === 'select') {
+ setShowSiteModal(true)
+ }
+
+ }
+
+ const navBack = () => {
+ Taro.navigateBack({
+ delta: 1
+ })
+ }
+ //新增地址
+ const { fetchData: addAddressFetch } = mppurchaseraddress()
+ const handAdd = async () => {
+ let res = await addAddressFetch({ ...getFilterData(formData), purchaser_id: Number(router.params.purchaser_id) })
+ if (res.data) {
+ Taro.showToast({
+ title: '成功',
+ icon: "none"
+ })
+ navBack()
+ } else {
+ Taro.showToast({
+ title: res.msg
+ })
+ }
+ }
+
+ // 编辑地址
+ const { fetchData: putFetch } = mppurchaseraddressput()
+ const handEdit = async () => {
+ let res = await putFetch({ ...getFilterData(formData), purchaser_id: Number(router.params.purchaser_id), id: Number(router.params.purchaser_id) })
+ if (res.msg === 'success') {
+ Taro.showToast({
+ title: '成功',
+ icon: "none"
+ })
+ navBack()
+ } else {
+ Taro.showToast({
+ title: res.msg
+ })
+ }
+ }
+ return (
+ <>
+
+ {itemList.map((item, index) => {
+ return (
+
+
+ {item.title}*
+
+ changeInput(e, item)}
+ type={item.type}
+ onClick={() => showModal(item)}
+ style={{ width: '212px' }}
+ disabled={item.disabled}
+ placeholder={item.placeholderFont}
+ value={item.value}
+ className={styles.inputClass}
+ placeholderStyle='font-size: 28rpx;color: #000000;'
+ >
+
+ )
+ })}
+
+
+
+
+
+ 设置默认地址
+ 提醒:下单会优先使用该地址
+
+ { onChange(e) }} />
+
+
+ {
+ router.params.type === 'add' &&
+
+
+
+ }
+ {
+ router.params.type === 'edit' &&
+
+
+
+
+ }
+ onClose()} show={showSiteModal} />
+
+ >
+ )
+}
\ No newline at end of file
diff --git a/src/pages/addressManager/index.tsx b/src/pages/addressManager/index.tsx
index a0ef657..64c258b 100644
--- a/src/pages/addressManager/index.tsx
+++ b/src/pages/addressManager/index.tsx
@@ -5,10 +5,10 @@ import { stopPullDownRefresh, usePullDownRefresh } from "@tarojs/taro"
import { useState } from "react"
import "./index.scss"
-export default ()=>{
+export default () => {
return (
- {/* */}
+
)
}
\ No newline at end of file
diff --git a/src/pages/login/index.config.ts b/src/pages/login/index.config.ts
new file mode 100644
index 0000000..044b7e5
--- /dev/null
+++ b/src/pages/login/index.config.ts
@@ -0,0 +1,3 @@
+export default {
+ navigationBarTitleText: '登录',
+}
diff --git a/src/pages/login/index.module.scss b/src/pages/login/index.module.scss
new file mode 100644
index 0000000..688e86f
--- /dev/null
+++ b/src/pages/login/index.module.scss
@@ -0,0 +1,93 @@
+page {
+ height: 100vh;
+}
+.login {
+ width: 100%;
+ height: 100%;
+ background-color: white;
+ &-panel {
+ padding: 0 48px;
+ }
+ &-title {
+ margin-left: 11px;
+ Text {
+ display: block;
+ &:first-child {
+ font-size: 70px;
+ font-weight: 500;
+ color: $color_font_one;
+ }
+ &:last-child {
+ font-size: 40px;
+ color: #727272;
+ font-weight: 500;
+ line-height: 2;
+ }
+ }
+ }
+ .input-bar {
+ display: flex;
+ flex-flow: row nowrap;
+ align-items: center;
+ border: 1px solid #c2c2c2;
+ border-radius: 12px;
+ margin-top: 40px;
+ padding: 20px;
+ font-size: 40px;
+ @mixin inputBaseStyle {
+ display: block;
+ width: 100%;
+ flex: 1 1 auto;
+ padding-left: 20px;
+ font-size: 32px;
+ padding-right: 0;
+ }
+ &--account {
+ @include inputBaseStyle;
+ }
+ &--password {
+ @include inputBaseStyle;
+ }
+ }
+ &-options {
+ display: flex;
+ flex-flow: row nowrap;
+ justify-content: space-between;
+ align-items: center;
+ padding: 0 10px;
+ }
+ &-option {
+ display: flex;
+ flex-flow: row nowrap;
+ align-items: center;
+ margin-top: 40px;
+ font-size: 26px;
+ color: #909090;
+ }
+ &-button {
+ margin-top: 120px;
+ }
+}
+.isRememberPwd {
+ display: block;
+ margin-left: 10px;
+}
+.isForgetPwd {
+ margin: 0 20px;
+}
+.quick-login {
+ margin-top: 85px;
+ &--options {
+ display: flex;
+ flex-flow: row nowrap;
+ justify-content: center;
+ align-items: center;
+ }
+ &--divider{
+ font-size: 25px;
+ color: #acacac;
+ }
+ &--iconCard{
+ color: #acacac;
+ }
+}
diff --git a/src/pages/login/index.tsx b/src/pages/login/index.tsx
new file mode 100644
index 0000000..efb0c12
--- /dev/null
+++ b/src/pages/login/index.tsx
@@ -0,0 +1,141 @@
+import Divider from '@/components/divider'
+import IconFont from '@/components/iconfont'
+import { View, Image, Text, Input } from '@tarojs/components'
+import { FC, useState } from 'react'
+import styles from './index.module.scss'
+import MCheckbox from '@/components/checkbox'
+import NormalButton from '@/components/normalButton'
+import IconCard from '@/components/iconCard'
+import {memo} from 'react'
+import { LoginApi } from '@/api'
+import Taro from '@tarojs/taro'
+import { alert } from '@/common/common'
+import useUserInfo from '@/use/useUserInfo'
+
+const Login: FC = () => {
+ const [isRemember, setRemember] = useState(false)
+
+ const [eyesStatus, setEyesStatus] = useState(true)
+
+ const handlePwdVisible = () => {
+ setEyesStatus((value) => !value)
+ }
+
+ const selectCallBack = () => {
+ console.log('selectCallBack')
+ setRemember(true)
+ }
+ const closeCallBack = () => {
+ setRemember(false)
+ console.log('closeCallBack')
+ }
+
+ const [account, setAccount] = useState('')
+ const [password, setPassword] = useState('')
+
+ const formatInput = (value:string) => {
+ return value.trim()
+ }
+
+ const handleInputAccount = (event: any) => {
+ const formated = formatInput(event.detail.value)
+ setAccount(formated)
+ }
+ const handleInputPassword = (event: any) => {
+ const formated = formatInput(event.detail.value)
+ setPassword(formated)
+ }
+
+ const { setToken, setUserInfo } = useUserInfo()
+
+
+
+ const { fetchData } = LoginApi()
+
+
+
+
+ const handleLogin = async () => {
+ if (account === '' || password === '') return alert.error('账号密码不能为空!')
+ console.log('账户密码:', account, password)
+ const res = await fetchData({
+ account,
+ password,
+ })
+ console.log('state===>', res)
+ if (res.success) {
+ alert.success('登陆成功')
+ setToken(res.data.token)
+ setUserInfo({ ...res.data })
+
+ Taro.redirectTo({
+ url: '/pages/index/index',
+ })
+ } else {
+ alert.error('登陆失败')
+ }
+ }
+
+ return (
+
+
+
+
+ 您好,
+ 欢迎来到蜘蛛管家
+
+
+
+
+
+
+
+
+
+
+
+ {!eyesStatus ? (
+
+ ) : (
+
+ )}
+
+
+
+
+
+ 记住密码
+
+
+
+ 忘记密码?
+
+
+
+ 登录
+
+
+
+
+ )
+}
+
+const QuickLogin: FC = memo(() => {
+ return (
+
+
+ 或通过以下方式登录
+
+
+
+
+
+ )
+})
+
+export default Login
diff --git a/src/pages/order/index.module.scss b/src/pages/order/index.module.scss
index dcfff37..14d39ae 100644
--- a/src/pages/order/index.module.scss
+++ b/src/pages/order/index.module.scss
@@ -135,7 +135,7 @@
.saomiao {
margin-right: 24px;
- font-size: 26px;
+ font-size: 40px;
color: #000;
}
}
diff --git a/src/pages/user/index.module.scss b/src/pages/user/index.module.scss
index a1f1daf..66c0f14 100644
--- a/src/pages/user/index.module.scss
+++ b/src/pages/user/index.module.scss
@@ -86,7 +86,7 @@ page{
.layoutTitle {
font-size: 32px;
font-weight: 600;
- color: #333;
+ color: $color_font_one;
font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
margin-bottom: 20px;
diff --git a/src/pages/user/index.tsx b/src/pages/user/index.tsx
index 74a38c7..1564ce4 100644
--- a/src/pages/user/index.tsx
+++ b/src/pages/user/index.tsx
@@ -1,6 +1,5 @@
-import { isEmptyObject } from '@/common/common'
-import { Button, View, Image, Text } from '@tarojs/components'
-import { FC, memo, useMemo, useState } from 'react'
+import { View, Image, Text } from '@tarojs/components'
+import { FC, useState } from 'react'
import styles from './index.module.scss'
import defaultAvatar from '../../styles/image/defaultAvatar.png'
import NormalButton from '@/components/normalButton'
@@ -9,6 +8,8 @@ import Divider from '@/components/Divider'
import LayoutBlock from '@/components/layoutBlock'
import IconCard from '@/components/iconCard'
import IconFont from '@/components/iconfont'
+import useUserInfo from '@/use/useUserInfo'
+import { goLink } from '@/common/common'
type IconfontName = Parameters['0']['name']
type IconCardType = {
@@ -19,11 +20,13 @@ type IconCardType = {
// 用户信息
const UserInfo: FC = () => {
- const [userInfo, setUserInfo] = useState({
- avatarUrl: '',
- username: '',
- userno: '',
- })
+ const { removeToken, removeUserInfo, userInfo } = useUserInfo()
+ console.log('userInfo==>', userInfo)
+ // const [userInfo, setUserInfo] = useState({
+ // avatarUrl: '',
+ // username: '',
+ // userno: '',
+ // })
const feature: IconCardType[] = [
@@ -63,7 +66,7 @@ const UserInfo: FC = () => {
path: '',
},
{
- iconName: 'icon-shoukuanliebiao',
+ iconName: 'icon-kehuxinxi',
name: '客户列表',
path: '',
},
@@ -110,21 +113,27 @@ const UserInfo: FC = () => {
},
]
- const handleLogout = () => {}
+
+ // 退出登录
+ const handleLogout = () => {
+ removeToken()
+ removeUserInfo()
+ goLink('/pages/login/index', {}, 'reLaunch')
+ }
return (
<>
-
+
- 杨子杰
- 064
+ {userInfo.userInfo.user_name}
+ {userInfo.userInfo.user_code}
-
+
退出登录
@@ -161,13 +170,6 @@ const UserInfo: FC = () => {
})}
- {/*
-
- 客户列表
- 查看全部客户 ▶
-
- asdfasdfasdfas
- */}
>
)
}
diff --git a/src/reducers/commonData.ts b/src/reducers/commonData.ts
index fde1ee4..75d22dc 100644
--- a/src/reducers/commonData.ts
+++ b/src/reducers/commonData.ts
@@ -19,7 +19,7 @@ const INIT = {
shopCount: Taro.getStorageSync(STORAGE_SHOPCOUNT)?JSON.parse(Taro.getStorageSync(STORAGE_SHOPCOUNT)).shopCount:0,
}
-export default function counter (state = INIT, action: Action) {
+export default (state = INIT, action: Action) => {
const {type, data} = action
switch (type) {
case SET_SHOPCOUNT:
@@ -31,4 +31,4 @@ export default function counter (state = INIT, action: Action) {
default:
return state
}
-}
\ No newline at end of file
+}
diff --git a/src/reducers/hooks.ts b/src/reducers/hooks.ts
index ccc4573..02e2714 100644
--- a/src/reducers/hooks.ts
+++ b/src/reducers/hooks.ts
@@ -5,7 +5,7 @@ import { DataParam as userInfoParam } from './userInfo';
import { DataParam as commonDataParam } from './commonData';
import { TabBarData as tabbarDataParam } from './tabBar';
type Params = {
- userInfo: userInfoParam
+ userInfoData: userInfoParam
commonData: commonDataParam
tabBarData: tabbarDataParam
}
diff --git a/src/reducers/index.ts b/src/reducers/index.ts
index f5294cc..9ea8aed 100644
--- a/src/reducers/index.ts
+++ b/src/reducers/index.ts
@@ -1,10 +1,10 @@
import { combineReducers } from 'redux'
-import userInfo from './userInfo'
+import userInfoData from './userInfo'
import commonData from './commonData'
import tabBarReducer from './tabBar'
export type Reducers = {
- userInfo: typeof userInfo
+ userInfoData: typeof userInfoData
commonData: typeof commonData
tabBarData: typeof tabBarReducer
}
@@ -12,7 +12,7 @@ export type Reducers = {
export type ReducersKey = keyof Reducers
export default combineReducers({
- userInfo,
+ userInfoData,
commonData,
tabBarData: tabBarReducer,
})
diff --git a/src/reducers/userInfo.ts b/src/reducers/userInfo.ts
index 9edaa36..7493051 100644
--- a/src/reducers/userInfo.ts
+++ b/src/reducers/userInfo.ts
@@ -1,31 +1,18 @@
import Taro from '@tarojs/taro'
-import {
- SET_USERINFO,
- SET_ADMINUSERINFO,
- SET_TOKEN,
- SET_SESSIONKEY,
- SET_SORTCODE,
- CLEAR_TOKEN,
- CLEAR_USERINFO,
- CLEAR_SESSIONKEY,
- CLEAR_ADMINUSERINFO,
- CLEAR_SORTCODE,
- LOGIN_STATUS
-} from '../constants/userInfo'
+import { UserInfoActionType } from '../constants/userInfo'
export type UserParam = {
- nickName?:string,
- phone?:string,
- avatarUrl?:string,
- city?: string,
- country?: string,
- province?: string,
- gender?: number,
- language?: string,
- timestamp?: number,
- physical_warehouse?: number,
- physical_warehouse_name?: string,
+ department_code?: string
+ department_id?: string
+ department_name?: string
+ physical_warehouse?: number
+ physical_warehouse_name?: string
+ token?: string
+ user_code?: number
+ user_id?: string
+ user_name?: number
+ avatar_url?: string
}
export type UserAdminParam = {
@@ -38,8 +25,8 @@ export type UserAdminParam = {
user_id?: number,
user_name?: string,
wechat_user_open_id?: number
- is_authorize_name?: false|true,
- is_authorize_phone?: false|true,
+ is_authorize_name?: boolean,
+ is_authorize_phone?: boolean,
phone?:string,
authentication_status?:number,
authentication_status_name: string,
@@ -64,11 +51,11 @@ export type DataParam = {
userInfo: UserParam,
adminUserInfo: UserAdminParam,
sort_code: SortCodeParam
- logingStatus?: false //登录状态 true 正在登录
+ logingStatus?: boolean //登录状态 true 正在登录
}
-type Action = {
- type?: string,
+export type UserInfoAction = {
+ type: UserInfoActionType
data?: DataParam
}
@@ -82,42 +69,42 @@ const INIT_USER = {
logingStatus: false
}
-export default function counter (state = INIT_USER, action: Action) {
- const {type, data} = action
- switch (type) {
- case SET_USERINFO:
- Taro.setStorageSync('userInfo',JSON.stringify(data?.userInfo))
- return {...state,...data}
- case SET_ADMINUSERINFO:
- Taro.setStorageSync('adminUserInfo',JSON.stringify(data?.adminUserInfo))
- return {...state,...data}
- case SET_TOKEN:
- Taro.setStorageSync('token',data?.token)
- return {...state,...data}
- case SET_SESSIONKEY:
- Taro.setStorageSync('session_key',data?.session_key)
- return {...state,...data}
- case SET_SORTCODE:
- Taro.setStorageSync('sort_code',JSON.stringify(data?.sort_code))
- return {...state,...data}
- case CLEAR_TOKEN:
- Taro.removeStorageSync('token')
- return {...state, token:''}
- case CLEAR_SESSIONKEY:
- Taro.removeStorageSync('session_key')
- return {...state, session_key:''}
- case CLEAR_USERINFO:
- Taro.removeStorageSync('userInfo')
- return {...state, userInfo: null}
- case CLEAR_ADMINUSERINFO:
- Taro.removeStorageSync('adminUserInfo')
- return {...state, adminUserInfo: null}
- case CLEAR_SORTCODE:
- Taro.removeStorageSync('sort_code')
- return {...state, sortCode: null}
- case LOGIN_STATUS:
- return {...state, ...data}
- default:
- return state
- }
-}
\ No newline at end of file
+export default (state = INIT_USER, action: UserInfoAction) => {
+ const { type, data } = action
+ switch (type) {
+ case UserInfoActionType.SET_USERINFO:
+ Taro.setStorageSync('userInfo', JSON.stringify(data?.userInfo))
+ return { ...state, ...data }
+ case UserInfoActionType.SET_ADMINUSERINFO:
+ Taro.setStorageSync('adminUserInfo', JSON.stringify(data?.adminUserInfo))
+ return { ...state, ...data }
+ case UserInfoActionType.SET_TOKEN:
+ Taro.setStorageSync('token', data?.token)
+ return { ...state, ...data }
+ case UserInfoActionType.SET_SESSIONKEY:
+ Taro.setStorageSync('session_key', data?.session_key)
+ return { ...state, ...data }
+ case UserInfoActionType.SET_SORTCODE:
+ Taro.setStorageSync('sort_code', JSON.stringify(data?.sort_code))
+ return { ...state, ...data }
+ case UserInfoActionType.CLEAR_TOKEN:
+ Taro.removeStorageSync('token')
+ return { ...state, token: '' }
+ case UserInfoActionType.CLEAR_SESSIONKEY:
+ Taro.removeStorageSync('session_key')
+ return { ...state, session_key: '' }
+ case UserInfoActionType.CLEAR_USERINFO:
+ Taro.removeStorageSync('userInfo')
+ return { ...state, userInfo: null }
+ case UserInfoActionType.CLEAR_ADMINUSERINFO:
+ Taro.removeStorageSync('adminUserInfo')
+ return { ...state, adminUserInfo: null }
+ case UserInfoActionType.CLEAR_SORTCODE:
+ Taro.removeStorageSync('sort_code')
+ return { ...state, sortCode: null }
+ case UserInfoActionType.LOGIN_STATUS:
+ return { ...state, ...data }
+ default:
+ return state
+ }
+}
diff --git a/src/use/useHttp.ts b/src/use/useHttp.ts
index efb08c0..5ff8104 100644
--- a/src/use/useHttp.ts
+++ b/src/use/useHttp.ts
@@ -122,6 +122,7 @@ export const useRequest = (
}
const stateRef = useRef({ ...params })
+ console.log('stateRef==>', stateRef)
const [state, setState] = useState({ ...stateRef.current })
const { removeToken, removeSessionKey, removeUserInfo } = useUserInfo()
const { login } = useLoginRequest()
@@ -152,11 +153,11 @@ export const useRequest = (
},
...(options.method?.toUpperCase() == 'GET'
? {
- data: stateRef.current.query,
- }
+ data: stateRef.current.query,
+ }
: {
- data: options.type?.toUpperCase() == 'FORMDATA' ? qs.stringify(stateRef.current.query) : stateRef.current.query,
- }),
+ data: options.type?.toUpperCase() == 'FORMDATA' ? qs.stringify(stateRef.current.query) : stateRef.current.query,
+ }),
}
const result = await Taro.request(q as any)
const { statusCode } = result
@@ -196,10 +197,11 @@ export const useRequest = (
}
stateRef.current.error = false
stateRef.current.loading = false
- setState(() => ({ ...stateRef.current }))
+ setState(() => ({...stateRef.current}))
+ console.log('request result stateRef', stateRef.current)
+ console.log('request result state', state)
return stateRef.current
}
-
return {
fetchData,
state,
diff --git a/src/use/useUserInfo.ts b/src/use/useUserInfo.ts
index e081bf2..a231136 100644
--- a/src/use/useUserInfo.ts
+++ b/src/use/useUserInfo.ts
@@ -1,40 +1,47 @@
-import { useDispatch, useSelector } from 'react-redux'
-import { CLEAR_SESSIONKEY, SET_USERINFO, SET_TOKEN, SET_SESSIONKEY, CLEAR_USERINFO, CLEAR_TOKEN, SET_ADMINUSERINFO, SET_SORTCODE } from '@/constants/userInfo'
-import { DataParam, UserParam, UserAdminParam, SortCodeParam } from '@/reducers/userInfo'
+import { useDispatch } from 'react-redux'
+import { UserInfoActionType } from '@/constants/userInfo'
+import { DataParam, UserParam, UserAdminParam, SortCodeParam, UserInfoAction } from '@/reducers/userInfo'
+import { Dispatch } from 'redux'
+import { useSelector } from '@/reducers/hooks'
export default () => {
- const userInfo = useSelector((state: DataParam) => state.userInfo) as DataParam
- const dispatch = useDispatch()
+ const userInfo = useSelector((state) => state.userInfoData)
+ const dispatch = useDispatch>()
const setToken = (token: string) => {
- dispatch({ type: SET_TOKEN, data: { token } })
+ // @ts-ignore
+ dispatch({ type: UserInfoActionType.SET_TOKEN, data: { token } })
}
const setSessionKey = (sessionkey: string) => {
- dispatch({ type: SET_SESSIONKEY, data: { session_key: sessionkey } })
+ // @ts-ignore
+ dispatch({ type: UserInfoActionType.SET_SESSIONKEY, data: { session_key: sessionkey } })
}
const setUserInfo = (userInfo: UserParam) => {
- dispatch({ type: SET_USERINFO, data: { userInfo } })
+ // @ts-ignore
+ dispatch({ type: UserInfoActionType.SET_USERINFO, data: { userInfo } })
}
const setAdminUserInfo = (adminUserInfo: UserAdminParam) => {
- dispatch({ type: SET_ADMINUSERINFO, data: { adminUserInfo } })
+ // @ts-ignore
+ dispatch({ type: UserInfoActionType.SET_ADMINUSERINFO, data: { adminUserInfo } })
}
const setSortCode = (sortCode: SortCodeParam) => {
- dispatch({ type: SET_SORTCODE, data: { sort_code: sortCode } })
+ // @ts-ignore
+ dispatch({ type: UserInfoActionType.SET_SORTCODE, data: { sort_code: sortCode } })
}
const removeUserInfo = () => {
- dispatch({ type: CLEAR_USERINFO })
+ dispatch({ type: UserInfoActionType.CLEAR_USERINFO })
}
const removeToken = () => {
- dispatch({ type: CLEAR_TOKEN })
+ dispatch({ type: UserInfoActionType.CLEAR_TOKEN })
}
const removeSessionKey = () => {
- dispatch({ type: CLEAR_SESSIONKEY })
+ dispatch({ type: UserInfoActionType.CLEAR_SESSIONKEY })
}
return {
diff --git a/yarn.lock b/yarn.lock
index 174e4d0..bb62e8c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17,10 +17,10 @@
dependencies:
"@babel/highlight" "^7.18.6"
-"@babel/compat-data@^7.12.1", "@babel/compat-data@^7.14.7", "@babel/compat-data@^7.17.7", "@babel/compat-data@^7.18.8":
- version "7.18.13"
- resolved "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.18.13.tgz#6aff7b350a1e8c3e40b029e46cbe78e24a913483"
- integrity sha512-5yUzC5LqyTFp2HLmDoxGQelcdYgSpP9xsnMWBphAscOdFrHSAVbLNzWiy32sVNDqJRDiJK6klfDnAgu6PAGSHw==
+"@babel/compat-data@^7.12.1", "@babel/compat-data@^7.14.7", "@babel/compat-data@^7.17.7", "@babel/compat-data@^7.18.8", "@babel/compat-data@^7.19.0":
+ version "7.19.0"
+ resolved "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.19.0.tgz#2a592fd89bacb1fcde68de31bee4f2f2dacb0e86"
+ integrity sha512-y5rqgTTPTmaF5e2nVhOxw+Ur9HDJLsWb6U/KpgUzRZEdPfE6VOubXBKLdbcUTijzRptednSBDQbYZBOSqJxpJw==
"@babel/core@7.12.3":
version "7.12.3"
@@ -45,20 +45,20 @@
source-map "^0.5.0"
"@babel/core@^7.11.1", "@babel/core@^7.14.0", "@babel/core@^7.14.5", "@babel/core@^7.8.0":
- version "7.18.13"
- resolved "https://registry.npmmirror.com/@babel/core/-/core-7.18.13.tgz#9be8c44512751b05094a4d3ab05fc53a47ce00ac"
- integrity sha512-ZisbOvRRusFktksHSG6pjj1CSvkPkcZq/KHD45LAkVP/oiHJkNBZWfpvlLmX8OtHDG8IuzsFlVRWo08w7Qxn0A==
+ version "7.19.0"
+ resolved "https://registry.npmmirror.com/@babel/core/-/core-7.19.0.tgz#d2f5f4f2033c00de8096be3c9f45772563e150c3"
+ integrity sha512-reM4+U7B9ss148rh2n1Qs9ASS+w94irYXga7c2jaQv9RVzpS7Mv1a9rnYYwuDa45G+DkORt9g6An2k/V4d9LbQ==
dependencies:
"@ampproject/remapping" "^2.1.0"
"@babel/code-frame" "^7.18.6"
- "@babel/generator" "^7.18.13"
- "@babel/helper-compilation-targets" "^7.18.9"
- "@babel/helper-module-transforms" "^7.18.9"
- "@babel/helpers" "^7.18.9"
- "@babel/parser" "^7.18.13"
+ "@babel/generator" "^7.19.0"
+ "@babel/helper-compilation-targets" "^7.19.0"
+ "@babel/helper-module-transforms" "^7.19.0"
+ "@babel/helpers" "^7.19.0"
+ "@babel/parser" "^7.19.0"
"@babel/template" "^7.18.10"
- "@babel/traverse" "^7.18.13"
- "@babel/types" "^7.18.13"
+ "@babel/traverse" "^7.19.0"
+ "@babel/types" "^7.19.0"
convert-source-map "^1.7.0"
debug "^4.1.0"
gensync "^1.0.0-beta.2"
@@ -83,12 +83,12 @@
"@jridgewell/gen-mapping" "^0.1.0"
jsesc "^2.5.1"
-"@babel/generator@^7.12.1", "@babel/generator@^7.17.10", "@babel/generator@^7.18.13":
- version "7.18.13"
- resolved "https://registry.npmmirror.com/@babel/generator/-/generator-7.18.13.tgz#59550cbb9ae79b8def15587bdfbaa388c4abf212"
- integrity sha512-CkPg8ySSPuHTYPJYo7IRALdqyjM9HCbt/3uOBEFbzyGVP6Mn8bwFPB0jX6982JVNBlYzM1nnPkfjuXSOPtQeEQ==
+"@babel/generator@^7.12.1", "@babel/generator@^7.17.10", "@babel/generator@^7.19.0":
+ version "7.19.0"
+ resolved "https://registry.npmmirror.com/@babel/generator/-/generator-7.19.0.tgz#785596c06425e59334df2ccee63ab166b738419a"
+ integrity sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg==
dependencies:
- "@babel/types" "^7.18.13"
+ "@babel/types" "^7.19.0"
"@jridgewell/gen-mapping" "^0.3.2"
jsesc "^2.5.1"
@@ -107,33 +107,33 @@
"@babel/helper-explode-assignable-expression" "^7.18.6"
"@babel/types" "^7.18.9"
-"@babel/helper-compilation-targets@^7.12.1", "@babel/helper-compilation-targets@^7.14.5", "@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9":
- version "7.18.9"
- resolved "https://registry.npmmirror.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz#69e64f57b524cde3e5ff6cc5a9f4a387ee5563bf"
- integrity sha512-tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg==
+"@babel/helper-compilation-targets@^7.12.1", "@babel/helper-compilation-targets@^7.14.5", "@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.19.0":
+ version "7.19.0"
+ resolved "https://registry.npmmirror.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.0.tgz#537ec8339d53e806ed422f1e06c8f17d55b96bb0"
+ integrity sha512-Ai5bNWXIvwDvWM7njqsG3feMlL9hCVQsPYXodsZyLwshYkZVJt59Gftau4VrE8S9IT9asd2uSP1hG6wCNw+sXA==
dependencies:
- "@babel/compat-data" "^7.18.8"
+ "@babel/compat-data" "^7.19.0"
"@babel/helper-validator-option" "^7.18.6"
browserslist "^4.20.2"
semver "^6.3.0"
-"@babel/helper-create-class-features-plugin@^7.10.4", "@babel/helper-create-class-features-plugin@^7.10.5", "@babel/helper-create-class-features-plugin@^7.12.1", "@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.18.9":
- version "7.18.13"
- resolved "https://registry.npmmirror.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.13.tgz#63e771187bd06d234f95fdf8bd5f8b6429de6298"
- integrity sha512-hDvXp+QYxSRL+23mpAlSGxHMDyIGChm0/AwTfTAAK5Ufe40nCsyNdaYCGuK91phn/fVu9kqayImRDkvNAgdrsA==
+"@babel/helper-create-class-features-plugin@^7.10.4", "@babel/helper-create-class-features-plugin@^7.10.5", "@babel/helper-create-class-features-plugin@^7.12.1", "@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.19.0":
+ version "7.19.0"
+ resolved "https://registry.npmmirror.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz#bfd6904620df4e46470bae4850d66be1054c404b"
+ integrity sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==
dependencies:
"@babel/helper-annotate-as-pure" "^7.18.6"
"@babel/helper-environment-visitor" "^7.18.9"
- "@babel/helper-function-name" "^7.18.9"
+ "@babel/helper-function-name" "^7.19.0"
"@babel/helper-member-expression-to-functions" "^7.18.9"
"@babel/helper-optimise-call-expression" "^7.18.6"
"@babel/helper-replace-supers" "^7.18.9"
"@babel/helper-split-export-declaration" "^7.18.6"
-"@babel/helper-create-regexp-features-plugin@^7.18.6":
- version "7.18.6"
- resolved "https://registry.npmmirror.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.18.6.tgz#3e35f4e04acbbf25f1b3534a657610a000543d3c"
- integrity sha512-7LcpH1wnQLGrI+4v+nPp+zUvIkF9x0ddv1Hkdue10tg3gmRnLy97DXh4STiOf1qeIInyD69Qv5kKSZzKD8B/7A==
+"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.19.0":
+ version "7.19.0"
+ resolved "https://registry.npmmirror.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz#7976aca61c0984202baca73d84e2337a5424a41b"
+ integrity sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==
dependencies:
"@babel/helper-annotate-as-pure" "^7.18.6"
regexpu-core "^5.1.0"
@@ -162,13 +162,13 @@
dependencies:
"@babel/types" "^7.18.6"
-"@babel/helper-function-name@^7.17.9", "@babel/helper-function-name@^7.18.9":
- version "7.18.9"
- resolved "https://registry.npmmirror.com/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz#940e6084a55dee867d33b4e487da2676365e86b0"
- integrity sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A==
+"@babel/helper-function-name@^7.17.9", "@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0":
+ version "7.19.0"
+ resolved "https://registry.npmmirror.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c"
+ integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==
dependencies:
- "@babel/template" "^7.18.6"
- "@babel/types" "^7.18.9"
+ "@babel/template" "^7.18.10"
+ "@babel/types" "^7.19.0"
"@babel/helper-hoist-variables@^7.16.7", "@babel/helper-hoist-variables@^7.18.6":
version "7.18.6"
@@ -198,19 +198,19 @@
dependencies:
"@babel/types" "^7.18.6"
-"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.18.9":
- version "7.18.9"
- resolved "https://registry.npmmirror.com/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz#5a1079c005135ed627442df31a42887e80fcb712"
- integrity sha512-KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g==
+"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.0":
+ version "7.19.0"
+ resolved "https://registry.npmmirror.com/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz#309b230f04e22c58c6a2c0c0c7e50b216d350c30"
+ integrity sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ==
dependencies:
"@babel/helper-environment-visitor" "^7.18.9"
"@babel/helper-module-imports" "^7.18.6"
"@babel/helper-simple-access" "^7.18.6"
"@babel/helper-split-export-declaration" "^7.18.6"
"@babel/helper-validator-identifier" "^7.18.6"
- "@babel/template" "^7.18.6"
- "@babel/traverse" "^7.18.9"
- "@babel/types" "^7.18.9"
+ "@babel/template" "^7.18.10"
+ "@babel/traverse" "^7.19.0"
+ "@babel/types" "^7.19.0"
"@babel/helper-optimise-call-expression@^7.18.6":
version "7.18.6"
@@ -219,10 +219,10 @@
dependencies:
"@babel/types" "^7.18.6"
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
- version "7.18.9"
- resolved "https://registry.npmmirror.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz#4b8aea3b069d8cb8a72cdfe28ddf5ceca695ef2f"
- integrity sha512-aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w==
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+ version "7.19.0"
+ resolved "https://registry.npmmirror.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz#4796bb14961521f0f8715990bee2fb6e51ce21bf"
+ integrity sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw==
"@babel/helper-remap-async-to-generator@^7.18.6", "@babel/helper-remap-async-to-generator@^7.18.9":
version "7.18.9"
@@ -282,14 +282,14 @@
integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==
"@babel/helper-wrap-function@^7.10.4", "@babel/helper-wrap-function@^7.18.9":
- version "7.18.11"
- resolved "https://registry.npmmirror.com/@babel/helper-wrap-function/-/helper-wrap-function-7.18.11.tgz#bff23ace436e3f6aefb61f85ffae2291c80ed1fb"
- integrity sha512-oBUlbv+rjZLh2Ks9SKi4aL7eKaAXBWleHzU89mP0G6BMUlRxSckk9tSIkgDGydhgFxHuGSlBQZfnaD47oBEB7w==
+ version "7.19.0"
+ resolved "https://registry.npmmirror.com/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz#89f18335cff1152373222f76a4b37799636ae8b1"
+ integrity sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg==
dependencies:
- "@babel/helper-function-name" "^7.18.9"
+ "@babel/helper-function-name" "^7.19.0"
"@babel/template" "^7.18.10"
- "@babel/traverse" "^7.18.11"
- "@babel/types" "^7.18.10"
+ "@babel/traverse" "^7.19.0"
+ "@babel/types" "^7.19.0"
"@babel/helpers@7.12.1":
version "7.12.1"
@@ -300,14 +300,14 @@
"@babel/traverse" "^7.12.1"
"@babel/types" "^7.12.1"
-"@babel/helpers@^7.12.1", "@babel/helpers@^7.18.9":
- version "7.18.9"
- resolved "https://registry.npmmirror.com/@babel/helpers/-/helpers-7.18.9.tgz#4bef3b893f253a1eced04516824ede94dcfe7ff9"
- integrity sha512-Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ==
+"@babel/helpers@^7.12.1", "@babel/helpers@^7.19.0":
+ version "7.19.0"
+ resolved "https://registry.npmmirror.com/@babel/helpers/-/helpers-7.19.0.tgz#f30534657faf246ae96551d88dd31e9d1fa1fc18"
+ integrity sha512-DRBCKGwIEdqY3+rPJgG/dKfQy9+08rHIAJx8q2p+HSWP87s2HCrQmaAMMyMll2kIXKCW0cO1RdQskx15Xakftg==
dependencies:
- "@babel/template" "^7.18.6"
- "@babel/traverse" "^7.18.9"
- "@babel/types" "^7.18.9"
+ "@babel/template" "^7.18.10"
+ "@babel/traverse" "^7.19.0"
+ "@babel/types" "^7.19.0"
"@babel/highlight@^7.18.6":
version "7.18.6"
@@ -323,10 +323,10 @@
resolved "https://registry.npmmirror.com/@babel/parser/-/parser-7.17.10.tgz#873b16db82a8909e0fbd7f115772f4b739f6ce78"
integrity sha512-n2Q6i+fnJqzOaq2VkdXxy2TCPCWQZHiCo0XqmrCvDWcZQKRyZzYi4Z0yxlBuN0w+r2ZHmre+Q087DSrw3pbJDQ==
-"@babel/parser@^7.12.3", "@babel/parser@^7.14.5", "@babel/parser@^7.16.7", "@babel/parser@^7.17.10", "@babel/parser@^7.18.10", "@babel/parser@^7.18.13":
- version "7.18.13"
- resolved "https://registry.npmmirror.com/@babel/parser/-/parser-7.18.13.tgz#5b2dd21cae4a2c5145f1fbd8ca103f9313d3b7e4"
- integrity sha512-dgXcIfMuQ0kgzLB2b9tRZs7TTFFaGM2AbtA4fJgUUYukzGH4jwsS7hzQHEGs67jdehpm22vkgKwvbU+aEflgwg==
+"@babel/parser@^7.12.3", "@babel/parser@^7.14.5", "@babel/parser@^7.16.7", "@babel/parser@^7.17.10", "@babel/parser@^7.18.10", "@babel/parser@^7.19.0":
+ version "7.19.0"
+ resolved "https://registry.npmmirror.com/@babel/parser/-/parser-7.19.0.tgz#497fcafb1d5b61376959c1c338745ef0577aa02c"
+ integrity sha512-74bEXKX2h+8rrfQUfsBfuZZHzsEs6Eql4pqy/T4Nn6Y9wNPggQOqD6z6pn5Bl8ZfysKouFZT/UXEH94ummEeQw==
"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
version "7.18.6"
@@ -344,13 +344,13 @@
"@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
"@babel/plugin-proposal-optional-chaining" "^7.18.9"
-"@babel/plugin-proposal-async-generator-functions@^7.12.1", "@babel/plugin-proposal-async-generator-functions@^7.18.10":
- version "7.18.10"
- resolved "https://registry.npmmirror.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.10.tgz#85ea478c98b0095c3e4102bff3b67d306ed24952"
- integrity sha512-1mFuY2TOsR1hxbjCo4QL+qlIjV07p4H4EUYw2J/WCqsvFV6V9X9z9YhXbWndc/4fw+hYGlDT7egYxliMp5O6Ew==
+"@babel/plugin-proposal-async-generator-functions@^7.12.1", "@babel/plugin-proposal-async-generator-functions@^7.19.0":
+ version "7.19.0"
+ resolved "https://registry.npmmirror.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.19.0.tgz#cf5740194f170467df20581712400487efc79ff1"
+ integrity sha512-nhEByMUTx3uZueJ/QkJuSlCfN4FGg+xy+vRsfGQGzSauq5ks2Deid2+05Q3KhfaUjvec1IGhw/Zm3cFm8JigTQ==
dependencies:
"@babel/helper-environment-visitor" "^7.18.9"
- "@babel/helper-plugin-utils" "^7.18.9"
+ "@babel/helper-plugin-utils" "^7.19.0"
"@babel/helper-remap-async-to-generator" "^7.18.9"
"@babel/plugin-syntax-async-generators" "^7.8.4"
@@ -406,15 +406,15 @@
"@babel/plugin-syntax-decorators" "^7.12.1"
"@babel/plugin-proposal-decorators@^7.14.5":
- version "7.18.10"
- resolved "https://registry.npmmirror.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.18.10.tgz#788650d01e518a8a722eb8b3055dd9d73ecb7a35"
- integrity sha512-wdGTwWF5QtpTY/gbBtQLAiCnoxfD4qMbN87NYZle1dOZ9Os8Y6zXcKrIaOU8W+TIvFUWVGG9tUgNww3CjXRVVw==
+ version "7.19.0"
+ resolved "https://registry.npmmirror.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.19.0.tgz#5a3bc0699ee34117c73c960a5396ffce104c4eaa"
+ integrity sha512-Bo5nOSjiJccjv00+BrDkmfeBLBi2B0qe8ygj24KdL8VdwtZz+710NCwehF+x/Ng+0mkHx5za2eAofmvVFLF4Fg==
dependencies:
- "@babel/helper-create-class-features-plugin" "^7.18.9"
- "@babel/helper-plugin-utils" "^7.18.9"
+ "@babel/helper-create-class-features-plugin" "^7.19.0"
+ "@babel/helper-plugin-utils" "^7.19.0"
"@babel/helper-replace-supers" "^7.18.9"
"@babel/helper-split-export-declaration" "^7.18.6"
- "@babel/plugin-syntax-decorators" "^7.18.6"
+ "@babel/plugin-syntax-decorators" "^7.19.0"
"@babel/plugin-proposal-do-expressions@7.12.1":
version "7.12.1"
@@ -615,12 +615,12 @@
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-syntax-decorators@^7.10.4", "@babel/plugin-syntax-decorators@^7.12.1", "@babel/plugin-syntax-decorators@^7.18.6":
- version "7.18.6"
- resolved "https://registry.npmmirror.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.18.6.tgz#2e45af22835d0b0f8665da2bfd4463649ce5dbc1"
- integrity sha512-fqyLgjcxf/1yhyZ6A+yo1u9gJ7eleFQod2lkaUsF9DQ7sbbY3Ligym3L0+I2c0WmqNKDpoD9UTb1AKP3qRMOAQ==
+"@babel/plugin-syntax-decorators@^7.10.4", "@babel/plugin-syntax-decorators@^7.12.1", "@babel/plugin-syntax-decorators@^7.19.0":
+ version "7.19.0"
+ resolved "https://registry.npmmirror.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.19.0.tgz#5f13d1d8fce96951bea01a10424463c9a5b3a599"
+ integrity sha512-xaBZUEDntt4faL1yN8oIFlhfXeQAWJW7CLKYsHTUqriCUbj8xOra8bfxxKGi/UwExPFBuPdH4XfHc9rGQhrVkQ==
dependencies:
- "@babel/helper-plugin-utils" "^7.18.6"
+ "@babel/helper-plugin-utils" "^7.19.0"
"@babel/plugin-syntax-do-expressions@^7.12.1":
version "7.18.6"
@@ -799,16 +799,17 @@
dependencies:
"@babel/helper-plugin-utils" "^7.18.9"
-"@babel/plugin-transform-classes@^7.0.0", "@babel/plugin-transform-classes@^7.12.1", "@babel/plugin-transform-classes@^7.18.9":
- version "7.18.9"
- resolved "https://registry.npmmirror.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.9.tgz#90818efc5b9746879b869d5ce83eb2aa48bbc3da"
- integrity sha512-EkRQxsxoytpTlKJmSPYrsOMjCILacAjtSVkd4gChEe2kXjFCun3yohhW5I7plXJhCemM0gKsaGMcO8tinvCA5g==
+"@babel/plugin-transform-classes@^7.0.0", "@babel/plugin-transform-classes@^7.12.1", "@babel/plugin-transform-classes@^7.19.0":
+ version "7.19.0"
+ resolved "https://registry.npmmirror.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz#0e61ec257fba409c41372175e7c1e606dc79bb20"
+ integrity sha512-YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A==
dependencies:
"@babel/helper-annotate-as-pure" "^7.18.6"
+ "@babel/helper-compilation-targets" "^7.19.0"
"@babel/helper-environment-visitor" "^7.18.9"
- "@babel/helper-function-name" "^7.18.9"
+ "@babel/helper-function-name" "^7.19.0"
"@babel/helper-optimise-call-expression" "^7.18.6"
- "@babel/helper-plugin-utils" "^7.18.9"
+ "@babel/helper-plugin-utils" "^7.19.0"
"@babel/helper-replace-supers" "^7.18.9"
"@babel/helper-split-export-declaration" "^7.18.6"
globals "^11.1.0"
@@ -820,7 +821,7 @@
dependencies:
"@babel/helper-plugin-utils" "^7.18.9"
-"@babel/plugin-transform-destructuring@^7.0.0", "@babel/plugin-transform-destructuring@^7.12.1", "@babel/plugin-transform-destructuring@^7.18.9":
+"@babel/plugin-transform-destructuring@^7.0.0", "@babel/plugin-transform-destructuring@^7.12.1", "@babel/plugin-transform-destructuring@^7.18.13":
version "7.18.13"
resolved "https://registry.npmmirror.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.13.tgz#9e03bc4a94475d62b7f4114938e6c5c33372cbf5"
integrity sha512-TodpQ29XekIsex2A+YJPj5ax2plkGa8YYY6mFjCohk/IG9IY42Rtuj1FuDeemfg2ipxIFLzPeA83SIBnlhSIow==
@@ -851,11 +852,11 @@
"@babel/helper-plugin-utils" "^7.18.6"
"@babel/plugin-transform-flow-strip-types@^7.0.0":
- version "7.18.9"
- resolved "https://registry.npmmirror.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.18.9.tgz#5b4cc521426263b5ce08893a2db41097ceba35bf"
- integrity sha512-+G6rp2zRuOAInY5wcggsx4+QVao1qPM0osC9fTUVlAV3zOrzTCnrMAFVnR6+a3T8wz1wFIH7KhYMcMB3u1n80A==
+ version "7.19.0"
+ resolved "https://registry.npmmirror.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.19.0.tgz#e9e8606633287488216028719638cbbb2f2dde8f"
+ integrity sha512-sgeMlNaQVbCSpgLSKP4ZZKfsJVnFnNQlUSk6gPYzR/q7tzCgQF2t8RBKAP6cKJeZdveei7Q7Jm527xepI8lNLg==
dependencies:
- "@babel/helper-plugin-utils" "^7.18.9"
+ "@babel/helper-plugin-utils" "^7.19.0"
"@babel/plugin-syntax-flow" "^7.18.6"
"@babel/plugin-transform-for-of@^7.0.0", "@babel/plugin-transform-for-of@^7.12.1", "@babel/plugin-transform-for-of@^7.18.8":
@@ -907,14 +908,14 @@
"@babel/helper-simple-access" "^7.18.6"
babel-plugin-dynamic-import-node "^2.3.3"
-"@babel/plugin-transform-modules-systemjs@^7.12.1", "@babel/plugin-transform-modules-systemjs@^7.18.9":
- version "7.18.9"
- resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.9.tgz#545df284a7ac6a05125e3e405e536c5853099a06"
- integrity sha512-zY/VSIbbqtoRoJKo2cDTewL364jSlZGvn0LKOf9ntbfxOvjfmyrdtEEOAdswOswhZEb8UH3jDkCKHd1sPgsS0A==
+"@babel/plugin-transform-modules-systemjs@^7.12.1", "@babel/plugin-transform-modules-systemjs@^7.19.0":
+ version "7.19.0"
+ resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.0.tgz#5f20b471284430f02d9c5059d9b9a16d4b085a1f"
+ integrity sha512-x9aiR0WXAWmOWsqcsnrzGR+ieaTMVyGyffPVA7F8cXAGt/UxefYv6uSHZLkAFChN5M5Iy1+wjE+xJuPt22H39A==
dependencies:
"@babel/helper-hoist-variables" "^7.18.6"
- "@babel/helper-module-transforms" "^7.18.9"
- "@babel/helper-plugin-utils" "^7.18.9"
+ "@babel/helper-module-transforms" "^7.19.0"
+ "@babel/helper-plugin-utils" "^7.19.0"
"@babel/helper-validator-identifier" "^7.18.6"
babel-plugin-dynamic-import-node "^2.3.3"
@@ -926,13 +927,13 @@
"@babel/helper-module-transforms" "^7.18.6"
"@babel/helper-plugin-utils" "^7.18.6"
-"@babel/plugin-transform-named-capturing-groups-regex@^7.12.1", "@babel/plugin-transform-named-capturing-groups-regex@^7.18.6":
- version "7.18.6"
- resolved "https://registry.npmmirror.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.18.6.tgz#c89bfbc7cc6805d692f3a49bc5fc1b630007246d"
- integrity sha512-UmEOGF8XgaIqD74bC8g7iV3RYj8lMf0Bw7NJzvnS9qQhM4mg+1WHKotUIdjxgD2RGrgFLZZPCFPFj3P/kVDYhg==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.12.1", "@babel/plugin-transform-named-capturing-groups-regex@^7.19.0":
+ version "7.19.0"
+ resolved "https://registry.npmmirror.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.0.tgz#58c52422e4f91a381727faed7d513c89d7f41ada"
+ integrity sha512-HDSuqOQzkU//kfGdiHBt71/hkDTApw4U/cMVgKgX7PqfB3LOaK+2GtCEsBu1dL9CkswDm0Gwehht1dCr421ULQ==
dependencies:
- "@babel/helper-create-regexp-features-plugin" "^7.18.6"
- "@babel/helper-plugin-utils" "^7.18.6"
+ "@babel/helper-create-regexp-features-plugin" "^7.19.0"
+ "@babel/helper-plugin-utils" "^7.19.0"
"@babel/plugin-transform-new-target@^7.12.1", "@babel/plugin-transform-new-target@^7.18.6":
version "7.18.6"
@@ -999,15 +1000,15 @@
"@babel/helper-plugin-utils" "^7.18.6"
"@babel/plugin-transform-react-jsx@^7.0.0", "@babel/plugin-transform-react-jsx@^7.12.13", "@babel/plugin-transform-react-jsx@^7.18.6":
- version "7.18.10"
- resolved "https://registry.npmmirror.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.18.10.tgz#ea47b2c4197102c196cbd10db9b3bb20daa820f1"
- integrity sha512-gCy7Iikrpu3IZjYZolFE4M1Sm+nrh1/6za2Ewj77Z+XirT4TsbJcvOFOyF+fRPwU6AKKK136CZxx6L8AbSFG6A==
+ version "7.19.0"
+ resolved "https://registry.npmmirror.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.19.0.tgz#b3cbb7c3a00b92ec8ae1027910e331ba5c500eb9"
+ integrity sha512-UVEvX3tXie3Szm3emi1+G63jyw1w5IcMY0FSKM+CRnKRI5Mr1YbCNgsSTwoTwKphQEG9P+QqmuRFneJPZuHNhg==
dependencies:
"@babel/helper-annotate-as-pure" "^7.18.6"
"@babel/helper-module-imports" "^7.18.6"
- "@babel/helper-plugin-utils" "^7.18.9"
+ "@babel/helper-plugin-utils" "^7.19.0"
"@babel/plugin-syntax-jsx" "^7.18.6"
- "@babel/types" "^7.18.10"
+ "@babel/types" "^7.19.0"
"@babel/plugin-transform-react-pure-annotations@^7.12.1":
version "7.18.6"
@@ -1071,12 +1072,12 @@
dependencies:
"@babel/helper-plugin-utils" "^7.18.6"
-"@babel/plugin-transform-spread@^7.0.0", "@babel/plugin-transform-spread@^7.12.1", "@babel/plugin-transform-spread@^7.18.9":
- version "7.18.9"
- resolved "https://registry.npmmirror.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.18.9.tgz#6ea7a6297740f381c540ac56caf75b05b74fb664"
- integrity sha512-39Q814wyoOPtIB/qGopNIL9xDChOE1pNU0ZY5dO0owhiVt/5kFm4li+/bBtwc7QotG0u5EPzqhZdjMtmqBqyQA==
+"@babel/plugin-transform-spread@^7.0.0", "@babel/plugin-transform-spread@^7.12.1", "@babel/plugin-transform-spread@^7.19.0":
+ version "7.19.0"
+ resolved "https://registry.npmmirror.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz#dd60b4620c2fec806d60cfaae364ec2188d593b6"
+ integrity sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==
dependencies:
- "@babel/helper-plugin-utils" "^7.18.9"
+ "@babel/helper-plugin-utils" "^7.19.0"
"@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
"@babel/plugin-transform-sticky-regex@^7.0.0", "@babel/plugin-transform-sticky-regex@^7.12.1", "@babel/plugin-transform-sticky-regex@^7.18.6":
@@ -1101,12 +1102,12 @@
"@babel/helper-plugin-utils" "^7.18.9"
"@babel/plugin-transform-typescript@^7.12.17", "@babel/plugin-transform-typescript@^7.16.1", "@babel/plugin-transform-typescript@^7.18.6", "@babel/plugin-transform-typescript@^7.5.0":
- version "7.18.12"
- resolved "https://registry.npmmirror.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.18.12.tgz#712e9a71b9e00fde9f8c0238e0cceee86ab2f8fd"
- integrity sha512-2vjjam0cum0miPkenUbQswKowuxs/NjMwIKEq0zwegRxXk12C9YOF9STXnaUptITOtOJHKHpzvvWYOjbm6tc0w==
+ version "7.19.0"
+ resolved "https://registry.npmmirror.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.19.0.tgz#50c3a68ec8efd5e040bde2cd764e8e16bc0cbeaf"
+ integrity sha512-DOOIywxPpkQHXijXv+s9MDAyZcLp12oYRl3CMWZ6u7TjSoCBq/KqHR/nNFR3+i2xqheZxoF0H2XyL7B6xeSRuA==
dependencies:
- "@babel/helper-create-class-features-plugin" "^7.18.9"
- "@babel/helper-plugin-utils" "^7.18.9"
+ "@babel/helper-create-class-features-plugin" "^7.19.0"
+ "@babel/helper-plugin-utils" "^7.19.0"
"@babel/plugin-syntax-typescript" "^7.18.6"
"@babel/plugin-transform-unicode-escapes@^7.12.1", "@babel/plugin-transform-unicode-escapes@^7.18.10":
@@ -1197,17 +1198,17 @@
semver "^5.5.0"
"@babel/preset-env@^7.11.0", "@babel/preset-env@^7.14.5":
- version "7.18.10"
- resolved "https://registry.npmmirror.com/@babel/preset-env/-/preset-env-7.18.10.tgz#83b8dfe70d7eea1aae5a10635ab0a5fe60dfc0f4"
- integrity sha512-wVxs1yjFdW3Z/XkNfXKoblxoHgbtUF7/l3PvvP4m02Qz9TZ6uZGxRVYjSQeR87oQmHco9zWitW5J82DJ7sCjvA==
+ version "7.19.0"
+ resolved "https://registry.npmmirror.com/@babel/preset-env/-/preset-env-7.19.0.tgz#fd18caf499a67d6411b9ded68dc70d01ed1e5da7"
+ integrity sha512-1YUju1TAFuzjIQqNM9WsF4U6VbD/8t3wEAlw3LFYuuEr+ywqLRcSXxFKz4DCEj+sN94l/XTDiUXYRrsvMpz9WQ==
dependencies:
- "@babel/compat-data" "^7.18.8"
- "@babel/helper-compilation-targets" "^7.18.9"
- "@babel/helper-plugin-utils" "^7.18.9"
+ "@babel/compat-data" "^7.19.0"
+ "@babel/helper-compilation-targets" "^7.19.0"
+ "@babel/helper-plugin-utils" "^7.19.0"
"@babel/helper-validator-option" "^7.18.6"
"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6"
"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.18.9"
- "@babel/plugin-proposal-async-generator-functions" "^7.18.10"
+ "@babel/plugin-proposal-async-generator-functions" "^7.19.0"
"@babel/plugin-proposal-class-properties" "^7.18.6"
"@babel/plugin-proposal-class-static-block" "^7.18.6"
"@babel/plugin-proposal-dynamic-import" "^7.18.6"
@@ -1241,9 +1242,9 @@
"@babel/plugin-transform-async-to-generator" "^7.18.6"
"@babel/plugin-transform-block-scoped-functions" "^7.18.6"
"@babel/plugin-transform-block-scoping" "^7.18.9"
- "@babel/plugin-transform-classes" "^7.18.9"
+ "@babel/plugin-transform-classes" "^7.19.0"
"@babel/plugin-transform-computed-properties" "^7.18.9"
- "@babel/plugin-transform-destructuring" "^7.18.9"
+ "@babel/plugin-transform-destructuring" "^7.18.13"
"@babel/plugin-transform-dotall-regex" "^7.18.6"
"@babel/plugin-transform-duplicate-keys" "^7.18.9"
"@babel/plugin-transform-exponentiation-operator" "^7.18.6"
@@ -1253,9 +1254,9 @@
"@babel/plugin-transform-member-expression-literals" "^7.18.6"
"@babel/plugin-transform-modules-amd" "^7.18.6"
"@babel/plugin-transform-modules-commonjs" "^7.18.6"
- "@babel/plugin-transform-modules-systemjs" "^7.18.9"
+ "@babel/plugin-transform-modules-systemjs" "^7.19.0"
"@babel/plugin-transform-modules-umd" "^7.18.6"
- "@babel/plugin-transform-named-capturing-groups-regex" "^7.18.6"
+ "@babel/plugin-transform-named-capturing-groups-regex" "^7.19.0"
"@babel/plugin-transform-new-target" "^7.18.6"
"@babel/plugin-transform-object-super" "^7.18.6"
"@babel/plugin-transform-parameters" "^7.18.8"
@@ -1263,14 +1264,14 @@
"@babel/plugin-transform-regenerator" "^7.18.6"
"@babel/plugin-transform-reserved-words" "^7.18.6"
"@babel/plugin-transform-shorthand-properties" "^7.18.6"
- "@babel/plugin-transform-spread" "^7.18.9"
+ "@babel/plugin-transform-spread" "^7.19.0"
"@babel/plugin-transform-sticky-regex" "^7.18.6"
"@babel/plugin-transform-template-literals" "^7.18.9"
"@babel/plugin-transform-typeof-symbol" "^7.18.9"
"@babel/plugin-transform-unicode-escapes" "^7.18.10"
"@babel/plugin-transform-unicode-regex" "^7.18.6"
"@babel/preset-modules" "^0.1.5"
- "@babel/types" "^7.18.10"
+ "@babel/types" "^7.19.0"
babel-plugin-polyfill-corejs2 "^0.3.2"
babel-plugin-polyfill-corejs3 "^0.5.3"
babel-plugin-polyfill-regenerator "^0.4.0"
@@ -1340,9 +1341,9 @@
source-map-support "^0.5.16"
"@babel/runtime-corejs3@^7.14.8":
- version "7.18.9"
- resolved "https://registry.npmmirror.com/@babel/runtime-corejs3/-/runtime-corejs3-7.18.9.tgz#7bacecd1cb2dd694eacd32a91fcf7021c20770ae"
- integrity sha512-qZEWeccZCrHA2Au4/X05QW5CMdm4VjUDCrGq5gf1ZDcM4hRqreKrtwAn7yci9zfgAS9apvnsFXiGBHBAxZdK9A==
+ version "7.19.0"
+ resolved "https://registry.npmmirror.com/@babel/runtime-corejs3/-/runtime-corejs3-7.19.0.tgz#0df75cb8e5ecba3ca9e658898694e5326d52397f"
+ integrity sha512-JyXXoCu1N8GLuKc2ii8y5RGma5FMpFeO2nAQIe0Yzrbq+rQnN+sFj47auLblR5ka6aHNGPDgv8G/iI2Grb0ldQ==
dependencies:
core-js-pure "^3.20.2"
regenerator-runtime "^0.13.4"
@@ -1355,9 +1356,9 @@
regenerator-runtime "^0.13.4"
"@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.14.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.7.7", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
- version "7.18.9"
- resolved "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.18.9.tgz#b4fcfce55db3d2e5e080d2490f608a3b9f407f4a"
- integrity sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==
+ version "7.19.0"
+ resolved "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.19.0.tgz#22b11c037b094d27a8a2504ea4dcff00f50e2259"
+ integrity sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==
dependencies:
regenerator-runtime "^0.13.4"
@@ -1370,7 +1371,7 @@
"@babel/parser" "^7.16.7"
"@babel/types" "^7.16.7"
-"@babel/template@^7.0.0", "@babel/template@^7.10.4", "@babel/template@^7.18.10", "@babel/template@^7.18.6":
+"@babel/template@^7.0.0", "@babel/template@^7.10.4", "@babel/template@^7.18.10":
version "7.18.10"
resolved "https://registry.npmmirror.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71"
integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==
@@ -1395,26 +1396,26 @@
debug "^4.1.0"
globals "^11.1.0"
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.12.1", "@babel/traverse@^7.18.11", "@babel/traverse@^7.18.13", "@babel/traverse@^7.18.9":
- version "7.18.13"
- resolved "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.18.13.tgz#5ab59ef51a997b3f10c4587d648b9696b6cb1a68"
- integrity sha512-N6kt9X1jRMLPxxxPYWi7tgvJRH/rtoU+dbKAPDM44RFHiMH8igdsaSBgFeskhSl/kLWLDUvIh1RXCrTmg0/zvA==
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.12.1", "@babel/traverse@^7.18.9", "@babel/traverse@^7.19.0":
+ version "7.19.0"
+ resolved "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.19.0.tgz#eb9c561c7360005c592cc645abafe0c3c4548eed"
+ integrity sha512-4pKpFRDh+utd2mbRC8JLnlsMUii3PMHjpL6a0SZ4NMZy7YFP9aXORxEhdMVOc9CpWtDF09IkciQLEhK7Ml7gRA==
dependencies:
"@babel/code-frame" "^7.18.6"
- "@babel/generator" "^7.18.13"
+ "@babel/generator" "^7.19.0"
"@babel/helper-environment-visitor" "^7.18.9"
- "@babel/helper-function-name" "^7.18.9"
+ "@babel/helper-function-name" "^7.19.0"
"@babel/helper-hoist-variables" "^7.18.6"
"@babel/helper-split-export-declaration" "^7.18.6"
- "@babel/parser" "^7.18.13"
- "@babel/types" "^7.18.13"
+ "@babel/parser" "^7.19.0"
+ "@babel/types" "^7.19.0"
debug "^4.1.0"
globals "^11.1.0"
-"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.16.7", "@babel/types@^7.17.10", "@babel/types@^7.18.10", "@babel/types@^7.18.13", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.4.4":
- version "7.18.13"
- resolved "https://registry.npmmirror.com/@babel/types/-/types-7.18.13.tgz#30aeb9e514f4100f7c1cb6e5ba472b30e48f519a"
- integrity sha512-ePqfTihzW0W6XAU+aMw2ykilisStJfDnsejDCXRchCcMJ4O0+8DhPXf2YUbZ6wjBlsEmZwLK/sPweWtu8hcJYQ==
+"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.16.7", "@babel/types@^7.17.10", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.4.4":
+ version "7.19.0"
+ resolved "https://registry.npmmirror.com/@babel/types/-/types-7.19.0.tgz#75f21d73d73dc0351f3368d28db73465f4814600"
+ integrity sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==
dependencies:
"@babel/helper-string-parser" "^7.18.10"
"@babel/helper-validator-identifier" "^7.18.6"
@@ -1859,61 +1860,61 @@
"@nodelib/fs.scandir" "2.1.5"
fastq "^1.6.0"
-"@parcel/css-darwin-arm64@1.13.0":
- version "1.13.0"
- resolved "https://registry.npmmirror.com/@parcel/css-darwin-arm64/-/css-darwin-arm64-1.13.0.tgz#06d1a419c24b7c00f93243989d87abed4597701f"
- integrity sha512-GqyAeNa0Bah6WuIgqeBJCBRRcGEqkRMkK1YxgaFBhJiicrJJJ1/aZetzOhwNy6JGpQ8wnKP+p+t6IX2wrklaWw==
+"@parcel/css-darwin-arm64@1.13.1":
+ version "1.13.1"
+ resolved "https://registry.npmmirror.com/@parcel/css-darwin-arm64/-/css-darwin-arm64-1.13.1.tgz#b857c162c5750b3417079ad5a6fead15427444d0"
+ integrity sha512-46LVidYcao8zurVPOZ4ZWJQ/50o4N+Z0K4CRmCCqWE+5gIWlx+md+W0h8XQTRb/GQ3j3+mlZvYCQxHpKy5M1lA==
-"@parcel/css-darwin-x64@1.13.0":
- version "1.13.0"
- resolved "https://registry.npmmirror.com/@parcel/css-darwin-x64/-/css-darwin-x64-1.13.0.tgz#818082dca71d6a30c7a255ae4732754daeede345"
- integrity sha512-k7/YBwZ5nDXmyDLCo8Pf7ATqQPo34emv9Tpz2LbYUU3NCO2uhsGzjjsQiYXsAp5QeupPHgDmQeEX6WSvXxo0fQ==
+"@parcel/css-darwin-x64@1.13.1":
+ version "1.13.1"
+ resolved "https://registry.npmmirror.com/@parcel/css-darwin-x64/-/css-darwin-x64-1.13.1.tgz#be7e73a61fcace9a78e3664a0ca8845e69747f96"
+ integrity sha512-vX1/Ut06UL5MQzWr5fPg51n6NYrzfjW9A+jXH3KeBloWtX+NllhLilmtcO4X1y/ZqaFjqHWpk4yrNVdtk1r4zA==
-"@parcel/css-linux-arm-gnueabihf@1.13.0":
- version "1.13.0"
- resolved "https://registry.npmmirror.com/@parcel/css-linux-arm-gnueabihf/-/css-linux-arm-gnueabihf-1.13.0.tgz#f916e699b21b1f0e8470545c6124a1b00c08a245"
- integrity sha512-mBtDUkF/Gje3a7KMt2edEc9rUdKupTy49bvgGFE9dc+k9ZBQg1L8JK35mUo0Y3Y0jJmRDURY2+LRnxvOWJm3TA==
+"@parcel/css-linux-arm-gnueabihf@1.13.1":
+ version "1.13.1"
+ resolved "https://registry.npmmirror.com/@parcel/css-linux-arm-gnueabihf/-/css-linux-arm-gnueabihf-1.13.1.tgz#bae1e86f9cb03646b48cf4604dded78a7757922f"
+ integrity sha512-qxQKUeXLHqehLmuJODQ7GNp0Syj2Kl35X4YvXGoPOI7Eq/y2ny3G5NCKUWkGDwOasIP3hKvVVfJRJv9fLJWnDQ==
-"@parcel/css-linux-arm64-gnu@1.13.0":
- version "1.13.0"
- resolved "https://registry.npmmirror.com/@parcel/css-linux-arm64-gnu/-/css-linux-arm64-gnu-1.13.0.tgz#2946390ebe1d70bfeff7aed84b8e58b60602150a"
- integrity sha512-h90mKM4SpLLHc1vd06O5SkOae9aR36CfX+NWzgwLI4VKiZGcr+D78gsF7+CDkWrf1hqx5UonguMrqlN/MVdJBQ==
+"@parcel/css-linux-arm64-gnu@1.13.1":
+ version "1.13.1"
+ resolved "https://registry.npmmirror.com/@parcel/css-linux-arm64-gnu/-/css-linux-arm64-gnu-1.13.1.tgz#fa4c43564b6bfc5434ab779cbef58de7b1228994"
+ integrity sha512-FxnOONVo8WBW58uzjqv/mwSBDgGMp1qxK+fovjqLPCP3zcNgxkUG0l6ElWpqtiWWH3mTMzSHe+7hSaeVov12yQ==
-"@parcel/css-linux-arm64-musl@1.13.0":
- version "1.13.0"
- resolved "https://registry.npmmirror.com/@parcel/css-linux-arm64-musl/-/css-linux-arm64-musl-1.13.0.tgz#fa6d6990542a51f20b6086e387596e75ec1eea26"
- integrity sha512-FGg6UyHaPwmZ+IFJmSiUzznNUsGYG1aIvKIWIaw2CgH2cUamqLORSnCIBV4LXrpZJ7I8X2845L76hzMvaetkRg==
+"@parcel/css-linux-arm64-musl@1.13.1":
+ version "1.13.1"
+ resolved "https://registry.npmmirror.com/@parcel/css-linux-arm64-musl/-/css-linux-arm64-musl-1.13.1.tgz#17c1c1bb085d95a983cab0299312be9bc7ceae4d"
+ integrity sha512-6RDhL36HBAtt1mHa/y+34fHRImEJT/rd9hy1Z2qz117WUgzpZ3m4tFw33VrG7MKACugs9C2zG1MdVfy1Rz5+Uw==
-"@parcel/css-linux-x64-gnu@1.13.0":
- version "1.13.0"
- resolved "https://registry.npmmirror.com/@parcel/css-linux-x64-gnu/-/css-linux-x64-gnu-1.13.0.tgz#6ff0cebf729ee054eb5d5c9d9ac43933d977f761"
- integrity sha512-QJyCKM4ms7OaklffoqleouigDAYATZcCcZkp9AUEt7lqg8i2sWFrInEwWM4QhauwML3gxdKaRVugVZCzMSp3Kg==
+"@parcel/css-linux-x64-gnu@1.13.1":
+ version "1.13.1"
+ resolved "https://registry.npmmirror.com/@parcel/css-linux-x64-gnu/-/css-linux-x64-gnu-1.13.1.tgz#f363d661961ccee3f88fb94dac372de5e1f97fe0"
+ integrity sha512-4VsduFKs35J1I3iQJuBCTp66K5mLh8nrtfXzkBDgP9tc6cLqw9PFodby9NhW9SJSn0ZVdrciIXW0C8Lp3Ev+bw==
-"@parcel/css-linux-x64-musl@1.13.0":
- version "1.13.0"
- resolved "https://registry.npmmirror.com/@parcel/css-linux-x64-musl/-/css-linux-x64-musl-1.13.0.tgz#d8605cbe236233678496e11af480a5be68219106"
- integrity sha512-V2mA8hzZaYRyMIZjEAMaZqrziYTtkjHP/jdS+qnAnHNdvIav3+3Saca3hbSnD2hQuM9iu2wzD3gHoVexlCjTOg==
+"@parcel/css-linux-x64-musl@1.13.1":
+ version "1.13.1"
+ resolved "https://registry.npmmirror.com/@parcel/css-linux-x64-musl/-/css-linux-x64-musl-1.13.1.tgz#b29b660b9b39c9810d6dc351b77f925f6d5171cf"
+ integrity sha512-Ws34m9fW/0UuNTkC359nbnURzvSbCsstRG6QQ3UxdeNJ+crrgEsmvHPcN3WiIz/P2seP1Hu6GobKQAnOy6g3HA==
-"@parcel/css-win32-x64-msvc@1.13.0":
- version "1.13.0"
- resolved "https://registry.npmmirror.com/@parcel/css-win32-x64-msvc/-/css-win32-x64-msvc-1.13.0.tgz#55806568f31eb7ef55d1bcd8925b4992e043a62d"
- integrity sha512-0WFdh4nS5lkjLnBr0N6O7OatbjUFZdVBSlPDdTdwEYZkl8La+SnmGGMEkrE/jiQ6NjjwgLorN7xainmPWuQdDw==
+"@parcel/css-win32-x64-msvc@1.13.1":
+ version "1.13.1"
+ resolved "https://registry.npmmirror.com/@parcel/css-win32-x64-msvc/-/css-win32-x64-msvc-1.13.1.tgz#55c572528100ef91dd60db655b367dc648c0c99c"
+ integrity sha512-4yPYFQqUW4ZepIWa8rWiXnSDU6Nki2H9PB1NfTvr7IjN3WsNFrrVZFKsTg/KU2euYnasBXSZ+CMTUutvLZoVaA==
"@parcel/css@^1.4.0":
- version "1.13.0"
- resolved "https://registry.npmmirror.com/@parcel/css/-/css-1.13.0.tgz#90747a64e05511e813d0d46454165f60ec959e82"
- integrity sha512-S4QD4Jd+j8QzU5ZZpfg+1cdmEXeJ71wabbV6ff3DJB/05gXWj9Qf/ZZUVtwH3V255Oif6/jcEmcWY4AmFXTyLw==
+ version "1.13.1"
+ resolved "https://registry.npmmirror.com/@parcel/css/-/css-1.13.1.tgz#67e3acd3a328e65ddaa8fdb31ae7a47c4a7ee6c9"
+ integrity sha512-pDv+1tPCk2ggGZ1Msl4r+lq7dPKjUBpZXJf/DMydTnYPxupwAjtmlmOd67CF3QHVLyKYB+viU4g5M8pVXCbaeA==
dependencies:
detect-libc "^1.0.3"
optionalDependencies:
- "@parcel/css-darwin-arm64" "1.13.0"
- "@parcel/css-darwin-x64" "1.13.0"
- "@parcel/css-linux-arm-gnueabihf" "1.13.0"
- "@parcel/css-linux-arm64-gnu" "1.13.0"
- "@parcel/css-linux-arm64-musl" "1.13.0"
- "@parcel/css-linux-x64-gnu" "1.13.0"
- "@parcel/css-linux-x64-musl" "1.13.0"
- "@parcel/css-win32-x64-msvc" "1.13.0"
+ "@parcel/css-darwin-arm64" "1.13.1"
+ "@parcel/css-darwin-x64" "1.13.1"
+ "@parcel/css-linux-arm-gnueabihf" "1.13.1"
+ "@parcel/css-linux-arm64-gnu" "1.13.1"
+ "@parcel/css-linux-arm64-musl" "1.13.1"
+ "@parcel/css-linux-x64-gnu" "1.13.1"
+ "@parcel/css-linux-x64-musl" "1.13.1"
+ "@parcel/css-win32-x64-msvc" "1.13.1"
"@pmmmwh/react-refresh-webpack-plugin@0.5.4":
version "0.5.4"
@@ -1962,101 +1963,101 @@
resolved "https://registry.npmmirror.com/@stencil/sass/-/sass-1.5.2.tgz#861dffe90a8d911b6b2af4a36d8928b5264a8646"
integrity sha512-nJ93pUSylsGsMX0eLmhxh1oEljcUjj5mYjhB9ziCdoaydAdjukrUoqDCC7tdVbOcBo2hKptQyWqCtETnBGYsXQ==
-"@swc/core-android-arm-eabi@1.2.245":
- version "1.2.245"
- resolved "https://registry.npmmirror.com/@swc/core-android-arm-eabi/-/core-android-arm-eabi-1.2.245.tgz#d3dfa9d6a4a623d2d7e2b221417bfd5dac6477a1"
- integrity sha512-KpQVX1DdvOjNupJzoM1j6BqEnZjIJlGV0vINNE46bIybMrCMA14Q5OnsI8hGHH6WizSEV7FrMaFHpAQLwu+uhQ==
+"@swc/core-android-arm-eabi@1.2.248":
+ version "1.2.248"
+ resolved "https://registry.npmmirror.com/@swc/core-android-arm-eabi/-/core-android-arm-eabi-1.2.248.tgz#dfc9ffe76b56130ea0ba44359a129e99b7dae8d7"
+ integrity sha512-+n4fyGnGWnhV/GanN99N5FkgCF0JdJVViecsA0eAEXF35+qZ0PO3YgDx3EfBXA35utddXZwskZ9q71cjSPv4Rg==
dependencies:
"@swc/wasm" "1.2.122"
-"@swc/core-android-arm64@1.2.245":
- version "1.2.245"
- resolved "https://registry.npmmirror.com/@swc/core-android-arm64/-/core-android-arm64-1.2.245.tgz#b516b033a1ee48c745d671618329e8903f5eda2a"
- integrity sha512-QEK0aphFD+Z9zV+b38wasuM8nMrS9mixXybzXGZeRrGCUHOLxHeQzP69ksHocv8uBKLrega5NWcYxRwul7bueQ==
+"@swc/core-android-arm64@1.2.248":
+ version "1.2.248"
+ resolved "https://registry.npmmirror.com/@swc/core-android-arm64/-/core-android-arm64-1.2.248.tgz#6aef149f336b2c3279802158d12e28310d858c2a"
+ integrity sha512-/eXNTuWpAiJsP/DkO2hr4B+a6oS605sRq6Y2ry7sc+7bS8jkDloryD3Lkyv6h1RgRrv33uRCt0+JLN+odeeBSA==
dependencies:
"@swc/wasm" "1.2.130"
-"@swc/core-darwin-arm64@1.2.245":
- version "1.2.245"
- resolved "https://registry.npmmirror.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.2.245.tgz#33c5db025642715f4bcad2ef229df5494cb67013"
- integrity sha512-0qn4H9h6otyW3L+sFSCZ7pgp93fxizFIkBscxShjX1160zs4AScnK5hp4kNYfyjxr2tMCIA5WVttfL6NIYp6Uw==
+"@swc/core-darwin-arm64@1.2.248":
+ version "1.2.248"
+ resolved "https://registry.npmmirror.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.2.248.tgz#a6341313c5b3848323204e830da81121254a205a"
+ integrity sha512-rd9UwNuFhMk4WxoFmba2HKNrPevh8p/syEtjThyQ+kcMLU1D5yA3WwYEyPvnLgytlkJvsUIjVjV15i8lNSU0TQ==
-"@swc/core-darwin-x64@1.2.245":
- version "1.2.245"
- resolved "https://registry.npmmirror.com/@swc/core-darwin-x64/-/core-darwin-x64-1.2.245.tgz#28dec045f319652bab79886d3ef6cad5e53bf818"
- integrity sha512-DkJHcGZi3pZkH+jl6QCWcXB00xP9Ntp8btpUuqsiRhtNkbQhTOk+2d8M3AzSJs/p2Jlr3Z24tBIq52q3CQJiCg==
+"@swc/core-darwin-x64@1.2.248":
+ version "1.2.248"
+ resolved "https://registry.npmmirror.com/@swc/core-darwin-x64/-/core-darwin-x64-1.2.248.tgz#44198802de856ac3030adf6224a0cd73d4b39c9c"
+ integrity sha512-ouexUd719FZ4CEGl2HDZEGJV4nAhcRJ6BUMO0IOxK0MRJEDvqTiW98nSqTbOz22GHTy9Z0n5vkc5nOkuDfTJTQ==
-"@swc/core-freebsd-x64@1.2.245":
- version "1.2.245"
- resolved "https://registry.npmmirror.com/@swc/core-freebsd-x64/-/core-freebsd-x64-1.2.245.tgz#917646c55424946456988d7df25b137ebb5318e1"
- integrity sha512-xKM7VDXzgZL4Mh3TAtQz1sHK8yxoinvddX5MRanmQXoEEGeIWaYKqKYymbhjw4DwIZakB58rc7MjYrpDLK6dOA==
+"@swc/core-freebsd-x64@1.2.248":
+ version "1.2.248"
+ resolved "https://registry.npmmirror.com/@swc/core-freebsd-x64/-/core-freebsd-x64-1.2.248.tgz#b25e587df4920226f66ed2f1928918a4550d6293"
+ integrity sha512-rV4h0dGqz9x5xRGGRXKQ5MzAep90PkjLIXIcPG16M8pJQFNhS6Ebslxvh//6GIvTONE9VU/86CHWJ8FJHedUPA==
dependencies:
"@swc/wasm" "1.2.130"
-"@swc/core-linux-arm-gnueabihf@1.2.245":
- version "1.2.245"
- resolved "https://registry.npmmirror.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.2.245.tgz#a8e94b46d65ed2b2183421b517ae5da388a177f8"
- integrity sha512-n9CE5AP4/xa5crPbEJovLIsS9UR1/zBrVERWXDTSUEvpS6yiV2KuMa8fWuJ+rJtS1soNhCKsS/8cHljBb4b77A==
+"@swc/core-linux-arm-gnueabihf@1.2.248":
+ version "1.2.248"
+ resolved "https://registry.npmmirror.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.2.248.tgz#ce1b1784b43619d88e7bc0a47f1fe1bebb8ab368"
+ integrity sha512-8ZOPx9+tuLQ86cvFd3+FVBsodxFWvczJRzfLamxScEGywMsQ+Jz6vMEXAo0AbSjNjJG01DXeiVkqqyCD3Rpmug==
dependencies:
"@swc/wasm" "1.2.130"
-"@swc/core-linux-arm64-gnu@1.2.245":
- version "1.2.245"
- resolved "https://registry.npmmirror.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.2.245.tgz#1cc35e1205c47b8fab94e99f35a52376fb6a525e"
- integrity sha512-P0x8QKxGoZeLVLMxBR/XCJobiTjxS6QPCHJsWfhdktCZoxm/+3OtH858ns9b7lFNV3tggxAU6l9PtXdkvU6Cew==
+"@swc/core-linux-arm64-gnu@1.2.248":
+ version "1.2.248"
+ resolved "https://registry.npmmirror.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.2.248.tgz#08d647f945b7a7771b25db92e0daf346078cbb16"
+ integrity sha512-drJgH/s9p+4DMw7E6RxNSwj9M/0o0DWfTgO11D/afSTIR9hZfZSjC1cjpGS93jnW52H6iMWPHhcTOidHtvmVPg==
-"@swc/core-linux-arm64-musl@1.2.245":
- version "1.2.245"
- resolved "https://registry.npmmirror.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.2.245.tgz#13d23fae0b012d5b60c5d455e26e83cdb0dc20dc"
- integrity sha512-dHvYYpZHIMXPVfFrOz6kgTFVDEAq2SVjRwOl7aqpDpFfTRW7JEc7yuHh/W+kioMhVIiscMc6lXHFXSUlRA5qFA==
+"@swc/core-linux-arm64-musl@1.2.248":
+ version "1.2.248"
+ resolved "https://registry.npmmirror.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.2.248.tgz#c3aad83c1f3421ff0edc5b901bed8b28f4a00db0"
+ integrity sha512-qhntKjnAtpbHyOVJPX/LQdOdngATFXiBc8S7f5hrkn6AdK3WmojUapZbiy+0YRYxjoRrMWy/ubY8J2JWyHKeZg==
-"@swc/core-linux-x64-gnu@1.2.245":
- version "1.2.245"
- resolved "https://registry.npmmirror.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.2.245.tgz#a39ccd128b4c6c5a759170789a11f533dba753ec"
- integrity sha512-NAgd4ImnWubYKdZE1sQi9hNvsSw8+z3nVm7WrZqhBx3OVQx/XQ2OQxUKIYvTe3LInUDxywX+ifRQ/syR/pFHUQ==
+"@swc/core-linux-x64-gnu@1.2.248":
+ version "1.2.248"
+ resolved "https://registry.npmmirror.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.2.248.tgz#6e0c90adcf459d56f92b31acb10a7c3ef057fdfa"
+ integrity sha512-NcWuAuWg0N7/KXOk2JtYG4crFqhWrFV2d9shDr5PLm9bAbgSebqxGjAluQbTQjGM+ABpZ3PO4IuaCfyui3abqQ==
-"@swc/core-linux-x64-musl@1.2.245":
- version "1.2.245"
- resolved "https://registry.npmmirror.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.2.245.tgz#2797641fcce6ef8babce99923aef81e1faf3e70a"
- integrity sha512-jBThAr+TdmGRj5syD58IRlTu+N/9IcWT4GZ/YdujwDifyb2oZVj5Hop5D8wMBqBrDs1oWmK43sHp2suTfWdKBQ==
+"@swc/core-linux-x64-musl@1.2.248":
+ version "1.2.248"
+ resolved "https://registry.npmmirror.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.2.248.tgz#cfef61fcc7afeb6921c241bd960a4749008bc57f"
+ integrity sha512-E9bog6QK3DSGcK7UdpgsPVeDDCRv/SqoFOEYRYuDEOVgNkpte37pj1IdQCmN0gDHyyvuJxQ9+Knr9282DUJmQg==
-"@swc/core-win32-arm64-msvc@1.2.245":
- version "1.2.245"
- resolved "https://registry.npmmirror.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.2.245.tgz#ace106c6c1f8d3fb969ce07914e54d29c217e275"
- integrity sha512-m0cCHZHTay0J1PxUGEVeoe9Xr8Xmf2Ahdn+FPk3tp/bqA+65eT527kAQBRc6fsyJyu6tip3STVQHapFauD/w9g==
+"@swc/core-win32-arm64-msvc@1.2.248":
+ version "1.2.248"
+ resolved "https://registry.npmmirror.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.2.248.tgz#513533c727ea4cb2b1509b4a7fb3a585c0b0f2cc"
+ integrity sha512-dzAFIo5gN0hJGdC9Ikzx+gtqhePpKN2brpK0hQLlEL/+ruClxTjGxOpPO9cSHR771uO62hgNn1lN0Vhx37gQMA==
dependencies:
"@swc/wasm" "1.2.130"
-"@swc/core-win32-ia32-msvc@1.2.245":
- version "1.2.245"
- resolved "https://registry.npmmirror.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.2.245.tgz#65c103fc8ac6f71ad25873c2c410f7502220a1af"
- integrity sha512-7mMwNFpD7eepMbbveSzeEIvOL5W2I2TPHD0kR6PKq//2mr4wR+LOrw6I4i0O159Go8bDVSrdRhCNzfY66oNJ7Q==
+"@swc/core-win32-ia32-msvc@1.2.248":
+ version "1.2.248"
+ resolved "https://registry.npmmirror.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.2.248.tgz#4165648f921a9146a55689d51de8ddebd50801ad"
+ integrity sha512-TjyHVop+4+hHVziyoUpQ7mBrgGShvbcFF0f+5mVzKzBJSjbKPsZEtu5qMi12r03g+4fCCHaq1QnWeq1uhke0rQ==
dependencies:
"@swc/wasm" "1.2.130"
-"@swc/core-win32-x64-msvc@1.2.245":
- version "1.2.245"
- resolved "https://registry.npmmirror.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.2.245.tgz#16a6fe0d0b14b36c4bdeec3bc2f670a3fb357798"
- integrity sha512-vgresfVnySSZs7DO8SLpn3SB0aX+EN7N6n4YtF/rH37rFwH4WIJhNKRv6Wq4n/hzx33OT116+e/bIDMTg2cEoQ==
+"@swc/core-win32-x64-msvc@1.2.248":
+ version "1.2.248"
+ resolved "https://registry.npmmirror.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.2.248.tgz#1de8d1a52ad39e626d41d24b5661e26002370b6b"
+ integrity sha512-XODvZBfUSoUdj0RqUyOkBD7HydE5vSDvcYSVLCmLWsgEDPJhUWiOZHoXMEvoTu5/BDNezUZn58DlKozCzWZQsQ==
"@swc/core@^1.2.204":
- version "1.2.245"
- resolved "https://registry.npmmirror.com/@swc/core/-/core-1.2.245.tgz#72244799a2162a9e9f7d5be53fedb50801a573cc"
- integrity sha512-QbjqYkgC1AbJZqybzm3jWg13I5VhlRRODpeBb7H69h5GY1YUWdAb/mpKA5x5jh7j6VuGxJHDxYfry0Rv/MNz7w==
+ version "1.2.248"
+ resolved "https://registry.npmmirror.com/@swc/core/-/core-1.2.248.tgz#2f0d8486901f121dddb96932de7eea365177c112"
+ integrity sha512-/HQJT2BIT5fkf6I6vK5fS5SKf34QedBQQNf0A38xRIAFhQjLBVWECRFySqKijaFoIzRv9Ic4DI6XwusBNfPUyA==
optionalDependencies:
- "@swc/core-android-arm-eabi" "1.2.245"
- "@swc/core-android-arm64" "1.2.245"
- "@swc/core-darwin-arm64" "1.2.245"
- "@swc/core-darwin-x64" "1.2.245"
- "@swc/core-freebsd-x64" "1.2.245"
- "@swc/core-linux-arm-gnueabihf" "1.2.245"
- "@swc/core-linux-arm64-gnu" "1.2.245"
- "@swc/core-linux-arm64-musl" "1.2.245"
- "@swc/core-linux-x64-gnu" "1.2.245"
- "@swc/core-linux-x64-musl" "1.2.245"
- "@swc/core-win32-arm64-msvc" "1.2.245"
- "@swc/core-win32-ia32-msvc" "1.2.245"
- "@swc/core-win32-x64-msvc" "1.2.245"
+ "@swc/core-android-arm-eabi" "1.2.248"
+ "@swc/core-android-arm64" "1.2.248"
+ "@swc/core-darwin-arm64" "1.2.248"
+ "@swc/core-darwin-x64" "1.2.248"
+ "@swc/core-freebsd-x64" "1.2.248"
+ "@swc/core-linux-arm-gnueabihf" "1.2.248"
+ "@swc/core-linux-arm64-gnu" "1.2.248"
+ "@swc/core-linux-arm64-musl" "1.2.248"
+ "@swc/core-linux-x64-gnu" "1.2.248"
+ "@swc/core-linux-x64-musl" "1.2.248"
+ "@swc/core-win32-arm64-msvc" "1.2.248"
+ "@swc/core-win32-ia32-msvc" "1.2.248"
+ "@swc/core-win32-x64-msvc" "1.2.248"
"@swc/register@^0.1.10":
version "0.1.10"
@@ -2092,23 +2093,23 @@
"@babel/runtime" "^7.11.2"
"@tarojs/runtime" "3.3.10"
-"@tarojs/api@3.5.4":
- version "3.5.4"
- resolved "https://registry.npmmirror.com/@tarojs/api/-/api-3.5.4.tgz#c113642a447f703209fb67d3611845a954284680"
- integrity sha512-8dDFO7SV9hX4BEdUyjRVqzU/KmkqkIBQNGa2d1tw4EGyXHS/8e5rhyAQj59O05qzT8w3HBEH9uR5lz5oNRr/sQ==
+"@tarojs/api@3.5.5":
+ version "3.5.5"
+ resolved "https://registry.npmmirror.com/@tarojs/api/-/api-3.5.5.tgz#6a9ce48e792d60c0c66434ba191fb3e884eb1b2a"
+ integrity sha512-meLBpiBLtTfW+ntLbu/5e/W4T/J11Wn3Et+VGVvHGFLuDEywvmJLotJX+Bupg+8rWvyV2dN8xE5eERsKmZffbg==
dependencies:
"@babel/runtime" "^7.14.5"
- "@tarojs/runtime" "3.5.4"
+ "@tarojs/runtime" "3.5.5"
-"@tarojs/components@3.5.4":
- version "3.5.4"
- resolved "https://registry.npmmirror.com/@tarojs/components/-/components-3.5.4.tgz#995f82e7627ac7e86d05f53bb89a72cb09cf18e9"
- integrity sha512-wnat2Rrps5RrueWMkJYZo/w9iMUUQF4B+8p+8RNt70TrLqTmP/K3jBq1oTEWtQSrRyqgFOBY2T6xluXsyw8h2Q==
+"@tarojs/components@3.5.5":
+ version "3.5.5"
+ resolved "https://registry.npmmirror.com/@tarojs/components/-/components-3.5.5.tgz#4ccb60b44429c40a4effc8ce870503e7746b9505"
+ integrity sha512-D0Ir+FMXke2MoLwvQwFzr7345U8Id1MAElhk9QyOIpOKLLKC29bFuxxUS09s5caUKigNtcCM5ZWj6wF9vBsbeg==
dependencies:
"@stencil/core" "~2.13.0"
"@stencil/sass" "1.5.2"
- "@tarojs/router" "3.5.4"
- "@tarojs/taro" "3.5.4"
+ "@tarojs/router" "3.5.5"
+ "@tarojs/taro" "3.5.5"
better-scroll "^1.14.1"
classnames "^2.2.5"
hls.js "^1.1.5"
@@ -2142,10 +2143,10 @@
resolve "1.15.1"
yauzl "2.10.0"
-"@tarojs/helper@3.5.4":
- version "3.5.4"
- resolved "https://registry.npmmirror.com/@tarojs/helper/-/helper-3.5.4.tgz#4a3ebd06d0b765615e8c1bc06038300176a8802e"
- integrity sha512-cOevtp7ia3HrWOx6RbR66UZ16ny/y6RcBb5naYj5g13RY/F6MedMlzbPfYDliStFredu/2ywxWm4WIxIpJI7CQ==
+"@tarojs/helper@3.5.5":
+ version "3.5.5"
+ resolved "https://registry.npmmirror.com/@tarojs/helper/-/helper-3.5.5.tgz#45f57df10683ec0d1f650581e76ddbe42a581af8"
+ integrity sha512-8A7E/DRnEZPmcBo71cSx84PHnnmv8LPgyWiBIztL8w362GE7MmwWQF+IBQxoUlYe2At/Z7HkhUAjstihcuu8BQ==
dependencies:
"@babel/core" "^7.14.5"
"@babel/parser" "^7.14.5"
@@ -2171,101 +2172,101 @@
yauzl "2.10.0"
"@tarojs/plugin-framework-react@^3.4.12":
- version "3.5.4"
- resolved "https://registry.npmmirror.com/@tarojs/plugin-framework-react/-/plugin-framework-react-3.5.4.tgz#93d35d43b175e6c36a00473dd92212bda92424ad"
- integrity sha512-Tb66PHNC5qT5EYi2wCEEg8EQ+Mtd2bqXfD/ZtH2raCGxD4oFdDmPxf7h+48L6VUIIwXOTpJ8mdnDMcmKF4yQcQ==
+ version "3.5.5"
+ resolved "https://registry.npmmirror.com/@tarojs/plugin-framework-react/-/plugin-framework-react-3.5.5.tgz#9047e24ed8fda33ea03a7de258cbca190b8e97d2"
+ integrity sha512-u/YxuE96Zk85Gmzcg0IkT6jhlaOep8jhw9pnQKENKcROuKyw+EBoEMYXn3cwnJYh7f+UZhFLc46om12aZcu+7A==
dependencies:
- "@tarojs/helper" "3.5.4"
- "@tarojs/runtime" "3.5.4"
- "@tarojs/service" "3.5.4"
- "@tarojs/shared" "3.5.4"
+ "@tarojs/helper" "3.5.5"
+ "@tarojs/runtime" "3.5.5"
+ "@tarojs/service" "3.5.5"
+ "@tarojs/shared" "3.5.5"
acorn "^8.0.4"
acorn-walk "^8.0.0"
"@tarojs/plugin-mini-ci@^3.5.1":
- version "3.5.4"
- resolved "https://registry.npmmirror.com/@tarojs/plugin-mini-ci/-/plugin-mini-ci-3.5.4.tgz#d99f02e55c69b6598a785d8f29e0012254219d2b"
- integrity sha512-h+cPTWDIo0YanacQxShV38dHQyb4OurHv+bY1OXUFDtkM5aa4P+UCbWBpRylHbMg1bthzo2JTUdRs1YU6QO+Rg==
+ version "3.5.5"
+ resolved "https://registry.npmmirror.com/@tarojs/plugin-mini-ci/-/plugin-mini-ci-3.5.5.tgz#3017945000a243fc0a1865edc449275ddd7edbbe"
+ integrity sha512-dmubzQsclmCzarHnRBw+cHVGfPyviwlKEePQ4Uf4/yVy9R983y1oKgxhx2zREqyJexmqNhMc76ZRTzse/k6MaA==
dependencies:
- "@tarojs/service" "3.5.4"
+ "@tarojs/service" "3.5.5"
minimist "^1.2.5"
miniprogram-ci "^1.6.1"
qrcode-terminal "^0.12.0"
shelljs "^0.8.4"
-"@tarojs/plugin-platform-alipay@3.5.4":
- version "3.5.4"
- resolved "https://registry.npmmirror.com/@tarojs/plugin-platform-alipay/-/plugin-platform-alipay-3.5.4.tgz#4c42024c29ba393c61fd913e122365fd14eb7217"
- integrity sha512-9F63IApYcPg4eASD6IVIl36pO8LZDIAuzmmUDZKe3/jgb+SVazS6fQnIS6mSYuVvaXF8QCJ2sC//hUA2odg2Ow==
+"@tarojs/plugin-platform-alipay@3.5.5":
+ version "3.5.5"
+ resolved "https://registry.npmmirror.com/@tarojs/plugin-platform-alipay/-/plugin-platform-alipay-3.5.5.tgz#8b7223e9a8640d7cffaf4cec4bd86887c0e501be"
+ integrity sha512-onBNqx6FP7yuyKLUWbqP/raTrNf25VxEude1URhjtasxI+lUehLS9XHrZRAgVzU0Y//99vOIo7bYWyHXcSfAWA==
dependencies:
- "@tarojs/components" "3.5.4"
- "@tarojs/service" "3.5.4"
- "@tarojs/shared" "3.5.4"
+ "@tarojs/components" "3.5.5"
+ "@tarojs/service" "3.5.5"
+ "@tarojs/shared" "3.5.5"
-"@tarojs/plugin-platform-jd@3.5.4":
- version "3.5.4"
- resolved "https://registry.npmmirror.com/@tarojs/plugin-platform-jd/-/plugin-platform-jd-3.5.4.tgz#aee16cbd6fcb3c29bee9069a436be6f63cd73a35"
- integrity sha512-SI2BPXVm5RAcpkZuJFguxO6oZExkJSkrJOi2cgKNdBWbi4F9Hh22FGzYdab/t3n8KVjvCzKz8ynutQBjcsjTsQ==
+"@tarojs/plugin-platform-jd@3.5.5":
+ version "3.5.5"
+ resolved "https://registry.npmmirror.com/@tarojs/plugin-platform-jd/-/plugin-platform-jd-3.5.5.tgz#320b0cc1983ef5d796dd0b96ac1cf5bc347a4f43"
+ integrity sha512-sZVUbIt0n3KaifRLjqa4wK2OrL8ecJ7O7QMPQg8fows8qlCyKH2o4wqYeuXMS43K5fbliDwXsc1n5JXUMxLAbA==
dependencies:
- "@tarojs/service" "3.5.4"
- "@tarojs/shared" "3.5.4"
+ "@tarojs/service" "3.5.5"
+ "@tarojs/shared" "3.5.5"
-"@tarojs/plugin-platform-qq@3.5.4":
- version "3.5.4"
- resolved "https://registry.npmmirror.com/@tarojs/plugin-platform-qq/-/plugin-platform-qq-3.5.4.tgz#b78b7ae56d7480175351cb1b2df3dc0177081453"
- integrity sha512-A5DvzMc9SoW1h0mmsGcGIlhvNHWVgL7v0usq5Cn/xgTzKS09m2RXYNesmU79ZegCACto6G8QL/Ow14bLfC6UOg==
+"@tarojs/plugin-platform-qq@3.5.5":
+ version "3.5.5"
+ resolved "https://registry.npmmirror.com/@tarojs/plugin-platform-qq/-/plugin-platform-qq-3.5.5.tgz#9a20ec245feba291d1f04f0971e1363de7a20490"
+ integrity sha512-wocQIl3ep1g55ry4pl+eIYCTatddjywUq+tIsN+xPMAOkMVP3kWHtQhYp11kpfwScja/iibwAIOgWkQsAoo1hw==
dependencies:
- "@tarojs/plugin-platform-weapp" "3.5.4"
- "@tarojs/service" "3.5.4"
- "@tarojs/shared" "3.5.4"
+ "@tarojs/plugin-platform-weapp" "3.5.5"
+ "@tarojs/service" "3.5.5"
+ "@tarojs/shared" "3.5.5"
-"@tarojs/plugin-platform-swan@3.5.4":
- version "3.5.4"
- resolved "https://registry.npmmirror.com/@tarojs/plugin-platform-swan/-/plugin-platform-swan-3.5.4.tgz#12a7e74710d41a5edefef553e62b3e9603f8384d"
- integrity sha512-IPFFN7H7iSF9rxA1xC5uoiD0k5+ZZKbh7Ew800K1N25cFHn6KEsUgdFN3N2ZqkYasSQkGOLyEhscgAlkbFo+ow==
+"@tarojs/plugin-platform-swan@3.5.5":
+ version "3.5.5"
+ resolved "https://registry.npmmirror.com/@tarojs/plugin-platform-swan/-/plugin-platform-swan-3.5.5.tgz#a37857a5168390cbf88c4f25b22b5e1c639b92d2"
+ integrity sha512-ahruWLAsL6zNJKJ0bHwEIn5awi9xR7zuJNFNAo8bc/5NQmxdaqGNHovgV/ww4O2Oun+8GSkJYU+Wr86BvXptKQ==
dependencies:
- "@tarojs/components" "3.5.4"
- "@tarojs/service" "3.5.4"
- "@tarojs/shared" "3.5.4"
+ "@tarojs/components" "3.5.5"
+ "@tarojs/service" "3.5.5"
+ "@tarojs/shared" "3.5.5"
-"@tarojs/plugin-platform-tt@3.5.4":
- version "3.5.4"
- resolved "https://registry.npmmirror.com/@tarojs/plugin-platform-tt/-/plugin-platform-tt-3.5.4.tgz#453f5fe2ac5674d83ad181f5c95e8f677aa750de"
- integrity sha512-EYlHRZ4BlwncNCcJD1b0Q8EoTbF6pEA9LIQ/dGlcT8BkgY3HS73pq5zXj1QIOtUWby/Ftw1jHC2MCO1g4nER9w==
+"@tarojs/plugin-platform-tt@3.5.5":
+ version "3.5.5"
+ resolved "https://registry.npmmirror.com/@tarojs/plugin-platform-tt/-/plugin-platform-tt-3.5.5.tgz#c5050b6d8e367d031192bfba27ddb469f042b392"
+ integrity sha512-oPeRsouo1LASHysmQi8PdyNeMTTWlx/+iHop+CANNVFn78DMf7AZ0t4SE8rASvjL6q2sLekDn27MC6bF0zxxAA==
dependencies:
- "@tarojs/components" "3.5.4"
- "@tarojs/service" "3.5.4"
- "@tarojs/shared" "3.5.4"
+ "@tarojs/components" "3.5.5"
+ "@tarojs/service" "3.5.5"
+ "@tarojs/shared" "3.5.5"
-"@tarojs/plugin-platform-weapp@3.5.4", "@tarojs/plugin-platform-weapp@^3.5.4":
- version "3.5.4"
- resolved "https://registry.npmmirror.com/@tarojs/plugin-platform-weapp/-/plugin-platform-weapp-3.5.4.tgz#8dcd7034f134dfe58f25f2dbc1be309571979d54"
- integrity sha512-aqyQLmT+Vz2yGHqfqSYh5SA0cdL+OALXOZsRJIZPGZonofyEE3BRKyQUhM4digYD7GBF8/RkcKoO0C7nzDuzgQ==
+"@tarojs/plugin-platform-weapp@3.5.5", "@tarojs/plugin-platform-weapp@^3.5.5":
+ version "3.5.5"
+ resolved "https://registry.npmmirror.com/@tarojs/plugin-platform-weapp/-/plugin-platform-weapp-3.5.5.tgz#aad7bd29d35e4de6fd41e3cda09a5fb1351e9d2d"
+ integrity sha512-xBlkdVLuhtaodqp/oXN6JDl+RMzyxl0KtX7Gbb1g/6egZMiwZayeQZpCtV/gtVTsTnC5n2GwYL1CS8iwjWewUg==
dependencies:
- "@tarojs/components" "3.5.4"
- "@tarojs/service" "3.5.4"
- "@tarojs/shared" "3.5.4"
+ "@tarojs/components" "3.5.5"
+ "@tarojs/service" "3.5.5"
+ "@tarojs/shared" "3.5.5"
"@tarojs/plugin-react-devtools@^3.4.13":
- version "3.5.4"
- resolved "https://registry.npmmirror.com/@tarojs/plugin-react-devtools/-/plugin-react-devtools-3.5.4.tgz#00d6101e439a8aa7ebd4a7960b1880081650a4a5"
- integrity sha512-PhJpK43uxV9Vw8CRW4mM2yhPQH89HrwL9Qce20qMX5fWyNY0NEhSaqcsnwPNUfT+JtSCz/hZiVe2BCvNBXFhZg==
+ version "3.5.5"
+ resolved "https://registry.npmmirror.com/@tarojs/plugin-react-devtools/-/plugin-react-devtools-3.5.5.tgz#15c3c1baa8765d29557e926ea047dfe0e201af0c"
+ integrity sha512-ruFcKEuCd7/Fq9MGe+7LULH0Dc5PTYZq6yOix41CMyTOzz5dRChtn/6DTFkc19zkpojcmopQB85BqB0w2Swr0A==
dependencies:
- "@tarojs/helper" "3.5.4"
- "@tarojs/service" "3.5.4"
- "@tarojs/shared" "3.5.4"
- "@tarojs/taro" "3.5.4"
+ "@tarojs/helper" "3.5.5"
+ "@tarojs/service" "3.5.5"
+ "@tarojs/shared" "3.5.5"
+ "@tarojs/taro" "3.5.5"
cross-spawn "^7.0.3"
detect-port "^1.3.0"
react-devtools "4.14.0"
-"@tarojs/react@3.5.4":
- version "3.5.4"
- resolved "https://registry.npmmirror.com/@tarojs/react/-/react-3.5.4.tgz#54584996abf7fc704d4f56907d166bb7e8a86a5c"
- integrity sha512-fEGvV8vHQB00kZc33B07P+ZmO/6uQFty/AxqxMjyH1ZkS9igo12vFl9xDofnlNnpzPeuR/ntqXqHrWqPqyEEOA==
+"@tarojs/react@3.5.5":
+ version "3.5.5"
+ resolved "https://registry.npmmirror.com/@tarojs/react/-/react-3.5.5.tgz#85551da6bdb333d94d60c44042f639919790fb73"
+ integrity sha512-RoLJvR4u3eKYdNAUjHrQmRLxz85SnD2NPMWmp23ZUkxvR49PJMzvN7MsBgLRhHWSIUzl6fkeKl1UM26Qf9Mw9A==
dependencies:
- "@tarojs/runtime" "3.5.4"
- "@tarojs/shared" "3.5.4"
+ "@tarojs/runtime" "3.5.5"
+ "@tarojs/shared" "3.5.5"
react-reconciler "0.27.0"
scheduler "^0.20.1"
@@ -2280,25 +2281,25 @@
universal-router "^8.3.0"
url-parse "^1.4.7"
-"@tarojs/router@3.5.4":
- version "3.5.4"
- resolved "https://registry.npmmirror.com/@tarojs/router/-/router-3.5.4.tgz#6fb59ec0829ca3e7b242282e36b14ae3c36f0ba0"
- integrity sha512-L3xPXLo0sTtff3pv4Zn1NGtO2/2CTvHgLUtPeVjRCqXHJySr6+8SJ9m9DcrO1r8pxjgclEt5Ld1d8DwW/+bSPg==
+"@tarojs/router@3.5.5":
+ version "3.5.5"
+ resolved "https://registry.npmmirror.com/@tarojs/router/-/router-3.5.5.tgz#6403ad634f63a0d905d4be3b5881e20cd4917cb6"
+ integrity sha512-y8H40eMG+b4cXewte4tozQLM8Y2AnDQZqt0IkAklErsk5PTUhglNl8Ti+WtOXOLMGrLoSo//sC/ksgW4aQv3UQ==
dependencies:
- "@tarojs/runtime" "3.5.4"
- "@tarojs/taro" "3.5.4"
+ "@tarojs/runtime" "3.5.5"
+ "@tarojs/taro" "3.5.5"
dingtalk-jsapi "~2.15.2"
history "^5.1.0"
mobile-detect "^1.4.2"
query-string "^7.1.1"
universal-router "^8.3.0"
-"@tarojs/runner-utils@3.5.4":
- version "3.5.4"
- resolved "https://registry.npmmirror.com/@tarojs/runner-utils/-/runner-utils-3.5.4.tgz#598129241b608208e4e455696b12eb8c708dc9e2"
- integrity sha512-gGjB3LiIEScuZPMZ/P+jEGkgnx6wosueal9AkwEz/KRUj0KTG4zrQU6ISR5/wLR0hjebA3bbJ6N078Jn0j1b9Q==
+"@tarojs/runner-utils@3.5.5":
+ version "3.5.5"
+ resolved "https://registry.npmmirror.com/@tarojs/runner-utils/-/runner-utils-3.5.5.tgz#af44ab6cd5ecde67ed32f7075b2bef09d30fbf05"
+ integrity sha512-/kveQ/ln56t8hH7O8isTNBx7kuRjkuwk2jK3vE2tiXfnVLRTvg9YM+kVOfchICOqicYQZzKsbdi4ydXP/irRxw==
dependencies:
- "@tarojs/helper" "3.5.4"
+ "@tarojs/helper" "3.5.5"
scss-bundle "^3.0.2"
"@tarojs/runtime@3.3.10":
@@ -2311,22 +2312,22 @@
lodash-es "4.17.15"
reflect-metadata "^0.1.13"
-"@tarojs/runtime@3.5.4":
- version "3.5.4"
- resolved "https://registry.npmmirror.com/@tarojs/runtime/-/runtime-3.5.4.tgz#1b5f40ddc605d89e0e1745fb40220cc9eb4f4d37"
- integrity sha512-Cj14EM/ck0zUbMzgbg0Lw76bWzqu5D1GeX1uS9gW86/KFhLYxpDvn2nvMl6Cm8MIwaPmtENVST3WjcHOWVaL7w==
+"@tarojs/runtime@3.5.5", "@tarojs/runtime@^3.5.5":
+ version "3.5.5"
+ resolved "https://registry.npmmirror.com/@tarojs/runtime/-/runtime-3.5.5.tgz#8ed63c5bbcdbf8cde1301a13e37837edb4600e88"
+ integrity sha512-4izmzDQfk95HdWm+fhC/DcDvLUWjiKG2drE73NZv8ezSmsiWokdiA88vSpj6PiLyi2qZNhkt4wyT1nv60iNcLQ==
dependencies:
- "@tarojs/shared" "3.5.4"
+ "@tarojs/shared" "3.5.5"
lodash-es "4.17.21"
-"@tarojs/service@3.5.4":
- version "3.5.4"
- resolved "https://registry.npmmirror.com/@tarojs/service/-/service-3.5.4.tgz#8fa8166528eadca47026e46b4e201cb6e9e8ae9e"
- integrity sha512-rZaaoyoMOQ7RQ8PiaLQESihdnXPWMg/hGdgdTYQaipjN/Ctqd1R5OLrC6zPZMvpaV24BTPL39z09w4fhlnC10g==
+"@tarojs/service@3.5.5":
+ version "3.5.5"
+ resolved "https://registry.npmmirror.com/@tarojs/service/-/service-3.5.5.tgz#b1770e4b37e4e26e123af053c7b381a29196cb0a"
+ integrity sha512-+UK+nRIKL/bjibugkdErwIEU6bqQNqKf/yOn2NkKS0MsqZk/3PnBgyknxDD8vopYlQxWD5J3wXWsJyhyIRd8fg==
dependencies:
- "@tarojs/helper" "3.5.4"
- "@tarojs/shared" "3.5.4"
- "@tarojs/taro" "3.5.4"
+ "@tarojs/helper" "3.5.5"
+ "@tarojs/shared" "3.5.5"
+ "@tarojs/taro" "3.5.5"
fs-extra "^8.1.0"
joi "^17.6.0"
lodash "^4.17.21"
@@ -2339,10 +2340,10 @@
resolved "https://registry.npmmirror.com/@tarojs/shared/-/shared-3.3.10.tgz#68075a2abb754f936f703466508ecae5e22ebf2b"
integrity sha512-PPIgkDEGXl7SNsN2XmN8ykbS1VgN0O+D1+W1RDbeWMXdRuuLXMc/jyhTWuxLV01ebaJr6e2pGeo6PC2Ce8lKeA==
-"@tarojs/shared@3.5.4":
- version "3.5.4"
- resolved "https://registry.npmmirror.com/@tarojs/shared/-/shared-3.5.4.tgz#203ed711ad5ab80ed8314ff08a461198e44e0eda"
- integrity sha512-XRSVEerM9RE+tk5VolVJX6Ts16jPNWT7Gfa+wZG5Fb5FG4c/vx+5obNyq2rIR3aplbJ26z7A9RFkzoIhBfh5pA==
+"@tarojs/shared@3.5.5":
+ version "3.5.5"
+ resolved "https://registry.npmmirror.com/@tarojs/shared/-/shared-3.5.5.tgz#b551b3629f9b5c7af7a9ebf1a9b8e3fb9b0ab33b"
+ integrity sha512-0tPycA3aryM0++7lfJFh8RftDcRQwD0ZLnt/grvXwt6MWw7B6zdVprVpjhzJdKfsQ1IovcngIfvbFFj7FkPKzw==
"@tarojs/taro-h5@3.3.10":
version "3.3.10"
@@ -2358,13 +2359,13 @@
raf "^3.4.1"
whatwg-fetch "^3.4.0"
-"@tarojs/taro-loader@3.5.4":
- version "3.5.4"
- resolved "https://registry.npmmirror.com/@tarojs/taro-loader/-/taro-loader-3.5.4.tgz#9ce68c771df0ee6f835d21a88b2e6aab66bab74a"
- integrity sha512-Pv+VyzUAzgPI18OYVu/CusRJn2/MHYUfqSNVTDk6Bq2N62VdaoiJu7K8dtnu/yqdCARFojcLfukPMs3HoGS49A==
+"@tarojs/taro-loader@3.5.5":
+ version "3.5.5"
+ resolved "https://registry.npmmirror.com/@tarojs/taro-loader/-/taro-loader-3.5.5.tgz#ba7cb5218c4aef1948c0238e55367059d6843428"
+ integrity sha512-ebuyu+2NX2UzRdSwEcBbEKSg8UJG461sMfzI18d9An39p733jCwWhJYAblZTtlfqNAzIEOIyBh2WQhqCSsHADA==
dependencies:
- "@tarojs/helper" "3.5.4"
- "@tarojs/taro" "3.5.4"
+ "@tarojs/helper" "3.5.5"
+ "@tarojs/taro" "3.5.5"
loader-utils "^1.2.3"
"@tarojs/taro@3.3.10":
@@ -2376,22 +2377,22 @@
"@tarojs/runtime" "3.3.10"
"@tarojs/taro-h5" "3.3.10"
-"@tarojs/taro@3.5.4":
- version "3.5.4"
- resolved "https://registry.npmmirror.com/@tarojs/taro/-/taro-3.5.4.tgz#3b099cdebf6be454135bdc4e85a9d7c31d1631b3"
- integrity sha512-nkP3j7KIpP+XoPJzzRjFK7yGq6KJ1O9mHXfJsMbGtOnBVB9KsfobbdbKMTlscqOCn2VvDWOTzCS1lsrzoKcbVw==
+"@tarojs/taro@3.5.5":
+ version "3.5.5"
+ resolved "https://registry.npmmirror.com/@tarojs/taro/-/taro-3.5.5.tgz#e016d41a01f99683323cebbf0f92c92fe5868ee9"
+ integrity sha512-eQ09VjL+CKT4ltw9CtZPfkPFS3MOFkLDaP6zj0LYDiTtPRkBqBYnJ340+8ceRUE2vFg7Ta5AL4MP97hUcIEm2A==
dependencies:
- "@tarojs/api" "3.5.4"
- "@tarojs/runtime" "3.5.4"
+ "@tarojs/api" "3.5.5"
+ "@tarojs/runtime" "3.5.5"
-"@tarojs/webpack5-prebundle@3.5.4":
- version "3.5.4"
- resolved "https://registry.npmmirror.com/@tarojs/webpack5-prebundle/-/webpack5-prebundle-3.5.4.tgz#b5ac919d0cafd69e11a634ad49fd3a5d6474a449"
- integrity sha512-gZu8Xeld1kHjeaOD7XSarMbe3rdEQtgKLPE/YsahDE61d//2Z9u6828hz47IhIpFAiav0Q2lm38fJOlii6wUUQ==
+"@tarojs/webpack5-prebundle@3.5.5":
+ version "3.5.5"
+ resolved "https://registry.npmmirror.com/@tarojs/webpack5-prebundle/-/webpack5-prebundle-3.5.5.tgz#373c989241e3339ff75e9ed7e59e882adaf4fe66"
+ integrity sha512-XRkFBwlPv1GOU4TPkBJ+rNAc4Sm/kVBRJoYFIOOUW7HcZdXu0SYrNYSasuJkwQAZ04QalneekHtxy2BlMM+S0Q==
dependencies:
"@swc/core" "^1.2.204"
- "@tarojs/helper" "3.5.4"
- "@tarojs/taro" "3.5.4"
+ "@tarojs/helper" "3.5.5"
+ "@tarojs/taro" "3.5.5"
enhanced-resolve "^5.9.3"
es-module-lexer "^0.10.4"
esbuild "^0.14.27"
@@ -2401,25 +2402,25 @@
webpack-sources "^3.2.3"
webpack-virtual-modules "^0.4.3"
-"@tarojs/webpack5-runner@^3.5.4":
- version "3.5.4"
- resolved "https://registry.npmmirror.com/@tarojs/webpack5-runner/-/webpack5-runner-3.5.4.tgz#b9ca007da914d238bb79b6aeec256aac1e95fe59"
- integrity sha512-rNAJSF0q02t4XBbMZvxWeaXUI5JJmbuX9thuUBrttVNCP05NSaP8KwF8T4TiT4+tROzcITDtKSdHu5vNJLkG5Q==
+"@tarojs/webpack5-runner@^3.5.5":
+ version "3.5.5"
+ resolved "https://registry.npmmirror.com/@tarojs/webpack5-runner/-/webpack5-runner-3.5.5.tgz#cc0010882c453bca6cb0de2ea64f2365a1f54bc8"
+ integrity sha512-gl0PaEj8LdOxqFhaSMyGxyqh0zSeNl8hBdeqfoIVgsnvdNrVkcu+0qstLvy7KtOaUy6OG2U8cMonIfPKIbYVGw==
dependencies:
"@parcel/css" "^1.4.0"
- "@tarojs/helper" "3.5.4"
- "@tarojs/plugin-platform-alipay" "3.5.4"
- "@tarojs/plugin-platform-jd" "3.5.4"
- "@tarojs/plugin-platform-qq" "3.5.4"
- "@tarojs/plugin-platform-swan" "3.5.4"
- "@tarojs/plugin-platform-tt" "3.5.4"
- "@tarojs/plugin-platform-weapp" "3.5.4"
- "@tarojs/runner-utils" "3.5.4"
- "@tarojs/runtime" "3.5.4"
- "@tarojs/shared" "3.5.4"
- "@tarojs/taro" "3.5.4"
- "@tarojs/taro-loader" "3.5.4"
- "@tarojs/webpack5-prebundle" "3.5.4"
+ "@tarojs/helper" "3.5.5"
+ "@tarojs/plugin-platform-alipay" "3.5.5"
+ "@tarojs/plugin-platform-jd" "3.5.5"
+ "@tarojs/plugin-platform-qq" "3.5.5"
+ "@tarojs/plugin-platform-swan" "3.5.5"
+ "@tarojs/plugin-platform-tt" "3.5.5"
+ "@tarojs/plugin-platform-weapp" "3.5.5"
+ "@tarojs/runner-utils" "3.5.5"
+ "@tarojs/runtime" "3.5.5"
+ "@tarojs/shared" "3.5.5"
+ "@tarojs/taro" "3.5.5"
+ "@tarojs/taro-loader" "3.5.5"
+ "@tarojs/webpack5-prebundle" "3.5.5"
acorn-walk "^8.0.0"
autoprefixer "^9.7.4"
babel-loader "8.2.1"
@@ -2446,11 +2447,11 @@
mkdirp "^1.0.4"
ora "4.0.3"
postcss "8.3.5"
- postcss-html-transform "3.5.4"
+ postcss-html-transform "3.5.5"
postcss-import "12.0.1"
postcss-loader "6.2.1"
- postcss-plugin-constparse "3.5.4"
- postcss-pxtransform "3.5.4"
+ postcss-plugin-constparse "3.5.5"
+ postcss-pxtransform "3.5.5"
postcss-url "8.0.0"
regenerator-runtime "0.11"
resolve "^1.22.0"
@@ -2626,9 +2627,9 @@
integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==
"@types/minimatch@*":
- version "5.1.1"
- resolved "https://registry.npmmirror.com/@types/minimatch/-/minimatch-5.1.1.tgz#b1429c0c016cd50e105f3166bf179f6918b7365f"
- integrity sha512-v55NF6Dz0wrj14Rn8iEABTWrhYRmgkJYuokduunSiq++t3hZ9VZ6dvcDt+850Pm5sGJZk8RaHzkFCXPxVINZ+g==
+ version "5.1.2"
+ resolved "https://registry.npmmirror.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
+ integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
"@types/ms@*":
version "0.7.31"
@@ -2636,9 +2637,9 @@
integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
"@types/node@*":
- version "18.7.14"
- resolved "https://registry.npmmirror.com/@types/node/-/node-18.7.14.tgz#0fe081752a3333392d00586d815485a17c2cf3c9"
- integrity sha512-6bbDaETVi8oyIARulOE9qF1/Qdi/23z6emrUh0fNJRUmjznqrixD4MpGDdgOFk5Xb0m2H6Xu42JGdvAxaJR/wA==
+ version "18.7.16"
+ resolved "https://registry.npmmirror.com/@types/node/-/node-18.7.16.tgz#0eb3cce1e37c79619943d2fd903919fc30850601"
+ integrity sha512-EQHhixfu+mkqHMZl1R2Ovuvn47PUw18azMJOTwSZr9/fhzHNGXAJ0ma0dayRVchprpCj0Kc1K1xKoWaATWF1qg==
"@types/node@^12.0.12":
version "12.20.55"
@@ -2666,9 +2667,9 @@
integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
"@types/react@*", "@types/react@^18.0.17":
- version "18.0.17"
- resolved "https://registry.npmmirror.com/@types/react/-/react-18.0.17.tgz#4583d9c322d67efe4b39a935d223edcc7050ccf4"
- integrity sha512-38ETy4tL+rn4uQQi7mB81G7V1g0u2ryquNmsVIOKUAEIDK+3CUjZ6rSRpdvS99dNBnkLFL83qfmtLacGOTIhwQ==
+ version "18.0.18"
+ resolved "https://registry.npmmirror.com/@types/react/-/react-18.0.18.tgz#9f16f33d57bc5d9dca848d12c3572110ff9429ac"
+ integrity sha512-6hI08umYs6NaiHFEEGioXnxJ+oEhY3eRz8VCUaudZmGdtvPviCJB8mgaMxaDWAdPSYd4eFavrPk2QIolwbLYrg==
dependencies:
"@types/prop-types" "*"
"@types/scheduler" "*"
@@ -2767,13 +2768,13 @@
debug "^4.3.1"
"@typescript-eslint/parser@^5.20.0":
- version "5.36.0"
- resolved "https://registry.npmmirror.com/@typescript-eslint/parser/-/parser-5.36.0.tgz#c08883073fb65acaafd268a987fd2314ce80c789"
- integrity sha512-dlBZj7EGB44XML8KTng4QM0tvjI8swDh8MdpE5NX5iHWgWEfIuqSfSE+GPeCrCdj7m4tQLuevytd57jNDXJ2ZA==
+ version "5.36.2"
+ resolved "https://registry.npmmirror.com/@typescript-eslint/parser/-/parser-5.36.2.tgz#3ddf323d3ac85a25295a55fcb9c7a49ab4680ddd"
+ integrity sha512-qS/Kb0yzy8sR0idFspI9Z6+t7mqk/oRjnAYfewG+VN73opAUvmYL3oPIMmgOX6CnQS6gmVIXGshlb5RY/R22pA==
dependencies:
- "@typescript-eslint/scope-manager" "5.36.0"
- "@typescript-eslint/types" "5.36.0"
- "@typescript-eslint/typescript-estree" "5.36.0"
+ "@typescript-eslint/scope-manager" "5.36.2"
+ "@typescript-eslint/types" "5.36.2"
+ "@typescript-eslint/typescript-estree" "5.36.2"
debug "^4.3.4"
"@typescript-eslint/scope-manager@4.33.0":
@@ -2784,23 +2785,23 @@
"@typescript-eslint/types" "4.33.0"
"@typescript-eslint/visitor-keys" "4.33.0"
-"@typescript-eslint/scope-manager@5.36.0":
- version "5.36.0"
- resolved "https://registry.npmmirror.com/@typescript-eslint/scope-manager/-/scope-manager-5.36.0.tgz#f4f859913add160318c0a5daccd3a030d1311530"
- integrity sha512-PZUC9sz0uCzRiuzbkh6BTec7FqgwXW03isumFVkuPw/Ug/6nbAqPUZaRy4w99WCOUuJTjhn3tMjsM94NtEj64g==
+"@typescript-eslint/scope-manager@5.36.2":
+ version "5.36.2"
+ resolved "https://registry.npmmirror.com/@typescript-eslint/scope-manager/-/scope-manager-5.36.2.tgz#a75eb588a3879ae659514780831370642505d1cd"
+ integrity sha512-cNNP51L8SkIFSfce8B1NSUBTJTu2Ts4nWeWbFrdaqjmn9yKrAaJUBHkyTZc0cL06OFHpb+JZq5AUHROS398Orw==
dependencies:
- "@typescript-eslint/types" "5.36.0"
- "@typescript-eslint/visitor-keys" "5.36.0"
+ "@typescript-eslint/types" "5.36.2"
+ "@typescript-eslint/visitor-keys" "5.36.2"
"@typescript-eslint/types@4.33.0":
version "4.33.0"
resolved "https://registry.npmmirror.com/@typescript-eslint/types/-/types-4.33.0.tgz#a1e59036a3b53ae8430ceebf2a919dc7f9af6d72"
integrity sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==
-"@typescript-eslint/types@5.36.0":
- version "5.36.0"
- resolved "https://registry.npmmirror.com/@typescript-eslint/types/-/types-5.36.0.tgz#cde7b94d1c09a4f074f46db99e7bd929fb0a5559"
- integrity sha512-3JJuLL1r3ljRpFdRPeOtgi14Vmpx+2JcR6gryeORmW3gPBY7R1jNYoq4yBN1L//ONZjMlbJ7SCIwugOStucYiQ==
+"@typescript-eslint/types@5.36.2":
+ version "5.36.2"
+ resolved "https://registry.npmmirror.com/@typescript-eslint/types/-/types-5.36.2.tgz#a5066e500ebcfcee36694186ccc57b955c05faf9"
+ integrity sha512-9OJSvvwuF1L5eS2EQgFUbECb99F0mwq501w0H0EkYULkhFa19Qq7WFbycdw1PexAc929asupbZcgjVIe6OK/XQ==
"@typescript-eslint/typescript-estree@4.33.0":
version "4.33.0"
@@ -2815,13 +2816,13 @@
semver "^7.3.5"
tsutils "^3.21.0"
-"@typescript-eslint/typescript-estree@5.36.0":
- version "5.36.0"
- resolved "https://registry.npmmirror.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.36.0.tgz#0acce61b4850bdb0e578f0884402726680608789"
- integrity sha512-EW9wxi76delg/FS9+WV+fkPdwygYzRrzEucdqFVWXMQWPOjFy39mmNNEmxuO2jZHXzSQTXzhxiU1oH60AbIw9A==
+"@typescript-eslint/typescript-estree@5.36.2":
+ version "5.36.2"
+ resolved "https://registry.npmmirror.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.36.2.tgz#0c93418b36c53ba0bc34c61fe9405c4d1d8fe560"
+ integrity sha512-8fyH+RfbKc0mTspfuEjlfqA4YywcwQK2Amcf6TDOwaRLg7Vwdu4bZzyvBZp4bjt1RRjQ5MDnOZahxMrt2l5v9w==
dependencies:
- "@typescript-eslint/types" "5.36.0"
- "@typescript-eslint/visitor-keys" "5.36.0"
+ "@typescript-eslint/types" "5.36.2"
+ "@typescript-eslint/visitor-keys" "5.36.2"
debug "^4.3.4"
globby "^11.1.0"
is-glob "^4.0.3"
@@ -2836,12 +2837,12 @@
"@typescript-eslint/types" "4.33.0"
eslint-visitor-keys "^2.0.0"
-"@typescript-eslint/visitor-keys@5.36.0":
- version "5.36.0"
- resolved "https://registry.npmmirror.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.36.0.tgz#565d35a5ca00d00a406a942397ead2cb190663ba"
- integrity sha512-pdqSJwGKueOrpjYIex0T39xarDt1dn4p7XJ+6FqBWugNQwXlNGC5h62qayAIYZ/RPPtD+ButDWmpXT1eGtiaYg==
+"@typescript-eslint/visitor-keys@5.36.2":
+ version "5.36.2"
+ resolved "https://registry.npmmirror.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.36.2.tgz#2f8f78da0a3bad3320d2ac24965791ac39dace5a"
+ integrity sha512-BtRvSR6dEdrNt7Net2/XDjbYKU5Ml6GqJgVfXT0CxTCJlnIqK7rAGreuWKMT2t8cFUT2Msv5oxw0GMRD7T5J7A==
dependencies:
- "@typescript-eslint/types" "5.36.0"
+ "@typescript-eslint/types" "5.36.2"
eslint-visitor-keys "^3.3.0"
"@vue/babel-helper-vue-jsx-merge-props@^1.4.0":
@@ -4667,9 +4668,9 @@ caniuse-api@^3.0.0:
lodash.uniq "^4.5.0"
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000864, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001370, caniuse-lite@^1.0.30001373:
- version "1.0.30001385"
- resolved "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001385.tgz#51d5feeb60b831a5b4c7177f419732060418535c"
- integrity sha512-MpiCqJGhBkHgpyimE9GWmZTnyHyEEM35u115bD3QBrXpjvL/JgcP8cUhKJshfmg4OtEHFenifcK5sZayEw5tvQ==
+ version "1.0.30001393"
+ resolved "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001393.tgz#1aa161e24fe6af2e2ccda000fc2b94be0b0db356"
+ integrity sha512-N/od11RX+Gsk+1qY/jbPa0R6zJupEa0lxeBG598EbrtblxVCTJsQwbRBm6+V+rxpc5lHKdsXb9RY83cZIPLseA==
capture-stack-trace@^1.0.0:
version "1.0.1"
@@ -4807,11 +4808,6 @@ class-utils@^0.3.5:
isobject "^3.0.0"
static-extend "^0.1.1"
-classname@^0.0.0:
- version "0.0.0"
- resolved "https://registry.npmmirror.com/classname/-/classname-0.0.0.tgz#43d171b484e354c7a293a5b78004df6852db20d6"
- integrity sha512-kkhsspEJdUW+VhuvNzb2sQf0KbafDPfd36dB1qf03Uu42dWZwMQzaQuyNkaRr5ir0ZiAN0+TlH/EOOfwb/aaXg==
-
classnames@^2.2.5:
version "2.3.1"
resolved "https://registry.npmmirror.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e"
@@ -5136,17 +5132,16 @@ copy-webpack-plugin@10.2.0:
serialize-javascript "^6.0.0"
core-js-compat@^3.21.0, core-js-compat@^3.22.1, core-js-compat@^3.6.2:
- version "3.25.0"
- resolved "https://registry.npmmirror.com/core-js-compat/-/core-js-compat-3.25.0.tgz#489affbfbf9cb3fa56192fe2dd9ebaee985a66c5"
- integrity sha512-extKQM0g8/3GjFx9US12FAgx8KJawB7RCQ5y8ipYLbmfzEzmFRWdDjIlxDx82g7ygcNG85qMVUSRyABouELdow==
+ version "3.25.1"
+ resolved "https://registry.npmmirror.com/core-js-compat/-/core-js-compat-3.25.1.tgz#6f13a90de52f89bbe6267e5620a412c7f7ff7e42"
+ integrity sha512-pOHS7O0i8Qt4zlPW/eIFjwp+NrTPx+wTL0ctgI2fHn31sZOq89rDsmtc/A2vAX7r6shl+bmVI+678He46jgBlw==
dependencies:
browserslist "^4.21.3"
- semver "7.0.0"
core-js-pure@^3.20.2, core-js-pure@^3.8.1:
- version "3.25.0"
- resolved "https://registry.npmmirror.com/core-js-pure/-/core-js-pure-3.25.0.tgz#f8d1f176ff29abbfeb610110de891d5ae5a361d4"
- integrity sha512-IeHpLwk3uoci37yoI2Laty59+YqH9x5uR65/yiA0ARAJrTrN4YU0rmauLWfvqOuk77SlNJXj2rM6oT/dBD87+A==
+ version "3.25.1"
+ resolved "https://registry.npmmirror.com/core-js-pure/-/core-js-pure-3.25.1.tgz#79546518ae87cc362c991d9c2d211f45107991ee"
+ integrity sha512-7Fr74bliUDdeJCBMxkkIuQ4xfxn/SwrVg+HkJUAoNEXVqYLv55l6Af0dJ5Lq2YBUW9yKqSkLXaS5SYPK6MGa/A==
core-js@^2.4.0, core-js@^2.5.0:
version "2.6.12"
@@ -5154,9 +5149,9 @@ core-js@^2.4.0, core-js@^2.5.0:
integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
core-js@^3.4.1, core-js@^3.6.5:
- version "3.25.0"
- resolved "https://registry.npmmirror.com/core-js/-/core-js-3.25.0.tgz#be71d9e0dd648ffd70c44a7ec2319d039357eceb"
- integrity sha512-CVU1xvJEfJGhyCpBrzzzU1kjCfgsGUxhEvwUV2e/cOedYWHdmluamx+knDnmhqALddMG16fZvIqvs9aijsHHaA==
+ version "3.25.1"
+ resolved "https://registry.npmmirror.com/core-js/-/core-js-3.25.1.tgz#5818e09de0db8956e16bf10e2a7141e931b7c69c"
+ integrity sha512-sr0FY4lnO1hkQ4gLDr24K0DGnweGO1QwSj5BpfQjpSJPdqWalja4cTps29Y/PJVG/P7FYlPDkH3hO+Tr0CvDgQ==
core-util-is@1.0.2:
version "1.0.2"
@@ -5258,9 +5253,9 @@ css-color-keywords@^1.0.0:
integrity sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg==
css-declaration-sorter@^6.3.0:
- version "6.3.0"
- resolved "https://registry.npmmirror.com/css-declaration-sorter/-/css-declaration-sorter-6.3.0.tgz#72ebd995c8f4532ff0036631f7365cce9759df14"
- integrity sha512-OGT677UGHJTAVMRhPO+HJ4oKln3wkBTwtDFH0ojbqm+MJm6xuDMHp2nkhh/ThaBqq20IbraBQSWKfSLNHQO9Og==
+ version "6.3.1"
+ resolved "https://registry.npmmirror.com/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz#be5e1d71b7a992433fb1c542c7a1b835e45682ec"
+ integrity sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w==
css-loader@6.5.1:
version "6.5.1"
@@ -5895,9 +5890,9 @@ ee-first@1.1.1:
integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
electron-to-chromium@^1.3.47, electron-to-chromium@^1.4.202:
- version "1.4.234"
- resolved "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.234.tgz#ff8fb29c2edac74ef3935ca03a2ecbe62ede400b"
- integrity sha512-VqlJ4Ihd9F7eQIfwEtf7C0eZZDl6bQtpez8vx8VHN9iCZEzePZjr7n9OGFHSav4WN9zfLa2CFLowj0siBoc0hQ==
+ version "1.4.244"
+ resolved "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.244.tgz#ae9b56ed4ae2107e3a860dad80ed662c936e369e"
+ integrity sha512-E21saXLt2eTDaTxgUtiJtBUqanF9A32wZasAwDZ8gvrqXoxrBrbwtDCx7c/PQTLp81wj4X0OLDeoGQg7eMo3+w==
electron@^11.1.0:
version "11.5.0"
@@ -5980,15 +5975,15 @@ error-stack-parser@^2.0.6:
stackframe "^1.3.4"
es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19.5:
- version "1.20.1"
- resolved "https://registry.npmmirror.com/es-abstract/-/es-abstract-1.20.1.tgz#027292cd6ef44bd12b1913b828116f54787d1814"
- integrity sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==
+ version "1.20.2"
+ resolved "https://registry.npmmirror.com/es-abstract/-/es-abstract-1.20.2.tgz#8495a07bc56d342a3b8ea3ab01bd986700c2ccb3"
+ integrity sha512-XxXQuVNrySBNlEkTYJoDNFe5+s2yIOpzq80sUHEdPdQr0S5nTLz4ZPPPswNIpKseDDUS5yghX1gfLIHQZ1iNuQ==
dependencies:
call-bind "^1.0.2"
es-to-primitive "^1.2.1"
function-bind "^1.1.1"
function.prototype.name "^1.1.5"
- get-intrinsic "^1.1.1"
+ get-intrinsic "^1.1.2"
get-symbol-description "^1.0.0"
has "^1.0.3"
has-property-descriptors "^1.0.0"
@@ -6000,9 +5995,9 @@ es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19
is-shared-array-buffer "^1.0.2"
is-string "^1.0.7"
is-weakref "^1.0.2"
- object-inspect "^1.12.0"
+ object-inspect "^1.12.2"
object-keys "^1.1.1"
- object.assign "^4.1.2"
+ object.assign "^4.1.4"
regexp.prototype.flags "^1.4.3"
string.prototype.trimend "^1.0.5"
string.prototype.trimstart "^1.0.5"
@@ -6210,10 +6205,10 @@ escodegen@^1.11.1:
optionalDependencies:
source-map "~0.6.1"
-eslint-config-taro@3.5.4:
- version "3.5.4"
- resolved "https://registry.npmmirror.com/eslint-config-taro/-/eslint-config-taro-3.5.4.tgz#945023c8620913e79aaa0cc195c89139ff178875"
- integrity sha512-pAiMxnFNlZzcADonI9u/d/3FfGL5TmkXcuy69I4OZAXoG/DcMyY8hJwDYpOGGr6Ba7ddoWz5xwcJqURym7E7bw==
+eslint-config-taro@3.5.5:
+ version "3.5.5"
+ resolved "https://registry.npmmirror.com/eslint-config-taro/-/eslint-config-taro-3.5.5.tgz#1278124387feeeaf55006a3e24fdd535b037acf2"
+ integrity sha512-IL/FqHCKp3vCfWvaubM6BpzQzPSS8KEXacqAL19itZn6T+/sWPT5RrKL9BDRuBTvKQa282N/1IOa/gswQPYo9Q==
dependencies:
"@babel/eslint-parser" "^7.17.0"
"@typescript-eslint/parser" "^5.20.0"
@@ -6258,9 +6253,9 @@ eslint-plugin-react-hooks@^4.2.0:
integrity sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==
eslint-plugin-react@^7.8.2:
- version "7.31.1"
- resolved "https://registry.npmmirror.com/eslint-plugin-react/-/eslint-plugin-react-7.31.1.tgz#d29793ed27743f3ed8a473c347b1bf5a0a8fb9af"
- integrity sha512-j4/2xWqt/R7AZzG8CakGHA6Xa/u7iR8Q3xCxY+AUghdT92bnIDOBEefV456OeH0QvBcroVc0eyvrrLSyQGYIfg==
+ version "7.31.7"
+ resolved "https://registry.npmmirror.com/eslint-plugin-react/-/eslint-plugin-react-7.31.7.tgz#36fb1c611a7db5f757fce09cbbcc01682f8b0fbb"
+ integrity sha512-8NldBTeYp/kQoTV1uT0XF6HcmDqbgZ0lNPkN0wlRw8DJKXEnaWu+oh/6gt3xIhzvQ35wB2Y545fJhIbJSZ2NNw==
dependencies:
array-includes "^3.1.5"
array.prototype.flatmap "^1.3.0"
@@ -6933,7 +6928,7 @@ get-caller-file@^2.0.1:
resolved "https://registry.npmmirror.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
-get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1, get-intrinsic@^1.1.2:
version "1.1.2"
resolved "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.1.2.tgz#336975123e05ad0b7ba41f152ee4aadbea6cf598"
integrity sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==
@@ -9430,9 +9425,9 @@ num2fraction@^1.2.2:
integrity sha512-Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg==
nwsapi@^2.2.0:
- version "2.2.1"
- resolved "https://registry.npmmirror.com/nwsapi/-/nwsapi-2.2.1.tgz#10a9f268fbf4c461249ebcfe38e359aa36e2577c"
- integrity sha512-JYOWTeFoS0Z93587vRJgASD5Ut11fYl5NyihP3KrYBvMe1FRRs6RN7m20SA/16GM4P6hTnZjT+UmDOt38UeXNg==
+ version "2.2.2"
+ resolved "https://registry.npmmirror.com/nwsapi/-/nwsapi-2.2.2.tgz#e5418863e7905df67d51ec95938d67bf801f0bb0"
+ integrity sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==
oauth-sign@~0.9.0:
version "0.9.0"
@@ -9453,7 +9448,7 @@ object-copy@^0.1.0:
define-property "^0.2.5"
kind-of "^3.0.3"
-object-inspect@^1.12.0, object-inspect@^1.9.0:
+object-inspect@^1.12.2, object-inspect@^1.9.0:
version "1.12.2"
resolved "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea"
integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==
@@ -9478,7 +9473,7 @@ object-visit@^1.0.0:
dependencies:
isobject "^3.0.0"
-object.assign@^4.1.0, object.assign@^4.1.2, object.assign@^4.1.3:
+object.assign@^4.1.0, object.assign@^4.1.3, object.assign@^4.1.4:
version "4.1.4"
resolved "https://registry.npmmirror.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
@@ -10034,10 +10029,10 @@ postcss-discard-overridden@^5.1.0:
resolved "https://registry.npmmirror.com/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz#7e8c5b53325747e9d90131bb88635282fb4a276e"
integrity sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==
-postcss-html-transform@3.5.4:
- version "3.5.4"
- resolved "https://registry.npmmirror.com/postcss-html-transform/-/postcss-html-transform-3.5.4.tgz#53bedb93ab659633481a40fd4e8862390229189e"
- integrity sha512-n8VypEO88w2uKONkGj+GBjVDhwg9+u5tL/DUmjqxWe0eVGB7usTHtNjb3nmxMsyB86Yo6heYjc8+vaDqloKkcw==
+postcss-html-transform@3.5.5:
+ version "3.5.5"
+ resolved "https://registry.npmmirror.com/postcss-html-transform/-/postcss-html-transform-3.5.5.tgz#22998a49a444b6488e03e10f17d7f52fea1b7ea8"
+ integrity sha512-ulrRYeV2P4Upb5lo5HNEbxsL0NhEHNkRUP8MdvpvXQVyE7wO3J9wm/UU7BPm0eG0pH36UeSS8M2oATfeT+MWZg==
dependencies:
postcss "^6.0.22"
@@ -10236,17 +10231,17 @@ postcss-ordered-values@^5.1.3:
cssnano-utils "^3.1.0"
postcss-value-parser "^4.2.0"
-postcss-plugin-constparse@3.5.4:
- version "3.5.4"
- resolved "https://registry.npmmirror.com/postcss-plugin-constparse/-/postcss-plugin-constparse-3.5.4.tgz#907813c6343ac78cae96ba98f2b661697352b8bc"
- integrity sha512-SLVnH/T6QJea058OEfGVvbu4AsMrX0+X09qeW9/zrkZxxDoINmPDKXjxIyLIgWV0eyVT7epEAtobGpCQvYnNJw==
+postcss-plugin-constparse@3.5.5:
+ version "3.5.5"
+ resolved "https://registry.npmmirror.com/postcss-plugin-constparse/-/postcss-plugin-constparse-3.5.5.tgz#b52ced0ff2ff98eb3308ed3daf04b2d58c865f83"
+ integrity sha512-wSQAFgVxHJrA7OcLL+D7mWvKenVS7Qd67wPtyPlAgMx8GptjNQr9xJYKNNCPolNVw+IT5GMr3BYZDIz8JhKijA==
dependencies:
postcss "^6.0.22"
-postcss-pxtransform@3.5.4:
- version "3.5.4"
- resolved "https://registry.npmmirror.com/postcss-pxtransform/-/postcss-pxtransform-3.5.4.tgz#3f6fb201c4de0b75771227def8813ec6519e1eb0"
- integrity sha512-iZvf6N9b9zFZfkhO3iw6o2KdHud5PivsWNeTF05QndMJJGHZjHwqBpEKvnS78XBtTYk1SNfzwLJm1wexaysr6g==
+postcss-pxtransform@3.5.5:
+ version "3.5.5"
+ resolved "https://registry.npmmirror.com/postcss-pxtransform/-/postcss-pxtransform-3.5.5.tgz#5d2516538cb7de77e7ce342befd104720c044384"
+ integrity sha512-RSoMJIJhFmTLxo4IBKcLxLqnwcYAYuqllM6/T5NIQQf13vRI9arwLnATGa/et1rgDt7GhowpWdglnbBLIeoLHg==
dependencies:
postcss "^6.0.22"
@@ -11329,9 +11324,9 @@ sass@1.50.0:
source-map-js ">=0.6.2 <2.0.0"
sass@^1.23.7, sass@^1.44.0:
- version "1.54.6"
- resolved "https://registry.npmmirror.com/sass/-/sass-1.54.6.tgz#5a12c268db26555c335028e355d6b7b1a5b9b4c8"
- integrity sha512-DUqJjR2WxXBcZjRSZX5gCVyU+9fuC2qDfFzoKX9rV4rCOcec5mPtEafTcfsyL3YJuLONjWylBne+uXVh5rrmFw==
+ version "1.54.9"
+ resolved "https://registry.npmmirror.com/sass/-/sass-1.54.9.tgz#b05f14ed572869218d1a76961de60cd647221762"
+ integrity sha512-xb1hjASzEH+0L0WI9oFjqhRi51t/gagWnxLiwUNMltA0Ab6jIDkAacgKiGYKM9Jhy109osM7woEEai6SXeJo5Q==
dependencies:
chokidar ">=3.0.0 <4.0.0"
immutable "^4.0.0"
@@ -11429,9 +11424,9 @@ select-hose@^2.0.0:
integrity sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==
selfsigned@^2.0.0:
- version "2.0.1"
- resolved "https://registry.npmmirror.com/selfsigned/-/selfsigned-2.0.1.tgz#8b2df7fa56bf014d19b6007655fff209c0ef0a56"
- integrity sha512-LmME957M1zOsUhG+67rAjKfiWFox3SBxE/yymatMZsAx+oMrJ0YQ8AToOnyCm7xbeg2ep37IHLxdu0o2MavQOQ==
+ version "2.1.1"
+ resolved "https://registry.npmmirror.com/selfsigned/-/selfsigned-2.1.1.tgz#18a7613d714c0cd3385c48af0075abf3f266af61"
+ integrity sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==
dependencies:
node-forge "^1"
@@ -11452,11 +11447,6 @@ semver-diff@^2.0.0:
resolved "https://registry.npmmirror.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
-semver@7.0.0:
- version "7.0.0"
- resolved "https://registry.npmmirror.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
- integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
-
semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
version "6.3.0"
resolved "https://registry.npmmirror.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
@@ -12192,9 +12182,9 @@ supports-color@^8.0.0:
has-flag "^4.0.0"
supports-hyperlinks@^2.2.0:
- version "2.2.0"
- resolved "https://registry.npmmirror.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb"
- integrity sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==
+ version "2.3.0"
+ resolved "https://registry.npmmirror.com/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz#3943544347c1ff90b15effb03fc14ae45ec10624"
+ integrity sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==
dependencies:
has-flag "^4.0.0"
supports-color "^7.0.0"
@@ -12726,9 +12716,9 @@ unzip-response@^2.0.1:
integrity sha512-N0XH6lqDtFH84JxptQoZYmloF4nzrQqqrAymNj+/gW60AO2AZgOcf4O/nUXJcYfyQkqvMo9lSupBZmmgvuVXlw==
update-browserslist-db@^1.0.5:
- version "1.0.5"
- resolved "https://registry.npmmirror.com/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz#be06a5eedd62f107b7c19eb5bcefb194411abf38"
- integrity sha512-dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q==
+ version "1.0.7"
+ resolved "https://registry.npmmirror.com/update-browserslist-db/-/update-browserslist-db-1.0.7.tgz#16279639cff1d0f800b14792de43d97df2d11b7d"
+ integrity sha512-iN/XYesmZ2RmmWAiI4Z5rq0YqSiv0brj9Ce9CfhNE4xIW2h+MFxcgkxIzZ+ShkFPUkjU3gQ+3oypadD3RAMtrg==
dependencies:
escalade "^3.1.1"
picocolors "^1.0.0"