Merge branch 'develop' of git.dev.yoho.cn:ued/yohogirls-views into develop

@@ -18,7 +18,7 @@
     "girlDownloadUrl":"http://localhost:3000/default",
     
     "default_js":true,
-    
+    "fan":false,
     
     "channel":"default",
     "tvs": [
@@ -63,13 +63,13 @@
         "data":[
             {
                 "isChoosen":true,
-                "img": "http://img02.yohoboys.com/staticimg/2014/12/24/16/0278a8c531c6bc6ffb1fedead55689a29c.jpg",
+                "img": "http://img01.yohoboys.com/staticimg/2014/12/09/09/01568f6fea500fbf172a50ee02334a20ce.jpg",
                 "link": "http://www.baidu.com"
             },{
-                "img": "http://img02.yohoboys.com/staticimg/2014/12/24/16/0278a8c531c6bc6ffb1fedead55689a29c.jpg",
+                "img": "http://img01.yohoboys.com/staticimg/2014/12/09/09/01568f6fea500fbf172a50ee02334a20ce.jpg",
                 "link": "http://www.baidu.com"
             },{
-                "img": "http://img02.yohoboys.com/staticimg/2014/12/24/16/0278a8c531c6bc6ffb1fedead55689a29c.jpg",
+                "img": "http://img01.yohoboys.com/staticimg/2014/12/09/09/01568f6fea500fbf172a50ee02334a20ce.jpg",
                 "link": "http://www.baidu.com"
             }
         ]

@@ -58,6 +58,7 @@
 
     },
     "ajax": {
+        "default/default/getnewest":"",
         "todolist/getlist": ["这是我的list", "这是我的list", "这是我的list", "这是我的list", "这是我的list", "这是我的list", "这是我的list", "这是我的list"],
         "todolist/getlist2": {
             "ajaxRepeat": 3,

- Subproject commit 6efdaf44e3af04547e7fb746acc1702d6e90e6b7
+ Subproject commit b7949e428c18ba4cf8d359a5ad9f9fb9ff9d3336