update fenxiang

src/components/menu/index.vue

@@ -228,8 +228,14 @@ export default {
           $(".hyrlbg_ind").addClass("height0");
           if (this.isMobile) {
             this.$emit("toggleBirdView", true);
+            if (this.$route.query.boothId != void 0) {
+              this.$emit("toggleBirdView", false);
+            }
           } else {
             this.$showBirdView();
+            if (this.$route.query.boothId != void 0) {
+              this.$hideBirdView();
+            }
           }
           this.$emit("resetCurrentTheme");
         }

src/components/qrcodetl/index.vue

@@ -12,10 +12,10 @@
       </div>
       <div class="qrcodecon">
         <div>识别二维码，立即观展</div>
-        <!-- <img :src="require(`@/assets/images/project/qrcode/${data.panoId||data.id}.jpg`)" alt="" /> -->
-        <img :src="require(`@/assets/images/proj2022/qrcode.png`)" alt="" />
+        <img :src="require(`@/assets/images/project/qrcode/${data.panoId||'zhanqu_all'}.jpg`)" alt="" />
+        <!-- <img :src="require(`@/assets/images/proj2022/qrcode.png`)" alt="" /> -->
         <!-- <p v-html="`${data.name +(data.desc?` ${data.desc}`:'')}`"></p> -->
-        <p v-html="`${'当前展位：央视网'}`"></p>
+        <p v-html="`${data.name?'当前展位：'+data.name:'新时代中国网络文明建设成果展云展示'}`"></p>
       </div>
     </div>
   </div>

src/data/booth.js

@@ -1,3 +1,14 @@
+//计算点位分布
+let calcuSpread = (start, end, other = [], getRid = []) => {
+  let arr = [];
+  for (let i = 0; i <= end - start; i++) {
+    if (!(getRid.indexOf(start + i) > -1)) {
+      arr.push(String(start + i));
+    }
+  }
+  return arr.concat(other);
+};
+
 let Booth = [
   {
     id: "1",
@@ -9,7 +20,7 @@ let Booth = [
         id: "1_1", //標識符
         firstView: "&firstView=pano:0,qua:0.006532994615897772,-0.0025274544617692302,0.000016512252212974678,0.9999754723878731", //初始視角
         panoId: "0",
-        containPanos: []
+        containPanos: calcuSpread(0, 57, [344], []),
       }
     ],
   },
@@ -27,7 +38,7 @@ let Booth = [
         height: '8%',
         firstView: "&firstView=pano:236,qua:0.003480801832936312,0.9128715630672547,-0.007785040536549504,0.4081578044626181", //初始視角
         panoId: "236",
-        containPanos: ["236","237","238","239","240","241","242","243","244","251","252"]
+        containPanos: ["236", "237", "238", "239", "240", "241", "242", "243", "244", "251", "252"]
       },
       {
         name: "天津市",
@@ -39,7 +50,7 @@ let Booth = [
         height: "14%",
         firstView: "&firstView=pano:66,qua:0.0017518034285941132,-0.6940206521715635,0.0016887091883557755,0.7199509812968947", //初始視角
         panoId: "66", //对应点位id
-        containPanos: ["65","66","77","78","79","80","81","82","83","84","85","86","87","88","89","90","91","92","93","94","95","96","97","98","99","100","58","255","256","180"]
+        containPanos: ["65", "66", "77", "78", "79", "80", "81", "82", "83", "84", "85", "86", "87", "88", "89", "90", "91", "92", "93", "94", "95", "96", "97", "98", "99", "100", "58", "255", "256", "180"]
       },
       {
         name: "河北省",
@@ -51,7 +62,7 @@ let Booth = [
         height: "6%",
         firstView: "&firstView=pano:135,qua:0.015705148645611147,0.4683450309904384,-0.00832658487331569,0.8833668158516297", //初始視角
         panoId: "135", //对应点位id
-        containPanos: ["135","116","117","118","119","120","121","122"]
+        containPanos: ["135", "116", "117", "118", "119", "120", "121", "122"]
       },
       {
         name: "内蒙古自治区",
@@ -63,7 +74,7 @@ let Booth = [
         height: "5%",
         firstView: "&firstView=pano:115,qua:-0.002914860969113398,-0.2571845563680906,-0.0007757554987742462,0.9663575995125463", //初始視角
         panoId: "115", //对应点位id
-        containPanos: ["115","123","124","125","126","127","128","129","130","131","132","133","134"]
+        containPanos: ["115", "123", "124", "125", "126", "127", "128", "129", "130", "131", "132", "133", "134"]
       },
       {
         name: "吉林省",
@@ -75,7 +86,7 @@ let Booth = [
         height: "6%",
         firstView: "&firstView=pano:102,qua:0.013932276076966083,0.4941965139219505,-0.007921379021369674,0.8692024723293211", //初始視角
         panoId: "102", //对应点位id
-        containPanos: ["101","102","103","104","105","106","107","108"]
+        containPanos: ["101", "102", "103", "104", "105", "106", "107", "108"]
       },
       {
         name: "上海市",
@@ -87,7 +98,7 @@ let Booth = [
         height: "7%",
         firstView: "&firstView=pano:59,qua:0.03169251111651029,0.3489621532260752,-0.011809051306773477,0.9365263094574586", //初始視角
         panoId: "59", //对应点位id
-        containPanos: ["59","60","61","62","63","64"]
+        containPanos: ["59", "60", "61", "62", "63", "64"]
       },
       {
         name: "江苏省",
@@ -99,7 +110,7 @@ let Booth = [
         height: "3%",
         firstView: "&firstView=pano:109,qua:-0.01996445240366129,-0.8385737467156694,-0.030800587867370395,0.5435501800251524", //初始視角
         panoId: "109", //对应点位id
-        containPanos: ["109","110","111","112","113","114","154"]
+        containPanos: ["109", "110", "111", "112", "113", "114", "154"]
       },
       {
         name: "浙江省",
@@ -111,7 +122,7 @@ let Booth = [
         height: "4%",
         firstView: "&firstView=pano:152,qua:-0.015383547760863333,0.41634202930798503,0.007045611591242512,0.909050617828818", //初始視角
         panoId: "152", //对应点位id
-        containPanos: ["151","152","153","155","156","157","158","159","138","139"]
+        containPanos: ["151", "152", "153", "155", "156", "157", "158", "159", "138", "139"]
       },
       {
         name: "安徽省",
@@ -123,7 +134,7 @@ let Booth = [
         height: "3%",
         firstView: "&firstView=pano:136,qua:0.0005441737929696521,-0.4030780506128982,0.00023967744959056323,0.9151654069731247", //初始視角
         panoId: "136", //对应点位id
-        containPanos: ["136","137","140","142","143"]
+        containPanos: ["136", "137", "140", "142", "143"]
       },
       {
         name: "福建省",
@@ -135,7 +146,7 @@ let Booth = [
         height: "9%",
         firstView: "&firstView=pano:245,qua:-0.003274955728200214,-0.6752050139260394,-0.002997852722455059,0.7376167660044172", //初始視角
         panoId: "245", //对应点位id
-        containPanos: ["245","235","234","280","246","248","247","249","267"]
+        containPanos: ["245", "235", "234", "280", "246", "248", "247", "249", "267"]
       },
       {
         name: "江西省",
@@ -147,7 +158,7 @@ let Booth = [
         height: "7%",
         firstView: "&firstView=pano:141,qua:-0.012069343265410443,0.9232530961623906,-0.029101874252052108,-0.38289832451349354", //初始視角
         panoId: "141", //对应点位id
-        containPanos: ["141","150","160","161","162","163","164","165","178"]
+        containPanos: ["141", "150", "160", "161", "162", "163", "164", "165", "178"]
       },
       {
         name: "河南省",
@@ -159,7 +170,7 @@ let Booth = [
         height: "6%",
         firstView: "&firstView=pano:177,qua:0.02877847579847971,-0.833411884839266,0.04359373957977583,0.5501781773768091", //初始視角
         panoId: "177", //对应点位id
-        containPanos: ["177","186","185","184","183","182","181","179"]
+        containPanos: ["177", "186", "185", "184", "183", "182", "181", "179"]
       },
       {
         name: "湖北省",
@@ -171,7 +182,7 @@ let Booth = [
         height: "7%",
         firstView: "&firstView=pano:170,qua:-0.0003362832582110284,0.9725023247438509,-0.001404259904263288,-0.2328886956178834", //初始視角
         panoId: "170", //对应点位id
-        containPanos: ["170","200","193","194","195","196","197","198","199","202","203","204"]
+        containPanos: ["170", "200", "193", "194", "195", "196", "197", "198", "199", "202", "203", "204"]
       },
       {
         name: "湖南省",
@@ -183,7 +194,7 @@ let Booth = [
         height: "6%",
         firstView: "&firstView=pano:201,qua:0.0029048018499625685,0.8949376478266332,0.00582685882339346,-0.44614371035335953", //初始視角
         panoId: "201", //对应点位id
-        containPanos: ["201","209","210","208","207","206","205","212"]
+        containPanos: ["201", "209", "210", "208", "207", "206", "205", "212"]
       },
       {
         name: "广东省",
@@ -195,7 +206,7 @@ let Booth = [
         height: "10%",
         firstView: "&firstView=pano:259,qua:0.048112694757082616,-0.7343050161729677,0.052333092612867796,0.6750870678299076", //初始視角
         panoId: "259", //对应点位id
-        containPanos: ["259","266","268","269","282","270","271","272","279","277","278","273","274","276","275"]
+        containPanos: ["259", "266", "268", "269", "282", "270", "271", "272", "279", "277", "278", "273", "274", "276", "275"]
       },
       {
         name: "广西壮族自治区",
@@ -207,7 +218,7 @@ let Booth = [
         height: "7%",
         firstView: "&firstView=pano:144,qua:0.0007652023854567885,-0.20078252569831934,0.0001568330891578431,0.9796355305200983", //初始視角
         panoId: "144", //对应点位id
-        containPanos: ["144","145","146","147","148","149","166"]
+        containPanos: ["144", "145", "146", "147", "148", "149", "166"]
       },
       {
         name: "海南省",
@@ -219,7 +230,7 @@ let Booth = [
         height: "6%",
         firstView: "&firstView=pano:168,qua:-0.006825949091149443,-0.2944266006273781,-0.002103015210066327,0.9556474061688144", //初始視角
         panoId: "168", //对应点位id
-        containPanos: ["167","168","169","172","173","174","175","176"]
+        containPanos: ["167", "168", "169", "172", "173", "174", "175", "176"]
       },
       {
         name: "重庆市",
@@ -231,7 +242,7 @@ let Booth = [
         height: "7%",
         firstView: "&firstView=pano:75,qua:0.0036390761677028245,0.5747701651204852,-0.0025560617170463885,0.8183027989899166", //初始視角
         panoId: "75", //对应点位id
-        containPanos: ["67","68","69","70","71","72","73","74","75","76"]
+        containPanos: ["67", "68", "69", "70", "71", "72", "73", "74", "75", "76"]
       },
       {
         name: "四川省",
@@ -243,7 +254,7 @@ let Booth = [
         height: "10%",
         firstView: "250,qua:0.01855666637790445,0.9174358281943414,-0.04308831642538874,0.3951082848826133", //初始視角
         panoId: "250", //对应点位id
-        containPanos: ["250","265","264","260","263","261","262","253"]
+        containPanos: ["250", "265", "264", "260", "263", "261", "262", "253"]
       },
       {
         name: "贵州省",
@@ -255,7 +266,7 @@ let Booth = [
         height: "5%",
         firstView: "&firstView=pano:171,qua:0.0017824102765913096,-0.5428442474929757,0.0011521026168594861,0.8398307133926982", //初始視角
         panoId: "171", //对应点位id
-        containPanos: ["171","188","189","190","191","192","187"]
+        containPanos: ["171", "188", "189", "190", "191", "192", "187"]
       },
       {
         name: "西藏自治区",
@@ -267,7 +278,7 @@ let Booth = [
         height: "6%",
         firstView: "&firstView=pano:211,qua:0.039443998090233995,0.0030299771643679933,-0.00011960804550374027,0.9992171814692207", //初始視角
         panoId: "211", //对应点位id
-        containPanos: ["211","213","215","216","217","218","214"]
+        containPanos: ["211", "213", "215", "216", "217", "218", "214"]
       },
       {
         name: "陕西省",
@@ -279,7 +290,7 @@ let Booth = [
         height: "8%",
         firstView: "&firstView=pano:227,qua:-0.021999243522644072,-0.3564400185837194,-0.008395322245446445,0.9340214487820174", //初始視角
         panoId: "227", //对应点位id
-        containPanos: ["227","220","219","224","221","223","222"]
+        containPanos: ["227", "220", "219", "224", "221", "223", "222"]
       },
       {
         name: "新疆维吾尔自治区",
@@ -291,7 +302,7 @@ let Booth = [
         height: "8%",
         firstView: "&firstView=pano:225,qua:-0.005264758340658099,0.9570338580037607,-0.017410027490639735,-0.28940517422823686", //初始視角
         panoId: "225", //对应点位id
-        containPanos: ["225","226","230","231","232","229","228","233","281"]
+        containPanos: ["225", "226", "230", "231", "232", "229", "228", "233", "281"]
       }
     ],
   },
@@ -309,7 +320,7 @@ let Booth = [
         height: "13%",
         firstView: "&firstView=pano:283,qua:0.014537068999790128,-0.7680885717259085,0.017448109618183792,0.6399407716116632", //初始視角
         panoId: "283", //对应点位id
-        containPanos: ["283","292","296","295","294","297","293","300","298"]
+        containPanos: ["283", "292", "296", "295", "294", "297", "293", "300", "298"]
       },
       {
         name: "新华网",
@@ -321,7 +332,7 @@ let Booth = [
         height: "11%",
         firstView: "&firstView=pano:291,qua:-0.005812432166942927,0.6048800050224513,0.00441529351180508,0.7962831842702823", //初始視角
         panoId: "291", //对应点位id
-        containPanos: ["291","258","257","284","285","286","287","290","288","306","289","254","305","304","302","301"]
+        containPanos: ["291", "258", "257", "284", "285", "286", "287", "290", "288", "306", "289", "254", "305", "304", "302", "301"]
       },
       {
         name: "央视网",
@@ -333,7 +344,7 @@ let Booth = [
         height: "11%",
         firstView: "&firstView=pano:340,qua:0.017038084398734447,0.17916481180558472,-0.003103312646746605,0.9836666343779016", //初始視角
         panoId: "340", //对应点位id
-        containPanos: ["340","341","342","343","384","385","386","387","388","389","390","391","392"]
+        containPanos: ["340", "341", "342", "343", "384", "385", "386", "387", "388", "389", "390", "391", "392"]
       },
       {
         name: "中国联通",
@@ -345,7 +356,7 @@ let Booth = [
         height: "11%",
         firstView: "&firstView=pano:372,qua:-0.021547124102444085,0.9000556057732905,-0.04479611540025312,-0.43293064598514197", //初始視角
         panoId: "372", //对应点位id
-        containPanos: ["372","383","382","381","377","380","378","376","375","374","379"]
+        containPanos: ["372", "383", "382", "381", "377", "380", "378", "376", "375", "374", "379"]
       },
       {
         name: "腾讯",
@@ -357,7 +368,7 @@ let Booth = [
         height: "13%",
         firstView: "&firstView=pano:338,qua:0.04689275463602263,-0.49467727263672506,0.026742931783574536,0.8673985800011111", //初始視角
         panoId: "338", //对应点位id
-        containPanos: ["338","339","337","336","345","346","347","349","350","351","352","353","348","354","356","355","357","358"]
+        containPanos: ["338", "339", "337", "336", "345", "346", "347", "349", "350", "351", "352", "353", "348", "354", "356", "355", "357", "358"]
       },
       {
         name: "阿里巴巴",
@@ -369,7 +380,7 @@ let Booth = [
         height: "9%",
         firstView: "&firstView=pano:303,qua:-0.012022502266654566,0.8949923430546826,-0.02416553743616291,-0.4452641749266701", //初始視角
         panoId: "303", //对应点位id
-        containPanos: ["303","307","308","309","310","311","312","313","314","299"]
+        containPanos: ["303", "307", "308", "309", "310", "311", "312", "313", "314", "299"]
       },
 
 
@@ -383,7 +394,7 @@ let Booth = [
         height: "10%",
         firstView: "&firstView=pano:326,qua:0.046986055943169396,-0.7099974432052234,0.0475876577129527,0.7010216503876512", //初始視角
         panoId: "326", //对应点位id
-        containPanos: ["326","325","327","335","328","331","329","330","332","333","334"]
+        containPanos: ["326", "325", "327", "335", "328", "331", "329", "330", "332", "333", "334"]
       },
       {
         name: "抖音",
@@ -395,7 +406,7 @@ let Booth = [
         height: "11%",
         firstView: "&firstView=pano:371,qua:0.0729785006998528,-0.6995666410591155,0.0721953629854038,0.7071552031294578", //初始視角
         panoId: "371", //对应点位id
-        containPanos: ["371","366","365","364","369","363","370","362","360","361","368","367","373","359"]
+        containPanos: ["371", "366", "365", "364", "369", "363", "370", "362", "360", "361", "368", "367", "373", "359"]
       },
       {
         name: "蚂蚁集团",
@@ -407,7 +418,7 @@ let Booth = [
         height: "11%",
         firstView: "&firstView=pano:315,qua:0.04796130587036803,-0.7073325392481822,0.04821560464025972,0.7036018950575474", //初始視角
         panoId: "315", //对应点位id
-        containPanos: ["315","324","323","316","317","318","319","320","321","322"]
+        containPanos: ["315", "324", "323", "316", "317", "318", "319", "320", "321", "322"]
       }
     ],
   }

src/data/raw.js

@@ -1,10 +1,10 @@
-import {Booth} from './booth'
+import { Booth } from './booth'
 
 //计算点位分布
-let calcuSpread = (start, end, other=[], getRid=[] ) => {
+let calcuSpread = (start, end, other = [], getRid = []) => {
   let arr = [];
   for (let i = 0; i <= end - start; i++) {
-    if (!(getRid.indexOf(start + i)>-1)) {
+    if (!(getRid.indexOf(start + i) > -1)) {
       arr.push(start + i);
     }
   }
@@ -17,8 +17,8 @@ let region = [
     id: "1",
     name: "综合展区",
     theme: "rgba(179, 104, 216, 1)",
-    company: Booth.find(item=>item.id=='1').company, //综合展区ID
-    spread: calcuSpread(0, 57,[344],[]),
+    company: Booth.find(item => item.id == '1').company, //综合展区ID
+    spread: calcuSpread(0, 57, [344], []),
     firstView: {
       panoId: "0",
       panoQuaternion: {
@@ -33,13 +33,13 @@ let region = [
     id: "2",
     name: "地方展区",
     theme: "rgba(187, 39, 39, 1)", //主题颜色
-    company: Booth.find(item=>item.id=='2').company,  //地方展区id
-    spread: calcuSpread(58, 282,[],[254,257,258]),
+    company: Booth.find(item => item.id == '2').company,  //地方展区id
+    spread: calcuSpread(58, 282, [], [254, 257, 258]),
     firstView: {
       panoId: "4",
       panoQuaternion: {
         x: -0.016484962519480128,
-        y:0.7083437993857234,
+        y: 0.7083437993857234,
         z: 0.016551859736091593,
         w: 0.7054809155529423
       },
@@ -49,15 +49,15 @@ let region = [
     id: "3",
     name: "互联网企业展区",
     theme: "rgba(113, 200, 82, 1)",
-    company: Booth.find(item=>item.id=='3').company,  //互联网企业ID
-    spread: calcuSpread(283, 392,[254,257,258],[344]),
+    company: Booth.find(item => item.id == '3').company,  //互联网企业ID
+    spread: calcuSpread(283, 392, [254, 257, 258], [344]),
     firstView: {
       panoId: "47",
       panoQuaternion: {
-        x:0.0008521342062728275,
-        y:0.7237583641229127,
-        z:-0.000893757162925398,
-        w:0.6900523954291632
+        x: 0.0008521342062728275,
+        y: 0.7237583641229127,
+        z: -0.000893757162925398,
+        w: 0.6900523954291632
       },
     },
   }

src/pages/mobilescene/components/qrcode.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="qrcode" :class="{ heping: g_isLandscape }">
     <div class="downloadQrcon">
-      <qrcodetl v-if="tmpPano.panoId" :id="'qrpg_' + tmpPano.panoId" :data="tmpPano" />
-      <qrcodetl v-if="currentItem.id" :id="'qrpgc_' + currentItem.id" :data="currentItem" />
+      <qrcodetl :id="'qrpg_' + rand" :data="{ id: rand }" />
+      <qrcodetl v-if="currentZhanqu" :id="'qrpgc_' + currentZhanqu.panoId" :data="currentZhanqu" />
     </div>
 
     <div class="qrcodecon">
@@ -13,35 +13,22 @@
         <span>请长按下方图片下载二维码分享给好友</span>
       </div>
       <div class="ul">
-        <div class="li" v-if="tmpPano.name">
+        <div class="li">
           <div class="liimg">
-            <img class="real" v-if="tmpImg" :src="tmpImg" alt="" />
-            <!-- <img class="qrc" v-if="tmpPano.panoId" :src="require(`@/assets/images/project/qrcode/${tmpPano.panoId}.jpg`)" alt="" /> -->
-            <img class="qrc" v-if="tmpPano.panoId"  :src="require(`@/assets/images/proj2022/qrcode.png`)" alt="" />
-
+            <img class="real" v-if="tmpcImg" :src="tmpcImg" alt="" />
+            <img class="qrc" :src="require(`@/assets/images/project/qrcode/${currentZhanqu.panoId}.jpg`)" alt="" />
           </div>
-          <template v-if="tmpPano.name">
-            <p v-if="!currentPanoArr" v-html="tmpPano.name || ''"></p>
-            <div v-else class="xiala">
-              <span @click="isShowUl = !isShowUl">
-                {{ tmpPano.name }}
-                <img :src="require(`@/assets/images/project/icon/jiantour.png`)" alt="" />
-              </span>
-              <ul class="brightness" v-if="isShowUl">
-                <li v-html="item.name" @click="(isShowUl = false), (tmpPano = item)" v-for="(item, i) in currentPanoArr" :key="i"></li>
-              </ul>
-            </div>
-          </template>
-          <p v-else></p>
+          <p v-html="currentZhanqu.name"></p>
         </div>
 
         <div class="li">
           <div class="liimg">
-            <img class="real" v-if="tmpcImg" :src="tmpcImg" alt="" />
-            <!-- <img class="qrc" :src="require(`@/assets/images/project/qrcode/${currentItem.id}.jpg`)" alt="" /> -->
-            <img class="qrc"  :src="require(`@/assets/images/proj2022/qrcode.png`)" alt="" />
+            <img class="real" v-if="tmpcImg" :src="tmpImg" alt="" />
+            <img class="qrc" :src="require(`@/assets/images/project/qrcode/zhanqu_all.jpg`)" alt="" />
           </div>
-          <p v-html="currentItem.name"></p>
+          <template>
+            <p v-html="'新时代中国网络文明建设成果展云展示'"></p>
+          </template>
         </div>
       </div>
     </div>
@@ -59,45 +46,35 @@ Booth.forEach((item) => {
 });
 
 export default {
-  props: ["currentPano", "currentItem"],
+  props: ["currentZhanqu",'currentPano'],
   data() {
     return {
       isShowUl: false,
       tmpPano: this.currentPano,
       tmpImg: "",
+      rand: Math.random(),
       tmpcImg: "",
     };
   },
   components: { qrcodetl },
-  computed: {
-    currentPanoArr: function() {
-      let tmp1 = all_booth.filter((item) => item.panoId == this.currentPano.panoId);
-      let tmp = tmp1.map((item, idx) => {
-        return {
-          ...item,
-          panoId: idx > 0 ? `${item.panoId}_${idx}` : item.panoId,
-        };
-      });
-      return tmp && tmp.length > 1 ? tmp : "";
-    },
-  },
+
   watch: {
-    tmpPano(newVal) {
-      console.log(newVal, 88888888);
-      setTimeout(() => {
-        this.download(newVal.id, "qrpg_", "tmpImg");
-      }, 100);
-    },
+    // tmpPano(newVal) {
+    //   console.log(newVal, 88888888);
+    //   setTimeout(() => {
+    //     this.download(newVal.id, "qrpg_", "tmpImg");
+    //   }, 100);
+    // },
   },
   mounted() {
     this.$nextTick(() => {
       setTimeout(() => {
-        this.download(this.tmpPano.panoId, "qrpg_", "tmpImg");
-        this.download(this.currentItem.id, "qrpgc_", "tmpcImg");
+        this.download(this.rand, "qrpg_", "tmpImg");
+        this.download(this.currentZhanqu.panoId, "qrpgc_", "tmpcImg");
       }, 100);
       setTimeout(() => {
-        this.download(this.tmpPano.panoId, "qrpg_", "tmpImg");
-        this.download(this.currentItem.id, "qrpgc_", "tmpcImg");
+        this.download(this.rand, "qrpg_", "tmpImg");
+        this.download(this.currentZhanqu.panoId, "qrpgc_", "tmpcImg");
       }, 400);
     });
   },
@@ -108,10 +85,14 @@ export default {
       }
       let node = document.getElementById(type + id);
 
+      console.log(node,'nodenodenode');
+
       domtoimage
         .toPng(node)
         .then((dataUrl) => {
           this[imgstr] = dataUrl;
+
+          console.log(this[imgstr]);
         })
         .catch((error) => {
           console.error("oops, something went wrong!", error);
@@ -256,7 +237,7 @@ export default {
 
         .liimg {
           max-width: 250px;
-          width: 70%;
+          width: 50%;
           margin: 10px auto;
           overflow: hidden;
           position: relative;

src/pages/mobilescene/index.vue

@@ -45,15 +45,14 @@
 
     <birdview @close="showBirdview = false" v-if="showBirdview" />
 
-    <!-- <template v-if="!g_isLandscape">
-      <birdview/>
+    <template v-if="!g_isLandscape">
       <vpopup v-if="showpopup && cp" v-clickoutside="handleoutside">
         <div slot="vcon" class="popcon">
-          <component :is="cp" :currentPano="currentPano" :currentItem="currentItem"> </component>
+          <component :is="cp" :currentPano="currentPano"  :currentZhanqu="currentZhanqu" :currentItem="currentItem"> </component>
           <img @click="(showpopup = false), (cp = '')" class="close" :src="require('@/assets/images/project/icon/close.png')" alt="" />
         </div>
       </vpopup>
-    </template> -->
+    </template>
 
     <vhotspot v-if="hotspot" @close="hotspot = ''" :hotspot="hotspot" />
   </div>
@@ -68,6 +67,10 @@ import scene from "./scene.vue";
 import vhotspot from "@/components/hotspot/index.vue";
 import roundMenu from "@/components/menu/index.vue";
 
+import content from "./components/content.vue";
+import qrcode from "./components/qrcode.vue";
+import popup from "./popup.vue";
+
 import { region } from "@/data/raw.js";
 import { Booth } from "@/data/booth.js";
 
@@ -82,6 +85,9 @@ export default {
     vsearch,
     vhotspot,
     birdview,
+    qrcode,
+    vpopup: popup,
+    vcontent: content,
     roundMenu,
   },
   computed: {
@@ -196,7 +202,6 @@ export default {
           if (res.data.source === "showAll") {
             setTimeout(() => {
               this.$hideLoading();
-              this.showBirdview = true;
             });
           }
 
@@ -302,6 +307,7 @@ export default {
     },
     handlecp(data) {
       this.cp = data;
+      console.log(data,'opencp')
       this.showpopup = true;
     },
     handleoutside() {

src/pages/mobilescene/scene.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="scene-body">
-    <iframe ref="ifr" id="ifr" :key="viewId" :src="`scene.html?m=1248${boothItem || firstView[viewId]}`" allowfullscreen="true" frameborder="0"></iframe>
+    <iframe ref="ifr" id="ifr" :key="viewId" :src="`scene.html?m=1248${boothItem?(boothItem || firstView[viewId]):''}`" allowfullscreen="true" frameborder="0"></iframe>
   </div>
 </template>
 

src/pages/scene/components/qrcode.vue

@@ -1,40 +1,22 @@
 <template>
   <div class="qrcode">
     <div class="downloadQrcon">
-      <qrcodetl v-if="tmpPano" :id="'qrpg_' + tmpPano.panoId" :data="tmpPano" />
-      <qrcodetl v-if="currentItem" :id="'qrpgc_' + currentItem.id" :data="currentItem" />
+      <qrcodetl :id="'qrpg_' + rand" :data="{ id: rand }" />
+      <qrcodetl v-if="currentZhanqu" :id="'qrpgc_' + currentZhanqu.panoId" :data="currentZhanqu" />
     </div>
 
     <div class="qrcodecon">
       <h3>分享</h3>
       <div class="ul">
-        <div class="li" v-if="tmpPano.name">
-          <template v-if="tmpPano.name">
-            <p v-if="!currentPanoArr" v-html="tmpPano.name || ''"></p>
-            <div v-else class="xiala">
-              <span :title="tmpPano.name" @click="isShowUl = !isShowUl">
-                {{ tmpPano.name || '' }}
-                <img :src="require(`@/assets/images/project/icon/jiantour.png`)" alt="" />
-              </span>
-              <ul class="brightness" v-if="isShowUl">
-                <li v-html="item.name|| ''" @click="(isShowUl = false), (tmpPano = item)" v-for="(item, i) in currentPanoArr" :key="i"></li>
-              </ul>
-            </div>
-          </template>
-          <p v-else></p>
-          <!-- <img v-if="tmpPano.panoId" :src="require(`@/assets/images/project/qrcode/${tmpPano.panoId}.jpg`)" alt="" /> -->
-          <img v-if="tmpPano.panoId" :src="require(`@/assets/images/proj2022/qrcode.png`)" alt="" />
-
-          <!-- <img :src="require(`@/assets/images/project/qrcode/11.jpg`)" alt="" /> -->
-          <div @click="download(tmpPano.panoId, 'qrpg_')" class="download">下载二维码</div>
+        <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>
-
-        <div class="li" v-if="currentItem.id">
-          <p v-html="currentItem.name + '<br/>' + (currentItem.desc|| '')"></p>
-          <!-- <img :src="require(`@/assets/images/project/qrcode/${currentItem.id}.jpg`)" alt="" /> -->
-          <img :src="require(`@/assets/images/proj2022/qrcode.png`)" alt="" />
-
-          <div @click="download(currentItem.id, 'qrpgc_')" class="download">下载二维码</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>
       </div>
     </div>
@@ -55,26 +37,15 @@ import qrcodetl from "@/components/qrcodetl/index.vue";
 import domtoimage from "dom-to-image";
 
 export default {
-  props: ["currentPano", "currentItem"],
+  props: ["currentZhanqu"],
   data() {
     return {
       isShowUl: false,
-      tmpPano: this.currentPano,
+      rand: Math.random(),
     };
   },
   components: { qrcodetl },
-  computed: {
-    currentPanoArr: function() {
-      let tmp1 = all_booth.filter((item) => item.panoId == this.currentPano.panoId);
-      let tmp = tmp1.map((item, idx) => {
-        return {
-          ...item,
-          panoId: idx > 0 ? `${item.panoId}_${idx}` : item.panoId,
-        };
-      });
-      return tmp && tmp.length > 1 ? tmp : "";
-    },
-  },
+
   methods: {
     download(id = null, type = "") {
       var node = document.getElementById(type + id);
@@ -89,7 +60,8 @@ export default {
           document.body.removeChild(elink);
         })
         .catch(function(error) {
-          console.error("oops, something went wrong!", error);
+          error
+          // console.error("oops, something went wrong!", error);
         });
     },
   },
@@ -132,8 +104,8 @@ export default {
       font-size: 30px;
       font-weight: bold;
       position: relative;
-      &::after{
-        content: '';
+      &::after {
+        content: "";
         display: inline-block;
         position: absolute;
         left: 236px;

src/pages/scene/index.vue

@@ -27,7 +27,7 @@
     <vhotspot v-if="hotspot" @close="hotspot = ''" :hotspot="hotspot" />
     <vpopup v-if="showpopup && cp" v-clickoutside="handleoutside">
       <div slot="vcon" class="popcon" :class="{ pad_notlandscape: isiPad && !g_isLandscape }">
-        <component :is="cp" :currentPano="currentPano" :currentItem="currentItem"> </component>
+        <component :is="cp" :currentPano="currentPano" :currentZhanqu="currentZhanqu" :currentItem="currentItem"> </component>
 
         <div class="close">
           <img @click="(showpopup = false), (cp = ''), $bus.$emit('resetMenuActive')" :src="require('@/assets/images/proj2022/pc/cancel_btn.png')" alt="" />
@@ -163,8 +163,7 @@ export default {
         this.isClear = data;
       });
 
-      !this.$route.query.boothId != '' && this.$showBirdView();
-
+      
       this.$bus.$on("resetCurrentTheme", () => {
         this.currentTheme = "";
       });
@@ -230,13 +229,16 @@ export default {
               }
             });
 
-            console.log(this.currentPano);
+            console.log(this.currentPanoid,'currentPanoid');
             this.currentZhanqu = "";
             this.currentZhanqu = all_booth.find((item) => {
-              if (item.containPanos.indexOf(this.currentPanoid) > -1) {
+              if (item.containPanos.indexOf(String(this.currentPanoid)) > -1) {
                 return item;
               }
             });
+
+            console.log(this.currentZhanqu,'currentZhanqu');
+
             this.currentZhanqu &&
               window.goldlog.record(
                 `/p_area${this.currentZhanqu.id}`,