@uxda/appkit 4.3.5 → 4.3.6

package/dist/index.js

@@ -128,6 +128,7 @@ function requestWxH5Pay(options) {
           title: "\u63D0\u793A",
           content: "\u5F53\u524D\u73AF\u5883\u4E0D\u652F\u6301\u5FAE\u4FE1\u652F\u4ED8\uFF0C\u8BF7\u5728\u5FAE\u4FE1\u5185\u7F6E\u6D4F\u89C8\u5668\u4E2D\u6253\u5F00",
           confirmText: "\u786E\u5B9A",
+          confirmColor: "#017fff",
           success: () => {
           }
         });
@@ -3795,7 +3796,8 @@ var script$A = /* @__PURE__ */ defineComponent({
     headerApp: { type: String, required: true },
     app: { type: String, required: true },
     tenant: { type: String, required: true },
-    payFinishJumpUrl: { type: String, required: false }
+    payFinishJumpUrl: { type: String, required: false },
+    apps: { type: String, required: false }
   },
   emits: ["complete", "agree"],
   setup(__props, { emit: __emit }) {
@@ -3959,13 +3961,46 @@ var script$A = /* @__PURE__ */ defineComponent({
         });
       }
     }
-    const onPayClick = () => {
+    const onPayClick = async () => {
       if (selectBean.value && !isCombinedPayment.value) {
         showDialog.value = true;
         return;
       }
+      if (isCombinedPayment.value) {
+        const res = await checkBalance();
+        if (!res) return;
+      }
       proceedWechatPayment();
     };
+    async function checkBalance() {
+      const $http = useHttp$2();
+      return new Promise((resolve, reject) => {
+        state.buttonLoading = true;
+        $http.get(endpoints$2.\u83B7\u53D6\u4F59\u989D\u660E\u7EC6, {
+          app: props.apps
+        }).then((data) => {
+          state.buttonLoading = false;
+          if (data.commonAccount < balance.value) {
+            showModal({
+              title: "\u6E29\u99A8\u63D0\u793A",
+              content: "\u4E91\u8C46\u4E0D\u8DB3\uFF0C\u8BF7\u5237\u65B0\u540E\u518D\u6B21\u786E\u8BA4",
+              showCancel: false,
+              confirmText: "\u5237\u65B0",
+              confirmColor: "#017fff",
+              success: () => {
+                balance.value = data.commonAccount;
+              }
+            });
+            resolve(false);
+          } else {
+            resolve(true);
+          }
+        }).catch((error) => {
+          state.buttonLoading = false;
+          resolve(false);
+        });
+      });
+    }
     return (_ctx, _cache) => {
       const _component_nut_checkbox = Checkbox;
       const _component_nut_button = Button;
@@ -5960,6 +5995,7 @@ var script$o = /* @__PURE__ */ defineComponent({
       showModal({
         content: toastMap[type],
         showCancel: false,
+        confirmColor: "#017fff",
         confirmText: "\u77E5\u9053\u4E86"
       });
     }
@@ -8639,6 +8675,7 @@ var script$b = /* @__PURE__ */ defineComponent({
         title: "\u63D0\u793A",
         content: "\u786E\u5B9A\u8981\u9000\u51FA\u767B\u5F55\u5417\uFF1F",
         confirmText: "\u786E\u5B9A",
+        confirmColor: "#017fff",
         success: async (e) => {
           if (e.confirm) {
             emits("logout");

package/package.json

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

package/src/balance/components/PromoterCard.vue

@@ -152,6 +152,7 @@ function onHelpClick(type: string) {
   showModal({
     content: toastMap[type],
     showCancel: false,
+    confirmColor: '#017fff',
     confirmText: '知道了',
   })
 }

package/src/payment/components/TradeView.vue

@@ -104,8 +104,9 @@
 import { computed, onMounted, reactive, ref } from "vue";
 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 } from "@tarojs/taro";
+import Taro, { showToast, useRouter, showModal } from "@tarojs/taro";
 import { useAmount } from "../../shared/composables/useAmount";
 import { isWechat } from "../../shared/composables/useDeviceEnv";
 
@@ -134,6 +135,10 @@ export interface RechargeViewProps {
    * h5支付完成后跳转地址
    */
   payFinishJumpUrl?: "";
+  /**
+   * 所有应用
+   **/
+   apps?: string;
 }
 
 const props = defineProps<RechargeViewProps>();
@@ -339,16 +344,59 @@ function proceedWechatPayment() {
   }
 }
 
-const onPayClick = () => {
+const onPayClick = async () => {
   // 用云豆支付（纯云豆支付）
   if (selectBean.value && !isCombinedPayment.value) {
     showDialog.value = true;
     return;
   }
 
+  if (isCombinedPayment.value) {
+    // 检验云豆是否已经改变，改变则刷新选择
+    const res = await checkBalance()
+    if (!res) return
+  }
+
   // 纯微信支付
   proceedWechatPayment();
-};
+}
+
+/**
+ * 校验余额是否充足
+ */
+ async function checkBalance() {
+   const $http = useHttp()
+  return new Promise((resolve, reject) => {
+    state.buttonLoading = true;
+    $http
+      .get<any>(balanceEndpoints.获取余额明细, {
+        app: props.apps,
+      })
+      .then((data) => {
+        state.buttonLoading = false;
+        if (data.commonAccount < balance.value) {
+          showModal({
+            title: '温馨提示',
+            content: '云豆不足，请刷新后再次确认',
+            showCancel: false,
+            confirmText: '刷新',
+            confirmColor: '#017fff',
+            success: () => {
+              balance.value = data.commonAccount;
+            }
+          })
+          resolve(false)
+          
+        } else {
+          resolve(true)
+        }
+      }).catch((error) => {
+        state.buttonLoading = false;
+        resolve(false)
+      })
+  })
+}
+
 </script>
 
 <style lang="scss">

package/src/shared/weixin/jssdk.ts

@@ -51,6 +51,7 @@ function requestWxH5Pay(options: PrePayOptions) {
           title: '提示',
           content: '当前环境不支持微信支付，请在微信内置浏览器中打开',
           confirmText: '确定',
+          confirmColor: '#017fff',
           success: () => {},
         })
         return

package/src/user/components/UserInfo.vue

@@ -360,6 +360,7 @@ function toLogout() {
     title: "提示",
     content: "确定要退出登录吗？",
     confirmText: "确定",
+    confirmColor: '#017fff',
     success: async (e: any) => {
       if (e.confirm) {
         emits("logout");