加上二维码信息

polaris1119 · polaris1119 · commit 617637d19c64 · 2019-09-30T16:51:53.000+08:00
diff --git a/model/feed.go b/model/feed.go
@@ -154,7 +154,7 @@ func PublishFeed(object interface{}, objectExt interface{}, me *Me) {
 	feedDay := config.ConfigFile.MustInt("feed", "day", 3)
 	feed.Seq = feedDay * 24
 	if me != nil && me.IsAdmin {
-		feed.Seq += 1000
+		feed.Seq += 100000
 	}
 
 	_, err := db.MasterDB.Insert(feed)
diff --git a/template/articles/detail.html b/template/articles/detail.html
@@ -10,7 +10,7 @@
 			<li><a href="/articles">文章</a></li>
 		</ol>
 		<div class="page">
-			<div class="box_white">
+			<div class="box_white" style="overflow: visible;">
 				<div class="title">
 					{{if .article.IsSelf}}
 					<div class="pull-right">
@@ -96,6 +96,9 @@ <h1 id="title" data-id="{{.article.Id}}">
 					{{end}}
 				</div>
 
+				<!-- 加群等 -->
+				{{include "common/promotion.html" .}}
+
 				<div class="content-buttons">
 					<div class="pull-right c9 f11" style="line-height: 12px; padding-top: 3px; text-shadow: 0px 1px 0px #fff;">{{.article.Viewnum}} 次点击 &nbsp;{{if .article.Likenum}}∙&nbsp; {{.article.Likenum}} 赞 &nbsp; {{end}}</div>
 					<a class="tb collect" href="javascript:;" title="{{if .hadcollect}}取消收藏{{else}}加入收藏{{end}}" data-objid="{{.article.Id}}" data-objtype="1" data-collect="{{.hadcollect}}">{{if .hadcollect}}取消收藏{{else}}加入收藏{{end}}</a>
@@ -260,6 +263,13 @@ <h1 id="title" data-id="{{.article.Id}}">
 	} else {
 		$('.read-time').text('预计阅读时间不到 1 分钟');
 	}
+
+	$('.qrcode').on('mouseover', function(evt) {
+		$('.qrcode-pop').show();
+	});
+	$('.qrcode').on('mouseout', function(evt) {
+		$('.qrcode-pop').hide();
+	});
 });
 </script>
 {{include "cssjs/ckeditor.js.html" .}}
diff --git a/template/common/promotion.html b/template/common/promotion.html
@@ -0,0 +1,26 @@
+<div class="cell qrcode" style="position: relative;">
+    <p>入群交流（和以上内容无关）：Go中文网 QQ 交流群：798786647 或加微信入微信群：274768166  备注：入群；关注公众号：<a href="javascript:void(0)" title="" target="_self">Go语言中文网<img width="16" src="https://weixin.sogou.com/new/pc/images/ico_ewm.png"></a></p>
+    <span style="display: none;" class="qrcode-pop">
+        关注Go语言中文网<br>
+        <img src="{{.static.domain}}/static/img/wx_sg_qrcode.jpg?imageView2/2/w/280" alt="关注微信" class="img-responsive">
+        <span style="color: red;">领全套学习资料</span>
+    </span>
+</div>
+
+<style type="text/css">
+.qrcode-pop {
+    background: #fff;
+    border: 1px solid #ddd;
+    position: absolute;
+    left: 42%;
+    top: 32px;
+    -moz-box-shadow: 0 2px 5px #ddd;
+    -webkit-box-shadow: 0 2px 5px #d9d9d9;
+    box-shadow: 0 2px 5px #d9d9d9;
+    border-radius: 2px;
+	text-align: center;
+    padding: 5px 10px 16px;
+    line-height: 32px;
+    width: 150px;
+}
+</style>
diff --git a/template/topics/detail.html b/template/topics/detail.html
@@ -12,7 +12,7 @@
             <li><a href="{{if .topic.node.ename}}/go/{{.topic.node.ename}}{{else}}/topics/node/{{.topic.node.nid}}{{end}}">{{.topic.node.name}}</a></li>
         </ol>
         <div class="page">
-            <div class="box_white">
+            <div class="box_white" style="overflow: visible;">
                 <div class="title">
                     <div class="pull-right">
                         <a href="/user/{{.topic.user.Username}}" title="{{.topic.user.Username}}">
@@ -81,6 +81,9 @@ <h1>
                 </div>
                 {{end}}
 
+                <!-- 加群等 -->
+				{{include "common/promotion.html" .}}
+
                 <div class="content-buttons">
                     <div class="pull-right c9 f11" style="line-height: 12px; padding-top: 3px; text-shadow: 0px 1px 0px #fff;">{{add .topic.view 1}} 次点击 &nbsp;{{if .topic.like}}∙&nbsp; {{.topic.like}} 赞 &nbsp; {{end}}</div>
                     <a class="tb collect" href="javascript:;" title="{{if .hadcollect}}取消收藏{{else}}加入收藏{{end}}" data-objid="{{.topic.tid}}" data-objtype="0" data-collect="{{.hadcollect}}">{{if .hadcollect}}取消收藏{{else}}加入收藏{{end}}</a>
@@ -211,6 +214,13 @@ <h1>
 
         return false;
     });
+
+	$('.qrcode').on('mouseover', function(evt) {
+		$('.qrcode-pop').show();
+	});
+	$('.qrcode').on('mouseout', function(evt) {
+		$('.qrcode-pop').hide();
+	});
 });
 </script>
 

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ func PublishFeed(object interface{}, objectExt interface{}, me *Me) {`
`154`	`154`	`feedDay := config.ConfigFile.MustInt("feed", "day", 3)`
`155`	`155`	`feed.Seq = feedDay * 24`
`156`	`156`	`if me != nil && me.IsAdmin {`
`157`		`- feed.Seq += 1000`
	`157`	`+ feed.Seq += 100000`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`_, err := db.MasterDB.Insert(feed)`