首页

README.md

@@ -1,4 +1,4 @@
-# green-valley
+# wiki
 
 ## Project setup
 ```

package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "green-valley",
+  "name": "wiki",
   "version": "0.1.0",
   "lockfileVersion": 1,
   "requires": true,
@@ -8429,8 +8429,8 @@
     },
     "moment": {
       "version": "2.29.1",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/moment/download/moment-2.29.1.tgz?cache=0&sync_timestamp=1601983423917&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmoment%2Fdownload%2Fmoment-2.29.1.tgz",
-      "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
+      "integrity": "sha1-sr52n6MZQL6e7qZGnAdeNQBvo9M="
     },
     "move-concurrently": {
       "version": "1.0.1",

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "green-valley",
+  "name": "wiki",
   "version": "0.1.0",
   "private": true,
   "scripts": {

src/common/portrait.styl

@@ -99,6 +99,11 @@
   padding-bottom: 20px;
 }
 
+.py-8{
+  padding-top: 32px;
+  padding-bottom: 32px;
+}
+
 .py-10{
   padding-top: 40px;
   padding-bottom: 40px;
@@ -138,6 +143,31 @@
   margin-bottom: 20px;
 }
 
+.my-6{
+  margin-top: 24px;
+  margin-bottom: 24px;
+}
+
+.my-7{
+  margin-top: 28px;
+  margin-bottom: 28px;
+}
+
+.my-8{
+  margin-top: 32px;
+  margin-bottom: 32px;
+}
+
+.my-9{
+  margin-top: 36px;
+  margin-bottom: 36px;
+}
+
+.my-10{
+  margin-top: 40px;
+  margin-bottom: 40px;
+}
+
 .mt-1{
   margin-top: 4px;
 }
@@ -263,6 +293,11 @@
   background: white;
 }
 
+.grey {
+  background: #DCDCDC;
+}
+
+
 // flex
 .d-flex{
   display: flex;
@@ -300,6 +335,10 @@
   justify-content: space-between;
 }
 
+.justify-space-around{
+  justify-content: space-around;
+}
+
 .align-center{
   align-items: center
 }
@@ -377,6 +416,19 @@ img{
   font-size: 32px;
 }
 
+.font-bold-30{
+  font-size: 30px;
+  font-weight: bold;
+}
+
+.font-30{
+  font-size: 30px;
+}
+
+.font-26{
+  font-size: 26px;
+}
+
 .font-bold-24{
   font-size: 24px;
   font-weight: bold;
@@ -428,7 +480,7 @@ h2{
 }
 
 .baseColor{
-  color: #13ACC4
+  color: #007CC1
 }
 
 .bg{
@@ -441,13 +493,13 @@ h2{
 }
 
 .ant-btn-primary{
-  background-color: #13ACC4
+  background-color: #007CC1
-  border-color: #13ACC4;
+  border-color: #007CC1;
   color: #fff!important;
 }
 
 .ant-btn-link:hover, .ant-btn-link:focus{
-  color: #13ACC4;
+  color: #007CC1;
 }
 
 .ant-btn-link{
@@ -469,13 +521,15 @@ h2{
 }
 
 .base-bg{
-  background: #13ACC4
+  background: #007CC1
 }
 
 .second-base-bg{
   background: #AACD06
 }
 
+
+
 // 文字颜色
 .white--text{
   color: #fff

src/components/FooterPage/FooterPage.vue

@@ -8,7 +8,7 @@
         <div class="box flex-1 d-flex flex-column" style="padding-left: 13%;">
           <div class="title">发现</div>
           <span>创新挑战</span>
-          <span>创新平台</span>
+          <span>服务超市</span>
           <span>孵化平台</span>
           <span>产业平台</span>
           <span>在线社区</span>
@@ -17,15 +17,13 @@
           <div class="title">资讯</div>
           <span>行业资讯</span>
           <span>活动公告</span>
-          <span>国家政策</span>
+          <span>政策查询</span>
-          <span>行业资讯</span>
-          <span>省级政策</span>
         </div>
         <div class="box flex-1 d-flex flex-column">
           <div class="title">联系我们</div>
           <span>我要入驻</span>
           <span>人才招聘</span>
-          <div>400-789-789</div>
+          <div class="font-bold-24 mt-3" style="font-style: italic;">400-789-789</div>
         </div>
         <div class="box">
           <img

src/components/Rotation/Rotation.vue

@@ -1,6 +1,5 @@
 <template>
   <div class="head">
-    <img class="settle-in" src="~assets/settleIn.png" />
     <a-carousel :autoplay-speed="time" autoplay>
       <div :key="item.id" class="img-box" v-for="item in lists">
         <img :src="item.url" alt />
@@ -43,20 +42,13 @@ export default {
 <style lang="stylus">
 .head {
   background: white;
-  max-height: 440px;
+  max-height: 350px;
   overflow: hidden;
   position: relative;
 }
 
-.settle-in {
-  position: absolute;
-  top: 10%;
-  right: 9%;
-  z-index: 9;
-}
-
 .img-box {
-  height: 380px;
+  height: 350px;
   width: 100%;
 
   img {

src/views/FirstPage/FirstPage.vue

@@ -6,7 +6,60 @@
 <template>
   <div>
     <rotation />
-    <div class="inner"></div>
+    <div class="white py-10">
+      <div class="inner">
+        <div class="d-flex flex-nowrap justify-space-around">
+          <div class="d-flex flex-column align-center">
+            <img src="~assets/index01.png" />
+            <span class="font-26 textColor mt-8">创新政策</span>
+          </div>
+          <div class="d-flex flex-column align-center">
+            <img src="~assets/index02.png" />
+            <span class="font-26 textColor mt-8">创新政策</span>
+          </div>
+          <div class="d-flex flex-column align-center">
+            <img src="~assets/index03.png" />
+            <span class="font-26 textColor mt-8">创新政策</span>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="inner">
+      <!-- floor2 -->
+      <div class="d-flex flex-nowrap justify-space-around">
+        <div class="d-flex flex-column align-center mr-2">
+          <img src="~assets/index04.png" />
+          <div class="font-26 textColor title grey">数智开发</div>
+        </div>
+        <div class="d-flex flex-column align-center ml-2">
+          <img src="~assets/index05.png" />
+          <div class="font-26 textColor title grey">创新挑战</div>
+        </div>
+      </div>
+      <!-- 行业资讯 -->
+      <div class="d-flex flex-column" style="margin-top:60px">
+        <div class="new-title base-bg font-bold-30 white--text">行业资讯</div>
+        <div class="py-8 white">
+          <div
+            :key="index"
+            class="font-20 d-flex flex-nowrap justify-start px-10 py-4"
+            v-for="(list,index) in lists"
+          >
+            <div class="textColor new-txt">{{ list.title }}</div>
+            <div
+              class="secondary new-time"
+              v-if="list.time"
+            >{{ $moment(+list.time).format('YYYY-MM-DD') }}</div>
+          </div>
+        </div>
+      </div>
+      <!-- 创业学院 -->
+      <div class="d-flex flex-column">
+        <div class="baseColor font-bold-30 mt-2 py-8">创业学院</div>
+        <img class="fill-width" src="~assets/index06.png" />
+      </div>
+    </div>
   </div>
 </template>
 
@@ -18,10 +71,29 @@ import {} from 'config/api';
 export default {
   components: { Rotation },
   data() {
-    return {};
+    return {
+      lists: [],
+    };
+  },
+  created() {
+    this.getIndustryInfoLists();
+  },
+
+  methods: {
+    ...mapActions('home', ['getIndustryInfoList']),
+
+    // 获取行业资讯列表
+    async getIndustryInfoLists() {
+      const params = {
+        param: {
+          pageNum: 1,
+          pageSize: 4,
+        },
+      };
+      const res = await this.getIndustryInfoList(params);
+      this.lists = res.list;
+    },
   },
-  created() {},
-  methods: {},
 };
 </script>
 
@@ -29,4 +101,30 @@ export default {
 .inner {
   margin: 40px auto;
 }
+
+.title {
+  width: 100%;
+  text-align: center;
+  height: 129px;
+  line-height: 129px;
+}
+
+.new-title {
+  width: 100%;
+  text-align: center;
+  height: 88px;
+  line-height: 88px;
+}
+
+.new-txt {
+  width: 70%;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.new-time {
+  width: 30%;
+  text-align: right;
+}
 </style>