diff --git a/TradeManage/HuoWu/HW_GoodsAddForTM.aspx b/TradeManage/HuoWu/HW_GoodsAddForTM.aspx
index a36bea9..451872a 100644
--- a/TradeManage/HuoWu/HW_GoodsAddForTM.aspx
+++ b/TradeManage/HuoWu/HW_GoodsAddForTM.aspx
@@ -44,7 +44,14 @@
var XPId = 0;
var GoodsModel = null;
var Title = "货物信息";
- var UserId = "<%=Session["UserId"]%>";
+ var UserId = "<%=Session["UserId"]%>";
+ var TemuChengBen = {
+ JinJia: "0",
+ YunFei: "0",
+ TouCheng: "0",
+ HuoWuShuiFei: "0",
+ YuGuJiaGe: "0",
+ }
var WindowLoadModel = new WindowLoad();
$(document).ready(function () {
WindowLoadModel.ApplicationPath = "../";
@@ -95,7 +102,8 @@
GetUrl();
GetUrl2();
GetPostNum();
- GetFedexModel();
+ GetFedexModel();
+ GetTemuFee();
}
//else
@@ -651,6 +659,74 @@
}
+
+ //获取temu成本预估
+ function GetTemuFee() {
+ var param = {
+ GoodsId: GoodsId
+ }
+ $.ajax({
+ url: "../DD_OrderServiceNew.asmx/GetListTemuChengBen",
+ data: Sys.Serialization.JavaScriptSerializer.serialize(param),
+ success: function (data) {
+ var JinJia = (GoodsModel.InPrice / usdfeerate).toFixed(2)
+ var TouCheng = (GoodsModel.Solid * 130).toFixed(2)
+ var HuoWuShuiFei = (GoodsModel.Solid * 130).toFixed(2)
+ var YuGuJiaGe = Number(JinJia) + Number(TouCheng) + Number(HuoWuShuiFei)
+ TemuChengBen = {
+ JinJia: JinJia,
+ YunFei: "0",
+ TouCheng: TouCheng,
+ HuoWuShuiFei: HuoWuShuiFei,
+ YuGuJiaGe: YuGuJiaGe.toFixed(2),
+ }
+ if (data.d.DataSource && data.d.DataSource.length) {
+ TemuChengBen = data.d.DataSource[0]
+ }
+ $("#txt_temu_JinJia").val(TemuChengBen.JinJia)
+ $("#txt_temu_YunFei").val(TemuChengBen.YunFei)
+ $("#txt_temu_TouCheng").val(TemuChengBen.TouCheng)
+ $("#txt_temu_HuoWuShuiFei").val(TemuChengBen.HuoWuShuiFei)
+ $('#txt_temu_YuGuJiaGe').text(TemuChengBen.YuGuJiaGe + '$')
+ }
+ });
+
+ }
+
+ //计算并保存temu成本预估
+ function SaveTemuFee() {
+ var JinJia = $("#txt_temu_JinJia").val()
+ var YunFei = $("#txt_temu_YunFei").val()
+ var TouCheng = $("#txt_temu_TouCheng").val()
+ var HuoWuShuiFei = $("#txt_temu_HuoWuShuiFei").val()
+ if (!JinJia || !YunFei || !TouCheng || !HuoWuShuiFei) {
+ alert("请把信息填写完整");
+ return;
+ }
+ var YuGuJiaGe = Number(JinJia) + Number(YunFei) + Number(TouCheng) + Number(HuoWuShuiFei)
+ $('#txt_temu_YuGuJiaGe').text(YuGuJiaGe+'$')
+ var param = {
+ Model: {
+ ID: TemuChengBen.ID,
+ GoodsId: GoodsId,
+ JinJia: JinJia,
+ YunFei: YunFei,
+ TouCheng: TouCheng,
+ HuoWuShuiFei: HuoWuShuiFei,
+ YuGuJiaGe: YuGuJiaGe,
+ }
+ }
+ $.ajax({
+ url: "../DD_OrderServiceNew.asmx/Save_TemuChengBen",
+ data: Sys.Serialization.JavaScriptSerializer.serialize(param),
+
+ success: function (data) {
+ WindowLoadModel.Hide();
+ GetFedexModel();
+ }
+ });
+ }
+
function SumYGFee()
{
if(GoodsModel!=null)
@@ -4776,6 +4852,19 @@ function selectE(p,c) {
type="button" value="计算" />
+
+
+ temu成本预估:
+ |
+
+ 进价:
+ +运费:
+ +货物税费:
+ +头程:
+ =预计价格:0$
+
+ |
+
diff --git a/TradeManage/HuoWu/HW_GoodsDetailList2.aspx b/TradeManage/HuoWu/HW_GoodsDetailList2.aspx
index 6853fb6..108329a 100644
--- a/TradeManage/HuoWu/HW_GoodsDetailList2.aspx
+++ b/TradeManage/HuoWu/HW_GoodsDetailList2.aspx
@@ -1162,6 +1162,10 @@
col.CellTemplate = "{Bind SubsidyFee}";
Array.add(datagrid1.Columns, col);
col = new nblf.ui.DataGridColumn();
+ col.HeaderText = "temu成本";
+ col.CellTemplate = "{Bind YuGuJiaGe}";
+ Array.add(datagrid1.Columns, col);
+ col = new nblf.ui.DataGridColumn();
col.HeaderText = "建议售价$";
col.CellTemplate = "{Bind JYPrice}";
// col.SortExpression = "InPrice";
diff --git a/TradeManage/Web.config b/TradeManage/Web.config
index 603e40a..d783027 100644
--- a/TradeManage/Web.config
+++ b/TradeManage/Web.config
@@ -67,7 +67,8 @@
-
+
+
diff --git a/TradeManageNew/DingDan/DT_SecondHand2.aspx b/TradeManageNew/DingDan/DT_SecondHand2.aspx
new file mode 100644
index 0000000..b355f91
--- /dev/null
+++ b/TradeManageNew/DingDan/DT_SecondHand2.aspx
@@ -0,0 +1,1070 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DT_OrderReturn.aspx.cs" Inherits="TradeManageNew.DingDan.DT_OrderReturn" %>
+
+
+
+
+
+
+
+ 二手售卖2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 二手售卖2
+
+
+
+
+
+
+
+
+
+

+

+
+
+
+
+
+
+ Product
+ -
+
+
+

+
-
+
+
+
+
+
+
verification code
+
+
+
+
+
+

+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/TradeManageNew/DingDan/DT_SecondHand2.aspx.cs b/TradeManageNew/DingDan/DT_SecondHand2.aspx.cs
new file mode 100644
index 0000000..fe91c85
--- /dev/null
+++ b/TradeManageNew/DingDan/DT_SecondHand2.aspx.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace TradeManageNew.DingDan
+{
+ public partial class DT_SecondHand2 : System.Web.UI.Page
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/TradeManageNew/DingDan/DT_SecondHand2.aspx.designer.cs b/TradeManageNew/DingDan/DT_SecondHand2.aspx.designer.cs
new file mode 100644
index 0000000..fef794e
--- /dev/null
+++ b/TradeManageNew/DingDan/DT_SecondHand2.aspx.designer.cs
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+// 此代码由工具生成。
+//
+// 对此文件的更改可能导致不正确的行为,如果
+// 重新生成代码,则所做更改将丢失。
+// 自动生成>
+//------------------------------------------------------------------------------
+
+namespace TradeManageNew.DingDan
+{
+
+
+ public partial class DT_SecondHand2
+ {
+
+ ///
+ /// form1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
diff --git a/TradeManageNew/TradeManageNew.csproj b/TradeManageNew/TradeManageNew.csproj
index 6396918..cb419f5 100644
--- a/TradeManageNew/TradeManageNew.csproj
+++ b/TradeManageNew/TradeManageNew.csproj
@@ -1377,6 +1377,7 @@
+
@@ -2552,6 +2553,13 @@
DT_SecondHand.aspx
+
+ DT_SecondHand2.aspx
+ ASPXCodeBehind
+
+
+ DT_SecondHand2.aspx
+
FedexFee2.aspx
ASPXCodeBehind
diff --git a/TradeManageNew/Web.config b/TradeManageNew/Web.config
index 2fb8413..9be45b4 100644
--- a/TradeManageNew/Web.config
+++ b/TradeManageNew/Web.config
@@ -155,4 +155,14 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file