Skip to content

Commit

Permalink
开发中....
Browse files Browse the repository at this point in the history
  • Loading branch information
zhaoky committed Mar 25, 2017
1 parent aca00db commit e5dcab9
Show file tree
Hide file tree
Showing 13 changed files with 52 additions and 42 deletions.
2 changes: 1 addition & 1 deletion gulp/kit.js
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ function getUglifyConfig(onf) {
join_vars: true, // join declarations
cascade: true, // try to cascade `right` into `left` in sequences
side_effects: true, // drop side-effect-free statements
drop_console: true, // drop console
drop_console: false, // drop console
warnings: false // warn about potentially dangerous optimizations/code
}
}, onf);
Expand Down
6 changes: 3 additions & 3 deletions src/components/_rContact/cmpt.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<div class="-contact">
<div class="-title">{{$ctrl.title}}</div>
<div class="-title" ng-bind="$ctrl.title"></div>
<div class="-content" ng-class="{'-content-en':$ctrl.isEng}">
<div class="-contact-des1" ng-class="{'-contact-des1-en':$ctrl.isEng}">
<span ng-repeat="item in $ctrl.desList1 track by $index">{{item}}</span>
<span ng-repeat="item in $ctrl.desList1 track by $index" ng-bind="item"></span>
</div>
<div class="-contact-des2">
<p ng-repeat="item in $ctrl.desList2 track by $index">{{item}}</p>
<p ng-repeat="item in $ctrl.desList2 track by $index" ng-bind="item"></p>
</div>
<!--<div class="-contact-download">-->
<!--<div class="-download-title">{{$ctrl.download}}</div>-->
Expand Down
4 changes: 2 additions & 2 deletions src/components/_rDefault/cmpt.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<div class="-content">
<div class="-photo"></div>
<div class="-des">
<p class="-quote">{{$ctrl.quote}}</p>
<p class="-quote" ng-bind="$ctrl.quote"></p>
<div class="-des-list">
<p ng-repeat="item in $ctrl.desList track by $index">{{item}}</p>
<p ng-repeat="item in $ctrl.desList track by $index" ng-bind="item"></p>
</div>
</div>
</div>
Expand Down
18 changes: 11 additions & 7 deletions src/components/_rExperience/cmpt.html
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
<div class="-experience">
<div class="-title">{{$ctrl.title}}</div>
<div class="-title" ng-bind="$ctrl.title"></div>
<div class="-content">
<div class="-banner" touch-three-d>
<div class="-experience-content">
<div class="-left">
<div class="-img" style="background-image: url({{$ctrl.exp.imgUrl}})"></div>
</div>
<div class="-right">
<h4>{{$ctrl.exp.title}}</h4>
<p class="-time">{{$ctrl.exp.time}}</p>
<p class="-post"><{{$ctrl.exp.post}}></p>
<p class="-tech">"{{$ctrl.exp.tech}}"</p>
<h4 ng-bind="$ctrl.exp.title"></h4>
<p class="-time" ng-bind="$ctrl.exp.time"></p>
<p class="-post"><<span ng-bind="$ctrl.exp.post"></span>></p>
<p class="-tech">"<span ng-bind="$ctrl.exp.tech"></span>"</p>
<ul class="-list">
<li class="-item" ng-class="{'-item-en':$ctrl.isEng}" ng-repeat="item in $ctrl.exp.contentList track by $index">{{item}}</li>
<li class="-item"
ng-class="{'-item-en':$ctrl.isEng}"
ng-repeat="item in $ctrl.exp.contentList track by $index"
ng-bind="item">
</li>
</ul>
</div>
</div>
Expand All @@ -25,6 +29,6 @@ <h4>{{$ctrl.exp.title}}</h4>
ng-repeat="item in $ctrl.cutList track by $index"></li>
</ul>
</div>
<div class="-exp-des">{{$ctrl.des}}</div>
<div class="-exp-des" ng-bind="$ctrl.des"></div>
</div>
</div>
8 changes: 5 additions & 3 deletions src/components/_rInfo/cmpt.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="-info">
<div class="-title">{{$ctrl.title}}</div>
<div class="-title" ng-bind="$ctrl.title"></div>
<div class="-content">
<div>
<ul class="-info-list">
Expand All @@ -8,13 +8,15 @@
<div class="-img">
<img ng-src="{{item.icon}}" alt="">
</div>
<div class="-intro" ng-class="{'-intro-en':$ctrl.isEng}">{{item.key}}/{{item.value}}</div>
<div class="-intro" ng-class="{'-intro-en':$ctrl.isEng}">
<span ng-bind="item.key"></span>/<span ng-bind="item.value"></span>
</div>
</div>
</li>
</ul>
</div>
<div class="-info-des" ng-class="{'-info-des-en':$ctrl.isEng}">
<p ng-repeat="item in $ctrl.desList track by $index">{{item}}</p>
<p ng-repeat="item in $ctrl.desList track by $index" ng-bind="item"></p>
</div>
</div>
</div>
12 changes: 6 additions & 6 deletions src/components/_rSkill/cmpt.html
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
<div class="-skill">
<div class="-title">{{$ctrl.title}}</div>
<div class="-title" ng-bind="$ctrl.title"></div>
<div class="-content">
<div class="-contain" ng-class="{'-contain-en':$ctrl.isEng}">
<div class="-skill-circle">
<ul class="-outCircle">
<li class="-out"
style="background-color:{{item.color}}"
ng-repeat="item in $ctrl.outCircleList track by $index">
{{item.name}}
ng-repeat="item in $ctrl.outCircleList track by $index"
ng-bind="item.name">
</li>
</ul>
<ul class="-innerCircle">
<li class="-inner"
style="background-color:{{item.color}}"
ng-repeat="item in $ctrl.innerCircleList track by $index">
{{item.name}}
ng-repeat="item in $ctrl.innerCircleList track by $index"
ng-bind="item.name">
</li>
</ul>
</div>
<div class="-des" ng-class="{'-des-en':$ctrl.isEng}">
<p ng-repeat="item in $ctrl.desList track by $index">{{item}}</p>
<p ng-repeat="item in $ctrl.desList track by $index" ng-bind="item"></p>
</div>
</div>

Expand Down
8 changes: 4 additions & 4 deletions src/components/_rWorks/cmpt.html
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<div class="-work">
<div class="-title">{{$ctrl.title}}</div>
<div class="-title" ng-bind="$ctrl.title"></div>
<div class="-content">
<ul class="-work-list">
<li class="-work-item" ng-repeat="item in $ctrl.worksList track by $index">
<h4 class="-work-title">{{item.title}}</h4>
<p class="-work-des" ng-class="{'-work-des-en':$ctrl.isEng}">{{item.des}}</p>
<h4 class="-work-title" ng-bind="item.title"></h4>
<p class="-work-des" ng-class="{'-work-des-en':$ctrl.isEng}" ng-bind="item.des"></p>
<a class="-work-link" ng-href="{{item.url}}"><img src="img/w_link.svg" alt=""></a>
</li>
</ul>
<div class="-work-more">
<a href="https://github.com/zhaoky/demos" target="_blank">{{$ctrl.viewMore}}</a>
<a href="https://github.com/zhaoky/demos" target="_blank" ng-bind="$ctrl.viewMore"></a>
</div>
<div class="-work-switch" switch-work>
<i class="-left"></i>
Expand Down
3 changes: 1 addition & 2 deletions src/components/_rWorks/cmpt.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,10 @@ export default angular
ele[0].addEventListener(actionEvent.event.start,switchWorkHandler);

function switchWorkHandler(evt){
console.log(evt);

if(evt.target.nodeName !== "I"){
return;
}

rotate += evt.target.className == "-left"?90:-90;

worksContain.style.transform ="rotateY("+rotate+"deg)";
Expand Down
1 change: 1 addition & 0 deletions src/components/rFooter/cmpt.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<div class="-footer">
<!--<p>写在后面的话</p>-->
<p>学习本简历制作(前端)请在PC端按F12</p>
<p>All Rights Reserved</p>
<p>蜀ICP备15021330号 Copyright © 2015 - 2017</p>
</div>
12 changes: 6 additions & 6 deletions src/components/rHeader/cmpt.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<div
show-nav
class="-header-title"
ng-class="{'-rotate':$ctrl.isShowNav}">
{{$ctrl.titleList[$ctrl.pageIndex].title}}
ng-class="{'-rotate':$ctrl.isShowNav}"
ng-bind="$ctrl.titleList[$ctrl.pageIndex].title">
</div>
<div class="-language">
<div
Expand All @@ -18,8 +18,8 @@
<span
data-index="{{$index}}"
ng-class="{'-selected':$ctrl.selectedLang == $index+1}"
ng-repeat="item in $ctrl.langList track by $index">
{{item}}
ng-repeat="item in $ctrl.langList track by $index"
ng-bind="item">
</span>
</div>
</div>
Expand All @@ -32,7 +32,7 @@
class="-item"
ng-class="{'-cur-index':$ctrl.pageIndex == $index}"
ng-repeat="item in $ctrl.titleList track by $index">
<em data-index="{{$index}}">{{item.title}}</em>
<em data-index="{{$index}}" ng-bind="item.title"></em>
</li>
</ul>
</div>
Expand All @@ -45,7 +45,7 @@
<em class="-dot" data-index="{{$index}}">
<img ng-src="{{item.svg}}" alt="">
</em>
<span class="-dot-title">{{item.title}}</span>
<span class="-dot-title" ng-bind="item.title"></span>
</li>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/rHeader/cmpt.less
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
display: block;
width: 40px;
height: 40px;
background: url(http://www.flqin.com/image/logo.jpg) no-repeat center center;
background: url("../img/logo.jpg") no-repeat center center;
background-size: contain;
border-radius: 50%;
}
Expand Down
16 changes: 10 additions & 6 deletions src/components/rMain/cmpt.js
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@ export default angular

stopIosDropDown.stop();

consoleLog();

ele[0].addEventListener(actionEvent.event.start, touchStartHandler);
ele[0].addEventListener("mousewheel", startWheelHandler);
}
Expand All @@ -174,7 +176,6 @@ export default angular
}

function touchStartHandler(e) {
console.log("start");

if (moving || e.type != "touchstart") {
return;
Expand All @@ -186,7 +187,6 @@ export default angular
}

function touchMoveHandler(e) {
console.log("move");

if (moving) {
return;
Expand All @@ -205,8 +205,6 @@ export default angular

function touchEndHandler() {

console.log("end");

if (moving) {
return;
}
Expand All @@ -216,8 +214,6 @@ export default angular

function transitionEndHandler() {

console.log("进入回调");

moving = false;

resumeData.moving = moving;
Expand Down Expand Up @@ -291,6 +287,14 @@ export default angular

}

function consoleLog(){
console.log("Hi! 朋友,感谢您愿意调试简历代码。\n" +
"本简历采用ES6,angularJS 1.x,gulp,less,webpack开发构建。\n" +
"源码已开源在(https://github.com/zhaoky/flqin),喜欢请点个star吧! \n" +
"如果您有什么建议或者想学习前端,欢迎您加入我们,我们互相学习,共同进步^_^ \n" +
"%c QQ小群(http://t.cn/RtlQbTq)","color: red");
}

}

return {
Expand Down
2 changes: 1 addition & 1 deletion src/components/zkyResume/cmpt.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export default angular
{
title:"web前端工程师简历(2015年版)",
des:"本简历初版,上线一个月后,百度关键词“web前端工程师简历”排名前三,点击量数百万,深受广大前端初学者的好评及模仿,至今搜该关键词百度前10页都处处能见该简历的仿版。",
url:"http://wwww.flqin.com/old",
url:"http://wwww.flqin.com/2015/",
},
{
title:"移动校园APP",
Expand Down

0 comments on commit e5dcab9

Please sign in to comment.