Kezdőlap Felfedezés Súgó
Bejelentkezés
lqq
/
LxtalkUIView
Figyelés 2
Kedvenc 1
Másolás 1
Fájlok Problémák 0 Beolvasztási kérések 0 Wiki
Forráskód Böngészése

微信界面

dgf 8 éve
szülő
711d54d9a7
commit
0d21399549
14 módosított fájl, 142 hozzáadás és 28 törlés
Osztott Nézet Diff Statisztika Mutatása
  1. 2 1
      dist/bower.json
  2. 1 0
      dist/web12345/app-1769fda85b.css
  3. 0 1
      dist/web12345/app-35f3e634f6.css
  4. 1 1
      dist/web12345/app-874b1a07e9.js
  5. 3 2
      dist/web12345/index.html
  6. 1 1
      dist/webManger12346/app-6c9471ec0b.js
  7. 1 1
      dist/webManger12346/app-bf1ddc11a0.css
  8. 2 2
      dist/webManger12346/index.html
  9. 1 0
      web12345/src/html/index.html
  10. 24 7
      web12345/src/js/controller/webController.js
  11. 77 6
      web12345/src/less/app.main.less
  12. 18 3
      web12345/src/templates/webChat-5.html
  13. 10 1
      webManger12346/src/less/app.main.less
  14. 1 2
      webManger12346/src/templates/mangerWeb.html

+ 2 - 1
dist/bower.json
Fájl Megtekintése 

@@ -30,6 +30,7 @@
 
     "ngInfiniteScroll": "^1.3.4",
 
     "jquery": "^3.2.1",
 
     "ngDraggable": "^0.1.11",
 
-    "bootstrap-material-design": "^4.0.2"
 
+    "bootstrap-material-design": "^4.0.2",
 
+    "layer": "^3.0.3"
 
   }
 
 }

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 0
dist/web12345/app-1769fda85b.css


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 1
dist/web12345/app-35f3e634f6.css


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
dist/web12345/app-874b1a07e9.js


+ 3 - 2
dist/web12345/index.html
Fájl Megtekintése 

@@ -8,20 +8,21 @@
 
     <!-- 新 Bootstrap 核心 CSS 文件 -->
 
     <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="app-35f3e634f6.css">
 
+    <link rel="stylesheet" href="app-1769fda85b.css">
 
 
     <!-- jQuery文件。务必在bootstrap.min.js 之前引入 -->
 
     <!--<script src="js/jquery.min.js"></script>-->
 
     <script src="http://webapi.amap.com/maps?v=1.3&key=d7455920303550a45cb4e1a27bdbfc86"></script>
 
     <script src="../bower_components/lodash/dist/lodash.js"></script>
 
     <script src="../bower_components/jquery/dist/jquery.min.js"></script>
 
+    <script src="../bower_components/layer/src/layer.js"></script>
 
     <script src="../bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
 
     <script src="../bower_components/angular/angular.js"></script>
 
     <script src="../bower_components/angular-ui-router/release/angular-ui-router.min.js"></script>
 
     <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-874b1a07e9.js"></script>
 
+    <script src="app-bcf26baade.js"></script>
 
 </head>
 
 
 <body ng-app="app">

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
dist/webManger12346/app-6c9471ec0b.js


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
dist/webManger12346/app-bf1ddc11a0.css


+ 2 - 2
dist/webManger12346/index.html
Fájl Megtekintése 

@@ -9,7 +9,7 @@
 
     <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.min.css">
 
     <!--<link rel="stylesheet" href="../bower_components/bootstrap-material-design/dist/bootstrap-material-design.css">-->
 
     <link rel="stylesheet" href="../bower_components/animate.css/animate.min.css">
 
-    <link rel="stylesheet" href="app-bf1ddc11a0.css">
 
+    <link rel="stylesheet" href="app-b88c138877.css">
 
 
     <!-- jQuery文件。务必在bootstrap.min.js 之前引入 -->
 
     <!--<script src="js/jquery.min.js"></script>-->
 
@@ -22,7 +22,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-6c9471ec0b.js"></script>
 
+    <script src="app-94a88a4d50.js"></script>
 
 </head>
 
 
 <body ng-app="app">

+ 1 - 0
web12345/src/html/index.html
Fájl Megtekintése 

@@ -15,6 +15,7 @@
 
     <script src="http://webapi.amap.com/maps?v=1.3&key=d7455920303550a45cb4e1a27bdbfc86"></script>
 
     <script src="../bower_components/lodash/dist/lodash.js"></script>
 
     <script src="../bower_components/jquery/dist/jquery.min.js"></script>
 
+    <script src="../bower_components/layer/src/layer.js"></script>
 
     <script src="../bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
 
     <script src="../bower_components/angular/angular.js"></script>
 
     <script src="../bower_components/angular-ui-router/release/angular-ui-router.min.js"></script>

+ 24 - 7
web12345/src/js/controller/webController.js
Fájl Megtekintése 

@@ -1,9 +1,22 @@
 
 'use strict';
 
 
-angular.module('app').controller('WebController', ['$scope', function($scope) {
 
+angular.module('app').controller('WebController', ['$scope', '$timeout', function($scope, $timeout) {
 
 
     //lxtalkClient.Invoke('{FB60F992-A0FD-47B3-AAA7-E80DF209C5A4}', '_Register', '', $scope);
 
-    $scope.mapView = function() {};
 
+    $scope.imgView = function(event) {
 
+        var img = $(event.target);
 
+        console.log(img);
 
+        $scope.imgUrl = img[0].currentSrc;
 
+        $(".image-big").remove();
 
+        $(".image-view").append('<img class="image-big" src="' + $scope.imgUrl + '" onClick="angular.element(this).scope().imgHide()" data-dismiss="modal">');
 
+    };
 
+
 
+    $scope.delImg = function() {
 
+        angular.element(".viewModal").removeClass("in");
 
+        $(".images").remove();
 
+    };
 
+
 
+    $scope.imgHide = function() {};
 
 
     $scope.actived = function($event) {
 
         var activeClick = $($event.target);
 
@@ -26,7 +39,7 @@ angular.module('app').controller('WebController', ['$scope', function($scope) {
 
             var reader = new FileReader();
 
         } else {
 
             alert("您的设备不支持图片预览功能，如需该功能请升级您的设备！");
 
-        }
 
+        };
 
 
         //获取文件
 
         var file = fileDom.files[0];
 
@@ -35,7 +48,7 @@ angular.module('app').controller('WebController', ['$scope', function($scope) {
 
         if (!imageType.test(file.type)) {
 
             alert("请选择图片！");
 
             return;
 
-        }
 
+        };
 
         //读取完成
 
         reader.onload = function(e) {
 
             // //获取图片dom
 
@@ -45,14 +58,14 @@ angular.module('app').controller('WebController', ['$scope', function($scope) {
 
             var imgNum = $("#imgpreview").find('img').length;
 
             console.log(imgNum);
 
             if (imgNum == 0) {
 
-                $("#imgpreview").append('<img class="images" src="' + e.target.result + '">');
 
+                $("#imgpreview").append('<a data-toggle="modal" data-target="#viewModal" onClick="angular.element(this).scope().imgView(event)" class="thumbnail images"><img src="' + e.target.result + '"></a>');
 
                 angular.element(".images").addClass("one");
 
             } else if (imgNum == 1) {
 
-                $("#imgpreview").append('<img class="images"  src="' + e.target.result + '">');
 
+                $("#imgpreview").append('<a data-toggle="modal" data-target="#viewModal" onClick="angular.element(this).scope().imgView(event)" class="thumbnail images"><img src="' + e.target.result + '"></a>');
 
                 angular.element(".images").removeClass("one");
 
                 angular.element(".images").addClass("two");
 
             } else if (imgNum >= 2) {
 
-                $("#imgpreview").append('<img class="images"  src="' + e.target.result + '">');
 
+                $("#imgpreview").append('<a data-toggle="modal" data-target="#viewModal" onClick="angular.element(this).scope().imgView(event)" class="thumbnail images"><img src="' + e.target.result + '"></a>');
 
                 angular.element(".images").removeClass("two");
 
                 angular.element(".images").addClass("three");
 
             }
 
@@ -60,4 +73,8 @@ angular.module('app').controller('WebController', ['$scope', function($scope) {
 
         reader.readAsDataURL(file);
 
     };
 
 
+    window.onpopstate = function(event) {
 
+        window.location.reload();
 
+    };
 
+
 
 }]);

+ 77 - 6
web12345/src/less/app.main.less
Fájl Megtekintése 

@@ -158,7 +158,7 @@ body{
 
             margin: 15px 10%;
 
             line-height: normal;
 
             white-space: nowrap; /* 自适应宽度,不换行*/
 
-            overflow: hidden;
 
+            overflow-x: hidden;
 
             font-family: "微软雅黑","宋体";
 
             font-size: 12px;
 
         }
 
@@ -222,6 +222,11 @@ body{
 
                 padding: 0px;
 
                 max-width: 65%;
 
                 white-space: normal;
 
+                .thumbnail {
 
+                    display: inline-block;
 
+                    margin: 2px;
 
+                    padding: 3px;
 
+                }
 
                 .one {
 
                     width: 98%;
 
                 }
 
@@ -231,10 +236,6 @@ body{
 
                 .three {
 
                     width: 31%;
 
                 }
 
-                >img {
 
-                    margin: 2px;
 
-                    border: 1px solid #ddd;
 
-                }
 
             }
 
             >input {
 
                 opacity: 0;
 
@@ -272,6 +273,69 @@ body{
 
                 }
 
             }
 
         }
 
+        .viewModal {
 
+            top: 6%;
 
+            margin: 0px;
 
+            padding: 0px;
 
+            padding-right: 0px !important;
 
+            .thumbnail {
 
+                margin: 0%;
 
+                text-align: center;
 
+                width: 100%;
 
+                .images {
 
+                    width: 100%;
 
+                }
 
+            }
 
+            .close {
 
+                margin-top: 2%;
 
+                margin-right: 2%;
 
+                font-size: 20px;
 
+                color: #555;
 
+                width: 36px;
 
+                line-height: 30px;
 
+                opacity: 1;
 
+                &:hover,&:focus {
 
+                    outline: none;
 
+                    color: #aaa;
 
+                }
 
+                &:active, .open>.dropdown-toggle.btn-primary{
 
+                    outline: none;
 
+                    color: #ddd;
 
+                }
 
+            }
 
+        }
 
+        .okModal .modal-dialog {
 
+            top: 200px;
 
+            width: 70%;
 
+            margin: 0px 15%;
 
+            .modal-header {
 
+                height: 40px;
 
+                text-align: center;
 
+                font-weight: normal;
 
+                border: none;
 
+                font-size: 14px;
 
+            }
 
+            .modal-footer {
 
+                text-align: center;
 
+                >button {
 
+                    margin: 10px 5px;
 
+                    height: 24px;
 
+                    width: 35%;
 
+                    padding: 2px 4px;
 
+                    font-size: 12px;
 
+                    background-color: #048FD2;
 
+                    border: #048FD2;
 
+                    &:hover,&:focus {
 
+                        outline: none;
 
+                    }
 
+                    &:active, .open>.dropdown-toggle.btn-default{
 
+                        outline: none;
 
+                        background-color: #036493;
 
+                        border-color: #036493;
 
+                    }
 
+                }
 
+            }
 
+        }
 
         .button-bottom{
 
             margin: 0px 10% 15px;
 
             .btn-default{
 
@@ -297,10 +361,13 @@ body{
 
         }
 
     }
 
 }
 
+.modal-backdrop {
 
+    position: relative;
 
+}
 
 .foot {
 
     position: fixed;
 
     top: 90%;
 
-    z-index: 99999;
 
+    z-index: 1000;
 
     width: 100%;
 
     height: 10%;
 
     background-color: #FFF;
 
@@ -336,6 +403,10 @@ body{
 
     height: 150px;
 
 }
 
 
+.amap-geolocation-con {
 
+    z-index: 999 !important;
 
+}
 
+
 
 .amap-marker-label {
 
     border: 0px;
 
     color: #0bc00f;

+ 18 - 3
web12345/src/templates/webChat-5.html
Fájl Megtekintése 

@@ -22,13 +22,28 @@
 
         <div><span>所在位置：</span>
 
             <div class="text-map">
 
                 <gaode-map options="mapOptions" style="height:150px"></gaode-map>
 
-                <div class='panel'>
 
-                    <input id='input' value='点击地图显示地址' disabled></input>
 
-                </div>
 
             </div>
 
         </div>
 
         <div class="button-bottom">
 
             <button type="button" class="btn btn-default" ng-click="pageChange()">提交</button>
 
         </div>
 
+        <div class="modal fade viewModal" id="viewModal" tabindex="-2" role="dialog" aria-labelledby="viewModalLabel" aria-hidden="true">
 
+            <button type="button" data-toggle="modal" data-target="#okModal" class="close" aria-hidden="true"><span class="glyphicon glyphicon-trash"></span></button>
 
+            <a class="thumbnail image-view"></a>
 
+        </div>
 
+        <!--OK-->
 
+        <div class="modal fade okModal" id="okModal" tabindex="-2" role="dialog" aria-labelledby="okModalLabel" aria-hidden="true">
 
+            <div class="modal-dialog">
 
+                <div class="modal-content">
 
+                    <div class="modal-header">
 
+                        <p id="titleB">确定删除？</p>
 
+                    </div>
 
+                    <div class="modal-footer">
 
+                        <button type="button" class="btn btn-success" data-dismiss="modal" ng-click="delImg()">确定</button>
 
+                        <button type="button" class="btn btn-success" data-dismiss="modal">取消</button>
 
+                    </div>
 
+                </div>
 
+            </div>
 
+        </div>
 
     </div>
 
 </div>

+ 10 - 1
webManger12346/src/less/app.main.less
Fájl Megtekintése 

@@ -496,10 +496,19 @@ body{
 
             }
 
         }
 
         .viewModal .modal-dialog {
 
+            width: 0px;
 
+            max-width: 100%;
 
+            padding: 0px;
 
+            margin: 0px;
 
             top: 50px;
 
             background-color: transparent;
 
             .modal-body {
 
-                
+                margin: 0px;
 
+                text-align: center;
 
+            }
 
+            .modal-content {
 
+                border: none;
 
+                outline: none;
 
             }
 
         }
 
         .okModal .modal-dialog {

+ 1 - 2
webManger12346/src/templates/mangerWeb.html
Fájl Megtekintése 

@@ -274,8 +274,7 @@
 
                 <div class="modal-dialog">
 
                     <div class="modal-content">
 
                         <div class="modal-body">
 
-                            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
 
-                            <a class="thumbnail" style="width:100%;"><img class="images" src="../img/111.jpg"></a>
 
+                            <img class="images" src="../img/111.jpg" data-dismiss="modal">
 
                         </div>
 
                     </div>
 
                 </div>