'icon'

1d3ac8fe · 李晓兵 · d7db9a14 · d7db9a14 · 1d3ac8fe · d7db9a14
Commit 1d3ac8fe authored Dec 19, 2019 by 李晓兵
34 changed files
--- a/resources/android/icon/drawable-hdpi-icon.png
+++ b/resources/android/icon/drawable-hdpi-icon.png
--- a/resources/android/icon/drawable-ldpi-icon.png
+++ b/resources/android/icon/drawable-ldpi-icon.png
--- a/resources/android/icon/drawable-mdpi-icon.png
+++ b/resources/android/icon/drawable-mdpi-icon.png
--- a/resources/android/icon/drawable-xhdpi-icon.png
+++ b/resources/android/icon/drawable-xhdpi-icon.png
--- a/resources/android/icon/drawable-xxhdpi-icon.png
+++ b/resources/android/icon/drawable-xxhdpi-icon.png
--- a/resources/android/icon/drawable-xxxhdpi-icon.png
+++ b/resources/android/icon/drawable-xxxhdpi-icon.png
--- a/resources/icon.png
+++ b/resources/icon.png
--- a/resources/icon.png.md5
+++ b/resources/icon.png.md5
+24fee3c9209c50fdb1fbfbc0cf2e38b9
\ No newline at end of file
--- a/resources/ios/icon/icon-1024.png
+++ b/resources/ios/icon/icon-1024.png
--- a/resources/ios/icon/icon-40.png
+++ b/resources/ios/icon/icon-40.png
--- a/resources/ios/icon/icon-40@2x.png
+++ b/resources/ios/icon/icon-40@2x.png
--- a/resources/ios/icon/icon-40@3x.png
+++ b/resources/ios/icon/icon-40@3x.png
--- a/resources/ios/icon/icon-50.png
+++ b/resources/ios/icon/icon-50.png
--- a/resources/ios/icon/icon-50@2x.png
+++ b/resources/ios/icon/icon-50@2x.png
--- a/resources/ios/icon/icon-60.png
+++ b/resources/ios/icon/icon-60.png
--- a/resources/ios/icon/icon-60@2x.png
+++ b/resources/ios/icon/icon-60@2x.png
--- a/resources/ios/icon/icon-60@3x.png
+++ b/resources/ios/icon/icon-60@3x.png
--- a/resources/ios/icon/icon-72.png
+++ b/resources/ios/icon/icon-72.png
--- a/resources/ios/icon/icon-72@2x.png
+++ b/resources/ios/icon/icon-72@2x.png
--- a/resources/ios/icon/icon-76.png
+++ b/resources/ios/icon/icon-76.png
--- a/resources/ios/icon/icon-76@2x.png
+++ b/resources/ios/icon/icon-76@2x.png
--- a/resources/ios/icon/icon-83.5@2x.png
+++ b/resources/ios/icon/icon-83.5@2x.png
--- a/resources/ios/icon/icon-small.png
+++ b/resources/ios/icon/icon-small.png
--- a/resources/ios/icon/icon-small@2x.png
+++ b/resources/ios/icon/icon-small@2x.png
--- a/resources/ios/icon/icon-small@3x.png
+++ b/resources/ios/icon/icon-small@3x.png
--- a/resources/ios/icon/icon.png
+++ b/resources/ios/icon/icon.png
--- a/resources/ios/icon/icon@2x.png
+++ b/resources/ios/icon/icon@2x.png
--- a/src/pages/home/home-page.vue
+++ b/src/pages/home/home-page.vue
@@ -115,6 +115,7 @@ export default {
              }
            }, {enableHighAccuracy: true})
          } else { // ios使用插件定位
+            console.log('&&&&&&&&&&&&___ios')
            baidumap_location.getCurrentPosition(function (result) {
              if (window.localStorage.getItem('province')) {
                vm.city = window.localStorage.getItem('city')

--- a/src/pages/home/location.vue
+++ b/src/pages/home/location.vue
@@ -111,7 +111,9 @@ export default {
              console.log(error)
            }, {enableHighAccuracy: true})
          } else { // ios使用插件定位
+            console.log('&&&&&&&&&&&&___ios')
            baidumap_location.getCurrentPosition(function (result) {
+              console.log('*********** '+JSON.stringify(result))
              window.localStorage.setItem('province', result.addr)
              window.localStorage.setItem('city', result.city)
              vm.places = window.localStorage.getItem('province') + '-' + window.localStorage.getItem('city')
@@ -120,6 +122,7 @@ export default {
              vm.flag = false
              vm.province_flag = true
            }, function (error) {
+              console.log('errorerrorerrorerror  '+error)
            })
          }


--- a/src/pages/login.vue
+++ b/src/pages/login.vue
@@ -274,6 +274,9 @@ export default {
        align-items: center;
        border-bottom: 1px solid rgba(42, 42, 42, 0.4);
        margin-top: 30px;
+        border-top:1px solid #FFF;
+        border-left: 1px solid #FFF;
+        border-right: 1px solid #FFF;
      }
      input:focus {
        border-bottom: 1px solid #1d3fff;
@@ -332,16 +335,20 @@ export default {
 }
 .platform-ios {
  #login {
+    .pwd-input{
      input{
-      padding: 8px 0;
+        line-height: 20px;
+      }
    }
  }
 }
 @media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
  .platform-ios {
    #login {
+      .pwd-input{
        input{
-        padding: 8px 0;
+          line-height: 20px;
+        }
      }
      .login-wrap{
        margin-top:20%
@@ -353,10 +360,11 @@ export default {
 @media (device-width: 414px) and (device-height: 896px) {
  .platform-ios {
    #login {
+      .pwd-input{
        input{
-        height: 20px;
          line-height: 20px;
        }
+      }
      .login-wrap{
        margin-top:20%
      }

--- a/src/pages/messageCenter/message-list.vue
+++ b/src/pages/messageCenter/message-list.vue
@@ -185,10 +185,12 @@ export default {
  //   padding-top: 10px;
  // }
  .display {
+    position: fixed;
+    top: 0;
    img {
      width: 100%;
      height: 100%;
-      margin-top: -70px;
+     // margin-top: -70px;
    }
  }
  .swipeout-list {
@@ -363,10 +365,10 @@ export default {
      }
    }
  }
-     .content {
+  /*   .content {
    position: absolute;
    top: 0;
-  }
+  }*/
  .scrollContent {
    padding-top: 1rem;
    padding-bottom: 20px;
@@ -385,6 +387,9 @@ export default {
      .scrollContent {
        padding-top: 2rem;
      }
+      .display{
+        top:1.68rem;
+      }
    }
  }
 }
@@ -395,6 +400,9 @@ export default {
      .scrollContent {
        padding-top: 2rem;
      }
+      .display{
+        top:1.68rem;
+      }
    }
  }
 }

--- a/www/index.html
+++ b/www/index.html
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=cordova.js></script><script type=text/javascript src="https://api.map.baidu.com/api?v=3.0&ak=o7fTnpVAGzXKN7SirV8xGU2xzWQS2NrI"></script><title>徐工融租</title><link href=./static/css/app.79f91c642f9f223cd008e2be175d7203.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.e547499500fbe65e7169.js></script><script type=text/javascript src=./static/js/app.8b23c313c3ff7e3b9bba.js></script></body></html>
\ No newline at end of file
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=cordova.js></script><script type=text/javascript src="https://api.map.baidu.com/api?v=2.0&ak=o7fTnpVAGzXKN7SirV8xGU2xzWQS2NrI"></script><title>徐工融租</title><link href=./static/css/app.cef9e99b92cf0ba926ef46444ea235b0.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.e547499500fbe65e7169.js></script><script type=text/javascript src=./static/js/app.b98728f85bf36e31eb7e.js></script></body></html>
\ No newline at end of file
--- a/www/static/img/null.0bd3592.png
+++ b/www/static/img/null.0bd3592.png
--- a/www/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
+++ b/www/static/js/manifest.3ad1d5771e9b13dbdad2.js.map