Browse Source

Merge branch 'dev' of http://192.168.0.115:3000/chenzhiguang/qjkankan_v1.1.1 into dev

jinx 5 months ago
parent
commit
88816f4065

+ 1 - 1
packages/qjkankan-view/.env.testprod

@@ -7,7 +7,7 @@ VUE_APP_PROXY_URL='https://test.4dkankan.com/qjkankan/'
 VUE_APP_URL_FILL=/qjkankan
 # 接口请求地址
 VUE_APP_APIS_URL=https://test.4dkankan.com/
-VUE_APP_DEBBUG_FLAG=20241106
+VUE_APP_DEBBUG_FLAG=20241107
 VUE_APP_DEBBUG_NOTIFY=0
 VUE_APP_DEBBUG_V4=0
 VUE_APP_DEBBUG_V4_URL="http://192.168.0.186:8081"

BIN
packages/qjkankan-view/src/assets/images/icon2/share.png


BIN
packages/qjkankan-view/src/assets/images/icon2/share@2x.png


+ 14 - 1
packages/qjkankan-view/src/components/UIGather/mobile/control.pano.vue

@@ -74,6 +74,9 @@
     <introduce v-if="showIntroduce" />
     <telephone v-if="showTelephone" />
     <clink v-if="showLink" />
+    <div class="tools-share" @click="onShare">
+      <img :src="require(`@/assets/images/icon2/share@2x.png`)" alt="" />
+    </div>
     <div class="tools-more" @click="showMore = false" v-if="showMore">
       <div class="list">
         <div @click="onIsAutoRotate">
@@ -134,7 +137,6 @@ import {
 } from "vue";
 import { useStore } from "vuex";
 import { useApp } from "@/app";
-
 import introduce from "./control/text";
 import telephone from "./control/telephone";
 import clink from "./control/link";
@@ -330,6 +332,17 @@ onMounted(() => {
     }
   }
 }
+.tools-share{
+  position: absolute;
+  right: 15px;
+  top: 16px;
+  z-index: 999;
+  img{
+    width: 24px;
+    height: 24px;
+    object-fit: contain;
+  }
+}
 .tools-more{
   position: absolute;
   left: 0;

+ 2 - 2
packages/qjkankan-view/src/components/UIGather/mobile/logo.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="logo" v-if="metadata.isLogo && currentScene.type=='pano'">
-    <img :src="metadata.logo || require(`@/assets/images/default/logo_white_${local}.svg`)" alt="">
+  <div class="logo" v-if="metadata?.workLogo?.isLogo && currentScene.type=='pano'">
+    <img :src="metadata?.workLogo.logo || require(`@/assets/images/default/logo_white_${local}.svg`)" alt="">
   </div>
 </template>