-
Conflicts: framework
-
Conflicts: static/js/me/entry.js static/sass/me/_index.scss template/m.yohobuy.com/partials/layout/use.phtml
-
Conflicts: compile/m.yohobuy.com/1.1.7a/5c77cc2fe7f49778a646efba81fee81c.php compile/m.yohobuy.com/1.1.7a/7340dac7aef6704c67977ab5321e084a.php compile/m.yohobuy.com/1.1.7a/8003100b8e5b8e24386d19f4338e39b9.php compile/m.yohobuy.com/1.1.7a/c4add9573b50c1b1311613ddf442b380.php compile/m.yohobuy.com/1.1.7a/c6c186bc9e01bc4493e42a531410793b.php compile/m.yohobuy.com/1.1.7a/cfa6a7a5747cefcb6a718a2f6fd5dbd9.php compile/m.yohobuy.com/1.1.7a/e1f153c73bfbf722637839a9cd6b6dd3.php compile/m.yohobuy.com/1.1.7a/e5de38b9c8aa0690719676314123bf7f.php compile/m.yohobuy.com/1.1.7a/ecece115ae5a3a0f1c38a63420cf5164.php compile/m.yohobuy.com/1.1.8/06387b9f348b7bdc53fbeb7d2af7ba09.php compile/m.yohobuy.com/1.1.8/1c526644c979455e6df7c4ed21118d5d.php compile/m.yohobuy.com/1.1.8/20732bfe76f7878ea18c8f32ef06fa58.php compile/m.yohobuy.com/1.1.8/3fb9fe151400fcbcd52614c53298db27.php compile/m.yohobuy.com/1.1.8/a83a239783648870e9fff56f65b1ba92.php compile/m.yohobuy.com/1.1.8/f0f8bb3ceb6a419388b37409fdec7758.php
-
Conflicts: library/Configs/CacheConfig.php
-
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
-
更改了GradeData.php：增加了获取会员等级数据，获取会员等级详情数据； 微调privilege.phtml和vip-grade.phtml; 修改了Home.php：增加了会员等级展示页和会员特权查看页数据； 修改了Grade.php：增加了getGrade，和getPreferential；
-
更改了GradeData.php：增加了获取会员等级数据，获取会员等级详情数据； 微调privilege.phtml和vip-grade.phtml; 修改了Home.php：增加了会员等级展示页和会员特权查看页数据； 修改了Grade.php：增加了getGrade，和getPreferential；
