@uxda/appkit 4.2.89 → 4.2.91

package/dist/index.js

@@ -1822,6 +1822,12 @@ function isWechat() {
   let ua = window.navigator.userAgent.toLowerCase();
   return ua.includes("micromessenger");
 }
+const isIOS = () => {
+  if (typeof window !== "undefined") {
+    return /iPhone|iPad|iPod/i.test(window.navigator.userAgent);
+  }
+  return false;
+};
 
 const _hoisted_1$B = { class: "view recharge-view" };
 const _hoisted_2$r = { class: "flex-grow" };
@@ -3412,7 +3418,7 @@ var script$t = /* @__PURE__ */ defineComponent({
                     1
                     /* TEXT */
                   ),
-                  !isAppEnv.value ? withDirectives((openBlock(), createElementBlock("div", {
+                  !isAppEnv.value || isAppEnv.value && !unref(isIOS)() ? withDirectives((openBlock(), createElementBlock("div", {
                     key: 0,
                     class: "pay",
                     onClick: gotoRecharge
@@ -6240,7 +6246,7 @@ var script$e = /* @__PURE__ */ defineComponent({
     }
     async function readAll() {
       try {
-        Taro.showLoading({
+        showLoading({
           title: "\u8BF7\u7A0D\u540E..."
         });
         const appkitOptions = useAppKitOptions();
@@ -6256,7 +6262,7 @@ var script$e = /* @__PURE__ */ defineComponent({
           });
         });
       } finally {
-        Taro.hideLoading();
+        hideLoading();
       }
     }
     const emits = __emit;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxda/appkit",
-  "version": "4.2.89",
+  "version": "4.2.91",
   "description": "小程序应用开发包",
   "main": "dist/index.js",
   "module": "dist/index.ts",

package/src/balance/components/AccountView.vue

@@ -18,7 +18,7 @@
         </div>
         <div class="bean-counts spa-between">
           <div class="counts number">{{ formatAmount(balance.total || 0) }}</div>
-          <div v-if="!isAppEnv" class="pay" v-track-click="'click'" @click="gotoRecharge">云豆充值</div>
+          <div v-if="!isAppEnv || (isAppEnv && !isIOS())" class="pay" v-track-click="'click'" @click="gotoRecharge">云豆充值</div>
         </div>
       </div>
       <Tip />
@@ -149,6 +149,7 @@ import groupBy from 'lodash-es/groupBy'
 import { useAmount } from '../../shared/composables/useAmount'
 import { ScrollView } from '@tarojs/components'
 import { isApp } from '../../utils/utils'
+import { isIOS } from '../../shared/composables/useDeviceEnv'
 
 type AccountViewProps = {
   app: string

package/src/notice/components/NoticeList2.vue

@@ -51,7 +51,7 @@
 
 <script setup lang="ts">
 import { useDidShow } from '@tarojs/taro'
-import Taro from '@tarojs/taro'
+import { showLoading, hideLoading } from '@tarojs/taro'
 import { type WithPaging, usePaging } from '@uxda/nutshell/taro'
 import { useHttp, endpoints } from '../api'
 import { reactive, ref } from 'vue'
@@ -161,7 +161,7 @@ function read(item: any) {
 
 async function readAll() {
   try {
-    Taro.showLoading({
+    showLoading({
       title: '请稍后...',
     })
 
@@ -178,7 +178,7 @@ async function readAll() {
       })
     })
   } finally {
-    Taro.hideLoading()
+    hideLoading()
   }
 }
 

package/src/shared/composables/useDeviceEnv.ts

@@ -9,3 +9,19 @@ export function isAlipay() {
   let ua = window.navigator.userAgent.toLowerCase()
   return ua.includes('alipayclient')
 }
+
+// 判断是否为 iOS 设备
+export const isIOS = () => {
+  if (typeof window !== 'undefined') {
+    return /iPhone|iPad|iPod/i.test(window.navigator.userAgent)
+  }
+  return false
+}
+
+// 判断是否为 Android 设备
+export const isAndroid = () => {
+  if (typeof window !== 'undefined') {
+    return /Android/i.test(window.navigator.userAgent)
+  }
+  return false
+}

package/src/utils/utils.ts

@@ -30,4 +30,4 @@ export function generateUniqueId(pre?: string, delimiter = '-') {
 // 是否是App环境
 export function isApp() {
   return dsBridge.hasNativeMethod('openWebPage')
-}
+}