From 97abc550f68483c3bc16d8c2ef280a78216d6dbb Mon Sep 17 00:00:00 2001
From: liaoxinyu <liaoxinyu@xingtongworld.com>
Date: Wed, 22 May 2024 17:45:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E5=B8=81=E8=AE=B0=E5=BD=95=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=92=A4=E9=94=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/assets/records.vue           | 16 ++++++++++++++--
 wxcomponents/vant/search/index.vue |  2 +-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/pages/assets/records.vue b/pages/assets/records.vue
index 3bbe59b..cac56cf 100644
--- a/pages/assets/records.vue
+++ b/pages/assets/records.vue
@@ -20,11 +20,13 @@
 				        <th class="p-b-md fn-left p-l-md">{{ $t("assets.c9") }}</th>
 				        <th class="p-b-md fn-left">{{ $t("assets.d0") }}</th>
 				        <th class="p-b-md fn-right p-r-md">{{ $t("assets.c0") }}</th>
+						<th class="p-b-md fn-right p-r-md">{{ $t("exchange.g3") }}</th>
 				      </tr>
 				      </thead>
 				      <tbody>
-				      <tr class="color-light trChange p-x-md rounded-md" v-for="item in list" :key="item.id">
-				        <td class="p-y-xs p-l-md rounded-tl-sm rounded-bl-sm fn-sm">
+				      <tr class="color-light trChange p-x-md rounded-md" style="height: 40px;" v-for="item in list" :key="item.id">
+				        <!-- <td class="p-y-xs p-l-md rounded-tl-sm rounded-bl-sm fn-sm"> -->
+				        <td class="p-y-xs rounded-tl-sm rounded-bl-sm fn-sm">
 				          {{ item.datetime | parseTime }}
 				        </td>
 				        <td v-if="type=='draw'">
@@ -39,6 +41,10 @@
 				          {{ item.amount }}
 				          <span class="color-default">({{ item.coin_name }})</span>
 				        </td>
+						<td class="" v-if="item.status==0">
+							<span style="color: #4381F6;width: 60px;height: 30px;font-size: 12px;" 
+							@click="cancelWithdraw(item)">{{$t('exchange.g4')}}</span>
+						</td>
 				      </tr>
 				      <!-- <tr v-if="loadMore">
 				        <td colspan="3" class="fn-center p-xs link-active" @click="more">
@@ -72,6 +78,12 @@ import formData from "@/utils/class/date";
 		  },
 		},
 		methods: {
+			cancelWithdraw(item) {
+			    Wallet.cancelWithdraw({ withdraw_id: item.id }).then(res => {
+			        this.getWithdrawRecords()
+					this.$toast(this.$t('otc.d4'));
+			    })
+			},
 			// 获取提币记录
 			getWithdrawRecords() {
 			  let data = {
diff --git a/wxcomponents/vant/search/index.vue b/wxcomponents/vant/search/index.vue
index 98ecc08..22eb900 100644
--- a/wxcomponents/vant/search/index.vue
+++ b/wxcomponents/vant/search/index.vue
@@ -104,5 +104,5 @@ VantComponent({
 export default global['__wxComponents']['vant/search/index']
 </script>
 <style platform="mp-weixin">
-@import '../common/index.css';.van-search{-webkit-align-items:center;align-items:center;box-sizing:border-box;padding:10px 12px;padding:var(--search-padding,10px 12px)}.van-search,.van-search__content{display:-webkit-flex;display:flex}.van-search__content{-webkit-flex:1;flex:1;padding-left:8px;padding-left:var(--padding-xs,8px);border-radius:2px;border-radius:var(--border-radius-sm,2px);background-color:#f7f8fa;background-color:var(--search-background-color,#f7f8fa)}.van-search__content--round{border-radius:17px;border-radius:calc(var(--search-input-height, 34px)/2)}.van-search__label{padding:0 5px;padding:var(--search-label-padding,0 5px);font-size:14px;font-size:var(--search-label-font-size,14px);line-height:34px;line-height:var(--search-input-height,34px);color:#323233;color:var(--search-label-color,#323233)}.van-search__field{-webkit-flex:1;flex:1}.van-search__field__left-icon{color:#969799;color:var(--search-left-icon-color,#969799)}.van-search--withaction{padding-right:0}.van-search__action{padding:0 8px;padding:var(--search-action-padding,0 8px);font-size:14px;font-size:var(--search-action-font-size,14px);line-height:34px;line-height:var(--search-input-height,34px);color:#323233;color:var(--search-action-text-color,#323233)}.van-search__action--hover{background-color:#f2f3f5;background-color:var(--active-color,#f2f3f5);color: #000 !important;}
+@import '../common/index.css';.van-search{-webkit-align-items:center;align-items:center;box-sizing:border-box;padding:10px 12px;padding:var(--search-padding,10px 12px)}.van-search,.van-search__content{display:-webkit-flex;display:flex}.van-search__content{-webkit-flex:1;flex:1;padding-left:8px;padding-left:var(--padding-xs,8px);border-radius:2px;border-radius:var(--border-radius-sm,2px);background-color:#f7f8fa;background-color:var(--search-background-color,#f7f8fa)}.van-search__content--round{border-radius:17px;border-radius:calc(var(--search-input-height, 34px)/2)}.van-search__label{padding:0 5px;padding:var(--search-label-padding,0 5px);font-size:14px;font-size:var(--search-label-font-size,14px);line-height:34px;line-height:var(--search-input-height,34px);color:#323233;color:var(--search-label-color,#323233)}.van-search__field{-webkit-flex:1;flex:1}.van-search__field__left-icon{color:#969799;color:var(--search-left-icon-color,#969799)}.van-search--withaction{padding-right:0}.van-search__action{padding:0 8px;padding:var(--search-action-padding,0 8px);font-size:14px;font-size:var(--search-action-font-size,14px);line-height:34px;line-height:var(--search-input-height,34px);color:#323233;color:var(--search-action-text-color,#323233)}.van-search__action--hover{background-color:#f2f3f5;background-color:var(--active-color,#f2f3f5)}
 </style>
\ No newline at end of file