开始对接选择范围

src/App.vue

@@ -70,13 +70,9 @@ export default {
 					window.location.href = getLoginUrl()  // 没有token返回登录页面
 				}
 			}else {
-<<<<<<< HEAD
-				window.location.href = getLoginUrl()  // 没有token返回登录页面
-=======
 				if(!localStorage.getItem('storageToken')) {
 					window.location.href = getLoginUrl()  // 没有token返回登录页面
 				}
->>>>>>> 1049ca21c55130831c3d4ab2d015aa8ce21707bf
 			}
 			vm.changeToken(vm.token)
 			vm.getUserAuth(vm.token)

src/views/education/add-manager.vue

@@ -554,7 +554,7 @@ export default {
           editData.projectData.projectBegintime
         ],
         projectIntro: editData.projectData.projectIntro,
-        type: editData.attachmentModel[1].kind,
+        type: editData.attachmentModel[1].attachmentType,
         attachmentUrl1: editData.attachmentModel[0].attachmentUrl,
         attachmentUrl2: editData.attachmentModel[1].attachmentUrl,
         attachmentUrl3: ""