Merge branch 'release' of http://192.168.3.17/gitlab/zhanghongbo/qfw into release

core/src/qfw/mobile/wxmenu.go

@@ -265,7 +265,7 @@ func getSignature(action string) []string {
 	}
 	if len(signature) == 0 {
 		signature = coreutil.GetJSInterfaceParam(url)
-		redis.Put("other", "wxshare-"+url, signature, 60*1000)
+		redis.Put("other", "wxshare-"+url, signature, 90*60) //一个半小时
 	}
 	log.Println(url, "------", signature)
 	return signature

core/src/timetask.json

@@ -1 +1 @@
-{"comment":{"c_rate":10,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-11 14:45:22"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-11 14:45:22"}},"marketisstart":true,"marketrate":300}
+{"comment":{"c_rate":10,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-13 08:57:59"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-13 08:57:59"}},"marketisstart":true,"marketrate":300}

core/src/web/staticres/css/dev-qfw.css

@@ -49,7 +49,7 @@ a{
 	margin-right: 20px;
 }
 .text-primary {
-	color: #dd4814 !important;
+	 color:#FF5A5F !important;
 }
 .text-bold{
 	font-weight:700;
@@ -388,7 +388,7 @@ a{
 
 .a-header .a-h-search form{
 	height: 40px;
-  	margin-top: 15px;
+  	margin-top: 17px;
 }
 
 .a-header .a-h-search.a-com-focus{
@@ -420,7 +420,7 @@ a{
 	border: 2px #dd4814 solid;
 	box-shadow: none;
 	padding-right: 25px;
-	height: 40px;
+	height: 36px;
 	border-left-width: 0px;
 }
 
@@ -2216,7 +2216,6 @@ style="color:#D03102;margin-right:5px;"
 }
 .b-head .head-hideMenu i.ren1,.b-head .head-hideMenu i.tuichu{
 	font-size: 16px;
-	margin-right: 15px !important;
 }
 .b-head .head-hideMenu li:hover{
 	color: #fff;

core/src/web/staticres/css/index-new.css

@@ -60,10 +60,6 @@ a:focus, a:hover{
 .index-new-head .head-hideMenu i {
     color: #FF5A5F;
 }
-.index-new-head .head-hideMenu i.ren1, .index-new-head .head-hideMenu i.tuichu {
-    font-size: 16px;
-    margin-right: 15px !important;
-}
 .index-new-head .head-hideMenu i.ren1 {
     margin-left: 2px;
 }
@@ -536,4 +532,67 @@ a:focus, a:hover{
 .a-index-head .a-i-h-middle > ul > li {
 	background-color:#fff;
 	margin-bottom:0px;
-}
+}
+/*******找回密码********/
+.fw-new-content{
+	background-image:url('/images/u0111.png');
+	background-repeat: no-repeat;
+    background-position: 0px 5px;
+	
+}
+.fw-new-content .fw-new-title{
+	font-size: 24px;
+	color: #4E5051; 
+	padding-top:37px;
+}
+.fw-new-content .ufwimg{
+	width:437px;
+}
+.fw-new-content #step{
+	padding-top:10px;
+	margin-bottom:50px;
+}
+.fw-new-content .row .qrzh span{
+    font-weight: 700;
+    font-size: 14px;
+    color: #FF5A5F;
+	padding-left:50px;
+}
+.fw-new-content .row .aqyz span{
+    font-size: 14px;
+    color: #A0A0A0;
+	padding-left:10px;
+}
+.fw-new-content .row .czmm span{
+    font-size: 14px;
+    color: #A0A0A0;
+	padding-right:15px;
+}
+.fw-new-content .fwtb1{
+	margin-bottom:20px;
+}
+.fw-new-content .qfw-btn {
+    width: 238px;
+	height:34px;
+}
+.fw-new-content .subbtn{
+	margin-top:60px;
+}
+.fwbody{
+	background-color:#F0F0F0;
+}
+.fw-new-content .member-panel{
+	background-color:#fff;
+	display:inline-block;
+	margin-top: 37px; 
+	border:1px solid #ccc;
+	width:740px;
+	height:500px;
+	box-shadow: #aaa 0px 0px 5px;
+}
+.fw-new-content .fw-new-zh span,.fw-new-content .fw-new-yzm span{
+	float:right;margin:10px -5px 0px 0px;
+}
+.fw-new-content .afterSendIdentCode{
+	
+}

core/src/web/staticres/css/qfw.css

@@ -462,11 +462,55 @@ a.new_red:hover, a.new_red:active {
 	display: table-cell;
 }
 
-/*==========覆盖bootstrap样式===========*/
+/*==========覆盖bootstrap样式 start===========*/
 [class*="col-"] {
 	padding-left: 0px !important;
 }
-
+.btn{
+	padding-top: 6px;
+	padding-bottom: 6px;
+}
+.btn-primary,.btn-primary:hover,.btn-primary:focus,.btn-primary:active{
+	background-color: #FF5A5F;
+	border-color: #FF5A5F;
+}
+.btn-sm,.btn-group-sm>.btn{
+	padding-top: 3px;
+	padding-bottom: 3px;
+}
+.btn-xs,.btn-group-xs>.btn{
+	padding-top: 0px;
+	padding-bottom: 0px;
+}
+.text-primary {
+	color: #FF5A5F !important;
+}
+.b-modal .modal-content{
+	border-radius: 4px;
+	border-top-left-radius: 5px;
+	border-top-right-radius: 5px;
+}
+.b-modal .modal-header{
+	background-color: #FF5A5F;
+	color: #FFFFFF;
+	border-top-left-radius: 4px;
+	border-top-right-radius: 4px;
+	padding: 10px 10px 10px 20px;
+	font-size: 16px;
+}
+.b-modal .modal-header .close{
+	opacity: 1;
+	text-shadow: none;
+	font-weight: normal;
+	color: #FFFFFF;
+}
+.b-modal .modal-header .close:focus, .b-modal .modal-header .close:hover{
+	opacity: 1;
+}
+.form-control{
+	border-radius: 0px;
+}
+/*==========覆盖bootstrap样式 end===========*/
 .lineb {
 	display: inline-block;
 }
@@ -504,7 +548,6 @@ span.highlight {
 	color: #dd4814;
 	font-weight: bold;
 }
-
 /*字体图标*/
 @font-face {
 	font-family: 'qimingxing';
@@ -879,6 +922,10 @@ span.highlight {
 	content: "\2B";
 }
 
+.guanbi1:before{
+	content: "\6C";
+}
+
 .icon-small {
 	font-size: 12px;
 }

core/src/web/staticres/fonts/qimingxing.svg

@@ -16,9 +16,9 @@
 <glyph unicode="'" horiz-adv-x="2049" d="M0 157v1655q0 65 48 111q46 46 112 46h321q0 32 24 57q24 24 58 24h683q32 0 56 -24t24 -57h282q67 0 112 -46q48 -46 48 -111v-723l-160 -164v809q0 32 -24 55q-24 24 -57 23h-201v-78q0 -32 -24 -56q-24 -22 -56 -23h-683q-34 0 -58 23q-24 24 -24 56v78h-240 q-32 0 -57 -23q-24 -22 -24 -55v-1497q0 -34 24 -56q24 -24 57 -24h643l160 -157h-884q-67 0 -112 46q-48 46 -48 111zM481 788v40q0 39 41 39h724q39 0 39 -39v-40q0 -39 -39 -39h-724q-41 0 -41 39zM481 1222v39q0 39 41 39h724q39 0 39 -39v-39q0 -39 -39 -39h-724 q-41 0 -41 39zM829 439l106 104l297 -255l818 815l-806 -1103z" />
 <glyph unicode="(" horiz-adv-x="2027" d="M0 983q0 341 224 623q119 131 180 169q263 188 579 188q341 0 623 -224q131 -119 169 -181q188 -263 188 -578q0 -341 -224 -623q-119 -131 -181 -169q-263 -188 -578 -188q-341 0 -623 224q-131 119 -169 180q-188 263 -188 579zM22 978q0 -384 289 -683 q292 -273 674 -273q384 0 682 289q273 292 273 674q0 384 -288 682q-292 273 -674 273q-384 0 -683 -288q-273 -292 -273 -674zM360 1130v15q0 171 171 290q122 74 259 74q230 0 382 -178q49 -84 57 -126q-15 0 -46 3q-172 0 -292 -138q-72 -94 -72 -196v-21q0 -27 12 -78 h-3q-12 -2 -19 -2h-19q-56 0 -150 22l-150 -76v3q41 123 41 128h-2q-169 125 -169 280zM585 1273q9 -56 65 -56h7q43 0 48 56q-9 51 -48 51h-7q-49 0 -63 -44q0 -4 -2 -7zM847 862v15q0 152 165 258q97 48 191 48h22q131 0 251 -96q104 -97 104 -211v-7q0 -131 -152 -248 l35 -107h-2q-48 27 -120 65q-79 -22 -129 -23q-205 0 -326 168q-39 73 -39 138zM889 1266q0 -34 55 -49h10q43 0 53 43v17q-9 48 -46 47h-14q-58 -10 -58 -58zM1051 966q9 -41 43 -41q53 7 53 38v6q0 36 -53 43q-43 -12 -43 -41v-5zM1289 969q10 -44 44 -44h2q51 5 51 46 q0 31 -55 41q-28 0 -42 -43z" />
 <glyph unicode=")" horiz-adv-x="2041" d="M0 256v1534q0 106 75 181t179 75h1531q106 0 181 -75t75 -181v-1534q0 -106 -75 -181t-181 -75h-1531q-104 0 -179 75t-75 181zM254 384q0 -53 38 -90q38 -38 90 -38h1277q53 0 89 38q38 38 37 90v1278q0 53 -37 91q-38 38 -89 37h-1277q-53 0 -90 -37q-38 -38 -38 -91 v-1278zM510 575v128q0 65 63 65h893q65 0 65 -65v-128q0 -63 -65 -63h-893q-63 0 -63 63zM510 1343v128q0 63 63 63h128q63 0 64 -63v-128q0 -63 -64 -63h-128q-63 0 -63 63zM893 959v128q0 65 63 65h510q65 0 65 -65v-128q0 -63 -65 -63h-510q-63 0 -63 63zM893 1343v128 q0 63 63 63h128q65 0 65 -63v-128q0 -63 -65 -63h-128q-63 0 -63 63zM1275 1343v128q0 63 65 63h126q65 0 65 -63v-128q0 -63 -65 -63h-126q-65 0 -65 63z" />
-<glyph unicode="*" horiz-adv-x="0" d="M0 910v75q53 585 608 833q53 -113 70 -161q-253 -102 -383 -312q-164 -271 -94 -570q63 -258 275 -425q225 -176 522 -176q292 0 521 179q213 172 271 427q68 305 -95 567q-121 193 -383 317q12 24 36 77q22 55 38 77q544 -246 604 -820v-104q-34 -379 -295 -621 q-268 -247 -640 -273h-116q-398 32 -647 278q-273 275 -292 632zM903 1732v342q0 9 3 8h181v-686h-181q-3 126 -3 336z" />
-<glyph unicode="+" horiz-adv-x="0" d="M0 84v99q24 544 300 797q-140 102 -189 310q-51 218 34 408q157 357 592 401h91q288 -27 466 -211q200 -207 179 -494q-15 -232 -210 -414q271 -237 297 -794q5 -90 -7 -125q-17 -48 -77 -61h-1389q-70 20 -87 84zM217 201h1130q-24 486 -267 656q-118 -60 -297 -60 q-183 -2 -295 60q-246 -162 -271 -656zM305 1437q3 -130 65 -225q75 -118 221 -178q159 -65 324 -20q147 39 242 148q106 121 106 284q0 183 -133 314q-157 155 -396 134q-130 -12 -225 -75q-89 -58 -145 -150q-61 -101 -59 -232z" />
-<glyph unicode="," horiz-adv-x="0" d="M0 164v1331q27 135 167 162h1767q147 -31 169 -170v-1315q-9 -58 -48 -104q-43 -48 -101 -59q-14 -3 -225 -4h-1362q-208 0 -224 4q-118 24 -143 155zM191 328q263 244 603 580q-90 67 -301 225q-193 145 -302 224v-1029zM326 188h1447q-31 29 -623 602q-75 -60 -124 -51 q-17 5 -41 24q-27 22 -38 27q-53 -51 -297 -283q-186 -176 -295 -285q-31 -31 -29 -34zM350 1471q94 -68 350 -261q220 -166 353 -261q58 44 350 261q213 160 346 265h-701q-432 2 -698 -4zM1302 901q94 -87 287 -273q191 -184 287 -273q32 -31 35 -29q-2 97 0 517 q0 317 -3 514q-48 -36 -304 -227q-184 -138 -302 -229z" />
+<glyph unicode="*" horiz-adv-x="1989" d="M0 910v75q53 585 608 833q53 -113 70 -161q-253 -102 -383 -312q-164 -271 -94 -570q63 -258 275 -425q225 -176 522 -176q292 0 521 179q213 172 271 427q68 305 -95 567q-121 193 -383 317q12 24 36 77q22 55 38 77q544 -246 604 -820v-104q-34 -379 -295 -621 q-268 -247 -640 -273h-116q-398 32 -647 278q-273 275 -292 632zM903 1732v342q0 9 3 8h181v-686h-181q-3 126 -3 336z" />
+<glyph unicode="+" horiz-adv-x="1565" d="M0 84v99q24 544 300 797q-140 102 -189 310q-51 218 34 408q157 357 592 401h91q288 -27 466 -211q200 -207 179 -494q-15 -232 -210 -414q271 -237 297 -794q5 -90 -7 -125q-17 -48 -77 -61h-1389q-70 20 -87 84zM217 201h1130q-24 486 -267 656q-118 -60 -297 -60 q-183 -2 -295 60q-246 -162 -271 -656zM305 1437q3 -130 65 -225q75 -118 221 -178q159 -65 324 -20q147 39 242 148q106 121 106 284q0 183 -133 314q-157 155 -396 134q-130 -12 -225 -75q-89 -58 -145 -150q-61 -101 -59 -232z" />
+<glyph unicode="," horiz-adv-x="2102" d="M0 164v1331q27 135 167 162h1767q147 -31 169 -170v-1315q-9 -58 -48 -104q-43 -48 -101 -59q-14 -3 -225 -4h-1362q-208 0 -224 4q-118 24 -143 155zM191 328q263 244 603 580q-90 67 -301 225q-193 145 -302 224v-1029zM326 188h1447q-31 29 -623 602q-75 -60 -124 -51 q-17 5 -41 24q-27 22 -38 27q-53 -51 -297 -283q-186 -176 -295 -285q-31 -31 -29 -34zM350 1471q94 -68 350 -261q220 -166 353 -261q58 44 350 261q213 160 346 265h-701q-432 2 -698 -4zM1302 901q94 -87 287 -273q191 -184 287 -273q32 -31 35 -29q-2 97 0 517 q0 317 -3 514q-48 -36 -304 -227q-184 -138 -302 -229z" />
 <glyph unicode="0" horiz-adv-x="2544" d="M0 0h2545v2050h-2545v-2050zM212 212v1624h2119v-1624h-2119zM445 437h1308v135q0 79 -164 152q-341 150 -369 155q53 56 113 210q15 43 15 157q0 150 -1 159q-49 174 -250 174q-198 0 -247 -174q-2 -10 -2 -159q0 -114 16 -157q61 -155 112 -210q-27 -5 -367 -157 q-162 -72 -164 -150v-135zM1534 940h442v106h-442v-106zM1534 1186h313v104h-313v-104zM1534 1434h529v105h-529v-105z" />
 <glyph unicode="2" horiz-adv-x="2239" d="M0 1024q0 72 27 133t74 109q48 46 109 74q61 27 135 27q80 0 153 -38l326 306q-9 29 -8 70q0 72 27 133q27 63 75 108q46 46 108 73q63 27 135 27t133 -27q63 -27 109 -73q44 -44 72 -108q27 -61 27 -133t-27 -135q-27 -61 -72 -107q-46 -48 -109 -75q-61 -27 -133 -28 q-49 0 -96 14q-44 14 -80 37l-313 -290q14 -49 14 -97q0 -61 -20 -114l320 -270q39 22 82 34q44 12 93 12q72 0 133 -27q63 -27 109 -74q44 -48 72 -109q27 -63 27 -135t-27 -133q-27 -63 -72 -107q-46 -46 -109 -74q-61 -27 -133 -27t-135 27q-61 27 -108 74 q-48 44 -75 107q-27 61 -27 133q0 22 3 41q2 19 5 38l-343 290q-31 -15 -65 -22q-36 -7 -71 -7q-73 0 -135 27q-61 27 -109 74q-46 46 -74 107q-27 61 -27 135z" />
 <glyph unicode="3" horiz-adv-x="1500" d="M0 159v1450q0 31 14 60q12 29 32 53q22 24 50 39q29 15 59 16h116v148q0 49 45 87q44 36 94 36q51 0 93 -36q43 -38 43 -87v-148h408v148q0 49 41 87q43 36 99 36t97 -36q43 -38 43 -87v-148h97q31 0 62 -14q31 -15 54 -38q24 -22 38 -52q15 -29 15 -60v-1439 q0 -31 -15 -60q-14 -31 -38 -56q-24 -26 -54 -41q-31 -17 -62 -17h-1184q-61 0 -104 48t-43 111zM265 478q0 -29 18 -53q20 -24 48 -24h428q29 0 48 24q20 24 21 53q0 29 -21 53q-19 24 -48 24h-428q-27 0 -48 -24q-19 -24 -18 -53zM265 898q0 -31 18 -60q20 -29 48 -29h836 q31 0 52 29q19 29 18 60q0 27 -18 47q-20 19 -52 19h-836q-27 0 -48 -19q-19 -20 -18 -47zM546 1297q0 -29 19 -53q20 -24 48 -24h546q31 0 51 24q19 24 19 53q0 27 -19 51q-20 24 -51 24h-546q-27 0 -48 -24q-19 -24 -19 -51z" />
@@ -66,6 +66,7 @@
 <glyph unicode="i" horiz-adv-x="3193" d="M0 29v1816h280l584 -1212v1212h268v-1816h-289l-575 1184v-1184h-268zM1370 707q1 172 69 334q67 164 189 249q123 85 275 86q236 0 384 -195q150 -195 150 -490q0 -299 -150 -495q-152 -196 -382 -196q-142 0 -270 82q-130 82 -196 239q-68 159 -69 386zM1652 688 q0 -197 72 -301q73 -104 181 -104t179 104q73 104 73 302q0 193 -73 297q-72 104 -179 105q-108 0 -181 -105q-72 -102 -72 -298zM2652 29v348h273v-348h-273z" />
 <glyph unicode="j" horiz-adv-x="2713" d="M75 20q-29 16 -29 42q0 43 75 115q77 41 179 77q-26 60 -25 125q0 119 78 205q79 85 190 85q109 0 187 -85q79 -85 79 -205q0 7 0 -10q31 5 53 6v1496q0 75 48 126q49 51 123 51h1025q73 0 121 -51q46 -51 46 -126v-1579q184 -51 304 -118q116 -77 116 -121 q0 -25 -41 -39q-39 -14 -97 -14q-22 0 -46 2l-2289 1h-15q-51 0 -82 17zM1082 770q0 -34 36 -62q33 -25 70 -25h3h154q38 0 63 25q26 26 26 62v242q0 38 -26 63q-26 26 -63 26h-176q-36 0 -61 -26q-26 -26 -26 -63v-242zM1082 1408q0 -34 36 -61q34 -26 73 -26h154 q38 0 63 26q26 26 26 61v242q0 38 -26 63q-26 26 -63 26h-176q-36 0 -61 -26q-26 -26 -26 -63v-242zM1654 770q0 -34 36 -62q35 -25 72 -25h3h153q36 0 62 25q26 26 25 62v242q0 38 -25 63q-26 26 -62 26h-175q-38 0 -64 -26t-25 -63v-242zM1654 1408q0 -34 36 -61 q36 -26 75 -26h153q36 0 62 26t25 61v242q0 38 -25 63q-26 26 -62 26h-175q-38 0 -64 -26t-25 -63v-242z" />
 <glyph unicode="k" d="M0 1024q0 -425 300 -724q299 -300 724 -300t724 300q300 299 300 724t-300 724q-299 300 -724 300t-724 -300q-300 -299 -300 -724zM560 1644h177l292 -477l287 477h171l-325 -552h268v-140h-266v-201h268v-133h-270v-272h-271v270h-277v135h277v203h-277v137h277z" />
+<glyph unicode="l" horiz-adv-x="2179" d="M0 1026v126q14 210 108 411q79 164 213 297q294 287 705 318h126q427 -36 708 -318q283 -282 319 -708v-126q-36 -425 -319 -709q-282 -282 -708 -317h-126q-425 36 -709 317q-282 282 -317 709zM155 1036q24 -377 301 -635q270 -248 628 -248q29 0 59 2q369 22 630 301 q251 267 251 627q0 28 -2 57q-19 370 -300 633q-264 248 -620 248q-33 0 -66 -2q-382 -24 -633 -297q-250 -270 -250 -627q0 -29 2 -59zM657 756q44 49 328 329q-53 60 -164 169t-164 168q56 53 108 109q259 -258 291 -289q43 -43 40 -42l41 42q44 44 124 123t125 123 q43 43 39 43q3 0 58 -55q53 -53 53 -54q-56 -64 -162 -168q-119 -118 -164 -165q44 -48 164 -166q106 -104 162 -167q-2 -2 -80 -82l-28 -25l-83 80l-208 208q-41 41 -38 41l-43 -41q-44 -46 -124 -123q-82 -80 -125 -125q-41 -41 -39 -40q-2 0 -56 52z" />
 <glyph unicode="p" horiz-adv-x="2054" d="M9 1229l42 572q7 82 65 139q56 56 138 64l572 44q9 1 18 1q89 0 154 -66l992 -991q65 -65 65 -156q0 -92 -65 -157l-614 -614q-65 -65 -157 -65q-91 0 -156 65l-991 991q-64 64 -64 151q0 11 1 22zM96 1222q-1 -6 -1 -13q0 -53 38 -91l992 -992q37 -37 91 -37h3 q58 0 95 37l615 615q39 39 39 95q0 55 -39 94l-992 992q-39 39 -94 39h-10l-572 -44q-49 -3 -84 -40q-34 -34 -39 -83zM374 1505q0 73 51 125q51 51 125 51q72 0 122 -51q51 -51 52 -125q0 -72 -52 -123q-51 -51 -122 -51q-74 0 -125 51t-51 123zM486 1444q26 -24 64 -24 q36 0 61 24q26 26 26 61q0 38 -26 63q-26 26 -61 26q-38 0 -64 -26q-23 -25 -23 -60q0 -39 23 -64z" />
 <glyph unicode="q" d="M0 1024q0 423 300 724q300 300 724 300q423 0 724 -300q300 -300 300 -724q0 -423 -300 -724q-300 -300 -724 -300t-724 300t-300 724zM147 1024q0 -364 257 -620q255 -257 617 -257h3q364 0 621 257q258 256 258 620t-258 621q-258 258 -621 258q-364 0 -620 -258 q-258 -258 -257 -621zM493 734q3 29 28 48q24 19 54 15q29 -3 48 -27q154 -196 404 -197q251 0 407 200q17 24 47 27q31 5 55 -13q24 -19 27 -48v-10q0 -25 -13 -45q-197 -257 -520 -257h-3h-3q-318 0 -515 252q-16 21 -16 47v8zM587 1126v147q0 46 33 77q32 32 78 32 q44 0 77 -32q32 -31 32 -77v-147q0 -44 -32 -76t-77 -33q-46 1 -78 33t-33 76zM1246 1126v147q0 46 32 77q32 32 77 32q46 0 79 -32q32 -31 32 -77v-147q0 -44 -32 -76t-79 -33q-45 1 -77 33t-32 76z" />
 <glyph unicode="r" d="M0 1024q0 423 300 724q300 300 724 300q423 0 724 -300q300 -300 300 -724q0 -423 -300 -724q-300 -300 -724 -300t-724 300t-300 724zM150 1024q0 -362 256 -618t618 -256t618 256t256 618t-256 618t-618 256t-618 -256t-256 -618zM916 944v624q0 31 23 53q22 22 53 23 q31 0 52 -23q22 -22 23 -53v-592l218 -220q22 -22 22 -53t-22 -53t-53 -22t-53 22l-240 241q-22 22 -23 53z" />

core/src/web/staticres/js/qfw.js

@@ -220,6 +220,7 @@ var SendIdentCode = {
 		var childNode = parentNode.children("div");
 		if(c == -1){
 			thisClass.flag = true;
+			$(obj).attr("disabled","disabled");
 			childNode.addClass("text-primary").html('抱歉，您今天发送的验证码次数已超限制，请明天再来。');
 			return;
 		}
@@ -228,6 +229,8 @@ var SendIdentCode = {
 			checkCodeObj.attr("disabled","disabled");
 		}
 		$(obj).addClass("text-muted").removeClass("cursor-pointer").text("已发送");
+		$(obj).css("background-color","ccc");
+		$(obj).css("border","1px solid #ccc");
 		var count = 59;
 		childNode.removeClass("text-primary").text("校验码已通过"+sendType+"发出,如果没有收到,您可在"+count--+"秒后重新发送");
 		var intgerval = setInterval(function (){
@@ -239,6 +242,8 @@ var SendIdentCode = {
 				$(obj).text("获取"+sendType+"验证码");
 				parentNode.hide();
 				clearInterval(intgerval);
+				$(obj).css("background-color","FF5A5F");
+				$(obj).css("border","1px solid #FF5A5F");
 			}else{
 				childNode.removeClass("text-primary").text("校验码已通过"+sendType+"发出,如果没有收到,您可在"+count--+"秒后重新发送");
 			}
@@ -547,19 +552,19 @@ function b_loadTop(){
 					html += '<a class="b-round-dot"></a>';
 				}
 				html += '</span></li>'
-						+'<li onclick="window.location.href=\'/member/show/memberindex\'"><i class="glyphicon ren1">&nbsp;</i>用户中心</li>'
-						+'<li onclick="window.location.href=\'/front/logout\'" class="border-b-0"><i class="glyphicon tuichu">&nbsp;</i>退出</li>';
+						+'<li onclick="window.location.href=\'/member/show/memberindex\'"><i class="glyphicon ren1"></i>用户中心</li>'
+						+'<li onclick="window.location.href=\'/front/logout\'" class="border-b-0"><i class="glyphicon tuichu"></i>退出</li>';
 						+'</ul></div>';
 				$("#b-loginStatus").html(html)
 				.mouseover(function(){
 					$("#head-hideMenu").show();
 				}).mouseleave(function(){
-					//$("#head-hideMenu").hide();
+					$("#head-hideMenu").hide();
 				});
 				$("#head-hideMenu").mouseover(function(){
 					$(this).show();
 				}).mouseleave(function(){
-					//$(this).hide();
+					$(this).hide();
 				});
 				//处理公用底部扫码登录按钮
 				$("#bottom-bar>li:first").addClass("invisible");

core/src/web/templates/common/login.html

@@ -8,34 +8,15 @@
 	padding-left: 0px;
 }
 .loginModal {
-	width: 490px;
+	width: 520px;
 	height: 440px;
 }
-.loginForm .username,.loginForm .password{
-	padding-left: 30px;
-}
-.loginForm .glyphicon{
-	position: absolute;
-  	color: #BBB;
-  	width: 38px;
-  	height: 38px;
-  	line-height: 38px;
-	top: 30px;
-}
 .loginForm{
 	text-align:left;
 }
-.loginForm .zhanghao{
-	font-size: 14px;
-	margin-left: 10px;
-}
-.loginForm .mima{
-	font-size: 17px;
-	margin-left: 7px;
-}
 .loginForm .Validform_checktip {
-	line-height: 30px;
-	height: 30px;
+	line-height: 20px;
+	height: 20px;
 	display: block !important;
 	background: none;
 	padding: 0px;
@@ -50,15 +31,6 @@
 	margin-bottom: 0px;
 	position: relative;
 }
-.login_close{
-	cursor: pointer;
-	float: right;
-	margin-top: 12.5px;
-}
-.login_close:hover{
-	filter: progid:DXImageTransform.Microsoft.Alpha(opacity=50);
-	opacity: 0.5;
-}
 .loginFont{
 	font-size:14px;
 	font-weight:bold;
@@ -76,23 +48,8 @@
 	margin:0 0px 0 12px;	
 }
 .login-logo{
-	width: 156px;
-	height: 55px;
-	margin-left:150px;
-	margin-top:20px;
-}
-.loginModal .modal-header{
-	border-top-left-radius: 6px;
-	border-top-right-radius: 6px;
-	padding: 0px 14px 0px 20px;
-	height: 105px;
-	line-height: 105px;
-	border-bottom:none;
-}
-.loginModal .otherlogin{
-	display:none;
-	padding:0 30px;
-	height:275px;
+	width: 130px;
+	height: 40px;
 }
 </style>
 <script src="/js/validform-min.js"></script>
@@ -228,7 +185,7 @@ $(function (){
 	},"loginForm");
 	function login_errorProcess(obj,msg){
 		login_cssctlObj(obj.prev(),3);
-		obj.prev().text(msg).show();
+		obj.next().text(msg).show();
 	}
 	
 	$(".loginFont").click(function(){
@@ -300,14 +257,14 @@ function afterLoginSkip(data){
 }
 </script>
 <!-- 登录弹出框 -->
-<div class="modal fade" id="loginModal" tabindex="-1" role="dialog" aria-labelledby="loginModal" aria-hidden="true">
+<div class="modal fade b-modal" id="loginModal" tabindex="-1" role="dialog" aria-labelledby="loginModal" aria-hidden="true">
   <div class="modal-dialog loginModal">
 		<!--登录注册框-->
-    <div class="modal-content">
+    <div class="modal-content" style="height: 360px;">
 			<!--注册/登录框 -->
-      <div class="modal-header" style="border-top-left-radius: 6px;border-top-right-radius: 6px;padding: 0px 14px 0px 20px;height: 105px;line-height: 105px;border-bottom:none">
-		<img alt="" src="/images/logo.png" class="login-logo">
-		<img alt="" src="/images/login_close.png" class="login_close" onclick="$('#loginModal').modal('hide');clearInterval(t);">
+      <div class="modal-header text-center">
+		<img alt="" src="/images/logo-white.png" class="login-logo">
+		<span data-dismiss="modal" aria-label="Close" class="close glyphicon guanbi1" onclick="clearInterval(t);"></span>
       </div>
 			<div  class="f-logintip" style="display:none;">
 				<hr class="hidden-xs hr1" style="width:100%;"/>
@@ -360,33 +317,34 @@ function afterLoginSkip(data){
 					</div>
 					<div><small>2015年12月14日起，在企明星注册的服务机构在发布服务信息后，即可收到企明星微信平台发放的最高200元的微信红包奖励！欢迎参与！<a target="_blank" href="/p/">点击查看详情</a>。</small></div>
 			</div>			
-			<div class="modal-body f-login" style="text-align:center;padding-top:0;">
-	 	<div class="hidden-xs" style='margin-bottom:20px;'><hr class='hr1'/><span class="text-muted text-primary loginFont" v="wxlogin">微信扫码登录</span><span class="text-muted" style="display:inline-block;margin:0 10px;">|</span><span v="otherlogin" class="text-muted loginFont">手机/邮箱登录</span><hr class="hr1 hr2"/></div>
-		<div class="login wxlogin hidden-xs">
-			<img alt="加载中.." style="width:250px;height:250px;" id="wxPic" class="border">
-			<div class="text-muted" style="margin-top:5px;">请使用微信扫描登录<br/>新用户扫码确认后会自动完成注册</div>
+			<div class="modal-body f-login" style="text-align:center;padding-top:20;">
+		<div class="row">
+		<div class="login wxlogin hidden-xs col-md-5">
+			<div class="text-muted" style="margin-top:5px;font-weight: 700;color:#000;font-size: 14px;">微信扫码登录</div>
+			<img alt="加载中.." style="width:124px;height:127px;margin:20px;" id="wxPic" class="border">
+			<div class="text-muted" style="line-height: 22px;margin-top:5px;font-family: '宋体 Regular', 宋体;font-size: 12px;color: rgb(160, 160, 160);">使用微信扫描登录<br/>新用户自动注册</div>
 		</div>
-		<div class="login otherlogin">
-			<form class="form-horizontal loginForm" method="post">
+		<div class="login col-md-7" style="border-left:1px solid #F0F0F0;">
+			<div class="text-muted" style="margin-top:5px;font-weight: 700;color:#000;font-size: 14px;">邮箱/手机登录</div>
+			<form class="form-horizontal loginForm" method="post" style="width:220px;margin-left: 40px;">
 		  	<div class="form-group">
 				<div class="Validform_checktip text-primary"></div>
 			    <input name="s_name" type="text" class="form-control username" placeholder="邮箱/手机号" datatype="m|e" nullmsg="请填写邮箱/手机号" errormsg="邮箱/手机号格式错误">
-				<i class="glyphicon zhanghao"></i>
 		  	</div>
 		 	<div class="form-group">
 			  	<div class="Validform_checktip text-primary"></div>
 			    <input name="s_pwd" type="password" class="form-control password" placeholder="密码" datatype="*" nullmsg="请填写密码">
-				<i class="glyphicon mima"></i>
 		  	</div>
 		  	<div class="form-group margin-t-20 font-size-12">
-				<input type="checkbox" name="rememberMe" value="y" style="vertical-align: sub;">&nbsp;下次自动登录
+				<!--<input type="checkbox" name="rememberMe" value="y" style="vertical-align: sub;">&nbsp;下次自动登录-->
 			  	<a class="pull-right text-primary" href="/front/findpwd">忘记密码?</a>
 		  	</div>
 		  	<div class="form-group text-center margin-t-20">
-		    	<button type="submit" class="btn btn-primary" style="width: 100%;font-weight: bold;">登<span class="margin-lr-30"></span>录</button>
+		    	<button type="submit" class="btn btn-primary" style="background-color: #ff5a5f;width: 100%;">登录</button>
 		  	</div>
 		</form>
 		</div>
+		</div>
 	</div>
 		</div>
  </div>

core/src/web/templates/member/findpwd.html

@@ -3,85 +3,123 @@
 <title>找回密码</title>
 {{include "/common/inc.html"}}
 <script src="/js/validform-min.js"></script>
+<link href="/css/index-new.css" rel="stylesheet">
 <style type="text/css">
 h5{
 	margin-top: 0px;
 	margin-bottom: 0px;
 	font-weight: bold;
 }
-#step_4 button{
-	margin-left: 120px;
+#step_4 #findpwdSuccess button{
+	background-color:#FF5A5F;
+	margin-top:100px;
+	margin-right: 66px;
+}
+#step_4 #findpwdFail button{
+	margin-top:100px;
+	margin-right: 66px;
+}
+#step_4 span{
+    font-size: 20px;
+    color: #4E5051;
 }
 .checkCodeIdValid.Validform_right{
 	display: none !important;	
 }
+.index-new-nva{  
+   box-shadow: #aaa 0px 0px 10px;  
+}
+.input-group .form-control:first-child{
+	border-radius:4px;
+}
+.fw-new-hqy{
+	padding-right:10px;
+}
+.fw-new-hqy span{
+	background-color:#FF5A5F;
+	border:1px solid #FF5A5F;
+}
+.fw-new-content .fwtb2{
+	margin-bottom:35px;
+}
+.fw-new-content .afterSendIdentCode{
+	padding:20px 0px;
+}
+.fw-new-content .afterSendIdentCode .text-muted{
+	text-align:left;
+}
 </style>
 </head>
-<body>
-<div class="container-fluid">
-	<div class="qfw-header">
-		<div>
-			<a href="/"><img alt="" src="/images/logo.png" class="header_logo"></a>
-			<img alt="" src="/images/v_line.png" class="header_line">
-			<font class="text-muted">找回密码</font>
-		</div>
-		<div class="header-ul">
-			<ul>
-				<li><a href="/">返回首页</a></li>
-				<li class="splitLine"></li>
-				<li><a href="/front/web_helpcenterlist.html">帮助中心</a></li>
-				<li class="splitLine"></li>
-				<li><a href="/front/web_feedbacklist.html">意见反馈</a></li>
-			</ul>
-		</div>
+<body class="fwbody"><!---->
+<div class="index-new-head b-head">
+	{{include "/common/top.html"}}
+	<div class="b-nav index-new-nva">
+		<ul>
+			<li class="b-nav-logo index-new-nva-l"><a href="/"><img src="/images/logo.png" class="logo"></a></li>
+			
+		</ul>
 	</div>
-	<div class="a-line"></div>
 </div>
 <!-- 中间 -->
-<div class="a-content qfw-content">
-	<div class="qfw-content panel panel-default member-panel" style="margin-top: 30px;">
+<div class="a-content qfw-content text-center fw-new-content">
+<div class="fw-new-title">找回企明星帐号密码</div>
+	<div class="qfw-content panel panel-default member-panel ">
 		<div class="panel-body">
+				<img src="/images/ufw01.png" class="ufwimg"/>
 			<div class="row" id="step">
-				<ul class="witchStep">
-					<li class="text-muted text-primary li_active_b" style="background-image: url('/images/whiteRound.png');width: 106px;">1.确认账号</li>
-					<li class="text-muted text-primary li_active_a" style="background-image: url('/images/grayLine.png');width: 10px;"></li>
-					<li class="text-muted" style="background-image: url('/images/whiteRound.png');width: 106px;">2.安全验证</li>
-					<li class="text-muted" style="background-image: url('/images/grayLine.png');width: 10px;"></li>
-					<li class="text-muted" style="background-image: url('/images/whiteRound.png');width: 106px;">3.重置密码</li>
-				</ul>
+				<div class="col-sm-4 qrzh" ><span>确认账号</span></div>
+				<div class="col-sm-4 aqyz" ><span>安全验证</span></div>
+				<div class="col-sm-4 czmm" ><span>重置密码</span></div>
 			</div>
 			<!--第一步-->
 			<form class="form-horizontal accountForm" method="post" id="step_1">
 			<input type="hidden" value="1" name="flag">
-				<div class="row">
-					<div class="col-md-12">
-						<h5>请填写你需要找回的账号</h5><br>
+				<div class="row fwtb1">
+				
+					<div class="col-md-2">
+					</div>
+					<div class="col-md-10">
+						<h5 style="float:left;">请填写你需要找回的账号</h5><br>
 					</div>
 				</div>
 			  	<div class="form-group">
-			    <div class="col-md-4">
-			      <input type="text" name="loginName" class="form-control" onKeyUp="rePlaceSpace(this)" datatype="m|e" nullmsg="请输入邮箱/手机号" errormsg="邮箱/手机号格式错误" ajaxurl="/front/ajaxReq?oprType=accountIsExisit">
+					<div class="col-md-1">
+					</div>
+					<div class="col-md-2 fw-new-zh">
+					<span>帐　号</span>
+					</div>
+			    <div class="col-md-5">
+			      <input type="text" name="loginName" class="form-control" onKeyUp="rePlaceSpace(this)" datatype="m|e" placeholder="邮箱/手机号" nullmsg="请输入邮箱/手机号" errormsg="邮箱/手机号格式错误" ajaxurl="/front/ajaxReq?oprType=accountIsExisit">
 			    </div>
-			    <div class="col-md-8">
+			    <div class="col-md-4">
 				    <span class="Validform_checktip">请输入邮箱/手机号</span>
 			    </div>
 			  </div>
 			  	<div class="form-group">
-				    <div class="input-group col-md-4 checkCodeId">
+					<div class="col-md-1">
+					</div>
+					<div class="col-md-2 fw-new-yzm">
+					<span>验证码</span>
+					</div>
+				    <div class="input-group col-md-5 checkCodeId">
 				      	<input type="text" name="checkCodeId" class="form-control inputxt" maxlength="4" onKeyUp="rePlaceUnDigital(this)" datatype="n4" nullmsg="请输入验证码" errormsg="验证码格式错误" aria-describedby="checkCodeId">
 					    <span class="input-group-addon" id="checkCodeId">
 							<img id="captcha" src="/tool/captcha" onClick="reLoadCaptcha();">
 							<a onClick="reLoadCaptcha();" class="text-primary">刷新</a>
 						</span>
 					</div>
-				   	<div class="col-md-8">
+				   	<div class="col-md-4">
 						<span class="Validform_checktip checkCodeIdValid">请输入验证码</span>
 					</div>
 				  </div>
-			    <div class="form-group">
-					<div class="col-md-4">
+			    <div class="form-group subbtn">
+					<div class="col-md-3">
+					</div>
+					<div class="col-md-5">
 					<button type="submit" class="btn btn-default qfw-btn" disabled="disabled">下一步</button>
-				 </div>
+				 	</div>
+					<div class="col-md-4">
+					</div>
 				</div>
 			</form>
 			<!--第二步安全验证-->
@@ -89,33 +127,52 @@ h5{
 				<input type="hidden" value="2" name="flag">
 				<input type="hidden" name="loginName">
 				<input type="hidden" name="loginType">
-				<div class="row">
-					<h5>为了你的帐号安全，请完成身份验证</h5><br>
+				<div class="row fwtb2">
+				
+				
+					<div class="col-md-2">
+					</div>
+					<div class="col-md-10">
+						<h5 style="float:left;">为了你的帐号安全，请完成身份验证</h5><br>
+					</div>
 				</div>
-				<div class="form-group">
-				    <label class="col-md-1 control-label"><h5><span class="userNameType"></span>验证</h5></label>
-				    <div class="col-md-11"></div>
+				<div class="form-group hidden">
+					<div class="col-md-1">
+					</div>
+				    <label class="col-md-2 control-label"><h5><span class="userNameType"></span>手机号验证</h5></label>
+				    <div class="col-md-9"></div>
 				  </div>
 				<div class="form-group">
-				    <label class="col-md-1 control-label userNameType" style="font-weight: normal;"></label>
-				    <div class="col-md-4 encryUserName" style="padding-top: 7px;"></div>
-				    <div class="col-md-7"></div>
-				  </div>
+					<div class="col-md-1">
+					</div>
+				    <label class="col-md-2 control-label userNameType" style="font-weight: normal;">手机号</label>
+				    <div class="col-md-3 encryUserName" style="padding-top: 7px;margin-right: -7px;"></div>
+				    <div class="col-md-2 fw-new-hqy"><span id="sendIdentCodeBtn" class="btn btn-default">获取验证码</span></div>
+				  	<div class="col-md-2"></div>
+				</div>
 				<div class="form-group">
-				    <label class="col-md-1 control-label" style="font-weight: normal;">验证码</label>
-				    <div class="input-group col-md-4 checkCodeId">
+					<div class="col-md-1">
+					</div>
+				    <label class="col-md-2 control-label" style="font-weight: normal;">验证码</label>
+				    <div class="input-group col-md-5 checkCodeId">
 			      		<input type="text" name="identCode" datatype="n6" maxlength="6" onKeyUp="rePlaceUnDigital(this)" nullmsg="请输入验证码" errormsg="验证码格式错误" class="form-control" ajaxurl="/front/ajaxReq?oprType=checkIdentCode">
-						<span class="input-group-addon"><div id="sendIdentCodeBtn" class="sendIdentCodeBtn">获取验证码</div></span>
+						<span class="input-group-addon hide"><div id="sendIdentCodeBtn" class="sendIdentCodeBtn">获取验证码</div></span>
 				    </div>
-				    <div class="col-md-7"><span class="Validform_checktip">请输入验证码</span></div>
+				    <div class="col-md-4"><span class="Validform_checktip">请输入验证码</span></div>
 				</div>
 				<div class="form-group afterSendIdentCode">
-					<div class="col-md-offset-1 col-md-11 text-muted"></div>
+					<label class="col-md-2 fw-new-moreword">
+					</label>
+					<div class="col-md-10 text-muted"></div>
 				</div>
 			    <div class="form-group">
-				 <div class="col-md-offset-1 col-md-4">
-					<button type="submit" class="btn btn-default qfw-btn" disabled="disabled">下一步</button>
-				 </div>
+					<div class="col-md-3">
+					</div>
+					 <div class="col-md-5">
+						<button type="submit" class="btn btn-default qfw-btn" disabled="disabled">下一步</button>
+					 </div>
+					<div class="col-md-4">
+					</div>
 				</div>
 			</form>
 			<!--第三步-->
@@ -123,27 +180,40 @@ h5{
 				<input type="hidden" name="loginName">
 				<input type="hidden" name="loginType">
 				<input type="hidden" value="3" name="flag">
-				<div class="row" style="margin-bottom: 20px;">
-					<font class="text-muted">您正在找回的账号是：</font><span class="encryAccount encryUserName" style="font-weight: bold;"></span>
+				<div class="row" style="margin-bottom: 30px;">
+					<div class="col-md-2">
+					</div>
+					<div class="col-md-10">
+					<font class="text-muted"  style="float:left;margin-left: -17px;">您正在找回的账号是：</font><span class="encryAccount encryUserName" style="font-weight: bold;float:left;">15737190152</span>
+					</div>
 				</div>
 				<div class="form-group">
-				    <label class="col-md-1 control-label">新密码</label>
-				    <div class="col-md-4">
+					<div class="col-md-1">
+					</div>
+				    <label class="col-md-2 control-label">新&nbsp;&nbsp;密&nbsp;码</label>
+				    <div class="col-md-5">
 				      <input type="password" name="s_pwd" class="form-control" onpaste="return false" datatype="ns6-14" nullmsg="请输入密码">
 				    </div>
-				    <div class="col-md-7"><span class="Validform_checktip">长度为6~14个字符的数字、字母组合，区分大小写</span></div>
+				    <div class="col-md-4"><span class="Validform_checktip">长度为6~14个字符的数字、字母组合，区分大小写</span></div>
 				  </div>
 				<div class="form-group">
-				    <label class="col-md-1 control-label">确认密码</label>
-				    <div class="col-md-4">
+					<div class="col-md-1">
+					</div>
+				    <label class="col-md-2 control-label">确认密码</label>
+				    <div class="col-md-5">
 				      <input type="password" class="form-control" onpaste="return false" recheck="s_pwd" datatype="ns6-14" nullmsg="请再次输入密码" errormsg="两次输入的密码不一致">
 				    </div>
-				    <div class="col-md-7"><span class="Validform_checktip"></span></div>
+				    <div class="col-md-4"><span class="Validform_checktip"></span></div>
 				  </div>
-				<div class="form-group">
-					<div class="col-md-offset-1 col-md-4">
+				<div class="form-group" style="margin-top:60px;">
+					<div class="col-md-3">
+					</div>
+					<div class="col-md-5">
 					<button type="submit" class="btn btn-default qfw-btn" disabled="disabled">确认</button>
-				 </div>
+				 	
+					<div class="col-md-4">
+					</div>
+				</div>
 				</div>
 			</form>
 			<!-- 第四步 -->
@@ -189,12 +259,15 @@ $(function(){
 						$("#step_2 .userNameType").text("邮箱");
 						$("#sendIdentCodeBtn").text("获取邮箱验证码");
 					}
+					$(".ufwimg").attr("src","/images/ufw0"+data.flag+".png");
 					$("[name='loginType']").val(data.result);
 					SendIdentCode.init($("#sendIdentCodeBtn"),data.loginName,null,data.count);
 					$(".witchStep li:eq(2)").addClass("text-primary li_active_b");
 					$(".witchStep li:eq(3)").addClass("text-primary li_active_a");
+					$(".fw-new-moreword").html("");
 				}else if(data.flag == 3){
 					$(".witchStep li:eq(4)").addClass("text-primary li_active_b");
+					$(".ufwimg").attr("src","/images/ufw0"+data.flag+".png")
 				}
 				var lastStepProcess = function(obj){
 					$("#"+obj).removeClass("hidden");
@@ -239,21 +312,21 @@ $(function(){
 		var name = $(this).attr("name");
 		if(name == "loginName" || name == "checkCodeId"){
 			if(validForm.eq(0).check(true) && $("#step_1").find(".Validform_wrong").length == 0){
-				$("#step_1 [type='submit']").addClass("btn-primary").removeClass("btn-default").removeAttr("disabled");
+				$("#step_1 [type='submit']").addClass("btn-primary").removeClass("btn-default").removeAttr("disabled").css("background-color","#FF5A5F");
 			}else{
-				$("#step_1 [type='submit']").addClass("btn-default").removeClass("btn-primary").attr("disabled",true);
+				$("#step_1 [type='submit']").addClass("btn-default").removeClass("btn-primary").attr("disabled",true).css("background-color","rgb(174, 167, 159)");
 			}
 		}else if(name == "identCode"){
 			if(validForm.eq(1).check(true) && $("#step_2").find(".Validform_wrong").length == 0){
-				$("#step_2 [type='submit']").addClass("btn-primary").removeClass("btn-default").removeAttr("disabled");
+				$("#step_2 [type='submit']").addClass("btn-primary").removeClass("btn-default").removeAttr("disabled").css("background-color","#FF5A5F");
 			}else{
-				$("#step_2 [type='submit']").addClass("btn-default").removeClass("btn-primary").attr("disabled",true);
+				$("#step_2 [type='submit']").addClass("btn-default").removeClass("btn-primary").attr("disabled",true).css("background-color","rgb(174, 167, 159)");
 			}
 		}else{
 			if(validForm.eq(2).check(true) && $("#step_3").find(".Validform_wrong").length == 0){
-				$("#step_3 [type='submit']").addClass("btn-primary").removeClass("btn-default").removeAttr("disabled");
+				$("#step_3 [type='submit']").addClass("btn-primary").removeClass("btn-default").removeAttr("disabled").css("background-color","#FF5A5F");
 			}else{
-				$("#step_3 [type='submit']").addClass("btn-default").removeClass("btn-primary").attr("disabled",true);
+				$("#step_3 [type='submit']").addClass("btn-default").removeClass("btn-primary").attr("disabled",true).css("background-color","rgb(174, 167, 159)");
 			}
 		}
 		if($(this).val().length == 0){
@@ -265,5 +338,6 @@ function reLoadCaptcha(){
 	document.getElementById('captcha').src='/tool/captcha?rnd='+Math.random();
 }
 </script>
+
 </body>
 </html>