From 4fd6b74d553db545aa8ed02dd235edb1ef3e4283 Mon Sep 17 00:00:00 2001
From: CherrysChang <1935003650@qq.com>
Date: Mon, 7 Sep 2020 16:52:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=88=87=E6=8D=A2=EF=BC=8C?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/header.vue        | 24 ++++-----
 src/components/common/market-header.vue | 31 +++++------
 src/pages/market-announce.vue           |  9 ++--
 src/pages/market-order.vue              | 68 ++-----------------------
 4 files changed, 33 insertions(+), 99 deletions(-)

diff --git a/src/components/common/header.vue b/src/components/common/header.vue
index fd4aa34..67524a4 100644
--- a/src/components/common/header.vue
+++ b/src/components/common/header.vue
@@ -184,7 +184,7 @@
             </el-dropdown>
           </li>
           <!-- 角色切换-->
-          <li class="menu-item">
+          <li class="menu-item" v-if="userData != '' && userData != undefined">
             <el-dropdown
               @command="switchRole"
               trigger="click"
@@ -192,7 +192,7 @@
             >
               <span class="dropdown-link">
                 <span>
-                  交易用户
+                  {{ menuRole.current.name }}
                 </span>
                 <i class="el-icon-arrow-down el-icon--right"></i>
               </span>
@@ -354,15 +354,15 @@ export default {
     let yyyfToken = localStorage.getItem('yyyfToken');
     this.isSubmit = localStorage.getItem('isSubmit') == 'true' ? true : false;
     if (yyyfToken == '' || yyyfToken == undefined) {
-      // this.$alert('未从以渔有方登录，点击确定返回登录', '提示', {
-      //   type: 'error',
-      //   showClose: false,
-      //   confirmButtonText: '确定',
-      //   confirmButtonClass: 'btn-self-style',
-      //   callback: () => {
-      //     window.location.href = yyyfUrl;
-      //   },
-      // });
+      this.$alert('未从以渔有方登录，点击确定返回登录', '提示', {
+        type: 'error',
+        showClose: false,
+        confirmButtonText: '确定',
+        confirmButtonClass: 'btn-self-style',
+        callback: () => {
+          window.location.href = yyyfUrl;
+        },
+      });
     } else {
       //请求类型
       this.reqType = localStorage.getItem('reqType');
@@ -537,7 +537,7 @@ export default {
       if (!command) {
         return;
       }
-      location.href = '/market-announce?perUrl=' + this.perUrl;
+      location.href = '/market-announce';
     },
     exit(params) {
       logOut().then(res => {
diff --git a/src/components/common/market-header.vue b/src/components/common/market-header.vue
index 2b8b3b5..35a4045 100644
--- a/src/components/common/market-header.vue
+++ b/src/components/common/market-header.vue
@@ -43,7 +43,7 @@
             >
               <span class="dropdown-link">
                 <span>
-                  交易用户
+                  {{ menuRole.current.name }}
                 </span>
                 <i class="el-icon-arrow-down el-icon--right"></i>
               </span>
@@ -78,9 +78,7 @@
 <script>
 import {getCurrentLanguage} from '@/common/i18n';
 import {getExchangeRateCookie, setExchangeRateCookie} from '@/utils/auth';
-import {logOut} from '@/api/user';
 import {FILE_URL} from '@/api/app';
-import {submit, reStart} from '@/api/yyyf';
 import {signUp, signIn} from '@/api/user';
 import {yyyfUrl} from '@/api/app.js';
 
@@ -113,7 +111,7 @@ export default {
       menuLeft: Menu.left,
       menuRight: Menu.right,
       menuRole: {
-        current: {id: 'tradeUser', name: '交易用户'},
+        current: {id: 'marketMaker', name: '做市商'},
         list: [
           {id: 'tradeUser', name: '交易用户'},
           {id: 'marketMaker', name: '做市商'},
@@ -121,7 +119,7 @@ export default {
       },
       userData: '',
       headerImg: '',
-      perUrl: 'personal',
+      perUrl: 'market-announce',
       file: '',
       showCounting: true,
       //0 考试 1 练习 2 不计分
@@ -141,15 +139,15 @@ export default {
     let yyyfToken = localStorage.getItem('yyyfToken');
     this.isSubmit = localStorage.getItem('isSubmit') == 'true' ? true : false;
     if (yyyfToken == '' || yyyfToken == undefined) {
-      // this.$alert('未从以渔有方登录，点击确定返回登录', '提示', {
-      //   type: 'error',
-      //   showClose: false,
-      //   confirmButtonText: '确定',
-      //   confirmButtonClass: 'btn-self-style',
-      //   callback: () => {
-      //     window.location.href = yyyfUrl;
-      //   },
-      // });
+      this.$alert('未从以渔有方登录，点击确定返回登录', '提示', {
+        type: 'error',
+        showClose: false,
+        confirmButtonText: '确定',
+        confirmButtonClass: 'btn-self-style',
+        callback: () => {
+          window.location.href = yyyfUrl;
+        },
+      });
     } else {
       //请求类型
       this.reqType = localStorage.getItem('reqType');
@@ -162,7 +160,6 @@ export default {
       }
       this.file = FILE_URL;
       this.perUrl = window.location.pathname.split('/')[1];
-      // console.log(this.perUrl);
 
       // this.userData = Cookie.get('userData');
       this.userData = localStorage.getItem('userData');
@@ -348,7 +345,7 @@ export default {
     }
 
     .menu-item {
-      margin-right: 3%;
+      margin-right: 6%;
     }
   }
 
@@ -378,7 +375,7 @@ export default {
     display: flex;
     flex-wrap: wrap;
     height: 100%;
-    justify-content: space-between;
+    justify-content: flex-start;
 
     .menu-item {
       display: flex;
diff --git a/src/pages/market-announce.vue b/src/pages/market-announce.vue
index 7c58d08..9eb9eaa 100644
--- a/src/pages/market-announce.vue
+++ b/src/pages/market-announce.vue
@@ -5,7 +5,7 @@
       <!-- OTC一级标题 -->
       <ul class="exchange-menu">
         <!-- 购买 -->
-        <li class="mensu-item">
+        <!--<li class="mensu-item">
           <a
             :class="showCommentInput === true ? 'buyTwo' : 'buy'"
             @click="hangdelClickShow()"
@@ -14,7 +14,7 @@
         </li>
         <li class="mensu-item">
           <div class="line"></div>
-        </li>
+        </li>-->
         <!-- 出售 -->
         <li class="mensu-item">
           <a
@@ -42,7 +42,6 @@
 </template>
 <script>
 // 引入子组件
-import NavHeader from '@/components/common/header';
 import Footer from '@/components/common/footer';
 import AnnounceTableBi from '@/components/announce/announce-tabgle-bi';
 import AnnounceTableSell from '@/components/announce/announce-table-sell';
@@ -58,8 +57,8 @@ export default {
   },
   data() {
     return {
-      showCommentInput: true, //购买
-      ifCommentInput: false, //出售
+      showCommentInput: false, //购买
+      ifCommentInput: true, //出售
       hackReset: true,
       hackResetBuy: true,
     };
diff --git a/src/pages/market-order.vue b/src/pages/market-order.vue
index 30633dc..f6aa757 100644
--- a/src/pages/market-order.vue
+++ b/src/pages/market-order.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <NavHeader></NavHeader>
+    <market-header></market-header>
     <main class="main-coins">
       <!-- 广告管理 -->
       <OrderOtcAdver></OrderOtcAdver>
@@ -12,15 +12,15 @@
 </template>
 <script>
 // 引入子组件
-import NavHeader from '@/components/common/header';
 import Footer from '@/components/common/footer';
 import OrderOtcAdver from '@/components/order/order-otc-adver';
 import OrderOtcGoods from '@/components/order/order-otc-goods';
+import MarketHeader from '@/components/common/market-header';
 
 export default {
   name: 'market-order',
   components: {
-    NavHeader,
+    MarketHeader,
     Footer,
     OrderOtcAdver,
     OrderOtcGoods,
@@ -38,66 +38,4 @@ export default {
   margin: 0 auto;
   margin-top: 40px;
 }
-// .main-adver {
-//   // margin-top: 18px;
-//   display: flex;
-//   flex-direction: row;
-//   .adver-select {
-//     margin-right: 48px;
-//     .biZhon {
-//       width: 36px;
-//       height: 27px;
-//       color: #333;
-//       font-size: 18px;
-//       text-align: left;
-//       padding-right: 18px;
-//     }
-//   }
-// }
-// .action {
-//   width: 110px;
-//   height: 35px;
-//   font-size: 16px;
-//   text-align: center;
-//   padding-left: 208px;
-//   margin: auto;
-//   .btn-widget {
-//     background-color: #c7282c;
-//     width: 110px;
-//     border: 2px solid #c7282c;
-//     color: #fff;
-//     &:active {
-//       background: #9f2023;
-//       border: 2px solid #9f2023;
-//       opacity: 1;
-//       color: #ba8889;
-//     }
-//   }
-// }
-// .bian {
-//   margin-top: 40px;
-// }
-// .el-table th {
-//   height: 60px;
-// }
-// .el-table thead {
-//   color: #333;
-// }
-// .tableimg {
-//   margin-right: 21px;
-// }
-// .deldet {
-//   cursor: pointer;
-//   color: #c7282c;
-// }
-// .el-select-dropdown__item.selected {
-//   color: #c7282c;
-//   font-weight: bold;
-// }
-// .orderTittle {
-//   color: #333;
-//   font-size: 23px;
-//   margin-top: 30px;
-//   margin-bottom: 5px;
-// }
 </style>