From 52d4b7927b9fac351049d1d1b92bb30064ba03b4 Mon Sep 17 00:00:00 2001
From: liuyiwuqing <1520431201@qq.com>
Date: Fri, 2 Aug 2024 15:28:50 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BC=98=E5=8C=96=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E8=AE=BF=E9=97=AE=EF=BC=8C=E5=AE=9E=E7=8E=B0=E8=81=94=E5=8A=A8?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E5=8A=A8=E6=80=81=E5=90=AF=E7=94=A8=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=EF=BC=9B=202.=20=E6=96=87=E7=AB=A0=E6=B5=B7=E6=8A=A5?=
 =?UTF-8?q?=E5=88=86=E4=BA=AB=E6=94=AF=E6=8C=81=E5=8A=A8=E6=80=81=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E7=A0=81=EF=BC=9B=203.=20=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=89=AB=E6=8F=8F=E6=96=87=E7=AB=A0=E6=B5=B7=E6=8A=A5=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E6=8C=87=E5=AE=9A=E6=96=87=E7=AB=A0=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/v2/all.api.js                        | 12 +++++++
 pages/index/index.vue                    | 44 ++++++++++++++++++------
 pagesA/article-detail/article-detail.vue | 18 ++++++++--
 3 files changed, 61 insertions(+), 13 deletions(-)

diff --git a/api/v2/all.api.js b/api/v2/all.api.js
index 6b13cca..b27409a 100644
--- a/api/v2/all.api.js
+++ b/api/v2/all.api.js
@@ -200,5 +200,17 @@ export default {
 	 */
 	submitLink(form) {
 		return HttpHandler.Post(`/apis/linksSubmit.muyin.site/v1alpha1/submit`, form, null)
+	},
+	/**
+	 * 获取二维码信息
+	 */
+	getQRCodeInfo: (key) => {
+		return HttpHandler.Get(`/apis/api.uni.uhalo.pro/v1alpha1/plugins/plugin-uni-halo/getQRCodeInfo/${key}`, null,)
+	},
+	/**
+	 * 获取二维码图片
+	 */
+	getQRCodeImg: (postId) => {
+		return HttpHandler.Get(`/apis/api.uni.uhalo.pro/v1alpha1/plugins/plugin-uni-halo/getQRCodeImg/${postId}`, null,)
 	}
 }
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 843168d..0507221 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -5,24 +5,37 @@
 <script>
 const homePagePath = '/pages/tabbar/home/home'
 const startPagePath = '/pagesA/start/start'
+const articleDetailPath = '/pagesA/article-detail/article-detail';
 export default {
     computed: {
         configs() {
             return this.$tm.vx.getters().getConfigs;
         }
     },
-    onLoad() {
-        uni.$tm.vx.actions('config/fetchConfigs').then((res) => {
-            // #ifdef MP-WEIXIN
-            // uni.$tm.vx.commit('setWxShare', res.shareConfig);
-            // #endif
-            this.fnCheckShowStarted();
-        }).catch((err) => {
-            uni.switchTab({
-                url: homePagePath
+  onLoad: function (options) {
+    uni.$tm.vx.actions('config/fetchConfigs').then(async (res) => {
+      if (options.scene) {
+        if ('' !== options.scene) {
+          const postId = await this.getPostIdByQRCode(options.scene);
+          if (postId) {
+            uni.redirectTo({
+              url: articleDetailPath + `?name=${postId}`,
+              animationType: 'slide-in-right'
             });
-        })
-    },
+          }
+        }
+      }
+
+      // #ifdef MP-WEIXIN
+      // uni.$tm.vx.commit('setWxShare', res.shareConfig);
+      // #endif
+      this.fnCheckShowStarted();
+    }).catch((err) => {
+      uni.switchTab({
+        url: homePagePath
+      });
+    })
+  },
     methods: {
         fnCheckShowStarted() {
             if (!this.configs.appConfig.startConfig.enabled) {
@@ -51,6 +64,15 @@ export default {
                     url: startPagePath
                 });
             }
+        },
+        async getPostIdByQRCode(key) {
+          const response = await this.$httpApi.v2.getQRCodeInfo(key);
+          if (response) {
+            if(response && response.postId) {
+              return response.postId;
+            }
+          }
+          return null;
         }
     }
 };
diff --git a/pagesA/article-detail/article-detail.vue b/pagesA/article-detail/article-detail.vue
index 82868a3..535d28c 100644
--- a/pagesA/article-detail/article-detail.vue
+++ b/pagesA/article-detail/article-detail.vue
@@ -232,6 +232,7 @@ import commentModal from '@/components/comment-modal/comment-modal.vue';
 
 import rCanvas from '@/components/r-canvas/r-canvas.vue';
 import barrage from '@/components/barrage/barrage.vue';
+import {getAppConfigs} from '@/config/index.js'
 
 export default {
     components: {
@@ -358,7 +359,9 @@ export default {
                     }
                     const visitFlag = uni.getStorageSync('visit_' + this.result?.metadata?.name);
 
-                    if (!visitFlag) {
+                    const toolsPluginEnabled = getAppConfigs().pluginConfig.toolsPlugin?.enabled;
+
+                    if (toolsPluginEnabled && !visitFlag) {
                         const annotationsMap = res?.metadata?.annotations;
                         if (('restrictReadEnable' in annotationsMap) && annotationsMap.restrictReadEnable ===
                             'true') {
@@ -631,9 +634,10 @@ export default {
 
                 this.drawDashedLine(this.$refs.rCanvas.ctx, 14, 356, 332, 0.5, [8, 5, 5, 5], '#999');
                 // 小程序信息
+                const _qrCodeImageUrl = await this.qrCodeImageUrl();
                 await this.$refs.rCanvas
                     .drawImage({
-                        url: this.$utils.checkImageUrl(this.haloConfigs?.appConfig?.appInfo?.qrCodeImageUrl),
+                        url: this.$utils.checkImageUrl(_qrCodeImageUrl),
                         x: 20,
                         y: 360,
                         w: 80,
@@ -924,6 +928,16 @@ export default {
                     return;
             }
         },
+        async qrCodeImageUrl() {
+          const useDynamicQRCode = this.haloConfigs?.appConfig?.appInfo?.useDynamicQRCode;
+          if (useDynamicQRCode) {
+            const qrCodeImg = await this.$httpApi.v2.getQRCodeImg(this.result.metadata.name);
+            return qrCodeImg;
+          } else {
+            return this.haloConfigs?.appConfig?.appInfo?.qrCodeImageUrl;
+          }
+        }
+
     }
 };
 </script>