Merge branch 'base' into tabbar

2024-05-08 20:27:06 +08:00
parent 5eadda62de 1914f43972
commit ffa5c68e66
12 changed files with 61 additions and 220 deletions
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,79 +0,0 @@
-{
-  "name": "unibest-base",
-  "appid": "H57F2ACE4",
-  "description": "",
-  "versionName": "1.0.0",
-  "versionCode": "100",
-  "transformPx": false,
-  "app-plus": {
-    "usingComponents": true,
-    "nvueStyleCompiler": "uni-app",
-    "compilerVersion": 3,
-    "splashscreen": {
-      "alwaysShowBeforeRender": true,
-      "waiting": true,
-      "autoclose": true,
-      "delay": 0
-    },
-    "modules": {},
-    "distribute": {
-      "android": {
-        "permissions": [
-          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-          "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-          "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-          "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-          "<uses-feature android:name=\"android.hardware.camera\"/>",
-          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-        ],
-        "minSdkVersion": 30,
-        "targetSdkVersion": 30,
-        "abiFilters": [
-          "armeabi-v7a",
-          "arm64-v8a"
-        ]
-      },
-      "ios": {},
-      "sdkConfigs": {},
-      "icons": {
-        "android": {},
-        "ios": {}
-      }
-    }
-  },
-  "quickapp": {},
-  "mp-weixin": {
-    "appid": "wxa2abb91f64032a2b",
-    "setting": {
-      "urlCheck": false
-    },
-    "usingComponents": true
-  },
-  "mp-alipay": {
-    "usingComponents": true
-  },
-  "mp-baidu": {
-    "usingComponents": true
-  },
-  "mp-toutiao": {
-    "usingComponents": true
-  },
-  "uniStatistics": {
-    "enable": false
-  },
-  "vueVersion": "3",
-  "h5": {
-    "router": {
-      "base": "/"
-    }
-  }
-}
--- a/src/pages.json
+++ b/src/pages.json
@@ -1,90 +0,0 @@
-{
-  "globalStyle": {
-    "navigationStyle": "default",
-    "navigationBarTitleText": "unibest",
-    "navigationBarBackgroundColor": "#f8f8f8",
-    "navigationBarTextStyle": "black",
-    "backgroundColor": "#FFFFFF"
-  },
-  "easycom": {
-    "autoscan": true,
-    "custom": {
-      "^wd-(.*)": "wot-design-uni/components/wd-$1/wd-$1.vue"
-    }
-  },
-  "tabBar": {
-    "custom": true,
-    "color": "#999999",
-    "selectedColor": "#018d71",
-    "backgroundColor": "#F8F8F8",
-    "borderStyle": "black",
-    "height": "50px",
-    "fontSize": "10px",
-    "iconWidth": "24px",
-    "spacing": "3px",
-    "list": [
-      {
-        "iconPath": "static/tabbar/home.png",
-        "selectedIconPath": "static/tabbar/homeHL.png",
-        "pagePath": "pages/index/index",
-        "text": "首页"
-      },
-      {
-        "iconPath": "static/tabbar/example.png",
-        "selectedIconPath": "static/tabbar/exampleHL.png",
-        "pagePath": "pages/index/about",
-        "text": "关于"
-      }
-    ]
-  },
-  "pages": [
-    {
-      "path": "pages/index/index",
-      "type": "home",
-      "style": {
-        "navigationStyle": "custom",
-        "navigationBarTitleText": "首页"
-      }
-    },
-    {
-      "path": "pages/index/about",
-      "type": "page",
-      "style": {
-        "navigationBarTitleText": "关于"
-      }
-    },
-    {
-      "path": "pages/index/request",
-      "type": "page",
-      "layout": "demo",
-      "style": {
-        "navigationBarTitleText": "请求"
-      }
-    },
-    {
-      "path": "pages/index/request2",
-      "type": "page",
-      "layout": "demo",
-      "style": {
-        "navigationBarTitleText": "请求-状态一体化"
-      }
-    },
-    {
-      "path": "pages/index/upload",
-      "type": "page",
-      "layout": "default",
-      "style": {
-        "navigationBarTitleText": "上传"
-      }
-    },
-    {
-      "path": "pages/index/upload2",
-      "type": "page",
-      "layout": "default",
-      "style": {
-        "navigationBarTitleText": "上传-状态一体化"
-      }
-    }
-  ],
-  "subPackages": []
-}
--- a/src/service/index/foo.ts
+++ b/src/service/index/foo.ts
@@ -1,4 +1,4 @@
-import { http, httpGet } from '@/utils/http'
+import { http } from '@/utils/http'
 export interface IFooItem {
  id: string
  name: string
@@ -15,7 +15,7 @@ export const getFooAPI = (name: string) => {

 /** GET 请求 - 再次简化，看大家是否喜欢这种简化 */
 export const getFooAPI2 = (name: string) => {
-  return httpGet<IFooItem>('/foo', { name })
+  return http.get<IFooItem>('/foo', { name })
 }

 /** POST 请求 */
@@ -27,3 +27,7 @@ export const postFooAPI = (name: string) => {
    data: { name },
  })
 }
+/** POST 请求 - 再次简化，看大家是否喜欢这种简化 */
+export const postFooAPI2 = (name: string) => {
+  return http.post<IFooItem>('/foo', { name }, { name })
+}
--- a/src/uni_modules/.gitkeep
+++ b/src/uni_modules/.gitkeep
--- a/src/utils/http.ts
+++ b/src/utils/http.ts
@@ -41,6 +41,7 @@ export const http = <T>(options: CustomRequestOptions) => {
    })
  })
 }
+
 /**
 * GET 请求
 * @param url 后台地址
@@ -74,3 +75,6 @@ export const httpPost = <T>(
    method: 'POST',
  })
 }
+
+http.get = httpGet
+http.post = httpPost
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -1,16 +1,18 @@
-import pagesJson from '@/pages.json'
-
-console.log(pagesJson)
+import { pages, subPackages, tabBar } from '@/pages.json'

 /** 判断当前页面是否是tabbar页  */
 export const getIsTabbar = () => {
-  if (!Object.keys(pagesJson).includes('tabBar')) {
+  if (!tabBar) {
    return false
  }
-  const pages = getCurrentPages()
-  const lastPage = pages.at(-1)
+  if (!tabBar.list.length) {
+    // 通常有tabBar的话，list不能有空，且至少有2个元素，这里其实不用处理
+    return false
+  }
+  // getCurrentPages() 至少有1个元素，所以不再额外判断
+  const lastPage = getCurrentPages().at(-1)
  const currPath = lastPage.route
-  return !!pagesJson.tabBar.list.find((e) => e.pagePath === currPath)
+  return !!tabBar.list.find((e) => e.pagePath === currPath)
 }

 /**
@@ -19,10 +21,8 @@ export const getIsTabbar = () => {
 * redirectPath 如 ‘/pages/demo/base/route-interceptor’
 */
 export const currRoute = () => {
-  const pages = getCurrentPages()
-  console.log('pages:', pages)
-
-  const lastPage = pages.at(-1)
+  // getCurrentPages() 至少有1个元素，所以不再额外判断
+  const lastPage = getCurrentPages().at(-1)
  const currRoute = (lastPage as any).$page
  // console.log('lastPage.$page:', currRoute)
  // console.log('lastPage.$page.fullpath:', currRoute.fullPath)
@@ -66,8 +66,8 @@ export const getUrlObj = (url: string) => {
 */
 export const getAllPages = (key = 'needLogin') => {
  // 这里处理主包
-  const pages = [
-    ...pagesJson.pages
+  const mainPages = [
+    ...pages
      .filter((page) => !key || page[key])
      .map((page) => ({
        ...page,
@@ -76,7 +76,7 @@ export const getAllPages = (key = 'needLogin') => {
  ]
  // 这里处理分包
  const subPages: any[] = []
-  pagesJson.subPackages.forEach((subPageObj) => {
+  subPackages.forEach((subPageObj) => {
    // console.log(subPageObj)
    const { root } = subPageObj

@@ -89,7 +89,7 @@ export const getAllPages = (key = 'needLogin') => {
        })
      })
  })
-  const result = [...pages, ...subPages]
+  const result = [...mainPages, ...subPages]
  console.log(`getAllPages by ${key} result: `, result)
  return result
 }