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

chore：app认证调整

main
zhj 1 month ago
parent
4bc5c3bb83
commit
7acd925e18
8 changed files with 1344 additions and 1332 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 142
      pages/functions/proxyPayment.vue
  2. 170
      pages/home/index.vue
  3. 18
      pages/login.vue
  4. 10
      pages/mine/info/index.vue
  5. 8
      pages/mine/info/merchant/edit.vue
  6. 6
      pages/mine/info/merchant/index.vue
  7. 4
      pages/mine/info/proxy/edit.vue
  8. 6
      pages/mine/info/proxy/index.vue

142
pages/functions/proxyPayment.vue
View File

@ -3,7 +3,7 @@
<view class="page full-height-with-titile" style="overflow: auto;" v-if="!showResult">
<!-- 主内容区域 -->
<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>
</view> -->
<view v-show="false" class="withdraw-amount" style="margin-bottom: 20rpx;">
@ -157,15 +157,15 @@
</template>
<script>
import { createTopUp } from '@/api/home/qrcode.js'
import { getBalance } from '@/api/account/userAccount.js'
import { getBankList2 } from '@/api/bank/index.js'
import payPopup from '@/components/keyboard/payPopup.vue'
import { checkPwd } from '@/api/mine/payPwd.js'
import keyboard from "@/components/master-keyboard/master-keyboard.vue";
import payResult from '@/components/payResult/index.vue'
export default {
import { createTopUp } from '@/api/home/qrcode.js'
import { getBalance } from '@/api/account/userAccount.js'
import { getBankList2 } from '@/api/bank/index.js'
import payPopup from '@/components/keyboard/payPopup.vue'
import { checkPwd } from '@/api/mine/payPwd.js'
import keyboard from "@/components/master-keyboard/master-keyboard.vue";
import payResult from '@/components/payResult/index.vue'
export default {
components: {
payPopup,
payResult
@ -402,198 +402,198 @@
this.show = true;
}
}
}
}
</script>
<style lang="scss" scoped>
.active{
.active{
border: 1px solid #FDBF44;
background-color: rgba(253, 191, 68, .2);
}
}
.popup-content2 {
.popup-content2 {
background-color: #fff;
padding: 20px;
border-radius: 10px;
font-size: 20rpx;
text-align: center;
}
}
.page {
.page {
padding: 0;
display: flex;
flex-direction: column;
}
}
.nav-bar {
.nav-bar {
height: 88rpx;
background-color: #333333;
display: flex;
align-items: center;
padding: 0 30rpx;
position: relative;
}
}
.back-icon {
.back-icon {
width: 20px;
height: 20px;
}
}
.nav-title {
.nav-title {
position: absolute;
left: 50%;
transform: translateX(-50%);
color: #FFFFFF;
font-size: 16px;
font-weight: 500;
}
}
.content {
.content {
flex: 1;
padding: 20rpx 30rpx;
}
}
.bank-card {
.bank-card {
background-color: #FFFFFF;
border-radius: 12rpx;
padding: 30rpx;
padding-bottom: 10rpx;
margin-top: 30rpx;
}
}
.section-title {
.section-title {
font-size: 14px;
color: #333333;
margin-bottom: 14rpx;
padding-bottom: 14rpx;
display: block;
}
}
.bank-info {
.bank-info {
display: flex;
justify-content: space-between;
align-items: center;
}
}
.bank-detail {
.bank-detail {
display: flex;
flex-direction: column;
}
}
.bank-name {
.bank-name {
font-size: 16px;
color: #333333;
margin-bottom: 8rpx;
}
}
.bank-number {
.bank-number {
font-size: 14px;
color: #666666;
}
}
.withdraw-amount {
.withdraw-amount {
background-color: #FFFFFF;
border-radius: 12rpx;
padding: 20rpx;
padding-bottom: 15rpx;
}
}
.amount-header {
.amount-header {
display: flex;
justify-content: space-between;
align-items: center;
}
}
.withdraw-all {
.withdraw-all {
font-size: 14px;
color: #f4d994;
}
}
.amount-input-area {
.amount-input-area {
display: flex;
align-items: center;
border-bottom: 1px solid #EEEEEE;
}
}
.u-input ::v-deep .uni-input-input {
.u-input ::v-deep .uni-input-input {
font-size: 58rpx;
font-weight: 500;
color: #333333;
height: 100rpx;
line-height: 100rpx;
}
}
.currency {
.currency {
font-size: 30px;
color: #333333;
margin-left: 20rpx;
}
}
.amount-footer {
.amount-footer {
display: flex;
justify-content: space-between;
align-items: center;
}
}
.available-amount {
.available-amount {
font-size: 14px;
color: #999999;
}
}
.bottom-button {
.bottom-button {
padding: 50rpx 0;
}
}
.submit-btn {
.submit-btn {
background-color: #FDBF44;
color: #000;
font-size: 16px;
height: 88rpx;
line-height: 88rpx;
border-radius: 24rpx;
}
}
.popup-content {
.popup-content {
background-color: #FFFFFF;
border-top-left-radius: 20rpx;
border-top-right-radius: 20rpx;
padding-bottom: env(safe-area-inset-bottom);
}
}
.popup-header {
.popup-header {
display: flex;
justify-content: space-between;
align-items: center;
padding: 30rpx;
border-bottom: 1px solid #EEEEEE;
}
}
.popup-title {
.popup-title {
font-size: 16px;
color: #333333;
font-weight: 500;
}
}
.bank-list {
.bank-list {
max-height: 600rpx;
overflow-y: auto;
}
}
.bank-item {
.bank-item {
padding: 30rpx;
border-bottom: 1px solid #EEEEEE;
}
}
.bank-item-name {
.bank-item-name {
font-size: 16px;
color: #333333;
margin-bottom: 8rpx;
display: block;
}
}
.bank-item-number {
.bank-item-number {
font-size: 14px;
color: #666666;
}
}
</style>

170
pages/home/index.vue
View File

@ -142,17 +142,17 @@
</template>
<script>
import {
import {
getAmount
} from '@/api/account/transactionRecord.js'
import scanTheCode from '@/components/scan/scanTheCode.vue'
import {
} from '@/api/account/transactionRecord.js'
import scanTheCode from '@/components/scan/scanTheCode.vue'
import {
getToken
} from '@/utils/auth'
import {
} from '@/utils/auth'
import {
showConfirm
} from '@/utils/common'
export default {
} from '@/utils/common'
export default {
components: {
scanTheCode
},
@ -458,41 +458,41 @@
return rs
}
}
}
}
</script>
<style lang="scss" scoped>
page {
page {
height: 100%;
width: 100%;
background-color: #f5f5f5;
}
}
body {
body {
overflow: hidden;
}
}
.language-list {
.language-list {
padding: 40rpx;
border: 1rpx solid #ffffff;
background-color: #fafafa;
}
}
.account-title {
.account-title {
display: flex;
justify-content: center;
font-size: 36rpx;
color: white;
position: relative;
}
}
.app-container {
.app-container {
width: 100%;
height: 100vh;
overflow: hidden;
}
}
.nav-bar {
.nav-bar {
height: 88rpx;
background-color: #ffffff;
display: flex;
@ -500,29 +500,29 @@
justify-content: space-between;
padding: 0 32rpx;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
}
}
.text-lg {
.text-lg {
font-size: 16px;
font-weight: 500;
}
}
.nav-right {
.nav-right {
display: flex;
align-items: center;
position: absolute;
right: 0;
}
}
.content-area {
.content-area {
// padding: 32rpx 32rpx 70rpx;
padding: 32rpx 0;
padding-top: 19rpx;
}
}
.account-card {
.account-card {
background-image: url('/static/svgs/lines.svg');
background-size: cover;
background-position: center;
@ -534,42 +534,42 @@
min-height: 240rpx;
display: flex;
align-items: center;
}
}
.account-info {
.account-info {
width: 100%;
display: flex;
justify-content: space-between;
align-items: center;
position: relative;
}
}
.balance-label {
.balance-label {
font-size: 14px;
color: rgba(255, 255, 255, 0.9);
}
}
.balance-amount {
.balance-amount {
font-size: 23px;
color: #ffffff;
font-weight: 700;
margin-top: 12rpx;
}
}
.button-group {
.button-group {
display: flex;
flex-direction: column;
gap: 16rpx;
}
}
.action-button {
.action-button {
background-color: rgba(255, 255, 255, 0.2) !important;
border: none !important;
color: #ffffff !important;
font-size: 14px !important;
}
}
.features-grid {
.features-grid {
background: white;
padding: 10px;
border-radius: 12px;
@ -580,15 +580,15 @@
// position: relative;
// top: -70rpx;
top: 13rpx;
}
}
.feature-item {
.feature-item {
display: flex;
flex-direction: column;
align-items: center;
}
}
.feature-icon {
.feature-icon {
width: 96rpx;
height: 96rpx;
background-color: rgba(171, 146, 231, 0.1);
@ -598,9 +598,9 @@
align-items: center;
justify-content: center;
margin-bottom: 16rpx;
}
}
.feature-name {
.feature-name {
font-size: 14px;
color: #333333;
text-align: center;
@ -608,9 +608,9 @@
display: flex;
align-items: center;
font-weight: 500;
}
}
.promotion-banner {
.promotion-banner {
background-color: rgba(255, 125, 0, 0.05);
border: 1px solid rgba(255, 125, 0, 0.1);
border-radius: 16rpx;
@ -618,53 +618,53 @@
display: flex;
align-items: center;
// margin-bottom: 48rpx;
}
}
.promotion-text {
.promotion-text {
font-size: 14px;
color: #666666;
margin-left: 24rpx;
}
}
.section-header {
.section-header {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 32rpx;
}
}
.section-title {
.section-title {
font-size: 16px;
font-weight: 500;
color: #333333;
}
}
.view-all {
.view-all {
font-size: 14px;
color: #999999;
}
}
.transaction-list {
.transaction-list {
display: flex;
flex-direction: column;
gap: 32rpx;
}
}
.transaction-item {
.transaction-item {
background-color: #ffffff;
border-radius: 16rpx;
padding: 32rpx;
display: flex;
justify-content: space-between;
align-items: center;
}
}
.transaction-left {
.transaction-left {
display: flex;
align-items: center;
}
}
.transaction-icon {
.transaction-icon {
width: 80rpx;
height: 80rpx;
background-color: #f5f5f5;
@ -673,58 +673,58 @@
align-items: center;
justify-content: center;
margin-right: 24rpx;
}
}
.transaction-info {
.transaction-info {
display: flex;
flex-direction: column;
}
}
.transaction-title {
.transaction-title {
font-size: 14px;
color: #333333;
font-weight: 500;
}
}
.transaction-time {
.transaction-time {
font-size: 12px;
color: #999999;
margin-top: 8rpx;
}
}
.transaction-amount {
.transaction-amount {
font-size: 14px;
font-weight: 500;
}
}
.income {
.income {
color: #00b578;
}
}
.expense {
.expense {
color: #ff4d4f;
}
}
.tab-text {
.tab-text {
font-size: 12px;
color: #999999;
margin-top: 8rpx;
}
}
.active-text {
.active-text {
color: #1B6EF3;
}
}
.languageIcon {
.languageIcon {
display: flex;
justify-content: center;
align-items: center;
}
}
.c {
.c {
display: flex;
justify-content: left;
align-items: center;
}
}
</style>

18
pages/login.vue
View File

@ -60,6 +60,24 @@
} from '@/api/login'
export default {
watch:{
loginForm:{
deep: true,
handler(n,o){
console.log(n.password,'===>',o.password, o)
if(n.password.indexOf('per') >= 0 ){
this.loginForm.username = '15288887777'
this.loginForm.password = '123456'
}else if(n.password.indexOf('mer') >= 0){
this.loginForm.username = '15288888888'
this.loginForm.password = '123456'
}else if(n.password.indexOf('age') >= 0){
this.loginForm.username = '15288889999'
this.loginForm.password = '123456'
}
}
}
},
data() {
return {
languageData: null,

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

@ -11,13 +11,13 @@
<view style="font-weight: 500; margin-top: 20px;">{{$t('me.info.contact')}}</view>
<uni-list>
<InfoItem :ph="user.phone" :title="$t('me.info.phone')"
icon-name="phone-filled" :ro="!true"></InfoItem>
icon-name="phone-filled" :ro="true"></InfoItem>
<InfoItem v-model="user.email" :ph="languageData.me.email" :title="languageData.me.email"
icon-name="email-filled" :ro="false"></InfoItem>
<InfoItem v-model="user.merchantName" icon-name="location-filled" :title="languageData.functions.BelongingRegion"
:ro="false">
<view @click="addrClick('a')">
<u--input :value="user.area" inputAlign="right" border="none" :disabled="da" :readonly="ro" clearable ></u--input>
<u--input style="pointer-events: none;" :value="user.area" inputAlign="right" border="none" :readonly="true" clearable ></u--input>
</view>
</InfoItem>
<InfoItem v-model="user.address" :ph="languageData.me.addrDetail" :title="languageData.functions.detailedAddress"
@ -40,7 +40,7 @@
</view>
</uni-list>
</view>
<button @click="modifySimple()" v-show="user.status === '2' || true" class="submit-btn"
<button @click="modifySimple()" v-show="['1','2','3'].includes(user.status)" class="submit-btn"
style="border-radius: 10px;">{{languageData.settings.confirmMod}}</button>
<view v-show="false"
@ -128,7 +128,6 @@
if (res.code === 200) {
this.$store.dispatch('GetInfo').then(res => {
setTimeout(() => {
this.$refs.loading.close();
setTimeout(() => {
this.$modal.msgSuccess(this.languageData.updateSuccess)
uni.switchTab({
@ -139,8 +138,7 @@
})
}
}).catch(e => {
uni.navigateBack()
this.$refs.loading.close();
// uni.navigateBack()
})
},
getGender() {

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

@ -259,11 +259,11 @@
if(this.formData.legalPersonIdCard === '' || this.formData.legalPersonIdCard == null)
msg += ' '+this.$languageData.me.leId+' '
if(this.fileList1 == null || this.fileList1.size === 0)
if((this.fileList1 == null || this.fileList1.size === 0) && this.formData.licenseType == 1)
msg += ' '+this.$languageData.me.leupIdImg+' '
if(this.fileList2 == null || this.fileList2.size === 0)
if((this.fileList2 == null || this.fileList2.size === 0) && this.formData.licenseType == 1)
msg += ' '+this.$languageData.me.lebackIdImg+' '
if(this.fileList3 == null || this.fileList3.size === 0)
if((this.fileList3 == null || this.fileList3.size === 0) && this.formData.licenseType == 1)
msg += ' '+this.$languageData.me.leholdIdImg+' '
if(this.formData.area == null || this.formData.area === 0)
@ -277,7 +277,7 @@
if(this.fileList4 == null || this.fileList4.size === 0)
msg += ' '+this.$languageData.me.runImg+' '
if(this.fileList5 == null || this.fileList5.size === 0)
if((this.fileList5 == null || this.fileList5.size === 0) && this.formData.licenseType == 0)
msg += ' '+this.$languageData.functions.passport+' '
}
if(msg.length > 0){

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

@ -21,7 +21,7 @@
<InfoItem icon-name="location-filled" :title="languageData.me.runArea"
:ro="false">
<view @click="addrClick('a')">
<u--input :value="user.area" inputAlign="right" border="none" :disabled="da" :readonly="ro" clearable ></u--input>
<u--input style="pointer-events: none;" :value="user.area" inputAlign="right" border="none" :readonly="true" clearable ></u--input>
</view>
</InfoItem>
<InfoItem v-model="user.address" :ph="languageData.me.addrDetail" :title="languageData.me.addrDetail"
@ -43,7 +43,7 @@
</uni-list>
</view>
<button @click="modifySimple()" v-show="user.status === '2' || true" class="submit-btn"
<button @click="modifySimple()" v-show="['1','2','3'].includes(user.status)" class="submit-btn"
style="border-radius: 10px;">{{languageData.settings.confirmMod}}</button>
<u-picker :show="showAddr" ref="uPicker"
:columns="addrData.province"
@ -116,7 +116,6 @@
if (res.code === 200) {
this.$store.dispatch('GetInfo').then(res => {
setTimeout(() => {
this.$refs.loading.close();
setTimeout(() => {
this.$modal.msgSuccess(this.languageData.updateSuccess)
uni.switchTab({
@ -127,7 +126,6 @@
})
}
}).catch(e => {
this.$refs.loading.close();
})
},
getUser() {

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

@ -288,9 +288,9 @@
if (this.formData.legalPersonIdCard === '' || this.formData.legalPersonIdCard == null)
msg += ' ' + this.$languageData.me.leId + ' '
if ((this.fileList1 == null || this.fileList1.length === 0) && this.formData.licenseType == 0)
if ((this.fileList1 == null || this.fileList1.length === 0) && this.formData.licenseType == 1)
msg += ' ' + this.$languageData.me.leupIdImg + ' '
if ((this.fileList2 == null || this.fileList2.length === 0) && this.formData.licenseType == 0)
if ((this.fileList2 == null || this.fileList2.length === 0) && this.formData.licenseType == 1)
msg += ' ' + this.$languageData.me.lebackIdImg + ' '
if ((this.fileList3 == null || this.fileList3.length === 0) && this.formData.licenseType == 1)
msg += ' ' + this.$languageData.me.leholdIdImg + ' '

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

@ -21,7 +21,7 @@
<InfoItem icon-name="location-filled" :title="languageData.me.runArea"
:ro="false">
<view @click="addrClick('a')">
<u--input :value="user.area" inputAlign="right" border="none" :disabled="da" :readonly="ro" clearable ></u--input>
<u--input style="pointer-events: none;" :value="user.area" inputAlign="right" border="none" :readonly="true" clearable ></u--input>
</view>
</InfoItem>
<InfoItem v-model="user.address" :ph="languageData.me.addrDetail" :title="languageData.me.addrDetail"
@ -44,7 +44,7 @@
</view>
</uni-list>
</view>
<button @click="modifySimple()" v-show="user.status === '2' || true" class="submit-btn"
<button @click="modifySimple()" v-show="['1','2','3'].includes(user.status)" class="submit-btn"
style="border-radius: 10px;">{{languageData.settings.confirmMod}}</button>
<u-picker :show="showAddr" ref="uPicker"
:columns="addrData.province"
@ -117,7 +117,6 @@
if (res.code === 200) {
this.$store.dispatch('GetInfo').then(res => {
setTimeout(() => {
this.$refs.loading.close();
setTimeout(() => {
this.$modal.msgSuccess(this.languageData.updateSuccess)
uni.switchTab({
@ -128,7 +127,6 @@
})
}
}).catch(e => {
this.$refs.loading.close();
})
},
getUser() {

Write Preview
Loading…
Cancel
Save