From 12024edf53122dbd9430c386c664047e24a382f6 Mon Sep 17 00:00:00 2001
From: fxc <541723947@qq.com>
Date: Mon, 17 Feb 2025 14:51:57 +0800
Subject: [PATCH 1/3] 111
---
TradeManageNew/DingDan/DT_SecondHand2.aspx | 25 +++++++
.../Huowu/TemuShopGoodPriceNew.aspx | 71 ++++++++++++++++++-
2 files changed, 94 insertions(+), 2 deletions(-)
diff --git a/TradeManageNew/DingDan/DT_SecondHand2.aspx b/TradeManageNew/DingDan/DT_SecondHand2.aspx
index 83f813d..fb5472a 100644
--- a/TradeManageNew/DingDan/DT_SecondHand2.aspx
+++ b/TradeManageNew/DingDan/DT_SecondHand2.aspx
@@ -193,6 +193,26 @@
'onComplete': function () {}
});
});
+
+
+ $("#" + datagrid1.TableID + " [CommandName='outboundImg']").live("click", function () {
+ var RowIndex = $(this).parentsUntil("tr").parent().attr("index");
+ var model = datagrid1.Get_Model(RowIndex);
+ $("#img_1").attr("src", model.ImageUrls[0]);
+ $("#div_img").empty();
+ model.ImageUrls.forEach(pic => {
+ $("#div_img").append("
");
+ })
+ $.fancybox({
+ 'width': '40%',
+ 'height': '40%',
+ 'autoScale': false,
+ 'transitionIn': 'elastic',
+ 'transitionOut': 'elastic',
+ 'href': '#test3',
+ 'onComplete': function () { }
+ });
+ });
});
// 初始化DataGrid
@@ -298,6 +318,11 @@
}
Array.add(datagrid1.Columns, col);
+ col = new nblf.ui.DataGridColumn();
+ col.HeaderText = "Outbound Photo";
+ col.CellTemplate = "
";
+ Array.add(datagrid1.Columns, col);
+
//操作
col = new nblf.ui.DataGridColumn();
col.HeaderText = "操作";
diff --git a/TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx b/TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx
index b93c557..ec8f2a7 100644
--- a/TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx
+++ b/TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx
@@ -23,6 +23,7 @@
+
@@ -121,6 +122,23 @@
}
});
+
+
+ $("#btn_Excel1").click(function () {
+ ajaxFileUpload();
+ });
+
+ $("#btn_Excel2").click(function () {
+ var url = '../ServerCookies/TemuGoodsTemplate.xls';
+ // 创建隐藏的 元素
+ var link = document.createElement('a');
+ link.href = url;
+ link.download = url.split('/').pop(); // 设置下载文件的名称
+ document.body.appendChild(link);
+ link.click();
+ document.body.removeChild(link);
+ })
+
});
//获取temu平台的所有店铺
function GetTemuShops() {
@@ -365,6 +383,48 @@
}, 0);
}
//#endregion
+
+
+ //#region
+ function ajaxFileUpload() {
+ var filename = $("#fileToUpload").val();
+ if (!filename.endsWith('.xls') && !filename.endsWith('.xlsx')) { alert("文件格式不正确"); return; }
+ $.ajaxFileUpload({
+ url: '../GlobalAshx/AjaxFileUpdate.ashx?DirectoryName=ServerCookies',
+ secureuri: false,
+ fileElementId: 'fileToUpload',
+ dataType: 'json',
+ success: function (data, status) {
+ ImportGoods("ServerCookies/" + data.FileName);
+ },
+ error: function (data, status, e) {
+ alert(e);
+ }
+ });
+ }
+ //#endregion
+
+ //#region
+ function ImportGoods(FileName) {
+ var param = new Object();
+ param.filePath = FileName;
+ WindowLoadModel.Show();
+ $.ajax({
+ url: "../HuoWuServiceNew.asmx/ImportTemuHuoDongPrices",
+ data: Sys.Serialization.JavaScriptSerializer.serialize(param),
+ success: function (data) {
+ WindowLoadModel.Hide();
+ if (data.d.Code == 0) { alert(data.d.Message); ReadData(); return; }
+ else {
+ ReadData();
+ }
+ },
+ error: function (xhr, status) {
+ if (status != "success") alert(xhr.responseText);
+ }
+ });
+ }
+ //#endregion
@@ -397,11 +457,18 @@
|
-
-
+ |
|
+
+ 导入数据:
+
+ |
+
+
+
+ |
From 6c5fa5ba99591d31a2ec458f45f97f8aa5cab35a Mon Sep 17 00:00:00 2001
From: fxc <541723947@qq.com>
Date: Mon, 17 Feb 2025 15:06:16 +0800
Subject: [PATCH 2/3] 111
---
TradeManageNew/DingDan/DT_SecondHand2.aspx | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/TradeManageNew/DingDan/DT_SecondHand2.aspx b/TradeManageNew/DingDan/DT_SecondHand2.aspx
index fb5472a..974003c 100644
--- a/TradeManageNew/DingDan/DT_SecondHand2.aspx
+++ b/TradeManageNew/DingDan/DT_SecondHand2.aspx
@@ -1,4 +1,6 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DT_SecondHand2.aspx.cs" Inherits="TradeManageNew.DingDan.DT_SecondHand2" %>
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DT_OrderReturn.aspx.cs" Inherits="TradeManageNew.DingDan.DT_OrderReturn" %>
+
+DingDan/DD_OrderListForTM2.aspx
@@ -100,7 +102,10 @@
top: 0;
max-width: 100vw;
max-height: 100vh;
+ /* overflow: hidden; */
page-break-after: avoid;
+ /* display:flex;
+ justify-content:center; */
}
#printArea *{
position: absolute;
@@ -112,6 +117,8 @@
+
+
@@ -198,9 +205,9 @@
$("#" + datagrid1.TableID + " [CommandName='outboundImg']").live("click", function () {
var RowIndex = $(this).parentsUntil("tr").parent().attr("index");
var model = datagrid1.Get_Model(RowIndex);
- $("#img_1").attr("src", model.ImageUrls[0]);
+ $("#img_1").attr("src", model.imgList[0]);
$("#div_img").empty();
- model.ImageUrls.forEach(pic => {
+ model.imgList.forEach(pic => {
$("#div_img").append(" ");
})
$.fancybox({
@@ -399,6 +406,7 @@
data.d.DataSource.forEach(it=>{
it.orginData = JSON.parse(JSON.stringify(it))
it.firstImg = it.ImageUrls && it.ImageUrls.length ? it.ImageUrls[0] : ""
+ it.imgList = it.imgList ? it.split(',') : []
})
datagrid1.Set_RowCount(data.d.RowCount);
datagrid1.DataBind(data.d.DataSource);
From e85ce972cd1ce365a374771de9adb4c39d7b6601 Mon Sep 17 00:00:00 2001
From: fxc <541723947@qq.com>
Date: Tue, 18 Feb 2025 08:59:48 +0800
Subject: [PATCH 3/3] 111
---
TradeManageNew/DingDan/DT_SecondHand2.aspx | 30 +-
.../Huowu/HW_GoodsDetailList2TemuSku.aspx | 2 +-
.../Huowu/TemuShopGoodPriceNew.aspx | 1045 +++++++++--------
.../ServerCookies/TemuGoodsTemplate2.xls | Bin 0 -> 18432 bytes
4 files changed, 560 insertions(+), 517 deletions(-)
create mode 100644 TradeManageNew/ServerCookies/TemuGoodsTemplate2.xls
diff --git a/TradeManageNew/DingDan/DT_SecondHand2.aspx b/TradeManageNew/DingDan/DT_SecondHand2.aspx
index 974003c..a51a484 100644
--- a/TradeManageNew/DingDan/DT_SecondHand2.aspx
+++ b/TradeManageNew/DingDan/DT_SecondHand2.aspx
@@ -287,6 +287,10 @@ DingDan/DD_OrderListForTM2.aspx
return "等待取货";
case 4:
return "售卖完成";
+ case 5:
+ return "使用配件";
+ case 6:
+ return "现场出售";
default:
return "-";
}
@@ -327,7 +331,15 @@ DingDan/DD_OrderListForTM2.aspx
col = new nblf.ui.DataGridColumn();
col.HeaderText = "Outbound Photo";
- col.CellTemplate = " ";
+ col.CellTemplate = `{Bind orginData}`;
+ col.CellFormatter = function (data) {
+ var imgList = data.imgList
+ if (imgList.length) {
+ return ` `
+ } else {
+ return ''
+ }
+ }
Array.add(datagrid1.Columns, col);
//操作
@@ -400,16 +412,16 @@ DingDan/DD_OrderListForTM2.aspx
$.ajax({
url: "../DD_OrderServiceNew.asmx/OrderUsedSalePlatformPage",
data: Sys.Serialization.JavaScriptSerializer.serialize(param),
- success: function (data) {
+ success: function (res) {
WindowLoadModel.Hide();
- data.d.DataSource = data.d.DataSource ? data.d.DataSource : []
- data.d.DataSource.forEach(it=>{
- it.orginData = JSON.parse(JSON.stringify(it))
+ data = res.d.DataSource ? res.d.DataSource : []
+ data.forEach(it=>{
it.firstImg = it.ImageUrls && it.ImageUrls.length ? it.ImageUrls[0] : ""
- it.imgList = it.imgList ? it.split(',') : []
+ it.imgList = it.imgList ? it.imgList.split(',') : []
+ it.orginData = JSON.parse(JSON.stringify(it))
})
- datagrid1.Set_RowCount(data.d.RowCount);
- datagrid1.DataBind(data.d.DataSource);
+ datagrid1.Set_RowCount(res.d.RowCount);
+ datagrid1.DataBind(data);
$("#a_select").html("");
$("a[iul]").each(function () {
var iul = $(this).attr("iul");
@@ -874,6 +886,8 @@ DingDan/DD_OrderListForTM2.aspx
+
+
|
diff --git a/TradeManageNew/Huowu/HW_GoodsDetailList2TemuSku.aspx b/TradeManageNew/Huowu/HW_GoodsDetailList2TemuSku.aspx
index 774bdc0..da8bf1c 100644
--- a/TradeManageNew/Huowu/HW_GoodsDetailList2TemuSku.aspx
+++ b/TradeManageNew/Huowu/HW_GoodsDetailList2TemuSku.aspx
@@ -294,7 +294,7 @@
var YYUserList = [];
function GetYYUser() {
var param = new Object();
- param.isShowAllGroup = 0;
+ param.isShowAllGroup = 1;
$.ajax({
url: "../CangKuServerNew.asmx/GetList_YYUser",
data: Sys.Serialization.JavaScriptSerializer.serialize(param),
diff --git a/TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx b/TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx
index ec8f2a7..93ba35d 100644
--- a/TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx
+++ b/TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx
@@ -1,536 +1,565 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TemuShopGoodPriceNew.aspx.cs" Inherits="TradeManageNew.Huowu.TemuShopGoodPriceNew" %>
-
-
-
-
-
-
-
- Temu店铺商品活动
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+ var error = CreateSaveModel("MainTable", Model);
+ if (error != "") { alert(error); return; }
+ Model.ShopId = $("#select_shops").val();
+ error = datagrid2.UpdateDataSource();
+ if (error != "") { alert(error); return; }
+ var param = new Object();
+ param.Model = Model;
+ param.Model.ListModel = datagrid2.DataSource
+ WindowLoadModel.Show();
+ if(EditType == 'edit'){
+ $.ajax({
+ url: "../DD_OrderServiceNew.asmx/update_TemuShopGoodActive",
+ data: Sys.Serialization.JavaScriptSerializer.serialize(param),
+ success: function (data) {
+ WindowLoadModel.Hide();
+ ReadData();
+ alert("保存成功");
+ $.fancybox.close();
+ }
+ });
+ }else{
+ $.ajax({
+ url: "../DD_OrderServiceNew.asmx/Save_TemuShopGoodActive",
+ data: Sys.Serialization.JavaScriptSerializer.serialize(param),
+ success: function (data) {
+ WindowLoadModel.Hide();
+ ReadData();
+ alert("保存成功");
+ $.fancybox.close();
+ }
+ });
+ }
+ }
+ //#endregion
+ //#region 显示弹出窗体
+ function ShowFancybox(id) {
+ $.fancybox({
+ 'scrolling': 'no',
+ 'autoScale': false,
+ 'transitionIn': 'elastic',
+ 'transitionOut': 'elastic',
+ 'href': '#' + id,
+ 'onClosed': function () {
+ }
+ }, 0);
+ }
+ //#endregion
+
+
+ //#region
+ function ajaxFileUpload() {
+ var filename = $("#fileToUpload").val();
+ if (!filename.endsWith('.xls') && !filename.endsWith('.xlsx')) { alert("文件格式不正确"); return; }
+ $.ajaxFileUpload({
+ url: '../GlobalAshx/AjaxFileUpdate.ashx?DirectoryName=ServerCookies',
+ secureuri: false,
+ fileElementId: 'fileToUpload',
+ dataType: 'json',
+ success: function (data, status) {
+ ImportGoods("ServerCookies/" + data.FileName);
+ },
+ error: function (data, status, e) {
+ alert(e);
+ }
+ });
+ }
+ //#endregion
+
+ //#region
+ function ImportGoods(FileName) {
+ var param = new Object();
+ param.filePath = FileName;
+ WindowLoadModel.Show();
+ $.ajax({
+ url: "../HuoWuServiceNew.asmx/ImportTemuHuoDongPrices",
+ data: Sys.Serialization.JavaScriptSerializer.serialize(param),
+ success: function (data) {
+ WindowLoadModel.Hide();
+ if (data.d.Code == 0) { alert(data.d.Message); ReadData(); return; }
+ else {
+ ReadData();
+ }
+ },
+ error: function (xhr, status) {
+ if (status != "success") alert(xhr.responseText);
+ }
+ });
+ }
+ //#endregion
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+ |