From 6562b74130689734fe0e013b9eb9ea8cb3aba2ee Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Mon, 5 May 2025 09:30:29 +0800
Subject: [PATCH] no message

---
 public/images/application/apps.svg            |  5 ++
 resources/assets/js/pages/manage.vue          | 13 ++++
 .../assets/js/pages/manage/application.vue    | 61 +++++--------------
 .../setting/components/SystemMeetingNav.vue   | 55 +++++++++++++++++
 resources/assets/sass/pages/page-apply.scss   |  4 ++
 .../public/images/application/apps.svg        |  5 ++
 6 files changed, 97 insertions(+), 46 deletions(-)
 create mode 100644 public/images/application/apps.svg
 create mode 100644 resources/assets/js/pages/manage/setting/components/SystemMeetingNav.vue
 create mode 100644 resources/assets/statics/public/images/application/apps.svg

diff --git a/public/images/application/apps.svg b/public/images/application/apps.svg
new file mode 100644
index 000000000..ce39d80be
--- /dev/null
+++ b/public/images/application/apps.svg
@@ -0,0 +1,5 @@
+<svg width="49" height="48" viewBox="0 0 49 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M36.6001 48H12.6001C6.0001 48 0.600098 42.6 0.600098 36V12C0.600098 5.4 6.0001 0 12.6001 0H36.6001C43.2001 0 48.6001 5.4 48.6001 12V36C48.6001 42.6 43.2001 48 36.6001 48Z" fill="#72A1F7"/>
+<path d="M28.6001 20.75C28.1901 20.75 27.8501 20.41 27.8501 20V16.5C27.8501 15.42 27.1801 14.75 26.1001 14.75H23.1001C22.0201 14.75 21.3501 15.42 21.3501 16.5V20C21.3501 20.41 21.0101 20.75 20.6001 20.75C20.1901 20.75 19.8501 20.41 19.8501 20V16.5C19.8501 14.59 21.1901 13.25 23.1001 13.25H26.1001C28.0101 13.25 29.3501 14.59 29.3501 16.5V20C29.3501 20.41 29.0101 20.75 28.6001 20.75Z" fill="white"/>
+<path d="M20.6001 29.78C20.1901 29.78 19.8501 29.44 19.8501 29.03C19.8501 28.61 20.1901 28.28 20.6001 28.28H32.3601C32.6601 28.28 32.8901 28.02 32.8601 27.72L32.1801 22.03C31.9401 20.09 31.6001 18.5 28.2001 18.5H21.0001C17.6001 18.5 17.2601 20.09 17.0301 22.03L16.1301 29.53C15.8401 31.99 16.6001 34 20.1101 34H29.0901C32.2501 34 33.1801 32.37 33.1301 30.25C33.1201 29.98 32.9001 29.78 32.6301 29.78H20.6001Z" fill="white"/>
+</svg>
diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue
index 59387ca65..ede342c02 100644
--- a/resources/assets/js/pages/manage.vue
+++ b/resources/assets/js/pages/manage.vue
@@ -351,6 +351,14 @@
         <DrawerOverlay v-model="approveDetailsShow" placement="right" :size="600">
             <ApproveDetails v-if="approveDetailsShow" :data="approveDetails" @onBack="approveDetailsShow=false"/>
         </DrawerOverlay>
+
+        <!--应用商店-->
+        <DrawerOverlay
+            v-model="appsShow"
+            placement="right"
+            :size="1200">
+
+        </DrawerOverlay>
     </div>
 </template>
 
@@ -457,6 +465,8 @@ export default {
 
             approveDetails: {id: 0},
             approveDetailsShow: false,
+
+            appsShow: false,
         }
     },
 
@@ -1219,6 +1229,9 @@ export default {
                 case 'workReport':
                     this.settingRoute(act)
                     break;
+                case 'apps':
+                    this.appsShow = true
+                    break;
             }
         },
 
diff --git a/resources/assets/js/pages/manage/application.vue b/resources/assets/js/pages/manage/application.vue
index f68453164..216b04d72 100644
--- a/resources/assets/js/pages/manage/application.vue
+++ b/resources/assets/js/pages/manage/application.vue
@@ -195,36 +195,7 @@
                     <p @click="meetingSettingShow = true" v-if="userIsAdmin">{{ $L('会议设置') }}</p>
                 </div>
                 <div class="ivu-modal-wrap-apply-body full-body">
-                    <ul class="ivu-modal-wrap-ul">
-                        <li>
-                            <div class="modal-item-img">
-                                <div class="apply-icon no-dark-content meeting"></div>
-                            </div>
-                            <div class="modal-item-info">
-                                <div class="modal-item-name">
-                                    <h4>{{ $L('新会议') }}</h4>
-                                </div>
-                                <p class="modal-item-desc" @click="openDetail(meetingDescs.add)"> {{ meetingDescs.add }} </p>
-                                <div class="modal-item-btns">
-                                    <Button @click="onMeeting('createMeeting')">{{ $L('新建会议') }}</Button>
-                                </div>
-                            </div>
-                        </li>
-                        <li>
-                            <div class="modal-item-img">
-                                <div class="apply-icon no-dark-content meeting-join"></div>
-                            </div>
-                            <div class="modal-item-info">
-                                <div class="modal-item-name">
-                                    <h4>{{ $L('加入会议') }}</h4>
-                                </div>
-                                <p class="modal-item-desc" @click="openDetail(meetingDescs.join)">{{ meetingDescs.join }}</p>
-                                <div class="modal-item-btns">
-                                    <Button @click="onMeeting('joinMeeting')">{{ $L('加入会议') }}</Button>
-                                </div>
-                            </div>
-                        </li>
-                    </ul>
+                    <SystemMeetingNav @openDetail="openDetail" @onMeeting="onMeeting"/>
                 </div>
             </div>
         </DrawerOverlay>
@@ -266,7 +237,7 @@
             </div>
         </DrawerOverlay>
 
-        <!--app推送-->
+        <!--App 推送-->
         <DrawerOverlay v-model="appPushShow" placement="right" :size="700">
             <div v-if="appPushShow" class="ivu-modal-wrap-apply">
                 <div class="ivu-modal-wrap-apply-title">
@@ -278,7 +249,7 @@
             </div>
         </DrawerOverlay>
 
-        <!-- 扫码登录 -->
+        <!--扫码登录-->
         <Modal
             v-model="scanLoginShow"
             :title="$L('扫码登录')"
@@ -293,7 +264,7 @@
             </div>
         </Modal>
 
-        <!-- 发起群投票、接龙 -->
+        <!--发起群投票、接龙-->
         <UserSelect
             ref="wordChainAndVoteRef"
             v-model="sendData"
@@ -316,6 +287,7 @@ import SystemAibot from "./setting/components/SystemAibot";
 import SystemCheckin from "./setting/components/SystemCheckin";
 import Checkin from "./setting/checkin";
 import SystemMeeting from "./setting/components/SystemMeeting";
+import SystemMeetingNav from "./setting/components/SystemMeetingNav.vue";
 import SystemThirdAccess from "./setting/components/SystemThirdAccess";
 import SystemEmailSetting from "./setting/components/SystemEmailSetting";
 import SystemAppPush from "./setting/components/SystemAppPush";
@@ -332,6 +304,7 @@ export default {
         SystemCheckin,
         Checkin,
         SystemMeeting,
+        SystemMeetingNav,
         SystemThirdAccess,
         SystemEmailSetting,
         SystemAppPush
@@ -359,10 +332,6 @@ export default {
             //
             meetingShow: false,
             meetingSettingShow: false,
-            meetingDescs: {
-                add: this.$L('创建一个全新的会议视频会议，与会者可以在实时中进行面对面的视听交流。') + this.$L('通过视频会议平台，参与者可以分享屏幕、共享文档，并与其他与会人员进行讨论和协。'),
-                join: this.$L('加入视频会议，参与已经创建的会议，在会议过程中与其他参会人员进行远程实时视听交流和协作。'),
-            },
             //
             ldapShow: false,
             //
@@ -404,7 +373,7 @@ export default {
     },
     methods: {
         initList() {
-            let applyList = [
+            const applyList = [
                 { value: "approve", label: "审批中心", sort: 30 },
                 { value: "okr", label: "OKR 管理", sort: 40 },
                 { value: "report", label: "工作报告", sort: 50 },
@@ -419,6 +388,7 @@ export default {
                 { value: "addTask", label: "添加任务", sort: 120 },
                 { value: "scan", label: "扫一扫", sort: 130, show: $A.isEEUiApp },
                 { value: "setting", label: "设置", sort: 140 },
+                { value: "apps", label: "应用商店", sort: 999 },
             ];
             // 竖屏模式
             if (this.windowPortrait) {
@@ -428,12 +398,10 @@ export default {
                 ])
             }
             // 管理员
-            const adminApplyList = [];
-            if (!this.userIsAdmin) {
-                if (this.userInfo.department_owner) {
-                    adminApplyList.push({ value: "okrAnalyze", label: "OKR 结果", sort: 150 })
-                }
-            } else {
+            const adminApplyList = [
+                { value: "okrAnalyze", label: "OKR 结果", sort: 150, show: this.userIsAdmin || this.userInfo.department_owner }
+            ];
+            if (this.userIsAdmin) {
                 adminApplyList.push(...[
                     { value: "okrAnalyze", label: "OKR 结果", sort: 150 },
                     { value: "ldap", label: "LDAP", sort: 160 },
@@ -521,13 +489,14 @@ export default {
                     break;
                 case 'scan':
                     $A.eeuiAppScan(this.scanResult);
-                    return;
+                    break;
                 case 'word-chain':
                 case 'vote':
                     this.sendData = [];
                     this.sendType = item.value;
                     this.$refs.wordChainAndVoteRef.onSelection()
-                    return;
+                    break;
+
             }
             this.$emit("on-click", item.value)
         },
diff --git a/resources/assets/js/pages/manage/setting/components/SystemMeetingNav.vue b/resources/assets/js/pages/manage/setting/components/SystemMeetingNav.vue
new file mode 100644
index 000000000..1dc62ce25
--- /dev/null
+++ b/resources/assets/js/pages/manage/setting/components/SystemMeetingNav.vue
@@ -0,0 +1,55 @@
+<template>
+    <ul class="ivu-modal-wrap-ul">
+        <li>
+            <div class="modal-item-img">
+                <div class="apply-icon no-dark-content meeting"></div>
+            </div>
+            <div class="modal-item-info">
+                <div class="modal-item-name">
+                    <h4>{{ $L('新会议') }}</h4>
+                </div>
+                <p class="modal-item-desc" @click="openDetail(meetingDescs.add)"> {{ meetingDescs.add }} </p>
+                <div class="modal-item-btns">
+                    <Button @click="onMeeting('createMeeting')">{{ $L('新建会议') }}</Button>
+                </div>
+            </div>
+        </li>
+        <li>
+            <div class="modal-item-img">
+                <div class="apply-icon no-dark-content meeting-join"></div>
+            </div>
+            <div class="modal-item-info">
+                <div class="modal-item-name">
+                    <h4>{{ $L('加入会议') }}</h4>
+                </div>
+                <p class="modal-item-desc" @click="openDetail(meetingDescs.join)">{{ meetingDescs.join }}</p>
+                <div class="modal-item-btns">
+                    <Button @click="onMeeting('joinMeeting')">{{ $L('加入会议') }}</Button>
+                </div>
+            </div>
+        </li>
+    </ul>
+</template>
+
+<script>
+export default {
+    name: "SystemMeetingNav",
+    data() {
+        return {
+            meetingDescs: {
+                add: this.$L('创建一个全新的会议视频会议，与会者可以在实时中进行面对面的视听交流。') + this.$L('通过视频会议平台，参与者可以分享屏幕、共享文档，并与其他与会人员进行讨论和协。'),
+                join: this.$L('加入视频会议，参与已经创建的会议，在会议过程中与其他参会人员进行远程实时视听交流和协作。'),
+            },
+        }
+    },
+
+    methods: {
+        openDetail(desc){
+            this.$emit("openDetail", desc);
+        },
+        onMeeting(name) {
+            this.$emit("onMeeting", name);
+        },
+    }
+}
+</script>
diff --git a/resources/assets/sass/pages/page-apply.scss b/resources/assets/sass/pages/page-apply.scss
index 382eaaf8d..500c3bd26 100644
--- a/resources/assets/sass/pages/page-apply.scss
+++ b/resources/assets/sass/pages/page-apply.scss
@@ -238,6 +238,10 @@
     &.word-chain {
         background-image: url("../images/application/word-chain.svg");
     }
+
+    &.apps {
+        background-image: url("../images/application/apps.svg");
+    }
 }
 
 .ivu-modal-wrap-apply {
diff --git a/resources/assets/statics/public/images/application/apps.svg b/resources/assets/statics/public/images/application/apps.svg
new file mode 100644
index 000000000..ce39d80be
--- /dev/null
+++ b/resources/assets/statics/public/images/application/apps.svg
@@ -0,0 +1,5 @@
+<svg width="49" height="48" viewBox="0 0 49 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M36.6001 48H12.6001C6.0001 48 0.600098 42.6 0.600098 36V12C0.600098 5.4 6.0001 0 12.6001 0H36.6001C43.2001 0 48.6001 5.4 48.6001 12V36C48.6001 42.6 43.2001 48 36.6001 48Z" fill="#72A1F7"/>
+<path d="M28.6001 20.75C28.1901 20.75 27.8501 20.41 27.8501 20V16.5C27.8501 15.42 27.1801 14.75 26.1001 14.75H23.1001C22.0201 14.75 21.3501 15.42 21.3501 16.5V20C21.3501 20.41 21.0101 20.75 20.6001 20.75C20.1901 20.75 19.8501 20.41 19.8501 20V16.5C19.8501 14.59 21.1901 13.25 23.1001 13.25H26.1001C28.0101 13.25 29.3501 14.59 29.3501 16.5V20C29.3501 20.41 29.0101 20.75 28.6001 20.75Z" fill="white"/>
+<path d="M20.6001 29.78C20.1901 29.78 19.8501 29.44 19.8501 29.03C19.8501 28.61 20.1901 28.28 20.6001 28.28H32.3601C32.6601 28.28 32.8901 28.02 32.8601 27.72L32.1801 22.03C31.9401 20.09 31.6001 18.5 28.2001 18.5H21.0001C17.6001 18.5 17.2601 20.09 17.0301 22.03L16.1301 29.53C15.8401 31.99 16.6001 34 20.1101 34H29.0901C32.2501 34 33.1801 32.37 33.1301 30.25C33.1201 29.98 32.9001 29.78 32.6301 29.78H20.6001Z" fill="white"/>
+</svg>