Ver Fonte

功能代码优化

fanghuisheng há 1 ano atrás
pai
commit
1e54572265

+ 1 - 3
src/App.vue

@@ -23,10 +23,8 @@ watchEffect(() => {
 
 onLaunch(() => {
   console.log("App Launch");
-
-  //#ifdef APP-PLUS || MP-WEIXIN || H5
+  
   uni.hideTabBar(); //隐藏自带tabbar
-  //#endif
 
   //#ifdef APP-PLUS
   plus.screen.lockOrientation("portrait-primary"); //设置不可横屏

+ 2 - 2
src/components/oa-scroll/index.vue

@@ -69,8 +69,8 @@ const props = defineProps({
   },
   //设置外部style
   customStyle: {
-    type: String || Object,
-    default: "" || {},
+    type: [String, Object],
+    default: "",
   },
   //是否开启上拉加载
   refresherLoad: {

+ 19 - 3
src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "综合智慧云",
     "appid" : "__UNI__36DE3A0",
     "description" : "综合智慧云",
-    "versionName" : "2.0.4",
-    "versionCode" : 6,
+    "versionName" : "2.0.5",
+    "versionCode" : 7,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -31,7 +31,8 @@
             "Barcode" : {},
             "Camera" : {},
             "Fingerprint" : {},
-            "Contacts" : {}
+            "Contacts" : {},
+            "Push" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
@@ -110,6 +111,21 @@
                         "appkey_ios" : "ffc71dfd4e576596027f8f45a1b8fb2f",
                         "appkey_android" : "ffc71dfd4e576596027f8f45a1b8fb2f"
                     }
+                },
+                "push" : {
+                    "unipush" : {
+                        "version" : "2",
+                        "offline" : false,
+                        "icons" : {
+                            "small" : {
+                                "hdpi" : "unpackage/res/push/36x36.png",
+                                "ldpi" : "unpackage/res/push/18x18.png",
+                                "mdpi" : "unpackage/res/push/24x24.png",
+                                "xhdpi" : "unpackage/res/push/48x48.png",
+                                "xxhdpi" : "unpackage/res/push/72x72.png"
+                            }
+                        }
+                    }
                 }
             },
             "icons" : {

+ 4 - 4
src/pages/business/fireIot/alarmManage/alarmDetailsList/index.vue

@@ -51,14 +51,14 @@ const tabsList = ref([
     name: "全部",
     value: "",
   },
-  {
-    name: "已处理",
-    value: 1,
-  },
   {
     name: "未处理",
     value: 0,
   },
+  {
+    name: "已处理",
+    value: 1,
+  },
 ]);
 const tabsCurrent = ref(0);
 

+ 4 - 4
src/pages/index.vue

@@ -39,10 +39,10 @@
                 <view class="transition-section-content-text"> 扫一扫 </view>
               </view>
               <!-- <div class="transition-section-divider"></div>
-            <view class="transition-section-content">
-              <text class="transition-section-content-icon iconfont ucicon-saoyisao"></text>
-              <view class="transition-section-content-text">发起群聊 </view>
-            </view> -->
+              <view class="transition-section-content">
+                <text class="transition-section-content-icon iconfont ucicon-saoyisao"></text>
+                <view class="transition-section-content-text">发起群聊 </view>
+              </view> -->
             </view>
           </view>
         </u-transition>

+ 65 - 69
src/pages/login.vue

@@ -1,10 +1,7 @@
 <template>
   <view id="login" class="section">
-    <!-- <u-loading-page :loading="true" loading-text="loading..."  loading-mode="spinner"></u-loading-page> -->
-
     <view class="bg">
       <image class="bgImage" :src="useStore.$state.loginBg" v-if="useStore.$state.loginBg" />
-      <!-- <image class="bgImage" src="@/static/images/wt/bg.png" v-else /> -->
     </view>
 
     <view class="middle">
@@ -26,12 +23,11 @@
 
       <view id="login-input" v-if="switchText == '账号密码登录'">
         <u-input v-model="phone" prefixIcon="phone" placeholder="请输入手机号码" />
-      </view>
 
-      <view id="login-input" v-if="switchText == '账号密码登录'">
         <u-input v-model="verify" prefixIcon="email" placeholder="请输入验证码" :maxlength="6">
           <template #suffix>
-            <u-button @click="getVerifyCode">{{ !codeTime ? "获取验证码" : codeTime + "s" }}</u-button>
+            <button class="verify" @click="getVerifyCode">{{ !codeTime ? "获取验证码" : codeTime + "s" }}</button>
+            <!-- <u-button @click="getVerifyCode">{{ !codeTime ? "获取验证码" : codeTime + "s" }}</u-button> -->
           </template>
         </u-input>
       </view>
@@ -96,8 +92,6 @@ const data = reactive({
   linkUrl: uni.getStorageSync("serveUrl"),
   /** 用户隐私协议数据 */
   userChecked: [true],
-
-  // VerificationCodeOne
 });
 
 const { phone, verify, codeTime, switchText, username, password, inputIconBool, linkUrl, userChecked } = toRefs(data);
@@ -179,7 +173,7 @@ function env() {
     // linkUrl.value='ces.cn';
     // linkUrl.value = "172.16.120.165:13207";
     // linkUrl.value = "172.16.120.165:13200";
-    // linkUrl.value = "1";
+    // linkUrl.value = "localhost:81";
 
     useStore.GetMobileTenantConfig({ url: linkUrl.value });
   }
@@ -205,9 +199,7 @@ function submitRes() {
     proxy.$modal.msg("首次登录请先进行服务器配置");
     return;
   }
-  //#endif
 
-  //#ifdef APP-PLUS || MP-WEIXIN
   if (!userChecked.value[0]) {
     proxy.$modal.msg("请在阅读并同意 用户协议和隐私协议后登录");
     return;
@@ -316,62 +308,18 @@ onLoad((options) => {});
     margin: auto;
     margin-top: 30%;
 
-    // 登录页-服务器配置样式 开始
-    #login-input {
-      :deep(.u-input) {
-        height: 45px;
-        border-radius: 8px;
-        padding: 5px 12px !important;
-        border: 0 !important;
-        // border-color: #000 !important;
-        // border-color: gray !important;
-        // background-color: rgba(255, 255, 255, 0.1) !important;
-        background-color: #f5f6fa !important;
-        margin-bottom: 15px;
-      }
-
-      :deep(.input-placeholder) {
-        color: #c0c4cc !important;
-      }
-
-      :deep(.uni-input-wrapper) {
-        font-size: 16px;
-      }
-
-      :deep(.u-icon__icon) {
-        font-size: 24px !important;
-        line-height: 24px !important;
-        color: gray !important;
-      }
-
-      :deep(.iconfont) {
-        color: gray !important;
-      }
-
-      :deep(:-webkit-autofill) {
-        caret-color: #000; // 设置光标颜色
-        // -webkit-text-fill-color: gray !important;
-        -webkit-box-shadow: 0 0 0px 1000px transparent inset !important;
-        background-color: transparent;
-        background-image: none;
-        transition: background-color 50000s ease-in-out 0s; //背景色透明  生效时长  过渡效果  启用时延迟的时间
-      }
-    }
-
     .top {
       display: flex;
       align-items: center;
       justify-content: center;
       margin-bottom: 60px;
 
-      :deep(uni-image) {
+      .logo {
         height: 40px;
-        // width:40px;
         width: auto;
-      }
-      .logo {
         margin-right: 10px;
       }
+
       .title {
         font-size: 20px;
         color: #000;
@@ -412,15 +360,67 @@ onLoad((options) => {});
         color: #fff;
         padding: 3px 5px;
         border-radius: 3px;
+
+        &::after {
+          content: "";
+          position: absolute;
+          border: 5px solid transparent;
+          transform: rotate(90deg);
+          right: 5px;
+          bottom: -9px;
+          border-left-color: #2a98ff;
+        }
       }
-      #okay::after {
-        content: "";
-        position: absolute;
-        border: 5px solid transparent;
-        transform: rotate(90deg);
-        right: 5px;
-        bottom: -9px;
-        border-left-color: #2a98ff;
+    }
+
+    // 登录页-服务器配置样式 开始
+    #login-input {
+      :deep(.u-input) {
+        height: 45px;
+        border: 0 !important;
+        border-radius: 8px;
+        margin-bottom: 15px;
+        padding: 5px 12px !important;
+        background-color: #f5f6fa !important;
+      }
+
+      :deep(.input-placeholder) {
+        color: #c0c4cc !important;
+      }
+
+      :deep(.uni-input-wrapper) {
+        font-size: 16px;
+      }
+
+      :deep(.u-icon__icon) {
+        font-size: 24px !important;
+        line-height: 24px !important;
+        color: gray !important;
+      }
+
+      :deep(.iconfont) {
+        color: gray !important;
+      }
+
+      :deep(:-webkit-autofill) {
+        caret-color: #000; // 设置光标颜色
+        // -webkit-text-fill-color: gray !important;
+        -webkit-box-shadow: 0 0 0px 1000px transparent inset !important;
+        background-color: transparent;
+        background-image: none;
+        transition: background-color 50000s ease-in-out 0s; //背景色透明  生效时长  过渡效果  启用时延迟的时间
+      }
+
+      .verify {
+        color: #2a98ff;
+        font-size: 14px;
+        padding-left: 0px;
+        padding-right: 0px;
+        background-color: transparent;
+
+        &::after {
+          border: 0px;
+        }
       }
     }
 
@@ -477,9 +477,5 @@ onLoad((options) => {});
       font-size: 14px;
     }
   }
-
-  .iconfont {
-    color: #999;
-  }
 }
 </style>

BIN
unpackage/res/push/18x18.png


BIN
unpackage/res/push/24x24.png


BIN
unpackage/res/push/36x36.png


BIN
unpackage/res/push/48x48.png


BIN
unpackage/res/push/72x72.png