tremble 3 years ago
parent
commit
9c9bc60c88

+ 0 - 5
src/assets/style/public.less

@@ -3,11 +3,6 @@
   -webkit-tap-highlight-color: transparent;
 }
 
-@font-face {
-  font-family: "pangmen";
-  src: url('./fonts/庞门正道标题体.ttf');
-
-}
 
 @theme: #BC1915;
 

+ 1 - 1
src/clients/index.vue

@@ -21,7 +21,7 @@ export default {
         );
       } else {
         window.location.href =
-          window.location.origin + window.location.pathname + "mobile.html";
+          window.location.origin + window.location.pathname + "testmobile.html";
       }
     }
 

+ 15 - 3
src/clients/mobile.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="bbbb">
+  <div class="bbbb" @touchstart.once="playaudio">
     <router-view />
   </div>
 </template>
@@ -16,17 +16,27 @@ gdBgm.loop = true;
 
 
 export default {
-  methods: {},
   watch: {
     "$route.name": function(newVal) {
       this.$bus.$emit("toggleBGM", newVal == "scene");
       // newVal !='scene' ? this.$refs.vgbgm.pause() : this.$refs.vgbgm.play();
     },
   },
+  methods: {
+    playaudio(){
+       if (window.firstPlayAudio) {
+          window.firstPlayAudio = false
+          gdBgm.play();
+          setTimeout(() => {
+            gdBgm.pause();
+          },);
+        }
+    }
+  },
   mounted() {
     if (!this.isMobile) {
       // window.location.href = window.location.href.replace("mobile.html", "index.html");
-      window.location.href = window.location.href.replace("mobile.html", "index.html");
+      window.location.href = window.location.href.replace("testmobile.html", "testindex.html");
     }
 
     this.$nextTick(() => {
@@ -38,6 +48,8 @@ export default {
           gdBgm.pause();
         },);
       }, false);
+      
+
 
       this.$bus.$on("toggleGdBgm", (data) => {
         data == 'play' ? gdBgm.play() : gdBgm.pause();

+ 57 - 5
src/pages/mobilescene/components/qrcode.vue

@@ -45,6 +45,59 @@ Booth.forEach((item) => {
   all_booth = all_booth.concat(item.company);
 });
 
+function uuid(len, radix) {
+
+        var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('');
+    
+        var uuid = [], i;
+    
+        radix = radix || chars.length;
+    
+     
+    
+        if (len) {
+    
+          // Compact form
+    
+          for (i = 0; i < len; i++) uuid[i] = chars[0 | Math.random()*radix];
+    
+        } else {
+    
+          // rfc4122, version 4 form
+    
+          var r;
+    
+     
+    
+          // rfc4122 requires these characters
+    
+          uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-';
+    
+          uuid[14] = '4';
+    
+     
+    
+          // Fill in random data.  At i==19 set the high bits of clock sequence as
+    
+          // per rfc4122, sec. 4.1.5
+    
+          for (i = 0; i < 36; i++) {
+    
+            if (!uuid[i]) {
+    
+              r = 0 | Math.random()*16;
+    
+              uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r];
+    
+            }
+    
+          }
+    
+        }
+        return uuid.join('');
+    
+    }
+
 export default {
   props: ["currentZhanqu",'currentPano'],
   data() {
@@ -52,7 +105,7 @@ export default {
       isShowUl: false,
       tmpPano: this.currentPano,
       tmpImg: "",
-      rand: Math.random(),
+      rand: uuid(6),
       tmpcImg: "",
     };
   },
@@ -71,10 +124,6 @@ export default {
       setTimeout(() => {
         this.download(this.rand, "qrpg_", "tmpImg");
         this.download(this.currentZhanqu.panoId, "qrpgc_", "tmpcImg");
-      }, 100);
-      setTimeout(() => {
-        this.download(this.rand, "qrpg_", "tmpImg");
-        this.download(this.currentZhanqu.panoId, "qrpgc_", "tmpcImg");
       }, 400);
     });
   },
@@ -86,15 +135,18 @@ export default {
       let node = document.getElementById(type + id);
 
       console.log(node,'nodenodenode');
+      this.$showLoading()
 
       domtoimage
         .toPng(node)
         .then((dataUrl) => {
           this[imgstr] = dataUrl;
+          this.$hideLoading()
 
           console.log(this[imgstr]);
         })
         .catch((error) => {
+          this.$hideLoading()
           console.error("oops, something went wrong!", error);
         });
     },