1

.env.dev

@@ -5,5 +5,5 @@ VUE_APP_ORIGIN=${VUE_APP_PROTOCOL}yuhuatai.4dage.com
 VUE_APP_CDN_PATH=${VUE_APP_ORIGIN}/YHT/goodsData/
 VUE_APP_CDN_PATH_QJKK_SOME_DATA=${VUE_APP_ORIGIN}/YHT/Qjkk/local/WK1578926366500417536/someData.json
 VUE_APP_CDN_PATH_QJKK_DESC=${VUE_APP_ORIGIN}/YHT/Qjkk/data/
-VUE_APP_MOBILE_URL=${VUE_APP_ORIGIN}/YHTM/index.html
-VUE_APP_PC_URL=${VUE_APP_ORIGIN}/YHT/index.html
+# VUE_APP_MOBILE_URL=${VUE_APP_ORIGIN}/YHTM/index.html
+# VUE_APP_PC_URL=${VUE_APP_ORIGIN}/YHT/index.html

.env.test

@@ -5,5 +5,5 @@ VUE_APP_ORIGIN=${VUE_APP_PROTOCOL}yuhuatai.4dage.com
 VUE_APP_CDN_PATH=${VUE_APP_ORIGIN}/YHT/goodsData/
 VUE_APP_CDN_PATH_QJKK_SOME_DATA=${VUE_APP_ORIGIN}/YHT/Qjkk/local/WK1578926366500417536/someData.json
 VUE_APP_CDN_PATH_QJKK_DESC=${VUE_APP_ORIGIN}/YHT/Qjkk/data/
-VUE_APP_MOBILE_URL=${VUE_APP_ORIGIN}/YHTM/index.html
-VUE_APP_PC_URL=${VUE_APP_ORIGIN}/YHT/index.html
+# VUE_APP_MOBILE_URL=${VUE_APP_ORIGIN}/YHTM/index.html
+# VUE_APP_PC_URL=${VUE_APP_ORIGIN}/YHT/index.html

README.md

@@ -1,2 +1,2 @@
 # 部署
-阿里云 oss://yuhuatai/YHTM/
+阿里云 oss://4dkk-culture/AnhuiDaily/

package.json

@@ -1,6 +1,6 @@
 {
   "name": "yuhuatai-mobile",
-  "version": "0.3.20230106.1440",
+  "version": "0.1.20230203.1935",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve --mode dev",

src/main.js

@@ -25,31 +25,32 @@ const uaParser = new UAParser()
 const uaInfo = uaParser.getResult()
 console.log(uaInfo)
 Vue.prototype.$uaInfo = uaInfo
+if (uaInfo.device.type === 'mobile') {
+  Vue.prototype.$isMobile = true
+} else {
+  Vue.prototype.$isMobile = false
+}
 if (uaInfo.browser && uaInfo.browser.name === 'WeChat') {
   Vue.prototype.$isWeChat = true
 }
 if (uaInfo.browser && uaInfo.browser.name === 'Safari') {
   Vue.prototype.$isSafari = true
 }
-if (uaInfo.device.type !== 'mobile' && window.innerWidth > window.innerHeight) {
-  location.replace(process.env.VUE_APP_PC_URL)
-}
+
+// 酌情跳转到PC版
+// if (uaInfo.device.type !== 'mobile' && window.innerWidth > window.innerHeight) {
+//   location.replace(process.env.VUE_APP_PC_URL)
+// }
 
 Vue.prototype.$origin = process.env.VUE_APP_ORIGIN
 Vue.prototype.$globalConfig = globalConfig
 Vue.prototype.$cdnPath = process.env.VUE_APP_CDN_PATH
 Vue.prototype.$msgCenter = new MessageCenter()
 
-const idealWindowInnerWidth = 1125 // 设计稿的宽度
-const idealRootFontSize = 24 // 设计稿里选择的根元素尺寸
-
 let windowWidthLast = window.innerWidth
 let windowHeightLast = window.innerHeight
 
 function onResize() {
-  Vue.prototype.$oneRemToPx = window.innerWidth * idealRootFontSize / idealWindowInnerWidth
-  document.documentElement.style.fontSize = Vue.prototype.$oneRemToPx + 'px'
-
   if (window.innerWidth === windowWidthLast) {
     // 发生了高度变化，认为发生了软键盘显隐
     if (uaInfo.os.name === 'Android') {

src/router/index.js

@@ -49,7 +49,7 @@ const routes = [
     name: 'SwkkView',
     component: SwkkView,
     meta: {
-      isShowBottomBar: true,
+      isShowBottomBar: false,
       canFullScreen: true,
     },
     beforeEnter (to, from, next) {

src/views/SwkkView.vue

@@ -6,7 +6,15 @@
       class="swkk-wrap"
     />
 
-    <menu>
+    <h1>
+      安徽省纪录小康工程数据库云展馆
+    </h1>
+
+    <menu
+      :style="{
+        bottom: isShowTourGuide ? '300px' : '',
+      }"
+    >
       <button
         id="auto-moving"
         :class="{active: isAutoMoving}"
@@ -25,7 +33,7 @@
           draggable="false"
         >
 
-        <div>自动漫游</div>
+        <!-- <div>自动漫游</div> -->
       </button>
       <button
         id="tour-guide"
@@ -33,18 +41,11 @@
         @click="onClickCjdl"
       >
         <img
-          v-show="!isShowTourGuide"
           src="@/assets\images\swkk\changjingdaolan.png"
           alt=""
           draggable="false"
         >
-        <img
-          v-show="isShowTourGuide"
-          src="@/assets\images\swkk\changjingdaolan_1.png"
-          alt=""
-          draggable="false"
-        >
-        <div>场景导览</div>
+        <!-- <div>场景导览</div> -->
       </button>
       <button
         id="qjmy"
@@ -52,58 +53,37 @@
         @click="onClickQjmy"
       >
         <img
-          v-show="mode !== 2"
           src="@/assets\images\swkk\quanjingmanyou.png"
           alt=""
           draggable="false"
         >
-        <img
-          v-show="mode === 2"
-          src="@/assets\images\swkk\quanjingmanyou_1.png"
-          alt=""
-          draggable="false"
-        >
-        <div>全景漫游</div>
+        <!-- <div>全景漫游</div> -->
       </button>
       <button
-        id="mini-model"
+        id="overlook"
         :class="{active: mode === 3}"
-        @click="onClickMnmx"
+        @click="onClickDbfs"
       >
         <img
-          v-show="mode !== 3"
-          src="@/assets\images\swkk\minimoxing.png"
-          alt=""
-          draggable="false"
-        >
-        <img
-          v-show="mode === 3"
-          src="@/assets\images\swkk\minimoxing_1.png"
+          src="@/assets\images\swkk\dingbufushi.png"
           alt=""
           draggable="false"
         >
-        <div>迷你模型</div>
+        <!-- <div>顶部俯视</div> -->
       </button>
       <button
-        id="overlook"
+        id="mini-model"
         :class="{active: mode === 4}"
-        @click="onClickDbfs"
+        @click="onClickMnmx"
       >
         <img
-          v-show="mode !== 4"
-          src="@/assets\images\swkk\dingbufushi.png"
-          alt=""
-          draggable="false"
-        >
-        <img
-          v-show="mode === 4"
-          src="@/assets\images\swkk\dingbufushi_1.png"
+          src="@/assets\images\swkk\minimoxing.png"
           alt=""
           draggable="false"
         >
-        <div>顶部俯视</div>
+        <!-- <div>迷你模型</div> -->
       </button>
-      <button
+      <!-- <button
         id="hotspot-list"
         :class="{active: isShowHotspotList}"
         @click="isShowHotspotList = true"
@@ -121,7 +101,7 @@
           draggable="false"
         >
         <div>热点列表</div>
-      </button>
+      </button> -->
     </menu>
 
     <!-- 右上地图 -->
@@ -130,26 +110,12 @@
       id="mini-map"
       class="mini-map"
     >
-      <div
-        class="radio-wrap"
-        :class="{ active: floor === '1' }"
-        @click="changeFloor('1')"
-      >
-        <div class="radio" />
-        <div class="rowrr">
-          一层
-        </div>
-      </div>
-      <div
-        class="radio-wrap"
-        :class="{ active: floor === '2' }"
-        @click="changeFloor('2')"
+      <img
+        class="mini-map-top"
+        :src="require(`@/assets/images/swkk/mini-map-${$isMobile ? 'mobile' : 'pc'}.png`)"
+        alt=""
+        draggable="false"
       >
-        <div class="radio" />
-        <div class="rowrr">
-          二层
-        </div>
-      </div>
     </div>
 
     <!-- 导览栏 -->
@@ -486,9 +452,9 @@ export default {
     // 监听看看的模式
     kankan.Camera.on("mode.beforeChange", ({ toMode }) => {
       this.mode = {
-        floorplan: 4,
-        dollhouse: 3,
         panorama: 2,
+        floorplan: 3,
+        dollhouse: 4,
       }[toMode]
     })
 
@@ -599,22 +565,37 @@ export default {
     z-index: 0;
   }
 
+  > h1 {
+    position: absolute;
+    z-index: 1;
+    top: 23px;
+    left: 50%;
+    transform: translateX(-50%);
+    background: rgba(0,0,0,0.45);
+    border-radius: 33px;
+    font-size: 16px;
+    color: #FFFFFF;
+    padding: 9px 29px;
+
+  }
+
   > menu {
     position: absolute;
     z-index: 1;
-    top: 2rem;
-    left: 1.75rem;
+    left: 30px;
+    bottom: 30px;
     display: flex;
-    flex-direction: column;
     align-items: center;
     > button {
-      margin-bottom: 0.83rem;
-      &:last-child {
-        margin-bottom: initial;
+      margin-left: 30px;
+      opacity: 0.7;
+      cursor: pointer;
+      &:hover {
+        opacity: 1;
       }
       > img {
-        width: 5rem;
-        height: 5rem;
+        width: 50px;
+        height: 50px;
       }
       > div {
         color: #fff;
@@ -623,6 +604,7 @@ export default {
         font-size: 1.17rem;
       }
       &.active {
+        opacity: 1;
         > div {
           color: #930909;
           text-shadow: 0px 0px 0.2rem rgba(255,255,255,0.6);
@@ -632,60 +614,22 @@ export default {
   }
 
   /deep/[xui_min_map] {
-    top: 7rem;
-    right: 1.67rem;
-    width: 18rem;
-    height: 18rem;
-    border: 0.08rem solid #D8B275;
-    background-color: rgba(81, 32, 32, 0.4);
-    border-radius: 0 0 0.42rem 0.42rem;
+    top: 28px;
+    right: 20px;
+    width: 237px;
+    height: 149px;
+    border: none;
+    background: rgba(86,86,86,0.2);
+    border-radius: 0;
+    backdrop-filter: blur(10px);
   }
   .mini-map {
     position: absolute;
     z-index: 1;
-    right: 1.67rem;
-    top: 2.5rem;
-    border: 0.08rem solid #d8b275;
-    border-radius: 0.42rem 0.42rem 0 0;
-    color: #fff;
-    width: 18rem;
-    height: 4.6rem;
-    background-color: #930909;
-    display: flex;
-    justify-content: space-evenly;
-    .radio-wrap {
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      font-size: 1.67rem;
-      .radio {
-        margin-right: 0.5rem;
-        width: 2.2rem;
-        height: 2.2rem;
-        border-radius: 50%;
-        border: 0.08rem solid #fff;
-        position: relative;
-      }
-      .rowrr {
-      }
-    }
-    .active {
-      color: #d8b275;
-      pointer-events: none;
-      .radio {
-        &::after {
-          content: "";
-          position: absolute;
-          top: 50%;
-          left: 50%;
-          transform: translate(-50%, -50%);
-          border-radius: 50%;
-          width: 1rem;
-          height: 1rem;
-          background-color: #d8b275;
-        }
-      }
-    }
+    right: 12px;
+    top: 10px;
+    width: 254px;
+    height: 18px;
   }
 
   .tour-guide-wrap {