wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by xuqi
Commit 8ddaea5fb5c5b9f462aaaf89852f1fc3bd2ed321 1 parent 7f0c268f

zepto -> jquery 2.1.4

Inline Side-by-side
Showing 35 changed files with 57 additions and 60 deletions
@@ -4,9 +4,9 @@ @@ -4,9 +4,9 @@
4 * @date: 2015/10/23 4 * @date: 2015/10/23
5 */ 5 */
6 6
7 -var $ = require('yoho.zepto'), 7 +var $ = require('jquery'),
8 Swiper = require('yoho.iswiper'), 8 Swiper = require('yoho.iswiper'),
9 - lazyLoad = require('yoho.zeptolazyload'); 9 + lazyLoad = require('yoho.lazyload');
10 10
11 var swiper, 11 var swiper,
12 $brandList = $('.brand-list'); 12 $brandList = $('.brand-list');
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 * @date: 2015/10/14 4 * @date: 2015/10/14
5 */ 5 */
6 6
7 -var $ = require('yoho.zepto'); 7 +var $ = require('jquery');
8 8
9 var $nav = $('.category-nav'), 9 var $nav = $('.category-nav'),
10 $contents = $('.category-container > .content'); 10 $contents = $('.category-container > .content');
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 * @author: xuqi<qi.xu@yoho.cn> 3 * @author: xuqi<qi.xu@yoho.cn>
4 * @date: 2015/10/21 4 * @date: 2015/10/21
5 */ 5 */
6 -var $ = require('yoho.zepto'); 6 +var $ = require('jquery');
7 7
8 function cookie(name) { 8 function cookie(name) {
9 var cookies = document.cookie, 9 var cookies = document.cookie,
@@ -4,9 +4,9 @@ @@ -4,9 +4,9 @@
4 * @date: 2015/10/13 4 * @date: 2015/10/13
5 */ 5 */
6 6
7 -var $ = require('yoho.zepto'), 7 +var $ = require('jquery'),
8 ellipsis = require('mlellipsis'), 8 ellipsis = require('mlellipsis'),
9 - lazyLoad = require('yoho.zeptolazyload'), 9 + lazyLoad = require('yoho.lazyload'),
10 IScroll = require('iscroll/iscroll-probe'); 10 IScroll = require('iscroll/iscroll-probe');
11 11
12 var $authorIntro = $('.author .intro'); 12 var $authorIntro = $('.author .intro');
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 * @date: 2015/10/10 4 * @date: 2015/10/10
5 */ 5 */
6 6
7 -var $ = require('yoho.zepto'), 7 +var $ = require('jquery'),
8 Swiper = require('yoho.iswiper'); 8 Swiper = require('yoho.iswiper');
9 9
10 var info = require('./info'), 10 var info = require('./info'),
@@ -4,9 +4,9 @@ @@ -4,9 +4,9 @@
4 * @date: 2015/10/10 4 * @date: 2015/10/10
5 */ 5 */
6 6
7 -var $ = require('yoho.zepto'), 7 +var $ = require('jquery'),
8 ellipsis = require('mlellipsis'), 8 ellipsis = require('mlellipsis'),
9 - lazyLoad = require('yoho.zeptolazyload'); 9 + lazyLoad = require('yoho.lazyload');
10 10
11 var tip = require('../plugin/tip'); 11 var tip = require('../plugin/tip');
12 var loading = require('../plugin/loading'); 12 var loading = require('../plugin/loading');
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 * @date: 2015/10/10 4 * @date: 2015/10/10
5 */ 5 */
6 6
7 -var $ = require('yoho.zepto'); 7 +var $ = require('jquery');
8 8
9 var info = require('./info'), 9 var info = require('./info'),
10 loadMore = info.loadMore; 10 loadMore = info.loadMore;
@@ -4,9 +4,9 @@ @@ -4,9 +4,9 @@
4 * @date: 2015/10/10 4 * @date: 2015/10/10
5 */ 5 */
6 6
7 -var $ = require('yoho.zepto'), 7 +var $ = require('jquery'),
8 ellipsis = require('mlellipsis'), 8 ellipsis = require('mlellipsis'),
9 - lazyLoad = require('yoho.zeptolazyload'); 9 + lazyLoad = require('yoho.lazyload');
10 10
11 var $intro = $('#intro'), 11 var $intro = $('#intro'),
12 $imt = $('#intro-more-txt'), 12 $imt = $('#intro-more-txt'),
@@ -4,8 +4,8 @@ @@ -4,8 +4,8 @@
4 * @date: 2015/10/10 4 * @date: 2015/10/10
5 */ 5 */
6 6
7 -var $ = require('yoho.zepto'),  
8 - lazyLoad = require('yoho.zeptolazyload'), 7 +var $ = require('jquery'),
  8 + lazyLoad = require('yoho.lazyload'),
9 Swiper = require('yoho.iswiper'); 9 Swiper = require('yoho.iswiper');
10 10
11 var $navs = $('#nav-tab > li'), 11 var $navs = $('#nav-tab > li'),
@@ -3,9 +3,9 @@ @@ -3,9 +3,9 @@
3 * @author: liangzhifeng<zhifeng.liang@yoho.cn> 3 * @author: liangzhifeng<zhifeng.liang@yoho.cn>
4 * @date: 2015/10/12 4 * @date: 2015/10/12
5 */ 5 */
6 -var $ = require('yoho.zepto'), 6 +var $ = require('jquery'),
7 Swiper = require('yoho.iswiper'), 7 Swiper = require('yoho.iswiper'),
8 - lazyLoad = require('yoho.zeptolazyload'), 8 + lazyLoad = require('yoho.lazyload'),
9 bannerSwiper, 9 bannerSwiper,
10 recommendSwiper, 10 recommendSwiper,
11 hotBrandsSwiper, 11 hotBrandsSwiper,
@@ -4,9 +4,9 @@ @@ -4,9 +4,9 @@
4 * @date: 2015/10/12 4 * @date: 2015/10/12
5 */ 5 */
6 6
7 -var $ = require('yoho.zepto'), 7 +var $ = require('jquery'),
8 tip = require('../plugin/tip'), 8 tip = require('../plugin/tip'),
9 - lazyLoad = require('yoho.zeptolazyload'); 9 + lazyLoad = require('yoho.lazyload');
10 10
11 var winH = $(window).height(), 11 var winH = $(window).height(),
12 loadMoreH = $('#load-more').height(), 12 loadMoreH = $('#load-more').height(),
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 * @date: 2015/10/26 4 * @date: 2015/10/26
5 */ 5 */
6 6
7 -var $ = require('yoho.zepto'); 7 +var $ = require('jquery');
8 8
9 var $searchBox = $('.search-box'), 9 var $searchBox = $('.search-box'),
10 $indexSearch = $('.index-search'), 10 $indexSearch = $('.index-search'),
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 * @date: 2015/10/19 4 * @date: 2015/10/19
5 */ 5 */
6 6
7 -var $ = require('yoho.zepto'); 7 +var $ = require('jquery');
8 8
9 var $input = $('#search-input input'); 9 var $input = $('#search-input input');
10 10
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 * @author: xuqi<qi.xu@yoho.cn> 3 * @author: xuqi<qi.xu@yoho.cn>
4 * @date: 2015/10/8 4 * @date: 2015/10/8
5 */ 5 */
6 -var $ = require('yoho.zepto'); 6 +var $ = require('jquery');
7 7
8 var trim = $.trim; 8 var trim = $.trim;
9 9
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 * @date: 2015/10/8 4 * @date: 2015/10/8
5 */ 5 */
6 6
7 -var $ = require('yoho.zepto'); 7 +var $ = require('jquery');
8 8
9 var $resend = $('#resend'); 9 var $resend = $('#resend');
10 10
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 * @author: xuqi<qi.xu@yoho.cn> 3 * @author: xuqi<qi.xu@yoho.cn>
4 * @date: 2015/10/8 4 * @date: 2015/10/8
5 */ 5 */
6 -var $ = require('yoho.zepto'); 6 +var $ = require('jquery');
7 7
8 var $email = $('#email'), 8 var $email = $('#email'),
9 $btnSure = $('#btn-sure'); 9 $btnSure = $('#btn-sure');
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 * @author: xuqi<qi.xu@yoho.cn> 3 * @author: xuqi<qi.xu@yoho.cn>
4 * @date: 2015/10/8 4 * @date: 2015/10/8
5 */ 5 */
6 -var $ = require('yoho.zepto'); 6 +var $ = require('jquery');
7 7
8 var $phoneNum = $('#phone-num'), 8 var $phoneNum = $('#phone-num'),
9 $countrySelect = $('#country-select'), 9 $countrySelect = $('#country-select'),
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 * @author: xuqi<qi.xu@yoho.cn> 3 * @author: xuqi<qi.xu@yoho.cn>
4 * @date: 2015/10/8 4 * @date: 2015/10/8
5 */ 5 */
6 -var $ = require('yoho.zepto'); 6 +var $ = require('jquery');
7 7
8 var $pwd = $('#pwd'), 8 var $pwd = $('#pwd'),
9 $btnOk = $('#btn-ok'); 9 $btnOk = $('#btn-ok');
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 * @author: xuqi<qi.xu@yoho.cn> 3 * @author: xuqi<qi.xu@yoho.cn>
4 * @date: 2015/10/8 4 * @date: 2015/10/8
5 */ 5 */
6 -var $ = require('yoho.zepto'); 6 +var $ = require('jquery');
7 7
8 module.exports = function(useInRegister) { 8 module.exports = function(useInRegister) {
9 var $captcha = $('#captcha'), 9 var $captcha = $('#captcha'),
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 * @author: xuqi<qi.xu@yoho.cn> 3 * @author: xuqi<qi.xu@yoho.cn>
4 * @date: 2015/10/8 4 * @date: 2015/10/8
5 */ 5 */
6 -var $ = require('yoho.zepto'); 6 +var $ = require('jquery');
7 7
8 var $phoneNum = $('#phone-num'), 8 var $phoneNum = $('#phone-num'),
9 $countrySelect = $('#country-select'), 9 $countrySelect = $('#country-select'),
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 * @author: xuqi<qi.xu@yoho.cn> 3 * @author: xuqi<qi.xu@yoho.cn>
4 * @date: 2015/9/30 4 * @date: 2015/9/30
5 */ 5 */
6 -var $ = require('yoho.zepto'); 6 +var $ = require('jquery');
7 7
8 var $account = $('#account'), 8 var $account = $('#account'),
9 $pwd = $('#pwd'), 9 $pwd = $('#pwd'),
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 * @author: xuqi<qi.xu@yoho.cn> 3 * @author: xuqi<qi.xu@yoho.cn>
4 * @date: 2015/10/8 4 * @date: 2015/10/8
5 */ 5 */
6 -var $ = require('yoho.zepto'); 6 +var $ = require('jquery');
7 7
8 var $pwd = $('#pwd'), 8 var $pwd = $('#pwd'),
9 $btnSure = $('#btn-sure'); 9 $btnSure = $('#btn-sure');
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 * @author: xuqi<qi.xu@yoho.cn> 3 * @author: xuqi<qi.xu@yoho.cn>
4 * @date: 2015/10/8 4 * @date: 2015/10/8
5 */ 5 */
6 -var $ = require('yoho.zepto'); 6 +var $ = require('jquery');
7 7
8 var $phoneNum = $('#phone-num'), 8 var $phoneNum = $('#phone-num'),
9 $countrySelect = $('#country-select'), 9 $countrySelect = $('#country-select'),
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 * @date: 2015/10/19 5 * @date: 2015/10/19
6 */ 6 */
7 7
8 -var $ = require('yoho.zepto'); 8 +var $ = require('jquery');
9 9
10 var $filter = $('.filter-mask'); 10 var $filter = $('.filter-mask');
11 11
@@ -33,7 +33,7 @@ function registerCbFn(cb) { @@ -33,7 +33,7 @@ function registerCbFn(cb) {
33 $classify.children(':first-child').addClass('active'); //T：不在HTML中使用{{#if @first}}active{{/if}}来初始化active为避免sub设置高度时的闪烁 33 $classify.children(':first-child').addClass('active'); //T：不在HTML中使用{{#if @first}}active{{/if}}来初始化active为避免sub设置高度时的闪烁
34 34
35 //classify switch 35 //classify switch
36 -$classify.delegate('.classify-item', 'tap', function(e) { 36 +$classify.delegate('.classify-item', 'click', function(e) {
37 var $this = $(this); 37 var $this = $(this);
38 38
39 e.stopPropagation(); 39 e.stopPropagation();
@@ -48,11 +48,11 @@ $classify.delegate('.classify-item', 'tap', function(e) { @@ -48,11 +48,11 @@ $classify.delegate('.classify-item', 'tap', function(e) {
48 }); 48 });
49 49
50 //点击Mask隐藏筛选界面 50 //点击Mask隐藏筛选界面
51 -$filter.tap(function() { 51 +$filter.click(function() {
52 hideFilter(); 52 hideFilter();
53 }); 53 });
54 54
55 -$subClassify.delegate('li', 'tap', function(e) { 55 +$subClassify.delegate('li', 'click', function(e) {
56 var $this = $(this), 56 var $this = $(this),
57 id = $this.data('id'); 57 id = $this.data('id');
58 58
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 * @date: 2015/10/29 4 * @date: 2015/10/29
5 */ 5 */
6 6
7 -var $ = require('yoho.zepto'); 7 +var $ = require('jquery');
8 8
9 var $page = $('.yoho-page'); 9 var $page = $('.yoho-page');
10 10
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 * @author: xuqi<qi.xu@yoho.cn> 3 * @author: xuqi<qi.xu@yoho.cn>
4 * @date: 2015/10/10 4 * @date: 2015/10/10
5 */ 5 */
6 -var $ = require('yoho.zepto'); 6 +var $ = require('jquery');
7 7
8 var $tip, tipItime; 8 var $tip, tipItime;
9 9
@@ -3,9 +3,9 @@ @@ -3,9 +3,9 @@
3 * @author: liangzhifeng<zhifeng.liang@yoho.cn> 3 * @author: liangzhifeng<zhifeng.liang@yoho.cn>
4 * @date: 2015/10/20 4 * @date: 2015/10/20
5 */ 5 */
6 - var $ = require('yoho.zepto'), 6 + var $ = require('jquery'),
7 Swiper = require('yoho.iswiper'), 7 Swiper = require('yoho.iswiper'),
8 - lazyLoad = require('yoho.zeptolazyload'), 8 + lazyLoad = require('yoho.lazyload'),
9 goodsSwiper; 9 goodsSwiper;
10 10
11 lazyLoad($('img.lazy')); 11 lazyLoad($('img.lazy'));
@@ -4,8 +4,8 @@ @@ -4,8 +4,8 @@
4 * @date: 2015/10/20 4 * @date: 2015/10/20
5 */ 5 */
6 6
7 -var $ = require('yoho.zepto'),  
8 - lazyLoad = require('yoho.zeptolazyload'); 7 +var $ = require('jquery'),
  8 + lazyLoad = require('yoho.lazyload');
9 9
10 //品牌页参数 10 //品牌页参数
11 var $brandHeader = $('#brand-header'), 11 var $brandHeader = $('#brand-header'),
@@ -220,7 +220,7 @@ writeSearch.bindWirteLocal($('#search-form')); @@ -220,7 +220,7 @@ writeSearch.bindWirteLocal($('#search-form'));
220 //3.筛选无active时点击展开筛选面板 220 //3.筛选无active时点击展开筛选面板
221 //4.筛选有active时点击隐藏筛选面板并恢复点击筛选前active项的active状态 221 //4.筛选有active时点击隐藏筛选面板并恢复点击筛选前active项的active状态
222 //5.当前active为筛选并且点击其他项时，隐藏筛选面板 222 //5.当前active为筛选并且点击其他项时，隐藏筛选面板
223 -$listNav.delegate('li', 'tap', function() { 223 +$listNav.delegate('li', 'click', function() {
224 var $this = $(this), 224 var $this = $(this),
225 nav, 225 nav,
226 navType, 226 navType,
@@ -319,20 +319,20 @@ $(window).scroll(function() { @@ -319,20 +319,20 @@ $(window).scroll(function() {
319 }); 319 });
320 320
321 //品牌介绍 321 //品牌介绍
322 -$brandHeader.children('.btn-intro').bind('tap', function() { 322 +$brandHeader.children('.btn-intro').bind('click', function() {
323 $introBox.removeClass('hide'); 323 $introBox.removeClass('hide');
324 }); 324 });
325 325
326 -$('.close-intro, .brand-intro-box').tap(function() { 326 +$('.close-intro, .brand-intro-box').click(function() {
327 $introBox.addClass('hide'); 327 $introBox.addClass('hide');
328 }); 328 });
329 329
330 -$('#brand-intro').tap(function(e) { 330 +$('#brand-intro').click(function(e) {
331 e.stopPropagation(); 331 e.stopPropagation();
332 }); 332 });
333 333
334 //品牌收藏 334 //品牌收藏
335 -$brandHeader.children('.btn-col').bind('tap', function() { 335 +$brandHeader.children('.btn-col').bind('click', function() {
336 var $this = $(this); 336 var $this = $(this);
337 337
338 var id = $brandHeader.data('id'), 338 var id = $brandHeader.data('id'),
@@ -4,9 +4,9 @@ @@ -4,9 +4,9 @@
4 * @date: 2015/10/20 4 * @date: 2015/10/20
5 */ 5 */
6 6
7 -var $ = require('yoho.zepto'), 7 +var $ = require('jquery'),
8 Swiper = require('yoho.iswiper'), 8 Swiper = require('yoho.iswiper'),
9 - lazyLoad = require('yoho.zeptolazyload'); 9 + lazyLoad = require('yoho.lazyload');
10 10
11 var swiper; 11 var swiper;
12 12
@@ -217,7 +217,6 @@ function search(opt) { @@ -217,7 +217,6 @@ function search(opt) {
217 lazyLoad($('.lazy')); 217 lazyLoad($('.lazy'));
218 218
219 filter.registerCbFn(search); 219 filter.registerCbFn(search);
220 -// loading.initLoadingMask();  
221 220
222 //导航栏点击逻辑说明： 221 //导航栏点击逻辑说明：
223 //1.点击非active项时切换active状态 222 //1.点击非active项时切换active状态
@@ -4,9 +4,9 @@ @@ -4,9 +4,9 @@
4 * @date: 2015/10/24 4 * @date: 2015/10/24
5 */ 5 */
6 6
7 -var $ = require('yoho.zepto'), 7 +var $ = require('jquery'),
8 Swiper = require('yoho.iswiper'), 8 Swiper = require('yoho.iswiper'),
9 - lazyLoad = require('yoho.zeptolazyload'); 9 + lazyLoad = require('yoho.lazyload');
10 10
11 var swiper; 11 var swiper;
12 12
@@ -244,7 +244,6 @@ function search(opt) { @@ -244,7 +244,6 @@ function search(opt) {
244 lazyLoad($('.lazy')); 244 lazyLoad($('.lazy'));
245 245
246 filter.registerCbFn(search); 246 filter.registerCbFn(search);
247 -// loading.initLoadingMask();  
248 247
249 //导航栏点击逻辑说明： 248 //导航栏点击逻辑说明：
250 //1.点击非active项时切换active状态 249 //1.点击非active项时切换active状态
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 * @date: 2015/10/20 4 * @date: 2015/10/20
5 */ 5 */
6 6
7 -var $ = require('yoho.zepto'); 7 +var $ = require('jquery');
8 8
9 var $cartContent = $('.cart-content'); 9 var $cartContent = $('.cart-content');
10 10
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 * @date: 2015/10/21 5 * @date: 2015/10/21
6 */ 6 */
7 7
8 -var $ = require('yoho.zepto'); 8 +var $ = require('jquery');
9 var Handlebars = require('yoho.handlebars'); 9 var Handlebars = require('yoho.handlebars');
10 10
11 var $page = $('.yoho-page'); 11 var $page = $('.yoho-page');
@@ -4,8 +4,8 @@ @@ -4,8 +4,8 @@
4 * @date: 2015/10/23 4 * @date: 2015/10/23
5 */ 5 */
6 6
7 -var $ = require('yoho.zepto'),  
8 - lazyLoad = require('yoho.zeptolazyload'); 7 +var $ = require('jquery'),
  8 + lazyLoad = require('yoho.lazyload');
9 9
10 var chosePanel = require('./chose-panel'); 10 var chosePanel = require('./chose-panel');
11 11
@@ -4,9 +4,9 @@ @@ -4,9 +4,9 @@
4 * @date: 2015/10/20 4 * @date: 2015/10/20
5 */ 5 */
6 6
7 -var $ = require('yoho.zepto'), 7 +var $ = require('jquery'),
8 ellipsis = require('mlellipsis'), 8 ellipsis = require('mlellipsis'),
9 - lazyLoad = require('yoho.zeptolazyload'); 9 + lazyLoad = require('yoho.lazyload');
10 10
11 var chosePanel = require('./chose-panel'); 11 var chosePanel = require('./chose-panel');
12 12
@@ -16,13 +16,12 @@ @@ -16,13 +16,12 @@
16 "spm": { 16 "spm": {
17 "main": "index.js", 17 "main": "index.js",
18 "dependencies": { 18 "dependencies": {
19 - "yoho.zepto": "1.1.61",  
20 - "yoho.jquery": "1.8.3", 19 + "jquery": "2.1.4",
21 "mlellipsis": "0.0.6", 20 "mlellipsis": "0.0.6",
22 "yoho.iswiper": "3.0.1", 21 "yoho.iswiper": "3.0.1",
23 "iscroll": "5.1.2", 22 "iscroll": "5.1.2",
24 "import-style": "1.0.0", 23 "import-style": "1.0.0",
25 - "yoho.zeptolazyload": "0.0.2", 24 + "yoho.lazyload": "1.1.0",
26 "yoho.handlebars": "3.0.3" 25 "yoho.handlebars": "3.0.3"
27 }, 26 },
28 "devDependencies": { 27 "devDependencies": {