Authored by Rock Zhang

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

@@ -1064,14 +1064,13 @@ @@ -1064,14 +1064,13 @@
1064 'bannerTop': { 1064 'bannerTop': {
1065 'list': [ 1065 'list': [
1066 { 1066 {
1067 - 'url' : '',  
1068 - 'img' : 'http://img13.static.yhbimg.com/goodsimg/2015/10/18/03/0250c3935f86dbd2baa7d45603d19fd637.jpg?imageMogr2/thumbnail/450x600/extent/450x600/background/d2hpdGU=/position/center/quality/90' 1067 + 'img' : ''
1069 }, 1068 },
1070 ... 1069 ...
1071 ] 1070 ]
1072 }, 1071 },
1073 'goodsName' : 'Stussy No. 4 BOX TEE ', 1072 'goodsName' : 'Stussy No. 4 BOX TEE ',
1074 - 'goodsSubtitle' : '【全民拼抢购】经典印花T恤,满4件免一件!', 1073 + 'goodsSubtitle' : '【全民拼抢购】经典印花T恤,满4件免一件!',
1075 1074
1076 'goodsPrice' : { 1075 'goodsPrice' : {
1077 'currentPrice' : '¥298.00', 1076 'currentPrice' : '¥298.00',
@@ -1082,20 +1081,20 @@ @@ -1082,20 +1081,20 @@
1082 'vipLevel' : { 1081 'vipLevel' : {
1083 'list' : [ 1082 'list' : [
1084 { 1083 {
1085 - 'img':'http://static.dev.yohobuy.com/img/product/silver.png',  
1086 'text' : '¥284.00' 1084 'text' : '¥284.00'
1087 }, 1085 },
1088 ... 1086 ...
1089 ] 1087 ]
1090 }, 1088 },
1091 'goodsDiscount' : { 1089 'goodsDiscount' : {
  1090 + 'listLength' : 2,
1092 'list' : [ 1091 'list' : [
1093 { 1092 {
1094 - 'text' : '【BACK TO SCHOOL】满¥499赠送Paul  
1095 - Franke帽子一个,多买多送!' 1093 + 'text' : '【BACK TO SCHOOL】满¥499赠送Paul Franke帽子一个,多买多送!'
1096 }, 1094 },
1097 ... 1095 ...
1098 - ], 1096 + ]
  1097 + },
1099 'feedbacks' : { 1098 'feedbacks' : {
1100 'commentsNum' : 0, 1099 'commentsNum' : 0,
1101 'consultsNum' : 1, 1100 'consultsNum' : 1,
@@ -1104,8 +1103,7 @@ @@ -1104,8 +1103,7 @@
1104 { 1103 {
1105 'userName' : 'Lynnic', 1104 'userName' : 'Lynnic',
1106 'desc' : '购买了白色Mate7', 1105 'desc' : '购买了白色Mate7',
1107 - 'content' : '活动时买的,挺超值。上身效果也不错。质量  
1108 -很好,买送人的,很满意。而且物流相当给...', 1106 + 'content' : '活动时买的',
1109 'time' : '2014-08-12 10:24:26' 1107 'time' : '2014-08-12 10:24:26'
1110 }, 1108 },
1111 ... 1109 ...
@@ -1113,15 +1111,15 @@ @@ -1113,15 +1111,15 @@
1113 'consults' : [ 1111 'consults' : [
1114 { 1112 {
1115 'question' : '您好 我一米七七 140斤 穿M的行吗', 1113 'question' : '您好 我一米七七 140斤 穿M的行吗',
1116 - 'time' : '2014-08-12 10:24:26',  
1117 - 'answer' : '您好,建议您参考XL的款式,由于版型和个人穿衣风格不同,需要' 1114 + 'time' : '2014-08-12 10:24:26',
  1115 + 'answer' : ''
1118 }, 1116 },
1119 ... 1117 ...
1120 ] 1118 ]
1121 }, 1119 },
1122 1120
1123 'enterStore' : { 1121 'enterStore' : {
1124 - 'img' : 'http://static.dev.yohobuy.com/img/product/store.png', 1122 + 'img' : '',
1125 'storeName' : 'Stussy', 1123 'storeName' : 'Stussy',
1126 'url' : 'http://stussy.m.yohobuy.com/' 1124 'url' : 'http://stussy.m.yohobuy.com/'
1127 }, 1125 },
@@ -1129,29 +1127,28 @@ @@ -1129,29 +1127,28 @@
1129 'goodsDescription' : { 1127 'goodsDescription' : {
1130 'title' : '商品描述', 1128 'title' : '商品描述',
1131 'enTitle' : 'DESCRIPTON', 1129 'enTitle' : 'DESCRIPTON',
1132 -  
1133 - 'detail' : {  
1134 - 'nubmer' : '51018059',  
1135 - 'color' : '黑',  
1136 - 'type' : '帽子',  
1137 - 'gender' : '女款',  
1138 - 'hatType' : '棒球帽',  
1139 - 'bongrace' : '平檐款式',  
1140 - 'goodsDetail' : '字母图案',  
1141 - 'style' : '街头'  
1142 - } 1130 + 'detail' : [
  1131 + {
  1132 + 'param' : '编号: 51018059'
  1133 + },
  1134 + ...
  1135 + ],
  1136 + 'desc': 'balabala'
1143 }, 1137 },
1144 1138
1145 'sizeInfo' : { 1139 'sizeInfo' : {
1146 'title' : '尺码信息', 1140 'title' : '尺码信息',
1147 - 'enTitle' : 'xSIZE INFO', 1141 + 'enTitle' : '',
1148 1142
1149 'detail' : { 1143 'detail' : {
1150 'list' : [ 1144 'list' : [
1151 - {  
1152 - 'name' : '尺寸',  
1153 - 'sizem' : 'm',  
1154 - 'sizexl' : 'XL' 1145 + {
  1146 + 'params' : [
  1147 + {
  1148 + 'param' : '尺寸'
  1149 + },
  1150 + ...
  1151 + ]
1155 }, 1152 },
1156 ... 1153 ...
1157 ] 1154 ]
@@ -1159,36 +1156,22 @@ @@ -1159,36 +1156,22 @@
1159 }, 1156 },
1160 1157
1161 'measurementMethod' : { 1158 'measurementMethod' : {
1162 - 'title' : '测量方式',  
1163 - 'enTitle' : 'MEASUREMENT METHOD',  
1164 -  
1165 - 'detail' : {  
1166 - 'sort' : '上衣' ,  
1167 - 'enSort' : 'TOPS',  
1168 - 'img' : 'http://static.dev.yohobuy.com/img/product/tops.png',  
1169 - 'items' : [  
1170 - 'item' : '肩宽(两端肩线间的直线长度)',  
1171 - ...  
1172 - ]  
1173 - }  
1174 - }, 1159 + 'title': '测量方式',
  1160 + 'enTitle': 'MEASUREMENT METHOD',
  1161 + 'img' : '',
  1162 + },
1175 1163
1176 'reference' : { 1164 'reference' : {
1177 'title' : '模特试穿', 1165 'title' : '模特试穿',
1178 - 'enTitle' : 'REFERENCE', 1166 + 'enTitle' : '',
1179 1167
1180 'detail' : { 1168 'detail' : {
1181 'list' : [ 1169 'list' : [
1182 - array{ 1170 + {
1183 'fieldName' : '头像', 1171 'fieldName' : '头像',
1184 - 'firstModel' : 'http://static.dev.yohobuy.com/img/product/avatar1.png',  
1185 - 'secondModel' =>'http://static.dev.yohobuy.com/img/product/avatar2.png' 1172 + 'firstModel' : '', //头像图片url
  1173 + 'secondModel' =>''
1186 }, 1174 },
1187 - {  
1188 - 'fieldName' : '模特',  
1189 - 'firstModel' : 'Oliver',  
1190 - 'secondModel' : 'Jvly'  
1191 - },  
1192 ... 1175 ...
1193 ] 1176 ]
1194 } 1177 }
@@ -1196,17 +1179,17 @@ @@ -1196,17 +1179,17 @@
1196 1179
1197 'materials' : { 1180 'materials' : {
1198 'title' : '商品材质', 1181 'title' : '商品材质',
1199 - 'enTitle' : 'MATERIALS',  
1200 - 'img' : 'http://static.dev.yohobuy.com/img/product/material.png',  
1201 - 'desc' : '用各种洗涤剂,可手洗机洗,但不宜氯漂,宜阴干,避免曝晒,以免深色衣物褪色,在日光下晾晒时,将里面朝外。浸泡时间不能太长,避免褪色,深色与浅色衣服最好请分开洗涤,避免染色。',  
1202 - 'materialType' : 'http://static.dev.yohobuy.com/img/product/material-type.png' 1182 + 'enTitle' : '',
  1183 + 'img' : '',
  1184 + 'desc' : '用各种洗涤剂',
  1185 + 'materialType' : ''
1203 }, 1186 },
1204 1187
1205 'productDetail' : { 1188 'productDetail' : {
1206 'title' : '商品详情', 1189 'title' : '商品详情',
1207 - 'enTitle' : 'DETAILS',  
1208 - 'desc' : 'Married to the MOB是由Leah McSweeney创立的女装品牌,一向标榜不羁、大胆的女性streetwear设计。喜欢恶搞的女生们,赶紧入手吧。',  
1209 - 'img' : 'http://static.dev.yohobuy.com/img/product/product.png' 1190 + 'enTitle' : '',
  1191 + 'desc' : 'Married to the MOB是由Leah McSweeney创立的女装品牌,一向标榜不羁、大胆的女性streetwear设计',
  1192 + 'img' : ''
1210 }, 1193 },
1211 1194
1212 'cartInfo' : { 1195 'cartInfo' : {
@@ -62,11 +62,12 @@ function initInfosEvt($container) { @@ -62,11 +62,12 @@ function initInfosEvt($container) {
62 $btn, 62 $btn,
63 $info; 63 $info;
64 64
65 - e.preventDefault(); 65 + //e.preventDefault();
66 66
67 //点赞 67 //点赞
68 $btn = $this.closest('.like-btn'); 68 $btn = $this.closest('.like-btn');
69 if ($btn.length > 0) { 69 if ($btn.length > 0) {
  70 + e.preventDefault();
70 if ($btn.hasClass('like')) { 71 if ($btn.hasClass('like')) {
71 opt = 'cancel'; 72 opt = 'cancel';
72 } 73 }
@@ -99,6 +100,7 @@ function initInfosEvt($container) { @@ -99,6 +100,7 @@ function initInfosEvt($container) {
99 //APP收藏 100 //APP收藏
100 $btn = $this.closest('.collect-btn'); 101 $btn = $this.closest('.collect-btn');
101 if ($btn.length > 0) { 102 if ($btn.length > 0) {
  103 + e.preventDefault();
102 if ($btn.hasClass('collected')) { 104 if ($btn.hasClass('collected')) {
103 opt = 'cancel'; 105 opt = 'cancel';
104 } 106 }
  1 +var $ = require('jquery');
  2 +var commentsNum;
  3 +
  4 +
  5 +(function() {
  6 + var consultsNum = $('#nav-tab .consults-num').html() - 0;
  7 +
  8 + commentsNum = $('#nav-tab .comments-num').html() - 0;
  9 +
  10 + $('#nav-tab li').each(function() {
  11 + $(this).removeClass('focus');
  12 + });
  13 +
  14 + $('#feedback-content .content').each(function() {
  15 + $(this).addClass('hide');
  16 + });
  17 + if (0 !== commentsNum) {
  18 + $('#nav-tab .comment-nav').addClass('focus');
  19 + $('#feedback-content .comment-content').removeClass('hide');
  20 +
  21 + } else if (0 !== consultsNum) {
  22 + $('#nav-tab .consult-nav').addClass('focus');
  23 + $('#feedback-content .consult-content').removeClass('hide');
  24 + }
  25 +
  26 +})();
  27 +
  28 +$('#nav-tab li').on('click', function() {
  29 + var index = $(this).index();
  30 +
  31 + if ($(this).hasClass('comment-nav') && 0 === commentsNum) {
  32 + alert('暂无商品评价');
  33 + } else {
  34 + if (!$(this).hasClass('focus')) {
  35 +
  36 + $('#nav-tab li').each(function() {
  37 + $(this).removeClass('focus');
  38 + });
  39 + $('#feedback-content .content').each(function() {
  40 + $(this).addClass('hide');
  41 + });
  42 +
  43 + $(this).addClass('focus');
  44 + $('#feedback-content .content:eq(' + index + ')').removeClass('hide');
  45 + }
  46 + }
  47 +});
@@ -11,10 +11,10 @@ @@ -11,10 +11,10 @@
11 var goodsSwiper, 11 var goodsSwiper,
12 sizeSwiper, 12 sizeSwiper,
13 refSwiper, 13 refSwiper,
14 - commentsNum,  
15 handleHelper; 14 handleHelper;
16 15
17 require('./desc'); 16 require('./desc');
  17 +require('./comments-consults');
18 18
19 lazyLoad($('img.lazy')); 19 lazyLoad($('img.lazy'));
20 20
@@ -28,50 +28,36 @@ goodsSwiper = new Swiper('.banner-swiper', { @@ -28,50 +28,36 @@ goodsSwiper = new Swiper('.banner-swiper', {
28 prevButton: '.my-swiper-button-prev' 28 prevButton: '.my-swiper-button-prev'
29 }); 29 });
30 30
31 -//初始化tab  
32 -(function() {  
33 - var consultsNum = $('#nav-tab .consults-num').html() - 0;  
34 -  
35 -  
36 - commentsNum = $('#nav-tab .comments-num').html() - 0;  
37 31
38 - $('#nav-tab li').each(function() {  
39 - $(this).removeClass('focus');  
40 - });  
41 -  
42 - $('#feedback-content .content').each(function() {  
43 - $(this).addClass('hide');  
44 - });  
45 - if (0 !== commentsNum) {  
46 - $('#nav-tab .comment-nav').addClass('focus');  
47 - $('#feedback-content .comment-content').removeClass('hide'); 32 +(function() {
48 33
49 - } else if (0 !== consultsNum) {  
50 - $('#nav-tab .consult-nav').addClass('focus');  
51 - $('#feedback-content .consult-content').removeClass('hide'); 34 + //初始化goods-discount
  35 + if (0 === $('.goods-discount .discount-folder').children().length) {
  36 + $('.goods-discount .discount-folder').css('display', 'none');
  37 + $('.goods-discount .first-item span').html('');
52 } 38 }
53 })(); 39 })();
54 40
55 -$('#nav-tab li').on('click', function() {  
56 - var index = $(this).index(); 41 +// $('#nav-tab li').on('click', function() {
  42 +// var index = $(this).index();
57 43
58 - if ($(this).hasClass('comment-nav') && 0 === commentsNum) {  
59 - alert('暂无商品评价');  
60 - } else {  
61 - if (!$(this).hasClass('focus')) {  
62 -  
63 - $('#nav-tab li').each(function() {  
64 - $(this).removeClass('focus');  
65 - });  
66 - $('#feedback-content .content').each(function() {  
67 - $(this).addClass('hide');  
68 - });  
69 -  
70 - $(this).addClass('focus');  
71 - $('#feedback-content .content:eq(' + index + ')').removeClass('hide');  
72 - }  
73 - }  
74 -}); 44 +// if ($(this).hasClass('comment-nav') && 0 === commentsNum) {
  45 +// alert('暂无商品评价');
  46 +// } else {
  47 +// if (!$(this).hasClass('focus')) {
  48 +
  49 +// $('#nav-tab li').each(function() {
  50 +// $(this).removeClass('focus');
  51 +// });
  52 +// $('#feedback-content .content').each(function() {
  53 +// $(this).addClass('hide');
  54 +// });
  55 +
  56 +// $(this).addClass('focus');
  57 +// $('#feedback-content .content:eq(' + index + ')').removeClass('hide');
  58 +// }
  59 +// }
  60 +// });
75 61
76 $('.goodsDiscount .dropdown').on('click', function() { 62 $('.goodsDiscount .dropdown').on('click', function() {
77 if ($('.goodsDiscount .discount-folder').is(':hidden')) { 63 if ($('.goodsDiscount .discount-folder').is(':hidden')) {
@@ -151,6 +151,7 @@ a { @@ -151,6 +151,7 @@ a {
151 @import "category/index"; 151 @import "category/index";
152 @import "product/index"; 152 @import "product/index";
153 @import "product/comments-consults"; 153 @import "product/comments-consults";
  154 +@import "product/product-description";
154 @import "index/index"; 155 @import "index/index";
155 @import "shopping-cart/index"; 156 @import "shopping-cart/index";
156 @import "me/index"; //个人中心 157 @import "me/index"; //个人中心
1 -.goods-comments-page{  
2 - .goods-comments{  
3 - .comment-item{  
4 - border: 1px solid $borderC;  
5 - padding: 0 pxToRem(28px);  
6 - .user-name{  
7 - font-size: pxToRem(24px);  
8 - line-height: pxToRem(62px);  
9 - color:$mainFontC;  
10 - }  
11 - .goods-spec,  
12 - .comment-time{  
13 - font-size: pxToRem(24px);  
14 - line-height: pxToRem(62px);  
15 - }  
16 - .detail-content{  
17 - font-size: pxToRem(24px);  
18 - line-height: pxToRem(62px);  
19 - color:$mainFontC;  
20 - }  
21 - .goods-spec,  
22 - .comment-time{  
23 - font-size: pxToRem(24px);  
24 - line-height: pxToRem(62px);  
25 - }  
26 - .detail-content{  
27 - font-size: pxToRem(28px);  
28 - line-height: pxToRem(36px);  
29 - }  
30 - .goods-spec,  
31 - .detail-content{  
32 - color:$mainFontC;  
33 - }  
34 - .comment-time{  
35 - color:#c1c1c1;  
36 - }  
37 - }  
38 - } 1 +.goods-comments-page {
  2 + .goods-comments {
  3 + .comment-item {
  4 + border: 1px solid $borderC;
  5 + padding: 0 pxToRem(28px);
  6 + .user-name {
  7 + font-size: pxToRem(24px);
  8 + line-height: pxToRem(62px);
  9 + color: $mainFontC;
  10 + }
  11 + .goods-spec,
  12 + .comment-time {
  13 + font-size: pxToRem(24px);
  14 + line-height: pxToRem(62px);
  15 + }
  16 + .detail-content {
  17 + font-size: pxToRem(24px);
  18 + line-height: pxToRem(62px);
  19 + color: $mainFontC;
  20 + }
  21 + .goods-spec,
  22 + .comment-time {
  23 + font-size: pxToRem(24px);
  24 + line-height: pxToRem(62px);
  25 + }
  26 + .detail-content {
  27 + font-size: pxToRem(28px);
  28 + line-height: pxToRem(36px);
  29 + }
  30 + .goods-spec,
  31 + .detail-content {
  32 + color: $mainFontC;
  33 + }
  34 + .comment-time {
  35 + color: #c1c1c1;
  36 + }
  37 + }
  38 + }
39 } 39 }
40 40
41 -.goods-consults-page{  
42 - .goto-consult{  
43 - padding: 0 pxToRem(28px);  
44 - height: pxToRem(120px);  
45 - background-color: #ffffff;  
46 - i,span{  
47 - line-height: pxToRem(120px);  
48 - font-size: pxToRem(28px);  
49 - color:$mainFontC;  
50 - }  
51 - .consult-logo{  
52 - padding-right: pxToRem(15px);  
53 - }  
54 - .enter-consult-page{  
55 - float: right;  
56 - color:$subFontC;  
57 - }  
58 - }  
59 - .goods-consults{  
60 - .consult-item{  
61 - padding: pxToRem(20px) pxToRem(28px);  
62 - background-color: #fff;  
63 - .question{  
64 - font-size: pxToRem(24px);  
65 - color:$mainFontC;  
66 - span{  
67 - display: block;  
68 - float: left;  
69 - font-size: inherit;  
70 - padding-right: pxToRem(15px);  
71 - }  
72 - p{  
73 - overflow: hidden;  
74 - padding-bottom: pxToRem(15px);  
75 - border-bottom: 1px solid $borderC;  
76 - }  
77 - }  
78 - .time{  
79 - font-size: pxToRem(22px);  
80 - color:$subFontC;  
81 - }  
82 - .answer{  
83 - font-size: pxToRem(24px);  
84 - line-height: pxToRem(36px);  
85 - color:$subFontC;  
86 - margin-top: pxToRem(14px);  
87 - span{  
88 - display: block;  
89 - float: left;  
90 - font-size: inherit;  
91 - color:$mainFontC;  
92 - padding-right: pxToRem(15px);  
93 - }  
94 - p{  
95 - overflow: hidden;  
96 - }  
97 - }  
98 - }  
99 - } 41 +.goods-consults-page {
  42 + .goto-consult {
  43 + padding: 0 pxToRem(28px);
  44 + height: pxToRem(120px);
  45 + background-color: #ffffff;
  46 + i,
  47 + span {
  48 + line-height: pxToRem(120px);
  49 + font-size: pxToRem(28px);
  50 + color: $mainFontC;
  51 + }
  52 + .consult-logo {
  53 + padding-right: pxToRem(15px);
  54 + }
  55 + .enter-consult-page {
  56 + float: right;
  57 + color: $subFontC;
  58 + }
  59 + }
  60 + .goods-consults {
  61 + .consult-item {
  62 + padding: pxToRem(20px) pxToRem(28px);
  63 + background-color: #fff;
  64 + .question {
  65 + font-size: pxToRem(24px);
  66 + color: $mainFontC;
  67 + span {
  68 + display: block;
  69 + float: left;
  70 + font-size: inherit;
  71 + padding-right: pxToRem(15px);
  72 + }
  73 + p {
  74 + overflow: hidden;
  75 + padding-bottom: pxToRem(15px);
  76 + border-bottom: 1px solid $borderC;
  77 + }
  78 + }
  79 + .time {
  80 + font-size: pxToRem(22px);
  81 + color: $subFontC;
  82 + }
  83 + .answer {
  84 + font-size: pxToRem(24px);
  85 + line-height: pxToRem(36px);
  86 + color: $subFontC;
  87 + margin-top: pxToRem(14px);
  88 + span {
  89 + display: block;
  90 + float: left;
  91 + font-size: inherit;
  92 + color: $mainFontC;
  93 + padding-right: pxToRem(15px);
  94 + }
  95 + p {
  96 + overflow: hidden;
  97 + }
  98 + }
  99 + }
  100 + }
  101 + .gap-block {
  102 + min-height: 30rem/$pxConvertRem;
  103 + background-color: #f0f0f0;
  104 + }
  105 +}
100 106
101 - .gap-block{  
102 - min-height: 30rem/$pxConvertRem;  
103 - background-color: #f0f0f0;  
104 - } 107 +.consult-form-page {
  108 + padding: pxToRem(28px);
  109 + text-align: center;
  110 + textarea {
  111 + box-sizing: border-box;
  112 + width: 100%;
  113 + height: pxToRem(400px);
  114 + font-size: pxToRem(28px);
  115 + padding: pxToRem(10px);
  116 + color: $mainFontC;
  117 + }
  118 + a {
  119 + display: inline-block;
  120 + height: pxToRem(80px);
  121 + width: pxToRem(360px);
  122 + color: #fff;
  123 + background-color: #444;
  124 + font-size: pxToRem(40px);
  125 + line-height: pxToRem(80px);
  126 + text-align: center;
  127 + margin-top: pxToRem(20px);
  128 + }
105 } 129 }
106 130
107 -.consult-form-page{  
108 - padding: pxToRem(28px);  
109 - text-align: center;  
110 - textarea{  
111 - box-sizing:border-box;  
112 - width: 100%;  
113 - height: pxToRem(400px);  
114 - font-size: pxToRem(28px);  
115 - padding:pxToRem(10px);  
116 - color:$mainFontC;  
117 - }  
118 - a{  
119 - display: inline-block;  
120 - height: pxToRem(80px);  
121 - width: pxToRem(360px);  
122 - color: #fff;  
123 - background-color: #444;  
124 - font-size: pxToRem(40px);  
125 - line-height: pxToRem(80px);  
126 - text-align: center;  
127 - margin-top: pxToRem(20px);  
128 - }  
129 -}  
  131 +.good-detail-page {
  132 + .feedback-list {
  133 + padding-top: pxToRem(30px);
  134 + background-color: #f0f0f0;
  135 + .nav-tab {
  136 + width: 100%;
  137 + }
  138 + .nav-tab {
  139 + height: pxToRem(60px);
  140 + padding: pxToRem(10px) 0;
  141 + background-color: #fff;
  142 + border-top: 1px solid $borderC;
  143 + border-bottom: 1px solid $borderC;
  144 + }
  145 + .comment-nav,
  146 + .consult-nav {
  147 + box-sizing: border-box;
  148 + float: left;
  149 + width: 50%;
  150 + height: pxToRem(60px);
  151 + line-height: pxToRem(60px);
  152 + font-size: pxToRem(28px);
  153 + text-align: center;
  154 + color: #ccc;
  155 + &.focus {
  156 + color: #000;
  157 + }
  158 + }
  159 + .comment-nav {
  160 + border-right: 1px solid #ccc;
  161 + }
  162 + .content {
  163 + .content-main {
  164 + background-color: #fff;
  165 + border-bottom: 1px solid $borderC;
  166 + &.comment-content-main {
  167 + .user-name {
  168 + font-size: pxToRem(24px);
  169 + line-height: pxToRem(62px);
  170 + color: $mainFontC;
  171 + padding-left: pxToRem(28px);
  172 + padding-right: pxToRem(18px);
  173 + }
  174 + .goods-spec,
  175 + .comment-time {
  176 + font-size: pxToRem(24px);
  177 + line-height: pxToRem(62px);
  178 + }
  179 + .detail-content {
  180 + // font-size: pxToRem(28px);
  181 + // line-height: pxToRem(36px);
  182 + font-size: pxToRem(24px);
  183 + line-height: pxToRem(62px);
  184 + color: $mainFontC;
  185 + padding-left: pxToRem(28px);
  186 + padding-right: pxToRem(18px);
  187 + }
  188 + .goods-spec,
  189 + .comment-time {
  190 + font-size: pxToRem(24px);
  191 + line-height: pxToRem(62px);
  192 + }
  193 + .detail-content {
  194 + font-size: pxToRem(28px);
  195 + line-height: pxToRem(36px);
  196 + }
  197 + .goods-spec,
  198 + .detail-content {
  199 + color: $mainFontC;
  200 + }
  201 + .detail-content,
  202 + .comment-time {
  203 + padding-left: pxToRem(28px);
  204 + }
  205 + .detail-content {
  206 + padding-right: pxToRem(28px);
  207 + padding-left: pxToRem(28px);
  208 + }
  209 + .detail-content {
  210 + padding-right: pxToRem(28px);
  211 + }
  212 + .comment-time {
  213 + color: #c1c1c1;
  214 + }
  215 + }
  216 + &.consult-content-main {
  217 + padding-right: pxToRem(28px);
  218 + padding-left: pxToRem(28px);
  219 + padding-top: pxToRem(20px);
  220 + padding-bottom: pxToRem(20px);
  221 + .question {
  222 + font-size: pxToRem(24px);
  223 + color: $mainFontC;
  224 + span {
  225 + display: block;
  226 + float: left;
  227 + font-size: inherit;
  228 + padding-right: pxToRem(15px);
  229 + }
  230 + p {
  231 + overflow: hidden;
  232 + }
  233 + }
  234 + .time {
  235 + font-size: pxToRem(22px);
  236 + color: $subFontC;
  237 + }
  238 + .answer {
  239 + font-size: pxToRem(24px);
  240 + line-height: pxToRem(36px);
  241 + color: $subFontC;
  242 + margin-top: pxToRem(14px);
  243 + span {
  244 + display: block;
  245 + float: left;
  246 + font-size: inherit;
  247 + color: $mainFontC;
  248 + padding-right: pxToRem(15px);
  249 + }
  250 + p {
  251 + overflow: hidden;
  252 + }
  253 + }
  254 + }
  255 + }
  256 + }
  257 +
  258 + .comment-content-footer,
  259 + .consult-content-footer {
  260 + min-height: pxToRem(88px);
  261 + text-align: center;
  262 + background-color: #fff;
  263 + border-bottom: 1px solid $borderC;
  264 + line-height: pxToRem(88px);
  265 + font-size: pxToRem(28px);
  266 + a {
  267 + color: #e0e0e0;
  268 + .iconfont {
  269 + font-size: inherit;
  270 + }
  271 + }
  272 + }
  273 +
  274 + .content.hide {
  275 + display: none;
  276 + }
  277 +
  278 + .nodata {
  279 + height: pxToRem(88px);
  280 + font-size: pxToRem(28px);
  281 + line-height: pxToRem(88px);
  282 + background-color: #fff;
  283 + padding: 0 pxToRem(28px);
  284 + .go-consult {
  285 + float: right;
  286 + color: $subFontC;
  287 + span {
  288 + font-size: pxToRem(28px);
  289 + }
  290 + }
  291 + }
  292 +
  293 +
  294 + }
  295 +}
@@ -87,7 +87,7 @@ $basicBtnC:#eb0313; @@ -87,7 +87,7 @@ $basicBtnC:#eb0313;
87 font-size: pxToRem(20px); 87 font-size: pxToRem(20px);
88 line-height: pxToRem(35px); 88 line-height: pxToRem(35px);
89 background-color: #7cd881; 89 background-color: #7cd881;
90 - // z-index: 16; 90 + z-index: 2;
91 } 91 }
92 } 92 }
93 .banner-top { 93 .banner-top {
@@ -196,12 +196,21 @@ $basicBtnC:#eb0313; @@ -196,12 +196,21 @@ $basicBtnC:#eb0313;
196 display: table-cell; 196 display: table-cell;
197 vertical-align: middle; 197 vertical-align: middle;
198 } 198 }
199 - .vip-img { 199 + .vip-img{
200 padding-right: pxToRem(22px); 200 padding-right: pxToRem(22px);
201 - img { 201 + img{
202 width: pxToRem(52px); 202 width: pxToRem(52px);
203 height: pxToRem(32px); 203 height: pxToRem(32px);
204 } 204 }
  205 + &:nth-child(3n-3) {
  206 + background: image-url('product/silver.png') no-repeat;
  207 + }
  208 + &:nth-child(3n-2) {
  209 + background: image-url('product/golden.png') no-repeat;
  210 + }
  211 + &:nth-child(3n-1) {
  212 + background: image-url('product/platinum.png') no-repeat;
  213 + }
205 } 214 }
206 .vip-price { 215 .vip-price {
207 padding-right: pxToRem(55px); 216 padding-right: pxToRem(55px);
@@ -238,164 +247,7 @@ $basicBtnC:#eb0313; @@ -238,164 +247,7 @@ $basicBtnC:#eb0313;
238 .goodsDiscount { 247 .goodsDiscount {
239 text-indent: pxToRem(-14px); 248 text-indent: pxToRem(-14px);
240 } 249 }
241 - .feedback-list {  
242 - padding-top: pxToRem(30px);  
243 - background-color: #f0f0f0;  
244 - .nav-tab {  
245 - width: 100%;  
246 - }  
247 - .nav-tab {  
248 - height: pxToRem(60px);  
249 - padding: pxToRem(10px) 0;  
250 - background-color: #fff;  
251 - border-top: 1px solid $borderC;  
252 - border-bottom: 1px solid $borderC;  
253 - }  
254 - .comment-nav,  
255 - .consult-nav {  
256 - box-sizing: border-box;  
257 - float: left;  
258 - width: 50%;  
259 - height: pxToRem(60px);  
260 - line-height: pxToRem(60px);  
261 - font-size: pxToRem(28px);  
262 - text-align: center;  
263 - color: #ccc;  
264 - &.focus {  
265 - color: #000;  
266 - }  
267 - }  
268 - .comment-nav {  
269 - border-right: 1px solid #ccc;  
270 - }  
271 - .content {  
272 - .content-main {  
273 - background-color: #fff;  
274 - border-bottom: 1px solid $borderC;  
275 - &.comment-content-main {  
276 - .user-name {  
277 - font-size: pxToRem(24px);  
278 - line-height: pxToRem(62px);  
279 - color: $mainFontC;  
280 - padding-left: pxToRem(28px);  
281 - padding-right: pxToRem(18px);  
282 - }  
283 - .goods-spec,  
284 - .comment-time {  
285 - font-size: pxToRem(24px);  
286 - line-height: pxToRem(62px);  
287 - }  
288 - .detail-content {  
289 - // font-size: pxToRem(28px);  
290 - // line-height: pxToRem(36px);  
291 - font-size: pxToRem(24px);  
292 - line-height: pxToRem(62px);  
293 - color: $mainFontC;  
294 - padding-left: pxToRem(28px);  
295 - padding-right: pxToRem(18px);  
296 - }  
297 - .goods-spec,  
298 - .comment-time {  
299 - font-size: pxToRem(24px);  
300 - line-height: pxToRem(62px);  
301 - }  
302 - .detail-content {  
303 - font-size: pxToRem(28px);  
304 - line-height: pxToRem(36px);  
305 - }  
306 - .goods-spec,  
307 - .detail-content {  
308 - color: $mainFontC;  
309 - }  
310 - .detail-content,  
311 - .comment-time {  
312 - padding-left: pxToRem(28px);  
313 - }  
314 - .detail-content {  
315 - padding-right: pxToRem(28px);  
316 - padding-left: pxToRem(28px);  
317 - }  
318 - .detail-content {  
319 - padding-right: pxToRem(28px);  
320 - }  
321 - .comment-time {  
322 - color: #c1c1c1;  
323 - }  
324 - }  
325 - &.consult-content-main {  
326 - padding-right: pxToRem(28px);  
327 - padding-left: pxToRem(28px);  
328 - padding-top: pxToRem(20px);  
329 - padding-bottom: pxToRem(20px);  
330 - .question {  
331 - font-size: pxToRem(24px);  
332 - color: $mainFontC;  
333 - span {  
334 - display: block;  
335 - float: left;  
336 - font-size: inherit;  
337 - padding-right: pxToRem(15px);  
338 - }  
339 - p {  
340 - overflow: hidden;  
341 - }  
342 - }  
343 - .time {  
344 - font-size: pxToRem(22px);  
345 - color: $subFontC;  
346 - }  
347 - .answer {  
348 - font-size: pxToRem(24px);  
349 - line-height: pxToRem(36px);  
350 - color: $subFontC;  
351 - margin-top: pxToRem(14px);  
352 - span {  
353 - display: block;  
354 - float: left;  
355 - font-size: inherit;  
356 - color: $mainFontC;  
357 - padding-right: pxToRem(15px);  
358 - }  
359 - p {  
360 - overflow: hidden;  
361 - }  
362 - }  
363 - }  
364 - }  
365 - }  
366 - .comment-content-footer,  
367 - .consult-content-footer {  
368 - min-height: pxToRem(88px);  
369 - text-align: center;  
370 - background-color: #fff;  
371 - border-bottom: 1px solid $borderC;  
372 - line-height: pxToRem(88px);  
373 - font-size: pxToRem(28px);  
374 - a {  
375 - color: #e0e0e0;  
376 - .iconfont {  
377 - font-size: inherit;  
378 - }  
379 - }  
380 - }  
381 - .content.hide {  
382 - display: none;  
383 - }  
384 - }  
385 - .feedback-list .nodata {  
386 - height: pxToRem(88px);  
387 - font-size: pxToRem(28px);  
388 - line-height: pxToRem(88px);  
389 - background-color: #fff;  
390 - padding: 0 pxToRem(28px);  
391 - .go-consult {  
392 - float: right;  
393 - color: $subFontC;  
394 - span {  
395 - font-size: pxToRem(28px);  
396 - }  
397 - }  
398 - } 250 +
399 .enter-store { 251 .enter-store {
400 min-height: pxToRem(100px); 252 min-height: pxToRem(100px);
401 display: table; 253 display: table;
@@ -426,130 +278,8 @@ $basicBtnC:#eb0313; @@ -426,130 +278,8 @@ $basicBtnC:#eb0313;
426 } 278 }
427 } 279 }
428 } 280 }
429 - .goods-desc {  
430 - .service {  
431 - width: pxToRem(489px);  
432 - height: pxToRem(28px);  
433 - margin-top: pxToRem(22px);  
434 - }  
435 - }  
436 - .tips {  
437 - color: $subFontC;  
438 - font-size: pxToRem(18px);  
439 - margin-top: pxToRem(20px);  
440 - }  
441 - .materials {  
442 - .detail {  
443 - img {  
444 - display: block;  
445 - overflow: hidden;  
446 - width: pxToRem(90px);  
447 - height: pxToRem(120px);  
448 - padding-right: pxToRem(20px);  
449 - float: left;  
450 - }  
451 - .material-desc {  
452 - font-size: pxToRem(24px);  
453 - overflow: hidden;  
454 - }  
455 - }  
456 - .material-type {  
457 - width: pxToRem(581px);  
458 - height: pxToRem(99px);  
459 - border-top: 1px solid $borderC;  
460 - padding: pxToRem(17px) 0;  
461 - }  
462 - }  
463 - .product-detail {  
464 - .detail {  
465 - img {  
466 - margin-top: pxToRem(20px);  
467 - width: pxToRem(581px);  
468 - height: pxToRem(772px);  
469 - }  
470 - }  
471 - margin-bottom: pxToRem(120px);  
472 - }  
473 - .detail-swiper {  
474 - .swiper-wrapper {  
475 - height: pxToRem(200px);  
476 - overflow: hidden;  
477 - .swiper-slide {  
478 - width: pxToRem(114px);  
479 - div {  
480 - text-align: center;  
481 - &.cell {  
482 - font-size: pxToRem(24px);  
483 - background-color: $tableCellC;  
484 - padding: pxToRem(15px) 0;  
485 - border: 1px solid #fff;  
486 - }  
487 - }  
488 - }  
489 - }  
490 - }  
491 - #reference-swiper-container {  
492 - .first-group {  
493 - width: pxToRem(70px);  
494 - margin-top: pxToRem(66px);  
495 - .avatar {  
496 - line-height: pxToRem(40px);  
497 - width: pxToRem(40px);  
498 - height: pxToRem(40px);  
499 - margin: pxToRem(18px) 0;  
500 - }  
501 - }  
502 - }  
503 - .measurement-method {  
504 - .detail {  
505 - width: 100%;  
506 - height: pxToRem(260px);  
507 - img {  
508 - float: left;  
509 - width: pxToRem(270px);  
510 - height: pxToRem(239px);  
511 - margin-top: pxToRem(18px);  
512 - margin-right: pxToRem(28px);  
513 - }  
514 - .right-part {  
515 - overflow: hidden;  
516 - .title {  
517 - >h1 {  
518 - margin-top: pxToRem(10px);  
519 - display: inline-block;  
520 - padding-right: pxToRem(10px);  
521 - border-right: 1px solid $borderC;  
522 - line-height: 100%;  
523 - }  
524 - >span {  
525 - font-size: pxToRem(12px);  
526 - }  
527 - }  
528 - ul.items {  
529 - margin-top: pxToRem(20px);  
530 - padding: 0;  
531 - line-height: pxToRem(30px);  
532 - font-size: pxToRem(13px);  
533 - li {  
534 - span {  
535 - display: inline-block;  
536 - width: pxToRem(15px);  
537 - height: pxToRem(15px);  
538 - background-color: $basicBtnC;  
539 - border-radius: 50%;  
540 - color: #fff;  
541 - text-align: center;  
542 - line-height: pxToRem(15px);  
543 - font-size: pxToRem(13px);  
544 - margin-right: pxToRem(12px);  
545 - vertical-align: text-bottom;  
546 - }  
547 - }  
548 - }  
549 - }  
550 - clear:both;  
551 - }  
552 - } 281 +
  282 + //底部固定栏
553 .cart-bar { 283 .cart-bar {
554 position: relative; 284 position: relative;
555 box-sizing: border-box; 285 box-sizing: border-box;
  1 +.good-detail-page{
  2 + .goods-desc {
  3 + .service {
  4 + width: pxToRem(489px);
  5 + height: pxToRem(28px);
  6 + margin-top: pxToRem(22px);
  7 + }
  8 + .desc-text {
  9 + font-size: pxToRem(24px);
  10 + margin-bottom: pxToRem(20px);
  11 + color: $mainFontC;
  12 + }
  13 + }
  14 + .tips {
  15 + color: $subFontC;
  16 + font-size: pxToRem(18px);
  17 + margin-top: pxToRem(20px);
  18 + }
  19 + .materials {
  20 + .detail {
  21 + img {
  22 + display: block;
  23 + overflow: hidden;
  24 + width: pxToRem(90px);
  25 + height: pxToRem(120px);
  26 + padding-right: pxToRem(20px);
  27 + float: left;
  28 + }
  29 + .material-desc {
  30 + font-size: pxToRem(24px);
  31 + overflow: hidden;
  32 + }
  33 + }
  34 + .material-type {
  35 + width: pxToRem(581px);
  36 + height: pxToRem(99px);
  37 + border-top: 1px solid $borderC;
  38 + padding: pxToRem(17px) 0;
  39 + }
  40 + }
  41 + .product-detail {
  42 + .detail {
  43 + img {
  44 + margin-top: pxToRem(20px);
  45 + width: pxToRem(581px);
  46 + height: pxToRem(772px);
  47 + }
  48 + }
  49 + margin-bottom: pxToRem(120px);
  50 + }
  51 + .detail-swiper {
  52 + .swiper-wrapper {
  53 + // height: pxToRem(200px);
  54 + // overflow: hidden;
  55 + .swiper-slide {
  56 + width: pxToRem(114px);
  57 + div {
  58 + text-align: center;
  59 + &.cell {
  60 + font-size: pxToRem(24px);
  61 + background-color: $tableCellC;
  62 + padding: pxToRem(15px) 0;
  63 + border: 1px solid #fff;
  64 + }
  65 + }
  66 + }
  67 + }
  68 + }
  69 + //模特
  70 + #reference-swiper-container {
  71 + .first-group {
  72 + width: pxToRem(70px);
  73 + margin-top: pxToRem(66px);
  74 + .avatar {
  75 + line-height: pxToRem(40px);
  76 + width: pxToRem(40px);
  77 + height: pxToRem(40px);
  78 + margin: pxToRem(18px) 0;
  79 + }
  80 + }
  81 + }
  82 +
  83 + //测量方法
  84 + .measurement-method {
  85 + .detail {
  86 + width: 100%;
  87 + height: pxToRem(260px);
  88 + img {
  89 + float: left;
  90 + width: 100%;
  91 + height: pxToRem(239px);
  92 + margin-top: pxToRem(18px);
  93 + margin-right: pxToRem(28px);
  94 + }
  95 + }
  96 + }
  97 +}
@@ -29,27 +29,27 @@ @@ -29,27 +29,27 @@
29 <h1 >{{.}}</h1> 29 <h1 >{{.}}</h1>
30 </div> 30 </div>
31 {{/periodOfMarket}} 31 {{/periodOfMarket}}
32 - </div> 32 +</div>
33 33
34 - {{# vipLevel}}  
35 - <div class="vipLevel">  
36 - {{# list}}  
37 - <span class="vip-img">  
38 - <img class="lazy" data-original="http://static.dev.yohobuy.com/img/product/silver.png" alt="">  
39 - </span>  
40 - <span class="vip-price">{{text}}</span>  
41 - {{/ list}}  
42 - </div>  
43 - {{/ vipLevel}} 34 +{{# vipLevel}}
  35 +<div class="vipLevel">
  36 + {{# list}}
  37 +<span class="vip-img">
  38 + <img class="img" alt="">
  39 +</span>
  40 + <span class="vip-price">{{text}}</span>
  41 + {{/ list}}
  42 +</div>
  43 +{{/ vipLevel}}
44 44
45 {{#goodsDiscount}} 45 {{#goodsDiscount}}
46 <div class="goodsDiscount"> 46 <div class="goodsDiscount">
47 - {{#each list}} 47 + {{#list}}
48 {{#if @first}} 48 {{#if @first}}
49 - <h1 class="first-item">{{title}}<span class="icon-down iconfont dropdown">&#xe609;</span></h1> 49 + <h1 class="first-item">{{text}}<span class="icon-down iconfont dropdown">&#xe609;</span></h1>
50 <div class="discount-folder"> 50 <div class="discount-folder">
51 {{else}} 51 {{else}}
52 - <h1 class="folder-item">{{title}}</h1> 52 + <h1 class="folder-item">{{text}}</h1>
53 {{/if}} 53 {{/if}}
54 {{/list}} 54 {{/list}}
55 </div> 55 </div>
@@ -59,14 +59,10 @@ @@ -59,14 +59,10 @@
59 <div class="feedback-list "> 59 <div class="feedback-list ">
60 {{# feedbacks}} 60 {{# feedbacks}}
61 {{#if commentsNum}} 61 {{#if commentsNum}}
62 - <!--tab begin-->  
63 {{> product/feedback-tab}} 62 {{> product/feedback-tab}}
64 - <!--/tab end-->  
65 {{else}} 63 {{else}}
66 {{#if consultsNum}} 64 {{#if consultsNum}}
67 - <!--tab begin-->  
68 {{> product/feedback-tab}} 65 {{> product/feedback-tab}}
69 - <!--/tab end-->  
70 {{else}} 66 {{else}}
71 <div class="nodata"> 67 <div class="nodata">
72 <span>暂无商品评价和咨询</span> 68 <span>暂无商品评价和咨询</span>
@@ -91,158 +87,7 @@ @@ -91,158 +87,7 @@
91 87
92 <div class="gap-block"></div> 88 <div class="gap-block"></div>
93 89
94 - {{#goodsDescription}}  
95 - <div class="goods-desc page-block">  
96 - <img class="service lazy" data-original="http://static.dev.yohobuy.com/img/product/service.png" alt="">  
97 - <h1 class="title">  
98 - {{title}}  
99 - <span class="en-title">{{enTitle}}</span>  
100 - </h1>  
101 - {{#detail}}  
102 - <div class="detail table">  
103 - <div class="row">  
104 - <div class="column">编号:{{nubmer}}</div>  
105 - <div class="column">帽型:{{hatType}}</div>  
106 - </div>  
107 - <div class="row">  
108 - <div class="column">颜色:{{color}}</div>  
109 - <div class="column">帽檐:{{bongrace}}</div>  
110 - </div>  
111 - <div class="row">  
112 - <div class="column">类型:{{type}}</div>  
113 - <div class="column">细节:{{goodsDetail}}</div>  
114 - </div>  
115 - <div class="row">  
116 - <div class="column">性别:{{gender}}</div>  
117 - <div class="column">风格:{{style}}</div>  
118 - </div>  
119 - </div>  
120 - {{/detail}}  
121 - </div>  
122 - {{/goodsDescription}}  
123 -  
124 - <div class="gap-block"></div>  
125 -  
126 - {{#sizeInfo}}  
127 - <div class="size-info page-block">  
128 - <h1 class="title">  
129 - {{title}}  
130 - <span class="en-title">{{enTitle}}</span>  
131 - </h1>  
132 - {{#detail}}  
133 - <div class="detail">  
134 - <div class="swiper-container detail-swiper" id="size-swiper-container">  
135 - <div class="swiper-wrapper">  
136 - {{#list}}  
137 - <div class="swiper-slide " >  
138 - <div class="size-name cell">{{name}}</div>  
139 - <div class="size-m cell">{{sizem}}</div>  
140 - <div class="size-xl cell">{{sizexl}}</div>  
141 - </div>  
142 - {{/list}}  
143 - </div>  
144 - </div>  
145 - <p class="tips">提示:左滑查看完整表格信息</p>  
146 - </div>  
147 - {{/detail}}  
148 - </div>  
149 - {{/sizeInfo}}  
150 -  
151 - <div class="gap-block"></div>  
152 -  
153 - {{#measurementMethod}}  
154 - <div class="measurement-method page-block">  
155 - <h1 class="title">  
156 - {{title}}  
157 - <span class="en-title">{{enTitle}}</span>  
158 - </h1>  
159 - {{#detail}}  
160 - <div class="detail" style="width:100%">  
161 - <img class="lazy" data-original="{{img}}" alt="">  
162 - <div class="right-part">  
163 - <div class="title">  
164 - <h1 >{{sort}}</h1>  
165 - <span>{{enSort}}</span>  
166 - </div>  
167 - <ul class="items">  
168 - {{#each items}}  
169 - <li>  
170 - <span>{{@index}}</span>  
171 - {{this}}</li>  
172 - {{/items}}  
173 - </ul>  
174 - </div>  
175 - </div>  
176 - {{/detail}}  
177 - </div>  
178 - {{/measurementMethod}}  
179 -  
180 - <div class="gap-block"></div>  
181 -  
182 - {{#reference}}  
183 - <div class="size-info page-block">  
184 - <h1 class="title">  
185 - {{title}}  
186 - <span class="en-title">{{enTitle}}</span>  
187 - </h1>  
188 - {{#detail}}  
189 - <div class="detail">  
190 - <div class="swiper-container detail-swiper" id="reference-swiper-container">  
191 - <div class="swiper-wrapper">  
192 - {{#list}}  
193 - {{#if @first}}  
194 - <div class="swiper-slide first-group" >  
195 - <img class="lazy avatar" data-original="{{firstModel}}" alt="">  
196 - <img class="lazy avatar" data-original="{{secondModel}}" alt="">  
197 - </div>  
198 - {{^}}  
199 - <div class="swiper-slide" >  
200 - <div class="model-field cell">{{fieldName}}</div>  
201 - <div class="first-model cell">{{firstModel}}</div>  
202 - <div class="second-model cell">{{secondModel}}</div>  
203 - </div>  
204 - {{/if}}  
205 - {{/list}}  
206 - </div>  
207 - </div>  
208 - <p class="tips">提示:左滑查看完整表格信息</p>  
209 - </div>  
210 - {{/detail}}  
211 - </div>  
212 - {{/reference}}  
213 -  
214 - <div class="gap-block"></div>  
215 -  
216 - {{#materials}}  
217 - <div class="materials page-block">  
218 - <h1 class="title">  
219 - {{title}}  
220 - <span class="en-title">{{enTitle}}</span>  
221 - </h1>  
222 - <div class="detail">  
223 - <img class="lazy" data-original="{{img}}" alt="">  
224 - <p class="material-desc">  
225 - {{desc}}  
226 - </p>  
227 - </div>  
228 - <img class="lazy material-type" data-original="{{materialType}}" alt="" >  
229 - </div>  
230 - {{/materials}}  
231 -  
232 - <div class="gap-block"></div>  
233 -  
234 - {{#productDetail}}  
235 - <div class="product-detail page-block">  
236 - <h1 class="title">  
237 - {{title}}  
238 - <span class="en-title">{{enTitle}}</span>  
239 - </h1>  
240 - <div class="detail">  
241 - <p>{{desc}}</p>  
242 - <img class="lazy" data-original="{{img}}" alt="">  
243 - </div>  
244 - </div>  
245 - {{/productDetail}} 90 + {{> product/product_description}}
246 91
247 {{#cartInfo}} 92 {{#cartInfo}}
248 <div class="cart-bar"> 93 <div class="cart-bar">
@@ -166,7 +166,7 @@ @@ -166,7 +166,7 @@
166 {{!-- 商品详情评论 --}} 166 {{!-- 商品详情评论 --}}
167 {{#if goodsCommentsPage}} 167 {{#if goodsCommentsPage}}
168 <script> 168 <script>
169 - seajs.use('js/product/detail/comments'); 169 + seajs.use('js/product/detail/comments-consults');
170 </script> 170 </script>
171 {{/if}} 171 {{/if}}
172 {{!-- 品类 --}} 172 {{!-- 品类 --}}
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <ul class="swiper-wrapper"> 3 <ul class="swiper-wrapper">
4 {{# list}} 4 {{# list}}
5 <li class="swiper-slide"> 5 <li class="swiper-slide">
6 - <a href="{{url}}"> 6 + <a href="javascript:;">
7 <img src="{{img}}" alt=""> 7 <img src="{{img}}" alt="">
8 </a> 8 </a>
9 </li> 9 </li>
  1 +{{#goodsDescription}}
  2 +<div class="goods-desc page-block">
  3 + <img class="service lazy" data-original="http://static.dev.yohobuy.com/img/product/service.png" alt="">
  4 + <h1 class="title">
  5 + {{title}}
  6 + <span class="en-title">{{enTitle}}</span>
  7 + </h1>
  8 + {{#detail}}
  9 + <ul class="detail table clearfix">
  10 + {{# list}}
  11 + <li class="row">
  12 + <div class="column">{{param}}</div>
  13 + </li>
  14 + {{/ list}}
  15 + </ul>
  16 + {{/detail}}
  17 + <div class="desc-text">{{desc}}</div>
  18 +</div>
  19 + {{/goodsDescription}}
  20 +
  21 +<div class="gap-block"></div>
  22 +
  23 + {{#sizeInfo}}
  24 +<div class="size-info page-block">
  25 +<h1 class="title">
  26 + {{title}}
  27 + <span class="en-title">{{enTitle}}</span>
  28 +</h1>
  29 +{{#detail}}
  30 +<div class="detail">
  31 + <div class="swiper-container detail-swiper" id="size-swiper-container">
  32 + <div class="swiper-wrapper">
  33 + {{#list}}
  34 + <div class="swiper-slide " >
  35 + {{#params}}
  36 + <div class="cell">{{param}}</div>
  37 + {{/params}}
  38 + </div>
  39 + {{/list}}
  40 + </div>
  41 + </div>
  42 + <p class="tips">提示:左滑查看完整表格信息</p>
  43 +</div>
  44 +{{/detail}}
  45 +</div>
  46 + {{/sizeInfo}}
  47 +
  48 +<div class="gap-block"></div>
  49 +
  50 + {{#measurementMethod}}
  51 +<div class="measurement-method page-block">
  52 +<h1 class="title">
  53 + {{title}}
  54 + <span class="en-title">{{enTitle}}</span>
  55 +</h1>
  56 +<div class="detail" style="width:100%">
  57 + <img class="lazy" data-original="{{img}}" alt="">
  58 +</div>
  59 +{{/measurementMethod}}
  60 +
  61 +<div class="gap-block"></div>
  62 +
  63 +{{#reference}}
  64 +<div class="size-info page-block">
  65 + <h1 class="title">
  66 + {{title}}
  67 + <span class="en-title">{{enTitle}}</span>
  68 + </h1>
  69 + {{#detail}}
  70 + <div class="detail">
  71 + <div class="swiper-container detail-swiper" id="reference-swiper-container">
  72 + <div class="swiper-wrapper">
  73 + {{#list}}
  74 + {{#if @first}}
  75 + <div class="swiper-slide first-group" >
  76 + <img class="lazy avatar" data-original="{{firstModel}}" alt="">
  77 + <img class="lazy avatar" data-original="{{secondModel}}" alt="">
  78 + </div>
  79 + {{^}}
  80 + <div class="swiper-slide" >
  81 + <div class="model-field cell">{{fieldName}}</div>
  82 + <div class="first-model cell">{{firstModel}}</div>
  83 + <div class="second-model cell">{{secondModel}}</div>
  84 + </div>
  85 + {{/if}}
  86 + {{/list}}
  87 + </div>
  88 + </div>
  89 + <p class="tips">提示:左滑查看完整表格信息</p>
  90 + </div>
  91 + {{/detail}}
  92 +</div>
  93 +{{/reference}}
  94 +
  95 +<div class="gap-block"></div>
  96 +
  97 +{{#materials}}
  98 +<div class="materials page-block">
  99 + <h1 class="title">
  100 + {{title}}
  101 + <span class="en-title">{{enTitle}}</span>
  102 + </h1>
  103 + <div class="detail">
  104 + <img class="lazy" data-original="{{img}}" alt="">
  105 + <p class="material-desc">
  106 + {{desc}}
  107 + </p>
  108 + </div>
  109 + <img class="lazy material-type" data-original="{{materialType}}" alt="" >
  110 +</div>
  111 +{{/materials}}
  112 +
  113 +<div class="gap-block"></div>
  114 +
  115 +{{#productDetail}}
  116 +<div class="product-detail page-block">
  117 + <h1 class="title">
  118 + {{title}}
  119 + <span class="en-title">{{enTitle}}</span>
  120 + </h1>
  121 + <div class="detail">
  122 + <p>{{desc}}</p>
  123 + <img class="lazy" data-original="{{img}}" alt="">
  124 + </div>
  125 +</div>
  126 +{{/productDetail}}