Merge branch 'demo'

codercup · Apr 5, 2024 · 047d1a3 · 047d1a3
2 parents c33faf5 + 622c695
commit 047d1a3
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 11 deletions.
diff --git a/mock/test.ts b/mock/test.ts
@@ -9,7 +9,7 @@ export default [
     response: ({ query }) => {
       return {
         code: 0,
-        result: {
+        data: {
           name: '菲鸽',
         },
       }
@@ -21,7 +21,7 @@ export default [
     timeout: 2000,
     response: {
       code: 0,
-      result: {
+      data: {
         name: '菲鸽',
       },
     },

diff --git a/src/pages.json b/src/pages.json
@@ -72,6 +72,13 @@
         "navigationBarTitleText": "登录"
       }
     },
+    {
+      "path": "pages/my/index",
+      "type": "page",
+      "style": {
+        "navigationBarTitleText": "我的"
+      }
+    },
     {
       "path": "pages/demo/base/auto-import",
       "type": "page",

diff --git a/src/pages/demo/base/mock.vue b/src/pages/demo/base/mock.vue
@@ -30,7 +30,7 @@ const data = ref()
 
 const getFoo = async () => {
   const res = await getMockAPI('菲鸽')
-  data.value = res.result
+  data.value = res.data
   originalData.value = res
 }
 

diff --git a/src/pages/demo/base/request.vue b/src/pages/demo/base/request.vue
@@ -48,14 +48,14 @@ const originalData = ref<IResData<IFooItem>>()
 const data = ref<IFooItem>()
 const getFoo = async () => {
   const res = await getFooAPI('菲鸽')
-  data.value = res.result
+  data.value = res.data
   originalData.value = res
 }
 
 const data2 = ref<IFooItem>()
 const postFoo = async () => {
   const res = await postFooAPI('菲鸽2')
-  data2.value = res.result
+  data2.value = res.data
 }
 
 const reset = () => {

diff --git a/src/pages/index/request.vue b/src/pages/index/request.vue
@@ -44,12 +44,12 @@ onLoad(() => {
 const data = ref<IFooItem>()
 const getFoo = async () => {
   const res = await getFooAPI('菲鸽')
-  data.value = res.result
+  data.value = res.data
 }
 
 const data2 = ref<IFooItem>()
 const postFoo = async () => {
   const res = await postFooAPI('菲鸽2')
-  data2.value = res.result
+  data2.value = res.data
 }
 </script>
diff --git a/src/pages/my/index.vue b/src/pages/my/index.vue
@@ -28,8 +28,10 @@ uni.login({
         code,
       },
     })
-    openId.value = res.result.openid
-    userStore.setUserInfo({ openid: res.result.openid })
+    console.log('微信登录-1：', res)
+    // {code: 0, msg: "success", data: {session_key: "JTzhLVK+oM3X58uJ/heDcQ==", openid: "oSYa06xPVqjsK-eFYzt0kSPYu1q4"}}
+    openId.value = res.data.openid
+    userStore.setUserInfo({ openid: res.data.openid })
   },
 })
 </script>
diff --git a/src/typings.d.ts b/src/typings.d.ts
@@ -5,7 +5,7 @@
 type IResData<T> = {
   code: number
   msg: string
-  result: T
+  data: T
 }
 
 // uni.uploadFile文件上传参数

diff --git a/vite.config.ts b/vite.config.ts
@@ -53,7 +53,7 @@ export default ({ command, mode }) => {
 
     plugins: [
       UniPages({
-        exclude: ['**/components/**/**.*', '**/my/**/**.vue'],
+        exclude: ['**/components/**/**.*'],
         routeBlockLang: 'json5', // 虽然设了默认值，但是vue文件还是要加上 lang="json5", 这样才能很好地格式化
         homePage: 'pages/index/index',
         subPackages: ['src/pages-sub'], // 是个数组，可以配置多个