shaogen1995 2 years ago
parent
commit
51bb02ed72

+ 6 - 3
scene/public/static/js/Hot.js

@@ -1,11 +1,15 @@
 //合并热点和展览 
 g_currentHot = null
 
+
+console.log('------------------------11111111111-------pppppppppppppppp');
+
 window.initHot = function (model) {
 
     var objLoader = new THREE.OBJLoader()
     var _planeGeometry = new THREE.PlaneGeometry(1, 1)
-    var _boxGeometry = new THREE.BoxBufferGeometry(1, 1, 1) { //ie的mesh 加了polygonOffset也是会重叠。所以去掉前面的face:  (但是突然ie又播放不了videoTexture)
+    var _boxGeometry = new THREE.BoxBufferGeometry(1, 1, 1) 
+    { //ie的mesh 加了polygonOffset也是会重叠。所以去掉前面的face:  (但是突然ie又播放不了videoTexture)
         var newIndex = [..._boxGeometry.index.array]
         newIndex.splice(4 * 6, 12)
         _boxGeometry.setIndex(new THREE.BufferAttribute(new Uint16Array(newIndex), 1))
@@ -45,9 +49,8 @@ window.initHot = function (model) {
         var r = link.substring(link.indexOf("html") + 4),
             o = "en" == manage.number("lang") ? "&lang=" + manage.number("lang") : ""; -
         1 == r.indexOf("?") ? src = link + "?time=" + randomTime().getTime() + "&id=" + window.number + o : src = link + "&time=" + randomTime().getTime() + "&id=" + window.number + o
-        // return 'http://project.4dage.com:8017' + src  // 线上测试
         // return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1', 'hot')
-        return src
+        return src //打包 
 
     }
     var removeSrcPostMark = function (url) { //去除texture.load时自动加上的'?'

+ 3 - 0
scene/src/assets/style/myBase.css

@@ -47,6 +47,9 @@
   fill: rgba(185, 12, 12, 0.8);
   r: 1;
 }
+#share-modal {
+  display: none !important;
+}
 @media screen and (max-width: 1000px) {
   #drawer.open.noScroll {
     height: 118px !important;

+ 4 - 0
scene/src/assets/style/myBase.less

@@ -70,6 +70,10 @@
   }
 }
 
+#share-modal{
+  display: none !important;
+}
+
 // 移动端
 @media screen and (max-width: 1000px) {
   #drawer.open.noScroll {

+ 1 - 1
scene/src/views/gui/other.vue

@@ -59,7 +59,7 @@
           </a>
         </div>
       </div>
-      <div id="interaction-modal">
+      <div id="interaction-modal" v-show="0">
         <div id="interaction-modal-inner">
           <div class="nav-icon">
             <img