create-young-proj 0.7.0 → 0.9.0

package/template-uni-app/src/pages.json

@@ -5,13 +5,19 @@
       "path": "pages/index",
       "type": "home",
       "needLogin": true,
-      "layout": "tabbar"
+      "layout": "tabbar",
+      "navbar": {
+        "isback": false
+      }
     },
     {
       "path": "pages/my",
       "type": "page",
       "needLogin": true,
-      "layout": "tabbar"
+      "layout": "tabbar",
+      "navbar": {
+        "isback": false
+      }
     },
     {
       "path": "pages/demo/index",
@@ -65,4 +71,4 @@
     }
   },
   "subPackages": []
-}
+}

package/template-uni-app/src/store/index.ts

@@ -4,13 +4,13 @@
  * @LastEditTime: 2023-07-18 15:20:22
  * @Description:
  */
-import type { App } from 'vue';
-import { createPinia } from 'pinia';
+import type { App } from 'vue'
+import { createPinia } from 'pinia'
 
 export function setupStore(app: App) {
-  const store = createPinia();
-  app.use(store);
+  const store = createPinia()
+  app.use(store)
 }
 
-export * from './local';
-export * from './system';
+export * from './local'
+export * from './system'

package/template-uni-app/src/store/local/index.ts

@@ -4,37 +4,39 @@
  * @LastEditTime: 2023-07-19 16:50:39
  * @Description:
  */
-import { randomId } from '@bluesyoung/utils';
+import { randomId } from '@bluesyoung/utils'
 
-export type LocationInfo = {
-  longitude: string | number;
-  latitude: string | number;
-  city?: string;
-  timer: number;
-};
-export type NavInfo = {
+export interface LocationInfo {
+  longitude: string | number
+  latitude: string | number
+  city?: string
+  timer: number
+}
+export interface NavInfo {
   /**
    * 系统状态栏高度
    */
-  statusBarH: number;
+  statusBarH: number
   /**
    * 自定义导航栏高度 = 胶囊下距离 + 胶囊上距离 - 状态栏高度
    */
-  customBarH: number;
+  customBarH: number
   /**
    * 底部安全距离
    */
-  safeBottom: number;
-};
+  safeBottom: number
+}
 
-export const getLocationInfo = () => uni.getStorageSync(YoungStorageKeys.位置信息) as LocationInfo;
-export const setLocationInfo = (v: LocationInfo) =>
-  uni.setStorageSync(YoungStorageKeys.位置信息, v);
-export const removeLocationInfo = () => uni.removeStorageSync(YoungStorageKeys.位置信息);
+export const getLocationInfo = () => uni.getStorageSync(YoungStorageKeys.位置信息) as LocationInfo
+export function setLocationInfo(v: LocationInfo) {
+  return uni.setStorageSync(YoungStorageKeys.位置信息, v)
+}
+export const removeLocationInfo = () => uni.removeStorageSync(YoungStorageKeys.位置信息)
 
-export const getUuid = () => uni.getStorageSync(YoungStorageKeys.唯一标识) as string;
-export const setUuid = () =>
-  uni.setStorageSync(YoungStorageKeys.唯一标识, randomId() + randomId() + randomId() + randomId());
+export const getUuid = () => uni.getStorageSync(YoungStorageKeys.唯一标识) as string
+export function setUuid() {
+  return uni.setStorageSync(YoungStorageKeys.唯一标识, randomId() + randomId() + randomId() + randomId())
+}
 
-export const setNavbarHeihgt = (v: NavInfo) => uni.setStorageSync(YoungStorageKeys.导航栏高度, v);
-export const getNavbarHeihgt = () => uni.getStorageSync(YoungStorageKeys.导航栏高度) as NavInfo;
+export const setNavbarHeihgt = (v: NavInfo) => uni.setStorageSync(YoungStorageKeys.导航栏高度, v)
+export const getNavbarHeihgt = () => uni.getStorageSync(YoungStorageKeys.导航栏高度) as NavInfo

package/template-uni-app/src/store/system.ts

@@ -1,20 +1,21 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-07-18 15:20:04
- * @LastEditTime: 2023-07-20 15:00:01
+ * @LastEditTime: 2023-08-25 16:20:11
  * @Description:
  */
-import type { PageMetaDatum } from '@uni-helper/vite-plugin-uni-pages';
-import { defineStore } from 'pinia';
+import type { PageMetaDatum } from '@uni-helper/vite-plugin-uni-pages'
+import { defineStore } from 'pinia'
 
 export const useSystemInfo = defineStore('useSystemInfo', () => {
-  const systemInfo = ref<UniApp.GetSystemInfoResult>();
-  const pagesInfo = ref<PageMetaDatum[]>([]);
+  const systemInfo = ref<UniApp.GetSystemInfoResult>()
+  const pagesInfo = ref<PageMetaDatum[]>([])
 
-  return { systemInfo, pagesInfo };
-});
+  return { systemInfo, pagesInfo }
+})
 
 export const useHttpLoading = defineStore('useHttpLoading', () => {
-  const httpLoadingEl = ref();
-  return { httpLoadingEl };
-});
+  const fullscreenLoading = ref(false)
+  const smallLoading = ref(false)
+  return { smallLoading, fullscreenLoading }
+})

package/template-uni-app/src/typings/global.d.ts

@@ -0,0 +1,7 @@
+/*
+ * @Author: zhangyang
+ * @Date: 2023-08-25 16:36:22
+ * @LastEditTime: 2023-08-25 16:36:22
+ * @Description:
+ */
+type ParamsObj = Record<string, any>;

package/template-uni-app/src/utils/auth.ts

@@ -1,40 +1,41 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-07-18 14:28:16
- * @LastEditTime: 2023-07-19 16:51:04
+ * @LastEditTime: 2023-08-29 10:22:48
  * @Description: 权限相关
  */
 /**
  * 获取微信授权码
  */
-export const getWxCode = async () =>
-  new Promise<string>((resolve, reject) => {
+export async function getWxCode() {
+  return new Promise<string>((resolve, reject) => {
     uni.login({
       provider: 'weixin',
       success: (res) => {
-        if (res.errMsg === 'login:ok') {
-          resolve(res.code);
-        } else {
-          reject('wechat auth fail');
-        }
+        if (res.errMsg === 'login:ok')
+          resolve(res.code)
+        else
+          reject('wechat auth fail')
       },
       fail: () => {
-        reject('wechat auth fail');
+        reject('wechat auth fail')
       },
-    });
-  });
+    })
+  })
+}
 
 /**
  * 定位
  */
-export const locate = (cancelback = true) =>
-  new Promise<UniApp.GetLocationSuccess & { timer?: number }>((_resolve, _reject) => {
-    const position = getLocationInfo();
+export function locate(cancelback = true) {
+  return new Promise<UniApp.GetLocationSuccess & { timer?: number }>((_resolve, _reject) => {
+    const position = getLocationInfo()
     // 系统 getLocation 30s 获取一次  这里延续到 60s
     if (new Date().getTime() - position.timer < 1000 * 60) {
-      setLocationInfo(position);
-      _resolve(position as unknown as UniApp.GetLocationSuccess);
-    } else {
+      setLocationInfo(position)
+      _resolve(position as unknown as UniApp.GetLocationSuccess)
+    }
+    else {
       uni.getLocation({
         type: 'gcj02',
         success: (res) => {
@@ -42,44 +43,46 @@ export const locate = (cancelback = true) =>
             latitude: res.latitude,
             longitude: res.longitude,
             timer: Date.now(),
-          });
+          })
 
-          console.log(res, 'location');
-          _resolve(res);
+          console.log(res, 'location')
+          _resolve(res)
         },
         fail: (res: UniApp.GetLocationSuccess & { errMsg: string }) => {
-          console.log(res, 'location');
-          if (cancelback) {
-            _reject(res);
-          } else {
-            _resolve(position as unknown as UniApp.GetLocationSuccess);
-          }
+          console.log(res, 'location')
+          if (cancelback)
+            _reject(res)
+          else
+            _resolve(position as unknown as UniApp.GetLocationSuccess)
         },
-      });
+      })
     }
-  });
+  })
+}
 
 /**
  * 授权定位
  * @param {boolean} cancelback  取消授权时是否有回调值
  */
-export const authLocation = async (cancelback = true, isShowModal = true) =>
-  new Promise<UniApp.GetLocationSuccess>(async (resolve, reject) => {
+export async function authLocation(cancelback = true, isShowModal = true) {
+  return new Promise<UniApp.GetLocationSuccess>(async (resolve, reject) => {
     uni.getSetting({
       withSubscriptions: true,
       success: async (conf) => {
         if (conf.authSetting['scope.userLocation']) {
           // 同意过定位授权
-          const position = await locate();
-          uni.$emit(AuthLocationEvents.同意授权, true);
-          resolve(position);
-        } else {
+          const position = await locate()
+          uni.$emit(AuthLocationEvents.同意授权, true)
+          resolve(position)
+        }
+        else {
           try {
-            const position = await locate();
-            uni.$emit(AuthLocationEvents.同意授权, true);
-            resolve(position);
-          } catch (error) {
-            console.log(error);
+            const position = await locate()
+            uni.$emit(AuthLocationEvents.同意授权, true)
+            resolve(position)
+          }
+          catch (error) {
+            console.log(error)
             if (isShowModal) {
               // 是否显示弹窗
               showModal({
@@ -91,35 +94,111 @@ export const authLocation = async (cancelback = true, isShowModal = true) =>
                       success: async (e) => {
                         console.log(
                           e.authSetting['scope.userLocation'],
-                          `e.authSetting['scope.userLocation']`,
-                        );
+                          'e.authSetting[\'scope.userLocation\']',
+                        )
                         if (e.authSetting['scope.userLocation']) {
-                          const position = await locate();
-                          resolve(position);
-                        } else {
-                          reject(false);
+                          const position = await locate()
+                          resolve(position)
+                        }
+                        else {
+                          reject(false)
                         }
                       },
-                    });
-                  } else {
-                    removeLocationInfo();
-                    cancelback && uni.$emit(AuthLocationEvents.启用授权, false);
-                    reject(false);
+                    })
+                  }
+                  else {
+                    removeLocationInfo()
+                    cancelback && uni.$emit(AuthLocationEvents.启用授权, false)
+                    reject(false)
                   }
                 },
                 fail: () => {
-                  reject(false);
+                  reject(false)
                 },
-              });
-            } else {
-              reject(false);
+              })
+            }
+            else {
+              reject(false)
             }
           }
         }
       },
       fail: (conf) => {
-        uni.$emit(AuthLocationEvents.启用授权);
-        reject(false);
+        uni.$emit(AuthLocationEvents.启用授权)
+        reject(false)
       },
-    });
-  });
+    })
+  })
+}
+
+/**
+ * 获取本机支持的生物认证信息
+ */
+export async function getAuthInfo() {
+  return new Promise<UniApp.CheckIsSupportSoterAuthenticationRes['supportMode'] | false>(
+    (resolve) => {
+      uni.checkIsSupportSoterAuthentication({
+        success(res) {
+          resolve(res.supportMode)
+        },
+        fail(err) {
+          console.log('🚀 ~ file: auth.ts:234 ~ fail ~ err:', err)
+          resolve(false)
+        },
+      })
+    },
+  )
+}
+
+/**
+ * 检查本机是否录入过指纹
+ */
+export async function checkFingerPrint() {
+  return new Promise<boolean>((resolve) => {
+    uni.checkIsSoterEnrolledInDevice({
+      checkAuthMode: 'fingerPrint',
+      success: () => resolve(true),
+      fail: () => resolve(false),
+    })
+  })
+}
+
+/**
+ * 指纹认证
+ */
+export async function fingerPrintAuth(signStr: string, authContent = '请验证本机指纹') {
+  return new Promise<boolean>(async (resolve) => {
+    const authMethods = await getAuthInfo()
+    if (authMethods && authMethods.includes('fingerPrint')) {
+      uni.checkIsSupportSoterAuthentication({
+        async success(res) {
+          if (res.supportMode.includes('fingerPrint') && (await checkFingerPrint())) {
+            uni.startSoterAuthentication({
+              requestAuthModes: ['fingerPrint'],
+              challenge: signStr,
+              authContent,
+              success(res) {
+                console.log('success', res)
+                resolve(true)
+              },
+              fail(err) {
+                console.log('fail', err)
+                resolve(false)
+              },
+            })
+          }
+          else {
+            resolve(false)
+          }
+        },
+        fail(err) {
+          console.log('fail', err)
+          resolve(false)
+        },
+      })
+    }
+    else {
+      resolve(false)
+    }
+  })
+}

package/template-uni-app/src/utils/index.ts

@@ -4,8 +4,8 @@
  * @LastEditTime: 2023-07-18 15:30:03
  * @Description:
  */
-export * from './modal';
-export * from './auth';
-export * from './map';
-export * from './system';
-export * from './route';
+export * from './modal'
+export * from './auth'
+export * from './map'
+export * from './system'
+export * from './route'

package/template-uni-app/src/utils/map.ts

@@ -4,40 +4,40 @@
  * @LastEditTime: 2023-07-19 16:51:26
  * @Description: 地图相关(基于腾讯地图)
  */
-export type TxLocationSearchRes = {
-  address: string;
-  title: string;
-  _distance: number;
-  id: string;
+export interface TxLocationSearchRes {
+  address: string
+  title: string
+  _distance: number
+  id: string
   location: {
-    lat: number;
-    lng: number;
-  };
-};
+    lat: number
+    lng: number
+  }
+}
 
-export type TxLocationSearch = {
+export interface TxLocationSearch {
   /**
    * 分页信息
    */
-  page_size: number;
-  page_index: number;
+  page_size: number
+  page_index: number
   /**
    * 搜索关键字
    */
-  keyword: string;
+  keyword: string
 
   /**
    * 经纬度
    */
-  latitude: number;
-  longitude: number;
-};
+  latitude: number
+  longitude: number
+}
 
 /**
  * 地点搜索
  */
-export const searchLoaction = (args: TxLocationSearch) => {
-  const { page_size, page_index, keyword, latitude, longitude } = args;
+export function searchLoaction(args: TxLocationSearch) {
+  const { page_size, page_index, keyword, latitude, longitude } = args
 
   return new Promise<TxLocationSearchRes[]>((resolve, reject): void => {
     uni.request({
@@ -45,54 +45,54 @@ export const searchLoaction = (args: TxLocationSearch) => {
         keyword ? `&keyword=${keyword}` : ''
       }&page_size=${page_size}&page_index=${page_index}&key=${getMapApiKey()}`,
       success: (res) => {
-        resolve((res.data as unknown as { data: TxLocationSearchRes[] }).data);
+        resolve((res.data as unknown as { data: TxLocationSearchRes[] }).data)
       },
       fail: (err) => {
-        console.log(err);
-        reject();
+        console.log(err)
+        reject()
       },
       complete: (err) => {
-        console.log(err);
-        reject();
+        console.log(err)
+        reject()
       },
-    });
-  });
-};
+    })
+  })
+}
 
-export type GeoCoderRes = {
-  province_code: string;
-  city_code: string;
-  city: string;
-  province: string;
+export interface GeoCoderRes {
+  province_code: string
+  city_code: string
+  city: string
+  province: string
   location: {
-    lat: number;
-    lng: number;
-  };
-};
+    lat: number
+    lng: number
+  }
+}
 
 /**
  * 逆地址解析（坐标位置描述）
  */
-export const geocoderLocation = (latitude: number, longitude: number) => {
+export function geocoderLocation(latitude: number, longitude: number) {
   return new Promise<GeoCoderRes>((resolve, reject): void => {
     uni.request({
       url: `https://apis.map.qq.com/ws/geocoder/v1/?location=${latitude},${longitude}&key=${getMapApiKey()}&get_poi=1`,
       success: (res) => {
-        const ad_info = (res.data as any).result.ad_info;
+        const ad_info = (res.data as any).result.ad_info
         resolve({
           ...ad_info,
           province_code: ad_info.adcode.slice(0, 2),
           city_code: ad_info.adcode.slice(0, 4),
-        });
+        })
       },
       fail: (err) => {
-        console.log(err);
-        reject();
+        console.log(err)
+        reject()
       },
       complete: (err) => {
-        console.log(err);
-        reject();
+        console.log(err)
+        reject()
       },
-    });
-  });
-};
+    })
+  })
+}