diff --git a/.env.development b/.env.development
index faaac77..3890df1 100644
--- a/.env.development
+++ b/.env.development
@@ -1,8 +1,9 @@
# 运行环境
-VITE_ENV=development
+VITE_PROD = false
+VITE_DEV = true
-# api域名
-VITE_API_URL = 'YOUR API URL'
+# BASE_URL
+VITE_BASE_URL = http://api-catch.ranesuangyu.top
# 上传域名
VITE_UPLOAD_URL = 'YOUR UPLOAD URL'
\ No newline at end of file
diff --git a/.env.production b/.env.production
index d521e59..4a7c385 100644
--- a/.env.production
+++ b/.env.production
@@ -1,8 +1,9 @@
# 运行环境
-VITE_ENV=production
+VITE_PROD = true
+VITE_DEV = false
# api域名
-VITE_API_URL = 'YOUR API URL'
+VITE_BASE_URL = 'YOUR API URL'
# 上传域名
VITE_UPLOAD_URL = 'YOUR UPLOAD URL'
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..a466545
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+ "i18n-ally.localesPaths": []
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index 46fb821..c85295c 100644
--- a/package.json
+++ b/package.json
@@ -47,6 +47,7 @@
"@dcloudio/uni-mp-toutiao": "3.0.0-alpha-3040820220424001",
"@dcloudio/uni-mp-weixin": "3.0.0-alpha-3040820220424001",
"@dcloudio/uni-quickapp-webview": "3.0.0-alpha-3040820220424001",
+ "lodash-es": "^4.17.21",
"vue": "^3.2.33",
"vue-i18n": "^9.1.9"
},
@@ -56,6 +57,7 @@
"@dcloudio/uni-automator": "3.0.0-alpha-3040820220424001",
"@dcloudio/uni-cli-shared": "3.0.0-alpha-3040820220424001",
"@dcloudio/vite-plugin-uni": "3.0.0-alpha-3040820220424001",
+ "@types/lodash-es": "^4.17.6",
"@types/node": "^17.0.38",
"@typescript-eslint/eslint-plugin": "^5.27.0",
"@typescript-eslint/parser": "^5.27.0",
@@ -80,7 +82,7 @@
},
"lint-staged": {
"*.{js,jsx,vue,ts,tsx}": [
- "pnpm lint",
+
"prettier --write",
"git add"
]
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 632afa7..60acba1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -18,6 +18,7 @@ specifiers:
'@dcloudio/uni-mp-weixin': 3.0.0-alpha-3040820220424001
'@dcloudio/uni-quickapp-webview': 3.0.0-alpha-3040820220424001
'@dcloudio/vite-plugin-uni': 3.0.0-alpha-3040820220424001
+ '@types/lodash-es': ^4.17.6
'@types/node': ^17.0.38
'@typescript-eslint/eslint-plugin': ^5.27.0
'@typescript-eslint/parser': ^5.27.0
@@ -27,6 +28,7 @@ specifiers:
eslint-plugin-vue: ^9.1.0
husky: ^8.0.1
lint-staged: ^13.0.0
+ lodash-es: ^4.17.21
mrm: ^4.0.0
prettier: ^2.6.2
sass: ^1.52.1
@@ -50,6 +52,7 @@ dependencies:
'@dcloudio/uni-mp-toutiao': registry.npmmirror.com/@dcloudio/uni-mp-toutiao/3.0.0-alpha-3040820220424001_vue@3.2.36
'@dcloudio/uni-mp-weixin': registry.npmmirror.com/@dcloudio/uni-mp-weixin/3.0.0-alpha-3040820220424001_vue@3.2.36
'@dcloudio/uni-quickapp-webview': registry.npmmirror.com/@dcloudio/uni-quickapp-webview/3.0.0-alpha-3040820220424001_vue@3.2.36
+ lodash-es: registry.npmmirror.com/lodash-es/4.17.21
vue: registry.npmmirror.com/vue/3.2.36
vue-i18n: registry.npmmirror.com/vue-i18n/9.1.10_vue@3.2.36
@@ -59,6 +62,7 @@ devDependencies:
'@dcloudio/uni-automator': registry.npmmirror.com/@dcloudio/uni-automator/3.0.0-alpha-3040820220424001_vue@3.2.36
'@dcloudio/uni-cli-shared': registry.npmmirror.com/@dcloudio/uni-cli-shared/3.0.0-alpha-3040820220424001_vue@3.2.36
'@dcloudio/vite-plugin-uni': registry.npmmirror.com/@dcloudio/vite-plugin-uni/3.0.0-alpha-3040820220424001_vite@2.9.9+vue@3.2.36
+ '@types/lodash-es': registry.npmmirror.com/@types/lodash-es/4.17.6
'@types/node': registry.npmmirror.com/@types/node/17.0.38
'@typescript-eslint/eslint-plugin': registry.npmmirror.com/@typescript-eslint/eslint-plugin/5.27.0_dszb5tb7atwkjjijmmov4qhi7i
'@typescript-eslint/parser': registry.npmmirror.com/@typescript-eslint/parser/5.27.0_xztl6dhthcahlo6akmb2bmjmle
@@ -1283,6 +1287,20 @@ packages:
'@types/node': registry.npmmirror.com/@types/node/17.0.38
dev: true
+ registry.npmmirror.com/@types/lodash-es/4.17.6:
+ resolution: {integrity: sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/lodash-es/-/lodash-es-4.17.6.tgz}
+ name: '@types/lodash-es'
+ version: 4.17.6
+ dependencies:
+ '@types/lodash': registry.npmmirror.com/@types/lodash/4.14.182
+ dev: true
+
+ registry.npmmirror.com/@types/lodash/4.14.182:
+ resolution: {integrity: sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/lodash/-/lodash-4.14.182.tgz}
+ name: '@types/lodash'
+ version: 4.14.182
+ dev: true
+
registry.npmmirror.com/@types/node/17.0.38:
resolution: {integrity: sha512-5jY9RhV7c0Z4Jy09G+NIDTsCZ5G0L5n+Z+p+Y7t5VJHM30bgwzSjVtlcBxqAj+6L/swIlvtOSzr8rBk/aNyV2g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/node/-/node-17.0.38.tgz}
name: '@types/node'
@@ -4427,6 +4445,12 @@ packages:
p-locate: registry.npmmirror.com/p-locate/4.1.0
dev: true
+ registry.npmmirror.com/lodash-es/4.17.21:
+ resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/lodash-es/-/lodash-es-4.17.21.tgz}
+ name: lodash-es
+ version: 4.17.21
+ dev: false
+
registry.npmmirror.com/lodash.camelcase/4.3.0:
resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz}
name: lodash.camelcase
diff --git a/src/assets/style/main.scss b/src/assets/style/main.scss
index 32d3d27..d279aa4 100644
--- a/src/assets/style/main.scss
+++ b/src/assets/style/main.scss
@@ -11,4 +11,4 @@
height: 0 !important;
-webkit-appearance: none;
background: transparent;
-}
\ No newline at end of file
+}
diff --git a/src/env.d.ts b/src/env.d.ts
index 64d18cd..68cd434 100644
--- a/src/env.d.ts
+++ b/src/env.d.ts
@@ -10,8 +10,10 @@ declare module '*.vue' {
interface ImportMetaEnv {
readonly VITE_ENV: string;
readonly VITE_APP_TITLE: string;
- readonly VITE_API_URL: string;
+ readonly VITE_BASE_URL: string;
readonly VITE_UPLOAD_URL: string;
+ readonly VITE_PROD: boolean;
+ readonly VITE_DEV: boolean;
}
interface ImportMeta {
diff --git a/src/main.ts b/src/main.ts
index 317c4ad..bbdeaa9 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,9 @@
import { createSSRApp } from 'vue';
import App from './App.vue';
import 'virtual:windi.css';
+import { setupInterceptors } from '@/utils/interceptors';
+
+setupInterceptors();
export function createApp() {
const app = createSSRApp(App);
return {
diff --git a/src/pages.json b/src/pages.json
index 8a92cfb..6bbf9ca 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -6,6 +6,12 @@
"style": {
"navigationBarTitleText": "uni-app"
}
+ },
+ {
+ "path": "pages/login/index",
+ "style": {
+ "navigationBarTitleText": "登录"
+ }
}
],
"globalStyle": {
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index aae13e4..1befb45 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -4,7 +4,11 @@
{{ title }}
+ {{ url }} ----
+
+
+
@@ -12,6 +16,15 @@
import { ref } from 'vue';
import Test from '@/components/test/Test.vue';
const title = ref('Hello');
+ const url = import.meta.env.VITE_BASE_URL;
+ console.log('url', url);
+ const jumLogin = () => {
+ console.log('/pages/login/index');
+
+ // uni.navigateTo({
+ // url: '/pages/login/index',
+ // });
+ };
diff --git a/src/utils/http/request/index.ts b/src/utils/http/request/index.ts
new file mode 100644
index 0000000..431953b
--- /dev/null
+++ b/src/utils/http/request/index.ts
@@ -0,0 +1,69 @@
+const BASE_URL = import.meta.env.VITE_BASE_URL;
+function createRequest(options: RequestOptions) {
+ const _options = Object.assign({}, options);
+ return new Promise((resolve, reject) => {
+ uni.request({
+ ..._options,
+ success(res) {
+ const { statusCode, data: resData } = res;
+ if (statusCode === 200) {
+ const { code, data, message } = resData;
+ switch (code) {
+ case 10000:
+ resolve(resData);
+ break;
+ case 10001:
+ default:
+ reject(resData);
+ break;
+ }
+ }
+ },
+ fail(err) {
+ reject(err);
+ },
+ });
+ });
+}
+
+export const request = createRequest;
+
+function beforeRequestInterceptors(args: any) {
+ uni.showLoading({});
+ args.url = `${BASE_URL}${args.url}`;
+ args.dataType = 'json';
+ args.responseType = 'text';
+ args.header = {
+ 'Content-Type': 'application/json;charset=UTF-8;',
+ Accept: 'application/json, text/plain, */*',
+ };
+}
+
+function responseSuccessInterceptors(res: any) {}
+
+function responseFailInterceptors(err: any) {}
+
+function completeInterceptors(res: any) {
+ uni.hideLoading();
+}
+
+export function requestInterceptors() {
+ uni.addInterceptor('request', {
+ invoke(args) {
+ // request 触发前拦截
+ beforeRequestInterceptors(args);
+ },
+ success(res) {
+ // 响应成功后触发拦截
+ responseSuccessInterceptors(res);
+ },
+ fail(err) {
+ // 响应失败后触发拦截
+ responseFailInterceptors(err);
+ },
+ complete(res) {
+ // 响应失败后触发拦截
+ completeInterceptors(res);
+ },
+ });
+}
diff --git a/src/utils/http/request/request.d.ts b/src/utils/http/request/request.d.ts
new file mode 100644
index 0000000..b33c354
--- /dev/null
+++ b/src/utils/http/request/request.d.ts
@@ -0,0 +1 @@
+declare type RequestOptions = UniApp.RequestOptions;
diff --git a/src/utils/interceptors/index.ts b/src/utils/interceptors/index.ts
new file mode 100644
index 0000000..c50750a
--- /dev/null
+++ b/src/utils/interceptors/index.ts
@@ -0,0 +1,5 @@
+import { requestInterceptors } from '@/utils/http/request';
+
+export function setupInterceptors() {
+ requestInterceptors();
+}
diff --git a/tsconfig.json b/tsconfig.json
index 8a7712f..5d9c79f 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -15,5 +15,11 @@
"@/*":["./src/*"]
}
},
- "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue"]
+ "include": [
+ "src/**/*.ts",
+ "src/**/*.d.ts",
+ "src/**/*.tsx",
+ "src/**/*.vue",
+ "node_modules/**/uni.d.ts"
+ ]
}
diff --git a/vite.config.ts b/vite.config.ts
index 1715213..5eb591e 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -37,11 +37,11 @@ export default defineConfig({
// 设计稿的像素宽度值，该尺寸会影响 rpx 转换过程中的计算比率
designWidth: 350,
}),
- eslintPlugin({
- include: ['src/**/*.js', 'src/**/*.vue', 'src/**/*.ts'],
- exclude: ['./node_modules/**'],
- cache: false,
- }),
+ // eslintPlugin({
+ // include: ['src/**/*.js', 'src/**/*.vue', 'src/**/*.ts'],
+ // exclude: ['./node_modules/**'],
+ // cache: false,
+ // }),
],
css: {
preprocessorOptions: {