Browse Source

新增公司历程

mentoswzq 4 years ago
parent
commit
af6e20b158
6 changed files with 74 additions and 49 deletions
  1. 1 1
      package.json
  2. 25 0
      src/css/aboutUs.css
  3. 3 3
      src/js/aboutUs.js
  4. 42 42
      template/aboutUs.html
  5. 1 1
      webpack-dll.config.js
  6. 2 2
      webpack.config.js

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "aft-portal",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "description": "",
   "main": "index.js",
   "scripts": {

+ 25 - 0
src/css/aboutUs.css

@@ -56,6 +56,8 @@
 .historyBanner>ul>li:first-child{background: url(../../img/aboutUs011.png) no-repeat center;background-size:98% 80% ;background-position-x: -11px;}
 .historyBanner>ul>li>ol>li span:hover{color: #ff7302;}
 .historyBanner>ul>li:first-child+li{background: url(../../img/aboutUs012.png) no-repeat center;background-size:98% 80% ;background-position-x: -11px;margin-left: -26px;}
+.historyBanner>ul>li:nth-child(2)+li{background: url(../../img/aboutUs011.png) no-repeat center;background-size:98% 80% ;background-position-x: -11px;margin-left: -26px;}
+.historyBanner>ul>li:nth-child(3)+li{background: url(../../img/aboutUs012.png) no-repeat center;background-size:98% 80% ;background-position-x: -11px;margin-left: -26px;}
 .historyBanner>ul>li:first-child>ol>li:nth-child(1){margin-top: 17px;margin-left: 2px;}
 .historyBanner>ul>li:first-child>ol>li:nth-child(2){margin-top: -13px;margin-left: 0px;}
 .historyBanner>ul>li:first-child>ol>li:nth-child(3){margin-top: -37px;margin-left: 0px;}
@@ -91,4 +93,27 @@
 .historyBanner>ul>li:first-child+li>ol>li:nth-child(10) p{width:165px;margin-left:-40px;}
 .historyBanner>ul>li:first-child+li>ol>li:nth-child(11){margin-top:-20px;margin-left: 8px;}
 .historyBanner>ul>li:first-child+li>ol>li:nth-child(11) p{width:112px;margin-left:-15px;}
+.historyBanner>ul>li:nth-child(3)>ol>li:nth-child(1){margin-top:50px;margin-left: 8px;}
+.historyBanner>ul>li:nth-child(3)>ol>li:nth-child(2){margin-top:-58px;margin-left: -5px;}
+.historyBanner>ul>li:nth-child(3)>ol>li:nth-child(3){margin-top:-62px;}
+.historyBanner>ul>li:nth-child(3)>ol>li:nth-child(4){margin-top:-38px;margin-left: 5px}
+.historyBanner>ul>li:nth-child(3)>ol>li:nth-child(5){margin-top:-41px;margin-left: 11px}
+.historyBanner>ul>li:nth-child(3)>ol>li:nth-child(6){margin-top:-57px;margin-left: 4px}
+.historyBanner>ul>li:nth-child(3)>ol>li:nth-child(7){margin-top:-57px;margin-left: 4px}
+.historyBanner>ul>li:nth-child(3)>ol>li:nth-child(8){margin-top:25px;margin-left: 6px}
+.historyBanner>ul>li:nth-child(3)>ol>li:nth-child(9){margin-top:54px;margin-left: 4px}
+.historyBanner>ul>li:nth-child(3)>ol>li:nth-child(10){margin-top:7px;margin-left: 5px}
+.historyBanner>ul>li:nth-child(3)>ol>li:nth-child(11){margin-top:-2px;margin-left: 0px}
+.historyBanner>ul>li:nth-child(3)>ol>li:nth-child(12){margin-top:-45px;margin-left: -11px}
+.historyBanner>ul>li:nth-child(4)>ol>li:nth-child(1){margin-top:-45px;margin-left: 46px}
+.historyBanner>ul>li:nth-child(4)>ol>li:nth-child(2){margin-top:-13px;margin-left: -1px}
+.historyBanner>ul>li:nth-child(4)>ol>li:nth-child(3){margin-top:-13px;margin-left: 8px}
+.historyBanner>ul>li:nth-child(4)>ol>li:nth-child(4){margin-top:-14px;margin-left: 5px}
+.historyBanner>ul>li:nth-child(4)>ol>li:nth-child(5){margin-top:-14px;margin-left: 3px}
+.historyBanner>ul>li:nth-child(4)>ol>li:nth-child(6){margin-top:-56px;margin-left: 7px}
+.historyBanner>ul>li:nth-child(4)>ol>li:nth-child(7){margin-top:-75px;margin-left: 3px}
+.historyBanner>ul>li:nth-child(4)>ol>li:nth-child(8){margin-top:-38px;margin-left: 8px}
+.historyBanner>ul>li:nth-child(4)>ol>li:nth-child(8) p{width: 309px;margin-left: -97px;}
+.historyBanner>ul>li:nth-child(4)>ol>li:nth-child(9){margin-top: -23px;margin-left: 10px;}
+.historyBanner>ul>li:nth-child(4)>ol>li:nth-child(9) p{width: 251px;margin-left: -159px;margin-top: -10px;margin-bottom: 14px;}
 

+ 3 - 3
src/js/aboutUs.js

@@ -26,10 +26,10 @@ $(function(){
 	var i=0;
 	$('.direction .next').click(function(){
 		i++;
-		if(i>6){
-			i=6
+		if(i>17){
+			i=17
 		}
-		$('.historyBanner ul').css('margin-left',-180*i)		
+		$('.historyBanner ul').css('margin-left',-177*i)
 	});	
 	$('.direction .pre').click(function(){
 		i--;

File diff suppressed because it is too large
+ 42 - 42
template/aboutUs.html


+ 1 - 1
webpack-dll.config.js

@@ -10,7 +10,7 @@ let theme = {
   '@link-color': '#58a3ff'
 };
 module.exports = (function () {
-	let staticHost = 'http://192.168.1.222:80';    
+	let staticHost = 'http://172.16.0.253:80';
     switch (argv.env.deploy) {
         case 'test':
             staticHost = 'http://statics.jishutao.com';

+ 2 - 2
webpack.config.js

@@ -515,7 +515,7 @@ module.exports = (function () {
         }));
     }
 
-    let staticHost = 'http://192.168.1.222:80';
+    let staticHost = 'http://172.16.0.253:80';
     switch (argv.env.deploy) {
         case 'test':
             staticHost = 'http://statics.jishutao.com';
@@ -547,7 +547,7 @@ module.exports = (function () {
         plugins: plugins,
         devServer: {
             disableHostCheck: true,
-            host: '192.168.1.222',
+            host: '172.16.0.253',
             port: 80,
             allowedHosts: ['192.168.0.222', '192.168.0.99', '192.168.0.20','192.168.0.17'],
             headers: {