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

@@ -7,10 +7,10 @@
         </select>
     </div>
     <div class="panel-col" v-if="params.type==1">
-        <com-calendar :value.sync="reqTime" :placeholder="'选择时间'" :end="EndDate"></com-calendar>
+        <com-calendar :value.sync="params.reqTime" :placeholder="'选择时间'" :end="EndDate"></com-calendar>
     </div>
     <div class="panel-col" v-if="params.type==3">
-        <com-calendar :format="'yyyy-MM'" :value.sync="reqTime" :end="EndMonth" :placeholder="'选择月份'"></com-calendar>
+        <com-calendar :format="'yyyy-MM'" :value.sync="params.reqTime" :end="EndDate" :placeholder="'选择月份'"></com-calendar>
     </div>
     <div class="panel-col" v-if="params.type==2">
         <com-calendar :value.sync="params.beginTime" :state="'week'" :placeholder="'开始时间'"></com-calendar>
@@ -47,21 +47,9 @@
         props: {
             params: {type: Object, default: {}}
         },
-        data(){
-            let date=new Date();
-                date.setDate(date.getDate()-1);
-            return {
-                reqTime:util.dateFormat(date, "YYYY-MM-dd")
-            }
-        },
         computed: {
             EndDate(){
                 let date=new Date();
-                date.setDate(date.getDate()-1);
-                return [date.getFullYear(),date.getMonth(),date.getDate()].join('-');
-            },
-            EndMonth(){
-                let date=new Date();
                 return [date.getFullYear(),date.getMonth(),date.getDate()-1].join('-');
             },
             EndTime(){
@@ -92,7 +80,7 @@
             changeType(){
                 if (this.params.type == 2) {
                     //周报：reqTime时间不传
-                    this.reqTime = "";
+                    this.params.reqTime = "";
                 }
                 else {
                     //月报,日报，开始结束时间不传

@@ -30,6 +30,7 @@
     import grid from '../../../../components/grid/index';
     import card from './card';
     import filer from './filter';
+    import util from 'util';
 
     export default {
         components: {
@@ -41,6 +42,8 @@
             refundData: {type: Object, default: {}}
         },
         data() {
+            let date=new Date();
+            date.setDate(date.getDate()-1);
             return {
                 cards: [
                     {name: "退货总数", value: "0", name1: "环比", value1: "0"},
@@ -49,7 +52,7 @@
                 ],
                 params: {
                     type: 1,
-                    reqTime: "",
+                    reqTime: util.dateFormat(date, "YYYY-MM-dd"),
                     beginTime: "",
                     endTime: "",
                     productSkn: "",

@@ -30,6 +30,7 @@
     import grid from '../../../../components/grid/index';
     import card from './card';
     import filer from './filter';
+    import util from 'util';
 
     export default {
         components: {
@@ -41,6 +42,8 @@
             saleData: {type: Object, default: {}}
         },
         data() {
+            let date=new Date();
+            date.setDate(date.getDate()-1);
             return {
                 cards: [
                     {name: "有效订单的商品件数", value: "0", name1: "环比", value1: "0"},
@@ -48,7 +51,7 @@
                 ],
                 params: {
                     type: 1,
-                    reqTime: "",
+                    reqTime: util.dateFormat(date, "YYYY-MM-dd"),
                     beginTime: "",
                     endTime: "",
                     productSkn: "",

@@ -43,8 +43,8 @@ var apiCofig = {
 	//root:__dirname,
 	EnvConst:{
 		domain:"http://192.168.102.210:8088/platform",
-		//bigdata:"http://172.16.6.189:8080/bigdata",//李建
-		bigdata:"http://192.168.102.210:8091/bigdata",
+		bigdata:"http://172.16.6.189:8080/bigdata",//李建
+		// bigdata:"http://192.168.102.210:8091/bigdata",
 		//bigdata:"http://172.16.6.110:8080",//钟文
 		system:Iaccount
 	},