1.修复MAC打包命令BUG

2.上传最新的APP
yujinjin · Mar 22, 2017 · 07db57e · 07db57e
1 parent 1edbfd8
commit 07db57e
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 8 deletions.
diff --git a/index.html b/index.html
@@ -10,13 +10,13 @@
 		<meta name="apple-mobile-web-app-capable" content="yes">
 		<meta name="format-detection" content="telephone=no">
 		<title>粉丝煲</title>
-	<link rel="shortcut icon" href="./build/goldfish.ico"><link href="./build/style.829c15a554636e55471d.css" rel="stylesheet"></head>
+	<link rel="shortcut icon" href="./build/goldfish.ico"><link href="./build/style.15f8cec46712f96a478f.css" rel="stylesheet"></head>
 
 	<body>
 		<div class="views">
 			<div id="app"></div>
 		</div>
 		<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.0.0.js" charset="utf-8"></script>
-	<script type="text/javascript" src="./build/common.829c15a554636e55471d.js"></script><script type="text/javascript" src="./build/build.829c15a554636e55471d.js"></script></body>
+	<script type="text/javascript" src="./build/common.15f8cec46712f96a478f.js"></script><script type="text/javascript" src="./build/build.15f8cec46712f96a478f.js"></script></body>
 
 </html>
diff --git a/manifest.json b/manifest.json
@@ -352,7 +352,13 @@
 					"build/common.8a5d3e8f97bc2e4d74ca.js",
 					"build/style.70f6d21e2cf521d78581.css",
 					"build/build.70f6d21e2cf521d78581.js",
-					"build/common.70f6d21e2cf521d78581.js"
+					"build/common.70f6d21e2cf521d78581.js",
+					"build/common.829c15a554636e55471d.js",
+					"build/build.829c15a554636e55471d.js",
+					"build/style.829c15a554636e55471d.css",
+					"build/build.15f8cec46712f96a478f.js",
+					"build/style.15f8cec46712f96a478f.css",
+					"build/common.15f8cec46712f96a478f.js"
 				],
 				"refer": []
 			}

diff --git a/src/views/app.vue b/src/views/app.vue
@@ -110,9 +110,9 @@
 				}
 				
 				//2.初始化是否启动欢迎页面
-//				if(!app.globalService.getStartFlag()){
-//					this.$router.push({name: "welcome"});
-//				}
+				if(!app.globalService.getStartFlag()){
+					this.$router.push({name: "welcome"});
+				}
 //				require(["../js/utils/site-utils.js", "../css/test.css"], function(utils){
 //					console.info("app.vue AMD 加载");
 //				});

diff --git a/unpackage/.confirmed_dependencies b/unpackage/.confirmed_dependencies
@@ -175,7 +175,13 @@
 			"build/common.8a5d3e8f97bc2e4d74ca.js",
 			"build/style.70f6d21e2cf521d78581.css",
 			"build/build.70f6d21e2cf521d78581.js",
-			"build/common.70f6d21e2cf521d78581.js"
+			"build/common.70f6d21e2cf521d78581.js",
+			"build/common.829c15a554636e55471d.js",
+			"build/build.829c15a554636e55471d.js",
+			"build/style.829c15a554636e55471d.css",
+			"build/build.15f8cec46712f96a478f.js",
+			"build/style.15f8cec46712f96a478f.css",
+			"build/common.15f8cec46712f96a478f.js"
 		],
 		"refer": []
 	}

diff --git a/unpackage/release/fans.apk b/unpackage/release/fans.apk
diff --git a/webpack.config.js b/webpack.config.js
@@ -14,7 +14,7 @@ module.exports = {
 	    commons: ['vue', 'vue-router']
 	},
 	output: {
-		path: NODE_RUN === "0" ? './build' : "/",//"./build",//"./build",//path.resolve(__dirname, './build'), //path.resolve(__dirname, './build'), //
+		path: NODE_RUN === "0" ? path.resolve(__dirname, './build') : "/",//"./build",//"./build",//path.resolve(__dirname, './build'), //path.resolve(__dirname, './build'), //
 		//publicPath路径就是你发布之后的路径，比如你想发布到你站点的/util/vue/build 目录下, 那么设置publicPath: "/util/vue/build/",此字段配置如果不正确，发布后资源定位不对，比如：css里面的精灵图路径错误
 		publicPath: NODE_RUN === "0" ? "./build/": "/build/",//"build/",//SERVER_PATH, //process.env.CUSTOM ? "/git/WebApp/n-build/" : "/n-build/",
 		filename: NODE_RUN === "0" ? "build.[hash].js" : "build.js",