Merge branch 'yohobuy-shop-dev-4.6-20160606' of http://git.yoho.cn/fe/yohobuy-sh…

…op-fe2 into yohobuy-shop-dev-4.6-20160606

@@ -84,6 +84,7 @@ module.exports={
         		{name: 'maxSortId',type: 'Number'}, 
         		{name: 'maxSortId',type: 'Number'}, 
         		{name: 'middleSortId',type: 'Number'}, 
         		{name: 'middleSortId',type: 'Number'}, 
         		{name: 'smallSortId',type: 'Number'}, 
         		{name: 'smallSortId',type: 'Number'}, 
+                {name: 'seasons', type: 'String'},
         		{name: 'productStandardRelationStr',type: 'String'}
         		{name: 'productStandardRelationStr',type: 'String'}
         	]
         	]
         },
         },

@@ -170,8 +170,8 @@
         },
         },
         events:{
         events:{
             complete(data){
             complete(data){
-                if(data && data.list.length > 0){
-                    this.listUpdateTime = data.list[0].hour? data.list[0].hour+":00":'--:--';
+                if(data && data.additionInfo){
+                    this.listUpdateTime = data.additionInfo.hour? data.additionInfo.hour+":00":'--:--';
                 }else{
                 }else{
                     this.listUpdateTime = '--';
                     this.listUpdateTime = '--';
                 }
                 }

@@ -41,5 +41,10 @@ module.exports=function(app) {
     /*************************************会员画像*************************************/
     /*************************************会员画像*************************************/
     
     
     app.vue("/report/charts", "report.Charts");
     app.vue("/report/charts", "report.Charts");
-    
+
+    app.post("/chart/getShopTopArea", "report_getShopTopArea"); //地域分布
+
+    app.post("/chart/getConsumeAna", "report_getConsumeAna"); //消费水平
+
+    app.post("/chart/getUserAna", "report_getUserAna"); //会员分布
 }
 }

@@ -84,6 +84,7 @@ module.exports={
         		{name: 'maxSortId',type: 'Number'}, 
         		{name: 'maxSortId',type: 'Number'}, 
         		{name: 'middleSortId',type: 'Number'}, 
         		{name: 'middleSortId',type: 'Number'}, 
         		{name: 'smallSortId',type: 'Number'}, 
         		{name: 'smallSortId',type: 'Number'}, 
+                {name: 'seasons', type: 'String'},
         		{name: 'productStandardRelationStr',type: 'String'}
         		{name: 'productStandardRelationStr',type: 'String'}
         	]
         	]
         },
         },

@@ -122,8 +122,38 @@ module.exports={
                 middleSortId:{type: Number},
                 middleSortId:{type: Number},
                 smallSortId:{type: Number}
                 smallSortId:{type: Number}
             }
             }
-        }
+        },
 
 
         /*************************************会员画像*************************************/
         /*************************************会员画像*************************************/
+
+        getShopTopArea:{
+            title:"地域分布",
+            domain:"{{bigdata}}",
+            url:"/chart/getShopTopArea",
+            params:{
+                shopId:{type: Number},
+                dateId:{type: Number}
+            }
+        },
+
+        getConsumeAna:{
+            title:"消费水平",
+            domain:"{{bigdata}}",
+            url:"/chart/getConsumeAna",
+            params:{
+                shopId:{type: Number},
+                dateId:{type: Number}
+            }
+        },
+
+        getUserAna:{
+            title:"会员分布",
+            domain:"{{bigdata}}",
+            url:"/chart/getUserAna",
+            params:{
+                shopId:{type: Number},
+                dateId:{type: Number}
+            }
+        }
     }
     }
 }
 }