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

src/pages.json

@@ -32,7 +32,11 @@
             "style": {
                 "navigationBarTitleText": "服务器配置",
                 "navigationStyle": "custom",
-                "navigationBarTextStyle": "black"
+                "enablePullDownRefresh": false,
+                "app-plus": {
+                    "bounce": "none",
+                    "titleNView": false
+                }
             }
         },
         {
@@ -40,7 +44,11 @@
             "style": {
                 "navigationBarTitleText": "服务器配置",
                 "navigationStyle": "custom",
-                "navigationBarTextStyle": "black"
+                "enablePullDownRefresh": false,
+                "app-plus": {
+                    "bounce": "none",
+                    "titleNView": false
+                }
             }
         },
         {
@@ -77,6 +85,18 @@
                     "titleNView": false
                 }
             }
+        },
+        {
+            "path": "pages/door/index",
+            "style": {
+                "navigationBarTitleText": "门禁识别",
+                "enablePullDownRefresh": false,
+                "navigationStyle": "custom",
+                "app-plus": {
+                    "bounce": "none",
+                    "titleNView": false
+                }
+            }
         }
     ],
     "subPackages": [
@@ -87,13 +107,25 @@
                 {
                     "path": "webview/index",
                     "style": {
-                        "navigationBarTitleText": "浏览网页"
+                        "navigationBarTitleText": "浏览网页",
+                        "navigationStyle": "custom",
+                        "enablePullDownRefresh": false,
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
                     "path": "textview/index",
                     "style": {
-                        "navigationBarTitleText": "浏览文本"
+                        "navigationBarTitleText": "浏览文本",
+                        "navigationStyle": "custom",
+                        "enablePullDownRefresh": false,
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
@@ -130,21 +162,36 @@
                     "path": "appMessage/index",
                     "style": {
                         "navigationBarTitleText": "消息列表",
-                        "enablePullDownRefresh": false
+                        "navigationStyle": "custom",
+                        "enablePullDownRefresh": false,
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
                     "path": "appMessage/details",
                     "style": {
                         "navigationBarTitleText": "消息详情",
-                        "enablePullDownRefresh": false
+                        "navigationStyle": "custom",
+                        "enablePullDownRefresh": false,
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
                     "path": "alarmMessage/index",
                     "style": {
                         "navigationBarTitleText": "告警通知",
-                        "enablePullDownRefresh": false
+                        "navigationStyle": "custom",
+                        "enablePullDownRefresh": false,
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
@@ -182,26 +229,49 @@
                 {
                     "path": "info/index",
                     "style": {
-                        "navigationBarTitleText": "我的信息"
+                        "navigationBarTitleText": "我的信息",
+                        "navigationStyle": "custom",
+                        "enablePullDownRefresh": false,
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
                     "path": "msg/index",
                     "style": {
-                        "navigationBarTitleText": "消息设置"
+                        "navigationBarTitleText": "消息设置",
+                        "navigationStyle": "custom",
+                        "enablePullDownRefresh": false,
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
                     "path": "secure/index",
                     "style": {
-                        "navigationBarTitleText": "账号与安全"
+                        "navigationBarTitleText": "账号与安全",
+                        "navigationStyle": "custom",
+                        "enablePullDownRefresh": false,
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
                     "path": "secure/loginLog/index",
                     "style": {
                         "navigationBarTitleText": "登录日志",
-                        "enablePullDownRefresh": false
+                        "navigationStyle": "custom",
+                        "enablePullDownRefresh": false,
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
@@ -215,7 +285,13 @@
                 {
                     "path": "avatar/index",
                     "style": {
-                        "navigationBarTitleText": "修改头像"
+                        "navigationBarTitleText": "修改头像",
+                        "navigationStyle": "custom",
+                        "enablePullDownRefresh": false,
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
@@ -257,49 +333,84 @@
                     "path": "xunJian/xunJian",
                     "style": {
                         "navigationBarTitleText": "巡检",
-                        "enablePullDownRefresh": false
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom",
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
                     "path": "xunJian/plan/index",
                     "style": {
                         "navigationBarTitleText": "巡检计划",
-                        "enablePullDownRefresh": false
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom",
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
                     "path": "xunJian/plan/components/siteDetails",
                     "style": {
                         "navigationBarTitleText": "站点详情",
-                        "enablePullDownRefresh": false
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom",
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
                     "path": "xunJian/plan/components/content",
                     "style": {
                         "navigationBarTitleText": "巡检内容",
-                        "enablePullDownRefresh": false
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom",
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
                     "path": "xunJian/plan/components/report",
                     "style": {
                         "navigationBarTitleText": "巡检上报",
-                        "enablePullDownRefresh": false
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom",
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
                     "path": "xunJian/record/index",
                     "style": {
                         "navigationBarTitleText": "巡检记录",
-                        "enablePullDownRefresh": false
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom",
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
                     "path": "xunJian/record/recordDetail/index",
                     "style": {
                         "navigationBarTitleText": "巡检记录详情",
-                        "enablePullDownRefresh": false
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom",
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
@@ -318,7 +429,12 @@
                     "path": "xunJian/collect/components/collectDetail",
                     "style": {
                         "navigationBarTitleText": "采集上报",
-                        "enablePullDownRefresh": false
+                        "navigationStyle": "custom",
+                        "enablePullDownRefresh": false,
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
@@ -337,35 +453,60 @@
                     "path": "xunJian/error/index",
                     "style": {
                         "navigationBarTitleText": "异常上报",
-                        "enablePullDownRefresh": false
+                        "navigationStyle": "custom",
+                        "enablePullDownRefresh": false,
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
                     "path": "xunJian/error/errorList",
                     "style": {
                         "navigationBarTitleText": "异常列表",
-                        "enablePullDownRefresh": false
+                        "navigationStyle": "custom",
+                        "enablePullDownRefresh": false,
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
                     "path": "xunJian/error/errorListDetail",
                     "style": {
                         "navigationBarTitleText": "事件详情",
-                        "enablePullDownRefresh": false
+                        "navigationStyle": "custom",
+                        "enablePullDownRefresh": false,
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
                     "path": "xunJian/error/errorDisposition",
                     "style": {
                         "navigationBarTitleText": "处置内容",
-                        "enablePullDownRefresh": false
+                        "navigationStyle": "custom",
+                        "enablePullDownRefresh": false,
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
                     "path": "signIn/index",
                     "style": {
                         "navigationBarTitleText": "人员签到",
-                        "enablePullDownRefresh": false
+                        "navigationStyle": "custom",
+                        "enablePullDownRefresh": false,
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 }
             ]

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

@@ -1,6 +1,15 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="人员签到" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <oa-scroll
     customClass="scroll-height"
+    :customStyle="{ height: `calc(100vh - (44px + ${proxy.$settingStore.StatusBarHeight} + ${proxy.$settingStore.tabBarHeight}))` }"
     :refresherLoad="false"
     :refresherEnabled="false"
     :refresherDefaultStyle="'none'"

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

@@ -1,6 +1,15 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="采集上报" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <oa-scroll
     customClass="scroll-height"
+    :customStyle="{ height: `calc(100vh - (44px + ${proxy.$settingStore.StatusBarHeight} + ${proxy.$settingStore.tabBarHeight}))` }"
     :isSticky="false"
     :refresherLoad="false"
     :refresherEnabled="false"

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

@@ -1,6 +1,15 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="处置内容" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <oa-scroll
     customClass="errorDisposition-container scroll-height"
+    :customStyle="{ height: `calc(100vh - (44px + ${proxy.$settingStore.StatusBarHeight} + ${proxy.$settingStore.tabBarHeight}))` }"
     :refresherLoad="false"
     :refresherEnabled="false"
     :refresherEnabledTitle="false"

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

@@ -1,5 +1,13 @@
 <template>
   <u-sticky class="shadow-default" bgColor="#fff" style="top: 0">
+    <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="异常列表" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+      <template #left>
+        <view class="u-navbar__content__left__item">
+          <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+        </view>
+      </template>
+    </u-navbar>
+
     <u-tabs
       :list="state.tabsList"
       :current="state.tabsCurrent"
@@ -13,6 +21,7 @@
 
   <oa-scroll
     customClass="fastMail-container scroll-height"
+    :customStyle="{ height: `calc(100vh - (44px + 44px + ${proxy.$settingStore.StatusBarHeight} + ${proxy.$settingStore.tabBarHeight}))` }"
     :pageSize="state.pageSize"
     :total="state.total"
     :isSticky="true"

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

@@ -1,7 +1,15 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="事件详情" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <oa-scroll
     customClass="invoicing-container scroll-height"
-    :customStyle="{}"
+    :customStyle="{ height: `calc(100vh - (44px + ${proxy.$settingStore.StatusBarHeight} + ${proxy.$settingStore.tabBarHeight}))` }"
     :refresherLoad="false"
     :refresherEnabled="false"
     :refresherDefaultStyle="'none'"

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

@@ -1,6 +1,15 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="异常上报" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <oa-scroll
     customClass="error-container scroll-height"
+    :customStyle="{ height: `calc(100vh - (44px + ${proxy.$settingStore.StatusBarHeight} + ${proxy.$settingStore.tabBarHeight}))` }"
     :refresherLoad="false"
     :refresherEnabled="false"
     :refresherEnabledTitle="false"

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

@@ -1,6 +1,15 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="巡检内容" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <oa-scroll
     customClass="xunjian-plan-content scroll-height"
+    :customStyle="{ height: `calc(100vh - (44px + ${proxy.$settingStore.StatusBarHeight} + ${proxy.$settingStore.tabBarHeight}))` }"
     :refresherLoad="false"
     :refresherEnabled="false"
     :refresherEnabledTitle="false"

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

@@ -1,6 +1,15 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="巡检上报" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <oa-scroll
     customClass="scroll-height"
+    :customStyle="{ height: `calc(100vh - (44px + ${proxy.$settingStore.StatusBarHeight} + ${proxy.$settingStore.tabBarHeight}))` }"
     :refresherLoad="false"
     :refresherEnabled="false"
     :refresherEnabledTitle="false"

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

@@ -1,6 +1,15 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="站点详情" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <oa-scroll
     customClass="scroll-height"
+    :customStyle="{ height: `calc(100vh - (44px + ${proxy.$settingStore.StatusBarHeight} + ${proxy.$settingStore.tabBarHeight}))` }"
     :refresherLoad="false"
     :refresherEnabled="false"
     :refresherEnabledTitle="false"

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

@@ -1,6 +1,15 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="巡检计划" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <oa-scroll
     customClass="xunjian-plan-container scroll-height"
+    :customStyle="{ height: `calc(100vh - (44px + ${proxy.$settingStore.StatusBarHeight} + ${proxy.$settingStore.tabBarHeight}))` }"
     :refresherLoad="false"
     :refresherEnabled="false"
     :refresherEnabledTitle="false"

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

@@ -1,27 +1,47 @@
 <template>
-  <view class="">
-    <view class="cu-list menu-avatar">
-      <view class="cu-item" :class="modalName == 'move-box-' + index ? 'move-cur' : ''" v-for="(item, index) in getData" :key="index" :data-target="'move-box-' + index" @tap="goDetail(item)">
-        <view class="content" style="left: 0; width: 80%">
-          <view class="pro-title">
-            <view class="cut">计划：{{ item.plan_name }}</view>
-          </view>
-          <view class="pro-des">
-            <view class="text-cut"> 点位：{{ item.spot_name }} </view>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="巡检记录" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
+  <oa-scroll
+    customClass="scroll-height"
+    :customStyle="{ height: `calc(100vh - (44px + ${proxy.$settingStore.StatusBarHeight} + ${proxy.$settingStore.tabBarHeight}))` }"
+    :refresherLoad="false"
+    :refresherEnabled="false"
+    :refresherEnabledTitle="false"
+    :refresherDefaultStyle="'none'"
+    :refresherThreshold="44"
+    :refresherBackground="'#f5f6f7'"
+    :data-theme="'theme-' + proxy.$settingStore.themeColor.name"
+  >
+    <template #default>
+      <view class="cu-list menu-avatar">
+        <view class="cu-item" :class="modalName == 'move-box-' + index ? 'move-cur' : ''" v-for="(item, index) in getData" :key="index" :data-target="'move-box-' + index" @tap="goDetail(item)">
+          <view class="content" style="left: 0; width: 80%">
+            <view class="pro-title">
+              <view class="cut">计划：{{ item.plan_name }}</view>
+            </view>
+            <view class="pro-des">
+              <view class="text-cut"> 点位：{{ item.spot_name }} </view>
+            </view>
+            <view class="pro-date">{{ item.wc_time }}</view>
           </view>
-          <view class="pro-date">{{ item.wc_time }}</view>
-        </view>
-        <view class="nav-right num mr10">
-          <view class="text-grey">
-            <button class="cu-btn radius bg-green sm" v-if="item.spot_abnormal == 0">正常</button>
-            <button class="cu-btn radius bg-orange sm" v-if="item.spot_abnormal == 1">异常</button>
-            <button class="cu-btn radius bg-red sm" v-if="item.spot_abnormal == 2">故障</button>
-            <button class="cu-btn radius bg-orange sm" v-if="item.spot_abnormal == 3">其他</button>
+          <view class="nav-right num mr10">
+            <view class="text-grey">
+              <button class="cu-btn radius bg-green sm" v-if="item.spot_abnormal == 0">正常</button>
+              <button class="cu-btn radius bg-orange sm" v-if="item.spot_abnormal == 1">异常</button>
+              <button class="cu-btn radius bg-red sm" v-if="item.spot_abnormal == 2">故障</button>
+              <button class="cu-btn radius bg-orange sm" v-if="item.spot_abnormal == 3">其他</button>
+            </view>
           </view>
         </view>
       </view>
-    </view>
-  </view>
+    </template>
+  </oa-scroll>
 </template>
 
 <script setup>

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

@@ -1,4 +1,12 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="巡检记录详情" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <view>
     <view class="timeBox flex justify-between align-center plr10">
       <view class="time">{{ getData.plan_name }}</view>

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

@@ -1,6 +1,15 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="巡检" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <oa-scroll
     customClass="scroll-height"
+    :customStyle="{ height: `calc(100vh - (44px + ${proxy.$settingStore.StatusBarHeight} + ${proxy.$settingStore.tabBarHeight}))` }"
     :refresherLoad="false"
     :refresherEnabled="false"
     :refresherEnabledTitle="false"

src/pages/common/alarmMessage/index.vue

@@ -1,6 +1,15 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="告警通知" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <oa-scroll
     customClass="alarmMessage-container scroll-height"
+    :customStyle="{ height: `calc(100vh - (44px + ${proxy.$settingStore.StatusBarHeight} + ${proxy.$settingStore.tabBarHeight}))` }"
     :pageSize="state.pageSize"
     :total="state.total"
     :refresherLoad="true"

src/pages/common/appMessage/details.vue

@@ -1,4 +1,12 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="消息详情" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <view>
     <uni-card class="view-title" :title="data?.infoTitle || ''">
       <view class="uni-body view-content">{{ data?.infoContent || "" }}</view>

src/pages/common/appMessage/index.vue

@@ -1,6 +1,15 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="消息列表" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <oa-scroll
     customClass="appMessage-container scroll-height"
+    :customStyle="{ height: `calc(100vh - (44px + ${proxy.$settingStore.StatusBarHeight} + ${proxy.$settingStore.tabBarHeight}))` }"
     :pageSize="state.size"
     :total="state.total"
     :refresherLoad="true"
@@ -72,7 +81,6 @@ function goContentDetails(e) {
   if (e.infoType == 4) {
     proxy.$tab.navigateTo(`/pages/business/fireIot/alarmManage/alarmDetails/index?contentId=${e.contentId}`).then(() => {});
   } else if (e.infoType == 5) {
-
     if (e.readFlag != 1) {
       projectApi()
         .ReportRecordReadFlag({ reportId: e.id })
@@ -84,8 +92,8 @@ function goContentDetails(e) {
           }
         });
     } else {
-        proxy.$tab.navigateTo(`/pages/business/common/projectMange/record/details?reportId=${e.moduleId}`);
-      }
+      proxy.$tab.navigateTo(`/pages/business/common/projectMange/record/details?reportId=${e.moduleId}`);
+    }
   } else {
     proxy.$tab.navigateTo(`/pages/common/appMessage/details?contentId=${e.contentId}`).then(() => {});
   }

src/pages/common/textview/index.vue

@@ -1,4 +1,12 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" :title="state.title" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <view class="view-text">
     <!-- <u-parse class="uni-body view-content" :content="content"></u-parse> -->
     <h3 style="text-align: center; line-height: 45px">{{ state.contentTitle }}</h3>
@@ -29,9 +37,6 @@ onLoad((options) => {
   state.title = options.title;
   state.content = options.content;
   state.contentTitle = options.contentTitle;
-  uni.setNavigationBarTitle({
-    title: options.title,
-  });
 });
 
 onShow(() => {

src/pages/common/webview/index.vue

@@ -1,4 +1,11 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" :title="params?.title" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
   <view v-if="params.url">
     <web-view :webview-styles="webviewStyles" :src="`${params.url}`" allow></web-view>
   </view>
@@ -38,11 +45,6 @@ const { params, webviewStyles } = toRefs(state);
 
 onLoad((event) => {
   params.value = event;
-  if (event.title) {
-    uni.setNavigationBarTitle({
-      title: event.title,
-    });
-  }
 });
 
 onShow(() => {

src/pages/login.vue

@@ -1,5 +1,5 @@
 <template>
-  <view id="login-container" class="login-container" v-if="xcxData == null">
+  <view id="login-container" class="login-container">
     <image class="bgImage" :src="useStore.loginBg" v-if="useStore.loginBg" />
 
     <view class="middle">
@@ -40,12 +40,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)">注册账号</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>
@@ -123,10 +123,9 @@ const state = reactive({
   /** 用户隐私协议数据 */
   uChecked: false,
   modalShow: false,
-  xcxData: null,
 });
 
-const { phone, verify, switchText, username, password, isPassword, linkUrl, uChecked, modalShow, xcxData } = toRefs(state);
+const { phone, verify, switchText, username, password, isPassword, linkUrl, uChecked, modalShow } = toRefs(state);
 
 /**
  * @跳转服务器配置
@@ -211,7 +210,7 @@ function submitRes() {
     return;
   }
 
-  if (!uChecked.value) {
+  if (config.appInfo.appid != "__UNI__BF1A1F0" && !uChecked.value) {
     modalShow.value = true;
     return;
   }

src/pages/mine/avatar/index.vue

@@ -1,4 +1,12 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="修改头像" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <view class="avatar-container" :data-theme="'theme-' + proxy.$settingStore.themeColor.name">
     <view class="oa-header-section"></view>
     <view class="oa-content-section page-body">

src/pages/mine/info/index.vue

@@ -1,4 +1,12 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="我的信息" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <view :data-theme="'theme-' + proxy.$settingStore.themeColor.name" class="info-container">
     <u-sticky class="shadow-default" bgColor="#fff" style="top: 0">
       <u-tabs

src/pages/mine/msg/index.vue

@@ -1,4 +1,12 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="消息设置" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <view class="msg-container">
     <view class="oa-header-section">提醒设置：关闭后，仍会接收此消息，但不进行消息接收提示</view>
     <view class="oa-content-section">

src/pages/mine/secure/index.vue

@@ -1,4 +1,12 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="账号与安全" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <view :data-theme="'theme-' + proxy.$settingStore.themeColor.name" class="secure-container">
     <view class="content-section">
       <view class="menu-list mt0 mlr0">

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

@@ -1,6 +1,15 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="登录日志" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <oa-scroll
     customClass="scroll-height"
+    :customStyle="{ height: `calc(100vh - (44px + ${proxy.$settingStore.StatusBarHeight} + ${proxy.$settingStore.tabBarHeight}))` }"
     :pageSize="state.pageSize"
     :total="state.total"
     :refresherLoad="true"

src/pages/serveConfig.vue

@@ -1,9 +1,13 @@
 <template>
-  <view id="serveConfig-container">
-    <view class="top-area">
-      <u-icon name="arrow-left" size="17px" color="#000" :bold="true" @click="navigateTo"></u-icon>
-    </view>
+  <u-navbar :titleStyle="{ color: '#000' }" :autoBack="true" title="" :placeholder="true" :safeAreaInsetTop="true" bgColor="#FFFFFF">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#000"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
 
+  <view id="serveConfig-container">
     <view class="content-area">
       <text class="content-area-title">设置服务器地址</text>
       <u-icon class="content-area-icons" name="scan" color="#2a98ff" size="22"></u-icon>
@@ -156,6 +160,14 @@ onLoad((options) => {
 </script>
 
 <style lang="scss" scoped>
+:deep() {
+  .u-navbar__content__left,
+  .u-navbar__content__right {
+    padding: 0 25px;
+    top: 50px;
+  }
+}
+
 #serveConfig-container {
   position: fixed;
   top: 0;
@@ -166,9 +178,9 @@ onLoad((options) => {
   width: 100%;
   margin: auto;
   padding: 0 30px;
-  padding-top: 20%;
-  //#ifdef MP-WEIXIN
   padding-top: 30%;
+  //#ifdef MP-WEIXIN
+  padding-top: 40%;
   //#endif
   background-color: #ffffff;
 

src/pages/serveConfigSelect.vue

@@ -1,9 +1,13 @@
 <template>
-  <view id="serveConfigSelect-container">
-    <view class="top-area">
-      <u-icon name="arrow-left" size="17px" color="#000" :bold="true" @click="navigateTo()"></u-icon>
-    </view>
+  <u-navbar :titleStyle="{ color: '#000' }" :autoBack="true" title="" :placeholder="true" :safeAreaInsetTop="true" bgColor="#fff">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#000"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
 
+  <view id="serveConfigSelect-container">
     <view class="content-area">
       <text class="content-area-title">选择服务器地址</text>
       <u-icon class="content-area-icons" name="scan" color="#2a98ff" size="22" @tap="serveClick(1)"></u-icon>
@@ -188,6 +192,14 @@ onLoad((options) => {});
 </script>
 
 <style lang="scss" scoped>
+:deep() {
+  .u-navbar__content__left,
+  .u-navbar__content__right {
+    padding: 0 25px;
+    top: 50px;
+  }
+}
+
 #serveConfigSelect-container {
   position: fixed;
   top: 0;
@@ -199,9 +211,9 @@ onLoad((options) => {});
   height: 100vh;
   margin: auto;
   padding: 0 30px;
-  padding-top: 20%;
-  //#ifdef MP-WEIXIN
   padding-top: 30%;
+  //#ifdef MP-WEIXIN
+  padding-top: 40%;
   //#endif
   background-color: #ffffff;
 

src/store/modules/setting.js

@@ -363,20 +363,18 @@ const settingStores = defineStore("storage-setting", {
             const useStore = useStores();
             modal.confirm("确定注销并退出系统吗？").then(() => {
                 useStore.LogOut().then(() => {
-                   
-                    if(localStorage.getItem("type")) {
+                    if (localStorage.getItem("type")) {
                         console.log('内嵌h5')
                         wx.miniProgram.navigateTo({
-                            appId:'wxf5ad8734295d43f8',
-                            url:'/pages/login?type=logout'
-                          })
-                    }  else{
+                            appId: 'wxf5ad8734295d43f8',
+                            url: '/pages/login?type=logout'
+                        })
+                    } else {
                         tab.reLaunch("/pages/index");
-                    }                 
-
+                    }
                 });
             });
-        },     
+        },
         /**
          * @初始化默认主题
          */