diff --git a/pages/pay/components/account-info-modal.vue b/pages/pay/components/account-info-modal.vue
index 7b33280..2708129 100644
--- a/pages/pay/components/account-info-modal.vue
+++ b/pages/pay/components/account-info-modal.vue
@@ -106,7 +106,7 @@
\ No newline at end of file
+ image {
+ width: 100%;
+ height: 100%;
+ }
+
diff --git a/pages/pay/withdraw.vue b/pages/pay/withdraw.vue
index e27732d..404d3b4 100644
--- a/pages/pay/withdraw.vue
+++ b/pages/pay/withdraw.vue
@@ -1,425 +1,423 @@
-
-
-
-
-
- 提现金额
-
- ¥
-
-
- 持卡人
-
-
-
-
- 卡号
-
-
-
-
- 收款码
-
-
-
-
-
-
- 选择提现方式:
-
-
-
-
-
-
-
-
- 选择银行
-
- 请选择提现方式
- 工商银行
- 建设银行
- 农业银行
-
-
-
-
-
- {{ state.accountInfo.account_header }}|{{ state.accountInfo.account_name }}
-
-
-
-
+ ]"
+ >
+
+ 可提现金额(元)
+ {{ fen2yuan(state.brokerageInfo.brokeragePrice) }}
+
+
+
+
+
+
+ 提现至
+
+ 请选择提现方式
+ 钱包余额
+ 微信零钱
+ 支付宝账户
+ 银行卡转账
+
+
+
+
+ 提现金额
+
+ ¥
+
+
+
+
+ 提现账号
+
+
+
+
+
+
+ 收款码
+
+
+
+
+
+ 持卡人
+
+
+
+
+
+ 提现银行
+
+
+
+
+
+ 开户地址
+
+
+
+
+
+
-
-
- 提现说明
-
-
- 当前可提现金额:¥{{state.userGet.brokeragePrice}}
-
-
- 冻结佣金:¥{{state.userGet.frozenPrice}}
-
-
- 说明:每笔佣金冻结期为0天,到期后可提现
-
-
+
+
+ 提现说明
+ 最低提现金额 {{ fen2yuan(state.minPrice) }} 元
+
+ 冻结佣金:¥{{ fen2yuan(state.brokerageInfo.frozenPrice) }}
+ (每笔佣金的冻结期为 {{ state.frozenDays }} 天,到期后可提现)
+
+
-
-
-
-
-
+
+
+
\ No newline at end of file
+ .draw-list {
+ font-size: 24rpx;
+ color: #999999;
+ line-height: 46rpx;
+ }
+ }
+
diff --git a/sheep/api/pay.js b/sheep/api/pay.js
deleted file mode 100644
index c49f89f..0000000
--- a/sheep/api/pay.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/sheep/request';
-
-export default {
- // 发起提现
- withdraw: {
- list: (params) =>
- request({
- url: 'withdraw',
- method: 'GET',
- params,
- custom: {
- auth: true,
- },
- }),
- rules: () =>
- request({
- url: 'withdraw/rules',
- method: 'GET',
- custom: {
- auth: true,
- },
- }),
- apply: (data) =>
- request({
- url: '/app-api/trade/brokerage-withdraw/create',
- method: 'POST',
- data,
- custom: {
- loadingMsg: '申请中',
- // auth: true,
- },
- }),
- userGet: (params) =>
- request({
- url: '/app-api/trade/brokerage-user/get',
- method: 'GET',
- params,
- // custom: {
- // loadingMsg: '申请中',
- // auth: true,
- // },
- }),
- },
-};
\ No newline at end of file
diff --git a/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue b/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue
index abcf423..ccea7e9 100644
--- a/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue
+++ b/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue
@@ -154,20 +154,18 @@
},
value(newVal) {
this.dataList = this.getDataList(newVal)
- // TODO @芋艿:这块可能被错误的注释了,需要跟进下
// fix by mehaotian is_reset 在 uni-forms 中定义
- // if(!this.is_reset){
- // this.is_reset = false
- // this.formItem && this.formItem.setValue(newVal)
- // }
+ if(!this.is_reset){
+ this.is_reset = false
+ this.formItem && this.formItem.setValue(newVal)
+ }
},
modelValue(newVal) {
this.dataList = this.getDataList(newVal);
- // TODO @芋艿:这块可能被错误的注释了,需要跟进下
- // if(!this.is_reset){
- // this.is_reset = false
- // this.formItem && this.formItem.setValue(newVal)
- // }
+ if(!this.is_reset){
+ this.is_reset = false
+ this.formItem && this.formItem.setValue(newVal)
+ }
}
},
data() {
@@ -195,22 +193,22 @@
}
},
created() {
- // this.form = this.getForm('uniForms')
- // this.formItem = this.getForm('uniFormsItem')
+ this.form = this.getForm('uniForms')
+ this.formItem = this.getForm('uniFormsItem')
// this.formItem && this.formItem.setValue(this.value)
- // if (this.formItem) {
- // this.isTop = 6
- // if (this.formItem.name) {
- // // 如果存在name添加默认值,否则formData 中不存在这个字段不校验
- // if(!this.is_reset){
- // this.is_reset = false
- // this.formItem.setValue(this.dataValue)
- // }
- // this.rename = this.formItem.name
- // this.form.inputChildrens.push(this)
- // }
- // }
+ if (this.formItem) {
+ this.isTop = 6
+ if (this.formItem.name) {
+ // 如果存在name添加默认值,否则formData 中不存在这个字段不校验
+ if(!this.is_reset){
+ this.is_reset = false
+ this.formItem.setValue(this.dataValue)
+ }
+ this.rename = this.formItem.name
+ this.form.inputChildrens.push(this)
+ }
+ }
if (this.localdata && this.localdata.length !== 0) {
this.isLocal = true
@@ -275,7 +273,7 @@
}
}
}
- // this.formItem && this.formItem.setValue(detail.value)
+ this.formItem && this.formItem.setValue(detail.value)
// TODO 兼容 vue2
this.$emit('input', detail.value);
// // TOTO 兼容 vue3
@@ -377,7 +375,7 @@
selectedArr.push(item[this.map.value])
}
})
- return this.dataValue.length > 0 ? this.dataValue : selectedArr
+ return this.dataValue && this.dataValue.length > 0 ? this.dataValue : selectedArr
},
/**
@@ -386,13 +384,11 @@
setStyleBackgroud(item) {
let styles = {}
let selectedColor = this.selectedColor?this.selectedColor:'#2979ff'
- if (this.selectedColor) {
- if (this.mode !== 'list') {
- styles['border-color'] = item.selected?selectedColor:'#DCDFE6'
- }
- if (this.mode === 'tag') {
- styles['background-color'] = item.selected? selectedColor:'#f5f5f5'
- }
+ if (this.mode !== 'list') {
+ styles['border-color'] = item.selected?selectedColor:'#DCDFE6'
+ }
+ if (this.mode === 'tag') {
+ styles['background-color'] = item.selected? selectedColor:'#f5f5f5'
}
let classles = ''
for (let i in styles) {
@@ -403,16 +399,15 @@
setStyleIcon(item) {
let styles = {}
let classles = ''
- if (this.selectedColor) {
- let selectedColor = this.selectedColor?this.selectedColor:'#2979ff'
- styles['background-color'] = item.selected?selectedColor:'#fff'
- styles['border-color'] = item.selected?selectedColor:'#DCDFE6'
+ let selectedColor = this.selectedColor?this.selectedColor:'#2979ff'
+ styles['background-color'] = item.selected?selectedColor:'#fff'
+ styles['border-color'] = item.selected?selectedColor:'#DCDFE6'
- if(!item.selected && item.disabled){
- styles['background-color'] = '#F2F6FC'
- styles['border-color'] = item.selected?selectedColor:'#DCDFE6'
- }
+ if(!item.selected && item.disabled){
+ styles['background-color'] = '#F2F6FC'
+ styles['border-color'] = item.selected?selectedColor:'#DCDFE6'
}
+
for (let i in styles) {
classles += `${i}:${styles[i]};`
}
@@ -421,17 +416,16 @@
setStyleIconText(item) {
let styles = {}
let classles = ''
- if (this.selectedColor) {
- let selectedColor = this.selectedColor?this.selectedColor:'#2979ff'
- if (this.mode === 'tag') {
- styles.color = item.selected?(this.selectedTextColor?this.selectedTextColor:'#fff'):'#666'
- } else {
- styles.color = item.selected?(this.selectedTextColor?this.selectedTextColor:selectedColor):'#666'
- }
- if(!item.selected && item.disabled){
- styles.color = '#999'
- }
+ let selectedColor = this.selectedColor?this.selectedColor:'#2979ff'
+ if (this.mode === 'tag') {
+ styles.color = item.selected?(this.selectedTextColor?this.selectedTextColor:'#fff'):'#666'
+ } else {
+ styles.color = item.selected?(this.selectedTextColor?this.selectedTextColor:selectedColor):'#666'
}
+ if(!item.selected && item.disabled){
+ styles.color = '#999'
+ }
+
for (let i in styles) {
classles += `${i}:${styles[i]};`
}
@@ -454,7 +448,7 @@