TrembleC 3 лет назад
Родитель
Сommit
29f005787f
40 измененных файлов с 68 добавлено и 107 удалено
  1. 2 2
      public/static/js/manage.js
  2. BIN
      src/assets/images/project/qrcode/0_production.png
  3. BIN
      src/assets/images/project/qrcode/102_production.png
  4. BIN
      src/assets/images/project/qrcode/109_production.png
  5. BIN
      src/assets/images/project/qrcode/115_production.png
  6. BIN
      src/assets/images/project/qrcode/135_production.png
  7. BIN
      src/assets/images/project/qrcode/136_production.png
  8. BIN
      src/assets/images/project/qrcode/141_production.png
  9. BIN
      src/assets/images/project/qrcode/144_production.png
  10. BIN
      src/assets/images/project/qrcode/152_production.png
  11. BIN
      src/assets/images/project/qrcode/168_production.png
  12. BIN
      src/assets/images/project/qrcode/170_production.png
  13. BIN
      src/assets/images/project/qrcode/171_production.png
  14. BIN
      src/assets/images/project/qrcode/177_production.png
  15. BIN
      src/assets/images/project/qrcode/201_production.png
  16. BIN
      src/assets/images/project/qrcode/211_production.png
  17. BIN
      src/assets/images/project/qrcode/225_production.png
  18. BIN
      src/assets/images/project/qrcode/227_production.png
  19. BIN
      src/assets/images/project/qrcode/236_production.png
  20. BIN
      src/assets/images/project/qrcode/245_production.png
  21. BIN
      src/assets/images/project/qrcode/250_production.png
  22. BIN
      src/assets/images/project/qrcode/259_production.png
  23. BIN
      src/assets/images/project/qrcode/283_production.png
  24. BIN
      src/assets/images/project/qrcode/291_production.png
  25. BIN
      src/assets/images/project/qrcode/303_production.png
  26. BIN
      src/assets/images/project/qrcode/315_production.png
  27. BIN
      src/assets/images/project/qrcode/326_production.png
  28. BIN
      src/assets/images/project/qrcode/338_production.png
  29. BIN
      src/assets/images/project/qrcode/340_production.png
  30. BIN
      src/assets/images/project/qrcode/371_production.png
  31. BIN
      src/assets/images/project/qrcode/372_production.png
  32. BIN
      src/assets/images/project/qrcode/59_production.png
  33. BIN
      src/assets/images/project/qrcode/66_production.png
  34. BIN
      src/assets/images/project/qrcode/75_production.png
  35. BIN
      src/assets/images/project/qrcode/zhanqu_all_production.png
  36. 1 1
      src/clients/mobile.vue
  37. 2 2
      src/mixins/index.js
  38. 29 80
      src/pages/mobilescene/components/qrcode.vue
  39. 33 21
      src/pages/scene/components/qrcode.vue
  40. 1 1
      src/pages/scenePage/views/gui/guide.vue

+ 2 - 2
public/static/js/manage.js

@@ -1,7 +1,7 @@
 var g_ProjectName = window.location.pathname.substring(window.location.pathname.indexOf("/") + 1, window.location.pathname.lastIndexOf("/"));
-// var g_Prefix = "//super.4dage.com/";
+var g_Prefix = "//super.4dage.com/";
 // http://wangzhan.cctv.com/wlwm2022/test/data/1248
-var g_Prefix = "//wangzhan.cctv.com/wlwm2022/";
+// var g_Prefix = "//wangzhan.cctv.com/wlwm2022/";
 
 // var g_Prefix=window.location.href.substring(0,window.location.href.indexOf("/index.html")+1);
 var s = window.location.href.split("/");

BIN
src/assets/images/project/qrcode/0_production.png


BIN
src/assets/images/project/qrcode/102_production.png


BIN
src/assets/images/project/qrcode/109_production.png


BIN
src/assets/images/project/qrcode/115_production.png


BIN
src/assets/images/project/qrcode/135_production.png


BIN
src/assets/images/project/qrcode/136_production.png


BIN
src/assets/images/project/qrcode/141_production.png


BIN
src/assets/images/project/qrcode/144_production.png


BIN
src/assets/images/project/qrcode/152_production.png


BIN
src/assets/images/project/qrcode/168_production.png


BIN
src/assets/images/project/qrcode/170_production.png


BIN
src/assets/images/project/qrcode/171_production.png


BIN
src/assets/images/project/qrcode/177_production.png


BIN
src/assets/images/project/qrcode/201_production.png


BIN
src/assets/images/project/qrcode/211_production.png


BIN
src/assets/images/project/qrcode/225_production.png


BIN
src/assets/images/project/qrcode/227_production.png


BIN
src/assets/images/project/qrcode/236_production.png


BIN
src/assets/images/project/qrcode/245_production.png


BIN
src/assets/images/project/qrcode/250_production.png


BIN
src/assets/images/project/qrcode/259_production.png


BIN
src/assets/images/project/qrcode/283_production.png


BIN
src/assets/images/project/qrcode/291_production.png


BIN
src/assets/images/project/qrcode/303_production.png


BIN
src/assets/images/project/qrcode/315_production.png


BIN
src/assets/images/project/qrcode/326_production.png


BIN
src/assets/images/project/qrcode/338_production.png


BIN
src/assets/images/project/qrcode/340_production.png


BIN
src/assets/images/project/qrcode/371_production.png


BIN
src/assets/images/project/qrcode/372_production.png


BIN
src/assets/images/project/qrcode/59_production.png


BIN
src/assets/images/project/qrcode/66_production.png


BIN
src/assets/images/project/qrcode/75_production.png


BIN
src/assets/images/project/qrcode/zhanqu_all_production.png


+ 1 - 1
src/clients/mobile.vue

@@ -62,7 +62,7 @@ export default {
       wxShare({
         title: `新时代中国网络文明建设成果展云展示`,
         desc: `弘扬时代新风 建设网络文明`,
-        link: window.location.href,
+        link: 'https://wangzhan.cctv.com/wlwm2022/mobile.html',
         imgUrl: "https://wangzhan.cctv.com/wlwm2022/sharelogo.jpg",
       });
     });

+ 2 - 2
src/mixins/index.js

@@ -18,8 +18,8 @@ import pagination from "@/components/pagination";
 import { region } from "@/data/raw";
 window.g_lock = false;
 
-// let hotUrl = "//super.4dage.com/";
-let hotUrl = '//wangzhan.cctv.com/wlwm2022/'
+let hotUrl = "//super.4dage.com/";
+// let hotUrl = '//wangzhan.cctv.com/wlwm2022/'
 
 Vue.mixin({
   data() {

+ 29 - 80
src/pages/mobilescene/components/qrcode.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="qrcode" :class="{ heping: g_isLandscape }">
-    <div class="downloadQrcon">
+    <!-- <div class="downloadQrcon">
       <qrcodetl :id="'qrpg_' + rand" :data="{ id: rand }" />
       <qrcodetl v-if="currentZhanqu" :id="'qrpgc_' + currentZhanqu.panoId" :data="currentZhanqu" />
-    </div>
+    </div> -->
 
     <div class="qrcodecon">
       <h3>分享</h3>
@@ -15,7 +15,8 @@
       <div class="ul">
         <div class="li">
           <div class="liimg">
-            <img class="real" v-if="tmpcImg" :src="tmpcImg" alt="" />
+            <!-- <img class="real" v-if="tmpcImg" :src="tmpcImg" alt="" /> -->
+            <img class="real" :src="require(`@/assets/images/project/qrcode/${currentZhanqu.panoId}_production.png`)" alt="" />
             <img class="qrc" :src="require(`@/assets/images/project/qrcode/${currentZhanqu.panoId}.jpg`)" alt="" />
           </div>
           <p v-html="currentZhanqu.name"></p>
@@ -23,7 +24,8 @@
 
         <div class="li">
           <div class="liimg">
-            <img class="real" v-if="tmpcImg" :src="tmpImg" alt="" />
+            <!-- <img class="real" v-if="tmpcImg" :src="tmpImg" alt="" /> -->
+            <img class="real"  :src="require(`@/assets/images/project/qrcode/zhanqu_all_production.png`)" alt="" />
             <img class="qrc" :src="require(`@/assets/images/project/qrcode/zhanqu_all.jpg`)" alt="" />
           </div>
           <template>
@@ -36,8 +38,8 @@
 </template>
 
 <script>
-import domtoimage from "dom-to-image";
-import qrcodetl from "@/components/qrcodetl/index.vue";
+// import domtoimage from "dom-to-image";
+// import qrcodetl from "@/components/qrcodetl/index.vue";
 import { Booth } from "@/data/booth.js";
 
 let all_booth = [];
@@ -45,58 +47,6 @@ 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'],
@@ -105,11 +55,10 @@ export default {
       isShowUl: false,
       tmpPano: this.currentPano,
       tmpImg: "",
-      rand: uuid(6),
       tmpcImg: "",
     };
   },
-  components: { qrcodetl },
+  // components: { qrcodetl },
 
   watch: {
     // tmpPano(newVal) {
@@ -121,32 +70,32 @@ export default {
   },
   mounted() {
     this.$nextTick(() => {
-      setTimeout(() => {
-        this.download(this.rand, "qrpg_", "tmpImg");
-        this.download(this.currentZhanqu.panoId, "qrpgc_", "tmpcImg");
-      }, 400);
+      // setTimeout(() => {
+      //   this.download(this.rand, "qrpg_", "tmpImg");
+      //   this.download(this.currentZhanqu.panoId, "qrpgc_", "tmpcImg");
+      // }, 400);
     });
   },
   methods: {
     download(id = null, type = "", imgstr = "") {
-      if (!id) {
-        return;
-      }
-      let node = document.getElementById(type + id);
+      // if (!id) {
+      //   return;
+      // }
+      // let node = document.getElementById(type + id);
 
-      console.log(node,'nodenodenode');
-      this.$showLoading()
+      // console.log(node,'nodenodenode');
+      // this.$showLoading()
 
-      domtoimage
-        .toPng(node)
-        .then((dataUrl) => {
-          this[imgstr] = dataUrl;
-          this.$hideLoading()
-        })
-        .catch((error) => {
-          this.$hideLoading()
-          console.error("oops, something went wrong!", error);
-        });
+      // domtoimage
+      //   .toPng(node)
+      //   .then((dataUrl) => {
+      //     this[imgstr] = dataUrl;
+      //     this.$hideLoading()
+      //   })
+      //   .catch((error) => {
+      //     this.$hideLoading()
+      //     console.error("oops, something went wrong!", error);
+      //   });
     },
   },
 };

+ 33 - 21
src/pages/scene/components/qrcode.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="qrcode">
-    <div class="downloadQrcon">
+    <!-- <div class="downloadQrcon">
       <qrcodetl :id="'qrpg_' + rand" :data="{ id: rand }" />
       <qrcodetl v-if="currentZhanqu" :id="'qrpgc_' + currentZhanqu.panoId" :data="currentZhanqu" />
-    </div>
+    </div> -->
 
     <div class="qrcodecon">
       <h3>分享</h3>
@@ -11,12 +11,14 @@
         <div class="li" v-if="currentZhanqu">
           <p v-html="currentZhanqu.name + '<br/>' + (currentZhanqu.desc || '')"></p>
           <img :src="require(`@/assets/images/project/qrcode/${currentZhanqu.panoId}.jpg`)" alt="" />
-          <div @click="download(currentZhanqu.panoId, 'qrpgc_')" class="download">下载二维码</div>
+          <!-- <div @click="download(currentZhanqu.panoId, 'qrpgc_')" class="download">下载二维码</div> -->
+          <div @click="download(currentZhanqu.panoId)" class="download">下载二维码</div>
+
         </div>
         <div class="li">
           <p v-html="'新时代中国网络文明建设成果展云展示'"></p>
           <img :src="require(`@/assets/images/project/qrcode/zhanqu_all.jpg`)" alt="" />
-          <div @click="download(rand, 'qrpg_')" class="download">下载二维码</div>
+          <div @click="download(`zhanqu_all`)" class="download">下载二维码</div>
         </div>
       </div>
     </div>
@@ -33,8 +35,8 @@ Booth.forEach((item) => {
 
 console.log(all_booth);
 
-import qrcodetl from "@/components/qrcodetl/index.vue";
-import domtoimage from "dom-to-image";
+// import qrcodetl from "@/components/qrcodetl/index.vue";
+// import domtoimage from "dom-to-image";
 
 export default {
   props: ["currentZhanqu"],
@@ -44,25 +46,35 @@ export default {
       rand: Math.random(),
     };
   },
-  components: { qrcodetl },
+  // components: { qrcodetl },
 
   methods: {
-    download(id = null, type = "") {
-      var node = document.getElementById(type + id);
-
-      domtoimage
-        .toPng(node)
-        .then(function(dataUrl) {
-          let elink = document.createElement("a");
-          elink.href = dataUrl;
+    download(dataUrl) {
+
+      let elink = document.createElement("a");
+          elink.href = require(`@/assets/images/project/qrcode/${dataUrl}_production.png`);
           elink.download = `poster.png`;
           elink.click();
-          document.body.removeChild(elink);
-        })
-        .catch(function(error) {
-          error
-          // console.error("oops, something went wrong!", error);
-        });
+
+
+          // document.body.removeChild(elink);
+
+
+      // var node = document.getElementById(type + id);
+
+      // domtoimage
+      //   .toPng(node)
+      //   .then(function(dataUrl) {
+      //     let elink = document.createElement("a");
+      //     elink.href = dataUrl;
+      //     elink.download = `poster.png`;
+      //     elink.click();
+      //     document.body.removeChild(elink);
+      //   })
+      //   .catch(function(error) {
+      //     error
+      //     // console.error("oops, something went wrong!", error);
+      //   });
     },
   },
 };

+ 1 - 1
src/pages/scenePage/views/gui/guide.vue

@@ -18,7 +18,7 @@
     <div id="drawer" class="fullWidth open">
       <div class="frame-container">
         <div id="scrollFrame" class="frame">
-          <ul id="thumb-container" class="slidee" @touchstart.stop @click.stop></ul>
+          <ul id="thumb-container" class="slidee" ></ul>
         </div>
         <div class="scrollbar" id="scroller">
           <div class="handle"></div>