wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by whb
Commit 88fea3df20b8d3cba78ffa64c4aaa702bb4bd783 2 parents 01bf57e9 9eca499f

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

Inline Side-by-side
Showing 2 changed files with 11 additions and 10 deletions
@@ -23,11 +23,11 @@ class Yohobuy @@ -23,11 +23,11 @@ class Yohobuy
23 // const SERVICE_URL = 'http://service.api.yohobuy.com/'; 23 // const SERVICE_URL = 'http://service.api.yohobuy.com/';
24 // const YOHOBUY_URL = 'http://www.yohobuy.com/'; 24 // const YOHOBUY_URL = 'http://www.yohobuy.com/';
25 25
26 -// const API_URL = 'http://apih5.yoho.cn/'; 26 + // const API_URL = 'http://apih5.yoho.cn/';
27 // const API_URL2 = 'http://apih5.yoho.cn/'; 27 // const API_URL2 = 'http://apih5.yoho.cn/';
28 -// const SERVICE_URL = 'http://serviceh5.yoho.cn/';  
29 -// const YOHOBUY_URL = 'http://www.yohobuy.com/';  
30 -// const API_OLD = 'http://api2.open.yohobuy.com/'; 28 + // const SERVICE_URL = 'http://serviceh5.yoho.cn/';
  29 + // const YOHOBUY_URL = 'http://www.yohobuy.com/';
  30 + // const API_OLD = 'http://api2.open.yohobuy.com/';
31 31
32 // /* 测试环境 */ 32 // /* 测试环境 */
33 // const API_URL = 'http://192.168.102.205:8080/gateway/'; // 先临时使用网关 33 // const API_URL = 'http://192.168.102.205:8080/gateway/'; // 先临时使用网关
1 .yoho-coin-new-page { 1 .yoho-coin-new-page {
2 padding-top: pxToRem(30px); 2 padding-top: pxToRem(30px);
3 - text-align: center;  
4 - 3 + .coin{
  4 + text-align: center;
  5 + }
5 .coin-num { 6 .coin-num {
6 color: #d0021b; 7 color: #d0021b;
7 font-size: pxToRem(66px); 8 font-size: pxToRem(66px);
8 font-weight: bold; 9 font-weight: bold;
9 line-height: pxToRem(106px); 10 line-height: pxToRem(106px);
10 - letter-spacing: pxToRem(8px); 11 + // letter-spacing: pxToRem(8px);
11 } 12 }
12 13
13 .info { 14 .info {
@@ -17,12 +18,12 @@ @@ -17,12 +18,12 @@
17 18
18 .dollar { 19 .dollar {
19 display: inline-block; 20 display: inline-block;
20 - margin-right: pxToRem(6px); 21 + // margin-right: pxToRem(6px);
21 vertical-align: middle; 22 vertical-align: middle;
22 width: pxToRem(24px); 23 width: pxToRem(24px);
23 height: pxToRem(24px); 24 height: pxToRem(24px);
24 background: image-url("me/yoho-coin/dollar.png") center center; 25 background: image-url("me/yoho-coin/dollar.png") center center;
25 - background-size: 100%; 26 + background-size: 100% 100%;
26 } 27 }
27 } 28 }
28 29
@@ -31,7 +32,7 @@ @@ -31,7 +32,7 @@
31 margin: pxToRem(30px) 0; 32 margin: pxToRem(30px) 0;
32 color: #444; 33 color: #444;
33 font-size: pxToRem(24px); 34 font-size: pxToRem(24px);
34 - line-height: pxToRem(36px); 35 + line-height: pxToRem(40px);
35 width: pxToRem(152px); 36 width: pxToRem(152px);
36 height: pxToRem(36px); 37 height: pxToRem(36px);
37 text-align: center; 38 text-align: center;