路径优化

dev-server

package.json

@@ -4,8 +4,8 @@
   "description": "zuiketang-frontend",
   "main": "index.js",
   "scripts": {
-    "dev": "cross-env NODE_ENV=development webpack --watch --progress --display-error-details",
-    "build": "cross-env NODE_ENV=production  webpack --progress --hide-modules"
+    "dev": "cross-env NODE_ENV=development node server.js",
+    "build": "cross-env NODE_ENV=production webpack --progress --hide-modules"
   },
   "keywords": [
     "webpack"
@@ -24,11 +24,14 @@
     "css-loader": "^0.28.4",
     "expose": "^0.1.4",
     "expose-loader": "^0.7.3",
+    "express": "^4.14.1",
     "extract-text-webpack-plugin": "^2.1.2",
     "file-loader": "^0.9.0",
     "html-webpack-plugin": "^2.28.0",
     "imports-loader": "^0.6.5",
     "jsx-loader": "^0.13.2",
+    "opn": "^4.0.2",
+    "ora": "^1.2.0",
     "script-loader": "^0.7.0",
     "style-loader": "^0.18.1",
     "url-loader": "^0.5.7",
@@ -36,6 +39,7 @@
     "vue-style-loader": "^1.0.0",
     "vue-template-compiler": "^2.2.1",
     "webpack": "^2.2.0",
+    "webpack-dev-middleware": "^1.10.0",
     "webpack-require-http": "^0.1.0"
   },
   "dependencies": {

server.js

+/**
+ * Created by pader on 2017/6/14.
+ */
+var opn = require('opn');
+var path = require('path');
+var express = require('express');
+var webpack = require('webpack');
+var webpackConfig = require("./webpack.config");
+
+var port = 8080;
+
+var app = express();
+var compiler = webpack(webpackConfig);
+
+var devMiddleware = require('webpack-dev-middleware')(compiler, {
+	publicPath: webpackConfig.output.publicPath,
+	noInfo: true,
+	quiet: false
+});
+
+app.use(devMiddleware);
+app.use('/', express.static('./'));
+
+var uri = 'http://localhost:' + port;
+
+var _resolve;
+var readyPromise = new Promise(resolve => {
+	_resolve = resolve
+});
+
+console.log('> Starting dev server...');
+devMiddleware.waitUntilValid(() => {
+	console.log('> Listening at ' + uri + '\n');
+	// when env is testing, don't need open it
+	opn(uri);
+	_resolve();
+});
+
+var server = app.listen(port);
+
+module.exports = {
+	ready: readyPromise,
+	close: () => {
+		server.close()
+	}
+};
\ No newline at end of file

src/components/doc-multi-uploader.vue

@@ -219,7 +219,7 @@ export default {
 			return filesize(size).human('si');
 		},
 		getImageSrc(src) {
-			return src ? src : common.getUrl("assets/img/placeholder.jpg")
+			return src ? src : common.getUrl("img/placeholder.jpg")
 		}
 	}
 }

src/components/honor/golden-wrench.vue

@@ -44,12 +44,12 @@
                 this.getLists(this.page,this.num);
             },
             getSortImg(index){
-                var result = '/assets/img/rank_no.jpg';
+                var result = '/img/rank_no.jpg';
                 if (index == 1) {
-                    result = '/assets/img/rank_no2.jpg';
+                    result = '/img/rank_no2.jpg';
                 }
                 if (index == 2) {
-                    result = '/assets/img/rank_no3.jpg';
+                    result = '/img/rank_no3.jpg';
                 }
                 return result;
             },

src/components/honor/share.vue

@@ -43,12 +43,12 @@
                 this.getLists(this.page,this.num);
             },
             getSortImg(index){
-                var result = '/assets/img/rank_no.jpg';
+                var result = '/img/rank_no.jpg';
                 if (index == 1) {
-                    result = '/assets/img/rank_no2.jpg';
+                    result = '/img/rank_no2.jpg';
                 }
                 if (index == 2) {
-                    result = '/assets/img/rank_no3.jpg';
+                    result = '/img/rank_no3.jpg';
                 }
                 return result;
             },

src/components/medal/medal-info.vue

@@ -42,7 +42,7 @@
                         var medal = res.data;
                         self.id = medal.id;
                         self.name = medal.name;
-                        self.icon = common.getUrl("assets/img/medal/" + medal.icon);
+                        self.icon = common.getUrl("img/medal/" + medal.icon);
                         self.info = medal.info;
                         document.body.appendChild(self.$el);
                     } else {

src/pages/code.vue

@@ -78,11 +78,11 @@
 
             <div class="step" style="padding-top: 20px;"><span>01</span></div>
             <p style="font-size: 14px;">常按识别二维码关注</p>
-            <img :src="getImgUrl('assets/img/qrcode_banshou.jpg')" style="padding:0">
+            <img src="../img/qrcode_banshou.jpg" style="padding:0">
 
             <div class="step"><span>02</span></div>
             <p style="font-size: 14px;">点击公众号菜单“扳手快查”</p>
-            <img :src="getImgUrl('assets/img/banshou_menu.jpg')" style="padding:0">
+            <img src="../img/banshou_menu.jpg" style="padding:0">
         </div>
 
 
@@ -91,7 +91,7 @@
                     class="iconfont icon-close"></i></a></div>
             <h3>欢迎加入官方微信群</h3>
             <p>与其在别处闲聊 不如在这里抱团</p>
-            <img :src="getImgUrl('assets/img/qrcode.jpg')">
+            <img src="../img/qrcode.jpg">
         </div>
 
     </div>
@@ -182,7 +182,7 @@
                      */
                 }
                 var title = self.code + '-故障码详情';
-                var imgUrl = common.getUrl('assets/img/share_logo.jpg');
+                var imgUrl = common.getUrl('img/share_logo.jpg');
                 var desc = '点击查看“' + self.brand + self.category + '”' + self.code + '故障码详情…';
                 weixinShare.init(title, desc, imgUrl);
             }, "json");
@@ -196,9 +196,6 @@
                 }
 
             },
-            getImgUrl(url){
-                return common.getUrl(url);
-            },
             missFeedback(){
                 if (this.telephone == '') {
                     return false;

src/pages/home.vue

@@ -115,7 +115,7 @@
         <div v-if="showMedal" class="mask" style="display: block; opacity: 1"></div>
         <div v-if="showMedal" class="medal-main-box">
             <div class="medal-main">
-                <img :src="'/assets/img/medal/'+medalInfo.icon">
+                <img :src="'/img/medal/'+medalInfo.icon">
                 <!--<h3>{{medalInfo.name}}</h3>-->
             </div>
             <div class="medal-get-tip">
@@ -320,7 +320,7 @@ export default {
 		});
 
 		var title = '扳手快查';
-		var imgUrl = common.getUrl('assets/img/share_logo.jpg');
+		var imgUrl = common.getUrl('img/share_logo.jpg');
 		var desc = '让你故障码查询效率提升10倍以上！';
 		weixinShare.init(title, desc, imgUrl);
 

src/pages/my.vue

@@ -44,9 +44,9 @@
                 userInfo: null,
                 medal: null,
                 medalImgMap: {
-                    '1': {img: '/assets/img/medal/medal_baixiaosheng.png', name: '扳手百晓生', shareImg: ''},
-                    '2': {img: '/assets/img/medal/medal_leifeng.png', name: "扳手活雷锋", shareImg: ''},
-                    '3': {img: '/assets/img/medal/medal_banshou.png', name: '金扳手', shareImg: ''}
+                    '1': {img: '/img/medal/medal_baixiaosheng.png', name: '扳手百晓生', shareImg: ''},
+                    '2': {img: '/img/medal/medal_leifeng.png', name: "扳手活雷锋", shareImg: ''},
+                    '3': {img: '/img/medal/medal_banshou.png', name: '金扳手', shareImg: ''}
                 }
             }
         },

src/utils/api.js

@@ -16,7 +16,7 @@ function request(obj) {
 		if (headerAuthorize) {
 			obj.headers = {"Authorize": token};
 		} else {
-			obj.url += (obj.url.indexOf("?") ? "&" : "?") + "authorize=" + encodeURIComponent(token);
+			obj.url += (obj.url.indexOf("?") == -1 ? "?" : "&") + "authorize=" + encodeURIComponent(token);
 		}
 	}
 

src/utils/common.js

@@ -41,7 +41,7 @@ module.exports = {
     },
     requestLogin: function (returnUrl) {
         returnUrl = returnUrl || location.href;
-        location.href = common.getFullUrl("login/auth") + "?returnUrl=" + encodeURIComponent(returnUrl);
+        location.href = this.getServerUrl("login/auth") + "?returnUrl=" + encodeURIComponent(returnUrl) + "&client=" + encodeURIComponent(location.origin);
     },
     isBanshou: function () {
         return !!navigator.userAgent.match(/BanShou/);

src/utils/layer.js

@@ -3,7 +3,7 @@
  */
 var layer = require('layer-js');
 var common = require('./common');
-var path = common.getUrl('assets/layer/2.4/');
+var path = common.getUrl('layer/2.4/');
 
 layer.config({
     path: path, //layer.js所在的目录，可以是绝对目录，也可以是相对目录

src/utils/qiniu.js

@@ -18,7 +18,7 @@ require("script-loader!../libs/plupload/plupload.full.min.js");
 require("script-loader!../libs/plupload/i18n/zh_CN.js");
 var api = require('./api');
 
-var flash_swf_url = common.getUrl('assets/plupload/Moxie.swf');
+var flash_swf_url = common.getUrl('plupload/Moxie.swf');
 
 module.exports = {
     Uploader: function (option) {

webpack.config.js

@@ -35,8 +35,8 @@ var targetDir = path.resolve(__dirname, './dist');
 var config = {
 	entry: entry,
 	output: {
-		path: path.resolve(targetDir, './assets'),
-		publicPath: '/assets/',
+		path: targetDir,
+		publicPath: '/',
 		filename: '[name].js?[chunkhash]',
 		chunkFilename: chunkFilename
 	},
@@ -65,7 +65,7 @@ var config = {
 		}),
 		new CopyWebpackPlugin([
 			// {from: __dirname + '/resource', to: 'resource'},
-			{from: './src/libs/layer', to: 'layer'},
+			{from: './src/libs/layer', to:'layer'},
 			{from: './src/img', to: 'img'},
 			{from: './src/libs/videojs/video-js.swf', to: 'videojs'},
 			{from: './src/libs/plupload', to: 'plupload'}