From 29cacdf1c7f9f9e3043d99c5ffd57e3866fe30cd Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Fri, 26 Feb 2021 18:06:37 +0800
Subject: [PATCH] no message
---
components/dialog/dialog.js | 2 +-
pages/client/withdrawal/index.js | 37 +++++++++++++----------------
pages/client/withdrawal/index.json | 2 ++
pages/client/withdrawal/index.wxml | 5 +++-
pages/home/customer-info/index.wxml | 8 +++----
pages/home/index/index.wxml | 8 +++----
pages/process/index/index.wxml | 4 ++--
7 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/components/dialog/dialog.js b/components/dialog/dialog.js
index 3716210..2891917 100644
--- a/components/dialog/dialog.js
+++ b/components/dialog/dialog.js
@@ -32,7 +32,7 @@ Dialog.defaultOptions = {
selector: '#van-dialog',
className: '',
asyncClose: false,
- transition: 'scale',
+ transition: 'fade',
customStyle: '',
messageAlign: '',
overlayStyle: '',
diff --git a/pages/client/withdrawal/index.js b/pages/client/withdrawal/index.js
index 20cbfe2..2680f61 100644
--- a/pages/client/withdrawal/index.js
+++ b/pages/client/withdrawal/index.js
@@ -20,7 +20,9 @@ Page({
banckList: [],
orderList: [],
checkIds: [],
- chooseBankCard: null
+ chooseBankCard: null,
+ visible: false,
+ columns: []
},
onLoad: function () {
this.getUserInfo()
@@ -34,16 +36,17 @@ Page({
},
fetchCardList: function(){
getBankCardList().then(res => {
- var list = []
+ this.data.columns = []
for (let index = 0; index < res.data.length; index++) {
const element = res.data[index]
- list.push({ text: element.bankName + '(' + element.cardNoSuffix + ')', value: element.id })
+ this.data.columns.push(element.bankName + '(' + element.cardNoSuffix + ')')
}
- this.setData({ banckCardList: res.data, banckList: list })
if (this.data.banckCardList[0] && this.data.banckCardList[0].cardName) {
const element = this.data.banckCardList[0]
var defaultCard = { cardId: element.id, cardName: element.bankName + '(' + element.cardNoSuffix + ')' }
- this.setData({ chooseBankCard: defaultCard })
+ this.setData({ banckCardList: res.data, columns: this.data.columns, chooseBankCard: defaultCard })
+ } else {
+ this.setData({ banckCardList: res.data, columns: this.data.columns })
}
})
},
@@ -85,8 +88,8 @@ Page({
this.setData({ orderList: this.data.orderList, expendMoney: sum || '' })
},
chooseCard: function () {
- if (this.data.chooseBankCard) {
- this.pickerView.showPicker(this.data.banckList, this.data.chooseBankCard.cardId)
+ if (this.data.columns.length > 0) {
+ this.setData({ visible: true })
} else {
Dialog.confirm({ title: '温馨提示', message: '您还没有绑定银行卡，请先去绑定银行卡' }).then(() => {
wx.navigateTo({ url: '/pages/client/bank-add/index' })
@@ -94,20 +97,14 @@ Page({
})
}
},
- onCardChange: function(e){
- if(!e.detail){
- return
- }
- this.setData({
- ['chooseBankCard.cardName']: this.data.banckCardList[e.detail.current].bankName,
- ['chooseBankCard.cardId']: this.data.banckCardList[e.detail.current].id
- })
+ onConfirm: function({detail}){
+ var nowItem = this.data.banckCardList[detail.index]
+ this.data.chooseBankCard.cardName = nowItem.bankName
+ this.data.chooseBankCard.cardId = nowItem.id
+ this.setData({ visible: false, chooseBankCard: this.data.chooseBankCard })
},
- onPickerChange: function (e) {
- if(!e.detail){
- return
- }
- this.setData({ ['chooseBankCard.cardName']: e.detail.text, ['chooseBankCard.cardId']: e.detail.value })
+ onHide: function(){
+ this.setData({ visible: false })
},
checkoutAmount: function () {
if (Number(this.data.expendMoney) <= 0) {
diff --git a/pages/client/withdrawal/index.json b/pages/client/withdrawal/index.json
index 49d50c8..f5710a6 100644
--- a/pages/client/withdrawal/index.json
+++ b/pages/client/withdrawal/index.json
@@ -3,6 +3,8 @@
"van-cell": "/components/cell/index",
"van-cell-group": "/components/cell-group/index",
"van-dialog": "/components/dialog/index",
+ "van-picker": "/components/picker/index",
+ "van-popup": "/components/popup/index",
"van-button": "/components/button/index"
}
}
\ No newline at end of file
diff --git a/pages/client/withdrawal/index.wxml b/pages/client/withdrawal/index.wxml
index e397eae..0046960 100644
--- a/pages/client/withdrawal/index.wxml
+++ b/pages/client/withdrawal/index.wxml
@@ -33,4 +33,7 @@
提现
-
\ No newline at end of file
+
+
+
+
\ No newline at end of file
diff --git a/pages/home/customer-info/index.wxml b/pages/home/customer-info/index.wxml
index 73f682e..27c2df8 100644
--- a/pages/home/customer-info/index.wxml
+++ b/pages/home/customer-info/index.wxml
@@ -2,10 +2,8 @@
客户资料
-
-
-
+
客户姓名
@@ -40,8 +38,8 @@
邀请注册纸通宝
-
- 保存
+
diff --git a/pages/home/index/index.wxml b/pages/home/index/index.wxml
index e2ead08..2d958ee 100644
--- a/pages/home/index/index.wxml
+++ b/pages/home/index/index.wxml
@@ -29,7 +29,7 @@
-
+
@@ -63,12 +63,12 @@
客户管理
-
+
diff --git a/pages/process/index/index.wxml b/pages/process/index/index.wxml
index 81e12ed..57b57fe 100644
--- a/pages/process/index/index.wxml
+++ b/pages/process/index/index.wxml
@@ -81,7 +81,7 @@
-->
-
+