Browse Source

修改bug

Jing 1 day ago
parent
commit
6b556855c7

+ 233 - 0
assets/css/public/footer.less

@@ -0,0 +1,233 @@
+.index_foot {
+    box-sizing: border-box;
+    width: 1200px;
+    margin: 0 auto;
+}
+
+.index_foot_name_box {
+    margin: 40px auto 0px;
+    text-align: center;
+    font-size: 0px;
+}
+
+.index_foot_name {
+    display: inline-block;
+    height: 67px;
+    line-height: 67px;
+    color: #f2f9f4;
+    font-size: 51px;
+    font-weight: bold;
+    overflow: hidden;
+}
+
+.index_foot_name:nth-of-type(even) {
+    color: #333;
+    font-size: 32px;
+}
+
+.foot_img_box {
+    overflow: hidden;
+    display: block;
+    margin: 10px auto 0;
+    width: 100%;
+//     display: flex;
+//     justify-content: space-between;
+//     flex-wrap: wrap;
+}
+
+.foot_img_box>* {
+    float: left;
+    width: 170px;
+    height: 57px;
+    overflow: hidden;
+//     box-sizing: border-box;
+//     border: solid 1px #d7edd4;
+    margin: 0px 36px 20px 0px;
+
+
+
+}
+
+.foot_img_box>* * {
+    display: block;
+    width: 170px;
+    height: 57px;
+     
+}
+
+.foot_img_box>*:nth-of-type(6n) {
+    margin-right: 0px;
+}
+
+.foot_frind_box {
+    display: block;
+    margin: 20px auto 20px;
+    overflow: hidden;
+    display: flex;
+    width: 100%;
+}
+
+.foot_frind_box span {
+    word-break: keep-all;
+    white-space: nowrap;
+    line-height: 22px;
+    font-size: 16px;
+    color: #333;
+    font-weight: bold;
+}
+
+.foot_frind_box div {
+    width: 100%;
+    overflow: hidden;
+}
+
+.foot_frind_box div * {
+    float: left;
+    line-height: 22px;
+    height: 22px;
+    color: #333;
+    font-size: 16px;
+    margin: 0 27px;
+    margin-bottom: 20px;
+}
+
+.call_us_box {
+    display: block;
+    width: 100%;
+    margin: 0 auto;
+    overflow: hidden;
+    text-align: center;
+    font-size: 0px;
+    background: #dd7d18;
+
+    a {
+        color: #fff;
+    }
+}
+
+.inner {
+    width: 1200px;
+    margin: 0 auto;
+}
+
+.inner>* {
+    height: 12px;
+    line-height: 12px;
+    color: #fff;
+    font-size: 14px;
+    display: inline-block;
+    box-sizing: border-box;
+    padding: 0 19px;
+    font-weight: bold;
+    border-left: solid 1px #CB7113;
+    margin: 18px 0;
+}
+
+.inner>*:nth-of-type(1) {
+    border-left: 0px;
+}
+
+.foot_text_box {
+    margin: 40px auto 0px;
+    text-align: center;
+    color: #333;
+    font-size: 14px;
+    line-height: 25px;
+//      background-color: red; 
+    p {
+        a {
+            color: #333;
+            font-size: 14px;
+        }
+
+        .webSitecolor {
+            color: #dd7d18;
+        }
+    }
+}
+
+.foot_text_box :deep(a){color: #333;}
+// .foot_text_box a{}
+
+.top_content {
+    padding: 0 170px;
+}
+
+.webSitecolor {
+    color: #dd7d18;
+}
+
+
+.foot_text_box_green {
+    color: #40663B;
+}
+
+.foot_text_box img {
+    display: inline-block;
+    height: 20px;
+    vertical-align: middle;
+}
+
+.foot_logo_out {
+    position: relative;
+    margin: 0px auto;
+    width: 100%;
+    height: 0px;
+}
+
+.foot_logo_out * {
+    width: 120px;
+    display: block;
+}
+
+.foot_logo_out>* {
+    position: absolute;
+    top: -145px;
+}
+
+.foot_logo_out>*:nth-of-type(1) {
+    left: 0px;
+}
+
+.foot_logo_out>*:nth-of-type(2) {
+    right: 0px;
+}
+
+.foot_last_img_box {
+    margin: 40px auto 10px;
+    text-align: center;
+    overflow: hidden;
+    width: 100%;
+    font-size: 0px;
+    padding-bottom: 40px;
+}
+
+.foot_last_img_box>* {
+    height: 50px;
+    width: 120px;
+    margin: 0px 13px;
+    display: inline-block;
+    overflow: hidden;
+}
+
+.foot_last_img_box>* * {
+    display: block;
+    height: 100%;
+    width: 100%;
+    overflow: hidden;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+ 263 - 0
assets/css/public/head.less

@@ -0,0 +1,263 @@
+.userInfo11 {
+    width: 100px;
+    height: 80px;
+    background-color: #fff;
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+    border-radius: 3px;
+    position: absolute;
+    top: 40px;
+    right: 35px;
+    font-size: 14px;
+    z-index: 999;
+
+    li {
+        height: 40px;
+        line-height: 40px;
+        color: #333333;
+        padding-left: 10px;
+    }
+
+    >li:hover {
+        color: #dd7d18;
+    }
+}
+
+.tips {
+    padding: 20px 0;
+    text-align: center;
+    font-size: 20px;
+    color: #333333;
+    font-weight: bold;
+
+    img {
+        width: 78px;
+        height: 78px;
+        vertical-align: middle;
+        margin-right: 20px;
+
+        p {
+            line-height: 30px;
+        }
+    }
+
+    p {
+        line-height: 40px;
+    }
+
+    >p:first-child {
+        margin-bottom: 30px;
+    }
+
+}
+
+/* 页面头部 */
+header {
+    width: 100%;
+    height: 180px;
+    font-size: 12px;
+    font-family: PingFang SC-Regular;
+    color: #666666;
+    background: url("http://img.bjzxtw.org.cn/master/bjzxtw/public/head/headtopbg.png") repeat-x;
+}
+
+.headerNav {
+    width: 100%;
+    height: 33px;
+    line-height: 33px;
+}
+
+.headerNav .left>span {
+    margin-right: 20px;
+    a{
+        color: #666666;
+    }
+}
+
+.headerNav .right {
+    display: flex;
+    margin-right: 10px;
+    position: relative;
+
+    button {
+        font-size: 12px;
+        color: #666666;
+        border: none;
+        background: none;
+        cursor: pointer;
+    }
+
+    .login {
+        width: 36px;
+        height: 19px;
+        color: #fff;
+        border-radius: 4px;
+        background-color: #028E21;
+        margin-right: 15px;
+        cursor: pointer;
+    }
+
+    .menu,
+    .right-top-menu {
+        display: flex;
+    }
+
+    .reg {
+        margin-right: 20px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        height: 33px;
+
+        img {
+            margin-right: 5px;
+        }
+    }
+}
+
+.headerNav .right {
+    float: right;
+    font-size: 12px;
+
+    span {
+        margin-right: 20px;
+    }
+
+    .home,
+    .collection {
+        display: inline-block;
+        width: 16px;
+        height: 16px;
+        vertical-align: -3px;
+    }
+
+    .home {
+        background-image: url("http://img.bjzxtw.org.cn/master/bjzxtw/public/image/search.png");
+    }
+
+    .collection {
+        background-image: url("http://img.bjzxtw.org.cn/master/bjzxtw/public/image/search.png");
+    }
+
+    .exit {
+        line-height: 30px;
+    }
+
+    // .exit:hover{
+    //     color: #028E21;
+    // }
+}
+
+/* // 头部logo */
+.headerLogo {
+    height: 145px;
+    position: relative;
+    //background: url("../../public/head/topBg.png") no-repeat center;
+    .titlead {
+        position: absolute;
+        bottom: 14px;
+        right: 26px;
+        width: 830px;
+        height: 110px;
+        overflow: hidden;
+        a {
+            display: block;
+            width: 830px;
+            height: 110px;
+            overflow: hidden;
+        }
+        img {
+            width: 100%;
+            height:110px;
+        }
+    }
+    .inner {
+        position: relative;
+        height: 145px;
+    }
+    .inner>img {
+        width: 297px;
+        height: 110px;
+        margin-top: 20px;
+        cursor: pointer;
+    }
+
+    /* // 搜索框部分 */
+    .search {
+        float: left;
+        width: 440px;
+        height: 40px;
+        background-color: #fff;
+        line-height: 40px;
+        margin-left: 39px;
+        margin: 71px 39px 48px;
+        position: relative;
+
+        em {
+            display: inline-block;
+            width: 30px;
+            height: 30px;
+            background: url("http://img.bjzxtw.org.cn/master/bjzxtw/public/image/search.png") no-repeat;
+            position: absolute;
+            top: 5px;
+            left: 15px;
+        }
+
+        input {
+            float: left;
+            width: 351px;
+            height: 40px;
+            border: none;
+            outline: none;
+            padding-left: 65px;
+            box-sizing: border-box;
+            border: 1px solid #028E21;
+            border-right: none;
+            border-radius: 4px 0px 0px 4px;
+        }
+
+        button {
+            float: right;
+            width: 89px;
+            height: 40px;
+            background-color: #028E21;
+            border-radius: 0px 4px 4px 0px;
+            border: none;
+            font-size: 14px;
+            color: #fff;
+            font-family: PingFang SC, PingFang SC;
+            font-weight: 500;
+        }
+
+    }
+
+    /* // 右侧小图标 */
+    .serve {
+        float: right;
+        height: 60px;
+        margin-top: 60px;
+        margin-right: 60px;
+
+        >li {
+            float: left;
+            height: 64px;
+            margin-left: 48px;
+        }
+
+        >li>a {
+            display: inline-block;
+            height: 64px;
+        }
+
+        >li img {
+            width: 29px;
+            height: 29px;
+            padding: 8px 14px;
+        }
+
+        >li p {
+            height: 28px;
+            text-align: center;
+            color: #666666;
+        }
+    }
+}

+ 161 - 0
assets/css/public/kefu.less

@@ -0,0 +1,161 @@
+//添加在线客服
+.kefu {
+  bottom: 100px;
+  height: 430px;
+  position: fixed;
+  right: 10px;
+  width: 100px;
+  .kefu_itemKf {
+      background-color: #fff;
+      border-radius: 10px;
+      box-shadow: 0 4px 16px #0000001a;
+      height: 100px;
+      margin-bottom: 15px;
+      text-align: center;
+      width: 100px;
+      box-sizing: border-box;
+      position: relative;
+      cursor: pointer;
+      margin-bottom: 100px;
+      a {
+          >p {
+              color: #666;
+              font-size: 14px;
+              font-weight: 500;
+              line-height: 16px;
+          }
+          >img {
+              margin-top: 15px;
+              width: 50px;
+              height:50px;
+              margin-bottom: 5px;
+          }
+      }
+  }
+  .kefu_itemQQ {
+      background-color: #fff;
+      border-radius: 10px;
+      box-shadow: 0 4px 16px #0000001a;
+      height: 100px;
+      margin-bottom: 15px;
+      text-align: center;
+      width: 100px;
+      box-sizing: border-box;
+      position: relative;
+      cursor: pointer;
+      >p {
+          color: #666;
+          font-size: 14px;
+          font-weight: 500;
+          line-height: 16px;
+      }
+      >img {
+          margin-top: 10px;
+          width: 60px;
+          height: 60px;
+      }
+      &:hover {
+          .kefu_item_content_QQ {
+              display: block;
+          }
+      }
+  }
+  .kefu_itemPhone {
+      background-color: #fff;
+      border-radius: 10px;
+      box-shadow: 0 4px 16px #0000001a;
+      height: 100px;
+      margin-bottom: 15px;
+      text-align: center;
+      width: 100px;
+      box-sizing: border-box;
+      position: relative;
+      cursor: pointer;
+      >p {
+          color: #666;
+          font-size: 14px;
+          font-weight: 500;
+          line-height: 16px;
+      }
+      >img {
+          margin-top: 10px;
+          width: 60px;
+          height: 60px;
+      }
+      &:hover {
+          .kefu_item_content_phone {
+              display: block;
+          }
+      }
+  }
+  .kefu_item_content_QQ {
+      position: absolute;
+      top: -100px;
+      right: 100px;
+      background: #fff;
+      border-radius: 10px;
+      display: none;
+      width: 190px;
+      height: 330px;
+      background: #fff;
+      box-shadow: 0 4px 16px #0000001a;
+      z-index: 99;
+      box-sizing: border-box;
+      padding: 20px;
+      img {
+          margin-bottom: 10px;
+      }
+      .qqfs {
+          margin-bottom: 20px;
+          font-size: 14px;
+          color: #333;
+      }
+      .arrow {
+          width: 0;
+          height: 0;
+          width: 0;
+          border-top: 20px solid transparent;
+          border-bottom: 20px solid transparent; 
+          border-left: 20px solid #fff; 
+          position: absolute;
+          top: 120px;
+          right: -20px;
+          transform: translateX(-50%);
+          z-index: 100;
+      }
+  }
+  .kefu_item_content_phone {
+      position: absolute;
+      top: 0;
+      right: 100px;
+      background: #fff;
+      border-radius: 10px;
+      display: none;
+      width: 190px;
+      height: 80px;
+      background: #fff;
+      box-shadow: 0 4px 16px #0000001a;
+      z-index: 99;
+      box-sizing: border-box;
+      padding: 20px;
+      text-align: left;
+      color: #333;
+      .kefu_item_content_phone_title {
+          margin-bottom: 5px;
+          font-weight: bold;
+      }
+      .arrow {
+          width: 0;
+          height: 0;
+          width: 0;
+          border-top: 20px solid transparent;
+          border-bottom: 20px solid transparent; 
+          border-left: 20px solid #fff; 
+          position: absolute;
+          top: 20px;
+          right: -20px;
+          transform: translateX(-50%);
+          z-index: 100;
+      }
+  }
+}

+ 230 - 0
assets/css/public/nav.less

@@ -0,0 +1,230 @@
+// 导航部分
+.partOne {
+    width: 100%;
+    height: 60px;
+    line-height: 60px;
+    background-color: #dd7d18;
+    font-size: 20px;
+    font-family: PingFang SC-Semibold;
+
+    .inner {
+        width: 1200px;
+        height: 60px;
+        margin: 0 auto;
+        position: relative;
+
+        .home {
+            width: 120px;
+            height: 68px;
+            line-height: 68px;
+            font-family: Microsoft YaHei, Microsoft YaHei;
+            font-weight: bold;
+            font-size: 20px;
+            letter-spacing: 2px;
+            text-align: center;
+            color: #fff;
+            background-color: #d2600f;
+            position: absolute;
+            top: -8px;
+            left: 0;
+            z-index: 100;
+
+            em {
+                display: inline-block;
+                width: 0;
+                height: 0;
+                border-top: 4px solid transparent;
+                border-left: 8px solid transparent;
+                border-bottom: 4px solid #803804;
+                border-right: 8px solid #803804;
+                position: absolute;
+                top: 0px;
+                left: -16px;
+
+            }
+
+            a {
+                color: #fff;
+            }
+
+        }
+
+        .partOneTitle {
+            width: 1050px;
+            height: 60px;
+            position: absolute;
+            top: 0;
+            left: 150px;
+            display: flex;
+            justify-content: space-between;
+
+            .titleList1 {
+                font-family: Microsoft YaHei, Microsoft YaHei;
+                font-weight: bold;
+                font-size: 16px;
+                color: #FFFFFF;
+
+                a {
+                    color: #fff;
+                }
+            }
+
+            .titleList111 {
+                font-family: Microsoft YaHei, Microsoft YaHei;
+                font-weight: 400;
+                font-size: 16px;
+                color: #FFFFFF;
+
+                a {
+                    color: #fff;
+                }
+            }
+
+            .titleList111:hover {
+                font-weight: 600;
+            }
+        }
+    }
+
+
+
+}
+
+.partTwo {
+    width: 100%;
+    height: 133px;
+    box-shadow: 0px 7px 14px 0px rgba(0, 0, 0, 0.1);
+    // margin-bottom: 50px;
+
+    .inner {
+        width: 1200px;
+        height: 133px;
+        line-height: 60px;
+        padding-top: 5px;
+        display: flex;
+        justify-content: space-between;
+
+        .navleft {
+            width: 100px;
+            text-align: center;
+            font-family: Microsoft YaHei, Microsoft YaHei;
+            font-weight: bold;
+            font-size: 16px;
+            color: #333333;
+        }
+
+        .navlist {
+            width: 1000px;
+            height: 65px;
+            font-family: Microsoft YaHei, Microsoft YaHei;
+            font-weight: 400;
+            font-size: 16px;
+            color: #333333;
+            /*display: flex;
+            justify-content: space-between;
+            flex-wrap: wrap;*/
+
+            .navListItem {
+                float: left;
+                width: 97px;
+                text-align: center;
+                font-family: Microsoft YaHei, Microsoft YaHei;
+                font-weight: 400;
+                font-size: 16px;
+                color: #333333;
+
+                a {
+                    color: #333333;
+                }
+            }
+
+            .navListItem:hover {
+                a {
+                    color: #e39543;
+                }
+            }
+        }
+
+        .navright {
+            margin-left: 20px;
+            width: 115px;
+            height: 75px;
+            font-size: 16px;
+            margin-top: 25px;
+            background: url(https://img.bjzxtw.org.cn/master/www/nmw/img/nav_bg.png) no-repeat;
+
+            .nav111 {
+                width: 98px;
+                height: 30px;
+                line-height: 44px;
+                text-align: center;
+                font-family: Microsoft YaHei, Microsoft YaHei;
+                font-weight: bold;
+                font-size: 16px;
+
+                a {
+                    font-weight: bold;
+                    background: linear-gradient(to bottom, #FFF6B1 0%, #F5BC38 100%);
+                    -webkit-background-clip: text;
+                    color: transparent;
+                }
+
+            }
+        }
+    }
+}
+
+//小导航
+.littleNav {
+    width: 100%;
+    height: 88px;
+    margin-top: 30px;
+
+    .inner {
+        width: 1200px;
+        height: 88px;
+        line-height: 88px;
+        margin: 0 auto;
+        display: flex;
+        border: 1px solid #D3D5D8;
+        background-color: #fafafa;
+
+        img {
+            width: 138px;
+            height: 38px;
+            margin-top: 22px;
+            margin-left: 25px;
+        }
+
+        .leftPart {
+            margin-left: 40px;
+            margin-right: 10px;
+        }
+
+        .leftPart,
+        .rightPart {
+            width: 470px;
+            height: 78px;
+            margin-top: 5px;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            padding: 0 10px;
+            border-bottom: 3px solid #A01C0E;
+
+            .navList {
+                a {
+                    font-family: Microsoft YaHei, Microsoft YaHei;
+                    font-weight: bold;
+                    font-size: 16px;
+                    color: #333333;
+                    line-height: 19px;
+                }
+            }
+
+            .navList:hover a {
+                color: #A01C0E;
+            }
+        }
+    }
+}

+ 1 - 0
components/home/foot.vue

@@ -57,6 +57,7 @@
             </a>
         </div>
     </footer>
+    <HomeKefu :bottomBase="bottomBase" />
 </template>
 
 <script setup>

+ 1 - 0
components/home/foot1.vue

@@ -76,6 +76,7 @@
             </div>
         </div> -->
     </footer>
+    <HomeKefu :bottomBase="bottomBase" />
 </template>
 
 <script setup>

+ 55 - 0
components/home/kefu.vue

@@ -0,0 +1,55 @@
+<template>
+  <!--在线客服-->
+  <div class="kefu">
+    <div class="kefu_itemKf">
+      <a :href="bottomBase.online_service" target="_blank">
+        <img src="https://img.bjzxtw.org.cn/pre/public/image/online1.png">
+        <p>在线客服</p>
+      </a>
+    </div>
+    <div class="kefu_itemQQ">
+      <img src="https://img.bjzxtw.org.cn/pre/public/image/qq1.png">
+      <p>QQ客服</p>
+      <div class="kefu_item_content_QQ">
+          <div @click="addQQFriend(bottomBase.customer_service_qq)" class="qqadd">
+              <img :src="bottomBase.service_qq_img" width="100">
+              <div class="qqfs">{{bottomBase.customer_service_qq}}</div>
+          </div>
+          <div @click="addQQFriend(bottomBase.communications)" class="qqadd">
+              <img :src="bottomBase.communications_img" width="100">
+              <div class="qqfs">{{bottomBase.communications}}</div>
+          </div>
+          <div class="arrow"></div>
+      </div>
+    </div>
+    <div class="kefu_itemPhone">
+      <img src="https://img.bjzxtw.org.cn/pre/public/image/dianhua1.png">
+      <p>电话客服</p>
+      <div class="kefu_item_content_phone">
+          <div class="kefu_item_content_phone_title">联系电话:</div>
+          <div>{{bottomBase.customer_service}}</div>
+          <div class="arrow"></div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+  const props = defineProps({
+    bottomBase: {
+      type: Object,
+      required: true
+    }
+  })
+
+  //添加网站客服
+  function addQQFriend(qqNumber) {
+    let qq = qqNumber.match(/\d+/g);
+    // 使用tencent协议唤起QQ客户端并添加好友
+    window.location.href = `tencent://message/?uin=${qq}&Site=&Menu=yes`;
+  }
+</script>
+
+<style lang="less" scoped>
+  @import url('@/assets/css/public/kefu.less');
+</style>

+ 2 - 2
components/home/pageHead.vue

@@ -172,7 +172,7 @@ const handleClickOutside = (event) => {
 //3.跳转菜单逻辑 start ---------------------------------------->
 let gotosystem = () => {
     let url = $BwebUrl + '/#/login?userurl=' + $CwebUrl;
-    isShow.value = false;
+    isShow.value = false
     //window.location.href = url; 
     window.open(url, '_blank');
 }
@@ -180,7 +180,7 @@ let gotosystem = () => {
 //点击退出按钮
 let exit = () => {
     window.location.href = $CwebUrl;
-    isShow.value = false;
+    isShow.value = false
     isDel.value = 1
     token1.value = getToken()
 

+ 17 - 9
pages/index.vue

@@ -1142,7 +1142,15 @@
 //1.页面必备方法 start ---------------------------------------->
 import { ElMessage } from 'element-plus';
 //1.页面必备方法 end ---------------------------------------->
-
+const getLinkPath = (item) => {
+    if (item.is_url == 1) {
+        return `${item.web_url}`;
+    } else if (item.children_count == 0) {
+        return `/${item.url}/list-1.html`;
+    } else {
+        return `/${item.url}/index.html`;
+    }
+}
 
 //2.获取基本信息 start ---------------------------------------->
 // 2.1 导航信息
@@ -1579,14 +1587,14 @@ getPageAllData();
 
 //获取模块下的特殊数据
 let getJson1 = [
-    { "parent": $pageNav[4] +",0,6" },//模块5 乡村建设320
-    { "parent": $pageNav[5] +",0,6" },//模块6 乡村管理319
-    { "parent": $pageNav[6] +",0,6" },//模块7 乡村文化321
-    { "parent": $pageNav[8] +",0,6" },//模块9 乡村生活322
-    { "parent": $pageNav[9] +",0,6" },//模块10 乡村经济323
-    { "parent": $pageNav[10] +",0,6" },//模块11 乡村风采318
-    { "parent": $pageNav[18] +",0,2" },//模块19 三农探索16
-    { "parent": $pageNav[19] +",0,2" },//模块20 招工求职344
+    { "parent": $pageNav[4] + ",0,6" },//模块5 乡村建设320
+    { "parent": $pageNav[5] + ",0,6" },//模块6 乡村管理319
+    { "parent": $pageNav[6] + ",0,6" },//模块7 乡村文化321
+    { "parent": $pageNav[8] + ",0,6" },//模块9 乡村生活322
+    { "parent": $pageNav[9] + ",0,6" },//模块10 乡村经济323
+    { "parent": $pageNav[10] + ",0,6" },//模块11 乡村风采318
+    { "parent": $pageNav[18] + ",0,2" },//模块19 三农探索16
+    { "parent": $pageNav[19] + ",0,2" },//模块20 招工求职344
 ]
 let jsonString1 = JSON.stringify(getJson1);
 //获取模块下的特殊数据

+ 2 - 2
plugins/category.ts

@@ -56,7 +56,7 @@ const navPre: number[] = [
 
 export default defineNuxtPlugin((nuxtApp) => {
     //master 环境
-    nuxtApp.provide('pageNav', navMaster)
+    // nuxtApp.provide('pageNav', navMaster)
     //pre 环境
-    // nuxtApp.provide('pageNav', navPre)
+    nuxtApp.provide('pageNav', navPre)
 })

+ 10 - 13
plugins/globals.js

@@ -1,22 +1,19 @@
 export default defineNuxtPlugin((nuxtApp) => {
-  //Pre环境
-  // nuxtApp.provide('webUrl', 'http://apipre1.bjzxtw.org.cn:29501')
-  // nuxtApp.provide('CwebUrl', 'http://nwpre.bjzxtw.org.cn')
-  // nuxtApp.provide('BwebUrl', 'http://adminpre.bjzxtw.org.cn')
-  // nuxtApp.provide('userUrl', 'http://localhost:3000')
   //乡村网pre环境
-  // nuxtApp.provide('webUrl', 'http://apipre1.bjzxtw.org.cn:29501')
-  // nuxtApp.provide('CwebUrl', 'http://pre.china-village.com.cn')
-  // nuxtApp.provide('BwebUrl', 'http://adminpre.bjzxtw.org.cn')
-  // nuxtApp.provide('userUrl', 'http://localhost:3000')
+  nuxtApp.provide('webUrl', 'http://apipre1.bjzxtw.org.cn:29501')
+  nuxtApp.provide('CwebUrl', 'http://pre.china-village.com.cn')
+  nuxtApp.provide('BwebUrl', 'http://adminpre.bjzxtw.org.cn')
+  nuxtApp.provide('LoginWebUrl', 'http://adminpre.bjzxtw.org.cn/adminapi')
+  nuxtApp.provide('userUrl', 'http://localhost:3000')
   //Dev环境
   // nuxtApp.provide('webUrl', 'http://apidev.bjzxtw.org.cn')
   // nuxtApp.provide('CwebUrl', 'http://nwdev.bjzxtw.org.cn')
   // nuxtApp.provide('BwebUrl', 'http://admindev.bjzxtw.org.cn')
   // nuxtApp.provide('userUrl', 'http://localhost:3000')
   //乡村网正式环境
-  nuxtApp.provide('webUrl', 'https://flzxw.bjzxtw.org.cn')
-  nuxtApp.provide('CwebUrl', 'http://nw.china-village.com.cn')
-  nuxtApp.provide('BwebUrl', 'https://admin.bjzxtw.org.cn')
-  nuxtApp.provide('userUrl', 'http://localhost:3001')
+  // nuxtApp.provide('webUrl', 'https://flzxw.bjzxtw.org.cn')
+  // nuxtApp.provide('CwebUrl', 'http://nw.china-village.com.cn')
+  // nuxtApp.provide('BwebUrl', 'https://admin.bjzxtw.org.cn')
+  // nuxtApp.provide('LoginWebUrl', 'http://admin.bjzxtw.org.cn/adminapi')
+  // nuxtApp.provide('userUrl', 'http://localhost:3001')
 })

+ 4 - 4
plugins/request.js

@@ -5,11 +5,11 @@ import { getToken } from '@/store/useCookieStore'
 export default defineNuxtPlugin(nuxtApp => {
     let Url = {
         // //正式环境
-        webUrl: 'https://flzxw.bjzxtw.org.cn', //接口地址
-        CwebUrl: 'nw.china-village.com.cn' //页面地址
+        // webUrl: 'https://flzxw.bjzxtw.org.cn', //接口地址
+        // CwebUrl: 'nw.china-village.com.cn' //页面地址
         //pre环境
-        // webUrl: 'http://apipre1.bjzxtw.org.cn:29501', //pre接口地址
-        // CwebUrl: 'pre.china-village.com.cn' //页面地址
+        webUrl: 'http://apipre1.bjzxtw.org.cn:29501', //pre接口地址
+        CwebUrl: 'pre.china-village.com.cn' //页面地址
     }
 
     const service = axios.create({

BIN
public/favicon1.ico