Merge branch 'yuanshop'

src/views/index.vue

@@ -133,8 +133,7 @@
                   v-model="value1"
                   @change="dateTimechange"
                   :picker-options="pickerOptions"
-                  value-format="timestamp"
-                  :default-time="['00:00:00', '23:59:59']"
+                  value-format="yyyy-MM-dd HH:mm:ss"
                   type="daterange"
                   range-separator="至"
                   start-placeholder="开始日期"
@@ -432,7 +431,7 @@ export default {
           let curDate = new Date().getTime();
           let three = 30 * 24 * 3600 * 1000;
           let threeMonths = curDate - three;
-          return time.getTime() > Date.now() || time.getTime() < threeMonths;
+          return time.getTime() > Date.now()- 86400000 || time.getTime() < threeMonths;
         },
       },
       //下拉框数据
@@ -529,6 +528,16 @@ export default {
     },
     //统计店铺数据时间和排行数据
     async dateTimechange() {
+      let data
+      //因为 default-time 属性与时间限制起了冲突，加上这个属性的话，当天的日期不能置灰，故出此下策，又因为传参需要默认传23点59分59秒，只能手动修改了，望见谅，有更好的方法的话可以替换一下
+      if(this.value1){
+        data=new Date(this.value1[1])
+        let year = data.getFullYear()
+        //因为月份转换比正常月份少一，故在此加一
+        let month = data.getMonth()+1
+        let date=data.getDate()
+        this.value1[1]=`${year}-${month}-${date} 23:59:59`
+      }
       if (this.value1 == null) {
         this.value1 = [];
         let objNum = this.numberChartDataCopy;
@@ -537,8 +546,8 @@ export default {
         this.storeGoods = objStore;
       } else if (this.numSelect == "11") {
         let query = {};
-        query.start_time = this.value1[0] / 1000;
-        query.end_time = this.value1[1] / 1000;
+        query.start_time = new Date(this.value1[0]).getTime() / 1000;
+        query.end_time = new Date(this.value1[1]).getTime() / 1000;
         query.seller_id = this.$store.state.user.sellerid;
         const result = await getStoreData(query);
         let storeObject = {};
@@ -555,8 +564,8 @@ export default {
         this.numberChartData = storeObject;
       } else if (this.numSelect == "13") {
         let query = {};
-        query.start_time = this.value1[0] / 1000;
-        query.end_time = this.value1[1] / 1000;
+        query.start_time = new Date(this.value1[0]).getTime() / 1000;
+        query.end_time = new Date(this.value1[1]).getTime() / 1000;
         const result = await getGoodsSale(query);
         //对金额进行除以100修改
         let arr = result.data;
@@ -575,9 +584,6 @@ export default {
       // query.start_time=this.value1[0]
       // query.end_time=this.value1[1]
       // const result=await getGoodsSale(query)
-      // console.log(result)
-      // console.log(query)
-      // console.log(this.value2,'热销类目选择时间')
     },
     //修改表格样式
     changeCellStyle(row, column, rowIndex, columnIndex) {