Merge remote-tracking branch 'origin/master'

package.json

@@ -26,7 +26,7 @@
     "axios": "^1.6.8",
     "canvas-confetti": "^1.9.2",
     "crypto-js": "^4.1.1",
-    "dayjs": "^1.11.9",
+    "dayjs": "^1.11.13",
     "devui-theme": "^0.0.7",
     "dompurify": "^3.0.5",
     "js-cookie": "^3.0.5",

src/components/LoginModal/index.vue

@@ -794,10 +794,15 @@ $active-title: var(--color-CG900);
 $active-color: var(--color-CG800);
 $inactive-title: var(--color-CG500);
 $active-panel: var(--color-G800);
-iframe {
+.login-modal-l iframe {
   border: 0;
   width: 100%;
-  height: 60vh;
+  height: 400px;
+}
+.login-modal-r iframe {
+  border: 0;
+  width: 100%;
+  height: 580px;
 }
 .login-modal {
   box-sizing: border-box;

src/views/Jyh/Home/index.vue

@@ -48,13 +48,7 @@
             </div>
           </template>
         </d-input>
-        <d-dropdown-menu
-          v-model="isOpen"
-          :origin="searchInput?.$el"
-          close-scope="'blank'"
-          :offset="offset"
-          :clickOutside="closeOutside"
-        >
+        <d-dropdown-menu v-model="isOpen" :origin="searchInput?.$el" :offset="offset">
           <div class="advanced-search-menu" :style="{ width: dropdownWidth + 'px' }">
             <AdvanceSearch @submit="submit($event)" @cancel="isOpen = false" class="p-20" :layout="'vertical'">
               <template #title>
@@ -131,6 +125,7 @@ const industryOptions = ref(['通信', '军工', '金融', '能源']);
 const searchType = ref('软件');
 const searchOptions = ref(['软件']);
 const offset = ref({ mainAxis: 7, crossAxis: -10 });
+const isKeepOpen = ref(true);
 const isOpen = ref(false);
 const rotate = ref(0);
 const cateRotate = ref(0);

src/views/Jyh/PersonalCenter/Detail/InvitationNoticeList.vue

@@ -55,6 +55,7 @@ import { acceptInvite, getInviteListData } from '@/api/jyh';
 import { ref, shallowReactive } from 'vue';
 import NoData from "@/components/NoData/NoData.vue";
 import { Message } from 'vue-devui';
+import dayjs from "dayjs";
 
 const noticeTableData = ref([]);
 const pager = shallowReactive({
@@ -73,7 +74,8 @@ const queryInviteListData = async () => {
   noticeTableData.value = data.data.data.data.map(item => {
     return {
       ...item,
-      content: `尊敬的用户，您好！为更好地整合资源、协同开发，现诚邀您加入${item.name}。`
+      content: `尊敬的用户，您好！为更好地整合资源、协同开发，现诚邀您加入组织【${item.name}】。`,
+      createTime: dayjs(item.createTime).format('YYYY-MM-DD HH:mm:ss'),
     }
   });
   pager.total = data.data.data.data.length;

src/views/Jyh/PersonalCenter/OrganizationManage/OrganizationManage.vue

@@ -142,6 +142,7 @@ import {
   type UserInfoType,
 } from '@/api/organizationManage/organizationManageType';
 import {getUserInfo} from "@/api/user";
+import dayjs from "dayjs";
 
 const userInfo = shallowRef<UserInfoType>({
   username: '',
@@ -323,7 +324,9 @@ async function getMemberList() {
   try {
     const res = await getOrganizationMemberListApi({ groupId: organizationInfo.value.groupId });
     if (res.data?.code === 200) {
-      originMemberList = res.data?.data;
+      originMemberList = res.data?.data.map(item => {
+        return { ...item, createTime: dayjs(item.createTime).format('YYYY-MM-DD HH:mm:ss') };
+      });
       pager.total = originMemberList.length;
       updateFilterTableList();
     } else {