From 4b0fe38b239996f7ff424ef2e6095898347bd2ff Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Mon, 1 Mar 2021 16:37:44 +0800
Subject: [PATCH] no message
---
pages/home/index/index.wxml | 4 ++--
pages/process/index/index.wxml | 4 ++--
pages/process/payment/index.js | 24 +++++++++++++++++++++---
pages/process/payment/index.json | 2 ++
pages/process/payment/index.wxml | 30 ++++++++++++++++++++++++++----
5 files changed, 53 insertions(+), 11 deletions(-)
diff --git a/pages/home/index/index.wxml b/pages/home/index/index.wxml
index 2d958ee..782449f 100644
--- a/pages/home/index/index.wxml
+++ b/pages/home/index/index.wxml
@@ -63,12 +63,12 @@
客户管理
-
+
diff --git a/pages/process/index/index.wxml b/pages/process/index/index.wxml
index 57b57fe..33ff4fc 100644
--- a/pages/process/index/index.wxml
+++ b/pages/process/index/index.wxml
@@ -81,7 +81,7 @@
-->
-
+
diff --git a/pages/process/payment/index.js b/pages/process/payment/index.js
index 08fbae8..23cc3d2 100644
--- a/pages/process/payment/index.js
+++ b/pages/process/payment/index.js
@@ -20,6 +20,7 @@ Page({
amount: 0,
orderList: null,
params: {
+ settleType: '1',
ids: [],
payRemark: ''
},
@@ -39,10 +40,15 @@ Page({
this.data.params.ids = []
if (result.data && result.data.records.length) {
for (let index = 0; index < result.data.records.length; index++) {
- amount = math.plus(amount, result.data.records[index].settlePrice)
- this.data.params.ids.push(result.data.records[index].id)
+ const element = result.data.records[index]
+ amount = math.plus(amount, element.settlePrice)
+ this.data.params.ids.push(element.id)
+ if(index == 0 && Number(element.settleType) == 2 && !util.isEmpty(element.bankCardNo)){
+ this.data.params.settleType = '2'
+ this.data.params.bankCardNo = element.bankCardNo
+ }
}
- this.setData({ safeBottom: app.globalData.safeBottom, orderList: result.data.records, amount })
+ this.setData({ safeBottom: app.globalData.safeBottom, orderList: result.data.records, amount, params: this.data.params })
} else {
this.setData({ safeBottom: app.globalData.safeBottom })
}
@@ -50,8 +56,19 @@ Page({
wx.hideLoading()
this.setData({ safeBottom: app.globalData.safeBottom })
util.showToast(err)
+ console.log(err)
})
},
+ onTypeChange: function({detail}){
+ this.setData({ ['params.settleType']: detail })
+ },
+ onTypeClick(e) {
+ if(Number(e.currentTarget.dataset.name == 2) && util.isEmpty(this.data.params.bankCardNo)){
+ util.showToast('暂无客户银行卡信息，无法进行银行卡转账')
+ return
+ }
+ this.setData({ ['params.settleType']: e.currentTarget.dataset.name })
+ },
lookItem: function(e){
var item = this.data.orderList[e.currentTarget.dataset.index]
item.checked = !item.checked
@@ -79,6 +96,7 @@ Page({
Dialog.confirm({ title: '温馨提示', message: '确定要付款吗？' }).then(() => {
wx.showLoading({ title: '正在获取', mask: true })
this.data.requesting = true
+ this.data.params.settleType = Number(this.data.params.settleType)
paymentOrder(this.data.params).then(result => {
wx.hideLoading()
util.showBackToast('订单已经付款')
diff --git a/pages/process/payment/index.json b/pages/process/payment/index.json
index e8b6f86..2f46fb1 100644
--- a/pages/process/payment/index.json
+++ b/pages/process/payment/index.json
@@ -3,6 +3,8 @@
"van-cell": "/components/cell/index",
"van-button": "/components/button/index",
"van-checkbox": "/components/checkbox/index",
+ "van-radio": "/components/radio/index",
+ "van-radio-group": "/components/radio-group/index",
"van-image": "/components/image/index",
"van-dialog": "/components/dialog/index"
}
diff --git a/pages/process/payment/index.wxml b/pages/process/payment/index.wxml
index afcc4e4..65e31c6 100644
--- a/pages/process/payment/index.wxml
+++ b/pages/process/payment/index.wxml
@@ -9,13 +9,35 @@
{{formate.formateAmount(amount)}}
-
-
+
+
+
+ 付款方式
+
+
+
+
+
+
+
+
+
+ 银行卡转账
+ ({{params.bankCardNo}})
+
+
+
+
+
+
+
+
付款备注
-
-
+
+
+