配餐完成

src/plugins/common.js

@@ -59,7 +59,7 @@ export function getPayApi(money, topPayType, payType, channelId, scene, userId)
 // }
 
 // export function weixin() {
-//     return axios.get(`wxAccToken`, { "url": "https://qhome.usky.cn/dxapi/wxAccToken?url=https://qhome.usky.cn/dxapi/wxAccToken" })
+//     return axios.get(`wxAccToken`, { "url": "https://smartpark.caih.com/dxapi/wxAccToken?url=https://smartpark.caih.com/dxapi/wxAccToken" })
 //         .then(res => {
 //             return res
 //         }).catch(() => {

src/router/index.js

@@ -100,6 +100,14 @@ const routes = [
         component: () =>
             import ( /* webpackChunkName: "about" */ '../views/orderingFood/address')
     },
+    {
+        path: '/catering', //配餐服务
+        name: 'catering',
+        component: () =>
+            import ( /* webpackChunkName: "about" */ '../views/catering')
+    },
+
+
 
 
 

src/store/index.js

@@ -6,17 +6,31 @@ Vue.use(Vuex)
 export default new Vuex.Store({
     state: {
         cart: [],
+        user: {},
+        canbie: undefined
     },
     mutations: {
         SET_CART: (state, value) => {
             state.cart = value
         },
+        SET_USER: (state, value) => {
+            state.user = value
+        },
+        SET_CANBIE: (state, value) => {
+            state.canbie = value
+        },
     },
     actions: {
         cart({ commit }, value) {
             console.log(value)
             commit('SET_CART', value)
         },
+        user({ commit }, value) {
+            commit('SET_USER', value)
+        },
+        canbie({ commit }, value) {
+            commit('SET_CANBIE', value)
+        },
     },
     modules: {}
 })

src/views/catering/index.vue

@@ -0,0 +1,479 @@
+<template>
+  <div class="mianBox" v-if="status">
+    <van-row class="headerBox" @click="fanhuiBtn">
+      <van-icon name="arrow-left" class="arrow-left" />
+      <van-col class="return">返回</van-col>
+      <van-col class="title">{{title}}</van-col>
+    </van-row>
+    <van-row class="top">
+        <van-tabs v-model="active" @click="activeSelect" class="pc">
+            <van-tab title="待配餐" :badge="number"></van-tab>
+            <van-tab title="已完成"></van-tab>
+        </van-tabs>
+        <div class="lineP"></div>
+    </van-row>
+    <van-row class="bottom">
+        <van-row class="orderList" v-if="active==0">
+          <van-col span="24" v-for="(item,index) in order" :key="index" class="order" @click="orderOne(item)">
+              <van-col span="12" class="dcrText">点餐人：</van-col>
+              <van-col span="12" class="dcr">{{item.orderUserName}}</van-col>
+              <van-col span="12" class="scAddressText">送餐地址：</van-col>
+              <van-col span="12" class="scAddress">{{item.address}}</van-col>
+              <van-col span="12" class="statusText">当前状态：</van-col>
+              <van-col span="12" :class="item.orderStatus == '3' ? 'status' : 'status1'">
+                  {{item.orderStatus == "0" ? "待接单" : item.orderStatus == "1" ? "配餐中" : item.orderStatus == "2" ? "送餐中"  : "已完成"}}
+              </van-col>
+              <van-steps :active="item.orderStatus == '0' ? '-1' : item.orderStatus" v-if="item.orderStatus != '3'"  active-color="#D7000F" inactive-color="#999999">
+                <van-step>待接单</van-step>
+                <van-step>配餐中</van-step>
+                <van-step>送餐中</van-step>
+                </van-steps>
+          </van-col>
+          <van-col span="24" class="noMore">没有更多数据了</van-col>
+        </van-row>
+        <van-row class="orderList" v-if="active==1">
+          <van-col span="24" v-for="(item,index) in order" :key="index" class="order" @click="orderOne(item)">
+              <van-col span="12" class="dcrText">点餐人：</van-col>
+              <van-col span="12" class="dcr">{{item.orderUserName}}</van-col>
+              <van-col span="12" class="scAddressText">送餐地址：</van-col>
+              <van-col span="12" class="scAddress">{{item.address}}</van-col>
+              <van-col span="12" class="statusText">当前状态：</van-col>
+              <van-col span="12" :class="item.orderStatus == '3' ? 'status' : 'status1'">
+                  {{item.orderStatus == "0" ? "待接单" : item.orderStatus == "1" ? "配餐中" : item.orderStatus == "2" ? "送餐中"  : "已完成"}}
+              </van-col>
+              <van-steps :active="item.orderStatus == '0' ? '-1' : item.orderStatus" v-if="item.orderStatus != '3'"  active-color="#D7000F" inactive-color="#999999">
+                <van-step>待接单</van-step>
+                <van-step>配餐中</van-step>
+                <van-step>送餐中</van-step>
+                </van-steps>
+          </van-col>
+          <van-col span="24" class="noMore">没有更多数据了</van-col>
+        </van-row>
+    </van-row>
+    <van-dialog v-model="show" class="pcDialog">
+       <van-row class="orderDetails">
+           <van-col class="order" >
+              <van-col span="12" class="left">订餐人：</van-col>
+              <van-col span="12" class="right">{{orderDetails.orderUserName || '-'}}</van-col>
+              <van-col span="12" class="left">餐别：</van-col>
+              <van-col span="12" class="right">{{orderDetails.mType || '-'}}</van-col>
+              <van-col span="12" class="left">手机号：</van-col>
+              <van-col span="12" class="right">{{orderDetails.phone || '-'}}</van-col>
+              <van-col span="12" class="left">送餐地址：</van-col>
+              <van-col span="12" class="right">{{orderDetails.address}}</van-col>
+              <van-col span="12" class="left">备注：</van-col>
+              <van-col span="12" class="right">{{orderDetails.remark || '-'}}</van-col>
+           </van-col>
+          <van-col class="detailsText">配餐明细</van-col>
+          <van-col  span="24"  class="dishes">
+            <van-col span="24" v-for="(item,index) in dishes" :key="index" class="list">
+                <van-col span="12" class="name">{{item.mName}}</van-col>
+                <van-col span="12" class="num">{{item.mCount}}份</van-col>
+            </van-col>
+          </van-col>
+          <van-col class="statusSelect">
+            <van-col class="select zt" v-if = "orderDetails.orderStatus == '0'" @click="statusChange(1)">
+               接单
+            </van-col>
+            <van-col class="select zt" v-if = "orderDetails.orderStatus == '1'" @click="statusChange(2)">
+               送餐
+            </van-col>
+             <van-col class="select zt" v-if = "orderDetails.orderStatus == '2'" @click="statusChange(3)">
+               完成
+            </van-col>
+             <van-col class="select gb" @click="close">
+               关闭
+            </van-col>
+          </van-col>
+          <van-col class="jjPhone">紧急联系人：{{orderDetails.jjPhone}}</van-col>
+        </van-row>
+    </van-dialog>
+  </div>
+</template>
+<script>
+import axios from "axios";
+import { Field, NumberKeyboard, Dialog, Toast,Step, Steps } from "vant";
+import Cookies from "js-cookie";
+import { getNowTime } from "@/assets/js/dataFormate.js";
+export default {
+  data() {
+    return {
+      show:false,
+      number:undefined,
+      status:false,
+      active:0,
+      order:[],
+      orderDetails:{},
+      dishes:[],
+      title:"配餐清单",
+      orderId:undefined,
+    };
+  },
+  components: {
+    [Field.name]: Field,
+    [NumberKeyboard.name]: NumberKeyboard,
+    [Dialog.name]: Dialog,
+    [Toast.name]: Toast,
+  },
+  created() {
+    
+
+  },
+  mounted(){
+    document.title = '中国东信智慧园区'
+    this.orderStatus()
+    if(this.$route.query.id){
+        console.log(this.$route.query.id)
+        this.orderStatus()
+        setTimeout(()=>{
+            for(let i =0;i<this.order.length;i++){
+                if(this.order[i].id = this.$route.query.id){
+                    this.orderOne(this.order[i])
+                }
+            }
+        },50)
+        
+    }else{
+        this.orderStatus()
+    }
+    
+  },
+  methods: {
+      //返回上级
+    fanhuiBtn() {
+        this.$router.push({ path: "/home"}) 
+    },
+    //订单查询
+    orderStatus(id){
+        let data = {
+            current:1,
+            size:500,
+            orderStatus:undefined,
+            statusList:undefined
+        }
+        if(id){
+            data.orderStatus = id
+             //历史订单
+            axios.post(`https://smartpark.caih.com/dxapi/dreOrder/page`,data).then(res => { 
+                const data = res.data.data.records
+                this.order  = data
+                this.status = true
+            })
+        }else{
+            data.statusList = [0,1,2]
+             //历史订单
+            axios.post(`https://smartpark.caih.com/dxapi/dreOrder/page`,data).then(res => { 
+                const data = res.data.data.records
+                this.number = data.length
+                if(this.number == "0"){
+                    this.number = undefined
+                }
+                this.order  = data
+                this.status = true
+            })
+        }
+       
+      
+    },
+    //active切换
+    activeSelect(){
+        if(this.active == "0"){
+            this.orderStatus()
+        }else{
+            this.orderStatus(3)
+        }
+    },
+    //订单详情
+    orderOne(row){
+        this.show = true
+        this.orderDetails = row
+        axios.get(`https://smartpark.caih.com/dxapi/system/config/configKey/dre_urgency_phone`).then(res => { 
+            this.orderDetails.jjPhone  = res.data.data
+        })
+        //订单详情
+        axios.get(`https://smartpark.caih.com/dxapi/dreOrderDetail/listByOrder?orderId=${row.id}`).then(res => { 
+            const data = res.data.data
+            this.dishes = data
+        })
+    },
+    //订单详情
+    orderOne(row){
+        this.show = true
+        this.orderDetails = row
+        axios.get(`https://smartpark.caih.com/dxapi/system/config/configKey/dre_urgency_phone`).then(res => { 
+            this.orderDetails.jjPhone  = res.data.data
+        })
+        //订单详情
+        axios.get(`https://smartpark.caih.com/dxapi/dreOrderDetail/listByOrder?orderId=${row.id}`).then(res => { 
+            const data = res.data.data
+            this.dishes = data
+        })
+    },
+    //状态变更
+    statusChange(id){
+        let time = getNowTime()
+        let data = {
+            id:this.orderDetails.id,
+            orderStatus:id,
+            receiveUserName:undefined,
+            receiveUserId:undefined,
+            receiveTime:undefined, 
+            sendUserName:undefined,
+            sendUserId:undefined,
+            sendTime:undefined,
+            sendEndTime:undefined,
+        }
+        let sid = undefined
+        axios.get("https://smartpark.caih.com/dxapi/dxtop/staff/one",{
+          params:{
+            id:Cookies.get("userId57")
+          }
+        }).then(res2 =>{
+            sid = res2.data.data.sid
+            if(id == "1"){
+                data.receiveUserName = Cookies.get("nickName57")
+                data.receiveUserId = sid
+                data.receiveTime = time
+            }
+            if(id == "2"){
+                data.sendUserName= Cookies.get("nickName57")
+                data.sendUserId = sid
+                data.sendTime = time
+            }
+            if(id == "3"){
+                data.sendEndTime = time
+            }
+            axios.put(`https://smartpark.caih.com/dxapi/dreOrder/`,data).then(res => { 
+                Toast("订单状态变更完成")
+                if(id == "3"){
+                    this.active = 1
+                    this.number = this.number - 1
+                    if(this.number == "0"){
+                        this.number = undefined
+                    }
+                    this.orderStatus(3)
+                }else{
+                    this.active = 0
+                    this.orderStatus()
+                }
+                
+                this.show = false
+            })
+        })
+        
+    },
+    //关闭
+    close(id){
+      this.show = false  
+    }
+  },
+};
+</script>
+<style lang="scss" scoped>
+.mianBox{
+    width:100%;
+    height:100%;
+    background-color: #F9F9F9 !important;
+    .headerBox{
+        position: relative;
+        .arrow-left{
+            font-size: 24px;
+            vertical-align: middle;
+            margin-left:-6px;
+        }
+        .return{
+            vertical-align: middle;
+            font-size: 16px;
+            line-height: 42px;
+        }
+        .title{
+            position: absolute;
+            width:calc(100vw - 30px);
+            text-align: center;
+        }
+    }
+    .top{
+        position: relative;
+        .lineP{
+            position: absolute;
+            top:12px;
+            left:50%;
+            width:1px;
+            height:20px;
+            background-color: #E8E8E8;
+        }
+    }
+    .bottom{
+        background-color: #fff;
+        margin-top:10px;
+        .orderList{
+            .order{
+                padding:15px 15px 15px;
+                .dcrText,.scAddressText,.statusText{
+                    color:#999999;
+                    padding:5px 0;
+                    
+                }
+                .dcr,.scAddress,.status{
+                    color:#333;
+                    text-align: right;
+                    padding:5px 0;
+                }
+                div{
+                    font-size: 14px;
+                    padding:5px 0;
+                }
+                // div:nth-child(even){
+                //     text-align: right;
+                // }
+                .status1{
+                    color:#D7000F;
+                    text-align: right;
+                    padding:5px 0;
+                }
+                .van-steps{
+                    width:100%;
+                    background:transparent;
+                    height:50px;
+                    
+                }
+            }
+            .order:nth-child(odd){
+                background-color: #fff;
+            }
+            .order:nth-child(even){
+                background-color: #F9F9F9;
+            }
+            
+        }
+        .noMore{
+            background-color: #F9F9F9;
+            color:#999999;
+            text-align: center;
+            padding:20px 0;
+            font-size: 14px;
+        }
+    }
+    .pcDialog{
+        border-radius: 4px;
+        width:85%;
+        padding-bottom:10px;
+        .orderDetails{
+            .order{
+                padding:16px;
+                border-bottom:1px solid #F0F0F0;
+                div{
+                    padding:5px 0;
+                }
+                div:nth-child(odd){
+                    text-align: left;
+                    color:#999999;
+                }
+                div:nth-child(even){
+                    text-align: right;
+                    color:#333;
+                }
+            }
+        }
+        .detailsText,.jjPhone{
+            font-size: 18px;
+            margin:10px 16px;
+            font-weight: 700;
+        }
+        .dishes{
+            max-height:calc(100vh - 550px);
+            overflow-y: scroll;
+            padding:0px 16px;
+            .list{
+                color:#333;
+                font-size: 18px;
+                height:40px;
+                line-height: 40px;
+                width:100%;
+                div:nth-child(odd){
+                    text-align: left;
+                    padding-left:10px;
+                }
+                div:nth-child(even){
+                    text-align: right;
+                    padding-right:10px;
+                }
+            }
+            
+            .list:nth-child(odd){
+                background: #F9F9F9;
+            }
+            .list:nth-child(even){
+                background: #F0F0F0;
+            }
+            
+        }
+        .statusSelect{
+            padding:20px 16px 10px;
+            position: relative;
+            float:right;
+            .select{
+                width:60px;
+                height:40px;
+                line-height: 40px; 
+                font-size: 16px;
+                text-align: center;
+                border-radius: 4px;
+            }
+            .select:nth-child(1){
+                margin-left:155px;
+            }
+            .select:nth-child(2){
+               margin-left:10px;
+            }
+            .zt{
+                color: #fff;
+                background:#D7000F;
+            }
+            .gb{
+                 color: #D7000F;
+                background:#fff;
+                border:1px solid #D7000F;
+            }
+        }
+    }
+    
+    
+}
+
+</style>
+<style>
+.van-steps__items{
+    margin-top:-10px !important;
+}
+.van-step__title{
+    position: absolute !important;
+    top:40px;
+    font-size: 12px !important;
+    margin-left:-50px;
+
+}
+.van-step--horizontal:last-child .van-step__title{
+  margin-left:-40px;
+}
+
+.van-info{
+    width:20px;
+    height:20px;
+    line-height: 20px;
+    top:10px;
+    left:20px;
+    color:#fff;
+    margin-left:20px;
+    background-color: #D7000F;
+}
+.pcDialog .van-dialog__footer{
+    display: none;
+}
+.pc .van-tab__text{
+    font-size: 16px;
+}
+.pc .van-tabs__line{
+    width:55px;
+}
+</style>

src/views/home/index.vue

@@ -32,7 +32,7 @@
     </van-row>
     <van-row class="contentBox">
       <van-row class="system">
-        <van-row  type="flex" justify="space-between" gutter="10" >
+        <van-row  type="flex"  gutter="10" class="menu">
           <van-col span="6" class="function" @click="sm('https://smartpark.caih.com/h5/#/licence',1)">
             <van-image :src="require('../../assets/image/function/icon2.png')" />
             <div class="title">车牌登记</div>
@@ -49,6 +49,14 @@
             <van-image :src="require('../../assets/image/function/icon10.png')" />
             <div class="title">综合安防</div>
           </van-col>
+          <van-col span="6" class="function" @click="dc" >
+            <van-image :src="require('../../assets/image/function/dc.png')" />
+            <div class="title">点餐服务</div>
+          </van-col>
+          <van-col span="6" class="function" @click="pc" >
+            <van-image :src="require('../../assets/image/function/pc.png')" />
+            <div class="title">配餐服务</div>
+          </van-col>
           <!-- <van-col span="6" class="function"  v-if="people57 == '1'">
             <van-image :src="require('../../assets/image/function/icon11.png')" />
             <div class="title">预约场地</div>
@@ -174,11 +182,11 @@ export default {
     };
   },
   created(){
-    if(Cookies.get("userId57")){
-      this.userId = Cookies.get("userId57")
-    }else{
-      this.$router.push({ path: "/login"})
-    }
+    // if(Cookies.get("userId57")){
+    //   this.userId = Cookies.get("userId57")
+    // }else{
+    //   this.$router.push({ path: "/login"})
+    // }
     this.portrait57 = Cookies.get("portrait57")
     this.nickName57 = Cookies.get("nickName57")
     this.dept57 = Cookies.get("dept57")
@@ -374,6 +382,14 @@ export default {
             Toast(err.response.data.message)
         })
     },
+    //点餐
+    dc(){
+      this.$router.push({ path: "/orderingFood"})
+    },
+    //配餐
+    pc(){
+      this.$router.push({ path: "/catering"})
+    },
     //一卡通充值
     ykt(){
       this.$router.push({ path: `/amount?token=${localStorage.getItem('cipher57')}&classify=''&passageway='weixin'`}) //passageway检测微信进入会app进入
@@ -393,7 +409,25 @@ export default {
       this.$router.push({ path: "/information"})
     },
     outLogin(){
-      this.$router.push({ path: "/"})
+      localStorage.clear()
+      Cookies.remove("timestamp57");
+        Cookies.remove("username57");
+        Cookies.remove("rememberMe57");
+        Cookies.remove("password57");
+        Cookies.remove("portrait57");
+        Cookies.remove("userId57");
+        Cookies.remove("token57");
+        Cookies.remove("nonce57");
+        
+        Cookies.remove("timestamp57");
+        Cookies.remove("nickName57");
+        Cookies.remove("dept57");
+        Cookies.remove("phone57");
+        Cookies.remove("people57");
+        Cookies.remove("openid57");
+        Cookies.remove("cardId57");
+        
+      this.$router.push({ path: "/login"})
     }
   },
 };
@@ -494,7 +528,12 @@ export default {
             color:#000;
             text-align: center;
             margin-top:6px;
+            width:70px;
           }
+          .van-image{
+            width:70px;
+          }
+
         }
       }
       .record{

src/views/login/index.vue

@@ -66,6 +66,7 @@ import { Toast } from "vant";
 import axios from "axios";
 import Cookies from "js-cookie";
 import { encrypt, decrypt } from '../../utils/jsencrypt';
+import { mapState, mapActions } from "vuex";
 export default {
   data() {
     return {
@@ -101,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'))
     }
@@ -146,7 +147,7 @@ export default {
        return gvalue;
      },
     wx_login(){//微信拉起授权获取code
-      window.location.href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxd64360a4b8c50006&redirect_uri=https://smartpark.caih.com/vuepay&response_type=code&scope=snsapi_base&state=123`
+      window.location.href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxd64360a4b8c50006&redirect_uri=https://smartpark.caih.com/vuepay2&response_type=code&scope=snsapi_base&state=123`
       //获取openid
       //https://api.weixin.qq.com/sns/oauth2/access_token?appid=wxd64360a4b8c50006&secret=b758e45c89162542610509dafd9db7c3&code=021Ye8Ha1jvNXC0ckiJa1JtKPF2Ye8Hp&grant_type=authorization_code
     },
@@ -200,6 +201,7 @@ export default {
                     Toast("离职人员,暂无权限")
                     return
                   }else{
+                    this.$store.dispatch("user", res?.data?.data?.data)
                     localStorage.setItem("cipher57",data.cipher)
                     localStorage.setItem("classify","2")
                     Cookies.set("username57", this.loginForm.username, { expires: 300 });
@@ -219,8 +221,8 @@ export default {
                       openId:Cookies.get("openid57")
                     })
                     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/vuepay2/#/home"
                     },200)
                   }
 
@@ -229,7 +231,7 @@ export default {
                     Toast("离职人员,暂无权限")
                     return
                   }else{
-                    
+                    this.$store.dispatch("user", res?.data?.data?.data)
                     localStorage.setItem("cipher57",data.cipher)
                     localStorage.setItem("classify","1")
                     Cookies.set("username57", this.loginForm.username, { expires: 300 });
@@ -250,8 +252,8 @@ export default {
                       openId:Cookies.get("openid57")
                     })
                     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/vuepay2/#/home"
                     },200)
                     
                   }

src/views/orderingFood/address/index.vue

@@ -5,7 +5,7 @@
       <van-col class="return">返回</van-col>
       <van-col class="title">{{ title }}</van-col>
     </van-row>
-    <van-row class="top">
+    <van-row class="top" >
       <van-row class="foodType">
         <van-col class="describe" :span="12">
           <van-image
@@ -25,19 +25,18 @@
                 class="gx"
             />
           </van-col>
-          <van-col :span="24" v-if="form.id == '自定义送餐地址：'" class="address">
-              <input type="text" placeholder="请输入送餐地址" v-model="form.address" class="addressInput">
+          <van-col :span="24" v-if="form.id == '自定义送餐地址：'" class="address" >
+              <input type="text" placeholder="请输入送餐地址" v-model="form.address" class="addressInput" maxlength="20">
           </van-col>
         </van-col>
-      <!-- <van-button  type="danger" @click="diancan" class="button">去点餐</van-button> -->
     </van-row>
-    <van-col class="tel">
-        <van-col class="telText" :span="12">联系方式（非必填）：</van-col>
-        <input type="text" placeholder="请输入联系方式" v-model="form.tel" class="telInput">
+    <van-col class="tel" span="24">
+        <van-col class="telText" span="12">联系方式（非必填）：</van-col>
+        <input  placeholder="请输入联系方式" v-model="form.tel" class="telInput" type="number">
     </van-col>
     <van-col class="remarks">
         <van-col class="remarksText" :span="24">备注信息（非必填）：</van-col>
-        <textarea type="text" placeholder="请输入备注信息" v-model="form.remarks" class="remarksInput" rows="3" />
+        <textarea type="text" placeholder="请输入备注信息" v-model="form.remarks" class="remarksInput" rows="3" maxlength="20" />
     </van-col>
     <van-row class="bottom">
       <van-row class="settlement">
@@ -57,6 +56,7 @@
 </template>
 <script>
 import axios from "axios";
+import Cookies from "js-cookie";
 import { mapState, mapActions, ContactList } from "vuex";
 import {
   Field,
@@ -72,35 +72,16 @@ import { returnFloat } from "@/assets/js/common.js";
 export default {
   data() {
     return {
-        form:{
-            remarks:undefined,
-            tel:undefined,
-            address:undefined,
-            id:"自定义送餐地址：",
-        },
+      status:false,
+      form:{
+          remarks:undefined,
+          tel:undefined,
+          address:undefined,
+          id:"自定义送餐地址：",
+      },
       title: "送菜地址",
       money: 0,
-      foodList: [
-        { name: "香菇肉粉1", money: "10.00", num: 0,id:1 },
-        { name: "香菇肉粉2", money: "11.00", num: 0,id:2 },
-        { name: "香菇肉粉3", money: "12.00", num: 0,id:3 },
-        { name: "香菇肉粉4", money: "13.00", num: 0 ,id:4},
-        { name: "香菇肉粉5", money: "14.00", num: 0 ,id:5},
-        { name: "香菇肉粉6", money: "15.00", num: 0 ,id:6},
-        { name: "香菇肉粉7", money: "16.50", num: 0 ,id:7},
-        { name: "香菇肉粉8", money: "13.00", num: 0,id:8 },
-        { name: "香菇肉粉9", money: "14.00", num: 0,id:9 },
-        { name: "香菇肉粉10", money: "15.00", num: 0,id:10 },
-        { name: "香菇肉粉11", money: "16.50", num: 0,id:11 },
-     
-      ],
-      addressList: [
-        { name: "201包间", id: "201包间" },
-        { name: "202包间", id: "202包间" },
-        { name: "1606包间", id: "1606包间"},
-        { name: "1608包间", id: "1608包间"},
-        { name: "自定义送餐地址：", id: "自定义送餐地址："},
-      ],
+      addressList: [],
     };
   },
   watch: {
@@ -114,32 +95,39 @@ export default {
   },
   computed: {
     ...mapState({
-       footStoreData:state=>state.cart
+       store:state=>state
     })
-   },
+  },
   created() {
-      if(JSON.stringify(this.footStoreData) != '[]'){
-          this.foodList = this.footStoreData
+      //获取默认地址
+      axios.get(`https://smartpark.caih.com/dxapi/system/config/configKey/dre_default_address`).then(res => { 
+        const data = res.data.data.split(',')
+        let arr = []
+        for(let i =0;i<data.length;i++){
+          arr[i] = {id:undefined,name:undefined}
+          arr[i].id = data[i]
+          arr[i].name = data[i]
+        }
+        arr.push({ name: "自定义送餐地址：", id: "自定义送餐地址："}),
+        this.addressList = arr
+        
+      })
+      if(JSON.stringify(this.store.cart) != '[]'){
+          this.foodList = this.store.cart
       }
-      let data = this.footStoreData
+      let data = this.store.cart
       for(let i=0;i<data.length;i++){
           if(data[i].num){
-              this.money += data[i].money * data[i].num
+              this.money += data[i].price * data[i].num
           }
       }
-      // this.money = this.footStoreData
   },
-  mouted() {
-    var url = window.location.href;
+  mounted() {
+    document.title = '中国东信智慧园区'
   },
-  computed: {
-    ...mapState({
-       footStoreData:state=>state.cart
-    })
-   },
   methods: {
     fanhuiBtn() {
-       this.$router.go(-1)
+       this.$router.push({path:'/orderService'})
     },
     diancan() {},
     onConfirm() {
@@ -150,15 +138,55 @@ export default {
         this.form.id = id
     },
     submit(){
+      //获取默认地址
+      let data = this.store.cart
+      let arr = []
+      for(let i=0;i<data.length;i++){
+        if(data[i].num>0){
+          let select = {mName:undefined,mPrice:undefined,totalPrice:undefined,mCount:undefined}
+          select.mName = data[i].name
+          select.mPrice = data[i].price
+          select.totalPrice = (data[i].price * data[i].num).toFixed(2)
+          select.mCount = data[i].num
+          arr.push(select)
+
+        }
+      }
+      if(this.form.id == "自定义送餐地址：" && !this.form.address){
+        Toast("送菜地址不能为空")
+        return
+      }
+      axios.get("https://smartpark.caih.com/dxapi/dxtop/staff/one",{
+          params:{
+            id:Cookies.get("userId57")
+          }
+        }).then(res2 =>{
+          axios.post(`https://smartpark.caih.com/dxapi/dreOrder/`,
+            {
+              orderUserName:Cookies.get("nickName57"),
+              address:this.form.id == "自定义送餐地址：" ? this.form.address : this.form.id,
+              totalMoney:this.money.toFixed(2),
+              mType:localStorage.getItem("canbie57"),
+              phone:this.form.tel,
+              remark:this.form.remarks,
+              dreOrderDetails:arr,
+              orderUserId:res2.data.data.sid
+            }).then(res => { 
+              this.$store.dispatch("cart", [])
+              this.$store.dispatch("canbie", undefined)
+              localStorage.clear("canbie57")
+              Dialog.confirm({
+                title: '系统信息',
+                message: '您的点餐已进入配餐流程，请耐心等候，谢谢！',
+              }).then(() => {
+                this.$router.push({ path: "/orderingFood"})
+              });
+              setTimeout(()=>{
+                document.getElementsByClassName("van-button__text")[1].innerHTML = "关闭"
+              },1)
+          })  
+        })
       
-      Dialog.confirm({
-        title: '系统信息',
-        message: '您的点餐已进入配餐流程，请耐心等候，谢谢！',
-      }).then(() => {
-        
-      });
-      document.getElementsByClassName("van-button__text").html = "关闭"
-        
     },
   },
 };
@@ -166,7 +194,8 @@ export default {
 <style lang="scss" scoped>
 .mianBox {
   width: 100%;
-  height: 100%;
+  height: calc(100vh - 60px);
+  overflow-y: scroll;
   background-color: #f9f9f9 !important;
   .headerBox {
     position: relative;
@@ -189,7 +218,7 @@ export default {
   .top {
     background-color: #fff;
     .foodType {
-      padding: 10px 15px 10px;
+      padding: 10px 15px 14px;
       text-align: left;
       border-bottom: 1px solid #e8e8e8;
       .cj {
@@ -227,7 +256,7 @@ export default {
                 position: absolute;
                 width:20px;
                 right:20px;
-                top:00px;
+                top:0px;
             }
       }
     }
@@ -250,8 +279,7 @@ export default {
             border-radius: 6px;
             padding:10px;
         }
-    }
-
+  }
   .bottom {
     background: #fff;
     width: 100%;
@@ -282,6 +310,9 @@ export default {
     }
   }
 }
+
+
+
 </style>
 <style>
 .van-dropdown-menu__bar {
@@ -311,4 +342,37 @@ export default {
 .van-dialog__cancel{
   display: none;
 }
+
+
+
+
+.van-dialog{
+  border-radius: 4px;
+}
+.van-dialog{
+  width:80%;
+}
+.van-dialog__header{
+  font-weight: 700 !important;
+  font-size: 16px;
+}
+.van-dialog__message--has-title{
+  letter-spacing: 1px;
+  font-size: 12.5px;
+  line-height: 20px;
+}
+.van-dialog__confirm{
+  background:#D7000F;
+  color:#fff;
+  font-weight: 700;
+  font-size: 16px;
+  margin:20px 7.5%;
+  width:85%;
+  letter-spacing: 2px;
+  
+}
+.addressInput{
+  width:100%;
+  height:20px;
+}
 </style>

src/views/orderingFood/index.vue

@@ -1,13 +1,13 @@
 <template>
-  <div class="mianBox" v-if="order">
-    <van-row class="headerBox">
-      <van-icon name="arrow-left" @click="fanhuiBtn" class="arrow-left" />
+  <div class="mianBox" v-if="status">
+    <van-row class="headerBox" @click="fanhuiBtn">
+      <van-icon name="arrow-left" class="arrow-left" />
       <van-col class="return">返回</van-col>
       <van-col class="title">{{title}}</van-col>
     </van-row>
     <van-row class="top">
         <van-row class="timeType">
-            <van-col class="describe">今日{{type}}菜品：<span class="time">（点餐时间：{{time}}）</span></van-col>
+            <van-col class="describe">今日{{type}}菜品：<span class="time">(点餐时间：{{time}})</span></van-col>
         </van-row>
         <van-row class="RecommendedDishes">
           <van-col  :span="7" v-for="(item,index) in RecommendedDishes" :key="index" class="dishes" :gutter="20">
@@ -24,21 +24,20 @@
                 <van-image :src="require('../../assets/image/right2.png')" class="right_icon"  />
             </van-col>
         </van-row>
-        <van-row class="orderList" gutter="20">
+        <van-row class="orderList">
           <van-col span="24" v-for="(item,index) in order" :key="index" class="order">
-              <van-col span="12" class="moneyText">下单金额</van-col>
-              <van-col span="12" class="money">￥{{item.money}}</van-col>
-              <van-col span="12" class="orderTimeText">下单时间</van-col>
-              <van-col span="12" class="orderTime">{{item.createTime}}</van-col>
-              <van-col span="12" class="statusText">当前状态</van-col>
-              <van-col span="12" :class="item.status == '4' ? 'status' : 'status1'">
-                  {{item.status == "1" ? "待接单" : item.status == "2" ? "已接单" : item.status == "3" ? "配餐中" : item.status == "4" ? "送餐" : "完成"}}
+              <van-col span="12" class="moneyText">下单金额：</van-col>
+              <van-col span="12" class="money">￥{{item.totalMoney}}</van-col>
+              <van-col span="12" class="orderTimeText">下单时间：</van-col>
+              <van-col span="12" class="orderTime">{{item.orderTime}}</van-col>
+              <van-col span="12" class="statusText">当前状态：</van-col>
+              <van-col span="12" :class="item.orderStatus == '3' ? 'status' : 'status1'">
+                  {{item.orderStatus == "0" ? "待接单" : item.orderStatus == "1" ? "配餐中" : item.orderStatus == "2" ? "送餐中"  : "已完成"}}
               </van-col>
-              <van-steps :active="item.status" v-if="item.status != '4'"  active-color="#D7000F" inactive-color="#999999">
+              <van-steps :active="item.orderStatus == '0' ? '-1' : item.orderStatus" v-if="item.orderStatus != '3'"  active-color="#D7000F" inactive-color="#999999">
                 <van-step>待接单</van-step>
-                <van-step>已接单</van-step>
                 <van-step>配餐中</van-step>
-                <van-step>送餐</van-step>
+                <van-step>送餐中</van-step>
              </van-steps>
           </van-col>
           <van-col span="24" class="noMore">没有更多数据了</van-col>
@@ -49,29 +48,19 @@
 <script>
 import axios from "axios";
 import { Field, NumberKeyboard, Dialog, Toast,Step, Steps } from "vant";
-import { returnFloat } from '@/assets/js/common.js'
+import { getNowTime } from "@/assets/js/dataFormate.js";
 export default {
   data() {
     return {
+      status:false,
       title:"自助点餐",
-      type:"晚餐",
-      time:'15:00-19:00',
-      RecommendedDishes:[
-          {name:"香菇肉粉1"},
-          {name:"香菇肉粉2"},
-          {name:"香菇肉粉3"},
-          {name:"香菇肉粉4"},
-          {name:"香菇肉粉5"},
-          {name:"香菇肉粉6"},
-          {name:"香菇肉粉7"},
-          {name:"香菇肉粉8"},
-          {name:"香菇肉粉9"},
-          {name:"香菇肉粉10"},
-      ],
+      type:undefined,
+      time:undefined,
+      RecommendedDishes:[],
       order:[
-          {money:'18.50',createTime:'2022-08-14 00:00:00',status:2},
-          {money:'20.00',createTime:'2022-08-14 00:00:00',status:3},
-          {money:'100.00',createTime:'2022-08-14 00:00:00',status:4}
+          // {money:'18.50',createTime:'2022-08-14 00:00:00',status:2},
+          // {money:'20.00',createTime:'2022-08-14 00:00:00',status:3},
+          // {money:'100.00',createTime:'2022-08-14 00:00:00',status:4}
       ],
       
     };
@@ -90,104 +79,55 @@ export default {
     [Toast.name]: Toast,
   },
   created() {
-    var url = window.location.href;
-    localStorage.setItem("amount57",url)
-    if(url.indexOf("token") > 1){
-      //("app进入")
-      if(this.getQueryVariable("token")){
-        localStorage.removeItem('type');
-        this.erp = true
-        this.noerp = false
-        this.loadingErp = true
-        this.userQuery()
-      }else{
-        //console.log("app进入")
-        Toast(this.getQueryVariable("无token传入！"))
-      }
+    let nowTime = getNowTime().split(" ")[1].substring(0,2)
+    if(0 < nowTime && nowTime < 9){
+      this.type = "早餐"
+      this.time = "00:00 - 09:00"
     }
-
+    if(9<= nowTime  && nowTime < 13){
+      this.type = "午餐"
+      this.time = "09:00 - 13:00"
+    }
+    if(13<= nowTime && nowTime < 19){
+      this.type = "晚餐"
+      this.time = "13:00 - 19:00"
+    }
+    if(19< nowTime && nowTime < 24){
+      this.type = "宵夜"
+      this.time = "19:00 - 24:00"
+    }
+    //获取菜单
+    axios.get(`https://smartpark.caih.com/dxapi/dreMenu/list?current=1&size=500&type=${this.type}&isRecommend=1`).then(res => { 
+     const data = res.data.data.records
+     this.RecommendedDishes  = data
+    })
   },
-  mouted(){
-    var url = window.location.href;
+  mounted(){
+    document.title = '中国东信智慧园区'
+    //历史订单
+      axios.post(`https://smartpark.caih.com/dxapi/dreOrder/page`,{
+        current:1,
+        size:500,
+        orderUserName:localStorage.getItem("nickName57")
+      }).then(res => { 
+        const data = res.data.data.records
+        this.order  = data
+        this.status = true
+      })
   },
   methods: {
-      diancan(){
-        this.$router.push({ path: "/orderService"})
-      },
-  //用户查询(卡号)
-    userQuery(){
-      axios({//查询信息
-        method: 'get',
-        url: 'https://smartpark.caih.com/zkxt/api/thirdparty/v1/user/getZkUserByCipher?cipher=' + this.getQueryVariable("token"),
-        timeout: 10000,
-      }).then(res =>{
-        if(res.data?.data?.id){
-          //axios.get(`/dxtop/staff/one?id=0001T110000000002HBL`).then(res2 => { //测试
-          axios.get(`/dxtop/staff/one?id=${res.data.data.id}`).then(res2 => { //验证充值信息是否同步
-            if(res2.data.data.proportion){
-              this.proportion = res2.data.data.proportion
-            }else{
-              this.proportion = 1
-            }
-            if(res2.data.data){
-              localStorage.setItem("user_wt", res.data.data.id)
-              // localStorage.setItem("user_wt", "0001T110000000002HBL") //测试id
-              localStorage.setItem("cardId57", res2.data.data.cardId)
-              this.cardId = res2.data.data.cardId
-              this.cardLoading = false
-              this.Balance()
-              this.recharge2()
-            }else{
-              this.userNoAlert()
-            }
-            this.loadingErp = false
-          })
-        }else if(res.data?.data?.cardId){
-          this.loadingErp = false
-          Toast("用户卡号未绑定")
-        }else{
-          this.loadingErp = false
-          this.userNoAlert()
-        }
-      }).catch(err =>{
-        this.loadingErp = false
-        this.userNoAlert()
-      });
+    fanhuiBtn() {
+       this.$router.go(-1)
+       //this.$router.push({ path: "/home"})
     },
-    userNoAlert(){
-      Toast("当前账户初始流程中，请耐心等待或联系管理人员查询")
-    },
-    getQueryVariable(variable){//参数获取 设定微信进入参数
-      //window.location.search.substring(1);
-      console.log(variable)
-      var query = window.location.hash.substring(3);
-      var vars = query.split("&");
-      if(vars[2]){ //判定微信端进入
-        localStorage.setItem("passageway","weixin")
-      }else{
-        localStorage.removeItem("passageway")
-      }
-      for (var i=0;i<vars.length;i++) {
-        var pair = vars[i].split("=");
-        if(pair[0] == variable || pair[0] =="mount?token"){
-          
-          if(vars[1] != "classify"){
-            // localStorage.removeItem("classify")
-          }
-          if(variable =="token"){
-            this.user = pair[1]
-          }else if(variable =="type"){
-            this.type = pair[1]
-          }
-          return pair[1];
-        }
-      }
-      return(false);
+    diancan(){
+      this.$router.push({ path: "/orderService"})
     },
 
 
 
 
+
     handleClose() {
       this.money = Number(this.money);
       this.overlayShow = false;
@@ -200,7 +140,7 @@ export default {
 
     //返回上级或app目录页
     fanhuiBtn(){
-      this.$router.go(-1)
+      this.$router.push({ path: "/home"})
       // if(localStorage.getItem("passageway")){
       //   this.$router.go(-1)
       // }else{
@@ -244,13 +184,12 @@ export default {
             padding:10px 0 2px;
             text-align: left;
             .describe{
-                font-size: 16px;
-                // font-family: PingFangMedium;
+                font-size: 18px;
                 font-weight: 700;
                 width:100%;
             }
             .time{
-                font-size: 14px;
+                font-size: 15px;
                 font-weight: 400;
             }
         }
@@ -303,11 +242,15 @@ export default {
                 padding:15px 15px 15px;
                 .moneyText,.orderTimeText,.statusText{
                     color:#999999;
+                    text-align: left;
+                    height:30px;
                     
                 }
                 .money,.orderTime,.status{
                     color:#333;
+                    height:30px;
                     text-align: right;
+                    
                 }
                 div{
                     font-size: 14px;
@@ -319,6 +262,7 @@ export default {
                 .status1{
                     color:#D7000F;
                     text-align: right;
+                    height:30px;
                 }
                 .van-steps{
                     width:100%;
@@ -350,10 +294,21 @@ export default {
 <style>
 .van-steps__items{
     margin-top:-10px !important;
+    /* width:100%;
+    margin-left:-25%;
+    overflow: hidden; */
 }
 .van-step__title{
     position: absolute !important;
     top:40px;
-    font-size: 14px !important;
+    font-size: 12px !important;
+    margin-left:-50px;
+
+}
+.van-step--horizontal:last-child .van-step__title{
+  margin-left:-40px;
+}
+.van-steps__items:nth-child(1){
+
 }
 </style>

src/views/orderingFood/orderList/index.vue

@@ -6,15 +6,15 @@
       <van-col class="title">{{title}}</van-col>
     </van-row>
     <van-row class="bottom">
-        <van-row class="orderList" :gutter="20">
+        <van-row class="orderList">
           <van-col span="24" v-for="(item,index) in order" :key="index" class="order">
-              <van-col span="12" class="moneyText">下单金额</van-col>
-              <van-col span="12" class="money">￥{{item.money}}</van-col>
-              <van-col span="12" class="orderTimeText">下单时间</van-col>
-              <van-col span="12" class="orderTime">{{item.createTime}}</van-col>
-              <van-col span="12" class="statusText">当前状态</van-col>
-              <van-col span="12" :class="item.status == '4' ? 'status' : 'status1'">
-                  {{item.status == "1" ? "待接单" : item.status == "2" ? "已接单" : item.status == "3" ? "配餐中" : item.status == "4" ? "送餐" : "完成"}}
+              <van-col span="12" class="moneyText">下单金额：</van-col>
+              <van-col span="12" class="money">￥{{item.totalMoney}}</van-col>
+              <van-col span="12" class="orderTimeText">下单时间：</van-col>
+              <van-col span="12" class="orderTime">{{item.orderTime}}</van-col>
+              <van-col span="12" class="statusText">当前状态：</van-col>
+              <van-col span="12" :class="item.orderStatus == '3' ? 'status' : 'status1'">
+                  {{item.orderStatus == "0" ? "待接单" : item.orderStatus == "1" ? "配餐中" : item.orderStatus == "2" ? "送餐中"  : "已完成"}}
               </van-col>
               <!-- <van-steps :active="item.status" v-if="item.status != '4'"  active-color="#D7000F" inactive-color="#999999">
                 <van-step>待接单</van-step>
@@ -36,14 +36,7 @@ export default {
   data() {
     return {
       title:"点餐记录",
-      order:[
-          {money:'18.50',createTime:'2022-08-14 00:00:00',status:2},
-          {money:'20.00',createTime:'2022-08-14 00:00:00',status:3},
-          {money:'100.00',createTime:'2022-08-14 00:00:00',status:4}
-
-      ],
-      
-
+      order:[],
     };
   },
   watch: {
@@ -59,16 +52,24 @@ export default {
     
 
   },
-  mouted(){
-    var url = window.location.href;
+  mounted(){
+    document.title = '中国东信智慧园区'
+    //历史订单
+      axios.post(`https://smartpark.caih.com/dxapi/dreOrder/page`,{
+        current:1,
+        size:500,
+        orderUserName:localStorage.getItem("nickName57")
+      }).then(res => { 
+        const data = res.data.data.records
+        this.order  = data
+      })
   },
   methods: {
       diancan(){
 
       },
       fanhuiBtn(){
-          console.log(11)
-          this.$router.go(-1)
+        this.$router.push({path:'/orderingFood'})
       }
   }
 };
@@ -105,10 +106,12 @@ export default {
                 padding:15px 15px 15px;
                 .moneyText,.orderTimeText,.statusText{
                     color:#999999;
+                    height:30px;
                 }
                 .money,.orderTime,.status{
                     color:#333;
                     text-align: right;
+                    height:30px;
                 }
                 div{
                     padding:5px 0;
@@ -120,6 +123,7 @@ export default {
                 .status1{
                     color:#D7000F;
                     text-align: right;
+                    height:30px;
                 }
                 .van-steps{
                     width:100%;

src/views/orderingFood/orderService/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="mianBox">
-    <van-row class="headerBox">
-      <van-icon name="arrow-left" @click="fanhuiBtn" class="arrow-left" />
+    <van-row class="headerBox" @click="fanhuiBtn">
+      <van-icon name="arrow-left"  class="arrow-left" />
       <van-col class="return">返回</van-col>
       <van-col class="title">{{ title }}</van-col>
     </van-row>
@@ -12,13 +12,39 @@
             :src="require('../../../assets/image/cj.png')"
             class="cj"
           />
-          <span class="describe">{{ typeVlue }}菜单</span>
+          <span class="describe">{{ typeValue }}菜单</span>
         </van-col>
-        <van-col class="type" :span="11">
-          <van-dropdown-menu>
-            <van-dropdown-item v-model="type" :options="option" />
-          </van-dropdown-menu>
+        <van-col class="type" :span="11" @click="downStatus">
+          <van-col class="name" :span="24" >{{typeSelect}}<van-image
+            :src="require('../../../assets/image/xl.png')"
+            class="xl"
+          /></van-col>
+          
         </van-col>
+        <van-popup
+          v-model="show"
+          position="bottom"
+          :style="{ height: '270px;overflow: hidden;' }"
+          
+        >
+          <van-col :span="24" class="selectTitle">
+              <van-col :span="4" class="cancel" @click="cancel">
+                取消
+              </van-col>
+              <van-col :span="16" class="title">
+                请选择餐别
+              </van-col>
+              <van-col :span="4" class="determine" @click="determine">
+                确定
+              </van-col>
+          </van-col>
+          <van-col :span="24" class="typeList" v-for="(item,index) in typeList" :key="index" @click="change(item.name)">
+              <van-col :span="24" :class="item.name == typeColor ? 'nameSelect' : 'name'" >{{item.name}}</van-col>
+          </van-col>
+        </van-popup>
+          <!-- <van-dropdown-menu>
+            <van-dropdown-item v-model="type" :options="option" />
+          </van-dropdown-menu> -->
       </van-row>
     </van-row>
     <van-row class="middle">
@@ -35,23 +61,23 @@
                 >菜名：<span class="name">{{ item.name }}</span></van-col
               >
               <van-col span="24" class="text"
-                >单价：<span class="money">￥{{ item.money }}</span></van-col
+                >单价：<span class="money">￥{{ item.price }}</span></van-col
               >
             </van-col>
             <van-col span="12" class="right">
               <van-stepper
                 v-model="item.num"
                 min="0"
-                max="30"
+                max="100"
                 theme="round"
                 button-size="30"
+                integer
                 @change="onChange(item.id,item.num)"
               />
             </van-col>
           </van-col>
         </van-col>
       </van-row>
-      <!-- <van-button  type="danger" @click="diancan" class="button">去点餐</van-button> -->
     </van-row>
     <van-row class="bottom">
       <van-row class="settlement">
@@ -72,6 +98,7 @@
 <script>
 import axios from "axios";
 import { mapState, mapActions } from "vuex";
+import { getNowTime } from "@/assets/js/dataFormate.js";
 import {
   Field,
   NumberKeyboard,
@@ -82,43 +109,27 @@ import {
   Stepper,
 } from "vant";
 import {} from "vant";
-import { returnFloat } from "@/assets/js/common.js";
+
+
 export default {
   data() {
     return {
+      typeColor:undefined,//菜单类型
+      show:false,
       title: "点餐服务",
-      typeVlue: "晚餐",
+      typeValue: undefined,
+      typeSelect:"切换餐别",
       type: 2,
       money: 0,
-      foodList: [
-        { name: "香菇肉粉1", money: "10.00", num: 0,id:1 },
-        { name: "香菇肉粉2", money: "11.00", num: 0,id:2 },
-        { name: "香菇肉粉3", money: "12.00", num: 0,id:3 },
-        { name: "香菇肉粉4", money: "13.00", num: 0 ,id:4},
-        { name: "香菇肉粉5", money: "14.00", num: 0 ,id:5},
-        { name: "香菇肉粉6", money: "15.00", num: 0 ,id:6},
-        { name: "香菇肉粉7", money: "16.50", num: 0 ,id:7},
-        { name: "香菇肉粉8", money: "13.00", num: 0,id:8 },
-        { name: "香菇肉粉9", money: "14.00", num: 0,id:9 },
-        { name: "香菇肉粉10", money: "15.00", num: 0,id:10 },
-        { name: "香菇肉粉11", money: "16.50", num: 0,id:11 },
-     
-      ],
-      option: [
-        { text: "早餐", value: 0 },
-        { text: "午餐", value: 1 },
-        { text: "晚餐", value: 2 },
-        { text: "宵夜", value: 3 },
+      foodList: [],
+      typeList: [
+        { name: "早餐" },
+        { name: "午餐" },
+        { name: "晚餐" },
+        { name: "宵夜" },
       ],
     };
   },
-  watch: {
-    money(val) {
-      if (/^0[1-9]/.test(val)) {
-        this.money = val.substring(1);
-      }
-    },
-  },
   components: {
     [Field.name]: Field,
     [NumberKeyboard.name]: NumberKeyboard,
@@ -131,20 +142,45 @@ export default {
     })
    },
   created() {
-      if(JSON.stringify(this.footStoreData) != '[]'){
-          this.foodList = this.footStoreData
-      }
+      
+      
   },
-  mouted() {
-    var url = window.location.href;
+  mounted() {
+    document.title = '中国东信智慧园区'
+    //时段判断
+    let nowTime = getNowTime().split(" ")[1].substring(0,2)
+    if(nowTime <= 9){
+      this.typeValue = "早餐"
+    }else if( 9< nowTime  && nowTime < 13){
+      this.typeValue = "午餐"
+    }else if( 13<= nowTime && nowTime < 19){
+      this.typeValue = "晚餐"
+    }else{
+      this.typeValue = "宵夜"
+    }
+    if(JSON.stringify(this.footStoreData) != '[]'){
+        this.foodList = this.footStoreData
+    }else{
+      this.foodMenu(this.typeValue)
+    }
+    //餐单信息判断
+    this.money = 0;
+    let data = this.foodList
+    for(let i=0;i<data.length;i++){
+        if(data[i].num){
+            this.money += data[i].price * data[i].num
+        }
+    }
+    
   },
   methods: {
-    fanhuiBtn() {},
-    diancan() {},
-    onConfirm() {
-      this.$refs.item.toggle();
-      console.log(this.type, this.$refs.item);
+    downStatus(){
+      this.show = true
     },
+    fanhuiBtn() {
+      this.$router.push({path:'/orderingFood'})
+    },
+    diancan() {},
     onChange(id,value) {
     //   Toast.loading({ forbidClick: true });
 
@@ -158,17 +194,58 @@ export default {
         let data = this.foodList
         for(let i=0;i<data.length;i++){
             if(data[i].num){
-                this.money += data[i].money * data[i].num
+                this.money += data[i].price * data[i].num
             }
         }
     },
     submit(){
-        if(this.money<=0){
-            Toast("请添加菜品")
-        }
+      if(this.money<=0){
+          Toast("请添加菜品")
+      }else{
         this.$store.dispatch("cart", this.foodList)
+        this.$store.dispatch("canbie", this.typeValue)
+        localStorage.setItem("canbie57",this.typeValue)
         this.$router.push({ path: "/address"})
+      }
+    },
+    //餐别id选择
+    change(id){
+      this.typeColor = id
+    },
+    foodMenu(id){
+      this.foodList  = []
+      //获取菜单
+      axios.get(`https://smartpark.caih.com/dxapi/dreMenu/list?current=1&size=500&type=${id}`).then(res => { 
+        const data = res.data.data.records
+        for(let i = 0;i<data.length;i++){
+          data[i].num = 0
+        }
+        this.foodList  = data
+      })
+    },
+    //餐别确定
+    determine(){
+      this.money = 0
+      if(this.typeColor == undefined){
+        Toast("请选择餐别")
+      }else{
+        this.show = false
+        this.typeValue = this.typeColor 
+        for(let i = 0; i<this.typeList.length;i++){
+          if(this.typeColor == this.typeList[i].id){
+            this.typeValue = this.typeList[i].name
+            this.typeSelect = this.typeValue
+          }
+        }
+        this.typeSelect = this.typeValue
+        this.foodMenu(this.typeValue)
+      }
+     
     },
+    //餐别取消
+    cancel(){
+      this.show = false
+    }
   },
 };
 </script>
@@ -183,6 +260,7 @@ export default {
       font-size: 24px;
       vertical-align: middle;
       margin-left: -6px;
+      
     }
     .return {
       vertical-align: middle;
@@ -198,7 +276,7 @@ export default {
   .top {
     background-color: #fff;
     .foodType {
-      padding: 10px 15px 2px;
+      padding: 10px 15px 14px;
       text-align: left;
       border-bottom: 1px solid #e8e8e8;
       .cj {
@@ -215,7 +293,45 @@ export default {
       }
       .type {
         margin-top: -6px;
+        font-size: 16px;
+        color:#333;
+        text-align: right;
+        .name{
+          text-align: right;
+          vertical-align: middle;
+          margin-top:12px;
+          .xl{
+            vertical-align: middle;
+            width:20px;
+            margin:-6px -6px 0 0;
+          }
+        }
+        
       }
+      .selectTitle{
+          font-size: 16px;
+          text-align: center;
+          height:50px;
+          line-height: 50px;
+          color:#666666;
+          .determine{
+            color:#d7000f;
+          }
+        }
+        .typeList{
+          font-size: 16px;
+          border-top:1px solid #e8e8e8;
+          padding:15px 0;
+          position: relative;
+          .name{
+            text-align: center;
+          }
+          .nameSelect{
+            color:#d7000f;
+            text-align: center;
+          }
+          
+        }
     }
   }
   .middle {

vue.config.js

@@ -5,7 +5,7 @@ function resolve(dir) {
     return path.join(__dirname, dir)
 }
 module.exports = {
-    publicPath: '/vuepay', //部署路径后缀
+    publicPath: '/vuepay2', //部署路径后缀
     assetsDir: 'static', // 放置生成的静态资源 (js、css、img、fonts) 的 (相对于 outputDir 的) 目录。
     indexPath: 'index.html', // 指定生成的 index.html 的输出路径 (相对于 outputDir)。也可以是一个绝对路径。
     filenameHashing: true, // 文件名hash，默认
@@ -27,7 +27,7 @@ module.exports = {
             // 配置多个跨域
             '/': {
                 target: 'https://smartpark.caih.com/dxapi/', //东信
-                //target: 'http://172.16.120.213:8085/', //本地
+                //target: 'https://smartpark.caih.com/dxapi/', //本地
                 changeOrigin: false,
                 pathRewrite: {
                     '': '/'

文档/自助点餐 标注文件/自助点餐 标注文件/自助点餐-标注文件/links/页面-1-1-01-自助点餐.html

@@ -0,0 +1 @@
+<meta http-equiv="refresh" content="0;url=../index.html#0">

文档/自助点餐 标注文件/自助点餐 标注文件/自助点餐-标注文件/links/页面-1-2-02-点餐记录列表.html

@@ -0,0 +1 @@
+<meta http-equiv="refresh" content="0;url=../index.html#1">

文档/自助点餐 标注文件/自助点餐 标注文件/自助点餐-标注文件/links/页面-1-3-03-点餐服务.html

@@ -0,0 +1 @@
+<meta http-equiv="refresh" content="0;url=../index.html#2">

文档/自助点餐 标注文件/自助点餐 标注文件/自助点餐-标注文件/links/页面-1-4-04-点餐服务-餐别.html

@@ -0,0 +1 @@
+<meta http-equiv="refresh" content="0;url=../index.html#3">

文档/自助点餐 标注文件/自助点餐 标注文件/自助点餐-标注文件/links/页面-1-5-05-点餐结算1.html

@@ -0,0 +1 @@
+<meta http-equiv="refresh" content="0;url=../index.html#4">

文档/自助点餐 标注文件/自助点餐 标注文件/自助点餐-标注文件/links/页面-1-6-06-点餐结算2.html

@@ -0,0 +1 @@
+<meta http-equiv="refresh" content="0;url=../index.html#5">

文档/自助点餐 标注文件/自助点餐 标注文件/自助点餐-标注文件/links/页面-1-7-07-信息反馈.html

@@ -0,0 +1 @@
+<meta http-equiv="refresh" content="0;url=../index.html#6">

文档/自助点餐 标注文件/自助点餐 标注文件/自助点餐-标注文件/proto.html

@@ -0,0 +1 @@
+<meta http-equiv="refresh" content="0;url=index.html#p">

文档/配餐清单页面 标注文件/配餐清单页面 标注文件/配餐清单 标注文件/links/自助点餐-8-08-配餐清单.html

@@ -0,0 +1 @@
+<meta http-equiv="refresh" content="0;url=../index.html#0">

文档/配餐清单页面 标注文件/配餐清单页面 标注文件/配餐清单 标注文件/links/自助点餐-9-09-配餐清单02.html

@@ -0,0 +1 @@
+<meta http-equiv="refresh" content="0;url=../index.html#1">

文档/配餐清单页面 标注文件/配餐清单页面 标注文件/配餐清单 标注文件/proto.html

@@ -0,0 +1 @@
+<meta http-equiv="refresh" content="0;url=index.html#p">