From 304b22b1c18dfc086ba949c8a8b41bf40d579d53 Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Thu, 14 Sep 2023 18:15:40 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=89=AB=E4=B8=80=E6=89=AB?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/assets/js/pages/manage/application.vue | 14 +++++++++-----
 resources/assets/js/pages/manage/calendar.vue    |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/resources/assets/js/pages/manage/application.vue b/resources/assets/js/pages/manage/application.vue
index 08eedabf0..e47c8ba45 100644
--- a/resources/assets/js/pages/manage/application.vue
+++ b/resources/assets/js/pages/manage/application.vue
@@ -98,12 +98,12 @@
             <div class="ivu-modal-wrap-apply">
                 <div class="ivu-modal-wrap-apply-title">
                     {{ $L('签到管理') }}
-                    <p @click="signType = signType == 1 ? 2 : 1" v-if="userIsAdmin">
-                        {{ signType == 1 ? $L('系统设置') : $L('返回') }}
+                    <p @click="signInType = signInType == 1 ? 2 : 1" v-if="userIsAdmin">
+                        {{ signInType == 1 ? $L('系统设置') : $L('返回') }}
                     </p>
                 </div>
                 <div class="ivu-modal-wrap-apply-body">
-                    <Checkin v-if="signType == 1" />
+                    <Checkin v-if="signInType == 1" />
                     <SystemCheckin v-else />
                 </div>
             </div>
@@ -259,7 +259,7 @@ export default {
             aibotDialogSearchLoad: "",
             // 
             signInShow: false,
-            signType: 1,
+            signInType: 1,
             // 
             meetingShow: false,
             meetingType: 1,
@@ -308,7 +308,11 @@ export default {
                 { value: "meeting", label: "会议" }
             ];
             // wap模式
-            let appApplyList = this.windowOrientation != 'portrait' ? [] : [
+            let appApplyList = this.windowOrientation != 'portrait' ? (
+                    $A.isEEUiApp ? [
+                        { value: "scan", label: "扫一扫" }
+                    ] : []
+                ) : [
                 { value: "calendar", label: "日历" },
                 { value: "file", label: "文件" },
                 { value: "addProject", label: "创建项目" },
diff --git a/resources/assets/js/pages/manage/calendar.vue b/resources/assets/js/pages/manage/calendar.vue
index 5cb6533e4..b0c2ba2b7 100644
--- a/resources/assets/js/pages/manage/calendar.vue
+++ b/resources/assets/js/pages/manage/calendar.vue
@@ -4,7 +4,7 @@
         <div class="calendar-head">
             <div class="calendar-titbox">
                 <div class="calendar-title">
-                    <div class="common-nav-back portrait" @click="goBack()"><i class="taskfont">&#xe676;</i></div>
+                    <div class="common-nav-back portrait" @click="goForward({name: 'manage-application'},true)"><i class="taskfont">&#xe676;</i></div>
                     <h1>{{rangeText}}</h1>
                 </div>
                 <ButtonGroup class="calendar-arrow" size="small">