@uxda/appkit 1.0.70 → 1.0.74

package/dist/appkit.css

@@ -476,6 +476,26 @@ page {
   margin: 0 auto;
   text-align: center;
 }
+.empty-view {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  margin-top: 80px;
+}
+.empty-view-image {
+  display: block;
+  font-size: 0;
+  width: 144px;
+  height: 80px;
+  filter: grayscale(1);
+}
+.empty-view-text {
+  opacity: 0.4;
+  color: #353535;
+  font-size: 12px;
+  line-height: 28px;
+}
 .second-balance {
   width: 100vw;
 }
@@ -515,26 +535,6 @@ page {
   font-size: 14px;
   font-weight: 700;
 }
-.empty-view {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  margin-top: 80px;
-}
-.empty-view-image {
-  display: block;
-  font-size: 0;
-  width: 144px;
-  height: 80px;
-  filter: grayscale(1);
-}
-.empty-view-text {
-  opacity: 0.4;
-  color: #353535;
-  font-size: 12px;
-  line-height: 28px;
-}
 .account-view {
   background-image: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNzUwIiBoZWlnaHQ9IjQwNiIgdmlld0JveD0iMCAwIDc1MCA0MDYiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxwYXRoIGQ9Ik0zODIuNSA0MDcuNUM1NzcuMzU3IDQwNy41IDc1My43ODggMzgxLjI0OCA4ODEuNTIxIDMzOC43OTFDOTQ1LjM4NiAzMTcuNTYzIDk5Ny4xMDQgMjkyLjI3NiAxMDMyLjg3IDI2NC4xNzFDMTA2OC42MiAyMzYuMDcxIDEwODguNSAyMDUuMDk3IDEwODguNSAxNzIuNUMxMDg4LjUgMTM5LjkwMyAxMDY4LjYyIDEwOC45MjkgMTAzMi44NyA4MC44Mjg5Qzk5Ny4xMDQgNTIuNzI0NSA5NDUuMzg2IDI3LjQzNjcgODgxLjUyMSA2LjIwODk4Qzc1My43ODggLTM2LjI0ODIgNTc3LjM1NyAtNjIuNSAzODIuNSAtNjIuNUMxODcuNjQzIC02Mi41IDExLjIxMjIgLTM2LjI0ODIgLTExNi41MjIgNi4yMDg5OEMtMTgwLjM4NiAyNy40MzY3IC0yMzIuMTA0IDUyLjcyNDUgLTI2Ny44NjcgODAuODI4OUMtMzAzLjYyNCAxMDguOTI5IC0zMjMuNSAxMzkuOTAzIC0zMjMuNSAxNzIuNUMtMzIzLjUgMjA1LjA5NyAtMzAzLjYyNCAyMzYuMDcxIC0yNjcuODY3IDI2NC4xNzFDLTIzMi4xMDQgMjkyLjI3NiAtMTgwLjM4NiAzMTcuNTYzIC0xMTYuNTIyIDMzOC43OTFDMTEuMjEyMiAzODEuMjQ4IDE4Ny42NDMgNDA3LjUgMzgyLjUgNDA3LjVaIiBmaWxsPSIjM0IzOTNDIiBzdHJva2U9ImJsYWNrIi8+Cjwvc3ZnPgo=");
   background-position: center -200px;

package/dist/index.js

@@ -697,6 +697,9 @@ const endpointsList = {
   \u83B7\u53D6\u4F59\u989D\u660E\u7EC6: {
     path: "/ac-app/account/info/detail/app",
     // /app
+    translate: (data) => ({
+      appCode: data.app
+    }),
     transform(result) {
       return {
         total: result.commonAccount,
@@ -711,6 +714,7 @@ const endpointsList = {
     path: "/ac-app/account/record/detail/mobile",
     translate: (data) => {
       return {
+        appCode: data.app,
         accountType: positionMappingsReversed[data.\u8D26\u6237\u7C7B\u578B] || "",
         inOrOut: directionMappingsReversed[data.\u6536\u5165\u8FD8\u662F\u652F\u51FA] || "",
         changeType: typeMappingsReversed[data.\u4EA4\u6613\u7C7B\u578B] || "",
@@ -737,6 +741,9 @@ const endpointsList = {
   },
   \u83B7\u53D6\u6743\u76CA\u7C7B\u76EE: {
     path: "/ac-app/rights/item/list",
+    translate: (data) => ({
+      appCode: data.app
+    }),
     // translate (data: ConsumptionFiltering) {
     //   // return { appCode: data.appCode }
     // },
@@ -1317,18 +1324,52 @@ var script$4 = /* @__PURE__ */ defineComponent({
 
 script$4.__file = "src/balance/components/ConsumptionRules.vue";
 
-const _hoisted_1$3 = { class: "second-balance" };
-const _hoisted_2$3 = { class: "positions" };
+const _hoisted_1$3 = { class: "empty-view" };
+const _hoisted_2$3 = /* @__PURE__ */ createElementVNode(
+  "img",
+  {
+    class: "empty-view-image",
+    src: "https://cdn.ddjf.com/static/images/nutshell/empty-data.png"
+  },
+  null,
+  -1
+  /* HOISTED */
+);
 const _hoisted_3$3 = /* @__PURE__ */ createElementVNode(
+  "div",
+  { class: "empty-view-text" },
+  "\u6682\u65E0\u6570\u636E",
+  -1
+  /* HOISTED */
+);
+const _hoisted_4$3 = [
+  _hoisted_2$3,
+  _hoisted_3$3
+];
+function render(_ctx, _cache) {
+  return openBlock(), createElementBlock("div", _hoisted_1$3, [..._hoisted_4$3]);
+}
+
+const script$3 = {};
+
+script$3.render = render;
+script$3.__file = "src/shared/components/EmptyView.vue";
+
+const _hoisted_1$2 = { class: "second-balance" };
+const _hoisted_2$2 = {
+  key: 0,
+  class: "positions"
+};
+const _hoisted_3$2 = /* @__PURE__ */ createElementVNode(
   "div",
   { class: "icon" },
   null,
   -1
   /* HOISTED */
 );
-const _hoisted_4$3 = { class: "title" };
+const _hoisted_4$2 = { class: "title" };
 const _hoisted_5$2 = { class: "number amount" };
-var script$3 = /* @__PURE__ */ defineComponent({
+var script$2 = /* @__PURE__ */ defineComponent({
   __name: "SecondBalance",
   props: {
     data: { type: Array, required: true, default: () => [] }
@@ -1336,9 +1377,9 @@ var script$3 = /* @__PURE__ */ defineComponent({
   setup(__props) {
     return (_ctx, _cache) => {
       const _component_page_header = resolveComponent("page-header");
-      return openBlock(), createElementBlock("div", _hoisted_1$3, [
+      return openBlock(), createElementBlock("div", _hoisted_1$2, [
         createVNode(_component_page_header, { title: "\u5C0F\u4E91\u8C46\u4F59\u989D" }),
-        createElementVNode("div", _hoisted_2$3, [
+        _ctx.data.length ? (openBlock(), createElementBlock("div", _hoisted_2$2, [
           (openBlock(true), createElementBlock(
             Fragment,
             null,
@@ -1347,10 +1388,10 @@ var script$3 = /* @__PURE__ */ defineComponent({
                 class: "position",
                 key: index
               }, [
-                _hoisted_3$3,
+                _hoisted_3$2,
                 createElementVNode(
                   "label",
-                  _hoisted_4$3,
+                  _hoisted_4$2,
                   toDisplayString(item.title),
                   1
                   /* TEXT */
@@ -1367,44 +1408,13 @@ var script$3 = /* @__PURE__ */ defineComponent({
             128
             /* KEYED_FRAGMENT */
           ))
-        ])
+        ])) : (openBlock(), createBlock(script$3, { key: 1 }))
       ]);
     };
   }
 });
 
-script$3.__file = "src/balance/components/SecondBalance.vue";
-
-const _hoisted_1$2 = { class: "empty-view" };
-const _hoisted_2$2 = /* @__PURE__ */ createElementVNode(
-  "img",
-  {
-    class: "empty-view-image",
-    src: "https://cdn.ddjf.com/static/images/nutshell/empty-data.png"
-  },
-  null,
-  -1
-  /* HOISTED */
-);
-const _hoisted_3$2 = /* @__PURE__ */ createElementVNode(
-  "div",
-  { class: "empty-view-text" },
-  "\u6682\u65E0\u6570\u636E",
-  -1
-  /* HOISTED */
-);
-const _hoisted_4$2 = [
-  _hoisted_2$2,
-  _hoisted_3$2
-];
-function render(_ctx, _cache) {
-  return openBlock(), createElementBlock("div", _hoisted_1$2, [..._hoisted_4$2]);
-}
-
-const script$2 = {};
-
-script$2.render = render;
-script$2.__file = "src/shared/components/EmptyView.vue";
+script$2.__file = "src/balance/components/SecondBalance.vue";
 
 const _hoisted_1$1 = /* @__PURE__ */ createElementVNode(
   "label",
@@ -1493,9 +1503,13 @@ const _hoisted_25 = {
 };
 var script$1 = /* @__PURE__ */ defineComponent({
   __name: "AccountView",
+  props: {
+    app: { type: String, required: true, default: "" }
+  },
   emits: ["recharge"],
   setup(__props, { emit: __emit }) {
     const safeArea = useSafeArea();
+    const props = __props;
     const emit = __emit;
     const filterOpen = ref(false);
     const rulesPopupOpen = ref(false);
@@ -1562,7 +1576,10 @@ var script$1 = /* @__PURE__ */ defineComponent({
         title: `\u52A0\u8F7D\u4E2D...`,
         mask: true
       });
-      $http.get(endpoints.\u83B7\u53D6\u8D26\u6237\u6D41\u6C34, filtering).then((response) => {
+      $http.get(endpoints.\u83B7\u53D6\u8D26\u6237\u6D41\u6C34, {
+        app: props.app,
+        ...filtering
+      }).then((response) => {
         consumptionGroups.value = groupDataByDate(response.data);
         if (filtering.page >= response.totalPages) {
           filtering.page = response.totalPages;
@@ -1575,7 +1592,9 @@ var script$1 = /* @__PURE__ */ defineComponent({
     }
     async function loadBalance() {
       const $http = useHttp();
-      $http.get(endpoints.\u83B7\u53D6\u4F59\u989D\u660E\u7EC6, {}).then((data) => {
+      $http.get(endpoints.\u83B7\u53D6\u4F59\u989D\u660E\u7EC6, {
+        app: props.app
+      }).then((data) => {
         balance.value = data;
       });
     }
@@ -1628,6 +1647,16 @@ var script$1 = /* @__PURE__ */ defineComponent({
     function onSecondBalanceButtonClick() {
       secondBalanceOpen.value = true;
     }
+    watch(secondBalanceOpen, () => {
+      Taro.setNavigationBarColor({
+        frontColor: secondBalanceOpen.value ? "#000000" : "#ffffff",
+        backgroundColor: "#ffffff",
+        animation: {
+          duration: 400,
+          timingFunc: "easeIn"
+        }
+      });
+    });
     function onDateReset() {
       resetDateRange();
     }
@@ -1799,7 +1828,7 @@ var script$1 = /* @__PURE__ */ defineComponent({
                     /* KEYED_FRAGMENT */
                   )),
                   reachedLastPage.value ? (openBlock(), createElementBlock("div", _hoisted_25, "\u6CA1\u6709\u66F4\u591A\u4E86")) : createCommentVNode("v-if", true)
-                ])) : (openBlock(), createBlock(script$2, { key: 1 }))
+                ])) : (openBlock(), createBlock(script$3, { key: 1 }))
               ])
             ],
             2
@@ -1867,7 +1896,7 @@ var script$1 = /* @__PURE__ */ defineComponent({
             title: "\u5C0F\u4E91\u8C46\u4F59\u989D"
           }, {
             default: withCtx(() => [
-              createVNode(script$3, {
+              createVNode(script$2, {
                 data: balance.value.privileges
               }, null, 8, ["data"])
             ]),

package/package.json

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

package/src/balance/api/endpoints.ts

@@ -1,6 +1,12 @@
 import { HttpEndpoints } from '../../shared/http'
 import { 账户流水筛选项, ConsumptionType } from '../types'
 
+type OnlyApp = {
+  app: string
+}
+
+type AndApp<T> = OnlyApp & T
+
 /**
  * 流水交易类型映射
  */
@@ -42,6 +48,9 @@ const directionMappingsReversed = Object.fromEntries(
 const endpointsList: HttpEndpoints = {
   获取余额明细: {
     path: '/ac-app/account/info/detail/app', // /app
+    translate: (data: OnlyApp) => ({
+      appCode: data.app
+    }),
     transform (result: any) {
       return {
         total: result.commonAccount,
@@ -54,8 +63,9 @@ const endpointsList: HttpEndpoints = {
   },
   获取账户流水: {
     path: '/ac-app/account/record/detail/mobile',
-    translate: (data: 账户流水筛选项) => {
+    translate: (data: AndApp<账户流水筛选项>) => {
       return {
+        appCode: data.app,
         accountType: positionMappingsReversed[data.账户类型] || '',
         inOrOut: directionMappingsReversed[data.收入还是支出] || '',
         changeType: typeMappingsReversed[data.交易类型] || '',
@@ -81,6 +91,9 @@ const endpointsList: HttpEndpoints = {
   },
   获取权益类目: {
     path: '/ac-app/rights/item/list',
+    translate: (data: OnlyApp) => ({
+      appCode: data.app
+    }),
     // translate (data: ConsumptionFiltering) {
     //   // return { appCode: data.appCode }
     // },

package/src/balance/components/AccountView.vue

@@ -115,7 +115,7 @@
 
 <script lang="ts" setup>
 import Taro, { useDidShow, usePageScroll, usePullDownRefresh, useReachBottom } from '@tarojs/taro'
-import { computed, onMounted, reactive, ref } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import { endpoints, useHttp } from '../api'
 import { 账户流水筛选项, Balance, ConsumptionGroup, 账户流水 } from '../types'
 import ConsumptionFilter from './ConsumptionFilter.vue'
@@ -128,6 +128,16 @@ import EmptyView from '../../shared/components/EmptyView.vue'
 import { useSafeArea } from '../../shared'
 
 const safeArea = useSafeArea()
+
+type AccountViewProps = {
+  app: string
+}
+const props = withDefaults(
+  defineProps<AccountViewProps>(), {
+    app: ''
+  }
+)
+
 const emit = defineEmits(['recharge'])
 
 const filterOpen = ref<boolean>(false)
@@ -227,7 +237,10 @@ async function loadConsumptions (append: boolean = false) {
     title: `加载中...`,
     mask: true,
   })
-  $http.get<WithPaging<账户流水[]>>(endpoints.获取账户流水, filtering).then(response => {
+  $http.get<WithPaging<账户流水[]>>(endpoints.获取账户流水, {
+      app: props.app,
+      ...filtering
+    }).then(response => {
     consumptionGroups.value = groupDataByDate(response.data)
     if (filtering.page >= response.totalPages) {
       filtering.page = response.totalPages
@@ -245,6 +258,7 @@ async function loadConsumptions (append: boolean = false) {
 async function loadBalance() {
   const $http = useHttp()
   $http.get<Balance>(endpoints.获取余额明细, {
+    app: props.app,
   }).then(data => {
     balance.value = data
   })
@@ -315,6 +329,17 @@ function onSecondBalanceButtonClick () {
   secondBalanceOpen.value = true
 }
 
+watch(secondBalanceOpen, () => {
+  Taro.setNavigationBarColor({
+    frontColor: secondBalanceOpen.value ? '#000000' : '#ffffff', 
+    backgroundColor: '#ffffff',
+    animation: {
+      duration: 400,
+      timingFunc: 'easeIn'
+    }
+  })
+})
+
 function onDateReset () {
   resetDateRange()
 }

package/src/balance/components/SecondBalance.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="second-balance">
     <page-header title="小云豆余额" />
-    <div class="positions">
-      <div class="position" 
+    <div class="positions" v-if="data.length">
+      <div class="position"
         v-for="(item, index) in data" 
         :key="index">
         <div class="icon"></div>
@@ -10,11 +10,13 @@
         <label class="number amount">{{ item.count }}</label>
       </div>
     </div>
+    <empty-view v-else />
   </div>
 </template>
 
 <script lang="ts" setup>
 import { Privilege } from '../types'
+import EmptyView from '../../shared/components/EmptyView.vue'
 
 // 小云豆余额
 // 由账户页 AccountView 使用 AppDrawer 弹出