Merge remote-tracking branch 'origin/master'

src/views/AAAFont/index.vue

@@ -3,21 +3,22 @@
     <el-container>
       <el-header class="header">
         <!--        <div >-->
-        <div class="official-title" style="width: 45%; padding-left: 40px">
-          <img
-            :src="titleNameImage"
-            width="390"
-            height="auto"
-            style="position: relative; top: 3px; width: 50%"
-          />
-          <img
-            :src="titleNameImage1"
-            width="220"
-            height="auto"
-            style="margin-left: 20px; width: 30%"
-          />
+        <div class="official-title" style="width: 20%; padding-left: 40px">
+<!--          <img-->
+<!--            :src="titleNameImage"-->
+<!--            width="390"-->
+<!--            height="auto"-->
+<!--            style="position: relative; top: 3px; width: 50%"-->
+<!--          />-->
+<!--          <img-->
+<!--            :src="titleNameImage1"-->
+<!--            width="220"-->
+<!--            height="auto"-->
+<!--            style="margin-left: 20px; width: 30%"-->
+<!--          />-->
+          数据要素交易服务平台
         </div>
-        <div id="menu_index" style="width: 50%; display: flex; justify-content: end">
+        <div id="menu_index" style="width: 55%; display: flex; justify-content: end">
           <el-menu
             :default-active="activeIndex"
             class="el-menu-demo"
@@ -30,15 +31,19 @@
               v-for="(nav, index) in navs"
               :key="index"
               :index="nav.path"
-              style="font-size: 20px"
+              style="font-size: 20px;margin: 0 16px"
               >{{ nav.text }}</el-menu-item
             >
           </el-menu>
         </div>
+        <div class="right-div">
+          <el-button plain class="long_btn">登录</el-button>
+          <el-button class="long_btn" style="color: #486fe1;background-color: #dce5f9" type="primary">注册</el-button>
+        </div>
         <!--        </div>-->
       </el-header>
       <el-main>
-        <div class="container" style="clear: both">
+        <div style="clear: both">
           <router-view />
         </div>
         <div class="footer-div">
@@ -145,19 +150,19 @@
           </div>
         </div>
       </el-main>
-      <div class="fixed-area" v-show="showFixed">
-        <div id="to_common_problem" @click="toCommonProblem" class="detail">
-          <img class="fixed-img" />
-          <div class="custom-icon"></div>
-        </div>
-        <div id="to_common_problem" @click="toSignUp" class="detail1">
-          <img class="fixed-img" />
-        </div>
-
-        <!--        <div id="back_to_top" ref="btn" @click="backTop" class="detail2">-->
-        <!--          <img src="@/assets/tiankai_cup/index/zhiding@2x.png" class="fixed-img"/>-->
-        <!--        </div>-->
-      </div>
+<!--      <div class="fixed-area" v-show="showFixed">-->
+<!--        <div id="to_common_problem" @click="toCommonProblem" class="detail">-->
+<!--          <img class="fixed-img" />-->
+<!--          <div class="custom-icon"></div>-->
+<!--        </div>-->
+<!--        <div id="to_common_problem" @click="toSignUp" class="detail1">-->
+<!--          <img class="fixed-img" />-->
+<!--        </div>-->
+
+<!--        &lt;!&ndash;        <div id="back_to_top" ref="btn" @click="backTop" class="detail2">&ndash;&gt;-->
+<!--        &lt;!&ndash;          <img src="@/assets/tiankai_cup/index/zhiding@2x.png" class="fixed-img"/>&ndash;&gt;-->
+<!--        &lt;!&ndash;        </div>&ndash;&gt;-->
+<!--      </div>-->
       <el-backtop
         id="back_to_top"
         class="detail2"
@@ -308,6 +313,7 @@
     height: 60px;
     display: flex;
     align-items: center;
+    justify-content: space-around;
     top: 0;
     background-color: #ffffff;
   }
@@ -379,6 +385,16 @@
     /*justify-content: center;*/
   }
 
+  .long_btn{
+    width: 80px;
+    border: none;
+  }
+
+  .container{
+    display: flex;
+    justify-content: center;
+  }
+
   @media screen and (max-device-width: 415px) {
     .logo_img {
       float: left;

src/views/personalCenter/myMessage/detail.vue

+<template>
+
+</template>
+
+<script>
+export default {
+  name: "detail"
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/personalCenter/myMessage/index.vue

+<template>
+
+</template>
+
+<script>
+export default {
+  name: "index"
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/personalCenter/myObjection/detail.vue

+<template>
+
+</template>
+
+<script>
+export default {
+  name: "detail"
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/personalCenter/myObjection/index.vue

+<template>
+
+</template>
+
+<script>
+export default {
+  name: "index"
+}
+</script>
+
+<style scoped>
+
+</style>