wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by yangyang
Commit 83d3e687174b0dacc361f3a8df8473e4628ea49d 1 parent 3e3ca1ae

1,将plus&star接口换成v3，目前v3接口返回异常，待检查;2,修复cacheConfig问题

Inline Side-by-side
Showing 2 changed files with 1 additions and 9 deletions
@@ -35,18 +35,10 @@ class CacheConfig @@ -35,18 +35,10 @@ class CacheConfig
35 const KEY_ACTION_SEARCH_SEARCH = 'key_action_search_search'; // 搜索的数据 35 const KEY_ACTION_SEARCH_SEARCH = 'key_action_search_search'; // 搜索的数据
36 const KEY_ACTION_SEARCH_FILTER = 'key_action_search_filter'; // 搜索的过滤条件 36 const KEY_ACTION_SEARCH_FILTER = 'key_action_search_filter'; // 搜索的过滤条件
37 37
38 -<<<<<<< HEAD  
39 - const KEY_ACTION_HOME_GRADE = 'key_action_home_grade';//会员等级  
40 - const KEY_ACTION_HOME_PREFERENTIAL = 'key_action_home_preferential';//会员特权详情  
41 - const KEY_ACTION_GUANG_PLUSTAR_DATA = 'key_action_guang_plustar_data'; // 逛PLUSTAR  
42 - const KEY_ACTION_GUANG_DETAIL_DATA = 'key_action_guang_detail_data'; // 逛内容详情  
43 - const KEY_ACTION_HOME_ORDER_ORDER = 'key_action_home_order_order';//订单列表  
44 -=======  
45 const KEY_ACTION_GUANG_PLUSSTAR_INDEX = 'key_action_guang_plusstar_index'; // 国际优选 38 const KEY_ACTION_GUANG_PLUSSTAR_INDEX = 'key_action_guang_plusstar_index'; // 国际优选
46 const KEY_ACTION_GUANG_PLUSSTAR_LIST = 'key_action_guang_plusstar_list'; // 明星原创 39 const KEY_ACTION_GUANG_PLUSSTAR_LIST = 'key_action_guang_plusstar_list'; // 明星原创
47 const KEY_ACTION_GUANG_PLUSTAR_DATA = 'key_action_guang_plustar_data'; // 逛PLUSTAR 40 const KEY_ACTION_GUANG_PLUSTAR_DATA = 'key_action_guang_plustar_data'; // 逛PLUSTAR
48 const KEY_ACTION_GUANG_DETAIL_DATA = 'key_action_guang_detail_data'; // 逛内容详情 41 const KEY_ACTION_GUANG_DETAIL_DATA = 'key_action_guang_detail_data'; // 逛内容详情
49 const KEY_ACTION_GUANG_RSS_DATA = 'key_action_guang_detail_data'; // 逛订阅内容 42 const KEY_ACTION_GUANG_RSS_DATA = 'key_action_guang_detail_data'; // 逛订阅内容
50 ->>>>>>> master  
51 43
52 } 44 }
@@ -22,7 +22,7 @@ class PlusstarData @@ -22,7 +22,7 @@ class PlusstarData
22 { 22 {
23 23
24 const URI_BRANDLIST = 'guang/api/v1/plustar/getlist'; 24 const URI_BRANDLIST = 'guang/api/v1/plustar/getlist';
25 - const URI_BRANDINFO_PLUSSTAR = 'guang/service/v1/plustar/'; // 'guang/service/v3/plustar/' 25 + const URI_BRANDINFO_PLUSSTAR = 'guang/service/v3/plustar/'; // 'guang/service/v3/plustar/'
26 const URI_BRANDINFO_FAVORITE = 'shops/service/v1/favorite/'; 26 const URI_BRANDINFO_FAVORITE = 'shops/service/v1/favorite/';
27 const URI_BRANDINFO_ARTICLE = 'guang/service/v1/article/'; 27 const URI_BRANDINFO_ARTICLE = 'guang/service/v1/article/';
28 28