Etusivu Tutki Apua
Kirjaudu sisään
lqq
/
LxtalkUIView
Tarkkaile 2
Äänestä 1
Fork 1
Tiedostot Ongelmat 0 Pull-pyynnöt 0 Wiki
Selaa lähdekoodia

微信界面

dgf 8 vuotta sitten
vanhempi
e1d96fcfad
commit
d0b46d060b
10 muutettua tiedostoa jossa 178 lisäystä ja 175 poistoa
Jaettu näkymä Näytä diff tilastot
  1. 1 0
      dist/web12345-new/app-7089874f44.css
  2. 8 3
      dist/web12345-new/app-9a6d99ca51.js
  3. 0 1
      dist/web12345-new/app-8e583458fe.css
  4. 2 2
      dist/web12345-new/index.html
  5. BIN
      web12345-new.rar
  6. 6 1
      web12345-new/src/js/controller/webController.js
  7. 127 134
      web12345-new/src/less/app.home.less
  8. 28 27
      web12345-new/src/less/app.main.less
  9. 4 5
      web12345-new/src/templates/home.html
  10. 2 2
      web12345-new/src/templates/webChat-5.html

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 0
dist/web12345-new/app-7089874f44.css


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 8 - 3
dist/web12345-new/app-9a6d99ca51.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 1
dist/web12345-new/app-8e583458fe.css


+ 2 - 2
dist/web12345-new/index.html
Näytä tiedosto 

@@ -9,7 +9,7 @@
 
     <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.min.css">
 
     <link rel="stylesheet" href="../bower_components/animate.css/animate.min.css">
 
     <link rel="stylesheet" href="../bower_components/swiper/dist/css/swiper.min.css">
 
-    <link rel="stylesheet" href="app-8e583458fe.css">
 
+    <link rel="stylesheet" href="app-7089874f44.css">
 
 
     <!-- jQuery文件。务必在bootstrap.min.js 之前引入 -->
 
     <!--<script src="js/jquery.min.js"></script>-->
 
@@ -23,7 +23,7 @@
 
     <script src="../bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
 
     <script src="../bower_components/angular-animate/angular-animate.min.js"></script>
 
 
-    <script src="app-9a6d99ca51.js"></script>
 
+    <script src="app-89e2222c58.js"></script>
 
 </head>
 
 
 <body ng-app="app">

BIN
web12345-new.rar
Näytä tiedosto


+ 6 - 1
web12345-new/src/js/controller/webController.js
Näytä tiedosto 

@@ -22,9 +22,14 @@ angular.module('app').controller('WebController', ['$scope', '$timeout', functio
 
         angular.element(".onView").removeClass("onView");
 
         var img = $(event.target);
 
         img[0].className = "onView";
 
-        if (img[0].naturalWidth > img[0].naturalHeight) {
 
+        if (img[0].naturalHeight * 3 > (img[0].naturalWidth + 10) * 4) {
 
+            angular.element(".image-view").removeClass("width-Img");
 
+            angular.element(".viewModal").addClass("height-Img");
 
+        } else if (img[0].naturalWidth > img[0].naturalHeight) {
 
+            angular.element(".viewModal").removeClass("height-Img");
 
             angular.element(".image-view").addClass("width-Img");
 
         } else {
 
+            angular.element(".viewModal").removeClass("height-Img");
 
             angular.element(".image-view").removeClass("width-Img");
 
         }
 
         $scope.imgUrl = img[0].src;

+ 127 - 134
web12345-new/src/less/app.home.less
Näytä tiedosto 

@@ -1,138 +1,132 @@
 
 html {
 
-background-color: #FFF;
 
-}
 
-content {
 
-      flex: 1;
 
-      height: auto;
 
-}
 
-.main{
 
-  margin-top: 13px;
 
-  overflow:hidden;
 
     background-color: #FFF;
 
-    width: 100%;
 
     height: 100%;
 
-    font-family: "Arial","Microsoft YaHei","黑体","宋体",sans-serif;
 
-    .header111{
 
-      margin: 0px auto 10px;
 
-      width: 80%;
 
-      z-index: 99;
 
-      box-shadow: 0px 2px 15px #A3D4F8;
 
-      border-radius: 30px;
 
-      // box-shadow: 0px 0px 10px #5995EB,   /*左边阴影*/ 
-      // 0px 0px 0px #5995EB,  /*上边阴影*/ 
-      // 0px 0px 10px #5995EB,  /*右边阴影*/ 
-      // 0px 0px 30px #A3D4F8;   /*下边阴影*/
 
-      >img{
 
-          width: 100%;
 
-        }
 
-      }
 
-    .swiper-container {
 
-        width: 100%;
 
-        .swiper-wrapper {
 
-            margin-left: 10%;
 
-        }
 
-        img {
 
-            vertical-align: baseline !important;
 
-            width: 80%;
 
-            border-radius: 15px;
 
-            box-shadow: 0px 2px 5px #888;
 
-        }
 
-    }  
-}
 
+    width: 100%;
 
+    font-family: "Arial","Microsoft YaHei","宋体",sans-serif;
 
+ }
 
 
-footer {
 
-  margin-top: 20px;
 
+.main{
 
+    display: flex;
 
+    min-height: 100vh;
 
+    flex-direction: column;
 
+    padding-top: 13px;
 
+    overflow:hidden;
 
+    background-color: #FFF;
 
     width: 100%;
 
     height: 100%;
 
-    position: relative;
 
-    top: 100%;
 
-    .bg{
 
-        width: 100%;
 
-        height: 100%;
 
-        >img {
 
-          width: 100%;
 
-          height: 100%;
 
+    header {
 
+        min-height: 100px;
 
+        >.swiper-container {
 
+            width: 100%;
 
+            >.swiper-wrapper {
 
+                margin-left: 10%;
 
+            }
 
+            img {
 
+                vertical-align: baseline !important;
 
+                width: 80%;
 
+                border-radius: 15px;
 
+                box-shadow: 0px 2px 5px #888;
 
+            }
 
         }
 
-      }
 
-    .contain{
 
+    }
 
+    content {
 
+        flex: 1;
 
+        background-color: FFF;
 
+    }
 
+    footer {
 
+        min-height: 150px;
 
+        margin-top: 20px;
 
         width: 100%;
 
         height: 100%;
 
-        white-space: nowrap; /* 自适应宽度,不换行*/
 
-        overflow-x: hidden; /* overflow-x */
 
-        .font-12 {
 
-            font-size: 12px;
 
-        }
 
-        .font-15 {
 
-            font-size: 15px;
 
-        }
 
-      .inquire{
 
-        position: absolute;
 
-        top: 1%;
 
-        left: 30%;
 
-        width: 45%;
 
-        padding: 1%;
 
-        .explain {
 
-            margin-left: 9%;
 
+        position: relative;
 
+        top: 100%;
 
+        .bg{
 
+            width: 100%;
 
+            height: 100%;
 
+            >img {
 
+            width: 100%;
 
+            height: 100%;
 
             }
 
         }
 
-      .call{
 
-        position: absolute;
 
-        top: 17%;
 
-        left: 48%;
 
-        width: 45%;
 
-        padding: 1%;
 
-        .explain {
 
-            margin-left: 9%;
 
+        .contain{
 
+            width: 100%;
 
+            height: 100%;
 
+            white-space: nowrap; /* 自适应宽度,不换行*/
 
+            overflow-x: hidden; /* overflow-x */
 
+            .font-12 {
 
+                font-size: 12px;
 
             }
 
-        }
 
-      .online{
 
-        position: absolute;
 
-        top: 40%;
 
-        left: 57%;
 
-        width: 45%;
 
-        padding: 1%;
 
-        .explain {
 
-            margin-left: 9%;
 
+            .font-15 {
 
+                font-size: 15px;
 
             }
 
-        }
 
-      .email{
 
-        position: absolute;
 
-        top: 63%;
 
-        left: 48%;
 
-        width: 45%;
 
-        padding: 1%;
 
-        .explain {
 
-            margin-left: 9%;
 
+        .inquire{
 
+            position: absolute;
 
+            top: 1%;
 
+            left: 30%;
 
+            width: 45%;
 
+            padding: 1%;
 
+            .explain {
 
+                margin-left: 9%;
 
+                }
 
             }
 
-        }
 
-      .result{
 
-        position: absolute;
 
-        top: 80%;
 
-        left: 30%;
 
-        width: 45%;
 
-        padding: 1%;
 
-        .explain {
 
-            margin-left: 9%;
 
+        .call{
 
+            position: absolute;
 
+            top: 17%;
 
+            left: 48%;
 
+            width: 45%;
 
+            padding: 1%;
 
+            .explain {
 
+                margin-left: 9%;
 
+                }
 
+            }
 
+        .online{
 
+            position: absolute;
 
+            top: 40%;
 
+            left: 57%;
 
+            width: 45%;
 
+            padding: 1%;
 
+            .explain {
 
+                margin-left: 9%;
 
+                }
 
+            }
 
+        .email{
 
+            position: absolute;
 
+            top: 63%;
 
+            left: 48%;
 
+            width: 45%;
 
+            padding: 1%;
 
+            .explain {
 
+                margin-left: 9%;
 
+                }
 
+            }
 
+        .result{
 
+            position: absolute;
 
+            top: 80%;
 
+            left: 30%;
 
+            width: 45%;
 
+            padding: 1%;
 
+            .explain {
 
+                margin-left: 9%;
 
+                }
 
+            }
 
+            
+        .logo{
 
+            top: 20.5%;
 
+            left: -10.5%;
 
+            position: absolute;
 
+            width: 51.33%;
 
+            >img{
 
+            width: 100%;
 
             }
 
         }
 
-          
-      .logo{
 
-        top: 20.5%;
 
-        left: -10.5%;
 
-        position: absolute;
 
-        width: 51.33%;
 
-        >img{
 
-          width: 100%;
 
-          }
 
-      }
 
-      a:focus {
 
-          border: none;
 
-          outline: none;
 
-          text-decoration: none;
 
-      }
 
+        a:focus {
 
+            border: none;
 
+            outline: none;
 
+            text-decoration: none;
 
+        }
 
+        }
 
     }
 
 }
 
-
 
 .fade {
 
     top: 0%;
 
     margin: 0px;
 
@@ -143,15 +137,15 @@ footer {
 
         top: 100px;
 
         width: 80%;
 
         margin: 0px 10%;
 
-        padding: 10% 15%;
 
-        text-align: center;
 
-        border: 1px solid #bbb;
 
-        background-color: #FFF;
 
+        padding: 10%;
 
+        text-align: left;
 
+        font-family: "Arial","Microsoft YaHei","宋体",sans-serif;
 
+        border-top: 1px solid #ddd;
 
         box-shadow: 0px 2px 5px #888;
 
+        background-color: #FFF;
 
         border-radius: 4px;
 
         >input {
 
-            text-align: center;
 
-            margin-bottom: 30px;
 
+            margin-bottom: 25px;
 
             height: 28px;
 
             font-size: 14px;
 
         }
 
@@ -161,17 +155,16 @@ footer {
 
             margin-bottom: 20px;
 
         }
 
         >a {
 
-            margin: 10px 5px;
 
-            padding: 4px 15px;
 
-            font-size: 13px;
 
-            text-decoration: none;
 
-            border-radius: 4px;
 
-            color: white;
 
-            background: #40A1E6;
 
-            border: none;
 
-            outline: none;
 
-            &:hover{
 
-                background: #1F83C6;
 
+            float: right;
 
+            font-size: 15px;
 
+            margin: 10px 10px 0px 15px;
 
+            color: #03AD46;
 
+            &:hover,&:focus {
 
+                text-decoration: none;
 
+            }
 
+            &:active, .open>.dropdown-toggle.btn-default{
 
+                text-decoration: none;
 
+                color: #999;
 
             }
 
         }
 
     }

+ 28 - 27
web12345-new/src/less/app.main.less
Näytä tiedosto 

@@ -23,6 +23,7 @@
 
 
 body{
 
     background-color: #FFF;
 
+    font-family: "Arial","Microsoft YaHei","宋体",sans-serif;
 
 }
 
 content {
 
     flex: 1;
 
@@ -74,7 +75,7 @@ content {
 
      >p{
 
        margin: 25px 0px 0px 8px ;
 
       font-size: 15px;
 
-      font-family: "微软雅黑";
 
+      font-family: "微软雅黑","Arial","Microsoft YaHei","宋体";
 
       font-weight: 600;
 
       display: inline-block;
 
      }
 
@@ -99,7 +100,7 @@ content {
 
    display: block;
 
    width: 80%;
 
    font-size: 17px;
 
-   font-family: "微软雅黑";
 
+   font-family: "微软雅黑","Arial","Microsoft YaHei","宋体";
 
    font-weight: 800;
 
     &:hover,&:focus {
 
       outline: none;
 
@@ -142,7 +143,7 @@ content {
 
     width: 100%;
 
     margin: 40px auto 0px;
 
     overflow-y: auto;
 
-    font-family: "微软雅黑","宋体";
 
+    font-family: "微软雅黑","Arial","Microsoft YaHei","宋体";
 
     .webimg-2 {
 
         height: 150px;
 
         width: 100%;
 
@@ -162,7 +163,7 @@ content {
 
             white-space: nowrap; /* 自适应宽度,不换行*/
 
             overflow-x: hidden; /* overflow-x */
 
             overflow-y: auto;
 
-            font-family: "微软雅黑","宋体";
 
+            font-family: "微软雅黑","Arial","Microsoft YaHei","宋体";
 
             font-size: 12px;
 
         }
 
         .font-14{
 
@@ -189,7 +190,7 @@ content {
 
             float: right;
 
             margin-right: 10%;
 
             font-weight: 500;
 
-            font-family: "微软雅黑","宋体";
 
+            font-family: "微软雅黑","Arial","Microsoft YaHei","宋体";
 
         }
 
         .text-message {
 
             white-space: normal;
 
@@ -285,7 +286,6 @@ content {
 
         .viewModal {
 
             top: 0%;
 
             margin: 0px;
 
-            margin-right: -6px;
 
             padding: 0px 3px !important;
 
             background-color: #000;
 
             .thumbnail {
 
@@ -300,6 +300,9 @@ content {
 
                     width: 100%;
 
                 }
 
             }
 
+            &.height-Img {
 
+                margin-right: -6px;
 
+            }
 
             .width-Img {
 
                 margin-top: 30%;
 
             }
 
@@ -323,35 +326,33 @@ content {
 
                     color: #999;
 
                 }
 
             }
 
-            .modal-info {
 
+            >.modal-info {
 
                 position: absolute;
 
-                top: 150px;
 
-                width: 60%;
 
-                margin: 0px 20%;
 
+                top: 180px;
 
+                width: 80%;
 
+                margin: 0px 10%;
 
                 padding: 5%;
 
-                text-align: center;
 
-                border: 1px solid #888;
 
+                text-align: left;
 
+                font-family: "Arial","Microsoft YaHei","宋体",sans-serif;
 
+                box-shadow: 0px 1px 1px #888;
 
                 background-color: #FFF;
 
-                box-shadow:1px 1px 1px #444;
 
-                border-radius: 3px;
 
+                border-radius: 4px;
 
                 >p {
 
-                    font-size: 15px;
 
+                    font-size: 16px;
 
+                    color: #000;
 
+                    margin-bottom: 20px;
 
                 }
 
-                >button {
 
-                    margin: 10px 5px;
 
-                    height: 24px;
 
-                    width: 35%;
 
-                    padding: 2px 4px;
 
-                    font-size: 12px;
 
-                    background-color: #048FD2;
 
-                    border: #048FD2;
 
+                >a {
 
+                    float: right;
 
+                    font-size: 15px;
 
+                    margin: 10px 10px 0px 15px;
 
+                    color: #03AD46;
 
                     &:hover,&:focus {
 
-                        outline: none;
 
+                        text-decoration: none;
 
                     }
 
                     &:active, .open>.dropdown-toggle.btn-default{
 
-                        outline: none;
 
-                        background-color: #036493;
 
-                        border-color: #036493;
 
+                        text-decoration: none;
 
+                        color: #999;
 
                     }
 
                 }
 
             }

+ 4 - 5
web12345-new/src/templates/home.html
Näytä tiedosto 

@@ -20,8 +20,7 @@
 
     </header>
 
 
     <content>
 
-        <div>
 
-        </div>
 
+        <div></div>
 
     </content>
 
 
     <footer>
 
@@ -63,15 +62,15 @@
 
     <div class="modal fade errorLogin" id="errorLoginModal" tabindex="-2" data-backdrop="static" role="dialog" aria-labelledby="errorLoginModalLabel" aria-hidden="true">
 
         <div class="modal-info">
 
             <p>{{addr.regeocode.addressComponent.district}}暂不支持此功能</p>
 
-            <a href="" data-dismiss="modal">关 闭</a>
 
+            <a href="" data-dismiss="modal" style="color:#888;">关闭</a>
 
         </div>
 
     </div>
 
     <div class="modal fade phoneLogin" id="phoneLoginModal" tabindex="-2" data-backdrop="static" role="dialog" aria-labelledby="phoneLoginModalLabel" aria-hidden="true">
 
         <div class="modal-info">
 
             <p>请输入手机号码</p>
 
             <input class="form-control input-sm" type="text" ng-model="mobile">
 
-            <a ng-click="onlineService()">确 定</a>
 
-            <a href="" data-dismiss="modal">关 闭</a>
 
+            <a ng-click="onlineService()">确定</a>
 
+            <a href="" data-dismiss="modal" style="color:#888;">关闭</a>
 
         </div>
 
     </div>
 
 </div>

+ 2 - 2
web12345-new/src/templates/webChat-5.html
Näytä tiedosto 

@@ -32,8 +32,8 @@
 
             <a class="thumbnail image-view"></a>
 
             <div class="modal-info" ng-show="sure">
 
                 <p>确定删除？</p>
 
-                <button type="button" class="btn btn-success" data-dismiss="modal" ng-click="delSure()">确定</button>
 
-                <button type="button" class="btn btn-success" ng-click="sure=flase">取消</button>
 
+                <a data-dismiss="modal" ng-click="delSure()">确定</a>
 
+                <a ng-click="sure=flase" style="color:#888;">取消</a>
 
             </div>
 
         </div>
 
     </div>