gitea
/
fundHoldApp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

chore： 

代理交易键盘无法弹出问题；
代理、商户认证时，身份证号码改证件号码；
认证失败重新认证跳转逻辑调整；
信息修改完成后，跳转到首页调整；
main
zhj 1 month ago
parent
c0ff22f41a
commit
4183e83078
7 changed files with 632 additions and 619 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 154
      pages/functions/proxyPayment.vue
  2. 6
      pages/mine/info/edit.vue
  3. 9
      pages/mine/info/index.vue
  4. 8
      pages/mine/info/merchant/edit.vue
  5. 9
      pages/mine/info/merchant/index.vue
  6. 8
      pages/mine/info/proxy/edit.vue
  7. 9
      pages/mine/info/proxy/index.vue

154
pages/functions/proxyPayment.vue
View File

@ -3,10 +3,10 @@
<view class="page full-height-with-titile" style="overflow: auto;" v-if="!showResult"> <view class="page full-height-with-titile" style="overflow: auto;" v-if="!showResult">
<!-- 主内容区域 --> <!-- 主内容区域 -->
<view class="content" @click="hideKeyboard"> <view class="content" @click="hideKeyboard">
<!-- <view v-show="step === 1" style="width: 100%;"> <!-- <view v-show="step === 1" style="width: 100%;">
<u-subsection style="width: 100%;" activeColor="#FDBE44" :list="['代付', '代收']" :current="0" @change="handleUserTypeChg"></u-subsection> <u-subsection style="width: 100%;" activeColor="#FDBE44" :list="['代付', '代收']" :current="0" @change="handleUserTypeChg"></u-subsection>
</view> --> </view> -->
<view v-show="false" class="withdraw-amount" style="margin-bottom: 20rpx;"> <view v-if="false" class="withdraw-amount" style="margin-bottom: 20rpx;">
<text>支付类型</text> <text>支付类型</text>
<view style="display: grid; grid-template-columns: repeat(3,1fr); width: 100%; margin: 10px auto;"> <view style="display: grid; grid-template-columns: repeat(3,1fr); width: 100%; margin: 10px auto;">
<view v-for="item in payType" @click="param.payType = item.key" :class="{'active': param.payType === item.key}" style="display: flex; flex-direction: column;justify-content: center; border-radius: 8px; align-items: center; padding: 5px 0;"> <view v-for="item in payType" @click="param.payType = item.key" :class="{'active': param.payType === item.key}" style="display: flex; flex-direction: column;justify-content: center; border-radius: 8px; align-items: center; padding: 5px 0;">
@ -122,6 +122,7 @@
<button v-if="step === 2" class="submit-btn" @click="onSubmit" style="margin-top: 30rpx;">{{this.$languageData.functions.payimme}}</button> <button v-if="step === 2" class="submit-btn" @click="onSubmit" style="margin-top: 30rpx;">{{this.$languageData.functions.payimme}}</button>
</view> </view>
</view> </view>
</view>
<!-- 银行卡列表弹出层 --> <!-- 银行卡列表弹出层 -->
<uni-popup ref="bankListPopup" type="bottom"> <uni-popup ref="bankListPopup" type="bottom">
@ -149,23 +150,19 @@
</view> </view>
</uni-popup> </uni-popup>
<loading ref="loading":custom="false" :shadeClick="false" :type="1" /> <loading ref="loading":custom="false" :shadeClick="false" :type="1" />
</view>
</view> </view>
</template> </template>
<script> <script>
import { createTopUp } from '@/api/home/qrcode.js' import { createTopUp } from '@/api/home/qrcode.js'
import { getBalance } from '@/api/account/userAccount.js' import { getBalance } from '@/api/account/userAccount.js'
import { getBankList2 } from '@/api/bank/index.js' import { getBankList2 } from '@/api/bank/index.js'
import payPopup from '@/components/keyboard/payPopup.vue' import payPopup from '@/components/keyboard/payPopup.vue'
import { checkPwd } from '@/api/mine/payPwd.js' import { checkPwd } from '@/api/mine/payPwd.js'
import keyboard from "@/components/master-keyboard/master-keyboard.vue"; import keyboard from "@/components/master-keyboard/master-keyboard.vue";
import payResult from '@/components/payResult/index.vue' import payResult from '@/components/payResult/index.vue'
export default { export default {
components: { components: {
payPopup, payPopup,
payResult payResult
@ -197,6 +194,7 @@ export default {
} }
], ],
step: 1, step: 1,
amount: 0,
success:true, success:true,
showResult:false, showResult:false,
@ -282,7 +280,7 @@ export default {
this.bankList.unshift(account) this.bankList.unshift(account)
account = { account = {
bankName:this.$languageData.functions.accBalance, bankName:this.$languageData.functions.accBalance,
cardNum2:'20 KIP' cardNum2: this.userAccount.availableBalance +' KIP'
} }
this.bankList.unshift(account) this.bankList.unshift(account)
this.userAccount.bankName = res[0].bankName this.userAccount.bankName = res[0].bankName
@ -315,7 +313,7 @@ export default {
this.closeBankList(); this.closeBankList();
}, },
hideKeyboard() { hideKeyboard() {
uni.hideKeyboard(); // uni.hideKeyboard();
}, },
getBalance(){ getBalance(){
getBalance().then(res=>{ getBalance().then(res=>{
@ -402,198 +400,198 @@ export default {
this.show = true; this.show = true;
} }
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.active{ .active{
border: 1px solid #FDBF44; border: 1px solid #FDBF44;
background-color: rgba(253, 191, 68, .2); background-color: rgba(253, 191, 68, .2);
} }
.popup-content2 { .popup-content2 {
background-color: #fff; background-color: #fff;
padding: 20px; padding: 20px;
border-radius: 10px; border-radius: 10px;
font-size: 20rpx; font-size: 20rpx;
text-align: center; text-align: center;
} }
.page { .page {
padding: 0; padding: 0;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.nav-bar { .nav-bar {
height: 88rpx; height: 88rpx;
background-color: #333333; background-color: #333333;
display: flex; display: flex;
align-items: center; align-items: center;
padding: 0 30rpx; padding: 0 30rpx;
position: relative; position: relative;
} }
.back-icon { .back-icon {
width: 20px; width: 20px;
height: 20px; height: 20px;
} }
.nav-title { .nav-title {
position: absolute; position: absolute;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
color: #FFFFFF; color: #FFFFFF;
font-size: 16px; font-size: 16px;
font-weight: 500; font-weight: 500;
} }
.content { .content {
flex: 1; flex: 1;
padding: 20rpx 30rpx; padding: 20rpx 30rpx;
} }
.bank-card { .bank-card {
background-color: #FFFFFF; background-color: #FFFFFF;
border-radius: 12rpx; border-radius: 12rpx;
padding: 30rpx; padding: 30rpx;
padding-bottom: 10rpx; padding-bottom: 10rpx;
margin-top: 30rpx; margin-top: 30rpx;
} }
.section-title { .section-title {
font-size: 14px; font-size: 14px;
color: #333333; color: #333333;
margin-bottom: 14rpx; margin-bottom: 14rpx;
padding-bottom: 14rpx; padding-bottom: 14rpx;
display: block; display: block;
} }
.bank-info { .bank-info {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
} }
.bank-detail { .bank-detail {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.bank-name { .bank-name {
font-size: 16px; font-size: 16px;
color: #333333; color: #333333;
margin-bottom: 8rpx; margin-bottom: 8rpx;
} }
.bank-number { .bank-number {
font-size: 14px; font-size: 14px;
color: #666666; color: #666666;
} }
.withdraw-amount { .withdraw-amount {
background-color: #FFFFFF; background-color: #FFFFFF;
border-radius: 12rpx; border-radius: 12rpx;
padding: 20rpx; padding: 20rpx;
padding-bottom: 15rpx; padding-bottom: 15rpx;
} }
.amount-header { .amount-header {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
} }
.withdraw-all { .withdraw-all {
font-size: 14px; font-size: 14px;
color: #f4d994; color: #f4d994;
} }
.amount-input-area { .amount-input-area {
display: flex; display: flex;
align-items: center; align-items: center;
border-bottom: 1px solid #EEEEEE; border-bottom: 1px solid #EEEEEE;
} }
.u-input ::v-deep .uni-input-input { .u-input ::v-deep .uni-input-input {
font-size: 58rpx; font-size: 58rpx;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
height: 100rpx; height: 100rpx;
line-height: 100rpx; line-height: 100rpx;
} }
.currency { .currency {
font-size: 30px; font-size: 30px;
color: #333333; color: #333333;
margin-left: 20rpx; margin-left: 20rpx;
} }
.amount-footer { .amount-footer {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
} }
.available-amount { .available-amount {
font-size: 14px; font-size: 14px;
color: #999999; color: #999999;
} }
.bottom-button { .bottom-button {
padding: 50rpx 0; padding: 50rpx 0;
} }
.submit-btn { .submit-btn {
background-color: #FDBF44; background-color: #FDBF44;
color: #000; color: #000;
font-size: 16px; font-size: 16px;
height: 88rpx; height: 88rpx;
line-height: 88rpx; line-height: 88rpx;
border-radius: 24rpx; border-radius: 24rpx;
} }
.popup-content { .popup-content {
background-color: #FFFFFF; background-color: #FFFFFF;
border-top-left-radius: 20rpx; border-top-left-radius: 20rpx;
border-top-right-radius: 20rpx; border-top-right-radius: 20rpx;
padding-bottom: env(safe-area-inset-bottom); padding-bottom: env(safe-area-inset-bottom);
} }
.popup-header { .popup-header {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
padding: 30rpx; padding: 30rpx;
border-bottom: 1px solid #EEEEEE; border-bottom: 1px solid #EEEEEE;
} }
.popup-title { .popup-title {
font-size: 16px; font-size: 16px;
color: #333333; color: #333333;
font-weight: 500; font-weight: 500;
} }
.bank-list { .bank-list {
max-height: 600rpx; max-height: 600rpx;
overflow-y: auto; overflow-y: auto;
} }
.bank-item { .bank-item {
padding: 30rpx; padding: 30rpx;
border-bottom: 1px solid #EEEEEE; border-bottom: 1px solid #EEEEEE;
} }
.bank-item-name { .bank-item-name {
font-size: 16px; font-size: 16px;
color: #333333; color: #333333;
margin-bottom: 8rpx; margin-bottom: 8rpx;
display: block; display: block;
} }
.bank-item-number { .bank-item-number {
font-size: 14px; font-size: 14px;
color: #666666; color: #666666;
} }
</style> </style>

6
pages/mine/info/edit.vue
View File

@ -152,7 +152,7 @@
</view> </view>
</uni-forms> </uni-forms>
<view style="position: sticky; bottom: 0; left:0; padding-bottom: 15px; background-color: white; z-index: 9999;"> <view style="position: sticky; bottom: 0; left:0; padding-bottom: 15px; background-color: white; z-index: 9999;">
<button v-show="step>0 && !checkOnly || true" class="submit-btn" @click="step = step === 0 ? step:step-1">{{languageData.functions.lastStep}}</button> <button v-show="step>0 && !checkOnly" class="submit-btn" @click="step = step === 0 ? step:step-1">{{languageData.functions.lastStep}}</button>
<button v-show="step<2 && !checkOnly" class="submit-btn" @click="nextStep()">{{languageData.functions.nextStep}}</button> <button v-show="step<2 && !checkOnly" class="submit-btn" @click="nextStep()">{{languageData.functions.nextStep}}</button>
<button v-show="step===2 && !checkOnly" class="submit-btn" @click="handleSubmit">{{languageData.me.submit}}</button> <button v-show="step===2 && !checkOnly" class="submit-btn" @click="handleSubmit">{{languageData.me.submit}}</button>
</view> </view>
@ -371,8 +371,8 @@
this.$refs.loading.close(); this.$refs.loading.close();
setTimeout(() => { setTimeout(() => {
this.$modal.msgSuccess(this.languageData.updateSuccess) this.$modal.msgSuccess(this.languageData.updateSuccess)
uni.switchTab({ uni.navigateTo({
url: '/pages/home/index' url: '/pages/mine/info/index'
}) })
}, 500) }, 500)
}, 1000) }, 1000)

9
pages/mine/info/index.vue
View File

@ -130,8 +130,8 @@
setTimeout(() => { setTimeout(() => {
setTimeout(() => { setTimeout(() => {
this.$modal.msgSuccess(this.languageData.updateSuccess) this.$modal.msgSuccess(this.languageData.updateSuccess)
uni.switchTab({ uni.navigateTo({
url: '/pages/home/index' url: '/pages/mine/info/index'
}) })
}, 500) }, 500)
}, 1000) }, 1000)
@ -166,6 +166,11 @@
url: '/pages/mine/info/edit' url: '/pages/mine/info/edit'
}) })
} else { //查看认证 } else { //查看认证
if(this.user.status == '3')
uni.navigateTo({
url: '/pages/mine/info/edit'
})
else
uni.navigateTo({ uni.navigateTo({
url: '/pages/mine/info/edit?checkOnly=1' url: '/pages/mine/info/edit?checkOnly=1'
}) })

8
pages/mine/info/merchant/edit.vue
View File

@ -79,7 +79,7 @@
></u--input> ></u--input>
</uni-forms-item> </uni-forms-item>
</view> </view>
<uni-forms-item :label="languageData.me.leId" name="legalPersonIdCard"> <uni-forms-item :label="languageData.functions.iDNumber" name="legalPersonIdCard">
<uni-easyinput :disabled="step === 2" v-model="formData.legalPersonIdCard" :placeholder="languageData.me.leId" clearable /> <uni-easyinput :disabled="step === 2" v-model="formData.legalPersonIdCard" :placeholder="languageData.me.leId" clearable />
</uni-forms-item> </uni-forms-item>
<view v-show="formData.licenseType == 1"> <view v-show="formData.licenseType == 1">
@ -260,7 +260,7 @@
if(this.formData.legalPersonExpirationTime === '' || this.formData.legalPersonExpirationTime == null) if(this.formData.legalPersonExpirationTime === '' || this.formData.legalPersonExpirationTime == null)
msg += ' '+this.$languageData.me.exTime+' ' msg += ' '+this.$languageData.me.exTime+' '
if(this.formData.legalPersonIdCard === '' || this.formData.legalPersonIdCard == null) if(this.formData.legalPersonIdCard === '' || this.formData.legalPersonIdCard == null)
msg += ' '+this.$languageData.me.leId+' ' msg += ' '+this.$languageData.functions.iDNumber+' '
if((this.fileList1 == null || this.fileList1.size === 0) && this.formData.licenseType == 1) if((this.fileList1 == null || this.fileList1.size === 0) && this.formData.licenseType == 1)
msg += ' '+this.$languageData.me.leupIdImg+' ' msg += ' '+this.$languageData.me.leupIdImg+' '
@ -384,8 +384,8 @@
this.$refs.loading.close(); this.$refs.loading.close();
setTimeout(() => { setTimeout(() => {
this.$modal.msgSuccess(this.languageData.updateSuccess) this.$modal.msgSuccess(this.languageData.updateSuccess)
uni.switchTab({ uni.navigateTo({
url: '/pages/home/index' url: '/pages/mine/info/merchant/index'
}) })
}, 500) }, 500)
}, 1000) }, 1000)

9
pages/mine/info/merchant/index.vue
View File

@ -118,8 +118,8 @@
setTimeout(() => { setTimeout(() => {
setTimeout(() => { setTimeout(() => {
this.$modal.msgSuccess(this.languageData.updateSuccess) this.$modal.msgSuccess(this.languageData.updateSuccess)
uni.switchTab({ uni.navigateTo({
url: '/pages/home/index' url: '/pages/mine/info/merchant/index'
}) })
}, 500) }, 500)
}, 1000) }, 1000)
@ -147,6 +147,11 @@
url: '/pages/mine/info/merchant/edit' url: '/pages/mine/info/merchant/edit'
}) })
} else { //查看认证 } else { //查看认证
if(this.user.status == '3')
uni.navigateTo({
url: '/pages/mine/info/merchant/edit'
})
else
uni.navigateTo({ uni.navigateTo({
url: '/pages/mine/info/merchant/edit?checkOnly=1' url: '/pages/mine/info/merchant/edit?checkOnly=1'
}) })

8
pages/mine/info/proxy/edit.vue
View File

@ -69,7 +69,7 @@
:disabledColor="step === 2 ? '#F7F6F6':'white'" suffixIcon="arrow-down"></u--input> :disabledColor="step === 2 ? '#F7F6F6':'white'" suffixIcon="arrow-down"></u--input>
</uni-forms-item> </uni-forms-item>
</view> </view>
<uni-forms-item :label="languageData.me.leId" name="legalPersonIdCard"> <uni-forms-item :label="languageData.functions.iDNumber" name="legalPersonIdCard">
<uni-easyinput :disabled="step === 2" v-model="formData.legalPersonIdCard" <uni-easyinput :disabled="step === 2" v-model="formData.legalPersonIdCard"
:placeholder="languageData.me.leId" clearable /> :placeholder="languageData.me.leId" clearable />
</uni-forms-item> </uni-forms-item>
@ -289,7 +289,7 @@
if (this.formData.legalPersonExpirationTime === '' || this.formData.legalPersonExpirationTime == null) if (this.formData.legalPersonExpirationTime === '' || this.formData.legalPersonExpirationTime == null)
msg += ' ' + this.$languageData.me.exTime + ' ' msg += ' ' + this.$languageData.me.exTime + ' '
if (this.formData.legalPersonIdCard === '' || this.formData.legalPersonIdCard == null) if (this.formData.legalPersonIdCard === '' || this.formData.legalPersonIdCard == null)
msg += ' ' + this.$languageData.me.leId + ' ' msg += ' ' + this.$languageData.functions.iDNumber + ' '
if ((this.fileList1 == null || this.fileList1.length === 0) && this.formData.licenseType == 1) if ((this.fileList1 == null || this.fileList1.length === 0) && this.formData.licenseType == 1)
msg += ' ' + this.$languageData.me.leupIdImg + ' ' msg += ' ' + this.$languageData.me.leupIdImg + ' '
@ -451,8 +451,8 @@
setTimeout(() => { setTimeout(() => {
this.$modal.msgSuccess(this.languageData this.$modal.msgSuccess(this.languageData
.updateSuccess) .updateSuccess)
uni.switchTab({ uni.navigateTo({
url: '/pages/home/index' url: '/pages/mine/info/proxy/index'
}) })
}, 500) }, 500)
}, 1000) }, 1000)

9
pages/mine/info/proxy/index.vue
View File

@ -119,8 +119,8 @@
setTimeout(() => { setTimeout(() => {
setTimeout(() => { setTimeout(() => {
this.$modal.msgSuccess(this.languageData.updateSuccess) this.$modal.msgSuccess(this.languageData.updateSuccess)
uni.switchTab({ uni.navigateTo({
url: '/pages/home/index' url: '/pages/mine/info/proxy/index'
}) })
}, 500) }, 500)
}, 1000) }, 1000)
@ -148,6 +148,11 @@
url: '/pages/mine/info/proxy/edit' url: '/pages/mine/info/proxy/edit'
}) })
} else { //查看认证 } else { //查看认证
if(this.user.status == '3')
uni.navigateTo({
url: '/pages/mine/info/proxy/edit'
})
else
uni.navigateTo({ uni.navigateTo({
url: '/pages/mine/info/proxy/edit?checkOnly=1' url: '/pages/mine/info/proxy/edit?checkOnly=1'
}) })

Write Preview
Loading…
Cancel
Save