霸屏调试完成,登录页对条款细则做了限制

src/App.vue

@@ -168,4 +168,8 @@ uni-page-refresh {
   font-size: $uni-font-size-lg;
   font-weight: bold;
 }
+.uni-page-head{
+  position: absolute;
+  z-index: 999;
+}
 </style>

src/components/baPing/index.vue

@@ -1,43 +0,0 @@
-<template>
-  <div class="homeReturn" @touchstart="handle('start')" @touchend="handle('end')" v-if="config.appInfo.appid == '__UNI__BF1A1F0'"></div>
-</template>
-<script setup>
-/*----------------------------------公共方法引入-----------------------------------*/
-import config from "@/config";
-import { xunJianStores } from "@/store/modules/index";
-import { ref } from "vue";
-const timestamp = ref(0);
-function handle(type) {
-  if (type =='start') {
-    timestamp.value = new Date().getTime();
-  }
-  if (type =='end') {
-    if(new Date().getTime() - timestamp.value >3000){
-      uni.showModal({
-        title:"提示",
-        editable:true,
-        placeholderText:"请输入霸屏退出密码",
-        success(res) {
-            if (res.confirm) {
-                xunJianStores().modal.exitPassword = res.content
-                xunJianStores().modalConfirm()
-            } else if (res.cancel) {
-                console.log('用户点击了取消');
-            }
-        }
-      })
-    }
-  }
-}
-</script>
-<style>
-.homeReturn{
-  position: fixed;
-  z-index: 1000;
-  top:4px;
-  right:80px;
-  width:50px;
-  height:50px;
-  background: red;
-}
-</style>

src/components/systemReturn/index.vue

@@ -0,0 +1,39 @@
+<template>
+  <!-- #ifdef H5 -->
+  <div class="systemReturn H5"  @click="handle()" v-if="config.appInfo.appid == '__UNI__BF1A1F0'"></div>
+  <!--#endif-->
+  <!-- #ifdef APP-PLUS || MP-WEIXIN -->
+  <div class="systemReturn APP-WEIXIN"  @click="handle()" v-if="config.appInfo.appid == '__UNI__BF1A1F0'"></div>
+  <!--#endif-->
+</template>
+<script setup>
+/*----------------------------------公共方法引入-----------------------------------*/
+import config from "@/config";
+function handle() {
+  console.log("导航栏返回")
+  const pages = getCurrentPages(); // 获取当前页面栈
+  if(pages.length>1){
+    uni.navigateBack()
+  }else{
+    console.log("首页")
+    uni.reLaunch({
+      url: "/pages/index",
+    });
+  }
+}
+</script>
+<style>
+.systemReturn{
+  position: fixed;
+  z-index: 1000000;
+  left:10px;
+  width:30px;
+  height:30px;
+}
+.H5{
+  top:8px;
+}
+.APP-WEIXIN{
+  top:30px;
+}
+</style>

src/config.js

@@ -9,8 +9,8 @@ export default {
   //#endif
 
   //#ifdef H5
-  // baseUrl: import.meta.env.MODE === "production" ? `https://${window.location.host}/prod-api` : `http://192.168.10.165:801/dev-api`,
-  baseUrl: "https://gateWay.usky.cn/prod-api",
+  baseUrl: import.meta.env.MODE === "production" ? `https://${window.location.host}/prod-api` : `http://192.168.10.165:801/dev-api`,
+  // baseUrl: "https://gateWay.usky.cn/prod-api",
   //#endif
 
   websiteUrl: "https://qhome.usky.cn",

src/main.js

@@ -21,7 +21,7 @@ import oaUpgrade from "@/components/oa-upgrade/index"
 import oaTransForm from "@/components/oa-transForm/index"
 import oaTtsAudio from "@/components/oa-ttsAudio/index"
 import oaWeather from "@/components/oa-weather/index"
-import baPing from "@/components/baPing/index"
+import systemReturn from "@/components/systemReturn/index"
 
 export function createApp() {
   const app = createSSRApp(App);
@@ -39,7 +39,7 @@ export function createApp() {
   app.component('oa-transForm', oaTransForm)
   app.component('oa-ttsAudio', oaTtsAudio)
   app.component('oa-weather', oaWeather)
-  app.component('baPing', baPing)
+  app.component('systemReturn', systemReturn)
   
 
   // 挂载全局json导出

src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "智能巡更",
     "appid" : "__UNI__BF1A1F0",
     "description" : "智能巡更app，是一款用于监督和记录巡逻人员按照预定路线和时间进行巡逻的系统。",
-    "versionName" : "2.2.0",
-    "versionCode" : 20,
+    "versionName" : "2.2.3",
+    "versionCode" : 23,
     "transformPx" : false,
     "app-plus" : {
         "compatible" : {

src/pages.json

@@ -130,14 +130,17 @@
                     "path": "appMessage/index",
                     "style": {
                         "navigationBarTitleText": "消息列表",
-                        "enablePullDownRefresh": false
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom"
                     }
                 },
                 {
                     "path": "appMessage/details",
                     "style": {
                         "navigationBarTitleText": "消息详情",
-                        "enablePullDownRefresh": false
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom"
+                       
                     }
                 },
                 {
@@ -182,26 +185,30 @@
                 {
                     "path": "info/index",
                     "style": {
-                        "navigationBarTitleText": "我的信息"
+                        "navigationBarTitleText": "我的信息",
+                        "navigationStyle": "custom"
                     }
                 },
                 {
                     "path": "msg/index",
                     "style": {
-                        "navigationBarTitleText": "消息设置"
+                        "navigationBarTitleText": "消息设置",
+                        "navigationStyle": "custom"
                     }
                 },
                 {
                     "path": "secure/index",
                     "style": {
-                        "navigationBarTitleText": "账号与安全"
+                        "navigationBarTitleText": "账号与安全",
+                        "navigationStyle": "custom"
                     }
                 },
                 {
                     "path": "secure/loginLog/index",
                     "style": {
                         "navigationBarTitleText": "登录日志",
-                        "enablePullDownRefresh": false
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom"
                     }
                 },
                 {
@@ -264,42 +271,48 @@
                     "path": "xunJian/plan/index",
                     "style": {
                         "navigationBarTitleText": "巡检计划",
-                        "enablePullDownRefresh": false
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom"
                     }
                 },
                 {
                     "path": "xunJian/plan/components/siteDetails",
                     "style": {
                         "navigationBarTitleText": "站点详情",
-                        "enablePullDownRefresh": false
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom"
                     }
                 },
                 {
                     "path": "xunJian/plan/components/content",
                     "style": {
                         "navigationBarTitleText": "巡检内容",
-                        "enablePullDownRefresh": false
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom"
                     }
                 },
                 {
                     "path": "xunJian/plan/components/report",
                     "style": {
                         "navigationBarTitleText": "巡检上报",
-                        "enablePullDownRefresh": false
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom"
                     }
                 },
                 {
                     "path": "xunJian/record/index",
                     "style": {
                         "navigationBarTitleText": "巡检记录",
-                        "enablePullDownRefresh": false
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom"
                     }
                 },
                 {
                     "path": "xunJian/record/recordDetail/index",
                     "style": {
                         "navigationBarTitleText": "巡检记录详情",
-                        "enablePullDownRefresh": false
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom"
                     }
                 },
                 {
@@ -318,7 +331,8 @@
                     "path": "xunJian/collect/components/collectDetail",
                     "style": {
                         "navigationBarTitleText": "采集上报",
-                        "enablePullDownRefresh": false
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom"
                     }
                 },
                 {
@@ -337,35 +351,40 @@
                     "path": "xunJian/error/index",
                     "style": {
                         "navigationBarTitleText": "异常上报",
-                        "enablePullDownRefresh": false
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom"
                     }
                 },
                 {
                     "path": "xunJian/error/errorList",
                     "style": {
                         "navigationBarTitleText": "异常列表",
-                        "enablePullDownRefresh": false
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom"
                     }
                 },
                 {
                     "path": "xunJian/error/errorListDetail",
                     "style": {
                         "navigationBarTitleText": "事件详情",
-                        "enablePullDownRefresh": false
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom"
                     }
                 },
                 {
                     "path": "xunJian/error/errorDisposition",
                     "style": {
                         "navigationBarTitleText": "处置内容",
-                        "enablePullDownRefresh": false
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom"
                     }
                 },
                 {
                     "path": "signIn/index",
                     "style": {
                         "navigationBarTitleText": "人员签到",
-                        "enablePullDownRefresh": false
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom"
                     }
                 }
             ]

src/pages/business/common/projectMange/record/details.vue

@@ -101,7 +101,7 @@
       </view>
     </template>
   </oa-scroll>
-  <baPing />
+  <systemReturn />
 </template>
 
 <script setup>

src/pages/business/common/projectMange/record/index.vue

@@ -179,7 +179,7 @@
     @cancel="modal.show = false"
     @close="modal.show = false"
   ></u-modal>
-  <baPing />
+  <systemReturn />
 </template>
 
 <script setup>

src/pages/business/zhaf/signIn/index.vue

@@ -1,4 +1,5 @@
 <template>
+  <uni-nav-bar :title="title" :backgroundColor="proxy.$settingStore.themeColor.color" leftIcon="left" color="#fff" fixed statusBar :border="false"></uni-nav-bar>
   <oa-scroll
     customClass="scroll-height"
     :refresherLoad="false"
@@ -28,7 +29,7 @@
       </view>
     </template>
   </oa-scroll>
-  <baPing />
+  <systemReturn />
 </template>
 
 <script setup>
@@ -40,7 +41,7 @@ const { proxy } = getCurrentInstance();
 const themeColor = computed(() => {
   return proxy.$settingStore.themeColor;
 });
-
+const title = ref("");
 const state = reactive({
   address: "", //准确位置信息
   deviceCode: uni.getSystemInfoSync().deviceId, //设备编号
@@ -122,6 +123,9 @@ onUnload(() => {
 onShow(() => {
   //调用系统主题颜色
   proxy.$settingStore.systemThemeColor([1]);
+  const pages = getCurrentPages();
+  const currentPage = pages[pages.length - 1];
+  title.value = currentPage.$page.meta.navigationBar.titleText;
 });
 </script>
 

src/pages/business/zhaf/xunJian/collect/components/collectDetail.vue

@@ -28,7 +28,7 @@
       </view>
     </template>
   </oa-scroll>
-  <baPing />
+  <systemReturn />
 </template>
 
 <script setup>

src/pages/business/zhaf/xunJian/collect/components/collectRecord.vue

@@ -47,7 +47,7 @@
       </view>
     </template>
   </oa-scroll>
-  <baPing />
+  <systemReturn />
 </template>
 
 <script setup>

src/pages/business/zhaf/xunJian/collect/index.vue

@@ -75,7 +75,7 @@
       </uni-popup>
     </template>
   </oa-scroll>
-  <baPing />
+  <systemReturn />
 </template>
 
 <script setup>

src/pages/business/zhaf/xunJian/error/errorDisposition.vue

@@ -1,4 +1,5 @@
 <template>
+  <uni-nav-bar :title="title" :backgroundColor="proxy.$settingStore.themeColor.color" leftIcon="left" color="#fff" fixed statusBar :border="false"></uni-nav-bar>
   <oa-scroll
     customClass="errorDisposition-container scroll-height"
     :refresherLoad="false"
@@ -32,7 +33,7 @@
       </view>
     </template>
   </oa-scroll>
-  <baPing />
+  <systemReturn />
 </template>
 
 <script setup>
@@ -46,6 +47,7 @@ import { errorApi } from "@/api/business/zhaf/xunJian/index.js";
 /*----------------------------------公共变量-----------------------------------*/
 const { proxy } = getCurrentInstance();
 /*----------------------------------变量声明-----------------------------------*/
+const title = ref("");
 const state = reactive({
   form: {
     eventName: "", //事件名称
@@ -108,6 +110,9 @@ onLoad((options) => {
 onShow(() => {
   //调用系统主题颜色
   proxy.$settingStore.systemThemeColor([1]);
+  const pages = getCurrentPages();
+  const currentPage = pages[pages.length - 1];
+  title.value = currentPage.$page.meta.navigationBar.titleText;
 });
 </script>
 

src/pages/business/zhaf/xunJian/error/errorList.vue

@@ -1,4 +1,5 @@
 <template>
+  <uni-nav-bar :title="title" :backgroundColor="proxy.$settingStore.themeColor.color" leftIcon="left" color="#fff" fixed statusBar :border="false"></uni-nav-bar>
   <u-sticky class="shadow-default" bgColor="#fff" style="top: 0">
     <u-tabs
       :list="state.tabsList"
@@ -39,7 +40,7 @@
       </view>
     </view>
   </oa-scroll>
-  <baPing />
+  <systemReturn />
 </template>
 <script setup>
 /*----------------------------------依赖引入-----------------------------------*/
@@ -54,6 +55,7 @@ import { errorApi } from "@/api/business/zhaf/xunJian";
 const { proxy } = getCurrentInstance();
 const { patrol_event_classify, patrol_event_grade, patrol_event_type } = proxy.useDict("patrol_event_classify", "patrol_event_grade", "patrol_event_type");
 /*----------------------------------变量声明-----------------------------------*/
+const title = ref("");
 const state = reactive({
   tabsList: [{ name: "未完成事件" }, { name: "已完成事件" }],
   tabsCurrent: 0,
@@ -125,6 +127,9 @@ onShow(() => {
   //调用系统主题颜色
   proxy.$settingStore.systemThemeColor([1]);
   init();
+  const pages = getCurrentPages();
+  const currentPage = pages[pages.length - 1];
+  title.value = currentPage.$page.meta.navigationBar.titleText;
 });
 
 // 自定义导航事件

src/pages/business/zhaf/xunJian/error/errorListDetail.vue

@@ -1,4 +1,5 @@
 <template>
+  <uni-nav-bar :title="title" :backgroundColor="proxy.$settingStore.themeColor.color" leftIcon="left" color="#fff" fixed statusBar :border="false"></uni-nav-bar>
   <oa-scroll
     customClass="invoicing-container scroll-height"
     :customStyle="{}"
@@ -127,7 +128,7 @@
       </view>
     </view>
   </oa-scroll>
-  <baPing />
+  <systemReturn />
 </template>
 <script setup>
 /*----------------------------------依赖引入-----------------------------------*/
@@ -142,6 +143,7 @@ import { errorApi } from "@/api/business/zhaf/xunJian";
 const { proxy } = getCurrentInstance();
 const { patrol_event_classify, patrol_event_grade, patrol_event_type } = proxy.useDict("patrol_event_classify", "patrol_event_grade", "patrol_event_type");
 /*----------------------------------变量声明-----------------------------------*/
+const title = ref("");
 const state = reactive({
   dataList: {},
   id: undefined,
@@ -176,6 +178,9 @@ onReady(() => {});
 onShow(() => {
   //调用系统主题颜色
   proxy.$settingStore.systemThemeColor([1]);
+  const pages = getCurrentPages();
+  const currentPage = pages[pages.length - 1];
+  title.value = currentPage.$page.meta.navigationBar.titleText;
 });
 
 // 自定义导航事件

src/pages/business/zhaf/xunJian/error/index.vue

@@ -1,4 +1,5 @@
 <template>
+  <uni-nav-bar :title="title" :backgroundColor="proxy.$settingStore.themeColor.color" leftIcon="left" color="#fff" fixed statusBar :border="false"></uni-nav-bar>
   <oa-scroll
     customClass="error-container scroll-height"
     :refresherLoad="false"
@@ -57,7 +58,7 @@
       ></u-picker>
     </template>
   </oa-scroll>
-  <baPing />
+  <systemReturn />
 </template>
 
 <script setup>
@@ -76,6 +77,7 @@ const useStore = useStores();
 const commonStore = commonStores();
 const { patrol_event_classify, patrol_event_grade, patrol_event_type } = proxy.useDict("patrol_event_classify", "patrol_event_grade", "patrol_event_type");
 /*----------------------------------变量声明-----------------------------------*/
+const title = ref("")
 const state = reactive({
   form: {
     nickName: computed(() => {
@@ -223,6 +225,9 @@ onLoad((options) => {});
 onShow(() => {
   //调用系统主题颜色
   proxy.$settingStore.systemThemeColor([1]);
+  const pages = getCurrentPages();
+  const currentPage = pages[pages.length - 1];
+  title.value = currentPage.$page.meta.navigationBar.titleText;
 });
 </script>
 

src/pages/business/zhaf/xunJian/plan/components/content.vue

@@ -86,7 +86,7 @@
       <oa-ttsAudio v-if="audioUrl" :audioUrl="audioUrl" :audioBool="true"></oa-ttsAudio>
     </template>
   </oa-scroll>
-  <baPing />
+  <systemReturn />
 </template>
 
 <script setup>

src/pages/business/zhaf/xunJian/plan/components/report.vue

@@ -69,7 +69,7 @@
       </oaMovable>
     </template>
   </oa-scroll>
-  <baPing />
+  <systemReturn />
 </template>
 
 <script setup>

src/pages/business/zhaf/xunJian/plan/components/siteDetails.vue

@@ -68,7 +68,7 @@
       </view>
     </template>
   </oa-scroll>
-  <baPing />
+  <systemReturn />
 </template>
 
 <script setup>

src/pages/business/zhaf/xunJian/plan/index.vue

@@ -1,4 +1,5 @@
 <template>
+  <uni-nav-bar :title="title" :backgroundColor="proxy.$settingStore.themeColor.color" leftIcon="left" color="#fff" fixed statusBar :border="false"></uni-nav-bar>
   <oa-scroll
     customClass="xunjian-plan-container scroll-height"
     :refresherLoad="false"
@@ -122,7 +123,7 @@
       <drawer v-if="scanArray.length > 0" :scanArray="scanArray" :scanBool="scanBool" @scanClose="scanClose"></drawer>
     </template>
   </oa-scroll>
-  <baPing />
+  <systemReturn />
 </template>
 
 <script setup>
@@ -141,6 +142,7 @@ import { useStores, commonStores, xunJianStores } from "@/store/modules/index";
 const { proxy } = getCurrentInstance();
 const xunJianStore = xunJianStores(); //全局变量值Store
 /*----------------------------------变量声明-----------------------------------*/
+const title = ref("");
 const info = ref({
   lunar: true,
   range: true,
@@ -399,6 +401,9 @@ onShow(() => {
   uni.$on("NFC_readID", function (value) {
     planListApi(value);
   });
+  const pages = getCurrentPages();
+  const currentPage = pages[pages.length - 1];
+  title.value = currentPage.$page.meta.navigationBar.titleText;
 });
 
 onUnload(() => {

src/pages/business/zhaf/xunJian/record/index.vue

@@ -22,7 +22,7 @@
       </view>
     </view>
   </view>
-  <baPing />
+  <systemReturn />
 </template>
 
 <script setup>

src/pages/business/zhaf/xunJian/xunJian.vue

@@ -33,7 +33,7 @@
       </view>
     </template>
   </oa-scroll>
-  <baPing />
+  <systemReturn />
 </template>
 
 <script setup>

src/pages/common/appMessage/details.vue

@@ -1,11 +1,12 @@
 <template>
   <view>
+    <uni-nav-bar :title="title" :backgroundColor="proxy.$settingStore.themeColor.color" leftIcon="left" color="#fff" fixed statusBar :border="false"></uni-nav-bar>
     <uni-card class="view-title" :title="data?.infoTitle || ''">
       <view class="uni-body view-content">{{ data?.infoContent || "" }}</view>
       <text class="uni-body view-time">{{ data?.createTime ? data.createTime.replace("T", " ") : "" }}</text>
     </uni-card>
-    <baPing />
   </view>
+  <systemReturn />
 </template>
 
 <script setup>
@@ -21,7 +22,7 @@ import { getMceList } from "@/api/mine/info.js";
 const { proxy } = getCurrentInstance();
 /*----------------------------------变量声明-----------------------------------*/
 const data = ref();
-
+const title = ref("");
 function init(options) {
   getMceList({
     current: 1,
@@ -31,9 +32,8 @@ function init(options) {
     data.value = requset.data.records[0];
   });
 }
-onBackPress((event) => {
-  console.log("backbutton",new Date().getTime())
-  uni.setStorageSync("backbutton", "top");
+onNavigationBarButtonTap(event => {
+  console.log("navigationbutton",new Date().getTime(),event)
 })
 onLoad((options) => {
   init(options);
@@ -42,6 +42,9 @@ onLoad((options) => {
 onShow(() => {
   //调用系统主题颜色
   proxy.$settingStore.systemThemeColor([1]);
+  const pages = getCurrentPages();
+  const currentPage = pages[pages.length - 1];
+  title.title = currentPage.$page.meta.navigationBar.titleText;
 });
 </script>
 
@@ -63,4 +66,18 @@ onShow(() => {
   font-size: 12px;
   float: right;
 }
+.uni-page-head{
+  /* .uni-page-head-hd{ */
+    display: none !important;
+  /* } */
+  
+}
+</style>
+<style>
+.uni-page-head{
+  /* .uni-page-head-hd{ */
+    display: none !important;
+  /* } */
+  
+}
 </style>

src/pages/common/appMessage/index.vue

@@ -1,4 +1,5 @@
 <template>
+  <uni-nav-bar :title="title" :backgroundColor="proxy.$settingStore.themeColor.color" leftIcon="left" color="#fff" fixed statusBar :border="false"></uni-nav-bar>
   <oa-scroll
     customClass="appMessage-container scroll-height"
     :pageSize="state.size"
@@ -35,7 +36,7 @@
       </view>
     </template>
   </oa-scroll>
-  <baPing />
+  <systemReturn />
 </template>
 
 <script setup>
@@ -52,6 +53,7 @@ import { projectApi } from "@/api/business/project.js";
 /*----------------------------------公共变量-----------------------------------*/
 const { proxy } = getCurrentInstance();
 /*----------------------------------变量声明-----------------------------------*/
+const title = ref("");
 const state = reactive({
   scrollIntoView: "",
   loading: false,
@@ -165,6 +167,9 @@ onReady(() => {});
 onShow(() => {
   //调用系统主题颜色
   proxy.$settingStore.systemThemeColor([1]);
+  const pages = getCurrentPages();
+  const currentPage = pages[pages.length - 1];
+  title.value = currentPage.$page.meta.navigationBar.titleText;
 });
 
 onUnload(() => {

src/pages/common/textview/index.vue

@@ -4,7 +4,7 @@
     <h3 style="text-align: center; line-height: 45px">{{ state.contentTitle }}</h3>
     <view>{{ state.content }}</view>
   </view>
-  <baPing />
+  <systemReturn />
 </template>
 
 <script setup>

src/pages/info.vue

@@ -56,7 +56,6 @@
   </oa-scroll>
 
   <oa-tabbar :tabbarValue="1" :tabbarList="proxy.$constData.homeTabbar"></oa-tabbar>
-  <baPing />
 </template>
 
 <script setup>

src/pages/login.vue

@@ -10,10 +10,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>
-        <!--#endif-->
       </view>
 
       <view class="middle-input" v-if="switchText == '验证码登录'">
@@ -40,12 +38,12 @@
       <view class="middle-switch">
         <text class="switch-loginMethod" @click="switchMode(1)">{{ switchText === "验证码登录" ? "账号密码登录" : "验证码登录" }}</text>
         <view style="margin: auto"></view>
-        <text class="switch-register" @click="switchMode(2)" v-if="config.appInfo.appid === '__UNI__BF1A1F0'">注册账号</text>
+        <text class="switch-register" @click="switchMode(2)" v-if="config.appInfo.appid != '__UNI__BF1A1F0'">注册账号</text>
       </view>
       <!--#endif-->
 
       <!-- #ifdef APP-PLUS || MP-WEIXIN -->
-      <view class="middle-agreed text-center">
+      <view class="middle-agreed text-center" v-if="config.appInfo.appid != '__UNI__BF1A1F0'">
         <u-checkbox shape="circle" inactiveColor="#0081ff" size="13" :usedAlone="true" :checked="uChecked" @change="uCheckedChange"></u-checkbox>
         <!-- <text>登录即已代表阅读并同意</text> -->
         <text>我已阅读并同意</text>
@@ -61,7 +59,7 @@
     </view>
   </view>
 
-  <u-modal :show="modalShow" title="用户协议及隐私政策" :confirmText="'同意'" :cancelText="'不同意'" :zoom="false" :showCancelButton="true" @confirm="modalConfirm()" @cancel="modalShow = false">
+  <u-modal :show="modalShow" title="用户协议及隐私政策" :confirmText="'同意'" :cancelText="'不同意'" :zoom="false" :showCancelButton="true" @confirm="modalConfirm()" @cancel="modalShow = false" >
     <view class="slot-content">
       <view>
         您在使用我们的服务时，我们可能会收集和使用您的相关信息。我们希望通过本
@@ -91,7 +89,6 @@
       </view>
     </view>
   </u-modal>
-  <baPing />
 </template>
 
 <script setup>
@@ -213,11 +210,14 @@ function submitRes() {
     proxy.$modal.msg("首次登录请先进行服务器配置");
     return;
   }
-
-  if (!uChecked.value) {
-    modalShow.value = true;
-    return;
+  
+  if(config.appInfo.appid != '__UNI__BF1A1F0'){
+    if (!uChecked.value) {
+      modalShow.value = true;
+      return;
+    }
   }
+
   //#endif
 
   if (switchText.value == "验证码登录") {

src/pages/mine.vue

@@ -174,7 +174,6 @@
   <oa-upgrade ref="oaUpgradeRef" :themesColor="proxy.$settingStore.themeColor.color" />
 
   <oa-tabbar :tabbarValue="2" :tabbarList="proxy.$constData.homeTabbar"></oa-tabbar>
-  <baPing />
 </template>
 
 <script setup>

src/pages/mine/about/index.vue

@@ -1,4 +1,5 @@
 <template>
+  <uni-nav-bar :title="title" :backgroundColor="proxy.$settingStore.themeColor.color" leftIcon="left" color="#fff" fixed statusBar :border="false"></uni-nav-bar>
   <view class="about-container">
     <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="关于我们" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
       <template #left>
@@ -50,7 +51,7 @@
       <u-text :text="filingInfo.code" :href="filingInfo.href" mode="link" align="center" size="12"></u-text>
     </view>
   </view>
-  <baPing />
+  <systemReturn />
 </template>
 
 <script setup>
@@ -67,6 +68,7 @@ import config from "@/config";
 const { proxy } = getCurrentInstance();
 const useStore = useStores();
 /*----------------------------------变量声明-----------------------------------*/
+const title = ref("");
 const state = reactive({
   url: computed(() => {
     return config.appInfo.site_url;
@@ -93,6 +95,9 @@ const { url, version, email, hotline, copyright, filingInfo } = toRefs(state);
 onShow(() => {
   //调用系统主题颜色
   proxy.$settingStore.systemThemeColor([1]);
+  const pages = getCurrentPages();
+  const currentPage = pages[pages.length - 1];
+  title.value = currentPage.$page.meta.navigationBar.titleText;
 });
 </script>
 

src/pages/mine/avatar/index.vue

@@ -44,7 +44,7 @@
       <canvas canvas-id="myCanvas" :style="'position:absolute;border: 1px solid red; width:' + imageW + 'px;height:' + imageH + 'px;top:-9999px;left:-9999px;'"></canvas>
     </view>
   </view>
-  <baPing />
+  <systemReturn />
 </template>
 
 <script setup>

src/pages/mine/help/index.vue

@@ -1,4 +1,5 @@
 <template>
+  <uni-nav-bar :title="title" :backgroundColor="proxy.$settingStore.themeColor.color" leftIcon="left" color="#fff" fixed statusBar :border="false"></uni-nav-bar>
   <view class="help-container">
     <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="常见问题" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
       <template #left>
@@ -24,7 +25,7 @@
       </view>
     </view>
   </view>
-  <baPing />
+  <systemReturn />
 </template>
 
 <script setup>
@@ -41,6 +42,7 @@ import { useStores, commonStores } from "@/store/modules/index";
 const { proxy } = getCurrentInstance();
 const useStore = useStores();
 /*----------------------------------变量声明-----------------------------------*/
+const title = ref("");
 const state = reactive({
   list: [
     {
@@ -73,6 +75,9 @@ function handleText(item) {
 onShow(() => {
   //调用系统主题颜色
   proxy.$settingStore.systemThemeColor([1]);
+  const pages = getCurrentPages();
+  const currentPage = pages[pages.length - 1];
+  title.value = currentPage.$page.meta.navigationBar.titleText;
 });
 </script>
 

src/pages/mine/info/index.vue

@@ -1,4 +1,5 @@
 <template>
+  <uni-nav-bar :title="title" :backgroundColor="proxy.$settingStore.themeColor.color" leftIcon="left" color="#fff" fixed statusBar :border="false"></uni-nav-bar>
   <view :data-theme="'theme-' + proxy.$settingStore.themeColor.name" class="info-container">
     <u-sticky class="shadow-default" bgColor="#fff" style="top: 0">
       <u-tabs
@@ -129,7 +130,7 @@
       </view>
     </view>
   </u-modal>
-  <baPing />
+  <systemReturn />
 </template>
 
 <script setup>
@@ -146,6 +147,7 @@ import { useStores, commonStores } from "@/store/modules/index";
 const { proxy } = getCurrentInstance();
 const useStore = useStores();
 /*----------------------------------变量声明-----------------------------------*/
+const title = ref("");
 const state = reactive({
   tabsList: [{ name: "个人信息" }, { name: "企业/团队" }],
   tabsCurrent: 0,
@@ -160,6 +162,7 @@ const state = reactive({
 
   phone: undefined,
   verify: undefined,
+  title:""
 });
 
 const { tabsList, tabsCurrent, sexs, modalShow, modalTitle, phone, verify } = toRefs(state);
@@ -266,6 +269,9 @@ onReady(() => {
 onShow(() => {
   //调用系统主题颜色
   proxy.$settingStore.systemThemeColor([1]);
+  const pages = getCurrentPages();
+  const currentPage = pages[pages.length - 1];
+  title.value = currentPage.$page.meta.navigationBar.titleText;
 });
 
 // 自定义导航事件

src/pages/mine/msg/index.vue

@@ -1,4 +1,5 @@
 <template>
+  <uni-nav-bar :title="title" :backgroundColor="proxy.$settingStore.themeColor.color" leftIcon="left" color="#fff" fixed statusBar :border="false"></uni-nav-bar>
   <view class="msg-container">
     <view class="oa-header-section">提醒设置：关闭后，仍会接收此消息，但不进行消息接收提示</view>
     <view class="oa-content-section">
@@ -12,12 +13,12 @@
       </view>
     </view>
   </view>
-  <baPing />
+  <systemReturn />
 </template>
 <script setup>
 /*----------------------------------依赖引入-----------------------------------*/
 import { onLoad, onShow } from "@dcloudio/uni-app";
-import { reactive, getCurrentInstance, toRefs, inject } from "vue";
+import { ref, reactive, getCurrentInstance, toRefs, inject } from "vue";
 /*----------------------------------接口引入-----------------------------------*/
 import { getMceSettingInfo, addMceSetting } from "@/api/mine/info.js";
 /*----------------------------------组件引入-----------------------------------*/
@@ -27,6 +28,7 @@ import { getMceSettingInfo, addMceSetting } from "@/api/mine/info.js";
 const { proxy } = getCurrentInstance();
 const { message_type } = proxy.useDict("message_type");
 /*----------------------------------变量声明-----------------------------------*/
+const title = ref("");
 const state = reactive({
   id: "",
   modeType: "",
@@ -72,6 +74,9 @@ onLoad(() => {
 onShow(() => {
   //调用系统主题颜色
   proxy.$settingStore.systemThemeColor([1]);
+  const pages = getCurrentPages();
+  const currentPage = pages[pages.length - 1];
+  title.value = currentPage.$page.meta.navigationBar.titleText;
 });
 </script>
 <style lang="scss" scoped>

src/pages/mine/secure/fingerprint/index.vue

@@ -22,7 +22,7 @@
       </view>
     </view>
   </u-modal>
-  <baPing />
+  <systemReturn />
 </template>
 
 <script setup>

src/pages/mine/secure/index.vue

@@ -1,4 +1,5 @@
 <template>
+  <uni-nav-bar :title="title" :backgroundColor="proxy.$settingStore.themeColor.color" leftIcon="left" color="#fff" fixed statusBar :border="false"></uni-nav-bar>
   <view :data-theme="'theme-' + proxy.$settingStore.themeColor.name" class="secure-container">
     <view class="content-section">
       <view class="menu-list mt0 mlr0">
@@ -110,7 +111,7 @@
       </view>
     </view>
   </u-modal>
-  <baPing />
+  <systemReturn />
 </template>
 
 <script setup>
@@ -127,6 +128,7 @@ import { useStores, commonStores } from "@/store/modules/index";
 const { proxy } = getCurrentInstance();
 const useStore = useStores();
 /*----------------------------------变量声明-----------------------------------*/
+const title = ref("")
 const state = reactive({
   modalShow: false,
   modalTitle: "",
@@ -279,6 +281,9 @@ onReady(() => {});
 onShow(() => {
   //调用系统主题颜色
   proxy.$settingStore.systemThemeColor([1]);
+  const pages = getCurrentPages();
+  const currentPage = pages[pages.length - 1];
+  title.value = currentPage.$page.meta.navigationBar.titleText;
 });
 
 // 自定义导航事件

src/pages/mine/secure/loginLog/index.vue

@@ -1,4 +1,5 @@
 <template>
+  <uni-nav-bar :title="title" :backgroundColor="proxy.$settingStore.themeColor.color" leftIcon="left" color="#fff" fixed statusBar :border="false"></uni-nav-bar>
   <oa-scroll
     customClass="scroll-height"
     :pageSize="state.pageSize"
@@ -38,7 +39,7 @@
       </view>
     </template>
   </oa-scroll>
-  <baPing />
+  <systemReturn />
 </template>
 
 <script setup>
@@ -55,6 +56,7 @@ import { useStores, commonStores } from "@/store/modules/index";
 const { proxy } = getCurrentInstance();
 const useStore = useStores();
 /*----------------------------------变量声明-----------------------------------*/
+const title = ref("")
 const state = reactive({
   dataList: [],
   pageNum: 1,
@@ -111,6 +113,9 @@ onReady(() => {});
 onShow(() => {
   //调用系统主题颜色
   proxy.$settingStore.systemThemeColor([1]);
+  const pages = getCurrentPages();
+  const currentPage = pages[pages.length - 1];
+  title.value = currentPage.$page.meta.navigationBar.titleText;
 });
 
 // 自定义导航事件

src/pages/serveConfig.vue

@@ -1,8 +1,9 @@
 <template>
+  <uni-nav-bar :title="title" :backgroundColor="proxy.$settingStore.themeColor.color" leftIcon="left" color="#fff" fixed statusBar :border="false"></uni-nav-bar>
   <view id="serveConfig-container">
-    <view class="top-area">
+    <!-- <view class="top-area">
       <u-icon name="arrow-left" size="17px" color="#000" :bold="true" @click="navigateTo"></u-icon>
-    </view>
+    </view> -->
 
     <view class="content-area">
       <text class="content-area-title">设置服务器地址</text>
@@ -31,6 +32,7 @@
       </u-button>
     </view>
   </view>
+  <systemReturn />
 </template>
 
 <script setup>
@@ -48,6 +50,7 @@ const { proxy } = getCurrentInstance();
 const useStore = useStores();
 const commonStore = commonStores();
 /*----------------------------------变量声明-----------------------------------*/
+const title = ref("");
 const state = reactive({
   linkUrl: "", //链接地址
   port: "",
@@ -153,6 +156,11 @@ onLoad((options) => {
     }
   }
 });
+onShow(() => {
+  const pages = getCurrentPages();
+  const currentPage = pages[pages.length - 1];
+  title.value = currentPage.$page.meta.navigationBar.titleText;
+})
 </script>
 
 <style lang="scss" scoped>

src/pages/serveConfigSelect.vue

@@ -1,8 +1,9 @@
 <template>
+  <uni-nav-bar :title="title" :backgroundColor="proxy.$settingStore.themeColor.color" leftIcon="left" color="#fff" fixed statusBar :border="false"></uni-nav-bar>
   <view id="serveConfigSelect-container">
-    <view class="top-area">
+    <!-- <view class="top-area">
       <u-icon name="arrow-left" size="17px" color="#000" :bold="true" @click="navigateTo()"></u-icon>
-    </view>
+    </view> -->
 
     <view class="content-area">
       <text class="content-area-title">选择服务器地址</text>
@@ -49,6 +50,7 @@
       >
     </view>
   </view>
+  <systemReturn />
 </template>
 
 <script setup>
@@ -66,6 +68,7 @@ const { proxy } = getCurrentInstance();
 const useStore = useStores();
 const commonStore = commonStores();
 /*----------------------------------变量声明-----------------------------------*/
+const title =ref("")
 const state = reactive({
   radiolist: [],
   radiovalue: "",
@@ -182,6 +185,9 @@ function init() {
 
 onShow(() => {
   init();
+  const pages = getCurrentPages();
+  const currentPage = pages[pages.length - 1];
+  title.value = currentPage.$page.meta.navigationBar.titleText;
 });
 
 onLoad((options) => {});

src/plugins/keyListen.plugins.js

@@ -1,5 +1,4 @@
 import { xunJianStores } from "@/store/modules/index";
-
 const SYSTEM_REASON = "reason";
 //Home键
 const SYSTEM_HOME_KEY = "homekey";
@@ -15,33 +14,26 @@ export default {
         let main = plus.android.runtimeMainActivity();
         that.openListen();
         if (needStopSystem) {
-            // if(plus.os.name == "Android"){
+            if(plus.os.name == "Android"){
                 plus.key.addEventListener("backbutton", function (e) {
-                    let that2 = e
-                    setTimeout(()=>{
-                        console.log(1,new Date().getTime(),e)
-                        if(!uni.getStorageSync("backbutton")){
-                            uni.setStorageSync("backbutton","bottom")
-                        }
-                        // console.log(2)
-                        if(uni.getStorageSync("backbutton") == "bottom"){
-                            // main.stopLockTask()//按返回键恢复
-                            // main.startLockTask()//阻止系统home建和近期任务键
-                            // main.unregisterReceiver(receiver); //同时停止接收home和recent点击
-                            console.log('监听物理返回')
-                            that2.preventDefault();
-                        }else{
-                            console.log('监听组件返回')
-                            uni.setStorageSync("backbutton","bottom")
+                    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('用户点击了取消');
+                            }
                         }
                     })
-                    
+                    e.preventDefault();
                 },false);
-            // }
-            
-        } else {
+            }
         }
-
     },
     openListen: function () {//注册监听
         let that = this;

src/store/modules/setting.js

@@ -360,16 +360,16 @@ const settingStores = defineStore("storage-setting", {
             const useStore = useStores();
             modal.confirm("确定注销并退出系统吗？").then(() => {
                 useStore.LogOut().then(() => {
-                   
-                    if(localStorage.getItem("type")) {
-                        console.log('内嵌h5')
+                    // #ifdef APP-PLUS || H5
+                        tab.reLaunch("/pages/index");
+                    // #endif 
+
+                    // #ifdef MP-WEIXIN
                         wx.miniProgram.navigateTo({
                             appId:'wxf5ad8734295d43f8',
                             url:'/pages/login?type=logout'
-                          })
-                    }  else{
-                        tab.reLaunch("/pages/index");
-                    }                 
+                        })
+                    // #endif              
 
                 });
             });