Merge branch 'test'
This commit is contained in:
30
package.json
30
package.json
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "jdt-user",
|
||||
"version": "3.0.0",
|
||||
"version": "3.0.1",
|
||||
"private": true,
|
||||
"description": "",
|
||||
"templateInfo": {
|
||||
@@ -9,7 +9,7 @@
|
||||
"css": "sass"
|
||||
},
|
||||
"taroConfig": {
|
||||
"version": "3.0.0"
|
||||
"version": "3.0.1"
|
||||
},
|
||||
"scripts": {
|
||||
"build:weapp": "taro build --type weapp",
|
||||
@@ -59,9 +59,9 @@
|
||||
}
|
||||
},
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.23.2",
|
||||
"@babel/runtime": "^7.23.5",
|
||||
"@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",
|
||||
"@tarojs/components": "3.6.19",
|
||||
"@tarojs/helper": "3.6.19",
|
||||
@@ -79,31 +79,31 @@
|
||||
"@tarojs/taro": "3.6.19",
|
||||
"dayjs": "^1.11.10",
|
||||
"pinia": "^2.1.7",
|
||||
"vue": "^3.3.8"
|
||||
"vue": "^3.3.9"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/core": "^7.23.3",
|
||||
"@commitlint/cli": "^18.2.0",
|
||||
"@commitlint/config-conventional": "^18.1.0",
|
||||
"@babel/core": "^7.23.5",
|
||||
"@commitlint/cli": "^18.4.3",
|
||||
"@commitlint/config-conventional": "^18.4.3",
|
||||
"@tarojs/cli": "3.6.19",
|
||||
"@tarojs/plugin-mini-ci": "^3.6.20",
|
||||
"@tarojs/taro-loader": "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",
|
||||
"@typescript-eslint/eslint-plugin": "^6.10.0",
|
||||
"@typescript-eslint/parser": "^6.10.0",
|
||||
"@typescript-eslint/eslint-plugin": "^6.13.1",
|
||||
"@typescript-eslint/parser": "^6.13.1",
|
||||
"@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",
|
||||
"commitizen": "^4.3.0",
|
||||
"css-loader": "3.4.2",
|
||||
"cz-customizable": "^7.0.0",
|
||||
"eslint": "^8.53.0",
|
||||
"eslint": "^8.54.0",
|
||||
"eslint-config-taro": "3.6.19",
|
||||
"eslint-plugin-vue": "^9.18.1",
|
||||
"eslint-plugin-vue": "^9.19.2",
|
||||
"husky": "^8.0.3",
|
||||
"lint-staged": "^15.0.2",
|
||||
"lint-staged": "^15.1.0",
|
||||
"style-loader": "1.3.0",
|
||||
"stylelint": "9.3.0",
|
||||
"ts-node": "^10.9.1",
|
||||
|
||||
14339
pnpm-lock.yaml
generated
14339
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
@@ -107,7 +107,7 @@ const getData = async () => {
|
||||
});
|
||||
data.value = res.data.data || [];
|
||||
pagination.value.totalItems = res.data.total;
|
||||
row.value = res.data.integral || 0;
|
||||
row.value = res.data.data.integral || 0;
|
||||
console.log(res);
|
||||
} catch (e) {
|
||||
throw e;
|
||||
|
||||
@@ -3,8 +3,6 @@ import { computed, ref } from "vue";
|
||||
import Taro from "@tarojs/taro";
|
||||
import { getIntegralDetail, getBeanDetail, getGiftRecord } from "@/api/user";
|
||||
|
||||
// Taro.setStorageSync("token", "ok_OL66Ej4_lkQKNA0AwxnGwGyXo");
|
||||
|
||||
const tabValue = ref(1);
|
||||
|
||||
const tabsList = ref([
|
||||
|
||||
Reference in New Issue
Block a user