合并

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 => {

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;">

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',

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',

utils/language/zh_TW.js

@@ -257,6 +257,8 @@ export default {
 
 	// withdrawal
 	withdrawal: {
+		Reasonforrejection:'駁回原因',
+		enterIdCard:'請上傳證件照正面',
 		conFirmInfo:'實名認證',
 		apply:'待稽核',
 		agree:'稽核通過',