From 6748350140af280cdc567f2cbb6ce7142de472d9 Mon Sep 17 00:00:00 2001
From: liaoxinyu <liaoxinyu@xingtongworld.com>
Date: Thu, 10 Jul 2025 11:09:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E5=B8=81=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2,=E5=90=88=E7=BA=A6=E6=9C=80=E6=96=B0=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 element/index.js                              |   8 +-
 i18n/lang/en.json                             |  19 +-
 i18n/lang/zh-TW.json                          |  17 +-
 pages.json                                    |   5 +-
 pages/assets/address-list.vue                 | 108 ++---
 pages/assets/draw1.vue                        | 441 ++++++++++++++++++
 pages/assets/records.vue                      |  72 ++-
 pages/base/mine.vue                           |   6 +-
 pages/exchange/contract-history.vue           |   4 +
 pages/oncs/onservice.vue                      |   4 +-
 .../uni-datetime-picker/i18n/zh-Hans.json     |  40 +-
 11 files changed, 617 insertions(+), 107 deletions(-)
 create mode 100644 pages/assets/draw1.vue

diff --git a/element/index.js b/element/index.js
index f4715c0..fddec1c 100644
--- a/element/index.js
+++ b/element/index.js
@@ -1,8 +1,12 @@
 // 导入自己需要的组件
-import { Slider } from 'element-ui'
+import { Slider,Steps,Step,Select,Option } from 'element-ui'
+const components = [Slider,Steps,Step,Select,Option]
 const element = {
   install: function (Vue) {
-    Vue.use(Slider)
+    // Vue.use(Slider)
+	components.forEach(component => {
+		Vue.use(component)
+	})
   }
 }
 export default element
\ No newline at end of file
diff --git a/i18n/lang/en.json b/i18n/lang/en.json
index 6678660..a48e6ad 100644
--- a/i18n/lang/en.json
+++ b/i18n/lang/en.json
@@ -114,7 +114,22 @@
 		"c12": "Rejection Information",
 		"c13": "Withdrawal password",
 		"c14": "Please fill in the withdrawal password",
-		"c15": "Reset withdrawal password"
+		"c15": "Reset withdrawal password",
+		"rejection":"Reason for rejection",
+		"c16": "Send",
+		"c17": "Transfer Address",
+		"c18": "Transfer Amount",
+		"c19": "Recharge/Transfer",
+		"c20": "Contact Customer Service",
+		"c21": "Select Currency",
+		"c22": "Password and Email Verification Code",
+		"c23": "Estimated arrival time",
+		"c24": "Received quantity",
+		"c25": "Withdrawal",
+		"c26": "The transfer quantity cannot be greater than {name}",
+		"c27": "Transfer Records",
+		"c28": "confirm",
+		"c29": "Please check your withdrawal address carefully and make sure it is filled in correctly. If you miss or fill in the wrong information, you may lose your assets."
 	},
 	"base": {
 		"a0": "Title",
@@ -749,7 +764,7 @@
 		"d1": "Whether to remove the current ad",
 		"d2": "OK",
 		"d3": "Cancel",
-		"d4": "Undo successfully",
+		"d4": "Cancel successful",
 		"d5": "Fiat currency account",
 		"d6": "Freeze",
 		"d7": "Alipay Account",
diff --git a/i18n/lang/zh-TW.json b/i18n/lang/zh-TW.json
index a16f7a6..58fcd64 100644
--- a/i18n/lang/zh-TW.json
+++ b/i18n/lang/zh-TW.json
@@ -114,7 +114,22 @@
 		"c12": "駁回信息",
 		"c13": "提款密碼",
 		"c14": "請填写提款密碼",
-		"c15": "重置提款密碼"
+		"c15": "重置提款密碼",
+		"rejection":"拒絕理由",
+		"c16": "轉移",
+		"c17": "轉移地址",
+		"c18": "轉移金額",
+		"c19": "充值/轉移",
+		"c20": "聯絡客服",
+		"c21": "選擇幣種",
+		"c22": "密碼及邮箱驗證碼",
+		"c23": "預計到帳時間",
+		"c24": "到帳數量",
+		"c25": "提現",
+		"c26": "轉移數量不能大於{name}",
+		"c27": "轉移記錄",
+		"c28": "確認",
+		"c29": "請認真核對您的提幣地址，務必檢查是否正確填寫。如果您漏添或填錯，將有可能對您的資產造成損失"
 	},
 	"base": {
 		"a0": "標題",
diff --git a/pages.json b/pages.json
index 3d84d0a..3e33f43 100644
--- a/pages.json
+++ b/pages.json
@@ -177,7 +177,10 @@
 	  "path" : "pages/oncs/onservice"
 	},
 	{
-		"path" : "pages/safe/withdrawals-pwd"
+	  "path" : "pages/safe/withdrawals-pwd"
+	},
+	{
+	  "path" : "pages/assets/draw1"
 	},
     {
       "path": "pages/service/index",
diff --git a/pages/assets/address-list.vue b/pages/assets/address-list.vue
index 2a8f0f1..93408ed 100644
--- a/pages/assets/address-list.vue
+++ b/pages/assets/address-list.vue
@@ -16,79 +16,41 @@
           <li>·API{{ $t("assets.a2", { name: "API" }) }}{{lang=='zh-TW'||lang=='jp'?'。':'.'}}</li>
         </ul>
       </view>
-      <template v-for="parentItem in list">
-        <view
-          class="bg-panel-4 m-md rounded overflow-hidden box-shadow"
-          :key="parentItem.coin_name"
-        >
-          <view class="fn-16 p-x-md p-y-md border-b color-light">{{
-            parentItem.coin_name
-          }}</view>
-          <ul class="list" v-if="query.from == 'draw'">
-            <view
-              class="item d-flex border-b p-md align-center link-active"
-              v-for="item in parentItem.list"
-              :key="item.id"
-            >
-              <view
-                class="p-x-xs"
-                v-if="del"
-                @click.stop="$set(item, 'show', !item.show)"
-              >
-                <van-checkbox
-                  icon-size="15px"
-                  :value="item.show"
-                  checked-color="#f05319"
-                ></van-checkbox>
-              </view>
-              <view class="flex-fill" @click="selectAddress(item)">
-                <view class="title color-light eps-2 m-b-xs">{{
-                  item.address_note
-                }}</view>
-                <view class="fn-sm">{{ item.address }}</view>
-                <view class="time fn-sm">{{ item.datetime | parseTime }}</view>
-              </view>
-              <van-icon name="arrow" />
-            </view>
-          </ul>
-          <ul class="list" v-else>
-            <v-link
-              :to="{
-                path: '/pages/assets/edit-address',
-                query: {
-                  coin_name: item.coin_name,
-                  address: item.address,
-                  address_note: item.address_note,
-                  id: item.id,
-                },
-              }"
-              class="item d-flex border-b p-md align-center link-active"
-              v-for="item in parentItem.list"
-              :key="item.id"
-            >
-              <view
-                class="p-x-xs"
-                v-if="del"
-                @click.stop="$set(item, 'show', !item.show)"
-              >
-                <van-checkbox
-                  icon-size="15px"
-                  :value="item.show"
-                  checked-color="#f05319"
-                ></van-checkbox>
-              </view>
-              <view class="flex-fill">
-                <view class="title color-light eps-2 m-b-xs">{{
-                  item.address_note
-                }}</view>
-                <view class="fn-sm">{{ item.address }}</view>
-                <view class="time fn-sm">{{ item.datetime | parseTime }}</view>
-              </view>
-              <van-icon name="arrow" />
-            </v-link>
-          </ul>
-        </view>
-      </template>
+	  <scroll-view scroll-y="true" style="height: 430px;">
+		<template v-for="parentItem in list">
+		  <view class="bg-panel-4 m-md rounded overflow-hidden box-shadow" :key="parentItem.coin_name">
+		    <view class="fn-16 p-x-md p-y-md border-b color-light">{{parentItem.coin_name}}</view>
+		    <ul class="list" v-if="query.from == 'draw'">
+		      <view class="item d-flex border-b p-md align-center link-active" v-for="item in parentItem.list" :key="item.id">
+		        <view class="p-x-xs" v-if="del" @click.stop="$set(item, 'show', !item.show)">
+		          <van-checkbox icon-size="15px" :value="item.show" checked-color="#f05319"></van-checkbox>
+		        </view>
+		        <view class="flex-fill" @click="selectAddress(item)">
+		          <view class="title color-light eps-2 m-b-xs">{{item.address_note}}</view>
+		          <view class="fn-sm">{{ item.address }}</view>
+		          <view class="time fn-sm">{{ item.datetime | parseTime }}</view>
+		        </view>
+		        <van-icon name="arrow" />
+		      </view>
+		    </ul>
+		    <ul class="list" v-else>
+		      <v-link :to="{ path: '/pages/assets/edit-address',
+			   query: {coin_name: item.coin_name,address: item.address,address_note: item.address_note,id: item.id,}}"
+		        class="item d-flex border-b p-md align-center link-active" v-for="item in parentItem.list" :key="item.id">
+		        <view class="p-x-xs" v-if="del" @click.stop="$set(item, 'show', !item.show)">
+		          <van-checkbox icon-size="15px" :value="item.show" checked-color="#f05319"></van-checkbox>
+		        </view>
+		        <view class="flex-fill">
+		          <view class="title color-light eps-2 m-b-xs">{{item.address_note}}</view>
+		          <view class="fn-sm">{{ item.address }}</view>
+		          <view class="time fn-sm">{{ item.datetime | parseTime }}</view>
+		        </view>
+		        <van-icon name="arrow" />
+		      </v-link>
+		    </ul>
+		  </view>
+		</template>
+	  </scroll-view>
     </main>
 	</view>
     <view class="p-md" style="background-color: #121212;">
diff --git a/pages/assets/draw1.vue b/pages/assets/draw1.vue
new file mode 100644
index 0000000..9178745
--- /dev/null
+++ b/pages/assets/draw1.vue
@@ -0,0 +1,441 @@
+<template>
+	<v-page>
+	  <v-header>
+	    <template #title>
+	      <view>
+	        {{ $t("common.c16") }}
+	        <!-- <span class="color-theme-1">{{ coin }}</span> -->
+	      </view>
+	    </template>
+	    <template #right>
+	      <v-link :to="'/pages/assets/records?type='+type">
+	        <van-icon class="fn-20 m-t-xs" name="todo-list-o" />
+	      </v-link>
+	    </template>
+	  </v-header>
+	  <view class="layout-main" style="background-color: #121212;padding: 20px;">
+			<el-steps direction="vertical" :active="active" style="min-height: 260px !important;width: 100%;box-sizing: border-box;">
+			    <el-step :title="$t('common.c21')" style="flex-basis: 110px;">
+					<template slot="description">
+						<view class="d-flex justify-between m-t-md" @click="coinListShow=true" style="border: 1px solid #4e4e5d;padding: 10px;">
+						  <view class="fn-20 color-light">{{ coin }}</view>
+						  <view class="d-flex align-center">
+						    {{ $t('recharge.a0') }}
+						    <van-icon name="arrow"/>
+						  </view>
+						</view>
+					</template>
+				</el-step>
+			    <el-step :title="$t('common.c17')">
+					<template slot="description">
+						<view style="margin: 10px 0px;width: 540rpx;">
+							<v-input @input="addressnum" v-model="form.address" class="bg-form-panel-3 color-light w-max fn-13 rounded-xs" :placeholder="$t('assets.b9')"></v-input>
+							<el-select v-model="form.addressType" @change="enteraddressType" style="margin-top: 10px;width: 100%;" class="addressType" v-if="coin=='USDT'" :placeholder="$t('common.select')">
+							  <el-option v-for="(item, index) in network" :key="index" :label="item.name" :value="item.id">
+								<span>{{ item.name }}</span>
+							  </el-option>
+							</el-select>
+						</view>
+					</template>
+				</el-step>
+			    <el-step :title="$t('common.c18')" v-if="form.address">
+					<template slot="description">
+						<view style="margin: 10px 0px;color: #fff;width: 540rpx;">
+							<v-input @input="amountnum" v-model="form.amount" :min="withdrawFee.withdrawal_min" :max="withdrawFee.withdrawal_max" class="color-light fn-13" :placeholder="$t('assets.c2')"></v-input>
+							<view class="d-flex justify-between align-end" style="margin: 10px 0px;">
+							  <view style="width: 100%;">{{ $t("assets.c1") }}：{{ withdrawFee.usable_balance }}{{ coin }}</view>
+							  <view style="width: 100%;text-align: right;">{{$t('common.c23')}}：{{timeFormat}}</view>
+							</view>
+						</view>
+					</template>
+				</el-step>
+				<el-step :title="$t('common.c13')" v-if="form.amount">
+					<template slot="description">
+						<view style="margin: 10px 0px;color: #fff;width: 540rpx;">
+							<v-input type="password" @input="withdrawalnum" v-model="form.withdrawal_psw" class="color-light w-max fn-13 rounded-xs" :placeholder="$t('common.c14')"></v-input>
+						</view>
+					</template>
+				</el-step>
+				<el-step :title="$t('safe.a5')" v-if="form.withdrawal_psw">
+					<template slot="description">
+						<view style="margin: 10px 0px;color: #fff;width: 540rpx;display: flex;">
+							<v-input type="text" v-model="form.emailcode" class="w-max color-light fn-13" :placeholder="$t('safe.a6')"></v-input>
+							<view class="d-flex" style="justify-content: space-between;align-items: center;">
+								<view style="width: 180rpx;text-align: center;" class="all color-light m-l-md flex-shrink fn-12 getCode" @click="getEmailCode">
+									<text v-if="!getEmailCodeLock">{{ $t("common.getCode") }}</text>
+									<text v-else>{{ daojishi }}</text>
+								</view>
+							</view>
+						</view>
+					</template>
+				</el-step>
+			</el-steps>
+			<view style="margin: 20px 32px;border-top: 2px solid #444;">
+				<view style="display: flex;align-items: center;padding-top: 10px;">{{$t('common.c24')}}<img src="@/assets/img/zhuanzan.png" alt width="20" style="margin-left: 5px;"/></view>
+				<view style="display: flex;justify-content: space-between;align-items: center;">
+					<view>
+						<view style="font-size: 30px;font-weight: bold;max-width: 540rpx;">
+							<span style="overflow-wrap: anywhere;">{{price1(quantity)}}</span>
+						</view>
+						<view>{{$t('assets.c4')}}: {{coin=='USDT'&&form.addressType==3?withdrawFee.trc20:withdrawFee.withdrawal_fee }} {{coin}}</view>
+					</view>
+					<view></view>
+				</view>
+				<view style="display: flex;margin-top: 10px;">
+					<view :class="!form.emailcode?'fontWithdrawal':'fontWithdrawal1'" @click="toDraw">
+						{{$t('common.c25')}}
+					</view>
+				</view>
+			</view>
+			<view class="form bg-panel-3 p-x-lg p-y-md" style="background-color: #121212;">
+			  <ul class="fn-md rounded-md m-y-xs line-height-2">
+			    <li>·{{ $t("assets.c5") }}{{lang=='zh-TW'||lang=='jp'?'。':'.'}}</li>
+			    <li>·{{ $t("assets.c6") }}{{lang=='zh-TW'||lang=='jp'?'。':'.'}}</li>
+			    <li>·{{ $t("assets.c7") }}{{lang=='zh-TW'||lang=='jp'?'。':'.'}}</li>
+			  </ul>
+			</view>
+	  </view>
+	  <coin-list ref="coinList" v-model="coin" @close="coinListShow = false" v-show="coinListShow"/>
+	  <view v-show="promptaddress" class="modal-overlay">
+	  	<view class="modal-content">
+	  		<view style="margin-top: 25px;padding: 0px 10px;">
+	  			<img src="@/assets/img/tishi.png" alt="" width="60" />
+	  			<view style="margin: 20px 0px;">{{$t('common.c29')}}</view>
+	  			<view class="losure" @click="closeModal">{{$t('common.c28')}}</view>
+	  		</view>
+	  	</view>
+	  </view>
+	</v-page>
+</template>
+
+<script>
+	import coinList from "./coin-list";
+	import Wallet from "@/api/wallet";
+	import Member from "@/api/member";
+	import formData from "@/utils/class/date";
+	import Profile from "@/api/profile";
+	
+	export default {
+	  components: {
+	    coinList,
+	  },
+	  data() {
+	    return {
+			type: 'draw',
+			coin: "",
+			lang:"",
+			active:1,
+			JStime: 0,
+			tiemr: null,
+			indexshow:0,
+			quantity:"0.00",
+			timeFormat:"",
+			rechargeType: 2,
+			withdrawFee: {},
+			coinListShow: false,
+			promptaddress:false,
+			getEmailCodeLock: false,
+			lang: uni.getStorageSync('language'),
+			network:[{id:2,name:"ERC20"},{id:3,name:"TRC20"}],
+			form: {
+			  coin_id: "",
+			  amount: "",
+			  withdrawal_psw:"",
+			  address: "",
+			  addressType: "",
+			  code_type: 1,
+			  code: '',
+			  emailcode: '',
+			  gr_code: '',//图形验证码Graphic verification code
+			},
+		}
+	  },
+	  created() {
+	  	this.lang = localStorage.getItem('lang')
+	  	this.updateTimeFormat()
+	  	this.timeUpdateInterval = setInterval(this.updateTimeFormat, 36000);
+	  },
+	  computed: {
+	    activeCoin() {
+	      if (!this.coin) return {};
+	      return this.$refs.coinList.coinList.find(
+	          (item) => item.coin_name == this.coin
+	      );
+	    },
+	  	daojishi(){
+	  		return '('+this.JStime + 's' + ')';
+	  	}
+	  },
+	  watch: {
+	    coin(n) {
+	      if (n) {
+			this.active = 2
+	        this.form.address = "";
+	        if (this.coin != "USDT") {
+	          this.form.addressType = 1;
+	        } else {
+	          this.rechargeType = 2;
+	        }
+	        this.withdrawalBalance();
+	      }
+	    },
+	  },
+	  methods: {
+		price1(item){
+			if (item) {
+				let price = item.toString();
+				let parts = price.split(".");
+				parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+				return parts.join(".");
+			}
+		},
+		addressnum(e){
+			if(e&&this.indexshow!==1){
+				this.indexshow++;
+				this.promptaddress = true;
+				this.active = 3
+			}
+			// console.log(e);
+		},
+		closeModal(){
+			this.promptaddress = false;
+		},
+		// 获取提币地址
+		withdrawalBalance() {
+		  let address_type = 1
+		  let data = {
+		    coin_name: this.coin,
+		    address_type: this.rechargeType
+		  };
+		  Wallet.withdrawalBalance(data).then((res) => {
+		    // console.info(res)
+		    this.withdrawFee = res.data;
+		  });
+		},
+		enteraddressType(e){
+			if(e&&this.form.amount){
+				const num = this.coin=='USDT'&&this.form.addressType==3?this.withdrawFee.trc20:this.withdrawFee.withdrawal_fee
+				this.quantity = this.form.amount - num
+			}
+		},
+		// 獲取邮箱验证码
+		getEmailCode(){
+			if (!this.form.address) {
+				this.$toast(this.$t('assets.b9'))
+				return
+			}
+			if (!this.form.amount) {
+				this.$toast(this.$t('assets.c2'))
+				return
+			}
+			if (!this.form.withdrawal_psw) {
+				this.$toast(this.$t('common.c14'))
+				return
+			}
+			// if (!this.form.gr_code) {
+			// 	this.$toast(this.$t('common.GraphicValidation'))
+			// 	return
+			// }
+			if(this.getEmailCodeLock){return};
+			this.JStime = 300;
+			this.tiemr = setInterval(()=>{
+				if(this.JStime===0){
+					this.getEmailCodeLock = false;
+					clearInterval(this.tiemr);
+					return;
+				}
+				this.JStime--;
+			}, 1000)
+			this.getEmailCodeLock = true;
+			Member.getWdcode({bt:this.coin,baddr:this.form.address,bnum:this.form.amount}).then(res=>{
+				// console.log(res);
+				if(res.code=='4001'){
+					this.$toast(res.message);
+				}else{
+					this.$toast(this.$t('common.sendSuccess'));
+				}
+			})
+		},
+		// 发起提币
+		toDraw() {
+		  if (!this.form.address) {
+		    this.$toast(this.$t('assets.b9'))
+		    return
+		  }
+		  if (!this.form.amount) {
+		    this.$toast(this.$t('assets.c2'))
+		    return
+		  }
+		  if(!this.form.withdrawal_psw){
+		  		this.$toast(this.$t('common.c14'))
+		  		return
+		  }
+		  if (!this.form.emailcode) {
+		  	this.$toast(this.$t('safe.a6'))
+		  	return
+		  }
+		  let data = this.withdrawFee
+		  if (data.withdraw_switch == 1) {
+				this.secondaryShow = true
+		    if (data.google_status == 1) {
+				this.form.code_type = 3;
+		    } else if (data.phone_status == 1) {
+				this.form.code_type = 1;
+				this.$nextTick(() => {
+		        this.$refs.mobileCode.send();
+		      });
+		    } else if (data.email_status == 1) {
+				this.form.code_type = 2;
+				this.$nextTick(() => {
+					this.$refs.emailCode.send();
+				});
+		    }
+		  } else {
+		    this.draw()
+		  }
+		},
+		draw() {
+		 //  if(this.status!=2){
+			// this.$toast(this.$t('common.withdrawal2'));
+		 //  }
+		  // this.form.addressType = this.rechargeType;
+		  this.form.coin_id = this.activeCoin.coin_id;
+		  Wallet.withdraw(this.form, {btn: this.$refs.btn})
+		      .then((res) => {
+		        this.secondaryShow = false
+		        this.form.code = ''
+		        if (res.code == 4001) {
+		          this.$toast(res.message);
+				  // this.reGetGraphChe();//重新获取图形验证码；
+		        } else {
+		          this.$toast.success(this.$t("assets.d5") + "！");
+		          this.form.amount = ''
+		          setTimeout(()=>{
+		            uni.navigateTo({
+		              url:'/pages/assets/records?type='+this.type
+		            })
+		          }, 1500)
+		          // setTimeout(()=>{
+		          //  this.getWithdrawRecords();
+		          // }, 2000)
+		          // setTimeout(()=>{
+		          //  this.getWithdrawRecords();
+		          // }, 3000)
+		        }
+		      })
+		      .catch(() => {
+		      });
+		},
+		amountnum(){
+			if(this.form.amount){
+				this.active = 4
+				const num = this.coin=='USDT'&&this.form.addressType==3?this.withdrawFee.trc20:this.withdrawFee.withdrawal_fee
+				this.quantity = this.form.amount - num
+				if(this.quantity < 0){
+					this.quantity = "0.00"
+				}
+			}else{
+				this.quantity = "0.00"
+			}
+		},
+		withdrawalnum(){
+			this.active = 5
+		},
+		updateTimeFormat() {
+		  // 这里调用获取时间格式的函数，并更新data中的timeFormat
+		  this.timeFormat = this.getTimeFormat();
+		},
+		getCurrentUSTime() {
+		  const now = new Date();
+		  const offset = -4 * 60; // UTC-4小时（东部时间）
+		  // 注意：getTimezoneOffset() 返回的是当前时区与UTC的分钟差（正值），需要反向调整
+		  const usTime = new Date(now.getTime() + (now.getTimezoneOffset() * 60000) + (offset * 60000));
+		  return usTime;
+		},
+		 
+		// 获取当前美国时间的星期几（0代表周日，1代表周一，...，6代表周六）
+		getDayOfWeek(date) {
+		  return date.getDay();
+		},
+		 
+		// 根据当前是美国时间的哪一天来返回“12H”或“24H”
+		getTimeFormat() {
+		  const usTime = this.getCurrentUSTime();
+		  const dayOfWeek = this.getDayOfWeek(usTime);
+		  return dayOfWeek >= 1 && dayOfWeek <= 5 ? '12H' : '24H';
+		},
+	  }
+	}
+</script>
+
+<style lang="scss">
+	
+</style>
+<style scoped lang="scss">
+	.el-steps--vertical{
+		height: auto;
+	}
+	::v-deep .el-step__title.is-wait {
+	  color: #303133 !important;
+	}
+	::v-deep .el-input__inner{
+		background-color: #242424;
+	}
+	::v-deep .is-process .el-step__icon.is-text{
+		border-color: #C0C4CC;
+	}
+	
+	.modal-overlay {
+		z-index: 999999999999;
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-color: rgba(0, 0, 0, 0.5);
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	.modal-content {
+	  background-color: #1f1f1f;
+	  padding: 20px;
+	  border-radius: 5px;
+	  width: 550rpx;
+	  text-align: center;
+	  position: relative;
+	}
+	
+	.losure{
+		color: #fff;
+		width: 100%;
+		height: 40px;
+		font-size: 16px;
+		line-height: 40px;
+		cursor: pointer;
+		border-radius: 5px;
+		background-color: #77abff;
+	}
+	.getCode{
+		color: #fff;
+		margin: 10px 0px;
+		padding: 5px 10px;
+		border-radius: 5px;
+		align-items: center;
+		border: 1px solid #4e4e5d;
+	}
+	.fontWithdrawal{
+		color: #737475;
+		cursor: pointer;
+		padding: 10px 40px;
+		border-radius: 5px;
+		background-color: #3f4651;
+	}
+	.fontWithdrawal1{
+		color: #fff;
+		cursor: pointer;
+		padding: 10px 40px;
+		border-radius: 5px;
+		background-color: #1c52bc;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/assets/records.vue b/pages/assets/records.vue
index a73398c..0d37b35 100644
--- a/pages/assets/records.vue
+++ b/pages/assets/records.vue
@@ -3,7 +3,8 @@
 		<v-header>
 		  <template #title>
 		    <view v-if="type=='draw'">
-		      {{ $t("assets.c8") }}
+		      <!-- {{ $t("assets.c8") }} -->
+		      {{ $t("common.c27") }}
 		    </view>
 		    <view v-if="type=='recharge'">
 		      {{ $t('assets.f4') }}
@@ -30,7 +31,8 @@
 							  {{ item.datetime | parseTime }}
 							</view>
 							<view v-if="type=='draw'" style="width: 20%;">
-							  <view>{{ item.status_text }}</view>
+							  <view :class="item.status==0?'status_text':item.status==2?'status_text1':''">{{ item.status_text }}</view>
+							  <view v-if="item.status==0">{{updateTimer(item)}}</view>
 							</view>
 							<view v-if="type=='recharge'">
 							  <view v-if="item.status==0">{{$t('assets.d1')}}</view>
@@ -48,6 +50,9 @@
 						</view>
 						<view class="p-l-md" v-if="item.remark" style="color:red;word-wrap: break-word;width:680rpx;">
 							<view>{{$t('common.rejection')}}：{{item.remark}}</view>
+							<!-- <view style="display: flex;">
+								<view class="updated" v-if="!remarktext(item.updated_at)" @click="onservice">{{$t('common.c20')}}</view>
+							</view> -->
 						</view>
 				      </tr>
 				      <!-- <tr v-if="loadMore">
@@ -73,7 +78,8 @@ import formData from "@/utils/class/date";
 				type: '',
 				list: [],
 				page: 1,
-				loadMore: true
+				loadMore: true,
+				timer: null,
 			}
 		},
 		filters: {
@@ -121,6 +127,36 @@ import formData from "@/utils/class/date";
 			        this.getWithdrawRecords()
 			    })
 			},
+			onservice(){
+				this._router.push("/pages/oncs/onservice");
+			},
+			updateTimer(val){
+				const nowInMilliseconds = Date.now(); // 当前时间的毫秒级时间戳
+				const twelveHoursInSeconds = 43200; // 12小时的秒数
+				const nowInSeconds = Math.floor(nowInMilliseconds / 1000); // 当前时间的秒级时间戳
+				const adjustedNowInSeconds = nowInSeconds - twelveHoursInSeconds; // 调整后的当前时间的秒级时间戳
+				 
+				// 如果你需要一个毫秒级的时间戳，可以再将秒级时间戳转换回毫秒级
+				const adjustedNowInMilliseconds = adjustedNowInSeconds * 1000;
+				const timer = val.newdatetime * 1000
+				const diff = timer - adjustedNowInMilliseconds;
+				
+				if (diff <= 0) {
+				  return '00:00:00';
+				}
+			
+				const hours = Math.floor(diff / 3600000)
+				const minutes = Math.floor((diff % 3600000) / 60000)
+				const seconds = Math.floor((diff % 60000) / 1000)
+			
+				return `${hours < 10 ? '0'+hours: hours}:${minutes < 10 ? '0'+minutes: minutes}:${seconds < 10 ? '0'+seconds: seconds}`;
+			},
+			remarktext(val){
+				const now = new Date()
+				const target =  new Date(Date.parseTime(Date.parse(val)))
+				const diff = now.getTime() - target.getTime()
+				return diff > 12 * 60 * 60 * 1000
+			}
 		},
 		onLoad(e) {
 			// console.log('---------',e);
@@ -130,10 +166,36 @@ import formData from "@/utils/class/date";
 			}else if(e.type=='recharge'){
 				this.depositHistory();
 			}
+			
+			this.timer = setInterval(() => {
+			  this.list.forEach((item) => {
+			    if (item.status === 0) {
+			      // 手动触发 Vue 的响应式更新
+			      this.$forceUpdate();
+			    }
+			  });
+			}, 1000);
 		}
 	}
 </script>
 
-<style>
-
+<style scoped lang="scss">
+.status_text{
+	font-size: 14px;
+	color: #53b987;
+	text-shadow: 1px 1px rgba(83, 185, 135, 0.8);
+}
+.status_text1{
+	font-size: 14px;
+	color: #D31027;
+}
+.updated{
+	color: #fff;
+	display: flex;
+	padding: 5px;
+	cursor: pointer;
+	border-radius: 5px;
+	background-color: #0089ff;
+	text-align: center;
+}
 </style>
diff --git a/pages/base/mine.vue b/pages/base/mine.vue
index af2e433..0869295 100644
--- a/pages/base/mine.vue
+++ b/pages/base/mine.vue
@@ -50,9 +50,13 @@
 					<img src="@/assets/img/home/Make.png" alt="" class="h-25"/>
 					<view class="color-light fn-middle fn-ms">{{$t("base.b5")}}</view>
 				</v-link>
-				<v-link tag="view" to="/pages/assets/draw" class="manage_text">
+				<!-- <v-link tag="view" to="/pages/assets/draw" class="manage_text">
 				    <img src="@/assets/img/home/currency.png" alt="" class="h-25"/>
 				    <view class="color-light fn-ms">{{$t("base.b6")}}</view>
+				</v-link> -->
+				<v-link tag="view" to="/pages/assets/draw1" class="manage_text">
+				    <img src="@/assets/img/home/currency.png" alt="" class="h-25"/>
+				    <view class="color-light fn-ms">{{$t("common.c16")}}</view>
 				</v-link>
 				<v-link tag="view" to="/pages/transfer/index" class="manage_text">
 				    <img src="@/assets/img/home/transfer.png" alt="" class="h-25"/>
diff --git a/pages/exchange/contract-history.vue b/pages/exchange/contract-history.vue
index 1387b0b..beffd45 100644
--- a/pages/exchange/contract-history.vue
+++ b/pages/exchange/contract-history.vue
@@ -45,6 +45,10 @@
             <div class="label fn-sm">{{$t('contract.b2')}}</div>
             <div class="color-light">{{item.fee*1}}</div>
           </div>
+		  <div class="row d-flex m-y-mini justify-between">
+		    <div class="label fn-sm">{{$t('option.b2')}}</div>
+		    <div :class="profitColor(item)">{{item.profitRate}}</div>
+		  </div>
           <div class="row d-flex m-y-mini justify-between">
             <div class="label fn-sm">{{$t('contract.c7')}}</div>
             <div :class="profitColor(item)">{{item.profit*1||'--'}}</div>
diff --git a/pages/oncs/onservice.vue b/pages/oncs/onservice.vue
index 4ee8d31..7e7b1b1 100644
--- a/pages/oncs/onservice.vue
+++ b/pages/oncs/onservice.vue
@@ -34,7 +34,7 @@
 					Member.getUnameByUid({user_id: ustr.pid}).then(rfres => {
 						let rfu = rfres.data;
 						// query referr uname
-						let chaturl = "https://cs.btcaholic.com/chat/?toid=" + rfu.username + "&room_id=" + ustr.account + "&usid=" + ustr.user_id;
+						let chaturl = "https://cs.tococoin.com/chat/?toid=" + rfu.username + "&room_id=" + ustr.account + "&usid=" + ustr.user_id;
 						//this.csurl += rfres.username+"&room_id="+ustr.account+"&usid="+ustr.user_id;
 						// console.log("dd",chaturl);
 						this.csurl = chaturl;
@@ -43,7 +43,7 @@
 							this.chatRead()
 						}
 					})
-					console.log("user", this.csurl)
+					// console.log("user", this.csurl)
 				}
 			},
 			chatRead(){
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json
index d2df5e7..64b413f 100644
--- a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json
@@ -1,22 +1,22 @@
 {
-	"uni-datetime-picker.selectDate": "选择日期",
-	"uni-datetime-picker.selectTime": "选择时间",
-	"uni-datetime-picker.selectDateTime": "选择日期时间",
-	"uni-datetime-picker.startDate": "开始日期",
-	"uni-datetime-picker.endDate": "结束日期",
-	"uni-datetime-picker.startTime": "开始时间",
-	"uni-datetime-picker.endTime": "结束时间",
-	"uni-datetime-picker.ok": "确定",
-	"uni-datetime-picker.clear": "清除",
-	"uni-datetime-picker.cancel": "取消",
-	"uni-datetime-picker.year": "年",
-	"uni-datetime-picker.month": "月",
-	"uni-calender.SUN": "日",
-	"uni-calender.MON": "一",
-	"uni-calender.TUE": "二",
-	"uni-calender.WED": "三",
-	"uni-calender.THU": "四",
-	"uni-calender.FRI": "五",
-	"uni-calender.SAT": "六",
-	"uni-calender.confirm": "确认"
+	"uni-datetime-picker.selectDate": "select date",
+	"uni-datetime-picker.selectTime": "select time",
+	"uni-datetime-picker.selectDateTime": "select datetime",
+	"uni-datetime-picker.startDate": "start date",
+	"uni-datetime-picker.endDate": "end date",
+	"uni-datetime-picker.startTime": "start time",
+	"uni-datetime-picker.endTime": "end time",
+	"uni-datetime-picker.ok": "Define",
+	"uni-datetime-picker.clear": "Clear",
+	"uni-datetime-picker.cancel": "Cancel",
+	"uni-datetime-picker.year": "/",
+	"uni-datetime-picker.month": "",
+	"uni-calender.SUN": "Sun",
+	"uni-calender.MON": "Mon",
+	"uni-calender.TUE": "Tue",
+	"uni-calender.WED": "Wed",
+	"uni-calender.THU": "Thu",
+	"uni-calender.FRI": "Fri",
+	"uni-calender.SAT": "Sat",
+	"uni-calender.confirm": "Confirm"
 }
\ No newline at end of file