|
@@ -1114,28 +1114,25 @@ let adImg3 = ref({})
|
|
let adImg4 = ref({})
|
|
let adImg4 = ref({})
|
|
let adImg5 = ref({})
|
|
let adImg5 = ref({})
|
|
|
|
|
|
-const {data:adData,error:adError} = requestData('/web/getWebsiteAdvertisement',{method:'GET',query:{'ad_tag':'INDEDX'}});
|
|
|
|
-if (adError.value) {
|
|
|
|
- console.error('广告列表请求失败:', adError.value);
|
|
|
|
-} else {
|
|
|
|
- //当有值了以后再放进去,万恶之源,也是nuxt2和3都存在的一个问题,也许nuxt4会解决这个问题
|
|
|
|
- if (adData.value && adData.value.data) {
|
|
|
|
- for(let item of adData.value.data){
|
|
|
|
- if(item.ad_tag == 'SNZXWT_INDEDX_0002'){
|
|
|
|
- adImg2.value = item;
|
|
|
|
- }
|
|
|
|
- if(item.ad_tag == 'SNZXWT_INDEDX_0003'){
|
|
|
|
- adImg3.value = item;
|
|
|
|
- }
|
|
|
|
- if(item.ad_tag == 'SNZXWT_INDEDX_0004'){
|
|
|
|
- adImg4.value = item;
|
|
|
|
- }
|
|
|
|
- if(item.ad_tag == 'SNZXWT_INDEDX_0005'){
|
|
|
|
- adImg5.value = item;
|
|
|
|
- }
|
|
|
|
|
|
+async function getAdData(){
|
|
|
|
+ const adData = await requestDataPromise('/web/getWebsiteAdvertisement',{method:'GET',query:{'ad_tag':'INDEDX'}});
|
|
|
|
+ for(let item of adData.data){
|
|
|
|
+ if(item.ad_tag == 'SNZXWT_INDEDX_0002'){
|
|
|
|
+ adImg2.value = item;
|
|
|
|
+ }
|
|
|
|
+ if(item.ad_tag == 'SNZXWT_INDEDX_0003'){
|
|
|
|
+ adImg3.value = item;
|
|
|
|
+ }
|
|
|
|
+ if(item.ad_tag == 'SNZXWT_INDEDX_0004'){
|
|
|
|
+ adImg4.value = item;
|
|
|
|
+ }
|
|
|
|
+ if(item.ad_tag == 'SNZXWT_INDEDX_0005'){
|
|
|
|
+ adImg5.value = item;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+getAdData();
|
|
|
|
+
|
|
//2.交互方法 end---------------------------------------->
|
|
//2.交互方法 end---------------------------------------->
|
|
|
|
|
|
//3.页面基本信息 start---------------------------------------->
|
|
//3.页面基本信息 start---------------------------------------->
|
|
@@ -1264,7 +1261,7 @@ try {
|
|
|
|
|
|
//模块1
|
|
//模块1
|
|
async function getPageData1() {
|
|
async function getPageData1() {
|
|
- const { data: mkdata, error: mkdataError } = requestData('/web/getWebsiteModelArticles', {
|
|
|
|
|
|
+ const mkdata = await requestDataPromise('/web/getWebsiteModelArticles', {
|
|
method: 'GET',
|
|
method: 'GET',
|
|
query: {
|
|
query: {
|
|
'catid': pageData.value[0].cid,
|
|
'catid': pageData.value[0].cid,
|
|
@@ -1272,17 +1269,10 @@ async function getPageData1() {
|
|
'pagesize': 2
|
|
'pagesize': 2
|
|
},
|
|
},
|
|
});
|
|
});
|
|
- if (mkdataError.value) {
|
|
|
|
- //console.error('模块1数据上部分请求失败!', mkdataError.value);
|
|
|
|
- } else {
|
|
|
|
- if (mkdata.value) {
|
|
|
|
- //console.log('模块1数据上部分请求成功!', mkdata.value.data);
|
|
|
|
- boxData1.value = mkdata.value.data;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ boxData1.value = mkdata.data;
|
|
}
|
|
}
|
|
async function getPageData1_data2() {
|
|
async function getPageData1_data2() {
|
|
- const { data: mkdata, error: mkdataError } = requestData('/web/getWebsiteModelArticles', {
|
|
|
|
|
|
+ const mkdata = await requestDataPromise('/web/getWebsiteModelArticles', {
|
|
method: 'GET',
|
|
method: 'GET',
|
|
query: {
|
|
query: {
|
|
'catid': pageData.value[0].cid,
|
|
'catid': pageData.value[0].cid,
|
|
@@ -1290,18 +1280,11 @@ async function getPageData1_data2() {
|
|
'pagesize': 8
|
|
'pagesize': 8
|
|
},
|
|
},
|
|
});
|
|
});
|
|
- if (mkdataError.value) {
|
|
|
|
- //console.log()
|
|
|
|
- } else {
|
|
|
|
- if (mkdata.value) {
|
|
|
|
- //console.log()
|
|
|
|
- boxData1data2.value = mkdata.value.data;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ boxData1data2.value = mkdata.data;
|
|
}
|
|
}
|
|
//模块2
|
|
//模块2
|
|
async function getPageData2() {
|
|
async function getPageData2() {
|
|
- const { data: mkdata, error: mkdataError } = requestData('/web/getWebsiteModelArticles', {
|
|
|
|
|
|
+ const mkdata = await requestDataPromise('/web/getWebsiteModelArticles', {
|
|
method: 'GET',
|
|
method: 'GET',
|
|
query: {
|
|
query: {
|
|
'catid': pageData.value[1].cid,
|
|
'catid': pageData.value[1].cid,
|
|
@@ -1309,17 +1292,11 @@ async function getPageData2() {
|
|
'pagesize': 7
|
|
'pagesize': 7
|
|
},
|
|
},
|
|
});
|
|
});
|
|
- if (mkdataError.value) {
|
|
|
|
- //console.log()
|
|
|
|
- } else {
|
|
|
|
- if (mkdata.value) {
|
|
|
|
- boxData2.value = mkdata.value.data;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ boxData2.value = mkdata.data;
|
|
}
|
|
}
|
|
//模块4
|
|
//模块4
|
|
async function getPageData4() {
|
|
async function getPageData4() {
|
|
- const { data: mkdata, error: mkdataError } = requestData('/web/getWebsiteModelArticles', {
|
|
|
|
|
|
+ const mkdata = await requestDataPromise('/web/getWebsiteModelArticles', {
|
|
method: 'GET',
|
|
method: 'GET',
|
|
query: {
|
|
query: {
|
|
'catid': pageData.value[3].cid,
|
|
'catid': pageData.value[3].cid,
|
|
@@ -1327,17 +1304,11 @@ async function getPageData4() {
|
|
'pagesize': 5
|
|
'pagesize': 5
|
|
},
|
|
},
|
|
});
|
|
});
|
|
- if (mkdataError.value) {
|
|
|
|
- //console.log()
|
|
|
|
- } else {
|
|
|
|
- if (mkdata.value) {
|
|
|
|
- boxData4.value = mkdata.value.data;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ boxData4.value = mkdata.data;
|
|
}
|
|
}
|
|
//模块5
|
|
//模块5
|
|
async function getPageData5() {
|
|
async function getPageData5() {
|
|
- const { data: mkdata, error: mkdataError } = requestData('/web/getWebsiteModelArticles', {
|
|
|
|
|
|
+ const mkdata = await requestDataPromise('/web/getWebsiteModelArticles', {
|
|
method: 'GET',
|
|
method: 'GET',
|
|
query: {
|
|
query: {
|
|
'catid': pageData.value[4].cid,
|
|
'catid': pageData.value[4].cid,
|
|
@@ -1345,16 +1316,10 @@ async function getPageData5() {
|
|
'pagesize': 1
|
|
'pagesize': 1
|
|
},
|
|
},
|
|
});
|
|
});
|
|
- if (mkdataError.value) {
|
|
|
|
- //console.log()
|
|
|
|
- } else {
|
|
|
|
- if (mkdata.value) {
|
|
|
|
- boxData5.value = mkdata.value.data;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ boxData5.value = mkdata.data;
|
|
}
|
|
}
|
|
async function getPageData5_data2() {
|
|
async function getPageData5_data2() {
|
|
- const { data: mkdata, error: mkdataError } = requestData('/web/getWebsiteModelArticles', {
|
|
|
|
|
|
+ const mkdata = await requestDataPromise('/web/getWebsiteModelArticles', {
|
|
method: 'GET',
|
|
method: 'GET',
|
|
query: {
|
|
query: {
|
|
'catid': pageData.value[4].cid,
|
|
'catid': pageData.value[4].cid,
|
|
@@ -1363,17 +1328,11 @@ async function getPageData5_data2() {
|
|
'placeid': 2
|
|
'placeid': 2
|
|
},
|
|
},
|
|
});
|
|
});
|
|
- if (mkdataError.value) {
|
|
|
|
- //console.log()
|
|
|
|
- } else {
|
|
|
|
- if (mkdata.value) {
|
|
|
|
- boxData5data2.value = mkdata.value.data;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ boxData5data2.value = mkdata.data;
|
|
}
|
|
}
|
|
//模块6
|
|
//模块6
|
|
async function getPageData6() {
|
|
async function getPageData6() {
|
|
- const { data: mkdata, error: mkdataError } = requestData('/web/getWebsiteModelArticles', {
|
|
|
|
|
|
+ const mkdata = await requestDataPromise('/web/getWebsiteModelArticles', {
|
|
method: 'GET',
|
|
method: 'GET',
|
|
query: {
|
|
query: {
|
|
'catid': pageData.value[5].cid,
|
|
'catid': pageData.value[5].cid,
|
|
@@ -1381,17 +1340,11 @@ async function getPageData6() {
|
|
'pagesize': 3
|
|
'pagesize': 3
|
|
},
|
|
},
|
|
});
|
|
});
|
|
- if (mkdataError.value) {
|
|
|
|
- //console.log()
|
|
|
|
- } else {
|
|
|
|
- if (mkdata.value) {
|
|
|
|
- boxData6.value = mkdata.value.data;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ boxData6.value = mkdata.data;
|
|
}
|
|
}
|
|
//模块7
|
|
//模块7
|
|
async function getPageData7() {
|
|
async function getPageData7() {
|
|
- const { data: mkdata, error: mkdataError } = requestData('/web/getWebsiteModelArticles', {
|
|
|
|
|
|
+ const mkdata = await requestDataPromise('/web/getWebsiteModelArticles', {
|
|
method: 'GET',
|
|
method: 'GET',
|
|
query: {
|
|
query: {
|
|
'catid': pageData.value[6].cid,
|
|
'catid': pageData.value[6].cid,
|
|
@@ -1399,17 +1352,11 @@ async function getPageData7() {
|
|
'pagesize': 5
|
|
'pagesize': 5
|
|
},
|
|
},
|
|
});
|
|
});
|
|
- if (mkdataError.value) {
|
|
|
|
- //console.log()
|
|
|
|
- } else {
|
|
|
|
- if (mkdata.value) {
|
|
|
|
- boxData7.value = mkdata.value.data;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ boxData7.value = mkdata.data;
|
|
}
|
|
}
|
|
//模块8
|
|
//模块8
|
|
async function getPageData8() {
|
|
async function getPageData8() {
|
|
- const { data: mkdata, error: mkdataError } = requestData('/web/getWebsiteModelArticles', {
|
|
|
|
|
|
+ const mkdata = await requestDataPromise('/web/getWebsiteModelArticles', {
|
|
method: 'GET',
|
|
method: 'GET',
|
|
query: {
|
|
query: {
|
|
'catid': pageData.value[7].cid,
|
|
'catid': pageData.value[7].cid,
|
|
@@ -1417,16 +1364,10 @@ async function getPageData8() {
|
|
'pagesize': 2
|
|
'pagesize': 2
|
|
},
|
|
},
|
|
});
|
|
});
|
|
- if (mkdataError.value) {
|
|
|
|
- //console.log()
|
|
|
|
- } else {
|
|
|
|
- if (mkdata.value) {
|
|
|
|
- boxData8.value = mkdata.value.data;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ boxData8.value = mkdata.data;
|
|
}
|
|
}
|
|
async function getPageData8_data2() {
|
|
async function getPageData8_data2() {
|
|
- const { data: mkdata, error: mkdataError } = requestData('/web/getWebsiteModelArticles', {
|
|
|
|
|
|
+ const mkdata = await requestDataPromise('/web/getWebsiteModelArticles', {
|
|
method: 'GET',
|
|
method: 'GET',
|
|
query: {
|
|
query: {
|
|
'catid': pageData.value[7].cid,
|
|
'catid': pageData.value[7].cid,
|
|
@@ -1435,17 +1376,11 @@ async function getPageData8_data2() {
|
|
'placeid': 1
|
|
'placeid': 1
|
|
},
|
|
},
|
|
});
|
|
});
|
|
- if (mkdataError.value) {
|
|
|
|
- //console.log()
|
|
|
|
- } else {
|
|
|
|
- if (mkdata.value) {
|
|
|
|
- boxData88.value = mkdata.value.data;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ boxData88.value = mkdata.data;
|
|
}
|
|
}
|
|
//模块9
|
|
//模块9
|
|
async function getPageData9() {
|
|
async function getPageData9() {
|
|
- const { data: mkdata, error: mkdataError } = requestData('/web/getWebsiteModelArticles', {
|
|
|
|
|
|
+ const mkdata = await requestDataPromise('/web/getWebsiteModelArticles', {
|
|
method: 'GET',
|
|
method: 'GET',
|
|
query: {
|
|
query: {
|
|
'catid': pageData.value[8].cid,
|
|
'catid': pageData.value[8].cid,
|
|
@@ -1453,16 +1388,10 @@ async function getPageData9() {
|
|
'pagesize': 2
|
|
'pagesize': 2
|
|
},
|
|
},
|
|
});
|
|
});
|
|
- if (mkdataError.value) {
|
|
|
|
- //console.log()
|
|
|
|
- } else {
|
|
|
|
- if (mkdata.value) {
|
|
|
|
- boxData9.value = mkdata.value.data;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ boxData9.value = mkdata.data;
|
|
}
|
|
}
|
|
async function getPageData9_data2() {
|
|
async function getPageData9_data2() {
|
|
- const { data: mkdata, error: mkdataError } = requestData('/web/getWebsiteModelArticles', {
|
|
|
|
|
|
+ const mkdata = await requestDataPromise('/web/getWebsiteModelArticles', {
|
|
method: 'GET',
|
|
method: 'GET',
|
|
query: {
|
|
query: {
|
|
'catid': pageData.value[8].cid,
|
|
'catid': pageData.value[8].cid,
|
|
@@ -1471,17 +1400,11 @@ async function getPageData9_data2() {
|
|
'placeid': 3
|
|
'placeid': 3
|
|
},
|
|
},
|
|
});
|
|
});
|
|
- if (mkdataError.value) {
|
|
|
|
- //console.log()
|
|
|
|
- } else {
|
|
|
|
- if (mkdata.value) {
|
|
|
|
- boxData9data2.value = mkdata.value.data;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ boxData9data2.value = mkdata.data;
|
|
}
|
|
}
|
|
//模块11
|
|
//模块11
|
|
async function getPageData11() {
|
|
async function getPageData11() {
|
|
- const { data: mkdata, error: mkdataError } = requestData('/web/getWebsiteModelArticles', {
|
|
|
|
|
|
+ const mkdata = await requestDataPromise('/web/getWebsiteModelArticles', {
|
|
method: 'GET',
|
|
method: 'GET',
|
|
query: {
|
|
query: {
|
|
'catid': pageData.value[10].cid,
|
|
'catid': pageData.value[10].cid,
|
|
@@ -1489,16 +1412,10 @@ async function getPageData11() {
|
|
'pagesize': 2
|
|
'pagesize': 2
|
|
},
|
|
},
|
|
});
|
|
});
|
|
- if (mkdataError.value) {
|
|
|
|
- //console.log()
|
|
|
|
- } else {
|
|
|
|
- if (mkdata.value) {
|
|
|
|
- boxData11.value = mkdata.value.data;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ boxData11.value = mkdata.data;
|
|
}
|
|
}
|
|
async function getPageData11_data2() {
|
|
async function getPageData11_data2() {
|
|
- const { data: mkdata, error: mkdataError } = requestData('/web/getWebsiteModelArticles', {
|
|
|
|
|
|
+ const mkdata = await requestDataPromise('/web/getWebsiteModelArticles', {
|
|
method: 'GET',
|
|
method: 'GET',
|
|
query: {
|
|
query: {
|
|
'catid': pageData.value[10].cid,
|
|
'catid': pageData.value[10].cid,
|
|
@@ -1507,17 +1424,11 @@ async function getPageData11_data2() {
|
|
'placeid': 4
|
|
'placeid': 4
|
|
},
|
|
},
|
|
});
|
|
});
|
|
- if (mkdataError.value) {
|
|
|
|
- //console.log()
|
|
|
|
- } else {
|
|
|
|
- if (mkdata.value) {
|
|
|
|
- boxData11data2.value = mkdata.value.data;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ boxData11data2.value = mkdata.data;
|
|
}
|
|
}
|
|
//模块12
|
|
//模块12
|
|
async function getPageData12() {
|
|
async function getPageData12() {
|
|
- const { data: mkdata, error: mkdataError } = requestData('/web/getWebsiteModelArticles', {
|
|
|
|
|
|
+ const mkdata = await requestDataPromise('/web/getWebsiteModelArticles', {
|
|
method: 'GET',
|
|
method: 'GET',
|
|
query: {
|
|
query: {
|
|
'catid': pageData.value[11].cid,
|
|
'catid': pageData.value[11].cid,
|
|
@@ -1525,18 +1436,12 @@ async function getPageData12() {
|
|
'pagesize': 12
|
|
'pagesize': 12
|
|
},
|
|
},
|
|
});
|
|
});
|
|
- if (mkdataError.value) {
|
|
|
|
- //console.log()
|
|
|
|
- } else {
|
|
|
|
- if (mkdata.value) {
|
|
|
|
- boxData12.value = mkdata.value.data;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ boxData12.value = mkdata.data;
|
|
}
|
|
}
|
|
//模块13 只有一个入口
|
|
//模块13 只有一个入口
|
|
//模块14
|
|
//模块14
|
|
async function getPageData14() {
|
|
async function getPageData14() {
|
|
- const { data: mkdata, error: mkdataError } = requestData('/web/getWebsiteModelArticles', {
|
|
|
|
|
|
+ const mkdata = await requestDataPromise('/web/getWebsiteModelArticles', {
|
|
method: 'GET',
|
|
method: 'GET',
|
|
query: {
|
|
query: {
|
|
'catid': pageData.value[13].cid,
|
|
'catid': pageData.value[13].cid,
|
|
@@ -1544,16 +1449,10 @@ async function getPageData14() {
|
|
'pagesize': 2
|
|
'pagesize': 2
|
|
},
|
|
},
|
|
});
|
|
});
|
|
- if (mkdataError.value) {
|
|
|
|
- //console.log()
|
|
|
|
- } else {
|
|
|
|
- if (mkdata.value) {
|
|
|
|
- boxData14.value = mkdata.value.data;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ boxData14.value = mkdata.data;
|
|
}
|
|
}
|
|
async function getPageData14_data2() {
|
|
async function getPageData14_data2() {
|
|
- const { data: mkdata, error: mkdataError } = requestData('/web/getWebsiteModelArticles', {
|
|
|
|
|
|
+ const mkdata = await requestDataPromise('/web/getWebsiteModelArticles', {
|
|
method: 'GET',
|
|
method: 'GET',
|
|
query: {
|
|
query: {
|
|
'catid': pageData.value[13].cid,
|
|
'catid': pageData.value[13].cid,
|
|
@@ -1562,13 +1461,7 @@ async function getPageData14_data2() {
|
|
'placeid': 3
|
|
'placeid': 3
|
|
},
|
|
},
|
|
});
|
|
});
|
|
- if (mkdataError.value) {
|
|
|
|
- //console.log()
|
|
|
|
- } else {
|
|
|
|
- if (mkdata.value) {
|
|
|
|
- boxData14data2.value = mkdata.value.data;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ boxData14data2.value = mkdata.data;
|
|
}
|
|
}
|
|
//获取模块14的子导航
|
|
//获取模块14的子导航
|
|
async function getPageData14menu() {
|
|
async function getPageData14menu() {
|
|
@@ -1585,7 +1478,7 @@ async function getPageData14menu() {
|
|
boxData14mainCid.value = navData.data[0].category_id;
|
|
boxData14mainCid.value = navData.data[0].category_id;
|
|
}
|
|
}
|
|
async function getPageData14mainData() {
|
|
async function getPageData14mainData() {
|
|
- const { data: mkdata, error: mkdataError } = requestData('/web/getWebsiteModelArticles', {
|
|
|
|
|
|
+ const mkdata = await requestDataPromise('/web/getWebsiteModelArticles', {
|
|
method: 'GET',
|
|
method: 'GET',
|
|
query: {
|
|
query: {
|
|
'catid': boxData14mainCid.value,
|
|
'catid': boxData14mainCid.value,
|
|
@@ -1593,18 +1486,12 @@ async function getPageData14mainData() {
|
|
'pagesize': 5
|
|
'pagesize': 5
|
|
},
|
|
},
|
|
});
|
|
});
|
|
- if (mkdataError.value) {
|
|
|
|
- console.log(mkdataError.value);
|
|
|
|
- } else {
|
|
|
|
- if (mkdata.value) {
|
|
|
|
- boxData14mainData.value = mkdata.value.data;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ boxData14mainData.value = mkdata.data;
|
|
}
|
|
}
|
|
//模块15 只有一个入口
|
|
//模块15 只有一个入口
|
|
//模块16
|
|
//模块16
|
|
async function getPageData16() {
|
|
async function getPageData16() {
|
|
- const { data: mkdata, error: mkdataError } = requestData('/web/getWebsiteModelArticles', {
|
|
|
|
|
|
+ const mkdata = await requestDataPromise('/web/getWebsiteModelArticles', {
|
|
method: 'GET',
|
|
method: 'GET',
|
|
query: {
|
|
query: {
|
|
'catid': pageData.value[15].cid,
|
|
'catid': pageData.value[15].cid,
|
|
@@ -1612,16 +1499,10 @@ async function getPageData16() {
|
|
'pagesize': 4
|
|
'pagesize': 4
|
|
},
|
|
},
|
|
});
|
|
});
|
|
- if (mkdataError.value) {
|
|
|
|
- //console.log()
|
|
|
|
- } else {
|
|
|
|
- if (mkdata.value) {
|
|
|
|
- boxData16.value = mkdata.value.data;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ boxData16.value = mkdata.data;
|
|
}
|
|
}
|
|
async function getPageData16_data2() {
|
|
async function getPageData16_data2() {
|
|
- const { data: mkdata, error: mkdataError } = requestData('/web/getWebsiteModelArticles', {
|
|
|
|
|
|
+ const mkdata = await requestDataPromise('/web/getWebsiteModelArticles', {
|
|
method: 'GET',
|
|
method: 'GET',
|
|
query: {
|
|
query: {
|
|
'catid': pageData.value[15].cid,
|
|
'catid': pageData.value[15].cid,
|
|
@@ -1630,13 +1511,7 @@ async function getPageData16_data2() {
|
|
'placeid': 3
|
|
'placeid': 3
|
|
},
|
|
},
|
|
});
|
|
});
|
|
- if (mkdataError.value) {
|
|
|
|
- //console.log()
|
|
|
|
- } else {
|
|
|
|
- if (mkdata.value) {
|
|
|
|
- boxData16data2.value = mkdata.value.data;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ boxData16data2.value = mkdata.data;
|
|
}
|
|
}
|
|
//获取模块16的子导航
|
|
//获取模块16的子导航
|
|
async function getPageData16menu() {
|
|
async function getPageData16menu() {
|
|
@@ -1653,7 +1528,7 @@ async function getPageData16menu() {
|
|
boxData16mainCid.value = navData.data[0].category_id;
|
|
boxData16mainCid.value = navData.data[0].category_id;
|
|
}
|
|
}
|
|
async function getPageData16mainData() {
|
|
async function getPageData16mainData() {
|
|
- const { data: mkdata, error: mkdataError } = requestData('/web/getWebsiteModelArticles', {
|
|
|
|
|
|
+ const mkdata = await requestDataPromise('/web/getWebsiteModelArticles', {
|
|
method: 'GET',
|
|
method: 'GET',
|
|
query: {
|
|
query: {
|
|
'catid': boxData16mainCid.value,
|
|
'catid': boxData16mainCid.value,
|
|
@@ -1661,19 +1536,12 @@ async function getPageData16mainData() {
|
|
'pagesize': 5
|
|
'pagesize': 5
|
|
},
|
|
},
|
|
});
|
|
});
|
|
- if (mkdataError.value) {
|
|
|
|
- console.log(mkdataError.value);
|
|
|
|
- } else {
|
|
|
|
- if (mkdata.value) {
|
|
|
|
- console.log(mkdata.value);
|
|
|
|
- boxData16mainData.value = mkdata.value.data;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ boxData16mainData.value = mkdata.data;
|
|
}
|
|
}
|
|
//模块17 只有一个入口
|
|
//模块17 只有一个入口
|
|
//模块18
|
|
//模块18
|
|
async function getPageData18() {
|
|
async function getPageData18() {
|
|
- const { data: mkdata, error: mkdataError } = requestData('/web/getWebsiteModelArticles', {
|
|
|
|
|
|
+ const mkdata = await requestDataPromise('/web/getWebsiteModelArticles', {
|
|
method: 'GET',
|
|
method: 'GET',
|
|
query: {
|
|
query: {
|
|
'catid': pageData.value[17].cid,
|
|
'catid': pageData.value[17].cid,
|
|
@@ -1681,16 +1549,10 @@ async function getPageData18() {
|
|
'pagesize': 1
|
|
'pagesize': 1
|
|
},
|
|
},
|
|
});
|
|
});
|
|
- if (mkdataError.value) {
|
|
|
|
- //console.log()
|
|
|
|
- } else {
|
|
|
|
- if (mkdata.value) {
|
|
|
|
- boxData18.value = mkdata.value.data;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ boxData18.value = mkdata.data;
|
|
}
|
|
}
|
|
async function getPageData18_data2() {
|
|
async function getPageData18_data2() {
|
|
- const { data: mkdata, error: mkdataError } = requestData('/web/getWebsiteModelArticles', {
|
|
|
|
|
|
+ const mkdata = await requestDataPromise('/web/getWebsiteModelArticles', {
|
|
method: 'GET',
|
|
method: 'GET',
|
|
query: {
|
|
query: {
|
|
'catid': pageData.value[17].cid,
|
|
'catid': pageData.value[17].cid,
|
|
@@ -1698,17 +1560,11 @@ async function getPageData18_data2() {
|
|
'pagesize': 3
|
|
'pagesize': 3
|
|
},
|
|
},
|
|
});
|
|
});
|
|
- if (mkdataError.value) {
|
|
|
|
- //console.log()
|
|
|
|
- } else {
|
|
|
|
- if (mkdata.value) {
|
|
|
|
- boxData18data2.value = mkdata.value.data;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ boxData18data2.value = mkdata.data;
|
|
}
|
|
}
|
|
//模块19
|
|
//模块19
|
|
async function getPageData19() {
|
|
async function getPageData19() {
|
|
- const { data: mkdata, error: mkdataError } = requestData('/web/getWebsiteModelArticles', {
|
|
|
|
|
|
+ const mkdata = await requestDataPromise('/web/getWebsiteModelArticles', {
|
|
method: 'GET',
|
|
method: 'GET',
|
|
query: {
|
|
query: {
|
|
'catid': pageData.value[18].cid,
|
|
'catid': pageData.value[18].cid,
|
|
@@ -1716,17 +1572,11 @@ async function getPageData19() {
|
|
'pagesize':4
|
|
'pagesize':4
|
|
},
|
|
},
|
|
});
|
|
});
|
|
- if (mkdataError.value) {
|
|
|
|
- //console.log()
|
|
|
|
- } else {
|
|
|
|
- if (mkdata.value) {
|
|
|
|
- boxData19.value = mkdata.value.data;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ boxData19.value = mkdata.data;
|
|
}
|
|
}
|
|
//模块20
|
|
//模块20
|
|
async function getPageData20() {
|
|
async function getPageData20() {
|
|
- const { data: mkdata, error: mkdataError } = requestData('/web/getWebsiteModelArticles', {
|
|
|
|
|
|
+ const mkdata = await requestDataPromise('/web/getWebsiteModelArticles', {
|
|
method: 'GET',
|
|
method: 'GET',
|
|
query: {
|
|
query: {
|
|
'catid': pageData.value[19].cid,
|
|
'catid': pageData.value[19].cid,
|
|
@@ -1734,16 +1584,10 @@ async function getPageData20() {
|
|
'pagesize':2
|
|
'pagesize':2
|
|
},
|
|
},
|
|
});
|
|
});
|
|
- if (mkdataError.value) {
|
|
|
|
- //console.log()
|
|
|
|
- } else {
|
|
|
|
- if (mkdata.value) {
|
|
|
|
- boxData20.value = mkdata.value.data;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ boxData20.value = mkdata.data;
|
|
}
|
|
}
|
|
async function getPageData20_data2() {
|
|
async function getPageData20_data2() {
|
|
- const { data: mkdata, error: mkdataError } = requestData('/web/getWebsiteModelArticles', {
|
|
|
|
|
|
+ const mkdata = await requestDataPromise('/web/getWebsiteModelArticles', {
|
|
method: 'GET',
|
|
method: 'GET',
|
|
query: {
|
|
query: {
|
|
'catid': pageData.value[19].cid,
|
|
'catid': pageData.value[19].cid,
|
|
@@ -1752,13 +1596,7 @@ async function getPageData20_data2() {
|
|
'placeid': 2
|
|
'placeid': 2
|
|
},
|
|
},
|
|
});
|
|
});
|
|
- if (mkdataError.value) {
|
|
|
|
- //console.log()
|
|
|
|
- } else {
|
|
|
|
- if (mkdata.value) {
|
|
|
|
- boxData20data2.value = mkdata.value.data;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ boxData20data2.value = mkdata.data;
|
|
}
|
|
}
|
|
//3.页面基本信息 end---------------------------------------->
|
|
//3.页面基本信息 end---------------------------------------->
|
|
|
|
|