@uxda/appkit 4.0.12 → 4.0.16

package/dist/appkit.css

@@ -589,6 +589,7 @@ page {
   display: flex;
   flex-direction: column;
   width: 100%;
+  position: relative;
 }
 .consumption-date-filter .date-filter-header {
   text-align: center;
@@ -1112,13 +1113,12 @@ page {
   height: 12px;
   margin-left: 4px;
 }
-.consumption-filter {
-  height: 100%;
+.list-filter-picker {
   display: flex;
   flex-direction: column;
   width: 100%;
 }
-.consumption-filter-title {
+.list-filter-picker-title {
   position: relative;
   height: 44px;
   line-height: 44px;
@@ -1127,42 +1127,42 @@ page {
   background: #f5f5f5;
   text-align: center;
 }
-.consumption-filter-content {
+.list-filter-picker-content {
   flex: 1;
   margin: 15px;
   overflow-y: scroll;
   color: #353535;
   font-size: 13px;
 }
-.consumption-filter-content .title {
+.list-filter-picker-content .title {
   opacity: 0.6;
   line-height: 18px;
 }
-.consumption-filter-content .info {
+.list-filter-picker-content .info {
   display: grid;
   grid-template-columns: 1fr 1fr 1fr;
   grid-gap: 10px;
   margin: 10px 0;
 }
-.consumption-filter-content .info-item {
+.list-filter-picker-content .info-item {
   height: 30px;
   line-height: 30px;
   border: 1px solid #ccc;
   border-radius: 6px;
   text-align: center;
 }
-.consumption-filter-content .info .current {
+.list-filter-picker-content .info .current {
   border-radius: 5px;
   border: 1px solid #EFD082;
   background: linear-gradient(180deg, #FFF7E3 0%, #FEFDE6 100%);
 }
-.consumption-filter-btn {
+.list-filter-picker-btn {
   margin: 0 15px;
   display: flex;
   justify-content: space-between;
   align-items: center;
 }
-.consumption-filter-btn .btn {
+.list-filter-picker-btn .btn {
   flex: 1;
   height: 40px;
   line-height: 40px;
@@ -1173,17 +1173,17 @@ page {
   font-size: 16px;
   border-radius: 6px;
 }
-.consumption-filter-btn .confirm {
+.list-filter-picker-btn .confirm {
   margin-left: 11px;
   color: #000;
   border: none;
   background: linear-gradient(90deg, #ffebc1 0%, #ffd7a7 52.29%, #ffb875 100%);
 }
-.consumption-filter-bottom {
+.list-filter-picker-bottom {
   height: 32px;
   background: #fff;
 }
-.consumption-filter .icon {
+.list-filter-picker .icon {
   display: block;
   width: 20px;
   height: 20px;
@@ -1191,7 +1191,7 @@ page {
   background-repeat: no-repeat;
   background-position: center center;
 }
-.consumption-filter .icon.icon-x {
+.list-filter-picker .icon.icon-x {
   position: absolute;
   right: 10px;
   top: 11px;
@@ -1705,6 +1705,10 @@ page {
   font-size: 15px;
   line-height: 21px;
 }
+.user-entry-bd-arrow {
+  font-size: 12px;
+  margin-left: 8px;
+}
 .dd-skeleton__item {
   margin-top: 10px;
 }

package/dist/index.js

@@ -1,7 +1,7 @@
 import { GridItem, Grid, Popup, Checkbox, Button, Dialog, DatePicker, Radio, RadioGroup, FormItem, Form, Skeleton, Cell, Input, Step, Steps } from '@nutui/nutui-taro';
 import '@nutui/nutui-taro/dist/packages/button/style/css';
 import '@nutui/nutui-taro/dist/packages/checkbox/style/css';
-import { defineComponent, reactive, openBlock, createBlock, withCtx, createElementBlock, Fragment, renderList, normalizeClass, createElementVNode, toDisplayString, createTextVNode, createStaticVNode, ref, computed, onUnmounted, createCommentVNode, renderSlot, createVNode, unref, isRef, normalizeStyle, onMounted, watch, resolveComponent, withDirectives, vShow, vModelText, watchPostEffect, withModifiers } from 'vue';
+import { defineComponent, reactive, openBlock, createBlock, withCtx, createElementBlock, Fragment, renderList, normalizeClass, createElementVNode, toDisplayString, createTextVNode, createStaticVNode, ref, computed, onUnmounted, createCommentVNode, renderSlot, createVNode, unref, isRef, normalizeStyle, onMounted, watch, resolveComponent, withDirectives, vShow, useModel, mergeModels, vModelText, watchPostEffect, withModifiers } from 'vue';
 import '@nutui/nutui-taro/dist/packages/grid/style/css';
 import '@nutui/nutui-taro/dist/packages/griditem/style/css';
 import '@nutui/nutui-taro/dist/packages/popup/style/css';
@@ -291,6 +291,44 @@ const useUpload = (config) => {
   };
 };
 
+const defaultCryptoConfig = {
+  maskField: "mask",
+  secretField: "secretKey"
+};
+function useCrypto(config) {
+  const parse = (data, key) => {
+    let k = key || "masked";
+    let result = {};
+    try {
+      result = JSON.parse(data);
+      result = {
+        [k]: result.mask,
+        // 字段后加$表示用于解密的 secret
+        [`${k}$`]: result.secretKey
+      };
+    } catch (e) {
+    }
+    return result;
+  };
+  const resolve = (list, field) => {
+    const [first] = list, f = field ? Array.isArray(field) ? field : [field] : Object.entries(first).filter(([_, v]) => /^\{.*\}$/.test(v)).map(([k]) => k);
+    return list.map((item) => {
+      let result = { ...item };
+      f.forEach((r) => {
+        result = {
+          ...result,
+          ...parse(item[r], r)
+        };
+      });
+      return result;
+    });
+  };
+  return {
+    parse,
+    resolve
+  };
+}
+
 const _hoisted_1$C = {
   key: 0,
   class: "page-title"
@@ -400,16 +438,19 @@ var script$D = /* @__PURE__ */ defineComponent({
   props: {
     phone: { type: String, required: true },
     title: { type: String, required: false },
-    message: { type: String, required: false }
+    message: { type: String, required: false },
+    onSend: { type: Function, required: false }
   },
-  emits: ["update:modelValue"],
+  emits: ["complete", "cancel"],
   setup(__props, { emit: __emit }) {
+    const emits = __emit;
     const sent = ref(false), countdown = ref(60);
     let formData = reactive({
       code: ""
     });
     const send = () => {
       sent.value = true;
+      props.onSend && props.onSend();
       countdown.value = 60;
       let timer = setInterval(() => {
         countdown.value--;
@@ -419,6 +460,10 @@ var script$D = /* @__PURE__ */ defineComponent({
         }
       }, 1e3);
     };
+    const onOk = () => {
+      emits("complete", { code: formData.code });
+    };
+    const props = __props;
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", _hoisted_1$A, [
         createElementVNode(
@@ -444,17 +489,19 @@ var script$D = /* @__PURE__ */ defineComponent({
         ),
         createVNode(unref(NsForm), {
           modelValue: unref(formData),
-          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => isRef(formData) ? formData.value = $event : formData = $event)
+          "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => isRef(formData) ? formData.value = $event : formData = $event)
         }, {
           default: withCtx(() => [
             createVNode(unref(NsInput), {
               name: "code",
+              modelValue: unref(formData).code,
+              "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => unref(formData).code = $event),
               placeholder: "\u8BF7\u8F93\u5165\u9A8C\u8BC1\u7801",
               variant: "solid",
               rules: ["required", {
                 name: "function",
                 message: "\u8F93\u5165\u9519\u8BEF, \u8BF7\u91CD\u65B0\u8F93\u5165",
-                method: (value) => value.length === 4
+                method: (value) => value.length === 6
               }]
             }, {
               append: withCtx(() => [
@@ -476,13 +523,16 @@ var script$D = /* @__PURE__ */ defineComponent({
               ]),
               _: 1
               /* STABLE */
-            }, 8, ["rules"])
+            }, 8, ["modelValue", "rules"])
           ]),
           _: 1
           /* STABLE */
         }, 8, ["modelValue"]),
         createElementVNode("div", _hoisted_5$h, [
-          createVNode(unref(NsButton), { round: "" }, {
+          createVNode(unref(NsButton), {
+            round: "",
+            onClick: _cache[2] || (_cache[2] = ($event) => emits("cancel"))
+          }, {
             default: withCtx(() => [
               createTextVNode("\u53D6\u6D88")
             ]),
@@ -491,7 +541,8 @@ var script$D = /* @__PURE__ */ defineComponent({
           }),
           createVNode(unref(NsButton), {
             round: "",
-            gradient: "#FFEBC1,#FFD7A7,#FFB875/90"
+            gradient: "#FFEBC1,#FFD7A7,#FFB875/90",
+            onClick: onOk
           }, {
             default: withCtx(() => [
               createTextVNode("\u786E\u8BA4")
@@ -1929,7 +1980,7 @@ var script$v = /* @__PURE__ */ defineComponent({
 
 script$v.__file = "src/balance/components/BalanceCard.vue";
 
-const consumptionTypes$1 = [
+const consumptionTypes = [
   "\u5168\u90E8",
   "\u5145\u503C",
   "\u7F34\u8D39",
@@ -1941,8 +1992,8 @@ const consumptionTypes$1 = [
   "\u8D60\u9001",
   "\u6362\u8D2D"
 ];
-const consumptionPositions$1 = ["\u5168\u90E8", "\u4E91\u8C46", "\u6743\u76CA"];
-const consumptionDirections$1 = ["\u5168\u90E8", "\u6536\u5165", "\u652F\u51FA"];
+const consumptionPositions = ["\u5168\u90E8", "\u4E91\u8C46", "\u6743\u76CA"];
+const consumptionDirections = ["\u5168\u90E8", "\u6536\u5165", "\u652F\u51FA"];
 
 const _hoisted_1$t = { class: "consumption-filter" };
 const _hoisted_2$p = /* @__PURE__ */ createElementVNode(
@@ -1979,15 +2030,15 @@ var script$u = /* @__PURE__ */ defineComponent({
     const filterSections = ref([
       {
         title: "\u7C7B\u578B",
-        data: consumptionPositions$1.map((s) => ({ code: s, name: s }))
+        data: consumptionPositions.map((s) => ({ code: s, name: s }))
       },
       {
         title: "\u6536\u5165/\u652F\u51FA",
-        data: consumptionDirections$1.map((s) => ({ code: s, name: s }))
+        data: consumptionDirections.map((s) => ({ code: s, name: s }))
       },
       {
         title: "\u660E\u7EC6\u7C7B\u578B",
-        data: consumptionTypes$1.map((s) => ({ code: s, name: s }))
+        data: consumptionTypes.map((s) => ({ code: s, name: s }))
       },
       {
         title: "\u6743\u76CA\u7C7B\u76EE",
@@ -2165,74 +2216,66 @@ var script$t = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       const _component_nut_date_picker = DatePicker;
       const _component_nut_popup = Popup;
-      return openBlock(), createElementBlock(
-        Fragment,
-        null,
-        [
-          createElementVNode("div", _hoisted_1$s, [
-            _hoisted_2$o,
-            createElementVNode("div", _hoisted_3$j, [
-              _hoisted_4$f,
-              createElementVNode("div", _hoisted_5$c, [
-                createElementVNode(
-                  "div",
-                  {
-                    class: normalizeClass(["item", focused.value === "from" ? "current" : ""]),
-                    onClick: _cache[0] || (_cache[0] = ($event) => switchDateInput("from"))
-                  },
-                  toDisplayString(formatDate(result.from)),
-                  3
-                  /* TEXT, CLASS */
-                ),
-                _hoisted_6$8,
-                createElementVNode(
-                  "div",
-                  {
-                    class: normalizeClass(["item", focused.value === "to" ? "current" : ""]),
-                    onClick: _cache[1] || (_cache[1] = ($event) => switchDateInput("to"))
-                  },
-                  toDisplayString(formatDate(result.to)),
-                  3
-                  /* TEXT, CLASS */
-                )
-              ])
-            ]),
-            createElementVNode("div", { class: "buttons spa-between" }, [
-              createElementVNode("div", {
-                class: "btn",
-                onClick: reset
-              }, "\u91CD\u7F6E"),
-              createElementVNode("div", {
-                class: "btn confirm",
-                onClick: onOkClick
-              }, "\u786E\u5B9A")
-            ]),
-            _hoisted_7$6
+      return openBlock(), createElementBlock("div", _hoisted_1$s, [
+        _hoisted_2$o,
+        createElementVNode("div", _hoisted_3$j, [
+          _hoisted_4$f,
+          createElementVNode("div", _hoisted_5$c, [
+            createElementVNode(
+              "div",
+              {
+                class: normalizeClass(["item", focused.value === "from" ? "current" : ""]),
+                onClick: _cache[0] || (_cache[0] = ($event) => switchDateInput("from"))
+              },
+              toDisplayString(formatDate(result.from)),
+              3
+              /* TEXT, CLASS */
+            ),
+            _hoisted_6$8,
+            createElementVNode(
+              "div",
+              {
+                class: normalizeClass(["item", focused.value === "to" ? "current" : ""]),
+                onClick: _cache[1] || (_cache[1] = ($event) => switchDateInput("to"))
+              },
+              toDisplayString(formatDate(result.to)),
+              3
+              /* TEXT, CLASS */
+            )
+          ])
+        ]),
+        createElementVNode("div", { class: "buttons spa-between" }, [
+          createElementVNode("div", {
+            class: "btn",
+            onClick: reset
+          }, "\u91CD\u7F6E"),
+          createElementVNode("div", {
+            class: "btn confirm",
+            onClick: onOkClick
+          }, "\u786E\u5B9A")
+        ]),
+        _hoisted_7$6,
+        createVNode(_component_nut_popup, {
+          visible: datePickerOpen.value,
+          "onUpdate:visible": _cache[4] || (_cache[4] = ($event) => datePickerOpen.value = $event),
+          position: "bottom"
+        }, {
+          default: withCtx(() => [
+            createVNode(_component_nut_date_picker, {
+              modelValue: focusedDate.value,
+              "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => focusedDate.value = $event),
+              "min-date": minDate.value,
+              "max-date": maxDate.value,
+              "is-show-chinese": false,
+              "three-dimensional": false,
+              onCancel: _cache[3] || (_cache[3] = ($event) => datePickerOpen.value = false),
+              onConfirm: onDatePickerComplete
+            }, null, 8, ["modelValue", "min-date", "max-date"])
           ]),
-          createVNode(_component_nut_popup, {
-            visible: datePickerOpen.value,
-            "onUpdate:visible": _cache[4] || (_cache[4] = ($event) => datePickerOpen.value = $event),
-            position: "bottom"
-          }, {
-            default: withCtx(() => [
-              createVNode(_component_nut_date_picker, {
-                modelValue: focusedDate.value,
-                "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => focusedDate.value = $event),
-                "min-date": minDate.value,
-                "max-date": maxDate.value,
-                "is-show-chinese": false,
-                "three-dimensional": false,
-                onCancel: _cache[3] || (_cache[3] = ($event) => datePickerOpen.value = false),
-                onConfirm: onDatePickerComplete
-              }, null, 8, ["modelValue", "min-date", "max-date"])
-            ]),
-            _: 1
-            /* STABLE */
-          }, 8, ["visible"])
-        ],
-        64
-        /* STABLE_FRAGMENT */
-      );
+          _: 1
+          /* STABLE */
+        }, 8, ["visible"])
+      ]);
     };
   }
 });
@@ -3071,7 +3114,7 @@ var script$o = /* @__PURE__ */ defineComponent({
 
 script$o.__file = "src/balance/components/BalanceReminder.vue";
 
-const _hoisted_1$m = { class: "text number" };
+const _hoisted_1$m = { class: "text" };
 const _hoisted_2$i = /* @__PURE__ */ createElementVNode(
   "img",
   {
@@ -3085,47 +3128,55 @@ const _hoisted_2$i = /* @__PURE__ */ createElementVNode(
 );
 var script$n = /* @__PURE__ */ defineComponent({
   __name: "DateRange",
+  props: {
+    "modelValue": {
+      type: Object,
+      required: false,
+      default: {
+        from: dayjs().add(-1, "M").format("YYYY-MM-DD"),
+        to: dayjs().format("YYYY-MM-DD")
+      }
+    },
+    "modelModifiers": {}
+  },
+  emits: ["update:modelValue"],
   setup(__props) {
     const $n = useNutshell();
-    const filtering = reactive({
-      from: dayjs().add(-3, "M").format("YYYY-MM-DD"),
-      to: dayjs().format("YYYY-MM-DD")
-    });
-    const openDateFilter = () => {
+    const model = useModel(__props, "modelValue");
+    const openDateRangePicker = () => {
       $n.sheet({
         component: script$t,
         props: {
-          from: "2024-08-01",
-          to: "2024-08-31"
+          from: model.value.from,
+          to: model.value.to
+        },
+        onComplete(result) {
+          console.log("===openDateFilter complete", result);
+          model.value = {
+            from: result.from,
+            to: result.to
+          };
         }
       });
     };
     const dateRangeDisplay = computed(() => {
-      let startTime = (filtering.from || "").replace(/-/g, ".").substring(2);
-      let endTime = (filtering.to || "").replace(/-/g, ".").substring(2);
-      return startTime + " - " + endTime;
+      let startTime = (model.value.from || "").replace(/-/g, ".").substring(2);
+      let endTime = (model.value.to || "").replace(/-/g, ".").substring(2);
+      return startTime + "-" + endTime;
     });
     return (_ctx, _cache) => {
-      return withDirectives((openBlock(), createElementBlock(
-        "div",
-        {
-          class: "date-range",
-          onClick: openDateFilter
-        },
-        [
-          createElementVNode(
-            "div",
-            _hoisted_1$m,
-            toDisplayString(dateRangeDisplay.value),
-            1
-            /* TEXT */
-          ),
-          _hoisted_2$i
-        ],
-        512
-        /* NEED_PATCH */
-      )), [
-        [vShow, filtering.to]
+      return openBlock(), createElementBlock("div", {
+        class: "date-range",
+        onClick: openDateRangePicker
+      }, [
+        createElementVNode(
+          "div",
+          _hoisted_1$m,
+          toDisplayString(dateRangeDisplay.value),
+          1
+          /* TEXT */
+        ),
+        _hoisted_2$i
       ]);
     };
   }
@@ -3133,10 +3184,10 @@ var script$n = /* @__PURE__ */ defineComponent({
 
 script$n.__file = "src/balance/components/DateRange.vue";
 
-const _hoisted_1$l = { class: "consumption-filter" };
+const _hoisted_1$l = { class: "list-filter-picker" };
 const _hoisted_2$h = /* @__PURE__ */ createElementVNode(
   "div",
-  { class: "consumption-filter-title" },
+  { class: "list-filter-picker-title" },
   [
     /* @__PURE__ */ createElementVNode("h3", null, "\u9009\u62E9\u7B5B\u9009\u9879")
   ],
@@ -3157,51 +3208,45 @@ const _hoisted_7$4 = /* @__PURE__ */ createElementVNode(
 var script$m = /* @__PURE__ */ defineComponent({
   __name: "ListFilterPicker",
   props: {
-    modelValue: { type: null, required: true, default: () => ["\u5168\u90E8", "\u5168\u90E8", "\u5168\u90E8", ""] }
+    modelValue: { type: Object, required: true }
   },
   emits: ["complete"],
   setup(__props, { emit: __emit }) {
-    const $http = useHttp$3();
+    useHttp$3();
     const props = __props;
     const emit = __emit;
-    const result = reactive(props.modelValue);
+    const result = ref(props.modelValue);
     const filterSections = ref([
       {
-        title: "\u7C7B\u578B",
-        data: consumptionPositions.map((s) => ({ code: s, name: s }))
-      },
-      {
-        title: "\u6536\u5165/\u652F\u51FA",
-        data: consumptionDirections.map((s) => ({ code: s, name: s }))
-      },
-      {
-        title: "\u660E\u7EC6\u7C7B\u578B",
-        data: consumptionTypes.map((s) => ({ code: s, name: s }))
-      },
-      {
-        title: "\u6743\u76CA\u7C7B\u76EE",
-        data: []
+        label: "\u660E\u7EC6\u7C7B\u578B",
+        name: "type",
+        data: [
+          {
+            label: "\u5168\u90E8",
+            value: ""
+          },
+          {
+            label: "\u63D0\u73B0",
+            value: "withdrawal"
+          },
+          {
+            label: "\u6536\u76CA",
+            value: "income"
+          },
+          {
+            label: "\u5151\u6362",
+            value: "exchange"
+          }
+        ]
       }
     ]);
-    const getItemClass = (index, value) => result[index] === value ? ["current"] : [""];
+    const getItemClass = (name, value) => result.value[name]?.includes(value) ? ["current"] : [""];
     const onFilterSectionClick = (index, value) => {
-      result[index] = value;
+      result.value[index] = [value];
     };
     const reset = () => {
-      result[0] = "\u5168\u90E8";
-      result[1] = "\u5168\u90E8";
-      result[2] = "\u5168\u90E8";
-      result[3] = "";
+      result.value = {};
     };
-    const \u8BF7\u6C42\u6743\u76CA\u7C7B\u76EE = () => {
-      $http.get(endpoints$1.\u83B7\u53D6\u6743\u76CA\u7C7B\u76EE).then((data) => {
-        filterSections.value[3].data = [
-          { code: "", name: "\u5168\u90E8" },
-          ...data
-        ];
-      });
-    };
-    \u8BF7\u6C42\u6743\u76CA\u7C7B\u76EE();
     const onOkClick = () => {
       emit("complete", result);
     };
@@ -3220,7 +3265,7 @@ var script$m = /* @__PURE__ */ defineComponent({
                   createElementVNode(
                     "div",
                     _hoisted_4$a,
-                    toDisplayString(item.title),
+                    toDisplayString(item.label),
                     1
                     /* TEXT */
                   ),
@@ -3230,10 +3275,10 @@ var script$m = /* @__PURE__ */ defineComponent({
                       null,
                       renderList(item.data, (it, i) => {
                         return openBlock(), createElementBlock("div", {
-                          onClick: () => onFilterSectionClick(index, it.code),
-                          class: normalizeClass([getItemClass(index, it.code), "info-item"]),
+                          onClick: () => onFilterSectionClick(item.name, it.value),
+                          class: normalizeClass([getItemClass(item.name, it.value), "info-item"]),
                           key: i
-                        }, toDisplayString(typeof it === "string" ? it : it.name), 11, _hoisted_6$6);
+                        }, toDisplayString(typeof it === "string" ? it : it.label), 11, _hoisted_6$6);
                       }),
                       128
                       /* KEYED_FRAGMENT */
@@ -3289,11 +3334,32 @@ const _hoisted_3$c = [
 ];
 var script$l = /* @__PURE__ */ defineComponent({
   __name: "ListFilter",
-  setup(__props) {
+  props: {
+    "modelValue": {
+      type: Object,
+      default: {
+        type: ""
+      },
+      required: false
+    },
+    "modelModifiers": {}
+  },
+  emits: /* @__PURE__ */ mergeModels(["update:modelValue", "change"], ["update:modelValue"]),
+  setup(__props, { emit: __emit }) {
     const $n = useNutshell();
+    const model = useModel(__props, "modelValue");
+    const emit = __emit;
     const openPicker = () => {
       $n.sheet({
-        component: script$m
+        component: script$m,
+        props: {
+          modelValue: model,
+          onComplete: (result) => {
+            emit("update:modelValue", {
+              type: result[0]
+            });
+          }
+        }
       });
     };
     return (_ctx, _cache) => {
@@ -4923,25 +4989,16 @@ const _hoisted_2$8 = { class: "user-entry-head" };
 const _hoisted_3$5 = ["src"];
 const _hoisted_4$5 = { class: "user-entry-bd" };
 const _hoisted_5$5 = /* @__PURE__ */ createElementVNode(
-  "img",
-  {
-    class: "user-entry-bd-bigtxt-icon",
-    mode: "aspectFit",
-    src: "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNDAiIGhlaWdodD0iNDEiIHZpZXdCb3g9IjAgMCA0MCA0MSIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggb3BhY2l0eT0iMC4wMSIgZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0wIDQwLjM1MTZINDBWMC4zNTE1NjJIMFY0MC4zNTE2WiIgZmlsbD0id2hpdGUiLz4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0xNCA4LjM1MTU2TDI2IDIwLjM1MTZMMTQgMzIuMzUxNiIgZmlsbD0iYmxhY2siIGZpbGwtb3BhY2l0eT0iMC4wMSIvPgo8cGF0aCBkPSJNMTQgOC4zNTE1NkwyNiAyMC4zNTE2TDE0IDMyLjM1MTYiIHN0cm9rZT0iI2ZmZiIgc3Ryb2tlLXdpZHRoPSIzIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiLz4KPC9zdmc+Cg==",
-    alt: ""
-  },
-  null,
+  "span",
+  { class: "user-entry-bd-arrow" },
+  ">",
   -1
   /* HOISTED */
 );
 const _hoisted_6$3 = /* @__PURE__ */ createElementVNode(
-  "img",
-  {
-    style: { "width": "14px", "height": "14px", "margin-left": "2px" },
-    src: "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjgiIGhlaWdodD0iMjgiIHZpZXdCb3g9IjAgMCAyOCAyOCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTExLjA4MzUgN0wxOC4wODM1IDE0TDExLjA4MzUgMjEiIHN0cm9rZT0id2hpdGUiIHN0cm9rZS13aWR0aD0iMS43NSIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIi8+Cjwvc3ZnPgo=",
-    alt: ""
-  },
-  null,
+  "span",
+  { class: "user-entry-bd-arrow" },
+  ">",
   -1
   /* HOISTED */
 );
@@ -7655,4 +7712,4 @@ const AppKit = {
   }
 };
 
-export { script$p as AccountView, script$H as AmountPicker, script$E as AppDrawer, script$D as AppVerify, script$v as BalanceCard, script$o as BalanceReminder, script$n as DateRange, script$B as DeviceVersion, script$l as ListFilter, script$1 as LoginSetting, script$e as NoticeBanner, script$d as NoticeEntry, script$b as NoticeList, script$A as OcrIcon, script$F as PageHeader, script$y as RechargeResult, script$z as RechargeView, script$g as SelfRegistration, script$w as TradeView, script$G as UserAgreement, script$7 as UserBinding, script$6 as UserBindingSuccess, script$a as UserEntry, script$3 as UserFeedback, script$2 as UserFeedbackEntry, script$4 as UserHeadCrop, script$8 as UserInfo, script as UserResourceEmpty, components, createHttp, AppKit as default, requestPayment$2 as requestPayment, services$1 as services, useAppKit, useCountdown, useEncode, useSafeArea, useTabbar, useUpload, useValidator };
+export { script$p as AccountView, script$H as AmountPicker, script$E as AppDrawer, script$D as AppVerify, script$v as BalanceCard, script$o as BalanceReminder, script$n as DateRange, script$B as DeviceVersion, script$l as ListFilter, script$1 as LoginSetting, script$e as NoticeBanner, script$d as NoticeEntry, script$b as NoticeList, script$A as OcrIcon, script$F as PageHeader, script$y as RechargeResult, script$z as RechargeView, script$g as SelfRegistration, script$w as TradeView, script$G as UserAgreement, script$7 as UserBinding, script$6 as UserBindingSuccess, script$a as UserEntry, script$3 as UserFeedback, script$2 as UserFeedbackEntry, script$4 as UserHeadCrop, script$8 as UserInfo, script as UserResourceEmpty, components, createHttp, AppKit as default, defaultCryptoConfig, requestPayment$2 as requestPayment, services$1 as services, useAppKit, useCountdown, useCrypto, useEncode, useSafeArea, useTabbar, useUpload, useValidator };

package/package.json

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

package/src/balance/components/DateFilter.vue

@@ -22,18 +22,18 @@
       <div class="btn confirm" @click="onOkClick">确定</div>
     </div>
     <div class="bottom"></div>
+    <nut-popup v-model:visible="datePickerOpen" position="bottom">
+      <nut-date-picker
+        v-model="focusedDate"
+        :min-date="minDate"
+        :max-date="maxDate"
+        :is-show-chinese="false"
+        :three-dimensional="false"
+        @cancel="datePickerOpen = false"
+        @confirm="onDatePickerComplete"
+      ></nut-date-picker>
+    </nut-popup>
   </div>
-  <nut-popup v-model:visible="datePickerOpen" position="bottom">
-    <nut-date-picker
-      v-model="focusedDate"
-      :min-date="minDate"
-      :max-date="maxDate"
-      :is-show-chinese="false"
-      :three-dimensional="false"
-      @cancel="datePickerOpen = false"
-      @confirm="onDatePickerComplete"
-    ></nut-date-picker>
-  </nut-popup>
 </template>
 
 <script lang="ts" setup>
@@ -126,6 +126,7 @@ function switchDateInput(shift: string) {
   display: flex;
   flex-direction: column;
   width: 100%;
+  position: relative;
   .date-filter-header {
     text-align: center;
     height: 44px;

package/src/balance/components/DateRange.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="date-range" @click="openDateFilter" v-show="filtering.to">
-    <div class="text number">{{ dateRangeDisplay }}</div>
+  <div class="date-range" @click="openDateRangePicker">
+    <div class="text">{{ dateRangeDisplay }}</div>
     <img
       style="margin-top: -2px"
       class="time-icon"
@@ -10,32 +10,48 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, reactive } from 'vue'
+import { computed, PropType, reactive } from 'vue'
 import { useNutshell } from '@uxda/nutshell/taro'
 import DateFilter from './DateFilter.vue'
 import dayjs from 'dayjs'
 
 const $n = useNutshell()
 
-const filtering = reactive({
-  from: dayjs().add(-3, 'M').format('YYYY-MM-DD'),
-  to: dayjs().format('YYYY-MM-DD'),
+export type DateRangeModel = {
+  from: string,
+  to: string
+}
+
+const model = defineModel({
+  type: Object as PropType<DateRangeModel>,
+  required: false,
+  default: {
+    from: dayjs().add(-1, 'M').format('YYYY-MM-DD'),
+    to: dayjs().format('YYYY-MM-DD')
+  }
 })
 
-const openDateFilter = () => {
+const openDateRangePicker = () => {
   $n.sheet({
     component: DateFilter,
     props: {
-      from: '2024-08-01',
-      to: '2024-08-31',
+      from: model.value.from,
+      to: model.value.to,
+    },
+    onComplete (result: any) {
+      console.log('===openDateFilter complete', result)
+      model.value = {
+        from: result.from,
+        to: result.to
+      }
     }
   })
 }
 
 const dateRangeDisplay = computed(() => {
-  let startTime = (filtering.from || '').replace(/-/g, '.').substring(2)
-  let endTime = (filtering.to || '').replace(/-/g, '.').substring(2)
-  return startTime + ' - ' + endTime
+  let startTime = (model.value.from || '').replace(/-/g, '.').substring(2)
+  let endTime = (model.value.to || '').replace(/-/g, '.').substring(2)
+  return startTime + '-' + endTime
 })
 
 </script>

package/src/balance/components/ListFilter.vue

@@ -9,16 +9,40 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, reactive } from 'vue'
+import { computed, PropType, reactive } from 'vue'
 import { useNutshell } from '@uxda/nutshell/taro'
 import ListFilterPicker from './ListFilterPicker.vue'
 
 const $n = useNutshell()
 
+export type ListFilterValue = {
+    type: string,
+  }
+
+const model = defineModel({
+  type: Object as PropType<ListFilterValue>,
+  default: {
+    type: ''
+  },
+  required: false,
+})
+
+const emit = defineEmits<{
+  (e: 'update:modelValue', v: ListFilterValue): void,
+  (e: 'change'): void,
+}>()
+
 const openPicker = () => {
   $n.sheet({
     component: ListFilterPicker,
-
+    props: {
+      modelValue: model,
+      onComplete: (result) => {
+        emit('update:modelValue', {
+          type: result[0]
+        })
+      }
+    }
   })
 }
 </script>

package/src/balance/components/ListFilterPicker.vue

@@ -1,19 +1,19 @@
 <template>
-  <div class="consumption-filter">
-    <div class="consumption-filter-title">
+  <div class="list-filter-picker">
+    <div class="list-filter-picker-title">
       <h3>选择筛选项</h3>
     </div>
     <div class="consumption-filter-content">
       <template v-for="(item, index) in filterSections" :key="index">
-        <div class="title">{{ item.title }}</div>
+        <div class="title">{{ item.label }}</div>
         <div class="info">
           <div
             v-for="(it, i) in item.data"
-            @click="() => onFilterSectionClick(index, it.code)"
-            :class="getItemClass(index, it.code)"
+            @click="() => onFilterSectionClick(item.name, it.value)"
+            :class="getItemClass(item.name, it.value)"
             class="info-item"
             :key="i">
-            {{ typeof it === 'string' ? it : it.name }}
+            {{ typeof it === 'string' ? it : it.label }}
           </div>
         </div>
       </template>
@@ -33,21 +33,22 @@ import { UniData, UniDataItem } from '@uxda/nutshell/taro'
 
 const $http = useHttp()
 
-interface ConsumptionFilterProps {
-  modelValue: ConsumptionFilterModelValue
+type ListFilterPickerModel = Record<string, string[]>
+
+interface ListFilterPickerProps {
+  modelValue: ListFilterPickerModel
 }
 
-const props = withDefaults(
-  defineProps<ConsumptionFilterProps>(), {
-    modelValue: () => ['全部', '全部', '全部', '']
-  }
-)
+const props =
+  defineProps<ListFilterPickerProps>()
+
 const emit = defineEmits(['complete'])
 
-const result = reactive<ConsumptionFilterModelValue>(props.modelValue)
+const result = ref<ListFilterPickerModel>(props.modelValue)
 
 type FilterSecion = {
-  title: string,
+  label: string,
+  name: string,
   data: UniDataItem[]
 }
 
@@ -56,54 +57,45 @@ type FilterSecion = {
  */
 const filterSections = ref<FilterSecion[]>([
   {
-    title: '类型',
-    data: consumptionPositions.map(s => ({code: s, name: s})),
-  },
-  {
-    title: '收入/支出',
-    data: consumptionDirections.map(s => ({code: s, name: s})),
-  },
-  {
-    title: '明细类型',
-    data: consumptionTypes.map(s => ({code: s, name: s})),
+    label: '明细类型',
+    name: 'type',
+    data: [
+      {
+        label: '全部',
+        value: ''
+      },
+      {
+        label: '提现',
+        value: 'withdrawal'
+      },
+      {
+        label: '收益',
+        value: 'income'
+      },
+      {
+        label: '兑换',
+        value: 'exchange'
+      }
+    ]
   },
-  {
-    title: '权益类目',
-    data: []
-  }
 ])
 
-const getItemClass = (index: number, value) => result[index] === value ? ['current'] : ['']
+const getItemClass = (name: string, value: string) => result.value[name]?.includes(value) ? ['current'] : ['']
 
-const onFilterSectionClick = (index: number, value: MixteValues) => {
-  result[index] = value
+const onFilterSectionClick = (index: string, value: string) => {
+  result.value[index] = [value]
 }
 
 const reset = () => {
-  result[0] = '全部'
-  result[1] = '全部'
-  result[2] = '全部'
-  result[3] = ''
+  result.value = {}
 }
 
-const 请求权益类目 = () => {
-  $http.get<权益类目[]>(endpoints.获取权益类目).then(data => {
-    filterSections.value[3].data = [
-      { code: '', name: '全部' },
-      ...data
-    ]
-  })
-}
-
-请求权益类目()
-
 const onOkClick = () => {
   emit('complete', result)
 }
 </script>
 <style lang="scss">
-.consumption-filter {
-  height: 100%;
+.list-filter-picker {
   display: flex;
   flex-direction: column;
   width: 100%;

package/src/shared/components/AppVerify.vue

@@ -4,20 +4,33 @@
     <p class="caption">{{ message || '短信将发送至账号绑定手机号' }}</p>
     <p class="number">{{ phone }}</p>
     <ns-form v-model="formData">
-      <ns-input name="code" placeholder="请输入验证码" variant="solid" :rules="['required', {
+      <ns-input
+        name="code"
+        v-model="formData.code"
+        placeholder="请输入验证码"
+        variant="solid"
+        :rules="['required', {
         name: 'function',
         message: '输入错误, 请重新输入',
-        method: (value: string) => value.length === 4,
-      }]">
+        method: (value: string) => value.length === 6,
+      }]"
+      >
         <template #append>
-          <ns-button v-if="!sent" size="xs" variant="plain" color="primary" @click="send" label="获取验证码" />
+          <ns-button
+            v-if="!sent"
+            size="xs"
+            variant="plain"
+            color="primary"
+            @click="send"
+            label="获取验证码"
+          />
           <div class="caption" v-if="sent">{{ countdown }} 秒收重新发送</div>
         </template>
       </ns-input>
     </ns-form>
     <div class="row buttons">
-      <ns-button round>取消</ns-button>
-      <ns-button round gradient="#FFEBC1,#FFD7A7,#FFB875/90">确认</ns-button>
+      <ns-button round @click="emits('cancel')">取消</ns-button>
+      <ns-button round gradient="#FFEBC1,#FFD7A7,#FFB875/90" @click="onOk">确认</ns-button>
     </div>
   </div>
 </template>
@@ -27,27 +40,29 @@ import { NsForm, NsInput, NsButton } from '@uxda/nutshell/taro'
 import { reactive, ref } from 'vue'
 
 export interface AppVerifyProps {
-  phone: string,
-  title?: string,
-  message?: string,
+  phone: string
+  title?: string
+  message?: string
+  onSend?: Function
 }
 
-const emit = defineEmits<{
-  (event: 'update:modelValue', value: boolean): void
-}>()
+const emits = defineEmits(['complete', 'cancel'])
 
 const sent = ref(false),
   countdown = ref(60)
 
 let formData = reactive({
-  code: ''
+  code: '',
 })
 
 const send = () => {
   sent.value = true
+
+  props.onSend && props.onSend()
+
   countdown.value = 60
   let timer = setInterval(() => {
-    countdown.value --
+    countdown.value--
     if (countdown.value <= 0) {
       clearInterval(timer)
       sent.value = false
@@ -55,12 +70,11 @@ const send = () => {
   }, 1000)
 }
 
-const onVisibleChange = (value: boolean) => {
-  emit('update:modelValue', value)
+const onOk = () => {
+  emits('complete', { code: formData.code })
 }
 
-defineProps<AppVerifyProps>()
-
+const props = defineProps<AppVerifyProps>()
 </script>
 
 <style lang="scss">
@@ -81,4 +95,4 @@ defineProps<AppVerifyProps>()
     }
   }
 }
-</style>
+</style>

package/src/shared/composables/index.ts

@@ -4,3 +4,4 @@ export * from './useCountdown'
 export * from './useValidator'
 export * from './useEncode'
 export * from './useUpload'
+export * from './useCrypto'

package/src/shared/composables/useCrypto.ts

@@ -0,0 +1,76 @@
+// 解析脱敏姓名、手机号码等
+
+export type CryptoConfig = {
+  maskField: string,
+  secretField: string,
+}
+
+export const defaultCryptoConfig: CryptoConfig = {
+  maskField: 'mask',
+  secretField: 'secretKey'
+}
+
+export type DecodeResult<T extends string> = {
+  [key in T | `${T}Secret`]: string
+}
+
+export type DefaultDecodeResult = DecodeResult<'masked'>
+
+export type DecodeFunction = (encoded: string, key: string) => DecodeResult<`${key}`>
+
+/**
+ * 解析以及解密脱敏数据
+ * @param config 
+ * @returns 
+ */
+export function useCrypto (config?: CryptoConfig) {
+
+  const conf = config || defaultCryptoConfig
+
+  const parse: DecodeFunction = (data: string, key?: string) => {
+    let k = key || 'masked'
+    let result: Record<string, any> = {}
+    try {
+      result = JSON.parse(data)
+      result = {
+        [k]: result.mask,
+        // 字段后加$表示用于解密的 secret
+        [`${k}$`]: result.secretKey
+      }
+    } catch (e) {}
+    return result
+  }
+
+  /**
+   * 批量解析数组内的数据
+   * @param list 
+   * @param field 
+   * @returns 
+   */
+  const resolve = (list: any[], field?: string | string[]) => {
+    const [first] = list,
+      f = field
+        ? Array.isArray(field) ? field : [field]
+        // 自动探测需要解密的字段
+        // '{"secretKey":"","mask":""}' 形式
+        : Object.entries(first)
+            .filter(([_, v]) => /^\{.*\}$/.test(v as string))
+            .map(([k]) => k)
+    return list
+      .map(item => {
+          let result = { ...item }
+          f.forEach(r => {
+            result = {
+              ...result,
+              ...parse(item[r], r)
+            }
+          })
+          return result
+      })
+  }
+
+  return {
+    parse,
+    resolve,
+  }
+}

package/src/user/components/UserEntry.vue

@@ -21,21 +21,12 @@
     <div class="user-entry-bd">
       <div v-if="!mobile" class="user-entry-bd-bigtxt" @click="toLogin">
         请登录
-        <img
-          class="user-entry-bd-bigtxt-icon"
-          mode="aspectFit"
-          src="data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNDAiIGhlaWdodD0iNDEiIHZpZXdCb3g9IjAgMCA0MCA0MSIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggb3BhY2l0eT0iMC4wMSIgZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0wIDQwLjM1MTZINDBWMC4zNTE1NjJIMFY0MC4zNTE2WiIgZmlsbD0id2hpdGUiLz4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0xNCA4LjM1MTU2TDI2IDIwLjM1MTZMMTQgMzIuMzUxNiIgZmlsbD0iYmxhY2siIGZpbGwtb3BhY2l0eT0iMC4wMSIvPgo8cGF0aCBkPSJNMTQgOC4zNTE1NkwyNiAyMC4zNTE2TDE0IDMyLjM1MTYiIHN0cm9rZT0iI2ZmZiIgc3Ryb2tlLXdpZHRoPSIzIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiLz4KPC9zdmc+Cg=="
-          alt=""
-        />
+        <span class="user-entry-bd-arrow">></span>
       </div>
       <template v-else>
         <div @click="toUser" class="user-entry-bd-txt">
           {{ name }}
-          <img
-            style="width: 14px; height: 14px; margin-left: 2px"
-            src="data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjgiIGhlaWdodD0iMjgiIHZpZXdCb3g9IjAgMCAyOCAyOCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTExLjA4MzUgN0wxOC4wODM1IDE0TDExLjA4MzUgMjEiIHN0cm9rZT0id2hpdGUiIHN0cm9rZS13aWR0aD0iMS43NSIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIi8+Cjwvc3ZnPgo="
-            alt=""
-          />
+          <span class="user-entry-bd-arrow">></span>
         </div>
         <div @click="toUser" class="user-entry-bd-smalltxt">{{ encodePhone(mobile) }}</div>
       </template>
@@ -137,6 +128,10 @@ const emits = defineEmits(['jump', 'login'])
       font-size: 15px;
       line-height: 21px;
     }
+    &-arrow {
+      font-size: 12px;
+      margin-left: 8px;
+    }
   }
 }
 </style>