diff --git a/Mtxfw.Utility/Common.cs b/Mtxfw.Utility/Common.cs index 2539f31..86b5eee 100644 --- a/Mtxfw.Utility/Common.cs +++ b/Mtxfw.Utility/Common.cs @@ -3309,6 +3309,12 @@ namespace Mtxfw.Utility DataRow dr; DirectoryInfo SourceDir = new DirectoryInfo(ObjDirPath); + //判断是否存在文件夹，不存在则创建 + if (!Directory.Exists(ObjDirPath)) + { + Directory.CreateDirectory(ObjDirPath); + } + foreach (FileSystemInfo FSI in SourceDir.GetFileSystemInfos()) { diff --git a/Mtxfw.VipSite/Admin_Member_Currencytocash.aspx b/Mtxfw.VipSite/Admin_Member_Currencytocash.aspx index ad6dbfa..6d09dc1 100644 --- a/Mtxfw.VipSite/Admin_Member_Currencytocash.aspx +++ b/Mtxfw.VipSite/Admin_Member_Currencytocash.aspx @@ -92,7 +92,7 @@ td .ximage img{vertical-align:middle; width:4em;height:6em;border:1px solid #dfd 所有类型 佣金 - KSD + <%-- KSD--%> 提款信息一览表 diff --git a/Mtxfw.VipSite/Admin_Member_List0.aspx.cs b/Mtxfw.VipSite/Admin_Member_List0.aspx.cs index 62364b1..67b2c6d 100644 --- a/Mtxfw.VipSite/Admin_Member_List0.aspx.cs +++ b/Mtxfw.VipSite/Admin_Member_List0.aspx.cs @@ -69,7 +69,7 @@ namespace Mtxfw.VipSite { Mtxfw.Utility.Tools.Message("您没有权限!", "/gl.aspx"); } - if (MemberJS.IndexOf("联盟部管理") == -1) + if (MemberJS.IndexOf("健康译站管理") == -1) { Mtxfw.Utility.Tools.Message("您没有权限!", "/gl.aspx"); } diff --git a/Mtxfw.VipSite/Admin_Member_Products6.aspx.cs b/Mtxfw.VipSite/Admin_Member_Products6.aspx.cs index 817db5e..ca58deb 100644 --- a/Mtxfw.VipSite/Admin_Member_Products6.aspx.cs +++ b/Mtxfw.VipSite/Admin_Member_Products6.aspx.cs @@ -63,7 +63,7 @@ namespace Mtxfw.VipSite { Mtxfw.Utility.Tools.Message("您没有权限!", "/gl.aspx"); } - if (MemberJS.IndexOf("联盟部管理") == -1) + if (MemberJS.IndexOf("健康译站管理") == -1) { Mtxfw.Utility.Tools.Message("您没有权限!", "/gl.aspx"); } diff --git a/Mtxfw.VipSite/Admin_Member_Products_SJ_Orders.aspx.cs b/Mtxfw.VipSite/Admin_Member_Products_SJ_Orders.aspx.cs index a373b80..47611f3 100644 --- a/Mtxfw.VipSite/Admin_Member_Products_SJ_Orders.aspx.cs +++ b/Mtxfw.VipSite/Admin_Member_Products_SJ_Orders.aspx.cs @@ -79,7 +79,7 @@ namespace Mtxfw.VipSite { Mtxfw.Utility.Tools.Message("您没有权限!", "/gl.aspx"); } - if (MemberJS.IndexOf(t == 3 ? "助农专区管理" :(t == 2 ? "联盟部管理" : "门店管理")) == -1) + if (MemberJS.IndexOf(t == 3 ? "助农专区管理" :(t == 2 ? "健康译站管理" : "门店管理")) == -1) { Mtxfw.Utility.Tools.Message("您没有权限!", "/gl.aspx"); } diff --git a/Mtxfw.VipSite/Admin_Member_Products_SJ_Seef.aspx.cs b/Mtxfw.VipSite/Admin_Member_Products_SJ_Seef.aspx.cs index 243f20c..6f219db 100644 --- a/Mtxfw.VipSite/Admin_Member_Products_SJ_Seef.aspx.cs +++ b/Mtxfw.VipSite/Admin_Member_Products_SJ_Seef.aspx.cs @@ -78,7 +78,7 @@ namespace Mtxfw.VipSite { Mtxfw.Utility.Tools.Message("您没有权限!", "/gl.aspx"); } - if (MemberJS.IndexOf(t == 3 ? "助农专区管理" :(t == 2 ? "联盟部管理" : "门店管理")) == -1) + if (MemberJS.IndexOf(t == 3 ? "助农专区管理" :(t == 2 ? "健康译站管理" : "门店管理")) == -1) { Mtxfw.Utility.Tools.Message("您没有权限!", "/gl.aspx"); } diff --git a/Mtxfw.VipSite/Admin_Member_Products_Tree6.aspx.cs b/Mtxfw.VipSite/Admin_Member_Products_Tree6.aspx.cs index 06586d3..b94e4aa 100644 --- a/Mtxfw.VipSite/Admin_Member_Products_Tree6.aspx.cs +++ b/Mtxfw.VipSite/Admin_Member_Products_Tree6.aspx.cs @@ -62,7 +62,7 @@ namespace Mtxfw.VipSite { Mtxfw.Utility.Tools.Message("您没有权限!", "/gl.aspx"); } - if (MemberJS.IndexOf("联盟部管理") == -1) + if (MemberJS.IndexOf("健康译站管理") == -1) { Mtxfw.Utility.Tools.Message("您没有权限!", "/gl.aspx"); } diff --git a/Mtxfw.VipSite/Admin_Member_Products_add.aspx b/Mtxfw.VipSite/Admin_Member_Products_add.aspx index c8765c3..b143de2 100644 --- a/Mtxfw.VipSite/Admin_Member_Products_add.aspx +++ b/Mtxfw.VipSite/Admin_Member_Products_add.aspx @@ -1098,7 +1098,7 @@ 配送方式： - 快递配送： 用户自提： + 快递配送： 门店核销： <%if (utype0 == 1) diff --git a/Mtxfw.VipSite/Admin_Member_Products_add1.aspx b/Mtxfw.VipSite/Admin_Member_Products_add1.aspx index bb1e385..1c3a264 100644 --- a/Mtxfw.VipSite/Admin_Member_Products_add1.aspx +++ b/Mtxfw.VipSite/Admin_Member_Products_add1.aspx @@ -1028,7 +1028,7 @@ 配送方式： - 快递配送： 用户自提： + 快递配送： 门店核销： diff --git a/Mtxfw.VipSite/Admin_Member_business0_list.aspx b/Mtxfw.VipSite/Admin_Member_business0_list.aspx index c38e575..c989ead 100644 --- a/Mtxfw.VipSite/Admin_Member_business0_list.aspx +++ b/Mtxfw.VipSite/Admin_Member_business0_list.aspx @@ -133,7 +133,7 @@
  • 主页
  • 会员中心首页
  • 后台管理
    • -
  • 联盟部管理
    • +
  • 健康译站管理
    • @@ -189,15 +189,15 @@ <%#cuploadimages(Eval("TaxRegistration").ToString()) %> <%#cuploadimages(Eval("Introduction2").ToString()) %> <%#cuploadimages(Eval("Introduction3").ToString()) %> - ">"><%#Convert.ToDouble(Eval("umoney40")).ToString()%><%if (MemberJS.IndexOf("修改冻结货款") != -1) - { %>
    ,'<%#Eval("UserName")%>(<%#Eval("RealName")%>)')" class="abtn" value="修改" /> <%} %> - ">"><%#Convert.ToDouble(Eval("umoney41")).ToString()%><%if (MemberJS.IndexOf("修改解冻货款") != -1) - { %>
    ,'<%#Eval("UserName")%>(<%#Eval("RealName")%>)')" class="abtn" value="修改" /> <%} %> - ">"><%#Convert.ToDouble(Eval("umoney39")).ToString()%><%if (MemberJS.IndexOf("修改货款扣税") != -1) - { %>
    ,'<%#Eval("UserName")%>(<%#Eval("RealName")%>)')" class="abtn" value="修改" /> <%} %> - <%#Eval("ApplyTime") %> - <%#Eval("seef").ToString()=="1"?"已审核":"未审核" %> - ">编辑 + ">"><%#Eval("umoney40") is DBNull ? "0" : Convert.ToDouble(Eval("umoney40")).ToString()%><%if (MemberJS.IndexOf("修改冻结货款") != -1) + { %>
    ,'<%#Eval("UserName")%>(<%#Eval("RealName")%>)')" class="abtn" value="修改" /> <%} %> + ">"><%#Eval("umoney41") is DBNull ? "0" : Convert.ToDouble(Eval("umoney41")).ToString()%><%if (MemberJS.IndexOf("修改解冻货款") != -1) + { %>
    ,'<%#Eval("UserName")%>(<%#Eval("RealName")%>)')" class="abtn" value="修改" /> <%} %> + ">"><%#Eval("umoney39") is DBNull ? "0" : Convert.ToDouble(Eval("umoney39")).ToString()%><%if (MemberJS.IndexOf("修改货款扣税") != -1) + { %>
    ,'<%#Eval("UserName")%>(<%#Eval("RealName")%>)')" class="abtn" value="修改" /> <%} %> + <%#Eval("ApplyTime") %> + <%#Eval("seef").ToString()=="1"?"已审核":"未审核" %> + ">编辑 diff --git a/Mtxfw.VipSite/Admin_Member_business0_list.aspx.cs b/Mtxfw.VipSite/Admin_Member_business0_list.aspx.cs index 9029dd8..24b2ce4 100644 --- a/Mtxfw.VipSite/Admin_Member_business0_list.aspx.cs +++ b/Mtxfw.VipSite/Admin_Member_business0_list.aspx.cs @@ -26,7 +26,7 @@ namespace Mtxfw.WebSite._Admin { Mtxfw.Utility.Tools.Message("您没有权限!", "/gl.aspx"); } - if (MemberJS.IndexOf("联盟部管理") == -1) + if (MemberJS.IndexOf("健康译站管理") == -1) { Mtxfw.Utility.Tools.Message("您没有权限!", "/gl.aspx"); } diff --git a/Mtxfw.VipSite/Admin_Member_business0_list.aspx.designer.cs b/Mtxfw.VipSite/Admin_Member_business0_list.aspx.designer.cs index b2d5c64..2aa1711 100644 --- a/Mtxfw.VipSite/Admin_Member_business0_list.aspx.designer.cs +++ b/Mtxfw.VipSite/Admin_Member_business0_list.aspx.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// -// This code was generated by a tool. +// <自动生成> +// 此代码由工具生成。 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// //------------------------------------------------------------------------------ namespace Mtxfw.WebSite._Admin @@ -15,74 +15,74 @@ namespace Mtxfw.WebSite._Admin { /// - /// Head1 control. + /// Head1 控件。 /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlHead Head1; /// - /// Form1 control. + /// Form1 控件。 /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm Form1; /// - /// Drop_Cls control. + /// Drop_Cls 控件。 /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.DropDownList Drop_Cls; /// - /// Drop_State control. + /// Drop_State 控件。 /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.DropDownList Drop_State; /// - /// Repeater1 control. + /// Repeater1 控件。 /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Repeater Repeater1; /// - /// seclect_Drop control. + /// seclect_Drop 控件。 /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.DropDownList seclect_Drop; /// - /// Btn_Run control. + /// Btn_Run 控件。 /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Button Btn_Run; /// - /// MyPager control. + /// MyPager 控件。 /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::Wuqi.Webdiyer.AspNetPager MyPager; } diff --git a/Mtxfw.VipSite/App_Data/Config.xml b/Mtxfw.VipSite/App_Data/Config.xml index d9fc980..05e8973 100644 --- a/Mtxfw.VipSite/App_Data/Config.xml +++ b/Mtxfw.VipSite/App_Data/Config.xml @@ -229,8 +229,8 @@ - - + + @@ -300,4 +300,4 @@ - + \ No newline at end of file diff --git a/Mtxfw.VipSite/Css/cjadd.css b/Mtxfw.VipSite/Css/cjadd.css index 1556df1..68a5b59 100644 --- a/Mtxfw.VipSite/Css/cjadd.css +++ b/Mtxfw.VipSite/Css/cjadd.css @@ -9,7 +9,7 @@ body {} .bigbox { overflow:hidden; } #left-panel {position: relative;top: 0;left: 0;height:100%;z-index: 1002;width: 220px;float: left;overflow:hidden; overflow-y:auto;} -.left-panel { background-color:#1a73e8;} +.left-panel { background-color:#60d457;} #mainiframe{ width:100%; height:1000px; overflow:visible;} .hidden-menu #left-panel {left: 0;margin-left: -210px;} @@ -31,7 +31,7 @@ i.fa { background-image:url(../images/iconpng.png); width:30px;height:20px;backg ul.expmenu {margin:0;font-family: "Microsoft Yahei";width: 220px;} ul.expmenu li { line-height:26px;min-height:26px;margin:16px 0; list-style:none;} ul.expmenu li.liicon {background-image:url(../images/iconpng.png); background-repeat:no-repeat; display:block;} -ul.expmenu li a {color: #fff;font-size:14px;} +ul.expmenu li a {color: #074003;font-size:14px;} ul.expmenu li a:hover {color:#FFF; text-decoration:none;} ul.expmenu li b { float:left;} ul.expmenu li span.tt {width:100%; text-indent:35px; display:block;} @@ -40,11 +40,11 @@ ul.expmenu li span.tt {width:100%; text-indent:35px; display:block;} ul.expmenu li div.header {padding:0;border-bottom:0;height:32px;color:#a8a8a8;} ul.expmenu li div.header,ul.expmenu li div.header:hover {text-shadow:none; background:none;cursor:pointer;} ul.expmenu li div.header:hover .label {color:#FFF; } -ul.expmenu li ul { padding:6px 0; margin:0;background:#4285f4 url(../images/secondli.gif) repeat-y 5px top;} +ul.expmenu li ul { padding:6px 0; margin:0;background:#2baa09 url(../images/secondli.gif) repeat-y 5px top;} ul.expmenu li ul li {height:30px;line-height:30px;margin:0;padding-left:40px; color:#ccc;list-style:none;} ul.expmenu li ul li a { display:inline;width:auto;color:#ddd;font-size:13px;} .label {color:#FFF; } -ul.expmenu li .label{line-height:28px; background:none;color:#fff; font-weight:normal;font-size:14px;padding:0;padding-left:35px; float:left;} +ul.expmenu li .label{line-height:28px; background:none;color:#074003; font-weight:normal;font-size:14px;padding:0;padding-left:35px; float:left;} ul.expmenu li .label:hover {color:#FFF; } ul.expmenu li div.header .arrow{margin-right:25px;margin-top:6px;display:block;width:16px;height:16px;background:no-repeat center;float:right;} ul.expmenu li div.header .arrow.up{background-image:url(../images/arrow_u.png);} @@ -115,10 +115,10 @@ background-repeat:no-repeat;margin:0;} /*�Ҳ�ȫ���˳���*/ #header .righticon {width:200px;margin-top:15px;} -#header .righticon div { width:30px;height:30px; background-color:#1a73e8; border:1px solid #dfdfdf;border-radius:50%;margin-right:5px; overflow:hidden;} +#header .righticon div { width:30px;height:30px; background-color:#2baa09; border:1px solid #dfdfdf;border-radius:50%;margin-right:5px; overflow:hidden;} #header .righticon div span,#header .righticon a { display:block;width:100%;height:100%; color:#0d375d;} #header .zh_change {width:90px; } -#header .righticon a:hover { background-color:#4285f4; display:block;width:100%;height:100%; color:#0d375d;} +#header .righticon a:hover { background-color:#35d50a; display:block;width:100%;height:100%; color:#0d375d;} #header .righticon li a:hover { background:none;} i.fa-sign-out { background-position:-1px -369px;display:block;margin:0;} i.fa-reorder { background-position:-1px -419px;display:block;margin:0;} @@ -181,9 +181,9 @@ i.fa-add {background-position: -2px -280px;float: left;width:40px;height:25px;} .frontFocus .nextimg {background:url(../images/nextimg.png) no-repeat 0 center;width:24px;height:100%; cursor:pointer;position:absolute;right:20px;z-index:99;} .frontFocus li img {width:100%;height:300px;} .frontFocus #controls {position: absolute;bottom:6px;height:24px;width:200px; left:6px;} -.frontFocus #controls li { cursor:pointer; float:left;width:24px;height:24px;line-height:22px; margin-right:5px;background-color:#1a73e8;filter:alpha(opacity=80); -moz-opacity:0.8; -khtml-opacity: 0.8; opacity: 0.8; text-align:center; border-radius:4px;} +.frontFocus #controls li { cursor:pointer; float:left;width:24px;height:24px;line-height:22px; margin-right:5px;background-color:#2baa09;filter:alpha(opacity=80); -moz-opacity:0.8; -khtml-opacity: 0.8; opacity: 0.8; text-align:center; border-radius:4px;} .frontFocus #controls li a { color:#FFF; line-height:24px;} -.frontFocus #controls li.current {background:#4285f4;} +.frontFocus #controls li.current {background:#35d50a;} .bg-color-pinkDark {background-color: #278DB4!important;} @@ -367,19 +367,19 @@ em.invalid {color:#CC0000; display:block; font-family: Arial;} .transction-form .bonus-search {background: none;border: 0;box-shadow: none;-webkit-box-shadow: 0;padding-top:10px;} .transction-form .tree-search form {height:70px;} .table-list {margin-top:20px;border-radius:0px;} -.table-list .table {border-radius:0px;border:0;border-bottom:2px solid #1a73e8;border-left:1px solid #D7D7D7;border-right:1px solid #D7D7D7; } +.table-list .table {border-radius:0px;border:0;border-bottom:2px solid #29A4CA;border-left:1px solid #D7D7D7;border-right:1px solid #D7D7D7; } .table-list .table th {border:0;} .table-bordered thead:first-child tr:first-child>th:first-child, .table-bordered tbody:first-child tr:first-child>td:first-child, .table-bordered tbody:first-child tr:first-child>th:first-child , .table-bordered thead:first-child tr:first-child>th:last-child, .table-bordered tbody:first-child tr:first-child>td:last-child, .table-bordered tbody:first-child tr:first-child>th:last-child {border-radius:0px;} .table-bordered tr:last-child>td {border-bottom:0;border-radius:3px;} -.table-list .table th { background:#1a73e8;border:0; text-align:center;color:#FFF; height:32px;line-height:32px;padding:3px 0px; font-size:14px; +.table-list .table th { background:#29A4CA;border:0; text-align:center;color:#FFF; height:32px;line-height:32px;padding:3px 0px; font-size:14px; box-shadow: inset 0 -2px 0 rgba(0,0,0,.05); -moz-box-shadow: inset 0 -2px 0 rgba(0,0,0,.05); -webkit-box-shadow: inset 0 -2px 0 rgba(0,0,0,.05);} .table-list .table td {min-height:32px;line-height:32px;text-align:center;border:0;padding:3px 0px; border-bottom:1px solid #D7D7D7;} .table-list .table tbody tr {border:0;border-bottom:1px solid #D7D7D7; } -.table-list tr:hover td {color:#1a73e8 !important;} -.table-list .table td a {color:#1a73e8 ; font-weight:bold;} -.table-list .table td a:hover { color:#1a73e8; font-weight:bold;} +.table-list tr:hover td {color:#29A4CA !important;} +.table-list .table td a {color:#29A4CA ; font-weight:bold;} +.table-list .table td a:hover { color:#29A4CA; font-weight:bold;} .jjcx tr:hover td {color:#333 !important;} .transction-form .cdy{width: 840px;margin: 0 auto;height: 70px;} @@ -488,10 +488,10 @@ background: url(../images/fa.png) no-repeat 8px 3px !important; .smart-form .footer {display: block;padding: 3px 14px 15px;border-top: 1px solid #ddd;background: rgba(248,248,248,.9);height: 55px;} */ /*��ɫ��д*/ -.btn-primary { background-color: #1a73e8; } -.btn-primary:hover {background-color: #4285f4;} -#login .login-app-icons .btn-danger {color:#1a73e8;} -a {color:#1a73e8;} +.btn-primary { background-color: #278DB4; } +.btn-primary:hover {background-color: #3BAFBE;} +#login .login-app-icons .btn-danger {color:#278DB4;} +a {color:#278DB4;} @@ -663,10 +663,10 @@ input[type='text'],input[type='password'] .red,.font1 span{ color:Red;} #content select{ width:auto;} -.abtn{ padding:3px 8px; background-color:#1a73e8;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;border:1px solid #dfdfdf; color:#fff;} -.abtn:hover{ background-color:#4285f4; text-decoration:none;color:#fff;} -a.selectpica{ padding:5px 8px; background-color:#1a73e8;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;border:1px solid #dfdfdf; color:#fff;} -a.selectpica:hover{ background-color:#4285f4; text-decoration:none;color:#fff;} +.abtn{ padding:3px 8px; background-color:#2baa09;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;border:1px solid #dfdfdf; color:#fff;} +.abtn:hover{ background-color:#35d50a; text-decoration:none;color:#fff;} +a.selectpica{ padding:5px 8px; background-color:#2baa09;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;border:1px solid #dfdfdf; color:#fff;} +a.selectpica:hover{ background-color:#35d50a; text-decoration:none;color:#fff;} dl.goodsbox{ float:left; margin:20px 14px; padding:0; width:168px; height:280px; line-height:25px;} dl.goodsbox dt{ margin:0; padding:0;} dl.goodsbox dt img{padding:1px;border:1px solid #dfdfdf;width:168px;height:168px;} @@ -1262,7 +1262,7 @@ dl.goodsbox dd{ margin:0; padding:0;line-height:25px;} width: 100%; text-indent:10px; padding:6px 10px; - background-color:#1a73e8; + background-color:#2baa09; text-align:left; color:#fff; } diff --git a/Mtxfw.VipSite/Css/gl.css b/Mtxfw.VipSite/Css/gl.css index aac853b..24aa628 100644 --- a/Mtxfw.VipSite/Css/gl.css +++ b/Mtxfw.VipSite/Css/gl.css @@ -10,7 +10,7 @@ body height: 100%; border: 0; text-align:center; - background-color: #99b9e7 /*���屳��ɫ*/ + background-color: #b6efb2 /*���屳��ɫ*/ } * { margin:0; padding:0; box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;} *:focus {outline: none;} @@ -54,7 +54,7 @@ form text-align:center; line-height:60px; height:60px; - background-color:#1a73e8; + background-color:#176003; color:#fff; } #userlogin li label @@ -87,7 +87,7 @@ form { width:294px; height:40px; - background-color:#1a73e8; + background-color:#2baa09; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; @@ -97,7 +97,7 @@ form } #userlogin li input.btn:hover { - background-color:#4285f4; + background-color:#35d50a; } #userlogin li #loginold:link,#userlogin li #loginold:visited { diff --git a/Mtxfw.VipSite/Css/smartadmin-production.css b/Mtxfw.VipSite/Css/smartadmin-production.css index e39f51a..f85adec 100644 --- a/Mtxfw.VipSite/Css/smartadmin-production.css +++ b/Mtxfw.VipSite/Css/smartadmin-production.css @@ -3,24 +3,24 @@ padding: 0; height: 100%; overflow-y: auto; - background:#F2F2F2; + background:#F2F2F2 url(leftnavbg.jpg) no-repeat left top; } *html { height: 100%; - background:#F2F2F2; + background:#F2F2F2 url(leftnavbg.jpg) no-repeat left top; } body { margin: 0; padding: 0; height: 100%; /*overflow: hidden;*/ - background:#F2F2F2; + background:#F2F2F2 url(leftnavbg.jpg) no-repeat left top; direction: ltr } #ribbon { min-height: 40px; - background: #1a73e8; + background: #4ce440; padding: 0 13px; width:100%; @@ -60,7 +60,7 @@ text-shadow:none!important;padding-right:10px; left: 1px } .btn.btn-ribbon { - background-color: #1a73e8; + background-color: #207f06; color: #fff; padding: 0 5px; @@ -75,7 +75,7 @@ text-shadow:none!important;padding-right:10px; } .btn.btn-ribbon:hover { - background-color:#4285f4; + background-color:#2baa09; } .btn.btn-ribbon>i { font-size: 111% @@ -222,7 +222,7 @@ text-shadow:none!important;padding-right:10px; box-shadow: inset 1px 1px 0 rgba(0,0,0,.1),inset 0 -1px 0 rgba(0,0,0,.07); width: 100%; margin: 0!important; - border-bottom: 1px solid #1a73e8; + border-bottom: 1px solid #4ce440; } .login-info a { text-decoration: none!important; diff --git a/Mtxfw.VipSite/Mtxfw.VipSite.csproj b/Mtxfw.VipSite/Mtxfw.VipSite.csproj index f93e869..9e741d5 100644 --- a/Mtxfw.VipSite/Mtxfw.VipSite.csproj +++ b/Mtxfw.VipSite/Mtxfw.VipSite.csproj @@ -3994,6 +3994,10 @@ 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + diff --git a/Mtxfw.VipSite/favicon.ico b/Mtxfw.VipSite/favicon.ico index d1d08a4..5e8076a 100644 Binary files a/Mtxfw.VipSite/favicon.ico and b/Mtxfw.VipSite/favicon.ico differ diff --git a/Mtxfw.VipSite/gl.aspx b/Mtxfw.VipSite/gl.aspx index b65c343..7ea30a5 100644 --- a/Mtxfw.VipSite/gl.aspx +++ b/Mtxfw.VipSite/gl.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Description="" Language="C#" AutoEventWireup="true" CodeBehind="gl.aspx.cs" Inherits="Mtxfw.VipSite.Defaultgl" %> +<%@ Page Title="" Description="" Language="C#" AutoEventWireup="true" CodeBehind="gl.aspx.cs" Inherits="Mtxfw.VipSite.Defaultgl" %> diff --git a/Mtxfw.VipSite/left.aspx b/Mtxfw.VipSite/left.aspx index 5ab9686..43445a4 100644 --- a/Mtxfw.VipSite/left.aspx +++ b/Mtxfw.VipSite/left.aspx @@ -227,10 +227,10 @@ { %>
  • 代理列表
    • <%} %> - <%if (MemberJS.IndexOf("提货点列表") != -1) - { %> + <%if (MemberJS.IndexOf("考核级别列表") != -1) { %>
  • 考核级别列表
    • @@ -319,17 +319,17 @@ <%} %> - <%if (MemberJS.IndexOf("联盟部管理") != -1) + <%if (MemberJS.IndexOf("健康译站管理") != -1) { %>
  • - 联盟部管理 + 健康译站管理