Home Explore Help
Sign In
lqq
/
LxtalkUIView
Watch 2
Star 1
Fork 1
Files Issues 0 Pull Requests 0 Wiki
Browse Source

修改了lszw12345的service

lanzi68yang@163.com 8 years ago
parent
b72ad31866
commit
95b6f67030
10 changed files with 81 additions and 151 deletions
Split View Show Diff Stats
  1. 0 12
      lszw12345/src/html/index.html
  2. 0 4
      lszw12345/src/js/app.js
  3. 2 4
      lszw12345/src/js/controller/homeController.js
  4. 0 37
      lszw12345/src/js/controller/webController.js
  5. 0 6
      lszw12345/src/js/router.js
  6. 2 4
      lszw12345/src/less/app.less
  7. 1 79
      lszw12345/src/less/app.main.less
  8. 75 0
      lszw12345/src/less/app.service.less
  9. 1 1
      lszw12345/src/templates/service.html
  10. 0 4
      lszw12345/src/templates/webChat.html

+ 0 - 12
lszw12345/src/html/index.html
View File 

@@ -13,31 +13,19 @@
 
 
     <!-- jQuery文件。务必在bootstrap.min.js 之前引入 -->
 
     <!--<script src="js/jquery.min.js"></script>-->
 
-<<<<<<< HEAD
 
-    <script type="text/javascript" src="../bower_components/lodash/dist/lodash.js"></script>
 
-=======
 
     <script type="text/javascript" src="../bower_components/lodash/dist/lodash.min.js"></script>
 
->>>>>>> a5ba2a00e4550ae8d24dad60f592454caf4690a0
 
     <script type="text/javascript" src="../bower_components/jquery/dist/jquery.min.js"></script>
 
     <script type="text/javascript" src="../bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
 
     <script type="text/javascript" src="../bower_components/swiper/dist/js/swiper.jquery.min.js"></script>
 
     <script type="text/javascript" src="../bower_components/angular/angular.min.js"></script>
 
     <script type="text/javascript" src="../bower_components/angular-cookies/angular-cookies.min.js"></script>
 
     <script type="text/javascript" src="../bower_components/angular-ui-router/release/angular-ui-router.min.js"></script>
 
-<<<<<<< HEAD
 
-    <script type="text/javascript" src="../bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
 
-=======
 
->>>>>>> a5ba2a00e4550ae8d24dad60f592454caf4690a0
 
     <script type="text/javascript" src="../bower_components/angular-animate/angular-animate.min.js"></script>
 
 
     <script type="text/javascript" src="app.js"></script>
 
 </head>
 
 
 <body ng-app="app">
 
-<<<<<<< HEAD
 
-
 
-=======
 
->>>>>>> a5ba2a00e4550ae8d24dad60f592454caf4690a0
 
     <ui-view></ui-view>
 
 </body>

+ 0 - 4
lszw12345/src/js/app.js
View File 

@@ -3,10 +3,6 @@
 
 var app = angular.module('app', [
 
     'ui.router',
 
     'templatescache',
 
-<<<<<<< HEAD
 
-    'ui.bootstrap',
 
-=======
 
->>>>>>> a5ba2a00e4550ae8d24dad60f592454caf4690a0
 
     'ngAnimate',
 
     'ngCookies'
 
 ]);

+ 2 - 4
lszw12345/src/js/controller/homeController.js
View File 

@@ -1,8 +1,6 @@
 
 'use strict';
 
 
-<<<<<<< HEAD
 
-angular.module('app').controller('HomeController', ['$scope', function($scope) {
 
-=======
 
+
 
 angular.module('app').controller('HomeController', ['$scope', 'messageService', function($scope, messageService) {
 
 
     $scope.$on('$viewContentLoaded', function() {
 
@@ -38,6 +36,6 @@ angular.module('app').controller('HomeController', ['$scope', 'messageService',
 
             }
 
         }
 
     };
 
->>>>>>> a5ba2a00e4550ae8d24dad60f592454caf4690a0
 
+
 
 
 }]);

+ 0 - 37
lszw12345/src/js/controller/webController.js
View File 

@@ -3,41 +3,4 @@
 
 angular.module('app').controller('WebController', ['$scope', function($scope) {
 
     //lxtalkClient.Invoke('{FB60F992-A0FD-47B3-AAA7-E80DF209C5A4}', '_Register', '', $scope);
 
 
-<<<<<<< HEAD
 
-    !(function(win, doc) {
 
-        function setFontSize() {
 
-            var baseFontSize = 100;
 
-            var baseWidth = 320;
 
-            var clientWidth = document.documentElement.clientWidth || window.innerWidth;
 
-            var innerWidth = Math.max(Math.min(clientWidth, 480), 320);
 
-
 
-            var rem = 100;
 
-
 
-            if (innerWidth > 362 && innerWidth <= 375) {
 
-                rem = Math.floor(innerWidth / baseWidth * baseFontSize * 0.9);
 
-            }
 
-
 
-            if (innerWidth > 375) {
 
-                rem = Math.floor(innerWidth / baseWidth * baseFontSize * 0.84);
 
-            }
 
-
 
-            window.__baseREM = rem;
 
-            document.querySelector('html').style.fontSize = rem + 'px';
 
-        }
 
-        var evt = 'onorientationchange' in win ? 'orientationchange' : 'resize';
 
-        var timer = null;
 
-        win.addEventListener(evt, function() {
 
-            clearTimeout(timer);
 
-            timer = setTimeout(setFontSize, 300);
 
-        }, false);
 
-        win.addEventListener("pageshow", function(e) {
 
-            if (e.persisted) {
 
-                clearTimeout(timer);
 
-                timer = setTimeout(setFontSize, 300);
 
-            }
 
-        }, false);
 
-        setFontSize();
 
-    }(window, document));
 
-=======
 
->>>>>>> a5ba2a00e4550ae8d24dad60f592454caf4690a0
 
 }]);

+ 0 - 6
lszw12345/src/js/router.js
View File 

@@ -1,14 +1,8 @@
 
 angular.module('app').run(['$rootScope', '$state', '$stateParams',
 
-<<<<<<< HEAD
 
-    function($rootScope, $state, $stateParams, auth2Service) {
 
-        $rootScope.$state = $state;
 
-        $rootScope.$stateParams = $stateParams;
 
 
-=======
 
     function($rootScope, $state, $stateParams) {
 
         $rootScope.$state = $state;
 
         $rootScope.$stateParams = $stateParams;
 
->>>>>>> a5ba2a00e4550ae8d24dad60f592454caf4690a0
 
     }
 
 ]).config(['$stateProvider', '$urlRouterProvider',
 
     function($stateProvider, $urlRouterProvider) {

+ 2 - 4
lszw12345/src/less/app.less
View File 

@@ -1,8 +1,6 @@
 
 // Core variables and mixins
 
 @import "../../../common/app.utilities.less";
 
-<<<<<<< HEAD
 
-@import "app.main.less";
 
-=======
 
+
 
 @import "app.main.less";
 
 @import "app.home.less";
 
->>>>>>> a5ba2a00e4550ae8d24dad60f592454caf4690a0
 
+@import "app.service.less";

+ 1 - 79
lszw12345/src/less/app.main.less
View File 

@@ -1,4 +1,3 @@
 
-<<<<<<< HEAD
 
 /* 设置滚动条的样式 */::-webkit-scrollbar { width: 6px;}
 
 /* 滚动槽 */::-webkit-scrollbar-track { -webkit-box-shadow: inset 0 0 6px #FFFFFF; border-radius: 3px;}
 
 /* 滚动条滑块 */::-webkit-scrollbar-thumb { border-radius: 3px; background: #ccc; -webkit-box-shadow: inset 0 0 6px transparent;}::-webkit-scrollbar-thumb:window-inactive { background: transparent;}
 
@@ -25,81 +24,4 @@
 
 body{
 
     background-color: #F5F5F5;
 
     font-family: "Arial","Microsoft YaHei","宋体",sans-serif;
 
- overflow-y: hidden;
 
-}
 
-
 
-.header {
 
-  position: fixed;
 
-  top: 0%;
 
-  z-index: 1000;
 
-  width: 100%;
 
-  height: 40px;
 
-  padding-top: 9px;
 
-  font-size: 15px;
 
-  color: #FFF;
 
-  text-align: center;
 
-  background-color: #3FA1E6;
 
-  .glyphicon-arrow-left {
 
-      float: left;
 
-      margin-left: 10px;
 
-      margin-top: 2px;
 
-  }
 
-  .glyphicon-home {
 
-      float: right;
 
-      margin-right: 10px;
 
-      margin-top: 2px;
 
-  }
 
-}
 
-
 
-
 
-          .service-content{
 
-             margin-top: 45px;
 
-             height: 568px;
 
-             overflow-y: auto ;
 
-             overflow-x: hidden;
 
-             background-color: #FFF;     
-             >p{
 
-                 width: 49%;
 
-                 display:inline-block;
 
-                 line-height: 60px;
 
-                 height: 60px;
 
-                 border-bottom: 1px solid #DCDCDC;   
-                 margin: 0;  
-                 font-size: 13px;
 
-                 white-space: nowrap;
 
-                >span{
 
-                  margin-left: 21%;
 
-                     color:#168DD9;
 
-                      }
 
-              
-             }
 
-                  // >li{
 
-                  //      list-style-type: none;
 
-                  //      height: 60px;
 
-                  //      border-bottom: 1px solid #DCDCDC;
 
-                  //       >.right{
 
-                  //          width: 50%;
 
-                  //          display:inline-block;
 
-                  //         text-align: center; 
-                  //          margin-top: 20px;
 
-                  //          >span{
 
-                  //            color:#168DD9;
 
-                  //          }
 
-                  //       }
 
-                  //       >.left{
 
-                  //         width:50%;
 
-                  //         float: left;
 
-                  //          text-align: center; 
-                  //          margin-top: 20px;
 
-                  //          >span{
 
-                  //            color:#168DD9;
 
-                  //               }
 
-                  //       }  
-                         
-                  //     }
 
-
 
-          }
 
-=======
 
-
 
-
 
->>>>>>> a5ba2a00e4550ae8d24dad60f592454caf4690a0
 
+}

+ 75 - 0
lszw12345/src/less/app.service.less
View File 

@@ -0,0 +1,75 @@
 
+
 
+
 
+.header {
 
+  position: fixed;
 
+  top: 0%;
 
+  z-index: 1000;
 
+  width: 100%;
 
+  height: 40px;
 
+  padding-top: 9px;
 
+  font-size: 15px;
 
+  color: #FFF;
 
+  text-align: center;
 
+  background-color: #3FA1E6;
 
+  .glyphicon-arrow-left {
 
+      float: left;
 
+      margin-left: 10px;
 
+      margin-top: 2px;
 
+  }
 
+  .glyphicon-home {
 
+      float: right;
 
+      margin-right: 10px;
 
+      margin-top: 2px;
 
+  }
 
+}
 
+
 
+
 
+          .service-content{
 
+             margin-top: 45px;
 
+             height: 568px;
 
+             overflow-y: auto ;
 
+             overflow-x: hidden;
 
+             background-color: #FFF;     
+             >p{
 
+                 width: 49%;
 
+                 display:inline-block;
 
+                 line-height: 60px;
 
+                 height: 60px;
 
+                 border-bottom: 1px solid #DCDCDC;   
+                 margin: 0;  
+                 font-size: 13px;
 
+                 white-space: nowrap;
 
+                >span{
 
+                  margin-left: 21%;
 
+                     color:#168DD9;
 
+                      }
 
+              
+             }
 
+                  // >li{
 
+                  //      list-style-type: none;
 
+                  //      height: 60px;
 
+                  //      border-bottom: 1px solid #DCDCDC;
 
+                  //       >.right{
 
+                  //          width: 50%;
 
+                  //          display:inline-block;
 
+                  //         text-align: center; 
+                  //          margin-top: 20px;
 
+                  //          >span{
 
+                  //            color:#168DD9;
 
+                  //          }
 
+                  //       }
 
+                  //       >.left{
 
+                  //         width:50%;
 
+                  //         float: left;
 
+                  //          text-align: center; 
+                  //          margin-top: 20px;
 
+                  //          >span{
 
+                  //            color:#168DD9;
 
+                  //               }
 
+                  //       }  
+                         
+                  //     }
 
+
 
+          }
 
+
 
+

+ 1 - 1
lszw12345/src/templates/service.html
View File 

@@ -13,7 +13,7 @@
 
     <P> <span class="glyphicon glyphicon-link"></span>&nbsp市民宗局</P>
 
     <p> <span class="glyphicon glyphicon-link"></span>&nbsp市公安局</p>
 
 
-
 
+    <!-- 修改了service -->
 
     <!-- <P> <span class="glyphicon glyphicon-link"></span>&nbsp市民政局</P>
 
     <p> <span class="glyphicon glyphicon-link"></span>&nbsp市司法局</p>

+ 0 - 4
lszw12345/src/templates/webChat.html
View File 

@@ -1,10 +1,6 @@
 
 <header>
 
 </header>
 
-<<<<<<< HEAD
 
-<content ui-view class="fade-in-right-big"></content>
 
-=======
 
 <content ui-view></content>
 
->>>>>>> a5ba2a00e4550ae8d24dad60f592454caf4690a0
 
 
 <footer class="foot">
 
 </footer>