update1116 修复上线后的部分bug

packages/qjkankan-editor/.env

@@ -1,6 +1,6 @@
 VUE_APP_MAIN_COLOR=''
 VUE_APP_STATIC_DIR=static
-VUE_APP_CDN=https://ossxiaoan.4dage.com
-VUE_APP_PROXY_URL_ROOT='https://test.4dkankan.com'
-VUE_APP_PROXY_URL='https://test.4dkankan.com/qjkankan/'
+VUE_APP_CDN=https://4dkk.4dage.com
+VUE_APP_PROXY_URL_ROOT='https://www.4dkankan.com'
+VUE_APP_PROXY_URL='https://www.4dkankan.com/qjkankan/'
 VUE_APP_URL_FILL=

packages/qjkankan-editor/.env.prod

@@ -1,5 +1,8 @@
+
+NODE_ENV=production
 VUE_APP_MAIN_COLOR=''
 VUE_APP_STATIC_DIR=static
 VUE_APP_CDN=https://4dkk.4dage.com
-VUE_APP_PROXY_URL='http://www.4dkankan.com/qjkankan/'
+VUE_APP_PROXY_URL_ROOT='https://www.4dkankan.com'
+VUE_APP_PROXY_URL='https://www.4dkankan.com/qjkankan/'
 VUE_APP_URL_FILL=/qjkankan

packages/qjkankan-editor/src/components/preview/index.vue

@@ -99,7 +99,7 @@ export default {
 
 <style lang="less" scoped>
 .ui-message-confirm{
-  width: 1200px;
+  width: 1250px;
   height: 838px;
   border-radius: 4px;
   .icon_close{

packages/qjkankan-editor/src/framework/play/pano/components/list.vue

@@ -1,7 +1,11 @@
 <template>
   <div class="bar-list" v-if="show" :class="{ disable: isEditing }">
-    <div class="top-con" :style="`width:${Math.max(scenesListW, secondaryW) + 120}px`">
-      <div class="swiper-container" :style="`width:${scenesListW}px`" id="swScenes" ref="sw"
+    <div class="top-con"
+    :style="`width:${(Math.max(scenesListW,secondaryW)>1150)?'100%':((Math.max(scenesListW,secondaryW) + 120)+'px')}`"
+    >
+      <div class="swiper-container" 
+      :style="`width:${scenesListW>1150?'100%':(scenesListW+'px')}`"
+       id="swScenes" ref="sw"
         v-swiper:mySwiper="swiperOptions" v-if="currentScenesList.length > 0">
         <ul class="swiper-wrapper">
           <li v-tooltip="item.type === '4dkk' ? '请前往四维时代个人中心编辑场景' : ''" @click="tabCurrentScene(item)"

packages/qjkankan-kankan-view/.env.prod

@@ -5,8 +5,7 @@ VUE_APP_RESOURCE_URL=https://4dkk.4dage.com/
 # 静态资源地址
 VUE_APP_CDN_URL=https://4dkk.4dage.com/v4/www/
 # sdk文件地址
-# VUE_APP_SDK_DIR=https://4dkk.4dage.com/v4/www/sdk/
-VUE_APP_SDK_DIR=https://4dkk.4dage.com/v4-test/www/sdk/
+VUE_APP_SDK_DIR=https://4dkk.4dage.com/v4/www/sdk/
 
 
 
@@ -18,5 +17,5 @@ VUE_APP_STATIC_DIR=viewer
 VUE_APP_REGION_URL=
 
 # 接口请求地址
-VUE_APP_APIS_URL=https://test.4dkankan.com/
+VUE_APP_APIS_URL=https://www.4dkankan.com/
 

packages/qjkankan-kankan-view/public/smg.html

@@ -27,8 +27,8 @@
 
         <script src="<%= BASE_URL %><%= VUE_APP_STATIC_DIR %>/static/lib/jweixin-1.6.0.js"></script>
         
-        <script src="<%= VUE_APP_SDK_DIR %>kankan-sdk-deps.js?v=4.4.0-alpha.10"></script>
-        <script src="<%= VUE_APP_SDK_DIR %>kankan-sdk.js?v=4.4.0-alpha.10"></script>
+        <script src="<%= VUE_APP_SDK_DIR %>kankan-sdk-deps.js?v=4.3.4"></script>
+        <script src="<%= VUE_APP_SDK_DIR %>kankan-sdk.js?v=4.3.4"></script>
 
         <!-- <script src="https://4dkk.4dage.com/v4/www/sdk/kankan-sdk-deps.js?v=4.0.0-alpha.44"></script>
         <script src="https://4dkk.4dage.com/v4/www/sdk/kankan-sdk.js?v=4.0.0-alpha.44"></script> -->

packages/qjkankan-kankan-view/public/spg.html

@@ -17,8 +17,8 @@
         </noscript>
         <div id="app"></div>
         
-        <script src="<%= VUE_APP_SDK_DIR %>kankan-sdk-deps.js?v=4.4.0-alpha.10"></script>
-        <script src="<%= VUE_APP_SDK_DIR %>kankan-sdk.js?v=4.4.0-alpha.10"></script>
+        <script src="<%= VUE_APP_SDK_DIR %>kankan-sdk-deps.js?v=4.3.4"></script>
+        <script src="<%= VUE_APP_SDK_DIR %>kankan-sdk.js?v=4.3.4"></script>
 
         <!-- built files will be auto injected -->
     </body>

packages/qjkankan-view/.env

@@ -1,8 +1,8 @@
 VUE_APP_STATIC_DIR=showviewer
-VUE_APP_CDN=https://ossxiaoan.4dage.com
-VUE_APP_PROXY_URL_ROOT='https://test.4dkankan.com'
-VUE_APP_PROXY_URL='https://test.4dkankan.com/qjkankan/'
+VUE_APP_CDN=https://4dkk.4dage.com
+VUE_APP_PROXY_URL_ROOT='https://www.4dkankan.com'
+VUE_APP_PROXY_URL='https://www.4dkankan.com/qjkankan/'
 VUE_APP_URL_FILL=
 
 # 接口请求地址
-VUE_APP_APIS_URL=https://test.4dkankan.com/
+VUE_APP_APIS_URL=https://www.4dkankan.com/

packages/qjkankan-view/.env.prod

@@ -0,0 +1,6 @@
+NODE_ENV=production
+VUE_APP_STATIC_DIR=showviewer
+VUE_APP_CDN=https://4dkk.4dage.com
+VUE_APP_PROXY_URL_ROOT='https://www.4dkankan.com'
+VUE_APP_PROXY_URL='https://www.4dkankan.com/qjkankan/'
+VUE_APP_URL_FILL=/qjkankan

packages/qjkankan-view/package.json

@@ -6,6 +6,7 @@
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
     "build-testprod": "vue-cli-service build --mode testprod",
+    "build-prod": "vue-cli-service build --mode prod",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {

packages/qjkankan-view/src/components/UIGather/control/text.vue

@@ -56,6 +56,7 @@ const close = () => {
     padding: 30px;
     max-height: calc(100vh - 100px);
     overflow-y: auto;
+    line-height: 24px;
   }
 
   .title {

packages/qjkankan-view/src/components/UIGather/index.vue

@@ -4,10 +4,13 @@
       <div v-show="showUI">
             <Control />
             <Menu v-if="fdkkCurrentVersion == 'v4'" />
-            <div @click="onIsShowList" v-else class="v3daolan" :class="{ active: isShowScenesList }">
+            <div @click="onIsShowList" v-else
+                  v-show="!((metadata.catalogRoot && metadata.catalogRoot.length == 1) && scenes.length == 1 && secondaryList.length == 1)"
+                  class="v3daolan" :class="{ active: isShowScenesList }">
                   <img :src="require(`@/assets/images/icon/${isShowScenesList ? 'function_off@2x.png' : 'function_on@2x.png'}`)"
                         alt="" />
             </div>
+
             <sceneList />
             <div class="btnmask"></div>
       </div>
@@ -28,6 +31,9 @@ const store = useStore();
 const fdkkCurrentVersion = computed(() => store.getters["scene/fdkkCurrentVersion"]);
 const isShowScenesList = computed(() => store.getters["functions/isShowScenesList"]);
 const currentScene = computed(() => store.getters["scene/currentScene"]);
+const metadata = computed(() => store.getters["scene/metadata"]);
+const scenes = computed(() => store.getters["scene/list"]);
+const secondaryList = computed(() => store.getters["scene/secondaryList"]);
 
 const showUI = ref(false)
 
@@ -73,7 +79,8 @@ useApp().then((app) => {
       &.active {
             background: rgba(0, 0, 0, 0.5);
       }
-      >img{
+
+      >img {
             width: 26px;
             height: 26px;
       }

packages/qjkankan-view/src/components/UIGather/list.vue

@@ -3,9 +3,10 @@
     v-if="show && !((metadata.catalogRoot && metadata.catalogRoot.length == 1) && scenes.length == 1 && secondaryList.length == 1)"
     :class="{ barshow: isShowScenesList }">
     <div class="top-con" 
-    :style="`width:${Math.max(scenesListW,secondaryW) + 120}px`">
-
-      <div class="swiper-container" :style="`width:${scenesListW}px`"
+    :style="`width:${(Math.max(scenesListW,secondaryW)>1150)?'100%':((Math.max(scenesListW,secondaryW) + 120)+'px')}`"
+    >
+      <div class="swiper-container" 
+      :style="`width:${scenesListW>1150?'100%':(scenesListW+'px')}`"
         id="swScenes" v-if="currentScenesList.length > 0">
         <ul class="swiper-wrapper">
           <li @click="tabCurrentScene(item)" class="swiper-slide" :class="{

packages/qjkankan-view/src/components/UIGather/mobile/control/telephone.vue

@@ -62,6 +62,7 @@ const close = () => {
       color: #fff;
       padding: 14px 26px;
       max-height: calc(100vh - 100px);
+      line-height: 24px;
       overflow-y: auto;
       .theader {
         display: flex;

packages/qjkankan-view/src/components/UIGather/mobile/control/text.vue

@@ -71,6 +71,7 @@ const close = () => {
       padding: 20px;
       max-height: calc(100vh - 60px);
       overflow-y: auto;
+      line-height: 24px;
     }
   }