Code Review / dali_platform / mobile.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: d727ec4)
更换LOGO，测试环境
authorqiaowei <jov123@163.com>
Mon, 20 Apr 2020 08:51:56 +0000 (16:51 +0800)
committerqiaowei <jov123@163.com>
Mon, 20 Apr 2020 08:51:56 +0000 (16:51 +0800)
19 files changed:
platforms/android/app/src/main/assets/www/css/index.css patch | blob | history
platforms/android/app/src/main/assets/www/js/server.js patch | blob | history
platforms/android/app/src/main/assets/www/main.html patch | blob | history
platforms/android/app/src/main/res/mipmap-hdpi-v26/ic_launcher_foreground.png patch | blob | history
platforms/android/app/src/main/res/mipmap-hdpi/ic_launcher.png patch | blob | history
platforms/android/app/src/main/res/mipmap-ldpi-v26/ic_launcher_foreground.png patch | blob | history
platforms/android/app/src/main/res/mipmap-ldpi/ic_launcher.png patch | blob | history
platforms/android/app/src/main/res/mipmap-mdpi-v26/ic_launcher_foreground.png patch | blob | history
platforms/android/app/src/main/res/mipmap-mdpi/ic_launcher.png patch | blob | history
platforms/android/app/src/main/res/mipmap-xhdpi-v26/ic_launcher_foreground.png patch | blob | history
platforms/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png patch | blob | history
platforms/android/app/src/main/res/mipmap-xxhdpi-v26/ic_launcher_foreground.png patch | blob | history
platforms/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png patch | blob | history
platforms/android/app/src/main/res/mipmap-xxxhdpi-v26/ic_launcher_foreground.png patch | blob | history
platforms/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png patch | blob | history
www/css/index.css patch | blob | history
www/js/mainmenu.js patch | blob | history
www/js/server.js patch | blob | history
www/main.html patch | blob | history

diff --git a/platforms/android/app/src/main/assets/www/css/index.css b/platforms/android/app/src/main/assets/www/css/index.css
index fb20796..355df4c 100644 (file)
--- a/platforms/android/app/src/main/assets/www/css/index.css
+++ b/platforms/android/app/src/main/assets/www/css/index.css
@@ -44,6 +44,23 @@ body {
     align-items: center;display: flex!important;
    font-size: 20px;
 }
+.meun-img{
+    width:80px;
+    height: 80px;
+}
+@media only screen and (max-height: 700px) {
+    .meun-img{
+        width:80px;
+        height: 80px;
+    }
+}
+@media only screen and (min-height: 701px) {
+    .meun-img{
+        width:90px;
+        height: 90px;
+    }
+}
+
 
 @keyframes myfirst {
     0% {
diff --git a/platforms/android/app/src/main/assets/www/js/server.js b/platforms/android/app/src/main/assets/www/js/server.js
index 426bf2d..f5134a8 100644 (file)
--- a/platforms/android/app/src/main/assets/www/js/server.js
+++ b/platforms/android/app/src/main/assets/www/js/server.js
@@ -1,11 +1,11 @@
-var dev = false;
+var dev = true;
 var SERVER = "https://yy.dlsmk.cn/payapi/mobileapi";
 var DOOR_URl = "https://yy.dlsmk.cn/door/app/appMintUIindex";//门禁服务地址
 var GLOBAL_TODAY="";
 var GLOBAL_YESTERDAY="";
 var CURRENT_INDEX=1;
 if (dev) {
-    SERVER = "http://172.28.43.7:8099/payapi/mobileapi";
+    SERVER = "http://yy.dlsmk.cn:8080/payapi/mobileapi";
 }
 function V1Bindcardcode(param,callback) {
     ajaxPost("/v1/bindcardcode", param, callback)
diff --git a/platforms/android/app/src/main/assets/www/main.html b/platforms/android/app/src/main/assets/www/main.html
index 4aeb95e..d57a15a 100644 (file)
--- a/platforms/android/app/src/main/assets/www/main.html
+++ b/platforms/android/app/src/main/assets/www/main.html
@@ -10,54 +10,58 @@
     <link rel="stylesheet" type="text/css" href="css/jquery-weui.min.css">
     <link rel="stylesheet" type="text/css" href="css/index.css" />
     <link rel="stylesheet" type="text/css" href="css/aui-slide.css">
+    <style type="text/css">
+        .aui-slide-node{
+            background: transparent!important;
+        }
+    </style>
 </head>
-
 <body>
     <div id="main1">
         <div id="maintop">
-            <div id="startslider" class="main" style="height: 260px;display: block;background: #fff">
+            <div id="startslider" class="main" style="height: 240px;display: block;background: #ACEAF5;padding:36px 30px 30px 30px;">
                 <div class="aui-slide-wrap" >
-                    <div class="aui-slide-node bg-dark">
+                    <div class="aui-slide-node">
                         <img  src="img/p1.png" />
                     </div>
-                    <div class="aui-slide-node bg-dark">
+                    <div class="aui-slide-node ">
                         <img src="img/p1.png"  />
                     </div>
-                    <div class="aui-slide-node bg-dark">
+                    <div class="aui-slide-node ">
                         <img src="img/p1.png"  />
                     </div>
                 </div>
                 <div class="aui-slide-page-wrap"><!--分页容器--></div>
             </div>
         </div>
-        <div style="position: absolute;bottom:50px;width: 100%;top:260px" id="maincontent">
+        <div style="position: absolute;bottom:50px;width: 100%;top:240px" id="maincontent">
             <section class="aui-content " style="height: 100%">
                 <div class="aui-grid" style="height: 100%">
                     <div class="aui-row" style="height: 50%">
                         <div class="aui-col-xs-6  mainmeun-div" id="qrcodeBtn" style="background: #BBE6EC;">
                             <div>
-                                <div class="center-in"><img src="img/m4.png" style="width:100px;height: 100px"></div>
-                                <div class="aui-grid-label" style="margin-top:20px;font-size: 22px;">读码</div>
+                                <div class="center-in"><img src="img/m4.png" class="meun-img"class="meun-img"></div>
+                                <div class="aui-grid-label" style="margin-top:10px;font-size: 22px;">读码</div>
                             </div>
                         </div>
                         <div class="aui-col-xs-6 mainmeun-div" id="scanBtn" style="background: #91DDEA;">
                             <div>
-                                <div class="center-in"><img src="img/m2.png" style="width:100px;height: 100px"></div>
-                                <div class="aui-grid-label" style="margin-top:20px;font-size: 22px;">扫码</div>
+                                <div class="center-in"><img src="img/m2.png" class="meun-img"></div>
+                                <div class="aui-grid-label" style="margin-top:10px;font-size: 22px;">扫码</div>
                             </div>
                         </div>
                     </div>
                     <div class="aui-row" style="height: 50%">
                         <div class="aui-col-xs-6 mainmeun-div" id="qrcodeBtn1" style="background: #fff;">
                             <div>
-                                <div class="center-in"><img src="img/m3.png" style="width:100px;height: 100px"></div>
-                                <div class="aui-grid-label" style="margin-top:20px;font-size: 22px;">访码</div>
+                                <div class="center-in"><img src="img/m3.png" class="meun-img"></div>
+                                <div class="aui-grid-label" style="margin-top:10px;font-size: 22px;">访码</div>
                             </div>
                         </div>
                         <div class="aui-col-xs-6 mainmeun-div" id="moreFuncBtn"  style="background: #FDD479;">
                             <div>
-                                <div class="center-in"><img src="img/m1.png" style="width:100px;height: 100px"></div>
-                                <div class="aui-grid-label" style="margin-top:20px;font-size: 22px;">更多</div>
+                                <div class="center-in"><img src="img/m1.png" class="meun-img"></div>
+                                <div class="aui-grid-label" style="margin-top:10px;font-size: 22px;">更多</div>
                             </div>
                         </div>
                     </div>
diff --git a/platforms/android/app/src/main/res/mipmap-hdpi-v26/ic_launcher_foreground.png b/platforms/android/app/src/main/res/mipmap-hdpi-v26/ic_launcher_foreground.png
index 9b8c49c..dd6e249 100644 (file)
Binary files a/platforms/android/app/src/main/res/mipmap-hdpi-v26/ic_launcher_foreground.png and b/platforms/android/app/src/main/res/mipmap-hdpi-v26/ic_launcher_foreground.png differ
diff --git a/platforms/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/platforms/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
index 9b8c49c..9db7d5d 100644 (file)
Binary files a/platforms/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/platforms/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/platforms/android/app/src/main/res/mipmap-ldpi-v26/ic_launcher_foreground.png b/platforms/android/app/src/main/res/mipmap-ldpi-v26/ic_launcher_foreground.png
index eb9b7ba..2df416c 100644 (file)
Binary files a/platforms/android/app/src/main/res/mipmap-ldpi-v26/ic_launcher_foreground.png and b/platforms/android/app/src/main/res/mipmap-ldpi-v26/ic_launcher_foreground.png differ
diff --git a/platforms/android/app/src/main/res/mipmap-ldpi/ic_launcher.png b/platforms/android/app/src/main/res/mipmap-ldpi/ic_launcher.png
index eb9b7ba..2df416c 100644 (file)
Binary files a/platforms/android/app/src/main/res/mipmap-ldpi/ic_launcher.png and b/platforms/android/app/src/main/res/mipmap-ldpi/ic_launcher.png differ
diff --git a/platforms/android/app/src/main/res/mipmap-mdpi-v26/ic_launcher_foreground.png b/platforms/android/app/src/main/res/mipmap-mdpi-v26/ic_launcher_foreground.png
index b354ab7..5485b74 100644 (file)
Binary files a/platforms/android/app/src/main/res/mipmap-mdpi-v26/ic_launcher_foreground.png and b/platforms/android/app/src/main/res/mipmap-mdpi-v26/ic_launcher_foreground.png differ
diff --git a/platforms/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/platforms/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
index b354ab7..5485b74 100644 (file)
Binary files a/platforms/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/platforms/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/platforms/android/app/src/main/res/mipmap-xhdpi-v26/ic_launcher_foreground.png b/platforms/android/app/src/main/res/mipmap-xhdpi-v26/ic_launcher_foreground.png
index 9b8c49c..cba9ea4 100644 (file)
Binary files a/platforms/android/app/src/main/res/mipmap-xhdpi-v26/ic_launcher_foreground.png and b/platforms/android/app/src/main/res/mipmap-xhdpi-v26/ic_launcher_foreground.png differ
diff --git a/platforms/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/platforms/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 9b8c49c..cba9ea4 100644 (file)
Binary files a/platforms/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/platforms/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/platforms/android/app/src/main/res/mipmap-xxhdpi-v26/ic_launcher_foreground.png b/platforms/android/app/src/main/res/mipmap-xxhdpi-v26/ic_launcher_foreground.png
index 9b8c49c..16dfc52 100644 (file)
Binary files a/platforms/android/app/src/main/res/mipmap-xxhdpi-v26/ic_launcher_foreground.png and b/platforms/android/app/src/main/res/mipmap-xxhdpi-v26/ic_launcher_foreground.png differ
diff --git a/platforms/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/platforms/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 9b8c49c..16dfc52 100644 (file)
Binary files a/platforms/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/platforms/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/platforms/android/app/src/main/res/mipmap-xxxhdpi-v26/ic_launcher_foreground.png b/platforms/android/app/src/main/res/mipmap-xxxhdpi-v26/ic_launcher_foreground.png
index 9b8c49c..ff9f60d 100644 (file)
Binary files a/platforms/android/app/src/main/res/mipmap-xxxhdpi-v26/ic_launcher_foreground.png and b/platforms/android/app/src/main/res/mipmap-xxxhdpi-v26/ic_launcher_foreground.png differ
diff --git a/platforms/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/platforms/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 9b8c49c..ff9f60d 100644 (file)
Binary files a/platforms/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/platforms/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/www/css/index.css b/www/css/index.css
index fb20796..355df4c 100644 (file)
--- a/www/css/index.css
+++ b/www/css/index.css
@@ -44,6 +44,23 @@ body {
     align-items: center;display: flex!important;
    font-size: 20px;
 }
+.meun-img{
+    width:80px;
+    height: 80px;
+}
+@media only screen and (max-height: 700px) {
+    .meun-img{
+        width:80px;
+        height: 80px;
+    }
+}
+@media only screen and (min-height: 701px) {
+    .meun-img{
+        width:90px;
+        height: 90px;
+    }
+}
+
 
 @keyframes myfirst {
     0% {
diff --git a/www/js/mainmenu.js b/www/js/mainmenu.js
index 226091a..9d9fad6 100644 (file)
--- a/www/js/mainmenu.js
+++ b/www/js/mainmenu.js
@@ -186,7 +186,7 @@ var app = {
     initSlider:function(){
         var slide = new auiSlide({
             container:document.getElementById("startslider"),
-            "height":260,
+            "height":240,
             "speed":500,
             "pageShow":true,
             "autoPlay":3000,
diff --git a/www/js/server.js b/www/js/server.js
index 426bf2d..f5134a8 100644 (file)
--- a/www/js/server.js
+++ b/www/js/server.js
@@ -1,11 +1,11 @@
-var dev = false;
+var dev = true;
 var SERVER = "https://yy.dlsmk.cn/payapi/mobileapi";
 var DOOR_URl = "https://yy.dlsmk.cn/door/app/appMintUIindex";//门禁服务地址
 var GLOBAL_TODAY="";
 var GLOBAL_YESTERDAY="";
 var CURRENT_INDEX=1;
 if (dev) {
-    SERVER = "http://172.28.43.7:8099/payapi/mobileapi";
+    SERVER = "http://yy.dlsmk.cn:8080/payapi/mobileapi";
 }
 function V1Bindcardcode(param,callback) {
     ajaxPost("/v1/bindcardcode", param, callback)
diff --git a/www/main.html b/www/main.html
index 4aeb95e..d57a15a 100644 (file)
--- a/www/main.html
+++ b/www/main.html
@@ -10,54 +10,58 @@
     <link rel="stylesheet" type="text/css" href="css/jquery-weui.min.css">
     <link rel="stylesheet" type="text/css" href="css/index.css" />
     <link rel="stylesheet" type="text/css" href="css/aui-slide.css">
+    <style type="text/css">
+        .aui-slide-node{
+            background: transparent!important;
+        }
+    </style>
 </head>
-
 <body>
     <div id="main1">
         <div id="maintop">
-            <div id="startslider" class="main" style="height: 260px;display: block;background: #fff">
+            <div id="startslider" class="main" style="height: 240px;display: block;background: #ACEAF5;padding:36px 30px 30px 30px;">
                 <div class="aui-slide-wrap" >
-                    <div class="aui-slide-node bg-dark">
+                    <div class="aui-slide-node">
                         <img  src="img/p1.png" />
                     </div>
-                    <div class="aui-slide-node bg-dark">
+                    <div class="aui-slide-node ">
                         <img src="img/p1.png"  />
                     </div>
-                    <div class="aui-slide-node bg-dark">
+                    <div class="aui-slide-node ">
                         <img src="img/p1.png"  />
                     </div>
                 </div>
                 <div class="aui-slide-page-wrap"><!--分页容器--></div>
             </div>
         </div>
-        <div style="position: absolute;bottom:50px;width: 100%;top:260px" id="maincontent">
+        <div style="position: absolute;bottom:50px;width: 100%;top:240px" id="maincontent">
             <section class="aui-content " style="height: 100%">
                 <div class="aui-grid" style="height: 100%">
                     <div class="aui-row" style="height: 50%">
                         <div class="aui-col-xs-6  mainmeun-div" id="qrcodeBtn" style="background: #BBE6EC;">
                             <div>
-                                <div class="center-in"><img src="img/m4.png" style="width:100px;height: 100px"></div>
-                                <div class="aui-grid-label" style="margin-top:20px;font-size: 22px;">读码</div>
+                                <div class="center-in"><img src="img/m4.png" class="meun-img"class="meun-img"></div>
+                                <div class="aui-grid-label" style="margin-top:10px;font-size: 22px;">读码</div>
                             </div>
                         </div>
                         <div class="aui-col-xs-6 mainmeun-div" id="scanBtn" style="background: #91DDEA;">
                             <div>
-                                <div class="center-in"><img src="img/m2.png" style="width:100px;height: 100px"></div>
-                                <div class="aui-grid-label" style="margin-top:20px;font-size: 22px;">扫码</div>
+                                <div class="center-in"><img src="img/m2.png" class="meun-img"></div>
+                                <div class="aui-grid-label" style="margin-top:10px;font-size: 22px;">扫码</div>
                             </div>
                         </div>
                     </div>
                     <div class="aui-row" style="height: 50%">
                         <div class="aui-col-xs-6 mainmeun-div" id="qrcodeBtn1" style="background: #fff;">
                             <div>
-                                <div class="center-in"><img src="img/m3.png" style="width:100px;height: 100px"></div>
-                                <div class="aui-grid-label" style="margin-top:20px;font-size: 22px;">访码</div>
+                                <div class="center-in"><img src="img/m3.png" class="meun-img"></div>
+                                <div class="aui-grid-label" style="margin-top:10px;font-size: 22px;">访码</div>
                             </div>
                         </div>
                         <div class="aui-col-xs-6 mainmeun-div" id="moreFuncBtn"  style="background: #FDD479;">
                             <div>
-                                <div class="center-in"><img src="img/m1.png" style="width:100px;height: 100px"></div>
-                                <div class="aui-grid-label" style="margin-top:20px;font-size: 22px;">更多</div>
+                                <div class="center-in"><img src="img/m1.png" class="meun-img"></div>
+                                <div class="aui-grid-label" style="margin-top:10px;font-size: 22px;">更多</div>
                             </div>
                         </div>
                     </div>
大理市民卡手机端