create-young-proj 0.8.0 → 0.9.0

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

@@ -4,18 +4,18 @@
  * @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 fullscreenLoading = ref(false);
-  const smallLoading = ref(false);
-  return { smallLoading, fullscreenLoading };
-});
+  const fullscreenLoading = ref(false)
+  const smallLoading = ref(false)
+  return { smallLoading, fullscreenLoading }
+})

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

@@ -7,34 +7,35 @@
 /**
  * 获取微信授权码
  */
-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,77 +94,81 @@ 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 const getAuthInfo = async () => {
+export async function getAuthInfo() {
   return new Promise<UniApp.CheckIsSupportSoterAuthenticationRes['supportMode'] | false>(
     (resolve) => {
       uni.checkIsSupportSoterAuthentication({
         success(res) {
-          resolve(res.supportMode);
+          resolve(res.supportMode)
         },
         fail(err) {
-          console.log('🚀 ~ file: auth.ts:234 ~ fail ~ err:', err);
-          resolve(false);
+          console.log('🚀 ~ file: auth.ts:234 ~ fail ~ err:', err)
+          resolve(false)
         },
-      });
+      })
     },
-  );
-};
+  )
+}
 
 /**
  * 检查本机是否录入过指纹
  */
-export const checkFingerPrint = async () => {
+export async function checkFingerPrint() {
   return new Promise<boolean>((resolve) => {
     uni.checkIsSoterEnrolledInDevice({
       checkAuthMode: 'fingerPrint',
       success: () => resolve(true),
       fail: () => resolve(false),
-    });
-  });
-};
+    })
+  })
+}
 
 /**
  * 指纹认证
  */
-export const fingerPrintAuth = async (signStr: string, authContent = '请验证本机指纹') => {
+export async function fingerPrintAuth(signStr: string, authContent = '请验证本机指纹') {
   return new Promise<boolean>(async (resolve) => {
-    const authMethods = await getAuthInfo();
+    const authMethods = await getAuthInfo()
     if (authMethods && authMethods.includes('fingerPrint')) {
       uni.checkIsSupportSoterAuthentication({
         async success(res) {
@@ -171,25 +178,27 @@ export const fingerPrintAuth = async (signStr: string, authContent = '请验证
               challenge: signStr,
               authContent,
               success(res) {
-                console.log('success', res);
-                resolve(true);
+                console.log('success', res)
+                resolve(true)
               },
               fail(err) {
-                console.log('fail', err);
-                resolve(false);
+                console.log('fail', err)
+                resolve(false)
               },
-            });
-          } else {
-            resolve(false);
+            })
+          }
+          else {
+            resolve(false)
           }
         },
         fail(err) {
-          console.log('fail', err);
-          resolve(false);
+          console.log('fail', err)
+          resolve(false)
         },
-      });
-    } else {
-      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()
       },
-    });
-  });
-};
+    })
+  })
+}

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

@@ -1,12 +1,12 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-07-18 14:12:25
- * @LastEditTime: 2023-08-25 16:22:55
+ * @LastEditTime: 2023-09-06 19:42:19
  * @Description: ui 交互，弹窗之类的
  */
-import { sleep } from '@bluesyoung/utils';
+import { sleep } from '@bluesyoung/utils'
 
-let loadingCount = 0;
+let loadingCount = 0
 
 /**
  * 显示loading
@@ -14,21 +14,21 @@ let loadingCount = 0;
  * @param title - 提示文本
  */
 export function showLoading(title = '加载中...', mask = true) {
-  const { fullscreenLoading, smallLoading } = storeToRefs(useHttpLoading());
+  const { fullscreenLoading, smallLoading } = storeToRefs(useHttpLoading())
 
-  if (fullscreenLoading.value) {
-    return;
-  }
+  if (fullscreenLoading.value)
+    return
 
-  loadingCount++;
+  loadingCount++
 
   if (import.meta.env.VITE_CUSTOM_LOADING) {
-    smallLoading.value = true;
-  } else {
+    smallLoading.value = true
+  }
+  else {
     uni.showLoading({
       mask,
       title,
-    });
+    })
   }
 }
 
@@ -36,18 +36,16 @@ export function showLoading(title = '加载中...', mask = true) {
  * 隐藏loading
  */
 export function hideLoading() {
-  const { smallLoading, fullscreenLoading } = storeToRefs(useHttpLoading());
+  const { smallLoading, fullscreenLoading } = storeToRefs(useHttpLoading())
 
-  if (fullscreenLoading.value) {
-    return;
-  }
+  if (fullscreenLoading.value)
+    return
 
   if (--loadingCount === 0) {
-    if (import.meta.env.VITE_CUSTOM_LOADING) {
-      smallLoading.value = false;
-    } else {
-      uni.hideLoading();
-    }
+    if (import.meta.env.VITE_CUSTOM_LOADING)
+      smallLoading.value = false
+    else
+      uni.hideLoading()
   }
 }
 
@@ -55,61 +53,62 @@ export function hideLoading() {
  * 展示 toast
  */
 export function showToast(options?: UniApp.ShowToastOptions) {
-  const { icon = 'none', mask = false } = options || {};
+  const { icon = 'none', mask = false } = options || {}
 
   uni.showToast({
     icon,
     mask,
     ...options,
-  });
+  })
 }
 
-let hasModel = false;
-const modalPage = new Set<string>();
+let hasModel = false
+const modalPage = new Set<string>()
 /**
  * 显示弹窗
  * ! 全局一次只展示一个弹窗，其他的往后排
  */
 export async function showModal(options: UniApp.ShowModalOptions) {
-  const page = getCurrentPages();
-  const route = page[page.length - 1]?.route || '';
+  const page = getCurrentPages()
+  const route = page[page.length - 1]?.route || ''
   if (modalPage.has(route)) {
-    hasModel = true;
-  } else {
-    hasModel = false;
-    modalPage.add(route);
+    hasModel = true
   }
-  const { title = '提示', showCancel = true, complete } = options;
-  while (hasModel) {
-    await sleep(0.5);
+  else {
+    hasModel = false
+    modalPage.add(route)
   }
+  const { title = '提示', showCancel = true, complete } = options
+  // eslint-disable-next-line no-unmodified-loop-condition
+  while (hasModel)
+    await sleep(0.5)
+
   return new Promise((resolve, reject) => {
-    hasModel = true;
+    hasModel = true
     uni.showModal({
       title,
       showCancel,
       success(res) {
-        hasModel = false;
-        modalPage.delete(route);
-        if (res.confirm) {
-          resolve(res);
-        } else if (res.cancel) {
-          reject(res);
-        }
+        hasModel = false
+        modalPage.delete(route)
+        if (res.confirm)
+          resolve(res)
+        else if (res.cancel)
+          reject(res)
       },
       fail(err) {
-        hasModel = false;
-        modalPage.delete(route);
-        reject(err);
+        hasModel = false
+        modalPage.delete(route)
+        reject(err)
       },
       ...options,
       complete: (res) => {
-        hasModel = false;
-        modalPage.delete(route);
-        complete?.(res);
+        hasModel = false
+        modalPage.delete(route)
+        complete?.(res)
       },
-    });
-  });
+    })
+  })
 }
 
 /**
@@ -117,5 +116,5 @@ export async function showModal(options: UniApp.ShowModalOptions) {
  * @param errMsg - 错误信息
  */
 export function showErrorModal(errMsg: string) {
-  return showModal({ content: errMsg, showCancel: false });
+  return showModal({ content: errMsg, showCancel: false })
 }