• Conflicts:
    	library/Configs/CacheConfig.php
    by Rock Zhang
     
    Browse Files
  • Conflicts:
    	library/Api/Yohobuy.php
    	library/Plugin/TemplateLayout.php
    	static/js/category/brand.js
    	static/js/category/index.js
    	static/js/home/home.js
    	static/js/index/channel.js
    	static/sass/category/_index.scss
    	template/m.yohobuy.com/actions/index/index/index.phtml
    	template/m.yohobuy.com/partials/layout/page_header.phtml
    	template/m.yohobuy.com/partials/layout/use.phtml
    	yohobuy/m.yohobuy.com/configs/application.developer.ini
    	yohobuy/m.yohobuy.com/configs/application.preview.ini
    	yohobuy/m.yohobuy.com/configs/application.production.ini
    	yohobuy/m.yohobuy.com/configs/application.testing.ini
    by Rock Zhang
     
    Browse Files
  • 更改了GradeData.php:增加了获取会员等级数据,获取会员等级详情数据;
    微调privilege.phtml和vip-grade.phtml;
    修改了Home.php:增加了会员等级展示页和会员特权查看页数据;
    修改了Grade.php:增加了getGrade,和getPreferential;
    by yangyang
     
    Browse Files