@uxda/appkit 1.0.60 → 1.0.64

package/dist/appkit.css

@@ -422,7 +422,7 @@ page {
 }
 .consumption-date-filter .time {
   display: flex;
-  justify-content: start;
+  justify-content: flex-start;
   align-items: center;
   margin: 10px 0 30px 0;
 }
@@ -477,6 +477,10 @@ page {
   margin: 0 auto;
   text-align: center;
 }
+.consumption-view.popupOpen {
+  height: 100vh;
+  overflow: hidden;
+}
 .consumption-view .spa-between {
   padding: 0 0 0 10px;
   display: flex;

package/dist/index.js

@@ -234,13 +234,13 @@ const request = (config) => {
       method: config.method,
       success(res) {
         if (!isSuccess(res)) {
-          console.error("\u63A5\u53E3\u62A5\u9519", res);
+          reject(`==\u63A5\u53E3\u62A5\u9519==${res.statusCode}`);
           reject({});
         }
         const { data: raw } = res;
         if (clientConfig.interceptors?.auth(raw)) {
           clientConfig.onAuthError?.();
-          reject("--- 401 ---");
+          reject("===401===");
         }
         if (clientConfig.interceptors?.server(raw)) {
           clientConfig.onServerError?.();
@@ -250,7 +250,7 @@ const request = (config) => {
         if (response) {
           resolve(clientConfig.transforms && clientConfig.transforms[config.url] ? clientConfig.transforms[config.url](response) : response);
         } else {
-          reject({});
+          reject(`==\u63A5\u53E3\u62A5\u9519==${raw.msg}`);
         }
       },
       fail(res) {
@@ -360,6 +360,7 @@ const appKitOptions = {
   app: () => "",
   tenant: () => "",
   token: () => "",
+  tempToken: () => "",
   baseUrl: () => "",
   401() {
   }
@@ -373,9 +374,10 @@ const useAppKitOptions = () => {
 
 const makeHttp$1 = () => {
   const appkitOptions = useAppKitOptions();
-  console.log("===makeHTTP===token:", appkitOptions.token());
+  console.log("===makeHTTP===tempToken:", appkitOptions.tempToken());
+  const token = appkitOptions.tempToken() || appkitOptions.token();
   const header = {
-    Token: appkitOptions.token(),
+    Token: token,
     Appcode: appkitOptions.app()
   };
   const $http = useHttp({
@@ -1213,12 +1215,11 @@ var script$2 = /* @__PURE__ */ defineComponent({
 
 script$2.__file = "src/balance/components/ConsumptionRules.vue";
 
-const _hoisted_1$1 = { class: "consumption-view" };
-const _hoisted_2$1 = { class: "header" };
-const _hoisted_3$1 = { class: "header_card" };
-const _hoisted_4$1 = { class: "clound-bean" };
-const _hoisted_5$1 = { class: "bean-box spa-between" };
-const _hoisted_6 = /* @__PURE__ */ createElementVNode(
+const _hoisted_1$1 = { class: "header" };
+const _hoisted_2$1 = { class: "header_card" };
+const _hoisted_3$1 = { class: "clound-bean" };
+const _hoisted_4$1 = { class: "bean-box spa-between" };
+const _hoisted_5$1 = /* @__PURE__ */ createElementVNode(
   "div",
   { class: "bean-img" },
   [
@@ -1231,20 +1232,20 @@ const _hoisted_6 = /* @__PURE__ */ createElementVNode(
   -1
   /* HOISTED */
 );
-const _hoisted_7 = { class: "bean-counts spa-between" };
-const _hoisted_8 = { class: "counts number" };
-const _hoisted_9 = /* @__PURE__ */ createElementVNode(
+const _hoisted_6 = { class: "bean-counts spa-between" };
+const _hoisted_7 = { class: "counts number" };
+const _hoisted_8 = /* @__PURE__ */ createElementVNode(
   "div",
   { class: "line" },
   null,
   -1
   /* HOISTED */
 );
-const _hoisted_10 = {
+const _hoisted_9 = {
   key: 0,
   class: "small-clound-bean clound-bean"
 };
-const _hoisted_11 = /* @__PURE__ */ createElementVNode(
+const _hoisted_10 = /* @__PURE__ */ createElementVNode(
   "div",
   { class: "bean-box spa-between" },
   [
@@ -1255,20 +1256,20 @@ const _hoisted_11 = /* @__PURE__ */ createElementVNode(
   -1
   /* HOISTED */
 );
-const _hoisted_12 = { class: "bean-list" };
-const _hoisted_13 = { class: "counts number" };
-const _hoisted_14 = { class: "title" };
-const _hoisted_15 = { class: "operation-title spa-between" };
-const _hoisted_16 = { class: "search-time" };
-const _hoisted_17 = /* @__PURE__ */ createElementVNode(
+const _hoisted_11 = { class: "bean-list" };
+const _hoisted_12 = { class: "counts number" };
+const _hoisted_13 = { class: "title" };
+const _hoisted_14 = { class: "operation-title spa-between" };
+const _hoisted_15 = { class: "search-time" };
+const _hoisted_16 = /* @__PURE__ */ createElementVNode(
   "div",
   { class: "title" },
   "\u6536\u652F\u660E\u7EC6",
   -1
   /* HOISTED */
 );
-const _hoisted_18 = { class: "text" };
-const _hoisted_19 = /* @__PURE__ */ createElementVNode(
+const _hoisted_17 = { class: "text" };
+const _hoisted_18 = /* @__PURE__ */ createElementVNode(
   "img",
   {
     class: "time-icon",
@@ -1278,14 +1279,14 @@ const _hoisted_19 = /* @__PURE__ */ createElementVNode(
   -1
   /* HOISTED */
 );
-const _hoisted_20 = /* @__PURE__ */ createElementVNode(
+const _hoisted_19 = /* @__PURE__ */ createElementVNode(
   "span",
   { class: "text" },
   "\u7B5B\u9009",
   -1
   /* HOISTED */
 );
-const _hoisted_21 = /* @__PURE__ */ createElementVNode(
+const _hoisted_20 = /* @__PURE__ */ createElementVNode(
   "img",
   {
     class: "time-icon",
@@ -1295,35 +1296,35 @@ const _hoisted_21 = /* @__PURE__ */ createElementVNode(
   -1
   /* HOISTED */
 );
-const _hoisted_22 = [
-  _hoisted_20,
-  _hoisted_21
+const _hoisted_21 = [
+  _hoisted_19,
+  _hoisted_20
 ];
-const _hoisted_23 = { class: "operation-list" };
-const _hoisted_24 = {
+const _hoisted_22 = { class: "operation-list" };
+const _hoisted_23 = {
   key: 0,
   class: "box"
 };
-const _hoisted_25 = { class: "title" };
-const _hoisted_26 = { class: "item-type" };
-const _hoisted_27 = { class: "item-detail" };
-const _hoisted_28 = { class: "item-info spa-between" };
-const _hoisted_29 = { class: "item-info-type" };
-const _hoisted_30 = { class: "item-info-title" };
-const _hoisted_31 = { class: "item-info-amount number" };
-const _hoisted_32 = { class: "item-detail-remark" };
-const _hoisted_33 = /* @__PURE__ */ createElementVNode(
+const _hoisted_24 = { class: "title" };
+const _hoisted_25 = { class: "item-type" };
+const _hoisted_26 = { class: "item-detail" };
+const _hoisted_27 = { class: "item-info spa-between" };
+const _hoisted_28 = { class: "item-info-type" };
+const _hoisted_29 = { class: "item-info-title" };
+const _hoisted_30 = { class: "item-info-amount number" };
+const _hoisted_31 = { class: "item-detail-remark" };
+const _hoisted_32 = /* @__PURE__ */ createElementVNode(
   "div",
   { class: "box-not-text" },
   "\u6CA1\u6709\u66F4\u591A\u4E86",
   -1
   /* HOISTED */
 );
-const _hoisted_34 = {
+const _hoisted_33 = {
   key: 1,
   class: "operations-empty"
 };
-const _hoisted_35 = /* @__PURE__ */ createElementVNode(
+const _hoisted_34 = /* @__PURE__ */ createElementVNode(
   "img",
   {
     class: "operations-empty-img",
@@ -1333,16 +1334,16 @@ const _hoisted_35 = /* @__PURE__ */ createElementVNode(
   -1
   /* HOISTED */
 );
-const _hoisted_36 = /* @__PURE__ */ createElementVNode(
+const _hoisted_35 = /* @__PURE__ */ createElementVNode(
   "div",
   { class: "operations-empty-text" },
   "\u6682\u65E0\u6570\u636E",
   -1
   /* HOISTED */
 );
-const _hoisted_37 = [
-  _hoisted_35,
-  _hoisted_36
+const _hoisted_36 = [
+  _hoisted_34,
+  _hoisted_35
 ];
 var script$1 = /* @__PURE__ */ defineComponent({
   __name: "AccountView",
@@ -1426,153 +1427,173 @@ var script$1 = /* @__PURE__ */ defineComponent({
       scrollY.value = scrollTop;
     });
     usePullDownRefresh(() => {
+      if (popupOpen.value) {
+        Taro.stopPullDownRefresh();
+        return;
+      }
       loadBalance();
       setTimeout(() => {
         Taro.stopPullDownRefresh();
       }, 500);
     });
+    const popupOpen = computed(() => {
+      return rulesPopupOpen.value || datePickerOpen.value || filterOpen.value;
+    });
     return (_ctx, _cache) => {
       const _component_nut_popup = resolveComponent("nut-popup");
       return openBlock(), createElementBlock(
         Fragment,
         null,
         [
-          createElementVNode("div", _hoisted_1$1, [
-            createElementVNode("div", _hoisted_2$1, [
-              createElementVNode("div", _hoisted_3$1, [
-                createElementVNode("div", _hoisted_4$1, [
-                  createElementVNode("div", _hoisted_5$1, [
-                    _hoisted_6,
-                    createElementVNode("div", {
-                      class: "rule",
-                      onClick: _cache[0] || (_cache[0] = ($event) => rulesPopupOpen.value = true)
-                    }, "\u89C4\u5219\u8BF4\u660E")
-                  ]),
-                  createElementVNode("div", _hoisted_7, [
-                    createElementVNode(
-                      "div",
-                      _hoisted_8,
-                      toDisplayString(balance.value.total || 0),
-                      1
-                      /* TEXT */
-                    ),
-                    createElementVNode("div", {
-                      class: "pay",
-                      onClick: gotoRecharge
-                    }, "\u4E91\u8C46\u5145\u503C")
-                  ])
-                ]),
-                _hoisted_9,
-                balance.value.privileges.length > 0 ? (openBlock(), createElementBlock("div", _hoisted_10, [
-                  _hoisted_11,
-                  createElementVNode("div", _hoisted_12, [
-                    (openBlock(true), createElementBlock(
-                      Fragment,
-                      null,
-                      renderList(balance.value.privileges, (item) => {
-                        return openBlock(), createElementBlock("div", {
-                          key: item,
-                          class: "bean-list-item"
-                        }, [
-                          createElementVNode(
-                            "div",
-                            _hoisted_13,
-                            toDisplayString(item.amount),
-                            1
-                            /* TEXT */
-                          ),
-                          createElementVNode(
-                            "div",
-                            _hoisted_14,
-                            toDisplayString(item.title),
-                            1
-                            /* TEXT */
-                          )
-                        ]);
-                      }),
-                      128
-                      /* KEYED_FRAGMENT */
-                    ))
-                  ])
-                ])) : createCommentVNode("v-if", true)
-              ])
-            ]),
-            createElementVNode("div", _hoisted_15, [
-              createElementVNode("div", _hoisted_16, [
-                _hoisted_17,
-                withDirectives(createElementVNode(
-                  "div",
-                  {
-                    class: "time",
-                    onClick: openDateFilter
-                  },
-                  [
-                    createElementVNode(
-                      "div",
-                      _hoisted_18,
-                      toDisplayString(dataRangeDisplay.value),
-                      1
-                      /* TEXT */
-                    ),
-                    _hoisted_19
-                  ],
-                  512
-                  /* NEED_PATCH */
-                ), [
-                  [vShow, filtering.dateFrom]
-                ])
-              ]),
-              createElementVNode("div", {
-                class: "search",
-                onClick: _cache[1] || (_cache[1] = ($event) => filterOpen.value = true)
-              }, [..._hoisted_22])
-            ]),
-            createElementVNode("div", _hoisted_23, [
-              consumptionGroups.value.list.length > 0 ? (openBlock(), createElementBlock("div", _hoisted_24, [
-                (openBlock(true), createElementBlock(
-                  Fragment,
-                  null,
-                  renderList(consumptionGroups.value.list, (item, index) => {
-                    return openBlock(), createElementBlock("div", {
-                      class: "box-detail",
-                      key: index
-                    }, [
+          createElementVNode(
+            "div",
+            {
+              class: normalizeClass(["consumption-view", { popupOpen: popupOpen.value }])
+            },
+            [
+              createElementVNode("div", _hoisted_1$1, [
+                createElementVNode("div", _hoisted_2$1, [
+                  createElementVNode("div", _hoisted_3$1, [
+                    createElementVNode("div", _hoisted_4$1, [
+                      _hoisted_5$1,
+                      createElementVNode("div", {
+                        class: "rule",
+                        onClick: _cache[0] || (_cache[0] = ($event) => rulesPopupOpen.value = true)
+                      }, "\u89C4\u5219\u8BF4\u660E")
+                    ]),
+                    createElementVNode("div", _hoisted_6, [
                       createElementVNode(
                         "div",
-                        _hoisted_25,
-                        toDisplayString(item.date),
+                        _hoisted_7,
+                        toDisplayString(balance.value.total || 0),
                         1
                         /* TEXT */
                       ),
+                      createElementVNode("div", {
+                        class: "pay",
+                        onClick: gotoRecharge
+                      }, "\u4E91\u8C46\u5145\u503C")
+                    ])
+                  ]),
+                  _hoisted_8,
+                  balance.value.privileges.length > 0 ? (openBlock(), createElementBlock("div", _hoisted_9, [
+                    _hoisted_10,
+                    createElementVNode("div", _hoisted_11, [
                       (openBlock(true), createElementBlock(
                         Fragment,
                         null,
-                        renderList(item.consumptions, (it, i) => {
+                        renderList(balance.value.privileges, (item) => {
                           return openBlock(), createElementBlock("div", {
-                            class: "item",
-                            key: i
+                            key: item,
+                            class: "bean-list-item"
                           }, [
                             createElementVNode(
                               "div",
-                              _hoisted_26,
-                              toDisplayString(it.type),
+                              _hoisted_12,
+                              toDisplayString(item.amount),
                               1
                               /* TEXT */
                             ),
-                            createElementVNode("div", _hoisted_27, [
-                              createElementVNode("div", _hoisted_28, [
-                                createElementVNode("div", null, [
-                                  createElementVNode(
-                                    "div",
-                                    _hoisted_29,
-                                    toDisplayString(it.position),
-                                    1
-                                    /* TEXT */
-                                  ),
+                            createElementVNode(
+                              "div",
+                              _hoisted_13,
+                              toDisplayString(item.title),
+                              1
+                              /* TEXT */
+                            )
+                          ]);
+                        }),
+                        128
+                        /* KEYED_FRAGMENT */
+                      ))
+                    ])
+                  ])) : createCommentVNode("v-if", true)
+                ])
+              ]),
+              createElementVNode("div", _hoisted_14, [
+                createElementVNode("div", _hoisted_15, [
+                  _hoisted_16,
+                  withDirectives(createElementVNode(
+                    "div",
+                    {
+                      class: "time",
+                      onClick: openDateFilter
+                    },
+                    [
+                      createElementVNode(
+                        "div",
+                        _hoisted_17,
+                        toDisplayString(dataRangeDisplay.value),
+                        1
+                        /* TEXT */
+                      ),
+                      _hoisted_18
+                    ],
+                    512
+                    /* NEED_PATCH */
+                  ), [
+                    [vShow, filtering.dateFrom]
+                  ])
+                ]),
+                createElementVNode("div", {
+                  class: "search",
+                  onClick: _cache[1] || (_cache[1] = ($event) => filterOpen.value = true)
+                }, [..._hoisted_21])
+              ]),
+              createElementVNode("div", _hoisted_22, [
+                consumptionGroups.value.list.length > 0 ? (openBlock(), createElementBlock("div", _hoisted_23, [
+                  (openBlock(true), createElementBlock(
+                    Fragment,
+                    null,
+                    renderList(consumptionGroups.value.list, (item, index) => {
+                      return openBlock(), createElementBlock("div", {
+                        class: "box-detail",
+                        key: index
+                      }, [
+                        createElementVNode(
+                          "div",
+                          _hoisted_24,
+                          toDisplayString(item.date),
+                          1
+                          /* TEXT */
+                        ),
+                        (openBlock(true), createElementBlock(
+                          Fragment,
+                          null,
+                          renderList(item.consumptions, (it, i) => {
+                            return openBlock(), createElementBlock("div", {
+                              class: "item",
+                              key: i
+                            }, [
+                              createElementVNode(
+                                "div",
+                                _hoisted_25,
+                                toDisplayString(it.type),
+                                1
+                                /* TEXT */
+                              ),
+                              createElementVNode("div", _hoisted_26, [
+                                createElementVNode("div", _hoisted_27, [
+                                  createElementVNode("div", null, [
+                                    createElementVNode(
+                                      "div",
+                                      _hoisted_28,
+                                      toDisplayString(it.position),
+                                      1
+                                      /* TEXT */
+                                    ),
+                                    createElementVNode(
+                                      "div",
+                                      _hoisted_29,
+                                      toDisplayString(it.title),
+                                      1
+                                      /* TEXT */
+                                    )
+                                  ]),
                                   createElementVNode(
                                     "div",
                                     _hoisted_30,
-                                    toDisplayString(it.title),
+                                    toDisplayString(it.direction == "\u652F\u51FA" ? "-" : "+") + toDisplayString(it.amount),
                                     1
                                     /* TEXT */
                                   )
@@ -1580,33 +1601,28 @@ var script$1 = /* @__PURE__ */ defineComponent({
                                 createElementVNode(
                                   "div",
                                   _hoisted_31,
-                                  toDisplayString(it.direction == "\u652F\u51FA" ? "-" : "+") + toDisplayString(it.amount),
+                                  toDisplayString(it.description),
                                   1
                                   /* TEXT */
                                 )
-                              ]),
-                              createElementVNode(
-                                "div",
-                                _hoisted_32,
-                                toDisplayString(it.description),
-                                1
-                                /* TEXT */
-                              )
-                            ])
-                          ]);
-                        }),
-                        128
-                        /* KEYED_FRAGMENT */
-                      ))
-                    ]);
-                  }),
-                  128
-                  /* KEYED_FRAGMENT */
-                )),
-                _hoisted_33
-              ])) : (openBlock(), createElementBlock("div", _hoisted_34, [..._hoisted_37]))
-            ])
-          ]),
+                              ])
+                            ]);
+                          }),
+                          128
+                          /* KEYED_FRAGMENT */
+                        ))
+                      ]);
+                    }),
+                    128
+                    /* KEYED_FRAGMENT */
+                  )),
+                  _hoisted_32
+                ])) : (openBlock(), createElementBlock("div", _hoisted_33, [..._hoisted_36]))
+              ])
+            ],
+            2
+            /* CLASS */
+          ),
           createVNode(_component_nut_popup, {
             "pop-class": "consumption-rules-popup",
             visible: rulesPopupOpen.value,
@@ -1767,6 +1783,10 @@ const $app = {
     const appKitOptions = useAppKitOptions();
     appKitOptions.token = token;
   },
+  setTempToken: (token) => {
+    const appKitOptions = useAppKitOptions();
+    appKitOptions.tempToken = token;
+  },
   requestPayment: (options) => {
   },
   invokeRecharge: (options) => {

package/package.json

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

package/src/Appkit.ts

@@ -18,6 +18,11 @@ export type AppKitOptions = {
    * 由使用场景提供
    */
   token (): string,
+  /**
+   * 临时 token 获取方法
+   * 由使用场景提供
+   */
+  tempToken: () => string,
   /**
    * 调用 API 时使用的 base url
    */
@@ -28,6 +33,7 @@ export type AppKitOptions = {
 
 export type DollarApp = {
   setToken: (token: () => string) => void,
+  setTempToken: (token: () => string) => void,
   requestPayment: (options: PaymentParams) => void,
   invokeRecharge: (options: RechargeParams) => void,
 }
@@ -39,6 +45,7 @@ const appKitOptions: AppKitOptions = {
   app: () => '',
   tenant: () => '',
   token: () => '',
+  tempToken: () => '',
   baseUrl: () => '',
   401 () {}
 }

package/src/balance/components/AccountView.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="consumption-view">
+  <div class="consumption-view" :class="{ popupOpen }">
     <div class="header">
       <div class="header_card">
         <div class="clound-bean">
@@ -234,16 +234,29 @@ usePageScroll((e) => {
 })
 
 usePullDownRefresh(() => {
+  if (popupOpen.value) {
+    Taro.stopPullDownRefresh()
+    return
+  }
+
   // 页面下拉刷新
   loadBalance()
   setTimeout(() => {
     Taro.stopPullDownRefresh()
   }, 500);
 })
+
+const popupOpen = computed(() => {
+  return rulesPopupOpen.value || datePickerOpen.value || filterOpen.value
+})
 </script>
 
 <style lang="scss">
 .consumption-view {
+  &.popupOpen {
+    height: 100vh;
+    overflow: hidden;
+  }
   .spa-between {
     padding: 0 0 0 10px;
     display: flex;

package/src/balance/components/DateFilter.vue

@@ -200,7 +200,7 @@ function onDatePickerComplete ({ selectedValue, selectedOptions }) {
   }
   .time {
     display: flex;
-    justify-content: start;
+    justify-content: flex-start;
     align-items: center;
     margin: 10px 0 30px 0;
     .line {

package/src/index.ts

@@ -41,6 +41,10 @@ const $app: DollarApp = {
     const appKitOptions = useAppKitOptions()
     appKitOptions.token = token
   },
+  setTempToken: (token: () => string) => {
+    const appKitOptions = useAppKitOptions()
+    appKitOptions.tempToken = token
+  },
   requestPayment: (options: PaymentParams) => {},
   invokeRecharge: (options: RechargeParams) => {}
 }

package/src/payment/api/index.ts

@@ -4,9 +4,11 @@ import { useAppKitOptions } from '../../Appkit'
 
 const makeHttp = () => {
   const appkitOptions = useAppKitOptions()
-  console.log('===makeHTTP===token:', appkitOptions.token())
+  console.log('===makeHTTP===tempToken:', appkitOptions.tempToken())
+
+  const token = appkitOptions.tempToken() || appkitOptions.token()
   const header = {
-    Token: appkitOptions.token(),
+    Token: token,
     Appcode: appkitOptions.app(),
   }
 

package/src/shared/http/Http.ts

@@ -59,15 +59,18 @@ const request: Http['request'] = <T>(config: HttpRequestConfig) => {
       method: config.method,
       success (res: Taro.request.SuccessCallbackResult<ResponseRaw>) {
         if (!isSuccess(res)) {
-          console.error('接口报错', res)
+          // 拦截 statusCode
+          reject(`==接口报错==${res.statusCode}`)
           reject({})
         }
         const { data: raw } = res
         if (clientConfig.interceptors?.auth(raw)) {
+          //拦截 401
           clientConfig.onAuthError?.()
-          reject('--- 401 ---')
+          reject('===401===')
         }
         if (clientConfig.interceptors?.server(raw)) {
+          // 拦截后端错误
           clientConfig.onServerError?.()
           reject('server error')
         }
@@ -79,9 +82,8 @@ const request: Http['request'] = <T>(config: HttpRequestConfig) => {
               ? clientConfig.transforms[config.url](response) as T
               : response as T)
         } else {
-          reject({
-            
-          })
+          // 拦截业务异常
+          reject(`==接口报错==${raw.msg}`)
         }
       },
       fail (res) {