Commit fc73730a authored by zhengke's avatar zhengke

no message

parent ee776a32
...@@ -194,6 +194,7 @@ const GetTripFiledData = async () =>{ ...@@ -194,6 +194,7 @@ const GetTripFiledData = async () =>{
value=value[oo] value=value[oo]
} }
}else{ }else{
console.log(value[oo],'-----',oo)
value = null value = null
} }
}) })
...@@ -216,8 +217,8 @@ const GetTripFiledData = async () =>{ ...@@ -216,8 +217,8 @@ const GetTripFiledData = async () =>{
// 获取行程模版数据 // 获取行程模版数据
const GetTripTemplate = async () =>{ const GetTripTemplate = async () =>{
console.log('模版数据------') console.log('模版数据------',searchData.value.TempId,TempId.value)
if(!searchData.value.TempId) { if(!searchData.value.TempId&&!TempId.value) {
let list = [ let list = [
{ {
id: 'test-slide-1', id: 'test-slide-1',
...@@ -233,8 +234,10 @@ const GetTripTemplate = async () =>{ ...@@ -233,8 +234,10 @@ const GetTripTemplate = async () =>{
} }
try { try {
let queryMsg = { let queryMsg = {
TempId:searchData.value.TempId TempId: 0
} }
if(searchData.value.TempId) queryMsg.TempId = searchData.value.TempId
else if(TempId.value) queryMsg.TempId = TempId.value
let dataRes = await ConfigService.GetTripTemplateSlide(queryMsg); let dataRes = await ConfigService.GetTripTemplateSlide(queryMsg);
if (dataRes.data.resultCode == 1) { if (dataRes.data.resultCode == 1) {
let viewportRatio = 1.414 let viewportRatio = 1.414
...@@ -269,6 +272,7 @@ const GetTripTemplate = async () =>{ ...@@ -269,6 +272,7 @@ const GetTripTemplate = async () =>{
queryObj.value.ColorStr = dataRes.data.data.ColorStr queryObj.value.ColorStr = dataRes.data.data.ColorStr
queryObj.value.TempType = dataRes.data.data.TempType queryObj.value.TempType = dataRes.data.data.TempType
slidesStore.updateSlideIndex(0) slidesStore.updateSlideIndex(0)
if(ConfigId.value==0||TempId.value) { if(ConfigId.value==0||TempId.value) {
if(TempId.value) await GetTripConfig() if(TempId.value) await GetTripConfig()
return return
......
...@@ -61,8 +61,8 @@ const searchData = ref({} as any) ...@@ -61,8 +61,8 @@ const searchData = ref({} as any)
searchData.value = inject(injectKeyTemplate) searchData.value = inject(injectKeyTemplate)
let TempIds = 0 let TempIds = 0
if(TempId.value&&!searchData.value.TempId) TempIds = TempId.value
if(searchData.value.TempId) TempIds = searchData.value.TempId if(searchData.value.TempId) TempIds = searchData.value.TempId
else if(TempId.value) TempIds = TempId.value
const datas = reactive({ const datas = reactive({
DataSource:{ DataSource:{
FeatureImgList: [], FeatureImgList: [],
......
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