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

---
 .../bibi-balances/bibi-balances-table.vue     |  19 +--
 src/pages/exchange.vue                        |  32 +++--
 src/views/personal/profile.vue                | 121 ++++++++++--------
 3 files changed, 98 insertions(+), 74 deletions(-)

diff --git a/src/components/balances/bibi-balances/bibi-balances-table.vue b/src/components/balances/bibi-balances/bibi-balances-table.vue
index f386444..4fbd9b1 100644
--- a/src/components/balances/bibi-balances/bibi-balances-table.vue
+++ b/src/components/balances/bibi-balances/bibi-balances-table.vue
@@ -479,15 +479,12 @@ export default {
             addEos({
               addr: name.addr,
               tokenId: name.tokenSymbol,
-              walletType: 'OTC',
+              walletType: 'C2C',
             }).then(res => {
-              console.log(name.tokenSymbol);
-              console.log(name.addr);
-
               if (res.data.code === 200) {
                 // 充值成功！
                 this.$message.success(this.$t('balances.table.add'));
-                // location.reload(); //成功刷新页面
+                location.reload(); //成功刷新页面
               } else {
                 this.$message.error(res.data.msg);
               }
@@ -496,13 +493,11 @@ export default {
             addBtc({
               addr: name.addr,
               tokenId: name.tokenSymbol,
-              walletType: 'OTC',
+              walletType: 'C2C',
             }).then(res => {
-              console.log(name.tokenSymbol);
-              console.log(name.addr);
               if (res.data.code === 200) {
                 this.$message.success(this.$t('balances.table.add'));
-                // location.reload(); //成功刷新页面
+                location.reload(); //成功刷新页面
               } else {
                 this.$message.error(res.data.msg);
               }
@@ -511,13 +506,11 @@ export default {
             addEth({
               addr: name.addr,
               tokenId: name.tokenSymbol,
-              walletType: 'OTC',
+              walletType: 'C2C',
             }).then(res => {
-              console.log(name.tokenSymbol);
-              console.log(name.addr);
               if (res.data.code === 200) {
                 this.$message.success(this.$t('balances.table.add'));
-                // location.reload(); //成功刷新页面
+                location.reload(); //成功刷新页面
               } else {
                 this.$message.error(res.data.msg);
               }
diff --git a/src/pages/exchange.vue b/src/pages/exchange.vue
index 3b6c8d8..3205e46 100644
--- a/src/pages/exchange.vue
+++ b/src/pages/exchange.vue
@@ -6,9 +6,10 @@
       <ul class="exchange-menu">
         <li class="mensu-item">
           <a
-            :class="showCommentInput === true?'buyTwo':'buy'"
+            :class="showCommentInput === true ? 'buyTwo' : 'buy'"
             @click="hangdelClickShow()"
-          >{{$t('order.adver.adver_buy')}}</a>
+            >{{ $t('order.adver.adver_buy') }}</a
+          >
         </li>
         <li class="mensu-item">
           <div class="line"></div>
@@ -16,14 +17,17 @@
         <li class="mensu-item">
           <a
             class="sell"
-            :class="ifCommentInput === true?'buyTwo':'buy'"
+            :class="ifCommentInput === true ? 'buyTwo' : 'buy'"
             @click="hangdelClick()"
-          >{{$t('order.adver.adver_sell')}}</a>
+            >{{ $t('order.adver.adver_sell') }}</a
+          >
         </li>
       </ul>
       <!-- 申请商家 -->
       <div class="merchant">
-        <a href="./echangeGoods/merchant">{{$t('exchangeotc.merchant.name')}}</a>
+        <span class="apply" @click="handleSure()">{{
+          $t('exchangeotc.merchant.name')
+        }}</span>
       </div>
       <!-- 判断点击的时候什么 切换对应的子组件 -->
       <!-- 购买 -->
@@ -45,7 +49,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} from '@/api/coin';
 export default {
   name: 'exchange',
   components: {
@@ -82,6 +86,17 @@ export default {
       this.showCommentInput = false;
       this.ifCommentInput = true;
     },
+    // 确认申请为商家
+    handleSure() {
+      this.checked = false;
+      getMarketApplyl().then(res => {
+        if (res.data.code === 200) {
+          this.$message.success(res.data.msg);
+        } else {
+          this.$message.error(res.data.msg);
+        }
+      });
+    },
   },
 };
 </script>
@@ -142,14 +157,13 @@ export default {
   position: relative;
   top: -55px;
   left: -38px;
-  a {
+  .apply {
     color: #fff;
     display: inline-block;
     padding: 9px 11px;
     background-color: #e8494a;
     border-radius: 3px;
+    cursor: pointer;
   }
 }
 </style>
-
-
diff --git a/src/views/personal/profile.vue b/src/views/personal/profile.vue
index 458ac95..5d87c94 100644
--- a/src/views/personal/profile.vue
+++ b/src/views/personal/profile.vue
@@ -11,33 +11,41 @@
 
       <div class="secondaryBox majorBoxStyle majorBoxStyleBc">
         <div v-show="isRemake === false" class="profileContent">
-          <span class="secondaryTitle">{{ $t('personal.profile.basicInfo.userName') }}：</span>
+          <span class="secondaryTitle"
+            >{{ $t('personal.profile.basicInfo.userName') }}：</span
+          >
           <span class="secondaryCont">{{ userName }}</span>
-          <div
-            class="btnRemake"
-            @click="remakeName"
-          >{{ $t('personal.profile.basicInfo.changeNameBtn') }}</div>
+          <div class="btnRemake" @click="remakeName">
+            {{ $t('personal.profile.basicInfo.changeNameBtn') }}
+          </div>
         </div>
         <div v-show="isRemake == true" class="profileContent">
-          <span class="secondaryTitle">{{ $t('personal.profile.basicInfo.userName') }}：</span>
-          <el-input v-model="userName" :placeholder="$t('personal.profile.basicInfo.userName_p')"></el-input>
-          <div
-            class="btnHandle"
-            @click="renameSuccess"
-          >{{ $t('personal.profile.basicInfo.affirm') }}</div>
-          <div
-            class="btnHandle"
-            @click="remakeName('cancel')"
-          >{{ $t('personal.profile.basicInfo.cancel') }}</div>
+          <span class="secondaryTitle"
+            >{{ $t('personal.profile.basicInfo.userName') }}：</span
+          >
+          <el-input
+            v-model="userName"
+            :placeholder="$t('personal.profile.basicInfo.userName_p')"
+          ></el-input>
+          <div class="btnHandle" @click="renameSuccess">
+            {{ $t('personal.profile.basicInfo.affirm') }}
+          </div>
+          <div class="btnHandle" @click="remakeName('cancel')">
+            {{ $t('personal.profile.basicInfo.cancel') }}
+          </div>
         </div>
       </div>
 
       <div class="secondaryBox majorBoxStyle">
         <div class="profileContent">
-          <span class="secondaryTitle">{{ $t('personal.profile.basicInfo.loginPasswrod') }}：</span>
+          <span class="secondaryTitle"
+            >{{ $t('personal.profile.basicInfo.loginPasswrod') }}：</span
+          >
           <span class="secondaryCont">*********</span>
           <router-link to="/profile/change-password">
-            <div class="btnRemake">{{ $t('personal.profile.basicInfo.changePasswordBtn') }}</div>
+            <div class="btnRemake">
+              {{ $t('personal.profile.basicInfo.changePasswordBtn') }}
+            </div>
           </router-link>
         </div>
       </div>
@@ -46,7 +54,9 @@
     <div class="loginHistory" :style="{height: calac + 'px'}">
       <div class="majorBox">
         <div class="majorTitleBox majorBoxStyle">
-          <p class="majorTitle">{{ $t('personal.profile.loginHistory.title') }}</p>
+          <p class="majorTitle">
+            {{ $t('personal.profile.loginHistory.title') }}
+          </p>
         </div>
       </div>
       <el-table :data="loginHistory" stripe style="width: 100%">
@@ -55,23 +65,30 @@
           :label="$t('personal.profile.loginHistory.table_header_time')"
         >
           <template slot-scope="scope">
-            <span class="timeData">{{ scope.row.createTime.split(' ')[0].replace(/-/g, '/') }}</span>
-            <span class="timeData timeDataAfter">{{ scope.row.createTime.split(' ')[1] }}</span>
+            <span class="timeData">{{
+              scope.row.createTime.split(' ')[0].replace(/-/g, '/')
+            }}</span>
+            <span class="timeData timeDataAfter">{{
+              scope.row.createTime.split(' ')[1]
+            }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="mobilePhone" :label="$t('personal.profile.loginHistory.phone')"></el-table-column>
+        <el-table-column
+          prop="mobilePhone"
+          :label="$t('personal.profile.loginHistory.phone')"
+        ></el-table-column>
         <el-table-column prop="ipAddress" label="IP"></el-table-column>
         <el-table-column
           prop="status"
           :label="$t('personal.profile.loginHistory.table_header_status')"
         >
           <template slot-scope="scope">
-            <span
-              v-show="scope.row.status === 'SUCCESS'"
-            >{{ $t('personal.profile.loginHistory.success') }}</span>
-            <span
-              v-show="scope.row.status === 'FAIL'"
-            >{{ $t('personal.profile.loginHistory.fail') }}</span>
+            <span v-show="scope.row.status === 'SUCCESS'">{{
+              $t('personal.profile.loginHistory.success')
+            }}</span>
+            <span v-show="scope.row.status === 'FAIL'">{{
+              $t('personal.profile.loginHistory.fail')
+            }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -127,33 +144,33 @@ export default {
   methods: {
     // 取消商家
     getMerchant() {
-      this.$confirm(
-        this.$t('exchangeotc.merchant.cao'),
-        this.$t('exchangeotc.merchant.tishi'),
-        {
-          confirmButtonText: this.$t('exchangeotc.merchant.sure'),
-          cancelButtonText: this.$t('exchangeotc.merchant.delete'),
-          type: 'warning',
-        }
-      )
-        .then(() => {
-          getCancelApply().then(res => {
-            if (res.data.code === 200) {
-              this.$message({
-                type: 'success',
-                message: this.$t('exchangeotc.merchant.success'),
-              });
-            } else {
-              this.$message.error(res.data.msg);
-            }
-          });
-        })
-        .catch(() => {
+      // this.$confirm(
+      //   this.$t('exchangeotc.merchant.cao'),
+      //   this.$t('exchangeotc.merchant.tishi'),
+      //   {
+      //     confirmButtonText: this.$t('exchangeotc.merchant.sure'),
+      //     cancelButtonText: this.$t('exchangeotc.merchant.delete'),
+      //     type: 'warning',
+      //   }
+      // )
+      //   .then(() => {
+      getCancelApply().then(res => {
+        if (res.data.code === 200) {
           this.$message({
-            type: 'info',
-            message: this.$t('exchangeotc.merchant.deled'),
+            type: 'success',
+            message: this.$t('exchangeotc.merchant.success'),
           });
-        });
+        } else {
+          this.$message.error(res.data.msg);
+        }
+      });
+      // })
+      // .catch(() => {
+      //   this.$message({
+      //     type: 'info',
+      //     message: this.$t('exchangeotc.merchant.deled'),
+      //   });
+      // });
     },
     remakeName(e) {
       if (e == 'cancel') {