This commit is contained in:
46
package.json
46
package.json
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "jdt-user",
|
||||
"version": "4.0.3",
|
||||
"version": "4.0.4",
|
||||
"private": true,
|
||||
"description": "",
|
||||
"templateInfo": {
|
||||
@@ -9,7 +9,7 @@
|
||||
"css": "sass"
|
||||
},
|
||||
"taroConfig": {
|
||||
"version": "4.0.3"
|
||||
"version": "4.0.4"
|
||||
},
|
||||
"scripts": {
|
||||
"build:weapp": "taro build --type weapp",
|
||||
@@ -62,22 +62,22 @@
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.23.5",
|
||||
"@nutui/icons-vue-taro": "^0.0.9",
|
||||
"@nutui/nutui-taro": "^4.3.9",
|
||||
"@nutui/nutui-taro": "^4.3.12",
|
||||
"@qiun/vue-ucharts": "2.5.0-20230101",
|
||||
"@tarojs/components": "3.6.34",
|
||||
"@tarojs/helper": "3.6.34",
|
||||
"@tarojs/plugin-framework-vue3": "3.6.34",
|
||||
"@tarojs/plugin-html": "3.6.34",
|
||||
"@tarojs/plugin-platform-alipay": "3.6.34",
|
||||
"@tarojs/plugin-platform-h5": "3.6.34",
|
||||
"@tarojs/plugin-platform-jd": "3.6.34",
|
||||
"@tarojs/plugin-platform-qq": "3.6.34",
|
||||
"@tarojs/plugin-platform-swan": "3.6.34",
|
||||
"@tarojs/plugin-platform-tt": "3.6.34",
|
||||
"@tarojs/plugin-platform-weapp": "3.6.34",
|
||||
"@tarojs/runtime": "3.6.34",
|
||||
"@tarojs/shared": "3.6.34",
|
||||
"@tarojs/taro": "3.6.34",
|
||||
"@tarojs/components": "4.0.4",
|
||||
"@tarojs/helper": "4.0.4",
|
||||
"@tarojs/plugin-framework-vue3": "4.0.4",
|
||||
"@tarojs/plugin-html": "4.0.4",
|
||||
"@tarojs/plugin-platform-alipay": "4.0.4",
|
||||
"@tarojs/plugin-platform-h5": "4.0.4",
|
||||
"@tarojs/plugin-platform-jd": "4.0.4",
|
||||
"@tarojs/plugin-platform-qq": "4.0.4",
|
||||
"@tarojs/plugin-platform-swan": "4.0.4",
|
||||
"@tarojs/plugin-platform-tt": "4.0.4",
|
||||
"@tarojs/plugin-platform-weapp": "4.0.4",
|
||||
"@tarojs/runtime": "4.0.4",
|
||||
"@tarojs/shared": "4.0.4",
|
||||
"@tarojs/taro": "4.0.4",
|
||||
"dayjs": "^1.11.10",
|
||||
"pinia": "^2.1.7",
|
||||
"uqrcodejs": "^4.0.7",
|
||||
@@ -87,10 +87,10 @@
|
||||
"@babel/core": "^7.23.5",
|
||||
"@commitlint/cli": "^18.4.3",
|
||||
"@commitlint/config-conventional": "^18.4.3",
|
||||
"@tarojs/cli": "3.6.34",
|
||||
"@tarojs/plugin-mini-ci": "3.6.34",
|
||||
"@tarojs/taro-loader": "3.6.34",
|
||||
"@tarojs/webpack5-runner": "3.6.34",
|
||||
"@tarojs/cli": "4.0.4",
|
||||
"@tarojs/plugin-mini-ci": "4.0.4",
|
||||
"@tarojs/taro-loader": "4.0.4",
|
||||
"@tarojs/webpack5-runner": "4.0.4",
|
||||
"@types/node": "^18.19.1",
|
||||
"@types/webpack-env": "^1.18.4",
|
||||
"@typescript-eslint/eslint-plugin": "^6.13.1",
|
||||
@@ -99,12 +99,12 @@
|
||||
"@vue/babel-plugin-jsx": "^1.1.5",
|
||||
"@vue/compiler-sfc": "^3.3.9",
|
||||
"autoprefixer": "^10.4.19",
|
||||
"babel-preset-taro": "3.6.34",
|
||||
"babel-preset-taro": "4.0.4",
|
||||
"commitizen": "^4.3.0",
|
||||
"css-loader": "3.4.2",
|
||||
"cz-customizable": "^7.0.0",
|
||||
"eslint": "^8.55.0",
|
||||
"eslint-config-taro": "3.6.34",
|
||||
"eslint-config-taro": "4.0.4",
|
||||
"eslint-plugin-vue": "^9.19.2",
|
||||
"husky": "^8.0.3",
|
||||
"lint-staged": "^15.1.0",
|
||||
|
||||
@@ -74,7 +74,7 @@ const login = async () => {
|
||||
duration: 2000,
|
||||
});
|
||||
Taro.setStorageSync('token', res.data.token);
|
||||
if (optData.value.isBack !== 'undefined') {
|
||||
if (optData.value.isBack !== 'undefined' && optData.value.isBack) {
|
||||
await getUserInfo();
|
||||
Taro.navigateBack({
|
||||
delta: 2,
|
||||
|
||||
@@ -42,8 +42,9 @@ Taro.useLoad(opt => {
|
||||
});
|
||||
|
||||
const getPhoneNumber = async (e: any) => {
|
||||
// console.log(val.value);
|
||||
if (!val.value) {
|
||||
Taro.showToast({
|
||||
return Taro.showToast({
|
||||
title: '请先阅读并同意用户协议&隐私政策&积分使用规则',
|
||||
icon: 'none',
|
||||
});
|
||||
@@ -76,7 +77,7 @@ const getPhoneNumber = async (e: any) => {
|
||||
duration: 2000,
|
||||
});
|
||||
Taro.setStorageSync('token', ress.data.token);
|
||||
if (optData.value.isBack !== 'undefined') {
|
||||
if (optData.value.isBack !== 'undefined' && optData.value.isBack) {
|
||||
await getUserInfo();
|
||||
Taro.navigateBack({
|
||||
delta: 1,
|
||||
|
||||
Reference in New Issue
Block a user