@uxda/appkit 1.0.10 → 1.0.14

package/dist/appkit.css

@@ -426,45 +426,6 @@
   margin: 0 auto;
   text-align: center;
 }
-.balance-reminder-popup {
-  width: 90%;
-}
-
-.balance-reminder {
-  --primary-button-background: linear-gradient(135deg, #098C9D 0%, #66BF97 100%);
-}
-.balance-reminder h2 {
-  font-size: 16px;
-  font-weight: bold;
-  margin-bottom: 14px;
-}
-.balance-reminder .body {
-  height: 120px;
-  box-sizing: border-box;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  padding: 20px 10px 10px 10px;
-  font-size: 14px;
-  text-align: center;
-  color: #666;
-}
-.balance-reminder .footer {
-  display: flex;
-  flex-direction: row;
-  justify-content: stretch;
-  align-items: center;
-  padding: 10px 20px 20px 20px;
-}
-.balance-reminder .footer .col {
-  flex-grow: 1;
-  padding: 6px;
-}
-.balance-reminder .footer .recharge-button {
-  color: #fff;
-  background: var(--primary-button-background);
-}
 .consumption-view .spa-between {
   padding: 0 0 0 10px;
   display: flex;
@@ -669,20 +630,20 @@
   margin: 0 auto 40px;
   text-align: center;
 }
-.consumption-view .operation-list-not {
+.consumption-view .operation-list .operations-empty {
   display: flex;
   flex-direction: column;
   justify-content: center;
   align-items: center;
   margin-top: 80px;
 }
-.consumption-view .operation-list-not-img {
+.consumption-view .operation-list .operations-empty-img {
   display: block;
   font-size: 0;
   width: 144px;
   height: 80px;
 }
-.consumption-view .operation-list-not-text {
+.consumption-view .operation-list .operations-empty-text {
   opacity: 0.4;
   color: #353535;
   font-size: 12px;
@@ -694,4 +655,43 @@
   width: 70%;
   height: 70%;
   padding: 24px;
+}
+.balance-reminder-popup {
+  width: 90%;
+}
+
+.balance-reminder {
+  --primary-button-background: linear-gradient(135deg, #098C9D 0%, #66BF97 100%);
+}
+.balance-reminder h2 {
+  font-size: 16px;
+  font-weight: bold;
+  margin-bottom: 14px;
+}
+.balance-reminder .body {
+  height: 120px;
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 20px 10px 10px 10px;
+  font-size: 14px;
+  text-align: center;
+  color: #666;
+}
+.balance-reminder .footer {
+  display: flex;
+  flex-direction: row;
+  justify-content: stretch;
+  align-items: center;
+  padding: 10px 20px 20px 20px;
+}
+.balance-reminder .footer .col {
+  flex-grow: 1;
+  padding: 6px;
+}
+.balance-reminder .footer .recharge-button {
+  color: #fff;
+  background: var(--primary-button-background);
 }

package/dist/index.js

@@ -289,10 +289,10 @@ const endpointsList$1 = {
   getPackages: {
     path: "/payment/outer/payment/getRechargeList",
     translate: (data) => ({
-      appCode: data.app,
-      caseCode: "recharge",
+      // appCode: data.app,
+      caseCode: "recharge"
       // 这个参数可以不要
-      tenantId: data.tenant
+      // tenantId: data.tenant
     }),
     transform: (data) => data.amountList.map((d) => ({
       token: d.desc,
@@ -985,9 +985,9 @@ var script$3 = /* @__PURE__ */ defineComponent({
     const minDate = ref();
     const maxDate = ref(/* @__PURE__ */ new Date());
     const datePickerOpen = ref(false);
-    function resetTime() {
+    function reset() {
       result.from = props.from;
-      result.from = props.to;
+      result.to = props.to;
     }
     function onOkClick() {
       emit("complete", result);
@@ -997,7 +997,6 @@ var script$3 = /* @__PURE__ */ defineComponent({
       return year + "\u5E74" + month + "\u6708" + day + "\u65E5";
     }
     function onDatePickerComplete({ selectedValue, selectedOptions }) {
-      console.log("onDatePickerComfirm_______________________", selectedValue, selectedOptions);
       let time = selectedOptions.map((val) => val.text).join("-");
       if (focused.value === "from") {
         result.from = new Date(time) > new Date(result.to) ? result.to : time;
@@ -1054,7 +1053,7 @@ var script$3 = /* @__PURE__ */ defineComponent({
             createElementVNode("div", { class: "buttons spa-between" }, [
               createElementVNode("div", {
                 class: "btn",
-                onClick: resetTime
+                onClick: reset
               }, "\u91CD\u7F6E"),
               createElementVNode("div", {
                 class: "btn confirm",
@@ -1127,85 +1126,11 @@ var script$2 = /* @__PURE__ */ defineComponent({
 
 script$2.__file = "src/balance/components/ConsumptionRules.vue";
 
-const _hoisted_1$1 = { class: "balance-reminder" };
-const _hoisted_2$1 = /* @__PURE__ */ createElementVNode(
-  "div",
-  { 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")
-  ],
-  -1
-  /* HOISTED */
-);
-const _hoisted_3$1 = { class: "footer" };
-const _hoisted_4$1 = { class: "col" };
-const _hoisted_5$1 = { class: "col" };
-var script$1 = /* @__PURE__ */ defineComponent({
-  __name: "BalanceReminder",
-  props: {
-    modelValue: { type: Boolean, required: true, default: () => false }
-  },
-  emits: ["recharge", "update:modelValue"],
-  setup(__props, { emit: __emit }) {
-    const emit = __emit;
-    return (_ctx, _cache) => {
-      const _component_nut_button = resolveComponent("nut-button");
-      const _component_nut_popup = resolveComponent("nut-popup");
-      return openBlock(), createBlock(_component_nut_popup, {
-        "pop-class": "balance-reminder-popup",
-        round: "",
-        teleport: "#app",
-        visible: _ctx.modelValue,
-        "close-on-click-overlay": false
-      }, {
-        default: withCtx(() => [
-          createElementVNode("div", _hoisted_1$1, [
-            _hoisted_2$1,
-            createElementVNode("div", _hoisted_3$1, [
-              createElementVNode("div", _hoisted_4$1, [
-                createVNode(_component_nut_button, {
-                  class: "cancel-button",
-                  onClick: _cache[0] || (_cache[0] = ($event) => emit("update:modelValue", false)),
-                  block: ""
-                }, {
-                  default: withCtx(() => [
-                    createTextVNode("\u53D6\u6D88")
-                  ]),
-                  _: 1
-                  /* STABLE */
-                })
-              ]),
-              createElementVNode("div", _hoisted_5$1, [
-                createVNode(_component_nut_button, {
-                  block: "",
-                  class: "recharge-button",
-                  onClick: _cache[1] || (_cache[1] = ($event) => emit("recharge"))
-                }, {
-                  default: withCtx(() => [
-                    createTextVNode("\u53BB\u5145\u503C")
-                  ]),
-                  _: 1
-                  /* STABLE */
-                })
-              ])
-            ])
-          ])
-        ]),
-        _: 1
-        /* STABLE */
-      }, 8, ["visible"]);
-    };
-  }
-});
-
-script$1.__file = "src/balance/components/BalanceReminder.vue";
-
-const _hoisted_1 = { class: "consumption-view" };
-const _hoisted_2 = { class: "header" };
-const _hoisted_3 = { class: "header_card" };
-const _hoisted_4 = { class: "clound-bean" };
-const _hoisted_5 = { class: "bean-box spa-between" };
+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(
   "div",
   { class: "bean-img" },
@@ -1309,12 +1234,12 @@ const _hoisted_33 = /* @__PURE__ */ createElementVNode(
 );
 const _hoisted_34 = {
   key: 1,
-  class: "info-not"
+  class: "operations-empty"
 };
 const _hoisted_35 = /* @__PURE__ */ createElementVNode(
   "img",
   {
-    class: "info-not-img",
+    class: "operations-empty-img",
     src: "https://cdn.ddjf.com/static/images/fnfundkit/bean-no-thing.png"
   },
   null,
@@ -1323,7 +1248,7 @@ const _hoisted_35 = /* @__PURE__ */ createElementVNode(
 );
 const _hoisted_36 = /* @__PURE__ */ createElementVNode(
   "div",
-  { class: "info-not-text" },
+  { class: "operations-empty-text" },
   "\u6682\u65E0\u6570\u636E",
   -1
   /* HOISTED */
@@ -1332,7 +1257,7 @@ const _hoisted_37 = [
   _hoisted_35,
   _hoisted_36
 ];
-var script = /* @__PURE__ */ defineComponent({
+var script$1 = /* @__PURE__ */ defineComponent({
   __name: "AccountView",
   emits: ["recharge"],
   setup(__props, { emit: __emit }) {
@@ -1406,10 +1331,8 @@ var script = /* @__PURE__ */ defineComponent({
       loadConsumptions();
     };
     function gotoRecharge() {
-      balanceReminderOpen.value = true;
       emit("recharge");
     }
-    const balanceReminderOpen = ref(false);
     const scrollY = ref(0);
     usePageScroll((e) => {
       const { scrollTop } = e;
@@ -1421,11 +1344,11 @@ var script = /* @__PURE__ */ defineComponent({
         Fragment,
         null,
         [
-          createElementVNode("div", _hoisted_1, [
-            createElementVNode("div", _hoisted_2, [
-              createElementVNode("div", _hoisted_3, [
-                createElementVNode("div", _hoisted_4, [
-                  createElementVNode("div", _hoisted_5, [
+          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",
@@ -1644,11 +1567,7 @@ var script = /* @__PURE__ */ defineComponent({
             ]),
             _: 1
             /* STABLE */
-          }, 8, ["visible"]),
-          createVNode(script$1, {
-            modelValue: balanceReminderOpen.value,
-            "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => balanceReminderOpen.value = $event)
-          }, null, 8, ["modelValue"])
+          }, 8, ["visible"])
         ],
         64
         /* STABLE_FRAGMENT */
@@ -1657,7 +1576,81 @@ var script = /* @__PURE__ */ defineComponent({
   }
 });
 
-script.__file = "src/balance/components/AccountView.vue";
+script$1.__file = "src/balance/components/AccountView.vue";
+
+const _hoisted_1 = { class: "balance-reminder" };
+const _hoisted_2 = /* @__PURE__ */ createElementVNode(
+  "div",
+  { 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")
+  ],
+  -1
+  /* HOISTED */
+);
+const _hoisted_3 = { class: "footer" };
+const _hoisted_4 = { class: "col" };
+const _hoisted_5 = { class: "col" };
+var script = /* @__PURE__ */ defineComponent({
+  __name: "BalanceReminder",
+  props: {
+    modelValue: { type: Boolean, required: true, default: () => false }
+  },
+  emits: ["recharge", "update:modelValue"],
+  setup(__props, { emit: __emit }) {
+    const emit = __emit;
+    return (_ctx, _cache) => {
+      const _component_nut_button = resolveComponent("nut-button");
+      const _component_nut_popup = resolveComponent("nut-popup");
+      return openBlock(), createBlock(_component_nut_popup, {
+        "pop-class": "balance-reminder-popup",
+        round: "",
+        teleport: "#app",
+        visible: _ctx.modelValue,
+        "close-on-click-overlay": false
+      }, {
+        default: withCtx(() => [
+          createElementVNode("div", _hoisted_1, [
+            _hoisted_2,
+            createElementVNode("div", _hoisted_3, [
+              createElementVNode("div", _hoisted_4, [
+                createVNode(_component_nut_button, {
+                  class: "cancel-button",
+                  onClick: _cache[0] || (_cache[0] = ($event) => emit("update:modelValue", false)),
+                  block: ""
+                }, {
+                  default: withCtx(() => [
+                    createTextVNode("\u53D6\u6D88")
+                  ]),
+                  _: 1
+                  /* STABLE */
+                })
+              ]),
+              createElementVNode("div", _hoisted_5, [
+                createVNode(_component_nut_button, {
+                  block: "",
+                  class: "recharge-button",
+                  onClick: _cache[1] || (_cache[1] = ($event) => emit("recharge"))
+                }, {
+                  default: withCtx(() => [
+                    createTextVNode("\u53BB\u5145\u503C")
+                  ]),
+                  _: 1
+                  /* STABLE */
+                })
+              ])
+            ])
+          ])
+        ]),
+        _: 1
+        /* STABLE */
+      }, 8, ["visible"]);
+    };
+  }
+});
+
+script.__file = "src/balance/components/BalanceReminder.vue";
 
 const nutComponents = [
   Grid,
@@ -1701,4 +1694,4 @@ const AppKit = {
   }
 };
 
-export { script as AccountView, script$a as AmountPicker, script$7 as AppDrawer, script$5 as BalanceCard, script$1 as BalanceReminder, script$8 as PageHeader, script$6 as RechargeView, script$9 as UserAgreement, components, AppKit as default, requestPayment$2 as requestPayment, services$1 as services, useAppKit, useHttp };
+export { script$1 as AccountView, script$a as AmountPicker, script$7 as AppDrawer, script$5 as BalanceCard, script as BalanceReminder, script$8 as PageHeader, script$6 as RechargeView, script$9 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.10",
+  "version": "1.0.14",
   "description": "小程序应用开发包",
   "main": "dist/index.js",
   "module": "dist/index.ts",

package/src/balance/components/AccountView.vue

@@ -87,11 +87,11 @@
         </div>
         <div class="box-not-text">没有更多了</div>
       </div>
-      <div v-else class="info-not">
+      <div v-else class="operations-empty">
         <img
-          class="info-not-img"
+          class="operations-empty-img"
           src="https://cdn.ddjf.com/static/images/fnfundkit/bean-no-thing.png" />
-        <div class="info-not-text">暂无数据</div>
+        <div class="operations-empty-text">暂无数据</div>
       </div>
     </div>
   </div>
@@ -125,7 +125,6 @@
       filtering.type,
     ]" @complete="onFilterComplete" />
   </nut-popup>
-  <balance-reminder v-model="balanceReminderOpen" />
 </template>
 
 <script lang="ts" setup>
@@ -136,7 +135,6 @@ import { ConsumptionFiltering, ConsumptionGroups, Balance } from '../types'
 import ConsumptionFilter from './ConsumptionFilter.vue'
 import DateFilter from './DateFilter.vue'
 import ConsumptionRules from './ConsumptionRules.vue'
-import BalanceReminder from './BalanceReminder.vue'
 
 const emit = defineEmits(['recharge'])
 
@@ -225,11 +223,9 @@ const onDateFilterComplete = (value) => {
 }
 
 function gotoRecharge () {
-  balanceReminderOpen.value = true
   emit('recharge')
 }
 
-const balanceReminderOpen = ref(false)
 
 const scrollY = ref<number>(0)
 usePageScroll((e) => {
@@ -457,7 +453,7 @@ usePageScroll((e) => {
         text-align: center;
       }
     }
-    &-not {
+    .operations-empty {
       display: flex;
       flex-direction: column;
       justify-content: center;

package/src/balance/components/DateFilter.vue

@@ -20,7 +20,7 @@
       </div>
     </div>
     <div class="buttons spa-between">
-      <div class="btn" @click="resetTime">重置</div>
+      <div class="btn" @click="reset">重置</div>
       <div class="btn confirm" @click="onOkClick">确定</div>
     </div>
     <div class="bottom"></div>
@@ -46,6 +46,10 @@ type DateFilterProps = {
 const props = defineProps<DateFilterProps>()
 
 const emit = defineEmits(['complete'])
+
+/**
+ * 日期范围结果
+ */
 const result = reactive<DateFilterProps>({...props})
 
 /**
@@ -58,11 +62,17 @@ const minDate = ref<any>()
 const maxDate = ref<Date>(new Date())
 const datePickerOpen = ref<boolean>(false)
 
-function resetTime() {
+/**
+ * 日期重置
+ */
+function reset() {
   result.from = props.from
-  result.from = props.to
+  result.to = props.to
 }
 
+/**
+ * 确认，提交新时间
+ */
 function onOkClick() {
   emit('complete', result)
 }
@@ -73,7 +83,6 @@ function formatDate (date: string) {
 }
 
 function onDatePickerComplete ({ selectedValue, selectedOptions }) {
-  console.log('onDatePickerComfirm_______________________', selectedValue, selectedOptions)
   let time = selectedOptions.map((val: any) => val.text).join('-')
   if (focused.value === 'from') {
     // 如果选择的时间比结束时间大，结束时间改为开始时间
@@ -107,6 +116,7 @@ function onDatePickerComplete ({ selectedValue, selectedOptions }) {
   focused.value = shift
   datePickerOpen.value = true
 }
+
 </script>
 <style lang="scss">
 .consumption-date-filter {

package/src/payment/api/endpoints.ts

@@ -10,9 +10,9 @@ const endpointsList: HttpEndpoints = {
   getPackages: {
     path: '/payment/outer/payment/getRechargeList',
     translate: (data: any) => ({
-      appCode: data.app,
+      // appCode: data.app,
       caseCode: 'recharge', // 这个参数可以不要
-      tenantId: data.tenant
+      // tenantId: data.tenant
     }),
     transform: (data: any) => data.amountList.map((d: any) => ({
       token: d.desc,