Quellcode durchsuchen

修改广告

修改广告
dangyunlong vor 1 Monat
Ursprung
Commit
5e750d4768

+ 1 - 1
.nuxt/manifest/latest.json

@@ -1 +1 @@
-{"id":"dev","timestamp":1741671319371}
+{"id":"dev","timestamp":1741738204586}

+ 1 - 1
.nuxt/manifest/meta/dev.json

@@ -1 +1 @@
-{"id":"dev","timestamp":1741671319371,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}
+{"id":"dev","timestamp":1741738204586,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

+ 3 - 3
.nuxt/nitro.json

@@ -1,5 +1,5 @@
 {
 {
-  "date": "2025-03-11T05:35:22.037Z",
+  "date": "2025-03-12T00:10:08.775Z",
   "preset": "nitro-dev",
   "preset": "nitro-dev",
   "framework": {
   "framework": {
     "name": "nuxt",
     "name": "nuxt",
@@ -9,9 +9,9 @@
     "nitro": "2.10.4"
     "nitro": "2.10.4"
   },
   },
   "dev": {
   "dev": {
-    "pid": 3648,
+    "pid": 2116,
     "workerAddress": {
     "workerAddress": {
-      "socketPath": "\\\\.\\pipe\\nitro\\worker-3648-1.sock"
+      "socketPath": "\\\\.\\pipe\\nitro\\worker-2116-1.sock"
     }
     }
   }
   }
 }
 }

+ 1 - 1
.nuxt/nuxt.d.ts

@@ -1,6 +1,6 @@
 // Generated by nuxi
 // Generated by nuxi
-/// <reference types="@nuxt/telemetry" />
 /// <reference types="@nuxt/devtools" />
 /// <reference types="@nuxt/devtools" />
+/// <reference types="@nuxt/telemetry" />
 /// <reference path="types/builder-env.d.ts" />
 /// <reference path="types/builder-env.d.ts" />
 /// <reference types="nuxt" />
 /// <reference types="nuxt" />
 /// <reference path="types/app-defaults.d.ts" />
 /// <reference path="types/app-defaults.d.ts" />

+ 6 - 0
assets/css/index.less

@@ -596,6 +596,10 @@
     }
     }
     .adBox1 {
     .adBox1 {
         margin-bottom: 20px;
         margin-bottom: 20px;
+        img {
+            width: 450px;
+            height: 290px;
+        }
     }
     }
     .scienceLeft {
     .scienceLeft {
         width: 720px;
         width: 720px;
@@ -1352,6 +1356,8 @@
     img {
     img {
         margin: 0 auto;
         margin: 0 auto;
         display: block;
         display: block;
+        width: 1200px;
+        height: 90px;
     }
     }
 }
 }
 
 

+ 1 - 0
assets/css/nav.less

@@ -255,6 +255,7 @@
                 height: 29px;
                 height: 29px;
                 margin: 4px;
                 margin: 4px;
                 margin-right: 25px;
                 margin-right: 25px;
+                margin-left: 40px;
                 vertical-align: -13px;
                 vertical-align: -13px;
                 background: url('../../public/image/Iconly/Broken/Search.png');
                 background: url('../../public/image/Iconly/Broken/Search.png');
                 cursor: pointer;
                 cursor: pointer;

+ 2 - 9
components/detail/HotNews.vue

@@ -19,21 +19,14 @@
 <script setup>
 <script setup>
 const hotNewsList = ref([])
 const hotNewsList = ref([])
 async function getPageData() {
 async function getPageData() {
-    const { data: mkdata, error: mkdataError } =  requestData('/web/getWebsiteArticlett', {
+    const mkdata =  await requestDataPromise('/web/getWebsiteArticlett', {
         method: 'GET',
         method: 'GET',
         query: {
         query: {
             'pageSize': 14,
             'pageSize': 14,
             'level': 4,
             'level': 4,
         },
         },
     });
     });
-    if (mkdataError.value) {
-        //console.error('模块1数据上部分请求失败!', mkdataError.value);
-    } else {
-        if (mkdata.value) {
-            //console.log('模块1数据上部分请求成功!', mkdata.value.data);
-            hotNewsList.value = mkdata.value.data;
-        }
-    }
+    hotNewsList.value = mkdata.data;
 }
 }
 getPageData();
 getPageData();
 </script>
 </script>

+ 2 - 9
components/detail/HotNews2.vue

@@ -22,7 +22,7 @@
 <script setup>
 <script setup>
 const hotNewsList = ref([])
 const hotNewsList = ref([])
 async function getPageData() {
 async function getPageData() {
-    const { data: mkdata, error: mkdataError } =  requestData('/web/getWebsiteArticlett', {
+    const mkdata =  await requestDataPromise('/web/getWebsiteArticlett', {
         method: 'GET',
         method: 'GET',
         query: {
         query: {
             'pageSize': 5,
             'pageSize': 5,
@@ -30,14 +30,7 @@ async function getPageData() {
             'placeid': 15
             'placeid': 15
         },
         },
     });
     });
-    if (mkdataError.value) {
-        //console.error('模块1数据上部分请求失败!', mkdataError.value);
-    } else {
-        if (mkdata.value) {
-            //console.log('模块1数据上部分请求成功!', mkdata.value.data);
-            hotNewsList.value = mkdata.value.data;
-        }
-    }
+    hotNewsList.value = mkdata.data;
 }
 }
 getPageData();
 getPageData();
 </script>
 </script>

+ 8 - 4
components/home/Advertising.vue

@@ -1,10 +1,14 @@
 <template>
 <template>
     <!-- 广告位 -->
     <!-- 广告位 -->
-    <div class="adversing">
+    <div class="adversing" v-if="imgurl">
         <div class="inner">
         <div class="inner">
-            <a href="http://www.baidu.com" title="三农资讯网_广告位2">
-                <img :src="imgurl.thumb" v-if="!imgurl.image_src" alt="三农资讯网_广告位2">
-                <img :src="imgurl.image_src" v-if="imgurl.image_src" alt="三农资讯网_广告位2">
+            <!--如果已售出-->
+            <a :href="imgurl.image_url" title="三农资讯网_广告位2" v-if="imgurl.image_src!=''&&imgurl.image_url!=null">
+                <img :src="imgurl.image_src" alt="三农资讯网_广告位2">
+            </a>
+            <!--如果未售出-->
+            <a href="/" title="三农资讯网_广告位2" v-else>
+                <img :src="imgurl.thumb" alt="三农资讯网_广告位2">
             </a>
             </a>
         </div>
         </div>
     </div>
     </div>

+ 31 - 11
components/home/BigSwiper.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
     <!-- 首页大的轮播图 -->
     <!-- 首页大的轮播图 -->
-    <div class="swiper">
+    <div class="swiper" v-if="imagelist">
         <el-carousel :interval="5000" arrow="always" height="405px" indicator-class="custom-indicator"
         <el-carousel :interval="5000" arrow="always" height="405px" indicator-class="custom-indicator"
             class="custom-carousel" @change="handleIndicatorChange">
             class="custom-carousel" @change="handleIndicatorChange">
             <el-carousel-item v-for="(item, index) in imagelist" :key="index">
             <el-carousel-item v-for="(item, index) in imagelist" :key="index">
@@ -21,9 +21,9 @@
 <script setup>
 <script setup>
 import { ElCarousel, ElCarouselItem } from 'element-plus'
 import { ElCarousel, ElCarouselItem } from 'element-plus'
 //获取焦点图数据 start---------------------------------------->
 //获取焦点图数据 start---------------------------------------->
-let imagelist = useState("imageList", () => "")
+const imagelist = ref("")
 async function getModelData1() {
 async function getModelData1() {
-    const { data: mkdata, error: mkdataError } =  requestData('/web/getWebsiteArticlett', {
+    const mkdata =  await requestDataPromise('/web/getWebsiteArticlett', {
         method: 'GET',
         method: 'GET',
         query: {
         query: {
             'pageSize': 5,
             'pageSize': 5,
@@ -31,16 +31,36 @@ async function getModelData1() {
             'placeid': 0
             'placeid': 0
         },
         },
     });
     });
-    if (mkdataError.value) {
-        //console.error('模块1数据上部分请求失败!', mkdataError.value);
-    } else {
-        if (mkdata.value) {
-            //console.log('模块1数据上部分请求成功!', mkdata.value.data);
-            imagelist.value = mkdata.value.data;
-        }
-    }
+    imagelist.value = mkdata.data;
 }
 }
 getModelData1()
 getModelData1()
+
+
+
+
+
+
+// let imagelist = ref([])
+// async function getModelData1() {
+//     const { data: mkdata, error: mkdataError } =  requestData('/web/getWebsiteArticlett', {
+//         method: 'GET',
+//         query: {
+//             'pageSize': 5,
+//             'level': 2,
+//             'placeid': 0
+//         },
+//     });
+//     if (mkdataError.value) {
+//         //console.error('模块1数据上部分请求失败!', mkdataError.value);
+//     } else {
+//         if (mkdata.value) {
+            
+//             //console.log('模块1数据上部分请求成功!', mkdata.value.data);
+//             imagelist.value = mkdata.value.data;
+//         }
+//     }
+// }
+// getModelData1()
 //获取焦点图数据 end---------------------------------------->
 //获取焦点图数据 end---------------------------------------->
 
 
 let currentIndex = ref(0)
 let currentIndex = ref(0)

+ 1 - 1
components/home/SmallSwiper.vue

@@ -1,5 +1,5 @@
 <template>
 <template>
-    <div class="swiper">
+    <div class="swiper" v-if="swiperData.length > 0">
         <el-carousel :interval="5000" arrow="always" height="214px" indicator-class="custom-indicator">
         <el-carousel :interval="5000" arrow="always" height="214px" indicator-class="custom-indicator">
             <el-carousel-item v-for="item in swiperData" :key="item">
             <el-carousel-item v-for="item in swiperData" :key="item">
                 <img :src="item.imgurl" :alt="item.title">
                 <img :src="item.imgurl" :alt="item.title">

+ 8 - 4
components/home/TopTen.vue

@@ -1,9 +1,13 @@
 <template>
 <template>
     <div class="topTenTitle">
     <div class="topTenTitle">
-        <div class="inner">
-            <a href="http://www.baidu.com">
-                <img :src="imgurl.thumb" v-if="!imgurl.image_src" alt="三农资讯网_广告位3">
-                <img :src="imgurl.image_src" v-if="imgurl.image_src" alt="三农资讯网_广告位3">
+        <div class="inner" v-if="imgurl">
+            <!--如果已售出-->
+            <a :href="imgurl.image_url" title="三农资讯网_广告位3" v-if="imgurl.image_src!=''&&imgurl.image_url!=null">
+                <img :src="imgurl.image_src" alt="三农资讯网_广告位3">
+            </a>
+            <!--如果未售出-->
+            <a href="/" title="三农资讯网_广告位3" v-else>
+                <img :src="imgurl.thumb" alt="三农资讯网_广告位3">
             </a>
             </a>
         </div>
         </div>
     </div>
     </div>

+ 9 - 7
components/home/pageHead.vue

@@ -50,14 +50,12 @@
         <div class="headerLogo">
         <div class="headerLogo">
             <div class="inner">
             <div class="inner">
                 <img src="../../public/image/logo1.png" alt="三农资讯网" class="left" @click="backHome">
                 <img src="../../public/image/logo1.png" alt="三农资讯网" class="left" @click="backHome">
-                <div class="titlead" v-if="adImg.thumb||adImg.image_src">
-                    <a :href="adImg.image_url" title="三农资讯网_广告位" v-if="adImg.image_url">
-                        <img :src="adImg.thumb" alt="三农资讯网_广告位" v-if="!adImg.image_src">
-                        <img :src="adImg.image_src" alt="三农资讯网_广告位" v-if="adImg.image_src">
+                <div class="titlead" v-if="adImg">
+                    <a :href="adImg.image_url" title="三农资讯网_广告位1" v-if="adImg.image_src!=''&&adImg.image_url!=null">
+                        <img :src="adImg.image_src" alt="三农资讯网_广告位1">
                     </a>     
                     </a>     
-                    <a href="http://sannongdy.org.cn/" title="三农资讯网_广告位" v-else>
-                        <img :src="adImg.thumb" alt="三农资讯网_广告位" v-if="!adImg.image_src">
-                        <img :src="adImg.image_src" alt="三农资讯网_广告位" v-if="adImg.image_src">
+                    <a href="/" title="三农资讯网_广告位1" v-else>
+                        <img :src="adImg.thumb" alt="三农资讯网_广告位1">
                     </a>              
                     </a>              
                 </div>
                 </div>
             </div>
             </div>
@@ -228,6 +226,9 @@ let goSearch = () => {
 
 
 // 点击广告服务
 // 点击广告服务
 let goAdvertising = () => {
 let goAdvertising = () => {
+    //本地启动广告服务
+    //window.open('/advertising?activeName=1', '_blank');
+    //线上启动
     if (getToken()) {
     if (getToken()) {
         window.open($CwebUrl + '/advertising?activeName=1', '_blank');
         window.open($CwebUrl + '/advertising?activeName=1', '_blank');
     } else {
     } else {
@@ -428,6 +429,7 @@ header {
         bottom: 33px;
         bottom: 33px;
         right: 26px;
         right: 26px;
         img {
         img {
+            width: 600px;
             height: 120px;
             height: 120px;
         }
         }
     }
     }

+ 189 - 1
components/home/pageNavigation.vue

@@ -21,7 +21,7 @@
                     <li v-for="(item, index) in navigation1" :key="index">
                     <li v-for="(item, index) in navigation1" :key="index">
                         <NuxtLink :to="'/primaryNavigation/' + item.category_id" v-if="item.children_count != 0" :title="item.alias">
                         <NuxtLink :to="'/primaryNavigation/' + item.category_id" v-if="item.children_count != 0" :title="item.alias">
                             <span class="active" v-if="item.category_id == routeId">{{ item.alias }}</span>
                             <span class="active" v-if="item.category_id == routeId">{{ item.alias }}</span>
-                            <span v-else>{{ item.alias }}</span>
+                        <span v-else>{{ item.alias }}</span>
                         </NuxtLink>
                         </NuxtLink>
                         <NuxtLink :to="'/newsList/' + item.category_id" v-if="item.children_count == 0 && item.is_url != 1" :title="item.alias">
                         <NuxtLink :to="'/newsList/' + item.category_id" v-if="item.children_count == 0 && item.is_url != 1" :title="item.alias">
                             <span class="active" v-if="item.category_id == routeId">{{ item.alias }}</span>
                             <span class="active" v-if="item.category_id == routeId">{{ item.alias }}</span>
@@ -35,10 +35,68 @@
                 </ul>
                 </ul>
             </div>
             </div>
         </div>
         </div>
+        <!-- 展示地区 -->
+        <div class="cityBox">
+            <div class="cityMain">
+                <div class="cityTitle">
+                    地方频道
+                </div>
+                <ul class="cityList">
+                    <li v-for="(item, index) in provinceList" :key="index" @click="goToSearch(item.id)">
+                        {{item.abbreviation}}
+                    </li>
+                </ul>
+            </div>
+        </div>
+        <!-- 行政查询 -->
+        <div class="select">
+            <div class="inner">
+                <div class="role left">
+                    <div class="title">行政职能查询</div>
+                    <div class="searchRole" v-if="department.length > 0">
+                        <el-select v-model="depValue" placeholder="职能部门" size="large" style="width: 330px">
+                            <el-option v-for="(item, index) in department" :key="index" :label="item.name" :value="item.id" />
+                        </el-select>
+                        <em @click="goToPrimary"></em>
+                    </div>
+                </div>
+                <div class="region left">
+                    <div class="title">行政区划查询</div>
+                    <div class="searchRole" v-if="provinceList.length > 0">
+                        <el-select v-model="province" placeholder="请选择省" size="large" style="width: 80px">
+                            <el-option v-for="item in provinceList" :key="item.id" :label="item.name" @click="change(item.id)" :value="item.id" />
+                        </el-select>
+                        <i></i>
+                        <el-select v-model="city" placeholder="请选择市" no-data-text="请先选择省份" size="large" style="width: 80px">
+                            <el-option v-for="(item, index) in cityList" :key="item.id" :label="item.name" @click="change1(item.id)" :value="item.id" />
+                        </el-select>
+                        <i></i>
+                        <el-select v-model="region" placeholder="请选择区/县" no-data-text="请先选择市" size="large" style="width: 100px">
+                            <el-option v-for="item in regionList" :key="item.id" :label="item.name" :value="item.id" />
+                        </el-select>
+                        <em @click="goToPrimary"></em>
+                    </div>
+                </div>
+            </div>
+        </div>
+
     </div>
     </div>
 </template>
 </template>
 
 
 <script setup>
 <script setup>
+//1.加载依赖 start ---------------------------------------->
+import { ElMessage } from 'element-plus'
+import { ref, onMounted } from 'vue';
+import { ElSelect, ElOption } from 'element-plus'
+
+const nuxtApp = useNuxtApp();
+const axios = nuxtApp.$axios;
+
+const route = useRoute();
+const routeId = route.params.id; //获得该页面的id
+//1.加载依赖 end ---------------------------------------->
+
+//2.加载模块数据 start ---------------------------------------->
 const navigation1 = ref("");
 const navigation1 = ref("");
 async function getPageData2() {
 async function getPageData2() {
     const mkdata =  await requestDataPromise('/web/getWebsiteModelCategory', {
     const mkdata =  await requestDataPromise('/web/getWebsiteModelCategory', {
@@ -52,6 +110,136 @@ async function getPageData2() {
     navigation1.value = mkdata.data;
     navigation1.value = mkdata.data;
 }
 }
 getPageData2();
 getPageData2();
+//2.加载模块数据 end ---------------------------------------->
+
+//3.职能部门 start ---------------------------------------->
+let department = ref("安全")
+const depValue = ref("")
+const typeValue = ref("")
+let departmentList = async () => {
+    const { data: mkdata, error: mkdataError } =  requestData('/web/selectWebsiteDepartment', {
+        method: 'GET',
+        query: {
+            'keyword': department.value,
+        },
+    });
+    if (mkdataError.value) {
+       //console.log()
+    } else {
+        console.log(department.value)
+        if (mkdata.value) {
+            console.log(mkdata.value.data.department)
+            department.value = mkdata.value.data.department;
+        }
+    }
+}
+//获得所有部门
+departmentList();
+//3.职能部门 end ---------------------------------------->
+
+//4.展示行政区划 start ---------------------------------------->
+//let areaList = ref("")
+//4.1 省
+let province = ref("")
+let provinceid = ref("")
+let provinceList = ref("")
+//4.2 市
+let city = ref("")
+let cityid = ref("")
+let cityList = ref("")
+//4.3 县
+let region = ref("")
+//let regionid = ref("")
+let regionList = ref("")
+
+//选择省
+let areaArrList = async () => {
+    const { data: mkdata, error: mkdataError } =  requestData('/web/selectWebsiteArea', {
+        method: 'GET',
+        query: {},
+    });
+    if (mkdataError.value) {
+       //console.log()
+    } else {
+        console.log(department.value)
+        if (mkdata.value) {
+            console.log(mkdata.value)
+            //areaList.value = mkdata.value.data;
+            provinceList.value = mkdata.value.data;
+        }
+    }
+}
+//一开始只需要获取一下省
+areaArrList();
+
+//选择市
+let change = async (id) => {
+    provinceid.value = id;
+    const shengData =  await requestDataPromise('/web/selectWebsiteArea', {
+        method: 'GET',
+        query: {
+            'province': id,
+            'city': 0
+        },
+    });
+    cityList.value = shengData.data.city;
+}
+
+//选择县
+let change1 = async (id) => {
+    cityid.value = id;
+    const xianData =  await requestDataPromise('/web/selectWebsiteArea', {
+        method: 'GET',
+        query: {
+            'province': provinceid.value,
+            'city': cityid.value
+        },
+    });
+    regionList.value = xianData.data.region;
+}
+//4.展示行政区划 end ---------------------------------------->
+
+//5.执行搜索 start ---------------------------------------->
+const getcityid = ref("")
+//跳转到搜索页面
+let goToSearch = (id) => {
+    console.log(id)
+    const route = `/search/search?catids=${id}`;
+    window.location.href = route;
+}
+
+//获得cityid和
+let goToPrimary = async () => {
+    if (province.value != "") { getcityid.value = province.value }
+    if (city.value != "") { getcityid.value = city.value }
+    if (region.value != "") { getcityid.value = region.value }
+
+    if (province.value == ""&&city.value == ""&&region.value == ""&&depValue.value=="") {
+        ElMessage.error('请选择行政区划或者职能部门!')
+    }else{
+
+        const responseStatus =  await requestDataPromise('/web/selectWebsiteCategory', {
+        method: 'GET',
+            query: {
+                'cityid': getcityid.value,
+                'department_id': depValue.value
+            },
+        });
+
+        if (responseStatus.data.catid && responseStatus.data.catid.length > 0) {
+            const catids = responseStatus.data.catid.join(',');
+            const route = `/search/search?catids=${catids}`;
+            window.location.href = route;
+        } else {
+            // 可以在这里处理数组为空的情况
+            console.log('没有可用的分类ID');
+            const route = `/search/search`;
+            window.location.href = route;
+        }
+
+    }
+}
+//5.执行搜索 end ---------------------------------------->
 </script>
 </script>
 
 
 <style lang="less" scoped>
 <style lang="less" scoped>

+ 107 - 17
pages/advertising/index.vue

@@ -38,7 +38,7 @@
                                                         end-placeholder="请选择结束时间" :size="size" @change="changeStartTime"
                                                         end-placeholder="请选择结束时间" :size="size" @change="changeStartTime"
                                                         :disabled-date="disabledStartTime" /> -->
                                                         :disabled-date="disabledStartTime" /> -->
                                                     <el-date-picker v-model="ruleForm.time" type="datetimerange"
                                                     <el-date-picker v-model="ruleForm.time" type="datetimerange"
-                                                        format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+                                                        format="YYYY-MM-DD HH:00:00" value-format="YYYY-MM-DD HH:00:00"
                                                         range-separator="至" start-placeholder="请选择开始时间"
                                                         range-separator="至" start-placeholder="请选择开始时间"
                                                         end-placeholder="请选择结束时间" :size="size" @change="changeStartTime"
                                                         end-placeholder="请选择结束时间" :size="size" @change="changeStartTime"
                                                         :disabled-date="disabledStartTime">
                                                         :disabled-date="disabledStartTime">
@@ -62,7 +62,7 @@
 
 
                                             <!-- 表格部分 -->
                                             <!-- 表格部分 -->
                                             <div class="pageTable">
                                             <div class="pageTable">
-                                                <el-table :data="tableData" border ref="multipleTable" empty-text="暂无数据"
+                                                <el-table :data="tableData" border ref="multipleTable" empty-text="请先选择广告持续时间"
                                                     @selection-change="handleSelectionChange" style="width: 100%"
                                                     @selection-change="handleSelectionChange" style="width: 100%"
                                                     :header-row-style="{ height: '60px' }"
                                                     :header-row-style="{ height: '60px' }"
                                                     :row-style="{ height: '74px' }"
                                                     :row-style="{ height: '74px' }"
@@ -85,7 +85,7 @@
                                             <el-form-item label="广告图:" prop="adImg">
                                             <el-form-item label="广告图:" prop="adImg">
                                                 <el-upload class="avatar-uploader" action="#" :show-file-list="false"
                                                 <el-upload class="avatar-uploader" action="#" :show-file-list="false"
                                                     :on-success="handleAvatarSuccess"
                                                     :on-success="handleAvatarSuccess"
-                                                    :before-upload="beforeAvatarUpload">
+                                                    :before-upload="beforeAvatarUpload" accept=".jpg,.jpeg,.png">
                                                     <img v-if="imageUrl" :src="imageUrl" class="avatar" />
                                                     <img v-if="imageUrl" :src="imageUrl" class="avatar" />
                                                     <div v-else>
                                                     <div v-else>
                                                         <el-icon class="avatar-uploader-icon">
                                                         <el-icon class="avatar-uploader-icon">
@@ -304,21 +304,111 @@ const tabPosition = ref('left')
 
 
 // 获取开始时间
 // 获取开始时间
 let changeStartTime = (val) => {
 let changeStartTime = (val) => {
-    // console.log('val', val);
-    // ruleForm.startTime = `${val[0].getFullYear()}-${val[0].getMonth() + 1}-${val[0].getDate()}`
-    // ruleForm.endTime = `${val[1].getFullYear()}-${val[1].getMonth() + 1}-${val[1].getDate()}`
-    ruleForm.startTime = val[0]
-    ruleForm.endTime = val[1]
-    // console.log(ruleForm.startTime);
-    // console.log(ruleForm.endTime);
+    //先格式化传入的时间,选择的时间为下一个整数小时0分0秒
+    let time1 = new Date(new Date(val[0]).setMinutes(0, 0, 0) + 60 * 60 * 1000).getTime();
+    let time2 = new Date(new Date(val[1]).setMinutes(0, 0, 0) + 60 * 60 * 1000).getTime();
+    //同样的道理,获取当前时间的下一个整数小时0分0秒
+    let currentTimestamp = new Date(new Date().setMinutes(0, 0, 0) + 60 * 60 * 1000).getTime();
+
+    if(time1 < currentTimestamp) {
+        ElMessage.error('时间选择错误,已为您自动重设!');
+        //第一步,将时间戳转换为本地时间
+        let localTime = new Date(currentTimestamp).toLocaleString('zh-CN', {
+            year: 'numeric',
+            month: '2-digit',
+            day: '2-digit',
+            hour: '2-digit',
+            minute: '2-digit'
+        }).replace(/\//g, '-');
+        //第二步,将当前时间加24小时
+        let twoHoursLocalTime = new Date(currentTimestamp + 24 * 60 * 60 * 1000).toLocaleString('zh-CN', {
+            year: 'numeric', 
+            month: '2-digit',
+            day: '2-digit',
+            hour: '2-digit',
+            minute: '2-digit'
+        }).replace(/\//g, '-');
+
+        //第三步,将当前时间赋值给ruleForm.time[0]
+        ruleForm.time[0] = localTime;
+        ruleForm.time[1] = twoHoursLocalTime;
+        ruleForm.startTime = localTime;
+        ruleForm.endTime = twoHoursLocalTime;
+
+        //获取广告尺寸
+        getAdSize()
+        //创建购物车
+        axios.post("/order/addShoppingCart").then(response => {
+            // console.log("创建购物车", response.data);
+            shopCode.value = response.data
+            console.log('shopCode', shopCode.value);
+        })
 
 
-    getAdSize()
-    //创建购物车
-    axios.post("/order/addShoppingCart").then(response => {
-        // console.log("创建购物车", response.data);
-        shopCode.value = response.data
-        console.log('shopCode', shopCode.value);
-    })
+    }else{
+        //第二种情况,传入的时间戳大于当前时间
+        //但是时间间隔小于2小时
+        if(time2 - time1 < 24 * 60 * 60 * 1000){
+            ElMessage.error('广告持续时间不得低于24小时,已为您自动重设!');
+            //第一步,将时间戳转换为本地时间
+            let localTime = new Date(currentTimestamp).toLocaleString('zh-CN', {
+                year: 'numeric',
+                month: '2-digit',
+                day: '2-digit',
+                hour: '2-digit',
+                minute: '2-digit'
+            }).replace(/\//g, '-');
+            //第二步,将当前时间加2小时
+            let twoHoursLocalTime = new Date(currentTimestamp + 24 * 60 * 60 * 1000).toLocaleString('zh-CN', {
+                year: 'numeric', 
+                month: '2-digit',
+                day: '2-digit',
+                hour: '2-digit',
+                minute: '2-digit'
+            }).replace(/\//g, '-');
+
+        
+            //第三步,将当前时间赋值给ruleForm.time[0]
+            ruleForm.time[0] = localTime;
+            ruleForm.time[1] = twoHoursLocalTime;
+            ruleForm.startTime = localTime;
+            ruleForm.endTime = twoHoursLocalTime;
+
+            
+            //获取广告尺寸
+            getAdSize()
+            //创建购物车
+            axios.post("/order/addShoppingCart").then(response => {
+                // console.log("创建购物车", response.data);
+                shopCode.value = response.data
+                console.log('shopCode', shopCode.value);
+            })
+
+        }else{
+            //第三种情况,用户时间选择正确,无需操作
+            ruleForm.startTime = val[0]
+            ruleForm.endTime = val[1]
+            //获取广告尺寸
+            getAdSize()
+            //创建购物车
+            axios.post("/order/addShoppingCart").then(response => {
+                // console.log("创建购物车", response.data);
+                shopCode.value = response.data
+                console.log('shopCode', shopCode.value);
+            })
+        }
+    }
+
+    //第四种情况,使广告立即生效,请注释上面的if 直接使用下面这一段
+    // ruleForm.startTime = val[0]
+    // ruleForm.endTime = val[1]
+    // //获取广告尺寸
+    // getAdSize()
+    // //创建购物车
+    // axios.post("/order/addShoppingCart").then(response => {
+    //     // console.log("创建购物车", response.data);
+    //     shopCode.value = response.data
+    //     console.log('shopCode', shopCode.value);
+    // })
 
 
 }
 }
 //禁止选择的时间区域
 //禁止选择的时间区域

+ 14 - 8
pages/index.vue

@@ -97,10 +97,12 @@
                     <HomeSlider :message="pageData[2]"></HomeSlider>
                     <HomeSlider :message="pageData[2]"></HomeSlider>
                 </div>
                 </div>
                 <div class="scienceRight" v-if="pageData.length>=4">
                 <div class="scienceRight" v-if="pageData.length>=4">
-                    <div class="adBox1">
-                        <a href="http://www.baidu.com">
-                            <img :src="adImg3.thumb" v-if="adImg3 && !adImg3.image_src" alt="三农资讯网_广告位2">
-                            <img :src="adImg3.image_src" v-if="adImg3 && adImg3.image_src" alt="三农资讯网_广告位2">
+                    <div class="adBox1" v-if="adImg3">
+                        <a :href="adImg3.image_url" title="三农资讯网_广告位3" v-if="adImg3.image_src!=''&&adImg3.image_url!=null">
+                            <img :src="adImg3.image_src" alt="三农资讯网_广告位3">
+                        </a>
+                        <a href="/" title="三农资讯网_广告位3" v-else>
+                            <img :src="adImg3.thumb" v-if="adImg3 && adImg3.image_src" alt="三农资讯网_广告位3">
                         </a>
                         </a>
                     </div>
                     </div>
                     <!-- 模块四 三农之窗 pagedata[3] -->
                     <!-- 模块四 三农之窗 pagedata[3] -->
@@ -646,10 +648,12 @@
             </div>
             </div>
         </section>
         </section>
 
 
-        <div class="titleBox">
-            <a href="http://www.baidu.com">
-                <img :src="adImg5.thumb" v-if="adImg5 && !adImg5.image_src" alt="三农资讯网_广告位4">
-                <img :src="adImg5.image_src" v-if="adImg5 && adImg5.image_src" alt="三农资讯网_广告位4">
+        <div class="titleBox" v-if="adImg5">
+            <a :href="adImg5.image_url" v-if="adImg5.image_src!=''&&adImg5.image_url!=null">
+                <img :src="adImg5.image_src" alt="三农资讯网_广告位4">
+            </a>
+            <a href="/" v-else>
+                <img :src="adImg5.thumb" alt="三农资讯网_广告位4">
             </a>
             </a>
         </div>
         </div>
 
 
@@ -1362,6 +1366,8 @@ let adImg5 = ref({})
 
 
 async function getAdData(){
 async function getAdData(){
     const adData = await requestDataPromise('/web/getWebsiteAdvertisement',{method:'GET',query:{'ad_tag':'INDEDX'}});
     const adData = await requestDataPromise('/web/getWebsiteAdvertisement',{method:'GET',query:{'ad_tag':'INDEDX'}});
+    console.log("334455")
+    console.log(adData)
     for(let item of adData.data){
     for(let item of adData.data){
         if(item.ad_tag == 'SNZXWT_INDEDX_0002'){
         if(item.ad_tag == 'SNZXWT_INDEDX_0002'){
             adImg2.value = item;
             adImg2.value = item;

+ 1 - 1
plugins/request.js

@@ -16,7 +16,7 @@ export default defineNuxtPlugin(nuxtApp => {
         // console.log("请求拦截器",config);
         // console.log("请求拦截器",config);
         // 从cookie中获取数据
         // 从cookie中获取数据
         const token = getToken()
         const token = getToken()
-        //const token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJwaHBlcjY2Ni9qd3QiLCJ1aWQiOjc5LCJ1c2VyX25hbWUiOiIxMzkzMDg5NjY0MyIsIm1vYmlsZSI6IjEzOTMwODk2NjQzIiwiZW1haWwiOiIiLCJsZXZlbF9pZCI6MCwidHlwZV9pZCI6MTAwMDAsImp3dF9zY2VuZSI6ImRlZmF1bHQiLCJqdGkiOiJkZWZhdWx0XzY3YzdlNjMyMDkwODAxLjg3ODgyMDk3IiwiaWF0IjoxNzQxMTUzODQyLCJuYmYiOjE3NDExNTM4NDIsImV4cCI6MTc0MTI0MDI0Mn0.Dm8sZuITdqED7dfBHLRAFd-duSVXt63D0HVJ9feD65M"
+        //const token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJwaHBlcjY2Ni9qd3QiLCJ1aWQiOjc2LCJ1c2VyX25hbWUiOiIxNzM0MDUzMTQ1NCIsIm1vYmlsZSI6IjE3MzExMTExMTExIiwiZW1haWwiOiIiLCJsZXZlbF9pZCI6MCwidHlwZV9pZCI6MTAwMDAsImp3dF9zY2VuZSI6ImRlZmF1bHQiLCJqdGkiOiJkZWZhdWx0XzY3ZDBmYmQ2OWUwZDk2LjY3MTU1NDM5IiwiaWF0IjoxNzQxNzQ5MjA2LCJuYmYiOjE3NDE3NDkyMDYsImV4cCI6MTc0MTgzNTYwNn0.1pfYged1EOSVaQNdAlaKA_kvBJLgOkWKkk38yog_xoU"
         if (token) {
         if (token) {
             config.headers.token = token;
             config.headers.token = token;
         }
         }