Merge branch 'release_1.3_20160104' of 192.168.3.17:zhanghongbo/qfw into release_1.3_20160104

core/src/timetask.json

@@ -1 +1 @@
-{"comment":{"c_rate":10,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-05 11:43:55"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-05 11:43:55"}},"marketisstart":true,"marketrate":300}
+{"comment":{"c_rate":10,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-05 17:12:57"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-05 17:12:57"}},"marketisstart":true,"marketrate":300}

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

@@ -315,7 +315,7 @@ function afterLoginSkip(){
 						<div class="u-tipsok">
 								<h3>
 									<div class="f-username" style="float:left;"></div>
-									<div style="float:left;">恭喜你注册成功！<div>
+									<div style="float:left;">恭喜你注册成功！</div>
 								</h3>
 							</div>
 						</div>
@@ -339,7 +339,7 @@ function afterLoginSkip(){
 							<div class="u-tipsok">
 								<h3 style="line-height: 40px;margin: -25px 0 0 50px	;">
 									<div class="f-username"><span></span><img style="margin-left:15px;" src="/images/ent_authe_a.png" height="22"></div>
-									<div style="float:left;margin: -10px 0 30px 0; color:#000;">恭喜你注册成功！<div>
+									<div style="float:left;margin: -10px 0 30px 0; color:#000;">恭喜你注册成功！</div>
 								</h3>
 							</div>
 						</div>

core/src/web/templates/member/accountset/bindmail.html

@@ -159,7 +159,8 @@ function ocheckMail(){
 				}
 			}
 			
-		}});
+		}
+	});
 }
 function currPos(){
    return [["用户中心","/member/show/memberindex"]]