修改bug

ShopMobile/Admin/Defult.Master

@@ -78,6 +78,7 @@
 
                         <li><a><span class="menu-text">====可爱的分割线====</span></a></li>
                         <li><a href="UserList.aspx"><i class="icon-user"></i><span class="menu-text">用户管理</span></a></li>
+                        <li><a href="PictureList.aspx"><i class="icon-home"></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="ProductEdit.aspx"><i class="icon-home"></i><span class="menu-text">商品录入</span></a></li>

ShopMobile/Admin/OrderDetails.aspx

@@ -16,51 +16,45 @@
                             <td align="center" class="text-primary">订单号</td>
                             <td>
                                 <asp:Label ID="OrderID" runat="server" Text="Label"></asp:Label></td>
-                            <td align="center" class="text-primary">下单人</td>
+                            <td align="center" class="text-primary">支付总金额</td>
                             <td>
-                                <asp:Label ID="Receiver" runat="server" Text="Label"></asp:Label>
-                                <%#Eval("Receiver") %></td>
-                            <td align="center" class="text-primary">快递类型</td>
+                                <asp:Label ID="PayPrice" runat="server" Text="Label"></asp:Label>
+                             </td>
+                            <td align="center" class="text-primary">信用总点数</td>
                             <td>
-                                <asp:Label ID="Express" runat="server" Text="Label"></asp:Label>
-                                <%#Eval("Address") %></td>
-                            <td align="center" class="text-primary">快递单号</td>
+                                <asp:Label ID="Points" runat="server" Text="Label"></asp:Label>
+                             </td>
+                            <td align="center" class="text-primary">状态</td>
                             <td>
-                                <asp:Label ID="ExpressNo" runat="server" Text="Label"></asp:Label>
-                                <%#Eval("Address") %></td>
+                                <asp:Label ID="lbltz" runat="server" Text="Label"></asp:Label></td>
+                            
+                            
                         </tr>
                         <tr>
-                            <td align="center" class="text-primary">省</td>
-                            <td>
-                                <asp:Label ID="Province" runat="server" Text="Label"></asp:Label>
-                                <%#Eval("Province") %></td>
-                            <td align="center" class="text-primary">市</td>
+                            <td align="center" class="text-primary">收货人</td>
                             <td>
-                                <asp:Label ID="City" runat="server" Text="Label"></asp:Label>
-                                <%#Eval("City") %></td>
-                            <td align="center" class="text-primary">县/区</td>
-                            <td>
-                                <asp:Label ID="County" runat="server" Text="Label"></asp:Label>
-                                <%#Eval("County") %></td>
-                            <td align="center" class="text-primary">地址</td>
+                                <asp:Label ID="Receiver" runat="server" Text="Label"></asp:Label>
+                            </td>
+                            <td align="center" class="text-primary">联系电话</td>
                             <td>
+                                <asp:Label ID="TelePhone" runat="server" Text="Label"></asp:Label>
+                            </td>
+                            <td align="center" class="text-primary">收货地址</td>
+                            <td colspan="3">
                                 <asp:Label ID="Address" runat="server" Text="Label"></asp:Label>
-                                <%#Eval("Address") %></td>
+                                </td>
                         </tr>
                         <tr>
-                            <td align="center" class="text-primary">电话</td>
-                            <td>
-                                <asp:Label ID="TelePhone" runat="server" Text="Label"></asp:Label>
-                                <%#Eval("Address") %></td>
-
-                            <td align="center" class="text-primary">支付总金额</td>
-                            <td>
-                                <asp:Label ID="PayPrice" runat="server" Text="Label"></asp:Label>
-                                <%#Eval("Address") %></td>
-                            <td align="center" class="text-primary">信用总点数</td>
+                            
+                            <td align="center" class="text-primary">快递类型</td>
                             <td>
-                                <asp:Label ID="Points" runat="server" Text="Label"></asp:Label>
-                                <%#Eval("Address") %></td>
+                                <asp:Label ID="Express" runat="server" Text="Label"></asp:Label>
+                            </td>
+                            <td align="center" class="text-primary">快递单号</td>
+                            <td colspan="5">
+                                <asp:Label ID="ExpressNo" runat="server" Text="Label"></asp:Label>
+                            </td>
+                            
                         </tr>
                     </table>
                 </div>

ShopMobile/Admin/OrderDetails.aspx.cs

@@ -25,16 +25,37 @@ namespace ShopMobile.Admin
             Model.PT_Order_Header model = new Bll.PT_Order_Header().GetModel(OrderID);
             #region 对应值
             this.OrderID.Text = model.OrderID;
-            this.Province.Text = model.Province;
-            this.City.Text = model.City;
             this.Receiver.Text = model.Receiver;
-            this.County.Text = model.County;
-            this.Address.Text = model.Address;
+            this.Address.Text = model.Province+ model.City+model.County+model.Address;
             this.TelePhone.Text = model.Telephone;
             this.Express.Text = model.Express;
             this.ExpressNo.Text = model.ExpressNo;
             this.PayPrice.Text = model.PayPrice.ToString();
             this.Points.Text = model.Points.ToString();
+
+            string strtzname = string.Empty;
+            switch (model.State)
+            {
+                case 0:
+                    strtzname = "未支付";
+                    break;
+                case 1:
+                    strtzname = "已支付";
+                    break;
+                case 2:
+                    strtzname = "已发货";
+                    break;
+                case 3:
+                    strtzname = "已收货";
+                    break;
+                case 4:
+                    strtzname = "已完成";
+                    break;
+                case 9:
+                    strtzname = "已取消";
+                    break;
+            }
+            this.lbltz.Text = strtzname;
             #endregion
 
         }

ShopMobile/Admin/OrderDetails.aspx.designer.cs

@@ -22,58 +22,49 @@ namespace ShopMobile.Admin {
         protected global::System.Web.UI.WebControls.Label OrderID;
         
         /// <summary>
-        /// Receiver 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Receiver;
-        
-        /// <summary>
-        /// Express 控件。
+        /// PayPrice 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Express;
+        protected global::System.Web.UI.WebControls.Label PayPrice;
         
         /// <summary>
-        /// ExpressNo 控件。
+        /// Points 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label ExpressNo;
+        protected global::System.Web.UI.WebControls.Label Points;
         
         /// <summary>
-        /// Province 控件。
+        /// lbltz 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Province;
+        protected global::System.Web.UI.WebControls.Label lbltz;
         
         /// <summary>
-        /// City 控件。
+        /// Receiver 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label City;
+        protected global::System.Web.UI.WebControls.Label Receiver;
         
         /// <summary>
-        /// County 控件。
+        /// TelePhone 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label County;
+        protected global::System.Web.UI.WebControls.Label TelePhone;
         
         /// <summary>
         /// Address 控件。
@@ -85,31 +76,22 @@ namespace ShopMobile.Admin {
         protected global::System.Web.UI.WebControls.Label Address;
         
         /// <summary>
-        /// TelePhone 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Label TelePhone;
-        
-        /// <summary>
-        /// PayPrice 控件。
+        /// Express 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label PayPrice;
+        protected global::System.Web.UI.WebControls.Label Express;
         
         /// <summary>
-        /// Points 控件。
+        /// ExpressNo 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Points;
+        protected global::System.Web.UI.WebControls.Label ExpressNo;
         
         /// <summary>
         /// RpList 控件。

ShopMobile/Admin/OrderList.aspx

@@ -14,7 +14,7 @@
             <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>
+                        订单号：<asp:TextBox ID="txtname" runat="server"></asp:TextBox>
                     </div>
                     <div class="col-xs-4">
                         <asp:Button ID="btnsearch" class="btn btn-primary btn-sm" runat="server" Text="搜索" OnClick="btnsearch_Click" />
@@ -29,13 +29,9 @@
                             <tr>
                                 <th>订单号
                                 </th>
-                                <th>下单人
+                                <th>收货人
                                 </th>
-                                <th>省
-                                </th>
-                                <th>市
-                                </th>
-                                <th>县
+                                <th>联系电话
                                 </th>
                                 <th>地址
                                 </th>
@@ -46,7 +42,7 @@
                             </tr>
                         </thead>
                         <tbody>
-                            <asp:Repeater ID="RpList" runat="server">
+                            <asp:Repeater ID="RpList" runat="server" OnItemCommand="RpList_ItemCommand">
                                 <ItemTemplate>
                                     <tr>
                                         <td>
@@ -56,15 +52,12 @@
                                             <%#Eval("Receiver") %>
                                         </td>
                                         <td>
-                                            <%#Eval("Province") %>
+                                            <%#Eval("Telephone") %>
                                         </td>
                                         <td>
+                                            <%#Eval("Province") %>
                                             <%#Eval("City") %>
-                                        </td>
-                                        <td>
                                             <%#Eval("County") %>
-                                        </td>
-                                        <td>
                                             <%#Eval("Address") %>
                                         </td>
                                         <td>
@@ -72,8 +65,11 @@
                                         </td>
                                         <td>
                                             <a href='OrderTickets.aspx?ID=<%#Eval("OrderID") %>'>
-                                                   <%#Eval("State").ToString()=="1"?"发货":"" %>
+                                                   <%#(Eval("State").ToString()=="1" &&Eval("OrderID").ToString().Substring(0,1)=="S") ?"发货":"" %>
                                             </a>
+                                            <asp:LinkButton ID="lbnotice" CommandName="notice" CommandArgument='<%#Eval("OrderID") %>' OnClientClick="return confirm('确定要通知吗？')" runat="server" >
+                                                <%#(Eval("State").ToString()=="1" &&Eval("OrderID").ToString().Substring(0,1)=="B") ?"通知":"" %>
+                                            </asp:LinkButton>
                                             <%--<asp:Button ID="btn" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#myModal" runat="server" Text="发货"  OnClick="btn_Click"/>--%>
                                             <%--<button class="btn btn-primary btn-sm" data-toggle="modal" data-target="#myModal">发货</button>--%>
                                         </td>
@@ -103,37 +99,7 @@
         </div>
         <!-- /.row -->
     </div>
-    <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-                    <h4 class="modal-title text-primary">已支付订单</h4>
-                </div>
-                <div class="modal-body">
-                    <%--<p>One fine body…</p>--%>
-                    <table>
-                        <tr>
-                            <td style="width: 10%">快递名称：</td>
-                            <td style="width: 60%">
-                                <asp:TextBox ID="TextBox3" runat="server"></asp:TextBox></td>
-                        </tr>
-                        <tr>
-                            <td>快递单号：</td>
-                            <td>
-                                <asp:TextBox ID="TextBox1" runat="server"></asp:TextBox></td>
-                        </tr>
-                    </table>
-                </div>
-                <div class="modal-footer">
-                    <asp:Button ID="Button1" class="btn btn-default" data-dismiss="modal" runat="server" Text="关闭" />
-                    <asp:Button ID="Button2" class="btn btn-primary" runat="server" Text="保存" />
-                </div>
-            </div>
-            <!-- /.modal-content -->
-        </div>
-        <!-- /.modal-dialog -->
-    </div>
+
 </asp:Content>
 <asp:Content ID="Content3" ContentPlaceHolderID="otherjquery" runat="server">
 </asp:Content>

ShopMobile/Admin/OrderList.aspx.cs

@@ -1,6 +1,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using ShopMobile.Admin.common;
+using ShopMobile.apiclass;
 using ShopMobile.Common;
 using System;
 using System.Collections.Generic;
@@ -17,8 +18,10 @@ namespace ShopMobile.Admin
         public string paging;
         protected void Page_Load(object sender, EventArgs e)
         {
-
-            bind();
+            if (!IsPostBack)
+            {
+                bind();
+            }
         }
         protected void bind()
         {
@@ -34,12 +37,9 @@ namespace ShopMobile.Admin
                 {
                     strwhere = strwhere + "Receiver like @Receiver";
                     txtname.Text = Request.QueryString["zh"];
-                    paras.Add("Receiver", "%" + Request.QueryString["zh"] + "%");
-                }
-                else
-                {
-                    paras.Add("Receiver", "%" + strwhere + "%");
+                    paras.Add("OrderID", "%" + Request.QueryString["zh"] + "%");
                 }
+
                 RecordCount = new Bll.PT_Order_Header().GetRecordCount(strwhere, paras);
                 int PageSize = 10;
                 PageCount = int.Parse(Math.Ceiling(Convert.ToDecimal(RecordCount) / Convert.ToDecimal(PageSize)).ToString());
@@ -91,54 +91,39 @@ namespace ShopMobile.Admin
         protected void btnsearch_Click(object sender, EventArgs e)
         {
             string strzh = txtname.Text.Trim();
+
             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 + "?";
+
             _url = _url + "zh=" + strzh;
             Response.Redirect(_url);
 
         }
 
-        protected void btn_Click(object sender, EventArgs e)
+        protected void RpList_ItemCommand(object source, RepeaterCommandEventArgs e)
         {
-           
-            try
-            {
-              
-               
-            }
-            catch (Exception ex)
+            if (e.CommandName == "notice")
             {
-
+                string oid = e.CommandArgument.ToString();
+                var od = new Bll.PT_Order_Header().GetModel(oid);
+                if (od.OrderID.Substring(0, 1) == "B" && od.State==1)
+                {
+                    order or = new order();
+                    result msg = new result();
+                    or.addordertopt(od.OrderID, ref msg);
+                    if (msg.result1.ToString() == "")
+                    {
+                        Common.MessageBox.Show(this, "通知失败");
+                    }
+                    else
+                    {
+                        Common.MessageBox.Show(this, "通知成功");
+                    }
+                }
             }
         }
     }

ShopMobile/Admin/OrderList.aspx.designer.cs

@@ -38,41 +38,5 @@ namespace ShopMobile.Admin {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Repeater RpList;
-        
-        /// <summary>
-        /// TextBox3 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.TextBox TextBox3;
-        
-        /// <summary>
-        /// TextBox1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.TextBox TextBox1;
-        
-        /// <summary>
-        /// Button1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Button Button1;
-        
-        /// <summary>
-        /// Button2 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Button Button2;
     }
 }

ShopMobile/Admin/PictureList.aspx.cs

@@ -46,6 +46,7 @@ namespace ShopMobile.Admin
             if (!string.IsNullOrEmpty(Request.QueryString["zh"]))
             {
                 _search = _search + " and PicSort = '" + Request.QueryString["zh"] + "'";
+                txtPicSort.Text = Request.QueryString["zh"];
             }
             RpList.DataSource = Paginator.MyExecutePage("*", "PT_Pic_ImgUrl", _search, "id", "id desc", PageIndex, PageSize, out RecordCount, out PageCount);
             paging = Paginator.Pagination(PageIndex, PageCount, RecordCount);

ShopMobile/Admin/ProductListOther.aspx.cs

@@ -120,7 +120,7 @@ namespace ShopMobile.Admin
                         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.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();

ShopMobile/Mobile/View/Order.html

@@ -80,7 +80,7 @@
         avalon.ready(function () {
             if (model.cart.length > 0) {
                 var date = common.getnowdate("yyyyMMddHHmmss");
-                var strdata = { action: "common_cartlist", "cart": JSON.stringify(model.cart.$model), timestamp: date };
+                var strdata = { action: "product_cartlist", "cart": JSON.stringify(model.cart.$model), timestamp: date };
                 var sign = common.getsign(JSON.stringify(strdata));
                 var data = JSON.parse(JSON.stringify(strdata));
                 data.sign = sign;

ShopMobile/Mobile/View/OrderDatail.html

@@ -148,6 +148,9 @@
                     </div>
                 </li>
             </ul>
+            <div class="ui-form-item ui-form-item-order ui-border-b" ms-if="modelData.Express">
+                <a style="position:absolute;">快递信息</a><h4 class="ui-nowrap" style="padding-left:95px;">{{modelData.Express}}&nbsp;&nbsp;{{modelData.ExpressNo}}</h4>
+            </div>
             <div class="ui-form-item ui-form-item-order ui-border-b">
                 <a>商品明细</a>
             </div>

ShopMobile/Mobile/View/Pay/WeChat/jsapih5.ashx.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Web;
 using LitJson;
 using WxPayAPI;
+using ShopMobile.Common;
 
 namespace ShopMobile.View.Pay.WeChat
 {
@@ -12,50 +13,75 @@ namespace ShopMobile.View.Pay.WeChat
     /// </summary>
     public class jsapih5 : IHttpHandler
     {
-
         public void ProcessRequest(HttpContext context)
         {
             string wxJsApiParam = "";
-            string code = context.Request.Params["code"];
-            string orderid = context.Request.Params["orderid"];
-
-            try
+            if (context.Request.UrlReferrer != null && context.Request.UrlReferrer.DnsSafeHost == context.Request.Url.DnsSafeHost)
             {
-                var ord = new ShopMobile.Bll.PT_Order_Header().GetModel(orderid);
-                if (ord != null)
+                string sign = context.Request.Params["sign"];
+                string orderid = context.Request.Params["orderid"];
+                if ( !string.IsNullOrEmpty(orderid) && !string.IsNullOrEmpty(sign) && check(context))
                 {
-                    var bt = new ShopMobile.Bll.PT_Base_Site().GetModel(1);
-                    if (bt != null)
+                    try
                     {
-                        WxPayConfig.APPID = bt.WX_AppID;
-                        WxPayConfig.MCHID = bt.WX_MCHID;
-                        WxPayConfig.KEY = bt.WX_KEY;
-                        WxPayConfig.APPSECRET = bt.WX_AppSecret;
+                        var ord = new ShopMobile.Bll.PT_Order_Header().GetModel(orderid);
+                        if (ord != null)
+                        {
+                            var bt = new ShopMobile.Bll.PT_Base_Site().GetModel(1);
+                            if (bt != null)
+                            {
+                                WxPayConfig.APPID = bt.WX_AppID;
+                                WxPayConfig.MCHID = bt.WX_MCHID;
+                                WxPayConfig.KEY = bt.WX_KEY;
+                                WxPayConfig.APPSECRET = bt.WX_AppSecret;
+
 
+                                Log.Debug("NOTIFY_URL", WxPayConfig.NOTIFY_URL);
 
-                        Log.Debug("NOTIFY_URL", WxPayConfig.NOTIFY_URL);
+                                JsApiPay2 jsApiPay = new JsApiPay2(context);
+                                jsApiPay.GetOpenidAndAccessToken();
 
-                        JsApiPay2 jsApiPay = new JsApiPay2(context);
-                        jsApiPay.GetOpenidAndAccessToken();
+                                jsApiPay.orderid = orderid;
+                                jsApiPay.name = "商城订单" + orderid;
+                                jsApiPay.total_fee = (int)(ord.PayPrice * 100);
 
-                        jsApiPay.orderid = orderid;
-                        jsApiPay.name = "商城订单" + orderid;
-                        jsApiPay.total_fee = (int)(ord.PayPrice * 100);
+                                //JSAPI支付预处理
+                                WxPayData unifiedOrderResult = jsApiPay.GetUnifiedOrderResult();
+                                wxJsApiParam = jsApiPay.GetJsApiParameters();//获取H5调起JS API参数
+                            }
+                        }
 
-                        //JSAPI支付预处理
-                        WxPayData unifiedOrderResult = jsApiPay.GetUnifiedOrderResult();
-                        wxJsApiParam = jsApiPay.GetJsApiParameters();//获取H5调起JS API参数
+                    }
+                    catch (Exception ex)
+                    {
                     }
                 }
-
-            }
-            catch(Exception ex) {
             }
-
             context.Response.ContentType = "text/plain";
             context.Response.Write(wxJsApiParam);
         }
 
+        public bool check(HttpContext context)
+        {
+            bool bl = false;
+
+            string sign = context.Request.Params["sign"] ?? "";
+
+            string paras = string.Empty;
+            foreach (var key in context.Request.Params.AllKeys)
+            {
+                if (key == "sign")
+                {
+                    break;
+                }
+                paras = paras + context.Request.Params[key];
+            }
+
+            bl = Utils.MD5(paras).ToUpper() == sign.ToUpper();
+
+            return bl;
+        }
+
         public bool IsReusable
         {
             get

ShopMobile/Mobile/View/Pay/paywx.html

@@ -30,11 +30,11 @@
                     <li class="card-content card_border">
                         <div class="card-content-inner f28 flex_center">
                             <span class="black" style="width:100px;">订单编号</span>
-                            <span class="fx1">{{OrderID}}</span>
+                            <span class="fx1">{{DataModel.OrderID}}</span>
                         </div>
                         <div class="card-content-inner f28 flex_center">
                             <span class="black" style="width:100px;">应付款</span>
-                            <span class="fx1">¥{{DataModel.PayPrice?DataModel.PayPrice:DataModel.Total}}</span>
+                            <span class="fx1">¥{{DataModel.PayPrice}}</span>
                         </div>
                     </li>
                 </ul>
@@ -48,8 +48,8 @@
         var model = avalon.define({
             $id: "orderp",
             DataModel: {},
-            code: ComFunJS.getQueryString("code") ? ComFunJS.getQueryString("code") : "",
-            OrderID: ComFunJS.getQueryString("orderid") ? ComFunJS.getQueryString("orderid") : "",
+            code: common.getQueryString("code") ? common.getQueryString("code") : "",
+            OrderID: common.getQueryString("orderid") ? common.getQueryString("orderid") : "",
             jsapi: {},
             callpayto: function () {
                 callpay();
@@ -68,14 +68,18 @@
 
                     if (resultData.ErrorMsg == "") {
                         model.DataModel = resultData.result1;
-                        var pr = model.DataModel.PayPrice;
-                        if (!model.DataModel.PayPrice) { pr = model.DataModel.Total; }
-                        $.getJSON("/Mobile/View/Pay/WeChat/jsapih5.ashx", { "code": model.code, "orderid": model.OrderID, "orderpay": pr }, function (r) {
+                        
+                        var strdata1 = { "code": model.code, "orderid": model.modelData.OrderID, timestamp: date };
+                        var sign1 = common.getsign(JSON.stringify(strdata1));
+                        var data1 = JSON.parse(JSON.stringify(strdata1));
+                        data1.sign = sign1;
+
+                        $.getJSON("/Mobile/View/Pay/WeChat/jsapih5.ashx", data1, function (r) {
                             if (r) {
                                 model.jsapi = r;
 
                             } else {
-                                ComFunJS.winwarning("提交失败，请重新提交！");
+                                common.alert("提交失败，请重新提交！","warn");
                             }
                         })
                     }

ShopMobile/Mobile/View/SCSY.html

@@ -43,19 +43,23 @@
         });
         avalon.ready(function () {
             var date = common.getnowdate("yyyyMMddHHmmss");
-            var strdata = { action: "product_productlist", PageCount: 4, PageIndex: 1, timestamp: date };
+            var strdata = { action: "product_indexlist", timestamp: date };
             var sign = common.getsign(JSON.stringify(strdata));
             var data = JSON.parse(JSON.stringify(strdata));
             data.sign = sign;
             $.getJSON("/api/api.ashx", data, function (resultData) {
                 if (resultData.msgcode == "") {
+                    model.tcData = resultData.result1;
+                    model.rmData = resultData.result2;
+                    model.tjData = resultData.result3;
+
                     var html = "";
-                    $(resultData.result1).each(function (i, n) {
-                        if (i < 4) {
-                            //html = html + '<li class="imgsp" ><span style="background-image: url(' + n.AppActiveProductImg + ')"></span></li>';
-                            html = html + '<li class="imgsp" ><span style="background-image: url(' + n.ImgUrl1 + ')"></span></li>';
-                        }
+                    $(resultData.result4).each(function (i, n) {
+                        html = html + '<li><span style="background-image: url(/Mobile/img/zwtp.jpg)"><span style="background-image: url(' + n.PicUrl + ')"></span></span></li>';
                     })
+                    if (!html) {
+                        html = html + '<li><span style="background-image: url(/Mobile/img/zwtp.jpg)"></span></li>';
+                    }
 
                     $(".ui-slider-content").append(html)
 
@@ -67,18 +71,6 @@
                     });
                 }
             })
-
-            var strdata = { action: "product_indexlist", timestamp: date };
-            var sign = common.getsign(JSON.stringify(strdata));
-            var data = JSON.parse(JSON.stringify(strdata));
-            data.sign = sign;
-            $.getJSON("/api/api.ashx", data, function (resultData) {
-                if (resultData.msgcode == "") {
-                    model.tcData = resultData.result1;
-                    model.rmData = resultData.result2;
-                    model.tjData = resultData.result3;
-                }
-            })
         })
     </script>
 </head>

ShopMobile/Mobile/View/SPXQ.html

@@ -329,7 +329,7 @@
                             $(".ui-slider-content").empty();
                             var html = "";
                             $(model.DataModel.ImgUrl.split(',')).each(function (i, n) {
-                                html = html + '<li><span style="background-image: url(' + n + ')"></span></li>';
+                                html = html + '<li><span style="background-image: url(/Mobile/img/zwtp.jpg)"><span style="background-image: url(' + n + ')"></span></span></li>';
                             })
                             if (!html) {
                                 html = html + '<li><span style="background-image: url(/Mobile/img/zwtp.jpg)"></span></li>';

ShopMobile/Mobile/View/ShopCart.html

@@ -85,7 +85,7 @@
         avalon.ready(function () {
             if (model.cart.length > 0) {
                 var date = common.getnowdate("yyyyMMddHHmmss");
-                var strdata = { action: "common_cartlist", "cart": JSON.stringify(model.cart.$model), timestamp: date };
+                var strdata = { action: "product_cartlist", "cart": JSON.stringify(model.cart.$model), timestamp: date };
                 var sign = common.getsign(JSON.stringify(strdata));
                 var data = JSON.parse(JSON.stringify(strdata));
                 data.sign = sign;

ShopMobile/apiclass/common.cs

@@ -157,147 +157,5 @@ namespace ShopMobile.apiclass
         }
         #endregion
 
-        #region 获取购物车商品
-        public void cartlist(HttpContext context, ref result msg, Model.PT_User_Account user)
-        {
-            string url = CommFun.GetConfigString("shopurl").ToString();
-            string appkey = CommFun.GetConfigString("appkey").ToString();
-            string userkey = "&"+ CommFun.GetConfigString("userkey").ToString();
-
-            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)
-            {
-                Model.PT_Pro_Product pt = new Bll.PT_Pro_Product().GetModel(obj.id);
-                if (pt != null)
-                {
-                    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 = pt.Title;
-                        oim.sumprice = pt.SPPrice.Value;
-                        oim.payprice = (pt.Price == null || pt.Price.Value == 0) ? pt.SPPrice.Value / 2 : pt.Price.Value;
-                        oim.point = (pt.Points == null || pt.Points.Value == 0) ? pt.SPPrice.Value / 2 : pt.Points.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>();
-                            os.items.Add(oim);
-                            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")
-                            {
-                                var pe = decimal.Parse(spxq["Product_Price"].ToString());
-                                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.sumprice = pe;
-                                oim.payprice = (pt.Price == null || pt.Price.Value == 0) ? pe / 2 : pt.Price.Value;
-                                oim.point = (pt.Points == null || pt.Points.Value == 0) ? pe / 2 : pt.Points.Value;
-                                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)
-                        { }
-                    }
-                }
-            }
-            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 sumprice { get; set; }
-            public decimal payprice { get; set; }
-            public decimal point { 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/product.cs

@@ -14,13 +14,14 @@ namespace ShopMobile.apiclass
     {
         public product() { }
 
-        #region 获取商品列表
+        #region 获取首页列表
 
         public void indexlist(HttpContext context, ref result msg, Model.PT_User_Account user)
         {
             msg.result1 = new Bll.PT_Pro_Product().GetList(4, " ','+SpBQ+',' like '%,推荐,%' and Deleted='0' and IsSelf='1'", " ID desc").Tables[0];
             msg.result2 = new Bll.PT_Pro_Product().GetList(4, " ','+SpBQ+',' like '%,热卖,%' and Deleted='0' and IsSelf='1'", " ID desc").Tables[0];
             msg.result3 = new Bll.PT_Pro_Product().GetList(4, " ','+SpBQ+',' like '%,特价,%' and Deleted='0' and IsSelf='1'", " ID desc").Tables[0];
+            msg.result4 = new Bll.PT_Pic_ImgUrl().GetList(4, " 1=1 ", " PicSort asc ").Tables[0];
         }
         #endregion
 
@@ -222,5 +223,149 @@ namespace ShopMobile.apiclass
             msg.result1 = dt;
         }
         #endregion
+
+        #region 获取购物车商品
+        public void cartlist(HttpContext context, ref result msg, Model.PT_User_Account user)
+        {
+            string url = CommFun.GetConfigString("shopurl").ToString();
+            string appkey = CommFun.GetConfigString("appkey").ToString();
+            string userkey = "&" + CommFun.GetConfigString("userkey").ToString();
+
+            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)
+            {
+                Model.PT_Pro_Product pt = new Bll.PT_Pro_Product().GetModel(obj.id);
+                if (pt != null)
+                {
+                    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 = pt.Title;
+                        oim.sumprice = pt.SPPrice.Value;
+                        oim.payprice = (pt.Price == null || pt.Price.Value == 0) ? pt.SPPrice.Value / 2 : pt.Price.Value;
+                        oim.point = (pt.Points == null || pt.Points.Value == 0) ? pt.SPPrice.Value / 2 : pt.Points.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>();
+                            os.items.Add(oim);
+                            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")
+                            {
+                                var pe = decimal.Parse(spxq["Product_Price"].ToString());
+                                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.sumprice = pe;
+                                oim.payprice = (pt.Price == null || pt.Price.Value == 0) ? pe / 2 : pt.Price.Value;
+                                oim.point = (pt.Points == null || pt.Points.Value == 0) ? pe / 2 : pt.Points.Value;
+                                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)
+                        { }
+                    }
+                }
+            }
+            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 sumprice { get; set; }
+            public decimal payprice { get; set; }
+            public decimal point { 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
     }
 }