XinLingKeJi/jdt-user
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'test'

Browse Source
This commit is contained in:
YuanHuakk
2023-12-03 21:10:48 +08:00
parent 878cc05673 e2a3e0b5eb
commit 62f1f3454c
4 changed files with 10153 additions and 4220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "jdt-user", "name": "jdt-user",
"version": "3.0.0", "version": "3.0.1",
"private": true, "private": true,
"description": "", "description": "",
"templateInfo": { "templateInfo": {
@@ -9,7 +9,7 @@
"css": "sass" "css": "sass"
}, },
"taroConfig": { "taroConfig": {
"version": "3.0.0" "version": "3.0.1"
}, },
"scripts": { "scripts": {
"build:weapp": "taro build --type weapp", "build:weapp": "taro build --type weapp",
@@ -59,9 +59,9 @@
} }
}, },
"dependencies": { "dependencies": {
"@babel/runtime": "^7.23.2", "@babel/runtime": "^7.23.5",
"@nutui/icons-vue-taro": "^0.0.9", "@nutui/icons-vue-taro": "^0.0.9",
"@nutui/nutui-taro": "^4.2.0", "@nutui/nutui-taro": "^4.2.3",
"@qiun/vue-ucharts": "2.5.0-20230101", "@qiun/vue-ucharts": "2.5.0-20230101",
"@tarojs/components": "3.6.19", "@tarojs/components": "3.6.19",
"@tarojs/helper": "3.6.19", "@tarojs/helper": "3.6.19",
@@ -79,31 +79,31 @@
"@tarojs/taro": "3.6.19", "@tarojs/taro": "3.6.19",
"dayjs": "^1.11.10", "dayjs": "^1.11.10",
"pinia": "^2.1.7", "pinia": "^2.1.7",
"vue": "^3.3.8" "vue": "^3.3.9"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.23.3", "@babel/core": "^7.23.5",
"@commitlint/cli": "^18.2.0", "@commitlint/cli": "^18.4.3",
"@commitlint/config-conventional": "^18.1.0", "@commitlint/config-conventional": "^18.4.3",
"@tarojs/cli": "3.6.19", "@tarojs/cli": "3.6.19",
"@tarojs/plugin-mini-ci": "^3.6.20", "@tarojs/plugin-mini-ci": "^3.6.20",
"@tarojs/taro-loader": "3.6.19", "@tarojs/taro-loader": "3.6.19",
"@tarojs/webpack5-runner": "3.6.19", "@tarojs/webpack5-runner": "3.6.19",
"@types/node": "^18.18.9", "@types/node": "^18.19.0",
"@types/webpack-env": "^1.18.4", "@types/webpack-env": "^1.18.4",
"@typescript-eslint/eslint-plugin": "^6.10.0", "@typescript-eslint/eslint-plugin": "^6.13.1",
"@typescript-eslint/parser": "^6.10.0", "@typescript-eslint/parser": "^6.13.1",
"@vue/babel-plugin-jsx": "^1.1.5", "@vue/babel-plugin-jsx": "^1.1.5",
"@vue/compiler-sfc": "^3.3.8", "@vue/compiler-sfc": "^3.3.9",
"babel-preset-taro": "3.6.19", "babel-preset-taro": "3.6.19",
"commitizen": "^4.3.0", "commitizen": "^4.3.0",
"css-loader": "3.4.2", "css-loader": "3.4.2",
"cz-customizable": "^7.0.0", "cz-customizable": "^7.0.0",
"eslint": "^8.53.0", "eslint": "^8.54.0",
"eslint-config-taro": "3.6.19", "eslint-config-taro": "3.6.19",
"eslint-plugin-vue": "^9.18.1", "eslint-plugin-vue": "^9.19.2",
"husky": "^8.0.3", "husky": "^8.0.3",
"lint-staged": "^15.0.2", "lint-staged": "^15.1.0",
"style-loader": "1.3.0", "style-loader": "1.3.0",
"stylelint": "9.3.0", "stylelint": "9.3.0",
"ts-node": "^10.9.1", "ts-node": "^10.9.1",

14339
pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff

2
src/pages/admin/withdrawal/index.vue
View File

@@ -107,7 +107,7 @@ const getData = async () => {
}); });
data.value = res.data.data || []; data.value = res.data.data || [];
pagination.value.totalItems = res.data.total; pagination.value.totalItems = res.data.total;
row.value = res.data.integral || 0; row.value = res.data.data.integral || 0;
console.log(res); console.log(res);
} catch (e) { } catch (e) {
throw e; throw e;

2
src/pages/users/account/index.vue
View File

@@ -3,8 +3,6 @@ import { computed, ref } from "vue";
import Taro from "@tarojs/taro"; import Taro from "@tarojs/taro";
import { getIntegralDetail, getBeanDetail, getGiftRecord } from "@/api/user"; import { getIntegralDetail, getBeanDetail, getGiftRecord } from "@/api/user";
// Taro.setStorageSync("token", "ok_OL66Ej4_lkQKNA0AwxnGwGyXo");
const tabValue = ref(1); const tabValue = ref(1);
const tabsList = ref([ const tabsList = ref([