@uxda/appkit 4.3.14 → 4.3.16

package/dist/index.js

@@ -3483,6 +3483,26 @@ const isIOS = () => {
   }
   return false;
 };
+const isAndroid = () => {
+  if (typeof window !== "undefined") {
+    return /Android/i.test(window.navigator.userAgent);
+  }
+  return false;
+};
+function getBrowser() {
+  if (typeof window === "undefined") return "other";
+  const ua = window.navigator.userAgent.toLowerCase();
+  if (/edg\/|edge\//.test(ua) || /opr\/|opera/.test(ua)) return "other";
+  if (/chrome\/|crios\//.test(ua)) return "chrome";
+  if (/safari\//.test(ua) && !/chrome|crios/.test(ua)) return "safari";
+  return "other";
+}
+function isSafari() {
+  return getBrowser() === "safari";
+}
+function isChrome() {
+  return getBrowser() === "chrome";
+}
 
 const _hoisted_1$B = { class: "view recharge-view" };
 const _hoisted_2$r = { class: "flex-grow" };
@@ -3578,7 +3598,7 @@ var script$E = /* @__PURE__ */ defineComponent({
     function getChannelCode() {
       if (isWechat()) {
         return "centergzh";
-      } else if (isAlipay()) {
+      } else if (isAlipay() || isAndroid() || isIOS() && !isChrome() && !isSafari()) {
         return "YundouZfb";
       } else {
         return "distributor";
@@ -4015,7 +4035,6 @@ var script$A = /* @__PURE__ */ defineComponent({
           fromMini: !!params.from,
           useCloudBean: isCombinedPayment.value
         }).then((result) => {
-          console.log(result, "------requestBrandWCPayByBean");
           state.buttonLoading = false;
           if (typeof result === "boolean" && result) {
             window.location.href = props.payFinishJumpUrl;
@@ -4076,7 +4095,7 @@ var script$A = /* @__PURE__ */ defineComponent({
     function getChannelCode() {
       if (isWechat()) {
         return "centergzh";
-      } else if (isAlipay()) {
+      } else if (isAlipay() || isAndroid() || isIOS() && !isChrome() && !isSafari()) {
         return "YundouZfb";
       } else {
         return "distributor";

package/package.json

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

package/src/payment/components/RechargeView.vue

@@ -22,7 +22,7 @@ import AmountPicker from './AmountPicker.vue'
 import { useHttp, endpoints } from '../api'
 import { requestBrandWCPay, requestPayment } from '../services'
 import Taro, { showToast, useRouter } from '@tarojs/taro'
-import { isAlipay, isWechat } from '../../shared/composables/useDeviceEnv'
+import { isAlipay, isAndroid, isChrome, isIOS, isSafari, isWechat } from '../../shared/composables/useDeviceEnv'
 
 // 充值用户界面
 // 配置了必须的属性后
@@ -152,7 +152,7 @@ const onPayClick = () => {
 function getChannelCode() {
   if (isWechat()) {
     return 'centergzh';
-  } else if (isAlipay()) {
+  } else if (isAlipay() || isAndroid() || (isIOS() && !isChrome() && !isSafari())) {
     return 'YundouZfb';
   } else {
     return 'distributor';

package/src/payment/components/TradeView.vue

@@ -102,13 +102,13 @@
 
 <script lang="ts" setup>
 import { computed, onMounted, reactive, ref } from "vue";
-import RightsPicker, { Amount } from "./RightsPicker.vue";
-import { endpoints, useHttp } from "../api";
+import RightsPicker, { Amount } from './RightsPicker.vue'
+import { endpoints, useHttp } from '../api'
 import { endpoints as balanceEndpoints } from "../../balance/api";
-import { requestBrandWCPayByBean, requestPaymentByBean } from "../services";
-import Taro, { showToast, useRouter, showModal } from "@tarojs/taro";
-import { useAmount } from "../../shared/composables/useAmount";
-import { isAlipay, isWechat } from "../../shared/composables/useDeviceEnv";
+import { requestBrandWCPayByBean, requestPaymentByBean } from '../services'
+import Taro, { showToast, useRouter, showModal } from '@tarojs/taro'
+import { useAmount } from '../../shared/composables/useAmount'
+import { isAlipay,isAndroid,isChrome,isIOS,isSafari,isWechat } from '../../shared/composables/useDeviceEnv'
 
 // 充值用户界面
 // 配置了必须的属性后
@@ -157,7 +157,7 @@ const state = reactive({
   // agreementOpen: false,
   buttonLoading: false,
   thirdPayId: '',
-});
+})
 
 const balance = ref<number>(0);
 const amounts = ref<Amount[]>([]);
@@ -215,19 +215,16 @@ const isCombinedPayment = computed(() => {
 });
 
 onMounted(() => {
-  const $http = useHttp({ Appcode: props.headerApp, Tenant: props.tenant });
-  $http
-    .get<any[]>(endpoints.获取增值权益类目, {
-      rightCode:
-        props.app === "corporateStar" ? "riskQueryCompany" : "riskQueryMulti",
-      scene: isWechat() ? '' : 'APP'
-    })
-    .then((res: any) => {
-      balance.value = res.balance;
-      amounts.value = res.paymentCaseConfigVOS;
-      emit("loaded");
-    });
-});
+  const $http = useHttp({ Appcode: props.headerApp, Tenant: props.tenant })
+  $http.get<any[]>(endpoints.获取增值权益类目, {
+    rightCode: props.app === 'corporateStar' ? 'riskQueryCompany' : 'riskQueryMulti',
+    scene: isWechat() ? '' : 'APP'
+  }).then((res: any) => {
+    balance.value = res.balance
+    amounts.value = res.paymentCaseConfigVOS
+    emit('loaded')
+  })
+})
 
 // 云豆支付对话框
 const showDialog = ref<boolean>(false);
@@ -290,7 +287,6 @@ function proceedWechatPayment() {
       useCloudBean: isCombinedPayment.value
     })
       .then((result: any) => {
-        console.log(result, '------requestBrandWCPayByBean')
         state.buttonLoading = false;
         if (typeof result === "boolean" && result) {
           window.location.href = props.payFinishJumpUrl as string;
@@ -356,7 +352,7 @@ function proceedWechatPayment() {
 function getChannelCode() {
   if (isWechat()) {
     return 'centergzh';
-  } else if (isAlipay()) {
+  } else if (isAlipay() || isAndroid() || (isIOS() && !isChrome() && !isSafari())) {
     return 'YundouZfb';
   } else {
     return 'distributor';

package/src/shared/composables/useDeviceEnv.ts

@@ -24,4 +24,38 @@ export const isAndroid = () => {
     return /Android/i.test(window.navigator.userAgent)
   }
   return false
-}
+}
+
+/** 浏览器类型 */
+export type BrowserType = 'safari' | 'chrome' | 'other'
+
+/**
+ * 获取当前浏览器类型
+ * @returns 'safari' | 'chrome' | 'other'
+ */
+export function getBrowser(): BrowserType {
+  if (typeof window === 'undefined') return 'other'
+  const ua = window.navigator.userAgent.toLowerCase()
+  // Edge、Opera 等基于 Chromium 的浏览器归为 other，优先判断
+  if (/edg\/|edge\//.test(ua) || /opr\/|opera/.test(ua)) return 'other'
+  // Chrome（含 iOS 端 CriOS）
+  if (/chrome\/|crios\//.test(ua)) return 'chrome'
+  // Safari：含 safari 且不含 chrome（Chrome 的 UA 同时包含两者）
+  if (/safari\//.test(ua) && !/chrome|crios/.test(ua)) return 'safari'
+  return 'other'
+}
+
+/** 是否 Safari 浏览器 */
+export function isSafari(): boolean {
+  return getBrowser() === 'safari'
+}
+
+/** 是否 Chrome 浏览器（含 iOS 端） */
+export function isChrome(): boolean {
+  return getBrowser() === 'chrome'
+}
+
+/** 是否其他浏览器（非 Safari、非 Chrome） */
+export function isOtherBrowser(): boolean {
+  return getBrowser() === 'other'
+}