@uxda/appkit 4.3.21 → 4.3.23

package/dist/index.js

@@ -557,11 +557,12 @@ function useLogger(options) {
 }
 
 function useWxAuth() {
-  function toWxAuth(source, redirectUri) {
+  function toWxAuth(source, redirectUri, authSource = null) {
     const $http = useHttp$2();
     $http.get("/cas/auth/render/", {
       source,
-      redirectUri
+      redirectUri,
+      authSource
     }).then((res) => {
       location.replace(res);
     });
@@ -1999,7 +2000,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,
@@ -3909,13 +3910,10 @@ const _hoisted_6$9 = {
   key: 1,
   class: "amount"
 };
-const _hoisted_7$6 = {
-  key: 0,
-  class: "amount"
-};
+const _hoisted_7$6 = { class: "amount" };
 const _hoisted_8$5 = ["src"];
 const _hoisted_9$4 = {
-  key: 1,
+  key: 0,
   class: "balance-warning"
 };
 const _hoisted_10$3 = {
@@ -4189,7 +4187,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)),
@@ -4198,28 +4196,27 @@ 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 */
               ))
             ]),
-            balance.value > 0 ? (openBlock(), createElementBlock("div", {
-              key: 0,
+            createElementVNode("div", {
               class: "right",
               onClick: _cache[0] || (_cache[0] = ($event) => selectBean.value = !selectBean.value)
             }, [
-              !isCombinedPayment.value ? (openBlock(), createElementBlock(
+              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 */
-              )) : createCommentVNode("v-if", true),
+              ),
               createElementVNode("img", {
                 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,

package/package.json

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

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 v-if="balance > 0" class="right" @click="selectBean = !selectBean">
-          <div class="amount" v-if="!isCombinedPayment">
-            -{{ formatAmount(amounts[state.selected].paymentAmount || 0) }}
+        <div class="right" @click="selectBean = !selectBean">
+          <div class="amount" >
+            -{{ selectBean && balance < amounts[state.selected].paymentAmount ? balance : formatAmount(amounts[state.selected].paymentAmount || 0) }}
           </div>
           <img
             class="icon"

package/src/shared/composables/useWxAuth.ts

@@ -10,12 +10,13 @@ export function useWxAuth() {
    * @param source 设备码
    * @param redirectUri 重定向地址
    */
-  function toWxAuth(source, redirectUri) {
+  function toWxAuth(source, redirectUri, authSource = null) {
     const $http = useHttp()
     $http
       .get('/cas/auth/render/', {
         source,
         redirectUri,
+        authSource
       })
       .then((res: any) => {
         location.replace(res)

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(