合并版本冲突功能

src/locales/zh-CN.json

@@ -156,6 +156,7 @@
 	"Failed to get project": "获取项目失败",
 	"Failed to save project": "保存项目失败",
 	"Save project successfully": "保存项目成功",
+	"There are conflicts in the project": "项目有冲突，请先解决冲突",
 	"Input version remark": "输入版本备注",
 	"Input view name": "输入视图名",
 	"Invalid view name": "无效的视图名",

src/main.js

@@ -11,8 +11,6 @@ import './themes/light/index.scss'
 
 Vue.config.productionTip = false;
 
-import './token'
-
 new Vue({
   router,
   store,

src/token.js

-/**
- * Created by rockyl on 2019-11-16.
- */
-import cookie from "cookie";
-
-let user_cookie;
-user_cookie = cookie.parse(document.cookie).user_cookie;
-if (!user_cookie) {
-	try {
-		user_cookie = window.__data.token;
-	} catch (e) {
-	}
-}
-if (!user_cookie) {
-	console.log('Access denied');
-}
-window['zeroing_token'] = user_cookie;