From 3b18a48485f7207438d9d0eb3038d979e069431d Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期四, 26 五月 2022 17:58:18 +0800
Subject: [PATCH] 优化产品及产品分类,订单,对称加密,IP转地区名称

---
 web/web/GwProduct.ashx |  121 ++++++++++++++++++++++++++++++---------
 1 files changed, 92 insertions(+), 29 deletions(-)

diff --git a/web/web/GwProduct.ashx b/web/web/GwProduct.ashx
index 4a9c112..829c88d 100644
--- a/web/web/GwProduct.ashx
+++ b/web/web/GwProduct.ashx
@@ -35,7 +35,9 @@
             case "add":
                 return this.Add(context);       //娣诲姞
             case "list":
-                return this.List(context);      //鏌ヨ
+                return this.List(context);      //浜у搧鏌ヨ
+            case "productClassesList":
+                return this.ProductClassesList(context);      //浜у搧鏌ヨ
             case "get":
                 return this.Get(context);      //鑾峰彇璁板綍淇℃伅                    
             case "updateStatus":
@@ -68,41 +70,45 @@
             int num = 0;
             foreach (GwProduct bean in list)
             {
+
                 ++num;
-                str1 = str1 + (object) "<tr><td>" +  (object) bean.Icon;
-                str1 = str1 + "</td><td>" + bean.Name + "</td>";
-                str1 = string.Concat(new object[4]
+                //str1 = str1 + (object) "<tr><td>" +  "<img src=\"../static/images/productIcon/" + (object) bean.Icon + "\" >";
+                if (bean.Classes == 1 && !string.IsNullOrEmpty(bean.Icon))
                 {
-                         str1,
-                          "<td>",
-                         bean.Instructions,
-                         "</td>"
-                });
-                str1 = str1 + "<td>" + (object)this.ClassesToName(bean.Classes) + "</td>";
+                    str1 += "<tr><td>" + "<img src=\"../static/images/productIcon/" + (object)bean.Icon + "\" >"  + "</td>";
+                }
+                else
+                {
+                    str1 += "<tr><td>" + (object)bean.Icon  + "</td>";
+                }
+
+                str1 = str1 + "<td>" + ProductToName(bean.ParentId) + "</td>";
+                str1 += "<td>" + bean.Name + "</td>";
+                //str1 = str1 + "<td>" + (object)this.ClassesToName(bean.Classes) + "</td>";
                 if (bean.RouterType == 1)
                 {
-                    str1 += "<td rowspan=\"1\"><div class=\"btn  btn-primary btn-xs\">鐐硅矾鐢�</div>";
+                    str1 += "<td rowspan=\"1\"><span class='label label-primary'>閫氶亾</span>";
                     str1 += string.Format("<div>绉诲姩锛歿0}</div><div>鐢典俊锛歿1}</div><div>鑱旈�氾細{2}</div>", (object)this.GetOpName(bean.CmOpId), (object)this.GetOpName(bean.CtOpId), (object)this.GetOpName(bean.CuOpId));
                 }
                 else if (bean.RouterType == 3)
                 {
-                    str1 += "<td rowspan=\"1\"><div class=\"btn  btn-success  btn-xs\">缁勮矾鐢�</div>";
+                    str1 += "<td rowspan=\"1\"><span class='label label-success'>閫氶亾缁�</span>";
                     str1 += string.Format("<div>绉诲姩锛歿0}</div><div>鐢典俊锛歿1}</div><div>鑱旈�氾細{2}</div>", (object)this.GetGroupName(bean.CmGroupid), (object)this.GetGroupName(bean.CtGroupid), (object)this.GetGroupName(bean.CuGroupid));
                 }
                 else
                 {
                     str1 += "<td rowspan=\"1\"></td>";
                 }
-                str1 = str1 + "<td>" + ProductToName(bean.ParentId) + "</td>";
                 str1 = str1 + "<td>" + IsDefaultToName(bean.IsDefault) + "</td>";
                 str1 = str1 + "<td>" + IsEnableToName(bean.IsEnable) + "</td>";
-                str1 = string.Concat(new object[4]
-                {
-                         str1,
-                         "<td>",
-                         bean.Sort,
-                         "</td>"
-                });
+                /**
+            str1 = string.Concat(new object[4]
+            {
+                     str1,
+                     "<td>",
+                     bean.Sort,
+                     "</td>"
+            });**/
                 str1 = string.Concat(new object[4]
                 {
                         str1,
@@ -111,9 +117,16 @@
                           "</td>"
                 });
 
-                str1 += string.Format("<td>{0}鍏�/鏉�</td>", (object)(Convert.ToDecimal(bean.Price) / new Decimal(1000)));
+                str1 += string.Format("<td>{0}</td>", (object)(Convert.ToDecimal(bean.Price) / new Decimal(1000)));
                 str1 = str1 + "<td>" + bean.CreateTime + "</td>";
-                str1 += "<td  class=\"text-right\">";
+                str1 = string.Concat(new object[4]
+                {
+                         str1,
+                          "<td>",
+                         bean.Instructions,
+                         "</td>"
+                });
+                str1 += "<td  class=\"text-center \">";
                 str1 = bean.IsEnable != 0 ? str1 + string.Format("<a href=\"javascript:;\" data-id=\"{0}\" data-is_enable=\"0\" class=\"action-update-status btn btn-primary btn-xs\"><i class=\"fa fa-toggle-off\"></i>&nbsp;鍋滅敤</a> ", (object) bean.Id ) : str1 + string.Format("<a href=\"javascript:;\" data-id=\"{0}\" data-is_enable=\"1\" class=\"action-update-status btn  btn-default btn-xs\"><i class=\"fa fa-toggle-on\"/></i>&nbsp;鍚敤</a> ", (object) bean.Id );
                 str1 += string.Format("<a href=\"javascript:;\" data-id=\"{0}\" class=\"action-modal-edit btn  btn-success btn-xs\"><i class=\"fa fa-edit\"></i>&nbsp;缂栬緫</a> ", (object) bean.Id);
                 str1 += string.Format("<a href=\"javascript:;\" data-id=\"{0}\" class=\"action-delete btn  btn-default btn-xs\"><i class=\"fa fa-trash\"></i>&nbsp;鍒犻櫎</a> ", (object) bean.Id);
@@ -122,7 +135,57 @@
             }
         }
         else
-            str1 += "<tr><td colspan=\"13\" style=\"padding-left:5px; text-align: center;\">鏆傛棤淇℃伅</td></tr>";
+            str1 += "<tr><td colspan=\"11\" style=\"padding-left:5px; text-align: center;\">鏆傛棤淇℃伅</td></tr>";
+
+        return new JsonPageResult(true,  new
+        {
+            Table = str1.ToString(),
+            TotalCount = recordCount
+        });
+    }
+
+
+
+    //鍔犺浇浜у搧鍒嗙被淇℃伅
+    private JsonPageResult ProductClassesList(PageContext<SysUser> context)
+    {
+        //Console.WriteLine("List.............[" + context.GetInt("name") + "][" + context.GetInt("classes") + "]");
+        int classes = context.GetInt("classes");
+        string name = context.GetString("name");
+
+        int recordCount = 0;
+        int pageSize = context.GetInt("pageSize", 50);
+        int pageIndex = context.GetInt("pageIndex", 1);
+
+        List<GwProduct> list = _Dao.LoadInfoList(classes, name, pageSize, pageIndex, out recordCount);
+
+        string str1 = "";
+        if (list != null && list.Count > 0)
+        {
+
+            int num = 0;
+            foreach (GwProduct bean in list)
+            {
+
+                ++num;
+
+                str1 += "<tr>";
+                str1 += "<td>" + bean.Name + "</td>";
+                str1 +=  "<td>" + ProductToName(bean.ParentId) + "</td>";
+                str1 = str1 + "<td>" + IsEnableToName(bean.IsEnable) + "</td>";
+                str1 = str1 + "<td>" + bean.CreateTime + "</td>";
+                str1 = str1 + "<td>" + bean.Remark + "</td>";
+
+                str1 += "<td  class=\"text-center\">";
+                str1 = bean.IsEnable != 0 ? str1 + string.Format("<a href=\"javascript:;\" data-id=\"{0}\" data-is_enable=\"0\" class=\"action-update-status btn btn-primary btn-xs\"><i class=\"fa fa-toggle-off\"></i>&nbsp;鍋滅敤</a> ", (object) bean.Id ) : str1 + string.Format("<a href=\"javascript:;\" data-id=\"{0}\" data-is_enable=\"1\" class=\"action-update-status btn  btn-default btn-xs\"><i class=\"fa fa-toggle-on\"/></i>&nbsp;鍚敤</a> ", (object) bean.Id );
+                str1 += string.Format("<a href=\"javascript:;\" data-id=\"{0}\" class=\"action-modal-edit btn  btn-success btn-xs\"><i class=\"fa fa-edit\"></i>&nbsp;缂栬緫</a> ", (object) bean.Id);
+                str1 += string.Format("<a href=\"javascript:;\" data-id=\"{0}\" class=\"action-delete btn  btn-default btn-xs\"><i class=\"fa fa-trash\"></i>&nbsp;鍒犻櫎</a> ", (object) bean.Id);
+                str1 += "</td>";
+                str1 += "</tr>";
+            }
+        }
+        else
+            str1 += "<tr><td colspan=\"11\" style=\"padding-left:5px; text-align: center;\">鏆傛棤淇℃伅</td></tr>";
 
         return new JsonPageResult(true,  new
         {
@@ -697,9 +760,9 @@
         if (classes == -1)
             return string.Empty;
         else if(classes == 0)
-            return "0-浜у搧鍒嗙被";
+            return "浜у搧鍒嗙被";
         else if(classes == 1)
-            return "1-浜у搧";
+            return "浜у搧";
 
         return string.Empty;
     }
@@ -710,9 +773,9 @@
         if (isDefault == -1)
             return string.Empty;
         else if(isDefault == 0)
-            return "0-涓�у寲";
+            return "<span class='label label-warning'>涓�у寲</span>";
         else if(isDefault == 1)
-            return "1-绯荤粺榛樿";
+            return "<span class='label label-success'>绯荤粺榛樿</span>";
 
         return string.Empty;
     }
@@ -723,9 +786,9 @@
         if (isEnable == -1)
             return string.Empty;
         else if(isEnable == 0)
-            return "0-鍋滅敤";
+            return "<span class='label label-default'>宸插仠鐢�</span>";
         else if(isEnable == 1)
-            return "1-鍚敤";
+            return "<span class='label label-primary'>宸插惎鐢�</span>";
 
         return string.Empty;
     }

--
Gitblit v1.9.1