修复bug

public/material.html

@@ -24,8 +24,6 @@
     <script src="<%= VUE_APP_STATIC_DIR %>/lib/krpano/js/tour.js"></script>
     <script src="<%= VUE_APP_STATIC_DIR %>/lib/mCustomScrollbar/jquery.mCustomScrollbar.concat.min.js"></script>
     <script src="<%= VUE_APP_STATIC_DIR %>/lib/scrollbar/perfect-scrollbar.min.js"></script>
-    <script src="<%= VUE_APP_STATIC_DIR %>/lib/scrollbar/perfect-scrollbar.min.js"></script>
-    <script src="<%= VUE_APP_STATIC_DIR %>/lib/scrollbar/perfect-scrollbar.min.js"></script>
     <script src="<%= VUE_APP_STATIC_DIR %>/lib/audio.min.1.0.4.js"></script>
     <script src="<%= VUE_APP_STATIC_DIR %>/lib/tooltipster/tooltipster.bundle.js"></script>
 

public/show.html

@@ -20,5 +20,7 @@
     <script src="<%= VUE_APP_STATIC_DIR %>/lib/krpano/js/tour.js"></script>
     <script src="<%= VUE_APP_STATIC_DIR %>/lib/mCustomScrollbar/jquery.mCustomScrollbar.concat.min.js"></script>
     <script src="<%= VUE_APP_STATIC_DIR %>/lib/scrollbar/perfect-scrollbar.min.js"></script>
+    <script src="<%= VUE_APP_STATIC_DIR %>/lib/sly.min.js"></script>
+
   </body>
 </html>

src/components/rollName/index.vue

@@ -52,8 +52,8 @@ export default {
         // requestAnimationFrame(fn)
       }
 
-console.log('==============');
-      console.log(this.parentW, this.childW);
+// console.log('==============');
+//       console.log(this.parentW, this.childW);
       
       if (this.parentW < this.childW) {
         this.clearInter()

src/components/shared/loading/smallWaiting.vue

@@ -1,12 +1,15 @@
 <template>
     <popup ref="Message" v-if="display">
         <div class="ui-waiting">
+            <div class="icon">
+                <img :src="require('@/assets/images/loading.png')" alt="">
+            </div>
             <div class="txt">加载中</div>
-            <div class="spinner">
+            <!-- <div class="spinner">
                 <div class="bounce1"></div>
                 <div class="bounce2"></div>
                 <div class="bounce3"></div>
-            </div>
+            </div> -->
             <!-- <div>请稍等...</div> -->
         </div>
     </popup>
@@ -39,6 +42,24 @@ export default {
     color: #fff;
     text-align: center;
     letter-spacing: 2px;
+    width: 110px;
+    height: 110px;
+    background: rgba(0, 0, 0, 0.5);
+    border-radius: 2px;
+    .icon{
+        width: 60px;
+        height: 60px;
+        position: relative;
+        overflow: hidden;
+        margin: 10px auto;
+        >img{
+            height: 60px;
+            position: absolute;
+            left: 0;
+            top: 0;
+            animation: loading 1s steps(15) infinite;
+        }
+    }
     .txt{
         font-size: 14px;
     }
@@ -67,5 +88,12 @@ export default {
             animation-delay: -0.16s;
         }
     }
+
+    
+}
+@keyframes loading {
+  100% {
+    left: -900px;
+  }
 }
 </style>

src/components/tablist/index.vue

@@ -118,7 +118,7 @@ export default {
       this.currentXY = { top: e.y, left: e.x };
       let ul = $(e.target).find("ul");
       ul.css({
-        top: (e.y - 5) + "px",
+        top: (e.y) + "px",
         left: (e.x - 5) + "px",
         display: "block",
       });

src/framework/show/list.vue

@@ -72,6 +72,7 @@ export default {
       loadFirst: true,
       menuWidth: 0,
       sceneNum: config.sceneNum,
+      SlyArr:[]
     };
   },
   computed: {
@@ -93,19 +94,40 @@ export default {
       history.replaceState(null, null, "".concat(window.location.pathname, "?").concat(`id=${this.showInfo.id}&vr=${item.sceneCode}`));
       this.sceneNum = item.sceneCode;
     },
+    refreshSly(){
+      this.SlyArr.forEach(item=>{
+        // item.toStart()
+        this.$nextTick(() => {
+          item.reload()
+        });
+      })
+     
+    }
   },
 
   mounted() {
     this.$nextTick(() => {
       if ($scroll == null) {
         let eles = $(".clip-scroller");
-        Array.from(eles).forEach((item) => {
-          let frame = new PerfectScrollbar(item, {
-            useBothWheelAxes: true,
-            suppressScrollY: true,
-            wheelSpeed: 0.8,
-          });
-          $(item).data("scrollbar", frame);
+        Array.from(eles).forEach((item,i) => {
+          // let frame = new PerfectScrollbar(item, {
+          //   useBothWheelAxes: true,
+          //   suppressScrollY: true,
+          //   wheelSpeed: 0.8,
+          // });
+          // $(item).data("scrollbar", frame);
+          let iii = new Sly($(item),{
+              horizontal: !0,
+              smart: !0,
+              mouseDragging: !0,
+              touchDragging: !0,
+              speed: 0,
+              dragHandle: !0,
+              dynamicHandle: !0,
+              clickBar: !0,
+              activateOn: null
+          }).init()
+          this.SlyArr.push(iii)
         });
       }
     });
@@ -140,6 +162,7 @@ export default {
           });
           this.scenes = arr.sort((a, b) => a.weight - b.weight);
         }
+        this.refreshSly()
       },
     },
 

src/views/base/Toolbar.vue

@@ -331,8 +331,8 @@ export default {
 }
 
 .preview {
+  overflow: hidden;
   img {
-    width: 100%;
     height: 100%;
   }
 }

src/views/hotspot/Toolbar.vue

@@ -47,10 +47,21 @@ export default {
     this.$nextTick(() => {
           if ($scroll == null) {
               $scroll = $(".clip-scroller")[0];
-              new PerfectScrollbar($scroll, {
-                  useBothWheelAxes: true,
-                  suppressScrollY: true,
-              });
+
+              var options = {
+                horizontal: 1,
+                itemNav: 'basic',
+                speed: 300,
+                mouseDragging: 1,
+                touchDragging: 1
+              };
+
+              $scroll .sly(options);
+              // var frame = new Sly('#frame', options).init();
+              // new PerfectScrollbar($scroll, {
+              //     useBothWheelAxes: true,
+              //     suppressScrollY: true,
+              // });
           }
       });
   },