Merge branch 'test' of git.oschina.net:yiguanjia/php into test

www/webapp/o2o/js/model/user.js

@@ -8,7 +8,7 @@ define(['base', '$', 'native', 'api', 'order', 'config', 'address'], function (b
 		}
 		User.instance = this;
 		this.storagePrefix = 'user_';
-		this.id = '57e38f1b9f5160ac048b457d'; //57e22bb59f5160c2048b456c//57e38f1b9f5160ac048b457d
+		this.id = ''; //57e22bb59f5160c2048b456c//57e38f1b9f5160ac048b457d
 		this.lastID = this.getCache('lastID', null, '');
 		this.name = '';
 		this.avatar='';

www/webapp/o2o/tpl/secondary/index.html

@@ -23,13 +23,13 @@
                                     <!--<img src="http://oduj3utzz.bkt.clouddn.com/Home_btn_clean%20%281%29.png" width="50px" height="50px">-->
                                     <img src="http://odulvej8l.bkt.clouddn.com/%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81icon_1.png">
 
-                                    <div class="extra-service-name">日常清洁</div>
+                                    <div class="extra-service-name" >日常清洁</div>
                                 </li>
                                 <li class="Long-term-set">
                                     <!--<img src="http://oduj3utzz.bkt.clouddn.com/Home_btn_clean%20%287%29.png"  width="50px" height="50px">-->
-                                    <img src="http://odulvej8l.bkt.clouddn.com/%E9%95%BF%E6%9C%9F%E5%AE%9Aicon-01-01-01.png">
+                                    <img src="http://odulvej8l.bkt.clouddn.com/%E6%B4%BB%E5%8A%A8%E4%BA%A7%E5%93%81.png">
 
-                                    <div class="extra-service-name">活动体验</div>
+                                    <div class="extra-service-name" style="color: #b28f00;border-bottom: 3px solid #b28f00;">活动体验</div>
                                 </li>
                                 <li class="btn-product" data-product-type="2">
                                     <!--<img src="http://oduj3utzz.bkt.clouddn.com/Home_btn_clean%20%282%29.png"  width="50px" height="50px">-->