Commit 4b47a367 authored by zhengke's avatar zhengke

优化 销售最近行程调转

parent aba7228d
...@@ -223,6 +223,7 @@ const psdVisibleStatus = ref(false) ...@@ -223,6 +223,7 @@ const psdVisibleStatus = ref(false)
const { market, model, ConfigId, CoverImg, dataLoading, TempId, SourceLoading } = storeToRefs(useScreenStore()) const { market, model, ConfigId, CoverImg, dataLoading, TempId, SourceLoading } = storeToRefs(useScreenStore())
// 返回到首页 type 1 模版列表页 0 销售在线模版页 // 返回到首页 type 1 模版列表页 0 销售在线模版页
const goBack = (type:any) =>{ const goBack = (type:any) =>{
console.log(model.value,searchData.value.currentMenu)
mainBackVisible.value = false mainBackVisible.value = false
ElMessageBox.confirm( ElMessageBox.confirm(
'退出此页面将清空当前数据,请谨慎操作?', '退出此页面将清空当前数据,请谨慎操作?',
...@@ -239,7 +240,7 @@ const goBack = (type:any) =>{ ...@@ -239,7 +240,7 @@ const goBack = (type:any) =>{
if(model.value==0) { if(model.value==0) {
path = `/market/op/${ConfigId.value}/${t}` path = `/market/op/${ConfigId.value}/${t}`
router.push({path}) router.push({path})
}else if(model.value&&searchData.value.currentMenu){ }else if(model.value==2&&searchData.value.currentMenu>=0){
if(type) path = `/market/create` if(type) path = `/market/create`
else { else {
path = `/space/${searchData.value.currentMenu}` path = `/space/${searchData.value.currentMenu}`
......
...@@ -75,7 +75,7 @@ import ThumbnailSlide from '@/views/components/ThumbnailSlide/index.vue' ...@@ -75,7 +75,7 @@ import ThumbnailSlide from '@/views/components/ThumbnailSlide/index.vue'
import LayoutPool from './LayoutPool.vue' import LayoutPool from './LayoutPool.vue'
import Popover from '@/components/Popover.vue' import Popover from '@/components/Popover.vue'
import Draggable from 'vuedraggable' import Draggable from 'vuedraggable'
import { ElLoading, ElMessageBox } from 'element-plus' import { ElLoading, ElMessageBox, ElMessage } from 'element-plus'
import FileService from '@/services/FileService' import FileService from '@/services/FileService'
import { Slide } from '@/types/slides' import { Slide } from '@/types/slides'
import { uniqueId } from 'lodash' import { uniqueId } from 'lodash'
...@@ -510,7 +510,9 @@ const GetTripTemplate = async () =>{ ...@@ -510,7 +510,9 @@ const GetTripTemplate = async () =>{
VIEWPORT_SIZE.Value = 1754 VIEWPORT_SIZE.Value = 1754
VIEWPORT_VER_SIZE.Value = 1240 VIEWPORT_VER_SIZE.Value = 1240
} }
loadingObj.close() setTimeout(()=>{
loadingObj.close()
},300)
if(ConfigId.value==0) return if(ConfigId.value==0) return
if(TempId.value&&!searchData.value.TempId) await GetTripConfig() if(TempId.value&&!searchData.value.TempId) await GetTripConfig()
if(model.value!=3) await GetTripFiledData() if(model.value!=3) await GetTripFiledData()
...@@ -695,7 +697,11 @@ const sellGetTripTemplate = async () =>{ ...@@ -695,7 +697,11 @@ const sellGetTripTemplate = async () =>{
slidesStore.setSlides(newSlides) slidesStore.setSlides(newSlides)
} }
} }else ElMessage({
showClose: true,
message: dataRes.data.message,
type: 'warning',
})
} catch (error) { } catch (error) {
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment