diff --git a/service/Application/Admin/Lang/zh-cn/navigation.php b/service/Application/Admin/Lang/zh-cn/navigation.php index fd32ea1c9..859d075de 100755 --- a/service/Application/Admin/Lang/zh-cn/navigation.php +++ b/service/Application/Admin/Lang/zh-cn/navigation.php @@ -44,7 +44,8 @@ return array( 'navigation_nav_header_name' => '中间导航', 'navigation_nav_footer_name' => '底部导航', - 'goods_category_level_two' => '二级', - 'goods_category_level_three' => '三级', + 'navigation_category_level_one' => '一级', + 'navigation_category_level_two' => '二级', + 'navigation_category_level_three' => '三级', ); ?> \ No newline at end of file diff --git a/service/Application/Admin/View/Default/Navigation/Index.html b/service/Application/Admin/View/Default/Navigation/Index.html index 180f05495..7fa798a86 100755 --- a/service/Application/Admin/View/Default/Navigation/Index.html +++ b/service/Application/Admin/View/Default/Navigation/Index.html @@ -189,16 +189,15 @@ diff --git a/service/Application/Common/Common/function.php b/service/Application/Common/Common/function.php index a9b870449..da3ae6b8d 100755 --- a/service/Application/Common/Common/function.php +++ b/service/Application/Common/Common/function.php @@ -392,17 +392,17 @@ function NavDataDealWith($data) { // 文章分类 case 'article_category': - $v['url'] = HomeUrl('Channel', 'Index', ['id'=>$v['value'], 'viewid'=>$v['id']]); + $v['url'] = HomeUrl('Channel', 'Index', ['id'=>$v['value']]); break; // 自定义页面 case 'customview': - $v['url'] = HomeUrl('CustomView', 'Index', ['id'=>$v['value'], 'viewid'=>$v['id']]); + $v['url'] = HomeUrl('CustomView', 'Index', ['id'=>$v['value']]); break; // 商品分类 case 'goods_category': - $v['url'] = HomeUrl('Goods', 'Index', ['id'=>$v['value'], 'viewid'=>$v['id']]); + $v['url'] = HomeUrl('Search', 'Index', ['category_id'=>$v['value']]); break; } $data[$k] = $v; diff --git a/service/Application/Common/Lang/zh-cn.php b/service/Application/Common/Lang/zh-cn.php index 64b015221..a6ae4a667 100755 --- a/service/Application/Common/Lang/zh-cn.php +++ b/service/Application/Common/Lang/zh-cn.php @@ -362,8 +362,8 @@ return array( // 用户端 - 订单管理 'common_order_user_status' => array( 0 => array('id' => 0, 'name' => '待确认', 'checked' => true), - 1 => array('id' => 1, 'name' => '待支付'), - 2 => array('id' => 2, 'name' => '已支付'), + 1 => array('id' => 1, 'name' => '待付款'), + 2 => array('id' => 2, 'name' => '待发货'), 3 => array('id' => 3, 'name' => '待收货'), 4 => array('id' => 4, 'name' => '已完成'), 5 => array('id' => 5, 'name' => '已取消'), @@ -503,6 +503,13 @@ return array( 'app' => array('value' => 'app', 'name' => 'APP手机端'), ), + // 是否已评价 + 'common_comments_status_list' => array( + 0 => array('value' => 0, 'name' => '待评价'), + 1 => array('value' => 1, 'name' => '已评价'), + ), + + // 色彩值 'common_color_list' => array( diff --git a/service/Application/Home/Controller/CommonController.class.php b/service/Application/Home/Controller/CommonController.class.php index 7d221a29f..25e8217ee 100755 --- a/service/Application/Home/Controller/CommonController.class.php +++ b/service/Application/Home/Controller/CommonController.class.php @@ -5,6 +5,7 @@ namespace Home\Controller; use Think\Controller; use Service\GoodsService; use Service\NavigationService; +use Service\BuyService; /** * 前台 @@ -139,30 +140,6 @@ class CommonController extends Controller $this->assign('is_header', 1); $this->assign('is_footer', 1); - // 当前页面选择导航状态 - $nav_pid = 0; - $nav_id = 0; - foreach($this->nav_header as $v) - { - if(I('viewid') == $v['id']) - { - $nav_id = $v['id']; - } - if(!empty($v['item'])) - { - foreach($v['item'] as $vs) - { - if(I('viewid') == $vs['id']) - { - $nav_pid = $v['id']; - $nav_id = $vs['id']; - } - } - } - } - $this->assign('nav_pid', $nav_pid); - $this->assign('nav_id', $nav_id); - // 图片host地址 $this->assign('image_host', C('IMAGE_HOST')); @@ -183,6 +160,9 @@ class CommonController extends Controller // 商品大分类 $this->assign('goods_category_list', GoodsService::GoodsCategory()); + // 购物车商品总数 + $this->assign('common_cart_total', BuyService::CartTotal(['user'=>$this->user])); + // 当前控制器名称 $this->assign('controller_name', CONTROLLER_NAME); } diff --git a/service/Application/Home/Controller/IndexController.class.php b/service/Application/Home/Controller/IndexController.class.php index 5a658f528..c7c249488 100755 --- a/service/Application/Home/Controller/IndexController.class.php +++ b/service/Application/Home/Controller/IndexController.class.php @@ -5,6 +5,7 @@ namespace Home\Controller; use Service\BannerService; use Service\GoodsService; use Service\ArticleService; +use Service\OrderService; /** * 首页 @@ -52,6 +53,10 @@ class IndexController extends CommonController ]; $this->assign('article_list', ArticleService::ArticleList($params)); + // 用户订单状态 + $user_order_status = OrderService::OrderStatusStepTotal(['user_type'=>'user', 'user'=>$this->user, 'is_comments'=>1]); + $this->assign('user_order_status', $user_order_status['data']); + $this->display('Index'); } } diff --git a/service/Application/Home/Controller/OrderController.class.php b/service/Application/Home/Controller/OrderController.class.php index 8ffc370f7..a9183c646 100755 --- a/service/Application/Home/Controller/OrderController.class.php +++ b/service/Application/Home/Controller/OrderController.class.php @@ -84,6 +84,9 @@ class OrderController extends CommonController // 支付状态 $this->assign('common_order_pay_status', L('common_order_pay_status')); + // 评价状态 + $this->assign('common_comments_status_list', L('common_comments_status_list')); + // 参数 $this->assign('params', $params); $this->display('Index'); diff --git a/service/Application/Home/View/Default/Cart/Index.html b/service/Application/Home/View/Default/Cart/Index.html index ddc7adcc2..af34d6f5c 100755 --- a/service/Application/Home/View/Default/Cart/Index.html +++ b/service/Application/Home/View/Default/Cart/Index.html @@ -77,7 +77,7 @@ ¥{{$goods.total_price}} - 删除 + 删除 @@ -126,4 +126,22 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/service/Application/Home/View/Default/CustomView/Index.html b/service/Application/Home/View/Default/CustomView/Index.html index 229bac746..88d389bff 100755 --- a/service/Application/Home/View/Default/CustomView/Index.html +++ b/service/Application/Home/View/Default/CustomView/Index.html @@ -17,7 +17,7 @@ -
style="{{$max_width_style}}">{{$data.content}}
+
class="am-container">{{$data.content}}
diff --git a/service/Application/Home/View/Default/Index/Index.html b/service/Application/Home/View/Default/Index/Index.html index dbad29b2a..9dc06103b 100755 --- a/service/Application/Home/View/Default/Index/Index.html +++ b/service/Application/Home/View/Default/Index/Index.html @@ -84,10 +84,13 @@ diff --git a/service/Application/Home/View/Default/Order/Detail.html b/service/Application/Home/View/Default/Order/Detail.html index 6c2cb207d..545494dd8 100755 --- a/service/Application/Home/View/Default/Order/Detail.html +++ b/service/Application/Home/View/Default/Order/Detail.html @@ -173,7 +173,7 @@ 评价 - +
diff --git a/service/Application/Home/View/Default/Order/Index.html b/service/Application/Home/View/Default/Order/Index.html index b52b208fe..6e73f3f1a 100755 --- a/service/Application/Home/View/Default/Order/Index.html +++ b/service/Application/Home/View/Default/Order/Index.html @@ -96,6 +96,17 @@ + + 评价: + + diff --git a/service/Application/Home/View/Default/Public/HeaderNav.html b/service/Application/Home/View/Default/Public/HeaderNav.html index 3ea3424a5..676d0fe27 100755 --- a/service/Application/Home/View/Default/Public/HeaderNav.html +++ b/service/Application/Home/View/Default/Public/HeaderNav.html @@ -11,9 +11,13 @@ -
diff --git a/service/Application/Home/View/Default/Public/HeaderTopNav.html b/service/Application/Home/View/Default/Public/HeaderTopNav.html index fc9856209..dbede74fb 100755 --- a/service/Application/Home/View/Default/Public/HeaderTopNav.html +++ b/service/Application/Home/View/Default/Public/HeaderTopNav.html @@ -20,29 +20,32 @@ diff --git a/service/Application/Home/View/Default/Public/UserMenu.html b/service/Application/Home/View/Default/Public/UserMenu.html index 7f8168275..928dce7c5 100755 --- a/service/Application/Home/View/Default/Public/UserMenu.html +++ b/service/Application/Home/View/Default/Public/UserMenu.html @@ -13,7 +13,7 @@