ソースを参照

feat:屏蔽头部信息

jinx 4 年 前
コミット
5907c043fc

+ 22 - 17
pc/build/webpack.dev.conf.en.js

@@ -17,7 +17,10 @@ const PORT = process.env.PORT && Number(process.env.PORT)
 
 const devWebpackConfig = merge(baseWebpackConfig, {
   module: {
-    rules: utils.styleLoaders({ sourceMap: config.dev.cssSourceMap, usePostCSS: true })
+    rules: utils.styleLoaders({
+      sourceMap: config.dev.cssSourceMap,
+      usePostCSS: true
+    })
   },
   // cheap-module-eval-source-map is faster for development
   devtool: config.dev.devtool,
@@ -26,9 +29,10 @@ const devWebpackConfig = merge(baseWebpackConfig, {
   devServer: {
     clientLogLevel: 'warning',
     historyApiFallback: {
-      rewrites: [
-        { from: /.*/, to: path.posix.join(config.dev.assetsPublicPath, 'index.html') },
-      ],
+      rewrites: [{
+        from: /.*/,
+        to: path.posix.join(config.dev.assetsPublicPath, 'index.html')
+      }]
     },
     hot: true,
     contentBase: false, // since we use CopyWebpackPlugin.
@@ -37,18 +41,21 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     port: PORT || config.dev.port,
     open: config.dev.autoOpenBrowser,
     overlay: config.dev.errorOverlay
-      ? { warnings: false, errors: true }
+      ? {
+        warnings: false,
+        errors: true
+      }
       : false,
     publicPath: config.dev.assetsPublicPath,
     proxy: config.dev.proxyTable,
     quiet: true, // necessary for FriendlyErrorsPlugin
     watchOptions: {
-      poll: config.dev.poll,
+      poll: config.dev.poll
     },
     proxy: {
       '/api': {
         target: 'https://test.4dkankan.com',
-        changeOrigin: true,
+        changeOrigin: true
       }
     },
     setup: wepackDevServer
@@ -67,13 +74,11 @@ const devWebpackConfig = merge(baseWebpackConfig, {
       inject: true
     }),
     // copy custom static assets
-    new CopyWebpackPlugin([
-      {
-        from: path.resolve(__dirname, '../static'),
-        to: config.dev.assetsSubDirectory,
-        ignore: ['.*']
-      }
-    ])
+    new CopyWebpackPlugin([{
+      from: path.resolve(__dirname, '../static'),
+      to: config.dev.assetsSubDirectory,
+      ignore: ['.*']
+    }])
   ]
 })
 
@@ -91,11 +96,11 @@ module.exports = new Promise((resolve, reject) => {
       // Add FriendlyErrorsPlugin
       devWebpackConfig.plugins.push(new FriendlyErrorsPlugin({
         compilationSuccessInfo: {
-          messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}`],
+          messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}`]
         },
         onErrors: config.dev.notifyOnErrors
-        ? utils.createNotifierCallback()
-        : undefined
+          ? utils.createNotifierCallback()
+          : undefined
       }))
 
       resolve(devWebpackConfig)

+ 16 - 14
pc/build/webpack.dev.conf.js

@@ -11,8 +11,8 @@ const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
 const portfinder = require('portfinder')
 const wepackDevServer = require('./wepack.dev.server')
 
-// const HOST = '192.168.0.172'
-const HOST = '0.0.0.0'
+const HOST = '192.168.0.77'
+// const HOST = '0.0.0.0'
 const PORT = process.env.PORT && Number(process.env.PORT)
 
 const devWebpackConfig = merge(baseWebpackConfig, {
@@ -27,8 +27,8 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     clientLogLevel: 'warning',
     historyApiFallback: {
       rewrites: [
-        { from: /.*/, to: path.posix.join(config.dev.assetsPublicPath, 'index.html') },
-      ],
+        { from: /.*/, to: path.posix.join(config.dev.assetsPublicPath, 'index.html') }
+      ]
     },
     hot: true,
     contentBase: false, // since we use CopyWebpackPlugin.
@@ -43,22 +43,24 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     proxy: config.dev.proxyTable,
     quiet: true, // necessary for FriendlyErrorsPlugin
     watchOptions: {
-      poll: config.dev.poll,
+      poll: config.dev.poll
     },
     proxy: {
       '/api': {
-        target: 'https://test.4dkankan.com',
-        changeOrigin: true,
+        // target: 'https://test.4dkankan.com',
+        // target: 'https://testusa.4dkankan.com',
+        target: 'http://192.168.0.50:8080',
+        changeOrigin: true
       },
       '/www': {
         target: 'https://test.4dkankan.com',
-        changeOrigin: true,
+        changeOrigin: true
       },
       '/node-upload': {
         target: 'http://vrhouse2.4dkankan.com',
-        changeOrigin: true,
-      },
-      
+        changeOrigin: true
+      }
+
     },
     setup: wepackDevServer
   },
@@ -100,11 +102,11 @@ module.exports = new Promise((resolve, reject) => {
       // Add FriendlyErrorsPlugin
       devWebpackConfig.plugins.push(new FriendlyErrorsPlugin({
         compilationSuccessInfo: {
-          messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}`],
+          messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}`]
         },
         onErrors: config.dev.notifyOnErrors
-        ? utils.createNotifierCallback()
-        : undefined
+          ? utils.createNotifierCallback()
+          : undefined
       }))
 
       resolve(devWebpackConfig)

+ 2 - 2
pc/src/page/manage/temp/information.vue

@@ -52,12 +52,12 @@
               type="text"
             >
           </p>
-          <label class="check-con" @click="isReceive=!isReceive">
+          <!-- <label class="check-con" @click="isReceive=!isReceive">
             <span class="check-box">
               <span class="checkbox-inner" :class="{'checkbox-inner-checked':isReceive}"></span>
             </span>
             <span style="font-size:14px;color:#000;" v-html="langAccount.isReceive"></span>
-          </label>
+          </label> -->
           <div @click="saveNickName" class="btn parmary">{{langAccount.save}}</div>
         </div>
       </div>

+ 8 - 1
pc/src/router/index.js

@@ -10,12 +10,18 @@ let router = new Router({
   routes: [
     {
       path: '/',
-      component: resolve => require(['@/page/layout/normal'], resolve),
+      component: resolve => require(['@/page/login'], resolve),
+      // component: resolve => require(['@/page/layout/normal'], resolve),
       children: [
         {
           path: '/',
           name: 'home',
           component: resolve => require(['@/page/home2'], resolve)
+          // name: 'login',
+          // meta: {
+          //   hideFooter: true
+          // },
+          // component: resolve => require(['@/page/login'], resolve)
         },
         {
           path: '/coreProducts',
@@ -311,6 +317,7 @@ let router = new Router({
       name: 'cases_app',
       component: resolve => require(['@/page/cases/app'], resolve)
     }
+
   ],
   scrollBehavior (to, from, savedPosition) {
     if (to.hash === '') {