fe / YOHOBUYWAP · Commits

Go to a project

Authored by 周少峰
Commit 1bfa4f1d4801ea0e2f8223c7362ac10c55082b8c 1 parent c07241b4

students

Inline Side-by-side
Showing 7 changed files with 34 additions and 21 deletions

17.1 KB | W: | H:

19.9 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
@@ -5,6 +5,25 @@ @@ -5,6 +5,25 @@
5 a { 5 a {
6 color: #444; 6 color: #444;
7 } 7 }
  8 + .my-header {
  9 + position: relative;
  10 +
  11 + .students-entry {
  12 + display: block;
  13 + width: 100px;
  14 + height: 40px;
  15 + line-height: 40px;
  16 + border-top-left-radius: 40px;
  17 + border-bottom-left-radius: 40px;
  18 + background: #d0021b;
  19 + color: #ffffff;
  20 + padding-left: 20px;
  21 + position: absolute;
  22 + top: 20px;
  23 + right: 0px;
  24 + font-size: 24px;
  25 + }
  26 + }
8 27
9 .user-info { 28 .user-info {
10 display: block; 29 display: block;
@@ -57,6 +76,9 @@ @@ -57,6 +76,9 @@
57 background: url("/me/vip/vip-1.png"); 76 background: url("/me/vip/vip-1.png");
58 } 77 }
59 78
  79 + .students {
  80 + background: url("/me/vip/students.png");
  81 + }
60 .more-icon { 82 .more-icon {
61 position: absolute; 83 position: absolute;
62 top: 40px; 84 top: 40px;
@@ -70,22 +92,6 @@ @@ -70,22 +92,6 @@
70 background: rgba(200,200,200,.1)!important; 92 background: rgba(200,200,200,.1)!important;
71 } 93 }
72 } 94 }
73 -  
74 - .students-entry {  
75 - display: block;  
76 - width: 100px;  
77 - height: 40px;  
78 - line-height: 40px;  
79 - border-top-left-radius: 40px;  
80 - border-bottom-left-radius: 40px;  
81 - background: #d0021b;  
82 - color: #ffffff;  
83 - padding-left: 20px;  
84 - position: absolute;  
85 - top: 20px;  
86 - right: 0px;  
87 - font-size: 24px;  
88 - }  
89 } 95 }
90 96
91 .login-btn { 97 .login-btn {
@@ -8,11 +8,15 @@ @@ -8,11 +8,15 @@
8 {{#vip_info}} 8 {{#vip_info}}
9 <span class="vip-icon vip-{{cur_level}}"></span> 9 <span class="vip-icon vip-{{cur_level}}"></span>
10 {{/vip_info}} 10 {{/vip_info}}
  11 +
  12 + {{#if students}}
  13 + <span class="vip-icon students"></span>
  14 + {{/if}}
11 <div class="iconfont more-icon tap-hightlight">&#xe604;</div> 15 <div class="iconfont more-icon tap-hightlight">&#xe604;</div>
12 </a> 16 </a>
13 - {{#if showEntry}} 17 + {{^students}}
14 <a class="students-entry" href="###">学生认证</a> 18 <a class="students-entry" href="###">学生认证</a>
15 - {{/if}} 19 + {{/students}}
16 20
17 {{/isLogin}} 21 {{/isLogin}}
18 {{^isLogin}} 22 {{^isLogin}}
@@ -49,6 +49,9 @@ @@ -49,6 +49,9 @@
49 {{#if isGift}} 49 {{#if isGift}}
50 <span class="sale-price">¥{{salesPrice}}</span> 50 <span class="sale-price">¥{{salesPrice}}</span>
51 {{/if}} 51 {{/if}}
  52 + {{#if isStudents}}
  53 + <span class="students">学</span>
  54 + {{}}
52 </p> 55 </p>
53 {{#if isVipPrice}} 56 {{#if isVipPrice}}
54 <span class="vip"> 57 <span class="vip">
@@ -42,7 +42,7 @@ class UserModel @@ -42,7 +42,7 @@ class UserModel
42 $result['gender'] = $result['gender'] == 1 ? '男' : '女'; 42 $result['gender'] = $result['gender'] == 1 ? '男' : '女';
43 $result['head_ico'] = isset($result['head_ico']) && !empty($result['head_ico']) ? Images::getImageUrl($result['head_ico'], 128, 128) : ''; 43 $result['head_ico'] = isset($result['head_ico']) && !empty($result['head_ico']) ? Images::getImageUrl($result['head_ico'], 128, 128) : '';
44 } 44 }
45 - 45 + $result['students'] = isset($result['is_students']) && $result['is_students'] === 1;
46 return $result; 46 return $result;
47 } 47 }
48 48
@@ -11,8 +11,8 @@ define('APPLICATION_PATH', dirname(__DIR__)); // 应用目录 @@ -11,8 +11,8 @@ define('APPLICATION_PATH', dirname(__DIR__)); // 应用目录
11 define('ROOT_PATH', dirname(dirname(APPLICATION_PATH))); // 根目录 11 define('ROOT_PATH', dirname(dirname(APPLICATION_PATH))); // 根目录
12 defined('APPLICATION_ENV') || define('APPLICATION_ENV', 'developer'); 12 defined('APPLICATION_ENV') || define('APPLICATION_ENV', 'developer');
13 13
14 -define('API_URL', 'http://dev-api.yohops.com:9999/');  
15 -define('SERVICE_URL', 'http://dev-service.yohops.com:9999/'); 14 +define('API_URL', 'http://api.yoho.cn/');
  15 +define('SERVICE_URL', 'http://service.yoho.cn/');
16 define('YOHOBUY_URL', 'http://www.yohobuy.com/'); 16 define('YOHOBUY_URL', 'http://www.yohobuy.com/');
17 define('SERVICE_NOTIFY', 'http://testservice.yoho.cn:28077/'); 17 define('SERVICE_NOTIFY', 'http://testservice.yoho.cn:28077/');
18 18