From 1bfc8f9c7baad9be7fdb92742cf796f9fdb50df3 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 22 九月 2021 09:38:37 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/chuanyin-group-project
---
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx
index 0b508f7..b688c6d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx
@@ -7,6 +7,12 @@
<uc:cmshead id="CMSHead1" runat="server" />
<script src="../../js/business/Order.js?v=5" type="text/javascript"></script>
<script type="text/javascript">
+
+ function kaipiaoConfirm(orderId) {
+ var url = "/Pages/business/kaipiaoConfirm.aspx?id=" + orderId;
+ top.Dialog.open({ URL: url, Title: "寮�绁ㄧ敵璇风‘璁�", Height: 300, Width: 580 });
+ }
+
//璁㈠崟璇勪环
function evaluationModel(orderid) {
dialog.open({ URL: "/Pages/business/EvaluationSeller.aspx?orderid=" + orderid, Title: "鍗栧璇勪环", Width: 580, Height: 300 });
@@ -551,7 +557,14 @@
var ids = '';
var cks = $("input[name='ckId']:checked");
- if (cks.length == 0) { alertMsg('娌℃湁閫変腑浠讳綍椤癸紒'); return; } else { }
+ if (cks.length == 0)
+ {
+ alertMsg('娌℃湁閫変腑浠讳綍椤癸紒');
+ return;
+ }
+ else
+ {
+ }
var isCan = true;
var Kaipiaoshenqing = 2;
@@ -600,16 +613,17 @@
return;
}
- var msg = ('纭寮�绁ㄧ敵璇峰悧?');
- top.Dialog.confirm(msg, function () {
- DoAcceptAll3(ids);
- });
+ kaipiaoConfirm(ids);
+ //var msg = ('纭寮�绁ㄧ敵璇峰悧?');
+ //top.Dialog.confirm(msg, function () {
+ // DoAcceptAll3(ids);
+ //});
}
}
/*
-鎵归噺澶勭悊寮�绁ㄧ敵璇�
-*/
+ 鎵归噺澶勭悊寮�绁ㄧ敵璇�
+ */
var DoAcceptAll3 = function (orderIds) {
window.submitUrl = "/Pages/business/OrderListBatchOperation.aspx"
CallServer({ Target: "deleteOrderAll3", ids: orderIds }, function (data, textStatus) {
--
Gitblit v1.9.1