Inicio Explorar Ayuda
Iniciar sesión
guoziyun
/
artsite
1
0
Fork 0
Archivos Incidencias 0 Pull Requests 0 Wiki
Explorar el Código

fix

guoziyun hace 10 meses
padre
71bfcebfae
commit
1fd8a114c6
Se han modificado 7 ficheros con 36 adiciones y 26 borrados
Dividir vista Mostrar estadísticas de diff
  1. 1 1
      routes/v2/album.js
  2. 1 1
      routes/v2/detail.js
  3. 1 1
      routes/v2/share.js
  4. 1 1
      routes/v2/video-coloring-page.js
  5. 15 12
      views/detail.ejs
  6. 4 3
      views/v2/detail.ejs
  7. 13 7
      views/v2/share.ejs

+ 1 - 1
routes/v2/album.js
Ver fichero 

@@ -149,7 +149,7 @@ router.get('/:id', function (req, res, next) {
 
 
       // deeplink 相关
 
       let applink = `https://art.pcoloring.com${req.originalUrl}`;
 
-      let downlink = `https://pcoloring.com/anc/`;
 
+      let downlink = `https://art.pcoloring.com/app`;
 
 
       let data = {
 
         title: doc.seoTitle,

+ 1 - 1
routes/v2/detail.js
Ver fichero 

@@ -64,7 +64,7 @@ router.get('/:id', function (req, res, next) {
 
 
       // deeplink 相关
 
       let applink = `https://art.pcoloring.com${req.originalUrl}`;
 
-      let downlink = `https://pcoloring.com/anc/`;
 
+      let downlink = `https://art.pcoloring.com/app`;
 
       let openapplink = applink;
 
       if (!req.originalUrl.includes('check')) {
 
         openapplink = applink.concat(req.originalUrl.includes('?') ? '&check=1' : '?check=1');

+ 1 - 1
routes/v2/share.js
Ver fichero 

@@ -17,7 +17,7 @@ router.get('/:id', function (req, res, next) {
 
 
     let imageUrl = `${host}/thumbs/coloring-page/done/480/${id}.webp`;
 
     let applink = `https://art.pcoloring.com${req.originalUrl}`;
 
-    let downlink = `https://pcoloring.com/anc/`;
 
+    let downlink = `https://art.pcoloring.com/app`;
 
 
     let openapplink = applink;
 
     if (!req.originalUrl.includes('check')) {

+ 1 - 1
routes/v2/video-coloring-page.js
Ver fichero 

@@ -153,7 +153,7 @@ router.get('/:id', function (req, res, next) {
 
 
       // deeplink 相关
 
       let applink = `https://art.pcoloring.com${req.originalUrl}`;
 
-      let downlink = `https://pcoloring.com/anc/`;
 
+      let downlink = `https://art.pcoloring.com/app`;
 
 
       let data = {
 
         title: doc.seoTitle,

+ 15 - 12
views/detail.ejs
Ver fichero 

@@ -3,17 +3,17 @@
 
 
 <head>
 
     <%- include('common-meta') %>
 
-    <meta property="og:image" content="<%= imageUrl %>" />
 
+        <meta property="og:image" content="<%= imageUrl %>" />
 
 
-    <link rel="stylesheet" href="/stylesheets/styles.css">
 
-    <link rel="stylesheet" href="/stylesheets/header.css">
 
-    <link rel="stylesheet" href="/stylesheets/detail.css">
 
+        <link rel="stylesheet" href="/stylesheets/styles.css">
 
+        <link rel="stylesheet" href="/stylesheets/header.css">
 
+        <link rel="stylesheet" href="/stylesheets/detail.css">
 
 
-    <script type="text/javascript"
 
-        src="https://platform-api.sharethis.com/js/sharethis.js#property=67e0d66a54a3d000192a4615&product=inline-share-buttons&source=platform"
 
-        async="async"></script>
 
+        <script type="text/javascript"
 
+            src="https://platform-api.sharethis.com/js/sharethis.js#property=67e0d66a54a3d000192a4615&product=inline-share-buttons&source=platform"
 
+            async="async"></script>
 
 
-    <script type="application/ld+json">
 
+        <script type="application/ld+json">
 
     {
 
         "@context": "https://schema.org",
 
         "@type": "CreativeWork",
 
@@ -64,16 +64,19 @@
 
 <body>
 
     <%- include('header') %>
 
         <div class="details">
 
-            <div id="poster" class="poster" data-content-id="<%= detail._id %>"><img src="<%= detail.thumb %>" alt="<%= detail.title %>"></div>
 
+            <div id="poster" class="poster" data-content-id="<%= detail._id %>"><img src="<%= detail.thumb %>"
 
+                    alt="<%= detail.title %>"></div>
 
             <div class="description">
 
                 <div style="display: flex; justify-content: space-between;">
 
-                    <h1><%= detail.title %></h1>
 
+                    <h1>
 
+                        <%= detail.title %>
 
+                    </h1>
 
                     <div class="sharethis-inline-share-buttons"></div>
 
                 </div>
 
                 <% if (detail.totalStartCount> 0) { %>
 
                     <div style="color:gray;">
 
                         <%=detail.totalStartCount%>
 
-                        <%= translate.interested[lang] %>
 
+                            <%= translate.interested[lang] %>
 
                     </div>
 
                     <% } %>
 
                         <p>
 
@@ -185,7 +188,7 @@
 
                 else {
 
                     // 可以显示一个提示，或者跳转到通用的下载页面
 
                     console.log('无法确定操作系统，或者为桌面操作系统');
 
-                    window.open('https://pcoloring.com/anc/', '_blank');
 
+                    window.open('https://art.pcoloring.com/app', '_blank');
 
                 }
 
             });

+ 4 - 3
views/v2/detail.ejs
Ver fichero 

@@ -274,7 +274,7 @@
 
     const currentPageLink = baseUniversalLink + window.location.pathname + window.location.search;
 
     const appDeeplink = baseUniversalLink + window.location.pathname.replace('coloring-page', 'share') + window.location.search;
 
 
-    const linkDownloadCommon = 'https://pcoloring.com/anc/'; // 通用下载页
 
+    const linkDownloadCommon = 'https://art.pcoloring.com/app'; // 通用下载页
 
     const linkDownloadAppStore = 'itms-apps://itunes.apple.com/app/id1575480118?utm_source=share'; // ios app下载链接
 
     const linkDownloadPlayMarket = 'https://play.google.com/store/apps/details?id=com.pcoloring.art.puzzle.color.by.number&utm_source=share';  // android app 下载链接
 
     const ua = window.navigator.userAgent.toLowerCase();
 
@@ -367,7 +367,8 @@
 
           <a id="repaintBtn" onclick="onRepaint('<%= detail._id %>')" class="btn" style="display: none;">Repaint</a>
 
           <a id="reviewBtn" href="/play/<%= detail._id %>" class="btn"
 
             style="background-color: orange; display: none;">Review</a>
 
-          <a id="appBtn" class="btn" href="<%= openapplink %>" target="_blank" style="background-color: darkolivegreen;">Paint on APP</a>
 
+          <a id="appBtn" class="btn" href="<%= openapplink %>" target="_blank"
 
+            style="background-color: darkolivegreen;">Paint on APP</a>
 
           <a href="/download/pdf/page/<%= detail._id %>" class="btn"
 
             style="background-color: lightseagreen;">Download</a>
 
           <a id="printBtn" onclick="printImage('<%= detail._id %>')" class="btn"
 
@@ -492,7 +493,7 @@
 
           else {
 
             // 可以显示一个提示，或者跳转到通用的下载页面
 
             console.log('无法确定操作系统，或者为桌面操作系统');
 
-            window.open('https://pcoloring.com/anc/', '_blank');
 
+            window.open('https://art.pcoloring.com/app', '_blank');
 
           }
 
         }

+ 13 - 7
views/v2/share.ejs
Ver fichero 

@@ -426,13 +426,19 @@
 
           appLaunched = true;
 
         });
 
 
-        // 1 秒后检查是否成功拉起 App
 
-        setTimeout(function () {
 
-          if (!appLaunched) {
 
-            // 未拉起 App，跳转到下载页
 
-            window.location.href = downloadUrl;
 
-          }
 
-        }, 1000);
 
+        // 通用下载页，一般是在pc浏览器而非android/ios环境，直接跳转，不用等待
 
+        if (downloadUrl === 'https://art.pcoloring.com/app') {
 
+          window.location.href = downloadUrl;
 
+        } else {
 
+          // 1 秒后检查是否成功拉起 App
 
+          setTimeout(function () {
 
+            if (!appLaunched) {
 
+              // 未拉起 App，跳转到下载页
 
+              window.location.href = downloadUrl;
 
+            }
 
+          }, 500);
 
+        }
 
+
 
       }
 
 
       // 为 Claim Bonus 按钮添加防重复点击逻辑（可选）