diff --git a/static/js/me/order.js b/static/js/me/order.js
index cd8944d..5c395b6 100644
--- a/static/js/me/order.js
+++ b/static/js/me/order.js
@@ -26,6 +26,8 @@ var inAjax = false;
var loading = require('../plugin/loading');
+var dialog = require('./dialog');
+
var orderHammer;
//加载订单
@@ -110,36 +112,52 @@ orderHammer.on('tap', function(e) {
if ($cur.closest('.del').length > 0) {
//Order delete
- $.ajax({
- type: 'GET',
- url: '/home/delOrder',
- data: {
- id: id
- },
- success: function(data) {
- if (data.code === 200) {
-
- //删除订单页面刷新
- location.href = location.href;
- }
+ dialog.showDialog({
+ dialogText: '确定删除订单吗？',
+ hasFooter: {
+ leftBtnText: '取消',
+ rightBtnText: '确定'
}
+ }, function() {
+ $.ajax({
+ type: 'GET',
+ url: '/home/delOrder',
+ data: {
+ id: id
+ },
+ success: function(data) {
+ if (data.code === 200) {
+
+ //删除订单页面刷新
+ location.href = location.href;
+ }
+ }
+ });
});
} else if ($cur.closest('.cancel').length > 0) {
//Order cancel
- $.ajax({
- type: 'GET',
- url: '/home/cancelOrder',
- data: {
- id: id
- },
- success: function(data) {
- if (data.code === 200) {
-
- //取消订单页面刷新
- location.href = location.href;
- }
+ dialog.showDialog({
+ dialogText: '确定取消订单吗？',
+ hasFooter: {
+ leftBtnText: '取消',
+ rightBtnText: '确定'
}
+ }, function() {
+ $.ajax({
+ type: 'GET',
+ url: '/home/cancelOrder',
+ data: {
+ id: id
+ },
+ success: function(data) {
+ if (data.code === 200) {
+
+ //取消订单页面刷新
+ location.href = location.href;
+ }
+ }
+ });
});
} else {
diff --git a/static/js/product/detail/like.js b/static/js/product/detail/like.js
index de98f25..b9d571e 100644
--- a/static/js/product/detail/like.js
+++ b/static/js/product/detail/like.js
@@ -7,18 +7,24 @@ var $ = require('jquery'),
Hammer = require('yoho.hammer'),
tip = require('../../plugin/tip');
-var likeHammer = new Hammer(document.getElementById('likeBtn'));
+var likeHammer = new Hammer(document.getElementById('likeBtn')),
+ addToCartHammer = new Hammer(document.getElementById('addtoCart'));
+
+var productId = $('#productId').val();
likeHammer.on('tap', function(e) {
- var productId = $('#productId').val(),
- opt;
+ var opt,
+ favorite;
+
var $this = $(this);
if ($this.hasClass('liked')) {
opt = 'cancel';
+ favorite = 0;
} else {
opt = 'ok';
+ favorite = 1;
}
$.ajax({
@@ -36,6 +42,14 @@ likeHammer.on('tap', function(e) {
} else {
tip.show(data.message);
}
+
+ // 统计代码：用于统计用户加入或取消商品收藏的动作
+ if (window._yas) {
+ window._yas.sendCustomInfo({
+ pd: productId,
+ fa: favorite
+ });
+ }
},
error: function() {
tip.show('网络断开连接了~');
@@ -44,6 +58,15 @@ likeHammer.on('tap', function(e) {
});
-// $('#likeBtn').on('click', function(e) {
-// return false;
-// });
\ No newline at end of file
+addToCartHammer.on('tap', function(e) {
+
+ // 统计代码：用于统计用户加入购物车的动作
+ if (window._yas) {
+ window._yas.sendCustomInfo({
+ pd: productId,
+ by: 1
+ });
+ }
+});
+
+
diff --git a/static/js/product/list.js b/static/js/product/list.js
index 66f98a7..258b153 100644
--- a/static/js/product/list.js
+++ b/static/js/product/list.js
@@ -442,3 +442,8 @@ $listNav.on('touchstart', 'li', function() {
}).on('touchend touchcancel', 'li', function() {
$listNav.find('li').removeClass('bytouch');
});
+
+// 用于统计点击了商品列表的第几个商品，序号从1开始计算。
+if (window._yas) {
+ window._yas(1 * new Date(), '1.0.13.1', 'yohobuy_m', window._ozuid, '#goods-container >div >div .good-thumb >img');
+}
\ No newline at end of file
diff --git a/static/sass/me/_personal-details.scss b/static/sass/me/_personal-details.scss
index 15ab2db..18f070e 100644
--- a/static/sass/me/_personal-details.scss
+++ b/static/sass/me/_personal-details.scss
@@ -28,7 +28,6 @@
>span{
&:first-of-type{
color: #444;
- line-height:100rem / $pxConvertRem;
}
width: 42%;
height: 100%;
diff --git a/template/m.yohobuy.com/actions/index/home/coupons.phtml b/template/m.yohobuy.com/actions/index/home/coupons.phtml
index e191498..bf5c11d 100644
--- a/template/m.yohobuy.com/actions/index/home/coupons.phtml
+++ b/template/m.yohobuy.com/actions/index/home/coupons.phtml
@@ -15,7 +15,7 @@
{{^ used}}
<div class="null">
<i></i>
- <p>您还没有未使用的优惠券</p>
+ <p>您还没有优惠券!</p>
<a href="{{topURL}}">随便逛逛</a>
</div>
{{/ used}}
@@ -32,7 +32,7 @@
{{^ unused}}
<div class="null">
<i></i>
- <p>您还没有已使用的优惠券</p>
+ <p>您还没有使用的优惠券!</p>
<a href="{{topURL}}">随便逛逛</a>
</div>
{{/ unused}}
diff --git a/template/m.yohobuy.com/actions/product/detail/index.phtml b/template/m.yohobuy.com/actions/product/detail/index.phtml
index 7643c6d..4deee23 100644
--- a/template/m.yohobuy.com/actions/product/detail/index.phtml
+++ b/template/m.yohobuy.com/actions/product/detail/index.phtml
@@ -124,7 +124,7 @@
{{/if}}
<a href="/shoppingCart" class="num-incart iconfont"></a>
{{#if goodsInstore}}
- <a href="/shoppingCart" class="addto-cart ">加入购物车</a>
+ <a href="/shoppingCart" id="addtoCart" class="addto-cart">加入购物车</a>
{{else}}
<a href="javascript:;" class="sold-out">已售罄</a>
{{/if}}
@@ -132,11 +132,9 @@
<a href="javascript:;" id="likeBtn" class="favorite iconfont {{#isCollect}}liked{{/isCollect}}"></a>
</div>
{{/cartInfo}}
-
{{#if introUrl}}
<input id="introUrl" type="hidden" value={{introUrl}}>
{{/if}}
-
{{#if id}}
<input id="productId" type="hidden" value={{id}}>
{{/if}}