1
0
tremble 2 лет назад
Родитель
Сommit
2e836a5fc6

+ 1 - 1
packages/qjkankan-editor/src/router/material.js

@@ -28,7 +28,7 @@ const router = new Router({
 
 router.beforeEach(async (to, from, next) => {
   if (to.path == '/') {
-      return next({path: "/pano" })
+      return next({path: "/works" })
   }
   next()
 })

+ 3 - 1
packages/qjkankan-editor/src/utils/other.js

@@ -75,7 +75,9 @@ export function debounce(fn, delay, isImmediateCall = false) {
 ④12345678
  */
 export function isValidPhoneNumber(value) {
-  const reg = /^1\d{10}$|^(0\d{2,3}-?|\(0\d{2,3}\))?[1-9]\d{4,7}(-\d{1,8})?$/
+  const reg = /^1\d{10}$|^400[0-9]{7}|^(0\d{2,3}-?|\(0\d{2,3}\))?[1-9]\d{4,7}(-\d{1,8})?$/
+  // const reg = /^400[0-9]{7}|^1[34578]\d{9}$|^0[0-9]{2,3}-[0-9]{8}/
+
   return reg.test(value)
 }
 

+ 2 - 1
packages/qjkankan-view/src/components/Pano/index.vue

@@ -25,6 +25,7 @@ const isMobile = computed(() => browser.isMobile());
 const lang = computed(() => config.lang);
 
 const currentScene = computed(() => store.getters["scene/currentScene"]);
+const scenesList = computed(() => store.getters["scene/list"]);
 const metadata = computed(() => store.getters["scene/metadata"]);
 const currentPlaying = computed(() => store.getters["functions/currentPlaying"]);
 
@@ -133,7 +134,7 @@ useApp().then((app) => {
     let tt = currentScene.value.someData.hotspots.find((item) => item.name == id);
     store.commit("functions/setPauseFrom", '');
     if (tt.hotspotType == 'scene') {
-      store.commit("scene/setCurrentScene", tt.secne);
+      store.commit("scene/setCurrentScene", scenesList.value.find(item=>item.id==tt.secne.id));
       updateListPosi()
     } else if(tt.hotspotType == 'link'){
       if (tt.linkOpenType=='newTab') {