@uxda/appkit 1.0.26 → 1.0.30

package/dist/appkit.css

@@ -1,47 +1,38 @@
-.amounts-picker .nut-grid-item__content {
-  border-radius: 10px;
+.amount-picker {
+  padding: 14px 0 14px 14px;
+}
+.amount-picker .nut-grid-item__content {
   border: 1px solid rgba(204, 204, 204, 0.8);
   background: #F5F5F5;
+  border-radius: 8px;
 }
-.amounts-picker .tile {
+.amount-picker .tile {
   height: 80px;
 }
-.amounts-picker .tile.selected .nut-grid-item__content {
+.amount-picker .tile.selected .nut-grid-item__content {
   border-width: 2px;
   border-color: #EFD082;
   background: linear-gradient(180deg, #FFF7E3 0%, #FEFDE6 100%);
 }
-.amounts-picker h4 {
-  color: #d00;
-  font-size: 18px;
-}
-.amounts-picker h5 {
-  font-size: 12px;
-}
-.amounts-picker {
-  padding-top: 10px;
-}
-.amounts-picker .nut-grid-item__content {
-  border-radius: 8px;
-}
-.amounts-picker h4.token-line {
+.amount-picker h4.token-line {
   background-image: url("https://cdn.ddjf.com/static/images/appkit/yundou.png");
   background-size: 20px;
   background-repeat: no-repeat;
   background-position: left center;
   padding-left: 24px;
   color: #FD6701;
-  font-size: 18px;
   font-weight: 600;
   line-height: 25px;
+  color: #d00;
+  font-size: 18px;
 }
-.amounts-picker h5 {
-  font-size: 14px;
+.amount-picker h5 {
   line-height: 18px;
   color: #353535;
   font-weight: 600;
   opacity: 0.6;
   margin-top: 4px;
+  font-size: 12px;
 }
 .agreement-doc {
   padding: 1em;
@@ -57,27 +48,6 @@
 .agreement-doc p {
   margin: 0;
 }
-.recharge-result {
-  display: flex;
-  width: 100vw;
-  height: 100%;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-}
-.recharge-result h2 {
-  font-size: 16px;
-  font-weight: bold;
-  margin: 1em;
-}
-.recharge-result .figure {
-  width: 100px;
-  height: 100px;
-  background-image: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTAwIiBoZWlnaHQ9IjEwMCIgdmlld0JveD0iMCAwIDEwMCAxMDAiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxwYXRoIG9wYWNpdHk9IjAuMiIgZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik01MC41IDEwQzcyLjg2NzUgMTAgOTEgMjcuOTA4NiA5MSA1MEM5MSA3Mi4wOTE0IDcyLjg2NzUgOTAgNTAuNSA5MEMyOC4xMzI1IDkwIDEwIDcyLjA5MTQgMTAgNTBDMTAgMjcuOTA4NiAyOC4xMzI1IDEwIDUwLjUgMTBaIiBmaWxsPSIjOUFFMkNEIi8+CjxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgY2xpcC1ydWxlPSJldmVub2RkIiBkPSJNNTAuNSAxOEM2OS4wMDE1IDE4IDg0IDMyLjU1MDggODQgNTAuNUM4NCA2OC40NDkyIDY5LjAwMTUgODMgNTAuNSA4M0MzMS45OTg1IDgzIDE3IDY4LjQ0OTIgMTcgNTAuNUMxNyAzMi41NTA4IDMxLjk5ODUgMTggNTAuNSAxOFYxOFoiIGZpbGw9IiNDQUZBRUMiLz4KPHBhdGggZD0iTTM3IDQ5LjVMNDcgNjBMNjcgMzkiIHN0cm9rZT0iIzNEQ0E5RCIgc3Ryb2tlLXdpZHRoPSIxMCIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIi8+CjxwYXRoIGQ9Ik0xOS4xMjA0IDE2LjI5MTlMNy45OTg4NCAxMi43MzIxTDE1LjkyOTQgNS4wNTg5N0wxOS4xMjA0IDE2LjI5MTlaIiBmaWxsPSIjQ0FGQUVDIi8+CjxwYXRoIGQ9Ik0xMi44MzQgMjMuNDY0Mkw4LjU0NjMxIDI3LjU3NzhMNy4xMjc2NSAyMS44MDc4TDEyLjgzNCAyMy40NjQyWiIgZmlsbD0iI0NBRkFFQyIvPgo8L3N2Zz4K");
-}
-.recharge-result .back-button {
-  margin-top: 3em;
-}
 .page-header {
   flex-shrink: 0;
   position: relative;
@@ -107,7 +77,7 @@
   background-position: center center;
 }
 .page-header.color-mode-dark {
-  color: var(--text-color-dark-mode, "#fff");
+  color: var(--text-color-dark-mode, #fff);
 }
 .page-header.color-mode-dark .back-button {
   background-image: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNDIiIGhlaWdodD0iNDIiIHZpZXdCb3g9IjAgMCA0MiA0MiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggb3BhY2l0eT0iMC4wMSIgZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0wLjk5OTg0NyA0MUw0MC45OTk4IDQxTDQwLjk5OTggMUwwLjk5OTg0NyAxTDAuOTk5ODQ3IDQxWiIgZmlsbD0iI0Q4RDhEOCIgc3Ryb2tlPSJibGFjayIgc3Ryb2tlLW9wYWNpdHk9IjAuMDEiLz4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0xMi45OTM0IDE4Ljk0NzVDMTEuODYzNCAyMC4wMTQzIDExLjgxMjEgMjEuNzk1MiAxMi44Nzg5IDIyLjkyNTJMMjcuOTEwNiAzNy4xMzQzQzI4LjY5MjcgMzcuODczMSAyOS45MjU2IDM3LjgzODIgMzAuNjY0NSAzNy4wNTYyQzMxLjM2ODIgMzYuMzExNCAzMS4zNyAzNS4xNTc2IDMwLjY5MyAzNC40MTExTDE2LjUwMTMgMjAuOTkzNkwzMC41ODU4IDcuNjk3NjFDMzEuMzMwOSA2Ljk5NDI0IDMxLjI5ODMgNS43Mjc3MSAzMC42NjUxIDQuOTQzNzdDMjkuOTYxNyA0LjE5ODcxIDI4LjgwOTkgNC4xMzEwNCAyOC4wMjYgNC43NjQyN0wxMi45OTM0IDE4Ljk0NzVaIiBmaWxsPSJ3aGl0ZSIgc3Ryb2tlPSJibGFjayIgc3Ryb2tlLW9wYWNpdHk9IjAuMDEiLz4KPC9zdmc+Cg==");
@@ -138,6 +108,7 @@
 }
 .recharge-view .amount-footer {
   padding: 10px;
+  padding-bottom: 0;
 }
 .recharge-view .amount-footer .agreement {
   font-size: 12px;
@@ -151,6 +122,7 @@
   color: #353535;
   margin: 12px 0;
   border: 0;
+  border-radius: 8px;
 }
 .recharge-view .amount-footer .nut-checkbox {
   line-height: 40px;
@@ -164,6 +136,31 @@
   display: inline;
   color: #FD6701;
 }
+.recharge-result {
+  display: flex;
+  width: 100vw;
+  height: 100vh;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+.recharge-result h2 {
+  font-size: 16px;
+  font-weight: bold;
+  margin: 1em;
+}
+.recharge-result .caption {
+  color: #353535;
+  opacity: 0.5;
+}
+.recharge-result .figure {
+  width: 100px;
+  height: 100px;
+  background-image: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTAwIiBoZWlnaHQ9IjEwMCIgdmlld0JveD0iMCAwIDEwMCAxMDAiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxwYXRoIG9wYWNpdHk9IjAuMiIgZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik01MC41IDEwQzcyLjg2NzUgMTAgOTEgMjcuOTA4NiA5MSA1MEM5MSA3Mi4wOTE0IDcyLjg2NzUgOTAgNTAuNSA5MEMyOC4xMzI1IDkwIDEwIDcyLjA5MTQgMTAgNTBDMTAgMjcuOTA4NiAyOC4xMzI1IDEwIDUwLjUgMTBaIiBmaWxsPSIjOUFFMkNEIi8+CjxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgY2xpcC1ydWxlPSJldmVub2RkIiBkPSJNNTAuNSAxOEM2OS4wMDE1IDE4IDg0IDMyLjU1MDggODQgNTAuNUM4NCA2OC40NDkyIDY5LjAwMTUgODMgNTAuNSA4M0MzMS45OTg1IDgzIDE3IDY4LjQ0OTIgMTcgNTAuNUMxNyAzMi41NTA4IDMxLjk5ODUgMTggNTAuNSAxOFYxOFoiIGZpbGw9IiNDQUZBRUMiLz4KPHBhdGggZD0iTTM3IDQ5LjVMNDcgNjBMNjcgMzkiIHN0cm9rZT0iIzNEQ0E5RCIgc3Ryb2tlLXdpZHRoPSIxMCIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIi8+CjxwYXRoIGQ9Ik0xOS4xMjA0IDE2LjI5MTlMNy45OTg4NCAxMi43MzIxTDE1LjkyOTQgNS4wNTg5N0wxOS4xMjA0IDE2LjI5MTlaIiBmaWxsPSIjQ0FGQUVDIi8+CjxwYXRoIGQ9Ik0xMi44MzQgMjMuNDY0Mkw4LjU0NjMxIDI3LjU3NzhMNy4xMjc2NSAyMS44MDc4TDEyLjgzNCAyMy40NjQyWiIgZmlsbD0iI0NBRkFFQyIvPgo8L3N2Zz4K");
+}
+.recharge-result .back-button {
+  margin-top: 3em;
+}
 .account-card .card {
   background: #2F2F2F;
   border-radius: 10px;

package/dist/index.js

@@ -1,4 +1,4 @@
-import { defineComponent, reactive, resolveComponent, openBlock, createBlock, withCtx, createElementBlock, Fragment, renderList, normalizeClass, createElementVNode, toDisplayString, createStaticVNode, createVNode, createTextVNode, createCommentVNode, renderSlot, ref, onMounted, unref, computed, withDirectives, vShow } from 'vue';
+import { defineComponent, reactive, resolveComponent, openBlock, createBlock, withCtx, createElementBlock, Fragment, renderList, normalizeClass, createElementVNode, toDisplayString, createStaticVNode, createCommentVNode, renderSlot, createVNode, ref, onMounted, createTextVNode, unref, computed, withDirectives, vShow } from 'vue';
 import Taro, { usePageScroll } from '@tarojs/taro';
 import { Grid, GridItem, Button, Checkbox, Popup, OverLay, Icon, DatePicker, Picker } from '@nutui/nutui-taro';
 
@@ -28,7 +28,7 @@ var script$b = /* @__PURE__ */ defineComponent({
       const _component_nut_grid_item = resolveComponent("nut-grid-item");
       const _component_nut_grid = resolveComponent("nut-grid");
       return openBlock(), createBlock(_component_nut_grid, {
-        class: "amounts-picker",
+        class: "amount-picker",
         "column-num": 3,
         gutter: 10,
         border: false
@@ -90,66 +90,13 @@ const script$a = {};
 script$a.render = render;
 script$a.__file = "src/payment/components/UserAgreement.vue";
 
-const _hoisted_1$9 = { class: "recharge-result" };
-const _hoisted_2$7 = /* @__PURE__ */ createElementVNode(
-  "div",
-  { class: "figure" },
-  null,
-  -1
-  /* HOISTED */
-);
-const _hoisted_3$7 = /* @__PURE__ */ createElementVNode(
-  "h2",
-  null,
-  "\u5145\u503C\u6210\u529F",
-  -1
-  /* HOISTED */
-);
-const _hoisted_4$6 = /* @__PURE__ */ createElementVNode(
-  "div",
-  { class: "caption" },
-  "\u4E91\u8C46\u5C06\u57285\u5206\u949F\u4E4B\u5185\u5230\u8D26",
-  -1
-  /* HOISTED */
-);
-var script$9 = /* @__PURE__ */ defineComponent({
-  __name: "RechargeResult",
-  emits: ["dismiss"],
-  setup(__props, { emit: __emit }) {
-    const emit = __emit;
-    function onBackClick() {
-      emit("dismiss");
-    }
-    return (_ctx, _cache) => {
-      const _component_nut_button = resolveComponent("nut-button");
-      return openBlock(), createElementBlock("div", _hoisted_1$9, [
-        _hoisted_2$7,
-        _hoisted_3$7,
-        _hoisted_4$6,
-        createVNode(_component_nut_button, {
-          class: "back-button",
-          type: "default",
-          onClick: onBackClick
-        }, {
-          default: withCtx(() => [
-            createTextVNode("\u8FD4\u56DE")
-          ]),
-          _: 1
-          /* STABLE */
-        })
-      ]);
-    };
-  }
-});
-
-script$9.__file = "src/payment/components/RechargeResult.vue";
-
 function requestPayment$2(json) {
   return new Promise((resolve, reject) => {
-    const success = (message) => {
+    const success = (res) => {
       resolve(true);
     };
-    const fail = (message) => {
+    const fail = (res) => {
+      console.log("wx.requestPayment FAIL:", res);
       resolve(false);
     };
     wx.requestPayment({
@@ -160,11 +107,11 @@ function requestPayment$2(json) {
   });
 }
 
-const _hoisted_1$8 = {
+const _hoisted_1$9 = {
   key: 0,
   class: "page-title"
 };
-var script$8 = /* @__PURE__ */ defineComponent({
+var script$9 = /* @__PURE__ */ defineComponent({
   __name: "PageHeader",
   props: {
     title: { type: String, required: false, default: "" },
@@ -188,7 +135,7 @@ var script$8 = /* @__PURE__ */ defineComponent({
         [
           _ctx.title ? (openBlock(), createElementBlock(
             "h1",
-            _hoisted_1$8,
+            _hoisted_1$9,
             toDisplayString(_ctx.title),
             1
             /* TEXT */
@@ -206,10 +153,10 @@ var script$8 = /* @__PURE__ */ defineComponent({
   }
 });
 
-script$8.__file = "src/shared/components/PageHeader.vue";
+script$9.__file = "src/shared/components/PageHeader.vue";
 
-const _hoisted_1$7 = { class: "drawer-body" };
-var script$7 = /* @__PURE__ */ defineComponent({
+const _hoisted_1$8 = { class: "drawer-body" };
+var script$8 = /* @__PURE__ */ defineComponent({
   __name: "AppDrawer",
   props: {
     modelValue: { type: Boolean, required: true },
@@ -233,11 +180,11 @@ var script$7 = /* @__PURE__ */ defineComponent({
         "onUpdate:visible": onVisibleChange
       }, {
         default: withCtx(() => [
-          createVNode(script$8, {
+          createVNode(script$9, {
             title: _ctx.title,
             onClose: onPageHeaderClose
           }, null, 8, ["title"]),
-          createElementVNode("div", _hoisted_1$7, [
+          createElementVNode("div", _hoisted_1$8, [
             renderSlot(_ctx.$slots, "default")
           ])
         ]),
@@ -248,7 +195,7 @@ var script$7 = /* @__PURE__ */ defineComponent({
   }
 });
 
-script$7.__file = "src/shared/components/AppDrawer.vue";
+script$8.__file = "src/shared/components/AppDrawer.vue";
 
 var HttpMethod = /* @__PURE__ */ ((HttpMethod2) => {
   HttpMethod2["get"] = "GET";
@@ -264,12 +211,20 @@ const defaultClientConfig = {
     getCode: (data) => data.code,
     getMessage: (data) => data.msg,
     getData: (data) => data.result
+  },
+  interceptors: {
+    auth: (data) => data.code == "401",
+    server: (data) => false
   }
 };
 let clientConfig = {
   ...defaultClientConfig
 };
 const request = (config) => {
+  clientConfig = {
+    ...clientConfig,
+    ...config
+  };
   return new Promise((resolve, reject) => {
     const data = config.data && clientConfig.translates && clientConfig.translates[config.url] ? clientConfig.translates[config.url](config.data) : config.data;
     console.log(`[][][][][][][][][][][][] HTTP.${config.method}, ${clientConfig.baseUrl}${config.url}`, data);
@@ -286,7 +241,7 @@ const request = (config) => {
         const { data: raw } = res;
         if (clientConfig.interceptors?.auth(raw)) {
           clientConfig.onAuthError?.();
-          reject("auth failed");
+          reject("--- 401 ---");
         }
         if (clientConfig.interceptors?.server(raw)) {
           clientConfig.onServerError?.();
@@ -330,11 +285,8 @@ function useHttp(config) {
     post
   };
 }
-const successResonseCodes = [
-  "200"
-];
 function isSuccess(res) {
-  return /^2/.test(res.statusCode.toString()) && successResonseCodes.includes(`${clientConfig.response?.getCode(res.data)}`);
+  return /^2/.test(res.statusCode.toString());
 }
 
 const endpointsList$1 = {
@@ -407,7 +359,9 @@ const globalData = {};
 
 const appKitOptions = {
   token: () => "",
-  baseUrl: () => ""
+  baseUrl: () => "",
+  401() {
+  }
 };
 const useAppKitOptions = () => {
   if (!globalData.$appKitOptions) {
@@ -424,6 +378,9 @@ const makeHttp$1 = () => {
   const $http = useHttp({
     baseUrl: appkitOptions.baseUrl(),
     header,
+    onAuthError: () => {
+      appkitOptions["401"]();
+    },
     translates: translates$1,
     transforms: transforms$1
   });
@@ -479,11 +436,11 @@ const services$1 = [
   invokeRecharge$1
 ];
 
-const _hoisted_1$6 = { class: "view recharge-view" };
-const _hoisted_2$6 = { class: "flex-grow" };
-const _hoisted_3$6 = { class: "amount-footer" };
-const _hoisted_4$5 = { class: "agreement" };
-var script$6 = /* @__PURE__ */ defineComponent({
+const _hoisted_1$7 = { class: "view recharge-view" };
+const _hoisted_2$7 = { class: "flex-grow" };
+const _hoisted_3$7 = { class: "amount-footer" };
+const _hoisted_4$6 = { class: "agreement" };
+var script$7 = /* @__PURE__ */ defineComponent({
   __name: "RechargeView",
   props: {
     app: { type: String, required: true },
@@ -497,7 +454,6 @@ var script$6 = /* @__PURE__ */ defineComponent({
       agreed: false,
       selected: 0,
       agreementOpen: false,
-      resultOpen: false,
       buttonLoading: false
     });
     const amounts = ref([
@@ -531,7 +487,6 @@ var script$6 = /* @__PURE__ */ defineComponent({
         return false;
       }
       state.buttonLoading = true;
-      console.log("state.selected", state.selected);
       wx.login({
         success({ code }) {
           requestPayment({
@@ -543,27 +498,26 @@ var script$6 = /* @__PURE__ */ defineComponent({
             user: code
           }).then((result) => {
             state.buttonLoading = false;
-            state.resultOpen = true;
+            if (result) {
+              emit("complete", true);
+            }
           });
         }
       });
     };
-    const onResultDismiss = () => {
-      emit("complete", true);
-    };
     return (_ctx, _cache) => {
       const _component_nut_checkbox = resolveComponent("nut-checkbox");
       const _component_nut_button = resolveComponent("nut-button");
-      return openBlock(), createElementBlock("view", _hoisted_1$6, [
-        createElementVNode("view", _hoisted_2$6, [
+      return openBlock(), createElementBlock("view", _hoisted_1$7, [
+        createElementVNode("view", _hoisted_2$7, [
           createVNode(script$b, {
             items: amounts.value,
             selected: state.selected,
             onChange: onAmountSelect
           }, null, 8, ["items", "selected"])
         ]),
-        createElementVNode("view", _hoisted_3$6, [
-          createElementVNode("view", _hoisted_4$5, [
+        createElementVNode("view", _hoisted_3$7, [
+          createElementVNode("view", _hoisted_4$6, [
             createVNode(_component_nut_checkbox, {
               modelValue: state.agreed,
               "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => state.agreed = $event)
@@ -593,7 +547,7 @@ var script$6 = /* @__PURE__ */ defineComponent({
             /* STABLE */
           }, 8, ["loading"])
         ]),
-        createVNode(unref(script$7), {
+        createVNode(unref(script$8), {
           modelValue: state.agreementOpen,
           "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => state.agreementOpen = $event),
           title: "\u5145\u503C\u534F\u8BAE"
@@ -603,29 +557,73 @@ var script$6 = /* @__PURE__ */ defineComponent({
           ]),
           _: 1
           /* STABLE */
-        }, 8, ["modelValue"]),
-        createVNode(unref(script$7), {
-          modelValue: state.resultOpen,
-          "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => state.resultOpen = $event),
-          title: "\u5145\u503C"
+        }, 8, ["modelValue"])
+      ]);
+    };
+  }
+});
+
+script$7.__file = "src/payment/components/RechargeView.vue";
+
+const _hoisted_1$6 = { class: "recharge-result" };
+const _hoisted_2$6 = /* @__PURE__ */ createElementVNode(
+  "div",
+  { class: "figure" },
+  null,
+  -1
+  /* HOISTED */
+);
+const _hoisted_3$6 = /* @__PURE__ */ createElementVNode(
+  "h2",
+  null,
+  "\u5145\u503C\u6210\u529F",
+  -1
+  /* HOISTED */
+);
+const _hoisted_4$5 = /* @__PURE__ */ createElementVNode(
+  "div",
+  { class: "caption" },
+  "\u4E91\u8C46\u5C06\u57285\u5206\u949F\u4E4B\u5185\u5230\u8D26",
+  -1
+  /* HOISTED */
+);
+var script$6 = /* @__PURE__ */ defineComponent({
+  __name: "RechargeResult",
+  emits: ["dismiss"],
+  setup(__props, { emit: __emit }) {
+    const emit = __emit;
+    function onBackClick() {
+      emit("dismiss");
+    }
+    return (_ctx, _cache) => {
+      const _component_nut_button = resolveComponent("nut-button");
+      return openBlock(), createElementBlock("div", _hoisted_1$6, [
+        _hoisted_2$6,
+        _hoisted_3$6,
+        _hoisted_4$5,
+        createVNode(_component_nut_button, {
+          class: "back-button",
+          type: "default",
+          onClick: onBackClick
         }, {
           default: withCtx(() => [
-            createVNode(script$9, { onDismiss: onResultDismiss })
+            createTextVNode("\u8FD4\u56DE")
           ]),
           _: 1
           /* STABLE */
-        }, 8, ["modelValue"])
+        })
       ]);
     };
   }
 });
 
-script$6.__file = "src/payment/components/RechargeView.vue";
+script$6.__file = "src/payment/components/RechargeResult.vue";
 
 const components = {
   AmountPicker: script$b,
-  RechargeView: script$6,
-  UserAgreement: script$a
+  RechargeView: script$7,
+  UserAgreement: script$a,
+  RechargeResult: script$6
 };
 
 const typeMappings = {
@@ -698,7 +696,7 @@ const endpointsList = {
         list: result.accountRecordDetailDailyList.map((r) => ({
           date: r.operateTime,
           consumptions: r.accountRecordDetailList.map((d) => ({
-            position: positionMappings[d.accountTYpe],
+            position: positionMappings[d.accountType],
             type: typeMappings[d.changeType],
             direction: directionMappings[d.inOrOut],
             amount: d.changeValue,
@@ -729,6 +727,9 @@ const makeHttp = () => {
   const $http = useHttp({
     baseUrl: appkitOptions.baseUrl(),
     header,
+    onAuthError() {
+      appkitOptions[401]();
+    },
     translates,
     transforms
   });
@@ -1665,7 +1666,7 @@ const _hoisted_2 = /* @__PURE__ */ createElementVNode(
   { class: "body" },
   [
     /* @__PURE__ */ createElementVNode("h2", null, "\u64CD\u4F5C\u5931\u8D25"),
-    /* @__PURE__ */ createElementVNode("p", null, "\u60A8\u7684\u8D26\u6237\u4F59\u989D\u53EF\u80FD\u4E0D\u8DB3\uFF0C\u8BF7\u5145\u503C\u540E\u518D\u8FDB\u884C\u67E5\u8BE2")
+    /* @__PURE__ */ createElementVNode("p", null, "\u60A8\u7684\u8D26\u6237\u53EF\u7528\u4F59\u989D\u4E0D\u8DB3\uFF0C\u8BF7\u5145\u503C\u540E\u518D\u8FDB\u884C\u67E5\u8BE2")
   ],
   -1
   /* HOISTED */
@@ -1771,6 +1772,7 @@ const AppKit = {
     const appKitOptions = useAppKitOptions();
     appKitOptions.token = options.token;
     appKitOptions.baseUrl = options.baseUrl;
+    appKitOptions[401] = options[401];
     nutComponents.forEach((component) => {
       app.use(component);
     });
@@ -1780,4 +1782,4 @@ const AppKit = {
   }
 };
 
-export { script$1 as AccountView, script$b as AmountPicker, script$7 as AppDrawer, script$5 as BalanceCard, script as BalanceReminder, script$8 as PageHeader, script$6 as RechargeView, script$a as UserAgreement, components, AppKit as default, requestPayment$2 as requestPayment, services$1 as services, useAppKit, useHttp };
+export { script$1 as AccountView, script$b as AmountPicker, script$8 as AppDrawer, script$5 as BalanceCard, script as BalanceReminder, script$9 as PageHeader, script$6 as RechargeResult, script$7 as RechargeView, script$a as UserAgreement, components, AppKit as default, requestPayment$2 as requestPayment, services$1 as services, useAppKit, useHttp };

package/package.json

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

package/src/Appkit.ts

@@ -14,6 +14,7 @@ export type AppKitOptions = {
    * 调用 API 时使用的 base url
    */
   baseUrl (): string,
+  401 (): void
 }
 
 export type DollarApp = {
@@ -27,7 +28,8 @@ export type DollarApp = {
  */
 const appKitOptions: AppKitOptions = {
   token: () => '',
-  baseUrl: () => ''
+  baseUrl: () => '',
+  401 () {}
 }
 
 const useAppKitOptions = () => {

package/src/balance/api/endpoints.ts

@@ -75,7 +75,7 @@ const endpointsList: HttpEndpoints = {
         list: result.accountRecordDetailDailyList.map((r: any) => ({
           date: r.operateTime,
           consumptions: r.accountRecordDetailList.map((d: any) => ({
-            position: positionMappings[d.accountTYpe],
+            position: positionMappings[d.accountType],
             type: typeMappings[d.changeType],
             direction: directionMappings[d.inOrOut],
             amount: d.changeValue,

package/src/balance/api/index.ts

@@ -12,6 +12,9 @@ const makeHttp = () => {
   const $http = useHttp({
     baseUrl: appkitOptions.baseUrl(),
     header,
+    onAuthError () {
+      appkitOptions[401]()
+    },
     translates,
     transforms,
   })

package/src/balance/components/BalanceReminder.vue

@@ -8,7 +8,7 @@
     <div class="balance-reminder">
       <div class="body">
         <h2>操作失败</h2>
-        <p>您的账户余额可能不足，请充值后再进行查询</p>
+        <p>您的账户可用余额不足，请充值后再进行查询</p>
       </div>
       <div class="footer">
         <div class="col">

package/src/index.ts

@@ -57,6 +57,7 @@ const AppKit = {
     const appKitOptions = useAppKitOptions()
     appKitOptions.token = options.token
     appKitOptions.baseUrl = options.baseUrl
+    appKitOptions[401] = options[401]
     nutComponents.forEach(component => {
       app.use(component)
     })

package/src/payment/api/index.ts

@@ -12,6 +12,9 @@ const makeHttp = () => {
   const $http = useHttp({
     baseUrl: appkitOptions.baseUrl(),
     header,
+    onAuthError: () => {
+      appkitOptions['401']()
+    },
     translates,
     transforms,
   })

package/src/payment/components/AmountPicker.vue

@@ -1,6 +1,6 @@
 <template>
   <nut-grid
-    class="amounts-picker"
+    class="amount-picker"
     :column-num="3"
     :gutter="10"
     :border="false">
@@ -59,11 +59,12 @@ const onGridItemClick = (index: number) => {
 </script>
 
 <style lang="scss">
-.amounts-picker {
+.amount-picker {
+  padding: 14px 0 14px 14px;
   .nut-grid-item__content {
-    border-radius: 10px;
     border: 1px solid rgba(204, 204, 204, 0.80);
     background: #F5F5F5;
+    border-radius: 8px;
   }
   .tile {
     height: 80px;
@@ -75,22 +76,6 @@ const onGridItemClick = (index: number) => {
       }
     }
   }
-  h4 {
-    color: #d00;
-    font-size: 18px;
-  }
-  h5 {
-    font-size: 12px;
-  }
-}
-</style>
-
-<style lang="scss">
-.amounts-picker {
-  padding-top: 10px;
-  .nut-grid-item__content {
-    border-radius: 8px;
-  }
   h4.token-line {
     background-image: url("https://cdn.ddjf.com/static/images/appkit/yundou.png");
     background-size: 20px;
@@ -98,17 +83,18 @@ const onGridItemClick = (index: number) => {
     background-position: left center;
     padding-left: 24px;
     color: #FD6701;
-    font-size: 18px;
     font-weight: 600;
     line-height: 25px;
+    color: #d00;
+    font-size: 18px;
   }
   h5 {
-    font-size: 14px;
     line-height: 18px;
     color: #353535;
     font-weight: 600;
     opacity: 0.6;
     margin-top: 4px;
+    font-size: 12px;
   }
 }
 </style>

package/src/payment/components/RechargeResult.vue

@@ -20,7 +20,7 @@ function onBackClick () {
 .recharge-result {
   display: flex;
   width: 100vw;
-  height: 100%;
+  height: 100vh;
   flex-direction: column;
   justify-content: center;
   align-items: center;
@@ -29,6 +29,10 @@ function onBackClick () {
     font-weight: bold;
     margin: 1em;
   }
+  .caption {
+    color: #353535;
+    opacity: 0.5;
+  }
   .figure {
     width: 100px;
     height: 100px;

package/src/payment/components/RechargeView.vue

@@ -20,11 +20,6 @@
       title="充值协议">
       <user-agreement />
     </app-drawer>
-    <app-drawer
-      v-model="state.resultOpen"
-      title="充值">
-      <recharge-result @dismiss="onResultDismiss" />
-    </app-drawer>
   </view>
 </template>
 
@@ -32,7 +27,6 @@
 import { onMounted, reactive, ref } from 'vue'
 import AmountPicker from './AmountPicker.vue'
 import UserAgreement from './UserAgreement.vue'
-import RechargeResult from './RechargeResult.vue'
 import { AppDrawer } from '../../shared'
 import { makeHttp, endpoints } from '../api'
 import { requestPayment } from '../services'
@@ -68,7 +62,6 @@ const state = reactive({
   agreed: false,
   selected: 0,
   agreementOpen: false,
-  resultOpen: false,
   buttonLoading: false,
 })
 
@@ -107,7 +100,6 @@ const onPayClick = () => {
     return false
   }
   state.buttonLoading = true
-  console.log('state.selected', state.selected)
   wx.login({
     success ({code}: {code: string}) {
       requestPayment({
@@ -117,16 +109,13 @@ const onPayClick = () => {
         user: code
       }).then(result => {
         state.buttonLoading = false
-        state.resultOpen = true
+        if (result) {
+          emit('complete', true)
+        }
       })
     }
   })
 }
-
-const onResultDismiss = () => {
-  emit('complete', true)
-  // Taro.navigateBackMiniProgram({})
-}
 </script>
 
 <style lang="scss">
@@ -139,6 +128,7 @@ const onResultDismiss = () => {
   }
   .amount-footer {
     padding: 10px;
+    padding-bottom: 0;
     .agreement {
       font-size: 12px;
       display: flex;
@@ -151,6 +141,7 @@ const onResultDismiss = () => {
       color: #353535;
       margin: 12px 0;
       border: 0;
+      border-radius: 8px;
     }
     .nut-checkbox {
       line-height: 40px;

package/src/payment/components/index.ts

@@ -1,16 +1,19 @@
 import RechargeView from './RechargeView.vue'
 import AmountPicker from './AmountPicker.vue'
 import UserAgreement from './UserAgreement.vue'
+import RechargeResult from './RechargeResult.vue'
 
 const components = {
   AmountPicker,
   RechargeView,
-  UserAgreement
+  UserAgreement,
+  RechargeResult
 }
 
 export {
   AmountPicker,
   RechargeView,
   UserAgreement,
+  RechargeResult,
   components
 }

package/src/shared/components/PageHeader.vue

@@ -63,7 +63,7 @@ const onBackButtonClick = () => {
     background-position: center center;
   }
   &.color-mode-dark {
-    color: var(--text-color-dark-mode, '#fff');
+    color: var(--text-color-dark-mode, #fff);
     .back-button {
       background-image: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNDIiIGhlaWdodD0iNDIiIHZpZXdCb3g9IjAgMCA0MiA0MiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggb3BhY2l0eT0iMC4wMSIgZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0wLjk5OTg0NyA0MUw0MC45OTk4IDQxTDQwLjk5OTggMUwwLjk5OTg0NyAxTDAuOTk5ODQ3IDQxWiIgZmlsbD0iI0Q4RDhEOCIgc3Ryb2tlPSJibGFjayIgc3Ryb2tlLW9wYWNpdHk9IjAuMDEiLz4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0xMi45OTM0IDE4Ljk0NzVDMTEuODYzNCAyMC4wMTQzIDExLjgxMjEgMjEuNzk1MiAxMi44Nzg5IDIyLjkyNTJMMjcuOTEwNiAzNy4xMzQzQzI4LjY5MjcgMzcuODczMSAyOS45MjU2IDM3LjgzODIgMzAuNjY0NSAzNy4wNTYyQzMxLjM2ODIgMzYuMzExNCAzMS4zNyAzNS4xNTc2IDMwLjY5MyAzNC40MTExTDE2LjUwMTMgMjAuOTkzNkwzMC41ODU4IDcuNjk3NjFDMzEuMzMwOSA2Ljk5NDI0IDMxLjI5ODMgNS43Mjc3MSAzMC42NjUxIDQuOTQzNzdDMjkuOTYxNyA0LjE5ODcxIDI4LjgwOTkgNC4xMzEwNCAyOC4wMjYgNC43NjQyN0wxMi45OTM0IDE4Ljk0NzVaIiBmaWxsPSJ3aGl0ZSIgc3Ryb2tlPSJibGFjayIgc3Ryb2tlLW9wYWNpdHk9IjAuMDEiLz4KPC9zdmc+Cg==");
     }

package/src/shared/http/Http.ts

@@ -24,6 +24,10 @@ const defaultClientConfig: HttpClientConfig = {
     getCode: (data: ResponseRaw) => data.code,
     getMessage: (data: ResponseRaw) => data.msg,
     getData: (data: ResponseRaw) => data.result
+  },
+  interceptors: {
+    auth: (data) => data.code == '401',
+    server: (data) => false,
   }
 }
 
@@ -37,6 +41,10 @@ let clientConfig = {
  * @returns 
  */
 const request: Http['request'] = <T>(config: HttpRequestConfig) => {
+  clientConfig = {
+    ...clientConfig,
+    ...config,
+  }
   return new Promise<T>((resolve, reject) => {
     const data = config.data
       && clientConfig.translates
@@ -57,7 +65,7 @@ const request: Http['request'] = <T>(config: HttpRequestConfig) => {
         const { data: raw } = res
         if (clientConfig.interceptors?.auth(raw)) {
           clientConfig.onAuthError?.()
-          reject('auth failed')
+          reject('--- 401 ---')
         }
         if (clientConfig.interceptors?.server(raw)) {
           clientConfig.onServerError?.()
@@ -118,11 +126,8 @@ export function useHttp (config: HttpClientConfig): Http {
   }
 }
 
-const successResonseCodes = [
-  '200'
-]
+
 
 function isSuccess (res: Taro.request.SuccessCallbackResult<ResponseRaw>) {
   return /^2/.test(res.statusCode.toString())
-    && successResonseCodes.includes(`${clientConfig.response?.getCode(res.data)}`)
 }

package/src/shared/weixin/payment.ts

@@ -22,10 +22,11 @@ export function requestPayment(json: any): Promise<boolean> {
   //   /**接口调用结束的回调函数（调用成功、失败都会执行）*/
   //   complete = () => {}
   return new Promise<boolean>((resolve, reject) => {
-    const success = (message: string) => {
+    const success = (res) => {
       resolve(true)
     }
-    const fail = (message: string) => {
+    const fail = (res) => {
+      console.log('wx.requestPayment FAIL:', res)
       resolve(false)
     }
     wx.requestPayment({