From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue.js | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue.js b/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue.js
index 147586b..166f873 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue.js
@@ -18,7 +18,7 @@
{title: '所在省', field: 'province', visible: true, align: 'center', valign: 'middle'},
{title: '所在市', field: 'city', visible: true, align: 'center', valign: 'middle'},
{title: '预约门店', field: 'name', visible: true, align: 'center', valign: 'middle'},
- { title: '预约场地', field: 'nextName', visible: true, align: 'center', valign: 'middle'},
+ { title: '预约场地', field: 'siteName', visible: true, align: 'center', valign: 'middle'},
{ title: '姓名', field: 'booker', visible: true, align: 'center', valign: 'middle'},
{ title: '联系电话', field: 'phone', visible: true, align: 'center', valign: 'middle'},
{ title: '预约时间段', field: 'times', visible: true, align: 'center', valign: 'middle'},
@@ -30,23 +30,28 @@
align: 'center',
valign: 'middle',
formatter: function(value, row) {
- if (row.status === 0 ) {
- if (value) {
- var moneyValues = value.split(',');
- var moneyText = moneyValues[0] + '元/' + moneyValues[1] + '玩湃币';
- return moneyText;}
- }
-
- else {
- if (row.payType === 4){
+ // if (row.status === 0 ) {
+ // if (value) {
+ // var moneyValues = value.split(',');
+ //
+ // var moneyText = moneyValues[0] + '元/' + moneyValues[1] + '币';
+ // return moneyText;}
+ // } else {
+ console.log("看看支付方式")
+ console.log(row.payType)
+ if (row.payType == "手动支付"){
+ console.log("元")
return row.payMoney+'元'
- }else if (row.payType === 3){
- return row.payMoney+'玩湃币' }else {
+ }else if (row.payType == "玩湃币"){
+ console.log("币")
+ return row.payMoney+'币' }
+ else {
+ console.log("不会吧")
return row.payMoney+'元'
}
- }
+ // }
}
},
--
Gitblit v1.7.1