panhui 6 лет назад
Родитель
Сommit
f31ac85434
100 измененных файлов с 92 добавлено и 58 удалено
  1. 50 50
      config/index.js
  2. 25 6
      index.html
  3. 5 0
      package-lock.json
  4. 1 0
      package.json
  5. 6 2
      src/App.vue
  6. BIN
      src/FZKTJW.TTF
  7. BIN
      src/SourceHanSerifCN-Bold.otf
  8. BIN
      src/assets/anquan_img_01.png
  9. BIN
      src/assets/daily/meiri_img_02.jpg
  10. BIN
      src/assets/daily/meiri_img_03.jpg
  11. BIN
      src/assets/daily/meiri_img_04.jpg
  12. BIN
      src/assets/daily/meiri_img_05.jpg
  13. BIN
      src/assets/daily/meiri_img_06.jpg
  14. BIN
      src/assets/fangshan_img_01.jpg
  15. BIN
      src/assets/foodMenu/fangshan_img_02.jpg
  16. BIN
      src/assets/foodMenu/fangshan_img_03.jpg
  17. BIN
      src/assets/foodMenu/fangshan_img_04.jpg
  18. BIN
      src/assets/foodMenu/fangshan_img_05.jpg
  19. BIN
      src/assets/foodMenu/fangshan_img_06.jpg
  20. BIN
      src/assets/foodMenu/fangshan_img_07.jpg
  21. BIN
      src/assets/foodMenu/fangshan_img_08.jpg
  22. BIN
      src/assets/foodMenu/fangshan_img_09.jpg
  23. BIN
      src/assets/home_banner.jpg
  24. BIN
      src/assets/home_icon_01.png
  25. BIN
      src/assets/home_icon_02.png
  26. BIN
      src/assets/home_icon_03.png
  27. BIN
      src/assets/home_icon_04.png
  28. BIN
      src/assets/home_icon_05.png
  29. BIN
      src/assets/home_img_biaoti.png
  30. BIN
      src/assets/home_img_biaoti2.png
  31. BIN
      src/assets/icon_banner_00.png
  32. BIN
      src/assets/icon_daohang.png
  33. BIN
      src/assets/icon_dian.png
  34. BIN
      src/assets/icon_dianhua.png
  35. BIN
      src/assets/icon_dizhi.png
  36. BIN
      src/assets/icon_jingdian.png
  37. BIN
      src/assets/icon_success.png
  38. BIN
      src/assets/icon_warning.png
  39. BIN
      src/assets/icon_xiaoshan.png
  40. BIN
      src/assets/img_dibu.png
  41. BIN
      src/assets/img_dibu@3x.png
  42. BIN
      src/assets/img_fenjiexian.png
  43. BIN
      src/assets/img_shijian.png
  44. BIN
      src/assets/img_yun_01(1).png
  45. BIN
      src/assets/img_yun_01.png
  46. BIN
      src/assets/img_yun_01@3x.png
  47. BIN
      src/assets/img_yun_02(1).png
  48. BIN
      src/assets/img_yun_02.png
  49. BIN
      src/assets/img_yun_02@3x.png
  50. BIN
      src/assets/iocn_xuanzhong.png
  51. BIN
      src/assets/jingshui_img_01.jpg
  52. BIN
      src/assets/lishi_img_01.jpg
  53. BIN
      src/assets/lishi_img_02.png
  54. BIN
      src/assets/lishi_img_03.png
  55. BIN
      src/assets/lishi_img_04.png
  56. BIN
      src/assets/logo.png
  57. BIN
      src/assets/meeting/yujian_jiezi_img_01.jpg
  58. BIN
      src/assets/meeting/yujian_jiezi_img_02.jpg
  59. BIN
      src/assets/meeting/yujian_jiezi_img_03.jpg
  60. BIN
      src/assets/meeting/yujian_jiezi_img_04.jpg
  61. BIN
      src/assets/meeting/yujian_jiezi_img_05.jpg
  62. BIN
      src/assets/meeting/yujian_jiezi_img_06.jpg
  63. BIN
      src/assets/meeting/yujian_jiezi_img_07.jpg
  64. BIN
      src/assets/meeting/yujian_shuijie_img_01.jpg
  65. BIN
      src/assets/meeting/yujian_shuijie_img_02.jpg
  66. BIN
      src/assets/meeting/yujian_shuijie_img_03.jpg
  67. BIN
      src/assets/meeting/yujian_shuijie_img_04.jpg
  68. BIN
      src/assets/meeting/yujian_shuijie_img_05.jpg
  69. BIN
      src/assets/meeting/yujian_shuijie_img_06.jpg
  70. BIN
      src/assets/meeting/yujian_shuijie_img_07.jpg
  71. BIN
      src/assets/meeting/yujian_yangzi_img_01.jpg
  72. BIN
      src/assets/meeting/yujian_yangzi_img_02.jpg
  73. BIN
      src/assets/meeting/yujian_yangzi_img_03.jpg
  74. BIN
      src/assets/meeting/yujian_yangzi_img_04.jpg
  75. BIN
      src/assets/meeting/yujian_yangzi_img_05.jpg
  76. BIN
      src/assets/meeting/yujian_yangzi_img_06.jpg
  77. BIN
      src/assets/meeting/yujian_yangzi_img_07.jpg
  78. BIN
      src/assets/meeting/yujian_yangzi_img_08.jpg
  79. BIN
      src/assets/meeting/yujian_yihe_img_01.jpg
  80. BIN
      src/assets/meeting/yujian_yihe_img_02.jpg
  81. BIN
      src/assets/meeting/yujian_yihe_img_03.jpg
  82. BIN
      src/assets/meeting/yujian_yihe_img_04.jpg
  83. BIN
      src/assets/meeting/yujian_yihe_img_05.jpg
  84. BIN
      src/assets/meeting/yujian_yihe_img_06.jpg
  85. BIN
      src/assets/meeting/yujian_yihe_img_07.jpg
  86. BIN
      src/assets/meeting/yujian_yihe_img_08.jpg
  87. BIN
      src/assets/meeting/yujian_yihe_img_09.jpg
  88. BIN
      src/assets/meiri_img_01.jpg
  89. BIN
      src/assets/room/room1.jpg
  90. BIN
      src/assets/room/room2.jpg
  91. BIN
      src/assets/room/room3.jpg
  92. BIN
      src/assets/room/room4.jpg
  93. BIN
      src/assets/room/room5.jpg
  94. BIN
      src/assets/room/room6.jpg
  95. BIN
      src/assets/room/room7.jpg
  96. 5 0
      src/assets/room/去除文件名中.bat
  97. BIN
      src/assets/safe.jpg
  98. BIN
      src/assets/waterTreatment/jingshui_img_02.jpg
  99. BIN
      src/assets/waterTreatment/jingshui_img_03.jpg
  100. BIN
      src/assets/waterTreatment/jingshui_img_04.jpg

+ 50 - 50
config/index.js

@@ -5,65 +5,65 @@
 const path = require('path')
 const path = require('path')
 
 
 module.exports = {
 module.exports = {
-  dev: {
+    dev: {
 
 
-    // Paths
-    assetsSubDirectory: 'static',
-    assetsPublicPath: '/',
-    proxyTable: {},
+        // Paths
+        assetsSubDirectory: 'static',
+        assetsPublicPath: '/',
+        proxyTable: {},
 
 
-    // Various Dev Server settings
-    host: 'localhost', // can be overwritten by process.env.HOST
-    port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
-    autoOpenBrowser: false,
-    errorOverlay: true,
-    notifyOnErrors: true,
-    poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
+        // Various Dev Server settings
+        host: '0.0.0.0', // can be overwritten by process.env.HOST
+        port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+        autoOpenBrowser: false,
+        errorOverlay: true,
+        notifyOnErrors: true,
+        poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
 
 
-    
-    /**
-     * Source Maps
-     */
 
 
-    // https://webpack.js.org/configuration/devtool/#development
-    devtool: 'cheap-module-eval-source-map',
+        /**
+         * Source Maps
+         */
 
 
-    // If you have problems debugging vue-files in devtools,
-    // set this to false - it *may* help
-    // https://vue-loader.vuejs.org/en/options.html#cachebusting
-    cacheBusting: true,
+        // https://webpack.js.org/configuration/devtool/#development
+        devtool: 'cheap-module-eval-source-map',
 
 
-    cssSourceMap: true
-  },
+        // If you have problems debugging vue-files in devtools,
+        // set this to false - it *may* help
+        // https://vue-loader.vuejs.org/en/options.html#cachebusting
+        cacheBusting: true,
 
 
-  build: {
-    // Template for index.html
-    index: path.resolve(__dirname, '../dist/index.html'),
+        cssSourceMap: true
+    },
 
 
-    // Paths
-    assetsRoot: path.resolve(__dirname, '../dist'),
-    assetsSubDirectory: 'static',
-    assetsPublicPath: '/',
+    build: {
+        // Template for index.html
+        index: path.resolve(__dirname, '../dist/index.html'),
 
 
-    /**
-     * Source Maps
-     */
+        // Paths
+        assetsRoot: path.resolve(__dirname, '../dist'),
+        assetsSubDirectory: 'static',
+        assetsPublicPath: './',
 
 
-    productionSourceMap: true,
-    // https://webpack.js.org/configuration/devtool/#production
-    devtool: '#source-map',
+        /**
+         * Source Maps
+         */
 
 
-    // Gzip off by default as many popular static hosts such as
-    // Surge or Netlify already gzip all static assets for you.
-    // Before setting to `true`, make sure to:
-    // npm install --save-dev compression-webpack-plugin
-    productionGzip: false,
-    productionGzipExtensions: ['js', 'css'],
+        productionSourceMap: true,
+        // https://webpack.js.org/configuration/devtool/#production
+        devtool: '#source-map',
 
 
-    // Run the build command with an extra argument to
-    // View the bundle analyzer report after build finishes:
-    // `npm run build --report`
-    // Set to `true` or `false` to always turn it on or off
-    bundleAnalyzerReport: process.env.npm_config_report
-  }
-}
+        // Gzip off by default as many popular static hosts such as
+        // Surge or Netlify already gzip all static assets for you.
+        // Before setting to `true`, make sure to:
+        // npm install --save-dev compression-webpack-plugin
+        productionGzip: false,
+        productionGzipExtensions: ['js', 'css'],
+
+        // Run the build command with an extra argument to
+        // View the bundle analyzer report after build finishes:
+        // `npm run build --report`
+        // Set to `true` or `false` to always turn it on or off
+        bundleAnalyzerReport: process.env.npm_config_report
+    }
+}

+ 25 - 6
index.html

@@ -1,12 +1,31 @@
 <!DOCTYPE html>
 <!DOCTYPE html>
 <html>
 <html>
-  <head>
+
+<head>
     <meta charset="utf-8">
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <title>waterstreet</title>
-  </head>
-  <body>
+    <script charset="utf-8" src="http://map.qq.com/api/js?v=2.exp&key=GLFBZ-ZR2W6-76XSA-MF7CQ-GDJ6Z-6FB5K"></script>
+    <title>隐逸水街</title>
+</head>
+
+
+
+<body>
     <div id="app"></div>
     <div id="app"></div>
     <!-- built files will be auto injected -->
     <!-- built files will be auto injected -->
-  </body>
-</html>
+</body>
+<script>
+    // function changePage() {
+    //     location.reload()
+    //     console.log('aaaaaaaa')
+    // }
+
+    // window.onload = function() {
+    //     window.onresize = function() {
+    //         location.reload()
+    //             // console.log('aaaaaaaa')
+    //     }
+    // }
+</script>
+
+</html>

+ 5 - 0
package-lock.json

@@ -9546,6 +9546,11 @@
       "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
       "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
       "dev": true
       "dev": true
     },
     },
+    "vconsole": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/vconsole/-/vconsole-3.3.0.tgz",
+      "integrity": "sha512-0b3p8PseD8JQG2mraWmsi/5Zto3wRakCu+tByb06Tkz3XeQ8n4UAkGVDz8iSr3c2e33d+EXDH0K4ZaS7SmiLPg=="
+    },
     "vendors": {
     "vendors": {
       "version": "1.0.2",
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.2.tgz",
       "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.2.tgz",

+ 1 - 0
package.json

@@ -15,6 +15,7 @@
         "less": "^3.0.4",
         "less": "^3.0.4",
         "less-loader": "^4.1.0",
         "less-loader": "^4.1.0",
         "gsap": "^2.0.0",
         "gsap": "^2.0.0",
+        "vconsole": "^3.3.0",
         "vue": "^2.5.2",
         "vue": "^2.5.2",
         "vue-amap": "^0.5.9",
         "vue-amap": "^0.5.9",
         "vue-axios": "^2.1.1",
         "vue-axios": "^2.1.1",

+ 6 - 2
src/App.vue

@@ -11,11 +11,9 @@ export default {
   name: 'app',
   name: 'app',
   data() {
   data() {
     return {
     return {
-      allWords: require('./words.json'),
     }
     }
   },
   },
   mounted() {
   mounted() {
-    console.log(this.direction)
   },
   },
   computed: {
   computed: {
     ...mapState(['isChinese', 'direction', 'wordsJson']),
     ...mapState(['isChinese', 'direction', 'wordsJson']),
@@ -32,6 +30,10 @@ export default {
 <style lang="less">
 <style lang="less">
 @import "styles/reset.less";
 @import "styles/reset.less";
 
 
+.appRoot {
+  background-color: #fff;
+}
+
 .router-view {
 .router-view {
   box-sizing: border-box;
   box-sizing: border-box;
   width: 100%;
   width: 100%;
@@ -44,6 +46,8 @@ export default {
   position: absolute;
   position: absolute;
   top: 0;
   top: 0;
   left: 0;
   left: 0;
+  overflow: auto;
+  -webkit-overflow-scrolling: touch;
 }
 }
 
 
 .fade-enter-active,
 .fade-enter-active,

BIN
src/FZKTJW.TTF


BIN
src/SourceHanSerifCN-Bold.otf


BIN
src/assets/anquan_img_01.png


BIN
src/assets/daily/meiri_img_02.jpg


BIN
src/assets/daily/meiri_img_03.jpg


BIN
src/assets/daily/meiri_img_04.jpg


BIN
src/assets/daily/meiri_img_05.jpg


BIN
src/assets/daily/meiri_img_06.jpg


BIN
src/assets/fangshan_img_01.jpg


BIN
src/assets/foodMenu/fangshan_img_02.jpg


BIN
src/assets/foodMenu/fangshan_img_03.jpg


BIN
src/assets/foodMenu/fangshan_img_04.jpg


BIN
src/assets/foodMenu/fangshan_img_05.jpg


BIN
src/assets/foodMenu/fangshan_img_06.jpg


BIN
src/assets/foodMenu/fangshan_img_07.jpg


BIN
src/assets/foodMenu/fangshan_img_08.jpg


BIN
src/assets/foodMenu/fangshan_img_09.jpg


BIN
src/assets/home_banner.jpg


BIN
src/assets/home_icon_01.png


BIN
src/assets/home_icon_02.png


BIN
src/assets/home_icon_03.png


BIN
src/assets/home_icon_04.png


BIN
src/assets/home_icon_05.png


BIN
src/assets/home_img_biaoti.png


BIN
src/assets/home_img_biaoti2.png


BIN
src/assets/icon_banner_00.png


BIN
src/assets/icon_daohang.png


BIN
src/assets/icon_dian.png


BIN
src/assets/icon_dianhua.png


BIN
src/assets/icon_dizhi.png


BIN
src/assets/icon_jingdian.png


BIN
src/assets/icon_success.png


BIN
src/assets/icon_warning.png


BIN
src/assets/icon_xiaoshan.png


BIN
src/assets/img_dibu.png


BIN
src/assets/img_dibu@3x.png


BIN
src/assets/img_fenjiexian.png


BIN
src/assets/img_shijian.png


BIN
src/assets/img_yun_01(1).png


BIN
src/assets/img_yun_01.png


BIN
src/assets/img_yun_01@3x.png


BIN
src/assets/img_yun_02(1).png


BIN
src/assets/img_yun_02.png


BIN
src/assets/img_yun_02@3x.png


BIN
src/assets/iocn_xuanzhong.png


BIN
src/assets/jingshui_img_01.jpg


BIN
src/assets/lishi_img_01.jpg


BIN
src/assets/lishi_img_02.png


BIN
src/assets/lishi_img_03.png


BIN
src/assets/lishi_img_04.png


BIN
src/assets/logo.png


BIN
src/assets/meeting/yujian_jiezi_img_01.jpg


BIN
src/assets/meeting/yujian_jiezi_img_02.jpg


BIN
src/assets/meeting/yujian_jiezi_img_03.jpg


BIN
src/assets/meeting/yujian_jiezi_img_04.jpg


BIN
src/assets/meeting/yujian_jiezi_img_05.jpg


BIN
src/assets/meeting/yujian_jiezi_img_06.jpg


BIN
src/assets/meeting/yujian_jiezi_img_07.jpg


BIN
src/assets/meeting/yujian_shuijie_img_01.jpg


BIN
src/assets/meeting/yujian_shuijie_img_02.jpg


BIN
src/assets/meeting/yujian_shuijie_img_03.jpg


BIN
src/assets/meeting/yujian_shuijie_img_04.jpg


BIN
src/assets/meeting/yujian_shuijie_img_05.jpg


BIN
src/assets/meeting/yujian_shuijie_img_06.jpg


BIN
src/assets/meeting/yujian_shuijie_img_07.jpg


BIN
src/assets/meeting/yujian_yangzi_img_01.jpg


BIN
src/assets/meeting/yujian_yangzi_img_02.jpg


BIN
src/assets/meeting/yujian_yangzi_img_03.jpg


BIN
src/assets/meeting/yujian_yangzi_img_04.jpg


BIN
src/assets/meeting/yujian_yangzi_img_05.jpg


BIN
src/assets/meeting/yujian_yangzi_img_06.jpg


BIN
src/assets/meeting/yujian_yangzi_img_07.jpg


BIN
src/assets/meeting/yujian_yangzi_img_08.jpg


BIN
src/assets/meeting/yujian_yihe_img_01.jpg


BIN
src/assets/meeting/yujian_yihe_img_02.jpg


BIN
src/assets/meeting/yujian_yihe_img_03.jpg


BIN
src/assets/meeting/yujian_yihe_img_04.jpg


BIN
src/assets/meeting/yujian_yihe_img_05.jpg


BIN
src/assets/meeting/yujian_yihe_img_06.jpg


BIN
src/assets/meeting/yujian_yihe_img_07.jpg


BIN
src/assets/meeting/yujian_yihe_img_08.jpg


BIN
src/assets/meeting/yujian_yihe_img_09.jpg


BIN
src/assets/meiri_img_01.jpg


BIN
src/assets/room/room1.jpg


BIN
src/assets/room/room2.jpg


BIN
src/assets/room/room3.jpg


BIN
src/assets/room/room4.jpg


BIN
src/assets/room/room5.jpg


BIN
src/assets/room/room6.jpg


BIN
src/assets/room/room7.jpg


+ 5 - 0
src/assets/room/去除文件名中.bat

@@ -0,0 +1,5 @@
+@echo off& setlocal enabledelayedexpansion
+
+for /f "delims=" %%1 in ('dir /a /b') do (set wind=%%1
+
+ren "%%~1" "!wind:)=!")

BIN
src/assets/safe.jpg


BIN
src/assets/waterTreatment/jingshui_img_02.jpg


BIN
src/assets/waterTreatment/jingshui_img_03.jpg


BIN
src/assets/waterTreatment/jingshui_img_04.jpg


Некоторые файлы не были показаны из-за большого количества измененных файлов