wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by uedxwg
Commit cee4be074668bc6299d62507b795a760091daef1 2 parents 1a61dba0 0619b411

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

Inline Side-by-side
Showing 7 changed files with 61 additions and 62 deletions
@@ -149,7 +149,7 @@ function rePosFooter() { @@ -149,7 +149,7 @@ function rePosFooter() {
149 window._ozuid = uid;//暴露ozuid 149 window._ozuid = uid;//暴露ozuid
150 150
151 if (window._yas) { 151 if (window._yas) {
152 - window._yas(1 * new Date(), '1.0.13', 'yohobuy_m', uid, ''); 152 + window._yas(1 * new Date(), '1.0.13.1', 'yohobuy_m', uid, '');
153 } 153 }
154 }()); 154 }());
155 155
@@ -156,6 +156,7 @@ @@ -156,6 +156,7 @@
156 width: pxToRem(400px); 156 width: pxToRem(400px);
157 height: pxToRem(58px) * 2; 157 height: pxToRem(58px) * 2;
158 padding: pxToRem(20px) 0; 158 padding: pxToRem(20px) 0;
  159 + resize: none;
159 } 160 }
160 } 161 }
161 162
@@ -31,51 +31,6 @@ $basicBtnC:#eb0313; @@ -31,51 +31,6 @@ $basicBtnC:#eb0313;
31 right: auto; 31 right: auto;
32 } 32 }
33 33
34 -.tag-container {  
35 - position: absolute;  
36 - left: pxToRem(108px);  
37 - top: pxToRem(40px);  
38 - height: pxToRem(35px);  
39 - // width: pxToRem(70px);  
40 - color: #fff;  
41 - font-size: pxToRem(20px);  
42 - line-height: pxToRem(35px);  
43 - z-index: 2;  
44 - .good-tag {  
45 - display: inline-block;  
46 - box-sizing: border-box;  
47 - margin-left: .5px;  
48 - font-size: pxToRem(23px);  
49 - text-align: center;  
50 - line-height: pxToRem(35px);  
51 - padding: 0 8px;  
52 - }  
53 - .new-tag {  
54 - background-color: #78dc7e;  
55 - color: #fff;  
56 - }  
57 - .renew-tag {  
58 - background-color: #78dc7e;  
59 - color: #fff;  
60 - }  
61 - .sale-tag {  
62 - background-color: #ff575c;  
63 - color: #fff;  
64 - }  
65 - .new-festival-tag {  
66 - background-color: #000;  
67 - color: #fff;  
68 - }  
69 - .limit-tag {  
70 - border: 1px solid #000;  
71 - color: #000;  
72 - }  
73 - .soonSoldOut-tag {  
74 - background-color: #ffac5b;  
75 - color: #fff;  
76 - }  
77 -}  
78 -  
79 .good-detail-page { 34 .good-detail-page {
80 overflow: hidden; 35 overflow: hidden;
81 background-color: #f0f0f0; 36 background-color: #f0f0f0;
@@ -116,10 +71,10 @@ $basicBtnC:#eb0313; @@ -116,10 +71,10 @@ $basicBtnC:#eb0313;
116 font-size: pxToRem(24px); 71 font-size: pxToRem(24px);
117 background-color: $tableCellC; 72 background-color: $tableCellC;
118 float: left; 73 float: left;
119 - &:last-child{ 74 + &:last-child {
120 border-bottom: none; 75 border-bottom: none;
121 } 76 }
122 - &:nth-child(even){ 77 + &:nth-child(even) {
123 border-right: none; 78 border-right: none;
124 } 79 }
125 } 80 }
@@ -127,10 +82,52 @@ $basicBtnC:#eb0313; @@ -127,10 +82,52 @@ $basicBtnC:#eb0313;
127 } 82 }
128 } 83 }
129 } 84 }
130 - .gap-block {  
131 - min-height: 30rem/$pxConvertRem;  
132 - background-color: #f0f0f0; 85 +
  86 + .tag-container {
  87 + position: absolute;
  88 + left: pxToRem(108px);
  89 + top: pxToRem(40px);
  90 + height: pxToRem(35px);
  91 + // width: pxToRem(70px);
  92 + color: #fff;
  93 + font-size: pxToRem(20px);
  94 + line-height: pxToRem(35px);
  95 + z-index: 2;
  96 + .good-tag {
  97 + display: inline-block;
  98 + box-sizing: border-box;
  99 + margin-left: .5px;
  100 + font-size: pxToRem(23px);
  101 + text-align: center;
  102 + line-height: pxToRem(35px);
  103 + padding: 0 8px;
  104 + }
  105 + .new-tag {
  106 + background-color: #78dc7e;
  107 + color: #fff;
  108 + }
  109 + .renew-tag {
  110 + background-color: #78dc7e;
  111 + color: #fff;
  112 + }
  113 + .sale-tag {
  114 + background-color: #ff575c;
  115 + color: #fff;
  116 + }
  117 + .new-festival-tag {
  118 + background-color: #000;
  119 + color: #fff;
  120 + }
  121 + .limit-tag {
  122 + border: 1px solid #000;
  123 + color: #000;
  124 + }
  125 + .soonSoldOut-tag {
  126 + background-color: #ffac5b;
  127 + color: #fff;
  128 + }
133 } 129 }
  130 +
134 .banner-container { 131 .banner-container {
135 position: relative; 132 position: relative;
136 background-color: #fff; 133 background-color: #fff;
@@ -169,7 +166,7 @@ $basicBtnC:#eb0313; @@ -169,7 +166,7 @@ $basicBtnC:#eb0313;
169 height: 100%; 166 height: 100%;
170 li { 167 li {
171 float: left; 168 float: left;
172 - height: 100%; 169 + // height: 100%;
173 } 170 }
174 } 171 }
175 } 172 }
@@ -211,7 +208,7 @@ $basicBtnC:#eb0313; @@ -211,7 +208,7 @@ $basicBtnC:#eb0313;
211 line-height: pxToRem(88px); 208 line-height: pxToRem(88px);
212 } 209 }
213 .currentPrice { 210 .currentPrice {
214 - color: red; 211 + color: #d0021b;
215 margin-right: pxToRem(10px); 212 margin-right: pxToRem(10px);
216 } 213 }
217 .previousPrice { 214 .previousPrice {
@@ -258,20 +255,20 @@ $basicBtnC:#eb0313; @@ -258,20 +255,20 @@ $basicBtnC:#eb0313;
258 width: pxToRem(53px); 255 width: pxToRem(53px);
259 height: pxToRem(32px); 256 height: pxToRem(32px);
260 } 257 }
261 - &:nth-child(3) { 258 + &:nth-child(1) {
262 text-align: right; 259 text-align: right;
263 - .vip-img{ 260 + .vip-img {
264 background: image-url('product/silver.png') no-repeat; 261 background: image-url('product/silver.png') no-repeat;
265 } 262 }
266 } 263 }
267 &:nth-child(2) { 264 &:nth-child(2) {
268 - .vip-img{ 265 + .vip-img {
269 background: image-url('product/golden.png') no-repeat; 266 background: image-url('product/golden.png') no-repeat;
270 } 267 }
271 } 268 }
272 - &:nth-child(1) { 269 + &:nth-child(3) {
273 text-align: left; 270 text-align: left;
274 - .vip-img{ 271 + .vip-img {
275 background: image-url('product/platinum.png') no-repeat; 272 background: image-url('product/platinum.png') no-repeat;
276 } 273 }
277 } 274 }
@@ -39,8 +39,8 @@ @@ -39,8 +39,8 @@
39 <div class="price-date"> 39 <div class="price-date">
40 {{# goodsPrice}} 40 {{# goodsPrice}}
41 <div class="goodsPrice"> 41 <div class="goodsPrice">
42 - <h1 class="currentPrice">¥{{currentPrice}}</h1>  
43 - <h1 class="previousPrice">¥{{previousPrice}}</h1> 42 + <h1 class="currentPrice">{{currentPrice}}</h1>
  43 + <h1 class="previousPrice">{{previousPrice}}</h1>
44 </div> 44 </div>
45 {{/ goodsPrice}} 45 {{/ goodsPrice}}
46 46
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 a.async=1; 28 a.async=1;
29 a.src=j; 29 a.src=j;
30 m.parentNode.insertBefore(a,m); 30 m.parentNode.insertBefore(a,m);
31 - })(window,document,'script','http://cdn.yoho.cn/yas-jssdk/1.0.13/yas-debug.js','_yas'); 31 + })(window,document,'script','http://cdn.yoho.cn/yas-jssdk/1.0.13.1/yas.js','_yas');
32 </script> 32 </script>
33 {{> layout/use}} 33 {{> layout/use}}
34 {{> layout/analysis}} 34 {{> layout/analysis}}
@@ -15,7 +15,6 @@ @@ -15,7 +15,6 @@
15 </div> 15 </div>
16 </div> 16 </div>
17 17
18 - <!-- 如果需要导航按钮 -->  
19 <div class="my-swiper-button-prev prev-grey"></div> 18 <div class="my-swiper-button-prev prev-grey"></div>
20 <div class="my-swiper-button-next next-grey"></div> 19 <div class="my-swiper-button-next next-grey"></div>
21 </div> 20 </div>
@@ -12,7 +12,9 @@ @@ -12,7 +12,9 @@
12 {{/list}} 12 {{/list}}
13 </div> 13 </div>
14 {{/detail}} 14 {{/detail}}
  15 + {{#if desc}}
15 <div class="desc-text">{{desc}}</div> 16 <div class="desc-text">{{desc}}</div>
  17 + {{/if}}
16 </div> 18 </div>
17 19
18 {{/goodsDescription}} 20 {{/goodsDescription}}