@uxda/appkit 4.3.20 → 4.3.22

package/dist/appkit.css

@@ -239,8 +239,14 @@
   flex-grow: 1;
 }
 .recharge-view .amount-footer {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  background-color: #fff;
   padding: 10px;
   padding-bottom: 20px;
+  z-index: 10;
 }
 .recharge-view .amount-footer .agreement {
   font-size: 12px;
@@ -424,6 +430,12 @@
 }
 .recharge-view2 .amount-footer {
   padding: 10px 0;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  z-index: 10;
+  background-color: #fff;
 }
 .recharge-view2 .amount-footer .agreement {
   font-size: 12px;

package/dist/index.js

@@ -999,7 +999,7 @@ const endpointsList$3 = {
     path: "/ac-app/account/info/detail/app",
     // /app
     translate: (data) => ({
-      appCode: data.app
+      appCode: data.app || ""
     }),
     transform(result) {
       return {
@@ -1999,7 +1999,7 @@ const request = (config) => {
       }
       if (raw.data !== void 0) {
         const response = clientConfig.transforms && clientConfig.transforms[c.url] ? clientConfig.transforms[c.url](raw.data) : raw.data;
-        const paging = config.data && config.data.page ? clientConfig.paging.transform(raw.data) : void 0;
+        const paging = config.data && config.data.page ? clientConfig.paging?.transform(raw.data) : void 0;
         resolve(
           paging ? {
             paging,
@@ -4109,14 +4109,14 @@ var script$A = /* @__PURE__ */ defineComponent({
       }
     }
     const onPayClick = async () => {
+      if (isCombinedPayment.value || selectBean.value) {
+        const res = await checkBalance();
+        if (!res) return;
+      }
       if (selectBean.value && !isCombinedPayment.value) {
         showDialog.value = true;
         return;
       }
-      if (isCombinedPayment.value) {
-        const res = await checkBalance();
-        if (!res) return;
-      }
       proceedWechatPayment();
     };
     async function checkBalance() {
@@ -4186,7 +4186,7 @@ var script$A = /* @__PURE__ */ defineComponent({
                 -1
                 /* CACHED */
               )),
-              !selectBean.value || isCombinedPayment.value ? (openBlock(), createElementBlock(
+              !selectBean.value ? (openBlock(), createElementBlock(
                 "div",
                 _hoisted_5$d,
                 " \u4F59\u989D " + toDisplayString(unref(formatAmount)(balance.value || 0)),
@@ -4195,7 +4195,7 @@ var script$A = /* @__PURE__ */ defineComponent({
               )) : (openBlock(), createElementBlock(
                 "div",
                 _hoisted_6$9,
-                " \u6263\u51CF\u540E\u4F59\u989D " + toDisplayString(unref(formatAmount)(balance.value - amounts.value[state.selected].paymentAmount)),
+                " \u6263\u51CF\u540E\u4F59\u989D " + toDisplayString(balance.value > amounts.value[state.selected].paymentAmount ? unref(formatAmount)(balance.value - amounts.value[state.selected].paymentAmount) : 0),
                 1
                 /* TEXT */
               ))
@@ -4207,7 +4207,7 @@ var script$A = /* @__PURE__ */ defineComponent({
               createElementVNode(
                 "div",
                 _hoisted_7$6,
-                " -" + toDisplayString(unref(formatAmount)(amounts.value[state.selected].paymentAmount || 0)),
+                " -" + toDisplayString(selectBean.value && balance.value < amounts.value[state.selected].paymentAmount ? balance.value : unref(formatAmount)(amounts.value[state.selected].paymentAmount || 0)),
                 1
                 /* TEXT */
               ),

package/package.json

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

package/src/balance/api/endpoints.ts

@@ -52,7 +52,7 @@ const endpointsList: HttpEndpoints = {
   获取余额明细: {
     path: '/ac-app/account/info/detail/app', // /app
     translate: (data: OnlyApp) => ({
-      appCode: data.app,
+      appCode: data.app || '',
     }),
     transform(result: any) {
       return {

package/src/payment/components/RechargeView.vue

@@ -191,8 +191,14 @@ defineExpose({
   }
 
   .amount-footer {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    background-color: #fff;
     padding: 10px;
     padding-bottom: 20px;
+    z-index: 10;
 
     .agreement {
       font-size: 12px;

package/src/payment/components/TradeView.vue

@@ -9,17 +9,17 @@
       <div class="bean-buy" v-if="amounts[state.selected]">
         <div class="left">
           <div class="title">使用云豆支付</div>
-          <div class="amount" v-if="!selectBean || isCombinedPayment">
+          <div class="amount" v-if="!selectBean">
             余额 {{ formatAmount(balance || 0) }}
           </div>
           <div class="amount" v-else>
             扣减后余额
-            {{ formatAmount(balance - amounts[state.selected].paymentAmount) }}
+            {{ balance > amounts[state.selected].paymentAmount ? formatAmount(balance - amounts[state.selected].paymentAmount) : 0 }}
           </div>
         </div>
         <div class="right" @click="selectBean = !selectBean">
-          <div class="amount">
-            -{{ formatAmount(amounts[state.selected].paymentAmount || 0) }}
+          <div class="amount" >
+            -{{ selectBean && balance < amounts[state.selected].paymentAmount ? balance : formatAmount(amounts[state.selected].paymentAmount || 0) }}
           </div>
           <img
             class="icon"
@@ -360,18 +360,18 @@ function getChannelCode() {
 }
 
 const onPayClick = async () => {
+  // 云豆支付与组合支付检验云豆是否已经改变，改变则刷新选择
+  if (isCombinedPayment.value || selectBean.value) {
+    const res = await checkBalance()
+    if (!res) return
+  }
+
   // 用云豆支付（纯云豆支付）
   if (selectBean.value && !isCombinedPayment.value) {
     showDialog.value = true;
     return;
   }
 
-  if (isCombinedPayment.value) {
-    // 检验云豆是否已经改变，改变则刷新选择
-    const res = await checkBalance()
-    if (!res) return
-  }
-
   // 纯微信支付
   proceedWechatPayment();
 }
@@ -512,6 +512,12 @@ defineExpose({
 
   .amount-footer {
     padding: 10px 0;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    z-index: 10;
+    background-color: #fff;
 
     .agreement {
       font-size: 12px;

package/src/shared/http/Http.ts

@@ -74,7 +74,7 @@ const request: HttpInstance['request'] = <T>(config: HttpRequestConfig) => {
             // 并拼装回原 raw 数据
             const paging =
               config.data && config.data.page
-                ? (clientConfig.paging as Paging).transform(raw.data)
+                ? (clientConfig.paging as Paging)?.transform(raw.data)
                 : void 0
 
             resolve(