2312970463@qq.com 4 gadi atpakaļ
vecāks
revīzija
03f77e30d2

BIN
dist-1.rar


+ 3 - 3
src/assets/css/base.css

@@ -1,4 +1,4 @@
-* {
-  margin: 0;
-  padding: 0;
+* {
+  margin: 0;
+  padding: 0;
 }

+ 31 - 31
src/components/foot.vue

@@ -1,32 +1,32 @@
-<template>
-  <div class="foot">
-    <div class="foot-content">
-      <div>中国国际经济技术合作促进会科技项目转化工作委员会</div>
-      <div>联系方式: 秘书处 13056982333 吴先生 </div>
-      <div>联系邮箱: wuyucheng@163.com</div>
-      <div>联系地址:浙江省杭州市滨江区天马路58号</div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-    name: 'Foot'
-};
-</script>
-
-<style lang="scss" scoped>
-.foot {
-  background-color: #fff;
-  padding: 20px 0;
-  margin-top: 120px;
-  .foot-content {
-    margin: 0 auto;
-    width: 1234px;
-    text-align: center;
-    div {
-      padding: 10px;
-    }
-  }
-}
+<template>
+  <div class="foot">
+    <div class="foot-content">
+      <div>中国国际经济技术合作促进会科技项目转化工作委员会</div>
+      <div>联系方式: 秘书处 18604979785 王开 </div>
+      <div>联系邮箱: wuyucheng@163.com</div>
+      <div>联系地址:浙江省杭州市滨江区天马路58号</div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+    name: 'Foot'
+};
+</script>
+
+<style lang="scss" scoped>
+.foot {
+  background-color: #fff;
+  padding: 20px 0;
+  margin-top: 120px;
+  .foot-content {
+    margin: 0 auto;
+    width: 1234px;
+    text-align: center;
+    div {
+      padding: 10px;
+    }
+  }
+}
 </style>

+ 104 - 104
src/components/theader.vue

@@ -1,105 +1,105 @@
-<template>
-  <div class="header">
-    <div class="top">
-      <div class="top-left">
-        <div class="logo">
-          <img src="~@/assets/logo.jpg" alt="" />
-        </div>
-        <div class="title">
-          <div>中国国际经济技术合作促进会</div>
-          <span></span>
-          <div>科技项目转化工作委员会</div>
-        </div>
-      </div>
-      <div class="top-right">
-        <!-- <div>科技兴企</div>
-        <span></span>
-        <div>科技强国</div> -->
-        <div class="right-title">科技兴企 科技强国</div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "Header",
-};
-</script>
-
-<style lang="scss" scoped>
-.header {
-  background-color: #fff;
-  height: 206px;
-  .top {
-    width: 1234px;
-    height: 206px;
-    margin: 0 auto;
-    display: flex;
-    background: url('../assets/bg1.jpg');
-    align-items: center;
-    .top-left {
-      width: 723px;
-      height: 130px;
-      display: flex;
-      .logo {
-        width: 130px;
-        height: 130px;
-        img {
-          width: 130px;
-          height: 130px;
-        }
-      }
-      .title {
-        width: 593px;
-        height: 130px;
-        color: #d30104;
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        line-height: 1;
-        font-size: 40px;
-        font-weight: 800;
-        div {
-          // margin-left:10px;
-          width: 553px;
-          text-align: center;
-          padding-right: 40px;
-        }
-        span {
-          height: 10px;
-        }
-      }
-    }
-    .top-right {
-      height: 206px;
-      width: 511px;
-      // background-color: green;
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
-      text-align: center;
-      color: #d30104;
-      position: relative;
-      div {
-        width: 511px;
-        font-size: 28px;
-        line-height: 1;
-        padding: 0 10px;
-      }
-      span {
-        height: 10px;
-      }
-      .right-title{
-        text-align: end;
-        position: absolute;
-        // top: 30px;
-        bottom: 20px;
-         text-shadow: 2px 3px 1px black;
-        right: 0;
-        font-weight: bold;
-      }
-    }
-  }
-}
+<template>
+  <div class="header">
+    <div class="top">
+      <div class="top-left">
+        <div class="logo">
+          <img src="~@/assets/logo.jpg" alt="" />
+        </div>
+        <div class="title">
+          <div>中国国际经济技术合作促进会</div>
+          <span></span>
+          <div>科技项目转化工作委员会</div>
+        </div>
+      </div>
+      <div class="top-right">
+        <!-- <div>科技兴企</div>
+        <span></span>
+        <div>科技强国</div> -->
+        <div class="right-title">科技兴企 科技强国</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "Header",
+};
+</script>
+
+<style lang="scss" scoped>
+.header {
+  background-color: #fff;
+  height: 206px;
+  .top {
+    width: 1234px;
+    height: 206px;
+    margin: 0 auto;
+    display: flex;
+    background: url('../assets/bg1.jpg');
+    align-items: center;
+    .top-left {
+      width: 723px;
+      height: 130px;
+      display: flex;
+      .logo {
+        width: 130px;
+        height: 130px;
+        img {
+          width: 130px;
+          height: 130px;
+        }
+      }
+      .title {
+        width: 593px;
+        height: 130px;
+        color: #d30104;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        line-height: 1;
+        font-size: 40px;
+        font-weight: 800;
+        div {
+          // margin-left:10px;
+          width: 553px;
+          text-align: center;
+          padding-right: 40px;
+        }
+        span {
+          height: 10px;
+        }
+      }
+    }
+    .top-right {
+      height: 206px;
+      width: 511px;
+      // background-color: green;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      text-align: center;
+      color: #d30104;
+      position: relative;
+      div {
+        width: 511px;
+        font-size: 28px;
+        line-height: 1;
+        padding: 0 10px;
+      }
+      span {
+        height: 10px;
+      }
+      .right-title{
+        text-align: end;
+        position: absolute;
+        // top: 30px;
+        bottom: 20px;
+         text-shadow: 2px 3px 1px black;
+        right: 0;
+        font-weight: bold;
+      }
+    }
+  }
+}
 </style>

+ 134 - 134
src/components/toptabbar.vue

@@ -1,135 +1,135 @@
-<template>
-  <div class="top-tabbar">
-    <div class="tabbar">
-      <div class="tab-one">
-        <div class="tab-t1" @click="tabClick('/index',0)">网站首页</div>
-      </div>
-      <div class="tab-one tab-4">
-        <div class="tab-t1" @click="tabClick('/explain/int',0)">委员会简介</div>
-        <div class="tab-tow">
-          <div @click="tabClick('/explain/int',0)">基本介绍</div>
-          <div @click="tabClick('/explain/arch',1)">组织架构</div>
-          <div @click="tabClick('/explain/bylaws',2)">促进会章程</div>
-        </div>
-      </div>
-      <div class="tab-one tab-3">
-        <div class="tab-t1" @click="tabClick('/new/study',0)">新闻动态</div>
-        <div class="tab-tow">
-          <div @click="tabClick('/new/study',0)">学习强国</div>
-          <div @click="tabClick('/new/association',1)">科协新闻</div>
-          <div @click="tabClick('/new/party',2)">党建动态</div>
-        </div>
-      </div>
-      <div class="tab-one tab-1">
-        <div class="tab-t1" @click="tabClick('/question/qinfo',0)">专家智库</div>
-        <div class="tab-tow">
-          <div @click="tabClick('/question/qinfo',0)">智库专家团队</div>
-        </div>
-      </div>
-      <div class="tab-one tab-1">
-        <div class="tab-t1" @click="tabClick('/cooperation/union',0)">合作前沿</div>
-        <div class="tab-tow">
-          <div  @click="tabClick('/cooperation/union',0)">联合战略单位</div>
-        </div>
-      </div>
-      <div class="tab-one tab-3">
-        <div class="tab-t1" @click="tabClick('/committee/apply',1)">委员会成员</div>
-        <div class="tab-tow">
-          <div @click="tabClick('/committee/invitation',4)">邀请函</div>
-          <div @click="tabClick('/committee/apply',1)">入会须知</div>
-          <div @click="tabClick('/committee/load',2)">申请表下载</div>
-        </div>
-      </div>
-      <div class="tab-one">
-        <div class="tab-t1" @click="tabClick('/About/contcat',0)">联系我们</div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import {mapState, mapMutations } from 'vuex'
-export default {
-  name: "Toptabbar",
-  computed: {
-    ...mapState(['current'])
-  },
-  methods: {
-    ...mapMutations(['changeCurrent']),
-    tabClick(e,index) {
-      if( this.$route.path !== e ){
-        this.$router.push(e)
-      }
-      this.changeCurrent(index)
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.top-tabbar {
-  height: 60px;
-  background-color: #e13e00;
-  .tabbar {
-    margin: 0 auto;
-    width: 1234px;
-    height: 60px;
-    background-color: #e13e00;
-    display: flex;
-    .tab-one {
-      width: 120px;
-      display: inline-block;
-      line-height: 60px;
-      color: #fff;
-      position: relative;
-      cursor: pointer;
-      .tab-t1 {
-        padding: 0 20px;
-      }
-      .tab-t1:hover {
-        background-color: #ba3300;
-      }
-      .tab-tow {
-        transition: height 218ms;
-        height: 0;
-        position: absolute;
-        top: 60px;
-        left: 0;
-        border-top: 2px solid #fff;
-        overflow: hidden;
-        div {
-          line-height: 35px;
-          height: 35px;
-          padding: 0 20px;
-          width: 110px;
-          background-color: #e13e00;
-          &:hover {
-            background-color: #ba3300;
-          }
-        }
-      }
-    }
-    .tab-1:hover {
-      .tab-tow {
-        height: 38px;
-      }
-    }
-    .tab-2:hover {
-      .tab-tow {
-        height: 73px;
-      }
-    }
-    .tab-3:hover {
-      .tab-tow {
-        height: 108px;
-        z-index: 998;
-      }
-    }
-    .tab-4:hover {
-      .tab-tow {
-        height: 143px;
-      }
-    }
-  }
-}
+<template>
+  <div class="top-tabbar">
+    <div class="tabbar">
+      <div class="tab-one">
+        <div class="tab-t1" @click="tabClick('/index',0)">网站首页</div>
+      </div>
+      <div class="tab-one tab-4">
+        <div class="tab-t1" @click="tabClick('/explain/int',0)">委员会简介</div>
+        <div class="tab-tow">
+          <div @click="tabClick('/explain/int',0)">基本介绍</div>
+          <div @click="tabClick('/explain/arch',1)">组织架构</div>
+          <div @click="tabClick('/explain/bylaws',2)">促进会章程</div>
+        </div>
+      </div>
+      <div class="tab-one tab-3">
+        <div class="tab-t1" @click="tabClick('/new/study',0)">新闻动态</div>
+        <div class="tab-tow">
+          <div @click="tabClick('/new/study',0)">学习强国</div>
+          <div @click="tabClick('/new/association',1)">科协新闻</div>
+          <div @click="tabClick('/new/party',2)">党建动态</div>
+        </div>
+      </div>
+      <div class="tab-one tab-1">
+        <div class="tab-t1" @click="tabClick('/question/qinfo',0)">专家智库</div>
+        <div class="tab-tow">
+          <div @click="tabClick('/question/qinfo',0)">智库专家团队</div>
+        </div>
+      </div>
+      <div class="tab-one tab-1">
+        <div class="tab-t1" @click="tabClick('/cooperation/union',0)">合作前沿</div>
+        <div class="tab-tow">
+          <div  @click="tabClick('/cooperation/union',0)">联合战略单位</div>
+        </div>
+      </div>
+      <div class="tab-one tab-3">
+        <div class="tab-t1" @click="tabClick('/committee/apply',1)">委员会成员</div>
+        <div class="tab-tow">
+          <div @click="tabClick('/committee/invitation',4)">邀请函</div>
+          <div @click="tabClick('/committee/apply',1)">入会须知</div>
+          <div @click="tabClick('/committee/load',2)">申请表下载</div>
+        </div>
+      </div>
+      <div class="tab-one">
+        <div class="tab-t1" @click="tabClick('/About/contcat',0)">联系我们</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {mapState, mapMutations } from 'vuex'
+export default {
+  name: "Toptabbar",
+  computed: {
+    ...mapState(['current'])
+  },
+  methods: {
+    ...mapMutations(['changeCurrent']),
+    tabClick(e,index) {
+      if( this.$route.path !== e ){
+        this.$router.push(e)
+      }
+      this.changeCurrent(index)
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.top-tabbar {
+  height: 60px;
+  background-color: #e13e00;
+  .tabbar {
+    margin: 0 auto;
+    width: 1234px;
+    height: 60px;
+    background-color: #e13e00;
+    display: flex;
+    .tab-one {
+      width: 120px;
+      display: inline-block;
+      line-height: 60px;
+      color: #fff;
+      position: relative;
+      cursor: pointer;
+      .tab-t1 {
+        padding: 0 20px;
+      }
+      .tab-t1:hover {
+        background-color: #ba3300;
+      }
+      .tab-tow {
+        transition: height 218ms;
+        height: 0;
+        position: absolute;
+        top: 60px;
+        left: 0;
+        border-top: 2px solid #fff;
+        overflow: hidden;
+        div {
+          line-height: 35px;
+          height: 35px;
+          padding: 0 20px;
+          width: 110px;
+          background-color: #e13e00;
+          &:hover {
+            background-color: #ba3300;
+          }
+        }
+      }
+    }
+    .tab-1:hover {
+      .tab-tow {
+        height: 38px;
+      }
+    }
+    .tab-2:hover {
+      .tab-tow {
+        height: 73px;
+      }
+    }
+    .tab-3:hover {
+      .tab-tow {
+        height: 108px;
+        z-index: 998;
+      }
+    }
+    .tab-4:hover {
+      .tab-tow {
+        height: 143px;
+      }
+    }
+  }
+}
 </style>>

+ 54 - 54
src/components/toptip.vue

@@ -1,54 +1,54 @@
-<template>
-  <div class="toptip">
-    <div class="title">{{ currTitle }}</div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "toptip",
-  props: {
-    currTitle: {
-      type: String,
-      default: "",
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.toptip {
-    text-align: center;
-  .title {
-    display: inline-block;
-    color: #96311c;
-    text-align: center;
-    font-size: 20px;
-    margin: 45px auto;
-    font-weight: bold;
-    position: relative;
-    padding: 0 10px;
-    &::before {
-      background: url("../assets/divbefore.png") no-repeat;
-      left: -120px;
-    }
-    &::after {
-      background: url("../assets/divafter.png") no-repeat;
-      left: 100%;
-    }
-
-    &::before,
-    &::after {
-      width: 93px;
-      height: 5px;
-      content: "";
-      position: absolute;
-      top: 37%;
-      margin-top: -2px;
-      display: inline-block;
-      margin: 0 10px;
-    }
-  }
-}
-</style>
-
+<template>
+  <div class="toptip">
+    <div class="title">{{ currTitle }}</div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "toptip",
+  props: {
+    currTitle: {
+      type: String,
+      default: "",
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.toptip {
+    text-align: center;
+  .title {
+    display: inline-block;
+    color: #96311c;
+    text-align: center;
+    font-size: 20px;
+    margin: 45px auto;
+    font-weight: bold;
+    position: relative;
+    padding: 0 10px;
+    &::before {
+      background: url("../assets/divbefore.png") no-repeat;
+      left: -120px;
+    }
+    &::after {
+      background: url("../assets/divafter.png") no-repeat;
+      left: 100%;
+    }
+
+    &::before,
+    &::after {
+      width: 93px;
+      height: 5px;
+      content: "";
+      position: absolute;
+      top: 37%;
+      margin-top: -2px;
+      display: inline-block;
+      margin: 0 10px;
+    }
+  }
+}
+</style>
+

+ 27 - 27
src/components/totop.vue

@@ -1,28 +1,28 @@
-<template>
-  <div class="fixbox" @click="up">
-    <img src="../assets/up.png" alt="" class="up-img" />
-  </div>
-</template>
-
-<script>
-export default {
-  name: "Totop",
-  methods: {
-    up() {
-      document.body.scrollTop = document.documentElement.scrollTop = 0;
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.fixbox {
-  position: fixed;
-  right: 20px;
-  bottom: 30px;
-  .up-img {
-    width: 60px;
-    height: 60px;
-  }
-}
+<template>
+  <div class="fixbox" @click="up">
+    <img src="../assets/up.png" alt="" class="up-img" />
+  </div>
+</template>
+
+<script>
+export default {
+  name: "Totop",
+  methods: {
+    up() {
+      document.body.scrollTop = document.documentElement.scrollTop = 0;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.fixbox {
+  position: fixed;
+  right: 20px;
+  bottom: 30px;
+  .up-img {
+    width: 60px;
+    height: 60px;
+  }
+}
 </style>

+ 155 - 155
src/components/xhcontent.vue

@@ -1,156 +1,156 @@
-<template>
-  <div class="ex-content">
-    <div class="con-left">
-      <div class="head">
-        <div class="letter">
-          <span>{{ titleN }}</span>
-        </div>
-        <div class="jg"></div>
-        <div class="txt">
-          <h3>{{ title }}</h3>
-          <span></span>
-          <h4>{{ titleEN }}</h4>
-        </div>
-      </div>
-      <div class="body">
-        <div
-          class="body-tip"
-          v-for="(item, index) in bodyList"
-          :key="item.title"
-          @click="tipClick(index)"
-          :class="{ action: current === index }"
-        >
-          {{ item.title }}
-        </div>
-      </div>
-    </div>
-    <div class="con-main">
-      <div>
-        <slot></slot>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import {mapState, mapMutations } from 'vuex'
-export default {
-    name: 'Xhcontent',
-    props: {
-        titleN: {
-            type: String,
-            default: 'A'
-        },
-        title: {
-            type: String,
-            default: '关于本会'
-        },
-        titleEN: {
-            type: String,
-            default: 'BOUT US'
-        },
-        bodyList: {
-            type: Array,
-            default: []
-        }
-    },
-    data() {
-      return {
-        // current: 0
-      }
-    },
-    computed: {
-      ...mapState(['current'])
-    },
-    methods: {
-        ...mapMutations(['changeCurrent']),
-        tipClick(index) {
-          this.changeCurrent(index)
-          console.log(this.current)
-          this.$router.push(this.bodyList[index]).catch(err => { return})
-
-        }
-    },
-};
-</script>
-
-<style lang="scss" scoped>
-.ex-content {
-  width: 1234px;
-  margin: 0 auto;
-  background-color: #f5f5f5;
-  display: flex;
-  justify-content: space-between;
-  .con-left {
-    width: 265px;
-    background-color: #f5f5f5;
-    min-height: 400px;
-  }
-  .head {
-    background: url("../assets/guoqi.jpg") no-repeat;
-    width: 265px;
-    height: 137px;
-    margin: 0 0 20px;
-    padding: 35px 0 0;
-    background-color: #cb3301;
-    display: flex;
-    justify-content: center;
-    .letter {
-      width: 56px;
-      height: 106px;
-      color: white;
-      font-size: 80px;
-      line-height: 80px;
-      display: flex;
-      justify-content: end;
-      span {
-        padding-top: 30px;
-      }
-      margin-right: 10px;
-    }
-    .txt {
-      width: 120px;
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
-      color: white;
-      h3 {
-        font-size: 20px;
-        margin: 0;
-      }
-      span {
-        height: 10px;
-      }
-      h4 {
-        font-size: 24px;
-        margin: 0;
-      }
-    }
-  }
-  .body {
-    width: 263px;
-    .body-tip {
-      height: 50px;
-      line-height: 50px;
-      font-size: 16px;
-      background-color: #fff;
-      padding: 0 0 0 67px;
-      margin-bottom: 5px;
-      position: relative;
-      box-shadow: 0px 0px 2px #ebebeb;
-      cursor: pointer;
-    }
-    .action {
-      background-color: #96311c;
-      font-weight: bold;
-      color: #fff;
-    }
-  }
-  .con-main {
-    width: 858px;
-    // min-height: 700px;
-    background-color: #fff;
-    padding: 15px 40px;
-  }
-}
+<template>
+  <div class="ex-content">
+    <div class="con-left">
+      <div class="head">
+        <div class="letter">
+          <span>{{ titleN }}</span>
+        </div>
+        <div class="jg"></div>
+        <div class="txt">
+          <h3>{{ title }}</h3>
+          <span></span>
+          <h4>{{ titleEN }}</h4>
+        </div>
+      </div>
+      <div class="body">
+        <div
+          class="body-tip"
+          v-for="(item, index) in bodyList"
+          :key="item.title"
+          @click="tipClick(index)"
+          :class="{ action: current === index }"
+        >
+          {{ item.title }}
+        </div>
+      </div>
+    </div>
+    <div class="con-main">
+      <div>
+        <slot></slot>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {mapState, mapMutations } from 'vuex'
+export default {
+    name: 'Xhcontent',
+    props: {
+        titleN: {
+            type: String,
+            default: 'A'
+        },
+        title: {
+            type: String,
+            default: '关于本会'
+        },
+        titleEN: {
+            type: String,
+            default: 'BOUT US'
+        },
+        bodyList: {
+            type: Array,
+            default: []
+        }
+    },
+    data() {
+      return {
+        // current: 0
+      }
+    },
+    computed: {
+      ...mapState(['current'])
+    },
+    methods: {
+        ...mapMutations(['changeCurrent']),
+        tipClick(index) {
+          this.changeCurrent(index)
+          console.log(this.current)
+          this.$router.push(this.bodyList[index]).catch(err => { return})
+
+        }
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+.ex-content {
+  width: 1234px;
+  margin: 0 auto;
+  background-color: #f5f5f5;
+  display: flex;
+  justify-content: space-between;
+  .con-left {
+    width: 265px;
+    background-color: #f5f5f5;
+    min-height: 400px;
+  }
+  .head {
+    background: url("../assets/guoqi.jpg") no-repeat;
+    width: 265px;
+    height: 137px;
+    margin: 0 0 20px;
+    padding: 35px 0 0;
+    background-color: #cb3301;
+    display: flex;
+    justify-content: center;
+    .letter {
+      width: 56px;
+      height: 106px;
+      color: white;
+      font-size: 80px;
+      line-height: 80px;
+      display: flex;
+      justify-content: end;
+      span {
+        padding-top: 30px;
+      }
+      margin-right: 10px;
+    }
+    .txt {
+      width: 120px;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      color: white;
+      h3 {
+        font-size: 20px;
+        margin: 0;
+      }
+      span {
+        height: 10px;
+      }
+      h4 {
+        font-size: 24px;
+        margin: 0;
+      }
+    }
+  }
+  .body {
+    width: 263px;
+    .body-tip {
+      height: 50px;
+      line-height: 50px;
+      font-size: 16px;
+      background-color: #fff;
+      padding: 0 0 0 67px;
+      margin-bottom: 5px;
+      position: relative;
+      box-shadow: 0px 0px 2px #ebebeb;
+      cursor: pointer;
+    }
+    .action {
+      background-color: #96311c;
+      font-weight: bold;
+      color: #fff;
+    }
+  }
+  .con-main {
+    width: 858px;
+    // min-height: 700px;
+    background-color: #fff;
+    padding: 15px 40px;
+  }
+}
 </style>

+ 28 - 28
src/request/api.js

@@ -1,28 +1,28 @@
-import request from './http'
-
-// 获取文章列表
-export function article_list(data) {
-    return request({
-      url: "/article_list",
-      method: "get",
-      params: data
-    });
-  }
-
-//获取文章内容
-export function article_info(data,id) {
-    return request({
-      url: "/article_detail/"+id,
-      method: "get",
-      params: data
-    });
-  }
-
-  //轮播图
-  export function loop(data) {
-    return request({
-      url: "/loop",
-      method: "get",
-      params: data
-    });
-  }
+import request from './http'
+
+// 获取文章列表
+export function article_list(data) {
+	return request({
+		url: "/article_list",
+		method: "get",
+		params: data
+	});
+}
+
+//获取文章内容
+export function article_info(data, id) {
+	return request({
+		url: "/article_detail/" + id,
+		method: "get",
+		params: data
+	});
+}
+
+//轮播图
+export function loop(data) {
+	return request({
+		url: "/loop",
+		method: "get",
+		params: data
+	});
+}

+ 70 - 70
src/views/about/arch.vue

@@ -1,71 +1,71 @@
-<template>
-  <div class="arch">
-      <div class="title">{{ currTitle }}</div>
-      <template v-for="item in imgList">
-          <img :src="item" alt="协会架构" :key="item">
-      </template>
-  </div>
-</template>
-
-<script>
-import { article_info } from "../../request/api";
-export default {
-  name: "Arch",
-  data() {
-    return {
-      imgList: [],
-      currTitle: '组织架构'
-    };
-  },
-  created() {
-      this.getImgList()
-  },
-  methods: {
-    getImgList() {
-      article_info({}, 54).then(({ data }) => {
-        let img1 = "http://ca.liuniu946.com/" + data.data.coverimage;
-        this.imgList.push(img1);
-        article_info({}, 55).then(({ data }) => {
-          let img2 = "http://ca.liuniu946.com/" + data.data.coverimage;
-          this.imgList.push(img2);
-        });
-      });
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.title {
-  color: #96311c;
-  text-align: center;
-  font-size: 20px;
-  margin: 45px auto;
-  font-weight: bold;
-  position: relative;
-  &::before {
-    background: url('../../assets/divbefore.png') no-repeat;
-    left: 265px;
-  }
-  &::after {
-    background: url('../../assets/divafter.png') no-repeat;
-    left: 474px;   
-  }
-
-  &::before, &::after {
-    width: 93px;
-    height: 5px;
-    content: '';
-    position: absolute;
-    top: 37%;
-    margin-top: -2px;
-    display: inline-block;
-    margin: 0 10px;
-  }
-}
-.arch {
-    img {
-        width: 858px;
-    }
-}
+<template>
+  <div class="arch">
+      <div class="title">{{ currTitle }}</div>
+      <template v-for="item in imgList">
+          <img :src="item" alt="协会架构" :key="item">
+      </template>
+  </div>
+</template>
+
+<script>
+import { article_info } from "../../request/api";
+export default {
+  name: "Arch",
+  data() {
+    return {
+      imgList: [],
+      currTitle: '组织架构'
+    };
+  },
+  created() {
+      this.getImgList()
+  },
+  methods: {
+    getImgList() {
+      article_info({}, 54).then(({ data }) => {
+        let img1 = "http://ca.liuniu946.com/" + data.data.coverimage;
+        this.imgList.push(img1);
+        article_info({}, 55).then(({ data }) => {
+          let img2 = "http://ca.liuniu946.com/" + data.data.coverimage;
+          this.imgList.push(img2);
+        });
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.title {
+  color: #96311c;
+  text-align: center;
+  font-size: 20px;
+  margin: 45px auto;
+  font-weight: bold;
+  position: relative;
+  &::before {
+    background: url('../../assets/divbefore.png') no-repeat;
+    left: 265px;
+  }
+  &::after {
+    background: url('../../assets/divafter.png') no-repeat;
+    left: 474px;   
+  }
+
+  &::before, &::after {
+    width: 93px;
+    height: 5px;
+    content: '';
+    position: absolute;
+    top: 37%;
+    margin-top: -2px;
+    display: inline-block;
+    margin: 0 10px;
+  }
+}
+.arch {
+    img {
+        width: 858px;
+    }
+}
 </style>

+ 82 - 82
src/views/about/bylaws.vue

@@ -1,83 +1,83 @@
-<template>
-  <div class="bylaws">
-    <div class="title">{{ currTitle }}</div>
-    <div class="top-tip">中国国际经济技术合作促进会科技项目转化工作委员会</div>
-    <div class="top-tip-2" v-if="isCloud">{{title2}}</div>
-    <div class="constitution" v-html="article.content"></div>
-  </div>
-</template>
-
-<script>
-import { article_info } from "../../request/api";
-
-export default {
-  name: "Bylaws",
-  data() {
-    return {
-      currTitle: "促进会章程",
-      BContent: "",
-      article: "",
-      title2: "",
-      isCloud: false
-    };
-  },
-  created() {
-    this.getBylawsContent();
-  },
-  methods: {
-    getBylawsContent() {
-      article_info({}, 56).then(({ data }) => {
-        this.article = data.data;
-        console.log(this.article.title)
-        if(this.article.title.indexOf('(章程)')){
-          this.isCloud = true
-          this.article.title = this.article.title.replace(/(章程)/,'')
-          this.title2 = '(章程)'
-          console.log(this.article.content)
-        }
-      });
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.title {
-  color: #96311c;
-  text-align: center;
-  font-size: 20px;
-  margin: 45px auto;
-  font-weight: bold;
-  position: relative;
-  &::before {
-    background: url("../../assets/divbefore.png") no-repeat;
-    left: 265px;
-  }
-  &::after {
-    background: url("../../assets/divafter.png") no-repeat;
-    left: 474px;
-  }
-
-  &::before,
-  &::after {
-    width: 93px;
-    height: 5px;
-    content: "";
-    position: absolute;
-    top: 37%;
-    margin-top: -2px;
-    display: inline-block;
-    margin: 0 10px;
-  }
-}
-.top-tip, .top-tip-2 {
-    text-align: center;
-    font-size: 20px;
-    font-weight: bold;
-    color: #ff0000;
-    margin-bottom: 10px;
-}
-.top-tip-2 {
-    margin-bottom: 30px;
-}
+<template>
+  <div class="bylaws">
+    <div class="title">{{ currTitle }}</div>
+    <div class="top-tip">中国国际经济技术合作促进会科技项目转化工作委员会</div>
+    <div class="top-tip-2" v-if="isCloud">{{title2}}</div>
+    <div class="constitution" v-html="article.content"></div>
+  </div>
+</template>
+
+<script>
+import { article_info } from "../../request/api";
+
+export default {
+  name: "Bylaws",
+  data() {
+    return {
+      currTitle: "促进会章程",
+      BContent: "",
+      article: "",
+      title2: "",
+      isCloud: false
+    };
+  },
+  created() {
+    this.getBylawsContent();
+  },
+  methods: {
+    getBylawsContent() {
+      article_info({}, 56).then(({ data }) => {
+        this.article = data.data;
+        console.log(this.article.title)
+        if(this.article.title.indexOf('(章程)')){
+          this.isCloud = true
+          this.article.title = this.article.title.replace(/(章程)/,'')
+          this.title2 = '(章程)'
+          console.log(this.article.content)
+        }
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.title {
+  color: #96311c;
+  text-align: center;
+  font-size: 20px;
+  margin: 45px auto;
+  font-weight: bold;
+  position: relative;
+  &::before {
+    background: url("../../assets/divbefore.png") no-repeat;
+    left: 265px;
+  }
+  &::after {
+    background: url("../../assets/divafter.png") no-repeat;
+    left: 474px;
+  }
+
+  &::before,
+  &::after {
+    width: 93px;
+    height: 5px;
+    content: "";
+    position: absolute;
+    top: 37%;
+    margin-top: -2px;
+    display: inline-block;
+    margin: 0 10px;
+  }
+}
+.top-tip, .top-tip-2 {
+    text-align: center;
+    font-size: 20px;
+    font-weight: bold;
+    color: #ff0000;
+    margin-bottom: 10px;
+}
+.top-tip-2 {
+    margin-bottom: 30px;
+}
 </style>

+ 78 - 78
src/views/about/int.vue

@@ -1,79 +1,79 @@
-<template>
-  <div class="int">
-    <div class="title">{{ currTitle }}</div>
-    <div class="info-box">{{ infoData.title }}</div>
-    <div class="content" v-html="infoData.content"></div>
-  </div>
-</template>
-
-<script>
-import { article_info } from "../../request/api";
-export default {
-  name: "Int",
-  data() {
-    return {
-      //委员会基本介绍
-      infoData: {},
-      currTitle: "学会简介",
-    };
-  },
-  created() {
-    this.getInfoDate();
-  },
-  methods: {
-    getInfoDate() {
-      article_info({}, 13).then(({ data }) => {
-        this.infoData = data.data;
-        this.infoData.content = this.infoData.content.replace(/中国国际经济技术合作促进会/,'<strong>中国国际经济技术合作促进会<\/strong>')
-        this.infoData.content = this.infoData.content.replace(/学会的宗旨和工作重心是:/,'<strong>学会的宗旨和工作重心是:<\/strong>')
-        this.infoData.content = this.infoData.content.replace(/一带一路国际项目工作委员会等。/,'一带一路国际项目工作委员会等。<br><br>')
-      });
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.title {
-  color: #96311c;
-  text-align: center;
-  font-size: 20px;
-  margin: 45px auto;
-  font-weight: bold;
-  position: relative;
-  &::before {
-    background: url('../../assets/divbefore.png') no-repeat;
-    left: 265px;
-  }
-  &::after {
-    background: url('../../assets/divafter.png') no-repeat;
-    left: 474px;   
-  }
-
-  &::before, &::after {
-    width: 93px;
-    height: 5px;
-    content: '';
-    position: absolute;
-    top: 37%;
-    margin-top: -2px;
-    display: inline-block;
-    margin: 0 10px;
-  }
-}
-.info-box {
-  font-size: 24px;
-  font-weight: bold;
-  color: #be0000;
-  text-align: center;
-  margin: 45px auto;
-}
-.content {
-    text-size-adjust: 100%;
-    font: 0.8rem/1.2 "Helvetica Neue",Helvetica,"Hiragino Sans GB","Microsoft YaHei",Arial,sans-serif;
-    box-sizing: border-box;
-    line-height: 28px;
-    color: #666666;
-    font-size: 16px!important;
-}
+<template>
+  <div class="int">
+    <div class="title">{{ currTitle }}</div>
+    <div class="info-box">{{ infoData.title }}</div>
+    <div class="content" v-html="infoData.content"></div>
+  </div>
+</template>
+
+<script>
+import { article_info } from "../../request/api";
+export default {
+  name: "Int",
+  data() {
+    return {
+      //委员会基本介绍
+      infoData: {},
+      currTitle: "学会简介",
+    };
+  },
+  created() {
+    this.getInfoDate();
+  },
+  methods: {
+    getInfoDate() {
+      article_info({}, 13).then(({ data }) => {
+        this.infoData = data.data;
+        this.infoData.content = this.infoData.content.replace(/中国国际经济技术合作促进会/,'<strong>中国国际经济技术合作促进会<\/strong>')
+        this.infoData.content = this.infoData.content.replace(/学会的宗旨和工作重心是:/,'<strong>学会的宗旨和工作重心是:<\/strong>')
+        this.infoData.content = this.infoData.content.replace(/一带一路国际项目工作委员会等。/,'一带一路国际项目工作委员会等。<br><br>')
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.title {
+  color: #96311c;
+  text-align: center;
+  font-size: 20px;
+  margin: 45px auto;
+  font-weight: bold;
+  position: relative;
+  &::before {
+    background: url('../../assets/divbefore.png') no-repeat;
+    left: 265px;
+  }
+  &::after {
+    background: url('../../assets/divafter.png') no-repeat;
+    left: 474px;   
+  }
+
+  &::before, &::after {
+    width: 93px;
+    height: 5px;
+    content: '';
+    position: absolute;
+    top: 37%;
+    margin-top: -2px;
+    display: inline-block;
+    margin: 0 10px;
+  }
+}
+.info-box {
+  font-size: 24px;
+  font-weight: bold;
+  color: #be0000;
+  text-align: center;
+  margin: 45px auto;
+}
+.content {
+    text-size-adjust: 100%;
+    font: 0.8rem/1.2 "Helvetica Neue",Helvetica,"Hiragino Sans GB","Microsoft YaHei",Arial,sans-serif;
+    box-sizing: border-box;
+    line-height: 28px;
+    color: #666666;
+    font-size: 16px!important;
+}
 </style>

+ 175 - 175
src/views/committee.vue

@@ -1,175 +1,175 @@
-<template>
-  <div class="committee">
-    <div class="jg"></div>
-    <!-- 内容区域 -->
-    <div class="ex-content">
-      <div class="con-left">
-        <div class="head">
-          <div class="letter">
-            <span>{{ titleN }}</span>
-          </div>
-          <div class="jg"></div>
-          <div class="txt">
-            <h3>{{ title }}</h3>
-            <span></span>
-            <h4>{{ titleEN }}</h4>
-          </div>
-        </div>
-        <div class="body">
-          <div
-            class="body-tip"
-            v-for="(item, index) in bodyList"
-            :key="item.title"
-            @click="tipClick(index)"
-            :class="{ action: current === index }"
-          >
-            {{ item.title }}
-          </div>
-        </div>
-      </div>
-      <div class="con-main">
-        <div>
-          <router-view></router-view>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-// @ is an alias to /src
-import {mapState, mapMutations } from 'vuex'
-
-import Xhcontent from "../components/xhcontent";
-
-export default {
-  name: "Committee",
-  metaInfo: {
-    title: "委员会成员",
-  },
-  components: {
-    Xhcontent,
-  },
-  data() {
-    return {
-      info: {},
-      list: {},
-      bodyList: [
-        { title: "入会须知", path: "apply"},
-        { title: "入会申请", path: "apply" },
-        { title: "请求表下载", path: "load" },
-        { title: "成员单位", path: "mem" },
-        { title: "邀请函", path: "invitation" },
-      ],
-      titleN: "M",
-      title: "委员会成员",
-      titleEN: "Committee members ",
-      // current: 1
-    };
-  },
-  created() {
-  },
-  computed: {
-    ...mapState(['current'])
-  },
-  methods: {
-    ...mapMutations(['changeCurrent']),
-    tipClick(index) {
-      if(index === 0){
-        index = 1
-      }
-      this.changeCurrent(index)
-      this.$router.push(this.bodyList[index]).catch(err => { return})
-      console.log(this.current)
-    }
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-.jg {
-  height: 10px;
-}
-.ex-content {
-  width: 1234px;
-  margin: 0 auto;
-  background-color: #f5f5f5;
-  display: flex;
-  justify-content: space-between;
-  .con-left {
-    width: 265px;
-    background-color: #f5f5f5;
-    min-height: 400px;
-  }
-  .head {
-    background: url("../assets/guoqi.jpg") no-repeat;
-    width: 265px;
-    height: 137px;
-    margin: 0 0 20px;
-    padding: 35px 0 0;
-    background-color: #cb3301;
-    display: flex;
-    justify-content: center;
-    .letter {
-      width: 56px;
-      height: 106px;
-      color: white;
-      font-size: 80px;
-      line-height: 80px;
-      display: flex;
-      justify-content: end;
-      span {
-        padding-top: 30px;
-      }
-      margin-right: 10px;
-    }
-    .txt {
-      width: 120px;
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
-      color: white;
-      h3 {
-        font-size: 20px;
-        margin: 0;
-      }
-      span {
-        height: 10px;
-      }
-      h4 {
-        font-size: 24px;
-        margin: 0;
-      }
-    }
-  }
-  .body {
-    width: 263px;
-    .body-tip {
-      height: 50px;
-      line-height: 50px;
-      font-size: 16px;
-      background-color: #fff;
-      padding: 0 0 0 67px;
-      margin-bottom: 5px;
-      position: relative;
-      box-shadow: 0px 0px 2px #ebebeb;
-      cursor: pointer;
-      &:nth-child(2), &:nth-child(3) {
-         padding: 0 0 0 105px;
-      }
-    }
-    .action {
-      background-color: #96311c;
-      font-weight: bold;
-      color: #fff;
-    }
-  }
-  .con-main {
-    width: 858px;
-    // min-height: 700px;
-    background-color: #fff;
-    padding: 15px 40px;
-  }
-}
-</style>
+<template>
+  <div class="committee">
+    <div class="jg"></div>
+    <!-- 内容区域 -->
+    <div class="ex-content">
+      <div class="con-left">
+        <div class="head">
+          <div class="letter">
+            <span>{{ titleN }}</span>
+          </div>
+          <div class="jg"></div>
+          <div class="txt">
+            <h3>{{ title }}</h3>
+            <span></span>
+            <h4>{{ titleEN }}</h4>
+          </div>
+        </div>
+        <div class="body">
+          <div
+            class="body-tip"
+            v-for="(item, index) in bodyList"
+            :key="item.title"
+            @click="tipClick(index)"
+            :class="{ action: current === index }"
+          >
+            {{ item.title }}
+          </div>
+        </div>
+      </div>
+      <div class="con-main">
+        <div>
+          <router-view></router-view>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+// @ is an alias to /src
+import {mapState, mapMutations } from 'vuex'
+
+import Xhcontent from "../components/xhcontent";
+
+export default {
+  name: "Committee",
+  metaInfo: {
+    title: "委员会成员",
+  },
+  components: {
+    Xhcontent,
+  },
+  data() {
+    return {
+      info: {},
+      list: {},
+      bodyList: [
+        { title: "入会须知", path: "apply"},
+        { title: "入会申请", path: "apply" },
+        { title: "请求表下载", path: "load" },
+        { title: "成员单位", path: "mem" },
+        { title: "邀请函", path: "invitation" },
+      ],
+      titleN: "M",
+      title: "委员会成员",
+      titleEN: "Committee members ",
+      // current: 1
+    };
+  },
+  created() {
+  },
+  computed: {
+    ...mapState(['current'])
+  },
+  methods: {
+    ...mapMutations(['changeCurrent']),
+    tipClick(index) {
+      if(index === 0){
+        index = 1
+      }
+      this.changeCurrent(index)
+      this.$router.push(this.bodyList[index]).catch(err => { return})
+      console.log(this.current)
+    }
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+.jg {
+  height: 10px;
+}
+.ex-content {
+  width: 1234px;
+  margin: 0 auto;
+  background-color: #f5f5f5;
+  display: flex;
+  justify-content: space-between;
+  .con-left {
+    width: 265px;
+    background-color: #f5f5f5;
+    min-height: 400px;
+  }
+  .head {
+    background: url("../assets/guoqi.jpg") no-repeat;
+    width: 265px;
+    height: 137px;
+    margin: 0 0 20px;
+    padding: 35px 0 0;
+    background-color: #cb3301;
+    display: flex;
+    justify-content: center;
+    .letter {
+      width: 56px;
+      height: 106px;
+      color: white;
+      font-size: 80px;
+      line-height: 80px;
+      display: flex;
+      justify-content: end;
+      span {
+        padding-top: 30px;
+      }
+      margin-right: 10px;
+    }
+    .txt {
+      width: 120px;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      color: white;
+      h3 {
+        font-size: 20px;
+        margin: 0;
+      }
+      span {
+        height: 10px;
+      }
+      h4 {
+        font-size: 24px;
+        margin: 0;
+      }
+    }
+  }
+  .body {
+    width: 263px;
+    .body-tip {
+      height: 50px;
+      line-height: 50px;
+      font-size: 16px;
+      background-color: #fff;
+      padding: 0 0 0 67px;
+      margin-bottom: 5px;
+      position: relative;
+      box-shadow: 0px 0px 2px #ebebeb;
+      cursor: pointer;
+      &:nth-child(2), &:nth-child(3) {
+         padding: 0 0 0 105px;
+      }
+    }
+    .action {
+      background-color: #96311c;
+      font-weight: bold;
+      color: #fff;
+    }
+  }
+  .con-main {
+    width: 858px;
+    // min-height: 700px;
+    background-color: #fff;
+    padding: 15px 40px;
+  }
+}
+</style>

+ 46 - 46
src/views/committee/apply.vue

@@ -1,47 +1,47 @@
-<template>
-  <div class="apply">
-    <!-- <div class="title">{{ currTitle }}</div> -->
-    <toptip :currTitle="currTitle"></toptip>
-    <div class="content-center" v-html="titleDate.content"></div>
-  </div>
-</template>
-
-<script>
-import { article_info } from "../../request/api";
-
-import toptip from "../../components/toptip";
-
-export default {
-  metaInfo: {
-    title: "入会申请",
-  },
-  name: "Apply",
-  data() {
-    return {
-      titleDate: {},
-    };
-  },
-  computed: {
-    currTitle() {
-      return this.titleDate.title;
-    },
-  },
-  created() {
-    this.getTitleData();
-  },
-  methods: {
-    getTitleData() {
-      article_info({}, 76).then(({ data: res }) => {
-        this.titleDate = res.data;
-        console.log(this.titleDate);
-      });
-    },
-  },
-  components: {
-    toptip,
-  },
-};
-</script>
-
-<style lang="scss" scoped>
+<template>
+  <div class="apply">
+    <!-- <div class="title">{{ currTitle }}</div> -->
+    <toptip :currTitle="currTitle"></toptip>
+    <div class="content-center" v-html="titleDate.content"></div>
+  </div>
+</template>
+
+<script>
+import { article_info } from "../../request/api";
+
+import toptip from "../../components/toptip";
+
+export default {
+  metaInfo: {
+    title: "入会申请",
+  },
+  name: "Apply",
+  data() {
+    return {
+      titleDate: {},
+    };
+  },
+  computed: {
+    currTitle() {
+      return this.titleDate.title;
+    },
+  },
+  created() {
+    this.getTitleData();
+  },
+  methods: {
+    getTitleData() {
+      article_info({}, 76).then(({ data: res }) => {
+        this.titleDate = res.data;
+        console.log(this.titleDate);
+      });
+    },
+  },
+  components: {
+    toptip,
+  },
+};
+</script>
+
+<style lang="scss" scoped>
 </style>

+ 59 - 59
src/views/committee/dwload.vue

@@ -1,60 +1,60 @@
-<template>
-  <div class="dwload">
-    <toptip :currTitle="currTitle"></toptip>
-    <template v-for="item in pageInfo">
-        <img :src="'http://ca.liuniu946.com/'+item.coverimage" :alt="item.title" :key="item.id" style="width:100%">
-    </template>
-  </div>
-</template>
-
-<script>
-import { article_list, article_info } from "../../request/api";
-import toptip from "../../components/toptip";
-export default {
-  metaInfo: {
-    title: "单位会员入会申请表",
-  },
-  data() {
-    return {
-      currTitle: "单位会员入会申请表",
-      pageInfo: []
-    };
-  },
-  components: {
-    toptip,
-  },
-  computed: {
-
-  },
-  created() {
-      this.getDate()
-  },
-  methods: {
-      getDate() {
-          article_info({},69).then( ( { data: res } ) => {
-              this.pageInfo.push(res.data)
-              article_info({},70).then( ( { data: res } ) => {
-                  this.pageInfo.push(res.data)
-                  article_info({},71).then( ( { data: res } ) => {
-                      this.pageInfo.push(res.data)
-                       article_info({},72).then( ( { data: res } ) => {
-                           this.pageInfo.push(res.data)
-                           article_info({},73).then( ( { data: res } ) => {
-                                this.pageInfo.push(res.data)
-                                article_info({},74).then( ( { data: res } ) => {
-                                    this.pageInfo.push(res.data)
-                                    console.log(this.pageInfo)
-                                })
-                           })
-                       })
-                  })
-              })
-          })
-      }
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-
+<template>
+  <div class="dwload">
+    <toptip :currTitle="currTitle"></toptip>
+    <template v-for="item in pageInfo">
+        <img :src="'http://ca.liuniu946.com/'+item.coverimage" :alt="item.title" :key="item.id" style="width:100%">
+    </template>
+  </div>
+</template>
+
+<script>
+import { article_list, article_info } from "../../request/api";
+import toptip from "../../components/toptip";
+export default {
+  metaInfo: {
+    title: "单位会员入会申请表",
+  },
+  data() {
+    return {
+      currTitle: "单位会员入会申请表",
+      pageInfo: []
+    };
+  },
+  components: {
+    toptip,
+  },
+  computed: {
+
+  },
+  created() {
+      this.getDate()
+  },
+  methods: {
+      getDate() {
+          article_info({},69).then( ( { data: res } ) => {
+              this.pageInfo.push(res.data)
+              article_info({},70).then( ( { data: res } ) => {
+                  this.pageInfo.push(res.data)
+                  article_info({},71).then( ( { data: res } ) => {
+                      this.pageInfo.push(res.data)
+                       article_info({},72).then( ( { data: res } ) => {
+                           this.pageInfo.push(res.data)
+                           article_info({},73).then( ( { data: res } ) => {
+                                this.pageInfo.push(res.data)
+                                article_info({},74).then( ( { data: res } ) => {
+                                    this.pageInfo.push(res.data)
+                                    console.log(this.pageInfo)
+                                })
+                           })
+                       })
+                  })
+              })
+          })
+      }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+
 </style>

+ 41 - 41
src/views/committee/grload.vue

@@ -1,42 +1,42 @@
-<template>
-  <div class="grload">
-    <toptip :currTitle="currTitle"></toptip>
-    <img :src="'http://ca.liuniu946.com/'+info.coverimage" alt="info.title" style="width:100%">
-  </div>
-</template>
-
-<script>
-import { article_list, article_info } from "../../request/api";
-import toptip from "../../components/toptip";
-export default {
-  metaInfo: {
-    title: "个人会员入会申请表",
-  },
-  data() {
-    return {
-      currTitle: "个人会员入会申请表",
-      info: {}
-    };
-  },
-  components: {
-    toptip,
-  },
-  computed: {
-
-  },
-  created() {
-      this.getData()
-  },
-  methods: {
-      getData() {
-         article_info({},67).then(({ data: res }) => {
-             this.info = res.data
-         }) 
-      }
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-
+<template>
+  <div class="grload">
+    <toptip :currTitle="currTitle"></toptip>
+    <img :src="'http://ca.liuniu946.com/'+info.coverimage" alt="info.title" style="width:100%">
+  </div>
+</template>
+
+<script>
+import { article_list, article_info } from "../../request/api";
+import toptip from "../../components/toptip";
+export default {
+  metaInfo: {
+    title: "个人会员入会申请表",
+  },
+  data() {
+    return {
+      currTitle: "个人会员入会申请表",
+      info: {}
+    };
+  },
+  components: {
+    toptip,
+  },
+  computed: {
+
+  },
+  created() {
+      this.getData()
+  },
+  methods: {
+      getData() {
+         article_info({},67).then(({ data: res }) => {
+             this.info = res.data
+         }) 
+      }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+
 </style>

+ 48 - 48
src/views/committee/invitation.vue

@@ -1,49 +1,49 @@
-<template>
-  <div class="invitation">
-    <toptip :currTitle="currTitle"></toptip>
-    <template v-for="item in imgList">
-      <img :src="item" alt="邀请函" :key="item">
-    </template>
-  </div>
-</template>
-
-<script>
-import { article_list, article_info } from "../../request/api";
-import toptip from "../../components/toptip";
-export default {
-  metaInfo: {
-    title: "邀请函",
-  },
-  data() {
-    return {
-      currTitle: "邀请函",
-      imgList: [],
-    };
-  },
-  components: {
-    toptip,
-  },
-  created() {
-    this.getImgList();
-  },
-  methods: {
-    getImgList() {
-      article_info({}, 65).then(({ data: res }) => {
-        let imgUrl = "http://ca.liuniu946.com/" + res.data.coverimage;
-        this.imgList.push(imgUrl);
-        article_info({}, 66).then(({ data: res }) => {
-          let imgUrl = "http://ca.liuniu946.com/" + res.data.coverimage;
-          this.imgList.push(imgUrl);
-          console.log(this.imgList)
-        });
-      });
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-img {
-  width: 100%;
-}
+<template>
+  <div class="invitation">
+    <toptip :currTitle="currTitle"></toptip>
+    <template v-for="item in imgList">
+      <img :src="item" alt="邀请函" :key="item">
+    </template>
+  </div>
+</template>
+
+<script>
+import { article_list, article_info } from "../../request/api";
+import toptip from "../../components/toptip";
+export default {
+  metaInfo: {
+    title: "邀请函",
+  },
+  data() {
+    return {
+      currTitle: "邀请函",
+      imgList: [],
+    };
+  },
+  components: {
+    toptip,
+  },
+  created() {
+    this.getImgList();
+  },
+  methods: {
+    getImgList() {
+      article_info({}, 65).then(({ data: res }) => {
+        let imgUrl = "http://ca.liuniu946.com/" + res.data.coverimage;
+        this.imgList.push(imgUrl);
+        article_info({}, 66).then(({ data: res }) => {
+          let imgUrl = "http://ca.liuniu946.com/" + res.data.coverimage;
+          this.imgList.push(imgUrl);
+          console.log(this.imgList)
+        });
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+img {
+  width: 100%;
+}
 </style>

+ 117 - 117
src/views/committee/load.vue

@@ -1,118 +1,118 @@
-<template>
-  <div class="load">
-    <toptip :currTitle="currTitle"></toptip>
-    <template>
-      <el-table :data="newList" style="width: 100%">
-        <el-table-column>
-          <template slot-scope="scope">
-            <div @mouseleave="loadHiden()" @mouseover="loadShow(scope.row.in)">
-              <i class="el-icon-caret-right"></i>
-              <span
-                style="margin-left: 10px; font-size: 16px; width: 40%"
-                class="title"
-                @click="goto(scope.row.path)"
-                >{{ scope.row.name }}</span
-              >
-              <a class="loader" :href="scope.row.loadPath" :download="scope.row.loadTitle">
-                <span v-show="scope.row.in === current">下载</span>
-              </a>
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-    </template>
-    <div class="page-box">
-      <el-pagination
-        background
-        layout="prev, pager, next"
-        :total="count"
-        prev-text="上一页"
-        next-text="下一页"
-      >
-      </el-pagination>
-    </div>
-  </div>
-</template>
-
-<script>
-import toptip from "../../components/toptip";
-export default {
-  metaInfo: {
-    title: "申请表下载",
-  },
-  data() {
-    return {
-      currTitle: "申请表下载",
-      newList: [
-        {
-          name: "单位会员入会申请表",
-          in: 1,
-          path: "dwload",
-          loadPath: 'http://ca.liuniu946.com/uploads/20201223/93058675c2c0747769c550aacaf924e7.jpg',
-          loadTitle: '单位会员入会申请表.jpg'
-        },
-        {
-          name: "个人会员入会申请表",
-          in: 2,
-          path: "grload",
-          loadPath: 'http://ca.liuniu946.com/uploads/20201223/6a30c709cbe3cb994cdf3993c0062570.jpg',
-          loadTitle: '个人会员入会申请表.jpg'
-        },
-      ],
-      isShow: false,
-      current: 0,
-    };
-  },
-  components: {
-    toptip,
-  },
-  computed: {
-    count() {
-      return this.newList.length;
-    },
-  },
-  methods: {
-    loadShow(index) {
-      this.current = index;
-    },
-    loadHiden() {
-      this.current = 0;
-    },
-    goto(path) {
-      console.log(path);
-      this.$router.push("/committee/" + path);
-    },
-    down(data) {
-      console.log(data);
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.page-box {
-  margin-top: 40px;
-  width: 858px;
-  display: flex;
-  justify-content: center;
-  cursor: pointer;
-}
-.title {
-  cursor: pointer;
-}
-.loader {
-  cursor: pointer;
-  background: url("../../assets/load.png") no-repeat;
-  float: right;
-  width: 45px;
-  height: 25px;
-  color: #fff;
-  text-align: center;
-  line-height: 25px;
-  span {
-    display: inline-block;
-    background-color: red;
-    width: 45px;
-  }
-}
+<template>
+  <div class="load">
+    <toptip :currTitle="currTitle"></toptip>
+    <template>
+      <el-table :data="newList" style="width: 100%">
+        <el-table-column>
+          <template slot-scope="scope">
+            <div @mouseleave="loadHiden()" @mouseover="loadShow(scope.row.in)">
+              <i class="el-icon-caret-right"></i>
+              <span
+                style="margin-left: 10px; font-size: 16px; width: 40%"
+                class="title"
+                @click="goto(scope.row.path)"
+                >{{ scope.row.name }}</span
+              >
+              <a class="loader" :href="scope.row.loadPath" :download="scope.row.loadTitle">
+                <span v-show="scope.row.in === current">下载</span>
+              </a>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </template>
+    <div class="page-box">
+      <el-pagination
+        background
+        layout="prev, pager, next"
+        :total="count"
+        prev-text="上一页"
+        next-text="下一页"
+      >
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import toptip from "../../components/toptip";
+export default {
+  metaInfo: {
+    title: "申请表下载",
+  },
+  data() {
+    return {
+      currTitle: "申请表下载",
+      newList: [
+        {
+          name: "单位会员入会申请表",
+          in: 1,
+          path: "dwload",
+          loadPath: 'http://ca.liuniu946.com/uploads/20201223/93058675c2c0747769c550aacaf924e7.jpg',
+          loadTitle: '单位会员入会申请表.jpg'
+        },
+        {
+          name: "个人会员入会申请表",
+          in: 2,
+          path: "grload",
+          loadPath: 'http://ca.liuniu946.com/uploads/20201223/6a30c709cbe3cb994cdf3993c0062570.jpg',
+          loadTitle: '个人会员入会申请表.jpg'
+        },
+      ],
+      isShow: false,
+      current: 0,
+    };
+  },
+  components: {
+    toptip,
+  },
+  computed: {
+    count() {
+      return this.newList.length;
+    },
+  },
+  methods: {
+    loadShow(index) {
+      this.current = index;
+    },
+    loadHiden() {
+      this.current = 0;
+    },
+    goto(path) {
+      console.log(path);
+      this.$router.push("/committee/" + path);
+    },
+    down(data) {
+      console.log(data);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.page-box {
+  margin-top: 40px;
+  width: 858px;
+  display: flex;
+  justify-content: center;
+  cursor: pointer;
+}
+.title {
+  cursor: pointer;
+}
+.loader {
+  cursor: pointer;
+  background: url("../../assets/load.png") no-repeat;
+  float: right;
+  width: 45px;
+  height: 25px;
+  color: #fff;
+  text-align: center;
+  line-height: 25px;
+  span {
+    display: inline-block;
+    background-color: red;
+    width: 45px;
+  }
+}
 </style>

+ 37 - 37
src/views/committee/mem.vue

@@ -1,38 +1,38 @@
-<template>
-  <div class="invitation">
-    <toptip :currTitle="currTitle"></toptip>
-    <div v-html="list.content"></div>
-  </div>
-</template>
-
-<script>
-import toptip from "../../components/toptip";
-import { article_list, article_info } from "../../request/api";
-export default {
-    metaInfo: {
-    title: "成员单位",
-  },
-  data() {
-    return {
-      currTitle: "成员单位(副会长、理事、会员)",
-      list: {},
-    };
-  },
-  components: {
-    toptip,
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    getList() {
-      article_info({},44).then(({data: res}) => {
-          this.list = res.data
-      })
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
+<template>
+  <div class="invitation">
+    <toptip :currTitle="currTitle"></toptip>
+    <div v-html="list.content"></div>
+  </div>
+</template>
+
+<script>
+import toptip from "../../components/toptip";
+import { article_list, article_info } from "../../request/api";
+export default {
+    metaInfo: {
+    title: "成员单位",
+  },
+  data() {
+    return {
+      currTitle: "成员单位(副会长、理事、会员)",
+      list: {},
+    };
+  },
+  components: {
+    toptip,
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    getList() {
+      article_info({},44).then(({data: res}) => {
+          this.list = res.data
+      })
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
 </style>

+ 69 - 69
src/views/cooperation.vue

@@ -1,70 +1,70 @@
-<template>
-  <div class="cooperation">
-    <div class="fixbox" @click="up">
-      <img src="../assets/up.png" alt="" class="up-img" />
-    </div>
-    <div class="jg"></div>
-    <!-- 内容区域 -->
-    <xhcontent
-      :bodyList="bodyList"
-      :titleN="titleN"
-      :title="title"
-      :titleEN="titleEN"
-    >
-      <!-- 子路由 -->
-      <router-view></router-view>
-    </xhcontent>
-  </div>
-</template>
-
-<script>
-import Xhcontent from "../components/xhcontent";
-export default {
-  name: "question",
-  metaInfo: {
-    title: "合作前沿",
-  },
-  components: {
-    Xhcontent,
-  },
-  filters: {
-    content(data) {
-      return data.replace("<p>", '<p class="list">');
-    },
-  },
-  data() {
-    return {
-      info: {},
-      list: {},
-      bodyList: [{ title: "联合战略单位", path: "union" }],
-      titleN: "H",
-      title: "合作前沿",
-      titleEN: "Cooperation",
-    };
-  },
-  created() {
-
-  },
-  methods: {
-    up() {
-      document.body.scrollTop = document.documentElement.scrollTop = 0;
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.jg {
-  height: 10px;
-}
-
-.fixbox {
-  position: fixed;
-  right: 20px;
-  bottom: 30px;
-  .up-img {
-    width: 60px;
-    height: 60px;
-  }
-}
+<template>
+  <div class="cooperation">
+    <div class="fixbox" @click="up">
+      <img src="../assets/up.png" alt="" class="up-img" />
+    </div>
+    <div class="jg"></div>
+    <!-- 内容区域 -->
+    <xhcontent
+      :bodyList="bodyList"
+      :titleN="titleN"
+      :title="title"
+      :titleEN="titleEN"
+    >
+      <!-- 子路由 -->
+      <router-view></router-view>
+    </xhcontent>
+  </div>
+</template>
+
+<script>
+import Xhcontent from "../components/xhcontent";
+export default {
+  name: "question",
+  metaInfo: {
+    title: "合作前沿",
+  },
+  components: {
+    Xhcontent,
+  },
+  filters: {
+    content(data) {
+      return data.replace("<p>", '<p class="list">');
+    },
+  },
+  data() {
+    return {
+      info: {},
+      list: {},
+      bodyList: [{ title: "联合战略单位", path: "union" }],
+      titleN: "H",
+      title: "合作前沿",
+      titleEN: "Cooperation",
+    };
+  },
+  created() {
+
+  },
+  methods: {
+    up() {
+      document.body.scrollTop = document.documentElement.scrollTop = 0;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.jg {
+  height: 10px;
+}
+
+.fixbox {
+  position: fixed;
+  right: 20px;
+  bottom: 30px;
+  .up-img {
+    width: 60px;
+    height: 60px;
+  }
+}
 </style>

+ 66 - 66
src/views/cooperation/union.vue

@@ -1,67 +1,67 @@
-<template>
-    <div class="union">
-        <div class="title">{{ currTitle }}</div>
-        <div class="jg"></div>
-        <div v-html="info.content"></div>
-    </div>
-</template>
-
-<script>
-import { article_list, article_info } from "../../request/api";
-export default {
-    name: 'Union',
-    data() {
-        return {
-            currTitle: '',
-            info: {}
-        }
-    },
-    created() {
-        this.getDate()
-    },
-    methods: {
-        getDate() {
-            article_info({},75).then(({data:res}) => {
-                this.info = res.data
-                this.currTitle = res.data.title
-                
-            })
-        }
-    }
-}
-</script>
-
-<style lang="scss" scoped>
-.jg{
-  height: 30px;
-  background-color: #fff;
-}
-.title {
-  color: #96311c;
-  text-align: center;
-  font-size: 20px;
-  margin: 45px auto;
-  font-weight: bold;
-  position: relative;
-  &::before {
-    background: url("../../assets/divbefore.png") no-repeat;
-    left: 255px;
-  }
-  &::after {
-    background: url("../../assets/divafter.png") no-repeat;
-    left: 490px;
-  }
-
-  &::before,
-  &::after {
-    width: 93px;
-    height: 5px;
-    content: "";
-    position: absolute;
-    top: 37%;
-    margin-top: -2px;
-    display: inline-block;
-    margin: 0 10px;
-  }
-}
+<template>
+    <div class="union">
+        <div class="title">{{ currTitle }}</div>
+        <div class="jg"></div>
+        <div v-html="info.content"></div>
+    </div>
+</template>
+
+<script>
+import { article_list, article_info } from "../../request/api";
+export default {
+    name: 'Union',
+    data() {
+        return {
+            currTitle: '',
+            info: {}
+        }
+    },
+    created() {
+        this.getDate()
+    },
+    methods: {
+        getDate() {
+            article_info({},75).then(({data:res}) => {
+                this.info = res.data
+                this.currTitle = res.data.title
+                
+            })
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.jg{
+  height: 30px;
+  background-color: #fff;
+}
+.title {
+  color: #96311c;
+  text-align: center;
+  font-size: 20px;
+  margin: 45px auto;
+  font-weight: bold;
+  position: relative;
+  &::before {
+    background: url("../../assets/divbefore.png") no-repeat;
+    left: 255px;
+  }
+  &::after {
+    background: url("../../assets/divafter.png") no-repeat;
+    left: 490px;
+  }
+
+  &::before,
+  &::after {
+    width: 93px;
+    height: 5px;
+    content: "";
+    position: absolute;
+    top: 37%;
+    margin-top: -2px;
+    display: inline-block;
+    margin: 0 10px;
+  }
+}
 </style>

+ 478 - 461
src/views/index.vue

@@ -1,461 +1,478 @@
-<template>
-  <div class="index">
-    <div class="content-box">
-      <div class="content title3">对外经济文化合作</div>
-    </div>
-    <div class="main">
-      <div class="main-left">
-        <el-carousel trigger="click" height="400px">
-          <el-carousel-item v-for="(item, index) in list4" :key="index"
-            ><img :src="item.coverimage" alt="" class="small"
-          /></el-carousel-item>
-        </el-carousel>
-      </div>
-      <div class="main-right">
-        <div class="main-top">最新动态</div>
-        <div class="main-item" v-for="(item, index) in list5" :key="index">
-          <a :href="item.url" class="main-a">
-            <div class="item-left">{{ item.title }}</div>
-            <div class="item-right">{{ item.synopsis }}</div>
-          </a>
-        </div>
-      </div>
-    </div>
-    <div class="bgi">
-      <img src="../assets/index2.png" alt="" class="bgi-img" />
-    </div>
-    <div class="fixbox" @click="up">
-      <img src="../assets/up.png" alt="" class="up-img" />
-    </div>
-    <div class="content-box">
-      <div class="content title2">我会领导及专家</div>
-    </div>
-    <div class="list1-box">
-      <div class="list-item" v-for="(item, index) in list1" :key="index">
-        <div class="item-left">
-          <el-image
-            style="
-              width: 135px;
-              height: 135px;
-              border-radius: 10px 0px 0px 10px;
-            "
-            :src="item.coverimage"
-            fit="cover"
-          ></el-image>
-        </div>
-        <div class="item-right">
-          <div class="nickname">{{ item.title }}</div>
-          <div class="job">{{ item.author }}</div>
-          <div class="honor">{{ item.synopsis }}</div>
-        </div>
-      </div>
-      <div class="page-box">
-        <el-pagination
-          layout="prev, pager, next"
-          :page-size="6"
-          :total="total"
-          @current-change="handleSizeChange"
-        ></el-pagination>
-      </div>
-    </div>
-    <div class="img-box">
-      <img src="../assets/index1.png" alt="" class="img-img" />
-    </div>
-    <div class="content-box">
-      <div class="content title2">委员会活动集锦</div>
-    </div>
-    <div class="wrap">
-      <div class="list2-box">
-        <div class="list2-item" v-for="(item, index) in list2" :key="index">
-          <a :href="item.url"
-            ><el-image
-              style="width: 235px; height: 175px"
-              :src="item.coverimage"
-            ></el-image
-          ></a>
-        </div>
-      </div>
-    </div>
-    <div class="content-box"><div class="content title2">委员会文化</div></div>
-    <div class="list6" v-html="list6.content"></div>
-  </div>
-</template>
-
-<script>
-// @ is an alias to /src
-import { article_list, loop, article_info } from "../request/api";
-export default {
-  name: "index",
-  metaInfo: {
-    title: "首页",
-  },
-  components: {},
-  data() {
-    return {
-      fits: ["fill", "contain", "cover", "none", "scale-down"],
-      list3src: [],
-      total1: 0, //照片条数
-      total: 0, //领导总条数
-      page1: 1,
-      page: 1,
-      limit: 6,
-      listimg: [], //轮播图
-      info:
-        "中国东方文化研究会对外经济文化工作委员会作为中国东方文化研究会对外文化与经济交流合作的内设机构,将不断加强中国文化国际传播能力,加强与世界各国,特别是“一带一路”沿线国家的文化与经济交流合作,促进交融互鉴,创新发展。秉承和而不同,互鉴互惠的理念,以深化文化产业供给侧改革发挥桥梁和纽带作用。积极响应国家文化“走出去”政策,讲好中国故事、传播好中国声音,展示中国形象,助推中华文化的国际影响力,策应国家战略,为建设社会主义文化强国做出积极贡献。",
-      list1: [],
-      list2: [],
-      list3: [],
-      list4: [],
-      list5: [],
-      list6: {},
-    };
-  },
-  created() {
-    this.loadlist();
-    article_info({}, 57).then(({ data }) => {
-      this.list6 = data.data;
-    });
-  },
-
-  methods: {
-    up() {
-      document.body.scrollTop = document.documentElement.scrollTop = 0;
-    },
-    handChange(val) {
-      this.page1 = val;
-      this.lindao(16);
-    },
-    //分页改变
-    handleSizeChange(val) {
-      this.page = val;
-      this.lindao(15);
-    },
-    loadlist() {
-      loop().then(({ data }) => {
-        data.data.map((e) => {
-          e = "http://ca.liuniu946.com/" + e;
-          this.listimg.push(e);
-        });
-        this.lindao(15);
-        this.lindao(16);
-        this.lindao(17);
-        this.lindao(31);
-        this.lindao(32);
-      });
-    },
-    //获取领导
-    lindao(id) {
-      let pagea;
-      let limita;
-      if (id == 15) {
-        pagea = this.page;
-        limita = 6;
-      }
-      if (id == 16) {
-        pagea = this.page1;
-        limita = 8;
-      }
-      if (id == 17) {
-        pagea = 1;
-        limita = 100;
-      }
-      if (id == 31) {
-        pagea = 1;
-        limita = 6;
-      }
-      if (id == 32) {
-        pagea = 1;
-        limita = 7;
-      }
-      article_list({
-        category_id: id,
-        page: pagea,
-        limit: limita,
-      }).then(({ data }) => {
-        if (id == 15) {
-          this.total = data.data.count;
-          data.data.list.map((e) => {
-            e.coverimage = "http://ca.liuniu946.com/" + e.coverimage;
-          });
-          this.list1 = data.data.list;
-        }
-        if (id == 16) {
-          this.total1 = data.data.count;
-          data.data.list.map((e) => {
-            e.coverimage = "http://ca.liuniu946.com/" + e.coverimage;
-            this.list3src.push(e.coverimage);
-            console.log(this.list3src);
-          });
-          this.list3 = data.data.list;
-        }
-        if (id == 17) {
-          data.data.list.map((e) => {
-            e.coverimage = "http://ca.liuniu946.com/" + e.coverimage;
-          });
-          this.list2 = data.data.list;
-        }
-        if (id == 31) {
-          data.data.list.map((e) => {
-            e.coverimage = "http://ca.liuniu946.com/" + e.coverimage;
-          });
-          this.list4 = data.data.list;
-        }
-        if (id == 32) {
-          this.list5 = data.data.list;
-        }
-      });
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.list6 {
-  width: 1232px;
-  margin: 50px auto 0;
-  line-height: 30px;
-}
-.main {
-  width: 1232px;
-  margin: 50px auto 0;
-  display: flex;
-  border: 1px solid #999999;
-
-  .main-left {
-    flex: 1;
-    .top {
-      width: 100%;
-      height: 50px;
-      background-color: rbga(0, 0, 0, 0.4);
-      position: absolute;
-      left: 0;
-      bottom: 0;
-    }
-  }
-  .main-right {
-    flex: 1;
-    padding: 0 20px;
-    .main-top {
-      color: red;
-      line-height: 50px;
-      border-bottom: 1px solid red;
-    }
-    .main-a {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      border-bottom: 1px dashed #999999;
-      color: #666666;
-      line-height: 50px;
-    }
-    .main-a:hover {
-      color: blue;
-    }
-  }
-}
-a {
-  text-decoration: none;
-}
-.el-carousel__item .small {
-  width: 100%;
-  height: 612px;
-  margin: 0;
-}
-.index {
-  line-height: 1;
-  .top {
-    width: 100%;
-    height: 612px;
-    .top-img {
-      width: 100%;
-      height: 100%;
-    }
-  }
-  .content-box {
-    width: 1232px;
-    margin: 66px auto 45px;
-    border-bottom: 2px solid #be0000;
-    .content {
-      text-align: left;
-      height: 47px;
-      background: #be0000;
-      font-size: 20px;
-      font-weight: 600;
-      color: #ffffff;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-    }
-    .title1 {
-      width: 109px;
-    }
-    .title2 {
-      width: 168px;
-    }
-    .title3 {
-      width: 188px;
-    }
-  }
-  .list1-box {
-    width: 1232px;
-    margin: 0 auto;
-    display: flex;
-    flex-wrap: wrap;
-    padding-left: 15px;
-
-    .list-item {
-      width: 573px;
-      height: 134px;
-      background: #f4f4f4;
-      border-radius: 10px;
-      display: flex;
-      margin-right: 40px;
-      margin-bottom: 30px;
-      .item-left {
-        width: 135px;
-        height: 135px;
-        .item-avata {
-          width: 135px;
-          height: 135px;
-          border-radius: 10px 0px 0px 10px;
-        }
-      }
-      .item-right {
-        padding-left: 20px;
-        .nickname {
-          font-size: 20px;
-          font-weight: bold;
-          color: #333333;
-          line-height: 64px;
-        }
-        .job {
-          font-size: 14px;
-          font-weight: 500;
-          color: #666666;
-          margin-bottom: 15px;
-        }
-        .honor {
-          font-size: 14px;
-          font-weight: 500;
-          color: #666666;
-        }
-      }
-    }
-  }
-  .page-box {
-    text-align: right;
-    width: 100%;
-    padding-right: 40px;
-    // display: flex;
-    font-size: 16px;
-    font-weight: 500;
-    color: #333333;
-    margin-bottom: 30px;
-  }
-  .img-box {
-    width: 1234px;
-    height: 241px;
-    margin: 0 auto;
-    .img-img {
-      width: 1234px;
-      height: 241px;
-    }
-  }
-  .wrap {
-    width: 1234px;
-    margin: 0 auto;
-    .list2-box {
-      width: 1234px;
-      height: 175px;
-      overflow-x: auto;
-      overflow-y: hidden;
-      display: flex;
-      .list2-item {
-        width: 235px;
-        height: 175px;
-        margin-right: 30px;
-
-        .list2-img {
-          width: 235px;
-          height: 175px;
-        }
-      }
-    }
-  }
-  .list3-box {
-    width: 1232px;
-    margin: 0 auto;
-    padding-left: 16px;
-    padding-bottom: 30px;
-    display: flex;
-    flex-wrap: wrap;
-    .list3-item {
-      width: 285px;
-      margin: 0 20px 30px 0;
-      .item-top {
-        width: 285px;
-        .item-img {
-          width: 285px;
-          height: 145px;
-        }
-      }
-      .item-title {
-        text-align: center;
-        margin-top: 13px;
-        font-size: 16px;
-        font-weight: 500;
-        color: #333333;
-      }
-    }
-    .page-foot {
-      width: 100%;
-      text-align: center;
-      margin: 0 auto;
-      font-size: 16px;
-      font-weight: 500;
-      color: #333333;
-    }
-  }
-  .bgi {
-    width: 1234px;
-    height: 224px;
-    margin: 20px auto 0;
-    .bgi-img {
-      width: 1234px;
-      height: 224px;
-    }
-  }
-  .culture {
-    width: 1234px;
-    margin: 0 auto;
-    display: flex;
-    .culture-left {
-      width: 600px;
-      height: 300px;
-      .left-img {
-        width: 600px;
-        height: 300px;
-      }
-    }
-    .culture-right {
-      font-size: 18px;
-      font-weight: 500;
-      color: #333333;
-      line-height: 37px;
-      margin-left: 30px;
-      padding-right: 20px;
-      text-indent: 36px;
-    }
-  }
-
-  .fixbox {
-    position: fixed;
-    right: 20px;
-    bottom: 30px;
-    .up-img {
-      width: 60px;
-      height: 60px;
-    }
-  }
-}
-</style>
+<template>
+  <div class="index">
+    <div class="top">
+      <!-- <img src="../assets/index.jpg" alt="" class="top-img" /> -->
+      <el-carousel trigger="click" height="612px">
+        <!-- <el-carousel-item v-for="(item, index) in listimg" :key="index">
+          <img :src="item" alt="" class="small" />
+        </el-carousel-item> -->
+        <el-carousel-item v-for="item in listimg" :key="item">
+          <img :src="item" alt="" class="small">
+        </el-carousel-item>
+        <!-- <el-carousel-item>
+          <img src="../assets/index.jpg" alt="" class="small">
+        </el-carousel-item> -->
+      </el-carousel>
+    </div>
+    <div class="content-box">
+      <div class="content title3">对外经济文化合作</div>
+    </div>
+    <div class="main">
+      <div class="main-left">
+        <el-carousel trigger="click" height="400px">
+          <el-carousel-item v-for="(item, index) in list4" :key="index"
+            ><img :src="item.coverimage" alt="" class="small"
+          /></el-carousel-item>
+        </el-carousel>
+      </div>
+      <div class="main-right">
+        <div class="main-top">最新动态</div>
+        <div class="main-item" v-for="(item, index) in list5" :key="index">
+          <a :href="item.url" class="main-a">
+            <div class="item-left">{{ item.title }}</div>
+            <div class="item-right">{{ item.synopsis }}</div>
+          </a>
+        </div>
+      </div>
+    </div>
+    <div class="bgi">
+      <img src="../assets/index2.png" alt="" class="bgi-img" />
+    </div>
+    <div class="fixbox" @click="up">
+      <img src="../assets/up.png" alt="" class="up-img" />
+    </div>
+    <div class="content-box">
+      <div class="content title2">我会领导及专家</div>
+    </div>
+    <div class="list1-box">
+      <div class="list-item" v-for="(item, index) in list1" :key="index">
+        <div class="item-left">
+          <el-image
+            style="
+              width: 135px;
+              height: 135px;
+              border-radius: 10px 0px 0px 10px;
+            "
+            :src="item.coverimage"
+            fit="cover"
+          ></el-image>
+        </div>
+        <div class="item-right">
+          <div class="nickname">{{ item.title }}</div>
+          <div class="job">{{ item.author }}</div>
+          <div class="honor">{{ item.synopsis }}</div>
+        </div>
+      </div>
+      <div class="page-box">
+        <el-pagination
+          layout="prev, pager, next"
+          :page-size="6"
+          :total="total"
+          @current-change="handleSizeChange"
+        ></el-pagination>
+      </div>
+    </div>
+    <div class="img-box">
+      <img src="../assets/index1.png" alt="" class="img-img" />
+    </div>
+    <div class="content-box">
+      <div class="content title2">委员会活动集锦</div>
+    </div>
+    <div class="wrap">
+      <div class="list2-box">
+        <div class="list2-item" v-for="(item, index) in list2" :key="index">
+          <a :href="item.url"
+            ><el-image
+              style="width: 235px; height: 175px"
+              :src="item.coverimage"
+            ></el-image
+          ></a>
+        </div>
+      </div>
+    </div>
+    <div class="content-box"><div class="content title2">委员会文化</div></div>
+    <div class="list6" v-html="list6.content"></div>
+  </div>
+</template>
+
+<script>
+// @ is an alias to /src
+import { article_list, loop, article_info } from "../request/api";
+export default {
+  name: "index",
+  metaInfo: {
+    title: "首页",
+  },
+  components: {},
+  data() {
+    return {
+      fits: ["fill", "contain", "cover", "none", "scale-down"],
+      list3src: [],
+      total1: 0, //照片条数
+      total: 0, //领导总条数
+      page1: 1,
+      page: 1,
+      limit: 6,
+      listimg: [], //轮播图
+      info:
+        "中国东方文化研究会对外经济文化工作委员会作为中国东方文化研究会对外文化与经济交流合作的内设机构,将不断加强中国文化国际传播能力,加强与世界各国,特别是“一带一路”沿线国家的文化与经济交流合作,促进交融互鉴,创新发展。秉承和而不同,互鉴互惠的理念,以深化文化产业供给侧改革发挥桥梁和纽带作用。积极响应国家文化“走出去”政策,讲好中国故事、传播好中国声音,展示中国形象,助推中华文化的国际影响力,策应国家战略,为建设社会主义文化强国做出积极贡献。",
+      list1: [],
+      list2: [],
+      list3: [],
+      list4: [],
+      list5: [],
+      list6: {},
+    };
+  },
+  created() {
+    this.loadlist();
+    article_info({}, 57).then(({ data }) => {
+      this.list6 = data.data;
+    });
+  },
+
+  methods: {
+    up() {
+      document.body.scrollTop = document.documentElement.scrollTop = 0;
+    },
+    handChange(val) {
+      this.page1 = val;
+      this.lindao(16);
+    },
+    //分页改变
+    handleSizeChange(val) {
+      this.page = val;
+      this.lindao(15);
+    },
+    loadlist() {
+      loop().then(({ data }) => {
+        data.data.map((e) => {
+          e = "http://ca.liuniu946.com/" + e;
+          this.listimg.push(e);
+        });
+        this.lindao(15);
+        this.lindao(16);
+        this.lindao(17);
+        this.lindao(31);
+        this.lindao(32);
+      });
+    },
+    //获取领导
+    lindao(id) {
+      let pagea;
+      let limita;
+      if (id == 15) {
+        pagea = this.page;
+        limita = 6;
+      }
+      if (id == 16) {
+        pagea = this.page1;
+        limita = 8;
+      }
+      if (id == 17) {
+        pagea = 1;
+        limita = 100;
+      }
+      if (id == 31) {
+        pagea = 1;
+        limita = 6;
+      }
+      if (id == 32) {
+        pagea = 1;
+        limita = 7;
+      }
+      article_list({
+        category_id: id,
+        page: pagea,
+        limit: limita,
+      }).then(({ data }) => {
+        if (id == 15) {
+          this.total = data.data.count;
+          data.data.list.map((e) => {
+            e.coverimage = "http://ca.liuniu946.com/" + e.coverimage;
+          });
+          this.list1 = data.data.list;
+        }
+        if (id == 16) {
+          this.total1 = data.data.count;
+          data.data.list.map((e) => {
+            e.coverimage = "http://ca.liuniu946.com/" + e.coverimage;
+            this.list3src.push(e.coverimage);
+            console.log(this.list3src);
+          });
+          this.list3 = data.data.list;
+        }
+        if (id == 17) {
+          data.data.list.map((e) => {
+            e.coverimage = "http://ca.liuniu946.com/" + e.coverimage;
+          });
+          this.list2 = data.data.list;
+        }
+        if (id == 31) {
+          data.data.list.map((e) => {
+            e.coverimage = "http://ca.liuniu946.com/" + e.coverimage;
+          });
+          this.list4 = data.data.list;
+        }
+        if (id == 32) {
+          this.list5 = data.data.list;
+        }
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.list6 {
+  width: 1232px;
+  margin: 50px auto 0;
+  line-height: 30px;
+}
+.main {
+  width: 1232px;
+  margin: 50px auto 0;
+  display: flex;
+  border: 1px solid #999999;
+
+  .main-left {
+    flex: 1;
+    .top {
+      width: 100%;
+      height: 50px;
+      background-color: rbga(0, 0, 0, 0.4);
+      position: absolute;
+      left: 0;
+      bottom: 0;
+    }
+  }
+  .main-right {
+    flex: 1;
+    padding: 0 20px;
+    .main-top {
+      color: red;
+      line-height: 50px;
+      border-bottom: 1px solid red;
+    }
+    .main-a {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      border-bottom: 1px dashed #999999;
+      color: #666666;
+      line-height: 50px;
+    }
+    .main-a:hover {
+      color: blue;
+    }
+  }
+}
+a {
+  text-decoration: none;
+}
+.el-carousel__item .small {
+  width: 100%;
+  height: 612px;
+  margin: 0;
+}
+.index {
+  line-height: 1;
+  .top {
+    width: 100%;
+    height: 612px;
+    .top-img {
+      width: 100%;
+      height: 100%;
+    }
+  }
+  .banner {
+    width: 1232px;
+  }
+  .content-box {
+    width: 1232px;
+    margin: 66px auto 45px;
+    border-bottom: 2px solid #be0000;
+    .content {
+      text-align: left;
+      height: 47px;
+      background: #be0000;
+      font-size: 20px;
+      font-weight: 600;
+      color: #ffffff;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+    .title1 {
+      width: 109px;
+    }
+    .title2 {
+      width: 168px;
+    }
+    .title3 {
+      width: 188px;
+    }
+  }
+  .list1-box {
+    width: 1232px;
+    margin: 0 auto;
+    display: flex;
+    flex-wrap: wrap;
+    padding-left: 15px;
+
+    .list-item {
+      width: 573px;
+      height: 134px;
+      background: #f4f4f4;
+      border-radius: 10px;
+      display: flex;
+      margin-right: 40px;
+      margin-bottom: 30px;
+      .item-left {
+        width: 135px;
+        height: 135px;
+        .item-avata {
+          width: 135px;
+          height: 135px;
+          border-radius: 10px 0px 0px 10px;
+        }
+      }
+      .item-right {
+        padding-left: 20px;
+        .nickname {
+          font-size: 20px;
+          font-weight: bold;
+          color: #333333;
+          line-height: 64px;
+        }
+        .job {
+          font-size: 14px;
+          font-weight: 500;
+          color: #666666;
+          margin-bottom: 15px;
+        }
+        .honor {
+          font-size: 14px;
+          font-weight: 500;
+          color: #666666;
+        }
+      }
+    }
+  }
+  .page-box {
+    text-align: right;
+    width: 100%;
+    padding-right: 40px;
+    // display: flex;
+    font-size: 16px;
+    font-weight: 500;
+    color: #333333;
+    margin-bottom: 30px;
+  }
+  .img-box {
+    width: 1234px;
+    height: 241px;
+    margin: 0 auto;
+    .img-img {
+      width: 1234px;
+      height: 241px;
+    }
+  }
+  .wrap {
+    width: 1234px;
+    margin: 0 auto;
+    .list2-box {
+      width: 1234px;
+      height: 175px;
+      overflow-x: auto;
+      overflow-y: hidden;
+      display: flex;
+      .list2-item {
+        width: 235px;
+        height: 175px;
+        margin-right: 30px;
+
+        .list2-img {
+          width: 235px;
+          height: 175px;
+        }
+      }
+    }
+  }
+  .list3-box {
+    width: 1232px;
+    margin: 0 auto;
+    padding-left: 16px;
+    padding-bottom: 30px;
+    display: flex;
+    flex-wrap: wrap;
+    .list3-item {
+      width: 285px;
+      margin: 0 20px 30px 0;
+      .item-top {
+        width: 285px;
+        .item-img {
+          width: 285px;
+          height: 145px;
+        }
+      }
+      .item-title {
+        text-align: center;
+        margin-top: 13px;
+        font-size: 16px;
+        font-weight: 500;
+        color: #333333;
+      }
+    }
+    .page-foot {
+      width: 100%;
+      text-align: center;
+      margin: 0 auto;
+      font-size: 16px;
+      font-weight: 500;
+      color: #333333;
+    }
+  }
+  .bgi {
+    width: 1234px;
+    height: 224px;
+    margin: 20px auto 0;
+    .bgi-img {
+      width: 1234px;
+      height: 224px;
+    }
+  }
+  .culture {
+    width: 1234px;
+    margin: 0 auto;
+    display: flex;
+    .culture-left {
+      width: 600px;
+      height: 300px;
+      .left-img {
+        width: 600px;
+        height: 300px;
+      }
+    }
+    .culture-right {
+      font-size: 18px;
+      font-weight: 500;
+      color: #333333;
+      line-height: 37px;
+      margin-left: 30px;
+      padding-right: 20px;
+      text-indent: 36px;
+    }
+  }
+
+  .fixbox {
+    position: fixed;
+    right: 20px;
+    bottom: 30px;
+    .up-img {
+      width: 60px;
+      height: 60px;
+    }
+  }
+}
+</style>

+ 70 - 70
src/views/join/contcat.vue

@@ -1,71 +1,71 @@
-<template>
-  <div class="contcat">
-    <toptip :currTitle="currTitle"></toptip>
-    <div id="map">
-      <baidu-map
-        class="bm-view"
-        :center="{ lng: 120.207492, lat: 30.161478 }"
-        :zoom="zoom"
-      >
-        <bm-navigation anchor="BMAP_ANCHOR_TOP_RIGHT"></bm-navigation>
-        <bm-marker
-          :position="{ lng: 120.207492, lat: 30.161478 }"
-          :dragging="true"
-          animation="BMAP_ANIMATION_BOUNCE"
-        >
-          <!-- <bm-label content="" :labelStyle="{color: 'red', fontSize : '24px'}" :offset="{width: -35, height: 30}"/> -->
-        </bm-marker>
-        <!-- <bm-scale anchor="BMAP_ANCHOR_TOP_RIGHT"></bm-scale> -->
-      </baidu-map>
-    </div>
-    <div class="address">
-      浙江办事处<br />
-      联系方式: 秘书处 13056982333 吴先生 <br />
-      联系邮箱: wuyucheng@163.com <br />
-      联系地址:浙江省杭州市滨江区天马路58号
-    </div>
-  </div>
-</template>
-
-<script>
-import BaiduMap from "vue-baidu-map/components/map/Map.vue";
-import BmNavigation from "vue-baidu-map/components/controls/Navigation";
-import toptip from "../../components/toptip";
-export default {
-  metaInfo: {
-    title: "联系我们",
-  },
-  nane: "Contcat",
-  data() {
-    return {
-      currTitle: "联系我们",
-      center: "{lng: 116.404, lat: 39.915}",
-      zoom: 30,
-    };
-  },
-  components: {
-    toptip,
-    BaiduMap,
-    BmNavigation,
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-#map {
-  width: 858px;
-  height: 550px;
-  margin: 0 auto;
-  .bm-view {
-    width: 100%;
-    height: 550px;
-  }
-}
-.address {
-  width: 1232px;
-  margin: 20px auto 20px;
-  font-size: 20px;
-  font-weight: 400;
-  line-height: 1.5em;
-}
+<template>
+  <div class="contcat">
+    <toptip :currTitle="currTitle"></toptip>
+    <div id="map">
+      <baidu-map
+        class="bm-view"
+        :center="{ lng: 120.207492, lat: 30.161478 }"
+        :zoom="zoom"
+      >
+        <bm-navigation anchor="BMAP_ANCHOR_TOP_RIGHT"></bm-navigation>
+        <bm-marker
+          :position="{ lng: 120.207492, lat: 30.161478 }"
+          :dragging="true"
+          animation="BMAP_ANIMATION_BOUNCE"
+        >
+          <!-- <bm-label content="" :labelStyle="{color: 'red', fontSize : '24px'}" :offset="{width: -35, height: 30}"/> -->
+        </bm-marker>
+        <!-- <bm-scale anchor="BMAP_ANCHOR_TOP_RIGHT"></bm-scale> -->
+      </baidu-map>
+    </div>
+    <div class="address">
+      浙江办事处<br />
+      联系方式: 秘书处 18604979785 王开 <br />
+      联系邮箱: wuyucheng@163.com <br />
+      联系地址:浙江省杭州市滨江区天马路58号
+    </div>
+  </div>
+</template>
+
+<script>
+import BaiduMap from "vue-baidu-map/components/map/Map.vue";
+import BmNavigation from "vue-baidu-map/components/controls/Navigation";
+import toptip from "../../components/toptip";
+export default {
+  metaInfo: {
+    title: "联系我们",
+  },
+  nane: "Contcat",
+  data() {
+    return {
+      currTitle: "联系我们",
+      center: "{lng: 116.404, lat: 39.915}",
+      zoom: 30,
+    };
+  },
+  components: {
+    toptip,
+    BaiduMap,
+    BmNavigation,
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+#map {
+  width: 858px;
+  height: 550px;
+  margin: 0 auto;
+  .bm-view {
+    width: 100%;
+    height: 550px;
+  }
+}
+.address {
+  width: 1232px;
+  margin: 20px auto 20px;
+  font-size: 20px;
+  font-weight: 400;
+  line-height: 1.5em;
+}
 </style>

+ 48 - 48
src/views/new.vue

@@ -1,49 +1,49 @@
-<template>
-  <div class="new">
-    <div class="jg"></div>
-    <xhcontent
-      :bodyList="bodyList"
-      :titleN="titleN"
-      :title="title"
-      :titleEN="titleEN"
-    >
-    <router-view></router-view>
-    </xhcontent>
-  </div>
-</template>
-
-<script>
-import xhcontent from "../components/xhcontent.vue";
-export default {
-  components: { xhcontent },
-  name: "Naw",
-  data() {
-      return {
-        bodyList: [
-            {
-                title: '学习强国',
-                path: 'study'
-            },
-            {
-                title: '科协新闻',
-                path: 'association'
-            },
-            {
-                title: '党建动态',
-                path: 'party'
-            }
-        ],
-        titleN: 'N',
-        title: '新闻中心',
-        titleEN: 'ews'
-
-      }
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-.jg {
-    height: 10px;
-}
+<template>
+  <div class="new">
+    <div class="jg"></div>
+    <xhcontent
+      :bodyList="bodyList"
+      :titleN="titleN"
+      :title="title"
+      :titleEN="titleEN"
+    >
+    <router-view></router-view>
+    </xhcontent>
+  </div>
+</template>
+
+<script>
+import xhcontent from "../components/xhcontent.vue";
+export default {
+  components: { xhcontent },
+  name: "Naw",
+  data() {
+      return {
+        bodyList: [
+            {
+                title: '学习强国',
+                path: 'study'
+            },
+            {
+                title: '科协新闻',
+                path: 'association'
+            },
+            {
+                title: '党建动态',
+                path: 'party'
+            }
+        ],
+        titleN: 'N',
+        title: '新闻中心',
+        titleEN: 'ews'
+
+      }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.jg {
+    height: 10px;
+}
 </style>

+ 91 - 91
src/views/new/association.vue

@@ -1,92 +1,92 @@
-<template>
-  <div class="association">
-    <toptip :currTitle="currTitle"></toptip>
-    <template>
-      <el-table :data="newList" style="width: 100%">
-        <el-table-column class="news-wrapper">
-          <template slot-scope="scope">
-            <div @click="goto(scope.row.id)" class="newspan">
-              <i class="el-icon-caret-right"></i>{{ scope.row.title }}
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-    </template>
-    <div class="page-box">
-      <el-pagination
-        background
-        layout="prev, pager, next"
-        :total="count"
-        prev-text="上一页"
-        next-text="下一页"
-      >
-      </el-pagination>
-    </div>
-  </div>
-</template>
-
-<script>
-import { article_list, article_info } from "../../request/api";
-import Toptip from "../../components/toptip";
-export default {
-  metaInfo: {
-    title: "科协新闻",
-  },
-  name: "Association",
-  components: {
-    Toptip,
-  },
-  data() {
-    return {
-      currTitle: "科协新闻",
-      newList: [],
-      count: 0,
-      page: 1,
-      limita: 10,
-    };
-  },
-  created() {
-    this.getNewList();
-  },
-  methods: {
-    getNewList() {
-      article_list({
-        category_id: 35,
-        page: this.page,
-        limita: this.limita,
-      }).then(({ data: res }) => {
-        this.newList = res.data.list;
-        this.count = res.data.count;
-        this.page += 1;
-        console.log(this.newList);
-      });
-    },
-    goto(id) {
-      console.log(id);
-      this.$router.push({ path: "detail", query: { id: id } });
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.page-box {
-  margin-top: 40px;
-  width: 858px;
-  display: flex;
-  justify-content: center;
-}
-.newspan {
-  display: inline-block;
-  width: 858px;
-  line-height: 30px;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  font-size: 18px;
-  cursor:pointer;
-}
-.newspan:hover {
-  color: red;
-}
+<template>
+  <div class="association">
+    <toptip :currTitle="currTitle"></toptip>
+    <template>
+      <el-table :data="newList" style="width: 100%">
+        <el-table-column class="news-wrapper">
+          <template slot-scope="scope">
+            <div @click="goto(scope.row.id)" class="newspan">
+              <i class="el-icon-caret-right"></i>{{ scope.row.title }}
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </template>
+    <div class="page-box">
+      <el-pagination
+        background
+        layout="prev, pager, next"
+        :total="count"
+        prev-text="上一页"
+        next-text="下一页"
+      >
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import { article_list, article_info } from "../../request/api";
+import Toptip from "../../components/toptip";
+export default {
+  metaInfo: {
+    title: "科协新闻",
+  },
+  name: "Association",
+  components: {
+    Toptip,
+  },
+  data() {
+    return {
+      currTitle: "科协新闻",
+      newList: [],
+      count: 0,
+      page: 1,
+      limita: 10,
+    };
+  },
+  created() {
+    this.getNewList();
+  },
+  methods: {
+    getNewList() {
+      article_list({
+        category_id: 35,
+        page: this.page,
+        limita: this.limita,
+      }).then(({ data: res }) => {
+        this.newList = res.data.list;
+        this.count = res.data.count;
+        this.page += 1;
+        console.log(this.newList);
+      });
+    },
+    goto(id) {
+      console.log(id);
+      this.$router.push({ path: "detail", query: { id: id } });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.page-box {
+  margin-top: 40px;
+  width: 858px;
+  display: flex;
+  justify-content: center;
+}
+.newspan {
+  display: inline-block;
+  width: 858px;
+  line-height: 30px;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  font-size: 18px;
+  cursor:pointer;
+}
+.newspan:hover {
+  color: red;
+}
 </style>

+ 46 - 46
src/views/new/detail.vue

@@ -1,47 +1,47 @@
-<template>
-    <div class="detail">
-        <div class="title">{{list.title}}</div>
-        <div v-html="list.content"></div>
-    </div>
-</template>
-
-<script>
-import { article_info } from '../../request/api'
-export default {
-    metaInfo: {
-    title: "新闻详情",
-    },
-    name: 'Detail',
-    data() {
-        return {
-            list: {}
-        }
-    },
-    mounted() {
-        this.getListData()
-        
-    },
-    methods: {
-        getListData() {
-            // article_info()
-            let id = this.$route.query.id
-            console.log(id)
-            article_info({},id).then(({data: res}) => {
-                this.list = res.data
-                console.log(this.list)
-            })
-        }
-    }
-}
-</script>
-
-<style lang="scss" scoped>
-.title {
-    line-height: 1.5;
-    color: red;
-    font-size: 20px;
-    text-align: center;
-    margin: 40px auto 20px;
-    font-weight: bold;
-}
+<template>
+    <div class="detail">
+        <div class="title">{{list.title}}</div>
+        <div v-html="list.content"></div>
+    </div>
+</template>
+
+<script>
+import { article_info } from '../../request/api'
+export default {
+    metaInfo: {
+    title: "新闻详情",
+    },
+    name: 'Detail',
+    data() {
+        return {
+            list: {}
+        }
+    },
+    mounted() {
+        this.getListData()
+        
+    },
+    methods: {
+        getListData() {
+            // article_info()
+            let id = this.$route.query.id
+            console.log(id)
+            article_info({},id).then(({data: res}) => {
+                this.list = res.data
+                console.log(this.list)
+            })
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.title {
+    line-height: 1.5;
+    color: red;
+    font-size: 20px;
+    text-align: center;
+    margin: 40px auto 20px;
+    font-weight: bold;
+}
 </style>

+ 91 - 91
src/views/new/party.vue

@@ -1,92 +1,92 @@
-<template>
-  <div class="party">
-    <toptip :currTitle="currTitle"></toptip>
-    <template>
-      <el-table :data="newList" style="width: 100%">
-        <el-table-column>
-          <template slot-scope="scope">
-            <div @click="goto(scope.row.id)" class="newspan">
-              <i class="el-icon-caret-right"></i>{{ scope.row.title }}
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-    </template>
-    <div class="page-box">
-      <el-pagination
-        background
-        layout="prev, pager, next"
-        :total="count"
-        prev-text="上一页"
-        next-text="下一页"
-      >
-      </el-pagination>
-    </div>
-  </div>
-</template>
-
-<script>
-import { article_list, article_info } from "../../request/api";
-import Toptip from "../../components/toptip";
-export default {
-    metaInfo: {
-    title: "党建动态",
-  },
-  name: "Party",
-  components: {
-    Toptip,
-  },
-  data() {
-    return {
-      currTitle: "党建新闻",
-      newList: [],
-      count: 0,
-      page: 1,
-      limita: 10,
-    };
-  },
-  created() {
-    this.getNewList();
-  },
-  methods: {
-    getNewList() {
-      article_list({
-        category_id: 36,
-        page: this.page,
-        limita: this.limita,
-      }).then(({ data: res }) => {
-        this.newList = res.data.list;
-        this.count = res.data.count;
-        this.page += 1;
-        console.log(this.newList);
-      });
-    },
-    goto(id) {
-      console.log(id);
-      this.$router.push({path: 'detail',query: { id: id }})
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.page-box {
-  margin-top: 40px;
-  width: 858px;
-  display: flex;
-  justify-content: center;
-}
-.newspan {
-  display: inline-block;
-  width: 858px;
-  line-height: 30px;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  font-size: 18px;
-  cursor:pointer;
-}
-.newspan:hover {
-  color: red;
-}
+<template>
+  <div class="party">
+    <toptip :currTitle="currTitle"></toptip>
+    <template>
+      <el-table :data="newList" style="width: 100%">
+        <el-table-column>
+          <template slot-scope="scope">
+            <div @click="goto(scope.row.id)" class="newspan">
+              <i class="el-icon-caret-right"></i>{{ scope.row.title }}
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </template>
+    <div class="page-box">
+      <el-pagination
+        background
+        layout="prev, pager, next"
+        :total="count"
+        prev-text="上一页"
+        next-text="下一页"
+      >
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import { article_list, article_info } from "../../request/api";
+import Toptip from "../../components/toptip";
+export default {
+    metaInfo: {
+    title: "党建动态",
+  },
+  name: "Party",
+  components: {
+    Toptip,
+  },
+  data() {
+    return {
+      currTitle: "党建新闻",
+      newList: [],
+      count: 0,
+      page: 1,
+      limita: 10,
+    };
+  },
+  created() {
+    this.getNewList();
+  },
+  methods: {
+    getNewList() {
+      article_list({
+        category_id: 36,
+        page: this.page,
+        limita: this.limita,
+      }).then(({ data: res }) => {
+        this.newList = res.data.list;
+        this.count = res.data.count;
+        this.page += 1;
+        console.log(this.newList);
+      });
+    },
+    goto(id) {
+      console.log(id);
+      this.$router.push({path: 'detail',query: { id: id }})
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.page-box {
+  margin-top: 40px;
+  width: 858px;
+  display: flex;
+  justify-content: center;
+}
+.newspan {
+  display: inline-block;
+  width: 858px;
+  line-height: 30px;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  font-size: 18px;
+  cursor:pointer;
+}
+.newspan:hover {
+  color: red;
+}
 </style>

+ 91 - 91
src/views/new/study.vue

@@ -1,92 +1,92 @@
-<template>
-  <div class="study">
-    <toptip :currTitle="currTitle"></toptip>
-    <template>
-      <el-table :data="newList" style="width: 100%">
-        <el-table-column>
-          <template slot-scope="scope">
-            <div @click="goto(scope.row.id)" class="newspan">
-              <i class="el-icon-caret-right"></i>{{ scope.row.title }}
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-    </template>
-    <div class="page-box">
-      <el-pagination
-        background
-        layout="prev, pager, next"
-        :total="count"
-        prev-text="上一页"
-        next-text="下一页"
-      >
-      </el-pagination>
-    </div>
-  </div>
-</template>
-
-<script>
-import { article_list, article_info } from "../../request/api";
-import Toptip from "../../components/toptip";
-export default {
-    metaInfo: {
-    title: "学习强国",
-  },
-  name: "Study",
-  components: {
-    Toptip,
-  },
-  data() {
-    return {
-      currTitle: "学习强国",
-      page: 1,
-      limita: 10,
-      newList: [],
-      count: 0,
-    };
-  },
-  created() {
-    this.getNewList();
-  },
-  methods: {
-    getNewList() {
-      article_list({
-        category_id: 34,
-        page: this.page,
-        limita: this.limita,
-      }).then(({ data: res }) => {
-        this.newList = res.data.list;
-        this.count = res.data.count;
-        this.page += 1;
-        console.log(this.newList);
-      });
-    },
-    goto(id) {
-      console.log(id);
-      this.$router.push({path: 'detail',query: { id: id }})
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.page-box {
-  margin-top: 40px;
-  width: 858px;
-  display: flex;
-  justify-content: center;
-}
-.newspan {
-  display: inline-block;
-  width: 858px;
-  line-height: 30px;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  font-size: 18px;
-  cursor:pointer;
-}
-.newspan:hover {
-  color: red;
-}
+<template>
+  <div class="study">
+    <toptip :currTitle="currTitle"></toptip>
+    <template>
+      <el-table :data="newList" style="width: 100%">
+        <el-table-column>
+          <template slot-scope="scope">
+            <div @click="goto(scope.row.id)" class="newspan">
+              <i class="el-icon-caret-right"></i>{{ scope.row.title }}
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </template>
+    <div class="page-box">
+      <el-pagination
+        background
+        layout="prev, pager, next"
+        :total="count"
+        prev-text="上一页"
+        next-text="下一页"
+      >
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import { article_list, article_info } from "../../request/api";
+import Toptip from "../../components/toptip";
+export default {
+    metaInfo: {
+    title: "学习强国",
+  },
+  name: "Study",
+  components: {
+    Toptip,
+  },
+  data() {
+    return {
+      currTitle: "学习强国",
+      page: 1,
+      limita: 10,
+      newList: [],
+      count: 0,
+    };
+  },
+  created() {
+    this.getNewList();
+  },
+  methods: {
+    getNewList() {
+      article_list({
+        category_id: 34,
+        page: this.page,
+        limita: this.limita,
+      }).then(({ data: res }) => {
+        this.newList = res.data.list;
+        this.count = res.data.count;
+        this.page += 1;
+        console.log(this.newList);
+      });
+    },
+    goto(id) {
+      console.log(id);
+      this.$router.push({path: 'detail',query: { id: id }})
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.page-box {
+  margin-top: 40px;
+  width: 858px;
+  display: flex;
+  justify-content: center;
+}
+.newspan {
+  display: inline-block;
+  width: 858px;
+  line-height: 30px;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  font-size: 18px;
+  cursor:pointer;
+}
+.newspan:hover {
+  color: red;
+}
 </style>

+ 78 - 78
src/views/question/qinfo.vue

@@ -1,79 +1,79 @@
-<template>
-  <div class="qinfo">
-    <div class="title">{{ currTitle }}</div>
-    <div class="tip-1">
-      中国国际经济技术促进会科技项目转化工作委员会的智库专家团队
-    </div>
-    <div class="tip-1">拟邀智库专家(部分)</div>
-    <div class="jg"></div>
-    <div class="content-center" v-html="list.content"></div>
-  </div>
-</template>
-
-<script>
-import {article_info } from "../../request/api";
-
-export default {
-  name: "Qinfo",
-  data() {
-    return {
-      currTitle: "专家智库",
-      list: []
-    };
-  },
-  created() {
-    this.getThinkList();
-  },
-  methods: {
-    getThinkList() {
-      article_info({}, 40).then(({ data }) => {
-        this.list = data.data;
-        console.log(this.list)
-      });
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.jg{
-  height: 30px;
-  background-color: #fff;
-}
-.title {
-  color: #96311c;
-  text-align: center;
-  font-size: 20px;
-  margin: 45px auto;
-  font-weight: bold;
-  position: relative;
-  &::before {
-    background: url("../../assets/divbefore.png") no-repeat;
-    left: 265px;
-  }
-  &::after {
-    background: url("../../assets/divafter.png") no-repeat;
-    left: 474px;
-  }
-
-  &::before,
-  &::after {
-    width: 93px;
-    height: 5px;
-    content: "";
-    position: absolute;
-    top: 37%;
-    margin-top: -2px;
-    display: inline-block;
-    margin: 0 10px;
-  }
-}
-.tip-1 {
-  color: red;
-  text-align: center;
-  font-size: 24px;
-  font-weight: bold;
-  height: 40px;
-  line-height: 40px;
-}
+<template>
+  <div class="qinfo">
+    <div class="title">{{ currTitle }}</div>
+    <div class="tip-1">
+      中国国际经济技术促进会科技项目转化工作委员会的智库专家团队
+    </div>
+    <div class="tip-1">拟邀智库专家(部分)</div>
+    <div class="jg"></div>
+    <div class="content-center" v-html="list.content"></div>
+  </div>
+</template>
+
+<script>
+import {article_info } from "../../request/api";
+
+export default {
+  name: "Qinfo",
+  data() {
+    return {
+      currTitle: "专家智库",
+      list: []
+    };
+  },
+  created() {
+    this.getThinkList();
+  },
+  methods: {
+    getThinkList() {
+      article_info({}, 40).then(({ data }) => {
+        this.list = data.data;
+        console.log(this.list)
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.jg{
+  height: 30px;
+  background-color: #fff;
+}
+.title {
+  color: #96311c;
+  text-align: center;
+  font-size: 20px;
+  margin: 45px auto;
+  font-weight: bold;
+  position: relative;
+  &::before {
+    background: url("../../assets/divbefore.png") no-repeat;
+    left: 265px;
+  }
+  &::after {
+    background: url("../../assets/divafter.png") no-repeat;
+    left: 474px;
+  }
+
+  &::before,
+  &::after {
+    width: 93px;
+    height: 5px;
+    content: "";
+    position: absolute;
+    top: 37%;
+    margin-top: -2px;
+    display: inline-block;
+    margin: 0 10px;
+  }
+}
+.tip-1 {
+  color: red;
+  text-align: center;
+  font-size: 24px;
+  font-weight: bold;
+  height: 40px;
+  line-height: 40px;
+}
 </style>