@uxda/appkit 1.0.28 → 1.0.30

package/dist/appkit.css

@@ -77,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==");

package/dist/index.js

@@ -92,10 +92,11 @@ script$a.__file = "src/payment/components/UserAgreement.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({
@@ -210,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);
@@ -232,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?.();
@@ -276,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 = {
@@ -353,7 +359,9 @@ const globalData = {};
 
 const appKitOptions = {
   token: () => "",
-  baseUrl: () => ""
+  baseUrl: () => "",
+  401() {
+  }
 };
 const useAppKitOptions = () => {
   if (!globalData.$appKitOptions) {
@@ -370,6 +378,9 @@ const makeHttp$1 = () => {
   const $http = useHttp({
     baseUrl: appkitOptions.baseUrl(),
     header,
+    onAuthError: () => {
+      appkitOptions["401"]();
+    },
     translates: translates$1,
     transforms: transforms$1
   });
@@ -476,7 +487,6 @@ var script$7 = /* @__PURE__ */ defineComponent({
         return false;
       }
       state.buttonLoading = true;
-      console.log("state.selected", state.selected);
       wx.login({
         success({ code }) {
           requestPayment({
@@ -717,6 +727,9 @@ const makeHttp = () => {
   const $http = useHttp({
     baseUrl: appkitOptions.baseUrl(),
     header,
+    onAuthError() {
+      appkitOptions[401]();
+    },
     translates,
     transforms
   });
@@ -1653,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 */
@@ -1759,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);
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxda/appkit",
-  "version": "1.0.28",
+  "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/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/RechargeView.vue

@@ -100,7 +100,6 @@ const onPayClick = () => {
     return false
   }
   state.buttonLoading = true
-  console.log('state.selected', state.selected)
   wx.login({
     success ({code}: {code: string}) {
       requestPayment({

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({