Merge branch 'master' of http://face3d.4dage.com:7005/shaogen1995/YFYC-H5 into master

.gitignore

@@ -0,0 +1 @@
+/not-code

yfyc/src/components/BookingSuccess.vue

@@ -1,31 +1,31 @@
 <template>
-  <div class="booking-success">
+  <div class="booking-success" @click.self="$emit('close')">
     <article>
-      <h1>芜湖方特</h1>
+      <h1>老芜湖海关</h1>
       <div class="tip-1">预约成功</div>
       <div class="time-summary">
         <span class="key">预约时间：</span>
-        <span class="value">2022-05-04 17:22:35</span>
+        <span class="value">{{`${bookingYear}-${bookingMonth}-${bookingDay} ${bookingHour}:${bookingMinute}:${bookingSecond}`}}</span>
       </div>
       <div class="line">
         <img class="icon" src="@/assets/img/service/date.png" alt="" draggable="false">
         <div class="text">
           <span class="key">预约日期：</span>
-          <span class="value">2022-05-04 周六</span>
+          <span class="value">{{`${year}-${month}-${day} ${weekDay}`}}</span>
           </div>
       </div>
       <div class="line">
         <img class="icon" src="@/assets/img/service/time.png" alt="" draggable="false">
         <div class="text">
           <span class="key">预约时段：</span>
-          <span class="value">10:00-11:00</span>
+          <span class="value">{{`${time}`}}</span>
         </div>
       </div>
       <div class="line">
         <img class="icon" src="@/assets/img/service/people.png" alt="" draggable="false">
         <div class="text">
           <span class="key">参观人数：</span>
-          <span class="value">1人</span>
+          <span class="value">{{number}}人</span>
         </div>
       </div>
       <div class="tip-2">
@@ -35,6 +35,20 @@
   </div>
 </template>
 
+<script>
+export default {
+  props: [
+    'bookingYear',
+    'bookingMonth',
+    'bookingDay',
+    'bookingHour',
+    'bookingMinute',
+    'bookingSecond',
+    'year', 'month', 'day', 'weekDay', 'time', 'number'
+  ],
+}
+</script>
+
 <style lang="less" scoped>
 .booking-success {
   position: fixed;

yfyc/src/views/Serve/Booking.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="booking">
-    <img class="banner" src="@/assets/img/service/booking-banner.png" alt="" draggable="false">
+    <img class="banner" src="@/assets/img/service/老芜湖海关.png" alt="" draggable="false">
 
     <van-calendar
-      @confirm="onConfirm"
+      @confirm="onConfirmDate"
       title="预约日期"
       color="#ff615c" 
       :poppable="false"
@@ -25,7 +25,7 @@
               :class="{
                 active: index === timeIdx,
               }"
-              @click="handleClick(index)"
+              @click="handleClickTime(index)"
             >
               <span>{{item.time}}</span><br>
               <span>{{item.remain ? `剩余${item.remain}` : `已结束`}}</span>
@@ -65,21 +65,65 @@
     </div>
 
     <div class="submit-wrap">
-      <button class="submit" :class="{
-        active: canSubmit,
-      }">
+      <button
+        class="submit"
+        :class="{
+          active: canSubmit,
+        }"
+        @click="onClickSubmit"
+      >
         <div>立即预约</div>
       </button>
     </div>
+
+    <BookingSuccess v-if="isShowSuccess"
+    :bookingYear="bookingYear"
+    :bookingMonth="bookingMonth"
+    :bookingDay="bookingDay"
+    :bookingHour="bookingHour"
+    :bookingMinute="bookingMinute"
+    :bookingSecond="bookingSecond"
+    :year="year"
+    :month="month"
+    :day="day"
+    :weekDay="weekDay"
+    :time="timeList[timeIdx]?.time"
+    :number="number"
+    @close="$router.go(-1)"
+    ></BookingSuccess>
   </div>
 </template>
 
 <script>
 import Swiper from "../../assets/libs/swiper.js";
+import BookingSuccess from "@/components/BookingSuccess.vue";
+
+const weekDayList = [
+  '周一',
+  '周二',
+  '周三',
+  '周四',
+  '周五',
+  '周六',
+  '周日',
+]
 
 export default {
+  components: {
+    BookingSuccess,
+  },
   data() {
     return {
+      bookingYear: 'null',
+      bookingMonth: 'null',
+      bookingDay: 'null',
+      bookingHour: 'null',
+      bookingMinute: 'null',
+      bookingSecond: 'null',
+      year: null,
+      month: null,
+      day: null,
+      weekDay: null,
       timeList: [
         {
           time: '9:00-12:00',
@@ -94,14 +138,14 @@ export default {
           remain: 80,
         },
       ],
-      month: null,
-      day: null,
-      timeIdx: null,
+      timeIdx: 1,
       name: ',jkl',
       idCard: 'kljlk',
       phone: 'kljlk',
       age: 'lkjl',
       number: '.lk;',
+
+      isShowSuccess: false,
     }
   },
   computed: {
@@ -124,16 +168,30 @@ export default {
       initialSlide: 0,
     });
     const today = new Date()
-    this.month = today.getMonth() + 1 
-    this.day = today.getDate()
+    this.year = today.getFullYear()
+    this.month = (today.getMonth() + 1).toString().padStart(2, '0')
+    this.day = today.getDate().toString().padStart(2, '0')
+    this.weekDay = weekDayList[today.getDay() + 1]
   },
   methods: {
-    handleClick(index) {
+    onConfirmDate(date) {
+      this.year = date.getFullYear()
+      this.month = (date.getMonth() + 1).toString().padStart(2, '0')
+      this.day = date.getDate().toString().padStart(2, '0')
+      this.weekDay = weekDayList[date.getDay() + 1]
+    },
+    handleClickTime(index) {
       this.timeIdx = index
     },
-    onConfirm(date) {
-      this.month = date.getMonth() + 1
-      this.day = date.getDate()
+    onClickSubmit() {
+      const now = new Date()
+      this.bookingYear = now.getFullYear()
+      this.bookingMonth = (now.getMonth() + 1).toString().padStart(2, '0')
+      this.bookingDay = now.getDate().toString().padStart(2, '0')
+      this.bookingHour = (now.getHours()).toString().padStart(2, '0')
+      this.bookingMinute = (now.getMinutes()).toString().padStart(2, '0')
+      this.bookingSecond = (now.getSeconds()).toString().padStart(2, '0')
+      this.isShowSuccess = true
     },
   }
 }

yfyc/src/views/Serve/index.vue

@@ -32,21 +32,21 @@
       <router-link class="more" :to="{name: 'RecommendedPath'}">更多  》</router-link>
       <div class="grid-wrap">
         <div class="left-wrap card" @click="onClickPathItem">
-          <img src="@/assets/img/service/一日游.png" alt="" draggable="false">
-          <h4>一日游</h4>
+          <img src="@/assets/img/service/推荐路线-动感滨江.jpg" alt="" draggable="false">
+          <h4>动感滨江</h4>
         </div>
         <div class="right-wrap">
           <div class="card" @click="onClickPathItem">
-            <img src="@/assets/img/service/【快速浏览】.png" alt="" draggable="false">
-            <h4>【快速浏览】</h4>
+            <img src="@/assets/img/service/推荐路线-魅力湾沚.png" alt="" draggable="false">
+            <h4>【魅力湾沚】</h4>
           </div>
           <div class="card" @click="onClickPathItem">
-            <img src="@/assets/img/service/【西洋建筑】.png" alt="" draggable="false">
-            <h4>【西洋建筑】</h4>
+            <img src="@/assets/img/service/推荐路线-探源繁昌.png" alt="" draggable="false">
+            <h4>【探源繁昌】</h4>
           </div>
           <div class="card" @click="onClickPathItem">
-            <img src="@/assets/img/service/【古建筑】.png" alt="" draggable="false">
-            <h4>【古建筑】</h4>
+            <img src="@/assets/img/service/推荐路线-乡约南陵.png" alt="" draggable="false">
+            <h4>【乡约南陵】</h4>
           </div>
         </div>
       </div>
@@ -126,7 +126,7 @@
       </ul>
     </div> -->
 
-    <div class="public-service">
+    <div class="public-service" @click="pleaseWait">
       <h3>公共服务</h3>
       <router-link class="more" :to="{name: ''}">更多  》</router-link>
       <menu>
@@ -149,7 +149,7 @@
       </menu>
     </div>
 
-   <div class="wen-chuang-zuo-pin">
+   <div class="wen-chuang-zuo-pin"  @click="pleaseWait">
       <h3>文创作品</h3>
       <router-link class="more" :to="{name: ''}">更多  》</router-link>
       <div class="card-list">
@@ -233,9 +233,13 @@ methods: {
   //   })
   // },
   onClickBanner() {
+    this.pleaseWait()
   },
   onClickPathItem() {
     this.$router.push({name: 'RecommendedPathDetail'})
+  },
+  pleaseWait() {
+    globalToast("敬请期待!")
   }
 },
 created() {

yfyc/vue.config.js

@@ -19,7 +19,8 @@ module.exports = {
         // globalConfig: ['/src/config.js', 'default'],
         // globalApi: ['/src/api.js', 'default'],
         globalUtils: ['/src/utils/index.js', 'default'],
+        globalToast: ['vant', 'Toast'],
       }),
     ],
   },
-}
+}