优化

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'			=> '二级',
+	'navigation_category_level_one'				=>	'一级',
-	'goods_category_level_three'		=> '三级',
+	'navigation_category_level_two'				=>	'二级',
+	'navigation_category_level_three'			=>	'三级',
 );
 ?>

service/Application/Admin/View/Default/Navigation/Index.html

@@ -189,16 +189,15 @@
 							<select class="am-radius c-p chosen-select" name="value" data-placeholder="{{:L('common_please_select_choose')}}" data-validation-message="{{:L('navigation_goods_category_id_format')}}" required>
 								<option value="">{{:L('common_please_select_choose')}}</option>
 								<foreach name="goods_category_list" item="v">
-									<optgroup label="{{$v.name}}">
+									<option value="{{$v.id}}" <if condition="!empty($data['category_ids']) and in_array($v['id'], $data['category_ids'])">selected</if>>{{:L('navigation_category_level_one')}} - {{$v.name}}</option>
-										<if condition="!empty($v['items'])">
+									<if condition="!empty($v['items'])">
-											<foreach name="v.items" item="vs">
+										<foreach name="v.items" item="vs">
-												<option style="padding-left: 30px;" value="{{$vs.id}}" <if condition="!empty($data['category_ids']) and in_array($vs['id'], $data['category_ids'])">selected</if>>{{:L('goods_category_level_two')}}-{{$vs.name}}</option>
+											<option style="padding-left: 30px;" value="{{$vs.id}}" <if condition="!empty($data['category_ids']) and in_array($vs['id'], $data['category_ids'])">selected</if>>{{:L('navigation_category_level_two')}} - {{$vs.name}}</option>
-												<foreach name="vs.items" item="vss">
+											<foreach name="vs.items" item="vss">
-													<option style="padding-left: 60px;" value="{{$vss.id}}" <if condition="!empty($data['category_ids']) and in_array($vss['id'], $data['category_ids'])">selected</if>>{{:L('goods_category_level_three')}}-{{$vss.name}}</option>
+												<option style="padding-left: 60px;" value="{{$vss.id}}" <if condition="!empty($data['category_ids']) and in_array($vss['id'], $data['category_ids'])">selected</if>>{{:L('navigation_category_level_three')}} - {{$vss.name}}</option>
-												</foreach>
 											</foreach>
-										</if>
+										</foreach>
-									</optgroup>
+									</if>
 								</foreach>
 							</select>
 						</div>

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;

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' => '待支付'),
+			1 => array('id' => 1, 'name' => '待付款'),
-			2 => array('id' => 2, '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(

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);
 	}

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');
 	}
 }

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');

service/Application/Home/View/Default/Cart/Index.html

@@ -77,7 +77,7 @@
                             <strong class="total-price-content">￥{{$goods.total_price}}</strong>
                         </td>
                         <td class="operation">
-                            <a href="javascript:;" class="submit-delete" data-url="{{:U('Home/Cart/Delete')}}" data-id="{{$goods.id}}">删除</a>
+                            <a href="javascript:;" class="submit-delete" data-url="{{:U('Home/Cart/Delete')}}" data-id="{{$goods.id}}" data-view="fun" data-value="ViewDeleteBack">删除</a>
                         </td>
                     </tr>
                 </foreach>
@@ -126,4 +126,22 @@
 
 <!-- footer start -->
 <include file="Public/Footer" />
-<!-- footer end -->
+<!-- footer end -->
+
+<script type="text/javascript">
+    // 返回处理
+    function ViewDeleteBack(e)
+    {
+        if(e.code == 0)
+        {
+            $.AMUI.progress.done();
+            Prompt(e.msg, 'success');
+            $('#data-list-'+e.data_id).remove();
+            $('.top-nav-cart-total').text(parseInt(e.data));
+        } else {
+            $('form.form-validation').find('button[type="submit"]').button('reset');
+            $.AMUI.progress.done();
+            Prompt(e.msg);
+        }
+    }
+</script>

service/Application/Home/View/Default/CustomView/Index.html

@@ -17,7 +17,7 @@
 <!-- header nav end -->
 
 <!-- content start -->
-<div class="am-g custom-content" <if condition="!isset($data['is_full_screen']) or $data['is_full_screen'] eq 0"><if condition="!empty($max_width_style)">style="{{$max_width_style}}"</if></if>>{{$data.content}}</div>
+<div <if condition="!isset($data['is_full_screen']) or $data['is_full_screen'] eq 0">class="am-container"</if>>{{$data.content}}</div>
 <!-- content end -->
 
 <!-- footer start -->

service/Application/Home/View/Default/Index/Index.html

@@ -84,10 +84,13 @@
 			</if>
 			<if condition="!empty($user)">
 				<div class="member-center">
-					<a href="{{:U('Home/Order/Index', ['is_more'=>1, 'status'=>1])}}"><strong>0</strong>待付款</a>
+					<foreach name="user_order_status" item="v">
-					<a href="{{:U('Home/Order/Index', ['is_more'=>1, 'status'=>2])}}"><strong>0</strong>待发货</a>
+						<if condition="in_array($v['status'], [1,2,3])">
-					<a href="{{:U('Home/Order/Index', ['is_more'=>1, 'status'=>3])}}"><strong>0</strong>待收货</a>
+							<a href="{{:U('Home/Order/Index', ['is_more'=>1, 'status'=>$v['status']])}}"><strong>{{$v.count}}</strong>{{$v.name}}</a>
-					<a href="{{:U('Home/Order/Index', ['is_more'=>1, 'is_comment_user'=>0])}}"><strong>0</strong>待评价</a>
+						<elseif condition="in_array($v['status'], [100])" />
+							<a href="{{:U('Home/Order/Index', ['is_more'=>1, 'is_comments'=>0, 'status'=>4])}}"><strong>{{$v.count}}</strong>{{$v.name}}</a>
+						</if>
+					</foreach>
 				</div>
 			</if>
 		</div>

service/Application/Home/View/Default/Order/Detail.html

@@ -173,7 +173,7 @@
                             <a href="{{:U('Home/Order/Comments', ['id'=>$data['id']])}}" target="_blank" class="am-btn am-btn-primary am-btn-xs am-radius">评价</a>
                         </if>
                         <if condition="in_array($data['status'], [4,5,6])">
-                            <button type="button" class="am-btn am-btn-danger am-btn-xs am-radius submit-delete" data-url="{{:U('Home/Order/Delete')}}" data-id="{{$data.id}}" data-view="jump" data-jump="{{:U('Home/Order/Index')}}">删除</button>
+                            <button type="button" class="am-btn am-btn-danger am-btn-xs am-radius submit-delete" data-url="{{:U('Home/Order/Delete')}}" data-id="{{$data.id}}" data-view="jump" data-value="{{:U('Home/Order/Index')}}">删除</button>
                         </if>
                     </div>
                     <div class="logistics">

service/Application/Home/View/Default/Order/Index.html

@@ -96,6 +96,17 @@
                                     </notempty>
                                 </select>
                             </td>
+                            <td>
+                                <span>评价：</span>
+                                <select name="is_comments" class="chosen-select" data-placeholder="评价状态...">
+                                    <option value="-1">评价状态...</option>
+                                    <notempty name="common_comments_status_list">
+                                        <foreach name="common_comments_status_list" item="comments">
+                                            <option value="{{$comments.value}}" <if condition="isset($params['is_comments']) and $params['is_comments'] eq $comments['value']">selected</if>>{{$comments.name}}</option>
+                                        </foreach>
+                                    </notempty>
+                                </select>
+                            </td>
                         </tr>
                         <tr>
                             <td>

service/Application/Home/View/Default/Public/HeaderNav.html

@@ -11,9 +11,13 @@
                     </foreach>
                 </if>
         	</ul>
-            <div class="nav-extra">
+            <div class="nav-extra <if condition="empty($user)">login-event</if>">
-            	<i class="am-icon-user-secret am-icon-md nav-user"></i><b></b>我的福利
+                <a href="<if condition="empty($user)">javascript:;<else />{{:U('Home/User/Index')}}</if>">
-            	<i class="am-icon-angle-right" style="padding-left: 10px;"></i>
+                    <img src="<if condition="!empty($user['avatar'])">{{$user.avatar}}<else />__PUBLIC__/Home/{{$default_theme}}/Images/default-user-avatar.jpg</if>" class="nav-user" />
+                	<!-- <i class="am-icon-user-secret am-icon-md nav-user"></i> --><b></b>
+                    <span>我的商城</span>
+                	<i class="am-icon-angle-right"></i>
+                </a>
             </div>
         </div>
     </div>

service/Application/Home/View/Default/Public/HeaderTopNav.html

@@ -20,29 +20,32 @@
             </div>
         </ul>
         <ul class="top-nav-right">
-            <div class="top-nav-items home">
+            <div class="top-nav-items">
-                <div class="menu-hd">
+                <div class="menu-hd <if condition="empty($user)">login-event</if>">
-                    <a href="{{:__MY_URL__}}" target="_top" class="h">商城首页</a>
-                </div>
-            </div>
-            <div class="top-nav-items my-shangcheng">
-                <div class="menu-hd MyShangcheng <if condition="empty($user)">login-event</if>">
                     <a href="<if condition="empty($user)">javascript:;<else />{{:U('Home/User/Index')}}</if>" target="_top">
                         <i class="am-icon-user am-icon-fw"></i>
                         <span>个人中心</span>
                     </a>
                 </div>
             </div>
-            <div class="top-nav-items mini-cart">
+            <div class="top-nav-items">
-                <div class="menu-hd <if condition="empty($user)">login-event</if>">
+                <div class="am-dropdown menu-hd <if condition="empty($user)">login-event</if>" data-am-dropdown>
-                    <a id="mc-menu-hd" href="<if condition="empty($user)">javascript:;<else />{{:U('Home/Cart/Index')}}</if>" target="_top">
+                    <a class="am-dropdown-toggle" href="javascript:;" target="_top" data-am-dropdown-toggle>
-                        <i class="am-icon-shopping-cart  am-icon-fw"></i>
+                        <i class="am-icon-cube am-icon-fw"></i>
-                        <span>购物车</span>
+                        <span>我的交易</span>
-                        <strong id="J_MiniCartNum" class="h">0</strong>
+                        <i class="am-icon-caret-down"></i>
                     </a>
+                    <notempty name="user">
+                        <ul class="am-dropdown-content">
+                            <li>
+                                <a href="<if condition="empty($user)">javascript:;<else />{{:U('Home/Order/Index')}}</if>">我的订单</a>
+                            </li>
+                        </ul>
+                    </notempty>
                 </div>
             </div>
-            <div class="top-nav-items favorite">
+
+            <div class="top-nav-items">
                 <div class="am-dropdown menu-hd <if condition="empty($user)">login-event</if>" data-am-dropdown>
                     <a class="am-dropdown-toggle" href="javascript:;" target="_top" data-am-dropdown-toggle>
                         <i class="am-icon-heart am-icon-fw"></i>
@@ -58,6 +61,15 @@
                     </notempty>
                 </div>
             </div>
+            <div class="top-nav-items top-nav-mini-cart">
+                <div class="menu-hd <if condition="empty($user)">login-event</if>">
+                    <a id="mc-menu-hd" href="<if condition="empty($user)">javascript:;<else />{{:U('Home/Cart/Index')}}</if>" target="_top">
+                        <i class="am-icon-shopping-cart  am-icon-fw"></i>
+                        <span>购物车</span>
+                        <strong class="am-badge am-badge-danger am-round top-nav-cart-total">{{$common_cart_total}}</strong>
+                    </a>
+                </div>
+            </div>
         </ul>
     </div>
 </div>

service/Application/Home/View/Default/Public/UserMenu.html

@@ -13,7 +13,7 @@
               <ul class="am-list am-collapse user-sidebar-sub am-in" id="collapse-nav-{{$k}}">
                 <foreach name="v.item" item="vs">
                   <if condition="$vs['is_show'] eq 1">
-                    <li data-value="user-left-menu-{{:strtolower($vs['control'].'-'.$vs['action'])}}" class="user-left-menu-{{:strtolower($vs['control'].'-'.$vs['action'])}}">
+                    <li data-value="user-left-menu-{{:strtolower($vs['control'].'-'.$vs['action'])}}" class="user-left-menu-{{:strtolower($vs['control'].'-'.$vs['action'])}} <if condition="strtolower(CONTROLLER_NAME) eq strtolower($vs['control']) and strtolower(CONTROLLER_NAME) neq 'user'">am-active</if>">
                       <a href="{{:U('Home/'.$vs['control'].'/'.$vs['action'])}}" class="am-cf"><if condition="!empty($vs['icon'])"><i class="{{$vs.icon}}"></i></if> {{$vs.name}}</a>
                     </li>
                   </if>

service/Application/Service/BuyService.class.php

@@ -81,14 +81,14 @@ class BuyService
             $data['add_time'] = time();
             if($m->add($data) > 0)
             {
-                return DataReturn(L('common_join_success'), 0);
+                return DataReturn(L('common_join_success'), 0, self::CartTotal($params));
             }
         } else {
             $data['upd_time'] = time();
             $data['stock'] += $temp['stock'];
             if($m->where($where)->save($data))
             {
-                return DataReturn(L('common_join_success'), 0);
+                return DataReturn(L('common_join_success'), 0, self::CartTotal($params));
             }
         }
         
@@ -213,7 +213,7 @@ class BuyService
         ];
         if(M('Cart')->where($where)->delete())
         {
-            return DataReturn(L('common_operation_delete_success'), 0);
+            return DataReturn(L('common_operation_delete_success'), 0, self::CartTotal($params));
         }
         return DataReturn(L('common_operation_delete_error'), -100);
     }
@@ -649,5 +649,32 @@ class BuyService
         ];
         return DataReturn($msg, 0, $result);
     }
+
+    /**
+     * 购物车总数
+     * @author   Devil
+     * @blog    http://gong.gg/
+     * @version 1.0.0
+     * @date    2018-09-29
+     * @desc    description
+     * @param   [array]          $params [输入参数]
+     */
+    public static function CartTotal($params = [])
+    {
+        // 请求参数
+        $p = [
+            [
+                'checked_type'      => 'empty',
+                'key_name'          => 'user',
+                'error_msg'         => '用户信息有误',
+            ],
+        ];
+        $ret = params_checked($params, $p);
+        if($ret !== true)
+        {
+            return 0;
+        }
+        return (int) M('Cart')->where(['user_id'=>$params['user']['id']])->count();
+    }
 }
 ?>

service/Application/Service/OrderService.class.php

@@ -427,6 +427,12 @@ class OrderService
                 $where['status'] = intval(I('status', 0));
             }
 
+            // 评价状态
+            if(I('is_comments', -1) > -1)
+            {
+                $where['user_is_comments'] = (I('is_comments', 0) == 0) ? 0 : ['GT', 0];
+            }
+
             // 时间
             if(!empty($_REQUEST['time_start']))
             {
@@ -986,5 +992,91 @@ class OrderService
         return DataReturn(L('common_operation_comments_success'), 0);
     }
 
+    /**
+     * 订单每个状态总数
+     * @author   Devil
+     * @blog    http://gong.gg/
+     * @version 1.0.0
+     * @date    2018-10-10
+     * @desc    description
+     * @param   [array]          $params [输入参数]
+     */
+    public static function OrderStatusStepTotal($params = [])
+    {
+        // 用户类型
+        $user_type = isset($params['user_type']) ? $params['user_type'] : '';
+
+        // 条件
+        $where = [];
+        $where['is_delete_time'] = 0;
+
+        // 用户类型
+        switch($user_type)
+        {
+            case 'user' :
+                $where['user_is_delete_time'] = 0;
+                break;
+        }
+
+        // 新增用户条件
+        if($user_type == 'user' && !empty($params['user']))
+        {
+            $where['user_id'] = $params['user']['id'];
+        }
+
+        $field = 'COUNT(DISTINCT id) AS count, status';
+        $data = M('Order')->where($where)->field($field)->group('status')->select();
+
+        // 状态数据封装
+        $result = [];
+        $order_status_list = L('common_order_user_status');
+        foreach(L('common_order_user_status') as $v)
+        {
+            $result[$v['id']] = [
+                'name'      => $v['name'],
+                'status'    => $v['id'],
+                'count'     => 0,
+            ];
+        }
+
+        // 数据处理
+        if(!empty($data))
+        {
+            
+            foreach($data as $v)
+            {
+                if(isset($result[$v['status']]))
+                {
+                    $result[$v['status']]['count'] = $v['count'];
+                }
+            }
+            sort($result);
+
+            // 待评价状态站位100
+            if(isset($params['is_comments']) && $params['is_comments'] == 1)
+            {
+                switch($user_type)
+                {
+                    case 'user' :
+                        $where['user_is_comments'] = 0;
+                        break;
+                    case 'admin' :
+                        $where['is_comments'] = 0;
+                        break;
+                    default :
+                        $where['user_is_comments'] = 0;
+                        $where['is_comments'] = 0;
+                }
+                $where['status'] = 4;
+                $result[] = [
+                    'name'      => '待评价',
+                    'status'    => 100,
+                    'count'     => (int) M('Order')->where($where)->count(),
+                ];
+            }
+        }
+        return DataReturn('处理成功', 0, $result);
+    }
+
 }
 ?>

service/Public/Common/Js/Common.js

@@ -703,7 +703,7 @@ function DataDelete(e)
 	var id = e.data('id');
 	var url = e.data('url');
 	var view = e.data('view') || 'delete';
-	var jump = e.data('jump') || null;
+	var value = e.data('value') || null;
 	var title = e.data('title') || '温馨提示';
 	var msg = e.data('msg') || '删除后不可恢复、确认操作吗？';
 
@@ -750,6 +750,7 @@ function DataDelete(e)
 								case 'fun' :
 									if(IsExitsFunction(value))
 			                		{
+			                			result['data_id'] = id;
 			                			window[value](result);
 			                		} else {
 			                			Prompt('['+value+']配置方法未定义');
@@ -759,11 +760,11 @@ function DataDelete(e)
 								// 跳转
 								case 'jump' :
 									Prompt(result.msg, 'success');
-									if(jump != null)
+									if(value != null)
 									{
 										setTimeout(function()
 										{
-											window.location.href = jump;
+											window.location.href = value;
 										}, 1500);
 									}
 									break;

service/Public/Home/Default/Css/Common.css

@@ -42,7 +42,9 @@ button { outline: none; }
 .clear{ clear:both} 
 
 img, input {
-    vertical-align: middle;}
+    vertical-align: middle;
+    max-width: 100%;
+}
 a {
   color: #333;
   text-decoration: none;
@@ -177,9 +179,11 @@ color: #F5F5F2;font-size: 14px;cursor:pointer;border-radius:0px 0px ;}
     .nav-cont li a {font-size: 16px;color: #333;line-height: 36px;margin-left: -1px;padding: 0 25px;text-decoration: none;font-weight: 700;display: inline-block;vertical-align: middle;}
     .nav-cont li a:hover { color:#d2364c; }
 
-    .nav-cont .nav-extra{position: absolute;right:0px ;top:6px;font-size: 16px;color:#fcff00;line-height:33px;height:33px ;width:160px;text-align:center;background: url(../Images/extra.png);cursor: pointer;}
+    .nav-cont .nav-extra{position: absolute;right:0px ;top:6px;font-size: 16px;line-height:33px;height:33px ;width:120px;text-align:center;background: #e1363f;cursor: pointer;}
-    .nav-cont .nav-extra i.nav-user{background:#000 ;color:#fff ;width: 33px;height: 33px;border-radius: 33px;position: absolute;left:-28px;z-index: 99;padding: 5px;overflow: hidden;}
+    .nav-cont .nav-extra .nav-user{background:#e0313b; width: 33px;height: 33px;border-radius: 33px;position: absolute;left:-28px;z-index: 2;padding: 1px;overflow: hidden;}
-    .nav-cont .nav-extra b{display:block;position: absolute;width: 45px;height: 45px;border-radius:45px;z-index: 1;left: -33px;top: -8px;background: #fff;}
+    .nav-cont .nav-extra b{display:block;position: absolute;width: 40px;height: 40px;border-radius:45px;z-index: 1;left: -31px;top: -4px;background: #fff;}
+    .nav-cont .nav-extra .am-icon-angle-right { margin-left: 5px; }
+    .nav-cont .nav-extra * { color:#fcff00; text-decoration: none; }
     b.line{display: block;width:100%;height:2px ;border-bottom:2px solid #d2364c;position: absolute;top:180px;z-index:5;}
 
     /*分类*/
@@ -257,6 +261,7 @@ color: #F5F5F2;font-size: 14px;cursor:pointer;border-radius:0px 0px ;}
     /*导航*/
     .goods-category-title {width:180px;}
     .nav-cont {padding-left: 180px;}
+    .nav-cont ul { overflow: hidden; }
 
     /* 分类 */
     #goods-category .category-content{ position:relative; width: 180px; float: left; z-index: 113; top: 45px; }

service/Public/Home/Default/Css/Goods.css

@@ -354,8 +354,9 @@ li.am-comment{ width:100%}
            
      /*价格*/ 
     .tb-detail-hd h1 {font-size:18px;}
-
+    .tb-detail-price { overflow: hidden;height:75px;padding-top:10px; }
-    .tb-detail-price{background: #F7F7F7 url(data:image/png;base64,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);overflow: hidden;height:75px;padding-top:10px ;}
+    /*.tb-detail-price{background: #F7F7F7 url(data:image/png;base64,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); }*/
+    .tb-detail-price{ background: #fcf1e3 url(../Images/goods_meta_bg.png); background-size: cover; -moz-background-size: cover; background-repeat: no-repeat; }
     .tb-detail-price li {display: block;margin:0px 10px;}
     .tb-detail-price li  dt {width: 70px;float:left;text-align: left;}
     .sys_item_price{font-size: 24px;font-weight: bold;}

service/Public/Home/Default/Css/Search.css

@@ -62,7 +62,7 @@ li.select-result dt {left:-26px; top:0;font-weight:bold;width:50px;}
 dl#select2 .dd-conent{ left:-100%; right:-100%;}
 dl#select3 .dd-conent{ left:-200%; right:0px;}
        
-.am-badge{font-size:12px ;padding:0px 0px;background-color: #999999;color: #ffffff;}
+.search-content .am-badge{font-size:12px ;padding:0px 0px;background-color: #999999;color: #ffffff;}
 .theme-popover-mask{z-index:5;width: 100%;height: auto;position:fixed ;background:#000 ;top:0;opacity: 0.6;bottom: 0;}
  
 /*搜索结果*/
@@ -94,7 +94,7 @@ dl#select3 .dd-conent{ left:-200%; right:0px;}
 
     .screening-remove-submit{width:80px;float:right;margin-right:20px;}
 
-    .am-badge{font-size:14px ;padding:0px 0px;background: none;color: #000000;}
+    .search-content .am-badge{font-size:14px ;padding:0px 0px;background: none; }
 
 
 
@@ -109,7 +109,7 @@ dl#select3 .dd-conent{ left:-200%; right:0px;}
     /*筛选条件*/
     .select-list,.select-list dl{width:100%;}
     .select dl dt{left:-100px;top:10px;}
-    .select dt{width:100px;margin-left:0;text-align:center;color:#666;height:24px;line-height:24px;}
+    .select dt{width:100px;margin-left:0;text-align:center;color:#666 !important;height:24px;line-height:24px;}
     .select-list .dd-conent{ display:inline-block;float:left;background: none;width:100%;position: static;}
     dl#select2 .dd-conent,dl#select3 .dd-conent{ left:0; right:0;}