From a5b2428bc6ebac0210e4c552f61e7c5e1f1c9134 Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期四, 24 十一月 2022 15:25:48 +0800
Subject: [PATCH] 优化多项
---
web/web/Bin/Dao.dll | 0
web/Model/Model/GwSp.cs | 19 ++++
web/web/VersionHistory.aspx | 46 ++++++++++-
web/web/GwSp.aspx | 4
web/web/GwOrderComplete.aspx | 6
web/Lib/Model.pdb | 0
web/web/gwspupdate.aspx | 17 ++-
web/Lib/Dao.dll | 0
web/web/Index.aspx | 39 +++++----
web/web/GwClient.ashx | 9 +
web/web/Bin/Model.pdb | 0
web/.vs/Web/v16/.suo | 0
web/Lib/Model.dll | 0
web/web/GwClient.aspx | 50 +++--------
web/web/GwOrderAudit.aspx | 6
web/web/Bin/Model.dll | 0
web/Lib/Dao.pdb | 0
web/web/Bin/Dao.pdb | 0
18 files changed, 120 insertions(+), 76 deletions(-)
diff --git a/web/.vs/Web/v16/.suo b/web/.vs/Web/v16/.suo
index 625fdab..57c96f7 100644
--- a/web/.vs/Web/v16/.suo
+++ b/web/.vs/Web/v16/.suo
Binary files differ
diff --git a/web/Lib/Dao.dll b/web/Lib/Dao.dll
index 9ea0195..0370d65 100644
--- a/web/Lib/Dao.dll
+++ b/web/Lib/Dao.dll
Binary files differ
diff --git a/web/Lib/Dao.pdb b/web/Lib/Dao.pdb
index 57f4d97..8693fc8 100644
--- a/web/Lib/Dao.pdb
+++ b/web/Lib/Dao.pdb
Binary files differ
diff --git a/web/Lib/Model.dll b/web/Lib/Model.dll
index d486626..dc67266 100644
--- a/web/Lib/Model.dll
+++ b/web/Lib/Model.dll
Binary files differ
diff --git a/web/Lib/Model.pdb b/web/Lib/Model.pdb
index dda679b..61d8d0d 100644
--- a/web/Lib/Model.pdb
+++ b/web/Lib/Model.pdb
Binary files differ
diff --git a/web/Model/Model/GwSp.cs b/web/Model/Model/GwSp.cs
index 7866540..47503bd 100644
--- a/web/Model/Model/GwSp.cs
+++ b/web/Model/Model/GwSp.cs
@@ -133,6 +133,11 @@
}
set
{
+ if (value.Length >= 20)
+ {
+ throw new ArgumentOutOfRangeException("瀵嗙爜瓒呰繃闀垮害闄愬埗锛�");
+ }
+
this._password = value;
}
}
@@ -427,7 +432,19 @@
public int ForceSignFlag { get; set; }
- public string ForceSign { get; set; }
+
+ private string _forceSign;
+ public string ForceSign
+ {
+ get { return _forceSign; }
+ set {
+ if (value.Length >= 20)
+ {
+ throw new ArgumentOutOfRangeException("闀垮害瓒呭嚭闄愬埗锛�");
+ }
+ _forceSign = value;
+ }
+ }
public int CombinationMode { get; set; }
diff --git a/web/web/Bin/Dao.dll b/web/web/Bin/Dao.dll
index 9ea0195..0370d65 100644
--- a/web/web/Bin/Dao.dll
+++ b/web/web/Bin/Dao.dll
Binary files differ
diff --git a/web/web/Bin/Dao.pdb b/web/web/Bin/Dao.pdb
index 57f4d97..8693fc8 100644
--- a/web/web/Bin/Dao.pdb
+++ b/web/web/Bin/Dao.pdb
Binary files differ
diff --git a/web/web/Bin/Model.dll b/web/web/Bin/Model.dll
index d486626..dc67266 100644
--- a/web/web/Bin/Model.dll
+++ b/web/web/Bin/Model.dll
Binary files differ
diff --git a/web/web/Bin/Model.pdb b/web/web/Bin/Model.pdb
index dda679b..61d8d0d 100644
--- a/web/web/Bin/Model.pdb
+++ b/web/web/Bin/Model.pdb
Binary files differ
diff --git a/web/web/GwClient.ashx b/web/web/GwClient.ashx
index 7acbcc9..8e59192 100644
--- a/web/web/GwClient.ashx
+++ b/web/web/GwClient.ashx
@@ -419,7 +419,7 @@
string financialStaff = context.GetString("financialStaff");
string chargeType = context.GetString("chargeType");
string smsStatusReport = context.GetString("smsStatusReport");
-
+
string isEnableWhite = context.GetString("isEnableWhite");
string isEnableBlack = context.GetString("isEnableBlack");
@@ -530,7 +530,7 @@
client.FinancialStaff = financialStaff;
client.ChargeType = string.IsNullOrEmpty(chargeType) ? 0 : int.Parse(chargeType);
client.SmsStatusReport = string.IsNullOrEmpty(smsStatusReport) ? 0 : int.Parse(smsStatusReport);
-
+
client.IsEnableWhite = string.IsNullOrEmpty(isEnableWhite) ? 0 : int.Parse(isEnableWhite);
client.IsEnableBlack = string.IsNullOrEmpty(isEnableBlack) ? 0 : int.Parse(isEnableBlack);
@@ -598,6 +598,11 @@
throw new ArgumentException("瀹㈡埛璐﹀彿涓嶈兘涓虹┖锛屼笖蹇呴』涓哄叕鍙稿悕绉帮紒");
}
+ if (address.Length >= 150)
+ {
+ throw new ArgumentException("鍦板潃闀垮害瓒呭嚭闄愬埗锛�");
+ }
+
if (string.IsNullOrEmpty(company))
{
throw new AggregateException("鍏徃鍚嶇О涓嶈兘涓虹┖锛屼笖蹇呴』鏄叏绉�");
diff --git a/web/web/GwClient.aspx b/web/web/GwClient.aspx
index e2fac9d..b9deaa8 100644
--- a/web/web/GwClient.aspx
+++ b/web/web/GwClient.aspx
@@ -481,7 +481,7 @@
document.execCommand('copy');
element.remove ? element.remove() : element.removeNode(true);
}
- mytek.alert("澶嶅埗鎴愬姛锛�", false);
+ mytek.alert("澶嶅埗鎴愬姛锛�", true);
});
@@ -703,7 +703,7 @@
</div>
<div class="form-group">
<label class="control-label col-sm-2">
- 璁¤垂鏂瑰紡 <span style="color:red">*</span>
+ 缁撹垂鏂瑰紡 <span style="color:red">*</span>
</label>
<div class="col-sm-4">
<select name="chargeType" id="chargeType" class="form-control">
@@ -715,40 +715,17 @@
</div>
<div class="form-group">
<label class="control-label col-sm-2">
- 鐭俊鏄惁鏀寔鏄剧ず鐘舵�佹姤鍛� <span style="color:red">*</span>
+ 鐭俊鏄惁鏄剧ず鐘舵�佹姤鍛� <span style="color:red">*</span>
</label>
<div class="col-sm-4">
<select name="smsStatusReport" id="smsStatusReport" class="form-control">
<option value="0" >涓嶆樉绀�</option>
- <option value="1" >鍙樉绀烘彁浜ゅけ璐ヤ负鍙戦�佸け璐ョ姸鎬�</option>
- <option value="2" >鏄剧ず鍏ㄩ儴鐘舵��</option>
+ <%--<option value="1" >鍙樉绀烘彁浜ゅけ璐ヤ负鍙戦�佸け璐ョ姸鎬�</option>--%>
+ <option value="2" >鏄剧ず</option>
</select>
</div>
</div>
- <!--
- <div class="form-group">
- <label class="control-label col-sm-2">
- 褰╀俊鏄惁鏀寔鏄剧ず鐘舵�佹姤鍛� <span style="color:red">*</span>
- </label>
- <div class="col-sm-4">
- <select name="mmsStatusReport" id="mmsStatusReport" class="form-control">
- <option value="0" >涓嶆樉绀�</option>
- <option value="1" >鍙樉绀烘彁浜ゅけ璐ヤ负鍙戦�佸け璐ョ姸鎬�</option>
- <option value="2" >鏄剧ず鍏ㄩ儴鐘舵�佺姸鎬�</option>
- </select>
- </div>
- </div>
- -->
- <!--
- <div class="form-group">
- <label class="control-label col-sm-2">
- 褰掑睘涓氬姟鍛�
- </label>
- <div class="col-sm-4">
- <input type="text" name="agent" id="agent" value="" class="form-control" />
- </div>
- </div>
- -->
+
<div class="form-group">
<label class="control-label col-sm-2">
褰掑睘瀹㈡埛缁忕悊 <span style="color:red">*</span>
@@ -927,7 +904,7 @@
<form name="queryForm" method="post" id="queryForm" class="form-inline">
<div class="form-group">
<div class="input-group m-b">
- <span class="input-group-addon">瀹㈡埛璐﹀彿</span>
+ <span class="input-group-addon">瀹㈡埛璐︽埛</span>
<input type="text" name="ClientID" id="ClientID" class="form-control" />
</div>
</div>
@@ -976,7 +953,10 @@
<div class="form-group">
<div class="input-group m-b">
<input type="button" value="鏌ヨ" class="btn btn-primary action-query" /> 
- <input class="btn btn-success action-modal-create" value="鍒涘缓瀹㈡埛" type="button" /> 
+
+ <% if(IsEnable==1) { %>
+ <input class="btn btn-success action-modal-create" value="鍒涘缓瀹㈡埛" type="button" /> 
+ <%} %>
</div>
</div>
@@ -988,13 +968,13 @@
<input class="btn btn-danger action-modal-setProduct" value="鎵归噺鍒嗛厤涓�т骇鍝�" type="button" />
<%} %>
<input class="btn btn-info action-export" value="瀵煎嚭鏁版嵁" type="button" />
- <table class="table table-striped table-bordered table-hover" id="gwclientTable">
+ <table class="table table-striped table-bordered table-hover" id="gwclientTable" style="margin:10px 0 0 0;">
<thead>
<tr class="header">
<th>
<input type='checkbox' name='checkAll' id='checkAll' />
</th>
- <th>瀹㈡埛璐﹀彿
+ <th>瀹㈡埛璐︽埛
</th>
<th>鍏徃鍚嶇О</th>
<th>鑱旂郴浜�
@@ -1027,7 +1007,7 @@
</table>
</div>
- <div id="pager">
+ <div id="pager" style="margin:10px 0 0 0;">
</div>
<!--鎵归噺淇敼涓�т骇鍝� -->
@@ -1037,7 +1017,7 @@
<div class="modal-header">
<span class="title"><h3>鎵归噺鍒嗛厤涓�т骇鍝�</h3></span><a class="close" data-dismiss="modal" aria-hidden="true">脳</a>
<span class="text-muted">
- 鎵归噺鍒嗛厤涓�т骇鍝佸皢浼氭洿鏂版墍鏈夐�変腑鐨勮处鍙风殑瀹㈡埛锛�<br />
+ 鎵归噺鍒嗛厤涓�т骇鍝佸皢浼氭洿鏂版墍鏈夐�変腑鐨勮处鎴风殑瀹㈡埛锛�<br />
纭畾鍒嗛厤涓嶈兘鍙栨秷锛岃璋ㄦ厧鎿嶄綔锛�<br />
</span>
</div>
diff --git a/web/web/GwOrderAudit.aspx b/web/web/GwOrderAudit.aspx
index ff20d9f..12ae077 100644
--- a/web/web/GwOrderAudit.aspx
+++ b/web/web/GwOrderAudit.aspx
@@ -239,7 +239,7 @@
<div class="m-b">
<div class="form-group">
<div class="input-group m-b">
- <span class="input-group-addon">瀹㈡埛璐﹀彿</span>
+ <span class="input-group-addon">瀹㈡埛璐︽埛</span>
<input type="text" name="ClientId" id="ClientId" class="form-control col-md-2" />
</div>
</div>
@@ -282,7 +282,7 @@
<th>鐭俊璐﹀彿
</th>
- <th>瀹㈡埛璐﹀彿
+ <th>瀹㈡埛璐︽埛
</th>
<th>鍏徃鍚嶇О
</th>
@@ -354,7 +354,7 @@
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
- 瀹㈡埛璐﹀彿</label>
+ 瀹㈡埛璐︽埛</label>
<div class="col-sm-4 ">
<!--
<select name="clientId" id="clientId" class="form-control">
diff --git a/web/web/GwOrderComplete.aspx b/web/web/GwOrderComplete.aspx
index d4867fb..4696107 100644
--- a/web/web/GwOrderComplete.aspx
+++ b/web/web/GwOrderComplete.aspx
@@ -125,7 +125,7 @@
<div class="m-b">
<div class="form-group">
<div class="input-group m-b">
- <span class="input-group-addon">瀹㈡埛璐﹀彿</span>
+ <span class="input-group-addon">瀹㈡埛璐︽埛</span>
<input type="text" name="ClientId" id="ClientId" class="form-control col-md-2" />
</div>
</div>
@@ -168,7 +168,7 @@
<th>鐭俊璐﹀彿
</th>
- <th>瀹㈡埛璐﹀彿
+ <th>瀹㈡埛璐︽埛
</th>
<th>鍏徃鍚嶇О
</th>
@@ -239,7 +239,7 @@
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
- 瀹㈡埛璐﹀彿</label>
+ 瀹㈡埛璐︽埛</label>
<div class="col-sm-4 ">
<!--
<select name="clientId" id="clientId" class="form-control">
diff --git a/web/web/GwSp.aspx b/web/web/GwSp.aspx
index 6edcac4..cc9f57c 100644
--- a/web/web/GwSp.aspx
+++ b/web/web/GwSp.aspx
@@ -151,7 +151,7 @@
else {
statusMsg = "銆愬惎鐢ㄣ��";
}
- mytek.confirm("鏄惁闇�瑕�" + statusMsg + "璇ヨ处鎴风姸鎬侊紵", "鏄惁鎿嶄綔锛�", function (b) {
+ mytek.confirm("鏄惁闇�瑕�" + statusMsg + "璇ヨ处鍙风姸鎬侊紵", "鏄惁鎿嶄綔锛�", function (b) {
if (b) {
$.post("gwsp.ashx", { action: "updateSpStatus", spid: spid,status:status }, function (r) {
mytek.alert(r.Message, r.OK, function () {
@@ -493,7 +493,7 @@
鍏宠仈浜у搧
</th>
<th>
- 瀹㈡埛璐﹀彿
+ 瀹㈡埛璐︽埛
</th>
<th>
鍏徃鍚嶇О
diff --git a/web/web/Index.aspx b/web/web/Index.aspx
index abb283a..8a489c6 100644
--- a/web/web/Index.aspx
+++ b/web/web/Index.aspx
@@ -134,12 +134,27 @@
<li><a href="GwSmResend.aspx" class="J_menuItem">閲嶅彂鐭俊璁板綍</a> </li>
<li><a href="GwRm.aspx" class="J_menuItem">鐘舵�佹姤鍛婅褰�</a> </li>
<li><a href="GwRmResend.aspx" class="J_menuItem">姝ｅ湪閲嶆帹鎶ュ憡</a> </li>
-
+ <li><a href="gwerror.aspx" class="J_menuItem">瀹㈡埛鎻愪氦閿欒浠ｇ爜</a> </li>
<%-- <li><a href="SysOperationLog.aspx" class="J_menuItem">绯荤粺鏃ュ織璁板綍</a> </li>--%>
<li><a href="AlarmLog.aspx" class="J_menuItem">鍛婅鏃ュ織璁板綍</a> </li>
</ul>
</li>
+
+ <li>
+ <a href="#"><i class="fa fa-user-secret"></i><span class="nav-label">瀹㈡埛绠＄悊 </span><span class="fa arrow"></span></a>
+ <ul class="nav nav-second-level">
+ <li><a href="GwClient.aspx?IsEnable=1" class="J_menuItem">瀹㈡埛淇℃伅绠＄悊</a> </li>
+ <li><a href="GwClient.aspx?IsEnable=0" class="J_menuItem">鍋滅敤瀹㈡埛淇℃伅绠＄悊</a> </li>
+ <li><a href="GwSp.aspx" class="J_menuItem">鐭俊璐﹀彿绠＄悊</a> </li>
+ <li><a href="GwMoRoute.aspx" class="J_menuItem">涓婅璺敱閰嶇疆</a> </li>
+ <!--<li><a href="GwSpChargeLog.aspx" class="J_menuItem">鍏呭�艰褰曟煡璇�</a> </li>-->
+ <li><a href="GwOrderList.aspx" class="J_menuItem">鍏呭�艰褰曟煡璇�</a> </li>
+ <li><a href="api.aspx" class="J_menuItem">鎺ュ彛鏂囨。涓嬭浇</a> </li>
+
+ </ul>
+ </li>
+
<li>
<a href="#"><i class="fa fa fa-bar-chart-o"></i><span class="nav-label">鏁版嵁缁熻</span><span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
@@ -186,18 +201,7 @@
</ul>
</li>
- <li>
- <a href="#"><i class="fa fa-user-secret"></i><span class="nav-label">瀹㈡埛绠＄悊 </span><span class="fa arrow"></span></a>
- <ul class="nav nav-second-level">
- <li><a href="GwClient.aspx?IsEnable=1" class="J_menuItem">瀹㈡埛淇℃伅绠＄悊</a> </li>
- <li><a href="GwClient.aspx?IsEnable=0" class="J_menuItem">鍋滅敤瀹㈡埛淇℃伅绠＄悊</a> </li>
- <li><a href="GwSp.aspx" class="J_menuItem">鐭俊璐﹀彿绠＄悊</a> </li>
- <li><a href="GwMoRoute.aspx" class="J_menuItem">涓婅璺敱閰嶇疆</a> </li>
- <!--<li><a href="GwSpChargeLog.aspx" class="J_menuItem">鍏呭�艰褰曟煡璇�</a> </li>-->
- <li><a href="GwOrderList.aspx" class="J_menuItem">鍏呭�艰褰曟煡璇�</a> </li>
-
- </ul>
- </li>
+
<li>
<a href="#">
@@ -224,11 +228,11 @@
</ul>
</li>
<li>
- <a href="#"><i class="fa fa-home"></i><span class="nav-label">鍏充簬缃戝叧</span><span class="fa arrow"></span></a>
+ <a href="#"><i class="fa fa-home"></i><span class="nav-label">骞冲彴鐩稿叧</span><span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<li><a href="Pinfo.aspx" class="J_menuItem">绯荤粺浠嬬粛</a> </li>
- <li><a href="api.aspx" class="J_menuItem">鎺ュ彛鏂囨。</a> </li>
- <li><a href="gwerror.aspx" class="J_menuItem">閿欒浠ｇ爜</a> </li>
+
+
<li><a href="VersionHistory.aspx" class="J_menuItem">鐗堟湰鍘嗗彶</a> </li>
</ul>
</li>
@@ -252,9 +256,6 @@
<ul class="dropdown-menu dropdown-messages">
- <div>
- </div>
-
<li>
<div class="text-center link-block">
<a class="J_menuItem" href="alarmlog.aspx">
diff --git a/web/web/VersionHistory.aspx b/web/web/VersionHistory.aspx
index 8a004c9..07a0067 100644
--- a/web/web/VersionHistory.aspx
+++ b/web/web/VersionHistory.aspx
@@ -1,9 +1,47 @@
-锘�<%@ Page Language="C#" MasterPageFile="~/Main.master" AutoEventWireup="true" CodeFile="VersionHistory.aspx.cs" Inherits="VersionHistory"%>
+锘�<%@ Page Language="C#" MasterPageFile="~/Main.master" AutoEventWireup="true" CodeFile="VersionHistory.aspx.cs" Inherits="VersionHistory" %>
-<asp:Content ID="Content1" ContentPlaceHolderID="title" Runat="Server">
+<asp:Content ID="Content1" ContentPlaceHolderID="title" runat="Server">
</asp:Content>
-<asp:Content ID="Content2" ContentPlaceHolderID="head" Runat="Server">
+<asp:Content ID="Content2" ContentPlaceHolderID="head" runat="Server">
</asp:Content>
-<asp:Content ID="Content3" ContentPlaceHolderID="content" Runat="Server">
+<asp:Content ID="Content3" ContentPlaceHolderID="content" runat="Server">
+
+ <fieldset class="layui-elem-field layui-field-title" style="margin-top: 30px;">
+ <legend>鐗堟湰鏇存柊鏃ュ織</legend>
+ </fieldset>
+ <ul class="layui-timeline">
+ <li class="layui-timeline-item">
+ <i class="layui-icon layui-timeline-axis">顦�</i>
+ <div class="layui-timeline-content layui-text">
+ <h3 class="layui-timeline-title">2022骞�11鏈�23鏃� V3.1.1</h3>
+ <p>
+ 鏂板寰呭鏍稿唴瀹瑰彲淇敼
+ <br />
+ 浼樺寲澶氶」...
+ </p>
+ </div>
+ </li>
+ <li class="layui-timeline-item">
+ <i class="layui-icon layui-timeline-axis">顦�</i>
+ <div class="layui-timeline-content layui-text">
+ <h3 class="layui-timeline-title">2022骞�11鏈�21鏃� V3.1.0</h3>
+ <p>涓婄嚎鏂扮増鏈�</p>
+ <ul>
+ <li>璐︽埛璐﹀彿鍒嗙绠＄悊</li>
+ <li>鏂板浜у搧鍔熻兘</li>
+ <li>鏂板璁㈠崟绠＄悊鐩稿叧鍔熻兘</li>
+ <li>鏂板瑙掕壊銆佹潈闄愭帶鍒剁瓑</li>
+ </ul>
+ </div>
+ </li>
+
+ <li class="layui-timeline-item">
+ <i class="layui-icon layui-timeline-axis">顦�</i>
+ <div class="layui-timeline-content layui-text">
+ <div class="layui-timeline-title">杩囧幓</div>
+ </div>
+ </li>
+ </ul>
+
</asp:Content>
diff --git a/web/web/gwspupdate.aspx b/web/web/gwspupdate.aspx
index 720ab9c..3d20b83 100644
--- a/web/web/gwspupdate.aspx
+++ b/web/web/gwspupdate.aspx
@@ -539,7 +539,7 @@
<thead>
<tr>
<th colspan="4">
- <%=ActionTitle%> 缂栬緫璐︽埛
+ <%=ActionTitle%> 缂栬緫璐﹀彿
</th>
</tr>
</thead>
@@ -803,7 +803,7 @@
</td>
<th>
- 鏄惁鑷姩杩旇繕:
+ <span style="color:red">鏄惁鑷姩杩旇繕澶辫触鐨勬潯鏁�:</span>
</th>
<td>
<select name="IsAutoReturn" id="IsAutoReturn">
@@ -815,6 +815,13 @@
<span class="highlight">*</span>
</td>
</tr>
+ <%--<tr>
+ <th>鎵ｈ垂鏂瑰紡锛�</th>
+ <td>
+ <input type="radio" class="icheck-me" name="DeductionMode" value="1" <%=(GwSp.DeductionMode==1 ? "checked":"")%>/><label>鎻愪氦閲�</label>
+ <input type="radio" class="icheck-me" name="DeductionMode" value="2" <%=(GwSp.DeductionMode==2 ? "checked":"")%> /><label>鎴愬姛閲�</label>
+ </td>
+ </tr>--%>
<tr>
<th>
@@ -1140,11 +1147,7 @@
<input type="radio" class="icheck-me" name="IsDispalyPrice" value="0" <%=(GwSp.IsDispalyPrice==0 ? "checked":"")%> /><label>鍚�</label>
<input type="radio" class="icheck-me" name="IsDispalyPrice" value="1" <%=(GwSp.IsDispalyPrice==1 ? "checked":"")%> /><label>鏄�</label>
</td>
- <%--<th>鎵ｈ垂鏂瑰紡锛�</th>
- <td>
- <input type="radio" class="icheck-me" name="DeductionMode" value="1" <%=(GwSp.DeductionMode==1 ? "checked":"")%>/><label>鎻愪氦閲�</label>
- <input type="radio" class="icheck-me" name="DeductionMode" value="2" <%=(GwSp.DeductionMode==2 ? "checked":"")%> /><label>鎴愬姛閲�</label>
- </td>--%>
+
</tr>
<%--<tr>
<th>鍙戦�佹槸鍚﹀鏍革細</th>
--
Gitblit v1.9.1