@uxda/appkit 1.2.65 → 1.2.68

package/dist/appkit.css

@@ -1,3 +1,92 @@
+.user-entry {
+  position: absolute;
+  left: 0;
+  top: 130px;
+  transform: translateY(-50%);
+  display: flex;
+  padding: 0 22px;
+  align-items: center;
+  width: 100%;
+}
+.user-entry-head {
+  width: 65px;
+  height: 65px;
+  border-radius: 50%;
+  overflow: hidden;
+  margin-right: 5px;
+}
+.user-entry-head-img {
+  width: 100%;
+  height: 100%;
+}
+.user-entry-bd {
+  color: #fff;
+}
+.user-entry-bd-bigtxt {
+  display: flex;
+  align-items: center;
+  font-size: 20px;
+  font-weight: 500;
+  line-height: 28px;
+  margin-left: 15px;
+}
+.user-entry-bd-bigtxt-icon {
+  width: 20px;
+}
+.user-entry-bd-txt {
+  font-size: 20px;
+  font-weight: 500;
+  line-height: 25px;
+}
+.user-entry-bd-smalltxt {
+  margin-top: 0;
+  font-size: 15px;
+  line-height: 21px;
+}
+
+
+.user-feedback {
+  margin: 10px 12px;
+  border-radius: 5px;
+  background: #fff;
+  padding: 10px;
+}
+.user-feedback-head {
+  color: #f2f9ff;
+  padding: 15px;
+  border-radius: 2px;
+  font-size: 12px;
+  margin-bottom: 8px;
+}
+.user-feedback-tit {
+  height: 44px;
+  display: flex;
+  align-items: center;
+  color: #1a1a1a;
+  font-weight: 500;
+  font-size: 17px;
+}
+.user-feedback-body {
+  background: #f5f5f5;
+  border-radius: 4px 4px 0px 0px;
+}
+.user-feedback-handle {
+  border: 1px solid rgba(138, 138, 138, 0.1019607843);
+  background: #ffffff;
+  height: 60px;
+  display: flex;
+  align-items: center;
+  padding: 3px 10px;
+}
+.user-feedback-handle-item {
+  border-radius: 4px;
+  background: #d9d9d9;
+  color: #838383;
+  padding: 0 5px;
+  display: flex;
+  align-items: center;
+}
+
 .amount-picker {
   padding: 14px 0 14px 14px;
 }
@@ -1307,8 +1396,8 @@ page {
 }
 .notice-entry {
   position: fixed;
-  right: 43px;
-  top: 21px;
+  right: 0;
+  top: 120px;
   min-width: 66px;
   padding: 0 12px 0 15px;
   text-align: center;
@@ -1481,6 +1570,12 @@ page {
   font-size: 15px;
   margin-bottom: 4px;
 }
+.notice-list .wrapper .content .card.active .notice-list-label {
+  opacity: 1;
+}
+.notice-list .wrapper .content .card.active .notice-list-file {
+  opacity: 1;
+}
 .notice-list .no-data {
   background-color: #fff;
   display: flex;
@@ -1501,12 +1596,26 @@ page {
   margin-bottom: 19px;
 }
 .notice-list-file {
-  font-size: 12px;
+  font-size: 10px;
   color: #017fff;
+  opacity: 0.5;
 }
 .notice-list .cue-text {
   font-size: 13px;
   color: rgba(60, 60, 60, 0.5);
   padding: 30px 0 calc(30px + env(safe-area-inset-bottom, 0px));
   text-align: center;
+}
+.notice-list-label {
+  border: 1px solid #caa264;
+  color: #caa264;
+  border-radius: 1px;
+  font-size: 8px;
+  display: inline-flex;
+  justify-content: center;
+  align-items: center;
+  height: 14px;
+  padding: 0 5px;
+  margin-left: 4px;
+  opacity: 0.5;
 }

package/dist/index.js

@@ -1144,7 +1144,7 @@ const _hoisted_11$3 = {
   class: "agreement"
 };
 const _hoisted_12$3 = { class: "buy-amount" };
-const _hoisted_13$2 = { class: "left" };
+const _hoisted_13$3 = { class: "left" };
 const _hoisted_14$2 = { class: "amount" };
 const _hoisted_15$1 = /* @__PURE__ */ createElementVNode(
   "i",
@@ -1304,7 +1304,7 @@ var script$j = /* @__PURE__ */ defineComponent({
             }, 8, ["modelValue"])
           ])) : createCommentVNode("v-if", true),
           createElementVNode("div", _hoisted_12$3, [
-            createElementVNode("div", _hoisted_13$2, [
+            createElementVNode("div", _hoisted_13$3, [
               createTextVNode(" \u5F85\u652F\u4ED8\uFF1A "),
               createElementVNode("span", _hoisted_14$2, [
                 _hoisted_15$1,
@@ -1462,7 +1462,7 @@ const _hoisted_12$2 = /* @__PURE__ */ createElementVNode(
   -1
   /* HOISTED */
 );
-const _hoisted_13$1 = /* @__PURE__ */ createElementVNode(
+const _hoisted_13$2 = /* @__PURE__ */ createElementVNode(
   "img",
   {
     class: "pay-icon",
@@ -1474,7 +1474,7 @@ const _hoisted_13$1 = /* @__PURE__ */ createElementVNode(
 );
 const _hoisted_14$1 = [
   _hoisted_12$2,
-  _hoisted_13$1
+  _hoisted_13$2
 ];
 var script$i = /* @__PURE__ */ defineComponent({
   __name: "BalanceCard",
@@ -2015,7 +2015,7 @@ const _hoisted_11$1 = /* @__PURE__ */ createElementVNode(
   /* HOISTED */
 );
 const _hoisted_12$1 = { class: "list" };
-const _hoisted_13 = { class: "item-count" };
+const _hoisted_13$1 = { class: "item-count" };
 const _hoisted_14 = { class: "item-title" };
 const _hoisted_15 = {
   key: 0,
@@ -2330,7 +2330,7 @@ var script$c = /* @__PURE__ */ defineComponent({
                         class: "item star-item",
                         key: index
                       }, [
-                        createElementVNode("div", _hoisted_13, [
+                        createElementVNode("div", _hoisted_13$1, [
                           createElementVNode(
                             "span",
                             null,
@@ -3726,7 +3726,7 @@ var script$4 = /* @__PURE__ */ defineComponent({
       }).catch(() => {
         startMessageCarousel();
       });
-    }, 400);
+    }, 350);
     async function onDetail(item) {
       await noticeClick(item);
       emits("detail", item);
@@ -3937,7 +3937,7 @@ var script$2 = /* @__PURE__ */ defineComponent({
   },
   setup(__props) {
     const props = __props;
-    onMounted(() => {
+    const init = debounce(() => {
       if (!props.app) {
         return Taro.showToast({
           title: "NoticeEntry\u7EC4\u4EF6\u7F3A\u5C11appcode",
@@ -3945,6 +3945,10 @@ var script$2 = /* @__PURE__ */ defineComponent({
         });
       }
       getNotice();
+    }, 300);
+    init();
+    useDidShow(() => {
+      init();
     });
     const noticeShow = ref(false);
     async function getNotice() {
@@ -3956,9 +3960,9 @@ var script$2 = /* @__PURE__ */ defineComponent({
         tenantId: appkitOptions.tenant(),
         userId: props.userId
       }).then((result) => {
-        if (result.status === 200) {
-          noticeShow.value = result.data > 0;
-        }
+        if (!Number(result))
+          return;
+        noticeShow.value = result > 0;
       });
     }
     return (_ctx, _cache) => {
@@ -4180,17 +4184,21 @@ const _hoisted_5 = /* @__PURE__ */ createElementVNode(
   /* HOISTED */
 );
 const _hoisted_6 = { class: "time" };
-const _hoisted_7 = ["onClick"];
-const _hoisted_8 = {
+const _hoisted_7 = {
+  key: 0,
+  class: "notice-list-label"
+};
+const _hoisted_8 = ["onClick"];
+const _hoisted_9 = {
   key: 0,
   class: "cue-text",
   style: { "padding-bottom": "40px" }
 };
-const _hoisted_9 = {
+const _hoisted_10 = {
   key: 1,
   class: "no-data"
 };
-const _hoisted_10 = /* @__PURE__ */ createElementVNode(
+const _hoisted_11 = /* @__PURE__ */ createElementVNode(
   "div",
   { class: "no-data-img" },
   [
@@ -4203,22 +4211,23 @@ const _hoisted_10 = /* @__PURE__ */ createElementVNode(
   -1
   /* HOISTED */
 );
-const _hoisted_11 = /* @__PURE__ */ createElementVNode(
+const _hoisted_12 = /* @__PURE__ */ createElementVNode(
   "div",
   { class: "text" },
   "\u6682\u65E0\u8BB0\u5F55",
   -1
   /* HOISTED */
 );
-const _hoisted_12 = [
-  _hoisted_10,
-  _hoisted_11
+const _hoisted_13 = [
+  _hoisted_11,
+  _hoisted_12
 ];
 var script = /* @__PURE__ */ defineComponent({
   __name: "NoticeList",
   props: {
     app: { type: String, required: true, default: "" },
-    userId: { type: String, required: true, default: "" }
+    userId: { type: String, required: true, default: "" },
+    showAppLabel: { type: Boolean, required: false, default: false }
   },
   emits: ["view"],
   setup(__props, { emit: __emit }) {
@@ -4277,6 +4286,7 @@ var script = /* @__PURE__ */ defineComponent({
     function onNoticeView(link) {
       emits("view", link);
     }
+    const appMap = { aiapprove: "AI\u5BA1\u6279", corporateStar: "\u4F01\u660E\u661F" };
     const emits = __emit;
     return (_ctx, _cache) => {
       const _component_rich_text = resolveComponent("rich-text");
@@ -4323,11 +4333,25 @@ var script = /* @__PURE__ */ defineComponent({
                         createElementVNode(
                           "div",
                           {
-                            class: normalizeClass(["text tit", { gray: item.isRead == "1" }])
+                            class: normalizeClass(["text tit", { gray: item.isRead == "1" }]),
+                            style: { "display": "flex", "align-items": "center" }
                           },
-                          toDisplayString(item.title),
-                          3
-                          /* TEXT, CLASS */
+                          [
+                            createTextVNode(
+                              toDisplayString(item.title) + " ",
+                              1
+                              /* TEXT */
+                            ),
+                            _ctx.showAppLabel && appMap[item.appCode] ? (openBlock(), createElementBlock(
+                              "div",
+                              _hoisted_7,
+                              toDisplayString(appMap[item.appCode]),
+                              1
+                              /* TEXT */
+                            )) : createCommentVNode("v-if", true)
+                          ],
+                          2
+                          /* CLASS */
                         ),
                         createElementVNode(
                           "div",
@@ -4341,9 +4365,9 @@ var script = /* @__PURE__ */ defineComponent({
                             }, null, 8, ["nodes"]),
                             item.link && item.msgType == 3 ? (openBlock(), createElementBlock("span", {
                               key: 0,
-                              class: "account-news-file",
+                              class: "notice-list-file",
                               onClick: ($event) => onNoticeView(item.link)
-                            }, " \u67E5\u770B\u9644\u4EF6 ", 8, _hoisted_7)) : createCommentVNode("v-if", true)
+                            }, " \u67E5\u770B\u9644\u4EF6 ", 8, _hoisted_8)) : createCommentVNode("v-if", true)
                           ],
                           2
                           /* CLASS */
@@ -4354,12 +4378,12 @@ var script = /* @__PURE__ */ defineComponent({
                   128
                   /* KEYED_FRAGMENT */
                 )),
-                unref(isLast) ? (openBlock(), createElementBlock("div", _hoisted_8, "\u6CA1\u6709\u66F4\u591A\u4E86")) : createCommentVNode("v-if", true)
+                unref(isLast) ? (openBlock(), createElementBlock("div", _hoisted_9, "\u6CA1\u6709\u66F4\u591A\u4E86")) : createCommentVNode("v-if", true)
               ]),
               _: 1
               /* STABLE */
             }, 8, ["refresherTriggered", "onScrolltolower"])
-          ])) : (openBlock(), createElementBlock("div", _hoisted_9, [..._hoisted_12]))
+          ])) : (openBlock(), createElementBlock("div", _hoisted_10, [..._hoisted_13]))
         ])
       ]);
     };

package/package.json

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

package/src/notice/components/NoticeBanner.vue

@@ -159,7 +159,7 @@ const onClose = debounce((item: any, index: number) => {
     .catch(() => {
       startMessageCarousel()
     })
-}, 400)
+}, 350)
 
 // 跳转详情
 async function onDetail(item) {

package/src/notice/components/NoticeEntry.vue

@@ -11,10 +11,11 @@
 </template>
 
 <script lang="ts" setup>
-import { onMounted, ref } from 'vue'
+import { ref } from 'vue'
 import { useHttp } from '../api'
 import { useAppKitOptions } from '../../Appkit'
-import Taro from '@tarojs/taro'
+import Taro, { useDidShow } from '@tarojs/taro'
+import debounce from 'lodash/debounce'
 
 const props = withDefaults(
   defineProps<{
@@ -27,7 +28,7 @@ const props = withDefaults(
   }
 )
 
-onMounted(() => {
+const init = debounce(() => {
   if (!props.app) {
     return Taro.showToast({
       title: 'NoticeEntry组件缺少appcode',
@@ -35,6 +36,11 @@ onMounted(() => {
     })
   }
   getNotice()
+}, 300)
+
+init()
+useDidShow(() => {
+  init()
 })
 
 // 通知红点
@@ -51,9 +57,9 @@ async function getNotice() {
       userId: props.userId,
     })
     .then((result: any) => {
-      if (result.status === 200) {
-        noticeShow.value = result.data > 0
-      }
+      if (!Number(result)) return
+
+      noticeShow.value = result > 0
     })
 }
 </script>
@@ -61,8 +67,8 @@ async function getNotice() {
 <style lang="scss">
 .notice-entry {
   position: fixed;
-  right: 43px;
-  top: 21px;
+  right: 0;
+  top: 120px;
   min-width: 66px;
   padding: 0 12px 0 15px;
   text-align: center;

package/src/notice/components/NoticeList.vue

@@ -32,14 +32,21 @@
               <div class="time">
                 {{ formatMinutes(item.receiveTime) }}
               </div>
-              <div class="text tit" :class="{ gray: item.isRead == '1' }">
+              <div
+                class="text tit"
+                style="display: flex; align-items: center"
+                :class="{ gray: item.isRead == '1' }"
+              >
                 {{ item.title }}
+                <div class="notice-list-label" v-if="showAppLabel && appMap[item.appCode]">
+                  {{ appMap[item.appCode] }}
+                </div>
               </div>
               <div class="text" :class="{ gray: item.isRead == '1' }">
                 <rich-text style="white-space: pre-wrap" :nodes="item.context"></rich-text>
                 <span
                   v-if="item.link && item.msgType == 3"
-                  class="account-news-file"
+                  class="notice-list-file"
                   @click="onNoticeView(item.link)"
                 >
                   查看附件
@@ -78,10 +85,12 @@ const props = withDefaults(
   defineProps<{
     app: string
     userId: string
+    showAppLabel?: boolean
   }>(),
   {
     app: '',
     userId: '',
+    showAppLabel: false,
   }
 )
 
@@ -159,6 +168,8 @@ function onNoticeView(link) {
   emits('view', link)
 }
 
+const appMap = { aiapprove: 'AI审批', corporateStar: '企明星' }
+
 // 父组件事件
 const emits = defineEmits(['view'])
 </script>
@@ -241,6 +252,12 @@ const emits = defineEmits(['view'])
               margin-bottom: 4px;
             }
           }
+          .notice-list-label {
+            opacity: 1;
+          }
+          .notice-list-file {
+            opacity: 1;
+          }
         }
       }
     }
@@ -265,8 +282,9 @@ const emits = defineEmits(['view'])
     }
   }
   &-file {
-    font-size: 12px;
+    font-size: 10px;
     color: #017fff;
+    opacity: 0.5;
   }
   .cue-text {
     font-size: 13px;
@@ -274,5 +292,18 @@ const emits = defineEmits(['view'])
     padding: 30px 0 calc(30px + env(safe-area-inset-bottom, 0px));
     text-align: center;
   }
+  &-label {
+    border: 1px solid #caa264;
+    color: #caa264;
+    border-radius: 1px;
+    font-size: 8px;
+    display: inline-flex;
+    justify-content: center;
+    align-items: center;
+    height: 14px;
+    padding: 0 5px;
+    margin-left: 4px;
+    opacity: 0.5;
+  }
 }
 </style>