Merge branch 'master' of git.minrow.com:reyun/saasio

src/main/websrc/index.html

@@ -89,6 +89,7 @@
                 </a>
             </div>
             <div class="rightHeader clearfix">
+                <div class="toggleBtn"><a href="{{trackUrl}}" target="_blank">进入TrackingIO</a></div>
                 <div class="flowinfo">
                     <div class="flowCircle" ng-if="flowKnow && !flowRestrict"></div>
                 </div>

src/main/websrc/js/app/app.js

@@ -245,10 +245,16 @@
 	    		});
 				}
 
-
+        $scope.queryTrackUrl = function(){
+            var urlPM = HttpService.getInfo("/index/trackingio", {});
+            urlPM.then(function(data) {
+               $scope.trackUrl = data;
+            });
+        }
         $scope.initpage = function(){
             $scope.queryLimit();
             $scope.queryApp();
+            $scope.queryTrackUrl();
         }
 
         var lpath = $location.path();

src/main/websrc/js/manage/app.js

@@ -73,10 +73,32 @@
              return false;
           }
         }
+        var panelH = $(".rightWrap");
+        $(".rightWrap").scroll(function(event){  
+            if(panelH.get(0).scrollHeight<=panelH.height())return;
+            var _this = this;
+            $timeout(function() {
+                if($scope.isShow() && $scope.filterResult.length>0){
+                    var viewH =$(_this).height(),//可见高度  
+                    contentH =$(_this).get(0).scrollHeight,//内容高度  
+                    scrollTop =$(_this).scrollTop();//滚动高度  
+                    if(scrollTop>=contentH -viewH){ //到达底部100px时,加载新内容  
+                        $scope.getMore();
+                    }  
+                }
+            }, 10);
+        }); 
+        $(".rightWrap").on('mousewheel', function(event){ 
+            if(panelH.get(0).scrollHeight>panelH.height() || event.originalEvent.deltaY<=0)return;
+            if($scope.isShow() && $scope.filterResult.length>0){
+                $timeout(function() { 
+                    $scope.getMore();
+                }, 10);
+            }
+        });  
         $scope.getMore = function(){
-          $scope.limitCount += $scope.limitCount+9;
-        };
-
+            $scope.limitCount += 9;
+        }
         $scope.gopage = function(id,flag){
             if(flag){
                 isLog = true;
@@ -94,6 +116,8 @@
         $scope.goReport = function(info,e){
             if($(e.target).hasClass('copyBtn')) return;
             $rootScope.isweb = info.platform == 'H5';
+            $('.rightWrap').unbind("scroll");
+            $('.rightWrap').unbind("mousewheel");
             $scope.$emit("mngappTo",info.id);
 
             var url = $rootScope.firstMeau.substring(1).replace('/','.');

src/main/websrc/styles/style.scss

@@ -32,6 +32,30 @@ html,body{
 .sidebarNav li:not(.activemore):hover .iconfont{
 	color: $menulihoverft;
 }
+.toggleBtn{
+    border-left: 1px solid #ffffff;
+    margin-left: -102px;
+    display:inline-block;
+    margin-top:4px;
+	a{
+		border:1px solid #ffffff;
+		border-radius:100px;
+		color:#ffffff;
+		width:118px;
+		height:24px;
+		color:#ffffff;
+		text-align:center;
+		line-height:24px;
+		display:inline-block;
+		margin-left:20px;
+		&:before{
+			content:url(../images/whiteArrow.png);
+			width:7px;
+			height:6px;
+			padding-right:6px;
+		}
+	}
+}
 .icon-logo{
 	font-size:25px;
 	color:#fff;
@@ -6935,7 +6959,6 @@ pre{
 	margin-right: -14px;
 	.appWrap{
 			width: 33.333%;
-			float: left;
 			box-sizing: border-box;
 			padding-right: 14px;
 			padding-top: 14px;
@@ -6952,15 +6975,17 @@ pre{
 				box-shadow:0 1px 4px 0 rgba(0,0,0,0.10);
 			}
 			.setting{
-				background: url(../images/settings.png) no-repeat;
+				background: url(../images/settings.png) no-repeat center center;
 				width:16px;
 				height:16px;
 				cursor: pointer;
-				margin-right: 20px;
+				margin-right: 13px;
+				margin-top: -5px;
+				padding: 7px;
 				float: right;
 				position: relative;
 				&:hover{
-					background: url(../images/settings_hover.png) no-repeat;
+					background: url(../images/settings_hover.png) no-repeat center center;
 				}
 				ul{
 					background:#ffffff;
@@ -6969,7 +6994,7 @@ pre{
 					border-radius:3px;
 					width:78px;
 					position: absolute;
-					top:17px;
+					top:25px;
 					right: 0px;
 					li{
 						height:32px;
@@ -7020,24 +7045,16 @@ pre{
 	}
 	.more{
 		text-align: center;
+		background:#fafafa;
 		margin: auto;
-		color:#1964d4;
+		color:#666666;
 		cursor: pointer;
 		clear: both;
-    padding-top: 20px;
+    	margin-top: 20px;
+    	margin-right:15px;
 		width: auto;
-		span:before{
-			content: "";
-			background: url(../images/drop.png) no-repeat;
-			width: 10px;
-			height: 11px;
-			display: inline-block;
-		}
-		label{
-			padding-left: 5px;
-			color: #b5b0b0;
-			display: inline-block;
-		}
+		height:32px;
+		line-height:32px;
 	}
 	.noData{
 		text-align: center;

src/main/websrc/template/manage/app.html

@@ -16,7 +16,7 @@
          <div class="iconfont platform" ng-class="{'iOS':'icon-ios','Android':'icon-android','H5':'icon-wrap'}[info.platform]"></div>
          <span class="title">{{info.name}}</span>
          <span class="copyBtnIcon copyBtn" data-clipboard-text="{{info.name}}" title="点击复制"></span>
-         <span class="setting" ng-click="info.isShow=!info.isShow" stop-event>
+         <span class="setting" ng-click="info.isShow=!info.isShow" stop-event ng-mouseleave="info.isShow=false">
            <ul ng-show="info.isShow" ng-mouseleave="info.isShow=false">
              <li ng-click="gopage(info.id)">编辑</li>
              <li ng-click="doRemove(info.id)" ng-if="specialsAppkey.indexOf(info.appkey)==-1 && !isAppManage">删除</li>
@@ -32,7 +32,7 @@
      </div>
    </div>
  </div>
-  <div class="more" ng-click="getMore()" ng-show="isShow() && filterResult.length>0"><span>更多产品<label>(共{{resultList.length}}个产品)</label></span></div>
+ <div class="more" ng-click="getMore()" ng-show="isShow() && filterResult.length>0"><span>滑动/点击加载更多(共{{resultList.length}}个产品)</span></div>
   <div class="noData" ng-if="resultList.length==0">
      <span></span>
      <div>暂无产品</div>