devil_gong
|
|
@ -77,18 +77,15 @@ class UserController extends CommonController
|
|||
$user_order_status = OrderService::OrderStatusStepTotal(['user_type'=>'user', 'user'=>$this->user, 'is_comments'=>1]);
|
||||
$this->assign('user_order_status', $user_order_status['data']);
|
||||
|
||||
// 参数
|
||||
// 获取列表
|
||||
$params = array_merge($_POST, $_GET);
|
||||
$params['user'] = $this->user;
|
||||
|
||||
// 条件
|
||||
$params['is_more'] = 1;
|
||||
$params['status'] = [1,2,3];
|
||||
$where = OrderService::UserOrderListWhere($params);
|
||||
|
||||
// 获取列表
|
||||
$order_params = array(
|
||||
'limit_start' => 0,
|
||||
'limit_number' => 6,
|
||||
'is_items' => 0,
|
||||
'limit_number' => 3,
|
||||
'where' => $where,
|
||||
);
|
||||
$order = OrderService::OrderList($order_params);
|
||||
|
|
|
|||
|
|
@ -111,57 +111,36 @@
|
|||
<div class="am-panel-hd"><i></i>交易提醒</div>
|
||||
<div class="am-panel-bd">
|
||||
<notempty name="order_list">
|
||||
<table class="am-table">
|
||||
<tbody>
|
||||
<foreach name="order_list" item="v">
|
||||
<tr id="data-list-{{$v.id}}" data-id="{{$v.id}}" data-goods-id="{{$v.goods_id}}">
|
||||
<td class="base">
|
||||
<div class="goods-detail">
|
||||
<a href="{{$v.goods_url}}" target="_blank">
|
||||
<img src="{{$v.images}}" />
|
||||
</a>
|
||||
<div class="goods-base">
|
||||
<a href="{{$v.goods_url}}" target="_blank" class="goods-title">{{$v.title}}</a>
|
||||
<notempty name="goods.attribute">
|
||||
<ul class="goods-attr">
|
||||
<foreach name="goods.attribute" item="attr">
|
||||
<li>{{$attr.attr_type_name}}：{{$attr.attr_name}}</li>
|
||||
</foreach>
|
||||
</ul>
|
||||
</notempty>
|
||||
</div>
|
||||
</div>
|
||||
<div class="wap-base am-show-sm-only">
|
||||
<if condition="$goods['original_price'] gt 0">
|
||||
<span class="original-price">￥{{$v.original_price}}</span>
|
||||
</if>
|
||||
<strong class="total-price-content">￥{{$v.price}}</strong>
|
||||
<span class="wap-number">x{{$v.buy_number}}</span>
|
||||
</div>
|
||||
</td>
|
||||
<td class="price am-hide-sm-only">
|
||||
<if condition="$goods['original_price'] gt 0">
|
||||
<p class="original-price">￥{{$v.original_price}}</p>
|
||||
</if>
|
||||
<p class="line-price">￥{{$v.price}}</p>
|
||||
</td>
|
||||
<td class="number am-hide-sm-only">
|
||||
x{{$v.buy_number}}
|
||||
</td>
|
||||
<td class="total-price am-hide-sm-only">
|
||||
<strong class="total-price-content">￥{{$v.total_price}}</strong>
|
||||
</td>
|
||||
</tr>
|
||||
</foreach>
|
||||
</tbody>
|
||||
</table>
|
||||
<foreach name="order_list" item="v">
|
||||
<foreach name="v.items" key="key" item="goods">
|
||||
<if condition="$key eq 0">
|
||||
<div class="goods-detail">
|
||||
<a href="{{$goods.goods_url}}" target="_blank">
|
||||
<img src="{{$goods.images}}" />
|
||||
</a>
|
||||
<div class="goods-base">
|
||||
<a href="{{$goods.goods_url}}" target="_blank" class="goods-title ellipsis">{{$goods.title}}</a>
|
||||
<ul>
|
||||
<li>
|
||||
<span>{{$v.add_time_time}}</span>
|
||||
<span class="order-price">￥{{$v.price}}</span>
|
||||
<if condition="$v['items_count'] gt 1">
|
||||
<span class="items-count">{{$v.items_count}}中商品</span>
|
||||
</if>
|
||||
</li>
|
||||
<li>{{$v.status_name}}</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</if>
|
||||
</foreach>
|
||||
</foreach>
|
||||
</notempty>
|
||||
<empty name="order_list">
|
||||
<div class="table-no">
|
||||
<p>
|
||||
<i class="am-icon-warning"></i> {{:L('common_not_data_tips')}}
|
||||
</p>
|
||||
<a href="{{:U('Home/Order/Index')}}" class="am-btn am-btn-default am-radius am-btn-xs">查看全部订单</a>
|
||||
<i class="am-icon-cube am-icon-lg block"></i>
|
||||
<p class="tips-name">查看全部订单</p>
|
||||
<p class="tips-msg">交易提醒可帮助您了解订单状态和物流情况</p>
|
||||
</div>
|
||||
</empty>
|
||||
</div>
|
||||
|
|
@ -171,7 +150,13 @@
|
|||
<div class="am-panel am-panel-default">
|
||||
<div class="am-panel-hd"><i></i>购物车</div>
|
||||
<div class="am-panel-bd">
|
||||
面板内容
|
||||
<empty name="cart_list">
|
||||
<div class="table-no">
|
||||
<i class="am-icon-opencart am-icon-lg block"></i>
|
||||
<p class="tips-name">您的购物车还是空的</p>
|
||||
<p class="tips-msg">将想买的商品放进购物车，一起结算更轻松</p>
|
||||
</div>
|
||||
</empty>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -179,7 +164,13 @@
|
|||
<div class="am-panel am-panel-default">
|
||||
<div class="am-panel-hd"><i></i>商品收藏</div>
|
||||
<div class="am-panel-bd">
|
||||
面板内容
|
||||
<empty name="goods_favor_list">
|
||||
<div class="table-no">
|
||||
<i class="am-icon-heart-o am-icon-lg block"></i>
|
||||
<p class="tips-name">您还没有收藏商品</p>
|
||||
<p class="tips-msg">收藏的商品将显示最新的促销活动和降价情况</p>
|
||||
</div>
|
||||
</empty>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -187,7 +178,13 @@
|
|||
<div class="am-panel am-panel-default">
|
||||
<div class="am-panel-hd"><i></i>我的足迹</div>
|
||||
<div class="am-panel-bd">
|
||||
面板内容
|
||||
<empty name="goods_favor_list">
|
||||
<div class="table-no">
|
||||
<i class="am-icon-lastfm am-icon-lg block"></i>
|
||||
<p class="tips-name">您的商品浏览记录为空</p>
|
||||
<p class="tips-msg">赶紧去商城看看促销活动吧</p>
|
||||
</div>
|
||||
</empty>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -422,9 +422,13 @@ class OrderService
|
|||
{
|
||||
$where['pay_status'] = intval($params['pay_status']);
|
||||
}
|
||||
if(isset($params['status']) && $params['status'] > -1)
|
||||
if(isset($params['status']) && $params['status'] != -1)
|
||||
{
|
||||
$where['status'] = intval($params['status']);
|
||||
if(!is_array($params['status']))
|
||||
{
|
||||
$params['status'] = explode(',', $params['status']);
|
||||
}
|
||||
$where['status'] = ['in', $params['status']];
|
||||
}
|
||||
|
||||
// 评价状态
|
||||
|
|
@ -543,6 +547,10 @@ class OrderService
|
|||
$v['receive_province_name'] = ResourcesService::RegionName(['region_id'=>$v['receive_province']]);
|
||||
$v['receive_city_name'] = ResourcesService::RegionName(['region_id'=>$v['receive_city']]);
|
||||
$v['receive_county_name'] = ResourcesService::RegionName(['region_id'=>$v['receive_county']]);
|
||||
|
||||
// 时间
|
||||
$v['add_time_time'] = date('Y-m-d H:i:s', $v['add_time']);
|
||||
$v['add_time_date'] = date('Y-m-d', $v['add_time']);
|
||||
|
||||
// 订单详情
|
||||
if($is_items == 1)
|
||||
|
|
|
|||
|
|
@ -211,4 +211,4 @@ strong.total-price-content { color: #d2364c; font-size: 16px; }
|
|||
.cart-content table tr .number { width: 20%; }
|
||||
.cart-content table tr .total-price { width: 20%; }
|
||||
.cart-content { margin-top: 20px; }
|
||||
}
|
||||
}
|
||||
|
|
@ -72,6 +72,24 @@ ul.order-base li span.am-badge{position: absolute; top: -7px; left: 55%;}
|
|||
.various .am-panel-default > .am-panel-hd {
|
||||
padding: 5px;
|
||||
}
|
||||
.various i.am-icon-lg {
|
||||
color: #e8e8e8;
|
||||
font-size: 18px;
|
||||
}
|
||||
.various .tips-name {
|
||||
font-size: 16px;
|
||||
font-weight: 500;
|
||||
color: #b9b7b7;
|
||||
}
|
||||
.various .tips-msg {
|
||||
color: #ccc;
|
||||
}
|
||||
|
||||
.various .am-panel-bd {
|
||||
min-height: 212px;
|
||||
max-height: 212px;
|
||||
padding: 0 5px;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -106,4 +124,17 @@ ul.order-base li span.am-badge{position: absolute; top: -7px; left: 55%;}
|
|||
background-color: #fff;
|
||||
border-bottom: 1px solid #f1f1f1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 商品列表
|
||||
*/
|
||||
.goods-detail { position: relative; padding: 5px 0; }
|
||||
.goods-detail:not(:last-child) { border-bottom: 1px solid #eee; }
|
||||
.goods-detail img { width: 60px; height: 60px; }
|
||||
.goods-title { display: block; max-height: 36px; overflow: hidden; text-overflow: ellipsis; font-weight: 500; }
|
||||
.goods-title:hover { text-decoration: underline; }
|
||||
.goods-base { position: absolute; top: 5px; left: 65px; width: calc(100% - 70px); }
|
||||
.goods-base ul li span:not(:first-child) { margin-left: 10px; }
|
||||
.goods-base .order-price { color: #d2364c; font-weight: 700; }
|
||||
.goods-base ul li { color: #777; }
|
||||
|
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 7.9 KiB |
|
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 35 KiB |
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 666 B After Width: | Height: | Size: 666 B |
0
service/Public/Home/Default/Images/user-index-nav-order-icon-100.png
Normal file → Executable file
|
Before Width: | Height: | Size: 781 B After Width: | Height: | Size: 781 B |
|
Before Width: | Height: | Size: 579 B After Width: | Height: | Size: 579 B |
|
Before Width: | Height: | Size: 669 B After Width: | Height: | Size: 669 B |
|
Before Width: | Height: | Size: 461 B After Width: | Height: | Size: 461 B |