fe / YOHOBUYWAP · Commits

Go to a project

Authored by zhangxiaoru
Commit 84f0965c7558dca6a74d32ec4afe3a3431ff8dcb 2 parents 8b070a48 d424f46d

merge

Inline Side-by-side
Showing 12 changed files with 681 additions and 681 deletions
... ... @@ -4447,123 +4447,123 @@ exports.hasDangerInput = hasDangerInput;
});
define("js/me/dialog", ["jquery","handlebars","source-map","hammer"], function(require, exports, module){
/*
* @Description: dialog
* @Time: 2015/11/18
* @author: chenglong.wang
*/
var $ = require("jquery"),
Handlebars = require("handlebars"),
Hammer = require("hammer");
var $dialogWrapper,
dialogTpl,
dialogTemplate;
function getInstance() {
if (dialogTpl === undefined) {
dialogTpl = '<div id="dialog-wrapper" class="dialog-wrapper">' +
'<div class="dialog-box">' +
'{{# hasHeader}}' +
'{{/ hasHeader}}' +
'<div class="dialog-content">{{dialogText}}</div>' +
'{{# hasFooter}}' +
'<div class="dialog-footer">' +
'{{# leftBtnText}}' +
'<span class="dialog-left-btn tap-hightlight">{{.}}</span>' +
'{{/ leftBtnText}}' +
'{{# rightBtnText}}' +
'<span class="dialog-right-btn tap-hightlight">{{.}}</span>' +
'{{/ rightBtnText}}' +
'</div>' +
'{{/ hasFooter}}' +
'</div>' +
'</div>';
dialogTemplate = Handlebars.compile(dialogTpl);
}
return dialogTemplate;
}
// fullWithBtn是供详情页获取限购码使用的特殊参数
exports.showDialog = function(data, callback, callbackForLeft, fullWithBtn) {
var dialogTemplate = getInstance(),
dialogStr = dialogTemplate(data),
$dialogBox,
defaultHideDuraton,
dialogWrapperHammer;
$('.dialog-wrapper').remove();
$('body').append($(dialogStr));
$dialogBox = $('.dialog-box');
$dialogWrapper = $('.dialog-wrapper');
dialogWrapperHammer = new Hammer(document.getElementById('dialog-wrapper'));
// 显示
if (data.fast) {
$dialogWrapper.css({
display: 'block'
});
} else {
$dialogWrapper.fadeIn();
}
if (fullWithBtn) {
$('.dialog-wrapper .dialog-footer > span').css('width', '100%');
$('.dialog-wrapper .dialog-content').css({
'padding-left': '1.85rem',
'padding-right': '1.85rem'
});
$dialogWrapper.css('z-index', '10');
}
$dialogBox.css({
top: '50%',
marginTop: -($dialogBox.height() / 2)
});
//隐藏
if (data.autoHide) {
defaultHideDuraton = 1000;
if (data.autoHide > 1) {
defaultHideDuraton = data.autoHide;
}
setTimeout(function() {
$dialogWrapper.fadeOut();
}, defaultHideDuraton);
}
//禁止在dialog上可以上下滚动
$dialogWrapper.on('touchmove', function() {
return false;
});
dialogWrapperHammer.on('tap', function(event) {
if ($(event.target).hasClass('dialog-left-btn')) {
if (typeof callbackForLeft === 'function') {
callbackForLeft();
}
$dialogWrapper.fadeOut();
} else if ($(event.target).hasClass('dialog-right-btn')) {
callback();
}
// 防止出现点透问题
event.preventDefault();
event.srcEvent.stopPropagation();
});
};
exports.hideDialog = function() {
$('.dialog-wrapper').remove();
};
/*
* @Description: dialog
* @Time: 2015/11/18
* @author: chenglong.wang
*/
var $ = require("jquery"),
Handlebars = require("handlebars"),
Hammer = require("hammer");
var $dialogWrapper,
dialogTpl,
dialogTemplate;
function getInstance() {
if (dialogTpl === undefined) {
dialogTpl = '<div id="dialog-wrapper" class="dialog-wrapper">' +
'<div class="dialog-box">' +
'{{# hasHeader}}' +
'{{/ hasHeader}}' +
'<div class="dialog-content">{{dialogText}}</div>' +
'{{# hasFooter}}' +
'<div class="dialog-footer">' +
'{{# leftBtnText}}' +
'<span class="dialog-left-btn tap-hightlight">{{.}}</span>' +
'{{/ leftBtnText}}' +
'{{# rightBtnText}}' +
'<span class="dialog-right-btn tap-hightlight">{{.}}</span>' +
'{{/ rightBtnText}}' +
'</div>' +
'{{/ hasFooter}}' +
'</div>' +
'</div>';
dialogTemplate = Handlebars.compile(dialogTpl);
}
return dialogTemplate;
}
// fullWithBtn是供详情页获取限购码使用的特殊参数
exports.showDialog = function(data, callback, callbackForLeft, fullWithBtn) {
var dialogTemplate = getInstance(),
dialogStr = dialogTemplate(data),
$dialogBox,
defaultHideDuraton,
dialogWrapperHammer;
$('.dialog-wrapper').remove();
$('body').append($(dialogStr));
$dialogBox = $('.dialog-box');
$dialogWrapper = $('.dialog-wrapper');
dialogWrapperHammer = new Hammer(document.getElementById('dialog-wrapper'));
// 显示
if (data.fast) {
$dialogWrapper.css({
display: 'block'
});
} else {
$dialogWrapper.fadeIn();
}
if (fullWithBtn) {
$('.dialog-wrapper .dialog-footer > span').css('width', '100%');
$('.dialog-wrapper .dialog-content').css({
'padding-left': '1.85rem',
'padding-right': '1.85rem'
});
$dialogWrapper.css('z-index', '10');
}
$dialogBox.css({
top: '50%',
marginTop: -($dialogBox.height() / 2)
});
//隐藏
if (data.autoHide) {
defaultHideDuraton = 1000;
if (data.autoHide > 1) {
defaultHideDuraton = data.autoHide;
}
setTimeout(function() {
$dialogWrapper.fadeOut();
}, defaultHideDuraton);
}
//禁止在dialog上可以上下滚动
$dialogWrapper.on('touchmove', function() {
return false;
});
dialogWrapperHammer.on('tap', function(event) {
if ($(event.target).hasClass('dialog-left-btn')) {
if (typeof callbackForLeft === 'function') {
callbackForLeft();
}
$dialogWrapper.fadeOut();
} else if ($(event.target).hasClass('dialog-right-btn')) {
callback();
}
// 防止出现点透问题
event.preventDefault();
event.srcEvent.stopPropagation();
});
};
exports.hideDialog = function() {
$('.dialog-wrapper').remove();
};
});
define("js/index/write-search", [], function(require, exports, module){
... ... @@ -7870,65 +7870,65 @@ $listNav.on('touchstart', 'li', function() {
require("js/product/shop_coupon");
});
define("js/product/shop_coupon", ["jquery","iscroll-probe","swiper","index"], function(require, exports, module){
var $ = require("jquery"),
IScroll = require("iscroll-probe"),
Swiper = require("swiper"),
tip = require("js/plugin/tip");
var appVersion = $('input[name="app_version"]').val();
$(".coupon-content .receive-btn").closest('.swiper-slide').on('click', function(e) {
var that = this,
code = $(this).data('id') || '';
if (that.isCouponClick === false) {
return false;
}
that.isCouponClick = false;
$.ajax({
method: 'POST',
url: location.protocol + '//m.yohobuy.com/product/index/userCoupon',
data: {
couponID: code,
app_version: appVersion
},
xhrFields: {
withCredentials: true
},
success: function(data) {
that.isCouponClick = true;
if (data.code === 200) {
tip.show('领取成功');
$(that).find('.receive-btn').html('已领取');
return true;
} else if (data.code === 4401) {
$('#shop-login').remove();
$('body').append('<a href=\'' + data.url + '\'><span id="shop-login"><span></a>');
$('#shop-login').click();
} else if (data.code === 401) {
tip.show('已领取过');
} else {
tip.show(data.message);
}
},
error: function() {
tip.show('网络断开连接了~');
that.isCouponClick = true;
}
});
});
$(function() {
new Swiper('.coupon-content', {
slideElement: '.coupon-small',
slidesPerView: 'auto',
watchSlidesVisibility: true
});
})
var $ = require("jquery"),
IScroll = require("iscroll-probe"),
Swiper = require("swiper"),
tip = require("js/plugin/tip");
var appVersion = $('input[name="app_version"]').val();
$(".coupon-content .receive-btn").closest('.swiper-slide').on('click', function(e) {
var that = this,
code = $(this).data('id') || '';
if (that.isCouponClick === false) {
return false;
}
that.isCouponClick = false;
$.ajax({
method: 'POST',
url: location.protocol + '//m.yohobuy.com/product/index/userCoupon',
data: {
couponID: code,
app_version: appVersion
},
xhrFields: {
withCredentials: true
},
success: function(data) {
that.isCouponClick = true;
if (data.code === 200) {
tip.show('领取成功');
$(that).find('.receive-btn').html('已领取');
return true;
} else if (data.code === 4401) {
$('#shop-login').remove();
$('body').append('<a href=\'' + data.url + '\'><span id="shop-login"><span></a>');
$('#shop-login').click();
} else if (data.code === 401) {
tip.show('已领取过');
} else {
tip.show(data.message);
}
},
error: function() {
tip.show('网络断开连接了~');
that.isCouponClick = true;
}
});
});
$(function() {
new Swiper('.coupon-content', {
slideElement: '.coupon-small',
slidesPerView: 'auto',
watchSlidesVisibility: true
});
})
});
define("js/product/detail/detail", ["jquery","swiper","hammer","lazyload","handlebars","source-map","index"], function(require, exports, module){
... ... @@ -11253,465 +11253,465 @@ $reaMask.on('touchend', function(event) {
});
define("js/me/fav", ["jquery","hammer","swiper","handlebars","source-map","index"], function(require, exports, module){
/**
* 个人中心--收藏
* @author: chenglong<chenglong.wang@yoho.cn>
* @date: 2015/11/12
*/
var $ = require("jquery"),
Hammer = require("hammer"),
Swiper = require("swiper");
var diaLog = require("js/me/dialog");
var tip = require("js/plugin/tip");
var $navLi = $('#fav-tab > li'),
$favContainer = $('.fav-content > .fav-type'),
swiperObj = {},
favTabHammer,
favContentHammer,
$loadMore = $('.fav-load-more'),
$brandLoadMore = $('.fav-brand-load-more'),
winH = $(window).height(),
footerH = $('#yoho-footer').height(),
$favProductList = $('.fav-product-list'),
$favBrandList = $('.fav-brand-swiper-wrapper'),
pageId = 1,
brandPageId = 1, //收藏品牌的当前页数
lockId = true,
brandLockId = true, //收藏品牌是否可下拉加载更多
brandTab = false; //当前是否停留在收藏品牌页
function showFavTab(index) {
$navLi.filter('.active').removeClass('active');
$navLi.eq(index).addClass('active');
$favContainer.filter('.show').removeClass('show');
$favContainer.eq(index).addClass('show');
}
//初始化swiper
function initSwiper(data) {
var i,
idStrReg = /container-(\d+)['"]{1}/gi,
idReg = /\d+/,
idArr = data.match(idStrReg),
idArrLen = idArr.length,
containerId;
//$swiperList = $('.swiper-container');
for (i = 0; i < idArrLen; i++) {
/*id = $swiperList.eq(i).attr('data-id');
if (!!swiperObj[id]) {
swiperObj[id].destroy(true, true);
}*/
containerId = idArr[i].match(idReg)[0];
swiperObj[containerId] = new Swiper('#swiper-container-' + containerId, {
slidesPerView: 'auto',
grabCursor: true,
slideElement: 'li',
wrapperClass: 'swiper-wrapper-' + containerId,
lazyLoading: true,
watchSlidesVisibility: true
});
}
}
// 上拉加载更多
function loadData($parent, url, page) {
if (url === 'favBrand') {
brandLockId = true;
} else {
lockId = true;
}
$.ajax({
method: 'post',
url: '/home/' + url,
data: {
page: page
},
success: function(data) {
var $loadingMask = $parent.closest('.fav-type').find('.fav-content-loading');
if (url === 'favBrand') {
$brandLoadMore.addClass('hide');
} else {
$loadMore.addClass('hide');
}
if (data === ' ') {
$loadingMask.addClass('hide');
$parent.closest('.fav-type').find('.fav-null-box').removeClass('hide');
window.rePosFooter();
} else if (data === 'end') {
//处理data等于end时如果loadingMask存在且没有hide样式的情况
if ($loadingMask && !$loadingMask.hasClass('hide')) {
$loadingMask.addClass('hide');
//$parent.closest('.fav-type').find('.fav-null-box').removeClass('hide');
}
$parent.closest('.fav-type').find('.fav-load-background')
.removeClass('fav-load-background').html('没有更多了');
// hf: fixes bug to 修改没有数据还调接口,加载错误页面问题
brandLockId = true;
lockId = true;
} else if (data.length > 10) {
$parent.append(data);
//如果有数据loadingMask会被remove掉
$loadingMask.remove();
if (url === 'favBrand') {
initSwiper(data);//如果是收藏品牌需要初始化swiper
brandLockId = false;//请求成功后解锁品牌收藏page++
} else {
lockId = false;//请求成功后解锁商品收藏page++
}
}
window.rePosFooter();
}
});
}
// 如果从品牌收藏入口进入
if ($('#fav-tab').hasClass('brand-tab')) {
showFavTab(1);
loadData($favBrandList, 'favBrand', 1);
brandTab = true;
window.rePosFooter();
} else {
showFavTab(0);
loadData($favProductList, 'favProduct', 1);
brandTab = false;
window.rePosFooter();
}
favTabHammer = new Hammer(document.getElementById('fav-tab'));
favTabHammer.on('tap', function(e) {
var $cur = $(e.target).closest('li'),
index;
if ($cur.length === 0 || $cur.hasClass('active')) {
return;
}
index = $cur.index();
if (index === 0) {
brandTab = false;
if ($favProductList.find('li').length === 0 &&
$favProductList.closest('.fav-type').find('.fav-null-box').hasClass('hide')) {
loadData($favProductList, 'favProduct', 1);
}
} else {
brandTab = true;
if ($favBrandList.find('div').length === 0 &&
$favBrandList.closest('.fav-type').find('.fav-null-box').hasClass('hide')) {
loadData($favBrandList, 'favBrand', 1);
}
}
showFavTab(index);
window.rePosFooter();
});
//删除收藏的商品
favContentHammer = new Hammer(document.getElementById('fav-content'));
favContentHammer.on('tap', function(e) {
var id = '';
if (!$(e.target).hasClass('del-fav')) {
return;
}
diaLog.showDialog({
dialogText: '您确定要取消收藏吗？',
hasFooter: {
leftBtnText: '取消',
rightBtnText: '确定'
}
}, function() {
id = $(e.target).closest('li').attr('data-id');
$.ajax({
method: 'post',
url: '/home/favoriteDel',
data: {
id: id
}
}).then(function(data) {
if (data.code === 200) {
diaLog.showDialog({
autoHide: true,
fast: true,
dialogText: '已经取消收藏'
});
$(e.target).closest('li').remove();
} else if (data.code === 400) {
diaLog.showDialog({
autoHide: true,
fast: true,
dialogText: data.message
});
} else {
diaLog.showDialog({
autoHide: true,
fast: true,
dialogText: '取消收藏失败'
});
}
}).fail(function() {
//TODO
diaLog.showDialog({
autoHide: true,
dialogText: '网络错误~'
});
});
});
});
function scrollHandler() {
//距离底部未1/4列表高度+底部高度的时候加载更多
if ($(window).scrollTop() + winH >= $(document).height() - 0.25 * $favBrandList.height() - footerH) {
if (brandTab) {
$brandLoadMore.filter('.hide').removeClass('hide');
if (!brandLockId) {
brandPageId++;
loadData($favBrandList, 'favBrand', brandPageId);
}
} else {
$loadMore.filter('.hide').removeClass('hide');
if (!lockId) {
pageId++;
loadData($favProductList, 'favProduct', pageId);
}
}
}
}
//srcoll to load more
$(window).scroll(scrollHandler);
$(document).on('touchend', '.swiper-header', function() {
var url = $(this).find('.fav-more').attr('href');
if (url) {
window.location.href = url;
}
});
$('.invalidGoods').on('touchstart touchend', function(e) {
var $this = $(e.target).closest('span');
if ($this.hasClass('del-fav')) {
return;
}
tip.show('商品已下架');
return false;
});
/**
* 个人中心--收藏
* @author: chenglong<chenglong.wang@yoho.cn>
* @date: 2015/11/12
*/
var $ = require("jquery"),
Hammer = require("hammer"),
Swiper = require("swiper");
var diaLog = require("js/me/dialog");
var tip = require("js/plugin/tip");
var $navLi = $('#fav-tab > li'),
$favContainer = $('.fav-content > .fav-type'),
swiperObj = {},
favTabHammer,
favContentHammer,
$loadMore = $('.fav-load-more'),
$brandLoadMore = $('.fav-brand-load-more'),
winH = $(window).height(),
footerH = $('#yoho-footer').height(),
$favProductList = $('.fav-product-list'),
$favBrandList = $('.fav-brand-swiper-wrapper'),
pageId = 1,
brandPageId = 1, //收藏品牌的当前页数
lockId = true,
brandLockId = true, //收藏品牌是否可下拉加载更多
brandTab = false; //当前是否停留在收藏品牌页
function showFavTab(index) {
$navLi.filter('.active').removeClass('active');
$navLi.eq(index).addClass('active');
$favContainer.filter('.show').removeClass('show');
$favContainer.eq(index).addClass('show');
}
//初始化swiper
function initSwiper(data) {
var i,
idStrReg = /container-(\d+)['"]{1}/gi,
idReg = /\d+/,
idArr = data.match(idStrReg),
idArrLen = idArr.length,
containerId;
//$swiperList = $('.swiper-container');
for (i = 0; i < idArrLen; i++) {
/*id = $swiperList.eq(i).attr('data-id');
if (!!swiperObj[id]) {
swiperObj[id].destroy(true, true);
}*/
containerId = idArr[i].match(idReg)[0];
swiperObj[containerId] = new Swiper('#swiper-container-' + containerId, {
slidesPerView: 'auto',
grabCursor: true,
slideElement: 'li',
wrapperClass: 'swiper-wrapper-' + containerId,
lazyLoading: true,
watchSlidesVisibility: true
});
}
}
// 上拉加载更多
function loadData($parent, url, page) {
if (url === 'favBrand') {
brandLockId = true;
} else {
lockId = true;
}
$.ajax({
method: 'post',
url: '/home/' + url,
data: {
page: page
},
success: function(data) {
var $loadingMask = $parent.closest('.fav-type').find('.fav-content-loading');
if (url === 'favBrand') {
$brandLoadMore.addClass('hide');
} else {
$loadMore.addClass('hide');
}
if (data === ' ') {
$loadingMask.addClass('hide');
$parent.closest('.fav-type').find('.fav-null-box').removeClass('hide');
window.rePosFooter();
} else if (data === 'end') {
//处理data等于end时如果loadingMask存在且没有hide样式的情况
if ($loadingMask && !$loadingMask.hasClass('hide')) {
$loadingMask.addClass('hide');
//$parent.closest('.fav-type').find('.fav-null-box').removeClass('hide');
}
$parent.closest('.fav-type').find('.fav-load-background')
.removeClass('fav-load-background').html('没有更多了');
// hf: fixes bug to 修改没有数据还调接口,加载错误页面问题
brandLockId = true;
lockId = true;
} else if (data.length > 10) {
$parent.append(data);
//如果有数据loadingMask会被remove掉
$loadingMask.remove();
if (url === 'favBrand') {
initSwiper(data);//如果是收藏品牌需要初始化swiper
brandLockId = false;//请求成功后解锁品牌收藏page++
} else {
lockId = false;//请求成功后解锁商品收藏page++
}
}
window.rePosFooter();
}
});
}
// 如果从品牌收藏入口进入
if ($('#fav-tab').hasClass('brand-tab')) {
showFavTab(1);
loadData($favBrandList, 'favBrand', 1);
brandTab = true;
window.rePosFooter();
} else {
showFavTab(0);
loadData($favProductList, 'favProduct', 1);
brandTab = false;
window.rePosFooter();
}
favTabHammer = new Hammer(document.getElementById('fav-tab'));
favTabHammer.on('tap', function(e) {
var $cur = $(e.target).closest('li'),
index;
if ($cur.length === 0 || $cur.hasClass('active')) {
return;
}
index = $cur.index();
if (index === 0) {
brandTab = false;
if ($favProductList.find('li').length === 0 &&
$favProductList.closest('.fav-type').find('.fav-null-box').hasClass('hide')) {
loadData($favProductList, 'favProduct', 1);
}
} else {
brandTab = true;
if ($favBrandList.find('div').length === 0 &&
$favBrandList.closest('.fav-type').find('.fav-null-box').hasClass('hide')) {
loadData($favBrandList, 'favBrand', 1);
}
}
showFavTab(index);
window.rePosFooter();
});
//删除收藏的商品
favContentHammer = new Hammer(document.getElementById('fav-content'));
favContentHammer.on('tap', function(e) {
var id = '';
if (!$(e.target).hasClass('del-fav')) {
return;
}
diaLog.showDialog({
dialogText: '您确定要取消收藏吗？',
hasFooter: {
leftBtnText: '取消',
rightBtnText: '确定'
}
}, function() {
id = $(e.target).closest('li').attr('data-id');
$.ajax({
method: 'post',
url: '/home/favoriteDel',
data: {
id: id
}
}).then(function(data) {
if (data.code === 200) {
diaLog.showDialog({
autoHide: true,
fast: true,
dialogText: '已经取消收藏'
});
$(e.target).closest('li').remove();
} else if (data.code === 400) {
diaLog.showDialog({
autoHide: true,
fast: true,
dialogText: data.message
});
} else {
diaLog.showDialog({
autoHide: true,
fast: true,
dialogText: '取消收藏失败'
});
}
}).fail(function() {
//TODO
diaLog.showDialog({
autoHide: true,
dialogText: '网络错误~'
});
});
});
});
function scrollHandler() {
//距离底部未1/4列表高度+底部高度的时候加载更多
if ($(window).scrollTop() + winH >= $(document).height() - 0.25 * $favBrandList.height() - footerH) {
if (brandTab) {
$brandLoadMore.filter('.hide').removeClass('hide');
if (!brandLockId) {
brandPageId++;
loadData($favBrandList, 'favBrand', brandPageId);
}
} else {
$loadMore.filter('.hide').removeClass('hide');
if (!lockId) {
pageId++;
loadData($favProductList, 'favProduct', pageId);
}
}
}
}
//srcoll to load more
$(window).scroll(scrollHandler);
$(document).on('touchend', '.swiper-header', function() {
var url = $(this).find('.fav-more').attr('href');
if (url) {
window.location.href = url;
}
});
$('.invalidGoods').on('touchstart touchend', function(e) {
var $this = $(e.target).closest('span');
if ($this.hasClass('del-fav')) {
return;
}
tip.show('商品已下架');
return false;
});
});
define("js/me/suggest", ["jquery","hammer","lazyload","handlebars","source-map"], function(require, exports, module){
/**
* 个人中心--意见反馈
* @author: chenglong<chenglong.wang@yoho.cn>
* @date: 2015/11/12
*/
var $ = require("jquery"),
Hammer = require("hammer"),
lazyLoad = require("lazyload"),
Handlebars = require("handlebars");
var diaLog = require("js/me/dialog");
var $uploadImgList = $('.upload-img-list'),
headerNavHammer,
formHammer,
imgTpl,
imgTemplate,
$likeBtn = $('.suggest-item .like-btn'),
$disLikeBtn = $('.suggest-item .dislike-btn'),
$imgAdd = $('.img-add'),
imgStr = '',
uploadImgNum = 0;
require("js/me/jquery.upload");
imgTpl = '{{# imgList}}' +
'<li>' +
'{{# imgUrl}}<img src="{{.}}" />' +
'<span class="upload-img-remove"></span>{{/ imgUrl}}' +
'</li>' +
'{{/ imgList}}';
imgTemplate = Handlebars.compile(imgTpl);
$('#upload-img').upload({
auto: true,
fileType: 'image/*',
uploadScript: '/home/suggestimgUpload',
fileObjName: 'fileData',
fileSizeLimit: 300,
height: '100%',
width: '100%',
multi: false,
onAddQueueItem: function(files) {
//TODO
$uploadImgList.html(imgTemplate({
imgList: true
}));
},
onUploadComplete: function(file, data) {
$uploadImgList.html('');
imgStr = JSON.parse(data).imgList[0].imgRelUrl;
$uploadImgList.html(imgTemplate(JSON.parse(data)));
$imgAdd.hide();
uploadImgNum++;
}
});
lazyLoad();
headerNavHammer = new Hammer(document.getElementById('yoho-header'));
headerNavHammer.on('tap', function(e) {
var suggestText = $('#suggest-textarea').val(),
textReg = /\S+/;
if ($(e.target).hasClass('nav-btn')) {
if (!textReg.test(suggestText)) {
diaLog.showDialog({
autoHide: true,
dialogText: '意见不能为空'
});
return;
}
$.ajax({
method: 'post',
url: '/home/savesuggest',
data: {
content: suggestText,
image: imgStr
}
}).then(function(data) {
if (data.code === 200) {
diaLog.showDialog({
autoHide: true,
dialogText: '提交成功'
});
setTimeout(function() {
location.pathname = 'home/suggest';
}, 2000);
} else {
diaLog.showDialog({
autoHide: true,
dialogText: '提交失败~'
});
}
}).fail(function() {
diaLog.showDialog({
autoHide: true,
dialogText: '网络错误~'
});
});
}
});
if (document.getElementById('img-form') !== null) {
formHammer = new Hammer(document.getElementById('img-form'));
formHammer.on('tap', function(e) {
if ($(e.target).hasClass('upload-img-remove')) {
$uploadImgList.html('');
imgStr = '';
uploadImgNum--;
setTimeout(function() {
$imgAdd.show();
}, 50);
}
});
}
// 点赞与取消点赞
$likeBtn.bind('click', function() {
var id = $(this).closest('.suggest-item').attr('data-id'),
$that = $(this);
$.ajax({
method: 'post',
url: '/home/upAndDown',
data: {
suggest_id: id,
reliable: 1
}
}).then(function(data) {
if (data.code === 200) {
$that.closest('.suggest-type').removeClass('show');
$that.closest('.suggest-item').find('.suggest-good').addClass('show');
}
}).fail(function(data) {
//TODO
diaLog.showDialog({
autoHide: true,
dialogText: '网络错误~'
});
});
});
$disLikeBtn.bind('click', function() {
var id = $(this).closest('.suggest-item').attr('data-id'),
$that = $(this);
$.ajax({
method: 'post',
url: '/home/upAndDown',
data: {
suggest_id: id,
reliable: 2
}
}).then(function(data) {
if (data.code === 200) {
$that.closest('.suggest-type').removeClass('show');
$that.closest('.suggest-item').find('.suggest-bad').addClass('show');
}
}).fail(function(data) {
//TODO
diaLog.showDialog({
autoHide: true,
dialogText: '网络错误~'
});
});
/**
* 个人中心--意见反馈
* @author: chenglong<chenglong.wang@yoho.cn>
* @date: 2015/11/12
*/
var $ = require("jquery"),
Hammer = require("hammer"),
lazyLoad = require("lazyload"),
Handlebars = require("handlebars");
var diaLog = require("js/me/dialog");
var $uploadImgList = $('.upload-img-list'),
headerNavHammer,
formHammer,
imgTpl,
imgTemplate,
$likeBtn = $('.suggest-item .like-btn'),
$disLikeBtn = $('.suggest-item .dislike-btn'),
$imgAdd = $('.img-add'),
imgStr = '',
uploadImgNum = 0;
require("js/me/jquery.upload");
imgTpl = '{{# imgList}}' +
'<li>' +
'{{# imgUrl}}<img src="{{.}}" />' +
'<span class="upload-img-remove"></span>{{/ imgUrl}}' +
'</li>' +
'{{/ imgList}}';
imgTemplate = Handlebars.compile(imgTpl);
$('#upload-img').upload({
auto: true,
fileType: 'image/*',
uploadScript: '/home/suggestimgUpload',
fileObjName: 'fileData',
fileSizeLimit: 300,
height: '100%',
width: '100%',
multi: false,
onAddQueueItem: function(files) {
//TODO
$uploadImgList.html(imgTemplate({
imgList: true
}));
},
onUploadComplete: function(file, data) {
$uploadImgList.html('');
imgStr = JSON.parse(data).imgList[0].imgRelUrl;
$uploadImgList.html(imgTemplate(JSON.parse(data)));
$imgAdd.hide();
uploadImgNum++;
}
});
lazyLoad();
headerNavHammer = new Hammer(document.getElementById('yoho-header'));
headerNavHammer.on('tap', function(e) {
var suggestText = $('#suggest-textarea').val(),
textReg = /\S+/;
if ($(e.target).hasClass('nav-btn')) {
if (!textReg.test(suggestText)) {
diaLog.showDialog({
autoHide: true,
dialogText: '意见不能为空'
});
return;
}
$.ajax({
method: 'post',
url: '/home/savesuggest',
data: {
content: suggestText,
image: imgStr
}
}).then(function(data) {
if (data.code === 200) {
diaLog.showDialog({
autoHide: true,
dialogText: '提交成功'
});
setTimeout(function() {
location.pathname = 'home/suggest';
}, 2000);
} else {
diaLog.showDialog({
autoHide: true,
dialogText: '提交失败~'
});
}
}).fail(function() {
diaLog.showDialog({
autoHide: true,
dialogText: '网络错误~'
});
});
}
});
if (document.getElementById('img-form') !== null) {
formHammer = new Hammer(document.getElementById('img-form'));
formHammer.on('tap', function(e) {
if ($(e.target).hasClass('upload-img-remove')) {
$uploadImgList.html('');
imgStr = '';
uploadImgNum--;
setTimeout(function() {
$imgAdd.show();
}, 50);
}
});
}
// 点赞与取消点赞
$likeBtn.bind('click', function() {
var id = $(this).closest('.suggest-item').attr('data-id'),
$that = $(this);
$.ajax({
method: 'post',
url: '/home/upAndDown',
data: {
suggest_id: id,
reliable: 1
}
}).then(function(data) {
if (data.code === 200) {
$that.closest('.suggest-type').removeClass('show');
$that.closest('.suggest-item').find('.suggest-good').addClass('show');
}
}).fail(function(data) {
//TODO
diaLog.showDialog({
autoHide: true,
dialogText: '网络错误~'
});
});
});
$disLikeBtn.bind('click', function() {
var id = $(this).closest('.suggest-item').attr('data-id'),
$that = $(this);
$.ajax({
method: 'post',
url: '/home/upAndDown',
data: {
suggest_id: id,
reliable: 2
}
}).then(function(data) {
if (data.code === 200) {
$that.closest('.suggest-type').removeClass('show');
$that.closest('.suggest-item').find('.suggest-bad').addClass('show');
}
}).fail(function(data) {
//TODO
diaLog.showDialog({
autoHide: true,
dialogText: '网络错误~'
});
});
});
});
define("js/me/jquery.upload", ["jquery"], function(require, exports, module){
... ... @@ -14998,14 +14998,15 @@ $('.dispatch-time').on('touchend', 'li', function() {
orderInfo('deliveryTimeId', $(this).data('id'));
});
$('.yoho-coin-help-dialog-bg, .yoho-coin-footer').on('touchend', function(e) {
$('.yoho-coin-help-dialog-bg, .yoho-coin-footer').on('click', function(e) {
e.preventDefault();
$('.yoho-coin-help-dialog-bg').addClass('hide');
$('.yoho-coin-help-dialog').addClass('hide');
});
$('.coin').on('touchend', function(e) {
$('.coin').on('click', function(e) {
var $this = $(this);
e.preventDefault();
if ($(e.target).closest('.yoho-coin-help').length) {
$('.yoho-coin-help-dialog-bg').removeClass('hide');
... ... @@ -15694,37 +15695,37 @@ $confim.on('click', '.confim', function() {
});
define("js/cart/jit-detail", ["swiper","jquery","index"], function(require, exports, module){
/**
* jit拆单配送信息页面
* @author: zhaobiao<bill.zhao@yoho.cn>
* @date: 2016/04/26
*/
var Swiper = require("swiper"),
$ = require("jquery");
var height = $(window).height() - $('#yoho-header').height();
// 为了展示页面背景色，需要把页面根据窗口大小撑开
$('.jit-detail-page').css('height', height);
$('.jit-detail-page>div').show();
// 内容展示之后，再根据document高度，调整一次容器高度
height = $(document).height() - $('#yoho-header').height();
$('.jit-detail-page').css('height', height);
(function() {
return new Swiper('.swiper-container', {
slidesPerView: 'auto',
grabCursor: true,
slideElement: 'a',
lazyLoading: true,
watchSlidesVisibility: true
});
})();
/**
* jit拆单配送信息页面
* @author: zhaobiao<bill.zhao@yoho.cn>
* @date: 2016/04/26
*/
var Swiper = require("swiper"),
$ = require("jquery");
var height = $(window).height() - $('#yoho-header').height();
// 为了展示页面背景色，需要把页面根据窗口大小撑开
$('.jit-detail-page').css('height', height);
$('.jit-detail-page>div').show();
// 内容展示之后，再根据document高度，调整一次容器高度
height = $(document).height() - $('#yoho-header').height();
$('.jit-detail-page').css('height', height);
(function() {
return new Swiper('.swiper-container', {
slidesPerView: 'auto',
grabCursor: true,
slideElement: 'a',
lazyLoading: true,
watchSlidesVisibility: true
});
})();
});
define("js/cart/pay-back", ["jquery","hammer"], function(require, exports, module){
... ...
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
!function(e){function n(o){if(t[o])return t[o].exports;var i=t[o]={exports:{},id:o,loaded:!1};return e[o].call(i.exports,i,i.exports,n),i.loaded=!0,i.exports}var t={};return n.m=e,n.c=t,n.p="",n(0)}([function(e,n,t){e.exports=t(7)},function(e,n){n.flashChecker=function(){var e=0,n=0,t=0,o=null;return t?(o=new ActiveXObject("ShockwaveFlash.ShockwaveFlash"),o&&(e=1,n=o.GetVariable("$version"))):navigator.plugins&&navigator.plugins.length>0&&(o=navigator.plugins["Shockwave Flash"],o&&(e=1,n=o.description.replace("Shockwave Flash",""))),{f:e,v:n}},n.Hash=function(e){var n,t=1,o=0;if(e)for(t=0,n=e.length-1;n>=0;n--)o=e.charCodeAt(n),t=(t<<6&268435455)+o+(o<<14),o=266338304&t,0!==o&&(t^=o>>21);return t},n.Random=function(){return Math.round(2147483647*Math.random())},n.hashClientInfo=function(){var e=window.navigator,t=window.history.length,o=[e.appName,e.version,e.language,e.platform,e.userAgent,e.javaEnabled(),window.screen,window.screen.colorDepth,window.document.cookie?window.document.cookie:"",window.document.referrer?window.document.referrer:""];e=o.join("");for(var i=e.length;t>0;)e+=t--^i++;return n.Hash(e)},n.merge=function(e,n){var t={};for(var o in e)t[o]=e[o];for(var i in n)t[i]=n[i];return t},n.genParam=function(e){var n=[];for(var t in e)n.push(t+"="+e[t]);return n.join("&")},n.trim=function(e){if(String.prototype.trim)return null===e?"":String.prototype.trim.call(e);var n=/^\s+/,t=/\s+$/,o="";return e?(o=e.toString().replace(n,""),o=o.replace(t,"")):void 0},n.getGeo=function(e){function n(n){var t=n.coords.longitude,o=n.coords.latitude;e(o,t)}function t(n){e(!1)}if(window.navigator.geolocation){var o={enableHighAccuracy:!0};window.navigator.geolocation.getCurrentPosition(n,t,o)}else e(!1)},n.queryString=function(){var e,n,t={},o=window.location.search.slice(1).split("&");for(n=0;n<o.length;n++)e=o[n].split("="),t[e[0]]=e[1];return t},n.getChannel=function(){function e(e){var n,t=document.cookie;return t&&(t=t.split(";"),t.forEach(function(t){return t.indexOf(e)>-1?void(n=decodeURIComponent($.trim(t.replace(e+"=","")))):void 0})),n}return{boys:1,girls:2,kids:3,lifestyle:4}[e("_Channel")]};var t=function(){for(var e=navigator.userAgent.split(";")||[],n=0;n<e.length;n++)if(e[n].indexOf("app_version")>-1)return e[n].split("=")[1]};n.getAppVersion=function(){var e=window.qs.app_version||window.qs.appVersion;return e||(e=t()),e}},function(e,n){function t(){var e=document.domain.split("."),n=e.length;return n>1&&isNaN(e[n-1])?"."+e[n-2]+"."+e[n-1]:document.domain}e.exports={version:"1.0",yasPath:"/web/",yasDomain:t(),yasImgDomain:"//analytics.m.yohobuy.com/yas.gif",yasMobileDomain:"//analytics.m.yohobuy.com/yas_mobile"}},function(e,n,t){var o=t(1);e.exports=function(e,n,t){if("undefined"==typeof n){var i=null;if(document.cookie)for(var r=document.cookie.split(";"),a=0;a<r.length;a++){var s=o.trim(r[a]);if(s.substring(0,e.length+1)==e+"="){i=decodeURIComponent(s.substring(e.length+1));break}}return i}t=t||{},null===n&&(n="",t.expires=-1);var d="";if(t.expires&&("number"==typeof t.expires||t.expires.toUTCString)){var u;"number"==typeof t.expires?(u=new Date,u.setTime(u.getTime()+24*t.expires*60*60*1e3)):u=t.expires,d="; expires="+u.toUTCString()}var p=t.path?"; path="+t.path:"",c=t.domain?"; domain="+t.domain:"",f=t.secure?"; secure":"";document.cookie=[e,"=",encodeURIComponent(n),d,p,c,f].join("")}},function(e,n,t){var o=t(1),i=t(2),r=i.yasPath,a=i.yasImgDomain,s=i.yasMobileDomain,d=function(e,n){var t;return window.XMLHttpRequest?t=new XMLHttpRequest:"undefined"!=typeof XDomainRequest?t=new XDomainRequest:window.ActiveXObject&&(t=new ActiveXObject("Microsoft.XMLHTTP")),t};n.imgSend=function(e,n){var t=o.getAppVersion();if(!(window.appBaseLogs||t>="5.2.1")){var i=new Image(1,1);i.src=a+r+"?"+e,i.onload=function(){i.onload=null,n&&n()}}},n.appSend=function(e,n){if(window.appBaseLogs){var t=d();t&&(t.ontimeout=function(e){console.log("timeout: ",JSON.stringify(e))},t.onerror=function(e){console.log("error: ",JSON.stringify(e))},t.onreadystatechange=function(){4==t.readyState&&200==t.status&&n&&n()},t.open("post",("https:"===document.location.protocol?"https:":"http:")+s,!0),t.setRequestHeader("Content-Type","application/x-www-form-urlencoded"),t.send(e))}}},function(e,n){n.addEventHandler=function(e,n,t){e.addEventListener?e.addEventListener(n,t,!1):e.attachEvent?e.attachEvent("on"+n,t):e["on"+n]=t},n.removeEventHandler=function(e,n,t){e.removeEventListener?e.removeEventListener(n,t,!1):e.detachEvent?e.detachEvent("on"+n,t):delete e["on"+n]}},function(e,n,t){function o(e){var n=f.merge(h,_);n=f.merge(n,S);var t=r();t&&(n=f.merge(n,t),l("_yasmp",null,{path:"/",domain:v.yasDomain,expires:73e3}));var o=l("_yascustjson");if(o){var i=JSON.parse(o);n=f.merge(n,i),l("_yascustjson",null,{path:"/",domain:v.yasDomain,expires:73e3})}var a=l("_yaserror");if(a){var s=JSON.parse(a);n=f.merge(n,s),l("_yaserror",null,{path:"/",domain:v.yasDomain,expires:73e3})}var d=f.genParam(n);e=e?e:function(){},g.imgSend(d,e);var u=l("_yasev");u&&g.imgSend(u,function(){l("_yasev",null,{path:"/",domain:v.yasDomain,expires:73e3})})}function i(){var e=l("_yasvd");return e?{cid:e,isNew:"N"}:(e=f.Random()^2147483647&f.hashClientInfo(),l("_yasvd",e,{path:"/",domain:m,expires:73e3}),{cid:e,isNew:"Y"})}function r(){var e=l("_yasmp");if(e){var n=e.split(",");if(3===n.length)return{x:n[0],y:n[1],et:n[2]};if(4===n.length)return{x:n[0],y:n[1],et:n[2],ix:n[3]}}return null}function a(e){var n=0,t=0;return e.pageX||e.pageY?(n=e.pageX,t=e.pageY):(e.clientX||e.clientY)&&(n=e.clientX+document.body.scrollLeft+document.documentElement.scrollLeft,t=e.clientY+document.body.scrollTop+document.documentElement.scrollTop),n-=window.screen.width/2,t=window.screen.height/2-t,{x:n,y:t}}function s(){var e=window.qs.mkt_code||window.qs.union_type;if(e){var n={path:"/",domain:m,expires:new Date(Date.now()+6048e5)};y?l("mkt_code",e,n):l("mkt_code")||l("mkt_code",e,n)}}function d(){var e=l("mkt_code");return e?{mktc:e}:null}function u(){var e=window.qs.mkt_code||window.qs.union_type;if(e)for(var n=document.getElementsByTagName("a"),t=0;t<n.length;t++){var o=n[t].getAttribute("href")||"";o.indexOf("union.yoho.cn/union/downapp.html")>-1&&-1===o.indexOf("union_type")&&n[t].setAttribute("href",o+"?union_type="+e)}}function p(e,n,t,o,i){var r=l("_yasev");r?r+="&":r="",l("_yasev",r+"vd="+_.vd+"&t="+e+"&i="+n+"&l="+o+"&v="+i,{path:"/",domain:m,expires:73e3}),A++}function c(e,n){e.av&&(window.indx=e.indx,window.originUrl=e.origin||location.href,window.appBaseLogs={device:{ak:e.ak,udid:e.udid},status:[{av:e.av,udid:e.udid,sid:e.sid}],events:[{uid:e.uid,sid:e.sid}]},window.originUrl&&window.qs&&O.sendAppLogs({appop:"YB_H5_PAGE_OPEN_L",param:JSON.stringify({C_ID:window.qs.yh_channel||f.getChannel()||1,PAGE_URL:window.originUrl,PAGE_NAME:decodeURI(window.qs.title||document.title),ACTION_URL:n})},!1))}t(8);var f=t(1),l=t(3),g=t(4),w=t(5),v=t(2),m=(v.version,v.yaPath,v.yasDomain),h={h:document.domain,p:window.location.port,u:window.location.pathname,ft:0,fst:0,sv:"",ab:l("ab_5")||"",apf:window.location.search.indexOf("app_version=")>=0?"Y":"N"},y=/micromessenger/i.test(navigator.userAgent),x=i(),_={ak:"",cd:x.cid,vd:(new Date).getTime()+x.cid,ud:"",rf:document.referrer,ckf:x.isNew},b=f.flashChecker(),S={sr:window.screen.width+"x"+window.screen.height,wr:window.screen.availWidth+"x"+window.screen.availHeight,sd:window.screen.colorDepth,ln:window.navigator.language?window.navigator.language:window.navigator.browserLanguage,sy:window.navigator.platform,ce:window.navigator.cookieEnabled,fv:b.f?b.v:0},N=function(){},O=function(e,n,t,i,r,d){function p(e,n,t){N="This page contains error! \n\n",N+="Error message is\uff1a"+e+"\n",N+="URL is: "+n+"\n",N+="Line is\uff1a"+t+"\n\n";var o=JSON.stringify({er:N});return l("_yaserror",o,{path:"/",domain:m,expires:73e3}),!1}if(window.qs=f.queryString(),_.ak=t,h.sv=n,_.ud=i?i:"",_.ts=(new Date).getTime(),l("_yasgeo")){var c=l("_yasgeo").split(",");_.la=c[0],_.lo=c[1],l("_yasgeo",null,{path:"/",domain:v.yasDomain,expires:73e3})}var g=(new Date).getTime(),y=null,x=!1;if(h.ft=g-e,w.addEventHandler(window,"load",function(n){var t=(new Date).getTime();h.fst=t-e,w.removeEventHandler(window,"load",arguments.callee),window.clearTimeout(y),x||o()}),y=window.setTimeout(function(){h.fst=0,h.fse=">3s",x=!0,o()},3e3),r&&f.getGeo(function(e,n){e&&l("_yasgeo",e+","+n,{path:"/",domain:m,expires:73e3})}),s(),u(),d&&d[0])for(var b=0,S=d.length;S>b;b++)d[b].setAttribute("yoho_index",b+1);else w.addEventHandler(document,"click",function(e){e=e||window.event;var n=e.target||e.srcElement;if(n&&("A"===n.nodeName||"IMG"===n.nodeName&&"A"===n.parentNode.nodeName)){var t=a(e),o=t.x+","+t.y+","+e.type,i=n.getAttribute("yoho_index")||n.parentNode.getAttribute("yoho_index");i&&(o+=","+i),l("_yasmp",o,{path:"/",domain:m,expires:73e3})}ix=0});onerror=p;var N=""},A=0;if(O.add=function(e,n,t,o,i){A>3?g.imgSend(l("_yasev"),function(){l("_yasev",null,{path:"/",domain:v.yasDomain,expires:73e3}),A=0,p(e,n,t,o,i)}):p(e,n,t,o,i)},O.sendMouseEvent=function(e,n){e=e||window.event;var t=a(e);if(n){var o={x:t.x,y:t.y,et:e.type},i=f.merge(h,_);i=f.merge(i,S),i=f.merge(i,o);var r=f.genParam(i);g.imgSend(r,function(){})}else l("_yasmp",t.x+","+t.y+","+e.type,{path:"/",domain:m,expires:73e3})},O.sendCustomInfo=function(e,n){if(window.appBaseLogs&&e.appop)return e.op=e.appop,O.sendAppLogs(e,!0);if(delete e.appop,e.ts=(new Date).getTime(),n){var t=f.merge(h,_);t=f.merge(t,S),t=f.merge(t,e);var o=d();o&&(t=f.merge(t,o));var i=f.genParam(t);g.imgSend(i,function(){})}else{var r=JSON.stringify(e);l("_yascustjson",r,{path:"/",domain:m,expires:73e3})}},O.sendAppLogs=function(e,n){if(window.appBaseLogs){var t=JSON.parse(e.param);t.F_URL&&(t.F_URL=decodeURIComponent(t.F_URL));var o=f.merge(window.appBaseLogs.events[0],{ts:(new Date).getTime().toString(),indx:++window.indx,op:e.appop,param:t}),i=f.merge(window.appBaseLogs,{events:[o]});g.appSend("_mlogs="+escape(JSON.stringify(i))),window._yasloaded=!0,n&&(window.isandroidyas?window.prompt(JSON.stringify({method:"set.analyticEventIndex",arguments:{indx:window.indx}})):window.yohoInterface.triggerEvent(N,N,{method:"set.analyticEventIndex",arguments:{indx:window.indx}}))}},navigator.userAgent.indexOf("YohoBuy-android-yas")>-1){window.isandroidyas=!0;var E=window.prompt(JSON.stringify({method:"get.analyticAppData"}));c(JSON.parse(E||"{}"))}else w.addEventHandler(document,"deviceready",function(e){window._yasloaded=!1;for(var n=[],t=document.getElementsByTagName("a"),o=0;o<t.length;o++){var i=t[o].getAttribute("href");!i||/^#.*$/.test(i)||/^javascript.*$/i.test(i)||n.push(i),w.addEventHandler(t[o],"click",function(e){if(window.originUrl){var n=e.currentTarget,t=n.getAttribute("href");if(O.sendAppLogs({appop:"YB_H5_PAGE_FLR_C",param:JSON.stringify({C_ID:window.qs.yh_channel||f.getChannel()||1,PAGE_URL:window.originUrl,PAGE_NAME:decodeURI(window.qs.title||document.title),F_URL:t})},!0),"feature.yoho.cn"===document.domain){var o=n.getAttribute("operid");if(o){var i=n.getAttribute("param");i=JSON.parse(i),i.C_ID=window.qs.yh_channel,i.F_URL=t,O.sendAppLogs({appop:o,param:JSON.stringify(i)},!0)}}}})}window.yohoInterface.triggerEvent(function(e){c(e,n)},N,{method:"get.analyticAppData"});var r=setInterval(function(){window._yasloaded&&(clearInterval(r),window.yohoInterface.triggerEvent(N,N,{method:"set.analyticEventIndex",arguments:{indx:window.indx}}))},500)});e.exports=O},function(e,n,t){var o=t(6);if(window.YohoAcquisitionObject){var i=window.YohoAcquisitionObject;window[i].p&&(o.apply(this,window[i].p),window[i]=o)}e.exports=o},function(module,exports){"object"!=typeof JSON&&(JSON={}),function(){"use strict";function f(e){return 10>e?"0"+e:e}function this_value(){return this.valueOf()}function quote(e){return rx_escapable.lastIndex=0,rx_escapable.test(e)?'"'+e.replace(rx_escapable,function(e){var n=meta[e];return"string"==typeof n?n:"\\u"+("0000"+e.charCodeAt(0).toString(16)).slice(-4)})+'"':'"'+e+'"'}function str(e,n){var t,o,i,r,a,s=gap,d=n[e];switch(d&&"object"==typeof d&&"function"==typeof d.toJSON&&(d=d.toJSON(e)),"function"==typeof rep&&(d=rep.call(n,e,d)),typeof d){case"string":return quote(d);case"number":return isFinite(d)?String(d):"null";case"boolean":case"null":return String(d);case"object":if(!d)return"null";if(gap+=indent,a=[],"[object Array]"===Object.prototype.toString.apply(d)){for(r=d.length,t=0;r>t;t+=1)a[t]=str(t,d)||"null";return i=0===a.length?"[]":gap?"[\n"+gap+a.join(",\n"+gap)+"\n"+s+"]":"["+a.join(",")+"]",gap=s,i}if(rep&&"object"==typeof rep)for(r=rep.length,t=0;r>t;t+=1)"string"==typeof rep[t]&&(o=rep[t],i=str(o,d),i&&a.push(quote(o)+(gap?": ":":")+i));else for(o in d)Object.prototype.hasOwnProperty.call(d,o)&&(i=str(o,d),i&&a.push(quote(o)+(gap?": ":":")+i));return i=0===a.length?"{}":gap?"{\n"+gap+a.join(",\n"+gap)+"\n"+s+"}":"{"+a.join(",")+"}",gap=s,i}}var rx_one=/^[\],:{}\s]*$/,rx_two=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,rx_three=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,rx_four=/(?:^|:|,)(?:\s*\[)+/g,rx_escapable=/[\\\"\u0000-\u001f\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,rx_dangerous=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;"function"!=typeof Date.prototype.toJSON&&(Date.prototype.toJSON=function(){return isFinite(this.valueOf())?this.getUTCFullYear()+"-"+f(this.getUTCMonth()+1)+"-"+f(this.getUTCDate())+"T"+f(this.getUTCHours())+":"+f(this.getUTCMinutes())+":"+f(this.getUTCSeconds())+"Z":null},Boolean.prototype.toJSON=this_value,Number.prototype.toJSON=this_value,String.prototype.toJSON=this_value);var gap,indent,meta,rep;"function"!=typeof JSON.stringify&&(meta={"\b":"\\b"," ":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"},JSON.stringify=function(e,n,t){var o;if(gap="",indent="","number"==typeof t)for(o=0;t>o;o+=1)indent+=" ";else"string"==typeof t&&(indent=t);if(rep=n,n&&"function"!=typeof n&&("object"!=typeof n||"number"!=typeof n.length))throw new Error("JSON.stringify");return str("",{"":e})}),"function"!=typeof JSON.parse&&(JSON.parse=function(text,reviver){function walk(e,n){var t,o,i=e[n];if(i&&"object"==typeof i)for(t in i)Object.prototype.hasOwnProperty.call(i,t)&&(o=walk(i,t),void 0!==o?i[t]=o:delete i[t]);return reviver.call(e,n,i)}var j;if(text=String(text),rx_dangerous.lastIndex=0,rx_dangerous.test(text)&&(text=text.replace(rx_dangerous,function(e){return"\\u"+("0000"+e.charCodeAt(0).toString(16)).slice(-4)})),rx_one.test(text.replace(rx_two,"@").replace(rx_three,"]").replace(rx_four,"")))return j=eval("("+text+")"),"function"==typeof reviver?walk({"":j},""):j;throw new SyntaxError("JSON.parse")})}()}]);
\ No newline at end of file
... ...
... ... @@ -407,14 +407,15 @@ $('.dispatch-time').on('touchend', 'li', function() {
orderInfo('deliveryTimeId', $(this).data('id'));
});
$('.yoho-coin-help-dialog-bg, .yoho-coin-footer').on('touchend', function(e) {
$('.yoho-coin-help-dialog-bg, .yoho-coin-footer').on('click', function(e) {
e.preventDefault();
$('.yoho-coin-help-dialog-bg').addClass('hide');
$('.yoho-coin-help-dialog').addClass('hide');
});
$('.coin').on('touchend', function(e) {
$('.coin').on('click', function(e) {
var $this = $(this);
e.preventDefault();
if ($(e.target).closest('.yoho-coin-help').length) {
$('.yoho-coin-help-dialog-bg').removeClass('hide');
... ...
... ... @@ -499,16 +499,14 @@
}
.yoho-coin-help {
background: resolve("help.png") no-repeat;
display: inline-block;
background-color: #b0b0b0;
border-radius: 28px;
background-size: 28px;
width: 28px;
height: 28px;
line-height: 28px;
text-align: center;
color: #fff;
font-size: 22px;
margin-left: 10px;
cursor: pointer;
vertical-align: middle;
}
}
... ... @@ -656,12 +654,11 @@
height: 510px;
background-color: #fff;
z-index: 2;
margin: auto;
left: 0;
right: 0;
top: 0;
bottom: 0;
border-radius: 10px;
left: 50%;
margin-left: -270px;
top: 50%;
margin-top: -255px;
.yoho-coin-title {
font-size: 34px;
... ... @@ -773,4 +770,4 @@
color: #b0b0b0;
}
}
}
}
\ No newline at end of file
... ...
... ... @@ -116,7 +116,7 @@
<li class="coin" data-yoho-coin="{{yohoCoinCompute.yohoCoin}}" data-yoho-coin-click={{yohoCoinCompute.yohoCoinClick}}>
<span class="title">有货币</span>
<span class="desc msg">{{yohoCoinCompute.yohoCoinMsg}}</span>
<span class="yoho-coin-help">?</span>
<span class="yoho-coin-help"></span>
{{#if yohoCoinCompute.useYohoCoin}}
<span class="coin-check">
<i class="iconfont checkbox icon-cb-radio"></i>
... ...
... ... @@ -36,7 +36,7 @@
<li class="coin" data-yoho-coin="{{yohoCoinCompute.yohoCoin}}" data-yoho-coin-click={{yohoCoinCompute.yohoCoinClick}}>
<span class="title">有货币</span>
<span class="desc msg">{{yohoCoinCompute.yohoCoinMsg}}</span>
<span class="yoho-coin-help">?</span>
<span class="yoho-coin-help"></span>
{{#if yohoCoinCompute.useYohoCoin}}
<span class="coin-check">
<i class="iconfont checkbox icon-cb-radio"></i>
... ...