修复无法退出问题/优化deep使用率

README.md

@@ -4,7 +4,7 @@
 ### 密码：FIRE_admin123
 
 
- ## node
- >18.1.0
+## node>18.1.0||16.17.1
+ 
 
 

src/manifest.json

@@ -5,13 +5,12 @@
     "versionName" : "2.1.9",
     "versionCode" : 19,
     "transformPx" : false,
-    /* 5+App特有相关 */
     "app-plus" : {
         "compatible" : {
-            "ignoreVersion" : true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持
+            "ignoreVersion" : true
         },
         "kernel" : {
-            "ios" : "WKWebview" //或者 "WKWebview"
+            "ios" : "WKWebview"
         },
         "usingComponents" : true,
         "nvueStyleCompiler" : "uni-app",
@@ -28,7 +27,6 @@
             "landscape-primary",
             "landscape-secondary"
         ],
-        /* 模块配置 */
         "modules" : {
             "VideoPlayer" : {},
             "iBeacon" : {},
@@ -40,9 +38,7 @@
             "Camera" : {},
             "LivePusher" : {}
         },
-        /* 应用发布信息 */
         "distribute" : {
-            /* android打包配置 */
             "android" : {
                 "permissions" : [
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
@@ -88,7 +84,6 @@
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ],
                 "targetSdkVersion" : 30
             },
-            /* ios打包配置 */
             "ios" : {
                 "dSYMs" : false,
                 "privacyDescription" : {
@@ -107,7 +102,6 @@
                 },
                 "UIBackgroundModes" : ""
             },
-            /* SDK配置 */
             "sdkConfigs" : {
                 "ad" : {},
                 "maps" : {
@@ -201,13 +195,10 @@
             }
         },
         "safearea" : {
-            //可选，JSON对象，安全区域配置
             "offset" : "none"
         }
     },
-    /* 快应用特有相关 */
     "quickapp" : {},
-    /* 小程序特有相关 */
     "mp-weixin" : {
         "appid" : "",
         "setting" : {
@@ -257,5 +248,4 @@
     "vueVersion" : "3",
     "locale" : "zh-Hans"
 }
-/* ios打包配置 *//* SDK配置 */
 

src/pages/business/common/projectMange/list/addEdit.vue

@@ -364,24 +364,22 @@ onUnload(() => {
 </script>
 
 <style lang="scss" scoped>
-:deep(.u-cell__body) {
-  color: #000000;
-  font-size: 12px;
-  padding: 10px 0px !important;
-}
-
-:deep(.u-collapse-item__content) {
-  overflow: auto;
-}
-
-:deep(.u-collapse-item__content__text) {
-  padding: 0;
-}
-
-:deep(.u-cell__left-icon-wrap) {
-  margin: 0;
+:deep() {
+  .u-cell__body {
+    color: #000000;
+    font-size: 12px;
+    padding: 10px 0px !important;
+  }
+  .u-collapse-item__content {
+    overflow: auto;
+  }
+  .u-collapse-item__content__text {
+    padding: 0;
+  }
+  .u-cell__left-icon-wrap {
+    margin: 0;
+  }
 }
-
 .content-area {
   &-title {
     text-align: right;

src/pages/business/common/projectMange/write/components/template1.vue

@@ -68,7 +68,7 @@
     <view class="content-area-item mt10 p10 bg-white">
       <view class="font14 weight mb10">抄送到人</view>
       <avatarList :userList="userList" @deleteUsers="deleteUsers" />
-      <u-button class="mt20" type="primary" style="width: 100px; height: 25px" @click="insertUsers()" shape="circle" icon="plus" size="mini" :disabled="form.reportStatus==1"> 选择人员 </u-button>
+      <u-button class="mt20" type="primary" style="width: 100px; height: 25px" @click="insertUsers()" shape="circle" icon="plus" size="mini" :disabled="form.reportStatus == 1"> 选择人员 </u-button>
     </view>
     <view class="content-area-item mt10 p10 bg-white">
       <view class="flex">
@@ -78,14 +78,14 @@
           :modelValue="form.sendDingTalk == 0 ? false : true"
           :ctiveColor="proxy.$settingStore.themeColor.color"
           size="20"
-          :disabled="form.reportStatus==1"
+          :disabled="form.reportStatus == 1"
           @change="(event) => switchChage(event, 'sendDingTalk')"
           asyncChange
         ></u-switch>
       </view>
       <view class="flex"> </view>
     </view>
-    <view class="content-area-item mt10 p10 bg-white"  v-if="form.reportStatus != 1">
+    <view class="content-area-item mt10 p10 bg-white" v-if="form.reportStatus != 1">
       <view class="flex">
         <view class="font14 weight">定时发送</view>
         <u-switch
@@ -229,9 +229,9 @@ function insertUsers() {
 
 /** 删除人员按钮事件 */
 function deleteUsers(index) {
-  if(state.form.reportStatus==1){
-    console.log('已发送不可修改抄送人')
-    return
+  if (state.form.reportStatus == 1) {
+    console.log("已发送不可修改抄送人");
+    return;
   }
   state.userList.splice(index, 1);
   realTimeSaving();
@@ -277,8 +277,8 @@ function modalConfirm() {
 
 /** 提交 */
 function handleSubmit() {
-  state.form.sendDingTalk==true?1:0;
-  state.form.id=state.form.id?Number(state.form.id):'';
+  state.form.sendDingTalk == true ? 1 : 0;
+  state.form.id = state.form.id ? Number(state.form.id) : "";
   state.form.ccTo = state.userList.map((obj) => `${obj.id}`).join(",");
   state.form.reportDate = proxy.$time.formatterDate(new Date(), "yyyy-MM-dd");
   state.form.workContents.forEach((e) => {
@@ -311,8 +311,8 @@ watch(
     state.form.workContents.forEach((e) => {
       state.projectsCheck.push(e.projectId);
     });
-    var ccTo = state.form.ccTo.length > 0 ? state.form.ccTo.split(",").map((num) => Number(num)) : []; 
-    setTimeout(function(){
+    var ccTo = state.form.ccTo.length > 0 ? state.form.ccTo.split(",").map((num) => Number(num)) : [];
+    setTimeout(function () {
       state.userDate.forEach((e) => {
         if (ccTo.includes(e.userId)) {
           state.userList.push({
@@ -331,8 +331,7 @@ watch(
           });
         }
       });
-    },300)
-    
+    }, 300);
 
     projectApi()
       .ProjectsSelect()
@@ -362,16 +361,11 @@ onShow(() => {
 
 onLoad((options) => {
   init();
-  if(options.id){
-    state.form.id=options.id
-  }else{
-    state.form.id=''
+  if (options.id) {
+    state.form.id = options.id;
+  } else {
+    state.form.id = "";
   }
-
-
-
-
-
 });
 
 onUnload(() => {
@@ -380,22 +374,24 @@ onUnload(() => {
 </script>
 
 <style lang="scss" scoped>
-:deep(.u-cell__body) {
-  color: #000000;
-  font-size: 12px;
-  padding: 10px 0px !important;
-}
+:deep() {
+  .u-cell__body {
+    color: #000000;
+    font-size: 12px;
+    padding: 10px 0px !important;
+  }
 
-:deep(.u-collapse-item__content) {
-  overflow: auto;
-}
+  .u-collapse-item__content {
+    overflow: auto;
+  }
 
-:deep(.u-collapse-item__content__text) {
-  padding: 0;
-}
+  .u-collapse-item__content__text {
+    padding: 0;
+  }
 
-:deep(.u-cell__left-icon-wrap) {
-  margin: 0;
+  .u-cell__left-icon-wrap {
+    margin: 0;
+  }
 }
 
 .content-area {

src/pages/business/common/videoMonitor/videoDetail.vue

@@ -75,11 +75,12 @@ onLoad((options) => {
 </script>
 
 <style lang="scss" scoped>
-:deep(.u-input__content__field-wrapper__field) {
-  font-size: 13px !important;
-}
-
-:deep(.u-textarea__field) {
-  font-size: 13px;
+:deep() {
+  .u-input__content__field-wrapper__field {
+    font-size: 13px !important;
+  }
+  .u-textarea__field {
+    font-size: 13px;
+  }
 }
 </style>

src/pages/register.vue

@@ -178,36 +178,39 @@ onLoad((options) => {});
   }
 
   .bottom-area {
-    :deep(.u-input) {
-      height: 45px;
-      border-radius: 8px;
-      padding: 5px 12px !important;
-      border: 0 !important;
-      background-color: #f5f6fa !important;
-      margin-bottom: 15px;
-    }
-
-    :deep(.u-icon__icon) {
-      font-size: 24px !important;
-      line-height: 24px !important;
-      color: gray !important;
-    }
-
-    :deep(.iconfont) {
-      color: gray !important;
-    }
-
-    :deep(.input-placeholder) {
-      color: #c0c4cc !important;
-    }
-
-    :deep(.uni-input-wrapper) {
-      font-size: 16px;
+    :deep() {
+      .u-input {
+        height: 45px;
+        border-radius: 8px;
+        padding: 5px 12px !important;
+        border: 0 !important;
+        background-color: #f5f6fa !important;
+        margin-bottom: 15px;
+      }
+      .u-icon__icon {
+        font-size: 24px !important;
+        line-height: 24px !important;
+        color: gray !important;
+      }
+      .iconfont {
+        color: gray !important;
+      }
+      .input-placeholder {
+        color: #c0c4cc !important;
+      }
+      .uni-input-wrapper {
+        font-size: 16px;
+      }
+      .u-line {
+        display: none !important;
+      }
     }
+  }
+}
 
-    :deep(.u-line) {
-      display: none !important;
-    }
+@media (min-width: 1280px) {
+  #register-container {
+    padding-top: 10% !important;
   }
 }
 </style>

src/pages/serveConfig.vue

@@ -196,25 +196,24 @@ onLoad((options) => {
   }
 
   .bottom-area {
-    :deep(.u-input) {
-      height: 45px;
-      border-radius: 8px;
-      padding: 5px 12px !important;
-      border: 0 !important;
-      background-color: #f5f6fa !important;
-      margin-bottom: 15px;
-    }
-
-    :deep(.input-placeholder) {
-      color: #c0c4cc !important;
-    }
-
-    :deep(.uni-input-wrapper) {
-      font-size: 16px;
-    }
-
-    :deep(.u-line) {
-      display: none !important;
+    :deep() {
+      .u-input {
+        height: 45px;
+        border-radius: 8px;
+        padding: 5px 12px !important;
+        border: 0 !important;
+        background-color: #f5f6fa !important;
+        margin-bottom: 15px;
+      }
+      .input-placeholder {
+        color: #c0c4cc !important;
+      }
+      .uni-input-wrapper {
+        font-size: 16px;
+      }
+      .u-line {
+        display: none !important;
+      }
     }
   }
 }

src/store/modules/setting.js

@@ -295,7 +295,7 @@ const settingStores = defineStore("storage-setting", {
             let data = {
                 _api_key: "fba7440cd37400b6ff46e303896af4df",
                 appKey: platform === "android" ? "cbd3508235d03365f4253f6aae6b68ab" : "4b858fce6367652f5c0959a0444a4bea",
-                buildVersion: "2.1.7",
+                buildVersion: config.appInfo.version,
             };
             modal.loading("加载中");
             checkUpdates(data).then((res) => {

src/store/modules/user.js

@@ -285,9 +285,9 @@ const useStores = defineStore("useStores", {
     // 退出系统
     LogOut() {
       return new Promise((resolve, reject) => {
-        const openId = null;
+        var openId = null;
         // #ifdef H5
-        openId = localStorage.getItem("wxOpenId") ? localStorage.getItem("wxOpenId") : ""
+        openId = localStorage.getItem("wxOpenId") ? localStorage.getItem("wxOpenId") : "";
         // #endif
 
         logout({ openId: openId })