před 6 roky · f31ac85434
--- a/config/index.js
+++ b/config/index.js
@@ -5,65 +5,65 @@
 
				 const path = require('path')
			
 
				 
			
 
				 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
			
 
				+    }
			
 
				+}
			
--- a/index.html
+++ b/index.html
@@ -1,12 +1,31 @@
 
				 <!DOCTYPE html>
			
 
				 <html>
			
 
				-  <head>
			
 
				+
			
 
				+<head>
			
 
				     <meta charset="utf-8">
			
 
				     <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>
			
 
				     <!-- 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>
			
--- a/package-lock.json
+++ b/package-lock.json
@@ -9546,6 +9546,11 @@
 
				       "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
			
 
				       "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": {
			
 
				       "version": "1.0.2",
			
 
				       "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.2.tgz",
			
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
 
				         "less": "^3.0.4",
			
 
				         "less-loader": "^4.1.0",
			
 
				         "gsap": "^2.0.0",
			
 
				+        "vconsole": "^3.3.0",
			
 
				         "vue": "^2.5.2",
			
 
				         "vue-amap": "^0.5.9",
			
 
				         "vue-axios": "^2.1.1",
			
--- a/src/App.vue
+++ b/src/App.vue
@@ -11,11 +11,9 @@ export default {
 
				   name: 'app',
			
 
				   data() {
			
 
				     return {
			
 
				-      allWords: require('./words.json'),
			
 
				     }
			
 
				   },
			
 
				   mounted() {
			
 
				-    console.log(this.direction)
			
 
				   },
			
 
				   computed: {
			
 
				     ...mapState(['isChinese', 'direction', 'wordsJson']),
			
@@ -32,6 +30,10 @@ export default {
 
				 <style lang="less">
			
 
				 @import "styles/reset.less";
			
 
				 
			
 
				+.appRoot {
			
 
				+  background-color: #fff;
			
 
				+}
			
 
				+
			
 
				 .router-view {
			
 
				   box-sizing: border-box;
			
 
				   width: 100%;
			
@@ -44,6 +46,8 @@ export default {
 
				   position: absolute;
			
 
				   top: 0;
			
 
				   left: 0;
			
 
				+  overflow: auto;
			
 
				+  -webkit-overflow-scrolling: touch;
			
 
				 }
			
 
				 
			
 
				 .fade-enter-active,
			
--- a/src/FZKTJW.TTF
+++ b/src/FZKTJW.TTF
--- a/src/SourceHanSerifCN-Bold.otf
+++ b/src/SourceHanSerifCN-Bold.otf
--- a/src/assets/anquan_img_01.png
+++ b/src/assets/anquan_img_01.png
--- a/src/assets/daily/meiri_img_02.jpg
+++ b/src/assets/daily/meiri_img_02.jpg
--- a/src/assets/daily/meiri_img_03.jpg
+++ b/src/assets/daily/meiri_img_03.jpg
--- a/src/assets/daily/meiri_img_04.jpg
+++ b/src/assets/daily/meiri_img_04.jpg
--- a/src/assets/daily/meiri_img_05.jpg
+++ b/src/assets/daily/meiri_img_05.jpg
--- a/src/assets/daily/meiri_img_06.jpg
+++ b/src/assets/daily/meiri_img_06.jpg
--- a/src/assets/fangshan_img_01.jpg
+++ b/src/assets/fangshan_img_01.jpg
--- a/src/assets/foodMenu/fangshan_img_02.jpg
+++ b/src/assets/foodMenu/fangshan_img_02.jpg
--- a/src/assets/foodMenu/fangshan_img_03.jpg
+++ b/src/assets/foodMenu/fangshan_img_03.jpg
--- a/src/assets/foodMenu/fangshan_img_04.jpg
+++ b/src/assets/foodMenu/fangshan_img_04.jpg
--- a/src/assets/foodMenu/fangshan_img_05.jpg
+++ b/src/assets/foodMenu/fangshan_img_05.jpg
--- a/src/assets/foodMenu/fangshan_img_06.jpg
+++ b/src/assets/foodMenu/fangshan_img_06.jpg
--- a/src/assets/foodMenu/fangshan_img_07.jpg
+++ b/src/assets/foodMenu/fangshan_img_07.jpg
--- a/src/assets/foodMenu/fangshan_img_08.jpg
+++ b/src/assets/foodMenu/fangshan_img_08.jpg
--- a/src/assets/foodMenu/fangshan_img_09.jpg
+++ b/src/assets/foodMenu/fangshan_img_09.jpg
--- a/src/assets/home_banner.jpg
+++ b/src/assets/home_banner.jpg
--- a/src/assets/home_icon_01.png
+++ b/src/assets/home_icon_01.png
--- a/src/assets/home_icon_02.png
+++ b/src/assets/home_icon_02.png
--- a/src/assets/home_icon_03.png
+++ b/src/assets/home_icon_03.png
--- a/src/assets/home_icon_04.png
+++ b/src/assets/home_icon_04.png
--- a/src/assets/home_icon_05.png
+++ b/src/assets/home_icon_05.png
--- a/src/assets/home_img_biaoti.png
+++ b/src/assets/home_img_biaoti.png
--- a/src/assets/home_img_biaoti2.png
+++ b/src/assets/home_img_biaoti2.png
--- a/src/assets/icon_banner_00.png
+++ b/src/assets/icon_banner_00.png
--- a/src/assets/icon_daohang.png
+++ b/src/assets/icon_daohang.png
--- a/src/assets/icon_dian.png
+++ b/src/assets/icon_dian.png
--- a/src/assets/icon_dianhua.png
+++ b/src/assets/icon_dianhua.png
--- a/src/assets/icon_dizhi.png
+++ b/src/assets/icon_dizhi.png
--- a/src/assets/icon_jingdian.png
+++ b/src/assets/icon_jingdian.png
--- a/src/assets/icon_success.png
+++ b/src/assets/icon_success.png
--- a/src/assets/icon_warning.png
+++ b/src/assets/icon_warning.png
--- a/src/assets/icon_xiaoshan.png
+++ b/src/assets/icon_xiaoshan.png
--- a/src/assets/img_dibu.png
+++ b/src/assets/img_dibu.png
--- a/src/assets/img_dibu@3x.png
+++ b/src/assets/img_dibu@3x.png
--- a/src/assets/img_fenjiexian.png
+++ b/src/assets/img_fenjiexian.png
--- a/src/assets/img_shijian.png
+++ b/src/assets/img_shijian.png
--- a/src/assets/img_yun_01(1).png
+++ b/src/assets/img_yun_01(1).png
--- a/src/assets/img_yun_01.png
+++ b/src/assets/img_yun_01.png
--- a/src/assets/img_yun_01@3x.png
+++ b/src/assets/img_yun_01@3x.png
--- a/src/assets/img_yun_02(1).png
+++ b/src/assets/img_yun_02(1).png
--- a/src/assets/img_yun_02.png
+++ b/src/assets/img_yun_02.png
--- a/src/assets/img_yun_02@3x.png
+++ b/src/assets/img_yun_02@3x.png
--- a/src/assets/iocn_xuanzhong.png
+++ b/src/assets/iocn_xuanzhong.png
--- a/src/assets/jingshui_img_01.jpg
+++ b/src/assets/jingshui_img_01.jpg
--- a/src/assets/lishi_img_01.jpg
+++ b/src/assets/lishi_img_01.jpg
--- a/src/assets/lishi_img_02.png
+++ b/src/assets/lishi_img_02.png
--- a/src/assets/lishi_img_03.png
+++ b/src/assets/lishi_img_03.png
--- a/src/assets/lishi_img_04.png
+++ b/src/assets/lishi_img_04.png
--- a/src/assets/logo.png
+++ b/src/assets/logo.png
--- a/src/assets/meeting/yujian_jiezi_img_01.jpg
+++ b/src/assets/meeting/yujian_jiezi_img_01.jpg
--- a/src/assets/meeting/yujian_jiezi_img_02.jpg
+++ b/src/assets/meeting/yujian_jiezi_img_02.jpg
--- a/src/assets/meeting/yujian_jiezi_img_03.jpg
+++ b/src/assets/meeting/yujian_jiezi_img_03.jpg
--- a/src/assets/meeting/yujian_jiezi_img_04.jpg
+++ b/src/assets/meeting/yujian_jiezi_img_04.jpg
--- a/src/assets/meeting/yujian_jiezi_img_05.jpg
+++ b/src/assets/meeting/yujian_jiezi_img_05.jpg
--- a/src/assets/meeting/yujian_jiezi_img_06.jpg
+++ b/src/assets/meeting/yujian_jiezi_img_06.jpg
--- a/src/assets/meeting/yujian_jiezi_img_07.jpg
+++ b/src/assets/meeting/yujian_jiezi_img_07.jpg
--- a/src/assets/meeting/yujian_shuijie_img_01.jpg
+++ b/src/assets/meeting/yujian_shuijie_img_01.jpg
--- a/src/assets/meeting/yujian_shuijie_img_02.jpg
+++ b/src/assets/meeting/yujian_shuijie_img_02.jpg
--- a/src/assets/meeting/yujian_shuijie_img_03.jpg
+++ b/src/assets/meeting/yujian_shuijie_img_03.jpg
--- a/src/assets/meeting/yujian_shuijie_img_04.jpg
+++ b/src/assets/meeting/yujian_shuijie_img_04.jpg
--- a/src/assets/meeting/yujian_shuijie_img_05.jpg
+++ b/src/assets/meeting/yujian_shuijie_img_05.jpg
--- a/src/assets/meeting/yujian_shuijie_img_06.jpg
+++ b/src/assets/meeting/yujian_shuijie_img_06.jpg
--- a/src/assets/meeting/yujian_shuijie_img_07.jpg
+++ b/src/assets/meeting/yujian_shuijie_img_07.jpg
--- a/src/assets/meeting/yujian_yangzi_img_01.jpg
+++ b/src/assets/meeting/yujian_yangzi_img_01.jpg
--- a/src/assets/meeting/yujian_yangzi_img_02.jpg
+++ b/src/assets/meeting/yujian_yangzi_img_02.jpg
--- a/src/assets/meeting/yujian_yangzi_img_03.jpg
+++ b/src/assets/meeting/yujian_yangzi_img_03.jpg
--- a/src/assets/meeting/yujian_yangzi_img_04.jpg
+++ b/src/assets/meeting/yujian_yangzi_img_04.jpg
--- a/src/assets/meeting/yujian_yangzi_img_05.jpg
+++ b/src/assets/meeting/yujian_yangzi_img_05.jpg
--- a/src/assets/meeting/yujian_yangzi_img_06.jpg
+++ b/src/assets/meeting/yujian_yangzi_img_06.jpg
--- a/src/assets/meeting/yujian_yangzi_img_07.jpg
+++ b/src/assets/meeting/yujian_yangzi_img_07.jpg
--- a/src/assets/meeting/yujian_yangzi_img_08.jpg
+++ b/src/assets/meeting/yujian_yangzi_img_08.jpg
--- a/src/assets/meeting/yujian_yihe_img_01.jpg
+++ b/src/assets/meeting/yujian_yihe_img_01.jpg
--- a/src/assets/meeting/yujian_yihe_img_02.jpg
+++ b/src/assets/meeting/yujian_yihe_img_02.jpg
--- a/src/assets/meeting/yujian_yihe_img_03.jpg
+++ b/src/assets/meeting/yujian_yihe_img_03.jpg
--- a/src/assets/meeting/yujian_yihe_img_04.jpg
+++ b/src/assets/meeting/yujian_yihe_img_04.jpg
--- a/src/assets/meeting/yujian_yihe_img_05.jpg
+++ b/src/assets/meeting/yujian_yihe_img_05.jpg
--- a/src/assets/meeting/yujian_yihe_img_06.jpg
+++ b/src/assets/meeting/yujian_yihe_img_06.jpg
--- a/src/assets/meeting/yujian_yihe_img_07.jpg
+++ b/src/assets/meeting/yujian_yihe_img_07.jpg
--- a/src/assets/meeting/yujian_yihe_img_08.jpg
+++ b/src/assets/meeting/yujian_yihe_img_08.jpg
--- a/src/assets/meeting/yujian_yihe_img_09.jpg
+++ b/src/assets/meeting/yujian_yihe_img_09.jpg
--- a/src/assets/meiri_img_01.jpg
+++ b/src/assets/meiri_img_01.jpg
--- a/src/assets/room/room1.jpg
+++ b/src/assets/room/room1.jpg
--- a/src/assets/room/room2.jpg
+++ b/src/assets/room/room2.jpg
--- a/src/assets/room/room3.jpg
+++ b/src/assets/room/room3.jpg
--- a/src/assets/room/room4.jpg
+++ b/src/assets/room/room4.jpg
--- a/src/assets/room/room5.jpg
+++ b/src/assets/room/room5.jpg
--- a/src/assets/room/room6.jpg
+++ b/src/assets/room/room6.jpg
--- a/src/assets/room/room7.jpg
+++ b/src/assets/room/room7.jpg
--- a/src/assets/room/去除文件名中.bat
+++ b/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:)=!")
			
--- a/src/assets/safe.jpg
+++ b/src/assets/safe.jpg
--- a/src/assets/waterTreatment/jingshui_img_02.jpg
+++ b/src/assets/waterTreatment/jingshui_img_02.jpg
--- a/src/assets/waterTreatment/jingshui_img_03.jpg
+++ b/src/assets/waterTreatment/jingshui_img_03.jpg
--- a/src/assets/waterTreatment/jingshui_img_04.jpg
+++ b/src/assets/waterTreatment/jingshui_img_04.jpg