Merge branch 'master' of http://git.cc-lotus.info/service-platform/web-test

src/layout/enterprise/appointment.vue

@@ -2,7 +2,7 @@
   <div id="technical">
     <el-col :span="24" class="main">
       <el-col :span="24" class="left">
-        <el-col :span="24" class="leftTop"> <span>|</span> <span>事项管理</span> <span @click="add()">创建对接会</span></el-col>
+        <el-col :span="24" class="leftTop"> <span>|</span> <span>展会预约</span> <span @click="add()">创建对接会</span></el-col>
         <!-- <el-col :span="24" class="downLeftTop">
           <el-image :src="downLeftTopImage"></el-image>
           <span class="topText">
@@ -57,7 +57,7 @@
             </el-table-column>
           </el-table>
           <el-col :span="24">
-            <page :total="total" position="right" v-on="$listeners"></page>
+            <page :total="total" position="center" v-on="$listeners"></page>
           </el-col>
         </el-col>
       </el-col>

src/layout/enterprise/duijiecontext.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="rightcont">
     <el-col class="zhengce">
-      <el-col :span="24" class="topTitle"> <span>详情</span></el-col>
+      <el-col :span="24" class="leftTop"> <span>|</span> <span>对接会详情</span></el-col>
       <el-col :span="24" class="info">
         <el-col :span="24" class="messgae">
           <el-form ref="form" :model="form" label-width="120px">
@@ -68,13 +68,22 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.leftTop {
+  font-size: 18px;
+  width: 96%;
+  height: 41px;
+  line-height: 35px;
+  border-bottom: 1px solid #e5e5e5;
+  position: relative;
+  bottom: 1px;
+  margin: 10px;
+  font-weight: 600;
+  color: #22529a;
+}
 p {
   padding: 0;
   margin: 0;
 }
-.zhengce {
-  padding: 20px;
-}
 .zhengce .topTitle {
   font-size: 22px;
   color: #22529a;
@@ -99,4 +108,8 @@ p {
   width: 100px;
   height: 100px;
 }
+.messgae {
+  padding: 20px;
+  width: 95%;
+}
 </style>

src/layout/enterprise/xiugai.vue

@@ -2,11 +2,9 @@
   <div id="loginMain">
     <el-row class="loginMains">
       <el-col :span="24" class="top">
-        <el-col :span="12" class="context">
-          <el-col :span="24" class="topTitle">
-            修改密码
-          </el-col>
-          <el-col :span="24">
+        <el-col :span="12">
+          <el-col :span="24" class="leftTop"> <span>|</span> <span>修改密码</span></el-col>
+          <el-col :span="24" class="context">
             <el-form ref="form" :model="form" label-width="60px">
               <el-form-item label="新密码">
                 <el-input v-model="form.password" placeholder="请输入新密码" show-password></el-input>
@@ -41,17 +39,31 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.leftTop {
+  font-size: 18px;
+  width: 96%;
+  height: 41px;
+  line-height: 35px;
+  border-bottom: 1px solid #e5e5e5;
+  position: relative;
+  bottom: 1px;
+  margin: 10px;
+  font-weight: 600;
+  color: #22529a;
+}
 .topTitle {
   font-size: 22px;
   color: #22529a;
   margin: 0 0 20px 20px;
 }
 .loginMains {
-  padding: 20px 0;
   background-color: #fff;
 }
 
 .loginSubmit {
   text-align: center;
 }
+.context {
+  padding: 20px;
+}
 </style>

src/layout/live/head.vue

@@ -9,7 +9,7 @@
           <p>
             欢迎来到吉林省计算中心科技平台
           </p>
-          <p>
+          <p class="username">
             <span v-if="user && user.name" @click="stnmae">{{ user.name }}</span>
             <span v-else>
               <button type="button" class="logininfo" @click="btnLogin">登录</button>
@@ -106,4 +106,10 @@ export default {
   font-size: 20px;
   margin: 0 0 0 5px;
 }
+.username span {
+  cursor: pointer;
+}
+/deep/ button {
+  cursor: pointer;
+}
 </style>