angelo
/
web-retail-h5
3
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: angelo:840785e62f171687419af86596c9d360377713a8
Branches Tags
angelo:master
angelo:base-online
angelo:base-test
angelo:dev
angelo:feat/share-register
angelo:feat/pay/merge
..
compare: angelo:601439f3e67d1541704d77875187281ee48893c7
Branches Tags
angelo:base-online
angelo:base-test
angelo:dev
angelo:feat/share-register
angelo:feat/pay/merge
angelo:master

No commits in common. "840785e62f171687419af86596c9d360377713a8" and "601439f3e67d1541704d77875187281ee48893c7" have entirely different histories.
840785e62f ... 601439f3e6

6 changed files with 370 additions and 527 deletions
Show Stats Expand all files Collapse all files

210
config/balance.js
View File

@ -1,230 +1,202 @@
const http = uni.$u.http const http = uni.$u.http
// 钱包余额 // 钱包余额
export const getWalletBalance = params => export const getWalletBalance = (params) => http.get('/member/api/wallet/balance', {
http.get('/member/api/wallet/balance', { params
params,
}) })
//提现账户 //提现账户
export const getPkBdAccountList = params => export const getPkBdAccountList = (params) => http.get('/system/api/account/pkBdAccountList', {
http.get('/system/api/account/pkBdAccountList', { params
params,
}) })
//提现选择银行卡 //提现选择银行卡
export const getDefaultBank = params => export const getDefaultBank = (params) => http.get('/member/api/bank/default-bank', {
http.get('/member/api/bank/default-bank', { params
params, })
//校验是否绑定银行卡
export const checkIsbindBank = (params) => http.get('/member/api/bank/is-bind', {
params
}) })
//提现页面展示 //提现页面展示
export const getWidthdrawShow = params => export const getWidthdrawShow = (params) => http.get('/member/api/withdraw/show/add', {
http.get('/member/api/withdraw/show/add', { params
params,
}) })
//确认提现 //确认提现
export const addWithdraw = params => export const addWithdraw = (params) => http.post('/member/api/withdraw/add', params)
http.post('/member/api/withdraw/add', params)
//提现明细列表 //提现明细列表
export const getWithdrawList = params => export const getWithdrawList = (params) => http.get('/member/api/withdraw/list-detail', {
http.get('/member/api/withdraw/list-detail', { params
params,
}) })
//提现撤销 //提现撤销
export const cancelWithdraw = params => export const cancelWithdraw = (params) => http.get('/member/api/withdraw/cancel', {
http.get('/member/api/withdraw/cancel', { params
params,
}) })
//获取转账转出账户 //获取转账转出账户
export const getTransferAccount = params => export const getTransferAccount = (params) => http.get('/member/api/transfer/transfer-account', {
http.get('/member/api/transfer/transfer-account', { params
params,
}) })
//根据用户编号查询用户姓名 //根据用户编号查询用户姓名
export const getTransferChineseName = params => export const getTransferChineseName = (params) => http.get('/member/api/transfer/chinese-name', {
http.get('/member/api/transfer/chinese-name', { params
params,
}) })
//查询选择账户可转账余额 //查询选择账户可转账余额
export const getTransferMember = params => export const getTransferMember = (params) => http.get('/member/api/transfer/member-balance', {
http.get('/member/api/transfer/member-balance', { params
params,
}) })
//确认转账 //确认转账
export const addTransfer = params => export const addTransfer = (params) => http.post('/member/api/transfer/add', params)
http.post('/member/api/transfer/add', params)
//钱包银行卡列表 //钱包银行卡列表
export const getBankList = params => export const getBankList = (params) => http.get('/member/api/bank/list', {
http.get('/member/api/bank/list', { params
params,
}) })
//解除绑定 //解除绑定
export const removeBankBind = params => export const removeBankBind = (params) => http.get('/member/api/bank/unbind-bank', {
http.get('/member/api/bank/unbind-bank', { params
params,
}) })
//获取银行验证码 //获取银行验证码
export const getVerification = params => export const getVerification = (params) => http.get('/member/api/sms/verification', {
http.get('/member/api/sms/verification', { params
params,
}) })
//绑定银行卡校验 //绑定银行卡校验
export const verifyBankCard = params => export const verifyBankCard = (params) => http.post('/member/api/bank/verify-bank-card', params)
http.post('/member/api/bank/verify-bank-card', params)
//是否配置白名单 白名单不进行银行卡四要素校验
export const checkIfWhite = (params) => http.get('/member/api/bank/is-white-list', {
params
})
//银行卡选择下拉选 //银行卡选择下拉选
export const getBankCardChoiceList = params => export const getBankCardChoiceList = (params) => http.get('/system/api/bank/list', {
http.get('/system/api/bank/list', { params
params,
}) })
//钱包绑卡 //钱包绑卡
export const bindWalletBankAdd = params => export const bindWalletBankAdd = (params) => http.post('/member/api/bank/add', params)
http.post('/member/api/bank/add', params)
// 交易明细 // 交易明细
export const getTransactionDetails = params => export const getTransactionDetails = (params) => http.post('/member/api/wallet/transaction-details?pageNum=' + params
http.post( .pageNum + "&pageSize=" + params.pageSize, params)
'/member/api/wallet/transaction-details?pageNum=' +
params.pageNum +
'&pageSize=' +
params.pageSize,
params
)
//交易类型下拉选 //交易类型下拉选
export const getTradeTypeList = params => export const getTradeTypeList = (params) => http.get('/member/api/wallet/trade-type', {
http.get('/member/api/wallet/trade-type', { params
params,
}) })
//币种-账户类型下拉选 //币种-账户类型下拉选
export const getEnumsAccountList = params => export const getEnumsAccountList = (params) => http.get('/system/api/account/pkBdAccountList', {
http.get('/system/api/account/pkBdAccountList', { params
params,
}) })
//意见反馈类型 //意见反馈类型
export const getFeedbackType = params => export const getFeedbackType = (params) => http.get('/system/pub/enums/feedback-type', {
http.get('/system/pub/enums/feedback-type', { params
params,
}) })
//提交意见反馈列表 //提交意见反馈列表
export const saveFeedBack = params => export const saveFeedBack = (params) => http.post('/system/api/feedback/save', params)
http.post('/system/api/feedback/save', params)
// 公告、站内信、意见反馈数 // 公告、站内信、意见反馈数
export const getNoticeCount = params => export const getNoticeCount = (params) => http.get('/system/api/notice/index-count', {
http.get('/system/api/notice/index-count', { params
params,
}) })
// 公告站内信列表 公告1站内信2 // 公告站内信列表 公告1站内信2
export const getNoticeList = params => export const getNoticeList = (params) => http.get('/system/api/notice/index-list', {
http.get('/system/api/notice/index-list', { params
params,
}) })
//意见列表 //意见列表
export const getFeedbackList = params => export const getFeedbackList = (params) => http.get('/system/api/feedback/index-list', {
http.get('/system/api/feedback/index-list', { params
params,
}) })
//获取公告、站内信详情 //获取公告、站内信详情
export const getNoticeDetail = params => export const getNoticeDetail = (params) => http.get('/system/api/notice/index-detail', {
http.get('/system/api/notice/index-detail', { params
params,
}) })
//二级密码校验 //二级密码校验
export const checkPwd = params => export const checkPwd = (params) => http.get('/member/api/recharge/check-pwd', {
http.get('/member/api/recharge/check-pwd', { params
params,
}) })
//是否进行实名认证 //是否进行实名认证
export const getIfAuth = params => export const getIfAuth = (params) => http.get('/member/api/authentication/is-auth', {
http.get('/member/api/authentication/is-auth', { params
params,
}) })
//证件类型 //证件类型
export const getCardType = params => export const getCardType = (params) => http.get('/system/pub/enums/id-type', {
http.get('/system/pub/enums/id-type', { params
params,
}) })
//实名认证 //实名认证
export const addAuthentication = params => export const addAuthentication = (params) => http.post('/member/api/authentication/add', params)
http.post('/member/api/authentication/add', params)
//上传图片 //上传图片
export const getUploadUrl = params => http.post('/system/upload', params) export const getUploadUrl = (params) => http.post('/system/upload', params)
//成长之路-等级 //成长之路-等级
export const getGrowUpGrade = params => export const getGrowUpGrade = (params) => http.get('/member/api/member-footmark/grow-up-footmark-grade', {
http.get('/member/api/member-footmark/grow-up-footmark-grade', { params
params,
}) })
//成长之路-奖衔 //成长之路-奖衔
export const getGrowUpAwards = params => export const getGrowUpAwards = (params) => http.get('/member/api/member-footmark/grow-up-footmark-awards', {
http.get('/member/api/member-footmark/grow-up-footmark-awards', { params
params,
}) })
//是否上传营业执照 //是否上传营业执照
export const getIsExist = params => export const getIsExist = (params) => http.get('/member/api/business/license/is-exist', {
http.get('/member/api/business/license/is-exist', { params
params,
}) })
//上传营业执照 //上传营业执照
export const addLicense = params => export const addLicense = (params) => http.post('/member/api/business/license/add', params)
http.post('/member/api/business/license/add', params)
//营业执照详情 //营业执照详情
export const getLicenseDetail = params => export const getLicenseDetail = (params) => http.get('/member/api/business/license/detail', {
http.get('/member/api/business/license/detail', { params
params,
}) })
//修改营业执照 //修改营业执照
export const updateLicense = params => export const updateLicense = (params) => http.post('/member/api/business/license/update', params)
http.post('/member/api/business/license/update', params)
//ocr //ocr
export const ocrIdCard = params => export const ocrIdCard = (params) => http.post('/member/api/authentication/invoke-idCard', params)
http.post('/member/api/authentication/invoke-idCard', params)
//ocrBack //ocrBack
export const ocrIdCardBack = params => export const ocrIdCardBack = (params) => http.post('/member/api/authentication/invoke-idCard-back', params)
http.post('/member/api/authentication/invoke-idCard-back', params)
//实名认证详情 //实名认证详情
export const authenticationDetails = params => export const authenticationDetails = (params) => http.get('/member/api/authentication/detail', {
http.get('/member/api/authentication/detail', { params
params,
}) })
//实名认证详情续约用 //实名认证详情续约用
export const agreementName = params => export const agreementName = (params) => http.get('/member/api/authentication/agreement-real-name', {
http.get('/member/api/authentication/agreement-real-name', { params
params,
}) })
//设置默认银行卡 //设置默认银行卡
export const updateDefault = params => export const updateDefault = (params) => http.get('/member/api/bank/update-default', {
http.get('/member/api/bank/update-default', { params
params,
}) })

2
config/request.js
View File

@ -20,7 +20,7 @@ module.exports = vm => {
//#ifdef DEV_SERVER //#ifdef DEV_SERVER
console.log('DEV_SERVER') console.log('DEV_SERVER')
config.baseURL = 'https://t-app.beida777.com/prod-api' config.baseURL = 'http://t-app.beida777.com/prod-api'
//#endif //#endif
//#ifdef QA_SERVER //#ifdef QA_SERVER

43
pages/mine/balance/withdrawal.vue
View File

@ -7,7 +7,7 @@
:rules="rules" :rules="rules"
ref="uForm" ref="uForm"
> >
<u-form-item <!-- <u-form-item
label-width="200rpx" label-width="200rpx"
:label="'银行卡号'" :label="'银行卡号'"
prop="cardNumber" prop="cardNumber"
@ -24,7 +24,7 @@
<view v-else style="color: red" @click="goBindbank"> <view v-else style="color: red" @click="goBindbank">
{{ '请先绑定银行卡' }} {{ '请先绑定银行卡' }}
</view> </view>
</u-form-item> </u-form-item> -->
<u-form-item <u-form-item
label-width="200rpx" label-width="200rpx"
:label="`${'提现金额'}(${isLocaled()})`" :label="`${'提现金额'}(${isLocaled()})`"
@ -134,16 +134,7 @@
<u-button class="subbtn" @click="submit">{{ '提现' }}</u-button> <u-button class="subbtn" @click="submit">{{ '提现' }}</u-button>
</view> </view>
<u-toast ref="uToast"></u-toast> <u-toast ref="uToast"></u-toast>
<u-modal
:show="unBindDefaultModal"
showCancelButton
@cancel="unBindDefaultModal = false"
cancelText="取消"
confirmText="确定"
@confirm="unBindDefaultConfirm"
>
请先绑定默认银行卡
</u-modal>
<!-- 提现引导弹窗 --> <!-- 提现引导弹窗 -->
<!-- <WithdrawalGuide <!-- <WithdrawalGuide
:show="showWithdrawalGuide" :show="showWithdrawalGuide"
@ -202,9 +193,8 @@ export default {
bankData: {}, bankData: {},
widthDrwaData: {}, widthDrwaData: {},
ifeye: false, ifeye: false,
canbind: true, canbind: false,
showWithdrawalGuide: false, showWithdrawalGuide: false,
unBindDefaultModal: false,
} }
}, },
watch: { watch: {
@ -215,7 +205,7 @@ export default {
url: '/pages/mine/balance/withdrawlDetail', url: '/pages/mine/balance/withdrawlDetail',
}) })
}, },
onShow() { onLoad() {
this.getList() this.getList()
}, },
methods: { methods: {
@ -243,18 +233,16 @@ export default {
} }
}) })
bal.getDefaultBank().then(res => { bal.getDefaultBank().then(res => {
if (res.data && Object.keys(res.data).length > 0) {
this.bankData = res.data this.bankData = res.data
this.dataForm.pkBank = res.data.pkId this.dataForm.pkBank = res.data.pkId
} else {
this.unBindDefaultModal = true
}
}) })
}, //校验是否绑定银行卡
unBindDefaultConfirm() { bal.checkIsbindBank().then(res => {
this.unBindDefaultModal = false if (res.flag == 'Y') {
uni.navigateTo({ this.canbind = false
url: '/pages/mine/bindBank/index', } else if (res.flag == 'N') {
this.canbind = true
}
}) })
}, },
submit() { submit() {
@ -269,12 +257,7 @@ export default {
}) })
setTimeout(() => { setTimeout(() => {
uni.navigateBack() uni.navigateBack()
}, 500) }, 300)
// 显示提现引导弹窗
// setTimeout(() => {
// this.showWithdrawalGuide = true
// }, 300)
} }
}) })
}) })

86
pages/mine/bindBank/bindBank.vue
View File

@ -7,9 +7,21 @@
:rules="rules" :rules="rules"
ref="uForm" ref="uForm"
> >
<u-form-item
label-width="200rpx"
:label="'银行卡号'"
borderBottom
prop="cardNumber"
ref="item1"
>
<u--input
v-model="dataForm.cardNumber"
disabledColor="#F5F5F5;"
border="none"
></u--input>
</u-form-item>
<u-form-item <u-form-item
borderBottom borderBottom
required
label-width="200rpx" label-width="200rpx"
:label="'银行名称'" :label="'银行名称'"
prop="bankName" prop="bankName"
@ -28,7 +40,6 @@
<u-form-item <u-form-item
label-width="200rpx" label-width="200rpx"
:label="'开户支行'" :label="'开户支行'"
required
prop="subBankName" prop="subBankName"
borderBottom borderBottom
ref="item1" ref="item1"
@ -41,22 +52,7 @@
</u-form-item> </u-form-item>
<u-form-item <u-form-item
label-width="200rpx" label-width="200rpx"
:label="'银行卡号'" :label="'真实姓名'"
required
borderBottom
prop="cardNumber"
ref="item1"
>
<u--input
v-model="dataForm.cardNumber"
disabledColor="#F5F5F5;"
border="none"
></u--input>
</u-form-item>
<u-form-item
label-width="200rpx"
label="开户姓名"
required
prop="accountName" prop="accountName"
borderBottom borderBottom
ref="item1" ref="item1"
@ -70,7 +66,6 @@
<u-form-item <u-form-item
label-width="200rpx" label-width="200rpx"
:label="'证件号码'" :label="'证件号码'"
required
prop="idCard" prop="idCard"
borderBottom borderBottom
ref="item1" ref="item1"
@ -86,7 +81,6 @@
label-width="200rpx" label-width="200rpx"
:label="'联系方式'" :label="'联系方式'"
prop="phone" prop="phone"
required
borderBottom borderBottom
ref="item1" ref="item1"
> >
@ -101,7 +95,6 @@
v-if="userInfo.pkCountry == 1 && cancode" v-if="userInfo.pkCountry == 1 && cancode"
label-width="200rpx" label-width="200rpx"
:label="'验证码'" :label="'验证码'"
required
prop="verificationCode" prop="verificationCode"
borderBottom borderBottom
ref="item1" ref="item1"
@ -138,13 +131,6 @@
></u-picker> ></u-picker>
</u--form> </u--form>
</view> </view>
<view class="tip-wrapper">
<view class="tip-content">
<view class="tip-text"
>银行卡号、真实姓名、证件号码、联系方式，请与银行预留信息保持一致</view
>
</view>
</view>
<view class="btnbox"> <view class="btnbox">
<u-button class="subbtn" @click="submit">{{ '确定' }}</u-button> <u-button class="subbtn" @click="submit">{{ '确定' }}</u-button>
</view> </view>
@ -235,8 +221,18 @@ export default {
onLoad() { onLoad() {
this.userInfo = uni.getStorageSync('User') this.userInfo = uni.getStorageSync('User')
this.getList() this.getList()
this.checkIfWhite()
}, },
methods: { methods: {
checkIfWhite() {
ban.checkIfWhite().then(res => {
if (res.code == 200 && res.flag == 'N') {
this.cancode = true
} else if (res.code == 200 && res.flag == 'Y') {
this.cancode = false
}
})
},
codeChange(text) { codeChange(text) {
this.tips = text this.tips = text
}, },
@ -299,7 +295,9 @@ export default {
.then(res => { .then(res => {
// 没有三方接口 临机写死 // 没有三方接口 临机写死
this.ifpass = true this.ifpass = true
this.bindBank()
return
if (this.userInfo.pkCountry == 1) { if (this.userInfo.pkCountry == 1) {
if (this.cancode) { if (this.cancode) {
ban ban
@ -376,37 +374,5 @@ export default {
border-radius: 38rpx; border-radius: 38rpx;
color: #fff; color: #fff;
} }
.tip-wrapper {
margin: 20rpx 20rpx 0 20rpx;
.tip-content {
display: flex;
align-items: flex-start;
background: linear-gradient(135deg, #fff3e0 0%, #fff8f0 100%);
border: 2rpx solid #ffb74d;
border-radius: 16rpx;
padding: 20rpx 24rpx;
box-shadow: 0 4rpx 12rpx rgba(255, 183, 77, 0.1);
.tip-icon {
color: #ff9800;
font-size: 28rpx;
font-weight: bold;
margin-right: 16rpx;
margin-top: 2rpx;
flex-shrink: 0;
}
.tip-text {
flex: 1;
font-size: 24rpx;
line-height: 36rpx;
color: #e65100;
font-weight: 500;
letter-spacing: 0.5rpx;
}
}
}
} }
</style> </style>

122
pages/mine/bindBank/index.vue
View File

@ -1,12 +1,8 @@
<template> <template>
<view class="content"> <view class="content">
<view class="tablebox" v-if="tableData.length > 0"> <view class="tablebox" v-if="tableData.length > 0">
<view <view class="card" v-for="(item, index) in tableData"
class="card" :style="{ backgroundImage: 'url(' + item.backgroundImg + ')'}" :key="index">
v-for="(item, index) in tableData"
:style="{ backgroundImage: 'url(' + item.backgroundImg + ')' }"
:key="index"
>
<view class="cardtopflex"> <view class="cardtopflex">
<view class="cardtopflex2"> <view class="cardtopflex2">
<view class="imgbox"><img :src="item.logo" alt="" /></view> <view class="imgbox"><img :src="item.logo" alt="" /></view>
@ -18,74 +14,43 @@
<view class="flexs_1" v-if="item.defaultCard==1"> <view class="flexs_1" v-if="item.defaultCard==1">
<view class="qiu"></view> <view class="qiu"></view>
<view v-if="userInfo.pkCountry == 1">{{'默认'}}</view> <view v-if="userInfo.pkCountry == 1">{{'默认'}}</view>
<view <view v-else style="color: #000;font-weight: bold;" class="cardfooter">{{'默认'}}</view>
v-else
style="color: #000; font-weight: bold"
class="cardfooter"
>{{ '默认' }}</view
>
</view> </view>
<view class="flexs_1" v-else> <view class="flexs_1" v-else>
<view
style="color: #fff; font-weight: bold; cursor: pointer" <view style="color: #fff; font-weight: bold; cursor: pointer" @click="setDefault(item.pkId)"
@click="setDefault(item.pkId)" class="cardfooter">{{'设为默认'}}</view>
class="cardfooter"
>{{ '设为默认' }}</view
>
</view> </view>
</view> </view>
<view class="cardNumber">{{ item.cardNumber }}</view> <view class="cardNumber">{{ item.cardNumber }}</view>
<view <view v-if="userInfo.pkCountry == 1" class="cardfooter" @click="removeBind(item)">
v-if="userInfo.pkCountry == 1" [{{'解绑'}}]</view>
class="cardfooter" <view v-else style="color: #000;font-weight: bold;" class="cardfooter" @click="removeBind(item)">
@click="removeBind(item)" [{{'解绑'}}]</view>
>
[{{ '解绑' }}]</view
>
<view
v-else
style="color: #000; font-weight: bold"
class="cardfooter"
@click="removeBind(item)"
>
[{{ '解绑' }}]</view
>
</view> </view>
</view> </view>
<u-modal <u-modal :showCancelButton="true" @cancel="modalShow=false" :content="'是否确认解绑银行卡'" :show="modalShow"
:showCancelButton="true" @confirm="confirmRemove" ref="uModal" :asyncClose="true"></u-modal>
@cancel="modalShow = false" <view class="footerbtn" @click="goAdd">
:content="'是否确认解绑银行卡'" +{{'添加银行卡'}}
:show="modalShow" </view>
@confirm="confirmRemove"
ref="uModal"
:asyncClose="true"
></u-modal>
<view class="footerbtn" @click="goAdd"> +{{ '添加银行卡' }} </view>
<u-modal <u-modal :showCancelButton="true" @cancel="modalShow2=false" content="当前解绑为默银行卡，请设置为另一张卡为默认银行卡"
:showCancelButton="true" :show="modalShow2" @confirm="confirmRemove2" ref="uModal" :asyncClose="true"></u-modal>
@cancel="modalShow2 = false"
content="当前解绑为默银行卡，请设置为另一张卡为默认银行卡"
:show="modalShow2"
@confirm="confirmRemove2"
ref="uModal"
:asyncClose="true"
></u-modal>
<!-- <el-button class="footerbtn" @click="bindBank(true)">{{'绑定银行卡'}}</el-button> --> <!-- <el-button class="footerbtn" @click="bindBank(true)">{{'绑定银行卡'}}</el-button> -->
</view> </view>
</template> </template>
<script> <script>
import * as ban from '@/config/balance.js' import * as ban from "@/config/balance.js"
export default { export default {
data() { data() {
return { return {
tableData: [], tableData: [],
modalShow: false, modalShow: false,
modalShow2: false, modalShow2: false,
pkId: '', pkId: "",
userInfo: {}, userInfo: {}
} }
}, },
onLoad() { onLoad() {
@ -96,22 +61,20 @@ export default {
}, },
methods: { methods: {
setDefault(pkId) { setDefault(pkId) {
ban ban.updateDefault({
.updateDefault({ pkId: pkId
pkId: pkId, }).then((res) => {
})
.then(res => {
if (res.code == 200) { if (res.code == 200) {
uni.$u.toast(res.msg) uni.$u.toast(res.msg)
this.getSearch() this.getSearch();
} else { } else {
uni.$u.toast(res.msg) uni.$u.toast(res.msg)
} }
}) });
}, },
goAdd() { goAdd() {
uni.navigateTo({ uni.navigateTo({
url: '/pages/mine/bindBank/bindBank', url: '/pages/mine/bindBank/bindBank'
}) })
}, },
removeBind(item) { removeBind(item) {
@ -121,27 +84,26 @@ export default {
} else { } else {
this.modalShow = true this.modalShow = true
} }
}, },
confirmRemove2() { confirmRemove2() {
this.modalShow2 =false this.modalShow2 =false
// this.modalShow = true this.modalShow = true
}, },
//解除绑定 //解除绑定
confirmRemove() { confirmRemove() {
ban ban.removeBankBind({
.removeBankBind({ pkId: this.pkId
pkId: this.pkId, }).then((res) => {
})
.then(res => {
if (res.code == 200) { if (res.code == 200) {
uni.$u.toast(res.msg) uni.$u.toast(res.msg)
this.modalShow = false this.modalShow = false
this.getSearch() this.getSearch();
} else { } else {
uni.$u.toast(res.msg) uni.$u.toast(res.msg)
this.modalShow = false this.modalShow = false
} }
}) });
}, },
//点击绑定银行卡 //点击绑定银行卡
bindBank(val) { bindBank(val) {
@ -149,12 +111,12 @@ export default {
// this.jdTl = val; // this.jdTl = val;
}, },
getSearch() { getSearch() {
ban.getBankList().then(res => { ban.getBankList().then((res) => {
this.tableData = res.data this.tableData = res.data;
}) });
},
}, },
} }
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@ -223,13 +185,12 @@ export default {
} }
} }
} }
} }
.cardNumber { .cardNumber {
font-size: 32rpx; font-size: 32rpx;
font-family: font-family: PingFang SC-Medium, PingFang SC;
PingFang SC-Medium,
PingFang SC;
font-weight: 600; font-weight: 600;
color: #ffffff; color: #ffffff;
margin-top: 100rpx; margin-top: 100rpx;
@ -239,9 +200,7 @@ export default {
.cardfooter { .cardfooter {
text-align: right; text-align: right;
font-size: 24rpx; font-size: 24rpx;
font-family: font-family: PingFang SC-Regular, PingFang SC;
PingFang SC-Regular,
PingFang SC;
font-weight: 400; font-weight: 400;
color: #ffffff; color: #ffffff;
margin-top: 24rpx; margin-top: 24rpx;
@ -251,6 +210,7 @@ export default {
} }
.footerbtn { .footerbtn {
display: flex; display: flex;
align-items: center; align-items: center;
padding: 40rpx; padding: 40rpx;

40
pages/mine/order/index.vue
View File

@ -62,17 +62,9 @@
<view class="tit5"> x{{ ctem.quantity }} </view> <view class="tit5"> x{{ ctem.quantity }} </view>
</view> </view>
</view> </view>
<view class="order-info-row">
<view class="tit1"> {{ '创建时间' }}：{{ item.creationTime }} </view> <view class="tit1"> {{ '创建时间' }}：{{ item.creationTime }} </view>
<view class="order-amount-highlight">
<text class="amount-label">订单金额：</text>
<text class="amount-value">{{
item.orderAmount | numberToCurrency | isLocal
}}</text>
</view> </view>
</view> <view class="xian"></view>
</view>
<view class="xian" v-if="[0, 3, 5].includes(item.orderStatus)"></view>
<view class="disFlex"> <view class="disFlex">
<view style="flex: 1"></view> <view style="flex: 1"></view>
<view class="disFlex"> <view class="disFlex">
@ -788,36 +780,6 @@ export default {
color: #333333; color: #333333;
} }
.order-info-row {
display: flex;
justify-content: space-between;
align-items: center;
margin-top: 16rpx;
padding-top: 16rpx;
border-top: 1rpx solid #f5f5f5;
}
.order-amount-highlight {
font-family: Source Han Sans CN;
color: #f82c1a;
// background: rgba(248, 44, 26, 0.08);
// padding: 8rpx 16rpx;
// border-radius: 8rpx;
display: flex;
align-items: baseline;
}
.amount-label {
font-size: 22rpx;
font-weight: 400;
margin-right: 4rpx;
}
.amount-value {
font-size: 32rpx;
font-weight: 700;
}
.xian { .xian {
background: #eee; background: #eee;
height: 2rpx; height: 2rpx;