首页修改

core/src/github.com/mattn/go-sqlite3

@@ -0,0 +1 @@
+Subproject commit 5510da399572b4962c020184bb291120c0a412e2

core/src/timetask.json

@@ -1 +1,5 @@
-{"comment":{"c_rate":10,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-11 14:27:30"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-11 14:27:30"}},"marketisstart":true,"marketrate":300}
+<<<<<<< HEAD
+{"comment":{"c_rate":10,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-11 14:27:30"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-11 14:27:30"}},"marketisstart":true,"marketrate":300}
+=======
+{"comment":{"c_rate":10,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-09 16:38:34"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-09 16:38:34"}},"marketisstart":true,"marketrate":300}
+>>>>>>> e8a0d83ea644bf86764404d62e2b7ad26a0196d8

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

@@ -202,7 +202,7 @@ a.new_red:hover, a.new_red:active {
 	width: 42px;
 	position: fixed;
 	bottom: 5px;
-	right: 15px;
+	right: 5px;
 }
 
 .bottom-bar img {

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

@@ -21,6 +21,11 @@
 <script>
 var _hmt = _hmt || [];
 (function() {
+	var bottomBarRight = (document.body.clientWidth - 1200) / 2 - 42;
+	if(bottomBarRight > 0){
+		$("#bottom-bar").css({right: bottomBarRight});
+	}
+	//
   	$("#backTop").click(function(){
 		$(window).scrollTop(0);
 	});