个人资料

dist/bower.json

@@ -1,32 +1,32 @@
 {
-    "name": "talkview",
-    "description": "",
-    "main": "",
-    "authors": [
-        "lqq"
-    ],
-    "license": "MIT",
-    "homepage": "",
-    "private": true,
-    "ignore": [
-        "**/.*",
-        "node_modules",
-        "bower_components",
-        "test",
-        "tests"
-    ],
-    "dependencies": {
-        "angular-ui-router": "^0.3.1",
-        "bootstrap": "^3.3.7",
-        "angular": "^1.5.8",
-        "angular-scroll-glue": "^2.0.7",
-        "angular-animate": "^1.5.8",
-        "animate.css": "^3.5.2",
-        "angular-bootstrap": "^2.2.0",
-        "angular-sanitize": "^1.5.8",
-        "jquery-qrcode": "*",
-        "zTree": "^3.5.26",
-        "lodash": "^4.17.4",
-        "peerjs": "^0.3.14"
-    }
-}
+  "name": "talkview",
+  "description": "",
+  "main": "",
+  "authors": [
+    "lqq"
+  ],
+  "license": "MIT",
+  "homepage": "",
+  "private": true,
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ],
+  "dependencies": {
+    "angular-ui-router": "^0.3.1",
+    "bootstrap": "^3.3.7",
+    "angular": "^1.5.8",
+    "angular-scroll-glue": "^2.0.7",
+    "angular-animate": "^1.5.8",
+    "animate.css": "^3.5.2",
+    "angular-bootstrap": "^2.2.0",
+    "angular-sanitize": "^1.5.8",
+    "jquery-qrcode": "*",
+    "zTree": "^3.5.26",
+    "lodash": "^4.17.4",
+    "peerjs": "^0.3.14"
+  }
+}

talkview/src/js/controller/messageController.js

@@ -49,6 +49,17 @@ angular.module('appMessage').controller('MessageController', ['$scope', '$filter
             $scope.count = false;
         };
 
+        // $scope.scrollWheel = function() {
+        //     console.log("1111111111");
+        //     if (document.body.scrollTop + document.body.clientHeight == document.body.scrollHeight && window.wheelDelta < 0) {
+        //         $scope.height = document.body.scrollHeight;
+        //         lxtalkClient.Invoke('{15180DEF-D508-45F7-BAEB-6486CD8752C8}', 'LoadHistoryMessages', '', $scope);
+        //         $scope.count = false;
+        //     }
+        // }
+
+        //document.getElementById("body").addEventListener("wheel", scrollWheel());
+
         $scope.loadImages = function(data) {
             console.log('11111111222');
             lxtalkClient.Invoke('{15180DEF-D508-45F7-BAEB-6486CD8752C8}', 'LoadImages', JSON.stringify(data), $scope);

talkview/src/js/directive/mousewheel .js

@@ -0,0 +1,26 @@
+(function() {
+    'use strict';
+
+    angular
+        .module('appMessage')
+        .directive('ngMouseWheelUp', function() {
+            return function(scope, element, attrs) {
+                element.bind("DOMMouseScroll mousewheel onmousewheel", function(event) {
+                    // cross-browser wheel delta
+                    var event = window.event || event; // old IE support
+                    var delta = Math.max(-1, Math.min(1, (event.wheelDelta || -event.detail)));
+                    if (delta > 0) {
+                        scope.$apply(function() {
+                            scope.$eval(attrs.ngMouseWheelUp);
+                        });
+                        // for IE
+                        event.returnValue = false;
+                        // for Chrome and Firefox
+                        if (event.preventDefault) {
+                            event.preventDefault();
+                        }
+                    }
+                });
+            };
+        });
+})();

talkview/src/less/app.main.less

@@ -62,7 +62,7 @@
         margin-left: 10px;
         margin-top: -2px;
         margin-bottom: 0px;
-        margin-right: 25px;
+        margin-right: 20px;
         padding: 7px 14px 7px 12px;
         font-size: 12px;
         line-height: 16px;
@@ -96,7 +96,7 @@
         margin-left: 10px;
         margin-top: -2px;
         margin-bottom: 0px;
-        margin-right: 25px;
+        margin-right: 20px;
         padding: 7px 14px 7px 12px;
         font-size: 12px;
         line-height: 16px;
@@ -352,7 +352,7 @@ body {
         }
     }
     #userInfo {
-        height: 155px;
+        height: 152px;
         background: #fff;
         #content {
             position: relative;
@@ -363,7 +363,7 @@ body {
                 >li {
                     width: 210px;
                     font-family: "微软雅黑","宋体";
-                    padding-top:5px;
+                    padding-top:4px;
                     padding-bottom: 1px;
                     text-align: left;
                     font-size: 12px;
@@ -388,7 +388,7 @@ body {
     }
     #userCode {
         #code {
-            margin: 20px auto;
+            margin: 25px auto;
             width: 160px;
             height: 160px;
             border: 8px solid #fff;