From ef9253c5cf5711d9044d7d86f4d9a9cca7484f9b Mon Sep 17 00:00:00 2001
From: "huan.xu" <275942173@qq.com>
Date: Mon, 31 Aug 2020 16:32:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E6=99=AF=E9=A1=B5=E9=9D=A2bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/app.js                   |  1 +
 src/components/common/header.vue | 11 +++---
 src/pages/entry.vue              | 64 +++++++++++++++++++++++++++-----
 3 files changed, 62 insertions(+), 14 deletions(-)

diff --git a/src/api/app.js b/src/api/app.js
index f078e99..5f8f630 100644
--- a/src/api/app.js
+++ b/src/api/app.js
@@ -11,6 +11,7 @@ export const userApi = 'https://www.zhixinchains.com/user'; //用户
 export const FILE_URL = 'https://file.zhixinchains.com/'; //图片地址
 
 export const yyyfApi = 'https://www.zhixinchains.com/yyyfuser'; //用户
+export const yyyfUrl =  'http://www.iyyyf.com/'; //以渔有方地址
 
 // export const c2cApi = 'https://c2c.flamex.io'; //法币
 // export const btcApi = 'https://btc.flamex.io'; //BTC钱包
diff --git a/src/components/common/header.vue b/src/components/common/header.vue
index cad8234..3c59b23 100644
--- a/src/components/common/header.vue
+++ b/src/components/common/header.vue
@@ -3,8 +3,8 @@
     <header class="nav-header">
       <!-- 左侧 nav -->
       <div class="leftNav">
-        <a class="logoBox" href="javascript:history.go(-1);">
-          <el-button type="info" >&lt; 返回</el-button>
+        <a class="logoBox" href="/entry">
+          <el-button type="info">&lt; 返回</el-button>
         </a>
         <ul class="nav-menu">
           <!-- menu -->
@@ -215,6 +215,7 @@ 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';
 
 const Menu = {
   icon: [{t: 'nav.menu_name', link: '/'}],
@@ -276,7 +277,7 @@ export default {
           {id: 'security', name: this.$t('personal.leftNav.security')},
           {id: 'manner', name: this.$t('personal.leftNav.manner')},
           {id: 'prove', name: this.$t('personal.leftNav.prove')},
-         /* {id: 'out', name: this.$t('nav.menu_logOut')},*/
+          /* {id: 'out', name: this.$t('nav.menu_logOut')},*/
         ],
       },
       userData: '',
@@ -311,13 +312,13 @@ export default {
     let yyyfToken = localStorage.getItem('yyyfToken');
     this.isSubmit = localStorage.getItem('isSubmit') == 'true' ? true : false;
     if (yyyfToken == '' || yyyfToken == undefined) {
-      this.$alert('未从以渔有方登录，点击确定关闭浏览器', '提示', {
+      this.$alert('未从以渔有方登录，点击确定返回登录', '提示', {
         type: 'error',
         showClose: false,
         confirmButtonText: '确定',
         confirmButtonClass: 'btn-self-style',
         callback: () => {
-          this.closeWindow();
+          window.location.href = yyyfUrl;
         },
       });
     } else {
diff --git a/src/pages/entry.vue b/src/pages/entry.vue
index 214a445..cc5b45b 100644
--- a/src/pages/entry.vue
+++ b/src/pages/entry.vue
@@ -176,6 +176,8 @@ import {getLeftPrice} from '@/api/currency.js';
 import {submit, reStart} from '@/api/yyyf';
 import {logOut} from '@/api/user';
 import {signUp, signIn} from '@/api/user';
+import {yyyfUrl} from '@/api/app.js';
+
 export default {
   name: 'entry',
   data() {
@@ -189,6 +191,7 @@ export default {
       remainingTime: 0,
       //防止重复提交
       isSubmit: false,
+      newwin: undefined,
     };
   },
   components: {
@@ -245,6 +248,26 @@ export default {
         }
       });
     },
+    winOpen: function() {
+      if (this.newwin != undefined) {
+        if (
+          navigator.userAgent.indexOf('Firefox') != -1 ||
+          navigator.userAgent.indexOf('Chrome') != -1
+        ) {
+          this.newwin.location.href = 'about:blank';
+          this.newwin.close();
+        } else {
+          this.newwin.opener = null;
+          this.newwin.open('', '_self');
+          this.newwin.close();
+        }
+      }
+      this.newwin = window.open(
+        '/',
+        'onlywin',
+        'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, copyhistory=yes, height=600,width=1100,left=180,top=100'
+      );
+    },
     closeWindow: function() {
       if (
         navigator.userAgent.indexOf('Firefox') != -1 ||
@@ -298,10 +321,9 @@ export default {
       });
     },
     goIndex() {
-      window.open('/', '_blank');
+      this.winOpen();
     },
     submitExam: function() {
-      debugger;
       let self = this;
       //防止重复提交
       if (!self.isSubmit) {
@@ -435,13 +457,13 @@ export default {
     let yyyfToken = localStorage.getItem('yyyfToken');
     this.isSubmit = localStorage.getItem('isSubmit') == 'true' ? true : false;
     if (yyyfToken == '' || yyyfToken == undefined) {
-      this.$alert('未从以渔有方登录，点击确定关闭浏览器', '提示', {
+      this.$alert('未从以渔有方登录，点击确定返回登录', '提示', {
         type: 'error',
         showClose: false,
         confirmButtonText: '确定',
         confirmButtonClass: 'btn-self-style',
         callback: () => {
-          ths.closeWindow();
+          window.location.href = yyyfUrl;
         },
       });
     } else {
@@ -456,14 +478,17 @@ export default {
   .entry-content {
     background: url(../images/entry/bg.jpg);
     background-size: cover;
+
     .enrty-content__header {
       display: flex;
       justify-content: space-between;
       align-items: center;
+
       .centerNav {
         margin-right: 24px;
       }
     }
+
     .entry-btn {
       width: 265px;
       height: 30px;
@@ -471,6 +496,7 @@ export default {
       padding-bottom: 32px;
       margin: 0 auto 0 auto;
       cursor: pointer;
+
       img {
         width: 100%;
         height: 100%;
@@ -479,6 +505,7 @@ export default {
       }
     }
   }
+
   .entry-title {
     font-family: NotoSansHans-Regular;
     font-size: 20px;
@@ -491,8 +518,10 @@ export default {
     margin: 0;
   }
 }
+
 .paylist {
   position: relative;
+
   &::before {
     content: '';
     display: block;
@@ -505,6 +534,7 @@ export default {
     background-size: cover;
   }
 }
+
 .usdList {
   margin: 0 auto;
   width: 815px;
@@ -521,16 +551,20 @@ export default {
     &.wechat {
       background-image: url(../images/entry/wechat.png);
     }
+
     &.bank {
       background-image: url(../images/entry/bank.png);
     }
+
     &.alipay {
       background-image: url(../images/entry/alipay.png);
     }
+
     a {
       display: block;
       margin-top: 85px;
     }
+
     p {
       font-family: NotoSansHans-DemiLight;
       font-size: 10px;
@@ -539,11 +573,13 @@ export default {
       letter-spacing: 0px;
       color: #08c7cf;
       margin: 6px 8px;
+
       &:first-child {
         margin-top: 58px;
       }
     }
   }
+
   &.tabs {
     color: #fff;
     background: url(../images/entry/wallet1.png);
@@ -552,15 +588,18 @@ export default {
     height: 315px;
     width: 965px;
     padding-top: 145px;
+
     .el-tabs {
       width: 755px;
       margin: 60px auto 14px auto;
-      /deep/.el-tabs__header {
+
+      /deep/ .el-tabs__header {
         margin-bottom: 8px;
       }
     }
-    /DEEP/.el-tabs__nav {
-      /DEEP/.el-tabs__item {
+
+    /DEEP/ .el-tabs__nav {
+      /DEEP/ .el-tabs__item {
         font-family: NotoSansHans-Regular;
         font-size: 15px;
         font-weight: normal;
@@ -568,13 +607,15 @@ export default {
         line-height: 40px;
         letter-spacing: 0px;
         color: #00f5ff;
+
         &.is-active {
           color: #00f5ff;
           font-size: 20px;
           font-weight: bold;
         }
       }
-      /DEEP/.el-tabs__active-bar {
+
+      /DEEP/ .el-tabs__active-bar {
         width: 0 !important;
         height: 0 !important;
         border-left: 8px solid transparent;
@@ -584,18 +625,23 @@ export default {
         margin-left: 5%;
       }
     }
-    /DEEP/.el-tabs__nav-wrap::after {
+
+    /DEEP/ .el-tabs__nav-wrap::after {
       background-color: #00f5ff;
     }
+
     .el-tab-pane {
       width: 100%;
     }
   }
+
   .tabs-flex {
     display: flex;
     justify-content: space-between;
+
     .flex-1 {
       flex: 1;
+
       p {
         font-family: NotoSansHans-DemiLight;
         font-size: 10px;