合并冲突

config/dev.env.js

@@ -9,5 +9,6 @@ module.exports = merge(prodEnv, {
   Login:'"http://localhost:7777/login"',
   CHART_LINK:'"https://charttest.hzinsights.com/chartshow"',
   HR_MANAGEMENT_SYSTEM:'"http://8.136.199.33:8391/login"',
-  FINANCIAL_MANAGEMENT_SYSTEM:'"http://8.136.199.33:8618/login"'
+  FINANCIAL_MANAGEMENT_SYSTEM:'"http://8.136.199.33:8618/login"',
+  ETA_SYSTEM:'"http://8.136.199.33:7778/login"'
 });

config/prod.env.js

@@ -5,5 +5,6 @@ module.exports = {
 	Login:'"https://hzcrm.hzinsights.com/login"',
 	CHART_LINK:'"https://chartlib.hzinsights.com/chartshow"',
 	HR_MANAGEMENT_SYSTEM:'"https://hr.hzinsights.com/login"',
-	FINANCIAL_MANAGEMENT_SYSTEM:'"https://fms.hzinsights.com/login"'
+	FINANCIAL_MANAGEMENT_SYSTEM:'"https://fms.hzinsights.com/login"',
+	ETA_SYSTEM:'"https://hzeta.hzinsights.com/login"'
 }

config/prod.test.env.js

@@ -7,5 +7,6 @@ module.exports = {
 	Login:'"http://8.136.199.33:7777/login"',
 	CHART_LINK:'"https://charttest.hzinsights.com/chartshow"',
 	HR_MANAGEMENT_SYSTEM:'"http://8.136.199.33:8391/login"',
-  FINANCIAL_MANAGEMENT_SYSTEM:'"http://8.136.199.33:8618/login"'
+  FINANCIAL_MANAGEMENT_SYSTEM:'"http://8.136.199.33:8618/login"',
+  ETA_SYSTEM:'"http://8.136.199.33:7778/login"'
 }

src/components/questionMsgDia.vue

@@ -19,10 +19,10 @@
                 </div>
             </div>
         </div>
-        <div slot="reference" style="position:relative;cursor: pointer;marginRight:26px" >
+        <div slot="reference" class="icon-box-item">
             <div v-if="isshow">
-                <img src="~@/assets/img/icons/msg.png" alt="" style="height:32px;marginTop:6px;">
-                <span style="width:8px;height:8px;borderRadius:50%;background:#f00;display:block;position:absolute;right:-4px;top:3px;" v-show="list.length>0"></span>
+                <img src="~@/assets/img/icons/msg2.png" alt="" style="height:20px;width:20px">
+                <span style="width:8px;height:8px;borderRadius:50%;background:#f00;display:block;position:absolute;right:5px;top:3px;" v-show="list.length>0"></span>
             </div>
         </div>
     </el-popover>

src/views/Login.vue

@@ -1,8 +1,8 @@
 <template>
 	<div id="login">
 		<div id="login_wrapper">
-			<img class="login-bg" src="../assets/img/login_bg.png" alt />
-			<img class="login-icon" src="../assets/img/login_icon.png" alt />
+			<img class="login-bg" src="https://hzstatic.hzinsights.com/static/hz_crm_web/imgs/login_bg.png" alt />
+			<img class="login-icon" src="https://hzstatic.hzinsights.com/static/hz_crm_web/imgs/login_logo.png" alt />
 			<el-form
 				:model="ruleForm"
 				:rules="rules"
@@ -16,13 +16,13 @@
 				<el-form-item>
 					<h1
 						style="
-							font-size: 30px;
+							font-size: 38px;
 							text-align: center;
-							color: #3d6ff5;
+							color: #333;
 							margin-bottom: 30px;
 						"
 					>
-						弘则研究后台管理系统
+						运营管理系统
 					</h1>
 				</el-form-item>
 				<el-form-item prop="account">
@@ -68,11 +68,10 @@
 						@click.native="handleSubmit2"
 						:loading="logining"
 						class="submit_btn"
-						>立即登录</el-button
+						>登录</el-button
 					>
 				</el-form-item>
 			</el-form>
-			<img class="login-r-b" src="../assets/img/login_r_b.png" alt />
 		</div>
 	</div>
 </template>
@@ -212,7 +211,8 @@ export default {
 
 					for (let i = 0; i < menuList.length; i++) {
 						const element = menuList[i];
-						if(element.children.some(it => it.path == pathVal)){
+						const arr=menuList[i].children||[]
+						if(arr.some(it => it.path == pathVal)){
 							resolvePath='/'+pathVal
 							break
 						}
@@ -233,7 +233,7 @@ export default {
 #login {
 	width: 100%;
 	height: 100%;
-	background: #e6e6e6;
+	background: #fff;
 	position: relative;
 	overflow: hidden;
 	#login_wrapper {
@@ -241,19 +241,18 @@ export default {
 		height: 100%;
 		background-color: #ffffff;
 		position: relative;
-
 		.login-bg {
 			position: absolute;
-			left: 0;
-			bottom: 0;
-			width: 46%;
+			top: 50px;
+			left: 50px;
+			height: calc(100% - 100px);
+			max-width: 50%;
 		}
 
 		.login-icon {
 			position: absolute;
 			top: 44px;
-			right: 160px;
-			width: 16%;
+			right: 40px;
 		}
 
 		.login-r-b {
@@ -265,6 +264,7 @@ export default {
 
 		#login-container {
 			width: 31%;
+			max-width: 570px;
 			box-sizing: border-box;
 			border-radius: 10px;
 			position: absolute;
@@ -284,6 +284,7 @@ export default {
 				background: #007eff;
 				font-size: 16px;
 				border-radius: 5px;
+				margin-top: 30px;
 			}
 			.el-input input {
 				width: 100%;

src/views/interaction_manage/videoManageEN.vue

@@ -774,6 +774,11 @@ export default {
         }
     }
 }
+.send-email-wrap{
+    .el-input{
+        width: 100%;
+    }
+}
 </style>
 
 <style lang="scss" scoped>