home

service/Application/Admin/Controller/ArticleController.class.php

@@ -64,6 +64,9 @@ class ArticleController extends CommonController
 		// 是否启用
 		$this->assign('common_is_enable_list', L('common_is_enable_list'));
 
+		// 是否
+        $this->assign('common_is_text_list', L('common_is_text_list'));
+
 		// 文章分类
 		$this->assign('article_category_list', M('ArticleCategory')->field(array('id', 'name'))->where(array('is_enable'=>1))->select());
 
@@ -143,6 +146,10 @@ class ArticleController extends CommonController
 			{
 				$where['article_category_id'] = intval(I('article_category_id'));
 			}
+			if(I('is_home_recommended', -1) > -1)
+			{
+				$where['is_home_recommended'] = intval(I('is_home_recommended', 1));
+			}
 
 			// 表达式
 			if(!empty($_REQUEST['time_start']))
@@ -245,6 +252,7 @@ class ArticleController extends CommonController
 			$temp_image		=	$this->MatchContentImage($m->content);
 			$m->image 		=	json_encode($temp_image);
 			$m->image_count	=	count($temp_image);
+			$m->is_home_recommended = intval(I('is_home_recommended', 0));
 			
 			// 数据添加
 			if($m->add())
@@ -284,6 +292,7 @@ class ArticleController extends CommonController
 			$temp_image		=	$this->MatchContentImage($m->content);
 			$m->image 		=	json_encode($temp_image);
 			$m->image_count	=	count($temp_image);
+			$m->is_home_recommended = intval(I('is_home_recommended', 0));
 
 			// 数据更新
 			if($m->where(array('id'=>I('id')))->save())
@@ -370,5 +379,29 @@ class ArticleController extends CommonController
 			$this->ajaxReturn(L('common_operation_edit_error'), -100);
 		}
 	}
+
+	/**
+	 * [StatusHomeRecommended 是否首页推荐状态更新]
+	 * @author   Devil
+	 * @blog     http://gong.gg/
+	 * @version  0.0.1
+	 * @datetime 2017-01-12T22:23:06+0800
+	 */
+	public function StatusHomeRecommended()
+	{
+		// 参数
+		if(empty($_POST['id']) || !isset($_POST['state']))
+		{
+			$this->ajaxReturn(L('common_param_error'), -1);
+		}
+
+		// 数据更新
+		if(M('Article')->where(array('id'=>I('id')))->save(array('is_home_recommended'=>I('state'))))
+		{
+			$this->ajaxReturn(L('common_operation_edit_success'));
+		} else {
+			$this->ajaxReturn(L('common_operation_edit_error'), -100);
+		}
+	}
 }
 ?>

service/Application/Admin/Controller/CommonController.class.php

@@ -533,35 +533,38 @@ class CommonController extends Controller
 
 			foreach($data as $field)
 			{
-				$file = $_FILES[$field];
-
-				// 文件上传校验
-				$error = FileUploadError($field);
-				if($error !== true)
+				if(!empty($_FILES[$field]))
 				{
-					return ['status'=>false, 'msg'=>$error];
-				}
-				
-				// 存储图片
-				$temp_all = [
-						'tmp_name'	=>	$file['tmp_name'],
-						'type'		=>	$file['type'],
-					];
-				$original = $images_obj->GetOriginal($temp_all, $root_path.$img_path.'original'.$date);
-				if(!empty($original))
-				{
-					// 根据原图再次生成小图
-					$compr = $images_obj->GetBinaryCompress($root_path.$img_path.'original'.$date.$original, $root_path.$img_path.'compr'.$date, 600);
-					$small = $images_obj->GetBinaryCompress($root_path.$img_path.'original'.$date.$original, $root_path.$img_path.'small'.$date, 100, 100);
+					$file = $_FILES[$field];
 
-					if(!empty($compr))
+					// 文件上传校验
+					$error = FileUploadError($field);
+					if($error !== true)
 					{
-						$result[$field] = DS.$img_path.'compr'.$date.$small;
-					} else {
-						// 如果图片格式有误，则删除原图片
-						$this->ImagesDelete($img_path.'original'.$date.$original);
+						return ['status'=>false, 'msg'=>$error];
 					}
-	 			}
+					
+					// 存储图片
+					$temp_all = [
+							'tmp_name'	=>	$file['tmp_name'],
+							'type'		=>	$file['type'],
+						];
+					$original = $images_obj->GetOriginal($temp_all, $root_path.$img_path.'original'.$date);
+					if(!empty($original))
+					{
+						// 根据原图再次生成小图
+						$compr = $images_obj->GetBinaryCompress($root_path.$img_path.'original'.$date.$original, $root_path.$img_path.'compr'.$date, 600);
+						$small = $images_obj->GetBinaryCompress($root_path.$img_path.'original'.$date.$original, $root_path.$img_path.'small'.$date, 100, 100);
+
+						if(!empty($compr))
+						{
+							$result[$field] = DS.$img_path.'compr'.$date.$small;
+						} else {
+							// 如果图片格式有误，则删除原图片
+							$this->ImagesDelete($img_path.'original'.$date.$original);
+						}
+		 			}
+		 		}
 			}
 		}
 

service/Application/Admin/Controller/GoodsCategoryController.class.php

@@ -41,6 +41,9 @@ class GoodsCategoryController extends CommonController
 	{
 		// 是否启用
 		$this->assign('common_is_enable_list', L('common_is_enable_list'));
+
+        // 是否
+        $this->assign('common_is_text_list', L('common_is_text_list'));
 		$this->display('Index');
 	}
 
@@ -60,7 +63,7 @@ class GoodsCategoryController extends CommonController
 		}
 
 		// 获取数据
-		$field = array('id', 'pid', 'icon', 'name', 'sort', 'is_enable', 'bg_color', 'big_images', 'vice_name', 'describe');
+		$field = array('id', 'pid', 'icon', 'name', 'sort', 'is_enable', 'bg_color', 'big_images', 'vice_name', 'describe', 'is_home_recommended');
 		$data = M('GoodsCategory')->field($field)->where(array('pid'=>intval(I('id', 0))))->select();
 		if(!empty($data))
 		{
@@ -124,7 +127,7 @@ class GoodsCategoryController extends CommonController
 
             // 文件类型
             list($type, $suffix) = explode('/', $_FILES['file_icon']['type']);
-            $path = 'Public'.DS.'Upload'.DS.'category'.DS.date('Y').DS.date('m').DS;
+            $path = 'Public'.DS.'Upload'.DS.'goods_category'.DS.date('Y').DS.date('m').DS;
             if(!is_dir($path))
             {
                 mkdir(ROOT_PATH.$path, 0777, true);
@@ -150,7 +153,7 @@ class GoodsCategoryController extends CommonController
 
             // 文件类型
             list($type, $suffix) = explode('/', $_FILES['file_big_images']['type']);
-            $path = 'Public'.DS.'Upload'.DS.'category'.DS.date('Y').DS.date('m').DS;
+            $path = 'Public'.DS.'Upload'.DS.'goods_category'.DS.date('Y').DS.date('m').DS;
             if(!is_dir($path))
             {
                 mkdir(ROOT_PATH.$path, 0777, true);
@@ -180,6 +183,7 @@ class GoodsCategoryController extends CommonController
 				$m->name 		=	I('name');
                 $m->vice_name   =   I('vice_name');
                 $m->describe    =   I('describe');
+                $m->is_home_recommended = intval(I('is_home_recommended', 0));
 				
 				// 写入数据库
 				if($m->add())
@@ -198,6 +202,7 @@ class GoodsCategoryController extends CommonController
 				$m->upd_time	=	time();
                 $m->vice_name   =   I('vice_name');
                 $m->describe    =   I('describe');
+                $m->is_home_recommended = intval(I('is_home_recommended', 0));
 
 				// 移除 id
 				unset($m->id, $m->pid);

service/Application/Admin/Controller/GoodsController.class.php

@@ -269,14 +269,14 @@ class GoodsController extends CommonController
 		$photo = $this->GetFormGoodsPhotoParams();
 		if($photo['status'] === false)
 		{
-			$this->ajaxReturn($photo['msg'], -1);
+			$this->ajaxReturn($photo['msg'], -2);
 		}
 
 		// 手机端详情
 		$content_app =$this->GetFormGoodsContentAppParams();
 		if($content_app['status'] === false)
 		{
-			$this->ajaxReturn($content_app['msg'], -1);
+			$this->ajaxReturn($content_app['msg'], -3);
 		}
 
 		// 集合主图片
@@ -284,7 +284,7 @@ class GoodsController extends CommonController
 		$images = $this->GetGoodsImagesParams($images_field);
 		if($images['status'] === false)
 		{
-			$this->ajaxReturn($images['msg'], -1);
+			$this->ajaxReturn($images['msg'], -4);
 		}
 
 		// 基础数据

service/Application/Admin/Lang/zh-cn/article.php

@@ -22,5 +22,6 @@ return array(
 	'article_category_format'			=>	'请选择文章分类',
 	'article_article_category_id_error'	=>	'文章分类id不存在',
 	'article_so_keyword_tips'			=>	'标题关键字',
+	'article_home_recommended_text' 	=>	'首页推荐',
 );
 ?>

service/Application/Admin/Lang/zh-cn/goodscategory.php

@@ -17,7 +17,9 @@ return array(
     'goods_category_vice_name_text'         => '副名称',
     'goods_category_vice_name_format'       => '副名称最大60个字符',
 
-    'goods_category_describe_text'         => '描述',
-    'goods_category_describe_format'       => '描述最大200个字符',
+    'goods_category_describe_text'          => '描述',
+    'goods_category_describe_format'        => '描述最大200个字符',
+
+    'goods_category_home_recommended_text'  => '首页推荐',
 );
 ?>

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

@@ -27,6 +27,12 @@
 							<option value="{{$v.id}}" <if condition="isset($param['is_enable']) and $param['is_enable'] eq $v['id']">selected</if>>{{$v.name}}</option>
 						</foreach>
 					</select>
+					<select name="is_home_recommended" class="am-radius c-p m-t-10 m-l-5 param-where">
+						<option value="-1">{{:L('article_home_recommended_text')}}</option>
+						<foreach name="common_is_text_list" item="v">
+							<option value="{{$v.id}}" <if condition="isset($param['is_home_recommended']) and $param['is_home_recommended'] eq $v['id']">selected</if>>{{$v.name}}</option>
+						</foreach>
+					</select>
 					<div class="param-date param-where m-l-5">
 						<input type="text" name="time_start" class="Wdate am-radius m-t-10" placeholder="{{:L('common_time_start_name')}}" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd HH:mm:ss'})" <if condition="isset($param['time_start'])">value="{{$param.time_start}}"</if>/>
 						<span>~</span>
@@ -51,7 +57,7 @@
 					<th class="am-hide-sm-only">{{:L('article_category_text')}}</th>
 					<th class="am-hide-sm-only">{{:L('common_view_access_count_text')}}</th>
 					<th>{{:L('common_view_status_title')}}</th>
-					<th class="am-hide-sm-only">{{:L('common_create_time_name')}}</th>
+					<th>{{:L('article_home_recommended_text')}}</th>
 					<th>{{:L('common_more_name')}}</th>
 					<th>{{:L('common_operation_name')}}</th>
 				</tr>
@@ -68,7 +74,9 @@
 							<td>
 								<a href="javascript:;" class="am-icon-btn am-icon-check submit-state <if condition="$v['is_enable'] eq 1">am-success<else />am-default</if>" data-url="{{:U('Admin/Article/StatusUpdate')}}" data-id="{{$v.id}}" data-state="{{$v['is_enable']}}" data-is-update-status="1"></a>
 							</td>
-							<td class="am-hide-sm-only">{{$v.add_time}}</td>
+							<td>
+								<a href="javascript:;" class="am-icon-btn am-icon-check submit-state <if condition="$v['is_home_recommended'] eq 1">am-success<else />am-default</if>" data-url="{{:U('Admin/Article/StatusHomeRecommended')}}" data-id="{{$v.id}}" data-state="{{$v['is_home_recommended']}}"></a>
+							</td>
 							<td>
 								<span class="am-icon-caret-down c-p" data-am-modal="{target: '#my-popup{{$v.id}}'}"> {{:L('common_see_more_name')}}</span>
 								<div class="am-popup am-radius" id="my-popup{{$v.id}}">

service/Application/Admin/View/Default/Article/SaveInfo.html

@@ -44,6 +44,10 @@
 			    <label class="block">{{:L('common_view_enable_title')}}</label>
 			    <input name="is_enable" value="1" type="checkbox" data-off-text="{{:L('common_operation_off_is_text')}}" data-on-text="{{:L('common_operation_on_is_text')}}" data-size="xs" data-on-color="success" data-off-color="default" data-handle-width="50" data-am-switch <if condition="!empty($data) and $data['is_enable'] eq 1">checked="true"</if> />
 			</div>
+			<div class="am-form-group">
+			    <label class="block">{{:L('article_home_recommended_text')}}</label>
+			    <input name="is_home_recommended" value="1" type="checkbox" data-off-text="{{:L('common_operation_off_is_text')}}" data-on-text="{{:L('common_operation_on_is_text')}}" data-size="xs" data-on-color="success" data-off-color="default" data-handle-width="50" data-am-switch <if condition="!empty($data) and $data['is_home_recommended'] eq 1">checked="true"</if> />
+			</div>
 			<div class="am-form-group">
 				<label>{{:L('article_content_text')}}</label>
 				<textarea class="am-radius am-validate" name="content" rows="5" minlength="50" maxlength="105000" <if condition="!IsMobile()">id="editor-tag" data-url="{{:U('Admin/Ueditor/Index', ['path_type'=>'article'])}}" placeholder="{{:L('article_content_format')}}" <else /> placeholder="{{:L('article_content_format')}}{{:L('article_content_format_mobile')}}" </if> data-validation-message="{{:L('article_content_format')}}" required><notempty name="data">{{$data.content}}</notempty></textarea>

service/Application/Admin/View/Default/Goods/SaveInfo.html

@@ -135,7 +135,7 @@
 				</div>
 				<div class="am-form-group">
 					<label class="block">{{:L('goods_is_shelves_text')}}<span class="fs-12 fw-100 cr-999">（{{:L('goods_is_shelves_tips')}}）</span></label>
-					<input name="is_shelves" value="1" type="checkbox" data-off-text="{{:L('common_operation_off_goods_text')}}" data-on-text="{{:L('common_operation_on_goods_text')}}" data-size="xs" data-on-color="success" data-off-color="default" data-handle-width="50" data-am-switch <if condition="!empty($data) and $data['is_shelves'] eq 1">checked="true"</if> />
+					<input name="is_shelves" value="1" type="checkbox" data-off-text="{{:L('common_operation_off_goods_text')}}" data-on-text="{{:L('common_operation_on_goods_text')}}" data-size="xs" data-on-color="success" data-off-color="default" data-handle-width="50" data-am-switch <if condition="(!empty($data) and $data['is_shelves'] eq 1) or (empty($data))">checked="true"</if> />
 				</div>
 				<div class="am-form-group">
 					<label class="block">{{:L('goods_is_home_recommended_text')}}<span class="fs-12 fw-100 cr-999">（{{:L('goods_is_home_recommended_tips')}}）</span></label>

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

@@ -58,6 +58,16 @@
 							<label>{{:L('goods_category_describe_text')}}</label>
 							<textarea rows="5" name="describe" maxlength="200" class="am-radius" placeholder="{{:L('goods_category_describe_text')}}" data-validation-message="{{:L('goods_category_describe_format')}}"></textarea>
 						</div>
+						<div class="am-form-group">
+						    <label>{{:L('goods_category_home_recommended_text')}}</label>
+						    <div>
+						        <foreach name="common_is_text_list" item="v">
+						            <label class="am-radio-inline m-r-10">
+						                <input type="radio" name="is_home_recommended" value="{{$v.id}}" data-am-ucheck /> {{$v.name}}
+						            </label>
+						        </foreach>
+						    </div>
+						</div>
 						<div class="am-form-group">
 							<label>{{:L('common_view_sort_title')}}</label>
 							<input type="number" placeholder="{{:L('common_view_sort_title')}}" name="sort" min="0" max="255" data-validation-message="{{:L('common_sort_error')}}" class="am-radius" value="0" required />
@@ -76,7 +86,7 @@
 		<!-- save win end -->
 
         <!-- list start -->
-		<div id="tree" class="m-t-15" data-rank="3" data-additional='[{"field":"bg_color", "value":"", "type":"input"}, {"field":"bg_color", "value":"", "type":"css", "tag":"button.colorpicker-submit", "style":"background-color"}, {"field":"file_icon", "value":"", "type":"file", "tag":"input.file_icon-tag"}, {"field":"icon", "value":"", "type":"input"}, {"field":"icon_url", "value":"{{$image_host}}/Public/Admin/Default/Images/default-images.png", "type":"attr", "tag":"#form-img-icon", "style":"src"}, {"value":"", "type":"html", "tag":"#form-icon-tips"}, {"field":"file_big_images", "value":"", "type":"file", "tag":"input.file_big_images-tag"}, {"field":"big_images", "value":"", "type":"input"}, {"field":"big_images_url", "value":"{{$image_host}}/Public/Admin/Default/Images/default-images.png", "type":"attr", "tag":"#form-img-big_images", "style":"src"}, {"value":"", "type":"html", "tag":"#form-big_images-tips"}, {"field":"vice_name", "value":"", "type":"input"}, {"field":"describe", "value":"", "type":"textarea"}]'>
+		<div id="tree" class="m-t-15" data-rank="3" data-additional='[{"field":"bg_color", "value":"", "type":"input"}, {"field":"bg_color", "value":"", "type":"css", "tag":"button.colorpicker-submit", "style":"background-color"}, {"field":"file_icon", "value":"", "type":"file", "tag":"input.file_icon-tag"}, {"field":"icon", "value":"", "type":"input"}, {"field":"icon_url", "value":"{{$image_host}}/Public/Admin/Default/Images/default-images.png", "type":"attr", "tag":"#form-img-icon", "style":"src"}, {"value":"", "type":"html", "tag":"#form-icon-tips"}, {"field":"file_big_images", "value":"", "type":"file", "tag":"input.file_big_images-tag"}, {"field":"big_images", "value":"", "type":"input"}, {"field":"big_images_url", "value":"{{$image_host}}/Public/Admin/Default/Images/default-images.png", "type":"attr", "tag":"#form-img-big_images", "style":"src"}, {"value":"", "type":"html", "tag":"#form-big_images-tips"}, {"field":"vice_name", "value":"", "type":"input"}, {"field":"describe", "value":"", "type":"textarea"}, {"field":"is_home_recommended", "value":"0", "type":"input"}]'>
 			<div class="m-t-30 t-c">
 				<img src="__PUBLIC__/Common/Images/loading.gif" />
 				<p>{{:L('common_form_loading_tips')}}</p>

service/Application/Home/Controller/CommonController.class.php

@@ -505,7 +505,7 @@ class CommonController extends Controller
 	protected function GetGoodsCategoryList($pid = 0)
 	{
 		$images_host = C('IMAGE_HOST');
-		$field = 'id,pid,icon,name,vice_name,describe,bg_color,big_images,sort';
+		$field = 'id,pid,icon,name,vice_name,describe,bg_color,big_images,sort,is_home_recommended';
 		$data = M('GoodsCategory')->field($field)->where(['is_enable'=>1, 'pid'=>$pid])->order('sort asc')->select();
 		if(!empty($data))
 		{
@@ -532,7 +532,9 @@ class CommonController extends Controller
 		$where = empty($params['where']) ? [] : $params['where'];
 		$field = empty($params['field']) ? 'g.*' : $params['field'];
 		$is_photo = (isset($params['is_photo']) && $params['is_photo'] == true) ? true : false;
-		$data = M('Goods')->alias('g')->join(' INNER JOIN __GOODS_CATEGORY_JOIN__ AS gci ON g.id=gci.goods_id') ->field($field)->where($where)->order('g.id desc')->select();
+		$m = isset($params['m']) ? intval($params['m']) : 0;
+		$n = isset($params['n']) ? intval($params['n']) : 10;
+		$data = M('Goods')->alias('g')->join(' INNER JOIN __GOODS_CATEGORY_JOIN__ AS gci ON g.id=gci.goods_id') ->field($field)->where($where)->group('g.id')->order('g.id desc')->limit($m, $n)->select();
 		if(!empty($data))
 		{
 			$images_host = C('IMAGE_HOST');
@@ -544,7 +546,11 @@ class CommonController extends Controller
 				}
 				if(isset($v['home_recommended_images']))
 				{
-					$v['home_recommended_images'] = empty($v['home_recommended_images']) ? null : $images_host.$v['home_recommended_images'];
+					$v['home_recommended_images'] = empty($v['home_recommended_images']) ? (empty($v['images']) ? null : $v['images']) : $images_host.$v['home_recommended_images'];
+				}
+				if(isset($v['content_web']))
+				{
+					$v['content_web'] = ContentStaticReplace($v['content_web'], 'get');
 				}
 
 				// 获取相册
@@ -589,5 +595,30 @@ class CommonController extends Controller
 		}
 		return $data;
 	}
+
+	protected function GetCommonArticleList($params)
+	{
+		$where = empty($params['where']) ? [] : $params['where'];
+		$field = empty($params['field']) ? 'a.*' : $params['field'];
+		$m = isset($params['m']) ? intval($params['m']) : 0;
+		$n = isset($params['n']) ? intval($params['n']) : 10;
+
+		$data = M('Article')->alias('a')->join(' INNER JOIN __ARTICLE_CATEGORY__ AS ac ON a.article_category_id=ac.id') ->field($field)->where($where)->order('a.id desc')->limit($m, $n)->select();
+		if(!empty($data))
+		{
+			foreach($data as &$v)
+			{
+				if(isset($v['content']))
+				{
+					$v['content'] = ContentStaticReplace($v['content'], 'get');
+				}
+				if(isset($v['add_time']))
+				{
+					$v['add_time'] = date('Y-m-d H:i:s', $v['add_time']);
+				}
+			}
+		}
+		return $data;
+	}
 }
 ?>

service/Application/Home/Controller/IndexController.class.php

@@ -37,10 +37,14 @@ class IndexController extends CommonController
 		$this->assign('banner_list', $this->GetHomeBanner());
 
 		// 商品大分类
-		$this->assign('goods_category_list', $this->GetCommonGoodsCategory());
+		$goods_category = $this->GetCommonGoodsCategory();
+		$this->assign('goods_category_list', $goods_category);
 
 		// 楼层数据
-		$this->assign('goods_floor_list', $this->GetHomeFloorList());
+		$this->assign('goods_floor_list', $this->GetHomeFloorList($goods_category));
+
+		// 新闻
+		$this->assign('article_list', $this->GetCommonArticleList(['where'=>['a.is_enable'=>1, 'is_home_recommended'=>1], 'field'=>'a.id,a.title,a.title_color,ac.name AS category_name', 'm'=>0, 'n'=>8]));
 
 		$this->display('Index');
 	}
@@ -52,19 +56,19 @@ class IndexController extends CommonController
 	 * @version 1.0.0
 	 * @date    2018-08-10
 	 * @desc    description
+	 * @param   [array] $goods_category  [商品分类]
 	 */
-	private function GetHomeFloorList()
+	private function GetHomeFloorList($goods_category)
 	{
-		$data = $this->GetGoodsCategoryList(0);
-		if(!empty($data))
+		if(!empty($goods_category))
 		{
-			foreach($data as &$v)
+			foreach($goods_category as &$v)
 			{
 				$category_all = $this->GetCommonGoodsCategoryItemsIds($v['id']);
-				$v['goods'] = $this->GetCommonGoodsList(['where'=>['gci.category_id'=>['in', $category_all]]]);
+				$v['goods'] = $this->GetCommonGoodsList(['where'=>['gci.category_id'=>['in', $category_all], 'is_home_recommended'=>1], 'm'=>0, 'n'=>6]);
 			}
 		}
-		return $data;
+		return $goods_category;
 	}
 
 	/**

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

@@ -44,20 +44,6 @@
 
 			<!--轮播右侧-内容2 -->
 			<div class="marqueen">
-				<span class="marqueen-title">商城头条</span>
-				<div class="demo">
-
-					<ul>
-						<li class="title-first"><a target="_blank" href="#">
-							<img src="../images/TJ2.jpg"></img>
-							<span>[特惠]</span>商城爆品1分秒								
-						</a></li>
-						<li class="title-first"><a target="_blank" href="#">
-							<span>[公告]</span>商城与广州市签署战略合作协议
-						     <img src="../images/TJ.jpg"></img>
-						     <p>XXXXXXXXXXXXXXXXXX</p>
-					    </a></li>
-					    
 				<div class="mod-vip">
 					<div class="m-baseinfo">
 						<a href="../person/index.html">
@@ -78,15 +64,21 @@
 						<a href="#"><strong>0</strong>待付款</a>
 						<a href="#"><strong>0</strong>待评价</a>
 					</div>
-					<div class="clear"></div>	
-				</div>																	    
-					    
-						<li><a target="_blank" href="#"><span>[特惠]</span>洋河年末大促，低至两件五折</a></li>
-						<li><a target="_blank" href="#"><span>[公告]</span>华北、华中部分地区配送延迟</a></li>
-						<li><a target="_blank" href="#"><span>[特惠]</span>家电狂欢千亿礼券 买1送1！</a></li>
-						
+				</div>
+				<span class="marqueen-title">新闻头条</span>
+				<div class="banner-news">
+					<ul>
+						<if condition="!empty($article_list)">
+                			<foreach name="article_list" item="article">
+								<li>
+									<a target="_blank" href="#">
+										<span>[{{$article.category_name}}]</span>
+										<span <if condition="!empty($article.title_color)">style="color:{{$article.title_color}};"</if> >{{$article.title}}</span>
+									</a>
+								</li>
+							</foreach>
+						</if>
 					</ul>
-                <div class="advTip"><img src="../images/advTip.jpg"/></div>
 				</div>
 			</div>
 		</div>
@@ -132,7 +124,7 @@
 			
 			<!--热门活动 -->
 			<!-- <div class="am-container activity ">
-				<div class="shopTitle">
+				<div class="items-nav-title">
 					<h4>活动</h4>
 					<h3>每期活动 优惠享不停 </h3>
 					<span class="more ">
@@ -185,54 +177,75 @@
 				</div>
 
 			  </div>
-           </div> -->
+        	</div> -->
 
-			<!--甜点 f1 -->
+			<!-- 楼层 -->
 			<if condition="!empty($goods_floor_list)">
                 <foreach name="goods_floor_list" item="floor">
-					<div id="f{{$key+1}}">
-						<div class="am-container">
-							<div class="shopTitle">
-								<h4>{{$floor.name}}</h4>
-								<h3>{{$floor.vice_name}}</h3>
-								<div class="today-brands ">
-									<a href="# ">桂花糕</a>
-									<a href="# ">奶皮酥</a>
-									<a href="# ">栗子糕 </a>
-									<a href="# ">马卡龙</a>
-									<a href="# ">铜锣烧</a>
-									<a href="# ">豌豆黄</a>
-								</div>
-								<span class="more ">
-			            <a href="# ">更多美味<i class="am-icon-angle-right" style="padding-left:10px ;" ></i></a>
-			                </span>
-							</div>
-						</div>
-						
-						<div class="am-g am-g-fixed floodFour">
-							<div class="am-u-sm-5 am-u-md-4 text-one list ">
-								<div class="word">
-									<a class="outer" href="#"><span class="inner"><b class="text">核桃</b></span></a>
-									<a class="outer" href="#"><span class="inner"><b class="text">核桃</b></span></a>
-									<a class="outer" href="#"><span class="inner"><b class="text">核桃</b></span></a>	
-									<a class="outer" href="#"><span class="inner"><b class="text">核桃</b></span></a>
-									<a class="outer" href="#"><span class="inner"><b class="text">核桃</b></span></a>
-									<a class="outer" href="#"><span class="inner"><b class="text">核桃</b></span></a>									
-								</div>
-								<a href="# ">
-									<div class="outer-con ">
-										<div class="title ">
-										开抢啦！
-										</div>
-										<div class="sub-title ">
-											零食大礼包
-										</div>									
+                	<if condition="isset($floor['is_home_recommended']) and $floor['is_home_recommended'] eq 1">
+						<div id="floor{{$key+1}}">
+							<div class="am-container">
+								<div class="items-nav-title">
+									<h4>{{$floor.name}}</h4>
+									<h3>{{$floor.vice_name}}</h3>
+									<div class="today-brands ">
+										<if condition="!empty($floor['items'])">
+	                						<foreach name="floor.items" item="category">
+	                							<if condition="!empty($category['items'])">
+			                						<foreach name="category.items" item="categorys">
+			                							<if condition="$key lt 6 and isset($categorys['is_home_recommended']) and $categorys['is_home_recommended'] eq 1">
+															<a href="#">{{$categorys.name}}</a>
+														</if>
+													</foreach>
+												</if>
+											</foreach>
+										</if>
 									</div>
-			                          <img src="{{$floor.big_images}}" />								
-								</a>
-								<div class="triangle-topright"></div>						
+									<span class="more">
+				            			<a href="#">更多<i class="am-icon-angle-right" style="padding-left:10px ;" ></i></a>
+				                	</span>
+								</div>
 							</div>
 							
+							<div class="am-g am-g-fixed flood" <if condition="!empty($floor['bg_color'])">style="background-color:{{$floor.bg_color}};"<else />style="background-color:#eaeaea;"</if>>
+								<div class="am-u-sm-5 am-u-md-4 text-one list" >
+									<div class="word">
+										<if condition="!empty($floor['items'])">
+	                						<foreach name="floor.items" item="category">
+	                							<if condition="$key lt 6 and isset($category['is_home_recommended']) and $category['is_home_recommended'] eq 1">
+													<a class="outer" href="#">
+														<span class="inner">
+															<b class="text">{{:mb_substr($category['name'], 0, 4, 'utf-8')}}</b>
+														</span>
+													</a>
+												</if>
+											</foreach>
+										</if>			
+									</div>
+									<a href="#">
+										<div class="outer-con">
+											<div class="describe">{{$floor.describe}}</div>
+										</div>
+										<if condition="!empty($floor['big_images'])">
+					                        <img src="{{$floor.big_images}}" />
+					                    </if>
+									</a>
+									<div class="triangle-topright"></div>
+								</div>
+
+
+								<if condition="!empty($floor.goods)">
+					                <foreach name="floor.goods" item="goods">
+										<div class="goods-items <if condition="in_array($key, [0,1])">am-u-sm-7 am-u-md-4 text-two<else />am-u-sm-3 am-u-md-2 text-three</if>  <if condition="in_array($key, [0,3])">sug</if> <if condition="in_array($key, [2,5])">big</if> <if condition="$key eq 5">last</if>">
+											<div class="outer-con">
+												<div class="goods-title">{{$goods.title}}</div>	
+												<div class="price">￥{{$goods.price}}</div>
+											</div>
+											<a href="#"><img src="{{$goods.home_recommended_images}}" /></a>
+										</div>
+					                </foreach>
+					            </if>
+								<!-- 
 								<div class="am-u-sm-7 am-u-md-4 text-two sug">
 									<div class="outer-con ">
 										<div class="title ">
@@ -259,194 +272,64 @@
 									<a href="# "><img src="../images/1.jpg" /></a>
 								</div>
 
-
-							<div class="am-u-sm-3 am-u-md-2 text-three big">
-								<div class="outer-con ">
-									<div class="title ">
-										小优布丁
+								<div class="am-u-sm-3 am-u-md-2 text-three big">
+									<div class="outer-con ">
+										<div class="title ">
+											小优布丁
+										</div>
+										<div class="sub-title ">
+											¥4.8
+										</div>
+										<i class="am-icon-shopping-basket am-icon-md  seprate"></i>
 									</div>
-									<div class="sub-title ">
-										¥4.8
-									</div>
-									<i class="am-icon-shopping-basket am-icon-md  seprate"></i>
+									<a href="# "><img src="../images/5.jpg" /></a>
 								</div>
-								<a href="# "><img src="../images/5.jpg" /></a>
-							</div>
 
-							<div class="am-u-sm-3 am-u-md-2 text-three sug">
-								<div class="outer-con ">
-									<div class="title ">
-										小优布丁
+								<div class="am-u-sm-3 am-u-md-2 text-three sug">
+									<div class="outer-con ">
+										<div class="title ">
+											小优布丁
+										</div>
+										<div class="sub-title ">
+											¥4.8
+										</div>
+										<i class="am-icon-shopping-basket am-icon-md  seprate"></i>
 									</div>
-									<div class="sub-title ">
-										¥4.8
-									</div>
-									<i class="am-icon-shopping-basket am-icon-md  seprate"></i>
+									<a href="# "><img src="../images/3.jpg" /></a>
 								</div>
-								<a href="# "><img src="../images/3.jpg" /></a>
-							</div>
 
-							<div class="am-u-sm-3 am-u-md-2 text-three ">
-								<div class="outer-con ">
-									<div class="title ">
-										小优布丁
+								<div class="am-u-sm-3 am-u-md-2 text-three ">
+									<div class="outer-con ">
+										<div class="title ">
+											小优布丁
+										</div>
+										<div class="sub-title ">
+											¥4.8
+										</div>
+										<i class="am-icon-shopping-basket am-icon-md  seprate"></i>
 									</div>
-									<div class="sub-title ">
-										¥4.8
-									</div>
-									<i class="am-icon-shopping-basket am-icon-md  seprate"></i>
+									<a href="# "><img src="../images/4.jpg" /></a>
 								</div>
-								<a href="# "><img src="../images/4.jpg" /></a>
-							</div>
 
-							<div class="am-u-sm-3 am-u-md-2 text-three last big ">
-								<div class="outer-con ">
-									<div class="title ">
-										小优布丁
+								<div class="am-u-sm-3 am-u-md-2 text-three last big ">
+									<div class="outer-con ">
+										<div class="title ">
+											小优布丁
+										</div>
+										<div class="sub-title ">
+											¥4.8
+										</div>
+										<i class="am-icon-shopping-basket am-icon-md  seprate"></i>
 									</div>
-									<div class="sub-title ">
-										¥4.8
-									</div>
-									<i class="am-icon-shopping-basket am-icon-md  seprate"></i>
-								</div>
-								<a href="# "><img src="../images/5.jpg" /></a>
+									<a href="# "><img src="../images/5.jpg" /></a>
+								</div> -->
 							</div>
 						</div>
-					</div>
+					</if>
 				</foreach>
 			</if>
-
-			<!-- 坚果 f2 -->
-			<!-- <div id="f2">
-				<div class="am-container ">
-					<div class="shopTitle ">
-						<h4>坚果</h4>
-						<h3>酥酥脆脆，回味无穷</h3>
-						<div class="today-brands ">
-							<a href="# ">腰果</a>
-							<a href="# ">松子</a>
-							<a href="# ">夏威夷果 </a>
-							<a href="# ">碧根果</a>
-							<a href="# ">开心果</a>
-							<a href="# ">核桃仁</a>
-						</div>
-						<span class="more ">
-                <a href="# ">更多美味<i class="am-icon-angle-right" style="padding-left:10px ;" ></i></a>
-                    </span>
-					</div>
-				</div>
-				<div class="am-g am-g-fixed floodThree ">
-					<div class="am-u-sm-4 text-four list">
-						<div class="word">
-							<a class="outer" href="#"><span class="inner"><b class="text">核桃</b></span></a>
-							<a class="outer" href="#"><span class="inner"><b class="text">核桃</b></span></a>
-							<a class="outer" href="#"><span class="inner"><b class="text">核桃</b></span></a>	
-							<a class="outer" href="#"><span class="inner"><b class="text">核桃</b></span></a>
-							<a class="outer" href="#"><span class="inner"><b class="text">核桃</b></span></a>
-							<a class="outer" href="#"><span class="inner"><b class="text">核桃</b></span></a>									
-						</div>
-						<a href="# ">
-							<img src="../images/act1.png " />
-							<div class="outer-con ">
-								<div class="title ">
-									雪之恋和风大福
-								</div>									
-							</div>
-						</a>
-						<div class="triangle-topright"></div>	
-					</div>
-					<div class="am-u-sm-4 text-four">
-						<a href="# ">
-							<img src="../images/6.jpg" />
-							<div class="outer-con ">
-								<div class="title ">
-									雪之恋和风大福
-								</div>								
-								<div class="sub-title ">
-									¥13.8
-								</div>
-								<i class="am-icon-shopping-basket am-icon-md  seprate"></i>
-							</div>
-						</a>
-					</div>
-					<div class="am-u-sm-4 text-four sug">
-						<a href="# ">
-							<img src="../images/7.jpg" />
-							<div class="outer-con ">
-								<div class="title ">
-									雪之恋和风大福
-								</div>
-								<div class="sub-title ">
-									¥13.8
-								</div>
-								<i class="am-icon-shopping-basket am-icon-md  seprate"></i>
-							</div>
-						</a>
-					</div>
-					
-					<div class="am-u-sm-6 am-u-md-3 text-five big ">
-						<a href="# ">
-							<img src="../images/10.jpg" />
-							<div class="outer-con ">
-								<div class="title ">
-									雪之恋和风大福
-								</div>		
-								<div class="sub-title ">
-									¥13.8
-								</div>
-								<i class="am-icon-shopping-basket am-icon-md  seprate"></i>
-							</div>
-						</a>
-					</div>						
-					<div class="am-u-sm-6 am-u-md-3 text-five ">
-						<a href="# ">
-							<img src="../images/8.jpg" />
-							<div class="outer-con ">
-								<div class="title ">
-									雪之恋和风大福
-								</div>	
-								<div class="sub-title ">
-									¥13.8
-								</div>
-								<i class="am-icon-shopping-basket am-icon-md  seprate"></i>
-							</div>
-						</a>
-					</div>						
-					<div class="am-u-sm-6 am-u-md-3 text-five sug">
-						<a href="# ">
-							<img src="../images/9.jpg" />
-							<div class="outer-con ">
-								<div class="title ">
-									雪之恋和风大福
-								</div>
-								<div class="sub-title ">
-									¥13.8
-								</div>
-								<i class="am-icon-shopping-basket am-icon-md  seprate"></i>
-							</div>
-						</a>
-					</div>
-					<div class="am-u-sm-6 am-u-md-3 text-five big">
-						<a href="# ">
-							<img src="../images/10.jpg" />
-							<div class="outer-con ">
-								<div class="title ">
-									雪之恋和风大福
-								</div>			
-								<div class="sub-title ">
-									¥13.8
-								</div>
-								<i class="am-icon-shopping-basket am-icon-md  seprate"></i>
-							</div>
-						</a>
-					</div>
-				</div>
-			</div> -->
-
-
 		</div>
 	</div>
-
 </div>
 
 <!-- footer start -->
@@ -477,7 +360,7 @@ $(function()
 			})
 		}
 		$(function() {
-			setInterval('autoScroll(".demo")', 3000);
+			setInterval('autoScroll(".banner-news")', 3000);
 		})
 	}
 

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

@@ -1,4 +1,4 @@
-<hr data-am-widget="divider" class="am-divider am-divider-default m-0" />
+<hr data-am-widget="divider" class="am-divider am-divider-default" />
 <footer data-am-widget="footer" class="am-footer am-footer-default" data-am-footer="{}" <if condition="!empty($max_width_style)">style="{{$max_width_style}}"</if>>
 	<div class="footer-nav-list">
 		<foreach name="nav_footer" key="k" item="v">
@@ -9,8 +9,8 @@
 		</foreach>
 	</div>
 	<div class="am-footer-miscs">
-		<p>由 <a href="http://schoolcms.org/" title="SchoolCMS" target="_blank" class="">SchoolCMS</a> 提供技术支持</p>
-		<p>CopyRight©2014-{{:date('Y')}} SchoolCMS {{:L('common_application_ver')}} Inc.</p>
+		<p>由 <a href="http://shopxo.net/" title="ShopXO" target="_blank" class="">ShopXO</a> 提供技术支持</p>
+		<p>CopyRight©2014-{{:date('Y')}} ShopXO {{:L('common_application_ver')}} Inc.</p>
 		<p>{{:MyC('home_site_icp')}}</p>
 	</div>
 </footer>

service/Application/Runtime/Temp/8cde93cbd070139d84f31d26f8ea8f4d.php

@@ -1,3 +1,3 @@
 <?php
-//000000000000a:114:{i:41;s:12:"config_index";i:42;s:11:"config_save";i:81;s:10:"site_index";i:103;s:10:"site_index";i:105;s:9:"site_save";i:104;s:9:"sms_index";i:107;s:8:"sms_save";i:219;s:11:"email_index";i:220;s:10:"email_save";i:221;s:15:"email_emailtest";i:199;s:9:"seo_index";i:200;s:8:"seo_save";i:1;s:11:"power_index";i:22;s:11:"admin_index";i:19;s:14:"admin_saveinfo";i:20;s:10:"admin_save";i:21;s:12:"admin_delete";i:4;s:10:"power_role";i:17;s:18:"power_rolesaveinfo";i:18;s:14:"power_rolesave";i:23;s:16:"power_roledelete";i:13;s:11:"power_index";i:15;s:15:"power_powersave";i:16;s:17:"power_powerdelete";i:126;s:10:"user_index";i:127;s:10:"user_index";i:128;s:13:"user_saveinfo";i:129;s:9:"user_save";i:130;s:11:"user_delete";i:146;s:16:"user_excelexport";i:38;s:11:"goods_index";i:39;s:11:"goods_index";i:57;s:14:"goods_saveinfo";i:58;s:10:"goods_save";i:59;s:12:"goods_delete";i:181;s:19:"goods_statusshelves";i:218;s:27:"goods_statushomerecommended";i:201;s:19:"goodscategory_index";i:202;s:18:"goodscategory_save";i:203;s:20:"goodscategory_delete";i:177;s:11:"order_index";i:178;s:11:"order_index";i:179;s:12:"order_delete";i:180;s:12:"order_cancel";i:213;s:12:"answer_index";i:214;s:12:"answer_index";i:215;s:11:"answer_save";i:216;s:13:"answer_delete";i:217;s:19:"answer_statusupdate";i:222;s:16:"navigation_index";i:223;s:16:"navigation_index";i:226;s:15:"navigation_save";i:227;s:17:"navigation_delete";i:228;s:23:"navigation_statusupdate";i:234;s:16:"customview_index";i:235;s:19:"customview_saveinfo";i:236;s:15:"customview_save";i:237;s:17:"customview_delete";i:238;s:23:"customview_statusupdate";i:239;s:10:"link_index";i:240;s:13:"link_saveinfo";i:241;s:9:"link_save";i:242;s:11:"link_delete";i:243;s:17:"link_statusupdate";i:244;s:11:"theme_index";i:245;s:10:"theme_save";i:246;s:12:"theme_upload";i:247;s:12:"theme_delete";i:204;s:13:"article_index";i:205;s:13:"article_index";i:206;s:16:"article_saveinfo";i:207;s:12:"article_save";i:208;s:14:"article_delete";i:209;s:20:"article_statusupdate";i:210;s:21:"articlecategory_index";i:211;s:20:"articlecategory_save";i:212;s:22:"articlecategory_delete";i:162;s:15:"marketing_index";i:163;s:12:"coupon_index";i:164;s:18:"coupon_stateupdate";i:165;s:15:"coupon_saveinfo";i:166;s:11:"coupon_save";i:167;s:11:"coupon_user";i:168;s:13:"coupon_delete";i:169;s:15:"coupon_sendinfo";i:170;s:11:"coupon_send";i:171;s:16:"coupon_userquery";i:182;s:10:"data_index";i:183;s:13:"message_index";i:184;s:14:"message_delete";i:185;s:12:"paylog_index";i:186;s:21:"userintegrallog_index";i:187;s:15:"complaint_index";i:188;s:14:"complaint_save";i:189;s:16:"complaint_delete";i:152;s:15:"resources_index";i:153;s:12:"region_index";i:154;s:11:"region_save";i:155;s:13:"region_delete";i:156;s:13:"express_index";i:157;s:12:"express_save";i:158;s:14:"express_delete";i:172;s:11:"slide_index";i:173;s:14:"slide_saveinfo";i:174;s:10:"slide_save";i:175;s:17:"slide_stateupdate";i:176;s:12:"slide_delete";i:193;s:15:"agreement_index";i:194;s:14:"agreement_save";i:118;s:10:"tool_index";i:119;s:11:"cache_index";i:120;s:16:"cache_siteupdate";i:121;s:20:"cache_templateupdate";i:122;s:18:"cache_moduleupdate";}
+//000000000000a:115:{i:41;s:12:"config_index";i:42;s:11:"config_save";i:81;s:10:"site_index";i:103;s:10:"site_index";i:105;s:9:"site_save";i:104;s:9:"sms_index";i:107;s:8:"sms_save";i:219;s:11:"email_index";i:220;s:10:"email_save";i:221;s:15:"email_emailtest";i:199;s:9:"seo_index";i:200;s:8:"seo_save";i:1;s:11:"power_index";i:22;s:11:"admin_index";i:19;s:14:"admin_saveinfo";i:20;s:10:"admin_save";i:21;s:12:"admin_delete";i:4;s:10:"power_role";i:17;s:18:"power_rolesaveinfo";i:18;s:14:"power_rolesave";i:23;s:16:"power_roledelete";i:13;s:11:"power_index";i:15;s:15:"power_powersave";i:16;s:17:"power_powerdelete";i:126;s:10:"user_index";i:127;s:10:"user_index";i:128;s:13:"user_saveinfo";i:129;s:9:"user_save";i:130;s:11:"user_delete";i:146;s:16:"user_excelexport";i:38;s:11:"goods_index";i:39;s:11:"goods_index";i:57;s:14:"goods_saveinfo";i:58;s:10:"goods_save";i:59;s:12:"goods_delete";i:181;s:19:"goods_statusshelves";i:218;s:27:"goods_statushomerecommended";i:201;s:19:"goodscategory_index";i:202;s:18:"goodscategory_save";i:203;s:20:"goodscategory_delete";i:177;s:11:"order_index";i:178;s:11:"order_index";i:179;s:12:"order_delete";i:180;s:12:"order_cancel";i:213;s:12:"answer_index";i:214;s:12:"answer_index";i:215;s:11:"answer_save";i:216;s:13:"answer_delete";i:217;s:19:"answer_statusupdate";i:222;s:16:"navigation_index";i:223;s:16:"navigation_index";i:226;s:15:"navigation_save";i:227;s:17:"navigation_delete";i:228;s:23:"navigation_statusupdate";i:234;s:16:"customview_index";i:235;s:19:"customview_saveinfo";i:236;s:15:"customview_save";i:237;s:17:"customview_delete";i:238;s:23:"customview_statusupdate";i:239;s:10:"link_index";i:240;s:13:"link_saveinfo";i:241;s:9:"link_save";i:242;s:11:"link_delete";i:243;s:17:"link_statusupdate";i:244;s:11:"theme_index";i:245;s:10:"theme_save";i:246;s:12:"theme_upload";i:247;s:12:"theme_delete";i:204;s:13:"article_index";i:205;s:13:"article_index";i:206;s:16:"article_saveinfo";i:207;s:12:"article_save";i:208;s:14:"article_delete";i:209;s:20:"article_statusupdate";i:248;s:29:"article_statushomerecommended";i:210;s:21:"articlecategory_index";i:211;s:20:"articlecategory_save";i:212;s:22:"articlecategory_delete";i:162;s:15:"marketing_index";i:163;s:12:"coupon_index";i:164;s:18:"coupon_stateupdate";i:165;s:15:"coupon_saveinfo";i:166;s:11:"coupon_save";i:167;s:11:"coupon_user";i:168;s:13:"coupon_delete";i:169;s:15:"coupon_sendinfo";i:170;s:11:"coupon_send";i:171;s:16:"coupon_userquery";i:182;s:10:"data_index";i:183;s:13:"message_index";i:184;s:14:"message_delete";i:185;s:12:"paylog_index";i:186;s:21:"userintegrallog_index";i:187;s:15:"complaint_index";i:188;s:14:"complaint_save";i:189;s:16:"complaint_delete";i:152;s:15:"resources_index";i:153;s:12:"region_index";i:154;s:11:"region_save";i:155;s:13:"region_delete";i:156;s:13:"express_index";i:157;s:12:"express_save";i:158;s:14:"express_delete";i:172;s:11:"slide_index";i:173;s:14:"slide_saveinfo";i:174;s:10:"slide_save";i:175;s:17:"slide_stateupdate";i:176;s:12:"slide_delete";i:193;s:15:"agreement_index";i:194;s:14:"agreement_save";i:118;s:10:"tool_index";i:119;s:11:"cache_index";i:120;s:16:"cache_siteupdate";i:121;s:20:"cache_templateupdate";i:122;s:18:"cache_moduleupdate";}
 ?>

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

@@ -18,10 +18,9 @@ time, mark, audio, video {
     margin: 0;
     padding: 0;
     border: 0;
-    font-size: 100%;
     font: inherit;
     vertical-align: baseline;
- font-family: arial,"Lantinghei SC","Microsoft Yahei";  
+    font-family: arial,"Lantinghei SC","Microsoft Yahei";  
 }
 /* HTML5 display-role reset for older browsers */
 article, aside, details, figcaption, figure, 
@@ -43,11 +42,10 @@ html{width:100%;
 /*text-size-adjust不管屏幕怎么变文字大小不变*/
 
 body{margin:0;
-     padding:0;
-     width:100%;
-     font-size:12px;
-     font-family: arial,"Lantinghei SC","Microsoft Yahei";  
-     
+    padding:0;
+    width:100%;
+    font-size:14px;
+    font-family: arial,"Lantinghei SC","Microsoft Yahei";  
 }
 
    
@@ -70,7 +68,6 @@ a {
   text-decoration: none;
 }
 
-
 .spatic{width:100%; height:16px;}
 h5{float: right;color: #666;padding-right:20px;}
 
@@ -93,12 +90,12 @@ color: #555555;background:none;border-color:transparent;cursor: default;}
 
 /*浮动框*/
 .nav.white{position:fixed;top:0;width:100%;z-index:1099; margin:0px auto;background:#fff ;}
-.nav.white .logo{float:left;height:41px;width:70px; margin: 6px auto;}
+.nav.white .logo{float:left;height:36px;width:95px; margin: 0 auto;margin-top: 10px;}
 .logoBig{display:none;}
 .logo img{width:100%}
  
 /*搜索框*/
-.search-bar{height:41px; margin: 8px 20px 0 75px;}
+.search-bar{height:41px; margin: 8px 5px 0 100px;}
 .search-bar form{border:2px solid #F03726; max-width:670px;}
 .search-bar input{padding-left:5px;height:32px;width:78%;outline:none; font-size:12px; border:none}
 #ai-topsearch { width:20%;height:32px;border:none;float:right;background: #F03726 none repeat scroll 0% 0%;
@@ -150,7 +147,7 @@ color: #F5F5F2;font-size: 14px;cursor:pointer;border-radius:0px 0px ;}
     .message-r .topMessage {float: left;padding: 0px 6px;height: 35px;line-height: 35px;}
   
     .nav.white .logo{display:none;}  
-    .nav.white .logoBig{ display:block;float:left;height:56px;width:115px; margin:0px auto; margin-left:5%} 
+    .nav.white .logoBig{ display:block;float:left;height:40px;width:135px; margin:0px auto; margin-left:2%;margin-top: 5px;} 
     .nav.white .logoBig img{width:100%;}
     .my-cart { width: 46px;height: 46px;}
     .search-bar {height: 51px;margin: 0px 50px 0 120px; padding-left:5%;}
@@ -159,7 +156,7 @@ color: #F5F5F2;font-size: 14px;cursor:pointer;border-radius:0px 0px ;}
     .my-cart a{display:block; margin-top:5px}
     .classified{display:none;}
     .navCir{display:none;}
-    .nav.white{ position:relative;top:0px;z-index:0;}
+    .nav.white{ position:relative;top:0px;z-index:0;margin-bottom: 5px;}
      #ai-topsearch{ font-size:18px;}
      /*底部*/
     .footer {text-align:left; display:block;position: relative;margin: 0px auto; padding: 7px 0px 9px;border-top: 2px solid #FF5400; margin-top:20px;}
@@ -168,7 +165,6 @@ color: #F5F5F2;font-size: 14px;cursor:pointer;border-radius:0px 0px ;}
     .footer .footer-hd b { margin: 0px 3px;font-weight: 400;color: #DDD;}
     .footer .footer-bd p{ border-bottom:none;}
     .footer-bd{ display:block;}
-    .header,.nav.white{ padding-right:40px;}
     .bloglist{ margin-top:0px;}
     .shopMain {margin:0px 5px;}
     /*选项卡样式*/
@@ -180,7 +176,7 @@ color: #F5F5F2;font-size: 14px;cursor:pointer;border-radius:0px 0px ;}
     .mui-mbar-tabs{ display:block;}  
     .nav.white{padding-left:0px; max-width:1000px; margin:0px auto;}
     .nav.white .logo{display:none;}
-    .nav.white .logoBig { display:block; float:left;height:90px; width:200px; margin-left:0px;}
+    .nav.white .logoBig { display:block; float:left;height:60px; width:200px; margin-left:0px;margin-top: 15px;}
     .nav.white .logoBig li{float:left;}
     .search-bar{height:90px; padding: 20px 70px 0 230px; margin:auto;}
            
@@ -202,7 +198,7 @@ color: #F5F5F2;font-size: 14px;cursor:pointer;border-radius:0px 0px ;}
     .nav-cont li::before{content: '\20';display: inline-block;height: 16px;border-right: 1px solid #d9d9d9;width: 0;vertical-align: middle;margin-left: -1px;}
     .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 .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;color:#fcff00;line-height:33px;height:33px ;width:160px;text-align:center;background: url(../Images/extra.png);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 b{display:block;position: absolute;width: 45px;height: 45px;border-radius:45px;z-index: 1;left: -33px;top: -8px;background: #fff;}
     b.line{display: block;width:100%;height:2px ;border-bottom:2px solid #d2364c;position: absolute;top:180px;z-index:5;}      
@@ -249,7 +245,7 @@ display: block;
 line-height:38px;
 width: 35px;
 height: 38px;
-background: url(../images/ibar_sprites.png) no-repeat;
+background: url(../Images/ibar_sprites.png) no-repeat;
 }
 /*图标定位*/
 .item .setting {position:absolute;top: 10px;left: 10px;width: 18px;height: 19px;background-position: 0 0;}
@@ -279,7 +275,7 @@ cursor: pointer;color: #FFF; margin-bottom:10px;}
 .item a,.quick_toggle a{ display:block;
 width: 40px;
 height: 38px;cursor: pointer; position:relative; overflow:hidden; }
-.quick_toggle span{position:absolute;top:12px;left:12px;background: url(../images/ibar_sprites.png) no-repeat;}
+.quick_toggle span{position:absolute;top:12px;left:12px;background: url(../Images/ibar_sprites.png) no-repeat;}
 .quick_toggle .kfzx{background-position:0 -175px;}
 .quick_toggle li:hover .kfzx{ background-position:-33px -175px;}
 .quick_toggle .mpbtn_qrcode {background-position: 0 -302px; position:absolute;top:12px;left:10px;}
@@ -299,9 +295,9 @@ height: 38px;cursor: pointer; position:relative; overflow:hidden; }
 
 
 .mp_tooltip {height: 38px;line-height: 38px;width: 92px;position: absolute;z-index: 2;left: -121px;top: 0;background: #2b2b2b;color: #d8d8d8;text-align: center;display: block;visibility: hidden;font-size:12px;}
-.icon_arrow_white {position: absolute;right: -5px;top: 15px;width: 5px;height: 9px;background:url(../images/ibar_sprites.png) no-repeat;background-position: 0 -253px;}
+.icon_arrow_white {position: absolute;right: -5px;top: 15px;width: 5px;height: 9px;background:url(../Images/ibar_sprites.png) no-repeat;background-position: 0 -253px;}
 .icon_arrow_right_black {position: absolute;right: -5px;top: 15px;width: 5px;height: 9px;
-background:url(../images/ibar_sprites.png) no-repeat;background-position:0px -234px;overflow: hidden;}
+background:url(../Images/ibar_sprites.png) no-repeat;background-position:0px -234px;overflow: hidden;}
 
 
 .mp_qrcode {padding: 10px;width: 148px;height: 150px;top: -50px;background: #fff;box-shadow: 0 0 5px rgba(0,0,0,.4);border-radius: 5px 0 0 5px;border: 1px solid #ccc;z-index: 3;position: absolute;left: -154px;display: none;}
@@ -315,6 +311,13 @@ background:url(../images/ibar_sprites.png) no-repeat;background-position:0px -23
 .am-article-title.blog-title{font-size:24px;line-height: 1.15;font-weight: normal;margin: 10px 0px 20px;}
 .blog-content p{margin: 0 0 1.6rem 0;font-size:14px;}
 
+/**
+ * 底部
+ */
+.am-footer {
+    font-size: 14px;
+}
+
 
 /**
  * 框架覆盖