@uxda/appkit 4.3.0 → 4.3.2

package/src/payment/components/TradeView.vue

@@ -1,28 +1,58 @@
 <template>
   <view class="view recharge-view2">
     <view class="flex-grow">
-      <rights-picker :items="amounts" :selected="state.selected" @change="onAmountSelect" />
+      <rights-picker
+        :items="amounts"
+        :selected="state.selected"
+        @change="onAmountSelect"
+      />
       <div class="bean-buy" v-if="amounts[state.selected]">
         <div class="left">
           <div class="title">使用云豆支付</div>
-          <div class="amount" v-if="!selectBean">余额 {{ formatAmount(balance || 0) }}</div>
-          <div class="amount" v-else>扣减后余额 {{ formatAmount(balance - amounts[state.selected].paymentAmount) }}</div>
+          <div class="amount" v-if="!selectBean || isCombinedPayment">
+            余额 {{ formatAmount(balance || 0) }}
+          </div>
+          <div class="amount" v-else>
+            扣减后余额
+            {{ formatAmount(balance - amounts[state.selected].paymentAmount) }}
+          </div>
         </div>
-        <div class="right" v-if="balance >= amounts[state.selected].paymentAmount" @click="selectBean = !selectBean">
-          <div class="amount">-{{ formatAmount(amounts[state.selected].paymentAmount || 0) }}</div>
-          <img class="icon"
-            :src="selectBean ? 'https://cdn.ddjf.com/static/images/appkit/select.svg' : 'https://cdn.ddjf.com/static/images/appkit/not-select.svg'" />
+        <div class="right" @click="selectBean = !selectBean">
+          <div class="amount">
+            -{{ formatAmount(amounts[state.selected].paymentAmount || 0) }}
+          </div>
+          <img
+            class="icon"
+            :src="
+              selectBean
+                ? 'https://cdn.ddjf.com/static/images/appkit/select.svg'
+                : 'https://cdn.ddjf.com/static/images/appkit/not-select.svg'
+            "
+          />
+        </div>
+
+        <div class="balance-warning" v-if="isCombinedPayment">
+          云豆余额不足,还需额外支付{{ formatAmount(extraPaymentAmount) }}元
         </div>
       </div>
 
+      <div class="balance-warning-tip" v-if="isCombinedPayment">
+        请在支付完成前确保元豆余额不被消耗,否则本次权益可能购买失败
+      </div>
 
       <slot name="banner"></slot>
     </view>
 
     <view class="amount-footer">
-      <view class="agreement" v-if="!selectBean">
-        <nut-checkbox v-model="state.agreed">我已阅读并同意<a v-track-click class="link inline"
-            @click="onAgreementLinkClick">《大道云平台云豆充值服务协议》</a></nut-checkbox>
+      <view class="agreement" v-if="!selectBean || isCombinedPayment">
+        <nut-checkbox v-model="state.agreed"
+          >我已阅读并同意<a
+            v-track-click
+            class="link inline"
+            @click="onAgreementLinkClick"
+            >《大道云平台云豆充值服务协议》</a
+          ></nut-checkbox
+        >
       </view>
       <div class="buy-amount">
         <div class="left">
@@ -31,29 +61,53 @@
             <i>￥</i>{{ formatAmount(currentAmount) }}
           </span>
         </div>
-        <nut-button block shape="square" :loading="state.buttonLoading" v-track-click @click="onPayClick"
-          class="recharge-button">购买</nut-button>
+        <nut-button
+          block
+          shape="square"
+          :loading="state.buttonLoading"
+          v-track-click
+          @click="onPayClick"
+          class="recharge-button"
+          >购买</nut-button
+        >
       </div>
     </view>
-    <nut-dialog title="确认购买" custom-class="trade-dialog" v-model:visible="showDialog" @cancel="showDialog = !showDialog"
-      @ok="beanPay">
+    <nut-dialog
+      title="确认购买"
+      custom-class="trade-dialog"
+      v-model:visible="showDialog"
+      @cancel="showDialog = !showDialog"
+      @ok="beanPay"
+    >
       <template v-if="amounts[state.selected]">
-        <div class="item">云豆扣减：{{ formatAmount(amounts[state.selected].paymentAmount || 0) }}</div>
-        <div class="item">权益增加：{{ formatAmount(amounts[state.selected].priceRightNum || 0) }}笔</div>
-        <div class="item">扣减后云豆余额：{{ formatAmount(balance - amounts[state.selected].paymentAmount) }}</div>
+        <div class="item">
+          云豆扣减：{{
+            formatAmount(amounts[state.selected].paymentAmount || 0)
+          }}
+        </div>
+        <div class="item">
+          权益增加：{{
+            formatAmount(amounts[state.selected].priceRightNum || 0)
+          }}笔
+        </div>
+        <div class="item">
+          扣减后云豆余额：{{
+            formatAmount(balance - amounts[state.selected].paymentAmount)
+          }}
+        </div>
       </template>
     </nut-dialog>
   </view>
 </template>
 
 <script lang="ts" setup>
-import { computed, onMounted, reactive, ref } from 'vue'
-import RightsPicker, { Amount } from './RightsPicker.vue'
-import { endpoints, useHttp } from '../api'
-import { requestBrandWCPayByBean, requestPaymentByBean } from '../services'
-import Taro, { showToast, useRouter } from '@tarojs/taro'
-import { useAmount } from '../../shared/composables/useAmount'
-import { isWechat } from '../../shared/composables/useDeviceEnv'
+import { computed, onMounted, reactive, ref } from "vue";
+import RightsPicker, { Amount } from "./RightsPicker.vue";
+import { endpoints, useHttp } from "../api";
+import { requestBrandWCPayByBean, requestPaymentByBean } from "../services";
+import Taro, { showToast, useRouter } from "@tarojs/taro";
+import { useAmount } from "../../shared/composables/useAmount";
+import { isWechat } from "../../shared/composables/useDeviceEnv";
 
 // 充值用户界面
 // 配置了必须的属性后
@@ -63,11 +117,11 @@ export interface RechargeViewProps {
   /**
    * header头中的appcode，一般情况下与app参数一致，当无应用权限时，此参数未空
    **/
-  headerApp: string,
+  headerApp: string;
   /**
    * 应用
    **/
-  app: string,
+  app: string;
   /**
    * 充值场景
    */
@@ -75,141 +129,226 @@ export interface RechargeViewProps {
   /**
    * 租户
    */
-  tenant: string,
+  tenant: string;
   /**
    * h5支付完成后跳转地址
    */
-  payFinishJumpUrl?: ''
+  payFinishJumpUrl?: "";
 }
 
-const props = defineProps<RechargeViewProps>()
-const { formatAmount } = useAmount()
-const { params } = useRouter()
+const props = defineProps<RechargeViewProps>();
+const { formatAmount } = useAmount();
+const { params } = useRouter();
 
 const emit = defineEmits<{
-  (event: 'complete', value: { result: boolean, type: string }): void,
-  (event: 'agree'): void,
-}>()
+  (event: "complete", value: { result: boolean; type: string }): void;
+  (event: "agree"): void;
+}>();
 
 const state = reactive({
   agreed: false,
   selected: 0,
   // agreementOpen: false,
   buttonLoading: false,
-})
+});
 
-
-const balance = ref<number>(0)
-const amounts = ref<Amount[]>([])
-const selectBean = ref<boolean>(false)
+const balance = ref<number>(0);
+const amounts = ref<Amount[]>([]);
+const selectBean = ref<boolean>(false);
 
 const onAgreementLinkClick = (e) => {
-  e.preventDefault()
-  e.stopImmediatePropagation()
-  emit('agree')
+  e.preventDefault();
+  e.stopImmediatePropagation();
+  emit("agree");
   // state.agreementOpen = true
-}
+};
 
 const onAmountSelect = (selected: number) => {
-  state.selected = selected
-  selectBean.value = false
-}
+  state.selected = selected;
+  selectBean.value = false;
+};
+
+// 计算额外支付金额（当云豆余额不足时）
+const extraPaymentAmount = computed(() => {
+  if (!selectBean.value || !amounts.value[state.selected]) {
+    return 0;
+  }
+  const paymentAmount = amounts.value[state.selected].paymentAmount || 0;
+  const currentBalance = balance.value || 0;
+  return Math.max(0, paymentAmount - currentBalance);
+});
 
+// 计算待支付金额
 const currentAmount = computed(() => {
-  return amounts.value[state.selected] && !selectBean.value ? amounts.value[state.selected].paymentAmount : 0
-})
+  if (!amounts.value[state.selected]) {
+    return 0;
+  }
+
+  // 如果选择了云豆支付
+  if (selectBean.value) {
+    // 如果余额不足，返回额外需要支付的金额
+    if (balance.value < amounts.value[state.selected].paymentAmount) {
+      return extraPaymentAmount.value;
+    }
+    // 如果余额充足，返回0（全部用云豆支付）
+    return 0;
+  }
+
+  // 如果没有选择云豆支付，返回全额
+  return amounts.value[state.selected].paymentAmount || 0;
+});
+
+// 判断是否为组合支付
+const isCombinedPayment = computed(() => {
+  return (
+    selectBean.value &&
+    amounts.value[state.selected] &&
+    balance.value < amounts.value[state.selected].paymentAmount
+  );
+});
 
 onMounted(() => {
-  const $http = useHttp({ Appcode: props.headerApp, Tenant: props.tenant })
-  $http.get<any[]>(endpoints.获取增值权益类目, {
-    rightCode: props.app === 'corporateStar' ? 'riskQueryCompany' : 'riskQueryMulti',
-  }).then((res: any) => {
-    balance.value = res.balance
-    amounts.value = res.paymentCaseConfigVOS
-  })
-})
-
-// 云豆支付
-const showDialog = ref<boolean>(false)
+  const $http = useHttp({ Appcode: props.headerApp, Tenant: props.tenant });
+  $http
+    .get<any[]>(endpoints.获取增值权益类目, {
+      rightCode:
+        props.app === "corporateStar" ? "riskQueryCompany" : "riskQueryMulti",
+    })
+    .then((res: any) => {
+      balance.value = res.balance;
+      amounts.value = res.paymentCaseConfigVOS;
+    });
+});
+
+// 云豆支付对话框
+const showDialog = ref<boolean>(false);
+
+// 处理确认支付（纯云豆支付）
 async function beanPay() {
-  const $http = useHttp({ Appcode: props.headerApp, Tenant: props.tenant })
-  $http.post(`/payment/paymentCaseConfig/purchase/${amounts.value[state.selected].id}`).then((response: any) => {
+  const $http = useHttp({ Appcode: props.headerApp, Tenant: props.tenant });
+  try {
+    const response: any = await $http.post(
+      `/payment/paymentCaseConfig/purchase/${amounts.value[state.selected].id}`
+    );
     if (response) {
-      showDialog.value = false
-      emit('complete', { result: response, type: 'bean' })
+      showDialog.value = false;
+      emit("complete", { result: response, type: "bean" });
     } else {
       showToast({
-        title: response.message,
-        icon: 'none',
-      })
+        title: (response as any)?.message || "支付失败",
+        icon: "none",
+      });
     }
-  })
-}
-
-
-const onPayClick = () => {
-  // 用云豆支付
-  if (selectBean.value) {
-    showDialog.value = true
-    return
+  } catch (error: any) {
+    showToast({
+      title: error?.message || "支付失败",
+      icon: "none",
+    });
   }
+}
 
-  // 微信支付
-  if (!selectBean.value && !state.agreed) {
+// 执行微信支付（用于组合支付或纯微信支付）
+function proceedWechatPayment() {
+  if (!state.agreed) {
     showToast({
-      title: '请勾选《大道云平台云豆充值协议》',
-      icon: 'none',
-    })
-    return false
+      title: "请勾选《大道云平台云豆充值协议》",
+      icon: "none",
+    });
+    return false;
   }
-  state.buttonLoading = true
 
-  if (Taro.getEnv() === 'WEB') {
+  state.buttonLoading = true;
+
+  if (Taro.getEnv() === "WEB") {
     if (!isWechat()) {
       showToast({
-        title: '请使用微信浏览器打开',
-        icon: 'none',
-      })
-      state.buttonLoading = false
-      return false
+        title: "请使用微信浏览器打开",
+        icon: "none",
+      });
+      state.buttonLoading = false;
+      return false;
     }
+    // 组合支付或纯微信支付：传递caseConfigId和amount，后端会自动处理云豆扣减
     requestBrandWCPayByBean({
       caseConfigId: amounts.value[state.selected].id,
-      amount: amounts.value[state.selected].paymentAmount,
-      app: 'loankitMp',
+      amount: currentAmount.value,
+      app: "loankitMp",
       tenant: props.tenant,
       accountAuthFlag: false,
-      channelCode: 'centergzh',
+      channelCode: "centergzh",
       payFinishJumpUrl: props.payFinishJumpUrl,
-      fromMini: !!params.from
-    }).then(result => {
-      console.log(result, '------requestBrandWCPay')
-      state.buttonLoading = false
-      if (typeof result === 'boolean' && result) {
-        window.location.href = props.payFinishJumpUrl as string
-      } else {
-        emit('complete', { result, type: 'wePay' })
-      }
+      fromMini: !!params.from,
+      useCloudBean: isCombinedPayment.value
     })
+      .then((result) => {
+        state.buttonLoading = false;
+        if (typeof result === "boolean" && result) {
+          window.location.href = props.payFinishJumpUrl as string;
+        } else {
+          emit("complete", {
+            result,
+            type: isCombinedPayment.value ? "combined" : "wePay",
+          });
+        }
+      })
+      .catch((error) => {
+        state.buttonLoading = false;
+        showToast({
+          title: error.message || "支付失败",
+          icon: "none",
+        });
+      });
   } else {
     wx.login({
       success({ code }: { code: string }) {
-        requestPaymentByBean({
-          caseConfigId: amounts.value[state.selected].id,
-          amount: amounts.value[state.selected].paymentAmount,
-          app: props.app,
-          tenant: props.tenant,
-          user: code,
-        }, props.headerApp).then(result => {
-          state.buttonLoading = false
-          if (result) {
-            emit('complete', { result: true, type: 'wePay' })
-          }
-        })
-      }
-    })
+        requestPaymentByBean(
+          {
+            caseConfigId: amounts.value[state.selected].id,
+            amount: currentAmount.value,
+            app: props.app,
+            tenant: props.tenant,
+            user: code,
+          },
+          props.headerApp
+        )
+          .then((result) => {
+            state.buttonLoading = false;
+            if (result) {
+              emit("complete", {
+                result: true,
+                type: isCombinedPayment.value ? "combined" : "wePay",
+              });
+            }
+          })
+          .catch((error) => {
+            state.buttonLoading = false;
+            showToast({
+              title: error.message || "支付失败",
+              icon: "none",
+            });
+          });
+      },
+      fail() {
+        state.buttonLoading = false;
+        showToast({
+          title: "登录失败，请重试",
+          icon: "none",
+        });
+      },
+    });
   }
 }
+
+const onPayClick = () => {
+  // 用云豆支付（纯云豆支付）
+  if (selectBean.value && !isCombinedPayment.value) {
+    showDialog.value = true;
+    return;
+  }
+
+  // 纯微信支付
+  proceedWechatPayment();
+};
 </script>
 
 <style lang="scss">
@@ -226,15 +365,16 @@ const onPayClick = () => {
   .bean-buy {
     margin: 0 15px;
     padding: 10px;
-    background: #FFFBF3;
+    background: #fffbf3;
     border-radius: 5px;
     display: flex;
     justify-content: space-between;
     align-items: center;
+    flex-wrap: wrap;
 
     .left {
       .title {
-        color: #FD6701;
+        color: #fd6701;
         font-size: 14px;
         font-weight: 600;
         line-height: 20px;
@@ -245,7 +385,7 @@ const onPayClick = () => {
         color: #353535;
         font-size: 13px;
         line-height: 16px;
-        background-image: url('https://cdn.ddjf.com/static/images/appkit/yundou.png');
+        background-image: url("https://cdn.ddjf.com/static/images/appkit/yundou.png");
         background-repeat: no-repeat;
         background-size: 16px 16px;
         padding-left: 24px;
@@ -272,9 +412,24 @@ const onPayClick = () => {
     }
   }
 
+  .balance-warning {
+    width: 100%;
+    padding: 8px 10px;
+    margin-top: 10px;
+    background: #fdefe6;
+    border-radius: 5px;
+    color: #fd6701;
+    font-size: 12px;
+
+    &-tip {
+      margin: 10px 26px 0;
+      color: #666666;
+      font-size: 10px;
+    }
+  }
+
   .amount-footer {
     padding: 10px 0;
-    padding-bottom: 20px;
 
     .agreement {
       font-size: 12px;
@@ -299,7 +454,7 @@ const onPayClick = () => {
         font-size: 13px;
 
         .amount {
-          color: #FD6701;
+          color: #fd6701;
           font-size: 20px;
           font-weight: 600;
 
@@ -311,7 +466,12 @@ const onPayClick = () => {
       }
 
       .recharge-button {
-        background: linear-gradient(90deg, #FFEBC1 0%, #FFD7A7 52.29%, #FFB875 100%);
+        background: linear-gradient(
+          90deg,
+          #ffebc1 0%,
+          #ffd7a7 52.29%,
+          #ffb875 100%
+        );
         color: #353535;
         margin: 12px 0;
         border: 0;
@@ -332,7 +492,7 @@ const onPayClick = () => {
 
     .link {
       display: inline;
-      color: #FD6701;
+      color: #fd6701;
     }
   }
 }
@@ -340,7 +500,7 @@ const onPayClick = () => {
 .trade-dialog {
   .nut-dialog__header {
     font-size: 16px;
-    color: #262626
+    color: #262626;
   }
 
   .item {
@@ -351,13 +511,13 @@ const onPayClick = () => {
 
   .nut-dialog__footer-cancel {
     color: #353535 !important;
-    border-color: #CCCCCC !important;
+    border-color: #cccccc !important;
   }
 
   .nut-dialog__footer-ok {
     border: none;
     color: #353535;
-    background: linear-gradient(90deg, #FFEBC1 0%, #FFB875 100%);
+    background: linear-gradient(90deg, #ffebc1 0%, #ffb875 100%);
   }
 }
 </style>

package/src/payment/services/request-payment.ts

@@ -117,6 +117,8 @@ const requestBrandWCPayByBean = (params: PaymentParams, Appcode = '') => {
             }
           })
         }
+      }).catch(() => {
+        resolve(false)
       })
   })
 }

package/src/payment/types.ts

@@ -28,6 +28,7 @@ export type PaymentParams = {
   payFinishJumpUrl?: string
   fromMini?: Boolean
   clientInfo?: string
+  useCloudBean?: boolean
 }
 
 export type RechargeParams = Pick<PaymentParams, 'app' | 'tenant'>