diff --git a/components/common/global.js b/components/common/global.js index 9790a1b..01c26e1 100644 --- a/components/common/global.js +++ b/components/common/global.js @@ -1,5 +1,6 @@ //取手机设置 const systemInfo = uni.getSystemInfoSync(); +export const uniPlatform = systemInfo.uniPlatform; //屏幕长高 顶部 底部安全区 型号 是否为ios 以ios11模拟器开发暂取5个 安卓和其它ios机型有需要以后在说 export const screen = { diff --git a/pages/rwa_package/account/components/select-item.vue b/pages/rwa_package/account/components/select-item.vue index 4612aed..0185df2 100644 --- a/pages/rwa_package/account/components/select-item.vue +++ b/pages/rwa_package/account/components/select-item.vue @@ -6,7 +6,7 @@ 选择{{type == 0 ? '微信' : '支付宝'}}账户 - + @@ -16,14 +16,17 @@ - - + + + {{`请先绑定一个${type == 0 ? '微信' : '支付宝'}账户,用于收款`}} + + + 添加 + + + @@ -72,6 +75,9 @@ console.log('this',this.itemSelect); this.$emit('ok',this.itemSelect); }, + onAdd(){ + this.$emit('add'); + }, onClose(){ this.$emit('close'); } @@ -96,6 +102,34 @@ min-height:88rpx; display: flex; } + .item-mid-view-two{ + width:100%; + height:742rpx; + min-height:742rpx; + display: flex; + flex-direction: column; + align-items: center; + .no-data-black{ + width:120rpx; + height:120rpx; + margin-top:120rpx; + } + .add-btn{ + width:248rpx; + height:72rpx; + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; + border:2rpx solid #7934f6; + border-radius: 12rpx; + image{ + width:32rpx; + height:32rpx; + } + } + + } .item-mid-view{ width:100%; height:742rpx; diff --git a/pages/rwa_package/account/index.vue b/pages/rwa_package/account/index.vue index 0c9f7c7..2212d66 100644 --- a/pages/rwa_package/account/index.vue +++ b/pages/rwa_package/account/index.vue @@ -38,6 +38,11 @@ export default { dataList:[] }; }, + onLoad(option){ + if(option.id){ + this.type = option.id == '1' ? 0 : 1; + } + }, onShow() { this.init(); // this.userinfo(); diff --git a/pages/rwa_package/account/withdraw.vue b/pages/rwa_package/account/withdraw.vue index e8eb42a..4a04ede 100644 --- a/pages/rwa_package/account/withdraw.vue +++ b/pages/rwa_package/account/withdraw.vue @@ -12,14 +12,15 @@ - 0 + {{noAmount}} 不可用余额 {{type == 0 ? '提现' : '充值'}}方式 - + + 微信 @@ -28,7 +29,7 @@ - {{selectVal.name + '/' + selectVal.account}} + {{selectVal.name + '/' + selectVal.account}} @@ -71,7 +72,7 @@ - @@ -88,7 +89,7 @@ import MyBtn from '@/components/common/my-btn.vue' import func from '@/utils/func.js'; import SelectItem from './components/select-item.vue' import CodeItem from './components/code-item.vue' - +import {uniPlatform} from '@/components/common/global.js' import { getRechargeSupportPay, recharge,getAcctBalance } from '@/api/finance.js'; import { feedback } from '@/api/payment.js'; import { appWxpayFun, zfbPayFun } from '@/utils/payUtils.js' @@ -97,6 +98,7 @@ export default { components: { Header, TopSafe,MyBtn,SelectItem,CodeItem }, data() { return { + isWeb:false, topText:'', type:0, amount:'', @@ -122,7 +124,13 @@ export default { userInfo:null, }; }, - + onShow(){ + if(uniPlatform == 'web'){ + this.isWeb = true; + }else{ + this.isWeb = false; + } + }, onLoad(option) { if(option && option.type){ this.type = Number(option.type); @@ -146,6 +154,12 @@ export default { this.selectVal = this.dataList.filter(i=>i.id == val)[0]; this.onClose(); }, + onAddBack(){ + this.onClose(); + uni.navigateTo({ + url:'/pages/rwa_package/account/index?id=' + this.curSelect + }) + }, onClose(){ this.selectShow = false; this.codeShow = false; diff --git a/static/new/add.png b/static/new/add.png new file mode 100644 index 0000000..0e41163 Binary files /dev/null and b/static/new/add.png differ diff --git a/static/new/no_black_data.png b/static/new/no_black_data.png new file mode 100644 index 0000000..6366682 Binary files /dev/null and b/static/new/no_black_data.png differ