fix: 修复h5二维码无法跳转

wangyuan389 · Feb 14, 2022 · d15aac3 · d15aac3
1 parent 3339ae9
commit d15aac3
Show file tree

Hide file tree

Showing 3 changed files with 82 additions and 78 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
  * @Autor: WangYuan
  * @Date: 2021-12-20 14:20:57
  * @LastEditors: WangYuan
- * @LastEditTime: 2022-02-12 17:34:47
+ * @LastEditTime: 2022-02-14 09:44:58
 -->
 <!-- [English](./README.md) | 简体中文  -->
 
@@ -33,7 +33,7 @@ Mall-Cook 是一个基于 vue 开发的可视化商城搭建平台，包括多
 
 - 支持构建 H5、微信小程序多端商城
 - 利用 uni-app 重构物料库与模板项目
-- 修改项目为 [ root -> child project ] 结构，支持多个子项目独立存在
+- 修改为 Monorepo 风格项目结构，支持多个子项目独立存在
 
 ## 体验
 

diff --git a/packages/mall-cook-platform/public/index.html b/packages/mall-cook-platform/public/index.html
@@ -3,7 +3,7 @@
  * @Autor: WangYuan
  * @Date: 2021-05-19 09:49:33
  * @LastEditors: WangYuan
- * @LastEditTime: 2022-02-12 17:44:00
+ * @LastEditTime: 2022-02-14 09:47:50
 -->
 <!DOCTYPE html>
 <html lang="">
@@ -17,89 +17,93 @@
       rel="stylesheet"
       href="//at.alicdn.com/t/font_3164793_o7i0prkh7y.css"
     />
-    <style media="screen" type="text/css">
-      #appLoading {
-        width: 100%;
-        height: 100%;
-      }
-
-      .spinner {
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        width: 40px;
-        height: 40px;
-        transform: translate(-50%, -50%);
-      }
-
-      .spinner > div {
-        background-color: #155bd4;
-        height: 100%;
-        width: 6px;
-        display: inline-block;
-
-        -webkit-animation: sk-stretchdelay 1.2s infinite ease-in-out;
-        animation: sk-stretchdelay 1.2s infinite ease-in-out;
-      }
-
-      .spinner .rect2 {
-        -webkit-animation-delay: -1.1s;
-        animation-delay: -1.1s;
-      }
-
-      .spinner .rect3 {
-        -webkit-animation-delay: -1s;
-        animation-delay: -1s;
-      }
-
-      .spinner .rect4 {
-        -webkit-animation-delay: -0.9s;
-        animation-delay: -0.9s;
-      }
-
-      @-webkit-keyframes sk-stretchdelay {
-        0%,
-        40%,
-        100% {
-          -webkit-transform: scaleY(0.4);
-        }
-        20% {
-          -webkit-transform: scaleY(1);
-        }
-      }
-
-      @keyframes sk-stretchdelay {
-        0%,
-        40%,
-        100% {
-          transform: scaleY(0.4);
-          -webkit-transform: scaleY(0.4);
-        }
-        20% {
-          transform: scaleY(1);
-          -webkit-transform: scaleY(1);
-        }
-      }
-    </style>
+
     <title><%= htmlWebpackPlugin.options.title %></title>
   </head>
   <body>
-    <div id="appLoading">
-      <div class="spinner">
-        <div class="rect1"></div>
-        <div class="rect2"></div>
-        <div class="rect3"></div>
-        <div class="rect4"></div>
-      </div>
-    </div>
     <noscript>
       <strong
         >We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work
         properly without JavaScript enabled. Please enable it to
         continue.</strong
       >
     </noscript>
-    <div id="app"></div>
+
+    <div id="app">
+      <div id="appLoading">
+        <div class="spinner">
+          <div class="rect1"></div>
+          <div class="rect2"></div>
+          <div class="rect3"></div>
+          <div class="rect4"></div>
+        </div>
+      </div>
+
+      <style media="screen" type="text/css">
+        #appLoading {
+          width: 100%;
+          height: 100%;
+        }
+
+        .spinner {
+          position: absolute;
+          top: 50%;
+          left: 50%;
+          width: 40px;
+          height: 40px;
+          transform: translate(-50%, -50%);
+        }
+
+        .spinner > div {
+          background-color: #155bd4;
+          height: 100%;
+          width: 6px;
+          display: inline-block;
+
+          -webkit-animation: sk-stretchdelay 1.2s infinite ease-in-out;
+          animation: sk-stretchdelay 1.2s infinite ease-in-out;
+        }
+
+        .spinner .rect2 {
+          -webkit-animation-delay: -1.1s;
+          animation-delay: -1.1s;
+        }
+
+        .spinner .rect3 {
+          -webkit-animation-delay: -1s;
+          animation-delay: -1s;
+        }
+
+        .spinner .rect4 {
+          -webkit-animation-delay: -0.9s;
+          animation-delay: -0.9s;
+        }
+
+        @-webkit-keyframes sk-stretchdelay {
+          0%,
+          40%,
+          100% {
+            -webkit-transform: scaleY(0.4);
+          }
+          20% {
+            -webkit-transform: scaleY(1);
+          }
+        }
+
+        @keyframes sk-stretchdelay {
+          0%,
+          40%,
+          100% {
+            transform: scaleY(0.4);
+            -webkit-transform: scaleY(0.4);
+          }
+          20% {
+            transform: scaleY(1);
+            -webkit-transform: scaleY(1);
+          }
+        }
+      </style>
+    </div>
     <script src="https://cdn.bootcdn.net/ajax/libs/vue/2.6.11/vue.runtime.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/lib/vant.min.js"></script>
     <script src="https://cdn.bootcss.com/moment.js/2.20.1/moment.min.js"></script>

diff --git a/packages/mall-cook-platform/src/components/QrDialog/index.vue b/packages/mall-cook-platform/src/components/QrDialog/index.vue
@@ -3,7 +3,7 @@
  * @Autor: WangYuan
  * @Date: 2022-02-07 09:18:48
  * @LastEditors: WangYuan
- * @LastEditTime: 2022-02-11 10:16:24
+ * @LastEditTime: 2022-02-14 10:59:01
 -->
 <template>
   <el-dialog title="二维码预览" :visible.sync="show" width="30%">
@@ -48,7 +48,7 @@ export default {
     },
 
     getQr() {
-      let url = `${global.viewUrl}custom?projectId=${this.project.id}`;
+      let url = `${global.viewUrl}pages/index/tabbar/home?projectId=${this.project.id}`;
 
       let options = {
         padding: 10, // 二维码四边空白（默认为10px）