修复bug

.env.development

@@ -4,7 +4,7 @@ VUE_APP_RESOURCE_URL=https://4dkk.4dage.com/
 # 静态资源地址
 VUE_APP_CDN_URL=https://4dkk.4dage.com/v4/www/
 # sdk文件地址
-VUE_APP_SDK_DIR=http://192.168.0.45:3099/dist/sdk
+VUE_APP_SDK_DIR=http://192.168.0.198:3099/dist/sdk
 # 静态资源目录
 VUE_APP_STATIC_DIR=viewer
 

src/app.vue

@@ -22,12 +22,12 @@
           <div class="tabs" v-if="controls.showMap">
             <span :class="{ active: mode === 'floorplan' }" @click="changeMode('floorplan', $event)">
               <ui-icon :type="mode == 'floorplan' ? 'show_plane_selected' : 'show_plane_normal'"></ui-icon>
-              二维
+              二維
             </span>
             <span :class="{ active: mode === 'dollhouse' }" @click="changeMode('dollhouse', $event)">
               <ui-icon :type="mode == 'dollhouse' ? 'show_3d_selected' : 'show_3d_normal'"></ui-icon>
 
-              三维
+              三維
             </span>
             <div class="background" ref="background"></div>
           </div>
@@ -246,7 +246,7 @@ onMounted(async () => {
     .then((view) => {
       view.on("click", (e) => {
         var tag = e.data;
-        // 聚焦当前点击的热点
+        // 聚焦當前點擊的熱點
         view.focus(tag.sid).then(() => {
           if (tag.type == "coupon") {
             store.commit("tag/setTagClickType", {
@@ -490,7 +490,7 @@ onMounted(async () => {
     width: 64px !important;
     height: 64px !important;
     &::after {
-      content: "发现好礼";
+      content: "發現好禮";
       width: 100%;
       color: #ed5d18;
       position: absolute;

src/components/Controls/Panel/Guide.vue

@@ -98,11 +98,11 @@ const menulist = ref([
   },
   {
     icon: "guided_shopping",
-    name: "导购",
+    name: "導購",
   },
   {
     icon: "shopping",
-    name: "购物",
+    name: "購物",
   },
 ]);
 
@@ -140,7 +140,7 @@ const categorylist = ref([
 const brandlist = ref([
   {
     img: "show_3d_normal",
-    name: "GAP 盖璞",
+    name: "GAP 蓋璞",
   },
   {
     img: "show_3d_normal",
@@ -152,7 +152,7 @@ const brandlist = ref([
   },
   {
     img: "show_3d_normal",
-    name: "GAP 盖璞",
+    name: "GAP 蓋璞",
   },
   {
     img: "show_3d_normal",
@@ -164,7 +164,7 @@ const brandlist = ref([
   },
   {
     img: "show_3d_normal",
-    name: "GAP 盖璞",
+    name: "GAP 蓋璞",
   },
   {
     img: "show_3d_normal",
@@ -176,7 +176,7 @@ const brandlist = ref([
   },
   {
     img: "show_3d_normal",
-    name: "GAP 盖璞",
+    name: "GAP 蓋璞",
   },
   {
     img: "show_3d_normal",

src/components/Controls/Panel/Main.vue

@@ -3,7 +3,7 @@
     <div class="menu color">
       <div class="logo">
         <img :src="require('@/assets/images/icon/logo.png')" alt="" />
-        <p>cdf澳门上葡京</p>
+        <p>CDF澳门上葡京</p>
       </div>
       <div class="vline"></div>
       <ul>
@@ -22,10 +22,14 @@
       <div class="navigation">
         <div class="h3">專櫃導航</div>
         <div class="swiper-container" id="sw-navigation">
-          <ul class="swiper-wrapper" >
+          <ul class="swiper-wrapper">
             <li class="swiper-slide" @click.stop="onClickShop(item)" v-for="(item, i) in brandlist" :key="i">
-              <div class="img" :style="{ 'background-image': `url(${item.shopLogo+'?rnd='+Math.random()})` }"></div>
-              <div class="name">{{ item.shopName }}</div>
+              <div v-if="item.shopLogo" class="img" :style="{ 'background-image': `url(${item.shopLogo + '?rnd=' + Math.random()})` }"></div>
+              <div class="name" v-if="item.shopName">
+                <span :class="{active:item.shopName.length>6}">
+                  {{ item.shopName }}
+                </span>
+              </div>
             </li>
           </ul>
         </div>
@@ -197,7 +201,7 @@ const brandScroll = () => {
         spaceBetween: 10,
         grid: {
           rows: 2,
-          fill: 'row'
+          fill: "row",
         },
         on: {
           touchMove(swiper, e) {
@@ -224,10 +228,11 @@ const brandScroll = () => {
 
 const onClickMenu = (item) => {
   if (item.id == "kefu") {
-    let mglink = 'https://webpage.qidian.qq.com/2/chat/h5/index.html?linkType=1&env=ol&kfuin=3009110132&fid=3655&key=9b4334768c39150ead3f23e11e5dc2e4&cate=7&source=0&isLBS=0&isCustomEntry=0&type=10&ftype=1&_type=wpa&qidian=true&_pid=kvrmvu.74cg11.l43qvbcu&translateSwitch=0&isSsc=0&roleValue=4&roleData=922223821'
+    let mglink =
+      "https://webpage.qidian.qq.com/2/chat/h5/index.html?linkType=1&env=ol&kfuin=3009110132&fid=3655&key=9b4334768c39150ead3f23e11e5dc2e4&cate=7&source=0&isLBS=0&isCustomEntry=0&type=10&ftype=1&_type=wpa&qidian=true&_pid=kvrmvu.74cg11.l43qvbcu&translateSwitch=0&isSsc=0&roleValue=4&roleData=922223821";
     window.location.href = mglink;
   } else if (item.id == "shopping") {
-    browser.openLink("/subPackage/pages/shoppingcart/shoppingcart", "https://m.cdfmembers.com/shop/600667208/shoppingcart","/pages/shoppingcart/main");
+    browser.openLink("/subPackage/pages/shoppingcart/shoppingcart", "https://m.cdfmembers.com/shop/600667208/shoppingcart", "/pages/shoppingcart/main");
   }
 };
 
@@ -378,13 +383,20 @@ onMounted(() => {
             font-size: 12px;
             left: 0;
             background: rgba(0, 0, 0, 0.5);
-            text-overflow: ellipsis;
-            white-space: nowrap;
-            overflow: hidden;
+            // text-overflow: ellipsis;
+            // white-space: nowrap;
+            // overflow: hidden;
             text-align: center;
             padding: 2px 4px;
             box-sizing: border-box;
             word-break: break-all;
+            > span {
+              display: inline-block;
+              white-space: nowrap;
+            }
+            .active{
+              animation: 5s wordsLoop linear infinite normal;
+            }
           }
         }
       }
@@ -414,4 +426,17 @@ onMounted(() => {
     }
   }
 }
+
+@keyframes wordsLoop {
+  0% {
+    transform: translateX(100%);
+    -webkit-transform: translateX(100%);
+  }
+
+  100% {
+    transform: translateX(-100%);
+    -webkit-transform: translateX(-100%);
+  }
+}
+
 </style>

src/components/Information/View.Mobile.vue

@@ -52,7 +52,7 @@
                         </li>
                         <li @click="onShare('copy')">
                             <i class="iconfont iconlink"></i>
-                            <div>复制链接</div>
+                            <div>復製鏈接</div>
                         </li>
                     </ul>
                     <div @click="showShare = false">取消</div>
@@ -62,13 +62,13 @@
         <div class="url-share" v-show="showCopy">
             <div>
                 <div class="tips">
-                    <h4>分享链接给好友</h4>
+                    <h4>分享鏈接給好友</h4>
                     <i class="iconfont iconshow_cancel" @click="showCopy = false"></i>
                 </div>
                 <div class="url">{{ copyLink }}</div>
                 <div class="btns">
                     <ui-button class="cancel" @click="showCopy = false">取消</ui-button>
-                    <ui-button class="primary" :data-clipboard-text="copyLink" ref="copy$">一键复制</ui-button>
+                    <ui-button class="primary" :data-clipboard-text="copyLink" ref="copy$">一鍵復製</ui-button>
                 </div>
             </div>
         </div>
@@ -138,7 +138,7 @@ onMounted(() => {
     new ClipboardJS(copy$.value.$el).on('success', function (e) {
         e.clearSelection()
         showCopy.value = false
-        Dialog.toast({ content: '场景链接复制成功', type: 'success' })
+        Dialog.toast({ content: '場景鏈接復製成功', type: 'success' })
     })
 
     nextTick(() => {
@@ -584,7 +584,7 @@ const onChangeMode = () => {
                 text-overflow: ellipsis;
                 word-break: break-all;
                 word-wrap: break-word;
-                -webkit-line-clamp: 2; //在第几行加省略号
+                -webkit-line-clamp: 2; //在第幾行加省略號
                 -webkit-box-orient: vertical;
             }
             .btns {
@@ -724,7 +724,7 @@ const onChangeMode = () => {
     }
 }
 
-// ipad 横屏
+// ipad 橫屏
 @media only screen and (min-device-width: 768px) and (orientation: landscape) {
     .header {
         height: 0.8rem;

src/components/Tags/goods-list.vue

@@ -239,6 +239,7 @@ onMounted(() => {
           height: 34vh;
           width: 100%;
           background-size: auto 100%;
+          background-position: center;
         }
         .info {
           font-size: 14px;

src/components/openVideo/index.vue

@@ -1,12 +1,13 @@
 <template>
   <transition appear name="custom-classes-transition" leave-active-class="animated fadeOut faster">
     <div class="open-video">
-      <video x5-playsinline="true" ref="bgvideo$" playsinline="true" webkit-playsinline="true" class="bgvideo" preload autoplay :src="videourl"></video>
+      <!-- <video x5-playsinline="true" ref="bgvideo$" playsinline="true" webkit-playsinline="true" class="bgvideo" preload autoplay :src="videourl"></video> -->
       <div class="vmask"></div>
       <video x5-playsinline="true" playsinline="true" webkit-playsinline="true" class="video" ref="openvideo$" preload autoplay :src="videourl"></video>
-
-      <div v-show="videourl" @click.stop="emit('close')" class="jump">跳過</div>
-      <img v-show="videourl && bofanging" @click.stop="bofang" class="bofang" :src="require('@/assets/images/icon/bofang.png')" alt="" />
+      <template>
+        <div v-show="videourl" @click.stop="emit('close')" class="jump">跳過</div>
+        <img v-show="videourl && bofanging" @click.stop="bofang" class="bofang" :src="require('@/assets/images/icon/bofang.png')" alt="" />
+      </template>
     </div>
   </transition>
 </template>
@@ -17,6 +18,9 @@ import * as apis from "@/apis/index.js";
 const openvideo$ = ref(null);
 const bgvideo$ = ref(null);
 
+const openvideoCanplay = ref(null);
+const bgvideoCanplay = ref(null);
+
 const videourl = ref(null);
 const bofanging = ref(true);
 
@@ -38,14 +42,30 @@ onMounted(() => {
       emit("close");
     });
 
-    openvideo$.value.addEventListener("play", () => {
-      bofanging.value = false;
+    openvideo$.value.addEventListener("playing", () => {
+      if (bofanging.value) {
+        bofanging.value = false;
+      }
+    });
+
+    openvideo$.value.addEventListener("pause", () => {
+      if (!bofanging.value) {
+        bofanging.value = true;
+      }
     });
 
-    openvideo$.value.addEventListener("puased", () => {
-      bofanging.value = true;
+    openvideo$.value.addEventListener("canplaythrough", () => {
+      if (!openvideoCanplay.value) {
+        openvideoCanplay.value = true;
+      }
     });
 
+    // bgvideo$.value.addEventListener("canplaythrough", () => {
+    //   if (!bgvideoCanplay.value) {
+    //     bgvideoCanplay.value = true;
+    //   }
+    // });
+
     document.addEventListener(
       "WeixinJSBridgeReady",
       () => {
@@ -78,11 +98,7 @@ onMounted(() => {
     z-index: 999;
   }
   .bgvideo {
-    position: absolute;
-    left: 0;
-    top: 0;
-    bottom: 0;
-    right: 0;
+    position: fixed;
     z-index: 1;
     height: 100%;
     width: auto;
@@ -100,15 +116,15 @@ onMounted(() => {
     z-index: 2;
     backdrop-filter: blur(10px);
   }
-  .video {
-    width: 100%;
-    height: 100%;
-    display: table-cell;
-    text-align: center;
-    vertical-align: middle;
-    position: relative;
-    z-index: 9;
-  }
+  // .video {
+  //   width: 100%;
+  //   height: 100%;
+  //   display: table-cell;
+  //   text-align: center;
+  //   vertical-align: middle;
+  //   position: relative;
+  //   z-index: 9;
+  // }
   .jump {
     position: absolute;
     right: 15px;

src/components/shared/Loading.vue

@@ -1,6 +1,6 @@
 <template>
     <transition appear name="custom-classes-transition" leave-active-class="animated fadeOut faster">
-        <div v-if="show" class="scene-loading" :class="{ small: small, thumb: props.thumb, default: thumbStyle }" @touchmove.prevent :style="thumb && { backgroundImage: `url(${thumb})` }">
+        <div v-if="show" class="scene-loading" :class="{ small: small, default: thumbStyle }" @touchmove.prevent :style="thumb && { backgroundImage: `url(${thumb})` }">
             <div class="content">
                 <div :style="`transform:translateZ(0) scale(${small});`">
                     <div v-for="item in 3" :key="item" :class="`brick brick-${item} ${enter ? 'enter' : ''}`">