@uxda/appkit 4.3.1 → 4.3.2

package/dist/appkit.css

@@ -335,14 +335,15 @@
 .recharge-view2 .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;
 }
 .recharge-view2 .bean-buy .left .title {
-  color: #FD6701;
+  color: #fd6701;
   font-size: 14px;
   font-weight: 600;
   line-height: 20px;
@@ -373,9 +374,22 @@
   height: 16px;
   font-size: 0;
 }
+.recharge-view2 .balance-warning {
+  width: 100%;
+  padding: 8px 10px;
+  margin-top: 10px;
+  background: #fdefe6;
+  border-radius: 5px;
+  color: #fd6701;
+  font-size: 12px;
+}
+.recharge-view2 .balance-warning-tip {
+  margin: 10px 26px 0;
+  color: #666666;
+  font-size: 10px;
+}
 .recharge-view2 .amount-footer {
   padding: 10px 0;
-  padding-bottom: 20px;
 }
 .recharge-view2 .amount-footer .agreement {
   font-size: 12px;
@@ -399,7 +413,7 @@
   font-size: 13px;
 }
 .recharge-view2 .amount-footer .buy-amount .left .amount {
-  color: #FD6701;
+  color: #fd6701;
   font-size: 20px;
   font-weight: 600;
 }
@@ -408,7 +422,7 @@
   font-style: normal;
 }
 .recharge-view2 .amount-footer .buy-amount .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;
@@ -425,7 +439,7 @@
 }
 .recharge-view2 .amount-footer .link {
   display: inline;
-  color: #FD6701;
+  color: #fd6701;
 }
 .trade-dialog .nut-dialog__header {
   font-size: 16px;
@@ -438,12 +452,12 @@
 }
 .trade-dialog .nut-dialog__footer-cancel {
   color: #353535 !important;
-  border-color: #CCCCCC !important;
+  border-color: #cccccc !important;
 }
 .trade-dialog .nut-dialog__footer-ok {
   border: none;
   color: #353535;
-  background: linear-gradient(90deg, #FFEBC1 0%, #FFB875 100%);
+  background: linear-gradient(90deg, #ffebc1 0%, #ffb875 100%);
 }
 page {
   --text-color: #333;

package/dist/index.js

@@ -1501,6 +1501,7 @@ const request = (config) => {
       }
     }).catch((e) => {
       console.log("request.catch===", e);
+      reject(e);
     });
   });
 };
@@ -2694,9 +2695,11 @@ const endpointsList$2 = {
       certificateNo: params.user,
       accountAuthFlag: params.accountAuthFlag || false,
       channelCode: params.channelCode || null,
-      payFinishJumpUrl: params.payFinishJumpUrl || null
+      payFinishJumpUrl: params.payFinishJumpUrl || null,
+      useCloudBean: params.useCloudBean || false
     }),
     transform: (data) => {
+      console.log(data, "data-----");
       let json = null;
       try {
         json = JSON.parse(data.prePayStr);
@@ -2764,6 +2767,7 @@ const vendor$2 = {
             title: data.msg,
             icon: "none"
           });
+          reject(data.msg);
         }
       }).catch((e) => {
         reject(e);
@@ -2927,6 +2931,8 @@ const requestBrandWCPayByBean = (params, Appcode = "") => {
           }
         });
       }
+    }).catch(() => {
+      resolve(false);
     });
   });
 };
@@ -3331,17 +3337,25 @@ const _hoisted_6$9 = {
 };
 const _hoisted_7$6 = { class: "amount" };
 const _hoisted_8$5 = ["src"];
-const _hoisted_9$4 = { class: "amount-footer" };
+const _hoisted_9$4 = {
+  key: 0,
+  class: "balance-warning"
+};
 const _hoisted_10$3 = {
+  key: 1,
+  class: "balance-warning-tip"
+};
+const _hoisted_11$3 = { class: "amount-footer" };
+const _hoisted_12$3 = {
   key: 0,
   class: "agreement"
 };
-const _hoisted_11$3 = { class: "buy-amount" };
-const _hoisted_12$3 = { class: "left" };
-const _hoisted_13$2 = { class: "amount" };
-const _hoisted_14$2 = { class: "item" };
-const _hoisted_15$2 = { class: "item" };
+const _hoisted_13$2 = { class: "buy-amount" };
+const _hoisted_14$2 = { class: "left" };
+const _hoisted_15$2 = { class: "amount" };
 const _hoisted_16$2 = { class: "item" };
+const _hoisted_17$2 = { class: "item" };
+const _hoisted_18$2 = { class: "item" };
 var script$A = /* @__PURE__ */ defineComponent({
   __name: "TradeView",
   props: {
@@ -3374,8 +3388,28 @@ var script$A = /* @__PURE__ */ defineComponent({
       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;
+        }
+        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$2({ Appcode: props.headerApp, Tenant: props.tenant });
@@ -3389,24 +3423,28 @@ var script$A = /* @__PURE__ */ defineComponent({
     const showDialog = ref(false);
     async function beanPay() {
       const $http = useHttp$2({ Appcode: props.headerApp, Tenant: props.tenant });
-      $http.post(`/payment/paymentCaseConfig/purchase/${amounts.value[state.selected].id}`).then((response) => {
+      try {
+        const response = await $http.post(
+          `/payment/paymentCaseConfig/purchase/${amounts.value[state.selected].id}`
+        );
         if (response) {
           showDialog.value = false;
           emit("complete", { result: response, type: "bean" });
         } else {
           showToast({
-            title: response.message,
+            title: response?.message || "\u652F\u4ED8\u5931\u8D25",
             icon: "none"
           });
         }
-      });
-    }
-    const onPayClick = () => {
-      if (selectBean.value) {
-        showDialog.value = true;
-        return;
+      } catch (error) {
+        showToast({
+          title: error?.message || "\u652F\u4ED8\u5931\u8D25",
+          icon: "none"
+        });
       }
-      if (!selectBean.value && !state.agreed) {
+    }
+    function proceedWechatPayment() {
+      if (!state.agreed) {
         showToast({
           title: "\u8BF7\u52FE\u9009\u300A\u5927\u9053\u4E91\u5E73\u53F0\u4E91\u8C46\u5145\u503C\u534F\u8BAE\u300B",
           icon: "none"
@@ -3425,40 +3463,75 @@ var script$A = /* @__PURE__ */ defineComponent({
         }
         requestBrandWCPayByBean({
           caseConfigId: amounts.value[state.selected].id,
-          amount: amounts.value[state.selected].paymentAmount,
+          amount: currentAmount.value,
           app: "loankitMp",
           tenant: props.tenant,
           accountAuthFlag: false,
           channelCode: "centergzh",
           payFinishJumpUrl: props.payFinishJumpUrl,
-          fromMini: !!params.from
+          fromMini: !!params.from,
+          useCloudBean: isCombinedPayment.value
         }).then((result) => {
-          console.log(result, "------requestBrandWCPay");
           state.buttonLoading = false;
           if (typeof result === "boolean" && result) {
             window.location.href = props.payFinishJumpUrl;
           } else {
-            emit("complete", { result, type: "wePay" });
+            emit("complete", {
+              result,
+              type: isCombinedPayment.value ? "combined" : "wePay"
+            });
           }
+        }).catch((error) => {
+          state.buttonLoading = false;
+          showToast({
+            title: error.message || "\u652F\u4ED8\u5931\u8D25",
+            icon: "none"
+          });
         });
       } else {
         wx.login({
           success({ code }) {
-            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) => {
+            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: "wePay" });
+                emit("complete", {
+                  result: true,
+                  type: isCombinedPayment.value ? "combined" : "wePay"
+                });
               }
+            }).catch((error) => {
+              state.buttonLoading = false;
+              showToast({
+                title: error.message || "\u652F\u4ED8\u5931\u8D25",
+                icon: "none"
+              });
+            });
+          },
+          fail() {
+            state.buttonLoading = false;
+            showToast({
+              title: "\u767B\u5F55\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5",
+              icon: "none"
             });
           }
         });
       }
+    }
+    const onPayClick = () => {
+      if (selectBean.value && !isCombinedPayment.value) {
+        showDialog.value = true;
+        return;
+      }
+      proceedWechatPayment();
     };
     return (_ctx, _cache) => {
       const _component_nut_checkbox = Checkbox;
@@ -3481,29 +3554,28 @@ var script$A = /* @__PURE__ */ defineComponent({
                 -1
                 /* CACHED */
               )),
-              !selectBean.value ? (openBlock(), createElementBlock(
+              !selectBean.value || isCombinedPayment.value ? (openBlock(), createElementBlock(
                 "div",
                 _hoisted_5$c,
-                "\u4F59\u989D " + toDisplayString(unref(formatAmount)(balance.value || 0)),
+                " \u4F59\u989D " + toDisplayString(unref(formatAmount)(balance.value || 0)),
                 1
                 /* TEXT */
               )) : (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(unref(formatAmount)(balance.value - amounts.value[state.selected].paymentAmount)),
                 1
                 /* TEXT */
               ))
             ]),
-            balance.value >= amounts.value[state.selected].paymentAmount ? (openBlock(), createElementBlock("div", {
-              key: 0,
+            createElementVNode("div", {
               class: "right",
               onClick: _cache[0] || (_cache[0] = ($event) => selectBean.value = !selectBean.value)
             }, [
               createElementVNode(
                 "div",
                 _hoisted_7$6,
-                "-" + toDisplayString(unref(formatAmount)(amounts.value[state.selected].paymentAmount || 0)),
+                " -" + toDisplayString(unref(formatAmount)(amounts.value[state.selected].paymentAmount || 0)),
                 1
                 /* TEXT */
               ),
@@ -3511,12 +3583,20 @@ var script$A = /* @__PURE__ */ defineComponent({
                 class: "icon",
                 src: selectBean.value ? "https://cdn.ddjf.com/static/images/appkit/select.svg" : "https://cdn.ddjf.com/static/images/appkit/not-select.svg"
               }, null, 8, _hoisted_8$5)
-            ])) : createCommentVNode("v-if", true)
+            ]),
+            isCombinedPayment.value ? (openBlock(), createElementBlock(
+              "div",
+              _hoisted_9$4,
+              " \u4E91\u8C46\u4F59\u989D\u4E0D\u8DB3,\u8FD8\u9700\u989D\u5916\u652F\u4ED8" + toDisplayString(unref(formatAmount)(extraPaymentAmount.value)) + "\u5143 ",
+              1
+              /* TEXT */
+            )) : createCommentVNode("v-if", true)
           ])) : createCommentVNode("v-if", true),
+          isCombinedPayment.value ? (openBlock(), createElementBlock("div", _hoisted_10$3, " \u8BF7\u5728\u652F\u4ED8\u5B8C\u6210\u524D\u786E\u4FDD\u5143\u8C46\u4F59\u989D\u4E0D\u88AB\u6D88\u8017,\u5426\u5219\u672C\u6B21\u6743\u76CA\u53EF\u80FD\u8D2D\u4E70\u5931\u8D25 ")) : createCommentVNode("v-if", true),
           renderSlot(_ctx.$slots, "banner")
         ]),
-        createElementVNode("view", _hoisted_9$4, [
-          !selectBean.value ? (openBlock(), createElementBlock("view", _hoisted_10$3, [
+        createElementVNode("view", _hoisted_11$3, [
+          !selectBean.value || isCombinedPayment.value ? (openBlock(), createElementBlock("view", _hoisted_12$3, [
             createVNode(_component_nut_checkbox, {
               modelValue: state.agreed,
               "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => state.agreed = $event)
@@ -3544,14 +3624,14 @@ var script$A = /* @__PURE__ */ defineComponent({
               /* STABLE */
             }, 8, ["modelValue"])
           ])) : createCommentVNode("v-if", true),
-          createElementVNode("div", _hoisted_11$3, [
-            createElementVNode("div", _hoisted_12$3, [
+          createElementVNode("div", _hoisted_13$2, [
+            createElementVNode("div", _hoisted_14$2, [
               _cache[8] || (_cache[8] = createTextVNode(
                 " \u5F85\u652F\u4ED8\uFF1A ",
                 -1
                 /* CACHED */
               )),
-              createElementVNode("span", _hoisted_13$2, [
+              createElementVNode("span", _hoisted_15$2, [
                 _cache[7] || (_cache[7] = createElementVNode(
                   "i",
                   null,
@@ -3602,22 +3682,22 @@ var script$A = /* @__PURE__ */ defineComponent({
               [
                 createElementVNode(
                   "div",
-                  _hoisted_14$2,
-                  "\u4E91\u8C46\u6263\u51CF\uFF1A" + toDisplayString(unref(formatAmount)(amounts.value[state.selected].paymentAmount || 0)),
+                  _hoisted_16$2,
+                  " \u4E91\u8C46\u6263\u51CF\uFF1A" + toDisplayString(unref(formatAmount)(amounts.value[state.selected].paymentAmount || 0)),
                   1
                   /* TEXT */
                 ),
                 createElementVNode(
                   "div",
-                  _hoisted_15$2,
-                  "\u6743\u76CA\u589E\u52A0\uFF1A" + toDisplayString(unref(formatAmount)(amounts.value[state.selected].priceRightNum || 0)) + "\u7B14",
+                  _hoisted_17$2,
+                  " \u6743\u76CA\u589E\u52A0\uFF1A" + toDisplayString(unref(formatAmount)(amounts.value[state.selected].priceRightNum || 0)) + "\u7B14 ",
                   1
                   /* TEXT */
                 ),
                 createElementVNode(
                   "div",
-                  _hoisted_16$2,
-                  "\u6263\u51CF\u540E\u4E91\u8C46\u4F59\u989D\uFF1A" + toDisplayString(unref(formatAmount)(balance.value - amounts.value[state.selected].paymentAmount)),
+                  _hoisted_18$2,
+                  " \u6263\u51CF\u540E\u4E91\u8C46\u4F59\u989D\uFF1A" + toDisplayString(unref(formatAmount)(balance.value - amounts.value[state.selected].paymentAmount)),
                   1
                   /* TEXT */
                 )

package/package.json

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

package/src/payment/api/endpoints.ts

@@ -59,8 +59,10 @@ const endpointsList: HttpEndpoints = {
       accountAuthFlag: params.accountAuthFlag || false,
       channelCode: params.channelCode || null,
       payFinishJumpUrl: params.payFinishJumpUrl || null,
+      useCloudBean: params.useCloudBean || false,
     }),
     transform: (data: any) => {
+      console.log(data, 'data-----')
       let json = null
       try {
         json = JSON.parse(data.prePayStr)

package/src/payment/api/index.ts

@@ -51,6 +51,7 @@ const vendor = {
               title: data.msg,
               icon: 'none',
             })
+            reject(data.msg)
           }
         })
         .catch((e: any) => {

package/src/payment/components/RechargeResult.vue

@@ -30,7 +30,6 @@ const views = {
 function onBackClick () {
   emit('dismiss')
 }
-
 </script>
 
 <style lang="scss">