fix

4 months ago · 9487b181b2
parent 3f193aba12
commit 9487b181b2
8 changed files with 67 additions and 71 deletions
--- a/public/index.html
+++ b/public/index.html
@ -16,7 +16,7 @@
                s.parentNode.insertBefore(hm, s);
            })();
        </script>
-        <title>职站商城</title>
+        <title></title>
    </head>
    <body>
        <noscript>
--- a/src/layouts/footer/index.vue
+++ b/src/layouts/footer/index.vue
@ -111,7 +111,6 @@ export default {
  data () {
    return {
      isIasf: false,
-      showContactPath: ['/news', '/sfel', '/talent', '/careers', '/edu', '/news'], // 展示联系我们页脚的页面
      columns: [],
      floatings: [],
      footers: [],
@ -132,7 +131,6 @@ export default {
        this.getFooter()
        if (this.$route.path === '/iasf') {
          this.isIasf = true
-          this.getInfo()
        }
      },
      deep: true,
--- a/src/mixins/article/index.js
+++ b/src/mixins/article/index.js
@ -90,7 +90,7 @@ export default {
          location.href = href
        }
      } else {
-        this.$router.push(`/article?articleId=${item.id}&site=${this.site}&id=${item.columnId}`)
+        this.$router.push(`/article?articleId=${item.id}&siteId=${this.site}&id=${item.columnId}`)
      }
    }
  }
--- a/src/mixins/page/index.js
+++ b/src/mixins/page/index.js
@ -19,7 +19,7 @@ export default {
      const { id } = this.$route.query
      if (id) {
        this.id = id
-        this.getInfo()
+        this.getInfo && this.getInfo()
      }
    }
  },
--- a/src/pages/article/index.vue
+++ b/src/pages/article/index.vue
@ -103,7 +103,8 @@ export default {
              name: columnName || data.columnName,
              path: path ? '/' + path : '',
              query: {
-                id: id || data.columnId
+                id: id || data.columnId,
+                siteId: data.siteId,
              }
            },
            {
--- a/src/pages/column/index.vue
+++ b/src/pages/column/index.vue
@ -37,31 +37,6 @@
              </i> -->
              </div>
            </div>
-            <!-- 侧导航+新闻列表(含文章概述) -->
-            <div v-if="info.listStyleId === 12" class="forms">
-              <div class="item">
-                <span class="label">{{ $t('column.classification') }}：</span>
-                <el-select v-model="form.classificationId" @change="filter">
-                  <el-option :label="$t('column.all')" :value="null"></el-option>
-                  <el-option v-for="item in classifications" :key="item.id" :label="item.classificationName"
-                    :value="item.id">
-                  </el-option>
-                </el-select>
-              </div>
-              <div class="item">
-                <span class="label">{{ $t('column.label') }}：</span>
-                <el-select ref="search" v-model="lableId" multiple @change="filter">
-                  <el-option v-for="item in labels" :key="item.id" :label="item.labelName" :value="item.id">
-                  </el-option>
-                </el-select>
-              </div>
-              <div class="search">
-                <input type="text" :placeholder="$t('column.titlePlaceholder')" v-model="form.title" />
-                <!-- <i class="icon">
-                <img src="@/assets/images/search-white.png" alt="" />
-              </i> -->
-              </div>
-            </div>
            <!-- 会议活动：筛选+会议活动列表 -->
            <div v-if="info.listStyleId === 15" class="forms">
              <ul class="switch">
@ -789,6 +764,7 @@ export default {
 }

 .column-wrap {
+  min-height: calc(100vh - 24rem - 90px);
  padding: 2rem 0;
  background: url(../../assets/images/column-bg.png) 0 0 / auto no-repeat,
    url(../../assets/images/column-bg2.png) bottom right/auto auto no-repeat;
@ -1338,19 +1314,6 @@ export default {
 }

@media (max-width: 1200px) {
-  .banner {
-    height: 15rem !important;
-
-    img {
-      height: 15rem !important;
-    }
-
-    .texts {
-      top: 6rem;
-      left: 3rem;
-    }
-  }
-
  .article {
    flex-direction: column;
    width: 90%;
@ -1425,12 +1388,6 @@ export default {

@media (max-width: 640px) {
  .banner {
-    height: 12rem !important;
-
-    img {
-      height: 12rem !important;
-    }
-
    .texts {
      left: 2rem;
      bottom: 2rem;
--- a/src/pages/iasf/index.vue
+++ b/src/pages/iasf/index.vue
@ -17,6 +17,7 @@
      </el-carousel>
      <div :class="['block-wrap', { active: hide }]" id="part2">
        <div class="block card-block">
+          <div class="card-bg"></div>
          <div class="inner">
            <h2 class="b-title">{{ modules[1].form.title }}</h2>
            <p class="intro" data-wow-delay="0.5s">{{ modules[1].form.des }}</p>
@ -300,41 +301,69 @@ export default {
          this.modules = json
          console.log("🚀 ~ file: index.vue ~ line 138 ~ this.$post ~ this.modules", this.modules)

+          const promises = []
          // 获取文章列表
          if (json[5].form.column.length) {
            const { column, articleNum } = json[5].form
+            promises.push(new Promise((resolve) => {
              this.$post(`${this.api.queryArticlesByColumnType}?columnId=${column[column.length - 1]}`).then(({ data }) => {
                this.articles = Util.removeTag(data.slice(0, articleNum || 4))
+                resolve()
              }).catch(err => { })
+            }))
          }

          if (json[6].form.column.length) {
            const { column, articleNum } = json[6].form
+            promises.push(new Promise((resolve) => {
              this.$post(`${this.api.queryArticlesByColumnType}?columnId=${column[column.length - 1]}`).then(({ data }) => {
                this.articles1 = Util.removeTag(data.slice(0, articleNum || 4))
                if (this.articles1.length) this.curArticle1 = this.articles1[0]
+                resolve()
              }).catch(err => { })
+            }))
          }
          if (json[7].form.column.length) {
            const { column, articleNum } = json[7].form
+            promises.push(new Promise((resolve) => {
              this.$post(`${this.api.queryArticlesByColumnType}?columnId=${column[column.length - 1]}`).then(({ data }) => {
                this.articles2 = Util.removeTag(data.slice(0, articleNum || 4))
                if (this.articles2.length) this.curArticle2 = this.articles2[0]
+                resolve()
              }).catch(err => { })
+            }))
          }
          if (json[8].form.column.length) {
            const { column, articleNum } = json[8].form
+            promises.push(new Promise((resolve) => {
              this.$post(`${this.api.queryArticlesByColumnType}?columnId=${column[column.length - 1]}`).then(({ data }) => {
                this.articles3 = Util.removeTag(data.slice(0, articleNum || 4))
                if (this.articles3.length) this.curArticle3 = this.articles3[0]
+                resolve()
              }).catch(err => { })
+            }))
          }
          if (json[10].form.column.length) {
            const { column, articleNum } = json[10].form
+            promises.push(new Promise((resolve) => {
              this.$post(`${this.api.queryArticlesByColumnType}?columnId=${column[column.length - 1]}`).then(({ data }) => {
                this.articles4 = Util.removeTag(data.slice(0, articleNum || 3))
+                resolve()
              }).catch(err => { })
+            }))
          }
+
+          // 恢复上次从本页面跳转出去时的位置
+          Promise.all(promises).then(_ => {
+            this.$nextTick(() => {
+              const { scrollTop } = this.$store.state.content
+              if (scrollTop) {
+                this.hide = true
+                $(window).scrollTop(scrollTop)
+                this.$store.commit('content/setScrollTop', 0)
+              }
+            })
+          })
          // this.carouselInterval()
        }
      }).catch(err => { })
@ -556,7 +585,17 @@ $bannerMh: 800px;
 }

 .card-block {
-  background: url(https://huorantech.com/images/iasf/14.jpg) 0 0 / cover no-repeat;
+  position: relative;
+  background: url(https://huorantech.com/images/iasf/15.jpg) 0 0 / cover no-repeat;
+
+  .card-bg {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    background-color: rgba(255, 2550, 255, .9);
+  }
 }

 .card {
@ -597,7 +636,7 @@ $bannerMh: 800px;
    align-items: center;
    width: 100%;
    height: 100%;
-    font-size: 24px;
+    font-size: 29px;
    font-family: PingFangSC-Medium, PingFang SC;
    color: #fff;
    background-color: rgba(0, 0, 0, 0.3);
@ -1105,6 +1144,7 @@ $bannerMh: 800px;
    width: 632px;
    height: 558px;
    object-fit: cover;
+    border-top-left-radius: 100px;
  }
 }

--- a/src/router/permission.js
+++ b/src/router/permission.js
@ -2,6 +2,6 @@ import router from "./index";
 import Setting from "@/setting";

 router.beforeEach((to, from, next) => {
-  document.title = Setting.titleSuffix
+  // document.title = Setting.titleSuffix
  next()
 })