From 7f23377738a726464c5e4abd13e6a52c8e2daf2d Mon Sep 17 00:00:00 2001
From: j1ack <1209452658@qq.com>
Date: Thu, 15 Sep 2022 17:07:53 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/recharge/recharge.vue | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/pages/recharge/recharge.vue b/pages/recharge/recharge.vue
index dfda2ec..99d0129 100644
--- a/pages/recharge/recharge.vue
+++ b/pages/recharge/recharge.vue
@@ -220,13 +220,12 @@
 				this.qr = QR.createQrCodeImg(e)
 			},
 			getRechargeInfo(e) {
-
 				api.rechargeConfig({
 					type: this.pageState
 				}).then(res => {
 					this.reInfo = res
 					if (this.pageState == 'crypto') {
-						if (this.reInfo.coins[0].address) {
+						// if (this.reInfo.coins[0].address) {
 							// this.coinAddress = this.reInfo.coins[0].address
 							// let img = this.reInfo.coins[0].address
 							// this.coin = this.$i18n.PleaseChooseCoin
@@ -237,19 +236,19 @@
 							this.qr =  QR.createQrCodeImg(this.i18n.PleaseChooseCoin)
 							this.message = this.i18n.message.replace('{rechargeMinAmount}', '').replaceAll(
 								'{enname}', '')
-						} else {
-
-							let coinInfo = {
-								coinCode: this.reInfo.coins[0].code
-							}
-							// 返回的币种没有充值地址就用接口传code换取虚拟币充值地址
-							api.rechargeAddress(coinInfo).then(res => {
-								this.coinAddress = res.address
-								this.qr = this.getQr(this.coinAddress)
-								this.rechargeMinAmount = res.rechargeMinAmount
-								this.enname = res.enname
-							})
-						}
+						// } else {
+
+						// 	let coinInfo = {
+						// 		coinCode: this.reInfo.coins[0].code
+						// 	}
+						// 	// 返回的币种没有充值地址就用接口传code换取虚拟币充值地址
+						// 	api.rechargeAddress(coinInfo).then(res => {
+						// 		this.coinAddress = res.address
+						// 		this.qr = this.getQr(this.coinAddress)
+						// 		this.rechargeMinAmount = res.rechargeMinAmount
+						// 		this.enname = res.enname
+						// 	})
+						// }
 					} else {
 						this.reInfo.fastAmount = this.reInfo.fastAmount.split(',')
 						this.onlineInfo.tranAmt = this.reInfo.fastAmount[0]

From d2a08b2be4c4be0f8910238a871845230aae95a0 Mon Sep 17 00:00:00 2001
From: j1ack <1209452658@qq.com>
Date: Fri, 16 Sep 2022 17:53:11 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/KeyValueRow/KeyValueRow.vue |  15 +
 pages.json                             |  12 +
 pages/me/accountInfo.vue               |   8 +
 pages/me/confirmInfo.vue               | 395 +++++++++++++++++++++++++
 pages/recharge/outPage.vue             | 119 ++++++++
 pages/recharge/recharge.vue            |   5 +-
 pages/withdrawal/addOrEditBankCard.vue |  10 +-
 pages/withdrawal/chooseAddress.vue     |   3 +
 pages/withdrawal/withdrawal.vue        |  16 +-
 pages/withdrawal/withdrawalRecord.vue  |   2 +
 utils/api.js                           |   5 +-
 utils/language/en_US.js                |  13 +-
 utils/language/vi_VN.js                |  10 +-
 utils/language/zh_TW.js                |  12 +-
 14 files changed, 607 insertions(+), 18 deletions(-)
 create mode 100644 pages/me/confirmInfo.vue
 create mode 100644 pages/recharge/outPage.vue

diff --git a/components/KeyValueRow/KeyValueRow.vue b/components/KeyValueRow/KeyValueRow.vue
index c4f6c08..dd32b50 100644
--- a/components/KeyValueRow/KeyValueRow.vue
+++ b/components/KeyValueRow/KeyValueRow.vue
@@ -9,6 +9,7 @@
                     keyName
             }} </view> <text v-if="isBr"><br></text>
         <view class="value"
+		:class="isRemarks?'static':''"
             :style="{ color: rightColor, fontSize: size || rightSize, lineHeight: lineHeight || lineHeightValue }">{{
                     value
             }}</view>
@@ -73,6 +74,12 @@ export default {
                 return false
             }
         },
+		isRemarks: {
+		    type: Boolean,
+		    default() {
+		        return false
+		    }
+		},
     },
     data() {
         return {
@@ -92,10 +99,18 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+	.static{
+		position: static !important;
+		width: 480rpx !important;
+		margin-left:auto;
+		margin-left: 50rpx;
+		line-height: 40rpx;
+	}
 .KeyValueRow {
     box-sizing: border-box;
     margin-bottom: 10rpx;
     position: relative;
+	word-break: break-all;
 
     .keyName {
         vertical-align: top;
diff --git a/pages.json b/pages.json
index 18fadb4..1b09d88 100644
--- a/pages.json
+++ b/pages.json
@@ -158,6 +158,12 @@
 				"navigationStyle": "custom"
 			}
 		},
+		{
+			"path": "pages/me/confirmInfo",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
 		{
 			"path": "pages/me/donateRecord",
 			"style": {
@@ -184,6 +190,12 @@
 				"navigationStyle": "custom"
 			}
 		},
+		{
+			"path": "pages/recharge/outPage",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
 		{
 			"path": "pages/recharge/rechargeRecord",
 			"style": {
diff --git a/pages/me/accountInfo.vue b/pages/me/accountInfo.vue
index cc87651..d74ff38 100644
--- a/pages/me/accountInfo.vue
+++ b/pages/me/accountInfo.vue
@@ -18,6 +18,11 @@
             <u-button class="button" color="#211F32" throttleTime="500" id="ChangeWithdrawalPassword">
                 <view class="content">{{ i18n.ChangeWithdrawalPassword }}</view>
             </u-button>
+			
+			<u-button class="button" color="#211F32" throttleTime="500" id="conFirmInfo">
+			    <view class="content">{{ i18n.conFirmInfo }}</view>
+			</u-button>
+			
             <!-- 银行卡按钮 -->
             <u-button class="button" color="#211F32" throttleTime="500" id="BankCard">
                 <view class="content">{{ i18n.BankCard }}</view>
@@ -63,6 +68,9 @@ export default {
                 case 'WithdrawalAddress':
                     url = '/pages/withdrawal/chooseAddress?form=accountInfo'
                     break;
+					case 'conFirmInfo':
+					  url = '/pages/me/confirmInfo'
+					    break;
                 default:
                     break;
             }
diff --git a/pages/me/confirmInfo.vue b/pages/me/confirmInfo.vue
new file mode 100644
index 0000000..66b0885
--- /dev/null
+++ b/pages/me/confirmInfo.vue
@@ -0,0 +1,395 @@
+<template>
+	<view class="main">
+		<!-- nav -->
+		<navigation>{{ i18n.conFirmInfo  }}</navigation>
+		<!-- #ifdef APP-PLUS -->
+		<view class="content">
+			<!-- #endif -->
+			<!-- #ifdef H5 -->
+			<view class="contentH5">
+				<!-- #endif -->
+
+				<u--form class="form" :model="bankInfo" :rules="rules" ref="uForm" errorType="toast">
+					<view class="inputBody">
+						<view class="title" v-if="bankInfo.auditStatus">{{ i18n.infoStatus }}</view>
+						<view class="" style="margin-bottom: 20rpx;" v-if="bankInfo.auditStatus">
+							{{bankInfo.auditStatus=='apply'?i18n.apply:bankInfo.auditStatus=='agree'?i18n.agree:i18n.reject}}
+						</view>
+						
+						<view class="title">{{ i18n.FirstName }}</view>
+						<view class="input-item">
+							<u-form-item class="input-item" prop="name" ref="item1">
+								<u-input class="input" v-model="bankInfo.name" color="#fff" fontSize="32rpx"
+									border="none" :placeholder="i18n.enterName">
+								</u-input>
+							</u-form-item>
+						</view>
+						<view class="title">{{ i18n.idNumber }}</view>
+						<view class="input-item">
+							<u-form-item class="input-item" prop="certId" ref="item1">
+								<u-input class="input" v-model="bankInfo.certId" color="#fff" fontSize="32rpx"
+									border="none" :placeholder="i18n.enterIdNumber">
+								</u-input>
+							</u-form-item>
+						</view>
+
+						<view class="title" v-if="bankInfo.auditStatus!='agree'">{{ i18n.IDcard }}</view>
+
+						<u-upload  v-if="bankInfo.auditStatus!='agree'" :fileList="fileList1" @afterRead="afterRead" @delete="deletePic" name="1" multiple
+							:maxCount="1">
+							
+								<image class="add" src="/static/home/id.png" mode="aspectFit" v-if="!bankInfo.certFrontImgPath"></image>
+							
+								<image :src="baseURL+bankInfo.certFrontImgPath" 
+								mode="" class="add" v-if="bankInfo.certFrontImgPath"></image>
+							</u-upload>
+							
+					
+					<view class="title" style="margin-top: 20rpx;" v-if="bankInfo.auditStatus=='reject'">{{ i18n.infoStatus }}</view>
+					<view class="" style="word-break: break-all;" v-if="bankInfo.auditStatus=='reject'">
+						{{bankInfo.auditReason}}
+					</view>
+					
+					</view>
+					
+					
+					
+
+				</u--form>
+
+				<u-button class="button" color="#00E8A2" :throttleTime="500" :disabled="btnIsCanClick" @click="bank" v-if="!hideButton">
+					{{ i18n.Confirm }}
+				</u-button>
+			</view>
+		</view>
+</template>
+
+<script>
+	import api from '@/utils/api'
+	import constant from '@/utils/constant.js';
+	import {
+		pathToBase64,
+		base64ToPath
+	} from 'image-tools'
+	export default {
+		name: "withdrawalRecord",
+		data() {
+			return {
+				hideButton:false,
+				baseURL: '',
+				fileList1: [],
+				rules: {
+					name: {
+						type: 'string',
+						required: true,
+						message: this.$t('withdrawal').enterName,
+						trigger: ['blur', 'change'],
+					},
+					certId: {
+						type: 'string',
+						required: true,
+						message: this.$t('withdrawal').enterIdNumber,
+						trigger: ['blur', 'change']
+					},
+				
+				},
+				bankInfo: {
+					name: null,
+					certId: null,
+					certFrontImgPath:null
+				},
+				pageState: 'addBank', // 页面状态,是添加还是编辑银行卡
+
+				objData: {},
+			};
+		},
+		computed: {
+			i18n() {
+				return this.$t("withdrawal");
+			},
+			btnIsCanClick() {
+				if (this.bankInfo.name && this.bankInfo.certId && this.bankInfo.certFrontImgPath) {
+					return false
+				} else {
+					return true
+				}
+			}
+		},
+		onLoad(option) {
+			this.getBank()
+			this.baseURL = constant.BASE_URL
+		},
+		onShow() {},
+		methods: {
+			// 删除图片
+			deletePic(event) {
+				this[`fileList${event.name}`].splice(event.index, 1)
+			},
+
+			// 新增图片
+			async afterRead(event) {
+				uni.showLoading({
+					title: this.$t("withdrawal").shang,
+					mask: true,
+				})
+				// 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
+				let lists = [].concat(event.file)
+				console.log(event)
+				let fileListLen = this[`fileList${event.name}`].length
+				lists.map((item) => {
+					this[`fileList${event.name}`].push({
+						...item,
+						// status: 'uploading',
+						// message: '上传中'
+					})
+				})
+				for (let i = 0; i < lists.length; i++) {
+					const result = await this.uploadFilePromise(lists[i].url)
+					let item = this[`fileList${event.name}`][fileListLen]
+					this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
+						status: 'success',
+						message: '',
+						url: result
+					}))
+					fileListLen++
+				}
+			},
+			
+			uploadFilePromise(url) {
+				// #ifdef APP-PLUS
+				console.log(url)
+				pathToBase64(url)
+					.then(path => {
+						console.log(path)
+						let res=path
+						res = res.split(',')[1]
+						console.log(res,'res')
+						return new Promise((resolve, reject) => {
+							api.uploadImg({
+								img: res
+							}).then(res => {
+								uni.hideLoading()
+								this.bankInfo.certFrontImgPath=res
+							})
+						})
+					})
+					.catch(error => {
+						uni.hideLoading()
+						console.error(error)
+					})
+
+				// #endif
+				// #ifdef H5
+				const image = new Image() // 新建一个img标签（还没嵌入DOM节点)
+				//blob:http://localhost:8080/b878edea-e649-4f8d-b723-c3f25454141b
+				image.src = url;
+				image.onload = () => {
+					const canvas = document.createElement('canvas')
+					canvas.width = image.width
+					canvas.height = image.height
+					const context = canvas.getContext('2d')
+					context.drawImage(image, 0, 0, image.width, image.height);
+					let imgUrl = canvas.toDataURL() //图片的base64地址
+					imgUrl = imgUrl.split(',')[1]
+					return new Promise((resolve, reject) => {
+						api.uploadImg({
+							img: imgUrl
+						}).then(res => {
+						this.bankInfo.certFrontImgPath=res
+						console.log(res)
+						console.log(this.bankInfo.certFrontImgPath)
+						})
+					})
+
+				}
+				// #endif
+			},
+
+
+
+
+			getBase64(file) {
+				return new Promise((resolve, reject) => {
+					const reader = new FileReader()
+					reader.readAsDataURL(file)
+					reader.onload = () => resolve(reader.result)
+					reader.onerror = (error) => reject(error)
+				})
+			},
+
+		
+	
+
+		// 获取实名信息
+		getBank() {
+			api.certificationInfo().then(res => {
+				this.bankInfo = res;
+				this.bankInfo.certFrontImgPath=res.certFrontImg
+				if(this.bankInfo.auditStatus=='agree'||this.bankInfo.auditStatus=='apply'){
+					this.hideButton=true
+				}
+			})
+		},
+			
+			getInfo(){
+				api.certificationInfo().then(res => {
+				this.bankInfo=res
+				})
+			},
+			// 修改或添加实名信息
+			bank() {
+			
+				this.$refs.uForm.validate().then(res => {
+					let bankInfo = {
+						name: this.bankInfo.name,
+						certId: this.bankInfo.certId,
+						certFrontImgPath: this.bankInfo.certFrontImgPath
+					}
+					api.certification(bankInfo).then(res => {
+							uni.$u.toast(this.$t("me").addSuccessfully)
+							this.getInfo()
+					
+					})
+				}).catch(errors => {
+					console.log('err')
+				})
+			},
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	
+	/deep/ .uicon-camera-fill{
+		display:none !important;
+	}
+	/deep/ .u-upload{
+		position:relative;
+		.add{
+		width: 620rpx !important;
+		height: 360rpx !important;
+		}
+	}
+
+	/deep/ .u-upload__wrap__preview__image {
+	width: 620rpx !important;
+		height: 360rpx !important;
+	}
+
+	/deep/ .u-icon__icon {
+		font-size: 32rpx !important;
+	}
+
+	/deep/ .u-upload__button {
+		width: 620rpx !important;
+		height: 360rpx !important;
+		background-color: #323045 !important;
+	}
+
+	/deep/ .u-form-item__body {
+		padding: 0 0;
+	}
+
+	.main {
+
+		.content {
+			margin-top: 200rpx;
+			padding: 32rpx;
+
+			.inputBody {
+				overflow: hidden;
+				background: #211F32;
+				border-radius: 32rpx;
+				padding: 32rpx;
+				margin-bottom: 32rpx;
+
+				.title {
+					font-size: 32rpx;
+					color: #A1A0A8;
+					margin-bottom: 20rpx;
+				}
+
+				.input-item {
+					height: 112rpx;
+					background: #323045;
+					border-radius: 32rpx;
+					padding-left: 40rpx;
+					margin-bottom: 20rpx;
+
+					.input {
+						height: 112rpx;
+					}
+				}
+
+
+
+			}
+
+
+			.button {
+				position: fixed;
+				bottom: 40rpx;
+				width: 686rpx;
+				box-sizing: border-box;
+				height: 112rpx;
+				background: #00E8A2;
+				border-radius: 32rpx;
+				font-weight: 700;
+				font-size: 32rpx;
+				color: #15141F !important;
+
+			}
+		}
+
+		.contentH5 {
+			margin-top: 100rpx;
+			padding: 32rpx;
+
+			.inputBody {
+				overflow: hidden;
+				background: #211F32;
+				border-radius: 32rpx;
+				padding: 32rpx;
+				margin-bottom: 32rpx;
+
+				.title {
+					font-size: 32rpx;
+					color: #A1A0A8;
+					margin-bottom: 20rpx;
+				}
+
+				.input-item {
+					height: 112rpx;
+					background: #323045;
+					border-radius: 32rpx;
+					padding-left: 40rpx;
+					margin-bottom: 20rpx;
+
+					.input {
+						height: 112rpx;
+					}
+				}
+
+
+
+			}
+
+
+			.button {
+				position: fixed;
+				bottom: 40rpx;
+				width: 686rpx;
+				box-sizing: border-box;
+				height: 112rpx;
+				background: #00E8A2;
+				border-radius: 32rpx;
+				font-weight: 700;
+				font-size: 32rpx;
+				color: #15141F !important;
+
+			}
+		}
+
+
+	}
+</style>
diff --git a/pages/recharge/outPage.vue b/pages/recharge/outPage.vue
new file mode 100644
index 0000000..7e20a3b
--- /dev/null
+++ b/pages/recharge/outPage.vue
@@ -0,0 +1,119 @@
+<template>
+	<view class="main">
+		<view class="nav-head-H5"  @tap="back()">
+			<image src="../../static/public/back.png" mode="aspectFit" class="back"></image>
+		</view>
+		<web-view  :src="urls"></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+
+		},
+		name: "rechargeRecord",
+		data() {
+			return {
+				urls: '',
+				webviewStyles: {
+					progress: {
+
+						color: '#FF3333'
+					}
+				}
+			};
+		},
+		computed: {
+			i18n() {
+				return this.$t("recharge");
+			},
+		},
+		onReachBottom() {
+
+		},
+		onLoad(res) {
+			this.urls = res.url
+		},
+		onShow() {},
+		methods: {
+			back() {
+				uni.redirectTo({
+					url:'/pages/recharge/recharge'
+				})
+			}
+
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.item {
+		font-size: 28rpx;
+		text-align: center;
+		width: 234rpx;
+		line-height: 60rpx;
+	}
+
+	.nav-head-H5 {
+		position: fixed;
+		// top: 700rpx;
+		    top: 32%;
+		height: 56rpx;
+		text-align: center;
+		font-weight: 700;
+		font-size: 38rpx;
+		color: #fff;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		width: 10%;
+		background-color: #4DA2FF;
+		z-index: 99999;
+		border-bottom: 2px solid #4DA2FF;
+
+		&.tp {
+			background-color: transparent;
+			border: none;
+		}
+	}
+
+	.nav-head {
+		position: fixed;
+		top: 0rpx;
+		height: 112rpx;
+		// background-color: #fafafa;
+		// background-color: #fff;
+		text-align: center;
+		font-weight: 700;
+		font-size: 36rpx;
+		color: #fff;
+		// padding: 40rpx 16rpx;
+		padding-top: 88rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		width: 100%;
+		background-color: #15141F;
+		z-index: 9999;
+		border-bottom: 4rpx solid #323045;
+
+		&.tp {
+			background-color: transparent;
+			border: none;
+		}
+	}
+
+	.back {
+		width: 80rpx;
+		height: 80rpx;
+		position: absolute;
+		left: 0rpx;
+		z-index: 9999;
+	}
+
+	.content {
+		// margin-top: 150rpx;
+		// padding-bottom: 120rpx;
+	}
+</style>
diff --git a/pages/recharge/recharge.vue b/pages/recharge/recharge.vue
index 99d0129..677cd0d 100644
--- a/pages/recharge/recharge.vue
+++ b/pages/recharge/recharge.vue
@@ -169,7 +169,10 @@
 						plus.runtime.openURL(res.msg);
 						// #endif
 						// #ifdef H5
-						window.open(res.msg, '_blank');
+						// window.open(res.msg, '_blank');
+						uni.navigateTo({
+							url:'/pages/recharge/outPage?url='+res.msg
+						})
 						// #endif
 					}
 					if (res.code == 1) {
diff --git a/pages/withdrawal/addOrEditBankCard.vue b/pages/withdrawal/addOrEditBankCard.vue
index 700ed4d..8634f76 100644
--- a/pages/withdrawal/addOrEditBankCard.vue
+++ b/pages/withdrawal/addOrEditBankCard.vue
@@ -28,7 +28,7 @@
 							</u-form-item>
 						</view>
 
-						<view class="title">{{ i18n.IDcard }}</view>
+						<!-- <view class="title">{{ i18n.IDcard }}</view>
 
 						<u-upload :fileList="fileList1" @afterRead="afterRead" @delete="deletePic" name="1" multiple
 							:maxCount="1">
@@ -37,10 +37,8 @@
 							
 								<image :src="baseURL+bankInfo.certImg" 
 								mode="" class="add" v-if="bankInfo.certImg"></image>
-							</u-upload>
-							<view class="">
-								
-							</view>
+							</u-upload> -->
+							
 					</view>
 
 					<view class="inputBody">
@@ -130,7 +128,7 @@
 				return this.$t("withdrawal");
 			},
 			btnIsCanClick() {
-				if (this.bankInfo.bankCode && this.bankInfo.bankName && this.bankInfo.acctName && this.bankInfo.acctId && this.bankInfo.certImg) {
+				if (this.bankInfo.bankCode && this.bankInfo.bankName && this.bankInfo.acctName && this.bankInfo.acctId) {
 					return false
 				} else {
 					return true
diff --git a/pages/withdrawal/chooseAddress.vue b/pages/withdrawal/chooseAddress.vue
index fc676ce..68ef666 100644
--- a/pages/withdrawal/chooseAddress.vue
+++ b/pages/withdrawal/chooseAddress.vue
@@ -186,10 +186,13 @@
 						this.editCoinAddressIndex = addressIndex.id;
 					}
 				} else {
+					// console.log(addressIndex)
 					// 选择地址情况下 点击地址返回传参有问题 可能要通用vuex解决
 					uni.$emit('coinAddressChang', {
 						coinid: addressIndex.id,
 						coinAddress: addressIndex.address,
+						coinCode:addressIndex.coinCode,
+						coinEnname:addressIndex.coinEnname
 					});
 					uni.navigateBack()
 
diff --git a/pages/withdrawal/withdrawal.vue b/pages/withdrawal/withdrawal.vue
index f03461b..941a2a5 100644
--- a/pages/withdrawal/withdrawal.vue
+++ b/pages/withdrawal/withdrawal.vue
@@ -255,10 +255,13 @@
 			this.baseURL = constant.BASE_URL
 			// 监听事件  
 			uni.$on('coinAddressChang', (data) => {
+				console.log(data)
 				this.coinAddress = data.coinAddress
 				this.coinInfo.addressId = data.coinid
+				this.coinInfo.coinCode = data.coinEnname
+				this.coinInfo.coinCode2 =  data.coinCode
 			})
-			this.getWithConfig();
+			this.getWithConfig(true);
 		},
 		onUnload() {
 			// 移除监听事件  
@@ -309,7 +312,7 @@
 				this.coinAddress='';
 			},
 			// 获取提现配置
-			getWithConfig() {
+			getWithConfig(type) {
 				// 提现配置信息
 				// 重置信息 避免报错
 				this.withdrawInfo={
@@ -324,9 +327,12 @@
 						if (this.pageState == 'crypto') {
 							// 进来默认选中第一个币
 							this.withdrawInfo = res
-							this.coinInfo.coinCode = this.withdrawInfo.coins[0].enname
-							this.selectCoinInfo = this.withdrawInfo.coins[0]
-							this.coinInfo.coinCode2 = this.withdrawInfo.coins[0].code
+							if(type){
+								this.coinInfo.coinCode = this.withdrawInfo.coins[0].enname
+								this.selectCoinInfo = this.withdrawInfo.coins[0]
+								this.coinInfo.coinCode2 = this.withdrawInfo.coins[0].code
+							}
+						
 						} else {
 							// 法币
 							this.withdrawInfo = res
diff --git a/pages/withdrawal/withdrawalRecord.vue b/pages/withdrawal/withdrawalRecord.vue
index b149119..b064969 100644
--- a/pages/withdrawal/withdrawalRecord.vue
+++ b/pages/withdrawal/withdrawalRecord.vue
@@ -32,6 +32,7 @@
 						<view style="padding:20rpx 32rpx;">
 							<key-value-row :keyName="i18n.OrderID" :value="item.orderNo"></key-value-row>
 							<key-value-row :keyName="i18n.Fees" :value="item.tranFee+''+item.coinCode"></key-value-row>
+								<key-value-row :keyName="i18n.remarks" :value="item.remarks" :isRemarks="true" v-if="item.orderStatus=='processreject'"></key-value-row>
 							<key-value-row :keyName="i18n.Time" :value="item.addTimeStr"></key-value-row>
 						</view>
 						<view style="border-top: 2rpx solid #323045;padding:0rpx 32rpx; margin-bottom: 20rpx;">
@@ -61,6 +62,7 @@
 						<view style="padding:20rpx 32rpx;">
 							<key-value-row :keyName="i18n.OrderID" :value="item.orderNo"></key-value-row>
 							<key-value-row :keyName="i18n.Fees" :value="item.tranFee+''+item.coinCode"></key-value-row>
+							<key-value-row :keyName="i18n.remarks" :value="item.remarks" :isRemarks="true" v-if="item.orderStatus=='processreject'"></key-value-row>
 							<key-value-row :keyName="i18n.Time" :value="item.addTimeStr"></key-value-row>
 						</view>
 						<show-more class="onLineShowMore" style="border-top: 2rpx solid #323045;margin-bottom: 20rpx;">
diff --git a/utils/api.js b/utils/api.js
index 2628cad..de5dbfd 100644
--- a/utils/api.js
+++ b/utils/api.js
@@ -98,8 +98,9 @@ const api = {
    billList: (params) => Vue.prototype.$axios.post('/api/user/billList',params),//账单记录
    userInfo: (params) => Vue.prototype.$axios.post('/api/user/userInfo',params),//会员基本信息
     updatePayPassword: (params) => Vue.prototype.$axios.post('/api/user/updatePayPassword',params),//修改提现密码
-
-
+	
+	certification: (params) => Vue.prototype.$axios.post('/api/user/certification',params),//保存实名认证信息
+	certificationInfo: (params) => Vue.prototype.$axios.post('/api/user/certificationInfo',params),//获取实名认证信息
    
  }
 
diff --git a/utils/language/en_US.js b/utils/language/en_US.js
index 2a9fe3d..0ab35c2 100644
--- a/utils/language/en_US.js
+++ b/utils/language/en_US.js
@@ -254,6 +254,14 @@ export default {
 
 	// withdrawal
 	withdrawal: {
+		conFirmInfo:'Real name authentication',
+	    apply:'apply',
+		agree:'agree',
+		reject:'reject',
+		infoStatus:'Audit status',
+		idNumber:'ID Number',
+		
+		remarks:'Reason',
 		IDcard:'Upload photo ID front',
 		shang:'Uploading',
 		// 漏掉的国际化
@@ -326,6 +334,9 @@ export default {
 		enterName: 'Please enter your name',
 		Account: 'Account',
 		enterAccount: 'Please enter your Account',
+		
+		enterIdNumber: 'Please enter your ID Number',
+		
 		BankName: 'Bank Name',
 		enterBankName: 'Please enter bank name',
 		BankCode: 'Bank Code',
@@ -388,7 +399,7 @@ export default {
 
 	//me
 	me: {
-		
+		conFirmInfo:'Real name authentication',
 		// 漏掉的
 		Balanceaccount:'Balance account',
 		Contractaccount:'Contract account',
diff --git a/utils/language/vi_VN.js b/utils/language/vi_VN.js
index 95331de..62e8436 100644
--- a/utils/language/vi_VN.js
+++ b/utils/language/vi_VN.js
@@ -251,6 +251,13 @@ export default {
 
 	// withdrawal
 	withdrawal: {
+		conFirmInfo:'Xác thực tên thật',
+		apply:'Để xem lại',
+		agree:'Duyệt',
+		reject:'Chấp nhận',
+		infoStatus:'Kiểm tra',
+		idNumber:'Số chứng nhận',
+		remarks:'Lý',
 		IDcard:'Tải ảnh nhận diện',
 		shang:'Gửi',
 		// 漏掉的国际化
@@ -322,6 +329,7 @@ export default {
 		enterName: 'Vui lòng nhập tên thật của bạn',
 		Account: 'tài khoản',
 		enterAccount: 'Vui lòng nhập tài khoản của bạn',
+		enterIdNumber: 'Hãy nhập số nhận diện',
 		BankName: 'tên ngân hàng',
 		enterBankName: 'Vui lòng nhập tên ngân hàng',
 		BankCode: 'Mã ngân hàng',
@@ -381,7 +389,7 @@ export default {
 
 	//me
 	me: {
-		
+		conFirmInfo:'Xác thực tên thật',
 		Balanceaccount: 'Tài khoản tùy chọn',
 		Contractaccount: 'Hợp đồng',
 		Postscript: 'hậu',
diff --git a/utils/language/zh_TW.js b/utils/language/zh_TW.js
index d746696..54aebce 100644
--- a/utils/language/zh_TW.js
+++ b/utils/language/zh_TW.js
@@ -257,6 +257,13 @@ export default {
 
 	// withdrawal
 	withdrawal: {
+		conFirmInfo:'實名認證',
+		apply:'待稽核',
+		agree:'稽核通過',
+		reject:'稽核駁回',
+		infoStatus:'稽核狀態',
+		idNumber:'證件號',
+		remarks:'原因',
 		IDcard:'上傳證件照正面',
 		shang:'上傳中',
 		// 漏掉的国际化
@@ -330,6 +337,7 @@ export default {
 		enterName: '請輸入你的真實姓名',
 		Account: '帳戶',
 		enterAccount: '請輸入您的賬戶',
+		enterIdNumber: '請輸入您的身份證號碼',
 		BankName: '銀行名稱',
 		enterBankName: '請輸入銀行名稱',
 		BankCode: '銀行代碼',
@@ -382,14 +390,14 @@ export default {
 		Video: '視頻',
 		WhiteBook: '白皮書',
 		FullNameOfToken: '幣名全稱：',
-		TotalCirculation: '申購價格：',
+		TotalCirculation: '申購數量：',
 		ICOPrice: '申購價格：',
 		// ICOTime: '申購時間：',
 	},
 
 	//me
 	me: {
-		
+		conFirmInfo:'實名認證',
 		Balanceaccount:'交易賬戶',
 		Contractaccount:'合約帳戶',
 		Postscript:'備注',

From e842a5b688f43cfb9bea862ccc9c133bc718cc8f Mon Sep 17 00:00:00 2001
From: j1ack <1209452658@qq.com>
Date: Fri, 16 Sep 2022 18:44:58 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/me/confirmInfo.vue              | 28 ++++++++++++++-------------
 pages/withdrawal/withdrawalRecord.vue |  8 ++++----
 utils/language/en_US.js               |  3 ++-
 utils/language/vi_VN.js               |  2 ++
 utils/language/zh_TW.js               |  2 ++
 5 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/pages/me/confirmInfo.vue b/pages/me/confirmInfo.vue
index 66b0885..836faf2 100644
--- a/pages/me/confirmInfo.vue
+++ b/pages/me/confirmInfo.vue
@@ -16,6 +16,13 @@
 							{{bankInfo.auditStatus=='apply'?i18n.apply:bankInfo.auditStatus=='agree'?i18n.agree:i18n.reject}}
 						</view>
 						
+						
+						<view class="title" v-if="bankInfo.auditStatus=='reject'">{{ i18n.Reasonforrejection }}</view>
+						<view class="" style="word-break: break-all;margin-bottom: 20rpx;" v-if="bankInfo.auditStatus=='reject'">
+							{{bankInfo.auditReason}}
+						</view>
+						
+						
 						<view class="title">{{ i18n.FirstName }}</view>
 						<view class="input-item">
 							<u-form-item class="input-item" prop="name" ref="item1">
@@ -45,10 +52,7 @@
 							</u-upload>
 							
 					
-					<view class="title" style="margin-top: 20rpx;" v-if="bankInfo.auditStatus=='reject'">{{ i18n.infoStatus }}</view>
-					<view class="" style="word-break: break-all;" v-if="bankInfo.auditStatus=='reject'">
-						{{bankInfo.auditReason}}
-					</view>
+				
 					
 					</view>
 					
@@ -57,7 +61,7 @@
 
 				</u--form>
 
-				<u-button class="button" color="#00E8A2" :throttleTime="500" :disabled="btnIsCanClick" @click="bank" v-if="!hideButton">
+				<u-button class="button" color="#00E8A2" :throttleTime="500"  @click="bank" v-if="!hideButton">
 					{{ i18n.Confirm }}
 				</u-button>
 			</view>
@@ -108,7 +112,7 @@
 				return this.$t("withdrawal");
 			},
 			btnIsCanClick() {
-				if (this.bankInfo.name && this.bankInfo.certId && this.bankInfo.certFrontImgPath) {
+				if (this.bankInfo.name && this.bankInfo.certId) {
 					return false
 				} else {
 					return true
@@ -231,14 +235,12 @@
 			})
 		},
 			
-			getInfo(){
-				api.certificationInfo().then(res => {
-				this.bankInfo=res
-				})
-			},
 			// 修改或添加实名信息
 			bank() {
-			
+				if(!this.bankInfo.certFrontImgPath){
+					uni.$u.toast(this.$t("withdrawal").enterIdCard)
+					return;
+				}
 				this.$refs.uForm.validate().then(res => {
 					let bankInfo = {
 						name: this.bankInfo.name,
@@ -247,7 +249,7 @@
 					}
 					api.certification(bankInfo).then(res => {
 							uni.$u.toast(this.$t("me").addSuccessfully)
-							this.getInfo()
+							this.getBank()
 					
 					})
 				}).catch(errors => {
diff --git a/pages/withdrawal/withdrawalRecord.vue b/pages/withdrawal/withdrawalRecord.vue
index b064969..93b40d0 100644
--- a/pages/withdrawal/withdrawalRecord.vue
+++ b/pages/withdrawal/withdrawalRecord.vue
@@ -24,9 +24,9 @@
 					<!-- balance -->
 					<card-header v-if="form.type === 'crypto'" :iconName="baseURL+'/coins/'+item.coinCode+'.png'"
 						:title="item.tranAmt+item.coinCode" :rightName="item.orderStatus=='processreview'?i18n.Underreview:item.orderStatus=='processsuccess'?i18n.Success:
-					item.orderStatus=='processing'?i18n.Processing:item.orderStatus=='processfailed'?i18n.Failed:i18n.Failed"
+					item.orderStatus=='processing'?i18n.Processing:item.orderStatus=='processfailed'?i18n.processfailed:i18n.processfailed"
 						:fontColor="item.orderStatus=='processreview'?'#F2FE8D':item.orderStatus=='processsuccess'?'#00E8A2':
-					item.orderStatus=='processfailed'?'#F4506A':item.orderStatus=='processing'?'#00D1FF':'#A1A0A8'">
+					item.orderStatus=='processfailed'?'#F4506A':item.orderStatus=='processing'?'#00D1FF':'#F4506A'">
 					</card-header>
 					<view class="dataBody" v-if="form.type === 'crypto'">
 						<view style="padding:20rpx 32rpx;">
@@ -54,9 +54,9 @@
 				</card-header> -->
 					<card-header v-if="form.type === 'online'" iconName="../../static/withdrawal/money-send.png"
 						:title="item.tranAmt+item.coinCode" :rightName="item.orderStatus=='processreview'?i18n.Underreview:item.orderStatus=='processsuccess'?i18n.Success:
-						 item.orderStatus=='processing'?i18n.Processing:item.orderStatus=='processfailed'?i18n.Failed:i18n.Failed"
+						 item.orderStatus=='processing'?i18n.Processing:item.orderStatus=='processfailed'?i18n.processfailed:i18n.processfailed"
 						:fontColor="item.orderStatus=='processreview'?'#F2FE8D':item.orderStatus=='processsuccess'?'#00E8A2':
-					item.orderStatus=='processfailed'?'#F4506A':item.orderStatus=='processing'?'#00D1FF':'#A1A0A8'">
+					item.orderStatus=='processfailed'?'#F4506A':item.orderStatus=='processing'?'#00D1FF':'#F4506A'">
 					</card-header>
 					<view class="dataBody" v-if="form.type === 'online'">
 						<view style="padding:20rpx 32rpx;">
diff --git a/utils/language/en_US.js b/utils/language/en_US.js
index 0ab35c2..6891bd8 100644
--- a/utils/language/en_US.js
+++ b/utils/language/en_US.js
@@ -254,13 +254,14 @@ export default {
 
 	// withdrawal
 	withdrawal: {
+		enterIdCard:'Upload the front of the ID photo',
 		conFirmInfo:'Real name authentication',
 	    apply:'apply',
 		agree:'agree',
 		reject:'reject',
 		infoStatus:'Audit status',
 		idNumber:'ID Number',
-		
+		Reasonforrejection:'Reason for rejection',
 		remarks:'Reason',
 		IDcard:'Upload photo ID front',
 		shang:'Uploading',
diff --git a/utils/language/vi_VN.js b/utils/language/vi_VN.js
index 62e8436..41a6a63 100644
--- a/utils/language/vi_VN.js
+++ b/utils/language/vi_VN.js
@@ -251,6 +251,8 @@ export default {
 
 	// withdrawal
 	withdrawal: {
+		Reasonforrejection:'Lý do từ chối',
+		enterIdCard:'Tải lên mặt trước ảnh nhận diện',
 		conFirmInfo:'Xác thực tên thật',
 		apply:'Để xem lại',
 		agree:'Duyệt',
diff --git a/utils/language/zh_TW.js b/utils/language/zh_TW.js
index 54aebce..c361cdf 100644
--- a/utils/language/zh_TW.js
+++ b/utils/language/zh_TW.js
@@ -257,6 +257,8 @@ export default {
 
 	// withdrawal
 	withdrawal: {
+		Reasonforrejection:'駁回原因',
+		enterIdCard:'請上傳證件照正面',
 		conFirmInfo:'實名認證',
 		apply:'待稽核',
 		agree:'稽核通過',

From 667cae1b98ec8f3776fd153fec07c6b4ce978033 Mon Sep 17 00:00:00 2001
From: vee <897831508@qq.com>
Date: Sat, 17 Sep 2022 14:09:35 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dapp=E7=9A=84k=E7=BA=BF?=
 =?UTF-8?q?=E4=B8=8D=E5=87=BA=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/kline/kline.vue | 15 +++++++--------
 components/kline/props.js  |  4 ++++
 manifest.json              | 21 +++------------------
 pages/markets/kLine.vue    | 11 +++++++++--
 4 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/components/kline/kline.vue b/components/kline/kline.vue
index 2c6fcd1..852f044 100644
--- a/components/kline/kline.vue
+++ b/components/kline/kline.vue
@@ -20,7 +20,7 @@
 		</view>
 		<view id="kline" :windowWidth="width" :change:windowWidth="KlineJs.setWidth" :windowHeight="height"
 			:change:windowHeight="KlineJs.setHeight" :symbol="symbol"
-			:change:symbol="KlineJs.setSymbol" :index_activeCycle="index_activeCycle" :change:index_activeCycle="KlineJs.changindex_activeCycle"></view>
+			:change:symbol="KlineJs.setSymbol"  :language="language" :change:language="KlineJs.changlanguage" :index_activeCycle="index_activeCycle" :change:index_activeCycle="KlineJs.changindex_activeCycle"></view>
 	</view>
 </template>
 
@@ -106,7 +106,8 @@
 			return {
 				chartHeight: 0,
 				chartWidth: 0,
-				chartSymbol:'btc'
+				chartSymbol:'btc',
+				language:'en'
 			}
 		},
 		//该生命周期慢于不是renderjs的生命周期
@@ -129,6 +130,9 @@
 			},
 			changindex_activeCycle(index_activeCycle){
 				this.initChart(index_activeCycle)
+			},
+			changlanguage(language){
+				this.language=language
 			}
 			,
 			initChart(index_activeCycle) {
@@ -143,12 +147,7 @@
 				chartConfig.time_frames=[]
 				// 初始化 TradingView
 				console.log(window.TradingView.version())
-				const language = uni.getStorageSync("language")|| 'en_US';
-				if(language.indexOf('zh')>-1){
-					chartConfig.locale=language
-				}else{
-					chartConfig.locale=language.split('_')[0]
-				}
+				
 				
 				
 				widgetObj = new widget(chartConfig)
diff --git a/components/kline/props.js b/components/kline/props.js
index 8f7e8ea..7043678 100644
--- a/components/kline/props.js
+++ b/components/kline/props.js
@@ -13,6 +13,10 @@ export default {
 		symbol: {
 			type: String,
 			default: ''
+		},
+		language: {
+			type: String,
+			default: ''
 		},
 	}
 }	
diff --git a/manifest.json b/manifest.json
index 8a1d626..b1643ff 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,9 +1,9 @@
 {
-    "name" : "Same home",
+    "name" : "samehome",
     "appid" : "__UNI__C4028F6",
     "description" : "",
     "versionName" : "1.0.0",
-    "versionCode" : 100,
+    "versionCode" : "101",
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -84,22 +84,7 @@
                 }
             }
         },
-        "nativePlugins" : {
-            "HF-Step" : {
-                "__plugin_info__" : {
-                    "name" : "原生计步器（Android和IOS）",
-                    "description" : "计步器，原生计步器插件,安卓,IOS",
-                    "platforms" : "Android,iOS",
-                    "url" : "https://ext.dcloud.net.cn/plugin?id=6632",
-                    "android_package_name" : "com.samehome",
-                    "ios_bundle_id" : "com.samehome",
-                    "isCloud" : true,
-                    "bought" : 1,
-                    "pid" : "6632",
-                    "parameters" : {}
-                }
-            }
-        }
+        "nativePlugins" : {}
     },
     "h5" : {
         "publicPath" : "/",
diff --git a/pages/markets/kLine.vue b/pages/markets/kLine.vue
index b59f4f2..3ff33ce 100644
--- a/pages/markets/kLine.vue
+++ b/pages/markets/kLine.vue
@@ -35,7 +35,7 @@
 				</view>
 			</view>
 			
-			<kline v-if="showKline" :width="chartWidth" :height="chartHeight" :symbol="symbol.symbol"></kline>
+			<kline v-if="showKline" :width="chartWidth" :height="chartHeight" :symbol="symbol.symbol" :language="language"></kline>
 			
 			<!-- 买卖挂牌表 -->
 			<view class="MarketTrades">
@@ -117,7 +117,8 @@
 				// K线图高度
 				chartHeight: 0,
 				//菜单栏高度(单位PX)
-				menuHeight: 0,
+				menuHeight: 0,
+				language:'en'
 
 			};
 		},
@@ -199,6 +200,12 @@
 					// #ifdef APP-PLUS	
 					uni.navigateBack()
 					// #endif
+				}
+				const language = uni.getStorageSync("language")|| 'en_US';
+				if(language.indexOf('zh')>-1){
+					this.language=language
+				}else{
+					this.language=language.split('_')[0]
 				}
 				this.getMarketDetail();
 				this.initWebSocket();