no message

resources/assets/js/pages/manage.vue

@@ -349,7 +349,7 @@
         </transition>
 
         <!--审批中心-->
-        <DrawerOverlay v-model="approveShow" placement="right" :size="1380">
+        <DrawerOverlay v-model="approveShow" placement="right" :size="1380" class="approve-drawer">
             <Approve v-if="approveShow" @on-close="approveShow=false"/>
         </DrawerOverlay>
 

resources/assets/js/pages/manage/application.vue

@@ -15,7 +15,25 @@
                         {{ t == 'base' ? $L('常用') : $L('管理员') }}
                     </div>
                     <Row :gutter="16">
-                        <Col v-for="(item, key) in (t == 'base' ? filterMicroAppsMenus : filterMicroAppsMenusAdmin)" :key="`micro_` + key"
+                        <Col
+                            v-if="t == 'base'"
+                            :xs="{ span: 6 }"
+                            :sm="{ span: 6 }"
+                            :lg="{ span: 6 }"
+                            :xl="{ span: 6 }"
+                            :xxl="{ span: 3 }">
+                            <div class="apply-col">
+                                <div @click="applyClick({value: 'appstore'})">
+                                    <div class="logo">
+                                        <div class="apply-icon no-dark-content" :class="getLogoClass('appstore')"></div>
+                                    </div>
+                                    <p>{{ $L('应用商店') }}</p>
+                                </div>
+                            </div>
+                        </Col>
+                        <Col
+                            v-for="(item, key) in (t == 'base' ? filterMicroAppsMenus : filterMicroAppsMenusAdmin)"
+                            :key="`micro_` + key"
                             :xs="{ span: 6 }"
                             :sm="{ span: 6 }"
                             :lg="{ span: 6 }"
@@ -30,7 +48,9 @@
                                 </div>
                             </div>
                         </Col>
-                        <Col v-for="(item, key) in applyList" :key="key"
+                        <Col
+                            v-for="(item, key) in applyList"
+                            :key="key"
                             v-if="((t=='base' && !item.type) || item.type == t) && item.show !== false"
                             :xs="{ span: 6 }"
                             :sm="{ span: 6 }"
@@ -395,14 +415,13 @@ export default {
                 {value: "addProject", label: "创建项目", sort: 110},
                 {value: "addTask", label: "添加任务", sort: 120},
                 {value: "scan", label: "扫一扫", sort: 130, show: $A.isEEUIApp},
-                { value: "setting", label: "设置", sort: 140 },
-                { value: "appstore", label: "应用商店", sort: 999 },
             ]
             // 竖屏模式
             if (this.windowPortrait) {
                 list.push(...[
                     {value: "calendar", label: "日历", sort: 10},
                     {value: "file", label: "文件", sort: 20},
+                    {value: "setting", label: "设置", sort: 140},
                 ])
             }
             // 管理员

resources/assets/js/pages/manage/approve/index.vue

@@ -4,7 +4,7 @@
         <div class="approve-wrapper" ref="fileWrapper">
             <div class="approve-head">
                 <div class="approve-nav">
-                    <div class="common-nav-back" @click="goBack()"><i class="taskfont">&#xe676;</i></div>
+                    <div class="common-nav-back" @click="onBack"><i class="taskfont">&#xe676;</i></div>
                     <h1>{{$L('审批中心')}}</h1>
                 </div>
 
@@ -395,6 +395,14 @@ export default {
             this.isShowIcon = this.windowWidth < 515
         },
 
+        onBack() {
+            if (this.$listeners['on-close']) {
+                this.$emit('on-close')
+            } else {
+                this.goBack()
+            }
+        },
+
         // 收到websocket消息
         onWebsocketMsg(info) {
             const {type, action, mode, data} = info;

resources/assets/js/pages/manage/components/ChatInput/emoji.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="chat-emoji-wrapper">
+    <div class="chat-emoji-wrapper" @click.stop>
         <div class="chat-emoji-box">
             <div v-if="type === 'emosearch'" class="chat-emoji-emosearch">
                 <Input clearable v-model="emosearchKey" :placeholder="$L('搜索表情')">

resources/assets/sass/pages/page-approve.scss

@@ -217,6 +217,12 @@
     }
 }
 
+.approve-drawer {
+    .ivu-modal-close {
+        display: none;
+    }
+}
+
 .approve-details {
     flex: 1 1 auto;
     display: flex;