From 47e23cf659d4cc58bc93b44b16e64e82efcfb08d Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 24 七月 2024 17:34:27 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue.js | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 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 196f8fc..dcc182d 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,13 +30,13 @@
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.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 == "手动支付"){
@@ -51,7 +51,7 @@
}
- }
+ // }
}
},
@@ -61,7 +61,7 @@
visible: true,
align: 'center',
valign: 'middle',
- formatter: function(value, row) {
+ formatter: function(value, row) {//0=待支付，1=待核销，2=已到店，3=已完成，4=已过期，5=已取消
switch (value) {
case 0:
return '待支付';
--
Gitblit v1.7.1