0325审核修改

4 years ago · c0b153f5e5
11 changed files with 16220 additions and 56 deletions
--- a/package-lock.json
+++ b/package-lock.json
--- a/src/assets/logo_btm.png
+++ b/src/assets/logo_btm.png
--- a/src/assets/xtgs.png
+++ b/src/assets/xtgs.png
--- a/src/assets/xtgs02.png
+++ b/src/assets/xtgs02.png
--- a/src/components/FooterPage/FooterPage.vue
+++ b/src/components/FooterPage/FooterPage.vue
@ -3,14 +3,14 @@
 * @email: 18603454788@163.com
 * @Date: 2021-01-13 16:33:32
 * @LastEditors: wally
- * @LastEditTime: 2021-03-24 19:00:22
+ * @LastEditTime: 2021-03-25 18:27:53
 -->
 <template>
  <div>
    <div class="footer">
      <div class="d-flex flex-nowrap inner">
        <div class="box">
-          <img class="pic" src="~assets/logo_bottom.png" />
+          <img class="pic" src="~assets/logo_btm.png" />
        </div>
        <div class="box flex-1 d-flex flex-column" style="padding-left: 13%">
          <div class="title">发现</div>
@ -26,7 +26,7 @@
          <div class="font-bold-24 mt-3" style="font-style: italic">18003513318</div>
        </div>
        <div class="box">
-          <img class="pic" src="https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/logo/lvgu.jpg" />
+          <img class="pic" src="https://www.sxwikionline.com/gateway/wiki/uploads/upload/logo/csd.jpg" />
        </div>
        <div class="visit-num">当前访问量：5000</div>
      </div>
@ -68,7 +68,7 @@ export default {
 }

 .pic {
-  width: 130px;
+  width: 180px;
 }

 .box {
--- a/src/components/Introduce/Pter.vue
+++ b/src/components/Introduce/Pter.vue
@ -3,7 +3,7 @@
 * @email: 18603454788@163.com
 * @Date: 2021-01-13 18:36:52
 * @LastEditors: wally
- * @LastEditTime: 2021-01-15 22:47:27
+ * @LastEditTime: 2021-03-25 18:29:05
 -->
 <template>
  <div>
@ -18,6 +18,12 @@
            <img :src="list.logoUrl" class="fill-height" v-if="list.logoUrl" />
          </div>
        </div>
+
+        <div class="partner-content-box d-flex flex-wrap" v-if="item.unimportanceList && item.unimportanceList.length > 0">
+          <div :class="(q + 1) % 4 === 0 ? 'mr0' : ''" :key="q" class="item-box" v-for="(list, q) in item.unimportanceList">
+            <img :src="list.logoUrl" class="fill-height" v-if="list.logoUrl" />
+          </div>
+        </div>
      </div>
    </div>
  </div>
@ -48,6 +54,7 @@ export default {
  computed: mapState('home', ['partners']),

  async created() {
+    console.log(this.partners);
    this.setPartners([]);
    const { title, typeOfPlatform } = this;
    console.log('title, typeOfPlatform : ', title, typeOfPlatform);
--- a/src/views/FirstPage/FirstPage.vue
+++ b/src/views/FirstPage/FirstPage.vue
@ -74,18 +74,19 @@ export default {
          url: 'https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/logo/index01.png',
          path: '/Policy',
        },
-        {
-          id: 2,
-          name: '双创活动',
-          url: 'https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/logo/index02.png',
-          path: '/Activity',
-        },
        {
          id: 3,
          name: '创新服务',
          url: 'https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/logo/index03.png',
          path: '/ServiceMarket/Institute',
        },
+        {
+          id: 2,
+          name: '双创活动',
+          url: 'https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/logo/index02.png',
+          path: '/Activity',
+        },
+
        {
          id: 4,
          name: '创新挑战',
--- a/src/views/ServiceMarket/Children/Institute.vue
+++ b/src/views/ServiceMarket/Children/Institute.vue
@ -6,7 +6,7 @@
      <div class="flex-1">
        <div class="px-3 py-10">
          <div class="d-flex flex-row fill-width justify-center py-10">
-            <img src="~assets/fwcs01.png" />
+            <img src="~assets/xtgs.png" />
          </div>
          <div>
            <div class="font-16 textColor line-height-36" style="text-indent: 2em">
@ -26,7 +26,7 @@
        <div class="flex-1">
          <div class="px-3 py-10">
            <div class="d-flex flex-row fill-width justify-center py-10">
-              <img src="~assets/fwcs02.png" />
+              <img src="~assets/xtgs02.png" />
            </div>
            <div>
              <div class="font-16 textColor line-height-36" style="text-indent: 2em">
--- a/src/views/ServiceMarket/Children/ServiceDet.vue
+++ b/src/views/ServiceMarket/Children/ServiceDet.vue
@ -3,15 +3,15 @@
 * @email: 18603454788@163.com
 * @Date: 2021-01-14 16:25:40
 * @LastEditors: wally
- * @LastEditTime: 2021-03-24 18:26:50
+ * @LastEditTime: 2021-03-25 18:09:23
 -->
 <template>
  <div>
-    <div class="posi-name">
-      <p class="service-name">{{ obj.name }}</p>
-      <p class="service-eng">SERVICE</p>
-    </div>
    <div class="inner service-box">
+      <div class="posi-name">
+        <p class="service-name">{{ obj.name }}</p>
+        <p class="service-eng">SERVICE</p>
+      </div>
      <div style="margin-bottom: 40px" v-dompurify-html="obj.content"></div>
      <!-- <div
        style="margin-bottom: 40px"
@ -88,11 +88,11 @@ export default {
 }

 .posi-name {
-  position: absolute;
-  left: 20%;
-  top: 260px;
-  color: #fff;
-  text-align: center;
+  // position: absolute;
+  // left: 20%;
+  margin-top: 10px;
+  color: #000;
+  text-align: left;
 }

 .service-name {
--- a/src/views/ServiceMarket/components/LeftNav.vue
+++ b/src/views/ServiceMarket/components/LeftNav.vue
@ -3,7 +3,7 @@
 * @email: 18603454788@163.com
 * @Date: 2021-01-13 17:25:56
 * @LastEditors: wally
- * @LastEditTime: 2021-03-24 17:30:01
+ * @LastEditTime: 2021-03-25 18:23:00
 -->
 <template>
  <div class="nav-box">
@ -27,14 +27,14 @@ export default {
      str: '导航条',
      activeNum: 0,
      list: [
-        {
-          title: '创新研究院',
-          url: '/ServiceMarket/Institute',
-        },
        {
          title: '科技创新服务',
          url: '/ServiceMarket/InnovativeService',
        },
+        {
+          title: '创新研究院',
+          url: '/ServiceMarket/Institute',
+        },
        {
          title: '合作伙伴',
          url: '/ServiceMarket/Partner',
@ -44,11 +44,11 @@ export default {
  },
  created() {
    if (this.$route.fullPath === '/ServiceMarket/InnovativeService') {
-      this.activeNum = 1;
+      this.activeNum = 0;
    } else if (this.$route.fullPath === '/ServiceMarket/Partner') {
      this.activeNum = 2;
    } else {
-      this.activeNum = 0;
+      this.activeNum = 1;
    }
  },
  methods: {
--- a/yarn.lock
+++ b/yarn.lock
@ -1717,8 +1717,8 @@
    "color-convert" "^2.0.1"

 "ansi-styles@^4.1.0":
-  "integrity" "sha1-7dgDYornHATIWuegkG7a00tkiTc="
-  "resolved" "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1606792302448&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz"
+  "integrity" "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="
+  "resolved" "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"
  "version" "4.3.0"
  dependencies:
    "color-convert" "^2.0.1"
@ -2563,8 +2563,8 @@
    "supports-color" "^7.1.0"

 "chalk@^4.1.0":
-  "integrity" "sha1-ThSHCmGNni7dl92DRf2dncMVZGo="
-  "resolved" "https://registry.npm.taobao.org/chalk/download/chalk-4.1.0.tgz"
+  "integrity" "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A=="
+  "resolved" "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz"
  "version" "4.1.0"
  dependencies:
    "ansi-styles" "^4.1.0"
@ -2785,8 +2785,8 @@
    "color-name" "1.1.3"

 "color-convert@^2.0.1":
-  "integrity" "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM="
-  "resolved" "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz"
+  "integrity" "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="
+  "resolved" "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"
  "version" "2.0.1"
  dependencies:
    "color-name" "~1.1.4"
@ -2797,8 +2797,8 @@
  "version" "1.1.3"

 "color-name@~1.1.4":
-  "integrity" "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI="
-  "resolved" "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz"
+  "integrity" "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+  "resolved" "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
  "version" "1.1.4"

 "color-string@^1.5.4":
@ -4739,8 +4739,8 @@
  "version" "3.0.0"

 "has-flag@^4.0.0":
-  "integrity" "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s="
-  "resolved" "https://registry.npm.taobao.org/has-flag/download/has-flag-4.0.0.tgz"
+  "integrity" "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+  "resolved" "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
  "version" "4.0.0"

 "has-symbols@^1.0.1":
@ -6302,8 +6302,8 @@
  "version" "1.0.4"

 "moment@^2.21.0", "moment@^2.29.1":
-  "integrity" "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
-  "resolved" "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz"
+  "integrity" "sha1-sr52n6MZQL6e7qZGnAdeNQBvo9M="
+  "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"
  "version" "2.29.1"

 "move-concurrently@^1.0.1":
@ -8865,8 +8865,8 @@
    "has-flag" "^4.0.0"

 "supports-color@^7.1.0":
-  "integrity" "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo="
-  "resolved" "https://registry.npm.taobao.org/supports-color/download/supports-color-7.2.0.tgz"
+  "integrity" "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="
+  "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"
  "version" "7.2.0"
  dependencies:
    "has-flag" "^4.0.0"
@ -9505,8 +9505,8 @@
  "version" "2.3.4"

 "vue-loader-v16@npm:vue-loader@^16.0.0-beta.7":
-  "integrity" "sha1-XAO2xQ0qX5g8fOuhXFDXjKKymPQ="
-  "resolved" "https://registry.npm.taobao.org/vue-loader/download/vue-loader-16.1.2.tgz?cache=0&sync_timestamp=1608188050165&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-loader%2Fdownload%2Fvue-loader-16.1.2.tgz"
+  "integrity" "sha512-8QTxh+Fd+HB6fiL52iEVLKqE9N1JSlMXLR92Ijm6g8PZrwIxckgpqjPDWRP5TWxdiPaHR+alUWsnu1ShQOwt+Q=="
+  "resolved" "https://registry.npmjs.org/vue-loader/-/vue-loader-16.1.2.tgz"
  "version" "16.1.2"
  dependencies:
    "chalk" "^4.1.0"