cordova update

613eeaeb · wangqinghua · 60e0c39c · 613eeaeb · 613eeaeb · 613eeaeb
Commit 613eeaeb authored Jul 02, 2019 by wangqinghua
Hide whitespace changes
Inline Side-by-side

Showing with 24 additions and 9 deletions

app.component.ts src/app/app.component.ts +4 -3

app.scss src/app/app.scss +17 -2

index.html src/index.html +0 -1

http.service.ts src/service/http.service.ts +3 -3

No files found.
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -39,14 +39,15 @@ export class MyApp {
                public mobileAccess: MobileAccessibility,
                public appService: AppService) {
        platform.ready().then(() => {
-
            this.splashScreen.hide();
            this.statusBar.show();
            this.statusBar.overlaysWebView(false);
            this.statusBar.backgroundColorByHexString('#e12724');
            this.statusBar.styleLightContent();

-            this.screenOrientation.lock('portrait-primary');  //锁定竖屏
+            if (platform.is('android')) {
+                this.screenOrientation.lock('portrait-primary');  //锁定竖屏
+            }


            timer(4500).subscribe((res) => {
@@ -71,7 +72,7 @@ export class MyApp {
            version = version.replace(' ', '');
            this.appUpdateService.compariVersion().subscribe(res => {
                let data = res.json();
-                data.latestVersion = data.replace(' ', '');
+                data.latestVersion = data.latestVersion.replace(' ', '');
                if (data.code == 200) {
                    if (data.latestVersion != null && data.latestVersion != version) {
                        this.appUpdateService.detectionUpgrade(data.androidDownload, true); //提示升级

--- a/src/app/app.scss
+++ b/src/app/app.scss
@@ -378,7 +378,6 @@ ion-navbar .header-ios .toolbar-ios:last-child .toolbar-background-ios {
    top: 20%;
    left: 10%;
    width: 80%;
-    height: 270px;
    background-color: #fff;
    border-radius: 5px;

@@ -415,6 +414,23 @@ ion-navbar .header-ios .toolbar-ios:last-child .toolbar-background-ios {
    }
  }

+  @media screen and (max-width: 2000px) {
+    .mask-content-edu {
+      height: 56%;
+    }
+    .mask-content-bir {
+      height: 56%;
+    }
+  }
+
+  @media screen and (max-width: 480px) {
+    .mask-content-edu {
+      height: 280px;
+    }
+    .mask-content-bir{
+      height: 270px;
+    }
+  }

  //主题教育
  .mask-content-edu {
@@ -422,7 +438,6 @@ ion-navbar .header-ios .toolbar-ios:last-child .toolbar-background-ios {
    top: 20%;
    left: 10%;
    width: 80%;
-    height: 280px;
    border-radius: 5px;
    background: url(../assets/imgs/home/edu_mask.png) repeat;
    background-size: cover;

--- a/src/index.html
+++ b/src/index.html
 <!DOCTYPE html>
 <html lang="zh" dir="ltr">
-
 <head>
    <meta charset="UTF-8">
    <title>部机关党建云平台</title>

--- a/src/service/http.service.ts
+++ b/src/service/http.service.ts
@@ -15,9 +15,9 @@ export class AppGlobal {
    //接口基地址
    // static domain = "http://101.89.112.92:80";     //正式环境
    // static domain = "http://192.168.2.235:8080";   //测试环境
-    // static domain = "http://47.103.33.196:8080";   //阿里云测试地址
-    // static domain = "http://47.103.35.216:8080";   //阿里云正式地址
-    static domain = "";   //本地环境
+    static domain = "http://47.103.33.196:8080";   //阿里云正式地址
+    // static domain = "http://47.103.35.216:8080";   //阿里云测试地址
+    // static domain = "";   //本地环境
    //

    //图片地址