Ver código fonte

Merge branch 'dev-5.2' of Software/android-cloud-H5 into test

heyang 3 anos atrás
pai
commit
6d7ee9dc02

+ 1 - 1
androidscloudH5/gzhDownload.html

@@ -86,7 +86,7 @@
 
   function clickDown() {
     if (isAndroid) {
-      window.location.href = window.location.protocol === 'https:' ? 'https://file.phone.androidscloud.com:8121/document/newFile/download/1/${uploadKey}/LowLevelMultipartUpload_18131560837339955244' : 'http://110.53.221.195:8210/document/newFile/download/1/347905r86eb745a1sc38/LowLevelMultipartUpload_18131560837339955244'
+      window.location.href = window.location.protocol === 'https:' ? `https://file.phone.androidscloud.com:8121/document/newFile/download/1/edv834e74a9c43eaac02/LowLevelMultipartUpload_18330738923497472022` : `http://110.53.221.195:8210/document/newFile/download/1/edv834e74a9c43eaac02/LowLevelMultipartUpload_18330738923497472022`
     }
     if (isiOS) {
       window.location.href = window.location.href = 'https://www.pgyer.com/gemini6'

+ 147 - 8
microserviceUserH5/vcloud/userManual.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="zh-CN">
+<html lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
@@ -10,11 +10,18 @@
     <link rel="icon" href="../static/img/favicon2.ico" type="img/x-ico" />
     <title>双子星</title>
     <link rel="stylesheet" href="../static/css/normalize-8.0.1.css" />
+    <!-- <script src="https://lf9-cdn-tos.bytecdntp.com/cdn/expire-1-M/vConsole/3.12.1/vconsole.min.js"></script>
+    <script>
+      // VConsole will be exported to `window.VConsole` by default.
+      var vConsole = new window.VConsole();
+    </script> -->
+
     <script src="../static/js/vender/vue/vue.min.js"></script>
+
     <!-- <script src="https://cdn.staticfile.org/vue/2.2.2/vue.js"></script> -->
     <!-- <script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-M/vue/2.6.14/vue.js"></script> -->
     <script src="../static/js/vender/config.js"></script>
-    <script src="../static/js/tailwindcss/v3.0.24/index.js"></script>
+    <!-- <script src="../static/js/tailwindcss/v3.0.24/index.js"></script>
     <script>
       tailwind.config = {
         theme: {},
@@ -22,24 +29,80 @@
           preflight: false,
         },
       };
-    </script>
-    <script src="../static/js/vender/jquery-3.4.1.min.js"></script>
+    </script> -->
+    <!-- <script src="../static/js/vender/jquery-3.4.1.min.js"></script> -->
+
     <link rel="stylesheet" href="../static/js/vender/toastr/toastr.min.css" />
     <script src="../static/js/vender/toastr/toastr.min.js"></script>
     <script>
       toastr.options.positionClass = 'toast-center-center';
     </script>
+    <style>
+      [v-cloak] {
+        display: none;
+      }
+      /* @media screen and (max-width: 750px) {
+        html {
+          font-size: calc(100vw / 7.5);
+        }
+      }
+      @media screen and (min-width: 750px) {
+        html {
+          font-size: calc(750px / 7.5);
+        }
+      } */
+      .phone-container {
+        color: #333333;
+        line-height: 1.5;
+        padding: 20px;
+      }
+      /* .user-Agreement-content {
+        font-size: 0.28rem;
+        line-height: 1.5;
+        text-align: justify;
+      }
+      h1 {
+        font-size: 0.32rem;
+      }
+      h2 {
+        font-size: 0.31rem;
+      }
+      h3 {
+        font-size: 0.3rem;
+      }
+      h4 {
+        font-size: 0.29rem;
+      }
+      h5 {
+        font-size: 0.28rem;
+      }
+      h6 {
+        font-size: 0.27rem;
+      } */
+    
+      .phone-container p {
+        /* font-size: 0.28rem; */
+      }
+      .title {
+        text-align: center;
+        font-weight: bold;
+      }
+    </style>
   </head>
   <body>
+    <noscript>
+      <div class="">noscript</div>
+    </noscript>
+    <!-- <div class="data">777</div> -->
     <div v-cloak id="app">
-      <h1 class="text-center mt-2">{{title}}</h1>
-      <div class="p-2" v-html="content"></div>
+      <!-- <h1 class="title">{{title}}</h1> -->
+      <div class="phone-container" v-html="content"></div>
     </div>
     <script src="../static/js/vender/vue/axios.min.js"></script>
     <script src="../static/js/vender/vue/config.js"></script>
     <script src="../static/js/vender/vue/api.js"></script>
 
-    <script type="text/javascript">
+    <!-- <script type="text/javascript">
       Vue.config.errorHandler = function (err, vm, info) {
         toastr.error(err.message);
         return false;
@@ -61,9 +124,24 @@
               },
             })
             .then(
-              (response) => {
+              (response)=> {
                 this.title = response.data.agreementName;
                 this.content = response.data.content;
+
+                // const html = document.createElement('html');
+
+                // html.innerHTML = response.data.content;
+
+                // const phoneContainers =
+                //   html.querySelectorAll('.phone-container');
+
+                // if (phoneContainers.length > 0) {
+                //   this.content = phoneContainers.item(
+                //     phoneContainers.length - 1,
+                //   ).innerHTML;
+                // } else {
+                //   this.content = response.data.content;
+                // }
               },
               (error) => {
                 toastr.error(err.message);
@@ -75,6 +153,67 @@
           return false;
         },
       });
+    </script> -->
+
+    <script>
+      // console.log($('.data').html('888'));
+      new Vue({
+        el: '#app',
+        data() {
+          return {
+            title: '',
+            content: '',
+          };
+        },
+        mounted() {
+          const t = this;
+          service
+            .get('/api/public/v5/agreementApi/content/getContentByType', {
+              params: {
+                agreementCoding: 'XYPZYHXY2004',
+                type: 1,
+              },
+            })
+            .then(function (response) {
+              t.title = response.data.agreementName;
+              // t.content = response.data.content;
+              const html = document.createElement('html');
+              // console.log(html);
+              html.innerHTML = response.data.content;
+
+              const phoneContainers = html.querySelectorAll('.phone-container');
+
+              if (phoneContainers.length > 0) {
+                t.content =
+                  phoneContainers[phoneContainers.length - 1].innerHTML;
+              } else {
+                t.content = response.data.content;
+              }
+            });
+
+          // .then(
+          //   function (response) {
+          // //     console.log(response);
+          //     t.title = response.data.agreementName;
+          //     t.content = response.data.content;
+          // //     // const html = document.createElement('html');
+          // //     // html.innerHTML = response.data.content;
+          // //     // const phoneContainers =
+          // //     //   html.querySelectorAll('.phone-container');
+          // //     // if (phoneContainers.length > 0) {
+          // //     //   this.content = phoneContainers.item(
+          // //     //     phoneContainers.length - 1,
+          // //     //   ).innerHTML;
+          // //     // } else {
+          // //     //   this.content = response.data.content;
+          // //     // }
+          //   }
+          // //   // function (err) {
+          // //   //   toastr.error(err.message);
+          // //   // },
+          // );
+        },
+      });
     </script>
   </body>
 </html>