fe / YOHO-ACTIVITY-PHP · Commits

Go to a project

Authored by xuqi
Commit 5923969943aa4d3f03ca1c1a36aa89e23b82e349 2 parents 0b43a346 35016cbe

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

Inline Side-by-side
Showing 7 changed files with 53 additions and 41 deletions
... ... @@ -18,17 +18,17 @@ class Yohobuy
{
// /* 正式环境 */
// const API_URL = 'http://api2.open.yohobuy.com/';
// const API_URL2 = 'http://api.open.yohobuy.com/';
// const SERVICE_URL = 'http://service.api.yohobuy.com/';
// const YOHOBUY_URL = 'http://www.yohobuy.com/';
const API_URL = 'http://api2.open.yohobuy.com/';
const API_URL2 = 'http://api.open.yohobuy.com/';
const SERVICE_URL = 'http://service.api.yohobuy.com/';
const YOHOBUY_URL = 'http://www.yohobuy.com/';
/* 测试环境 */
const API_URL = 'http://test2.open.yohobuy.com/';
const SERVICE_URL = 'http://test.service.api.yohobuy.com/';
const YOHOBUY_URL = 'http://www.yohobuy.com/';
const API_URL_MYCENTER = 'http://192.168.102.213:8080/api-gateway-web/'; // 我的个人中心接口URL
const API_URL_SHOPINGCART = 'http://192.168.102.213:8080/api-gateway-web/'; // 我的购物车接口URL
// const API_URL = 'http://test2.open.yohobuy.com/';
// const SERVICE_URL = 'http://test.service.api.yohobuy.com/';
// const YOHOBUY_URL = 'http://www.yohobuy.com/';
// const API_URL_MYCENTER = 'http://192.168.102.213:8080/api-gateway-web/'; // 我的个人中心接口URL
// const API_URL_SHOPINGCART = 'http://192.168.102.213:8080/api-gateway-web/'; // 我的购物车接口URL
/**
* 私钥列表
... ...
... ... @@ -27,7 +27,9 @@ function editAddress(data) {
$addressForm.find('[name="area"]').val(data.area || '');
$addressForm.find('[name="address"]').val(data.address || '');
$editAddressPage.show();
$addressForm.find('[name="consignee"]').focus();
// $addressForm.find('[name="address"]').blur();
// $addressForm.find('[name="consignee"]').focus();
}
function deleteAddress(data) {
... ...
... ... @@ -142,8 +142,8 @@
input, textarea {
position: absolute;
top: 0;
right: 0;
width: pxToRem(400px);
right: pxToRem(40px);
width: pxToRem(360px);
height: pxToRem(88px);
color: #444;
padding: 0;
... ... @@ -156,6 +156,8 @@
}
textarea {
right: 0;
width: pxToRem(400px);
height: pxToRem(58px) * 2;
padding: pxToRem(20px) 0;
}
... ...
... ... @@ -78,7 +78,7 @@
font-size: pxToRem(32px);
line-height: pxToRem(88px);
span {
a {
color: #e0e0e0;
float: right;
}
... ... @@ -110,6 +110,7 @@
background: #fff;
.list-item {
display: block;
position: relative;
padding: 0 pxToRem(30px);
font-size: pxToRem(32px);
... ...
... ... @@ -11,15 +11,15 @@
</div>
</div>
<div class="my-link clearfix">
<a class="link-item" href="/home">
<a class="link-item" href="/home/">
{{product_favorite_total}}
<p>收藏的商品</p>
</a>
<a class="link-item" href="/home">
<a class="link-item" href="/home/">
{{brand_favorite_total}}
<p>收藏的品牌</p>
</a>
<a class="link-item" href="/home">
<a class="link-item" href="/home/">
{{product_browse}}
<p>浏览记录</p>
</a>
... ... @@ -27,9 +27,9 @@
<div class="my-order">
<div class="order-title">
我的订单
<span class="iconfont">
<a class="iconfont" href="/home/order">
查看全部订单 &#xe604;
</span>
</a>
</div>
<div class="order-type clearfix">
<a class="type-item" href="/home/order">
... ... @@ -47,44 +47,44 @@
</div>
</div>
<div class="group-list">
<div class="list-item">
<a class="list-item" href="/home/address">
<span class="iconfont icon">&#xe637;</span>
地址管理
<span class="iconfont num">3 &#xe604;</span>
</div>
</a>
</div>
<div class="group-list">
<div class="list-item">
<a class="list-item" href="/home/">
<span class="iconfont icon">&#xe63a;</span>
优惠券
<span class="iconfont num">{{coupon_num}} &#xe604;</span>
</div>
<div class="list-item">
</a>
<a class="list-item" href="/home/">
<span class="iconfont icon">&#xe635;</span>
YOHO 币
<span class="iconfont num">{{yoho_coin_num}} &#xe604;</span>
</div>
</a>
</div>
<div class="group-list">
<div class="list-item">
<a class="list-item" href="/home/">
<span class="iconfont icon">&#xe636;</span>
消息
<span class="iconfont num">{{inbox_total}} &#xe604;</span>
</div>
</a>
</div>
<div class="group-list">
<div class="list-item">
<a class="list-item" href="/home/">
<span class="iconfont icon">&#xe63c;</span>
在线客服
<span class="iconfont num">&#xe604;</span>
</div>
</a>
</div>
<div class="group-list">
<div class="list-item">
<a class="list-item" href="/home/">
<span class="iconfont icon">&#xe639;</span>
帮助
<span class="iconfont num">&#xe604;</span>
</div>
</a>
</div>
{{> product/recommend-for-you}}
... ...
... ... @@ -476,8 +476,12 @@ class HomeController extends AbstractAction
if (!empty($data)) {
$order['orders'] = $data;
} else {
if ($page > 1) {
echo " ";
} else {
$order['walkwayUrl'] = 'http://www.baidu.com';
}
}
//渲染模板
$this->_view->display('order-content', $order);
}
... ...
... ... @@ -123,44 +123,48 @@ class OrderModel
}
//根据type值设置nav属性
public function getNavs($type){
public function getNavs($type) {
$nav = array(
array(
'name' => '全部',
'typeId' => '1'
'typeId' => '1',
'url' => '/home/order?type=1'
),
array(
'name' => '待付款',
'typeId' => '2'
'typeId' => '2',
'url' => '/home/order?type=2'
),
array(
'name' => '待发货',
'typeId' => '3'
'typeId' => '3',
'url' => '/home/order?type=3'
),
array(
'name' => '待收货',
'typeId' => '4'
'typeId' => '4',
'url' => '/home/order?type=4'
)
);
foreach($nav as $key => $vo){
foreach ($nav as $key => $vo) {
switch ($type) {
case 1:
if($vo['typeId'] == 1){
if ($vo['typeId'] == 1) {
$nav[$key]['active'] = true;
}
break;
case 2:
if($vo['typeId'] == 2){
if ($vo['typeId'] == 2) {
$nav[$key]['active'] = true;
}
break;
case 3:
if($vo['typeId'] == 3){
if ($vo['typeId'] == 3) {
$nav[$key]['active'] = true;
}
break;
case 4:
if($vo['typeId'] == 4){
if ($vo['typeId'] == 4) {
$nav[$key]['active'] = true;
}
break;
... ... @@ -169,7 +173,6 @@ class OrderModel
}
}
return $nav;
}
}
... ...