优化预约订单创建

src/pages/home/createOrder/index.vue

@@ -1,12 +1,7 @@
 <template>
   <div>
     <div class="filterPop">
-      <el-dialog
-        top="130px"
-        :visible.sync="orderShow"
-        width="52.5%"
-        :close-on-click-modal="false"
-      >
+      <el-dialog top="130px" :visible.sync="orderShow" width="52.5%" :close-on-click-modal="false">
         <span slot="title" class="slot-title">
           <i @click="closeFilterPop" class="el-icon-arrow-left"></i>
           创建订单
@@ -21,8 +16,8 @@
               v-model="value1"
               type="date"
               placeholder="选择日期"
-            >
-            </el-date-picker>
+              @change="changeDate"
+            ></el-date-picker>
             <el-time-select
               :editable="false"
               :disabled="value1 == '' ? true : false"
@@ -34,8 +29,7 @@
                 end: '23:00',
                 minTime: this.nowTime,
               }"
-            >
-            </el-time-select>
+            ></el-time-select>
             <el-time-select
               :editable="false"
               :disabled="startTime == '' ? true : false"
@@ -47,21 +41,14 @@
                 end: '23:00',
                 minTime: startTime,
               }"
-            >
-            </el-time-select>
+            ></el-time-select>
           </div>
           <div class="create-title">选择用户:</div>
           <div class="filter-center">
-            <el-input
-              placeholder="用户手机号、用户id、用户昵称、用户真实姓名"
-              class="search"
-              v-model="searchText"
-            >
+            <el-input placeholder="用户手机号、用户id、用户昵称、用户真实姓名" class="search" v-model="searchText">
               <i slot="prefix" class="el-input__icon el-icon-search"></i>
             </el-input>
-            <el-button @click="searchUser" type="primary" class="searchButton"
-              >搜索</el-button
-            >
+            <el-button @click="searchUser" type="primary" class="searchButton">搜索</el-button>
           </div>
           <div class="filter-bottom">
             <div
@@ -71,7 +58,7 @@
               @click="isSelectUser(item, index)"
             >
               <div class="left">
-                <img :src="item.avatar_url" alt="">
+                <img :src="item.avatar_url" alt />
               </div>
               <div class="right">
                 <div class="right-content">
@@ -83,11 +70,7 @@
                   <div class="phone">电话: {{ item.mobile }}</div>
                 </div>
               </div>
-              <img
-                class="radio"
-                :src="item.status ? select : unSelect"
-                alt=""
-              />
+              <img class="radio" :src="item.status ? select : unSelect" alt />
             </div>
           </div>
         </div>
@@ -120,15 +103,28 @@ export default {
         disabledDate(time) {
           let times = Date.now() - 24 * 60 * 60 * 1000;
           return time.getTime() < times;
-        },
+        }
       }, //限制只能选择今天及以后的时间
       userList: [], //查询的用户列表
       checkUserList: [], //选中的用户信息ID
       id: "", //预约记录ID
-      isClick: "", //是否是编辑或者直接点击加号创建的
+      isClick: "" //是否是编辑或者直接点击加号创建的
     };
   },
   methods: {
+    // 选择日期回调
+    changeDate(e) {
+      let selectDate = `${e.getFullYear()}-${e.getMonth() + 1}-${e.getDate()}`;
+      let date = new Date();
+      let nowDate = `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`
+      if(selectDate>nowDate){
+        this.nowTime = ''
+        console.log(111);
+      }else{
+        // 限制选择的时间截止到当前之后
+        this.nowTime = `${date.getHours() - 1}:59`;
+      }
+    },
     // 取消&&返回按钮关闭弹窗
     closeFilterPop() {
       this.$emit("update:orderShow", false);
@@ -138,12 +134,12 @@ export default {
     searchUser(keyword) {
       api
         .searchOrderUser({
-          keyword: this.searchText || keyword,
+          keyword: this.searchText || keyword
         })
-        .then((res) => {
+        .then(res => {
           if (res.code == 200) {
             // 手机号四位隐藏
-            res.data.list.map((item) => {
+            res.data.list.map(item => {
               if (item.mobile) {
                 item.mobile =
                   item.mobile.substring(0, 3) +
@@ -154,7 +150,7 @@ export default {
             });
             // 获取查询的用户
             this.userList = res.data.list;
-            console.log(this.userList);
+            // console.log(this.userList);
           }
         });
     },
@@ -163,16 +159,16 @@ export default {
       if (this.userList[index].status) {
         this.$set(this.userList, index, {
           ...this.userList[index],
-          status: false,
+          status: false
         });
       } else {
         this.$set(this.userList, index, {
           ...this.userList[index],
-          status: true,
+          status: true
         });
       }
       let checkList = [];
-      this.userList.forEach((item) => {
+      this.userList.forEach(item => {
         if (item.status) {
           checkList.push(item.id);
         }
@@ -191,34 +187,33 @@ export default {
       }
       let date = this.isClick
         ? this.value1
-        : `${this.value1.getFullYear()}-${
-            this.value1.getMonth() + 1
-          }-${this.value1.getDate()}`;
+        : `${this.value1.getFullYear()}-${this.value1.getMonth() +
+            1}-${this.value1.getDate()}`;
       let start_time = date + " " + this.startTime;
       let end_time = date + " " + this.endTime;
       let params = {
         user_id: this.checkUserList.toString(),
         start_time,
         end_time,
-        id: this.id || "",
+        id: this.id || ""
       };
       console.log(params);
-      api.createUserOrder(params).then((res) => {
+      api.createUserOrder(params).then(res => {
         this.$message({
-          message:params.id?'修改成功': "创建成功",
-          type: "success",
+          message: params.id ? "修改成功" : "创建成功",
+          type: "success"
         });
         this.$emit("update:orderShow", false);
         this.$emit("updateUserOrder", date);
       });
       // 清除数据
       Object.assign(this.$data, this.$options.data());
-    },
+    }
   },
   watch: {
     // 获取父组件赋值的时间
     toTime(newValue, oldValue) {
-      console.log(newValue);
+      // console.log(newValue);
       if (newValue.isClick) {
         this.isClick = newValue.isClick;
         this.startTime = newValue.start;
@@ -228,22 +223,17 @@ export default {
         if (newValue.day) {
           this.value1 = newValue.day;
         } else {
-          this.value1 = `${date.getFullYear()}-${
-            date.getMonth() + 1
-          }-${date.getDate()}`;
+          this.value1 = `${date.getFullYear()}-${date.getMonth() +
+            1}-${date.getDate()}`;
         }
       } else {
         this.startTime = "";
         this.endTime = "";
         this.value1 = "";
       }
-    },
-  },
-  created() {
-    let date = new Date();
-    // 限制选择的时间截止到当前之后
-    this.nowTime = `${date.getHours() - 1}:59`;
+    }
   },
+  created() {}
 };
 </script>
 
@@ -305,7 +295,7 @@ export default {
           border-radius: 8px;
           margin-right: 8px;
           overflow: hidden;
-          img{
+          img {
             width: 100%;
             height: 100%;
           }

src/pages/revenueManage/index.vue

@@ -11,19 +11,19 @@
           <el-card>
             <div class="titleBox">
               <div class="title">销售金额:</div>
-              <div class="money"><img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/%E4%BA%BA%E6%B0%91%E5%B8%81.png" alt="">{{dataTotal.total_price}}</div>
+              <div class="money"><img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/%E4%BA%BA%E6%B0%91%E5%B8%81.png" alt="">{{dataTotal.total_price?dataTotal.total_price:0}}</div>
             </div>
           </el-card>
           <el-card>
             <div class="titleBox">
               <div class="title">消耗金额:</div>
-              <div class="money"><img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/%E4%BA%BA%E6%B0%91%E5%B8%81.png" alt="">{{dataTotal.card_expend_price}}</div>
+              <div class="money"><img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/%E4%BA%BA%E6%B0%91%E5%B8%81.png" alt="">{{dataTotal.card_expend_price?dataTotal.card_expend_price:0}}</div>
             </div>
           </el-card>
           <el-card>
             <div class="titleBox">
               <div class="title">实收金额:</div>
-              <div class="money"><img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/%E4%BA%BA%E6%B0%91%E5%B8%81.png" alt="">{{dataTotal.payer_price}}</div>
+              <div class="money"><img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/%E4%BA%BA%E6%B0%91%E5%B8%81.png" alt="">{{dataTotal.payer_price?dataTotal.payer_price:0}}</div>
             </div>
           </el-card>
         </div>