From 3c12858927ce26f277ba758e520c81be599d8df1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 28 十一月 2023 15:42:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/webapp/static/modular/system/cpPayment/cpPayment.js | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/cpPayment/cpPayment.js b/cloud-server-management/src/main/webapp/static/modular/system/cpPayment/cpPayment.js
index aadbb71..c9f6f43 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/cpPayment/cpPayment.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/cpPayment/cpPayment.js
@@ -14,7 +14,7 @@
*/
TQuestion.initColumn = function () {
return [
- {field: 'selectItem', checkbox: true},
+ {field: 'selectItem', radio: true},
{title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'},
{title: '所在省市', field: 'provinceAndCity', visible: role==1?true:false, align: 'center', valign: 'middle'},
{title: '门店名称', field: 'storeName', visible: true, align: 'center', valign: 'middle'},
@@ -538,23 +538,16 @@
TQuestion.unfreeze = function () {
if (this.check()) {
var selected = $('#' + this.id).bootstrapTable('getSelections');
-
console.log("看看选择")
console.log(selected)
const data1 = {
- ids:[],
+ ids:TQuestion.seItem.id,
payUserName:""
};
- selected.forEach(function(obj) {
- if (obj.payStatus == 2){
- Feng.error("订单已支付！不能再手动支付了")
- return;
- }
- var id = "";
- id = obj.id;
- console.log(obj.id);
- data1.ids.push(id);
- });
+ if (TQuestion.seItem.payStatus == 2){
+ Feng.error("订单已支付！不能再手动支付了")
+ return;
+ }
console.log(data1)
$.ajax({
url: Feng.ctxPath + "/cpPayment/pay",
--
Gitblit v1.7.1