From 19b23b63f70187b951bfd2f5bda81a8b3f3b0b36 Mon Sep 17 00:00:00 2001
From: CherrysChang <1935003650@qq.com>
Date: Mon, 7 Sep 2020 16:10:02 +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=A0init?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/common/header.vue | 66 ++-
src/components/common/market-header.vue | 639 ++++++++++++++++++++++++
src/pages/market-announce.app.js | 7 +
src/pages/market-announce.vue | 141 ++++++
src/pages/market-order.app.js | 7 +
src/pages/market-order.vue | 103 ++++
6 files changed, 954 insertions(+), 9 deletions(-)
create mode 100644 src/components/common/market-header.vue
create mode 100644 src/pages/market-announce.app.js
create mode 100644 src/pages/market-announce.vue
create mode 100644 src/pages/market-order.app.js
create mode 100644 src/pages/market-order.vue
diff --git a/src/components/common/header.vue b/src/components/common/header.vue
index 3c59b23..fd4aa34 100644
--- a/src/components/common/header.vue
+++ b/src/components/common/header.vue
@@ -183,6 +183,41 @@
+
+
@@ -280,6 +315,13 @@ export default {
/* {id: 'out', name: this.$t('nav.menu_logOut')},*/
],
},
+ menuRole: {
+ current: {id: 'tradeUser', name: '交易用户'},
+ list: [
+ {id: 'tradeUser', name: '交易用户'},
+ {id: 'marketMaker', name: '做市商'},
+ ],
+ },
userData: '',
headerImg: '',
perUrl: 'personal',
@@ -312,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');
@@ -491,6 +533,12 @@ export default {
location.href = '/personal?perUrl=' + this.perUrl + '#/' + command;
}
},
+ switchRole(command) {
+ if (!command) {
+ return;
+ }
+ location.href = '/market-announce?perUrl=' + this.perUrl;
+ },
exit(params) {
logOut().then(res => {
if (res.data.code === 200 || res.data.code === 202) {
diff --git a/src/components/common/market-header.vue b/src/components/common/market-header.vue
new file mode 100644
index 0000000..2b8b3b5
--- /dev/null
+++ b/src/components/common/market-header.vue
@@ -0,0 +1,639 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/market-announce.app.js b/src/pages/market-announce.app.js
new file mode 100644
index 0000000..00522aa
--- /dev/null
+++ b/src/pages/market-announce.app.js
@@ -0,0 +1,7 @@
+import pageCommon from '@/common/page-common';
+
+import App from './market-announce';
+
+pageCommon.createPageInstance({
+ render: h => h(App),
+});
diff --git a/src/pages/market-announce.vue b/src/pages/market-announce.vue
new file mode 100644
index 0000000..7c58d08
--- /dev/null
+++ b/src/pages/market-announce.vue
@@ -0,0 +1,141 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/market-order.app.js b/src/pages/market-order.app.js
new file mode 100644
index 0000000..bacaa91
--- /dev/null
+++ b/src/pages/market-order.app.js
@@ -0,0 +1,7 @@
+import pageCommon from '@/common/page-common';
+
+import App from './market-order';
+
+pageCommon.createPageInstance({
+ render: h => h(App),
+});
diff --git a/src/pages/market-order.vue b/src/pages/market-order.vue
new file mode 100644
index 0000000..30633dc
--- /dev/null
+++ b/src/pages/market-order.vue
@@ -0,0 +1,103 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+