updat

src/router.js

@@ -4,7 +4,7 @@ import Router from 'vue-router'
 Vue.use(Router)
 export default new Router({
   routes: [{
-      path: '/login',
+      path: '/',
       name: 'login',
       component: () => import('./views/Login.vue'),
       show: 0,

src/views/Home.vue

@@ -6,7 +6,7 @@
 	<el-container>
 		<el-header>
 			<div class="header">
-				<!-- <img class="logo" src="../assets/logo.png" alt=""> -->
+				<img class="logo" src="../assets/logo.png" alt="">
 				期刊微信公众号管理系统
 			</div>	
 			<div class="nav">

src/views/conference/AddConference.vue

@@ -24,7 +24,7 @@
         width:100%;
     }
 }
-.el-tabs__header{
+/deep/.el-tabs__header{
     margin:0;
     .el-tabs__active-bar{
         height:0px;
@@ -193,16 +193,11 @@
                         <el-tab-pane label="主讲人" name="second">
                             <section style="height:544px;padding:10px 0px;border:1px solid #ccc;">
                                 <el-row>
-                                    <el-col :span="5">
+                                    <el-col :span="9">
                                         <el-form-item label="主讲人姓名">
                                             <el-input placeholder="请输入主讲人姓名" v-model="form.address"></el-input>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="7">
-                                        <el-form-item label="主讲人简介">
-                                            <el-input type="textarea" placeholder="请输入主讲人简介" v-model="form.address"></el-input>
-                                        </el-form-item>
-                                    </el-col>
                                     <el-col :span="8">
                                         <el-form-item label="主讲人头像">
                                             <el-upload
@@ -220,12 +215,20 @@
                                         <el-button type="normal" icon="el-icon-plus">添加主讲人</el-button>
                                     </el-col>
                                 </el-row>
+                                <el-row style='position:relative;top:-55px'>
+                                    <el-col :span="9">
+                                        <el-form-item label="主讲人简介">
+                                            <el-input type="textarea" placeholder="请输入主讲人简介" v-model="form.address"></el-input>
+                                        </el-form-item>
+                                    </el-col>
+                                </el-row>
+                                
                             </section>
                         </el-tab-pane>
                         <el-tab-pane label="酒店信息" name="third">
                             <section class="hotel" style="padding:10px 0px;border:1px solid #ccc;">
                                 <el-row>
-                                    <el-col :span="18">
+                                    <el-col :span="16">
                                         <el-form-item label="选择历史酒店">
                                             <el-select placeholder="请选择酒店" v-model="form.sponsor" filterable>
                                             <el-option
@@ -237,7 +240,7 @@
                                         </el-select>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="6">
+                                    <el-col :span="4" offset='1'>
                                         <el-form-item>
                                             <el-button icon="el-icon-plus">添加酒店</el-button>
                                         </el-form-item>
@@ -343,11 +346,11 @@
                                             <span style='font-size:12px;color:#999999;'>建议图片尺寸为：210*160</span>
                                         </el-form-item>
                                     </el-col>
-                                </el-row>
+                                 </el-row>
                                 <el-row>
                                     <el-col :span="24">
-                                        <el-form-item>
-                                            <el-button type="normal" icon="el-icon-plus">添加主讲人</el-button>
+                                        <el-form-item label=' '>
+                                            <el-button type="normal" icon="el-icon-plus">添加房型</el-button>
                                         </el-form-item>
                                     </el-col>
                                 </el-row>