@uxda/appkit 4.3.14 → 4.3.15

package/src/payment/components/TradeView.vue

@@ -1,58 +1,28 @@
 <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 || isCombinedPayment">
-            余额 {{ formatAmount(balance || 0) }}
-          </div>
-          <div class="amount" v-else>
-            扣减后余额
-            {{ formatAmount(balance - amounts[state.selected].paymentAmount) }}
-          </div>
+          <div class="amount" v-if="!selectBean">余额 {{ formatAmount(balance || 0) }}</div>
+          <div class="amount" v-else>扣减后余额 {{ formatAmount(balance - amounts[state.selected].paymentAmount) }}</div>
         </div>
-        <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 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>
       </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 || isCombinedPayment">
-        <nut-checkbox v-model="state.agreed"
-          >我已阅读并同意<a
-            v-track-click
-            class="link inline"
-            @click="onAgreementLinkClick"
-            >《大道云平台云豆充值服务协议》</a
-          ></nut-checkbox
-        >
+      <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>
       <div class="buy-amount">
         <div class="left">
@@ -61,54 +31,29 @@
             <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 { 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 { 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 { isAlipay,isAndroid,isChrome,isIOS,isSafari,isWechat } from '../../shared/composables/useDeviceEnv'
 
 // 充值用户界面
 // 配置了必须的属性后
@@ -118,11 +63,11 @@ export interface RechargeViewProps {
   /**
    * header头中的appcode，一般情况下与app参数一致，当无应用权限时，此参数未空
    **/
-  headerApp: string;
+  headerApp: string,
   /**
    * 应用
    **/
-  app: string;
+  app: string,
   /**
    * 充值场景
    */
@@ -130,20 +75,16 @@ export interface RechargeViewProps {
   /**
    * 租户
    */
-  tenant: string;
+  tenant: string,
   /**
    * h5支付完成后跳转地址
    */
-  payFinishJumpUrl?: "";
-  /**
-   * 所有应用
-   **/
-   apps?: string;
+  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,
@@ -157,198 +98,122 @@ const state = reactive({
   // agreementOpen: false,
   buttonLoading: false,
   thirdPayId: '',
-});
+})
+
 
-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;
-};
-
-// 计算额外支付金额（当云豆余额不足时）
-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);
-});
+  state.selected = selected
+  selectBean.value = false
+}
 
-// 计算待支付金额
 const currentAmount = computed(() => {
-  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
-  );
-});
+  return amounts.value[state.selected] && !selectBean.value ? amounts.value[state.selected].paymentAmount : 0
+})
 
 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 showDialog = ref<boolean>(false);
+  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)
 async function beanPay() {
-  const $http = useHttp({ Appcode: props.headerApp, Tenant: props.tenant });
-  try {
-    const response: any = await $http.post(
-      `/payment/paymentCaseConfig/purchase/${amounts.value[state.selected].id}`
-    );
+  const $http = useHttp({ Appcode: props.headerApp, Tenant: props.tenant })
+  $http.post(`/payment/paymentCaseConfig/purchase/${amounts.value[state.selected].id}`).then((response: any) => {
     if (response) {
-      showDialog.value = false;
-      emit("complete", { result: response, type: "bean" });
+      showDialog.value = false
+      emit('complete', { result: response, type: 'bean' })
     } else {
       showToast({
-        title: (response as any)?.message || "支付失败",
-        icon: "none",
-      });
+        title: response.message,
+        icon: 'none',
+      })
     }
-  } catch (error: any) {
-    showToast({
-      title: error?.message || "支付失败",
-      icon: "none",
-    });
-  }
+  })
 }
 
-// 执行微信支付（用于组合支付或纯微信支付）
-function proceedWechatPayment() {
-  if (!state.agreed) {
-    showToast({
-      title: "请勾选《大道云平台云豆充值协议》",
-      icon: "none",
-    });
-    return false;
+
+const onPayClick = () => {
+  // 用云豆支付
+  if (selectBean.value) {
+    showDialog.value = true
+    return
   }
 
-  state.buttonLoading = true;
+  // 微信支付
+  if (!selectBean.value && !state.agreed) {
+    showToast({
+      title: '请勾选《大道云平台云豆充值协议》',
+      icon: 'none',
+    })
+    return false
+  }
+  state.buttonLoading = true
 
-  if (Taro.getEnv() === "WEB") {
+  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: currentAmount.value,
-      app: "loankitMp",
+      amount: amounts.value[state.selected].paymentAmount,
+      app: 'loankitMp',
       tenant: props.tenant,
       accountAuthFlag: false,
       channelCode: getChannelCode(),
       payFinishJumpUrl: props.payFinishJumpUrl,
-      fromMini: !!params.from,
-      useCloudBean: isCombinedPayment.value
+      fromMini: !!params.from
+    }).then((result: any) => {
+      state.buttonLoading = false;
+      if (typeof result === "boolean" && result) {
+        window.location.href = props.payFinishJumpUrl as string;
+      } else if (typeof result === 'object' && result?.paymentType === 'H5' && result?.prePayStr) {
+        state.thirdPayId = result?.thirdPayId || ''
+        window.location.href = result?.prePayStr;
+      } else {
+        emit('complete', { result, type: 'wePay' })
+      }
     })
-      .then((result: any) => {
-        console.log(result, '------requestBrandWCPayByBean')
-        state.buttonLoading = false;
-        if (typeof result === "boolean" && result) {
-          window.location.href = props.payFinishJumpUrl as string;
-        } else if (typeof result === 'object' && result?.paymentType === 'H5' && result?.prePayStr) {
-          state.thirdPayId = result?.thirdPayId || ''
-          window.location.href = result?.prePayStr;
-        } 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: 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",
-        });
-      },
-    });
+        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' })
+          }
+        })
+      }
+    })
   }
 }
 
@@ -356,66 +221,13 @@ function proceedWechatPayment() {
 function getChannelCode() {
   if (isWechat()) {
     return 'centergzh';
-  } else if (isAlipay()) {
+  } else if (isAlipay() || isAndroid() || (isIOS() && !isChrome() && !isSafari())) {
     return 'YundouZfb';
   } else {
     return 'distributor';
   }
 }
 
-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)
-      })
-  })
-}
-
 const payResultCheck = () => {
   if (!state.thirdPayId) return
   
@@ -426,7 +238,7 @@ const payResultCheck = () => {
     if (response.payStatus === 'paid') {
       emit("complete", {
         result: true,
-        type: isCombinedPayment.value ? "combined" : "wePay",
+        type: "wePay",
       });
     }
   })
@@ -451,16 +263,15 @@ defineExpose({
   .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;
@@ -471,7 +282,7 @@ defineExpose({
         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;
@@ -498,24 +309,9 @@ defineExpose({
     }
   }
 
-  .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;
@@ -540,7 +336,7 @@ defineExpose({
         font-size: 13px;
 
         .amount {
-          color: #fd6701;
+          color: #FD6701;
           font-size: 20px;
           font-weight: 600;
 
@@ -552,12 +348,7 @@ defineExpose({
       }
 
       .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;
@@ -578,7 +369,7 @@ defineExpose({
 
     .link {
       display: inline;
-      color: #fd6701;
+      color: #FD6701;
     }
   }
 }
@@ -586,7 +377,7 @@ defineExpose({
 .trade-dialog {
   .nut-dialog__header {
     font-size: 16px;
-    color: #262626;
+    color: #262626
   }
 
   .item {
@@ -597,13 +388,13 @@ defineExpose({
 
   .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

@@ -68,15 +68,13 @@ const requestBrandWCPay = (params: PaymentParams, Appcode = '') => {
         ...params,
       })
       .then((response: any) => {
-        if (!response.json && !response.prePayStr) {
+        if (!response.json) {
           showToast({
             title: response.message,
             icon: 'none',
           })
           resolve(false)
-        } else if (!response.json && response.prePayStr) {
-          resolve(response)
-        }  else if (params.fromMini) {
+        } else if (params.fromMini) {
           resolve(response.json)
         } else {
           requestWxH5Pay(response.json).then((result) => {
@@ -102,14 +100,12 @@ const requestBrandWCPayByBean = (params: PaymentParams, Appcode = '') => {
         ...params,
       })
       .then((response: any) => {
-        if (!response.json && !response.prePayStr) {
+        if (!response.json) {
           showToast({
             title: response.message,
             icon: 'none',
           })
           resolve(false)
-        } else if (!response.json && response.prePayStr) {
-          resolve(response)
         } else if (params.fromMini) {
           resolve(response.json)
         } else {
@@ -121,8 +117,6 @@ const requestBrandWCPayByBean = (params: PaymentParams, Appcode = '') => {
             }
           })
         }
-      }).catch(() => {
-        resolve(false)
       })
   })
 }