From 1565e85444814c6e27d17e28b72526244dfdb9e9 Mon Sep 17 00:00:00 2001
From: tianya <tianya@imcollege.cn>
Date: Mon, 26 Oct 2020 17:17:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/include/taglib/qrcode.lib.php           |   5 +-
 src/plus/qrcode.php                         |  39 +++---
 src/static/img/qrcode.js                    |   2 +-
 src/templets/default/article_article.htm    |   2 +
 src/templets/default/article_default.htm    |   2 +
 src/templets/default/article_default_sg.htm |   2 +
 src/templets/default/article_image.htm      |   2 +
 src/templets/default/article_infos.htm      |   2 +
 src/templets/default/article_shop.htm       |   2 +
 src/templets/default/article_soft.htm       |   2 +
 src/templets/default/article_spec.htm       |   2 +
 src/templets/default/index.htm              |   2 +
 src/templets/default/index_article.htm      |   4 +-
 src/templets/default/index_default.htm      |   4 +-
 src/templets/default/index_default_sg.htm   |   4 +-
 src/templets/default/index_image.htm        | 134 ++++++++++----------
 src/templets/default/index_infos.htm        |   2 +
 src/templets/default/index_shop.htm         | 123 +++++++++---------
 src/templets/default/index_soft.htm         | 123 +++++++++---------
 src/templets/default/list_article.htm       |   2 +
 src/templets/default/list_default.htm       |   2 +
 src/templets/default/list_default_sg.htm    |   2 +
 src/templets/default/list_free.htm          |   2 +
 src/templets/default/list_image.htm         |   2 +
 src/templets/default/list_infos.htm         |   2 +
 src/templets/default/list_shop.htm          |   2 +
 src/templets/default/list_soft.htm          |   2 +
 src/templets/default/list_spec.htm          |   2 +
 src/templets/default/widget_qrcode.htm      |  11 ++
 src/templets/plus/qrcode.htm                |  99 ++++++++-------
 30 files changed, 323 insertions(+), 263 deletions(-)
 create mode 100644 src/templets/default/widget_qrcode.htm

diff --git a/src/include/taglib/qrcode.lib.php b/src/include/taglib/qrcode.lib.php
index 03509320..aff9e741 100755
--- a/src/include/taglib/qrcode.lib.php
+++ b/src/include/taglib/qrcode.lib.php
@@ -1,6 +1,6 @@
 <?php   if(!defined('DEDEINC')) exit('Request Error!');
 /**
- * 自定义宏标记调用标签
+ * QRCode
  *
  * @version        $Id: qrcode.lib.php 1 9:29 2020年9月14日 tianya $
  * @package        DedeCMS.Taglib
@@ -13,7 +13,6 @@
 $GLOBALS['qrcode_id'] = isset($GLOBALS['qrcode_id'])? $GLOBALS['qrcode_id'] : 1;
 function lib_qrcode(&$ctag,&$refObj)
 {
-    global $dsql, $envs;
     //属性处理
     $attlist="type|,id|";
     FillAttsDefault($ctag->CAttribute->Items,$attlist);
@@ -43,7 +42,7 @@ function lib_qrcode(&$ctag,&$refObj)
     }
     
     $reval=<<<EOT
-  <a href='http://2v.dedecms.com/' id='__dedeqrcode_{$GLOBALS['qrcode_id']}'>织梦二维码生成器</a>
+  <a href='https://www.dedebiz.com/' id='__dedeqrcode_{$GLOBALS['qrcode_id']}'>二维码、二维码生成</a>
   <script type="text/javascript">
   	var __dedeqrcode_id={$GLOBALS['qrcode_id']};
   	var __dedeqrcode_aid={$id};
diff --git a/src/plus/qrcode.php b/src/plus/qrcode.php
index 641b4658..2dec544a 100755
--- a/src/plus/qrcode.php
+++ b/src/plus/qrcode.php
@@ -9,30 +9,27 @@
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
-$cfg_NotPrintHead='Y';
+$cfg_NotPrintHead = 'Y';
 
-require_once(dirname(__FILE__).'/../include/common.inc.php');
-require_once(DEDEINC.'/qrcode.class.php');
+require_once(dirname(__FILE__) . '/../include/common.inc.php');
+require_once(DEDEINC . '/qrcode.class.php');
 
-$action = isset($action)? $action : '';
-$type = isset($type)? RemoveXSS(HtmlReplace($type,3)) : '';
+$action = isset($action) ? $action : '';
+$type = isset($type) ? RemoveXSS(HtmlReplace($type, 3)) : '';
 $id = (isset($id) && is_numeric($id)) ? $id : 0;
-if ( !in_array($type,array('list','arc','index')) ) $url = "http://2v.dedecms.com";
+if (!in_array($type, array('list', 'arc', 'index'))) $url = "https://www.dedebiz.com";
 
-if ( $action=='get_qrcode' )
-{
-    if ( $type=='arc' )
-    {
-        $url = $cfg_basehost.$cfg_plus_dir.'/view.php?aid='.$id;
-    } elseif ( $type=='list' )
-    {
-        $url = $cfg_basehost.$cfg_plus_dir.'/list.php?tid='.$id;
+if ($action == 'get_qrcode') {
+    if ($type == 'arc') {
+        $url = $cfg_basehost . $cfg_plus_dir . '/view.php?aid=' . $id;
+    } elseif ($type == 'list') {
+        $url = $cfg_basehost . $cfg_plus_dir . '/list.php?tid=' . $id;
     }
-    if($id==0) $url = "http://2v.dedecms.com";
-    if ( $type=='index' ) $url = $cfg_basehost.$cfg_plus_dir.'/index.php';
+    if ($id == 0) $url = "https://www.dedebiz.com";
+    if ($type == 'index') $url = $cfg_basehost . $cfg_plus_dir . '/index.php';
 
     header("Content-Type: image/png");
-    $params=array();
+    $params = array();
     $params['data'] = $url;
     $params['size'] = 6;
     $qrcode = new DedeQrcode;
@@ -41,12 +38,10 @@ if ( $action=='get_qrcode' )
 } else {
     header("Content-Type: text/html; charset={$cfg_soft_lang}");
     $dtp = new DedeTemplate();
-	$tplfile = DEDETEMPLATE.'/plus/qrcode.htm';
+    $tplfile = DEDETEMPLATE . '/plus/qrcode.htm';
     $dtp->LoadTemplate($tplfile);
-    $dtp->SetVar('id',$id);
-    $dtp->SetVar('type',$type);
+    $dtp->SetVar('id', $id);
+    $dtp->SetVar('type', $type);
     $dtp->Display();
     exit();
 }
-
-    
\ No newline at end of file
diff --git a/src/static/img/qrcode.js b/src/static/img/qrcode.js
index c046236c..1abed27f 100755
--- a/src/static/img/qrcode.js
+++ b/src/static/img/qrcode.js
@@ -6,6 +6,6 @@ var __dedeqrcode_src = "\""+__dedeqrcode_dir+"/qrcode.php?id="+__dedeqrcode_aid+
 
 document.writeln("<ins style=\"display:inline-table;border:none;margin:0;padding:0;position:relative;visibility:visible;width:100%\">");
 document.writeln("  <ins id=\"__bfzInc_"+randNum+"\" style=\"display:block;border:none;margin:0;padding:0;position:relative;visibility:visible;width:100%\">");
-document.writeln("<iframe id=\"dede_qrcode_frame\" name=\"dede_qrcode_frame\" width=\"260\" height=\"280\" frameborder=\"0\" src="+__dedeqrcode_src+" marginwidth=\"0\" marginheight=\"0\" vspace=\"0\" hspace=\"0\" allowtransparency=\"true\" scrolling=\"no\" allowfullscreen=\"true\"></iframe>");
+document.writeln("<iframe id=\"dede_qrcode_frame\" name=\"dede_qrcode_frame\" width=\"260\" height=\"300\" style='display:block;margin:0 auto;' frameborder=\"0\" src="+__dedeqrcode_src+" marginwidth=\"0\" marginheight=\"0\" vspace=\"0\" hspace=\"0\" allowtransparency=\"true\" scrolling=\"no\" allowfullscreen=\"true\"></iframe>");
 document.writeln("  </ins>");
 document.writeln("</ins>");
\ No newline at end of file
diff --git a/src/templets/default/article_article.htm b/src/templets/default/article_article.htm
index 31865762..0a8937a0 100755
--- a/src/templets/default/article_article.htm
+++ b/src/templets/default/article_article.htm
@@ -96,6 +96,8 @@
 
                 {dede:include comment='热点内容' filename="widget_hot.htm"/}
 
+                {dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+
             </aside>
             <!-- /.article-sidebar -->
 
diff --git a/src/templets/default/article_default.htm b/src/templets/default/article_default.htm
index 9c239927..fc8c6fed 100755
--- a/src/templets/default/article_default.htm
+++ b/src/templets/default/article_default.htm
@@ -116,6 +116,8 @@
 
 				{dede:include comment='热点内容' filename="widget_hot.htm"/}
 
+				{dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+
 			</aside>
 			<!-- /.article-sidebar -->
 
diff --git a/src/templets/default/article_default_sg.htm b/src/templets/default/article_default_sg.htm
index 9c239927..fc8c6fed 100755
--- a/src/templets/default/article_default_sg.htm
+++ b/src/templets/default/article_default_sg.htm
@@ -116,6 +116,8 @@
 
 				{dede:include comment='热点内容' filename="widget_hot.htm"/}
 
+				{dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+
 			</aside>
 			<!-- /.article-sidebar -->
 
diff --git a/src/templets/default/article_image.htm b/src/templets/default/article_image.htm
index 9f9d45fe..fe8c6791 100755
--- a/src/templets/default/article_image.htm
+++ b/src/templets/default/article_image.htm
@@ -192,6 +192,8 @@
 
 				{dede:include comment='热点内容' filename="widget_hot.htm"/}
 
+				{dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+
 			</aside>
 			<!-- /.article-sidebar -->
 
diff --git a/src/templets/default/article_infos.htm b/src/templets/default/article_infos.htm
index 7aa53412..dd7c31a9 100755
--- a/src/templets/default/article_infos.htm
+++ b/src/templets/default/article_infos.htm
@@ -97,6 +97,8 @@
 
 				{dede:include comment='热点内容' filename="widget_hot_sg.htm"/}
 
+				{dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+
 			</aside>
 			<!-- /.article-sidebar -->
 
diff --git a/src/templets/default/article_shop.htm b/src/templets/default/article_shop.htm
index da12deb0..901306a7 100755
--- a/src/templets/default/article_shop.htm
+++ b/src/templets/default/article_shop.htm
@@ -101,6 +101,8 @@
 
 				{dede:include comment='热点内容' filename="widget_hot.htm"/}
 
+				{dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+
 			</aside>
 			<!-- /.article-sidebar -->
 
diff --git a/src/templets/default/article_soft.htm b/src/templets/default/article_soft.htm
index 3245e18a..10748e99 100755
--- a/src/templets/default/article_soft.htm
+++ b/src/templets/default/article_soft.htm
@@ -106,6 +106,8 @@
 
 				{dede:include comment='热点内容' filename="widget_hot.htm"/}
 
+				{dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+
 			</aside>
 			<!-- /.article-sidebar -->
 
diff --git a/src/templets/default/article_spec.htm b/src/templets/default/article_spec.htm
index 8539dcad..c937aae4 100755
--- a/src/templets/default/article_spec.htm
+++ b/src/templets/default/article_spec.htm
@@ -68,6 +68,8 @@
 
 				{dede:include comment='热点内容' filename="widget_hot.htm"/}
 
+				{dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+
 			</aside>
 			<!-- /.article-sidebar -->
 
diff --git a/src/templets/default/index.htm b/src/templets/default/index.htm
index 04f26d68..e95ead8c 100755
--- a/src/templets/default/index.htm
+++ b/src/templets/default/index.htm
@@ -164,6 +164,8 @@
                 {dede:include comment='热点内容' filename="widget_hot.htm"/}
 
                 {dede:include comment='投票' filename="widget_vote.htm"/}
+
+                {dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
             </aside><!-- /aside -->
         </div>
     </main>
diff --git a/src/templets/default/index_article.htm b/src/templets/default/index_article.htm
index c5024b20..4f7be00f 100755
--- a/src/templets/default/index_article.htm
+++ b/src/templets/default/index_article.htm
@@ -34,7 +34,7 @@
       <!-- /.position -->
     </div>
 
-    <main class="container mt-3">
+    <main class="container">
         <div class="row">
             <div class="col-12 col-lg-9 index-left">
               <div class="row">
@@ -68,6 +68,8 @@
               {dede:include comment='推荐内容' filename="widget_recommend.htm"/}
 
               {dede:include comment='热点内容' filename="widget_hot.htm"/}
+
+              {dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
             </aside><!-- /aside -->
         </div>
     </main>
diff --git a/src/templets/default/index_default.htm b/src/templets/default/index_default.htm
index f76b0197..9822a627 100755
--- a/src/templets/default/index_default.htm
+++ b/src/templets/default/index_default.htm
@@ -34,7 +34,7 @@
 		<!-- /.position -->
 	</div>
 
-    <main class="container mt-3">
+    <main class="container">
 
         <div class="row">
             <div class="col-12 col-lg-9 index-left">
@@ -69,6 +69,8 @@
               {dede:include comment='推荐内容' filename="widget_recommend.htm"/}
 
               {dede:include comment='热点内容' filename="widget_hot.htm"/}
+
+              {dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
             </aside><!-- /aside -->
         </div>
     </main>
diff --git a/src/templets/default/index_default_sg.htm b/src/templets/default/index_default_sg.htm
index 75fae38a..3ae5ebbb 100755
--- a/src/templets/default/index_default_sg.htm
+++ b/src/templets/default/index_default_sg.htm
@@ -34,7 +34,7 @@
 		<!-- /.position -->
 	</div>
 
-	<main class="container mt-3">
+	<main class="container">
 		<div class="row">
 			<div class="col-12 col-lg-9 index-left">
 				<div class="row">
@@ -68,6 +68,8 @@
 				{dede:include comment='推荐内容' filename="widget_recommend_sg.htm"/}
 
 				{dede:include comment='热点内容' filename="widget_hot_sg.htm"/}
+
+				{dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
 			</aside><!-- /aside -->
 		</div>
 	</main>
diff --git a/src/templets/default/index_image.htm b/src/templets/default/index_image.htm
index 8a647c18..eeacab34 100755
--- a/src/templets/default/index_image.htm
+++ b/src/templets/default/index_image.htm
@@ -2,85 +2,87 @@
 <html lang="zh-CN">
 
 <head>
-    <meta charset="{dede:global.cfg_soft_lang/}">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/bootstrap.min.css">
-    <link href="{dede:global.cfg_cmsurl/}/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
-    <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/dede.css">
-    <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/index.css">
-    <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.png">
-    <script src="{dede:global.cfg_cmsurl/}/static/js/jquery.min.js"></script>
-    <title>{dede:global.cfg_webname/}</title>
-    <meta name="keywords" content="{dede:global.cfg_keywords/}">
-    <meta name="description" content="{dede:global.cfg_description/}">
+  <meta charset="{dede:global.cfg_soft_lang/}">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/bootstrap.min.css">
+  <link href="{dede:global.cfg_cmsurl/}/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
+  <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/dede.css">
+  <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/index.css">
+  <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.png">
+  <script src="{dede:global.cfg_cmsurl/}/static/js/jquery.min.js"></script>
+  <title>{dede:global.cfg_webname/}</title>
+  <meta name="keywords" content="{dede:global.cfg_keywords/}">
+  <meta name="description" content="{dede:global.cfg_description/}">
 </head>
 
 <body>
-    {dede:include filename="top.htm"/}
-      
-    {dede:include filename="header.htm"/}
+  {dede:include filename="top.htm"/}
 
-	{dede:include filename="navbar.htm"/}
-	
-	<div class="container">
-		<div class="position">
-			<nav aria-label="breadcrumb">
-				<ol class="breadcrumb mb-0">
-					<li class="breadcrumb-item">当前位置</li>
-					{dede:field name='position'/}
-				</ol>
-			</nav>
-		</div>
-		<!-- /.position -->
-	</div>
+  {dede:include filename="header.htm"/}
 
-    <main class="container">
+  {dede:include filename="navbar.htm"/}
+
+  <div class="container">
+    <div class="position">
+      <nav aria-label="breadcrumb">
+        <ol class="breadcrumb mb-0">
+          <li class="breadcrumb-item">当前位置</li>
+          {dede:field name='position'/}
+        </ol>
+      </nav>
+    </div>
+    <!-- /.position -->
+  </div>
+
+  <main class="container">
+    <div class="row">
+      <div class="col-12 col-lg-9 index-left">
         <div class="row">
-            <div class="col-12 col-lg-9 index-left">
-              <div class="row">
-                {dede:channelartlist}
-                <div class="col-md-12 mb-3">
-                  <div class="card ddcard-normal">
-                      <div class="card-header">
-                          <div class="row">
-                              <div class="col-6 caption"><span><a href="{dede:field name='typeurl'/}">{dede:field name='typename'/}</a></span></div>
-                              <div class="col-6 d-flex justify-content-end more">
-                                <a href="{dede:field name='typeurl'/}">更多</a>
-                              </div>
-                          </div>
+          {dede:channelartlist}
+          <div class="col-md-12 mb-3">
+            <div class="card ddcard-normal">
+              <div class="card-header">
+                <div class="row">
+                  <div class="col-6 caption"><span><a href="{dede:field name='typeurl'/}">{dede:field
+                        name='typename'/}</a></span></div>
+                  <div class="col-6 d-flex justify-content-end more">
+                    <a href="{dede:field name='typeurl'/}">更多</a>
+                  </div>
+                </div>
+              </div>
+              <div class="row row-cols-2 row-cols-md-4 pt-3">
+                {dede:arclist row=4}
+                <div class="col">
+                  <div class="card border-0 image-item">
+                    <a href="[field:arcurl/]" title="[field:fulltitle/]" class="text-body stretched-link"><img
+                        src="[field:litpic/]" class="card-img-top" alt="[field:fulltitle/]">
+                      <div class="card-body">
+                        <h6 class="card-title">[field:title/]</h6>
                       </div>
-					  <div class="row row-cols-2 row-cols-md-4 pt-3">
-						{dede:arclist row=4}
-						  <div class="col">
-							  <div class="card border-0 image-item">
-								  <a href="[field:arcurl/]" title="[field:fulltitle/]" class="text-body stretched-link"><img
-										  src="[field:litpic/]" class="card-img-top" alt="[field:fulltitle/]">
-									  <div class="card-body">
-										  <h6 class="card-title">[field:title/]</h6>
-									  </div>
-								  </a>
-							  </div>
-						  </div>
-						  {/dede:arclist}
-					  </div>
+                    </a>
                   </div>
                 </div>
-                {/dede:channelartlist}
+                {/dede:arclist}
               </div>
+            </div>
+          </div>
+          {/dede:channelartlist}
+        </div>
 
-            </div><!-- /.index-left -->
-            <aside class="col-12 col-lg-3">
+      </div><!-- /.index-left -->
+      <aside class="col-12 col-lg-3">
 
-              {dede:include comment='推荐内容' filename="widget_recommend.htm"/}
+        {dede:include comment='推荐内容' filename="widget_recommend.htm"/}
 
-              {dede:include comment='热点内容' filename="widget_hot.htm"/}
-            </aside><!-- /aside -->
-        </div>
-    </main>
-    <!-- /main -->
+        {dede:include comment='热点内容' filename="widget_hot.htm"/}
 
-    {dede:include filename="footer.htm"/}
-</body>
+        {dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+      </aside><!-- /aside -->
+    </div>
+  </main>
+  <!-- /main -->
 
-</html>
+  {dede:include filename="footer.htm"/}
+</body>
 
+</html>
\ No newline at end of file
diff --git a/src/templets/default/index_infos.htm b/src/templets/default/index_infos.htm
index 1915a867..435c7a5a 100755
--- a/src/templets/default/index_infos.htm
+++ b/src/templets/default/index_infos.htm
@@ -68,6 +68,8 @@
               {dede:include comment='推荐内容' filename="widget_recommend_sg.htm"/}
 
               {dede:include comment='热点内容' filename="widget_hot_sg.htm"/}
+
+              {dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
             </aside><!-- /aside -->
         </div>
     </main>
diff --git a/src/templets/default/index_shop.htm b/src/templets/default/index_shop.htm
index e87fe1f3..081234f4 100755
--- a/src/templets/default/index_shop.htm
+++ b/src/templets/default/index_shop.htm
@@ -2,79 +2,80 @@
 <html lang="zh-CN">
 
 <head>
-    <meta charset="{dede:global.cfg_soft_lang/}">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/bootstrap.min.css">
-    <link href="{dede:global.cfg_cmsurl/}/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
-    <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/dede.css">
-    <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/index.css">
-    <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.png">
-    <script src="{dede:global.cfg_cmsurl/}/static/js/jquery.min.js"></script>
-    <title>{dede:global.cfg_webname/}</title>
-    <meta name="keywords" content="{dede:global.cfg_keywords/}">
-    <meta name="description" content="{dede:global.cfg_description/}">
+  <meta charset="{dede:global.cfg_soft_lang/}">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/bootstrap.min.css">
+  <link href="{dede:global.cfg_cmsurl/}/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
+  <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/dede.css">
+  <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/index.css">
+  <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.png">
+  <script src="{dede:global.cfg_cmsurl/}/static/js/jquery.min.js"></script>
+  <title>{dede:global.cfg_webname/}</title>
+  <meta name="keywords" content="{dede:global.cfg_keywords/}">
+  <meta name="description" content="{dede:global.cfg_description/}">
 </head>
 
 <body>
-    {dede:include filename="top.htm"/}
-      
-    {dede:include filename="header.htm"/}
+  {dede:include filename="top.htm"/}
 
-	{dede:include filename="navbar.htm"/}
-	
-	<div class="container">
-		<div class="position">
-			<nav aria-label="breadcrumb">
-				<ol class="breadcrumb mb-0">
-					<li class="breadcrumb-item">当前位置</li>
-					{dede:field name='position'/}
-				</ol>
-			</nav>
-		</div>
-		<!-- /.position -->
-	</div>
+  {dede:include filename="header.htm"/}
 
-    <main class="container">
+  {dede:include filename="navbar.htm"/}
+
+  <div class="container">
+    <div class="position">
+      <nav aria-label="breadcrumb">
+        <ol class="breadcrumb mb-0">
+          <li class="breadcrumb-item">当前位置</li>
+          {dede:field name='position'/}
+        </ol>
+      </nav>
+    </div>
+    <!-- /.position -->
+  </div>
+
+  <main class="container">
+    <div class="row">
+      <div class="col-12 col-lg-9 index-left">
         <div class="row">
-            <div class="col-12 col-lg-9 index-left">
-              <div class="row">
-                {dede:channelartlist}
-                <div class="col-md-6 mb-3">
-                  <div class="card ddcard-normal">
-                      <div class="card-header">
-                          <div class="row">
-                              <div class="col-6 caption"><span><a href="{dede:field name='typeurl'/}">{dede:field name='typename'/}</a></span></div>
-                              <div class="col-6 d-flex justify-content-end more">
-                                <a href="{dede:field name='typeurl'/}">更多</a>
-                              </div>
-                          </div>
-                      </div>
-                      <ul class="list-group list-group-flush">
-                          {dede:arclist titlelen='60' row='8'}
-                          <li><i class="fa fa-bookmark-o" aria-hidden="true"></i> <a
-                                  title="[field:fulltitle/]"
-                                  href="[field:arcurl/]">[field:title/]</a>
-                          </li>
-                          {/dede:arclist}
-                      </ul>
+          {dede:channelartlist}
+          <div class="col-md-6 mb-3">
+            <div class="card ddcard-normal">
+              <div class="card-header">
+                <div class="row">
+                  <div class="col-6 caption"><span><a href="{dede:field name='typeurl'/}">{dede:field
+                        name='typename'/}</a></span></div>
+                  <div class="col-6 d-flex justify-content-end more">
+                    <a href="{dede:field name='typeurl'/}">更多</a>
                   </div>
                 </div>
-                {/dede:channelartlist}
               </div>
+              <ul class="list-group list-group-flush">
+                {dede:arclist titlelen='60' row='8'}
+                <li><i class="fa fa-bookmark-o" aria-hidden="true"></i> <a title="[field:fulltitle/]"
+                    href="[field:arcurl/]">[field:title/]</a>
+                </li>
+                {/dede:arclist}
+              </ul>
+            </div>
+          </div>
+          {/dede:channelartlist}
+        </div>
 
-            </div><!-- /.index-left -->
-            <aside class="col-12 col-lg-3">
+      </div><!-- /.index-left -->
+      <aside class="col-12 col-lg-3">
 
-              {dede:include comment='推荐内容' filename="widget_recommend.htm"/}
+        {dede:include comment='推荐内容' filename="widget_recommend.htm"/}
 
-              {dede:include comment='热点内容' filename="widget_hot.htm"/}
-            </aside><!-- /aside -->
-        </div>
-    </main>
-    <!-- /main -->
+        {dede:include comment='热点内容' filename="widget_hot.htm"/}
 
-    {dede:include filename="footer.htm"/}
-</body>
+        {dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+      </aside><!-- /aside -->
+    </div>
+  </main>
+  <!-- /main -->
 
-</html>
+  {dede:include filename="footer.htm"/}
+</body>
 
+</html>
\ No newline at end of file
diff --git a/src/templets/default/index_soft.htm b/src/templets/default/index_soft.htm
index e87fe1f3..081234f4 100755
--- a/src/templets/default/index_soft.htm
+++ b/src/templets/default/index_soft.htm
@@ -2,79 +2,80 @@
 <html lang="zh-CN">
 
 <head>
-    <meta charset="{dede:global.cfg_soft_lang/}">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/bootstrap.min.css">
-    <link href="{dede:global.cfg_cmsurl/}/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
-    <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/dede.css">
-    <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/index.css">
-    <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.png">
-    <script src="{dede:global.cfg_cmsurl/}/static/js/jquery.min.js"></script>
-    <title>{dede:global.cfg_webname/}</title>
-    <meta name="keywords" content="{dede:global.cfg_keywords/}">
-    <meta name="description" content="{dede:global.cfg_description/}">
+  <meta charset="{dede:global.cfg_soft_lang/}">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/bootstrap.min.css">
+  <link href="{dede:global.cfg_cmsurl/}/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
+  <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/dede.css">
+  <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/index.css">
+  <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.png">
+  <script src="{dede:global.cfg_cmsurl/}/static/js/jquery.min.js"></script>
+  <title>{dede:global.cfg_webname/}</title>
+  <meta name="keywords" content="{dede:global.cfg_keywords/}">
+  <meta name="description" content="{dede:global.cfg_description/}">
 </head>
 
 <body>
-    {dede:include filename="top.htm"/}
-      
-    {dede:include filename="header.htm"/}
+  {dede:include filename="top.htm"/}
 
-	{dede:include filename="navbar.htm"/}
-	
-	<div class="container">
-		<div class="position">
-			<nav aria-label="breadcrumb">
-				<ol class="breadcrumb mb-0">
-					<li class="breadcrumb-item">当前位置</li>
-					{dede:field name='position'/}
-				</ol>
-			</nav>
-		</div>
-		<!-- /.position -->
-	</div>
+  {dede:include filename="header.htm"/}
 
-    <main class="container">
+  {dede:include filename="navbar.htm"/}
+
+  <div class="container">
+    <div class="position">
+      <nav aria-label="breadcrumb">
+        <ol class="breadcrumb mb-0">
+          <li class="breadcrumb-item">当前位置</li>
+          {dede:field name='position'/}
+        </ol>
+      </nav>
+    </div>
+    <!-- /.position -->
+  </div>
+
+  <main class="container">
+    <div class="row">
+      <div class="col-12 col-lg-9 index-left">
         <div class="row">
-            <div class="col-12 col-lg-9 index-left">
-              <div class="row">
-                {dede:channelartlist}
-                <div class="col-md-6 mb-3">
-                  <div class="card ddcard-normal">
-                      <div class="card-header">
-                          <div class="row">
-                              <div class="col-6 caption"><span><a href="{dede:field name='typeurl'/}">{dede:field name='typename'/}</a></span></div>
-                              <div class="col-6 d-flex justify-content-end more">
-                                <a href="{dede:field name='typeurl'/}">更多</a>
-                              </div>
-                          </div>
-                      </div>
-                      <ul class="list-group list-group-flush">
-                          {dede:arclist titlelen='60' row='8'}
-                          <li><i class="fa fa-bookmark-o" aria-hidden="true"></i> <a
-                                  title="[field:fulltitle/]"
-                                  href="[field:arcurl/]">[field:title/]</a>
-                          </li>
-                          {/dede:arclist}
-                      </ul>
+          {dede:channelartlist}
+          <div class="col-md-6 mb-3">
+            <div class="card ddcard-normal">
+              <div class="card-header">
+                <div class="row">
+                  <div class="col-6 caption"><span><a href="{dede:field name='typeurl'/}">{dede:field
+                        name='typename'/}</a></span></div>
+                  <div class="col-6 d-flex justify-content-end more">
+                    <a href="{dede:field name='typeurl'/}">更多</a>
                   </div>
                 </div>
-                {/dede:channelartlist}
               </div>
+              <ul class="list-group list-group-flush">
+                {dede:arclist titlelen='60' row='8'}
+                <li><i class="fa fa-bookmark-o" aria-hidden="true"></i> <a title="[field:fulltitle/]"
+                    href="[field:arcurl/]">[field:title/]</a>
+                </li>
+                {/dede:arclist}
+              </ul>
+            </div>
+          </div>
+          {/dede:channelartlist}
+        </div>
 
-            </div><!-- /.index-left -->
-            <aside class="col-12 col-lg-3">
+      </div><!-- /.index-left -->
+      <aside class="col-12 col-lg-3">
 
-              {dede:include comment='推荐内容' filename="widget_recommend.htm"/}
+        {dede:include comment='推荐内容' filename="widget_recommend.htm"/}
 
-              {dede:include comment='热点内容' filename="widget_hot.htm"/}
-            </aside><!-- /aside -->
-        </div>
-    </main>
-    <!-- /main -->
+        {dede:include comment='热点内容' filename="widget_hot.htm"/}
 
-    {dede:include filename="footer.htm"/}
-</body>
+        {dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+      </aside><!-- /aside -->
+    </div>
+  </main>
+  <!-- /main -->
 
-</html>
+  {dede:include filename="footer.htm"/}
+</body>
 
+</html>
\ No newline at end of file
diff --git a/src/templets/default/list_article.htm b/src/templets/default/list_article.htm
index 41a539c1..ca4d4cf0 100755
--- a/src/templets/default/list_article.htm
+++ b/src/templets/default/list_article.htm
@@ -74,6 +74,8 @@
 
                 {dede:include comment='热点内容' filename="widget_hot.htm"/}
 
+                {dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+
             </aside>
             <!-- /.article-sidebar -->
 
diff --git a/src/templets/default/list_default.htm b/src/templets/default/list_default.htm
index c13250e4..8f5b22d3 100755
--- a/src/templets/default/list_default.htm
+++ b/src/templets/default/list_default.htm
@@ -74,6 +74,8 @@
 
                 {dede:include comment='热点内容' filename="widget_hot.htm"/}
 
+                {dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+
             </aside>
             <!-- /.article-sidebar -->
 
diff --git a/src/templets/default/list_default_sg.htm b/src/templets/default/list_default_sg.htm
index 7662b8a2..55fc9aa3 100755
--- a/src/templets/default/list_default_sg.htm
+++ b/src/templets/default/list_default_sg.htm
@@ -74,6 +74,8 @@
 
                 {dede:include comment='热点内容' filename="widget_hot_sg.htm"/}
 
+                {dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+
             </aside>
             <!-- /.article-sidebar -->
 
diff --git a/src/templets/default/list_free.htm b/src/templets/default/list_free.htm
index 8d64d84c..78a07fd9 100755
--- a/src/templets/default/list_free.htm
+++ b/src/templets/default/list_free.htm
@@ -55,6 +55,8 @@
 
                 {dede:include comment='热点内容' filename="widget_hot.htm"/}
 
+                {dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+
             </aside>
             <!-- /.article-sidebar -->
 
diff --git a/src/templets/default/list_image.htm b/src/templets/default/list_image.htm
index c8158aa9..977c1fd2 100755
--- a/src/templets/default/list_image.htm
+++ b/src/templets/default/list_image.htm
@@ -68,6 +68,8 @@
 
                 {dede:include comment='热点内容' filename="widget_hot.htm"/}
 
+                {dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+
             </aside>
             <!-- /.article-sidebar -->
 
diff --git a/src/templets/default/list_infos.htm b/src/templets/default/list_infos.htm
index d7599242..bfd0a8a6 100755
--- a/src/templets/default/list_infos.htm
+++ b/src/templets/default/list_infos.htm
@@ -134,6 +134,8 @@
 
 				{dede:include comment='热点内容' filename="widget_hot_sg.htm"/}
 
+				{dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+
 			</aside>
 			<!-- /.article-sidebar -->
 
diff --git a/src/templets/default/list_shop.htm b/src/templets/default/list_shop.htm
index f526b6f8..59bb25d2 100755
--- a/src/templets/default/list_shop.htm
+++ b/src/templets/default/list_shop.htm
@@ -76,6 +76,8 @@
 
                 {dede:include comment='热点内容' filename="widget_hot.htm"/}
 
+                {dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+
             </aside>
             <!-- /.article-sidebar -->
 
diff --git a/src/templets/default/list_soft.htm b/src/templets/default/list_soft.htm
index 76e152aa..c8716aa5 100755
--- a/src/templets/default/list_soft.htm
+++ b/src/templets/default/list_soft.htm
@@ -76,6 +76,8 @@
 
                 {dede:include comment='热点内容' filename="widget_hot.htm"/}
 
+                {dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+
             </aside>
             <!-- /.article-sidebar -->
 
diff --git a/src/templets/default/list_spec.htm b/src/templets/default/list_spec.htm
index f9a02ccc..2f735fd5 100755
--- a/src/templets/default/list_spec.htm
+++ b/src/templets/default/list_spec.htm
@@ -77,6 +77,8 @@
 
                 {dede:include comment='热点内容' filename="widget_hot.htm"/}
 
+                {dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+
             </aside>
             <!-- /.article-sidebar -->
 
diff --git a/src/templets/default/widget_qrcode.htm b/src/templets/default/widget_qrcode.htm
new file mode 100644
index 00000000..cfe7845b
--- /dev/null
+++ b/src/templets/default/widget_qrcode.htm
@@ -0,0 +1,11 @@
+<div class="card ddcard pt-3">
+    <div class="card-header">
+        <div class="row">
+            <div class="col-12 caption"><span>二维码</span></div>
+        </div>
+    </div>
+    <div>
+        {dede:qrcode/}
+    </div>
+</div>
+<!-- /.ddcard -->
\ No newline at end of file
diff --git a/src/templets/plus/qrcode.htm b/src/templets/plus/qrcode.htm
index f42fb4e5..9eef7e02 100755
--- a/src/templets/plus/qrcode.htm
+++ b/src/templets/plus/qrcode.htm
@@ -1,50 +1,57 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html
+	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<title>扫描二维码</title>
-		<meta http-equiv="Content-Type" content="text/html; charset={dede:global.cfg_soft_lang/}" />
-		<meta name="generator" content="DedeCMS V5.6" />
-		<meta name="author" content="desdev.cn" />
-		<style type="text/css">
-			body{
-				margin: 0;
-			}
-			.dede_weixin_popup {
-			 padding: 10px;
-			  width: 240px;
-			  height: 300px;
-			  background: #fff;
-			  font-size: 12px;
-			}.dede_weixin_popup .dede_weixin_popup_head {
-			  font-size: 12px;
-			  font-weight: bold;
-			  text-align: left;
-			  line-height: 16px;
-			  height: 16px;
-			  position: relative;
-			  color: #000;
-			}.dede_weixin_popup .dede_weixin_popup_foot {
-			  font-size: 12px;
-			  text-align: left;
-			  line-height: 22px;
-			  color: #666;
-			}
-		</style>
-	</head>
-	<body>
-		<div id="dede_weixin_qrcode_dialog" class="dede_weixin_popup" style="left: 516px; top: 9606.5px; width: 240px; height: 230px;">
-			<div class="dede_weixin_popup_head"><span>分享到微信朋友圈</span>
-			</div>
-			<div id="dede_weixin_qrcode_dialog_qr" class="dede_weixin_popup_main">
-				<center>
-					<a href="http://2v.dedecms.com/" target="_blank">
-						<img src="{dede:global name='cfg_plus_dir'/}/qrcode.php?action=get_qrcode&type={dede:var name='type'/}&id={dede:var name='id'/}" width="" height="" border="0" alt="">
-					</a>
-				</center>
-			</div>
-			<div class="dede_weixin_popup_foot">打开微信，点击底部的“发现”，
-				<br>使用“扫一扫”即可将网页分享至朋友圈。</div>
+<head>
+	<title>扫描二维码</title>
+	<meta http-equiv="Content-Type" content="text/html; charset={dede:global.cfg_soft_lang/}" />
+	<style type="text/css">
+		body {
+			margin: 0;
+		}
+
+		.dede_weixin_popup {
+			padding: 10px;
+			width: 240px;
+			height: 300px;
+			background: #fff;
+			font-size: 12px;
+		}
+
+		.dede_weixin_popup .dede_weixin_popup_head {
+			font-size: 12px;
+			font-weight: bold;
+			text-align: left;
+			line-height: 16px;
+			height: 16px;
+			position: relative;
+			color: #000;
+		}
+
+		.dede_weixin_popup .dede_weixin_popup_foot {
+			font-size: 12px;
+			text-align: left;
+			line-height: 22px;
+			color: #666;
+			text-align: center;
+		}
+	</style>
+</head>
+<body>
+	<div id="dede_weixin_qrcode_dialog" class="dede_weixin_popup"
+		style="width: 240px; height: 300px;">
+		<div class="dede_weixin_popup_head"><span>分享到微信朋友圈</span>
+		</div>
+		<div id="dede_weixin_qrcode_dialog_qr" class="dede_weixin_popup_main">
+			<center>
+				<a href="https://www.dedebiz.com/" title="二维码/二维码生成" target="_blank">
+					<img src="{dede:global name='cfg_plus_dir'/}/qrcode.php?action=get_qrcode&type={dede:var name='type'/}&id={dede:var name='id'/}"
+						border="0" alt="">
+				</a>
+			</center>
 		</div>
-	</body>
+		<div class="dede_weixin_popup_foot">打开微信或扫码工具，使用“扫一扫”
+		<br>访问后即可将网页分享至朋友圈。</div>
+	</div>
+</body>
 
 </html>
\ No newline at end of file