From 92096dc931f54f49f2834cc86b6e53d551672988 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=9F=E6=B5=B7=E6=AC=A3?= <zhonghaixin@qq.com>
Date: Tue, 12 Nov 2019 10:26:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=95=86=E5=AE=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/coin.js                     |  2 +-
 src/pages/echangeGoods/merchant.vue | 46 ++++++++++++++++++-----------
 src/pages/exchange.vue              | 46 +++++++++++++++++++----------
 3 files changed, 60 insertions(+), 34 deletions(-)

diff --git a/src/api/coin.js b/src/api/coin.js
index 7e5e23c..aeb2370 100644
--- a/src/api/coin.js
+++ b/src/api/coin.js
@@ -54,7 +54,7 @@ export function getTotal() {
 }
 
 //确认申请商家
-export function getMarketApplyl() {
+export function getMarketApply() {
   return request({
     url: marketUrl + '/marketApply',
     method: 'post',
diff --git a/src/pages/echangeGoods/merchant.vue b/src/pages/echangeGoods/merchant.vue
index ff5a553..127efc7 100644
--- a/src/pages/echangeGoods/merchant.vue
+++ b/src/pages/echangeGoods/merchant.vue
@@ -4,16 +4,20 @@
     <div class="merchant">
       <div class="merchant-tittle">
         《
-        {{$t('exchangeotc.merchant.rule')}}
+        {{ $t('exchangeotc.merchant.rule') }}
         》
       </div>
       <div class="merchant-contant" v-html="rule"></div>
       <div class="merchant-che">
-        <el-checkbox v-model="checked">{{$t('exchangeotc.merchant.look')}}</el-checkbox>
+        <el-checkbox v-model="checked">{{
+          $t('exchangeotc.merchant.look')
+        }}</el-checkbox>
       </div>
       <!-- 立即申请 -->
       <div class="merchant-btn">
-        <el-button @click="handleVis()">{{$t('exchangeotc.merchant.promptly')}}</el-button>
+        <el-button @click="handleVis()">{{
+          $t('exchangeotc.merchant.promptly')
+        }}</el-button>
       </div>
     </div>
 
@@ -24,18 +28,22 @@
       width="536px"
     >
       <div class="vis-contant">
-        {{$t('exchangeotc.merchant.wallet')}}
-        {{$t('exchangeotc.merchant.fou')}}
+        {{ $t('exchangeotc.merchant.wallet') }}
+        {{ $t('exchangeotc.merchant.fou') }}
+      </div>
+      <div class="vis-contant" style="margin-top:20px;">
+        {{ $t('exchangeotc.merchant.deposit') }}:{{ merchantCAmount }}
+        {{ merchantCion }}
       </div>
-      <div
-        class="vis-contant"
-        style="margin-top:20px;"
-      >{{$t('exchangeotc.merchant.deposit')}}:{{merchantCAmount}} {{merchantCion}}</div>
       <span slot="footer" class="dialog-footer">
         <!-- 取 消 -->
-        <el-button @click="dialogVisible = false">{{$t('exchangeotc.merchant.delete')}}</el-button>
+        <el-button @click="dialogVisible = false">{{
+          $t('exchangeotc.merchant.delete')
+        }}</el-button>
         <!-- 确 定 -->
-        <el-button type="primary" @click="handleSure()">{{$t('exchangeotc.merchant.sure')}}</el-button>
+        <el-button type="primary" @click="handleSure()">{{
+          $t('exchangeotc.merchant.sure')
+        }}</el-button>
       </span>
     </el-dialog>
 
@@ -44,8 +52,8 @@
       <el-dialog :visible.sync="dialogSure" width="579px" :show-close="false">
         <img src="../../assets/otc/ok.png" alt />
         <div class="sure-contant">
-          <div>{{$t('exchangeotc.merchant.submit')}}</div>
-          <div>{{$t('exchangeotc.merchant.submit_1')}}</div>
+          <div>{{ $t('exchangeotc.merchant.submit') }}</div>
+          <div>{{ $t('exchangeotc.merchant.submit_1') }}</div>
         </div>
       </el-dialog>
       <Footer></Footer>
@@ -58,7 +66,7 @@ import NavHeader from '@/components/common/header';
 import Footer from '@/components/common/footer';
 
 import {getMerchant} from '@/api/priceSysconf';
-import {getDeposit, getTotal, getMarketApplyl} from '@/api/coin';
+import {getDeposit, getTotal, getMarketApply} from '@/api/coin';
 // 获取请求
 import {getOTCBtc} from '@/api/btc.js';
 
@@ -124,10 +132,15 @@ export default {
     // 确认申请为商家
     handleSure() {
       this.checked = false;
-      getMarketApplyl().then(res => {
+      getMarketApply().then(res => {
         if (res.data.code === 200) {
           this.dialogVisible = false;
-          this.dialogSure = true;
+          // this.dialogSure = true;
+          // 申請商家成功！
+          this.$message.success(this.$t('exchangeotc.merchant.bemarket'));
+          setInterval(() => {
+            window.location.href = '../exchange';
+          }, 1000);
         } else {
           this.$message.error(res.data.msg);
         }
@@ -288,4 +301,3 @@ export default {
   }
 }
 </style>
-
diff --git a/src/pages/exchange.vue b/src/pages/exchange.vue
index b9e8824..4a27600 100644
--- a/src/pages/exchange.vue
+++ b/src/pages/exchange.vue
@@ -29,11 +29,17 @@
         <span v-if="applyStatus == 'MARKET'">{{
           $t('exchangeotc.merchant.market')
         }}</span>
-        <span
+        <!-- <span
           v-else-if="(applyStatus = 'null' || applyStatus == 'NOTMARKET')"
           class="apply"
           @click="handleSure()"
           >{{ $t('exchangeotc.merchant.name') }}</span
+        > -->
+        <!-- 申请商家 -->
+        <a
+          href="./echangeGoods/merchant"
+          v-else-if="(applyStatus = 'null' || applyStatus == 'NOTMARKET')"
+          >{{ $t('exchangeotc.merchant.name') }}</a
         >
         <!-- 商家取消中 -->
         <span v-else-if="applyStatus == 'CANCELING'">{{
@@ -59,7 +65,7 @@ import NavHeader from '@/components/common/header';
 import Footer from '@/components/common/footer';
 import ExchangeTableBi from '@/components/exchange/exchange-tabgle-bi';
 import ExchangeTableSell from '@/components/exchange/exchange-table-sell';
-import {getMarketApplyl, cheackApply} from '@/api/coin';
+import {getMarketApply, cheackApply} from '@/api/coin';
 export default {
   name: 'exchange',
   components: {
@@ -101,20 +107,20 @@ export default {
       this.ifCommentInput = true;
     },
     // 确认申请为商家
-    handleSure() {
-      this.checked = false;
-      getMarketApplyl().then(res => {
-        if (res.data.code === 200) {
-          // 申請商家成功！
-          this.$message.success(this.$t('exchangeotc.merchant.bemarket'));
-          setInterval(() => {
-            location.reload(); //成功刷新页面
-          }, 1000);
-        } else {
-          this.$message.error(res.data.msg);
-        }
-      });
-    },
+    // handleSure() {
+    //   this.checked = false;
+    //   getMarketApplyl().then(res => {
+    //     if (res.data.code === 200) {
+    //       // 申請商家成功！
+    //       this.$message.success(this.$t('exchangeotc.merchant.bemarket'));
+    //       setInterval(() => {
+    //         location.reload(); //成功刷新页面
+    //       }, 1000);
+    //     } else {
+    //       this.$message.error(res.data.msg);
+    //     }
+    //   });
+    // },
     // 查询用户市商状态
     getcheckApply() {
       cheackApply().then(res => {
@@ -194,5 +200,13 @@ export default {
     border-radius: 3px;
     cursor: pointer;
   }
+  a {
+    color: #fff;
+    display: inline-block;
+    padding: 9px 11px;
+    background-color: #e8494a;
+    border-radius: 3px;
+    cursor: pointer;
+  }
 }
 </style>