@uxda/appkit 1.2.50 → 1.2.54

package/dist/appkit.css

@@ -1267,6 +1267,7 @@ page {
   display: -webkit-box;
   -webkit-line-clamp: 1;
   -webkit-box-orient: vertical;
+  text-align: left;
 }
 .notice-banner-btn {
   color: #017fff;

package/dist/index.js

@@ -3560,7 +3560,6 @@ var script$2 = /* @__PURE__ */ defineComponent({
   emits: ["close", "view"],
   setup(__props, { emit: __emit }) {
     const props = __props;
-    const { toReadFun, noticeClick } = useNotice();
     const showPopup = ref(true);
     onMounted(() => {
     });
@@ -3568,11 +3567,9 @@ var script$2 = /* @__PURE__ */ defineComponent({
       showPopup.value = false;
       emits("close");
     }
-    function toAllSystemNotice() {
-      noticeClick(props.message, () => {
-        onClose();
-        emits("view", props.message.id);
-      });
+    function toViewAttachment() {
+      onClose();
+      emits("view", props.message.jumpUrl || props.message.link);
     }
     async function onClose() {
       const $http = useHttp();
@@ -3580,9 +3577,6 @@ var script$2 = /* @__PURE__ */ defineComponent({
         device: "MINI",
         receiveId: props.message.id
       }).then(() => {
-        if (props.message.isRead === 0) {
-          toReadFun([props.message.id]);
-        }
         onCancel();
       });
     }
@@ -3604,10 +3598,11 @@ var script$2 = /* @__PURE__ */ defineComponent({
               1
               /* TEXT */
             ),
-            createElementVNode("div", {
+            _ctx.message.jumpUrl || _ctx.message.link ? (openBlock(), createElementBlock("div", {
+              key: 0,
               class: "notice-popup-bd-link",
-              onClick: toAllSystemNotice
-            }, "\u70B9\u51FB\u67E5\u770B\u9644\u4EF6")
+              onClick: toViewAttachment
+            }, " \u70B9\u51FB\u67E5\u770B\u9644\u4EF6 ")) : createCommentVNode("v-if", true)
           ]),
           createElementVNode("div", { class: "notice-popup-ft" }, [
             createElementVNode("div", {
@@ -3625,8 +3620,7 @@ var script$2 = /* @__PURE__ */ defineComponent({
 
 script$2.__file = "src/notice/components/NoticePopup.vue";
 
-const _hoisted_1$1 = { class: "notice-banner" };
-const _hoisted_2$1 = /* @__PURE__ */ createElementVNode(
+const _hoisted_1$1 = /* @__PURE__ */ createElementVNode(
   "img",
   {
     class: "notice-banner-icon",
@@ -3637,13 +3631,15 @@ const _hoisted_2$1 = /* @__PURE__ */ createElementVNode(
   -1
   /* HOISTED */
 );
-const _hoisted_3 = { class: "notice-banner-text" };
+const _hoisted_2$1 = { class: "notice-banner-text" };
+const _hoisted_3 = ["onClick"];
 var script$1 = /* @__PURE__ */ defineComponent({
   __name: "NoticeBanner",
   props: {
-    app: { type: String, required: true, default: "" }
+    app: { type: String, required: true, default: "" },
+    bannerStyle: { type: null, required: false, default: "" }
   },
-  emits: ["detail", "close"],
+  emits: ["detail", "close", "view"],
   setup(__props, { emit: __emit }) {
     const props = __props;
     const { toReadFun, noticeClick } = useNotice();
@@ -3665,11 +3661,11 @@ var script$1 = /* @__PURE__ */ defineComponent({
       }).then((result) => {
         bannerMessages.value = (result || []).filter((item) => item.noticeType !== void 0);
         popMessages.value = (result || []).filter((item) => item.isPop);
-        startMessage();
+        startMessageCarousel();
       });
     }
     let interval = null;
-    function startMessage() {
+    function startMessageCarousel() {
       clearInterval(interval);
       if (bannerMessages.value.length > 1) {
         interval = setInterval(() => {
@@ -3688,6 +3684,7 @@ var script$1 = /* @__PURE__ */ defineComponent({
       }
     }
     function onClose(item, index) {
+      clearInterval(interval);
       const $http = useHttp();
       $http.post("/cas/msg/setMsgStatus", {
         device: "PC",
@@ -3700,16 +3697,17 @@ var script$1 = /* @__PURE__ */ defineComponent({
           icon: "none"
         });
         bannerMessages.value.splice(index, 1);
-        startMessage();
-        if (item.isRead === 0) {
-          toReadFun([item.id]);
-        }
+        startMessageCarousel();
+      }).catch(() => {
+        startMessageCarousel();
       });
     }
-    function onDetail(item) {
-      noticeClick(item, (url) => {
-        emits("detail", url);
-      });
+    async function onDetail(item) {
+      await noticeClick(item);
+      emits("detail", item);
+    }
+    function onView(item) {
+      emits("view", item.link);
     }
     const emits = __emit;
     return (_ctx, _cache) => {
@@ -3717,39 +3715,49 @@ var script$1 = /* @__PURE__ */ defineComponent({
         Fragment,
         null,
         [
-          createElementVNode("div", _hoisted_1$1, [
-            (openBlock(true), createElementBlock(
-              Fragment,
-              null,
-              renderList(bannerMessages.value, (item, key) => {
-                return openBlock(), createBlock(script$l, {
-                  class: normalizeClass({ show: key === activeKey.value }),
-                  key,
-                  showClose: item.noticeType === 0,
-                  onClose: ($event) => onClose(item, key)
-                }, {
-                  default: withCtx(() => [
-                    _hoisted_2$1,
-                    createElementVNode(
-                      "div",
-                      _hoisted_3,
-                      toDisplayString(item.context),
-                      1
-                      /* TEXT */
-                    ),
-                    createElementVNode("div", {
-                      class: "notice-banner-btn",
-                      onClick: onDetail
-                    }, "\u8BE6\u60C5")
-                  ]),
-                  _: 2
-                  /* DYNAMIC */
-                }, 1032, ["class", "showClose", "onClose"]);
-              }),
-              128
-              /* KEYED_FRAGMENT */
-            ))
-          ]),
+          bannerMessages.value.length ? (openBlock(), createElementBlock(
+            "div",
+            {
+              key: 0,
+              class: "notice-banner",
+              style: normalizeStyle(_ctx.bannerStyle)
+            },
+            [
+              (openBlock(true), createElementBlock(
+                Fragment,
+                null,
+                renderList(bannerMessages.value, (item, key) => {
+                  return openBlock(), createBlock(script$l, {
+                    class: normalizeClass({ show: key === activeKey.value }),
+                    key,
+                    showClose: item.noticeType === 0,
+                    onClose: ($event) => onClose(item, key)
+                  }, {
+                    default: withCtx(() => [
+                      _hoisted_1$1,
+                      createElementVNode(
+                        "div",
+                        _hoisted_2$1,
+                        toDisplayString(item.context),
+                        1
+                        /* TEXT */
+                      ),
+                      createElementVNode("div", {
+                        class: "notice-banner-btn",
+                        onClick: ($event) => onDetail(item)
+                      }, "\u8BE6\u60C5", 8, _hoisted_3)
+                    ]),
+                    _: 2
+                    /* DYNAMIC */
+                  }, 1032, ["class", "showClose", "onClose"]);
+                }),
+                128
+                /* KEYED_FRAGMENT */
+              ))
+            ],
+            4
+            /* STYLE */
+          )) : createCommentVNode("v-if", true),
           createCommentVNode(" \u7CFB\u7EDF\u516C\u544A\u5F3A\u5236\u5F39\u6846 "),
           (openBlock(true), createElementBlock(
             Fragment,
@@ -3758,8 +3766,9 @@ var script$1 = /* @__PURE__ */ defineComponent({
               return openBlock(), createBlock(script$2, {
                 key,
                 message: item,
-                onClose: ($event) => popMessages.value.splice(key, 1)
-              }, null, 8, ["message", "onClose"]);
+                onClose: ($event) => popMessages.value.splice(key, 1),
+                onView: ($event) => onView(item)
+              }, null, 8, ["message", "onClose", "onView"]);
             }),
             128
             /* KEYED_FRAGMENT */
@@ -3828,10 +3837,11 @@ var script = /* @__PURE__ */ defineComponent({
           loginRuleTip.value = "";
           emits("show", loginRuleTip.value);
           return;
+        } else if (result.status) {
+          showLoginRule.value = true;
+          loginRuleTip.value = result.message;
+          emits("show", loginRuleTip.value);
         }
-        showLoginRule.value = true;
-        loginRuleTip.value = result.message;
-        emits("show", loginRuleTip.value);
       });
     }, 100);
     const emits = __emit;

package/package.json

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

package/src/notice/components/LoginSetting.vue

@@ -72,11 +72,11 @@ const checkLoginTimeRule = debounce(() => {
         loginRuleTip.value = ''
         emits('show', loginRuleTip.value)
         return
+      } else if (result.status) {
+        showLoginRule.value = true
+        loginRuleTip.value = result.message
+        emits('show', loginRuleTip.value)
       }
-
-      showLoginRule.value = true
-      loginRuleTip.value = result.message
-      emits('show', loginRuleTip.value)
     })
 }, 100)
 

package/src/notice/components/NoticeBanner.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="notice-banner">
+  <div class="notice-banner" :style="bannerStyle" v-if="bannerMessages.length">
     <DdNoticeBar
       :class="{ show: key === activeKey }"
       v-for="(item, key) in bannerMessages"
@@ -15,13 +15,13 @@
       <div class="notice-banner-text">
         {{ item.context }}
       </div>
-      <div class="notice-banner-btn" @click="onDetail">详情</div>
+      <div class="notice-banner-btn" @click="onDetail(item)">详情</div>
     </DdNoticeBar>
   </div>
 
   <!-- 系统公告强制弹框 -->
   <template v-for="(item, key) in popMessages" :key="key">
-    <NoticePopup :message="item" @close="popMessages.splice(key, 1)" />
+    <NoticePopup :message="item" @close="popMessages.splice(key, 1)" @view="onView(item)" />
   </template>
 </template>
 
@@ -37,9 +37,11 @@ import { useNotice } from './useNotice'
 const props = withDefaults(
   defineProps<{
     app: string
+    bannerStyle?: any
   }>(),
   {
     app: '',
+    bannerStyle: '',
   }
 )
 
@@ -66,126 +68,16 @@ async function queryNoticeMsg() {
       tenantId: appkitOptions.tenant(),
     })
     .then((result) => {
-      // const result = [
-      //   {
-      //     id: 92989,
-      //     appCode: 'loankit',
-      //     sendType: 11,
-      //     isRead: 1,
-      //     receiveTime: 1718189848000,
-      //     textId: 173545,
-      //     title: '测试消息',
-      //     context:
-      //       '尊敬的客户，为给您提供更加丰富和优质的金融产品及服为给您提供更加丰富和优质的金融产品及服',
-      //     businessId: '123123',
-      //     link: 'www.baidu.com',
-      //     miniLink: 'www.baidu.com',
-      //     appLink: '',
-      //     source: '测试',
-      //     msgType: 3,
-      //     userName: 'gao',
-      //     deviceType: 0,
-      //     customerName: '',
-      //     userId: '1580078112058789890',
-      //     sendTenant: '',
-      //     receiveTenant: '',
-      //     popDevice: '',
-      //     isPop: 1,
-      //     expiryTime: '2025-06-09 14:35:28',
-      //     noticeType: 0,
-      //     noticeStatus: '0',
-      //   },
-      //   {
-      //     id: 92989,
-      //     appCode: 'loankit',
-      //     sendType: 11,
-      //     isRead: 1,
-      //     receiveTime: 1718189848000,
-      //     textId: 173545,
-      //     title: '测试消息',
-      //     context: '你好呀，我111',
-      //     businessId: '123123',
-      //     link: 'www.baidu.com',
-      //     miniLink: 'www.baidu.com',
-      //     appLink: '',
-      //     source: '测试',
-      //     msgType: 3,
-      //     userName: 'gao',
-      //     deviceType: 0,
-      //     customerName: '',
-      //     userId: '1580078112058789890',
-      //     sendTenant: '',
-      //     receiveTenant: '',
-      //     popDevice: '',
-      //     isPop: 1,
-      //     expiryTime: '2025-06-09 14:35:28',
-      //     noticeType: 0,
-      //     noticeStatus: '0',
-      //   },
-      //   {
-      //     id: 92989,
-      //     appCode: 'loankit',
-      //     sendType: 11,
-      //     isRead: 1,
-      //     receiveTime: 1718189848000,
-      //     textId: 173545,
-      //     title: '测试消息',
-      //     context: '你好呀，我222',
-      //     businessId: '123123',
-      //     link: 'www.baidu.com',
-      //     miniLink: 'www.baidu.com',
-      //     appLink: '',
-      //     source: '测试',
-      //     msgType: 3,
-      //     userName: 'gao',
-      //     deviceType: 0,
-      //     customerName: '',
-      //     userId: '1580078112058789890',
-      //     sendTenant: '',
-      //     receiveTenant: '',
-      //     popDevice: '',
-      //     isPop: 1,
-      //     expiryTime: '2025-06-09 14:35:28',
-      //     noticeType: 0,
-      //     noticeStatus: '0',
-      //   },
-      //   {
-      //     id: 92989,
-      //     appCode: 'loankit',
-      //     sendType: 11,
-      //     isRead: 1,
-      //     receiveTime: 1718189848000,
-      //     textId: 173545,
-      //     title: '测试消息',
-      //     context: '你好呀，我333',
-      //     businessId: '123123',
-      //     link: 'www.baidu.com',
-      //     miniLink: 'www.baidu.com',
-      //     appLink: '',
-      //     source: '测试',
-      //     msgType: 3,
-      //     userName: 'gao',
-      //     deviceType: 0,
-      //     customerName: '',
-      //     userId: '1580078112058789890',
-      //     sendTenant: '',
-      //     receiveTenant: '',
-      //     popDevice: '',
-      //     isPop: 1,
-      //     expiryTime: '2025-06-09 14:35:28',
-      //     noticeType: 0,
-      //     noticeStatus: '0',
-      //   },
-      // ]
       bannerMessages.value = (result || []).filter((item: any) => item.noticeType !== undefined)
       popMessages.value = (result || []).filter((item: any) => item.isPop)
-      startMessage()
+
+      startMessageCarousel()
     })
 }
 
 let interval: any = null
 // 启动消息轮播
-function startMessage() {
+function startMessageCarousel() {
   clearInterval(interval)
   if (bannerMessages.value.length > 1) {
     interval = setInterval(() => {
@@ -206,6 +98,8 @@ function startMessageCalc() {
 
 // 关闭横幅
 function onClose(item: any, index: number) {
+  clearInterval(interval)
+
   const $http = useHttp()
   $http
     .post('/cas/msg/setMsgStatus', {
@@ -221,29 +115,38 @@ function onClose(item: any, index: number) {
       })
       bannerMessages.value.splice(index, 1)
 
-      startMessage()
+      startMessageCarousel()
 
-      if (item.isRead === 0) {
-        toReadFun([item.id])
-      }
+      // if (item.isRead === 0) {
+      //   toReadFun([item.id])
+      // }
+    })
+    .catch(() => {
+      startMessageCarousel()
     })
 }
 
 // 跳转详情
-function onDetail(item) {
-  noticeClick(item, (url) => {
-    emits('detail', url)
-  })
+async function onDetail(item) {
+  await noticeClick(item)
+
+  emits('detail', item)
+}
+
+// 查看附件(webview跳转)
+function onView(item) {
+  emits('view', item.link)
 }
 
 // 父组件事件
-const emits = defineEmits(['detail', 'close'])
+const emits = defineEmits(['detail', 'close', 'view'])
 </script>
 
 <style lang="scss">
 .notice-banner {
   height: 30px;
   margin-bottom: 8px;
+
   .dd-notice-bar {
     position: relative;
     background: #f2f3ff;
@@ -281,6 +184,7 @@ const emits = defineEmits(['detail', 'close'])
     display: -webkit-box;
     -webkit-line-clamp: 1;
     -webkit-box-orient: vertical;
+    text-align: left;
   }
   &-btn {
     color: #017fff;

package/src/notice/components/NoticePopup.vue

@@ -14,7 +14,13 @@
     </div>
     <div class="notice-popup-bd">
       {{ message.context }}
-      <div class="notice-popup-bd-link" @click="toAllSystemNotice">点击查看附件</div>
+      <div
+        v-if="message.jumpUrl || message.link"
+        class="notice-popup-bd-link"
+        @click="toViewAttachment"
+      >
+        点击查看附件
+      </div>
     </div>
     <div class="notice-popup-ft">
       <div class="notice-popup-ft-btn" @click="onClose">我知道了</div>
@@ -36,7 +42,7 @@ const props = withDefaults(
   }
 )
 
-const { toReadFun, noticeClick } = useNotice()
+const { noticeClick } = useNotice()
 const showPopup = ref(true)
 
 onMounted(() => {})
@@ -48,13 +54,11 @@ function onCancel() {
   emits('close')
 }
 
-// 查看全部系统公告
-function toAllSystemNotice() {
-  noticeClick(props.message, () => {
-    onClose()
+// 查看附件
+function toViewAttachment() {
+  onClose()
 
-    emits('view', props.message.id)
-  })
+  emits('view', props.message.jumpUrl || props.message.link)
 }
 
 // 关闭弹框
@@ -67,9 +71,9 @@ async function onClose() {
       receiveId: props.message.id,
     })
     .then(() => {
-      if (props.message.isRead === 0) {
-        toReadFun([props.message.id])
-      }
+      // if (props.message.isRead === 0) {
+      //   toReadFun([props.message.id])
+      // }
       onCancel()
     })
 }

package/src/notice/components/useNotice.ts

@@ -2,7 +2,7 @@ import { useHttp } from '../api'
 
 export function useNotice() {
   // 点击消息时
-  async function noticeClick(item: any, cb: Function) {
+  async function noticeClick(item: any, cb?: Function) {
     if (item.isRead === 0) {
       await toReadFun([item.id ?? item.msgId])
     }