create-young-proj 1.6.1 → 1.7.0

package/template-uni-app/src/App.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhangyang
  * @Date: 2023-02-13 14:58:26
- * @LastEditTime: 2023-07-20 15:31:59
+ * @LastEditTime: 2024-02-01 11:09:23
  * @Description:
 -->
 <script setup lang="ts">
@@ -17,9 +17,17 @@ onLaunch(async () => {
     setUuid()
 
   await getSystemInfo()
+
+  // #ifdef APP-PLUS
+  /**
+   * App 热更新
+   * 参见：https://ask.dcloud.net.cn/article/35667
+   */
+  // #endif
 })
 
 onShow(async () => {
+  // #ifdef MP
   /**
    * 自动更新
    */
@@ -46,6 +54,8 @@ onShow(async () => {
     // 新版本下载失败
     showModal({ title: '更新提示', content: '新版本下载失败', showCancel: false })
   })
+  // #endif
+
   console.log('App Show')
 })
 

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

@@ -17,8 +17,15 @@ const EnvConfig = {
 }
 
 export function getReqUrl(): string {
-  // @ts-expect-error
-  return import.meta.env.VITE_API_BASE_URL || EnvConfig[__wxConfig.envVersion]
+  let url = import.meta.env.VITE_API_BASE_URL
+
+  // #ifdef MP-WEIXIN
+  if (__wxConfig && __wxConfig.envVersion && EnvConfig[__wxConfig.envVersion])
+    url = EnvConfig[__wxConfig.envVersion]
+
+  // #endif
+
+  return url
 }
 
 const http = useHttp({

package/template-uni-app/src/components/young-loading/young-loading.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhangyang
  * @Date: 2023-07-19 12:12:29
- * @LastEditTime: 2023-08-25 16:26:53
+ * @LastEditTime: 2024-02-01 11:15:49
  * @Description:
 -->
 <script lang="ts" setup>
@@ -15,8 +15,10 @@ withDefaults(defineProps<{
    */
   tip?: string
 }>(), {
+  // #ifdef MP-WEIXIN
   // @ts-expect-error
   loadingGif: __wxConfig.accountInfo.icon,
+  // #endif
   tip: '加载中...',
 })
 
@@ -28,7 +30,7 @@ const { fullscreenLoading } = storeToRefs(useHttpLoading())
     v-show="fullscreenLoading"
     class="w100vw h100vh fixed left-0 top-0 z-999999 bg-white flex flex-col items-center justify-center"
   >
-    <image :src="loadingGif" class="w140rpx h140rpx mb-32rpx" />
+    <image v-if="loadingGif" :src="loadingGif" class="w140rpx h140rpx mb-32rpx" />
     <text class="text-[#999] text-24rpx leading-36rpx">
       {{ tip }}
     </text>

package/template-uni-app/src/env.d.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-07-19 08:41:05
- * @LastEditTime: 2023-11-07 17:14:47
+ * @LastEditTime: 2024-02-01 11:28:01
  * @Description:
  */
 /// <reference types="vite/client" />
@@ -25,10 +25,15 @@ declare interface ImportMetaEnv {
   VITE_CUSTOM_LOADING: boolean
 
   /**
-   * 微信小程序 appid
+   * appid
    */
   VITE_APPID: string
 
+  /**
+   * 应用名称
+   */
+  VITE_APPNAME: string
+
   /**
    * 接口请求地址
    */

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

@@ -1,7 +1,7 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-07-18 14:28:16
- * @LastEditTime: 2023-08-29 10:22:48
+ * @LastEditTime: 2024-02-01 10:31:14
  * @Description: 权限相关
  */
 /**
@@ -66,6 +66,7 @@ export function locate(cancelback = true) {
  */
 export async function authLocation(cancelback = true, isShowModal = true) {
   return new Promise<UniApp.GetLocationSuccess>(async (resolve, reject) => {
+    // #ifdef MP
     uni.getSetting({
       withSubscriptions: true,
       success: async (conf) => {
@@ -128,6 +129,11 @@ export async function authLocation(cancelback = true, isShowModal = true) {
         reject(false)
       },
     })
+    // #endif
+    // #ifndef MP
+    console.error('this method can only used in miniprogram !')
+    reject(false)
+    // #endif
   })
 }
 
@@ -137,6 +143,7 @@ export async function authLocation(cancelback = true, isShowModal = true) {
 export async function getAuthInfo() {
   return new Promise<UniApp.CheckIsSupportSoterAuthenticationRes['supportMode'] | false>(
     (resolve) => {
+      // #ifdef APP-PLUS || MP-WEIXIN
       uni.checkIsSupportSoterAuthentication({
         success(res) {
           resolve(res.supportMode)
@@ -146,6 +153,12 @@ export async function getAuthInfo() {
           resolve(false)
         },
       })
+      // #endif
+
+      // #ifndef APP-PLUS || MP-WEIXIN
+      resolve(false)
+      console.error('this method can only used in app and mp-weixin !')
+      // #endif
     },
   )
 }
@@ -155,11 +168,16 @@ export async function getAuthInfo() {
  */
 export async function checkFingerPrint() {
   return new Promise<boolean>((resolve) => {
+    // #ifdef APP-PLUS || MP-WEIXIN
     uni.checkIsSoterEnrolledInDevice({
       checkAuthMode: 'fingerPrint',
       success: () => resolve(true),
       fail: () => resolve(false),
     })
+    // #endif
+    // #ifndef APP-PLUS || MP-WEIXIN
+    resolve(false)
+    // #endif
   })
 }
 
@@ -168,6 +186,7 @@ export async function checkFingerPrint() {
  */
 export async function fingerPrintAuth(signStr: string, authContent = '请验证本机指纹') {
   return new Promise<boolean>(async (resolve) => {
+    // #ifdef APP-PLUS || MP-WEIXIN
     const authMethods = await getAuthInfo()
     if (authMethods && authMethods.includes('fingerPrint')) {
       uni.checkIsSupportSoterAuthentication({
@@ -200,5 +219,9 @@ export async function fingerPrintAuth(signStr: string, authContent = '请验证
     else {
       resolve(false)
     }
+    // #endif
+    // #ifndef APP-PLUS || MP-WEIXIN
+    resolve(false)
+    // #endif
   })
 }

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

@@ -1,11 +1,10 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-07-18 14:12:16
- * @LastEditTime: 2023-07-18 15:30:03
+ * @LastEditTime: 2024-02-01 10:20:17
  * @Description:
  */
 export * from './modal'
 export * from './auth'
-export * from './map'
 export * from './system'
 export * from './route'

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

@@ -1,7 +1,7 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-07-18 14:24:35
- * @LastEditTime: 2023-09-06 19:42:33
+ * @LastEditTime: 2024-02-01 10:26:40
  * @Description:
  */
 import type { SubscribeMessage } from '@/config'
@@ -10,6 +10,7 @@ import type { SubscribeMessage } from '@/config'
  * 订阅指定的消息
  */
 export function subscribeMessage(tmplIds: SubscribeMessage[]) {
+  // #ifdef MP-WEIXIN
   return new Promise((resolve) => {
     uni.requestSubscribeMessage({
       tmplIds,
@@ -22,6 +23,10 @@ export function subscribeMessage(tmplIds: SubscribeMessage[]) {
       complete: () => resolve(true),
     })
   })
+  // #endif
+  // #ifndef MP-WEIXIN
+  throw new Error('subscribeMessage 仅微信小程序支持')
+  // #endif
 }
 
 /**

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

@@ -1,98 +0,0 @@
-/*
- * @Author: zhangyang
- * @Date: 2023-07-18 14:29:41
- * @LastEditTime: 2023-07-19 16:51:26
- * @Description: 地图相关(基于腾讯地图)
- */
-export interface TxLocationSearchRes {
-  address: string
-  title: string
-  _distance: number
-  id: string
-  location: {
-    lat: number
-    lng: number
-  }
-}
-
-export interface TxLocationSearch {
-  /**
-   * 分页信息
-   */
-  page_size: number
-  page_index: number
-  /**
-   * 搜索关键字
-   */
-  keyword: string
-
-  /**
-   * 经纬度
-   */
-  latitude: number
-  longitude: number
-}
-
-/**
- * 地点搜索
- */
-export function searchLoaction(args: TxLocationSearch) {
-  const { page_size, page_index, keyword, latitude, longitude } = args
-
-  return new Promise<TxLocationSearchRes[]>((resolve, reject): void => {
-    uni.request({
-      url: `https://apis.map.qq.com/ws/place/v1/search?boundary=nearby(${latitude},${longitude},1000)${
-        keyword ? `&keyword=${keyword}` : ''
-      }&page_size=${page_size}&page_index=${page_index}&key=${getMapApiKey()}`,
-      success: (res) => {
-        resolve((res.data as unknown as { data: TxLocationSearchRes[] }).data)
-      },
-      fail: (err) => {
-        console.log(err)
-        reject()
-      },
-      complete: (err) => {
-        console.log(err)
-        reject()
-      },
-    })
-  })
-}
-
-export interface GeoCoderRes {
-  province_code: string
-  city_code: string
-  city: string
-  province: string
-  location: {
-    lat: number
-    lng: 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
-        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()
-      },
-      complete: (err) => {
-        console.log(err)
-        reject()
-      },
-    })
-  })
-}