订座-新增底部tab

htmldev/dashboard/package-lock.json

@@ -1054,93 +1054,6 @@
         "to-fast-properties": "^2.0.0"
       }
     },
-    "@better-scroll/core": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npm.taobao.org/@better-scroll/core/download/@better-scroll/core-2.0.4.tgz",
-      "integrity": "sha1-fTzNwbRDVTKX7zWW0m4NSeRlXZg=",
-      "dev": true,
-      "requires": {
-        "@better-scroll/shared-utils": "^2.0.4"
-      }
-    },
-    "@better-scroll/mouse-wheel": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npm.taobao.org/@better-scroll/mouse-wheel/download/@better-scroll/mouse-wheel-2.0.4.tgz",
-      "integrity": "sha1-VxPlGu6zYee4g4ASPGSi/cQuoKw=",
-      "dev": true,
-      "requires": {
-        "@better-scroll/core": "^2.0.4"
-      }
-    },
-    "@better-scroll/observe-dom": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npm.taobao.org/@better-scroll/observe-dom/download/@better-scroll/observe-dom-2.0.4.tgz",
-      "integrity": "sha1-oyt7x1NZzGdHTm8FNN/kOS7y7pE=",
-      "dev": true,
-      "requires": {
-        "@better-scroll/core": "^2.0.4"
-      }
-    },
-    "@better-scroll/pull-down": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npm.taobao.org/@better-scroll/pull-down/download/@better-scroll/pull-down-2.0.4.tgz",
-      "integrity": "sha1-rH1pr2rv1KnnkiIYgvvF1rO1vxI=",
-      "dev": true,
-      "requires": {
-        "@better-scroll/core": "^2.0.4"
-      }
-    },
-    "@better-scroll/pull-up": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npm.taobao.org/@better-scroll/pull-up/download/@better-scroll/pull-up-2.0.4.tgz",
-      "integrity": "sha1-n4ZeP4HWUjDZ3DJBvyrgmopjgNE=",
-      "dev": true,
-      "requires": {
-        "@better-scroll/core": "^2.0.4"
-      }
-    },
-    "@better-scroll/scroll-bar": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npm.taobao.org/@better-scroll/scroll-bar/download/@better-scroll/scroll-bar-2.0.4.tgz",
-      "integrity": "sha1-OXmLRh1M/VyAlpM8iHQqghVmyok=",
-      "dev": true,
-      "requires": {
-        "@better-scroll/core": "^2.0.4"
-      }
-    },
-    "@better-scroll/shared-utils": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npm.taobao.org/@better-scroll/shared-utils/download/@better-scroll/shared-utils-2.0.4.tgz",
-      "integrity": "sha1-T8EOFv3kKr/IUBzhpSGwWoYrwuk=",
-      "dev": true
-    },
-    "@better-scroll/slide": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npm.taobao.org/@better-scroll/slide/download/@better-scroll/slide-2.0.4.tgz",
-      "integrity": "sha1-oQ6ww6ZCX3eDNuGK+ln/e0ijn48=",
-      "dev": true,
-      "requires": {
-        "@better-scroll/core": "^2.0.4"
-      }
-    },
-    "@better-scroll/wheel": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npm.taobao.org/@better-scroll/wheel/download/@better-scroll/wheel-2.0.4.tgz",
-      "integrity": "sha1-FxQ6gK5pgx1v0RK/hhr6O9By4ng=",
-      "dev": true,
-      "requires": {
-        "@better-scroll/core": "^2.0.4"
-      }
-    },
-    "@better-scroll/zoom": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npm.taobao.org/@better-scroll/zoom/download/@better-scroll/zoom-2.0.4.tgz",
-      "integrity": "sha1-JA0bm+vGQhY9sMJ6Dm3NXlxgtqk=",
-      "dev": true,
-      "requires": {
-        "@better-scroll/core": "^2.0.4"
-      }
-    },
     "@hapi/address": {
       "version": "2.1.4",
       "resolved": "https://registry.npm.taobao.org/@hapi/address/download/@hapi/address-2.1.4.tgz?cache=0&sync_timestamp=1593993805194&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40hapi%2Faddress%2Fdownload%2F%40hapi%2Faddress-2.1.4.tgz",
@@ -2842,20 +2755,12 @@
       }
     },
     "better-scroll": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npm.taobao.org/better-scroll/download/better-scroll-2.0.4.tgz",
-      "integrity": "sha1-/uVvYVgxkGUWH3lwgExkQ4iAF5w=",
-      "dev": true,
-      "requires": {
-        "@better-scroll/core": "^2.0.4",
-        "@better-scroll/mouse-wheel": "^2.0.4",
-        "@better-scroll/observe-dom": "^2.0.4",
-        "@better-scroll/pull-down": "^2.0.4",
-        "@better-scroll/pull-up": "^2.0.4",
-        "@better-scroll/scroll-bar": "^2.0.4",
-        "@better-scroll/slide": "^2.0.4",
-        "@better-scroll/wheel": "^2.0.4",
-        "@better-scroll/zoom": "^2.0.4"
+      "version": "1.15.2",
+      "resolved": "https://registry.nlark.com/better-scroll/download/better-scroll-1.15.2.tgz?cache=0&sync_timestamp=1624517130811&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbetter-scroll%2Fdownload%2Fbetter-scroll-1.15.2.tgz",
+      "integrity": "sha1-Zf/GBYuLT/M3uN+tS8szTXaZzrY=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.0.0"
       }
     },
     "bfj": {

htmldev/dashboard/package.json

@@ -21,7 +21,7 @@
     "axios": "^0.20.0",
     "babel-eslint": "^10.1.0",
     "babel-plugin-import": "^1.13.0",
-    "better-scroll": "^2.0.4",
+    "better-scroll": "^1.15.1",
     "clipboard": "^2.0.6",
     "compressing": "^1.5.1",
     "compressorjs": "^1.0.6",
@@ -40,8 +40,8 @@
     "sass-loader": "^10.0.2",
     "standard": "^14.3.4",
     "style-resources-loader": "^1.3.3",
-    "vue-awesome-swiper": "^3.1.3",
     "vant": "^2.10.9",
+    "vue-awesome-swiper": "^3.1.3",
     "vue-router": "3.0.7",
     "vue-template-compiler": "^2.6.11",
     "vuex": "^3.5.1",

htmldev/dashboard/src/App.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="af-dashboard-entry">
+  <div>
     <keep-alive>
       <router-view v-if="$route.meta.keepAlive"></router-view>
     </keep-alive>
@@ -15,12 +15,4 @@ export default {
 
 <style lang="scss">
 @import "./assets/styles/reset";
-
-.af-dashboard-entry {
-  width: 100%;
-  height: 100%;
-  min-height: 100%;
-  overflow-y: scroll;
-  -webkit-overflow-scrolling: touch;
-}
 </style>

htmldev/dashboard/src/router/index.js

@@ -48,7 +48,7 @@ const routes = [
         meta: {
           title: '我的订座',
           isUseCache: false,
-          keepAlive: false
+          keepAlive: true
         }
       }
     ]

htmldev/dashboard/src/views/place/index.vue

@@ -1,9 +1,12 @@
 <template>
   <div class="af-container">
-    <router-view/>
+    <keep-alive>
+      <router-view v-if="$route.meta.keepAlive"/>
+    </keep-alive>
+    <router-view v-if="!$route.meta.keepAlive"/>
     <van-tabbar
       class="af-van-tabbar"
-      v-model="active"
+      v-model="activeTab"
       @change="onChange">
       <van-tabbar-item
         name="PlaceList"
@@ -28,9 +31,13 @@ export default {
   },
   data () {
     return {
-      active: 0
+      activeTab: 'PlaceList'
     }
   },
+  mounted () {
+    const routeName = this.$route.name
+    this.activeTab = ['PlaceList', 'PlaceReserve'].findIndex(item => item === routeName) > -1 ? routeName : ''
+  },
   methods: {
     onChange (routeName) {
       this.$router.replace({ name: routeName })
@@ -41,7 +48,7 @@ export default {
 
 <style lang="scss" scoped>
 .af-container {
-  padding-bottom: 70px;
+  padding-bottom: 50px;
 }
 
 .af-van-tabbar {

htmldev/dashboard/src/views/place/list/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="af-container">
+  <div class="af-place-list-container">
     <!--头部-->
     <div class="header">
       <div class="store-name">
@@ -31,7 +31,10 @@
           <p class="week">{{ item.week }}</p>
           <p class="date">{{ item.date }}</p>
         </template>
-        <div class="place-list" v-for="i in 10" :key="i">
+        <div class="place-list"
+             v-for="i in 10"
+             :key="i"
+             @click="showPopup = true">
           <div class="left">
             <p class="name">12人卡座（舞台中间）</p>
             <p class="des">卡座台费2800元</p>

htmldev/dashboard/src/views/place/list/style/index.scss

@@ -1,5 +1,5 @@
 @charset "utf-8";
-.af-container {
+.af-place-list-container {
   position: relative;
   left: 0;
   top: 0;

htmldev/dashboard/src/views/place/reserve/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>订座信息编辑</div>
+  <div></div>
 </template>
 
 <script>