@uxda/appkit 4.3.22 → 4.3.24

package/dist/index.js

@@ -557,11 +557,12 @@ function useLogger(options) {
 }
 
 function useWxAuth() {
-  function toWxAuth(source, redirectUri) {
+  function toWxAuth(source, redirectUri, authSource = null) {
     const $http = useHttp$2();
     $http.get("/cas/auth/render/", {
       source,
-      redirectUri
+      redirectUri,
+      authSource
     }).then((res) => {
       location.replace(res);
     });
@@ -3478,36 +3479,12 @@ function isWechat() {
   let ua = window.navigator.userAgent.toLowerCase();
   return ua.includes("micromessenger");
 }
-function isAlipay() {
-  let ua = window.navigator.userAgent.toLowerCase();
-  return ua.includes("alipayclient");
-}
 const isIOS = () => {
   if (typeof window !== "undefined") {
     return /iPhone|iPad|iPod/i.test(window.navigator.userAgent);
   }
   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" };
@@ -3605,10 +3582,8 @@ var script$E = /* @__PURE__ */ defineComponent({
     function getChannelCode() {
       if (isWechat()) {
         return "centergzh";
-      } else if (isAlipay() || isAndroid() || isIOS() && !isChrome() && !isSafari()) {
-        return "YundouZfb";
       } else {
-        return "distributor";
+        return "YundouZfb";
       }
     }
     const payResultCheck = () => {
@@ -4102,10 +4077,8 @@ var script$A = /* @__PURE__ */ defineComponent({
     function getChannelCode() {
       if (isWechat()) {
         return "centergzh";
-      } else if (isAlipay() || isAndroid() || isIOS() && !isChrome() && !isSafari()) {
-        return "YundouZfb";
       } else {
-        return "distributor";
+        return "YundouZfb";
       }
     }
     const onPayClick = async () => {

package/package.json

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

package/src/payment/components/RechargeView.vue

@@ -154,10 +154,8 @@ const onPayClick = () => {
 function getChannelCode() {
   if (isWechat()) {
     return 'centergzh';
-  } else if (isAlipay() || isAndroid() || (isIOS() && !isChrome() && !isSafari())) {
-    return 'YundouZfb';
   } else {
-    return 'distributor';
+    return 'YundouZfb';
   }
 }
 

package/src/payment/components/TradeView.vue

@@ -352,10 +352,8 @@ function proceedWechatPayment() {
 function getChannelCode() {
   if (isWechat()) {
     return 'centergzh';
-  } else if (isAlipay() || isAndroid() || (isIOS() && !isChrome() && !isSafari())) {
-    return 'YundouZfb';
   } else {
-    return 'distributor';
+    return 'YundouZfb';
   }
 }
 

package/src/shared/composables/useWxAuth.ts

@@ -10,12 +10,13 @@ export function useWxAuth() {
    * @param source 设备码
    * @param redirectUri 重定向地址
    */
-  function toWxAuth(source, redirectUri) {
+  function toWxAuth(source, redirectUri, authSource = null) {
     const $http = useHttp()
     $http
       .get('/cas/auth/render/', {
         source,
         redirectUri,
+        authSource
       })
       .then((res: any) => {
         location.replace(res)