修改bug

ShopMobile.Bll/PT_Order_Item.cs

@@ -131,7 +131,12 @@ namespace ShopMobile.Bll
                     {
                         model.Qty = int.Parse(dt.Rows[n]["Qty"].ToString());
                     }
+                    model.Attrs = dt.Rows[n]["Attrs"].ToString();
 
+                    if (dt.Rows[n]["SpNo"].ToString() != "")
+                    {
+                        model.SpNo = int.Parse(dt.Rows[n]["SpNo"].ToString());
+                    }
 
                     modelList.Add(model);
                 }

ShopMobile.Common/Utils.cs

@@ -53,10 +53,23 @@ namespace ShopMobile.Common
         #region SHA256加密
         public static string SHA256(string pwd)
         {
-            byte[] SHA256Data = Encoding.UTF8.GetBytes(pwd);
-            SHA256Managed Sha256 = new SHA256Managed();
-            byte[] Result = Sha256.ComputeHash(SHA256Data);
-            return Convert.ToBase64String(Result);  //返回长度为44字节的字符串
+            //byte[] SHA256Data = Encoding.UTF8.GetBytes(pwd);
+            //SHA256Managed Sha256 = new SHA256Managed();
+            //byte[] Result = Sha256.ComputeHash(SHA256Data);
+            //return Convert.ToBase64String(Result);  //返回长度为44字节的字符串
+            using (SHA256Managed sha256 = new SHA256Managed())
+            {
+                var hash = sha256.ComputeHash(Encoding.UTF8.GetBytes(pwd));
+                var sb = new StringBuilder(hash.Length * 2);
+
+                foreach (byte b in hash)
+                {
+                    sb.Append(b.ToString("x2"));
+                }
+
+                return sb.ToString();
+            }
+
         }
         public static string SHA1(string pwd)
         {

ShopMobile.Dal/PT_Order_Header.cs

@@ -48,7 +48,7 @@ namespace ShopMobile.Dal
                         new SqlParameter("@ExpressTime", SqlDbType.DateTime) ,
                         new SqlParameter("@QHPeople", SqlDbType.VarChar,50) ,
                         new SqlParameter("@OrderID", SqlDbType.VarChar,30) ,
-                        new SqlParameter("@QHRemark", SqlDbType.VarChar,500) ,
+                        new SqlParameter("@QHRemark", SqlDbType.VarChar,-1) ,
                         new SqlParameter("@DiscountNo", SqlDbType.VarChar,50) ,
                         new SqlParameter("@DiscountPrice", SqlDbType.Decimal,9) ,
                         new SqlParameter("@Points", SqlDbType.Decimal,9) ,
@@ -59,7 +59,7 @@ namespace ShopMobile.Dal
                         new SqlParameter("@InvoiceTitle", SqlDbType.VarChar,50) ,
                         new SqlParameter("@InvoiceContent", SqlDbType.VarChar,50) ,
                         new SqlParameter("@Receiver", SqlDbType.VarChar,30) ,
-                        new SqlParameter("@OrderMemo", SqlDbType.VarChar,200) ,
+                        new SqlParameter("@OrderMemo", SqlDbType.VarChar,-1) ,
                         new SqlParameter("@CreateUser", SqlDbType.VarChar,30) ,
                         new SqlParameter("@CreateTime", SqlDbType.DateTime) ,
                         new SqlParameter("@PayTime", SqlDbType.DateTime) ,
@@ -136,7 +136,7 @@ namespace ShopMobile.Dal
                         new SqlParameter("@ExpressTime", SqlDbType.DateTime) ,
                         new SqlParameter("@QHPeople", SqlDbType.VarChar,50) ,
                         new SqlParameter("@OrderID", SqlDbType.VarChar,30) ,
-                        new SqlParameter("@QHRemark", SqlDbType.VarChar,500) ,
+                        new SqlParameter("@QHRemark", SqlDbType.VarChar,-1) ,
                         new SqlParameter("@DiscountNo", SqlDbType.VarChar,50) ,
                         new SqlParameter("@DiscountPrice", SqlDbType.Decimal,9) ,
                         new SqlParameter("@Points", SqlDbType.Decimal,9) ,
@@ -147,7 +147,7 @@ namespace ShopMobile.Dal
                         new SqlParameter("@InvoiceTitle", SqlDbType.VarChar,50) ,
                         new SqlParameter("@InvoiceContent", SqlDbType.VarChar,50) ,
                         new SqlParameter("@Receiver", SqlDbType.VarChar,30) ,
-                        new SqlParameter("@OrderMemo", SqlDbType.VarChar,200) ,
+                        new SqlParameter("@OrderMemo", SqlDbType.VarChar,-1) ,
                         new SqlParameter("@CreateUser", SqlDbType.VarChar,30) ,
                         new SqlParameter("@CreateTime", SqlDbType.DateTime) ,
                         new SqlParameter("@PayTime", SqlDbType.DateTime) ,
@@ -260,7 +260,7 @@ namespace ShopMobile.Dal
                         new SqlParameter("@ExpressTime", SqlDbType.DateTime) ,
                         new SqlParameter("@QHPeople", SqlDbType.VarChar,50) ,
                         new SqlParameter("@OrderID", SqlDbType.VarChar,30) ,
-                        new SqlParameter("@QHRemark", SqlDbType.VarChar,500) ,
+                        new SqlParameter("@QHRemark", SqlDbType.VarChar,-1) ,
                         new SqlParameter("@DiscountNo", SqlDbType.VarChar,50) ,
                         new SqlParameter("@DiscountPrice", SqlDbType.Decimal,9) ,
                         new SqlParameter("@Points", SqlDbType.Decimal,9) ,
@@ -271,7 +271,7 @@ namespace ShopMobile.Dal
                         new SqlParameter("@InvoiceTitle", SqlDbType.VarChar,50) ,
                         new SqlParameter("@InvoiceContent", SqlDbType.VarChar,50) ,
                         new SqlParameter("@Receiver", SqlDbType.VarChar,30) ,
-                        new SqlParameter("@OrderMemo", SqlDbType.VarChar,200) ,
+                        new SqlParameter("@OrderMemo", SqlDbType.VarChar,-1) ,
                         new SqlParameter("@CreateUser", SqlDbType.VarChar,30) ,
                         new SqlParameter("@CreateTime", SqlDbType.DateTime) ,
                         new SqlParameter("@PayTime", SqlDbType.DateTime) ,

ShopMobile.Dal/PT_Order_Item.cs

@@ -33,9 +33,9 @@ namespace ShopMobile.Dal
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into PT_Order_Item(");
-            strSql.Append("CreateUser,CreateTime,OrderID,PID,Title,ImgUrl,Price1,Price2,Price3,Qty");
+            strSql.Append("CreateUser,CreateTime,OrderID,PID,Title,ImgUrl,Price1,Price2,Price3,Qty,Attrs,SpNo");
             strSql.Append(") values (");
-            strSql.Append("@CreateUser,@CreateTime,@OrderID,@PID,@Title,@ImgUrl,@Price1,@Price2,@Price3,@Qty");
+            strSql.Append("@CreateUser,@CreateTime,@OrderID,@PID,@Title,@ImgUrl,@Price1,@Price2,@Price3,@Qty,@Attrs,@SpNo");
             strSql.Append(") ");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
@@ -48,7 +48,9 @@ namespace ShopMobile.Dal
                         new SqlParameter("@Price1", SqlDbType.Decimal,9) ,
                         new SqlParameter("@Price2", SqlDbType.Decimal,9) ,
                         new SqlParameter("@Price3", SqlDbType.Decimal,9) ,
-                        new SqlParameter("@Qty", SqlDbType.Int,4)
+                        new SqlParameter("@Qty", SqlDbType.Int,4),
+                        new SqlParameter("@Attrs", SqlDbType.VarChar,-1),
+                        new SqlParameter("@SpNo", SqlDbType.Int,4)
 
             };
 
@@ -62,6 +64,8 @@ namespace ShopMobile.Dal
             parameters[7].Value = model.Price2;
             parameters[8].Value = model.Price3;
             parameters[9].Value = model.Qty;
+            parameters[10].Value = model.Attrs;
+            parameters[11].Value = model.SpNo;
 
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
@@ -84,9 +88,9 @@ namespace ShopMobile.Dal
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into PT_Order_Item(");
-            strSql.Append("CreateUser,CreateTime,OrderID,PID,Title,ImgUrl,Price1,Price2,Price3,Qty");
+            strSql.Append("CreateUser,CreateTime,OrderID,PID,Title,ImgUrl,Price1,Price2,Price3,Qty,Attrs,SpNo");
             strSql.Append(") values (");
-            strSql.Append("@CreateUser,@CreateTime,@OrderID,@PID,@Title,@ImgUrl,@Price1,@Price2,@Price3,@Qty");
+            strSql.Append("@CreateUser,@CreateTime,@OrderID,@PID,@Title,@ImgUrl,@Price1,@Price2,@Price3,@Qty,@Attrs,@SpNo");
             strSql.Append(") ");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
@@ -99,7 +103,9 @@ namespace ShopMobile.Dal
                         new SqlParameter("@Price1", SqlDbType.Decimal,9) ,
                         new SqlParameter("@Price2", SqlDbType.Decimal,9) ,
                         new SqlParameter("@Price3", SqlDbType.Decimal,9) ,
-                        new SqlParameter("@Qty", SqlDbType.Int,4)
+                        new SqlParameter("@Qty", SqlDbType.Int,4),
+                        new SqlParameter("@Attrs", SqlDbType.VarChar,-1),
+                        new SqlParameter("@SpNo", SqlDbType.Int,4)
 
             };
 
@@ -113,6 +119,8 @@ namespace ShopMobile.Dal
             parameters[7].Value = model.Price2;
             parameters[8].Value = model.Price3;
             parameters[9].Value = model.Qty;
+            parameters[10].Value = model.Attrs;
+            parameters[11].Value = model.SpNo;
 
             CommandInfo cio = new CommandInfo();
             cio.CommandText = strSql.ToString();
@@ -139,7 +147,9 @@ namespace ShopMobile.Dal
             strSql.Append(" Price1 = @Price1 , ");
             strSql.Append(" Price2 = @Price2 , ");
             strSql.Append(" Price3 = @Price3 , ");
-            strSql.Append(" Qty = @Qty  ");
+            strSql.Append(" Qty = @Qty , ");
+            strSql.Append(" Attrs=@Attrs ,");
+            strSql.Append(" SpNo=@SpNo ");
             strSql.Append(" where ID=@ID ");
 
             SqlParameter[] parameters = {
@@ -153,7 +163,9 @@ namespace ShopMobile.Dal
                         new SqlParameter("@Price1", SqlDbType.Decimal,9) ,
                         new SqlParameter("@Price2", SqlDbType.Decimal,9) ,
                         new SqlParameter("@Price3", SqlDbType.Decimal,9) ,
-                        new SqlParameter("@Qty", SqlDbType.Int,4)
+                        new SqlParameter("@Qty", SqlDbType.Int,4),
+                        new SqlParameter("@Attrs", SqlDbType.VarChar,-1),
+                        new SqlParameter("@SpNo", SqlDbType.Int,4)
 
             };
 
@@ -168,6 +180,8 @@ namespace ShopMobile.Dal
             parameters[8].Value = model.Price2;
             parameters[9].Value = model.Price3;
             parameters[10].Value = model.Qty;
+            parameters[11].Value = model.Attrs;
+            parameters[12].Value = model.SpNo;
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
             {
@@ -233,7 +247,7 @@ namespace ShopMobile.Dal
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select ID, CreateUser, CreateTime, OrderID, PID, Title, ImgUrl, Price1, Price2, Price3, Qty  ");
+            strSql.Append("select *  ");
             strSql.Append("  from PT_Order_Item ");
             strSql.Append(" where ID=@ID");
             SqlParameter[] parameters = {
@@ -279,7 +293,11 @@ namespace ShopMobile.Dal
                 {
                     model.Qty = int.Parse(ds.Tables[0].Rows[0]["Qty"].ToString());
                 }
-
+                model.Attrs = ds.Tables[0].Rows[0]["Attrs"].ToString();
+                if (ds.Tables[0].Rows[0]["SpNo"].ToString() != "")
+                {
+                    model.SpNo = int.Parse(ds.Tables[0].Rows[0]["SpNo"].ToString());
+                }
                 return model;
             }
             else

ShopMobile.Dal/PT_Pro_Product.cs

@@ -58,7 +58,7 @@ namespace ShopMobile.Dal
                         new SqlParameter("@SpNo", SqlDbType.Int,4) ,
                         new SqlParameter("@SPPrice", SqlDbType.Decimal,9) ,
                         new SqlParameter("@SpBQ", SqlDbType.VarChar,500) ,
-                        new SqlParameter("@Title", SqlDbType.VarChar,100) ,
+                        new SqlParameter("@Title", SqlDbType.VarChar,-1) ,
                         new SqlParameter("@ImgUrl", SqlDbType.VarChar,2000) ,
                         new SqlParameter("@ImgUrl1", SqlDbType.VarChar,100)
 
@@ -155,7 +155,7 @@ namespace ShopMobile.Dal
                         new SqlParameter("@SpNo", SqlDbType.Int,4) ,
                         new SqlParameter("@SPPrice", SqlDbType.Decimal,9) ,
                         new SqlParameter("@SpBQ", SqlDbType.VarChar,500) ,
-                        new SqlParameter("@Title", SqlDbType.VarChar,100) ,
+                        new SqlParameter("@Title", SqlDbType.VarChar,-1) ,
                         new SqlParameter("@ImgUrl", SqlDbType.VarChar,2000) ,
                         new SqlParameter("@ImgUrl1", SqlDbType.VarChar,100)
 

ShopMobile.Model/PT_Order_Item.cs

@@ -73,5 +73,17 @@ namespace ShopMobile.Model
 		[DisplayName("CreateTime")]
 		public DateTime? CreateTime { get; set; }
 
-	}
+        /// <summary>
+		/// Attrs
+		/// </summary>
+		[DisplayName("Attrs")]
+        public string Attrs { get; set; }
+
+        /// <summary>
+		/// SpNo
+		/// </summary>
+		[DisplayName("SpNo")]
+        public int? SpNo { get; set; }
+
+    }
 }

ShopMobile/Admin/Defult.Master

@@ -80,7 +80,7 @@
                         <li><a href="UserList.aspx"><i class="icon-user"></i><span class="menu-text">用户管理</span></a></li>
                         <li><a href="ProductCategoryList.aspx"><i class="icon-user"></i><span class="menu-text">分类管理</span></a></li>
                         <li><a href="ProductList.aspx"><i class="icon-home"></i><span class="menu-text">商品管理</span></a></li>
-
+                        <li><a href="ProductListOther.aspx"><i class="icon-home"></i><span class="menu-text">转换商品管理</span></a></li>
                         <li><a><span class="menu-text">====可爱的分割线====</span></a></li>
                         <li><a href="AdminUserList.aspx"><i class="icon-cogs"></i><span class="menu-text">管理员管理</span></a></li>
 

ShopMobile/Admin/Defult.Master.cs

@@ -15,7 +15,7 @@ namespace ShopMobile.Admin
         {
             if (Request.Cookies["admin"] == null)
             {
-                Response.Redirect("login.aspx");
+                Response.Redirect("/Admin/login.aspx");
             }
             else
             {
@@ -29,12 +29,12 @@ namespace ShopMobile.Admin
                     {
                         CookieUtil.RemoveCookie("admin");
 
-                        Response.Redirect("Login.aspx");
+                        Response.Redirect("/Admin/Login.aspx");
                     }
                 }
                 catch
                 {
-                    Response.Redirect("Login.aspx");
+                    Response.Redirect("/Admin/Login.aspx");
                 }
             }
 

ShopMobile/Admin/ProductList.aspx

@@ -15,10 +15,16 @@
                 <div class="row">
                     <div class="col-xs-8">
                         商品名称：<asp:TextBox ID="txtname" runat="server"></asp:TextBox>
+                        上架状态：
+                        <asp:DropDownList ID="ddlzt" runat="server">
+                            <asp:ListItem></asp:ListItem>
+                            <asp:ListItem Value="1">上架</asp:ListItem>
+                            <asp:ListItem Value="0">下架</asp:ListItem>
+                        </asp:DropDownList>
                     </div>
                     <div class="col-xs-4">
                         <asp:Button ID="btnsearch" runat="server" Text="搜索" OnClick="btnsearch_Click" />
-                        <asp:Button ID="btn" runat="server" Text="同步商品" OnClick="btn_Click" />
+                        <%--<asp:Button ID="btn" runat="server" Text="同步商品" OnClick="btn_Click" />--%>
                     </div>
                 </div>
                 

ShopMobile/Admin/ProductList.aspx.cs

@@ -74,10 +74,16 @@ namespace ShopMobile.Admin
 
             if (!string.IsNullOrEmpty(Request.QueryString["zh"]))
             {
-                _search = _search + " and Title like '%" + Request.QueryString["zh"] + "%'";
+               _search = _search + " and Title like '%" + Request.QueryString["zh"] + "%'";
                 txtname.Text = Request.QueryString["zh"];
             }
 
+            if (!string.IsNullOrEmpty(Request.QueryString["zt"]))
+            {
+                _search = _search + " and IsSelf = '" + Request.QueryString["zt"] + "'";
+                ddlzt.SelectedValue= Request.QueryString["zt"];
+            }
+
             RpList.DataSource = Paginator.MyExecutePage("*", "[PT_Pro_Product]", _search,"id", "id desc", PageIndex, PageSize, out RecordCount, out PageCount);
             paging = Paginator.Pagination(PageIndex, PageCount, RecordCount);
             RpList.DataBind();
@@ -86,41 +92,15 @@ namespace ShopMobile.Admin
         protected void btnsearch_Click(object sender, EventArgs e)
         {
             string strzh = txtname.Text.Trim();
+            string strzt = ddlzt.SelectedValue;
 
             string _url = HttpContext.Current.Request.Url.AbsoluteUri;
             if (_url.IndexOf('?') != -1)
             {
-                if (_url.Contains("&Page="))
-                {
-                    _url = _url.Remove(_url.LastIndexOf("&"));
-                    _url = _url + "&";
-                }
-                else if (_url.Contains("?Page="))
-                {
-                    _url = _url.Remove(_url.LastIndexOf("?"));
-                    _url = _url + "?";
-                }
-                if (_url.Contains("&zh="))
-                {
-                    _url = _url.Remove(_url.LastIndexOf("&zh="));
-                    _url = _url + "&";
-                }
-                else if (_url.Contains("?zh="))
-                {
-                    _url = _url.Remove(_url.LastIndexOf("?"));
-                    _url = _url + "?";
-                }
-                else
-                {
-                    _url = _url + "&";
-                }
-            }
-            else
-            {
-                _url = _url + "?";
+                _url = _url.Remove(_url.LastIndexOf("?"));
             }
 
-            _url = _url + "zh=" + strzh ;
+            _url = _url+ "?zh=" + strzh +"&zt="+ strzt;
             Response.Redirect(_url);
         }
 

ShopMobile/Admin/ProductList.aspx.designer.cs

@@ -22,22 +22,22 @@ namespace ShopMobile.Admin {
         protected global::System.Web.UI.WebControls.TextBox txtname;
         
         /// <summary>
-        /// btnsearch 控件。
+        /// ddlzt 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Button btnsearch;
+        protected global::System.Web.UI.WebControls.DropDownList ddlzt;
         
         /// <summary>
-        /// btn 控件。
+        /// btnsearch 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Button btn;
+        protected global::System.Web.UI.WebControls.Button btnsearch;
         
         /// <summary>
         /// RpList 控件。

ShopMobile/Admin/ProductListOther.aspx

@@ -0,0 +1,96 @@
+<%@ Page Title="" Language="C#" MasterPageFile="~/Admin/Defult.Master" AutoEventWireup="true" CodeBehind="ProductListOther.aspx.cs" Inherits="ShopMobile.Admin.ProductListOther" %>
+
+<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
+</asp:Content>
+<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
+    <div class="page-content">
+        <div class="page-header">
+            <h1>转换商品列表
+            </h1>
+        </div>
+        <div class="row">
+            <div class="col-xs-12" style="margin-bottom: 10px;">
+                <div class="row">
+                    <div class="col-xs-8">
+                        商品名称：<asp:TextBox ID="txtname" runat="server"></asp:TextBox>
+                    </div>
+                    <div class="col-xs-4">
+                        <asp:Button ID="btnsearch" runat="server" Text="搜索" OnClick="btnsearch_Click" />
+                    </div>
+                </div>
+            </div>
+            <div class="col-xs-12">
+                <div class="table-responsive">
+                    <table id="sample-table-1" class="table table-striped table-bordered table-hover">
+                        <thead>
+                            <tr>
+                                <th>编号
+                                </th>
+                                <th>名称
+                                </th>
+                                <th>价格
+                                </th>
+                                <th>图片
+                                </th>
+                                <th>品牌
+                                </th>
+                                <th>状态
+                                </th>
+                                <th>操作
+                                </th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <asp:Repeater ID="RpList" runat="server" OnItemCommand="RpList_ItemCommand">
+                                <ItemTemplate>
+                                    <tr>
+                                        <td>
+                                            <%#Eval("ProductSysNo") %>
+                                        </td>
+                                        <td>
+                                            <%#Eval("ProductName") %>
+                                        </td>
+                                        <td>
+                                            <%#Eval("ProductPrice") %>
+                                        </td>
+                                        <td>
+                                            <img src='<%#Eval("AppActiveProductImg") %>' style="height: 50px;" />
+                                        </td>
+                                        <td>
+                                            <%#Eval("Brand_Name") %>
+                                        </td>
+                                        <td>
+                                            <%#Eval("Status").ToString()=="3"?"上架":"<span style='color:red'>下架</span>" %>
+                                        </td>
+                                        <td>
+                                            <%--<a href="?Action=export&Id=<%#Eval("ProductSysNo") %>" title="导入" onclick="return confirm('确定要导入吗？')">导入本地商品库
+                                            </a>--%>
+                                            <asp:LinkButton ID="lbexport" CommandName="export" CommandArgument='<%#Eval("ProductSysNo") %>' OnClientClick="return confirm('确定要导入吗？')" runat="server" >导入本地商品库</asp:LinkButton>
+                                        </td>
+                                    </tr>
+                                </ItemTemplate>
+                            </asp:Repeater>
+                        </tbody>
+                    </table>
+                    <div class="row">
+                        <div class="col-sm-6">
+                        </div>
+                        <div class="col-sm-6">
+                            <div class="dataTables_paginate paging_bootstrap">
+                                <ul class="pagination">
+                                    <li class="active">
+                                        <%=paging %></li>
+                                </ul>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <!-- /.table-responsive -->
+            </div>
+            <!-- /span -->
+        </div>
+        <!-- /.row -->
+    </div>
+</asp:Content>
+<asp:Content ID="Content3" ContentPlaceHolderID="otherjquery" runat="server">
+</asp:Content>

ShopMobile/Admin/ProductListOther.aspx.cs

@@ -0,0 +1,140 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using ShopMobile.Admin.common;
+using ShopMobile.Common;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace ShopMobile.Admin
+{
+    public partial class ProductListOther : BasePage
+    {
+        public string paging;
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                bind();
+            }
+        }
+
+        protected void bind()
+        {
+
+            string url = CommFun.GetConfigString("shopurl").ToString();
+            string appkey = CommFun.GetConfigString("appkey").ToString();
+            string userkey = "&" + CommFun.GetConfigString("userkey").ToString();
+
+            int page = CommFun.RequestInt("Page", 1);
+            int pageindex = 10;
+
+            string key = CommFun.QueryString("zh");
+            txtname.Text = key;
+
+            try
+            {
+                var strdate = DateTime.Now.ToString("yyyyMMddHHmmss");
+                string strdata = "app_key=" + appkey + "&format=json&KeyWord=" + key + "&PageCount=" + pageindex
+                    + "&PageIndex=" + page + "&sign_method=md5&timestamp=" + strdate
+                    + "&sign=" + Utils.MD5(appkey + "json" + key + pageindex + page + "md5" + strdate + userkey).ToLower();
+                string result = CommFun.Get(url + "/v2/By/Products", strdata);
+                JObject res = JsonConvert.DeserializeObject(result) as JObject;
+                JObject ret = JsonConvert.DeserializeObject(res["Result"].ToString()) as JObject;
+                JObject con = JsonConvert.DeserializeObject(res["Content"].ToString()) as JObject;
+                if (ret["code"].ToString() == "1001")
+                {
+                    int tc = Int32.Parse(con["TotalCount"].ToString());
+                    int pc = Int32.Parse(Math.Ceiling(decimal.Parse(tc.ToString()) / pageindex).ToString());
+                    paging = Paginator.Pagination(page, pc, tc);
+                    ViewState["list"] = con["Products"].ToString();
+                    List<JObject> list = JsonConvert.DeserializeObject<List<JObject>>(con["Products"].ToString());
+
+                    RpList.DataSource = list.ToArray();
+                    RpList.DataBind();
+                }
+            }
+            catch (Exception ex)
+            { }
+        }
+
+        protected void btnsearch_Click(object sender, EventArgs e)
+        {
+            string strzh = txtname.Text.Trim();
+
+            string _url = HttpContext.Current.Request.Url.AbsoluteUri;
+            if (_url.IndexOf('?') != -1)
+            {
+                _url = _url.Remove(_url.LastIndexOf("?"));
+            }
+            _url = _url + "?";
+
+            _url = _url + "zh=" + strzh;
+            Response.Redirect(_url);
+        }
+
+        protected void RpList_ItemCommand(object source, RepeaterCommandEventArgs e)
+        {
+            if (e.CommandName == "export")
+            {
+                int _id = Int32.Parse(e.CommandArgument.ToString());
+                if (_id > 0)
+                {
+                    List<JObject> list = JsonConvert.DeserializeObject<List<JObject>>((string)ViewState["list"]);
+                    JObject obj = new JObject();
+                    foreach (JObject l in list)
+                    {
+                        if (l["ProductSysNo"].ToString() == _id.ToString())
+                        {
+                            obj = l;
+                            break;
+                        }
+                    }
+
+                    Model.PT_Pro_Product model = new Bll.PT_Pro_Product().GetModelBySpNo(_id);
+                    if (model == null)
+                    {
+                        Model.PT_Pro_Product pt = new Model.PT_Pro_Product();
+                        pt.Title = obj["ProductName"].ToString();
+                        pt.SPPrice = decimal.Parse(obj["ProductPrice"].ToString());
+                        pt.ImgUrl1 = obj["AppActiveProductImg"].ToString();
+                        pt.Category = Int32.Parse(obj["Product_C3SysNo"].ToString());
+                        pt.SpNo = Int32.Parse(obj["ProductSysNo"].ToString());
+                        pt.Status = Int32.Parse(obj["Status"].ToString());
+                        pt.Brand = obj["Brand_Name"].ToString();
+
+                        pt.Type = 1;
+                        pt.IsSelf = 0;
+                        pt.Deleted = 0;
+                        pt.CreateUser = uModel.UserName;
+                        pt.CreateTime = DateTime.Now;
+
+                        new Bll.PT_Pro_Product().Add(pt);
+                    }
+                    else
+                    {
+                        model.Title = obj["ProductName"].ToString();
+                        model.SPPrice = decimal.Parse(obj["ProductPrice"].ToString());
+                        model.ImgUrl1 = obj["AppActiveProductImg"].ToString();
+                        model.Category = Int32.Parse(obj["Product_C3SysNo"].ToString());
+                        model.SpNo = Int32.Parse(obj["ProductSysNo"].ToString());
+                        model.Status = Int32.Parse(obj["Status"].ToString());
+                        model.Brand = obj["Brand_Name"].ToString();
+
+                        new Bll.PT_Pro_Product().Update(model);
+                    }
+
+                    Common.MessageBox.Show(this, "导入完成");
+                }
+                else
+                {
+                    Common.MessageBox.Show(this, "导入失败");
+                }
+            }
+        }
+    }
+}

ShopMobile/Admin/ProductListOther.aspx.designer.cs

@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace ShopMobile.Admin {
+    
+    
+    public partial class ProductListOther {
+        
+        /// <summary>
+        /// txtname 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtname;
+        
+        /// <summary>
+        /// btnsearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btnsearch;
+        
+        /// <summary>
+        /// RpList 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Repeater RpList;
+    }
+}

ShopMobile/Admin/common/BasePage.cs

@@ -15,7 +15,7 @@ namespace ShopMobile.Admin.common
             //验证登录权限
             if (Request.Cookies["admin"] == null)
             {
-                Response.Redirect("/Login.aspx", true);
+                Response.Redirect("/Admin/Login.aspx", true);
 
             }
             else

ShopMobile/Mobile/View/Order.html

@@ -27,25 +27,18 @@
             },
             GetAllPrice: function () {
                 var pri = 0;
-                $(model.ctData).each(function (i, n) {
-                    if (n.isxz) {
-                        pri = pri * 1 + n.qty * n.price;
-                    }
+                $(model.ctData).each(function (j, m) {
+                    $(m.items).each(function (i, n) {
+                        if (n.isxz) {
+                            pri = pri * 1 + n.qty * n.price;
+                        }
+                    })
                 })
                 return pri;
             },
             AllPrice: 0,
-            //KYJF: "0",
-            remark:"",
             PostDD: function () {
-                var ids = "";
-                $(model.ctData).each(function (i, n) {
-                    ids = ids + n.pid + "_" + n.qty + ",";
-                })
-                if (ids) {
-                    ids = ids.substring(0, ids.length - 1)
-                }
-                else {
+                if (model.ctData.length==0) {
                     common.alert("未选择商品！", "warn");
                     return;
                 }
@@ -53,9 +46,9 @@
                     common.alert("请选择收货地址！", "warn");
                     return;
                 }
-                if (ids && model.dzData.ID) {
+                if ( model.dzData.ID) {
                     var date = common.getnowdate("yyyyMMddHHmmss");
-                    var strdata = { action: "order_addorder", "ids": ids, "addid": model.dzData.ID, "remark": model.remark, timestamp: date };
+                    var strdata = { action: "order_addorder", "ids": JSON.stringify(model.ctData.$model), "addid": model.dzData.ID, timestamp: date };
                     var sign = common.getsign(JSON.stringify(strdata));
                     var data = JSON.parse(JSON.stringify(strdata));
                     data.sign = sign;
@@ -66,7 +59,12 @@
                             $(".ui-btn-wrap").remove();
                             common.delxzcart();
                             common.alert("提交订单成功", "success", function () {
-                                window.location.href = 'OrderDatail.html?oid=' + datamodel.result1;
+                                if (model.ctData.length > 0) {
+                                    window.location.href = 'OrderDatail.html?oid=' + datamodel.result1;
+                                }
+                                else {
+                                    window.location.href = 'UserOrder.html';
+                                }
                             })
                         }
                     })
@@ -133,19 +131,32 @@
             <div class="ui-form-item ui-form-item-order ui-border-b">
                 <a>商品明细</a>
             </div>
-            <ul class="ui-list ui-list-text ui-border-b" style="margin-bottom:0px">
-                <li ms-repeat-el="ctData" ms-class-1="ui-border-t:!$first" style="padding:0;">
+            <ul class="ui-list ui-list-text ui-border-b" style="margin-bottom:0px" ms-repeat-elt="ctData">
+                <li>商家{{$index+1}}</li>
+                <li ms-repeat-el="elt.items" class="ui-border-t" >
                     <div class="ui-list-thumb ">
                         <img ms-src="el.imgurl" style="width:50px;" />
                     </div>
                     <div class="ui-list-info">
                         <h4 class="ui-nowrap">{{el.title}}</h4>
+                        <div class="ui-row-flex" ms-visible="el.group.length>0">
+                            <div class="ui-col ui-col" style="color: #777;font-size: 14px;" ms-repeat-item="el.group">{{item.key+'：'+item.value}}</div>
+                        </div>
                         <div style="display: -webkit-box;background-color: #fff;">
                             <h4 style="-webkit-box-flex: 1;"><span style="color:red">¥{{el.price/2}}</span>+<span style="color:red">¥{{el.price/2}}</span></h4>
                             <div>x{{el.qty}}</div>
                         </div>
                     </div>
                 </li>
+
+                <li class="ui-border-t" style="padding:0;">
+                    <div class="ui-form-item ui-form-item-textarea " style="width: 100%;padding: 0;">
+                        <label>
+                            备注
+                        </label>
+                        <textarea placeholder="请输入备注" ms-duplex="elt.remark"></textarea>
+                    </div>
+                </li>
             </ul>
             <div class="ui-form ui-border-b">
                 <!--<div class="ui-form-item ui-border-b">
@@ -153,12 +164,7 @@
                     <span style="color: red;padding-left: 95px;">¥{{KYJF}}</span>
                 </div>-->
 
-                <div class="ui-form-item ui-form-item-textarea ui-border-b">
-                    <label>
-                        备注
-                    </label>
-                    <textarea placeholder="请输入备注" ms-duplex="remark"></textarea>
-                </div>
+                
                 <div class="ui-form-item ui-border-b">
                     <label>
                         合计金额

ShopMobile/Mobile/View/OrderDatail.html

@@ -90,7 +90,7 @@
     <style>
         .order-flow{ margin:0 auto; padding:0; font-size:12px; font-weight:normal; padding-bottom:4px; }
         .order-flow-left, .order-flow-arrive, .order-flow-wait, .order-flow-right-arrive, .order-flow-right-wait{ 
-            margin:0; padding:0; background: url(/img/order_speed.gif) no-repeat scroll 0 0; float:left; 
+            margin:0; padding:0; background: url(/Mobile/img/order_speed.gif) no-repeat scroll 0 0; float:left; 
             font-family:Arial; line-height:16px; text-align:center; width:120px;
         }
         .order-flow div span{ margin:0; padding:0; background:none repeat scroll 0 0 #fff; display:block;}
@@ -152,12 +152,15 @@
                 <a>商品明细</a>
             </div>
             <ul class="ui-list ui-list-text ui-border-b" style="margin-bottom:0px">
-                <li ms-repeat-el="modelData.item" ms-class-1="ui-border-t:!$first" style="padding:0;">
+                <li ms-repeat-el="modelData.item" ms-class-1="ui-border-t:!$first" >
                     <div class="ui-list-thumb ">
                         <img ms-src="el.ImgUrl" style="width:50px;" />
                     </div>
                     <div class="ui-list-info">
                         <h4 class="ui-nowrap">{{el.Title}}</h4>
+                        <div class="ui-row-flex" ms-visible="JSON.parse(el.Attrs).length>0">
+                            <div class="ui-col ui-col" style="color: #777;font-size: 14px;" ms-repeat-item="JSON.parse(el.Attrs)">{{item.key+'：'+item.value}}</div>
+                        </div>
                         <div style="display: -webkit-box;background-color: #fff;">
                             <h4 style="-webkit-box-flex: 1;"><strong style="color:red">¥{{el.Price1/2}}</strong>+<strong style="color:red">¥{{el.Price1/2}}</strong></h4>
                             <div>x{{el.Qty}}</div>

ShopMobile/Mobile/View/Pay/pay_zfb.aspx.cs

@@ -33,8 +33,7 @@ namespace ShopMobile.View.Pay
 
                             string url = CommFun.GetDomainName();
 
-                            //支付类型
-                            string payment_type = "1";
+
                             //必填，不能修改
                             //服务器异步通知页面路径
                             string notify_url = url + "/Mobile/View/Alipay/notify_url.aspx";
@@ -57,20 +56,11 @@ namespace ShopMobile.View.Pay
                             //必填
 
                             //商品展示地址
-                            string show_url = url + "/Mobile/View/OrderDatail.aspx?oid=" + out_trade_no;
+                            string show_url = url + "/Mobile/View/OrderDatail.html?oid=" + out_trade_no;
                             //必填，需以http://开头的完整路径，例如：http://www.商户网址.com/myorder.html
 
                             //订单描述
-                            string body = ""; //WIDbody.Text.Trim();
-                                              //选填
-
-                            //超时时间
-                            string it_b_pay = ""; //WIDit_b_pay.Text.Trim();
-                                                  //选填
-
-                            //钱包token
-                            string extern_token = ""; //WIDextern_token.Text.Trim();
-                                                      //选填
+                            string body = ""; //选填
 
 
                             ////////////////////////////////////////////////////////////////////////////////////////////////
@@ -80,17 +70,18 @@ namespace ShopMobile.View.Pay
                             sParaTemp.Add("partner", Config.partner);
                             sParaTemp.Add("seller_id", Config.seller_id);
                             sParaTemp.Add("_input_charset", Config.input_charset.ToLower());
-                            sParaTemp.Add("service", "alipay.wap.create.direct.pay.by.user");
-                            sParaTemp.Add("payment_type", payment_type);
+                            sParaTemp.Add("service", Config.service);
+                            sParaTemp.Add("payment_type", Config.payment_type);
                             sParaTemp.Add("notify_url", notify_url);
                             sParaTemp.Add("return_url", return_url);
                             sParaTemp.Add("out_trade_no", out_trade_no);
                             sParaTemp.Add("subject", subject);
                             sParaTemp.Add("total_fee", total_fee);
                             sParaTemp.Add("show_url", show_url);
+                            //sParaTemp.Add("app_pay","Y");//启用此参数可唤起钱包APP支付。
                             sParaTemp.Add("body", body);
-                            sParaTemp.Add("it_b_pay", it_b_pay);
-                            sParaTemp.Add("extern_token", extern_token);
+                            //其他业务参数根据在线开发文档，添加参数.文档地址:https://doc.open.alipay.com/doc2/detail.htm?spm=a219a.7629140.0.0.2Z6TSk&treeId=60&articleId=103693&docType=1
+                            //如sParaTemp.Add("参数名","参数值");
 
                             //建立请求
                             string sHtmlText = Submit.BuildRequest(sParaTemp, "get", "确认");

ShopMobile/Mobile/View/SCSY.html

@@ -30,10 +30,10 @@
             DataModel: [],
             DataModel1: [],
             golist: function () {
-                window.location.href = "SPList.html?key=" + encodeURI($("#conkey").val());
+                window.location.href = "/Mobile/View/SPList.html?key=" + encodeURI($("#conkey").val());
             },
             viewsp: function (el) {
-                window.location.href = "SPXQ.html?id=" + el.SpNo;//el.ProductSysNo;
+                window.location.href = "/Mobile/View/SPXQ.html?id=" + el.ID;//el.ProductSysNo;
             }
         });
         avalon.ready(function () {

ShopMobile/Mobile/View/SPList.html

@@ -65,7 +65,7 @@
                 }
             },
             viewsp: function (el) {
-                window.location.href = "SPXQ.html?id=" + el.SpNo;//el.ProductSysNo;
+                window.location.href = "SPXQ.html?id=" + el.ID;//el.ProductSysNo;
             }
 
         });

ShopMobile/Mobile/View/SPXQ.html

@@ -254,7 +254,7 @@
             selData: {},
             scjdata: common.getcart(),
             spid: common.getQueryString("id") ? common.getQueryString("id") : "",
-            lsspid:0,
+            lsspno: 0,
             goback: function () {
                 history.back()
             },
@@ -278,7 +278,7 @@
                 }
             },
             addCar: function () {
-                var prd = { "id": model.DataModel.Product_SysNo, "num": $(".shopNumber .number").text(), isxz: 1 };
+                var prd = { "id": model.spid, "spno": (model.DataModel.Product_SysNo?model.DataModel.Product_SysNo:0), "num": $(".shopNumber .number").text(), isxz: 1 };
                 common.addcart(prd);
                 model.scjdata = common.getcart();
                 common.alert("加入购物车成功", "success");
@@ -291,14 +291,14 @@
                 location.href = "/Mobile/View/ShopCart.html";
             },
             xzval1: function (el) {
-                model.lsspid = model.spid;
+                model.lsspno = model.spno;
                 model.lssxDataItem = model.sxDataItem;
                 model.sxDataItem = el.item;
                 if (model.sxCount > 1) {
                     var bl = true;
                     $(el.item).each(function (i, n) {
                         if (n.name == model.selData.Value2) {
-                            model.spid = n.mum;
+                            model.spno = n.mum;
                             bl = false;
                             return false;
                         }
@@ -306,19 +306,19 @@
                     if (bl) { model.spid = el.item[0].num; }
                 }
                 else {
-                    model.spid = el.num;
+                    model.spno = el.num;
                 }
                 model.getdata();
             },
             xzval2: function (el) {
-                model.lsspid = model.spid;
+                model.lsspno = model.spid;
                 model.lssxDataItem = model.sxDataItem;
-                model.spid = el.num;
+                model.spno = el.num;
                 model.getdata();
             },
             getdata: function () {
                 var date = common.getnowdate("yyyyMMddHHmmss");
-                var strdata = { action: "product_productinfo", id: model.spid, timestamp: date };
+                var strdata = { action: "product_productinfo", id: model.spid, spno: model.spno, timestamp: date };
                 var sign = common.getsign(JSON.stringify(strdata));
                 var data = JSON.parse(JSON.stringify(strdata));
                 data.sign = sign;
@@ -343,42 +343,46 @@
                                 autoplay: true,
                                 interval: 3000
                             });
-                            if (model.DataModel.Product_Group.length > 0) {
-                                var sx = model.DataModel.Product_Group[0].Group_Name.split('|');
-                                $(sx).each(function (i, n) {
-                                    $(".sx" + (i + 1)).show();
-                                    $(".sx" + (i + 1)).find("label").text(n);
-                                })
-                                model.sxCount = sx.length;
-                                $(model.DataModel.Product_Group).each(function (i, n) {
-                                    var bl = true;
-                                    $(model.sxData).each(function (j, m) {
-                                        if (m.name == n.Value1) {
-                                            bl = false;
+                            model.sxData.clear();
+                            model.sxDataItem.clear();
+                            if (resultData.result2 == '1') {
+                                if (model.DataModel.Product_Group.length > 0) {
+                                    var sx = model.DataModel.Product_Group[0].Group_Name.split('|');
+                                    $(sx).each(function (i, n) {
+                                        $(".sx" + (i + 1)).show();
+                                        $(".sx" + (i + 1)).find("label").text(n);
+                                    })
+                                    model.sxCount = sx.length;
+                                    $(model.DataModel.Product_Group).each(function (i, n) {
+                                        var bl = true;
+                                        $(model.sxData).each(function (j, m) {
+                                            if (m.name == n.Value1) {
+                                                bl = false;
+                                                if (model.sxCount > 1) {
+                                                    m.item.push({ id: n.Value1, name: n.Value2, num: n.ProductSysNo });
+                                                }
+                                            }
+                                        })
+                                        if (n.ProductSysNo == model.DataModel.Product_SysNo) { model.selData = n; }
+                                        if (bl) {
+                                            var sxmodel = { name: n.Value1, item: [] }
                                             if (model.sxCount > 1) {
-                                                m.item.push({ id: n.Value1, name: n.Value2, num: n.ProductSysNo });
+                                                sxmodel.item.push({ id: n.Value1, name: n.Value2, num: n.ProductSysNo });
                                             }
+                                            else {
+                                                sxmodel.num = n.ProductSysNo;
+                                            }
+                                            model.sxData.push(sxmodel);
                                         }
                                     })
-                                    if (n.ProductSysNo == model.spid) { model.selData = n; }
-                                    if (bl) {
-                                        var sxmodel = { name: n.Value1, item: [] }
-                                        if (model.sxCount > 1) {
-                                            sxmodel.item.push({ id: n.Value1, name: n.Value2, num: n.ProductSysNo });
-                                        }
-                                        else {
-                                            sxmodel.num = n.ProductSysNo;
-                                        }
-                                        model.sxData.push(sxmodel);
+                                    if (model.sxCount > 1) {
+                                        $(model.sxData).each(function (i, n) {
+                                            if (n.name == model.selData.Value1) {
+                                                model.sxDataItem = n.item;
+                                                return false;
+                                            }
+                                        })
                                     }
-                                })
-                                if (model.sxCount > 1) {
-                                    $(model.sxData).each(function (i, n) {
-                                        if (n.name == model.selData.Value1) {
-                                            model.sxDataItem = n.item;
-                                            return false;
-                                        }
-                                    })
                                 }
                             }
 
@@ -389,7 +393,7 @@
                                 stayTime: 2000,
                                 type: "warn"
                             })
-                            model.spid = model.lsspid;
+                            model.spno = model.lsspno;
                             model.sxDataItem = model.lssxDataItem;
                         }
                     }
@@ -459,12 +463,12 @@
             </div>
         </div>
 
-        <ul class="ui-list ui-list-text ui-list-link ui-border-b" >
+        <ul class="ui-list ui-list-text ui-list-link ui-border-b" style="margin:0;">
             <li class="ui-border-t" ms-on-click="showdv()">
                 <h4 class="ui-nowrap">图文详情</h4>
             </li>
         </ul>
-        <ul class="ui-list ui-list-text ui-border-b" >
+        <ul class="ui-list ui-list-text ui-border-b" style="margin:0;">
             <li style="display:none" id="dvdetail">
                 {{DataModel.ProductImgDetail|html}}
             </li>

ShopMobile/Mobile/View/ShopCart.html

@@ -24,10 +24,12 @@
             ctData: [],
             GetAllPrice: function () {
                 var pri = 0;
-                $(model.ctData).each(function (i, n) {
-                    if (n.isxz) {
-                        pri = pri * 1 + n.qty * n.price;
-                    }
+                $(model.ctData).each(function (j, m) {
+                    $(m.items).each(function (i, n) {
+                        if (n.isxz) {
+                            pri = pri * 1 + n.qty * n.price;
+                        }
+                    })
                 })
 
                 return pri;
@@ -103,18 +105,22 @@
         <div class="ui-form" ms-if="model.cart.size() != 0">
 
 
-            <ul class="ui-list ui-list-text ui-border-b " style="margin-bottom:0px" ms-repeat-el="ctData">
-                <li style="padding:0;">
+            <ul class="ui-list ui-list-text ui-border-b " style="margin-bottom:0px" ms-repeat-elt="ctData">
+                <li class="ui-border-b ">商家{{$index+1}}</li>
+                <li ms-repeat-el="elt.items" class="ui-border-b ">
                     <label class="ui-checkbox" style="line-height: 60px;">
                         <input type="checkbox" ms-attr-checked="el.isxz=='1'?'checked':''" ms-change="setxz(el)">
                     </label>
                     <div class="ui-list-thumb ">
                         <img ms-src="el.imgurl" style="width:50px;" />
                     </div>
-                    <div class="ui-list-info ui-border-t">
+                    <div class="ui-list-info ">
                         <h4 class="ui-nowrap">{{el.title}}</h4>
+                        <div class="ui-row-flex" ms-visible="el.group.length>0">
+                            <div class="ui-col ui-col" style="color: #777;font-size: 14px;" ms-repeat-item="el.group">{{item.key+'：'+item.value}}</div>
+                        </div>
                         <div style="display: -webkit-box;background-color: #fff;">
-                            <h4 style="-webkit-box-flex: 1;"><strong style="color:red">¥{{el.price/2}}</strong>+<strong style="color:red">¥{{el.price/2}}</strong> </h4>
+                            <h4 style="-webkit-box-flex: 1;line-height: 25px;"><strong style="color:red">¥{{el.price/2}}</strong>+<strong style="color:red">¥{{el.price/2}}</strong> </h4>
                             <div style="display: -webkit-box; -webkit-box-orient: vertical; -webkit-box-pack: center; -webkit-box-align: center; text-align: center;">
                                 <table class="ui-table ui-border" style="line-height:25px">
                                     <thead>
@@ -130,9 +136,7 @@
                             </div>
                         </div>
                     </div>
-                    
                 </li>
-
             </ul>
             <div class="ui-form ui-border-b">
                 <div class="ui-form-item ui-border-b">

ShopMobile/ShopMobile.csproj

@@ -387,6 +387,7 @@
     <Content Include="Admin\ProductCategoryList.aspx" />
     <Content Include="Admin\ProductEdit.aspx" />
     <Content Include="Admin\ProductList.aspx" />
+    <Content Include="Admin\ProductListOther.aspx" />
     <Content Include="Admin\UserList.aspx" />
     <Content Include="Mobile\CSS\frozenui-1.3.0\css\actionsheet.css" />
     <Content Include="Mobile\CSS\frozenui-1.3.0\css\arrowlink.css" />
@@ -595,6 +596,13 @@
     <Compile Include="Admin\ProductList.aspx.designer.cs">
       <DependentUpon>ProductList.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Admin\ProductListOther.aspx.cs">
+      <DependentUpon>ProductListOther.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Admin\ProductListOther.aspx.designer.cs">
+      <DependentUpon>ProductListOther.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Admin\UserList.aspx.cs">
       <DependentUpon>UserList.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>

ShopMobile/apiclass/common.cs

@@ -23,10 +23,10 @@ namespace ShopMobile.apiclass
 
                 string url = CommFun.GetConfigString("loginurl");
                 string code = CommFun.GetConfigString("signcode");
-                string param = "type=login&username=" + uname + "&password=" + upsd + "&timestamp=" + DateTime.Now.Ticks;
-                //string token = Utils.MD5(Utils.SHA256(param + code)).ToLower();
-                //param = param + "&token=" + token + "&channel=shop";
-                param = param + "&debug=true";
+                string param = "type=login&username=" + uname + "&password=" + upsd + "&timestamp=" + DateTime.Now.Ticks + "&channel=shop";
+                string token = Utils.MD5(Utils.SHA256(param + code)).ToLower();
+                param = param + "&token=" + token ;
+                //param = param + "&debug=true";
                 string result = CommFun.Get(url, param);
 
                 JObject obj = JsonConvert.DeserializeObject(result) as JObject;
@@ -154,54 +154,131 @@ namespace ShopMobile.apiclass
             string appkey = CommFun.GetConfigString("appkey").ToString();
             string userkey = "&"+ CommFun.GetConfigString("userkey").ToString();
 
-            List<orderitem> list = new List<orderitem>();
+            List<orderitems> list = new List<orderitems>();
             string carts = Common.Utils.HtmlDecode(Common.CommFun.QueryString("cart"));
             List<cartitem> objs = JsonConvert.DeserializeObject<List<cartitem>>(carts) ;
             foreach (cartitem obj in objs)
             {
-                try
+                Model.PT_Pro_Product pt = new Bll.PT_Pro_Product().GetModel(obj.id);
+                if (pt != null)
                 {
-                    var strdate = DateTime.Now.ToString("yyyyMMddHHmmss");
-                    string strdata = "app_key=" + appkey + "&format=json&product_SysNo=" + obj.id + "&sign_method=md5&timestamp=" + strdate
-                        + "&sign=" + Utils.MD5(appkey+ "json"+ obj.id+ "md5"+ strdate+ userkey).ToLower();
-                    string result = CommFun.Get(url + "/v2/By/ProductsDetail", strdata);
-                    JObject res = JsonConvert.DeserializeObject(result) as JObject;
-                    JObject ret = JsonConvert.DeserializeObject(res["Result"].ToString()) as JObject;
-                    JObject spxq = JsonConvert.DeserializeObject(res["Content"].ToString()) as JObject;
-                    if (ret["code"].ToString() == "1001" && spxq["AvailableQty"].ToString() != "0")
+                    if (pt.Type == 0)
                     {
                         orderitem oim = new orderitem();
                         oim.pid = obj.id;
+                        oim.spno = obj.spno;
                         oim.qty = obj.num;
-                        oim.isxz = obj.isxz;
-                        oim.title = spxq["Product_Name"].ToString();
-                        oim.price = decimal.Parse(spxq["Product_Price"].ToString());
-                        oim.kcqty = Int32.Parse(spxq["AvailableQty"].ToString());
-                        oim.imgurl = new Uri("http://img.3721zh.com/UploadFiles/Product/" + obj.id + "/AppPic/1.jpg").ToString();
-                        list.Add(oim);
+                        oim.title = pt.Title;
+                        oim.price = pt.SPPrice.Value;
+                        oim.imgurl = pt.ImgUrl1;
+                        oim.kcqty = pt.Qty.Value;
+
+                        var os = list.Where(p => p.type == 0).FirstOrDefault();
+
+                        if (os == null)
+                        {
+                            os = new orderitems();
+                            os.type = 0;
+                            os.items = new List<orderitem>();
+                            list.Add(os);
+                        }
+                        else
+                        {
+                            os.items.Add(oim);
+                        }
+                    }
+                    if (pt.Type == 1)
+                    {
+                        try
+                        {
+                            var strdate = DateTime.Now.ToString("yyyyMMddHHmmss");
+                            string strdata = "app_key=" + appkey + "&format=json&product_SysNo=" + obj.spno + "&sign_method=md5&timestamp=" + strdate
+                                + "&sign=" + Utils.MD5(appkey + "json" + obj.spno + "md5" + strdate + userkey).ToLower();
+                            string result = CommFun.Get(url + "/v2/By/ProductsDetail", strdata);
+                            JObject res = JsonConvert.DeserializeObject(result) as JObject;
+                            JObject ret = JsonConvert.DeserializeObject(res["Result"].ToString()) as JObject;
+                            JObject spxq = JsonConvert.DeserializeObject(res["Content"].ToString()) as JObject;
+                            if (ret["code"].ToString() == "1001" && spxq["AvailableQty"].ToString() != "0")
+                            {
+                                orderitem oim = new orderitem();
+                                oim.pid = obj.id;
+                                oim.spno = obj.spno;
+                                oim.qty = obj.num;
+                                oim.isxz = obj.isxz;
+                                oim.title = spxq["Product_Name"].ToString();
+                                oim.price = decimal.Parse(spxq["Product_Price"].ToString());
+                                oim.kcqty = Int32.Parse(spxq["AvailableQty"].ToString());
+                                oim.imgurl = new Uri("http://img.3721zh.com/UploadFiles/Product/" + obj.spno + "/AppPic/1.jpg").ToString();
+                                oim.group = new List<attritem>();
+                                var grouplist = JsonConvert.DeserializeObject<List<JObject>>(spxq["Product_Group"].ToString());
+                                foreach (var gp in grouplist)
+                                {
+                                    if (gp["ProductSysNo"].ToString() == obj.spno.ToString())
+                                    {
+                                        var gps = gp["Group_Name"].ToString().Split('|');
+                                        oim.group.Add(new attritem() { key = gps[0], value = gp["Value1"].ToString() });
+                                        if (gps.Length > 1)
+                                        {
+                                            oim.group.Add(new attritem() { key = gps[1], value = gp["Value2"].ToString() });
+                                        }
+                                        break;
+                                    }
+                                }
+
+                                var os = list.Where(p => p.type == 1).FirstOrDefault();
+                                if (os == null)
+                                {
+                                    os = new orderitems();
+                                    os.type = 1;
+                                    os.items = new List<orderitem>();
+                                    os.items.Add(oim);
+
+                                    list.Add(os);
+                                }
+                                else {
+                                    os.items.Add(oim);
+                                }
+                                
+                            }
+                        }
+                        catch (Exception ex)
+                        { }
                     }
                 }
-                catch(Exception ex)
-                { }
             }
             msg.result1 = list;
         }
+        public class orderitems
+        {
+            public int type { get; set; }
+            public string name { get; set; }
+            public string remark { get; set; }
+            public List<orderitem> items { get; set; }
+        }
         public class orderitem
         {
             public int pid { get; set; }
+            public int spno { get; set; }
             public string title { get; set; }
             public string imgurl { get; set; }
             public decimal price { get; set; }
             public int kcqty { get; set; }
             public int qty { get; set; }
             public int isxz { get; set; }
+            public List<attritem> group { get; set; }
         }
         public class cartitem
         {
             public int id { get; set; }
+            public int spno { get; set; }
             public int num { get; set; }
             public int isxz { get; set; }
         }
+        public class attritem
+        {
+            public string key { get; set; }
+            public string value { get; set; }
+        }
         #endregion
     }
 }

ShopMobile/apiclass/order.cs

@@ -140,8 +140,7 @@ namespace ShopMobile.apiclass
             {
                 //获得传参信息
                 int addid = CommFun.RequestInt("addid");
-                string ids = CommFun.QueryString("ids");
-                string remark = CommFun.QueryString("remark");
+                string ids = Utils.HtmlDecode( CommFun.QueryString("ids"));
 
                 if (addid == 0)
                 {
@@ -155,120 +154,184 @@ namespace ShopMobile.apiclass
                     return;
                 }
 
-                List<orderitem> list = new List<orderitem>();
+                
                 decimal total = 0;
                 if (string.IsNullOrEmpty(ids))
                 {
-                    msg.msgcode = "购物车为空！";
+                    msg.msgcode = "商品为空！";
                     return;
                 }
                 else
                 {
+                    List<CommandInfo> SQLStringList = new List<CommandInfo>();
+                    List<string> ods = new List<string>();
                     string url = CommFun.GetConfigString("shopurl").ToString();
                     string appkey = CommFun.GetConfigString("appkey").ToString();
                     string userkey = "&" + CommFun.GetConfigString("userkey").ToString();
 
-                    string[] sps = ids.Split(',');
-                    foreach (string sp in sps)
+                    List<JObject> objs = JsonConvert.DeserializeObject<List<JObject>>(ids);
+                    foreach (var obj in objs)
                     {
-                        string[] arr = sp.Split('_');
-
-                        var strdate = DateTime.Now.ToString("yyyyMMddHHmmss");
-                        string strdata = "app_key=" + appkey + "&format=json&product_SysNo=" + arr[0] + "&sign_method=md5&timestamp=" + strdate
-                            + "&sign=" + Utils.MD5(appkey + "json" + arr[0] + "md5" + strdate + userkey).ToLower();
-                        string result = CommFun.Get(url + "/v2/By/ProductsDetail", strdata);
-                        JObject res = JsonConvert.DeserializeObject(result) as JObject;
-                        JObject ret = JsonConvert.DeserializeObject(res["Result"].ToString()) as JObject;
-                        JObject spxq = JsonConvert.DeserializeObject(res["Content"].ToString()) as JObject;
-                        if (ret["code"].ToString() == "1001" && spxq["AvailableQty"].ToString() != "0")
+                        string remark = obj["remark"].ToString();
+                        List<orderitem> list = new List<orderitem>();
+
+                        List<JObject> splist = JsonConvert.DeserializeObject<List<JObject>>(obj["items"].ToString());
+                        foreach (var sp in splist)
                         {
-                            if (Int32.Parse(arr[1]) <= Int32.Parse(spxq["AvailableQty"].ToString()))
+                            int qty= Int32.Parse(sp["qty"].ToString());
+                            int spno = Int32.Parse(sp["spno"].ToString());
+                            Model.PT_Pro_Product pt = new Bll.PT_Pro_Product().GetModel(Int32.Parse(sp["pid"].ToString()));
+                            if (pt != null)
                             {
-                                orderitem oim = new orderitem();
-                                oim.pid = Int32.Parse(arr[0]);
-                                oim.qty = Int32.Parse(arr[1]);
-                                oim.title = spxq["Product_Name"].ToString();
-                                oim.price = decimal.Parse(spxq["Product_Price"].ToString());
-                                oim.imgurl = new Uri("http://img.3721zh.com/UploadFiles/Product/" + arr[0] + "/AppPic/1.jpg").ToString();
-                                list.Add(oim);
-
-                                total = total + oim.price * oim.qty;
+                                if (pt.Type == 0)
+                                {
+                                    #region 本地商品处理
+                                    orderitem oim = new orderitem();
+                                    oim.pid = pt.ID;
+                                    oim.spno = spno;
+                                    oim.qty = qty;
+                                    oim.title = pt.Title;
+                                    oim.price = pt.SPPrice.Value;
+                                    oim.imgurl = pt.ImgUrl1;
+
+                                    list.Add(oim);
+
+                                    total = total + oim.price * oim.qty; 
+                                    #endregion
+                                }
+                                if (pt.Type == 1)
+                                {
+                                    #region 转换商城商品处理
+                                    var strdate = DateTime.Now.ToString("yyyyMMddHHmmss");
+                                    string strdata = "app_key=" + appkey + "&format=json&product_SysNo=" + spno + "&sign_method=md5&timestamp=" + strdate
+                                        + "&sign=" + Utils.MD5(appkey + "json" + spno + "md5" + strdate + userkey).ToLower();
+                                    string result = CommFun.Get(url + "/v2/By/ProductsDetail", strdata);
+                                    JObject res = JsonConvert.DeserializeObject(result) as JObject;
+                                    JObject ret = JsonConvert.DeserializeObject(res["Result"].ToString()) as JObject;
+                                    JObject spxq = JsonConvert.DeserializeObject(res["Content"].ToString()) as JObject;
+                                    if (ret["code"].ToString() == "1001" && spxq["AvailableQty"].ToString() != "0")
+                                    {
+                                        if (qty <= Int32.Parse(spxq["AvailableQty"].ToString()))
+                                        {
+                                            orderitem oim = new orderitem();
+                                            oim.pid = pt.ID;
+                                            oim.spno = spno;
+                                            oim.qty = qty;
+                                            oim.title = spxq["Product_Name"].ToString();
+                                            oim.price = decimal.Parse(spxq["Product_Price"].ToString());
+                                            oim.imgurl = new Uri("http://img.3721zh.com/UploadFiles/Product/" + spno + "/AppPic/1.jpg").ToString();
+                                            oim.group = new List<attritem>();
+                                            var grouplist = JsonConvert.DeserializeObject<List<JObject>>(spxq["Product_Group"].ToString());
+                                            foreach (var gp in grouplist)
+                                            {
+                                                if (gp["ProductSysNo"].ToString() == spno.ToString())
+                                                {
+                                                    var gps = gp["Group_Name"].ToString().Split('|');
+                                                    oim.group.Add(new attritem() { key = gps[0], value = gp["Value1"].ToString() });
+                                                    if (gps.Length > 1)
+                                                    {
+                                                        oim.group.Add(new attritem() { key = gps[1], value = gp["Value2"].ToString() });
+                                                    }
+                                                }
+                                            }
+
+                                            list.Add(oim);
+
+                                            total = total + oim.price * oim.qty;
+                                        }
+                                    }
+
+                                    #endregion
+                                }
                             }
                         }
-                    }
-                }
 
-                if (total <= 0)
-                {
-                    msg.msgcode = "购物车为空！";
-                    return;
-                }
-                //else if (user.Points < total)
-                //{
-                //    msg.msgcode = "会员积分不足！";
-                //    return;
-                //}
-
-                string orderid = DbHelperSQL.GetSingle(" SELECT dbo.GetOrderID() ").ToString();
-
-                List<CommandInfo> SQLStringList = new List<CommandInfo>();
-
-                Model.PT_Order_Header head = new Model.PT_Order_Header();
-                head.OrderID = orderid;
-                head.State = 0;
-                head.Receiver = addrModel.Receiver;
-                head.Province = addrModel.Province;
-                head.City = addrModel.City;
-                head.County = addrModel.County;
-                head.Address = addrModel.Address;
-                head.Telephone = addrModel.Telephone;
-                head.PostCode = addrModel.YB;
-                head.OrderMemo = remark;
-                head.SumPrice = total;
-                head.PayPrice = total/2;
-                head.Points = total / 2;
-                head.CreateUser = user.MID;
-                head.CreateTime = DateTime.Now;
-
-                SQLStringList.Add(new Bll.PT_Order_Header().GetAddSql(head));
-
-                foreach (var l in list)
-                {
-                    Model.PT_Order_Item item = new Model.PT_Order_Item();
-                    item.OrderID = orderid;
-                    item.ImgUrl = l.imgurl;
-                    item.PID = l.pid;
-                    item.Price1 = l.price;
-                    item.Title = l.title;
-                    item.Qty = l.qty;
-                    item.CreateUser = user.MID;
-                    item.CreateTime = DateTime.Now;
-
-                    SQLStringList.Add(new Bll.PT_Order_Item().GetAddSql(item));
-                }
+                        if (total > 0)
+                        {
+                            string type = string.Empty;
+                            switch (obj["type"].ToString())
+                            {
+                                case "0": type = "S"; break;
+                                case "1": type = "B"; break;
+                            }
 
-                try
-                {
-                    DbHelperSQL.ExecuteSqlTranWithIndentity(SQLStringList);
-                    msg.result1 = orderid;
-                }
-                catch (Exception ex)
-                {
-                    msg.msgcode = "提交订单失败！";
+                            string orderid = DbHelperSQL.GetSingle(" SELECT dbo.GetOrderID('"+ type + "') ").ToString();
+
+                            #region 订单表头
+                            Model.PT_Order_Header head = new Model.PT_Order_Header();
+                            head.OrderID = orderid;
+                            head.State = 0;
+                            head.Receiver = addrModel.Receiver;
+                            head.Province = addrModel.Province;
+                            head.City = addrModel.City;
+                            head.County = addrModel.County;
+                            head.Address = addrModel.Address;
+                            head.Telephone = addrModel.Telephone;
+                            head.PostCode = addrModel.YB;
+                            head.OrderMemo = remark;
+                            head.SumPrice = total;
+                            head.PayPrice = total / 2;
+                            head.Points = total / 2;
+                            head.CreateUser = user.MID;
+                            head.CreateTime = DateTime.Now;
+
+                            SQLStringList.Add(new Bll.PT_Order_Header().GetAddSql(head));
+                            #endregion
+
+                            #region 订单明细
+                            foreach (var l in list)
+                            {
+                                Model.PT_Order_Item item = new Model.PT_Order_Item();
+                                item.OrderID = orderid;
+                                item.ImgUrl = l.imgurl;
+                                item.PID = l.pid;
+                                item.Price1 = l.price;
+                                item.Title = l.title;
+                                item.Qty = l.qty;
+                                item.SpNo = l.spno;
+                                item.Attrs = JsonConvert.SerializeObject(l.group);
+                                item.CreateUser = user.MID;
+                                item.CreateTime = DateTime.Now;
+
+                                SQLStringList.Add(new Bll.PT_Order_Item().GetAddSql(item));
+                            }
+                            #endregion
+
+                            ods.Add(orderid);
+                        }
+                    }
+                    try
+                    {
+                        DbHelperSQL.ExecuteSqlTranWithIndentity(SQLStringList);
+                        msg.result1 = ods[0];
+                    }
+                    catch (Exception ex)
+                    {
+                        msg.msgcode = "提交订单失败！";
+                    }
                 }
+                
             }
             catch
             {
                 msg.msgcode = "提交订单失败！";
             }
         }
+
         public class orderitem
         {
             public int pid { get; set; }
+            public int spno { get; set; }
             public string title { get; set; }
             public string imgurl { get; set; }
             public decimal price { get; set; }
             public int qty { get; set; }
+            public List<attritem> group { get; set; }
+        }
+        public class attritem
+        {
+            public string key { get; set; }
+            public string value { get; set; }
         }
         #endregion
 

ShopMobile/apiclass/product.cs

@@ -90,23 +90,41 @@ namespace ShopMobile.apiclass
             string userkey = "&" + CommFun.GetConfigString("userkey").ToString();
 
             int id = CommFun.RequestInt("id");
+            int spno = CommFun.RequestInt("spno");
 
-            try
+            Model.PT_Pro_Product pt = new Bll.PT_Pro_Product().GetModel(id);
+            if (pt != null)
             {
-                var strdate = DateTime.Now.ToString("yyyyMMddHHmmss");
-                string strdata = "app_key=" + appkey + "&format=json&product_SysNo=" + id + "&sign_method=md5&timestamp=" + strdate
-                    + "&sign=" + Utils.MD5(appkey + "json" + id + "md5" + strdate + userkey).ToLower();
-                string result = CommFun.Get(url + "/v2/By/ProductsDetail", strdata);
-                JObject res = JsonConvert.DeserializeObject(result) as JObject;
-                JObject ret = JsonConvert.DeserializeObject(res["Result"].ToString()) as JObject;
-                JObject con = JsonConvert.DeserializeObject(res["Content"].ToString()) as JObject;
-                if (ret["code"].ToString() == "1001")
+                if (pt.Type == 0)
                 {
-                    msg.result1 = con;
+                    msg.result1 = pt;
                 }
+                if (pt.Type == 1)
+                {
+                    try
+                    {
+                        if (spno == 0) { spno = pt.SpNo.Value; }
+                        var strdate = DateTime.Now.ToString("yyyyMMddHHmmss");
+                        string strdata = "app_key=" + appkey + "&format=json&product_SysNo=" + spno + "&sign_method=md5&timestamp=" + strdate
+                            + "&sign=" + Utils.MD5(appkey + "json" + spno + "md5" + strdate + userkey).ToLower();
+                        string result = CommFun.Get(url + "/v2/By/ProductsDetail", strdata);
+                        JObject res = JsonConvert.DeserializeObject(result) as JObject;
+                        JObject ret = JsonConvert.DeserializeObject(res["Result"].ToString()) as JObject;
+                        JObject con = JsonConvert.DeserializeObject(res["Content"].ToString()) as JObject;
+                        if (ret["code"].ToString() == "1001")
+                        {
+                            msg.result1 = con;
+                        }
+                    }
+                    catch (Exception ex)
+                    { }
+                }
+                msg.result2 = pt.Type;
+            }
+            else
+            {
+                msg.msgcode = "此商品不存在";
             }
-            catch (Exception ex)
-            { }
         }
         #endregion