配餐返回

src/assets/js/dataFormate.js

@@ -29,6 +29,21 @@ function formatDate(date) {
     }
     return (myyear + "-" + mymonth + "-" + myweekday);
 }
+// 获取明日日期
+function GetDateStr(AddDayCount) {
+    var dd = new Date();
+    dd.setDate(dd.getDate() + AddDayCount); //获取AddDayCount天后的日期
+    var myyear = dd.getFullYear();
+    var mymonth = dd.getMonth() + 1; //获取当前月份的日期
+    var myweekday = dd.getDate();
+    if (mymonth < 10) {
+        mymonth = "0" + mymonth;
+    }
+    if (myweekday < 10) {
+        myweekday = "0" + myweekday;
+    }
+    return (myyear + "-" + mymonth + "-" + myweekday);
+}
 //获得某月的天数
 function getMonthDays(myMonth) {
     var monthStartDate = new Date(nowYear, myMonth, 1);
@@ -254,5 +269,6 @@ export {
     getQuarterStartDate,
     getQuarterEndDate,
     getNowTime,
-    getDateStrNowDay
+    getDateStrNowDay,
+    GetDateStr
 }

src/views/catering/index.vue

@@ -143,8 +143,7 @@ export default {
   methods: {
       //返回上级
     fanhuiBtn() {
-        window.href = "https://smartpark.caih.com/h5/#/home/feature"
-        // this.$router.go(-1)
+        this.$router.push({ path: "/home"})
     },
     //订单查询
     orderStatus(id){

src/views/home/index.vue

@@ -20,7 +20,7 @@
           <!-- <van-row class="phone">{{phone57}}</van-row> -->
           <van-icon name="arrow"  class="arrowRight"  @click="go"/>
         </van-row>
-        <van-row class="bottom" gutter="20">
+        <van-row class="bottom" gutter="0">
           <van-col  span="12">
             <van-image :src="require('../../assets/image/ic_我的余额备份@3x.png')" />
             <van-col  v-loading="loadingBalance" class="text">我的余额：<span >{{balance}}元</span></van-col>
@@ -546,16 +546,16 @@ export default {
         }
         .bottom{
           font-size: 14px;
-          margin-top:60px;
-          padding-bottom:20px;
+          margin:60px 0 20px;
           .van-image{
             width:28px;
             vertical-align: middle;
             display: inline-block;
             float:left;
-            margin-right:14px;
+            // margin-right:14px;
           }
           .text{
+            margin-left:14px;
             vertical-align: middle;
             text-align: left;
             display: inline-block;

src/views/login/index.vue

@@ -102,7 +102,7 @@ export default {
   mounted() {
 
     document.title = '中国东信智慧园区'
-    Cookies.set("openid57",'o5P6I5tLj-TjrK7leWUT8EFmTCa4') //本地测试
+    //Cookies.set("openid57",'o5P6I5tLj-TjrK7leWUT8EFmTCa4') //本地测试
     if(Cookies.get('rememberMe57')){
       this.loginForm.rememberMe = Boolean(Cookies.get('rememberMe57'))
     }
@@ -185,8 +185,8 @@ export default {
     },
     login_info() {
       if(Cookies.get("openid57") && Cookies.get("username57") && Cookies.get("password57")){
-        //window.location.href = "https://smartpark.caih.com/vuepay/#/home"
-        this.$router.push({ path: `/home`}) 
+        window.location.href = "https://smartpark.caih.com/vuepay/#/home"
+        //this.$router.push({ path: `/home`}) 
       }else{
         this.$refs.loginForm.validate(valid => {
           if (valid) {
@@ -242,8 +242,8 @@ export default {
                           }
                         }
                         setTimeout(()=>{
-                          this.$router.push({ path: `/home`}) 
-                          //window.location.href = "https://smartpark.caih.com/vuepay/#/home"
+                          //this.$router.push({ path: `/home`}) 
+                          window.location.href = "https://smartpark.caih.com/vuepay/#/home"
                         },200)
                      })
                     })

src/views/orderingFood/index.vue

@@ -86,7 +86,7 @@
   </div>
 </template>
 <script>
-import { getNowTime } from "@/assets/js/dataFormate.js";
+import { getNowTime, GetDateStr } from "@/assets/js/dataFormate.js";
 import Cookies from "js-cookie";
 import {
   Dialog,
@@ -152,8 +152,9 @@ export default {
     })
 
     document.title = '中国东信智慧园区'
-    let startTime = getNowTime().split(" ")[0] + " 00:00:00"
+    let startTime = getNowTime().split(" ")[0] + " 19:00:00"
     let endTime = getNowTime().split(" ")[0] + " 23:59:59"
+    // console.log(GetDateStr(1))
     //历史订单
       axios.post(`https://smartpark.caih.com/dxapi/dreOrder/page`,{
         current:1,