提交

src/api/index.js

@@ -56,6 +56,18 @@ export function cancel(data) {
   });
 }
 
+/**
+ * 取消预约
+ * @returns {AjaxPromise}
+ */
+export function advance(data) {
+  return ajax({
+    url: "/orders/to-house",
+    method: "get",
+    data,
+  });
+}
+
 /**
  * 跳过
  * @returns {AjaxPromise}

src/views/Appointment.vue

@@ -3,20 +3,22 @@
     <div class="main">
       <van-cell title="已预约" />
       <van-cell v-for="(item, i) in mainList" :key="i" :title="item.userName">
-        <template #default>
+        <template #label>
           <div>
             {{ item.orderTime }}
           </div>
         </template>
-        <template #label>
-          <van-button
-            v-if="item.self"
-            @click="() => removequeue(item.id)"
-            type="danger"
-            size="mini"
-          >
-            取消预约
-          </van-button>
+        <template #default>
+          <div style="text-align: right">
+            <van-button
+              v-if="item.self"
+              @click="() => removequeue(item.id)"
+              type="danger"
+              size="mini"
+            >
+              取消预约
+            </van-button>
+          </div>
         </template>
       </van-cell>
     </div>

src/views/Queue.vue

@@ -27,12 +27,21 @@
           <van-button v-if="i === 0" type="info" size="small" @click="nextItem">
             完成
           </van-button>
+          <van-button
+            type="warning"
+            size="small"
+            v-if="i !== 0 && item.orderType === 1"
+            @click="() => advancefun(item.id)"
+          >
+            已到达
+          </van-button>
           <van-button
             type="warning"
             size="small"
             @click="() => removequeue(item.id, i)"
-            >删除</van-button
           >
+            删除
+          </van-button>
         </template>
       </van-cell>
     </van-cell-group>
@@ -160,6 +169,7 @@ import {
   skip,
   nextone,
   cancel,
+  advance,
   getRule,
   upRule,
 } from "../api/index";
@@ -311,6 +321,16 @@ export default {
         });
       });
     },
+    advancefun(id) {
+      Dialog.confirm({
+        message: "请确认该用户已到达",
+        confirmButtonColor: "#2a7ef4",
+      }).then(() => {
+        advance({id}).then(() => {
+          this.reloadOrder();
+        });
+      });
+    },
     nextItem() {
       Dialog.confirm({
         message: "该服务是否已完成？",
@@ -381,20 +401,20 @@ export default {
   border: 1px solid #eee;
   cursor: pointer;
 }
-.queue .van-cell{
-    padding: 30px 16px
+.queue .van-cell {
+  padding: 30px 16px;
 }
-.queue .van-cell__title{
-    font-size: 50px
+.queue .van-cell__title {
+  font-size: 50px;
 }
-.queue .van-cell__title{
-    flex: 2
+.queue .van-cell__title {
+  flex: 2;
 }
-.queue .van-button{
-    font-size: 35px;
-    height: 45px;
+.queue .van-button {
+  font-size: 35px;
+  height: 45px;
 }
-.queue .van-tag{
-    vertical-align: middle;
+.queue .van-tag {
+  vertical-align: middle;
 }
 </style>