冲突合并

.hbuilderx/launch.json

@@ -2,7 +2,7 @@
     "version" : "1.0",
     "configurations" : [
         {
-            "playground" : "custom",
+            "playground" : "standard",
             "type" : "uni-app:app-android"
         },
         {

src/pages/login/index.vue

@@ -20,9 +20,10 @@
 </template>
 
 <script setup>
-import { reactive, ref } from 'vue'
+import { onMounted, reactive, ref } from 'vue'
 import { appLoginAPI, getUserInfoAPI } from '@/services/index.js'
 import { useMemberStore } from '@/stores'
+import { onLoad } from '@dcloudio/uni-app'
 const memberStore = useMemberStore()
 
 // 登录参数

src/services/index.js

@@ -4,6 +4,7 @@ import { http } from '@/utils/http'
  * 登录接口
  */
 export const appLoginAPI = (data) => {
+	console.log('999')
     return http({
         method: 'POST',
         url: '/auth/login',

src/utils/http.js

@@ -6,8 +6,7 @@ import { useMemberStore } from '@/stores'
  *  baseURL 设置请求ip地址和端口
  */
 const ENV = process.env.NODE_ENV
-const baseURL = ENV === 'development' ? 'http://192.168.2.76:18080' : '***'
+export const baseURL = ENV === 'development' ? 'http://192.168.2.246:18080' : '***'
-
 /**
  * httpInterceptor 分别拦截 request 和 uploadFile 请求
  */
@@ -66,6 +65,11 @@ export const http = (options) => {
                             url: '/pages/login/index',
                         })
                         reject(res)
+                    } else if (res.data.code === 500)  {
+						uni.showToast({
+						    icon: 'none',
+						    title: `${res.data.msg}`,
+						})
 					}
                 } else if (res.statusCode === 401) {
                     // 2. 401 表示token过期 去往登录页重新登录

vite.config.js

@@ -20,7 +20,8 @@ export default defineConfig({
         proxy: {
             // 在此处编写代理规则
             '/api': {
-                target: 'http://192.168.2.76:18080',
+                // target: 'http://192.168.2.76:18080',
+                target: 'http://localhost:18080',
                 changeOrigin: true,
                 rewrite: (path) => {
                     return path.replace(/\/api/, '')