添加霸屏退出弹框

src/manifest.json

@@ -1,46 +1,46 @@
 {
-    "name": "综合智慧云",
-    "appid": "__UNI__36DE3A0",
-    "description": "综合智慧云APP，是一款助力于企业数字化的应用平台，帮助企业提升办公效率，实现组织数字化和业务数字化。",
-    "versionName": "2.1.9",
-    "versionCode": 19,
-    "transformPx": false,
-    "app-plus": {
-        "compatible": {
-            "ignoreVersion": true
+    "name" : "智能巡更",
+    "appid" : "__UNI__BF1A1F0",
+    "description" : "智能巡更app，是一款用于监督和记录巡逻人员按照预定路线和时间进行巡逻的系统。",
+    "versionName" : "2.2.1",
+    "versionCode" : 21,
+    "transformPx" : false,
+    "app-plus" : {
+        "compatible" : {
+            "ignoreVersion" : true
         },
-        "kernel": {
-            "ios": "WKWebview"
+        "kernel" : {
+            "ios" : "WKWebview"
         },
-        "usingComponents": true,
-        "nvueStyleCompiler": "uni-app",
-        "compilerVersion": 3,
-        "splashscreen": {
-            "alwaysShowBeforeRender": true,
-            "waiting": true,
-            "autoclose": true,
-            "delay": 0
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
         },
-        "screenOrientation": [
+        "screenOrientation" : [
             "portrait-primary",
             "portrait-secondary",
             "landscape-primary",
             "landscape-secondary"
         ],
-        "modules": {
-            "VideoPlayer": {},
-            "iBeacon": {},
-            "Geolocation": {},
-            "Maps": {},
-            "Barcode": {},
-            "Fingerprint": {},
-            "Push": {},
-            "Camera": {},
-            "LivePusher": {}
+        "modules" : {
+            "VideoPlayer" : {},
+            "iBeacon" : {},
+            "Geolocation" : {},
+            "Maps" : {},
+            "Barcode" : {},
+            "Fingerprint" : {},
+            "Push" : {},
+            "Camera" : {},
+            "LivePusher" : {}
         },
-        "distribute": {
-            "android": {
-                "permissions": [
+        "distribute" : {
+            "android" : {
+                "permissions" : [
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
@@ -80,165 +80,156 @@
                     "<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
                     "<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>"
                 ],
-                "minSdkVersion": "",
-                "abiFilters": [
-                    "armeabi-v7a",
-                    "arm64-v8a"
-                ],
-                "targetSdkVersion": 30
+                "minSdkVersion" : "",
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ],
+                "targetSdkVersion" : 30
             },
-            "ios": {
-                "dSYMs": false,
-                "privacyDescription": {
-                    "NSPhotoLibraryUsageDescription": "该应用需要读取你的相册，用于上传头像",
-                    "NSPhotoLibraryAddUsageDescription": "该应用需要读取你的相册，用于拍照保存图片",
-                    "NSCameraUsageDescription": "该应用需要你的相机，用于你拍摄上传头像信息",
-                    "NSMicrophoneUsageDescription": "该应用需要使用你的麦克风，用于语音播放",
-                    "NSLocationWhenInUseUsageDescription": "该应用需要你的地理位置，用于天气、签到等功能",
-                    "NSLocationAlwaysUsageDescription": "该应用需要持续获取用户地理位置，用于天气、签到等功能",
-                    "NSLocationAlwaysAndWhenInUseUsageDescription": "该应用需要你的地理位置，用于天气、签到等功能",
-                    "NSCalendarsUsageDescription": "该应用需要获取你的日历，以便更好的体验",
-                    "NSContactsUsageDescription": "该应用需要读取你的通讯录，以便联系同事",
-                    "NSBluetoothPeripheralUsageDescription": "该应用需要你的蓝牙，以便读取相关蓝牙设备",
-                    "NFCReaderUsageDescription": "",
-                    "NSBluetoothAlwaysUsageDescription": "该应用需要你的蓝牙，以便读取相关蓝牙设备"
+            "ios" : {
+                "dSYMs" : false,
+                "privacyDescription" : {
+                    "NSPhotoLibraryUsageDescription" : "该应用需要读取你的相册，用于上传头像",
+                    "NSPhotoLibraryAddUsageDescription" : "该应用需要读取你的相册，用于拍照保存图片",
+                    "NSCameraUsageDescription" : "该应用需要你的相机，用于你拍摄上传头像信息",
+                    "NSMicrophoneUsageDescription" : "该应用需要使用你的麦克风，用于语音播放",
+                    "NSLocationWhenInUseUsageDescription" : "该应用需要你的地理位置，用于天气、签到等功能",
+                    "NSLocationAlwaysUsageDescription" : "该应用需要持续获取用户地理位置，用于天气、签到等功能",
+                    "NSLocationAlwaysAndWhenInUseUsageDescription" : "该应用需要你的地理位置，用于天气、签到等功能",
+                    "NSCalendarsUsageDescription" : "该应用需要获取你的日历，以便更好的体验",
+                    "NSContactsUsageDescription" : "该应用需要读取你的通讯录，以便联系同事",
+                    "NSBluetoothPeripheralUsageDescription" : "该应用需要你的蓝牙，以便读取相关蓝牙设备",
+                    "NFCReaderUsageDescription" : "",
+                    "NSBluetoothAlwaysUsageDescription" : "该应用需要你的蓝牙，以便读取相关蓝牙设备"
                 },
-                "UIBackgroundModes": ""
+                "UIBackgroundModes" : ""
             },
-            "sdkConfigs": {
-                "ad": {},
-                "maps": {
-                    "amap": {
-                        "appkey_ios": "fb35d03fbb17cbf7a8743a522da3c7fc",
-                        "appkey_android": "ffc71dfd4e576596027f8f45a1b8fb2f",
-                        "name": "amapBOujshtbA"
+            "sdkConfigs" : {
+                "ad" : {},
+                "maps" : {
+                    "amap" : {
+                        "appkey_ios" : "fb35d03fbb17cbf7a8743a522da3c7fc",
+                        "appkey_android" : "ffc71dfd4e576596027f8f45a1b8fb2f",
+                        "name" : "amapBOujshtbA"
                     }
                 },
-                "geolocation": {
-                    "system": {
-                        "__platform__": [
-                            "ios",
-                            "android"
-                        ]
+                "geolocation" : {
+                    "system" : {
+                        "__platform__" : [ "ios", "android" ]
                     },
-                    "amap": {
-                        "__platform__": [
-                            "ios",
-                            "android"
-                        ],
-                        "appkey_ios": "fb35d03fbb17cbf7a8743a522da3c7fc",
-                        "appkey_android": "ffc71dfd4e576596027f8f45a1b8fb2f",
-                        "name": "amapBOujshtbA"
+                    "amap" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appkey_ios" : "fb35d03fbb17cbf7a8743a522da3c7fc",
+                        "appkey_android" : "ffc71dfd4e576596027f8f45a1b8fb2f",
+                        "name" : "amapBOujshtbA"
                     }
                 },
-                "push": {
-                    "unipush": {
-                        "version": "2",
-                        "offline": true,
-                        "icons": {
-                            "small": {
-                                "hdpi": "unpackage/res/push/36x36.png",
-                                "ldpi": "unpackage/res/push/18x18.png",
-                                "mdpi": "unpackage/res/push/24x24.png",
-                                "xhdpi": "unpackage/res/push/48x48.png",
-                                "xxhdpi": "unpackage/res/push/72x72.png"
+                "push" : {
+                    "unipush" : {
+                        "version" : "2",
+                        "offline" : true,
+                        "icons" : {
+                            "small" : {
+                                "hdpi" : "unpackage/res/push/36x36.png",
+                                "ldpi" : "unpackage/res/push/18x18.png",
+                                "mdpi" : "unpackage/res/push/24x24.png",
+                                "xhdpi" : "unpackage/res/push/48x48.png",
+                                "xxhdpi" : "unpackage/res/push/72x72.png"
                             }
                         }
                     }
                 }
             },
-            "icons": {
-                "android": {
-                    "hdpi": "unpackage/res/icons/72x72.png",
-                    "xhdpi": "unpackage/res/icons/96x96.png",
-                    "xxhdpi": "unpackage/res/icons/144x144.png",
-                    "xxxhdpi": "unpackage/res/icons/192x192.png"
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
                 },
-                "ios": {
-                    "appstore": "unpackage/res/icons/1024x1024.png",
-                    "ipad": {
-                        "app": "unpackage/res/icons/76x76.png",
-                        "app@2x": "unpackage/res/icons/152x152.png",
-                        "notification": "unpackage/res/icons/20x20.png",
-                        "notification@2x": "unpackage/res/icons/40x40.png",
-                        "proapp@2x": "unpackage/res/icons/167x167.png",
-                        "settings": "unpackage/res/icons/29x29.png",
-                        "settings@2x": "unpackage/res/icons/58x58.png",
-                        "spotlight": "unpackage/res/icons/40x40.png",
-                        "spotlight@2x": "unpackage/res/icons/80x80.png"
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
                     },
-                    "iphone": {
-                        "app@2x": "unpackage/res/icons/120x120.png",
-                        "app@3x": "unpackage/res/icons/180x180.png",
-                        "notification@2x": "unpackage/res/icons/40x40.png",
-                        "notification@3x": "unpackage/res/icons/60x60.png",
-                        "settings@2x": "unpackage/res/icons/58x58.png",
-                        "settings@3x": "unpackage/res/icons/87x87.png",
-                        "spotlight@2x": "unpackage/res/icons/80x80.png",
-                        "spotlight@3x": "unpackage/res/icons/120x120.png"
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
                     }
                 }
             },
-            "splashscreen": {
-                "androidStyle": "default",
-                "android": {
-                    "hdpi": "src/static/images/wt/bg.png"
+            "splashscreen" : {
+                "androidStyle" : "default",
+                "android" : {
+                    "hdpi" : "src/static/images/wt/bg.png"
                 },
-                "iosStyle": "common"
+                "iosStyle" : "common"
             }
         },
-        "nativePlugins": {},
-        "safearea": {
-            "offset": "none"
+        "nativePlugins" : {},
+        "safearea" : {
+            "offset" : "none"
         }
     },
-    "quickapp": {},
-    "mp-weixin": {
-        "appid": "",
-        "setting": {
-            "urlCheck": false,
-            "checkSiteMap": false
+    "quickapp" : {},
+    "mp-weixin" : {
+        "appid" : "",
+        "setting" : {
+            "urlCheck" : false,
+            "checkSiteMap" : false
         },
-        "usingComponents": true
+        "usingComponents" : true
     },
-    "mp-alipay": {
-        "usingComponents": true
+    "mp-alipay" : {
+        "usingComponents" : true
     },
-    "mp-baidu": {
-        "usingComponents": true
+    "mp-baidu" : {
+        "usingComponents" : true
     },
-    "mp-toutiao": {
-        "usingComponents": true
+    "mp-toutiao" : {
+        "usingComponents" : true
     },
-    "uniStatistics": {
-        "enable": false
+    "uniStatistics" : {
+        "enable" : false
     },
-    "h5": {
-        "publicPath": "./",
-        "title": "综合智慧云",
-        "router": {
-            "mode": "hash"
+    "h5" : {
+        "publicPath" : "./",
+        "title" : "智能巡更",
+        "router" : {
+            "mode" : "hash"
         },
-        "devServer": {
-            "https": false,
-            "proxy": {}
+        "devServer" : {
+            "https" : false,
+            "proxy" : {}
         },
-        "sdkConfigs": {
-            "maps": {
-                "amap": {
-                    "key": "d4d73a7d572b6ff6028d5f67de62029a",
-                    "securityJsCode": "be916fcd16d0b33d228c49f0ff096b17",
-                    "serviceHost": ""
+        "sdkConfigs" : {
+            "maps" : {
+                "amap" : {
+                    "key" : "d4d73a7d572b6ff6028d5f67de62029a",
+                    "securityJsCode" : "be916fcd16d0b33d228c49f0ff096b17",
+                    "serviceHost" : ""
                 }
             }
         },
-        "optimization": {
-            "treeShaking": {
-                "enable": true
+        "optimization" : {
+            "treeShaking" : {
+                "enable" : true
             }
         },
-        "template": "index.html"
+        "template" : "index.html"
     },
-    "vueVersion": "3",
-    "locale": "zh-Hans"
-}
+    "vueVersion" : "3",
+    "locale" : "zh-Hans"
+}

src/pages/login.vue

@@ -11,8 +11,8 @@
       <view class="middle-content">
         <text class="title" :style="{ color: useStore.loginBg ? '#FFFFFF' : '#000000' }">请登录</text>
         <!-- #ifdef APP-PLUS || MP-WEIXIN -->
-        <view class="prompt" v-if="!linkUrl">首次账号登录请先配置服务器</view>
-        <view class="setting" @tap="goSeverConfig"> 配置服务器 </view>
+        <!-- <view class="prompt" v-if="!linkUrl">首次账号登录请先配置服务器</view>
+        <view class="setting" @tap="goSeverConfig"> 配置服务器 </view> -->
         <!--#endif-->
       </view>
 
@@ -74,7 +74,7 @@
     </view>
   </u-modal>
 
-  <u-modal
+  <!-- <u-modal
     :show="xunJianStore.modal.show"
     title="提醒"
     :zoom="false"
@@ -90,7 +90,7 @@
         <u-input v-model="xunJianStore.modal.exitPassword" placeholder="霸屏退出密码（必填）" border="bottom" style="padding: 6px 0px" />
       </view>
     </view>
-  </u-modal>
+  </u-modal> -->
 </template>
 
 <script setup>
@@ -193,8 +193,8 @@ function init() {
     // linkUrl.value = "localhost:81";
     useStore.GetMobileTenantConfig({ url: linkUrl.value });
   } else {
-    uni.setStorageSync("serveUrl", "manager.usky.cn");
-    commonStore.setServeList("manager.usky.cn", "");
+    uni.setStorageSync("serveUrl", "xf.usky.cn:13212");
+    commonStore.setServeList("xf.usky.cn:13212", "");
     linkUrl.value = uni.getStorageSync("serveUrl");
     // linkUrl.value = "localhost:81";
     useStore.GetMobileTenantConfig({ url: linkUrl.value });

src/plugins/keyListen.plugins.js

@@ -21,7 +21,22 @@ export default {
                 // main.unregisterReceiver(receiver); //同时停止接收home和recent点击
                 const pages = getCurrentPages(); // 获取当前页面栈
                 const currentPage = pages[pages.length - 1]; // 最后一个元素即为当前页面
-                xunJianStores().modal.show = currentPage.route === 'pages/login' ? true : false
+                // xunJianStores().modal.show = currentPage.route === 'pages/login' ? true : false
+                // xunJianStores().modal.show = true
+                uni.showModal({
+                    title:"提示",
+                    editable:true,
+                    placeholderText:"请输入霸屏退出密码",
+                    success(res) {
+                        if (res.confirm) {
+                            console.log(res)
+                            xunJianStores().modal.exitPassword = res.content
+                            xunJianStores().modalConfirm()
+                        } else if (res.cancel) {
+                            console.log('用户点击了取消');
+                        }
+                    }
+                })
                 console.log('监听返回')
                 e.preventDefault();
             });

unpackage/config/setting.js

@@ -20,8 +20,8 @@ filesToModify.forEach((file) => {
                 state.name = '智能巡更'
                 state.appid = '__UNI__BF1A1F0'
                 state.description = '智能巡更app，是一款用于监督和记录巡逻人员按照预定路线和时间进行巡逻的系统。'
-                state.versionName = "2.2.0"
-                state.versionCode = 20
+                state.versionName = "2.2.1"
+                state.versionCode = 21
                 state.h5.title = '智能巡更'
             } else if (args === 'huiYi') {
                 state.name = '智能会议'