fe / YOHOBUYPC · Commits

Go to a project

Authored by uedxwg
Commit 1e7d0e956d0192480c449d7d58d27d4c02c6ca4e 2 parents af3a8963 e48bca0e

Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

Inline Side-by-side
Showing 12 changed files with 192 additions and 85 deletions
@@ -28,7 +28,6 @@ var $action = $('.action'), @@ -28,7 +28,6 @@ var $action = $('.action'),
28 28
29 // 清除返回按钮原有链接 29 // 清除返回按钮原有链接
30 $backBtn.attr('href', 'javascript:void(0);'); 30 $backBtn.attr('href', 'javascript:void(0);');
31 -  
32 window.rePosFooter(); 31 window.rePosFooter();
33 32
34 // 自定义返回按钮事件 33 // 自定义返回按钮事件
@@ -39,6 +38,7 @@ $backBtn.on('touchend', function(e) { @@ -39,6 +38,7 @@ $backBtn.on('touchend', function(e) {
39 e.preventDefault(); 38 e.preventDefault();
40 currentPage = 'address'; 39 currentPage = 'address';
41 $navTitle.html('地址管理'); 40 $navTitle.html('地址管理');
  41 + window.rePosFooter();
42 } else if (currentPage === 'list') { 42 } else if (currentPage === 'list') {
43 $pageWrap.hide(); 43 $pageWrap.hide();
44 $editAddressPage.show(); 44 $editAddressPage.show();
@@ -60,9 +60,10 @@ function editAddress(data) { @@ -60,9 +60,10 @@ function editAddress(data) {
60 $addressForm.find('[name="address"]').val(data.address || ''); 60 $addressForm.find('[name="address"]').val(data.address || '');
61 61
62 currentPage = 'edit'; 62 currentPage = 'edit';
63 - $footer.hide();  
64 $pageWrap.hide(); 63 $pageWrap.hide();
65 $editAddressPage.show(); 64 $editAddressPage.show();
  65 +
  66 + $footer.addClass('bottom');
66 } 67 }
67 68
68 $confim.on('touchend', '.cancel', function() { 69 $confim.on('touchend', '.cancel', function() {
@@ -94,30 +95,7 @@ $confim.on('touchend', '.cancel', function() { @@ -94,30 +95,7 @@ $confim.on('touchend', '.cancel', function() {
94 }); 95 });
95 }); 96 });
96 97
97 -// 添加地址  
98 -$addAddress.on('touchend', function() {  
99 - if ($addressItem.length >= 5) {  
100 - tip.show('您最多添加5个收货地址');  
101 - return false;  
102 - }  
103 - editAddress();  
104 - $navTitle.html('添加新地址');  
105 -});  
106 -  
107 -// 编辑或删除  
108 -$action.on('touchend', '.edit', function() {  
109 - editAddress($(this).data());  
110 - $navTitle.html('修改地址');  
111 -}).on('touchend', '.del', function() {  
112 - deleteId = $(this).data('id');  
113 - $confim.show();  
114 -});  
115 -  
116 -$submit.on('touchend', function() {  
117 - $addressForm.submit();  
118 - return false;  
119 -});  
120 - 98 +// 提交表单请求
121 $addressForm.on('submit', function() { 99 $addressForm.on('submit', function() {
122 if (isSubmiting) { 100 if (isSubmiting) {
123 return false; 101 return false;
@@ -126,12 +104,14 @@ $addressForm.on('submit', function() { @@ -126,12 +104,14 @@ $addressForm.on('submit', function() {
126 // 简单的表单校验 104 // 简单的表单校验
127 if (!$(this).find('[name="consignee"]').val()) { 105 if (!$(this).find('[name="consignee"]').val()) {
128 tip.show('收件人不能为空'); 106 tip.show('收件人不能为空');
129 - $(this).find('[name="consignee"]').focus(); 107 +
  108 + // $(this).find('[name="consignee"]').focus();
130 return false; 109 return false;
131 } 110 }
132 if (!$(this).find('[name="mobile"]').val()) { 111 if (!$(this).find('[name="mobile"]').val()) {
133 tip.show('手机号不能为空'); 112 tip.show('手机号不能为空');
134 - $(this).find('[name="mobile"]').focus(); 113 +
  114 + // $(this).find('[name="mobile"]').focus();
135 return false; 115 return false;
136 } 116 }
137 if (!$(this).find('[name="area_code"]').val() || !$(this).find('[name="area"]').val()) { 117 if (!$(this).find('[name="area_code"]').val() || !$(this).find('[name="area"]').val()) {
@@ -140,7 +120,8 @@ $addressForm.on('submit', function() { @@ -140,7 +120,8 @@ $addressForm.on('submit', function() {
140 } 120 }
141 if (!$(this).find('[name="address"]').val()) { 121 if (!$(this).find('[name="address"]').val()) {
142 tip.show('地址不能为空'); 122 tip.show('地址不能为空');
143 - $(this).find('[name="address"]').focus(); 123 +
  124 + // $(this).find('[name="address"]').focus();
144 return false; 125 return false;
145 } 126 }
146 127
@@ -168,6 +149,34 @@ $addressForm.on('submit', function() { @@ -168,6 +149,34 @@ $addressForm.on('submit', function() {
168 return false; 149 return false;
169 }); 150 });
170 151
  152 +// 添加地址
  153 +$addAddress.on('touchend', function() {
  154 + if ($addressItem.length >= 5) {
  155 + tip.show('您最多添加5个收货地址');
  156 + return false;
  157 + }
  158 + editAddress();
  159 + $navTitle.html('添加新地址');
  160 +});
  161 +
  162 +// 编辑或删除
  163 +$action.on('touchend', '.edit', function() {
  164 + editAddress($(this).data());
  165 + $navTitle.html('修改地址');
  166 +}).on('touchend', '.del', function() {
  167 + deleteId = $(this).data('id');
  168 + $confim.show();
  169 +});
  170 +
  171 +$submit.on('touchend', function() {
  172 + $addressForm.submit();
  173 + return false;
  174 +}).on('touchstart', function() {
  175 + $(this).addClass('highlight');
  176 +}).on('touchend touchcancel', function() {
  177 + $(this).removeClass('highlight');
  178 +});
  179 +
171 // 省市区 180 // 省市区
172 $area.on('touchend', function() { 181 $area.on('touchend', function() {
173 $footer.hide(); 182 $footer.hide();
@@ -176,10 +185,9 @@ $area.on('touchend', function() { @@ -176,10 +185,9 @@ $area.on('touchend', function() {
176 currentPage = 'list'; 185 currentPage = 'list';
177 }); 186 });
178 187
  188 +// 省市区联动
179 $addressListPage.on('touchend', '.address', function() { 189 $addressListPage.on('touchend', '.address', function() {
180 - var caption = $(this).children('.caption').text();  
181 -  
182 - newArea.push(caption); 190 + newArea.push($(this).children('.caption').text());
183 $(this).siblings().hide(); 191 $(this).siblings().hide();
184 $(this).children('ul').show(); 192 $(this).children('ul').show();
185 return false; 193 return false;
@@ -193,6 +201,7 @@ $addressListPage.on('touchend', '.address', function() { @@ -193,6 +201,7 @@ $addressListPage.on('touchend', '.address', function() {
193 $editAddressPage.show(); 201 $editAddressPage.show();
194 currentPage = 'edit'; 202 currentPage = 'edit';
195 $navTitle.html('修改地址'); 203 $navTitle.html('修改地址');
  204 + $footer.show();
196 205
197 // 恢复默认的三级选择 206 // 恢复默认的三级选择
198 $addressListPage.hide(); 207 $addressListPage.hide();
@@ -201,3 +210,17 @@ $addressListPage.on('touchend', '.address', function() { @@ -201,3 +210,17 @@ $addressListPage.on('touchend', '.address', function() {
201 newArea = []; 210 newArea = [];
202 return false; 211 return false;
203 }); 212 });
  213 +
  214 +$($editAddressPage, $addressListPage).css('min-height', function() {
  215 + return $(window).height() - $('#yoho-header').height();
  216 +});
  217 +
  218 +$pageWrap.first().css('min-height', function() {
  219 + return $(window).height() - $('#yoho-header').height() - $footer.height();
  220 +});
  221 +
  222 +$('input, textarea').on('focus', function() {
  223 + $footer.hide();
  224 +}).on('blur', function() {
  225 + $footer.show();
  226 +});
@@ -18,3 +18,10 @@ $questionTab.on('touchend', function() { @@ -18,3 +18,10 @@ $questionTab.on('touchend', function() {
18 $('.question-list').removeClass('current'); 18 $('.question-list').removeClass('current');
19 $(clickTab).addClass('current'); 19 $(clickTab).addClass('current');
20 }); 20 });
  21 +
  22 +$('.yoho-page').on('touchstart', '.connect-item, .question-item', function() {
  23 + $(this).siblings().removeClass('highlight');
  24 + $(this).addClass('highlight');
  25 +}).on('touchend touchcancel', '.connect-item, .question-item', function() {
  26 + $(this).removeClass('highlight');
  27 +});
@@ -26,6 +26,8 @@ var inAjax = false; @@ -26,6 +26,8 @@ var inAjax = false;
26 26
27 var loading = require('../plugin/loading'); 27 var loading = require('../plugin/loading');
28 28
  29 +var dialog = require('./dialog');
  30 +
29 var orderHammer; 31 var orderHammer;
30 32
31 //加载订单 33 //加载订单
@@ -110,36 +112,52 @@ orderHammer.on('tap', function(e) { @@ -110,36 +112,52 @@ orderHammer.on('tap', function(e) {
110 if ($cur.closest('.del').length > 0) { 112 if ($cur.closest('.del').length > 0) {
111 113
112 //Order delete 114 //Order delete
113 - $.ajax({  
114 - type: 'GET',  
115 - url: '/home/delOrder',  
116 - data: {  
117 - id: id  
118 - },  
119 - success: function(data) {  
120 - if (data.code === 200) {  
121 -  
122 - //删除订单页面刷新  
123 - location.href = location.href;  
124 - } 115 + dialog.showDialog({
  116 + dialogText: '确定删除订单吗？',
  117 + hasFooter: {
  118 + leftBtnText: '取消',
  119 + rightBtnText: '确定'
125 } 120 }
  121 + }, function() {
  122 + $.ajax({
  123 + type: 'GET',
  124 + url: '/home/delOrder',
  125 + data: {
  126 + id: id
  127 + },
  128 + success: function(data) {
  129 + if (data.code === 200) {
  130 +
  131 + //删除订单页面刷新
  132 + location.href = location.href;
  133 + }
  134 + }
  135 + });
126 }); 136 });
127 } else if ($cur.closest('.cancel').length > 0) { 137 } else if ($cur.closest('.cancel').length > 0) {
128 138
129 //Order cancel 139 //Order cancel
130 - $.ajax({  
131 - type: 'GET',  
132 - url: '/home/cancelOrder',  
133 - data: {  
134 - id: id  
135 - },  
136 - success: function(data) {  
137 - if (data.code === 200) {  
138 -  
139 - //取消订单页面刷新  
140 - location.href = location.href;  
141 - } 140 + dialog.showDialog({
  141 + dialogText: '确定取消订单吗？',
  142 + hasFooter: {
  143 + leftBtnText: '取消',
  144 + rightBtnText: '确定'
142 } 145 }
  146 + }, function() {
  147 + $.ajax({
  148 + type: 'GET',
  149 + url: '/home/cancelOrder',
  150 + data: {
  151 + id: id
  152 + },
  153 + success: function(data) {
  154 + if (data.code === 200) {
  155 +
  156 + //取消订单页面刷新
  157 + location.href = location.href;
  158 + }
  159 + }
  160 + });
143 }); 161 });
144 } else { 162 } else {
145 163
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
7 7
8 var $ = require('jquery'), 8 var $ = require('jquery'),
9 Hammer = require('yoho.hammer'), 9 Hammer = require('yoho.hammer'),
  10 + lazyLoad = require('yoho.lazyload'),
10 Handlebars = require('yoho.handlebars'); 11 Handlebars = require('yoho.handlebars');
11 12
12 var diaLog = require('./dialog'); 13 var diaLog = require('./dialog');
@@ -53,6 +54,8 @@ $('#upload-img').uploadifive({ @@ -53,6 +54,8 @@ $('#upload-img').uploadifive({
53 } 54 }
54 }); 55 });
55 56
  57 +lazyLoad();
  58 +
56 headerNavHammer = new Hammer(document.getElementById('yoho-header')); 59 headerNavHammer = new Hammer(document.getElementById('yoho-header'));
57 60
58 headerNavHammer.on('tap', function(e) { 61 headerNavHammer.on('tap', function(e) {
@@ -7,18 +7,24 @@ var $ = require('jquery'), @@ -7,18 +7,24 @@ var $ = require('jquery'),
7 Hammer = require('yoho.hammer'), 7 Hammer = require('yoho.hammer'),
8 tip = require('../../plugin/tip'); 8 tip = require('../../plugin/tip');
9 9
10 -var likeHammer = new Hammer(document.getElementById('likeBtn')); 10 +var likeHammer = new Hammer(document.getElementById('likeBtn')),
  11 + addToCartHammer = new Hammer(document.getElementById('addtoCart'));
  12 +
  13 +var productId = $('#productId').val();
11 14
12 likeHammer.on('tap', function(e) { 15 likeHammer.on('tap', function(e) {
13 - var productId = $('#productId').val(),  
14 - opt; 16 + var opt,
  17 + favorite;
  18 +
15 19
16 var $this = $(this); 20 var $this = $(this);
17 21
18 if ($this.hasClass('liked')) { 22 if ($this.hasClass('liked')) {
19 opt = 'cancel'; 23 opt = 'cancel';
  24 + favorite = 0;
20 } else { 25 } else {
21 opt = 'ok'; 26 opt = 'ok';
  27 + favorite = 1;
22 } 28 }
23 29
24 $.ajax({ 30 $.ajax({
@@ -36,6 +42,14 @@ likeHammer.on('tap', function(e) { @@ -36,6 +42,14 @@ likeHammer.on('tap', function(e) {
36 } else { 42 } else {
37 tip.show(data.message); 43 tip.show(data.message);
38 } 44 }
  45 +
  46 + // 统计代码：用于统计用户加入或取消商品收藏的动作
  47 + if (window._yas) {
  48 + window._yas.sendCustomInfo({
  49 + pd: productId,
  50 + fa: favorite
  51 + });
  52 + }
39 }, 53 },
40 error: function() { 54 error: function() {
41 tip.show('网络断开连接了~'); 55 tip.show('网络断开连接了~');
@@ -44,6 +58,15 @@ likeHammer.on('tap', function(e) { @@ -44,6 +58,15 @@ likeHammer.on('tap', function(e) {
44 58
45 }); 59 });
46 60
47 -// $('#likeBtn').on('click', function(e) {  
48 -// return false;  
49 -// });  
  61 +addToCartHammer.on('tap', function(e) {
  62 +
  63 + // 统计代码：用于统计用户加入购物车的动作
  64 + if (window._yas) {
  65 + window._yas.sendCustomInfo({
  66 + pd: productId,
  67 + by: 1
  68 + });
  69 + }
  70 +});
  71 +
  72 +
@@ -442,3 +442,8 @@ $listNav.on('touchstart', 'li', function() { @@ -442,3 +442,8 @@ $listNav.on('touchstart', 'li', function() {
442 }).on('touchend touchcancel', 'li', function() { 442 }).on('touchend touchcancel', 'li', function() {
443 $listNav.find('li').removeClass('bytouch'); 443 $listNav.find('li').removeClass('bytouch');
444 }); 444 });
  445 +
  446 +// 用于统计点击了商品列表的第几个商品，序号从1开始计算。
  447 +if (window._yas) {
  448 + window._yas(1 * new Date(), '1.0.13.1', 'yohobuy_m', window._ozuid, '#goods-container >div >div .good-thumb >img');
  449 +}
1 .my-address-page { 1 .my-address-page {
2 width: 100%; 2 width: 100%;
3 background: #f0f0f0; 3 background: #f0f0f0;
4 - padding-bottom: pxToRem(20px); 4 +
  5 + .page-wrap:first-child {
  6 + padding-bottom: pxToRem(10px);
  7 + }
5 8
6 .address-item { 9 .address-item {
7 padding: pxToRem(20px) pxToRem(30px); 10 padding: pxToRem(20px) pxToRem(30px);
@@ -169,6 +172,10 @@ @@ -169,6 +172,10 @@
169 text-align: center; 172 text-align: center;
170 font-size: pxToRem(32px); 173 font-size: pxToRem(32px);
171 line-height: pxToRem(88px); 174 line-height: pxToRem(88px);
  175 +
  176 + &.highlight {
  177 + background: rgba(0, 0, 0, 0.6);
  178 + }
172 } 179 }
173 } 180 }
174 181
@@ -31,6 +31,7 @@ @@ -31,6 +31,7 @@
31 margin: 0 rem(32); 31 margin: 0 rem(32);
32 border-left: 1px solid #b0b0b0; 32 border-left: 1px solid #b0b0b0;
33 } 33 }
  34 +
34 } 35 }
35 36
36 .question-list { 37 .question-list {
@@ -43,15 +44,15 @@ @@ -43,15 +44,15 @@
43 } 44 }
44 45
45 li { 46 li {
46 - margin-left: rem(30);  
47 - width: rem(610);  
48 font-size: rem(28); 47 font-size: rem(28);
49 line-height: rem(90); 48 line-height: rem(90);
50 - border-bottom: 1px solid #ccc;  
51 49
52 a { 50 a {
53 display: block; 51 display: block;
54 color: #444; 52 color: #444;
  53 + width: rem(610);
  54 + margin-left: rem(30);
  55 + border-bottom: 1px solid #ccc;
55 } 56 }
56 57
57 .iconfont { 58 .iconfont {
@@ -64,6 +65,10 @@ @@ -64,6 +65,10 @@
64 &:last-child { 65 &:last-child {
65 border-bottom: none; 66 border-bottom: none;
66 } 67 }
  68 +
  69 + &.highlight {
  70 + background: #eee;
  71 + }
67 } 72 }
68 } 73 }
69 74
@@ -112,6 +117,9 @@ @@ -112,6 +117,9 @@
112 content: none; 117 content: none;
113 } 118 }
114 } 119 }
  120 + &.highlight {
  121 + background: #eee;
  122 + }
115 } 123 }
116 .icon { 124 .icon {
117 display: inline-block; 125 display: inline-block;
@@ -132,6 +140,7 @@ @@ -132,6 +140,7 @@
132 border-bottom: 1px solid #c8c7cc; 140 border-bottom: 1px solid #c8c7cc;
133 color: #444; 141 color: #444;
134 background: #fff; 142 background: #fff;
  143 +
135 &:last-child { 144 &:last-child {
136 margin-bottom: 0; 145 margin-bottom: 0;
137 } 146 }
@@ -146,6 +155,7 @@ @@ -146,6 +155,7 @@
146 .question { 155 .question {
147 @extend %qa; 156 @extend %qa;
148 position: relative; 157 position: relative;
  158 + color: #000;
149 &:after { 159 &:after {
150 content: ''; 160 content: '';
151 position: absolute; 161 position: absolute;
@@ -123,8 +123,8 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px); @@ -123,8 +123,8 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px);
123 123
124 //发表意见 124 //发表意见
125 .create-new-suggest { 125 .create-new-suggest {
126 - display: inline-block;  
127 - color: #444; 126 + display: block;
  127 +
128 width: 100%; 128 width: 100%;
129 height: pxToRem(88px); 129 height: pxToRem(88px);
130 line-height: pxToRem(88px); 130 line-height: pxToRem(88px);
@@ -132,7 +132,11 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px); @@ -132,7 +132,11 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px);
132 font-size: pxToRem(30px); 132 font-size: pxToRem(30px);
133 border-top: 1px solid #e0e0e0; 133 border-top: 1px solid #e0e0e0;
134 border-bottom: 1px solid #e0e0e0; 134 border-bottom: 1px solid #e0e0e0;
135 - margin-top: -1px; 135 +
  136 + a {
  137 + color: #444;
  138 + display: block;
  139 + }
136 140
137 > span { 141 > span {
138 color: #b0b0b0; 142 color: #b0b0b0;
@@ -100,8 +100,8 @@ $basicBtnC:#eb0313; @@ -100,8 +100,8 @@ $basicBtnC:#eb0313;
100 margin-left: .5px; 100 margin-left: .5px;
101 font-size: pxToRem(23px); 101 font-size: pxToRem(23px);
102 text-align: center; 102 text-align: center;
103 - line-height: pxToRem(35px);  
104 - padding: 0 8px; 103 + line-height: pxToRem(33px);
  104 + padding: 0 5px;
105 } 105 }
106 .new-tag { 106 .new-tag {
107 background-color: #78dc7e; 107 background-color: #78dc7e;
@@ -121,6 +121,7 @@ $basicBtnC:#eb0313; @@ -121,6 +121,7 @@ $basicBtnC:#eb0313;
121 } 121 }
122 .limit-tag { 122 .limit-tag {
123 border: 1px solid #000; 123 border: 1px solid #000;
  124 + background-color: #fff;
124 color: #000; 125 color: #000;
125 } 126 }
126 .soonSoldOut-tag { 127 .soonSoldOut-tag {
@@ -219,6 +220,7 @@ $basicBtnC:#eb0313; @@ -219,6 +220,7 @@ $basicBtnC:#eb0313;
219 .periodOfMarket { 220 .periodOfMarket {
220 font-size: pxToRem(24px); 221 font-size: pxToRem(24px);
221 float: right; 222 float: right;
  223 + color: #d0021b;
222 h1 { 224 h1 {
223 display: inline-block; 225 display: inline-block;
224 line-height: pxToRem(88px); 226 line-height: pxToRem(88px);
@@ -390,9 +392,11 @@ $basicBtnC:#eb0313; @@ -390,9 +392,11 @@ $basicBtnC:#eb0313;
390 } 392 }
391 } 393 }
392 .recommend-for-you { 394 .recommend-for-you {
393 - margin-bottom: pxToRem(120px); 395 + margin-bottom: pxToRem(30px);
394 } 396 }
395 } 397 }
396 - 398 +.bottom-blank{
  399 + height: pxToRem(120px);
  400 +}
397 @import "comments-consults"; 401 @import "comments-consults";
398 @import "product-description"; 402 @import "product-description";
@@ -9,7 +9,9 @@ @@ -9,7 +9,9 @@
9 <div class="suggest-content" id="suggest-content"> 9 <div class="suggest-content" id="suggest-content">
10 {{# suggestContent}} 10 {{# suggestContent}}
11 <div class="suggest-item" data-id="{{suggest_id}}"> 11 <div class="suggest-item" data-id="{{suggest_id}}">
12 - <img src="{{imgUrl}}" alt=""/> 12 + {{# imgUrl}}
  13 + <img class="lazy" data-original="{{.}}" alt=""/>
  14 + {{/ imgUrl}}
13 <h2>{{title}}</h2> 15 <h2>{{title}}</h2>
14 <p>{{content}}</p> 16 <p>{{content}}</p>
15 17
@@ -42,9 +44,11 @@ @@ -42,9 +44,11 @@
42 44
43 {{/ suggestContent}} 45 {{/ suggestContent}}
44 </div> 46 </div>
45 - <a class="create-new-suggest" href="./suggestSub">  
46 - 反馈问题<span>（功能意见，界面意见）</span>  
47 - </a> 47 + <div class="create-new-suggest">
  48 + <a href="./suggestSub">
  49 + 反馈问题<span>（功能意见，界面意见）</span>
  50 + </a>
  51 + </div>
48 {{/ suggest}} 52 {{/ suggest}}
49 </div> 53 </div>
50 {{> layout/footer}} 54 {{> layout/footer}}
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div class="good-detail-page yoho-page"> 2 <div class="good-detail-page yoho-page">
3 <div class="banner-container"> 3 <div class="banner-container">
4 <div class="tag-container"> 4 <div class="tag-container">
5 - <!-- <p class="good-tag soonSoldOut-tag">即将售罄</p> --> 5 + <!-- <p class="good-tag new-tag">NEW</p> -->
6 {{# tags}} 6 {{# tags}}
7 {{# is_new}} 7 {{# is_new}}
8 <p class="good-tag new-tag">NEW</p> 8 <p class="good-tag new-tag">NEW</p>
@@ -44,12 +44,12 @@ @@ -44,12 +44,12 @@
44 </div> 44 </div>
45 {{/ goodsPrice}} 45 {{/ goodsPrice}}
46 46
47 - {{# periodOfMarket}} 47 + {{#if periodOfMarket}}
48 <div class="periodOfMarket"> 48 <div class="periodOfMarket">
49 <h1>上市期：</h1> 49 <h1>上市期：</h1>
50 - <h1 >{{.}}</h1> 50 + <h1 >{{peridOfMarket}}</h1>
51 </div> 51 </div>
52 - {{/ periodOfMarket}} 52 + {{/if}}
53 </div> 53 </div>
54 54
55 {{# vipLevel}} 55 {{# vipLevel}}
@@ -124,7 +124,7 @@ @@ -124,7 +124,7 @@
124 {{/if}} 124 {{/if}}
125 <a href="/shoppingCart" class="num-incart iconfont">&#xe62c;</a> 125 <a href="/shoppingCart" class="num-incart iconfont">&#xe62c;</a>
126 {{#if goodsInstore}} 126 {{#if goodsInstore}}
127 - <a href="/shoppingCart" class="addto-cart ">加入购物车</a> 127 + <a href="/shoppingCart" id="addtoCart" class="addto-cart">加入购物车</a>
128 {{else}} 128 {{else}}
129 <a href="javascript:;" class="sold-out">已售罄</a> 129 <a href="javascript:;" class="sold-out">已售罄</a>
130 {{/if}} 130 {{/if}}
@@ -132,14 +132,13 @@ @@ -132,14 +132,13 @@
132 <a href="javascript:;" id="likeBtn" class="favorite iconfont {{#isCollect}}liked{{/isCollect}}">&#xe605;</a> 132 <a href="javascript:;" id="likeBtn" class="favorite iconfont {{#isCollect}}liked{{/isCollect}}">&#xe605;</a>
133 </div> 133 </div>
134 {{/cartInfo}} 134 {{/cartInfo}}
135 -  
136 {{#if introUrl}} 135 {{#if introUrl}}
137 <input id="introUrl" type="hidden" value={{introUrl}}> 136 <input id="introUrl" type="hidden" value={{introUrl}}>
138 {{/if}} 137 {{/if}}
139 -  
140 {{#if id}} 138 {{#if id}}
141 <input id="productId" type="hidden" value={{id}}> 139 <input id="productId" type="hidden" value={{id}}>
142 {{/if}} 140 {{/if}}
143 141
144 </div> 142 </div>
145 -{{> layout/footer}}  
  143 +{{> layout/footer}}
  144 +<div class="bottom-blank"></div>