From 705909e14fe4e9f2fc261ee4eb40a8b41fa2f6d4 Mon Sep 17 00:00:00 2001
From: wzp <2880584989@qq.com>
Date: 星期二, 12 七月 2022 17:37:26 +0800
Subject: [PATCH] 增加免密登陆的token
---
web/web/GwProduct.ashx | 108 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 61 insertions(+), 47 deletions(-)
diff --git a/web/web/GwProduct.ashx b/web/web/GwProduct.ashx
index 261a614..c6048c6 100644
--- a/web/web/GwProduct.ashx
+++ b/web/web/GwProduct.ashx
@@ -87,12 +87,12 @@
//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
@@ -117,7 +117,7 @@
"</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 = string.Concat(new object[4]
{
@@ -126,7 +126,7 @@
bean.Instructions,
"</td>"
});
- str1 += "<td class=\"text-right\">";
+ 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> 鍋滅敤</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> 鍚敤</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> 缂栬緫</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> 鍒犻櫎</a> ", (object) bean.Id);
@@ -176,7 +176,7 @@
str1 = str1 + "<td>" + bean.CreateTime + "</td>";
str1 = str1 + "<td>" + bean.Remark + "</td>";
- str1 += "<td class=\"text-right\">";
+ 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> 鍋滅敤</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> 鍚敤</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> 缂栬緫</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> 鍒犻櫎</a> ", (object) bean.Id);
@@ -265,6 +265,26 @@
int ctGroupid = 0;
int price = 0;
int givingNum = 0;
+
+ string parentId = context.GetString("parentId", "");
+ string path = "";
+ if (string.IsNullOrEmpty(parentId) )
+ {
+ path = "0";
+ }
+ else
+ {
+ GwProduct newProduct = _Dao.Get(parentId);
+ if(newProduct!=null)
+ {
+ path = newProduct.Path=="" ? "0" : newProduct.Path + "," + newProduct.Id ;
+ }
+ else
+ {
+ path = "0";
+ }
+
+ }
string info = "" ;
if (classes == -1) {
@@ -278,6 +298,11 @@
if (string.IsNullOrEmpty(name))
{
throw new ArgumentException(info + "鍚嶇О涓嶈兘涓虹┖锛�");
+ }
+
+ if (string.IsNullOrEmpty(parentId))
+ {
+ throw new ArgumentException("鎵�灞炰骇鍝佺被鍒笉鑳戒负绌猴紒");
}
}
@@ -326,25 +351,7 @@
}
}
- string parentId = context.GetString("parentId", "0");
- string path = "";
- if (parentId.Equals("0"))
- {
- path = "0";
- }
- else
- {
- GwProduct newProduct = _Dao.Get(parentId);
- if(newProduct!=null)
- {
- path = newProduct.Path=="" ? "0" : newProduct.Path + "," + newProduct.Id ;
- }
- else
- {
- path = "0";
- }
- }
int isEnable = context.GetInt("isEnable", 0);
//int price = context.GetInt("price", 0);
@@ -446,6 +453,26 @@
int ctGroupid = 0;
int price = 0;
int givingNum = 0;
+
+ string parentId = context.GetString("parentId", "");
+ string path = "";
+ if (string.IsNullOrEmpty(parentId) )
+ {
+ path = "0";
+ }
+ else
+ {
+ GwProduct newProduct = _Dao.Get(parentId);
+ if(newProduct!=null)
+ {
+ path = newProduct.Path=="" ? "0" : newProduct.Path + "," + newProduct.Id ;
+ }
+ else
+ {
+ path = "0";
+ }
+
+ }
string info = "" ;
if (classes == -1) {
@@ -459,6 +486,11 @@
if (string.IsNullOrEmpty(name))
{
throw new ArgumentException(info + "鍚嶇О涓嶈兘涓虹┖锛�");
+ }
+
+ if (string.IsNullOrEmpty(parentId))
+ {
+ throw new ArgumentException("鎵�灞炰骇鍝佺被鍒笉鑳戒负绌猴紒");
}
}
@@ -508,25 +540,7 @@
}
}
- string parentId = context.GetString("parentId", "0");
- string path = "";
- if (parentId.Equals("0"))
- {
- path = "0";
- }
- else
- {
- GwProduct newProduct = _Dao.Get(parentId);
- if(newProduct!=null)
- {
- path = newProduct.Path=="" ? "0" : newProduct.Path + "," + newProduct.Id ;
- }
- else
- {
- path = "0";
- }
- }
int isEnable = context.GetInt("isEnable", 0);
string remark = context.GetString("remark", "");
@@ -760,9 +774,9 @@
if (classes == -1)
return string.Empty;
else if(classes == 0)
- return "0-浜у搧鍒嗙被";
+ return "浜у搧鍒嗙被";
else if(classes == 1)
- return "1-浜у搧";
+ return "浜у搧";
return string.Empty;
}
@@ -773,9 +787,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;
}
@@ -786,9 +800,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