tongshanglei 2 years ago
parent
commit
4ccce3ed09
5 changed files with 8 additions and 10 deletions
  1. 3 6
      build/webpack.dev.conf.js
  2. 1 1
      config/index.js
  3. 1 1
      index.html
  4. 1 1
      src/assets/icon/iconfont.json
  5. 2 1
      src/main.js

+ 3 - 6
build/webpack.dev.conf.js

@@ -10,8 +10,8 @@ const HtmlWebpackPlugin = require('html-webpack-plugin')
 const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
 const portfinder = require('portfinder')
 
-var https = require('https');
-var fs = require('fs');
+
+
 
 const HOST = process.env.HOST
 const PORT = process.env.PORT && Number(process.env.PORT)
@@ -44,10 +44,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     proxy: config.dev.proxyTable,
     quiet: true, // necessary for FriendlyErrorsPlugin
 
-    https: {
-      key: fs.readFileSync(path.join(__dirname, './cert/privatekey.pem')),
-      cert: fs.readFileSync(path.join(__dirname, './cert/certificate.pem'))
-      },
+
 
     watchOptions: {
       poll: config.dev.poll,

+ 1 - 1
config/index.js

@@ -24,7 +24,7 @@ module.exports = {
     host: '192.168.1.77', // 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,
-    https:true,
+    https:false,
     errorOverlay: true,
     notifyOnErrors: true,
     poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-

+ 1 - 1
index.html

@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1.0,minimum-scale=1.0, maximum-scale=1.0">
-    <title>智校通</title>
+    <title>工具演示</title>
     <!-- <title>一见可得</title> -->
     <script src="//unpkg.com/vue-ydui/dist/ydui.flexible.js"></script>
     <script type="text/javascript" src="https://webapi.amap.com/maps?v=2.0&key=1918aa020d272557f3c3e0537a824326"></script> 

+ 1 - 1
src/assets/icon/iconfont.json

@@ -1,6 +1,6 @@
 {
   "id": "2506400",
-  "name": "Rlian智校通",
+  "name": "工具演示",
   "font_family": "iconfont",
   "css_prefix_text": "icon-",
   "description": "",

+ 2 - 1
src/main.js

@@ -53,7 +53,7 @@ Vue.config.productionTip = false
 router.beforeEach((to,from,next)=>{
   // console.log('to.....',to);
 
-  console.log(to.name)
+  
   //车牌扫码校验临时
   if(to.name == 'vehicle' || to.name == 'vehicledecode'){
     console.log('ddddddddddddddddd')
@@ -71,6 +71,7 @@ router.beforeEach((to,from,next)=>{
   }
   
   let openid = localStorage.getItem("openid");
+   openid = '12222111';
   let loginFlag = false; // 登录标记
   
   // 运营商,本地保存 yys_userid