fe / YOHO-ACTIVITY-PHP · Commits

Go to a project

Authored by Rock Zhang
Commit 42f2e1e3d9a590ca22c47c3ad64b2d97a3c68790 2 parents 609df6b1 2fb6f3b1

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

Inline Side-by-side
Showing 4 changed files with 14 additions and 13 deletions
framework @ 119c247f
1 -Subproject commit 75bbc3b075de19f239532f60c5995d06c5f814e2 1 +Subproject commit 119c247f5cf929aa1e059e40609bb16dd6b58f05
@@ -17,18 +17,18 @@ use Plugin\Cache; @@ -17,18 +17,18 @@ use Plugin\Cache;
17 class Yohobuy 17 class Yohobuy
18 { 18 {
19 19
20 -// /* 正式环境 */  
21 - const API_URL = 'http://api2.open.yohobuy.com/';  
22 - const API_URL2 = 'http://api.open.yohobuy.com/';  
23 - const SERVICE_URL = 'http://service.api.yohobuy.com/';  
24 - const YOHOBUY_URL = 'http://www.yohobuy.com/'; 20 + /* 正式环境 */
  21 + // const API_URL = 'http://api2.open.yohobuy.com/';
  22 + // const API_URL2 = 'http://api.open.yohobuy.com/';
  23 + // const SERVICE_URL = 'http://service.api.yohobuy.com/';
  24 + // const YOHOBUY_URL = 'http://www.yohobuy.com/';
25 25
26 /* 测试环境 */ 26 /* 测试环境 */
27 - // const API_URL = 'http://test2.open.yohobuy.com/';  
28 - // const SERVICE_URL = 'http://test.service.api.yohobuy.com/';  
29 - // const YOHOBUY_URL = 'http://www.yohobuy.com/';  
30 - // const API_URL_MYCENTER = 'http://192.168.102.213:8080/api-gateway-web/'; // 我的个人中心接口URL  
31 - // const API_URL_SHOPINGCART = 'http://192.168.102.213:8080/api-gateway-web/'; // 我的购物车接口URL 27 + const API_URL = 'http://test2.open.yohobuy.com/';
  28 + const SERVICE_URL = 'http://test.service.api.yohobuy.com/';
  29 + const YOHOBUY_URL = 'http://www.yohobuy.com/';
  30 + const API_URL_MYCENTER = 'http://192.168.102.213:8080/api-gateway-web/'; // 我的个人中心接口URL
  31 + const API_URL_SHOPINGCART = 'http://192.168.102.213:8080/api-gateway-web/'; // 我的购物车接口URL
32 32
33 33
34 /** 34 /**
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
2 background: #f0f0f0; 2 background: #f0f0f0;
3 3
4 .user-info { 4 .user-info {
  5 + display: block;
5 position: relative; 6 position: relative;
6 padding: 0 pxToRem(30px); 7 padding: 0 pxToRem(30px);
7 color: #fff; 8 color: #fff;
1 {{> layout/header}} 1 {{> layout/header}}
2 <div class="my-page yoho-page"> 2 <div class="my-page yoho-page">
3 <div class="my-header"> 3 <div class="my-header">
4 - <div class="user-info"><!--/home/personaldetails--> 4 + <a class="user-info" href="/home/personaldetails">
5 <img class="user-avatar" src="{{head_ico}}"> 5 <img class="user-avatar" src="{{head_ico}}">
6 <span class="username">{{profile_name}}</span> 6 <span class="username">{{profile_name}}</span>
7 {{#vip_info}} 7 {{#vip_info}}
8 <span class="vip-icon vip-{{next_level}}"></span> 8 <span class="vip-icon vip-{{next_level}}"></span>
9 {{/vip_info}} 9 {{/vip_info}}
10 <div class="iconfont more-icon">&#xe604;</div> 10 <div class="iconfont more-icon">&#xe604;</div>
11 - </div> 11 + </a>
12 </div> 12 </div>
13 <div class="my-link clearfix"> 13 <div class="my-link clearfix">
14 <a class="link-item" href="/home/favorite"> 14 <a class="link-item" href="/home/favorite">