提交

src/views/Apply.vue

@@ -38,6 +38,8 @@
         :rules="[{ required: true, message: '未选择预定时间' }]"
       />
       <div style="margin: 16px">
+        <br />
+        <br />
         <van-button
           color="#2a7ef4"
           round
@@ -45,16 +47,16 @@
           type="info"
           native-type="submit"
         >
-          预约
+          确认预约
         </van-button>
         <br />
         <van-button round block type="default" @click="toAppointment">
-          查看预约
+          查看预约列表
         </van-button>
         <br />
-        <van-button round block type="default" @click="price">
+        <!-- <van-button round block type="info" @click="price">
           查看价目表
-        </van-button>
+        </van-button> -->
       </div>
     </van-form>
 
@@ -72,7 +74,7 @@
     <!-- #2a7ef4 -->
     <van-popup v-model="program" position="bottom">
       <van-picker
-        title="选择项目"
+        title="选择套餐"
         @cancel="program = false"
         @confirm="onConfirmpro"
         value-key="name"
@@ -140,7 +142,10 @@ export default {
       this.userphone = user.phone || "";
       this.username = user.realName || "";
       goodsList().then(res => {
-        this.goodsLi = res || [];
+        this.goodsLi = (res || []).map(v=>{
+            v.name = v.name + '(' + v.price + '元)'
+            return v
+        });
         this.radio = (this.goodsLi[0] || {}).id;
       });
       applyrang().then(res => {
@@ -247,4 +252,7 @@ export default {
 .apply .van-radio {
   margin-bottom: 3px;
 }
+.apply .van-button--default{
+    border-color: #c7c8c8;
+}
 </style>

src/views/Applyreal.vue

@@ -123,6 +123,6 @@ export default {
   text-overflow: ellipsis;
 }
 .apply .van-radio{
-    margin-bottom: 3px
+    margin-bottom: 14px
 }
 </style>

src/views/Appointment.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="Appointment">
     <div class="main">
-      <van-cell title="已预约" />
+      <!-- <van-cell title="已预约" /> -->
       <van-cell v-for="(item, i) in mainList" :key="i" :title="item.userName">
         <template #label>
           <div>
@@ -43,7 +43,7 @@
         @click="toAppointment"
         native-type="submit"
       >
-        去预约
+        预约
       </van-button>
       <!-- @click="toAppointment" -->
     </div>
@@ -105,7 +105,7 @@ export default {
       });
       for (let i = 0; i < li.length; i++) {
         const v = li[i];
-        v.orderTime = v.orderTime.replace(/:00$/, "");
+        // v.orderTime = v.orderTime.replace(/:00$/, "");
         let key = v.orderTime.split(" ")[0];
         if (that.group[key]) {
           that.group[key].push(v);

src/views/Queue.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="queue">
     <van-nav-bar
-      title="当前队列"
-      right-text="营业规则"
+      title="预约列表"
+      right-text="营业时间"
       @click-left="toAdmin"
       @click-right="toOpen"
       left-text="添加预定"
@@ -11,8 +11,8 @@
     <van-cell-group>
       <van-cell v-for="(item, i) in queueList" :key="i">
         <template #title>
-          <van-tag v-if="item.orderType === 1" type="success">APP</van-tag>
-          <van-tag v-else type="warning ">现场</van-tag>
+          <van-tag size="large" v-if="item.orderType === 1" type="success">APP</van-tag>
+          <van-tag size="large" v-else type="warning ">现场</van-tag>
           {{ [item.orderTime + " ", item.userName].join(" ") }}
         </template>
         <template #default>
@@ -299,7 +299,9 @@ export default {
     reloadOrder() {
       if (this.load1) return;
       this.load1 = true;
-      orderList()
+      orderList({
+        // today: true,
+      })
         .then(res => {
           this.queueList = res || [];
           this.load1 = false;
@@ -326,7 +328,7 @@ export default {
         message: "请确认该用户已到达",
         confirmButtonColor: "#2a7ef4",
       }).then(() => {
-        advance({id}).then(() => {
+        advance({ id }).then(() => {
           this.reloadOrder();
         });
       });
@@ -403,6 +405,7 @@ export default {
 }
 .queue .van-cell {
   padding: 30px 16px;
+  line-height: 50px;
 }
 .queue .van-cell__title {
   font-size: 50px;
@@ -417,4 +420,22 @@ export default {
 .queue .van-tag {
   vertical-align: middle;
 }
+.queue .van-hairline--bottom {
+  height: 130px;
+  line-height: 130px;
+}
+
+.queue .van-nav-bar__content {
+  height: 130px;
+}
+.queue .van-nav-bar__title,
+.queue .van-nav-bar__text,
+.queue .van-nav-bar__left {
+  line-height: 130px;
+  font-size: 50px;
+}
+.queue .van-nav-bar__arrow {
+  line-height: 130px;
+  font-size: 50px;
+}
 </style>