@uxda/appkit 4.3.2 → 4.3.3

package/dist/index.js

@@ -1,7 +1,7 @@
-import { GridItem, Grid, Popup, ActionSheet, Checkbox, Button, Dialog, DatePicker, Radio, RadioGroup, FormItem, Form, Ellipsis, Skeleton, Cell, Input, Step, Steps } from '@nutui/nutui-taro';
+import { Grid, GridItem, Popup, ActionSheet, Checkbox, Button, Dialog, DatePicker, Form, FormItem, RadioGroup, Radio, Ellipsis, Skeleton, Cell, Input, Steps, Step } 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, ref, computed, onUnmounted, resolveDirective, createCommentVNode, withDirectives, renderSlot, createVNode, normalizeStyle, unref, isRef, onMounted, createStaticVNode, watch, vShow, mergeModels, useModel, resolveComponent, vModelText, watchPostEffect, withModifiers } from 'vue';
+import { defineComponent, reactive, createBlock, openBlock, withCtx, createElementBlock, Fragment, renderList, normalizeClass, createElementVNode, toDisplayString, createTextVNode, ref, computed, onUnmounted, resolveDirective, createCommentVNode, withDirectives, renderSlot, createVNode, normalizeStyle, unref, isRef, onMounted, createStaticVNode, watch, vShow, mergeModels, useModel, resolveComponent, vModelText, watchPostEffect, withModifiers } from 'vue';
 import '@nutui/nutui-taro/dist/packages/grid/style/css';
 import '@nutui/nutui-taro/dist/packages/griditem/style/css';
 import Taro, { showModal, getSystemInfoSync, getMenuButtonBoundingClientRect, uploadFile, request as request$1, showToast, chooseMedia, chooseMessageFile, showLoading, hideLoading, getStorageSync, setStorageSync, getSystemInfo, getNetworkType, getEnv, getAccountInfoSync, getPerformance, onAppHide, useDidShow, onAppShow, onNetworkStatusChange, useRouter } from '@tarojs/taro';
@@ -9,7 +9,7 @@ import '@nutui/nutui-taro/dist/packages/popup/style/css';
 import isMobilePhone from 'validator/es/lib/isMobilePhone';
 import isIdentityCard from 'validator/es/lib/isIdentityCard';
 import qs from 'qs';
-import { NsForm, NsInput, NsButton, NsIcon, usePopup, useNutshell, NsButtonGroup, usePaging, NsPage, NsTabs, NsTabsItem, NsPageContent, NsSkeleton, NsRepeator, NsCard, NsEmpty, NsCheckbox } from '@uxda/nutshell/taro';
+import { NsForm, NsInput, NsButton, NsIcon, usePopup, useNutshell, NsButtonGroup, usePaging, NsPage, NsTabs, NsPageContent, NsSkeleton, NsRepeator, NsCard, NsEmpty, NsCheckbox } from '@uxda/nutshell/taro';
 import '@nutui/nutui-taro/dist/packages/actionsheet/style/css';
 import pako from 'pako';
 import dsBridge from 'dsbridge';
@@ -657,8 +657,8 @@ script$K.__file = "src/shared/components/AppDrawer.vue";
 const _hoisted_1$D = { class: "app-verify column" };
 const _hoisted_2$s = { class: "caption" };
 const _hoisted_3$m = { class: "number" };
-const _hoisted_4$h = { class: "form-btn" };
-const _hoisted_5$d = {
+const _hoisted_4$i = { class: "form-btn" };
+const _hoisted_5$e = {
   key: 1,
   class: "caption"
 };
@@ -738,7 +738,7 @@ var script$J = /* @__PURE__ */ defineComponent({
                 method: (value) => value.length === 6
               }]
             }, null, 8, ["modelValue", "rules"]),
-            createElementVNode("div", _hoisted_4$h, [
+            createElementVNode("div", _hoisted_4$i, [
               !sent.value ? withDirectives((openBlock(), createBlock(
                 unref(NsButton),
                 {
@@ -757,7 +757,7 @@ var script$J = /* @__PURE__ */ defineComponent({
               ]) : createCommentVNode("v-if", true),
               sent.value ? (openBlock(), createElementBlock(
                 "div",
-                _hoisted_5$d,
+                _hoisted_5$e,
                 toDisplayString(countdown.value) + "s\u540E\u91CD\u65B0\u53D1\u9001",
                 1
                 /* TEXT */
@@ -1501,7 +1501,6 @@ const request = (config) => {
       }
     }).catch((e) => {
       console.log("request.catch===", e);
-      reject(e);
     });
   });
 };
@@ -1560,6 +1559,15 @@ function isApp() {
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+var TrackingEventType = /* @__PURE__ */ ((TrackingEventType2) => {
+  TrackingEventType2["PAGE_VIEW"] = "page_view";
+  TrackingEventType2["PAGE_LEAVE"] = "page_leave";
+  TrackingEventType2["APP_DEVICE_INFO"] = "app_device_info";
+  TrackingEventType2["CLICK"] = "click";
+  TrackingEventType2["CUSTOM"] = "custom";
+  return TrackingEventType2;
+})(TrackingEventType || {});
+const { PAGE_VIEW, PAGE_LEAVE, CLICK, CUSTOM, APP_DEVICE_INFO } = TrackingEventType;
 const DEFAULT_CONFIG = {
   enabled: true,
   debug: false,
@@ -2695,11 +2703,9 @@ const endpointsList$2 = {
       certificateNo: params.user,
       accountAuthFlag: params.accountAuthFlag || false,
       channelCode: params.channelCode || null,
-      payFinishJumpUrl: params.payFinishJumpUrl || null,
-      useCloudBean: params.useCloudBean || false
+      payFinishJumpUrl: params.payFinishJumpUrl || null
     }),
     transform: (data) => {
-      console.log(data, "data-----");
       let json = null;
       try {
         json = JSON.parse(data.prePayStr);
@@ -2767,7 +2773,6 @@ const vendor$2 = {
             title: data.msg,
             icon: "none"
           });
-          reject(data.msg);
         }
       }).catch((e) => {
         reject(e);
@@ -2931,8 +2936,6 @@ const requestBrandWCPayByBean = (params, Appcode = "") => {
           }
         });
       }
-    }).catch(() => {
-      resolve(false);
     });
   });
 };
@@ -2961,7 +2964,7 @@ const isIOS = () => {
 const _hoisted_1$B = { class: "view recharge-view" };
 const _hoisted_2$r = { class: "flex-grow" };
 const _hoisted_3$l = { class: "amount-footer" };
-const _hoisted_4$g = { class: "agreement" };
+const _hoisted_4$h = { class: "agreement" };
 var script$E = /* @__PURE__ */ defineComponent({
   __name: "RechargeView",
   props: {
@@ -3065,7 +3068,7 @@ var script$E = /* @__PURE__ */ defineComponent({
           }, null, 8, ["items", "selected"])
         ]),
         createElementVNode("view", _hoisted_3$l, [
-          createElementVNode("view", _hoisted_4$g, [
+          createElementVNode("view", _hoisted_4$h, [
             createVNode(_component_nut_checkbox, {
               modelValue: state.agreed,
               "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => state.agreed = $event)
@@ -3138,7 +3141,7 @@ const _hoisted_3$k = {
   key: 0,
   class: "caption"
 };
-const _hoisted_4$f = {
+const _hoisted_4$g = {
   key: 1,
   class: "caption"
 };
@@ -3179,7 +3182,7 @@ var script$C = /* @__PURE__ */ defineComponent({
           ),
           __props.payMethod == "bean" ? (openBlock(), createElementBlock("div", _hoisted_3$k, "\u6743\u76CA\u5DF2\u5230\u8D26")) : (openBlock(), createElementBlock(
             "div",
-            _hoisted_4$f,
+            _hoisted_4$g,
             toDisplayString(views[__props.type][1]) + "\u5C06\u57281\u5206\u949F\u4E4B\u5185\u5230\u8D26",
             1
             /* TEXT */
@@ -3326,8 +3329,8 @@ const _hoisted_3$i = {
   key: 0,
   class: "bean-buy"
 };
-const _hoisted_4$e = { class: "left" };
-const _hoisted_5$c = {
+const _hoisted_4$f = { class: "left" };
+const _hoisted_5$d = {
   key: 0,
   class: "amount"
 };
@@ -3337,25 +3340,17 @@ const _hoisted_6$9 = {
 };
 const _hoisted_7$6 = { class: "amount" };
 const _hoisted_8$5 = ["src"];
-const _hoisted_9$4 = {
-  key: 0,
-  class: "balance-warning"
-};
+const _hoisted_9$4 = { class: "amount-footer" };
 const _hoisted_10$3 = {
-  key: 1,
-  class: "balance-warning-tip"
-};
-const _hoisted_11$3 = { class: "amount-footer" };
-const _hoisted_12$3 = {
   key: 0,
   class: "agreement"
 };
-const _hoisted_13$2 = { class: "buy-amount" };
-const _hoisted_14$2 = { class: "left" };
-const _hoisted_15$2 = { class: "amount" };
+const _hoisted_11$3 = { class: "buy-amount" };
+const _hoisted_12$3 = { class: "left" };
+const _hoisted_13$2 = { class: "amount" };
+const _hoisted_14$2 = { class: "item" };
+const _hoisted_15$2 = { class: "item" };
 const _hoisted_16$2 = { class: "item" };
-const _hoisted_17$2 = { class: "item" };
-const _hoisted_18$2 = { class: "item" };
 var script$A = /* @__PURE__ */ defineComponent({
   __name: "TradeView",
   props: {
@@ -3388,28 +3383,8 @@ var script$A = /* @__PURE__ */ defineComponent({
       state.selected = selected;
       selectBean.value = false;
     };
-    const extraPaymentAmount = computed(() => {
-      if (!selectBean.value || !amounts.value[state.selected]) {
-        return 0;
-      }
-      const paymentAmount = amounts.value[state.selected].paymentAmount || 0;
-      const currentBalance = balance.value || 0;
-      return Math.max(0, paymentAmount - currentBalance);
-    });
     const currentAmount = computed(() => {
-      if (!amounts.value[state.selected]) {
-        return 0;
-      }
-      if (selectBean.value) {
-        if (balance.value < amounts.value[state.selected].paymentAmount) {
-          return extraPaymentAmount.value;
-        }
-        return 0;
-      }
-      return amounts.value[state.selected].paymentAmount || 0;
-    });
-    const isCombinedPayment = computed(() => {
-      return selectBean.value && amounts.value[state.selected] && balance.value < amounts.value[state.selected].paymentAmount;
+      return amounts.value[state.selected] && !selectBean.value ? amounts.value[state.selected].paymentAmount : 0;
     });
     onMounted(() => {
       const $http = useHttp$2({ Appcode: props.headerApp, Tenant: props.tenant });
@@ -3423,28 +3398,24 @@ var script$A = /* @__PURE__ */ defineComponent({
     const showDialog = ref(false);
     async function beanPay() {
       const $http = useHttp$2({ Appcode: props.headerApp, Tenant: props.tenant });
-      try {
-        const response = await $http.post(
-          `/payment/paymentCaseConfig/purchase/${amounts.value[state.selected].id}`
-        );
+      $http.post(`/payment/paymentCaseConfig/purchase/${amounts.value[state.selected].id}`).then((response) => {
         if (response) {
           showDialog.value = false;
           emit("complete", { result: response, type: "bean" });
         } else {
           showToast({
-            title: response?.message || "\u652F\u4ED8\u5931\u8D25",
+            title: response.message,
             icon: "none"
           });
         }
-      } catch (error) {
-        showToast({
-          title: error?.message || "\u652F\u4ED8\u5931\u8D25",
-          icon: "none"
-        });
-      }
+      });
     }
-    function proceedWechatPayment() {
-      if (!state.agreed) {
+    const onPayClick = () => {
+      if (selectBean.value) {
+        showDialog.value = true;
+        return;
+      }
+      if (!selectBean.value && !state.agreed) {
         showToast({
           title: "\u8BF7\u52FE\u9009\u300A\u5927\u9053\u4E91\u5E73\u53F0\u4E91\u8C46\u5145\u503C\u534F\u8BAE\u300B",
           icon: "none"
@@ -3463,75 +3434,40 @@ var script$A = /* @__PURE__ */ defineComponent({
         }
         requestBrandWCPayByBean({
           caseConfigId: amounts.value[state.selected].id,
-          amount: currentAmount.value,
+          amount: amounts.value[state.selected].paymentAmount,
           app: "loankitMp",
           tenant: props.tenant,
           accountAuthFlag: false,
           channelCode: "centergzh",
           payFinishJumpUrl: props.payFinishJumpUrl,
-          fromMini: !!params.from,
-          useCloudBean: isCombinedPayment.value
+          fromMini: !!params.from
         }).then((result) => {
+          console.log(result, "------requestBrandWCPay");
           state.buttonLoading = false;
           if (typeof result === "boolean" && result) {
             window.location.href = props.payFinishJumpUrl;
           } else {
-            emit("complete", {
-              result,
-              type: isCombinedPayment.value ? "combined" : "wePay"
-            });
+            emit("complete", { result, type: "wePay" });
           }
-        }).catch((error) => {
-          state.buttonLoading = false;
-          showToast({
-            title: error.message || "\u652F\u4ED8\u5931\u8D25",
-            icon: "none"
-          });
         });
       } else {
         wx.login({
           success({ code }) {
-            requestPaymentByBean(
-              {
-                caseConfigId: amounts.value[state.selected].id,
-                amount: currentAmount.value,
-                app: props.app,
-                tenant: props.tenant,
-                user: code
-              },
-              props.headerApp
-            ).then((result) => {
+            requestPaymentByBean({
+              caseConfigId: amounts.value[state.selected].id,
+              amount: amounts.value[state.selected].paymentAmount,
+              app: props.app,
+              tenant: props.tenant,
+              user: code
+            }, props.headerApp).then((result) => {
               state.buttonLoading = false;
               if (result) {
-                emit("complete", {
-                  result: true,
-                  type: isCombinedPayment.value ? "combined" : "wePay"
-                });
+                emit("complete", { result: true, type: "wePay" });
               }
-            }).catch((error) => {
-              state.buttonLoading = false;
-              showToast({
-                title: error.message || "\u652F\u4ED8\u5931\u8D25",
-                icon: "none"
-              });
-            });
-          },
-          fail() {
-            state.buttonLoading = false;
-            showToast({
-              title: "\u767B\u5F55\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5",
-              icon: "none"
             });
           }
         });
       }
-    }
-    const onPayClick = () => {
-      if (selectBean.value && !isCombinedPayment.value) {
-        showDialog.value = true;
-        return;
-      }
-      proceedWechatPayment();
     };
     return (_ctx, _cache) => {
       const _component_nut_checkbox = Checkbox;
@@ -3546,7 +3482,7 @@ var script$A = /* @__PURE__ */ defineComponent({
             onChange: onAmountSelect
           }, null, 8, ["items", "selected"]),
           amounts.value[state.selected] ? (openBlock(), createElementBlock("div", _hoisted_3$i, [
-            createElementVNode("div", _hoisted_4$e, [
+            createElementVNode("div", _hoisted_4$f, [
               _cache[4] || (_cache[4] = createElementVNode(
                 "div",
                 { class: "title" },
@@ -3554,28 +3490,29 @@ var script$A = /* @__PURE__ */ defineComponent({
                 -1
                 /* CACHED */
               )),
-              !selectBean.value || isCombinedPayment.value ? (openBlock(), createElementBlock(
+              !selectBean.value ? (openBlock(), createElementBlock(
                 "div",
-                _hoisted_5$c,
-                " \u4F59\u989D " + toDisplayString(unref(formatAmount)(balance.value || 0)),
+                _hoisted_5$d,
+                "\u4F59\u989D " + toDisplayString(unref(formatAmount)(balance.value || 0)),
                 1
                 /* TEXT */
               )) : (openBlock(), createElementBlock(
                 "div",
                 _hoisted_6$9,
-                " \u6263\u51CF\u540E\u4F59\u989D " + toDisplayString(unref(formatAmount)(balance.value - amounts.value[state.selected].paymentAmount)),
+                "\u6263\u51CF\u540E\u4F59\u989D " + toDisplayString(unref(formatAmount)(balance.value - amounts.value[state.selected].paymentAmount)),
                 1
                 /* TEXT */
               ))
             ]),
-            createElementVNode("div", {
+            balance.value >= amounts.value[state.selected].paymentAmount ? (openBlock(), createElementBlock("div", {
+              key: 0,
               class: "right",
               onClick: _cache[0] || (_cache[0] = ($event) => selectBean.value = !selectBean.value)
             }, [
               createElementVNode(
                 "div",
                 _hoisted_7$6,
-                " -" + toDisplayString(unref(formatAmount)(amounts.value[state.selected].paymentAmount || 0)),
+                "-" + toDisplayString(unref(formatAmount)(amounts.value[state.selected].paymentAmount || 0)),
                 1
                 /* TEXT */
               ),
@@ -3583,20 +3520,12 @@ var script$A = /* @__PURE__ */ defineComponent({
                 class: "icon",
                 src: selectBean.value ? "https://cdn.ddjf.com/static/images/appkit/select.svg" : "https://cdn.ddjf.com/static/images/appkit/not-select.svg"
               }, null, 8, _hoisted_8$5)
-            ]),
-            isCombinedPayment.value ? (openBlock(), createElementBlock(
-              "div",
-              _hoisted_9$4,
-              " \u4E91\u8C46\u4F59\u989D\u4E0D\u8DB3,\u8FD8\u9700\u989D\u5916\u652F\u4ED8" + toDisplayString(unref(formatAmount)(extraPaymentAmount.value)) + "\u5143 ",
-              1
-              /* TEXT */
-            )) : createCommentVNode("v-if", true)
+            ])) : createCommentVNode("v-if", true)
           ])) : createCommentVNode("v-if", true),
-          isCombinedPayment.value ? (openBlock(), createElementBlock("div", _hoisted_10$3, " \u8BF7\u5728\u652F\u4ED8\u5B8C\u6210\u524D\u786E\u4FDD\u5143\u8C46\u4F59\u989D\u4E0D\u88AB\u6D88\u8017,\u5426\u5219\u672C\u6B21\u6743\u76CA\u53EF\u80FD\u8D2D\u4E70\u5931\u8D25 ")) : createCommentVNode("v-if", true),
           renderSlot(_ctx.$slots, "banner")
         ]),
-        createElementVNode("view", _hoisted_11$3, [
-          !selectBean.value || isCombinedPayment.value ? (openBlock(), createElementBlock("view", _hoisted_12$3, [
+        createElementVNode("view", _hoisted_9$4, [
+          !selectBean.value ? (openBlock(), createElementBlock("view", _hoisted_10$3, [
             createVNode(_component_nut_checkbox, {
               modelValue: state.agreed,
               "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => state.agreed = $event)
@@ -3624,14 +3553,14 @@ var script$A = /* @__PURE__ */ defineComponent({
               /* STABLE */
             }, 8, ["modelValue"])
           ])) : createCommentVNode("v-if", true),
-          createElementVNode("div", _hoisted_13$2, [
-            createElementVNode("div", _hoisted_14$2, [
+          createElementVNode("div", _hoisted_11$3, [
+            createElementVNode("div", _hoisted_12$3, [
               _cache[8] || (_cache[8] = createTextVNode(
                 " \u5F85\u652F\u4ED8\uFF1A ",
                 -1
                 /* CACHED */
               )),
-              createElementVNode("span", _hoisted_15$2, [
+              createElementVNode("span", _hoisted_13$2, [
                 _cache[7] || (_cache[7] = createElementVNode(
                   "i",
                   null,
@@ -3682,22 +3611,22 @@ var script$A = /* @__PURE__ */ defineComponent({
               [
                 createElementVNode(
                   "div",
-                  _hoisted_16$2,
-                  " \u4E91\u8C46\u6263\u51CF\uFF1A" + toDisplayString(unref(formatAmount)(amounts.value[state.selected].paymentAmount || 0)),
+                  _hoisted_14$2,
+                  "\u4E91\u8C46\u6263\u51CF\uFF1A" + toDisplayString(unref(formatAmount)(amounts.value[state.selected].paymentAmount || 0)),
                   1
                   /* TEXT */
                 ),
                 createElementVNode(
                   "div",
-                  _hoisted_17$2,
-                  " \u6743\u76CA\u589E\u52A0\uFF1A" + toDisplayString(unref(formatAmount)(amounts.value[state.selected].priceRightNum || 0)) + "\u7B14 ",
+                  _hoisted_15$2,
+                  "\u6743\u76CA\u589E\u52A0\uFF1A" + toDisplayString(unref(formatAmount)(amounts.value[state.selected].priceRightNum || 0)) + "\u7B14",
                   1
                   /* TEXT */
                 ),
                 createElementVNode(
                   "div",
-                  _hoisted_18$2,
-                  " \u6263\u51CF\u540E\u4E91\u8C46\u4F59\u989D\uFF1A" + toDisplayString(unref(formatAmount)(balance.value - amounts.value[state.selected].paymentAmount)),
+                  _hoisted_16$2,
+                  "\u6263\u51CF\u540E\u4E91\u8C46\u4F59\u989D\uFF1A" + toDisplayString(unref(formatAmount)(balance.value - amounts.value[state.selected].paymentAmount)),
                   1
                   /* TEXT */
                 )
@@ -3727,8 +3656,8 @@ const components = {
 const _hoisted_1$w = { class: "account-card" };
 const _hoisted_2$n = { class: "card" };
 const _hoisted_3$h = { class: "card-row" };
-const _hoisted_4$d = { class: "card-row-left" };
-const _hoisted_5$b = { class: "bean-nums number" };
+const _hoisted_4$e = { class: "card-row-left" };
+const _hoisted_5$c = { class: "bean-nums number" };
 const _hoisted_6$8 = { class: "card-row-right" };
 var script$z = /* @__PURE__ */ defineComponent({
   __name: "BalanceCard",
@@ -3775,7 +3704,7 @@ var script$z = /* @__PURE__ */ defineComponent({
       return openBlock(), createElementBlock("div", _hoisted_1$w, [
         createElementVNode("div", _hoisted_2$n, [
           createElementVNode("div", _hoisted_3$h, [
-            createElementVNode("div", _hoisted_4$d, [
+            createElementVNode("div", _hoisted_4$e, [
               _cache[0] || (_cache[0] = createElementVNode(
                 "div",
                 { class: "bean-box" },
@@ -3793,7 +3722,7 @@ var script$z = /* @__PURE__ */ defineComponent({
               )),
               createElementVNode(
                 "div",
-                _hoisted_5$b,
+                _hoisted_5$c,
                 toDisplayString(unref(formatAmount)(balance.value.total || 0)),
                 1
                 /* TEXT */
@@ -3828,7 +3757,7 @@ var script$z = /* @__PURE__ */ defineComponent({
               ])
             ])
           ]),
-          createCommentVNode(' <div class="line"></div>\n      <div class="card-row">\n        <div class="card-row-left desc">\u6743\u76CA\u4F7F\u7528\u65F6\u81EA\u52A8\u6263\u51CF\u4E91\u8C46</div>\n        <div class="card-row-right">\n          <div class="pay" v-track-click @click="gotoRecharge">\n            <div>\u5145\u503C</div>\n            <img\n              class="pay-icon"\n              src="https://cdn.ddjf.com/static/images/bpms-workBench/bean-right.png"\n            />\n          </div>\n        </div>\n      </div> ')
+          createCommentVNode(' <div class="line"></div>\r\n      <div class="card-row">\r\n        <div class="card-row-left desc">\u6743\u76CA\u4F7F\u7528\u65F6\u81EA\u52A8\u6263\u51CF\u4E91\u8C46</div>\r\n        <div class="card-row-right">\r\n          <div class="pay" v-track-click @click="gotoRecharge">\r\n            <div>\u5145\u503C</div>\r\n            <img\r\n              class="pay-icon"\r\n              src="https://cdn.ddjf.com/static/images/bpms-workBench/bean-right.png"\r\n            />\r\n          </div>\r\n        </div>\r\n      </div> ')
         ])
       ]);
     };
@@ -3855,8 +3784,8 @@ const consumptionDirections = ["\u5168\u90E8", "\u6536\u5165", "\u652F\u51FA"];
 const _hoisted_1$v = { class: "consumption-filter" };
 const _hoisted_2$m = { class: "consumption-filter-content" };
 const _hoisted_3$g = { class: "title" };
-const _hoisted_4$c = { class: "info" };
-const _hoisted_5$a = ["onClick"];
+const _hoisted_4$d = { class: "info" };
+const _hoisted_5$b = ["onClick"];
 const _hoisted_6$7 = { class: "consumption-filter-btn spa-between" };
 var script$y = /* @__PURE__ */ defineComponent({
   __name: "ConsumptionFilter",
@@ -3935,7 +3864,7 @@ var script$y = /* @__PURE__ */ defineComponent({
                     1
                     /* TEXT */
                   ),
-                  createElementVNode("div", _hoisted_4$c, [
+                  createElementVNode("div", _hoisted_4$d, [
                     (openBlock(true), createElementBlock(
                       Fragment,
                       null,
@@ -3944,7 +3873,7 @@ var script$y = /* @__PURE__ */ defineComponent({
                           onClick: () => onFilterSectionClick(index, it.code),
                           class: normalizeClass([getItemClass(index, it.code), "info-item"]),
                           key: i
-                        }, toDisplayString(typeof it === "string" ? it : it.name), 11, _hoisted_5$a);
+                        }, toDisplayString(typeof it === "string" ? it : it.name), 11, _hoisted_5$b);
                       }),
                       128
                       /* KEYED_FRAGMENT */
@@ -3994,7 +3923,7 @@ script$y.__file = "src/balance/components/ConsumptionFilter.vue";
 const _hoisted_1$u = { class: "appkit-date-filter" };
 const _hoisted_2$l = { class: "content" };
 const _hoisted_3$f = { class: "time" };
-const _hoisted_4$b = { class: "buttons spa-between" };
+const _hoisted_4$c = { class: "buttons spa-between" };
 var script$x = /* @__PURE__ */ defineComponent({
   __name: "DateFilter",
   props: {
@@ -4117,7 +4046,7 @@ var script$x = /* @__PURE__ */ defineComponent({
             )
           ])
         ]),
-        createElementVNode("div", _hoisted_4$b, [
+        createElementVNode("div", _hoisted_4$c, [
           createElementVNode("div", {
             class: "btn",
             onClick: reset
@@ -4293,8 +4222,8 @@ script$u.__file = "src/balance/components/Tip.vue";
 const _hoisted_1$q = { class: "account-view" };
 const _hoisted_2$k = { class: "scroll-content" };
 const _hoisted_3$e = { class: "row jusify-right" };
-const _hoisted_4$a = { class: "balance" };
-const _hoisted_5$9 = { class: "bean-box spa-between" };
+const _hoisted_4$b = { class: "balance" };
+const _hoisted_5$a = { class: "bean-box spa-between" };
 const _hoisted_6$6 = { class: "bean-counts spa-between" };
 const _hoisted_7$5 = { class: "counts number" };
 const _hoisted_8$4 = {
@@ -4556,8 +4485,8 @@ var script$t = /* @__PURE__ */ defineComponent({
                   [_directive_track_click]
                 ])
               ]),
-              createElementVNode("div", _hoisted_4$a, [
-                createElementVNode("div", _hoisted_5$9, [
+              createElementVNode("div", _hoisted_4$b, [
+                createElementVNode("div", _hoisted_5$a, [
                   _cache[9] || (_cache[9] = createElementVNode(
                     "div",
                     { class: "bean-img" },
@@ -5030,8 +4959,8 @@ script$t.__file = "src/balance/components/AccountView.vue";
 const _hoisted_1$p = { class: "balance-reminder" };
 const _hoisted_2$j = { class: "body" };
 const _hoisted_3$d = { class: "footer" };
-const _hoisted_4$9 = { class: "col" };
-const _hoisted_5$8 = { class: "col" };
+const _hoisted_4$a = { class: "col" };
+const _hoisted_5$9 = { class: "col" };
 var script$s = /* @__PURE__ */ defineComponent({
   __name: "BalanceReminder",
   props: {
@@ -5072,7 +5001,7 @@ var script$s = /* @__PURE__ */ defineComponent({
               )
             ]),
             createElementVNode("div", _hoisted_3$d, [
-              createElementVNode("div", _hoisted_4$9, [
+              createElementVNode("div", _hoisted_4$a, [
                 createVNode(_component_nut_button, {
                   class: "cancel-button",
                   onClick: _cache[0] || (_cache[0] = ($event) => emit("update:modelValue", false)),
@@ -5089,7 +5018,7 @@ var script$s = /* @__PURE__ */ defineComponent({
                   /* STABLE */
                 })
               ]),
-              createElementVNode("div", _hoisted_5$8, [
+              createElementVNode("div", _hoisted_5$9, [
                 withDirectives((openBlock(), createBlock(_component_nut_button, {
                   block: "",
                   class: "recharge-button",
@@ -5227,8 +5156,8 @@ script$r.__file = "src/balance/components/DateRange.vue";
 const _hoisted_1$n = { class: "list-filter-picker" };
 const _hoisted_2$i = { class: "list-filter-picker-content" };
 const _hoisted_3$c = { class: "title" };
-const _hoisted_4$8 = { class: "info" };
-const _hoisted_5$7 = ["onClick"];
+const _hoisted_4$9 = { class: "info" };
+const _hoisted_5$8 = ["onClick"];
 const _hoisted_6$5 = { class: "list-filter-picker-btn spa-between" };
 var script$q = /* @__PURE__ */ defineComponent({
   __name: "ListFilterPicker",
@@ -5305,7 +5234,7 @@ var script$q = /* @__PURE__ */ defineComponent({
                     1
                     /* TEXT */
                   ),
-                  createElementVNode("div", _hoisted_4$8, [
+                  createElementVNode("div", _hoisted_4$9, [
                     (openBlock(true), createElementBlock(
                       Fragment,
                       null,
@@ -5314,7 +5243,7 @@ var script$q = /* @__PURE__ */ defineComponent({
                           onClick: () => onFilterSectionClick(item.name, it.value),
                           class: normalizeClass([getItemClass(item.name, it.value), "info-item"]),
                           key: i
-                        }, toDisplayString(typeof it === "string" ? it : it.label), 11, _hoisted_5$7);
+                        }, toDisplayString(typeof it === "string" ? it : it.label), 11, _hoisted_5$8);
                       }),
                       128
                       /* KEYED_FRAGMENT */
@@ -5430,8 +5359,8 @@ const _hoisted_1$m = {
 };
 const _hoisted_2$h = { class: "promoter-card-hd-num number" };
 const _hoisted_3$b = ["src"];
-const _hoisted_4$7 = { class: "promoter-card-ft" };
-const _hoisted_5$6 = {
+const _hoisted_4$8 = { class: "promoter-card-ft" };
+const _hoisted_5$7 = {
   key: 0,
   class: "promoter-card-ft-item"
 };
@@ -5589,8 +5518,8 @@ var script$o = /* @__PURE__ */ defineComponent({
           ])), [
             [_directive_track_click]
           ]) : createCommentVNode("v-if", true),
-          createElementVNode("div", _hoisted_4$7, [
-            __props.applyRecord.accessCheckStatus === "Y" ? (openBlock(), createElementBlock("div", _hoisted_5$6, [
+          createElementVNode("div", _hoisted_4$8, [
+            __props.applyRecord.accessCheckStatus === "Y" ? (openBlock(), createElementBlock("div", _hoisted_5$7, [
               __props.\u663E\u793A\u4E0B\u7EA7\u5206\u9500\u5546 ? (openBlock(), createElementBlock(
                 Fragment,
                 { key: 0 },
@@ -6032,8 +5961,8 @@ script$l.__file = "src/components/dd-selector/index.vue";
 const _hoisted_1$j = { class: "self-registration" };
 const _hoisted_2$f = { class: "self-registration-body" };
 const _hoisted_3$a = ["src"];
-const _hoisted_4$6 = { class: "self-registration__input" };
-const _hoisted_5$5 = { class: "self-registration-bottom" };
+const _hoisted_4$7 = { class: "self-registration__input" };
+const _hoisted_5$6 = { class: "self-registration-bottom" };
 var script$k = /* @__PURE__ */ defineComponent({
   __name: "SelfRegistration",
   props: {
@@ -6193,7 +6122,7 @@ var script$k = /* @__PURE__ */ defineComponent({
                 required: ""
               }, {
                 default: withCtx(() => [
-                  createElementVNode("div", _hoisted_4$6, [
+                  createElementVNode("div", _hoisted_4$7, [
                     withDirectives(createElementVNode(
                       "input",
                       {
@@ -6344,7 +6273,7 @@ var script$k = /* @__PURE__ */ defineComponent({
             /* STABLE */
           })
         ]),
-        createElementVNode("div", _hoisted_5$5, [
+        createElementVNode("div", _hoisted_5$6, [
           withDirectives((openBlock(), createBlock(_component_nut_button, {
             block: "",
             type: "primary",
@@ -6655,7 +6584,7 @@ var script$i = /* @__PURE__ */ defineComponent({
   emits: ["detail", "close", "view", "popup", "hasBanner"],
   setup(__props, { emit: __emit }) {
     const props = __props;
-    const { toReadFun, noticeClick } = useNotice();
+    const { noticeClick } = useNotice();
     const bannerMessages = ref([]);
     const popMessages = ref([]);
     const activeKey = ref(0);
@@ -7108,8 +7037,8 @@ const _hoisted_3$7 = {
   key: 0,
   class: "wrapper"
 };
-const _hoisted_4$5 = ["onClick"];
-const _hoisted_5$4 = { class: "time" };
+const _hoisted_4$6 = ["onClick"];
+const _hoisted_5$5 = { class: "time" };
 const _hoisted_6$3 = {
   key: 0,
   class: "notice-list-label"
@@ -7242,7 +7171,7 @@ var script$f = /* @__PURE__ */ defineComponent({
                       createElementVNode("div", null, [
                         createElementVNode(
                           "div",
-                          _hoisted_5$4,
+                          _hoisted_5$5,
                           toDisplayString(formatMinutes(item.receiveTime)),
                           1
                           /* TEXT */
@@ -7299,7 +7228,7 @@ var script$f = /* @__PURE__ */ defineComponent({
                           /* CLASS */
                         )
                       ])
-                    ], 10, _hoisted_4$5)), [
+                    ], 10, _hoisted_4$6)), [
                       [_directive_track_click, "\u6D88\u606F\u8BE6\u60C5"]
                     ]);
                   }),
@@ -7341,16 +7270,21 @@ var script$f = /* @__PURE__ */ defineComponent({
 
 script$f.__file = "src/notice/components/NoticeList.vue";
 
-const _hoisted_1$d = {
+const _hoisted_1$d = ["onClick"];
+const _hoisted_2$9 = {
+  key: 0,
+  class: "custom-title-dot"
+};
+const _hoisted_3$6 = {
   key: 0,
   class: "read-all"
 };
-const _hoisted_2$9 = {
+const _hoisted_4$5 = {
   key: 0,
   class: "news-item-title-icon",
-  src: "https://cdn.ddjf.com/static/images/loan-manage-app/ic_msg_system_notice.webp"
+  src: "https://cdn.ddjf.com/static/images/fnfundkit/ic_msg_system_notice.png"
 };
-const _hoisted_3$6 = { class: "news-item-time" };
+const _hoisted_5$4 = { class: "news-item-time" };
 var script$e = /* @__PURE__ */ defineComponent({
   __name: "NoticeList2",
   props: {
@@ -7361,9 +7295,28 @@ var script$e = /* @__PURE__ */ defineComponent({
   emits: ["itemClick"],
   setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
+    const tabList = ref([
+      {
+        label: "\u5168\u90E8",
+        value: "\u5168\u90E8"
+      },
+      {
+        label: "\u4E1A\u52A1\u6D88\u606F",
+        value: "\u4E1A\u52A1\u6D88\u606F"
+      },
+      {
+        label: "\u7CFB\u7EDF\u516C\u544A",
+        value: "\u7CFB\u7EDF\u516C\u544A"
+      },
+      {
+        label: "\u672A\u8BFB",
+        value: "\u672A\u8BFB"
+      }
+    ]);
     const $http = useHttp$1(), \u663E\u793A\u9AA8\u67B6\u5C4F = ref(true);
     useDidShow(() => {
       nextPage(1);
+      getNotice();
     });
     const state = reactive({
       search: "",
@@ -7416,6 +7369,7 @@ var script$e = /* @__PURE__ */ defineComponent({
     }
     function itemClick(item) {
       read(item);
+      getNotice();
       emits("itemClick", item);
     }
     function read(item) {
@@ -7443,9 +7397,24 @@ var script$e = /* @__PURE__ */ defineComponent({
           });
         });
       } finally {
+        getNotice();
         hideLoading();
       }
     }
+    const noticeShow = ref(false);
+    async function getNotice() {
+      const appkitOptions = useAppKitOptions();
+      const $http2 = useHttp$1();
+      $http2.get("/cas/msg/count-unread", {
+        deviceType: 2,
+        appCode: props.app,
+        tenantId: appkitOptions.tenant(),
+        userId: props.userId
+      }).then((result) => {
+        if (typeof result === "object") return;
+        noticeShow.value = result > 0;
+      });
+    }
     const emits = __emit;
     __expose({
       readAll
@@ -7461,7 +7430,7 @@ var script$e = /* @__PURE__ */ defineComponent({
               class: normalizeClass(["tabContainer", { inH5: unref(isWeb)() }])
             },
             [
-              createCommentVNode(' <ns-search\n       v-track-search="{\n          trackInput: false,\n          trackSubmit: true,\n          minLength: 2,\n        }"\n        style="margin: 0 12px"\n        placeholder="\u8BF7\u8F93\u5165\u5173\u952E\u5B57\u641C\u7D22"\n        v-model="state.search"\n      ></ns-search> '),
+              createCommentVNode(' <ns-tabs\r\n        v-model="state.tab"\r\n        fill="#fff"\r\n        square\r\n        size="xl"\r\n        style="height: 46px"\r\n        @change="onTabChange"\r\n      >\r\n        <ns-tabs-item key="\u5168\u90E8" tab="\u5168\u90E8"></ns-tabs-item>\r\n        <ns-tabs-item key="\u4E1A\u52A1\u6D88\u606F" tab="\u4E1A\u52A1\u6D88\u606F"></ns-tabs-item>\r\n        <ns-tabs-item key="\u7CFB\u7EDF\u516C\u544A" tab="\u7CFB\u7EDF\u516C\u544A"></ns-tabs-item>\r\n        <ns-tabs-item key="\u672A\u8BFB" tab="\u672A\u8BFB"></ns-tabs-item>\r\n      </ns-tabs> '),
               createVNode(unref(NsTabs), {
                 modelValue: state.tab,
                 "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => state.tab = $event),
@@ -7469,30 +7438,50 @@ var script$e = /* @__PURE__ */ defineComponent({
                 square: "",
                 size: "xl",
                 style: { "height": "46px" },
-                onChange: onTabChange
+                class: "news-tab",
+                items: tabList.value
               }, {
-                default: withCtx(() => [
-                  createVNode(unref(NsTabsItem), {
-                    key: "\u5168\u90E8",
-                    tab: "\u5168\u90E8"
-                  }),
-                  createVNode(unref(NsTabsItem), {
-                    key: "\u4E1A\u52A1\u6D88\u606F",
-                    tab: "\u4E1A\u52A1\u6D88\u606F"
-                  }),
-                  createVNode(unref(NsTabsItem), {
-                    key: "\u7CFB\u7EDF\u516C\u544A",
-                    tab: "\u7CFB\u7EDF\u516C\u544A"
-                  }),
-                  createVNode(unref(NsTabsItem), {
-                    key: "\u672A\u8BFB",
-                    tab: "\u672A\u8BFB"
-                  })
+                titles: withCtx(() => [
+                  (openBlock(true), createElementBlock(
+                    Fragment,
+                    null,
+                    renderList(tabList.value, (item) => {
+                      return openBlock(), createElementBlock("div", {
+                        class: normalizeClass([{ customLine: state.tab === item.value }, "nut-tabs__titles-item custom-tab-item"]),
+                        key: item.value,
+                        onClick: ($event) => {
+                          state.tab = item.value;
+                          onTabChange();
+                        }
+                      }, [
+                        createElementVNode(
+                          "div",
+                          {
+                            class: normalizeClass(["custom-title", { active: state.tab === item.value }])
+                          },
+                          [
+                            createElementVNode(
+                              "div",
+                              null,
+                              toDisplayString(item.label),
+                              1
+                              /* TEXT */
+                            ),
+                            item.value === "\u672A\u8BFB" && noticeShow.value ? (openBlock(), createElementBlock("div", _hoisted_2$9, " \u2022\u2022\u2022 ")) : createCommentVNode("v-if", true)
+                          ],
+                          2
+                          /* CLASS */
+                        )
+                      ], 10, _hoisted_1$d);
+                    }),
+                    128
+                    /* KEYED_FRAGMENT */
+                  ))
                 ]),
                 _: 1
                 /* STABLE */
-              }, 8, ["modelValue"]),
-              state.list.length > 0 ? (openBlock(), createElementBlock("div", _hoisted_1$d, [
+              }, 8, ["modelValue", "items"]),
+              state.list.length > 0 ? (openBlock(), createElementBlock("div", _hoisted_3$6, [
                 withDirectives((openBlock(), createElementBlock("div", {
                   class: "btn",
                   onClick: readAll
@@ -7549,7 +7538,7 @@ var script$e = /* @__PURE__ */ defineComponent({
                               class: "news-item-title"
                             },
                             [
-                              item.\u662F\u516C\u544A ? (openBlock(), createElementBlock("img", _hoisted_2$9)) : createCommentVNode("v-if", true),
+                              item.\u662F\u516C\u544A ? (openBlock(), createElementBlock("img", _hoisted_4$5)) : createCommentVNode("v-if", true),
                               createTextVNode(
                                 " " + toDisplayString(item.\u6807\u9898),
                                 1
@@ -7570,7 +7559,7 @@ var script$e = /* @__PURE__ */ defineComponent({
                           }, null, 8, ["style", "content"]),
                           createElementVNode(
                             "div",
-                            _hoisted_3$6,
+                            _hoisted_5$4,
                             toDisplayString(item.\u65F6\u95F4),
                             1
                             /* TEXT */