密码开门功能完成/代码优化

src/App.vue

@@ -31,8 +31,6 @@ function stteingInit() {
     plus.screen.lockOrientation("portrait-primary"); //设置屏幕方向（1.竖屏正方向：portrait-primary 2.竖屏反方向：portrait-secondary 3.横屏正方向：landscape-primary 4.横屏反方向：landscape-secondary 5.自然方向：default）
     plus.navigator.hideSystemNavigation(); //隐藏安卓底部虚拟导航键
   }
-
-  proxy.$settingStore.pushListener(); //开启消息推送监听
 }
 
 watchEffect(() => {

src/components/oa-passBody/index.vue

@@ -1,6 +1,7 @@
 <template>
-  <view class="visit-box" :style="{ backgroundImage: 'url(' + bg + ')' }" v-if="show">
+  <view class="visit-box" v-if="show">
     <!-- <view class="forget-pass" @tap="forgetpass">忘记密码</view> -->
+    <image class="visit-close" src="./close1.png" @click="close"></image>
     <view class="visit-icon"><image :src="icon"></image></view>
     <view class="visit-text">请输入密码</view>
     <view class="visit-list">
@@ -15,7 +16,7 @@
         @click="selectkey(item, index)"
       >
         <text v-if="item.key !== 'backspace'">{{ item.key }}</text>
-        <view class="qingchu-box" v-else><image src="./qingchu.png"></image></view>
+        <view class="qingchu-box" v-else><image src="./qingchu1.png"></image></view>
       </view>
     </view>
   </view>
@@ -25,14 +26,6 @@
 export default {
   name: "visit-box",
   props: {
-    bg: {
-      type: String,
-      default: "",
-    },
-    icon: {
-      type: String,
-      default: "",
-    },
     show: {
       type: Boolean,
       default: false,
@@ -80,12 +73,19 @@ export default {
         }
         this.select.splice(this.selectIndex, 1);
         this.$forceUpdate();
-      } else if (this.selectIndex === 6) {
+      }
+
+      if (this.selectIndex === 6) {
+        this.$emit("change", this.select.join(""));
       }
     },
     forgetpass() {
       this.$emit("forgetpass");
     },
+    //关闭按钮事件
+    close() {
+      this.$emit("close", false);
+    },
   },
   watch: {
     select: {
@@ -117,9 +117,9 @@ export default {
   height: 100vh;
   overflow: hidden;
   position: relative;
-  background-position: center center;
-  background-size: cover;
-  background: rgba(0, 0, 0, 0.3);
+  background: url(./bg.png) no-repeat;
+  background-size: 100% 100%;
+
   .forget-pass {
     width: 144rpx;
     height: 56rpx;
@@ -136,12 +136,22 @@ export default {
     top: 19rpx;
     right: 0rpx;
   }
+
+  .visit-close {
+    display: block;
+    width: 40rpx;
+    height: 40rpx;
+    margin-top: 50rpx;
+    margin-right: 50rpx;
+    margin-left: auto;
+    margin-bottom: 180rpx;
+  }
+
   .visit-icon {
     width: 68rpx;
     height: 68rpx;
     opacity: 1;
     margin: 0 auto;
-    margin-top: 180rpx;
     & > image {
       width: 100%;
       height: 100%;

src/pages.json

@@ -24,6 +24,42 @@
                 }
             }
         },
+        {
+            "path": "pages/door/setting/other/index",
+            "style": {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false,
+                "navigationStyle": "custom",
+                "app-plus": {
+                    "bounce": "none",
+                    "titleNView": false
+                }
+            }
+        },
+        {
+            "path": "pages/door/setting/serve/index",
+            "style": {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false,
+                "navigationStyle": "custom",
+                "app-plus": {
+                    "bounce": "none",
+                    "titleNView": false
+                }
+            }
+        },
+        {
+            "path": "pages/door/setting/system/index",
+            "style": {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false,
+                "navigationStyle": "custom",
+                "app-plus": {
+                    "bounce": "none",
+                    "titleNView": false
+                }
+            }
+        },
         {
             "path": "pages/face/index",
             "style": {

src/pages/door/index.vue

@@ -1,6 +1,6 @@
 <template>
   <web-view
-    v-show="!controlStore.modal.show"
+    v-show="!controlStore.popup.show"
     ref="faceView"
     id="faceView"
     class="faceView"
@@ -11,85 +11,9 @@
   >
   </web-view>
 
-  <u-modal
-    :show="controlStore.modal.show" 
-    title=""
-    cancelText="退出应用"
-    confirmText="确认"
-    :zoom="false"
-    :showConfirmButton="true"
-    :showCancelButton="true"
-    :closeOnClickOverlay="true"
-    @confirm="controlStore.modalConfirm()"
-    @cancel="controlStore.modalCancel()"
-    @close="controlStore.modalClose()"
-  >
-    <view class="slot-content">
-      <u-subsection class="mb20" :list="controlStore.subsection.list" :current="controlStore.subsection.value" @change="controlStore.sectionChange"></u-subsection>
-
-      <view v-if="controlStore.subsection.value == 0">
-        <view class="mb10 required">服务器地址</view>
-        <view class="mb20">
-          <u-input v-model="controlStore.form.linkUrl" placeholder="服务器地址（必填）" border="bottom" style="padding: 6px 0px" />
-        </view>
-
-        <view class="mb10">服务器端口</view>
-        <view class="mb20">
-          <u-input v-model="controlStore.form.port" placeholder="服务器端口（非必填）" border="bottom" style="padding: 6px 0px" />
-        </view>
-      </view>
-
-      <view v-if="controlStore.subsection.value == 1">
-        <view class="mb10">绑定门禁</view>
-        <view>
-          <u-input
-            v-model="controlStore.form.doorList.name"
-            placeholder="门禁（必选）"
-            suffixIcon="arrow-right"
-            suffixIconStyle="color: #909399"
-            border="none"
-            disabledColor="transparent"
-            disabled
-            @click="controlStore.handlePicker('绑定门禁')"
-          />
-        </view>
-      </view>
-
-      <u-cell-group v-if="controlStore.subsection.value == 2">
-        <!-- <u-cell title="导航栏显示">
-          <template #value>
-            <u-switch v-model="setting.navBarNew" size="15" @change="navBarNewChange"></u-switch>
-          </template>
-        </u-cell> -->
-        <u-cell title="软件版本号" :value="version"></u-cell>
-        <!-- <u-cell title="设备型号" :value="getAndroidModle()"></u-cell>
-        <u-cell title="设备序列号" :value="getSerialno()"></u-cell> -->
-        <u-cell title="检查更新" @click="handleToUpgrade()">
-          <template #value> <view class="iconfont oaIcon-jianchagengxin menu-item-icon mr2" style="color: #2979ff"></view> </template>
-        </u-cell>
-        <!-- <u-cell title="设备重启" @click="rebootNow()">
-          <template #value> <u-icon name="reload" color="#2979ff" size="20"></u-icon> </template>
-        </u-cell> -->
-      </u-cell-group>
-    </view>
-  </u-modal>
-
-  <u-picker
-    :show="controlStore.picker.show"
-    :columns="controlStore.picker.list"
-    :title="'请选择' + controlStore.picker.title"
-    keyName="name"
-    visibleItemCount="6"
-    :defaultIndex="[controlStore.picker.defaultIndex]"
-    :closeOnClickOverlay="true"
-    @close="controlStore.picker.show = false"
-    @cancel="controlStore.picker.show = false"
-    @confirm="controlStore.pickerConfirm"
-  ></u-picker>
-
-  <!-- <u-popup :show="popup.show" @close="popupClose" @open="popupOpen" bgColor="#474747" :zIndex="10074">
-    <oaPassBody :show="popup.show"></oaPassBody>
-  </u-popup> -->
+  <u-popup :show="controlStore.popup.show" bgColor="#474747" :zIndex="10074">
+    <oaPassBody :show="controlStore.popup.show" @change="change" @close="close"></oaPassBody>
+  </u-popup>
 </template>
 <script setup>
 /*----------------------------------依赖引入-----------------------------------*/
@@ -97,7 +21,6 @@ import config from "@/config";
 import { onLoad, onShow, onReady, onHide, onLaunch, onUnload, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject, nextTick, watch } from "vue";
 /*----------------------------------接口引入-----------------------------------*/
-import { doorApi } from "@/api/business/door.js";
 /*----------------------------------组件引入-----------------------------------*/
 import oaPassBody from "@/components/oa-passBody/index";
 /*----------------------------------store引入-----------------------------------*/
@@ -114,52 +37,37 @@ const state = reactive({
     width: "100%",
     height: "100%",
   },
-  inter: {
-    doorDom: null,
-  },
-  popup: {
-    show: false,
-  },
 });
-const { version, webviewStyles, popup } = toRefs(state);
+const { version, webviewStyles } = toRefs(state);
 
 // 初始化
 function init() {
-  controlStore.pageFunction = ["门禁"];
   controlStore.initCamera();
-  controlStore.initNfc();
+  // controlStore.initNfc();
   controlStore.initData();
   controlStore.initHandle();
 
-  if (!state.inter.doorDom) {
-    getDoorList();
-    state.inter.doorDom = setInterval(() => {
-      getDoorList();
+  if (!controlStore.inter.doorDom) {
+    controlStore.getDoorList("updateData");
+    controlStore.inter.doorDom = setInterval(() => {
+      controlStore.getDoorList("updateData");
     }, 1000 * 3);
   }
 }
 
-function popupOpen() {}
-
-function popupClose() {}
+function close(event) {
+  controlStore.popup.show = event;
+}
 
-function getDoorList() {
-  if (controlStore.form.domain) {
-    doorApi()
-      .Select({
-        current: 1, //页数
-        size: 2000, //条数
-        domain: controlStore.form.domain, //域名
-        deviceName: controlStore.form.doorList.name,
-      })
-      .then((requset) => {
-        if (requset.data.records.length > 0) {
-          controlStore.handleChildren({
-            funcName: "初始化数据",
-            data: JSON.stringify(requset.data.records[0]),
-          });
-        }
-      });
+function change(event) {
+  if (event == "628628") {
+    controlStore.popup.show = false;
+    controlStore.analysisData({
+      funcName: "点击开门",
+    });
+  } else {
+    controlStore.popup.show = false;
+    proxy.$modal.msg("密码错误");
   }
 }
 
@@ -175,52 +83,16 @@ window.onmessage = function (event) {
 };
 // #endif
 
-/**
- * @检查更新
- */
-function handleToUpgrade() {
-  proxy.$settingStore.handleToUpgrade({
-    success: (res) => {
-      proxy.$refs["oaUpgradeRef"].openUpgrade({
-        modalArray: res.data,
-      });
-    },
-  });
-}
- 
-onLoad((options) => {
+onLoad((options) => {});
+
+onShow(() => {
   setTimeout(() => {
     init();
   }, 500);
-
-  //#ifdef APP-PLUS
-  // const myActivityClass = plus.android.importClass("com.example.serialPort.UniSerialPort"); // 替换为你的包名和Activity名
-  // const myActivity = new myActivityClass(); // 创建插件类的实例
-
-  // console.log(myActivity);
-
-  // myActivity.test();
-
-  // myActivity.open((res) => {
-  //   console.log("open", res);
-  // });
-
-  // myActivity.onMessage((res) => {
-  //   console.log(res);
-  // });
-
-  // myActivity.getAllDeviceList((res) => {
-  //   console.log("getAllDeviceList", res);
-  // });
-
-  // console.log(myActivity.isOpen());
-  //#endif
 });
 
-onShow(() => {});
-
 onUnload(() => {
-  clearInterval(state.inter.doorDom); //销毁之前定时器
+  clearInterval(controlStore.inter.doorDom); //销毁之前定时器
 });
 </script>
 <style>

src/pages/door/setting.vue

@@ -1,175 +0,0 @@
-<template>
-  <oa-scroll
-    customClass="doorSetting-container scroll-height"
-    :customStyle="{
-      //#ifdef APP-PLUS || MP-WEIXIN
-      height: `calc(100vh - (0px))`,
-      //#endif
-      //#ifdef H5
-      height: `calc(100vh - (0px))`,
-      //#endif
-    }"
-    :refresherLoad="false"
-    :refresherEnabled="false"
-    :refresherDefaultStyle="'none'"
-    :refresherBackground="'#f5f6f7'"
-    :data-theme="'theme-' + proxy.$settingStore.themeColor.name"
-  >
-    <template #default>
-      <text class="iconfont oaIcon-exit" @click="handleExit()"></text>
-
-      <view class="Grid">
-        <view class="Grid-item">
-          <image class="Grid-item-image" src="@/static/face/img/serveSetting.png"></image>
-          <view class="Grid-item-lable">服务器配置</view>
-        </view>
-        <view class="Grid-item">
-          <image class="Grid-item-image" src="@/static/face/img/otherSetting.png"></image>
-          <view class="Grid-item-lable">其它配置</view>
-        </view>
-        <view class="Grid-item">
-          <image class="Grid-item-image" src="@/static/face/img/sysetmSetting.png"></image>
-          <view class="Grid-item-lable">系统配置</view>
-        </view>
-        <view class="Grid-item"></view>
-      </view>
-
-      <u-subsection class="mb20" :list="controlStore.subsection.list" :current="controlStore.subsection.value" @change="controlStore.sectionChange"></u-subsection>
-
-      <view v-if="controlStore.subsection.value == 0">
-        <view class="mb10 required">服务器地址</view>
-        <view class="mb20">
-          <u-input v-model="controlStore.form.linkUrl" placeholder="服务器地址（必填）" border="bottom" style="padding: 6px 0px" />
-        </view>
-
-        <view class="mb10">服务器端口</view>
-        <view class="mb20">
-          <u-input v-model="controlStore.form.port" placeholder="服务器端口（非必填）" border="bottom" style="padding: 6px 0px" />
-        </view>
-      </view>
-
-      <view v-if="controlStore.subsection.value == 1">
-        <view class="mb10">绑定门禁</view>
-        <view>
-          <u-input
-            v-model="controlStore.form.doorList.name"
-            placeholder="门禁（必选）"
-            suffixIcon="arrow-right"
-            suffixIconStyle="color: #909399"
-            border="none"
-            disabledColor="transparent"
-            disabled
-            @click="controlStore.handlePicker('绑定门禁')"
-          />
-        </view>
-      </view>
-
-      <u-cell-group v-if="controlStore.subsection.value == 2">
-        <!-- <u-cell title="导航栏显示">
-          <template #value>
-            <u-switch v-model="setting.navBarNew" size="15" @change="navBarNewChange"></u-switch>
-          </template>
-        </u-cell> -->
-        <u-cell title="软件版本号" :value="version"></u-cell>
-        <!-- <u-cell title="设备型号" :value="getAndroidModle()"></u-cell>
-        <u-cell title="设备序列号" :value="getSerialno()"></u-cell> -->
-        <u-cell title="检查更新" @click="handleToUpgrade()">
-          <template #value> <view class="iconfont oaIcon-jianchagengxin menu-item-icon mr2" style="color: #2979ff"></view> </template>
-        </u-cell>
-        <!-- <u-cell title="设备重启" @click="rebootNow()">
-          <template #value> <u-icon name="reload" color="#2979ff" size="20"></u-icon> </template>
-        </u-cell> -->
-      </u-cell-group>
-    </template>
-  </oa-scroll>
-</template>
-<script setup>
-/*----------------------------------依赖引入-----------------------------------*/
-import config from "@/config";
-import { onLoad, onShow, onReady, onHide, onLaunch, onUnload, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
-import { ref, reactive, computed, getCurrentInstance, toRefs, inject, nextTick, watch } from "vue";
-/*----------------------------------接口引入-----------------------------------*/
-import { doorApi } from "@/api/business/door.js";
-/*----------------------------------组件引入-----------------------------------*/
-/*----------------------------------store引入-----------------------------------*/
-import { controlStores } from "@/store/modules/index";
-/*----------------------------------公共方法引入-----------------------------------*/
-const { proxy } = getCurrentInstance();
-const controlStore = controlStores();
-/*----------------------------------公共变量-----------------------------------*/
-const state = reactive({});
-const {} = toRefs(state);
-
-function handleExit() {
-  proxy.$tab.navigateBack(1);
-}
-</script>
-<style lang="scss">
-.doorSetting-container {
-  background: url(@/static/face/img/face_bg.png) no-repeat;
-  background-size: 100% 100%;
-  color: #ffffff;
-  padding: 16px;
-
-  .iconfont {
-    display: block;
-    margin-bottom: 16px;
-  }
-
-  .Grid {
-    display: flex;
-    justify-content: center; /* 左对齐 */
-    flex-wrap: wrap; /* 换行 */
-
-    &-item {
-      flex: 0 0 25%;
-
-      &-image {
-        display: block;
-        width: 40px;
-        height: 40px;
-        margin: auto;
-      }
-
-      &-lable {
-        text-align: center;
-        margin: auto;
-        margin-top: 16px;
-      }
-    }
-  }
-}
-
-@media (min-width: 500px) {
-  .doorSetting-container {
-    font-size: 0.5rem !important;
-    padding: 1rem !important;
-
-    .iconfont {
-      font-size: 1.5rem !important;
-      margin-bottom: 1.5rem !important;
-    }
-
-    .Grid {
-      display: flex;
-      justify-content: center; /* 左对齐 */
-      flex-wrap: wrap; /* 换行 */
-
-      &-item {
-        flex: 0 0 25%;
-        // justify-content: center;
-        // margin: auto;
-
-        &-image {
-          width: 2.5rem;
-          height: 2.5rem;
-        }
-
-        &-lable {
-          margin-top: 0.5rem !important;
-        }
-      }
-    }
-  }
-}
-</style>

src/pages/door/setting/index.vue

@@ -33,53 +33,6 @@
         </view>
         <view class="Grid-item"></view>
       </view>
-
-      <u-subsection class="mb20" :list="controlStore.subsection.list" :current="controlStore.subsection.value" @change="controlStore.sectionChange"></u-subsection>
-
-      <view v-if="controlStore.subsection.value == 0">
-        <view class="mb10 required">服务器地址</view>
-        <view class="mb20">
-          <u-input v-model="controlStore.form.linkUrl" placeholder="服务器地址（必填）" border="bottom" style="padding: 6px 0px" />
-        </view>
-
-        <view class="mb10">服务器端口</view>
-        <view class="mb20">
-          <u-input v-model="controlStore.form.port" placeholder="服务器端口（非必填）" border="bottom" style="padding: 6px 0px" />
-        </view>
-      </view>
-
-      <view v-if="controlStore.subsection.value == 1">
-        <view class="mb10">绑定门禁</view>
-        <view>
-          <u-input
-            v-model="controlStore.form.doorList.name"
-            placeholder="门禁（必选）"
-            suffixIcon="arrow-right"
-            suffixIconStyle="color: #909399"
-            border="none"
-            disabledColor="transparent"
-            disabled
-            @click="controlStore.handlePicker('绑定门禁')"
-          />
-        </view>
-      </view>
-
-      <u-cell-group v-if="controlStore.subsection.value == 2">
-        <!-- <u-cell title="导航栏显示">
-            <template #value>
-              <u-switch v-model="setting.navBarNew" size="15" @change="navBarNewChange"></u-switch>
-            </template>
-          </u-cell> -->
-        <u-cell title="软件版本号" :value="version"></u-cell>
-        <!-- <u-cell title="设备型号" :value="getAndroidModle()"></u-cell>
-          <u-cell title="设备序列号" :value="getSerialno()"></u-cell> -->
-        <u-cell title="检查更新" @click="handleToUpgrade()">
-          <template #value> <view class="iconfont oaIcon-jianchagengxin menu-item-icon mr2" style="color: #2979ff"></view> </template>
-        </u-cell>
-        <!-- <u-cell title="设备重启" @click="rebootNow()">
-            <template #value> <u-icon name="reload" color="#2979ff" size="20"></u-icon> </template>
-          </u-cell> -->
-      </u-cell-group>
     </template>
   </oa-scroll>
 </template>
@@ -102,20 +55,25 @@ const {} = toRefs(state);
 
 function handle(type) {
   if (type == "serve") {
+    proxy.$tab.navigateTo("/pages/door/setting/serve/index");
   } else if (type == "other") {
     if (!controlStore.form.linkUrl) {
       proxy.$modal.msg("请先配置服务器信息!");
       return;
     }
-
-    
+    proxy.$tab.navigateTo("/pages/door/setting/other/index");
   } else if (type == "sysetm") {
+    proxy.$tab.navigateTo("/pages/door/setting/system/index");
   }
 }
 
 function handleExit() {
-  proxy.$tab.navigateBack(1);
+  proxy.$tab.redirectTo("/pages/door/index");
 }
+
+onLoad((options) => {
+  controlStore.initData(); //初始化数据
+});
 </script>
 <style lang="scss">
 .doorSetting-container {
@@ -155,7 +113,7 @@ function handleExit() {
 
 @media (min-width: 500px) {
   .doorSetting-container {
-    font-size: 0.5rem !important;
+    font-size: 0.6rem !important;
     padding: 1rem !important;
 
     .iconfont {

src/pages/door/setting/other/index.vue

@@ -0,0 +1,112 @@
+<template>
+  <oa-scroll
+    customClass="doorSettingOther-container scroll-height"
+    :customStyle="{
+      //#ifdef APP-PLUS || MP-WEIXIN
+      height: `calc(100vh - (0px))`,
+      //#endif
+      //#ifdef H5
+      height: `calc(100vh - (0px))`,
+      //#endif
+    }"
+    :refresherLoad="false"
+    :refresherEnabled="false"
+    :refresherDefaultStyle="'none'"
+    :refresherBackground="'#f5f6f7'"
+    :data-theme="'theme-' + proxy.$settingStore.themeColor.name"
+  >
+    <template #default>
+      <text class="iconfont oaIcon-left" @click="handleExit()"></text>
+
+      <view class="mb10">绑定门禁</view>
+      <view>
+        <u-input
+          v-model="controlStore.form.doorList.name"
+          placeholder="门禁（必选）"
+          suffixIcon="arrow-right"
+          suffixIconStyle="color: white"
+          border="none"
+          color="white"
+          disabledColor="transparent"
+          disabled
+          @click="controlStore.handlePicker('绑定门禁')"
+        />
+      </view>
+    </template>
+  </oa-scroll>
+
+  <u-picker
+    :show="controlStore.picker.show"
+    :columns="controlStore.picker.list"
+    :title="'请选择' + controlStore.picker.title"
+    keyName="name"
+    visibleItemCount="6"
+    :defaultIndex="[controlStore.picker.defaultIndex]"
+    :closeOnClickOverlay="true"
+    @close="controlStore.picker.show = false"
+    @cancel="controlStore.picker.show = false"
+    @confirm="controlStore.pickerConfirm"
+  ></u-picker>
+</template>
+<script setup>
+/*----------------------------------依赖引入-----------------------------------*/
+import config from "@/config";
+import { onLoad, onShow, onReady, onHide, onLaunch, onUnload, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
+import { ref, reactive, computed, getCurrentInstance, toRefs, inject, nextTick, watch } from "vue";
+/*----------------------------------接口引入-----------------------------------*/
+/*----------------------------------组件引入-----------------------------------*/
+/*----------------------------------store引入-----------------------------------*/
+import { controlStores } from "@/store/modules/index";
+/*----------------------------------公共方法引入-----------------------------------*/
+const { proxy } = getCurrentInstance();
+const controlStore = controlStores();
+/*----------------------------------公共变量-----------------------------------*/
+const state = reactive({});
+const {} = toRefs(state);
+
+function handleExit() {
+  if (controlStore.isDataChange) {
+    proxy.$modal.loading("保存中");
+    uni.setStorageSync("storage_face", controlStore.form);
+    setTimeout(() => {
+      proxy.$tab.navigateBack(1);
+      proxy.$modal.closeLoading();
+    }, 1000);
+  } else {
+    proxy.$tab.navigateBack(1);
+  }
+}
+
+onShow(() => {
+  controlStore.getDoorList();
+});
+
+onLoad((options) => {
+  controlStore.initData(); //初始化数据
+});
+</script>
+<style lang="scss">
+.doorSettingOther-container {
+  background: url(@/static/face/img/face_bg.png) no-repeat;
+  background-size: 100% 100%;
+  color: #ffffff;
+  padding: 16px;
+
+  .iconfont {
+    display: block;
+    margin-bottom: 16px;
+  }
+}
+
+@media (min-width: 500px) {
+  .doorSettingOther-container {
+    font-size: 0.6rem !important;
+    padding: 1rem !important;
+
+    .iconfont {
+      font-size: 1.5rem !important;
+      margin-bottom: 1.5rem !important;
+    }
+  }
+}
+</style>

src/pages/door/setting/serve/index.vue

@@ -16,27 +16,25 @@
     :data-theme="'theme-' + proxy.$settingStore.themeColor.name"
   >
     <template #default>
-      <text class="iconfont oaIcon-exit" @click="handleExit()"></text>
+      <text class="iconfont oaIcon-left" @click="handleExit()"></text>
 
       <view class="mb10 required">服务器地址</view>
       <view class="mb20">
-        <u-input v-model="controlStore.form.linkUrl" placeholder="服务器地址（必填）" border="bottom" style="padding: 6px 0px" />
+        <u-input v-model="controlStore.form.linkUrl" placeholder="服务器地址（必填）" border="bottom" color="white" @change="handleChange" style="padding: 6px 0px" />
       </view>
 
       <view class="mb10">服务器端口</view>
       <view class="mb20">
-        <u-input v-model="controlStore.form.port" placeholder="服务器端口（非必填）" border="bottom" style="padding: 6px 0px" />
+        <u-input v-model="controlStore.form.port" placeholder="服务器端口（非必填）" border="bottom" color="white" @change="handleChange" style="padding: 6px 0px" />
       </view>
     </template>
   </oa-scroll>
 </template>
 <script setup>
 /*----------------------------------依赖引入-----------------------------------*/
-import config from "@/config";
 import { onLoad, onShow, onReady, onHide, onLaunch, onUnload, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject, nextTick, watch } from "vue";
 /*----------------------------------接口引入-----------------------------------*/
-import { doorApi } from "@/api/business/door.js";
 /*----------------------------------组件引入-----------------------------------*/
 /*----------------------------------store引入-----------------------------------*/
 import { controlStores } from "@/store/modules/index";
@@ -47,12 +45,29 @@ const controlStore = controlStores();
 const state = reactive({});
 const {} = toRefs(state);
 
+function handleChange(e) {
+  controlStore.isDataChange = true;
+}
+
 function handleExit() {
-  proxy.$tab.navigateBack(1);
+  if (controlStore.isDataChange) {
+    proxy.$modal.loading("保存中");
+    controlStore.serveChange();
+    setTimeout(() => {
+      proxy.$tab.navigateBack(1);
+      proxy.$modal.closeLoading();
+    }, 1000);
+  } else {
+    proxy.$tab.navigateBack(1);
+  }
 }
+
+onLoad((options) => {
+  controlStore.initData(); //初始化数据
+});
 </script>
 <style lang="scss">
-.doorSetting-container {
+.doorSettingServe-container {
   background: url(@/static/face/img/face_bg.png) no-repeat;
   background-size: 100% 100%;
   color: #ffffff;
@@ -62,61 +77,17 @@ function handleExit() {
     display: block;
     margin-bottom: 16px;
   }
-
-  .Grid {
-    display: flex;
-    justify-content: center; /* 左对齐 */
-    flex-wrap: wrap; /* 换行 */
-
-    &-item {
-      flex: 0 0 25%;
-
-      &-image {
-        display: block;
-        width: 40px;
-        height: 40px;
-        margin: auto;
-      }
-
-      &-lable {
-        text-align: center;
-        margin: auto;
-        margin-top: 16px;
-      }
-    }
-  }
 }
 
 @media (min-width: 500px) {
-  .doorSetting-container {
-    font-size: 0.5rem !important;
+  .doorSettingServe-container {
+    font-size: 0.6rem !important;
     padding: 1rem !important;
 
     .iconfont {
       font-size: 1.5rem !important;
       margin-bottom: 1.5rem !important;
     }
-
-    .Grid {
-      display: flex;
-      justify-content: center; /* 左对齐 */
-      flex-wrap: wrap; /* 换行 */
-
-      &-item {
-        flex: 0 0 25%;
-        // justify-content: center;
-        // margin: auto;
-
-        &-image {
-          width: 2.5rem;
-          height: 2.5rem;
-        }
-
-        &-lable {
-          margin-top: 0.5rem !important;
-        }
-      }
-    }
   }
 }
 </style>

src/pages/door/setting/system/index.vue

@@ -0,0 +1,157 @@
+<template>
+  <oa-scroll
+    customClass="doorSettingSystem-container scroll-height"
+    :customStyle="{
+      //#ifdef APP-PLUS || MP-WEIXIN
+      height: `calc(100vh - (0px))`,
+      //#endif
+      //#ifdef H5
+      height: `calc(100vh - (0px))`,
+      //#endif
+    }"
+    :refresherLoad="false"
+    :refresherEnabled="false"
+    :refresherDefaultStyle="'none'"
+    :refresherBackground="'#f5f6f7'"
+    :data-theme="'theme-' + proxy.$settingStore.themeColor.name"
+  >
+    <template #default>
+      <text class="iconfont oaIcon-left" @click="handleExit()"></text>
+
+      <u-cell-group>
+        <!-- <u-cell title="导航栏显示">
+            <template #value>
+              <u-switch v-model="setting.navBarNew" size="15" @change="navBarNewChange"></u-switch>
+            </template>
+          </u-cell> -->
+        <u-cell title="软件版本号" :value="version"></u-cell>
+        <!-- <u-cell title="设备型号" :value="getAndroidModle()"></u-cell>
+          <u-cell title="设备序列号" :value="getSerialno()"></u-cell> -->
+        <u-cell title="清除缓存" @click="removeToken()">
+          <template #value> <view class="iconfont oaIcon-qingchu" style="color: white; margin: auto 0px"></view> </template>
+        </u-cell>
+        <u-cell title="检查更新" @click="handleToUpgrade()">
+          <template #value> <view class="iconfont oaIcon-jianchagengxin" style="color: white; margin: auto 0px"></view> </template>
+        </u-cell>
+        <u-cell title="退出应用" @click="controlStores.modalCancel()">
+          <template #value> <view class="iconfont oaIcon-exit" style="color: white; margin: auto 0px"></view> </template>
+        </u-cell>
+        <!-- <u-cell title="设备重启" @click="rebootNow()">
+            <template #value> <u-icon name="reload" color="#2979ff" size="20"></u-icon> </template>
+          </u-cell> -->
+      </u-cell-group>
+    </template>
+  </oa-scroll>
+
+  <oa-upgrade ref="oaUpgradeRef" :themesColor="proxy.$settingStore.themeColor.color" />
+</template>
+<script setup>
+/*----------------------------------依赖引入-----------------------------------*/
+import config from "@/config";
+import { getToken, setToken, removeToken } from "@/utils/auth";
+import { onLoad, onShow, onReady, onHide, onLaunch, onUnload, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
+import { ref, reactive, computed, getCurrentInstance, toRefs, inject, nextTick, watch } from "vue";
+/*----------------------------------接口引入-----------------------------------*/
+/*----------------------------------组件引入-----------------------------------*/
+/*----------------------------------store引入-----------------------------------*/
+import { controlStores } from "@/store/modules/index";
+/*----------------------------------公共方法引入-----------------------------------*/
+const { proxy } = getCurrentInstance();
+const controlStore = controlStores();
+/*----------------------------------公共变量-----------------------------------*/
+const state = reactive({
+  version: computed(() => {
+    return config.appInfo.version;
+  }),
+});
+const { version } = toRefs(state);
+
+function handleExit() {
+  proxy.$tab.redirectTo("/pages/door/setting/index");
+}
+
+/**
+ * @检查更新
+ */
+function handleToUpgrade() {
+  proxy.$settingStore.handleToUpgrade({
+    success: (res) => {
+      proxy.$refs["oaUpgradeRef"].openUpgrade({
+        modalArray: res.data,
+      });
+    },
+  });
+}
+
+onLoad((options) => {
+  controlStore.initData(); //初始化数据
+
+  //#ifdef APP-PLUS
+  // const myActivityClass = plus.android.importClass("com.example.serialPort.UniSerialPort"); // 替换为你的包名和Activity名
+  // const myActivity = new myActivityClass(); // 创建插件类的实例
+
+  // console.log(myActivity);
+
+  // myActivity.test();
+
+  // myActivity.open((res) => {
+  //   console.log("open", res);
+  // });
+
+  // myActivity.onMessage((res) => {
+  //   console.log(res);
+  // });
+
+  // myActivity.getAllDeviceList((res) => {
+  //   console.log("getAllDeviceList", res);
+  // });
+
+  // console.log(myActivity.isOpen());
+  //#endif
+});
+</script>
+<style lang="scss" scoped>
+.doorSettingSystem-container {
+  background: url(@/static/face/img/face_bg.png) no-repeat;
+  background-size: 100% 100%;
+  color: #ffffff;
+  padding: 16px;
+
+  .oaIcon-left {
+    display: block;
+    margin-bottom: 16px;
+  }
+
+  :deep() {
+    .u-cell__value,
+    .u-cell__title-text {
+      color: white;
+    }
+  }
+}
+
+@media (min-width: 500px) {
+  .doorSettingSystem-container {
+    font-size: 0.6rem !important;
+    padding: 1rem !important;
+
+    .oaIcon-left {
+      font-size: 1.5rem !important;
+      margin-bottom: 1.5rem !important;
+    }
+
+    :deep() {
+      .u-cell__value,
+      .u-cell__title-text {
+        font-size: 0.8rem !important;
+      }
+
+      .u-cell__body {
+        > .iconfont {
+          font-size: 0.8rem !important;
+        }
+      }
+    }
+  }
+}
+</style>

src/static/face/css/door_homeCardCenter.css

@@ -7,9 +7,24 @@
 }
 
 .home-card-center>.date {
-    font-size: 1rem;
+    font-size: 1.5rem;
     position: relative;
     top: calc(40% - 20vh / 2);
+    display: flex;
+    flex-wrap: wrap;
+}
+
+.home-card-center>.date .title {
+    width: 100%;
+    text-align: center;
+    margin-bottom: 1.5rem;
+}
+
+.home-card-center>.date .remark {
+    width: 80%;
+    font-size: 1rem;
+    text-align: center;
+    margin: 0 auto;
 }
 
 video,

src/static/face/css/door_homeCardFooter.css

@@ -6,31 +6,19 @@
     display: flex;
     width: 100%;
     font-size: 1rem;
-    margin-bottom: 1.5rem;
-}
-
-.home-card-footer .date {
-    width: 50%;
-    margin-right: 10%;
-}
-
-.home-card-footer .date .time1 {
-    font-size: 1.5rem;
-    margin-right: 1rem;
-}
-
-.home-card-footer .date .title {
-    margin-top: 0.5rem;
+    margin-bottom: 2rem;
 }
 
 .home-card-footer .qrCode {
-    width: 40%;
-    margin: auto 0;
+    /* width: 40%; */
 }
 
 .home-card-footer .qrCode .buttom {
-    width: 70%;
-    padding: 0.5rem;
+    padding: 0.7rem;
     border-radius: 5px;
     background-color: #1A5FDE;
+}
+
+.home-card-footer .btnArea {
+    margin: 0 auto;
 }

src/static/face/css/door_homeCardTop.css

@@ -5,7 +5,7 @@
     width: calc(100% - (0.5rem * 4));
     margin: 0.5rem;
     padding: 1rem 0.5rem;
-    background: #0c2f61;
+    /* background: #0c2f61; */
     border-radius: 15px;
     z-index: 1008;
 }

src/static/face/door.html

@@ -21,9 +21,26 @@
     <link rel="stylesheet" href="./css/door_homeCardCenter.css">
     <!-- 底部区域样式 -->
     <link rel="stylesheet" href="./css/door_homeCardFooter.css">
+    <!-- 引入阿里iconfont库 -->
+    <link rel="stylesheet" href="https://at.alicdn.com/t/c/font_4400427_yp2hzj2yvbf.css">
     <style>
+        .home-card-footer .btnArea .iconfont {
+            font-family: "iconfont" !important;
+            font-size: 2rem;
+            font-style: normal;
+            -webkit-font-smoothing: antialiased;
+            -webkit-text-stroke-width: 0.2px;
+            -moz-osx-font-smoothing: grayscale;
+            color: white;
+        }
+
+        .home-card-footer .btnArea .iconfont:nth-child(2n) {
+            margin-left: 1rem;
+        }
+
         @media (min-width: 768px) {
             .home-card-top {
+                width: calc(100% - 5rem) !important;
                 margin: 1rem !important;
                 padding: 2rem 1.5rem !important;
             }
@@ -45,9 +62,17 @@
                 font-size: 4rem;
             }
 
+            .home-card-center>.date .title {
+                margin-bottom: 5rem;
+            }
+
+            .home-card-center>.date .remark {
+                font-size: 2rem;
+            }
+
             .home-card-footer {
                 font-size: 2.5rem !important;
-                margin-bottom: 3rem !important;
+                margin-bottom: 4rem !important;
             }
 
             .home-card-footer .date .time1 {
@@ -62,6 +87,14 @@
             .home-card-footer .date .title {
                 margin-top: 1rem !important;
             }
+
+            .home-card-footer .btnArea .iconfont {
+                font-size: 5.5rem;
+            }
+
+            .home-card-footer .btnArea .iconfont:nth-child(2n) {
+                margin-left: 3rem;
+            }
         }
     </style>
 </head>
@@ -74,18 +107,19 @@
         </div>
         <!-- 顶部内容区域 -->
         <div class="home-card-top">
-            <div class="date">
+            <div class="date" id="configDialog2">
                 <span class="time1">{{ state.dateTime }}</span>
                 <span class="time2">{{ state.date }}</span>
             </div>
-            <div class="title">{{ state.doorName || '未绑定门禁' }}</div>
+            <div v-if="state.openMode?.includes('人脸')" class="title">{{ state.doorName || '未绑定门禁' }}</div>
         </div>
         <!-- 人脸内容区域 -->
         <div class="home-card-center" id="home-card-center">
-            <div class="date" id="configDialog1" style="display: none;">
+            <div v-if="!state.openMode?.includes('人脸')" class="date" id="configDialog1">
                 <div class="title">{{ state.doorName || '未绑定门禁' }}</div>
+                <div class="remark">{{state.remark || ""}}</div>
             </div>
-            <div class="face">
+            <div v-if="state.openMode?.includes('人脸')" class="face">
                 <!-- height="1564" -->
                 <video id="video" width="300" height="300" style="width:40vh;height:40vh" preload autoplay loop
                     muted></video>
@@ -96,24 +130,15 @@
         </div>
         <!-- 底部内容区域 -->
         <div class="home-card-footer">
-            <div class="date" id="configDialog2">
-                <span class="time1">{{ state.dateTime }}</span>
-                <span class="time2">{{ state.date }}</span>
-                <div class="title">{{ state.doorName || '未绑定门禁' }}</div>
-            </div>
-            <div class="qrCode">
-                <!-- <div class="buttom">打开二维码</div> -->
+            <!-- <div class="qrCode">
+                <div class="buttom" @click="parentMessage('密码')" v-if="state.openMode?.includes('密码')">密码</div>
                 <div class="buttom" @click="parentMessage('点击开门')" v-if="state.openMode?.includes('点击开门')">点击开门</div>
+            </div> -->
+            <div class="btnArea">
+                <i class="iconfont oa-dianji" @click="parentMessage('点击开门')"
+                    v-if="state.openMode?.includes('点击开门')"></i>
+                <i class="iconfont oa-mima" @click="parentMessage('密码')" v-if="state.openMode?.includes('密码')"></i>
             </div>
-
-            <!-- <svg t="1739774410284" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
-                p-id="6111" width="24" height="24">
-                <path
-                    d="M418.133333 499.2c-21.333333-34.133333-29.866667-72.533333-29.866666-115.2 0-119.466667 93.866667-213.333333 213.333333-213.333333s213.333333 93.866667 213.333333 
-                    213.333333-93.866667 213.333333-213.333333 213.333333c-46.933333 0-85.333333-12.8-123.733333-38.4l-98.133334 98.133334 46.933334 46.933333-59.733334 59.733333-46.933333-46.933333-29.866667 29.866667 46.933334 
-                    46.933333L277.333333 853.333333 170.666667 746.666667l247.466666-247.466667zM601.6 256c-72.533333 0-128 55.466667-128 128s55.466667 128 128 128 128-55.466667 128-128-59.733333-128-128-128z"
-                    fill="#444444" p-id="6112"></path>
-            </svg> -->
         </div>
     </div>
     <script>
@@ -153,22 +178,10 @@
                     that.state.remark = event.remark
 
                     if (event.openMode.includes("人脸")) {
-                        $('.home-card-center .face').css('display', 'block')
-                        $('.home-card-center .date').css('display', 'none')
-                        $('.home-card-footer .date .title').css('display', 'block')
                         that.tracker == null ? that.initVido() : undefined
                     } else {
-                        $('.home-card-center .face').css('display', 'none')
-                        $('.home-card-center .date').css('display', 'block')
-                        $('.home-card-footer .date .title').css('display', 'none')
                         that.tracker != null ? that.closeFace() : undefined
                     }
-
-                    // if (event.openMode.includes("点击开门")) {
-                    //     $('.home-card-footer .qrCode').css('display', 'block')
-                    // } else {
-                    //     $('.home-card-footer .qrCode').css('display', 'none')
-                    // }
                 },
                 // 初始化事件
                 initHandle() {
@@ -309,7 +322,7 @@
                             this.initData(JSON.parse(event.data));
                         } else if (event.funcName == "初始化事件") {
                             this.initHandle()
-                        } else if (event.funcName == "开启摄像头") {
+                        } else if (event.funcName == "开启摄像头" && document.getElementById("video")) {
                             this.initVido();//调用初始化摄像头
                         } else if (event.funcName == "关闭摄像头") {
                             this.closeFace();
@@ -328,11 +341,11 @@
                     if (document.visibilityState === 'visible') {
                         // 页面变为可见时的处理逻辑
                         console.log('页面变为可见');
-                        this.tracker == null ? this.initVido() : undefined
+                        this.tracker == null && document.getElementById("video") ? this.initVido() : undefined
                     } else if (document.visibilityState === 'hidden') {
                         // 页面变为不可见时的处理逻辑
                         console.log('页面变为不可见');
-                        this.tracker != null ? this.closeFace() : undefined
+                        this.tracker != null && document.getElementById("video") ? this.closeFace() : undefined
                     }
                 },
                 // 关闭摄像头

src/static/iconfont/iconfont.css

@@ -1,8 +1,9 @@
 @font-face {
-  font-family: "iconfont"; /* Project id 4510027 */
-  src: url('iconfont.woff2?t=1741163438430') format('woff2'),
-       url('iconfont.woff?t=1741163438430') format('woff'),
-       url('iconfont.ttf?t=1741163438430') format('truetype');
+  font-family: "iconfont";
+  /* Project id 4510027 */
+  src: url('https://at.alicdn.com/t/c/font_4510027_ui8qcchtgh.woff2?t=1741325910411') format('woff2'),
+    url('https://at.alicdn.com/t/c/font_4510027_ui8qcchtgh.woff?t=1741325910411') format('woff'),
+    url('https://at.alicdn.com/t/c/font_4510027_ui8qcchtgh.ttf?t=1741325910411') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +14,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.oaIcon-left:before {
+  content: "\e62b";
+}
+
 .oaIcon-exit:before {
   content: "\e62a";
 }
@@ -211,5 +216,4 @@
 
 .oaIcon-qingchu:before {
   content: "\e61f";
-}
-
+}

src/store/modules/control.js

@@ -15,6 +15,7 @@ const controlStore = defineStore("control", {
     state: () => ({
         pageFunction: [], //被包含的功能
         isClicked: false, //按钮是否被点击
+        isDataChange: false,//数据是否改变
         form: {
             linkUrl: "",
             port: "",
@@ -24,6 +25,9 @@ const controlStore = defineStore("control", {
                 name: undefined,
             },
         },
+        popup: {
+            show: false,
+        },
         modal: {
             show: false,
         },
@@ -37,7 +41,6 @@ const controlStore = defineStore("control", {
             list: ["服务器配置", "其它配置", "系统设置"],
             value: 0,
         },
-
         doooList: [],
         meetingDoorList: [],
         meetingRoomList: [],
@@ -50,6 +53,10 @@ const controlStore = defineStore("control", {
             nextSceneTime: {},
             timeList: [],
         },
+
+        inter: {
+            doorDom: null,
+        },
     }),
     actions: {
         /**
@@ -101,6 +108,29 @@ const controlStore = defineStore("control", {
         initHandle() {
             this.handleChildren({ funcName: "初始化事件", data: {} })
         },
+        /**
+         * @服务器配置保存事件
+         */
+        serveChange() {
+            if (this.form.linkUrl) {
+                if (!/^[a-zA-Z0-9][a-zA-Z0-9-]{1,61}(?:\.[a-zA-Z0-9]{2,})+$/.test(this.form.linkUrl)) {
+                    modal.msg("请输入正确的链接地址");
+                    return;
+                }
+
+                var domain = "";
+                if (this.form.linkUrl) {
+                    domain = this.form.linkUrl;
+                    if (this.form.port) {
+                        domain += ":" + this.form.port;
+                    }
+                }
+
+                this.form.domain = domain;
+                config.baseUrl = "http://" + this.form.domain + "/prod-api";
+            }
+            uni.setStorageSync("storage_face", this.form);
+        },
         /**
          * @弹窗确定按钮事件
          */
@@ -129,7 +159,7 @@ const controlStore = defineStore("control", {
             this.modalClose();
         },
         /**
-         * @弹窗退出按钮事件
+         * @应用退出按钮事件
          */
         modalCancel() {
             this.modal.show = false;
@@ -173,7 +203,7 @@ const controlStore = defineStore("control", {
                     this.getMeetingRoomList();
                 }
                 if (this.pageFunction.includes('门禁')) {
-                    this.getdoorList();
+                    this.getDoorList();
                 }
             }
 
@@ -208,6 +238,7 @@ const controlStore = defineStore("control", {
                 this.form.doorList.name = e.value[0].name;
             }
             this.picker.show = false;
+            this.isDataChange = true
         },
 
         /**
@@ -234,15 +265,35 @@ const controlStore = defineStore("control", {
         /**
          * @门禁下拉列表
          */
-        getdoorList() {
+        getDoorList(type) {
+            this.doooList = [];
+
+            if (!this.form.domain) {
+                return;
+            }
+
+            if (type == 'updateData' && !this.form.doorList.name) {
+                return;
+            }
+
             doorApi()
                 .Select({
                     current: 1, //页数
                     size: 2000, //条数
                     domain: this.form.domain, //域名
+                    deviceName: type == 'updateData' && !this.form.doorList.name ? this.form.doorList.name : undefined
                 })
                 .then((requset) => {
-                    if (requset.data.records.length > 0) {
+                    if (requset.data.records.length <= 0) {
+                        return;
+                    }
+
+                    if (type == "updateData") {
+                        this.handleChildren({
+                            funcName: "初始化数据",
+                            data: JSON.stringify(requset.data.records[0]),
+                        });
+                    } else {
                         requset.data.records.forEach((e) => {
                             this.doooList.push({
                                 value: e.deviceUuid,
@@ -319,6 +370,10 @@ const controlStore = defineStore("control", {
          * @人脸验证
          */
         faceVerify(imageBase) {
+            if (!this.form.domain) {
+                return;
+            }
+
             var that = this
             faceApi()
                 .faceVef({
@@ -387,10 +442,8 @@ const controlStore = defineStore("control", {
             if ("funcName" in event) {
                 if (event.funcName == "打开配置") {
                     this.handleChildren({ funcName: "关闭摄像头", data: {} });
-
-
                     tab.navigateTo("/pages/door/setting/index")
-                    // this.modal.show = true;
+                    this.modal.show = true;
                 } else if (event.funcName == "人脸识别") {
                     this.faceVerify(event.data.imageBase);
                 } else if (event.funcName == "点击开门") {
@@ -398,6 +451,9 @@ const controlStore = defineStore("control", {
                         userId: 99,
                         userName: "方惠圣",
                     });
+                } else if (event.funcName == "密码") {
+                    this.handleChildren({ funcName: "关闭摄像头", data: {} });
+                    this.popup.show = true
                 }
             }
         },

src/utils/request.js

@@ -28,13 +28,13 @@ function verification(res, resolve, reject) {
     }
     modal.closeLoading();
   } else if (code === 500 || res.statusCode === 500 || code === 'BIZ-0000') {
-    if (data.msg.indexOf(":") !== -1) {
-      modal.msg(data.msg.split(":")[1]);
-      reject(data.msg.split(":")[1]);
-    } else {
-      modal.msg(data.msg);
-      reject(data.msg);
-    }
+    // if (data.msg.indexOf(":") !== -1) {
+    //   modal.msg(data.msg.split(":")[1]);
+    //   reject(data.msg.split(":")[1]);
+    // } else {
+    //   modal.msg(data.msg);
+    //   reject(data.msg);
+    // }
     modal.closeLoading();
   } else if (code !== 200 && code !== "0") {
     reject(code);
@@ -42,6 +42,29 @@ function verification(res, resolve, reject) {
   resolve(data);
 }
 
+
+/**
+ * @异常结果方法
+ * @param {返回集} error 
+ * @param {结果抛出} resolve 
+ * @param {控制台打印} reject 
+ */
+function errorFonction(error, resolve, reject) {
+  let { errMsg } = error;
+  if (!errMsg) return;
+  if (errMsg === "Network Error") {
+    errMsg = "后端接口连接异常";
+  } else if (errMsg.includes("timeout")) {
+    errMsg = "系统接口请求超时";
+  } else if (errMsg.includes("Request failed with status code")) {
+    errMsg = "系统接口" + errMsg.substr(errMsg.length - 3) + "异常";
+  }
+  if (errMsg != "request:fail") {
+    modal.msg(errMsg);
+  }
+  reject(error);
+}
+
 const request = (config) => {
 
   // 是否需要设置 token
@@ -85,19 +108,7 @@ const request = (config) => {
         verification(res, resolve, reject);//调用校验结果方法
       })
       .catch((error) => {
-        let { errMsg } = error;
-        if (!errMsg) return;
-        if (errMsg === "Network Error") {
-          errMsg = "后端接口连接异常";
-        } else if (errMsg.includes("timeout")) {
-          errMsg = "系统接口请求超时";
-        } else if (errMsg.includes("Request failed with status code")) {
-          errMsg = "系统接口" + errMsg.substr(errMsg.length - 3) + "异常";
-        }
-        if (errMsg != "request:fail") {
-          modal.msg(errMsg);
-        }
-        reject(error);
+        errorFonction(error, resolve, reject)
       });
   });
 };
@@ -129,18 +140,7 @@ const uploads = (config) => {
         verification(res, resolve, reject);//调用校验结果方法
       },
       fail: (error) => {
-        let { errMsg } = error;
-        if (errMsg == "Network Error") {
-          errMsg = "后端接口连接异常";
-        } else if (errMsg.includes("timeout")) {
-          errMsg = "系统接口请求超时";
-        } else if (errMsg.includes("Request failed with status code")) {
-          errMsg = "系统接口" + errMsg.substr(errMsg.length - 3) + "异常";
-        }
-        if (errMsg != "request:fail") {
-          modal.msg(errMsg);
-        }
-        reject(error);
+        errorFonction(error, resolve, reject)
       },
     });
   });

unpackage/config/setting.js

@@ -70,8 +70,8 @@ filesToModify.forEach((file) => {
                 state.name = '智能门禁'
                 state.appid = '__UNI__8D6E9FD'
                 state.description = '智能门禁APP，是一款集成了现代信息技术和智能化管理功能的移动应用程序。'
-                state.versionName = "1.0.1"
-                state.versionCode = 2
+                state.versionName = "1.0.2"
+                state.versionCode = 3
                 state.h5.title = '智能门禁'
 
                 maps.amap.name = "amapBOujshtbA"