From fc44782dce619a61891963de94ebff8066852644 Mon Sep 17 00:00:00 2001
From: tony <dengtongyu123@163.com>
Date: Tue, 22 May 2018 14:57:08 +0800
Subject: [PATCH] fixed bug

---
 package.json               |  2 +-
 src/pages/resume/index.htm |  2 +-
 src/pages/resume/index.js  | 30 +++++++++++++++---------------
 task/task.js               | 11 ++++++-----
 task/util.js               |  2 +-
 5 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/package.json b/package.json
index 0eeff6e..271c657 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "webpage",
-  "version": "1.0.0",
+  "version": "1.1.2",
   "description": "web pages",
   "main": "index.js",
   "scripts": {
diff --git a/src/pages/resume/index.htm b/src/pages/resume/index.htm
index 1191ac9..475f5e3 100644
--- a/src/pages/resume/index.htm
+++ b/src/pages/resume/index.htm
@@ -18,7 +18,7 @@
 				<h1>邓统宇</h1>
 			</div>
 			<div class="msg-row">
-				<p>世界纷纷扰扰，我只想做一个安静的“攻城狮”！！</p>
+				<p>世界纷纷扰扰，我只想做一个安静的“攻城狮”！</p>
 			</div>
 			<div class="msg-row">
 				<p>web前端开发工程师</p>
diff --git a/src/pages/resume/index.js b/src/pages/resume/index.js
index 4becaf4..7cb24cc 100644
--- a/src/pages/resume/index.js
+++ b/src/pages/resume/index.js
@@ -9,22 +9,22 @@ require('../../script/lib/svg3dtagcloud');
 
 require('../../script/lib/touchSwipe');
 
-const pop = require('../../script/tmodjs/resume/pop');
+var pop = require('../../script/tmodjs/resume/pop');
 
-let scrolling = false;
+var scrolling = false;
 
-let pos = 0;
+var pos = 0;
 
-let list = $('section');
+var list = $('section');
 
-let svgObject = false;
+var svgObject = false;
 
-//let hasTouch = 'ontouchstart' in window;
+//var hasTouch = 'ontouchstart' in window;
 
-let isMobile = false;
+var isMobile = false;
 
-let cssSupports = (function() {
-    let div = document.createElement('div');
+var cssSupports = (function() {
+    var div = document.createElement('div');
   
     return function(prop) {
        if ( prop in div.style ) return true;
@@ -33,14 +33,14 @@ let cssSupports = (function() {
     };
  })();
 
- let ua = navigator.userAgent.toLowerCase();
+ var ua = navigator.userAgent.toLowerCase();
 
  if(ua.match(/(iphone|ipod|android|ios)/i)) {
     isMobile = true;
  }
 
 if(!cssSupports('order')){
-    let popDom = $(pop({browser:'浏览器'}));
+    var popDom = $(pop({browser:'浏览器'}));
     $('body').append(popDom);
 
     if(isMobile) {
@@ -108,7 +108,7 @@ function navigateDown() {
 function slidePage(isNext) {
     scrolling = true;
     list.css({display:'none'});
-    // let prev = getPrev(pos);
+    // var prev = getPrev(pos);
     // list.eq(prev).addClass('fadeOutUp');
     // list.eq(prev).one("animationend", onOutAnimationend);
     list.eq(pos).one("animationend", onInAnimationend);
@@ -157,9 +157,9 @@ function getNext(p) {
 }
 
 function setTagCloud() {
-    let curElement = $('#skill');
+    var curElement = $('#skill');
 
-    let entries = [ 
+    var entries = [ 
         { label: 'HTML5',url: 'javascript:void(0);',target: ''},
         { label: 'CSS3',url: 'javascript:void(0);',target: ''},
         { label: 'JavaScript',url: 'javascript:void(0);',target: ''},
@@ -181,7 +181,7 @@ function setTagCloud() {
         { label: 'WordPress',url: 'javascript:void(0);',target: ''}
     ];
     
-    let settings = {
+    var settings = {
         entries: entries,
         width: '100%',
         height: '100%',
diff --git a/task/task.js b/task/task.js
index f2817d5..d90608e 100644
--- a/task/task.js
+++ b/task/task.js
@@ -89,9 +89,10 @@ init = (pathName) => {
 			}))
 			.pipe(webpack({
 				output: {
-			    	filename: 'index.js',
-			    }
+					filename: 'index.js',
+				}
 			}))
+			//.pipe(webpack( require('./webpack.config.js')(pathConfig.scriptBuildPath) ))
 			.pipe(gulp.dest(pathConfig.babelOutPath))
 			.on("end", reload);
 	});
@@ -174,7 +175,7 @@ init = (pathName) => {
 
 
 	gulp.task('build', function() {
-		runSequence('stylus_build', 'swig_build', 'htmlmin_build', 'tmod_build', 'babel_build', 'uglify_build',function() {
+		runSequence('stylus_build', 'swig_build', 'htmlmin_build', 'tmod_build', 'babel_build', 'uglify_build', function() {
 			console.log(chalk.green.bold(pathName + ' 打包完成！'));
 		});
 	});
@@ -201,7 +202,7 @@ copyTpl = (pathName) => {
 	});
 }
 
-exports.selectTpl = (pathName,type) => {
+exports.selectTpl = (pathName, type) => {
 	copyTpl(pathName);
 	if (type == 1) {
 		runSequence('copy-pc', function() {
@@ -221,7 +222,7 @@ exports.selectTpl = (pathName,type) => {
 exports.dev = (pathName) => {
 	init(pathName);
 	runSequence('dev');
-	watch.init(util.getPathConfig(),gulp);
+	watch.init(util.getPathConfig(), gulp);
 }
 
 exports.pack = (pathName) => {
diff --git a/task/util.js b/task/util.js
index 5e31ccf..02d8836 100644
--- a/task/util.js
+++ b/task/util.js
@@ -34,7 +34,7 @@ exports.initPath = (pathName) => {
 	_pathConfig.babelOutPath = _config.build + '/pages/' + pathName;
 
 	//uglify build目录
-	_pathConfig.uglifyBuildPath = _config.build + '/pages/' + pathName + '/**/*.js';
+	_pathConfig.uglifyBuildPath = _config.build + '/pages/' + pathName + '/index.js';
 
 	//tmod build目录
 	_pathConfig.tmodBuildPath = _config.base + '/pages/' + pathName + '/**/*.tmod';