From 16cee07f274c039bf0dcb5da347859053b7c2586 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 05 八月 2025 09:28:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriverPromotionActivity/tPromotionOrder.html | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriverPromotionActivity/tPromotionOrder.html b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriverPromotionActivity/tPromotionOrder.html
index 43bad65..ceed173 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriverPromotionActivity/tPromotionOrder.html
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriverPromotionActivity/tPromotionOrder.html
@@ -7,6 +7,7 @@
</div>
<div class="ibox-content">
<input type="hidden" id="driverId" value="${driverId}">
+ <input type="hidden" id="activityId" value="${activityId}">
<div class="row row-lg">
<div class="col-sm-12">
<div class="row">
@@ -87,6 +88,7 @@
let driverName = $('#driverName').val();
let userName = $('#userName').val();
let orderNum = $('#orderNum').val();
+ let activityId = $('#activityId').val();
//提交信息
@@ -101,13 +103,15 @@
ajax.set("driverName",driverName);
ajax.set("userName",userName);
ajax.set("orderNum",orderNum);
+ ajax.set("activityId",activityId);
ajax.start();
TAbnormalOrder.search()
}
function resetSearch() {
-
+ let activityId = $('#activityId').val();
+ let driverId = $('#driverId').val();
//提交信息
var ajax = new $ax(Feng.ctxPath + "/promotionInfo/list1", function(data){
console.log(data)
@@ -115,7 +119,10 @@
$("#size").text(data.size)
},function(data){
});
+ ajax.set("activityId",activityId);
+ ajax.set("driverId",driverId);
ajax.start();
+
TAbnormalOrder.resetSearch()
}
</script>
--
Gitblit v1.7.1