fe / YOHOBUYWAP · Commits

Go to a project

Authored by hf
Commit e29d69c8261ba79b278fcf8870ac2d96ed61dc4e 1 parent 14cb0711

do merge develop code to fixes bugs and add home test multi uid

Inline Side-by-side
Showing 3 changed files with 35 additions and 12 deletions
... ... @@ -173,6 +173,22 @@ server
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Accept-Encoding "gzip";
}
location ^~ /product/pro_ {
proxy_redirect off;
proxy_pass http://yohobuy;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Accept-Encoding "gzip";
}
location ^~ /product/intro_ {
proxy_redirect off;
proxy_pass http://yohobuy;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Accept-Encoding "gzip";
}
# 逛相关
location ^~ /guang/ {
... ...
... ... @@ -94,7 +94,7 @@
</a>
</div>
<div class="group-list">
<a class="list-item" href="/home/IHelp">
<a class="list-item" href="/help.html">
<span class="iconfont icon">&#xe639;</span>
帮助
<span class="iconfont num">&#xe604;</span>
... ...
... ... @@ -476,6 +476,7 @@ class HomeController extends AbstractAction
/*
* 会员特权查看页
*/
public function preferentialAction()
{
//设置网站seo信息
... ... @@ -494,6 +495,7 @@ class HomeController extends AbstractAction
/*
* 我的订单页面,获得nav导航条焦点。并且异步请求订单详情列表页（getOrders）
*/
public function orderAction()
{
//获得type值,type:1=>全部,2=>待付款,3=>待发货,4=>待收货,5=>待评论。
... ... @@ -554,6 +556,7 @@ class HomeController extends AbstractAction
/*
* 我的订单-取消订单
*/
public function cancelOrderAction()
{
//判断是不是ajax请求
... ... @@ -574,6 +577,7 @@ class HomeController extends AbstractAction
/*
* 我的订单-删除订单
*/
public function delOrderAction()
{
//判断是不是ajax请求
... ... @@ -594,6 +598,7 @@ class HomeController extends AbstractAction
/*
* 我的订单-支付链接获取
*/
private function paymentAction()
{
$gender = Helpers::getGenderByCookie();
... ... @@ -604,6 +609,7 @@ class HomeController extends AbstractAction
/*
* 我的订单-随便逛逛链接获取
*/
private function strollAction()
{
//获取性别、频道数据
... ... @@ -667,19 +673,20 @@ class HomeController extends AbstractAction
$this->setNavHeader('帮助中心');
$data = array(
'iHelp' => array(
array('name' => '新用户注册','url' => 'http://m.dev.yohobuy.com/' ),
array('name' => '交款须知' ,'url' => 'http://m.dev.yohobuy.com/'),
array('name' => '服务条款' ,'url' => 'http://m.dev.yohobuy.com/'),
array('name' => '网站订购流程' ,'url' => 'http://m.dev.yohobuy.com/'),
array('name' => '会员登录' ,'url' => 'http://m.dev.yohobuy.com/'),
array('name' => '网站订单修改' ,'url' => 'http://m.dev.yohobuy.com/'),
array('name' => 'YOHO币' ,'url' => 'http://m.dev.yohobuy.com/'),
array('name' => '常见问题' ,'url' => 'http://m.dev.yohobuy.com/'),
array('name' => '支付方式' ,'url' => 'http://m.dev.yohobuy.com/'),
array('name' => '发票制度说明' ,'url' => 'http://m.dev.yohobuy.com/'),
array('name' => '配送时间' ,'url' => 'http://m.dev.yohobuy.com/')
array('name' => '新用户注册', 'url' => 'http://m.dev.yohobuy.com/'),
array('name' => '交款须知', 'url' => 'http://m.dev.yohobuy.com/'),
array('name' => '服务条款', 'url' => 'http://m.dev.yohobuy.com/'),
array('name' => '网站订购流程', 'url' => 'http://m.dev.yohobuy.com/'),
array('name' => '会员登录', 'url' => 'http://m.dev.yohobuy.com/'),
array('name' => '网站订单修改', 'url' => 'http://m.dev.yohobuy.com/'),
array('name' => 'YOHO币', 'url' => 'http://m.dev.yohobuy.com/'),
array('name' => '常见问题', 'url' => 'http://m.dev.yohobuy.com/'),
array('name' => '支付方式', 'url' => 'http://m.dev.yohobuy.com/'),
array('name' => '发票制度说明', 'url' => 'http://m.dev.yohobuy.com/'),
array('name' => '配送时间', 'url' => 'http://m.dev.yohobuy.com/')
)
);
$this->_view->display('i-help', $data);
}
}
... ...