From f84c760b85e4fb956cf3a300376f2d5111a70bef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E4=B8=BD=E5=90=9B?= <664953382@qq.com>
Date: Wed, 17 Nov 2021 13:48:47 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=B7=BB=E5=8A=A0=E5=88=9B?=
 =?UTF-8?q?=E6=96=B0=E6=9C=8D=E5=8A=A1=E5=8D=A1=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/home/home.js          |  14 ++++++
 src/assets/image/icon_cx.png  | Bin 0 -> 765 bytes
 src/assets/image/icon_cx2.png | Bin 0 -> 1090 bytes
 src/views/about.vue           |  49 +++++++++-----------
 src/views/home/home.vue       |  84 ++++++++++++++++++++++++++++++++--
 5 files changed, 116 insertions(+), 31 deletions(-)
 create mode 100644 src/assets/image/icon_cx.png
 create mode 100644 src/assets/image/icon_cx2.png

diff --git a/src/api/home/home.js b/src/api/home/home.js
index 741b66a..575ed0a 100644
--- a/src/api/home/home.js
+++ b/src/api/home/home.js
@@ -43,6 +43,20 @@ export function getInformation2(params) {
     params
   });
 }
+// 获取科技创新
+export function getScienceInnovate(params) {
+  return request({
+    url: '/mobile/getScienceInnovate',
+    params
+  });
+}
+// 获取科技创新数据回显
+export function getInfo(params) {
+  return request({
+    url: '/mobile/getInfo',
+    params
+  });
+}
 // 获取关于我们
 export function getAboutUs(params) {
   return request({
diff --git a/src/assets/image/icon_cx.png b/src/assets/image/icon_cx.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a61f8b63a32c9182931bba52821ef058e5853a2
GIT binary patch
literal 765
zcmV<Z0s{SsP)<h;3K|Lk000e1NJLTq000&M000yS1^@s6iG0m400001b5ch_0Itp)
z=>Px%w@E}nR5(waluc+<XB38?_ZuY}aiij*l!~!boI9ov5ncEP3hJUotx@XSiA4~^
zMO_FAf{G#~;zBnCMJ>)9<8MXK7Oe^vkp>kpnQQz*1R>fgf(xZZbH7t&GUf+o63n+e
z=e!T^eb4t@QR7$?Ttl=d8=tQ>V)@LRaz8B2sMgmY;BCNMh4H+q;6iW#)UIrC)2D%3
zgYhIh1)Hw$ZhL>RMd=364M-*^y!ZT*z@=f!2ZxXzDlE1P1P9xJaSG%0wZ6D!6lL%>
z9QB!nI2L2ngEyo{80X2xmnEzw*rH$o=Gv9(crnn`)UUu7fN3?vZJ7IBxsE3TbcIQy
zQC*`f3QhpufStp;1LTTVI1)@GMH?`-mZM6&ixJG^e%wWUdI56HVBZ2a%Td^|;B&fJ
z1LW{NhjTkiH)05APrDS0+-^t?VjRaSuhsG6k21E_%w!U~SAo6*ZUA2cqbjwxKqt@$
zxN^<=FVx)mw7-#$!G$1;5mnqQ1HD4}8~mLT0;~bEF(@?!>~IfEOB5E*4i1hoKlBOQ
zY?L&T(yt`840uPkE|StB#AD2U?=hez<%*|<a6EMe=Krb;{eyHG*pIjANFH$uvvt7o
z-sPIhDAy5J1zS|UUMq1)D?arb@MYhimLR_xbFUG9V0N@0<Tfr@iBGKpcT8c&gK{{Q
z&#VPogGhr;<J}fqQi5LTT@L-g##Lm$RKWk@Gz;JT3{ty*Cg2wEvn)#Q2d-0RXVldB
z=7ST<2TKtrfmCTZy^j09|6y9FT=CCdP3dt^m&G(~@F!geE@8|^EXCV*$i3$SSe#Kd
zE-kd`83LSX!E6Pxjd=C^cb&Ci+Jkgh+2W4jfsZtN#)$Xhs*1ZuzEpF2*YLnmuow8T
vhIpUCc*F3(`Sedno2!d$r^35iYk~g<n$Qwb9ME(=00000NkvXXu0mjfZVX|S

literal 0
HcmV?d00001

diff --git a/src/assets/image/icon_cx2.png b/src/assets/image/icon_cx2.png
new file mode 100644
index 0000000000000000000000000000000000000000..86d94bd4b3875c7b623d89111fc3cc43a89ea81e
GIT binary patch
literal 1090
zcmV-I1ikx-P)<h;3K|Lk000e1NJLTq002(_000mO1^@s6SL`CB00001b5ch_0Itp)
z=>Px&{7FPXR9HvVSj}1EFc5v?ZyN|Dgd@o*lt4;=3mf*9lt4-#C6L<^xR4S^3FMS;
zT$iwJ05rQJ$+Be0v4Q2Vx<LFRX`bGDGh>1s{4g9r;jH`}{LQeT%iXqqk5?zR08RCE
z!iK)@$Nn?CI=KPpT3=&q>1ux(+`k*1gV3+8sh)e@n~(2?QxJN|y_vc5aGu1I3S0WI
z+l2cYUITm+KFv!Y%Ny5nfFURMzaMDyCNF97GUJC~9}4ICc7_d<n%2QH&+xC7#dBmd
zKKPsu-u>VS+;Ff!4)Dh9qj6!H(`2{s$kJt>2g2Z`2j1W}(0IB9P4-9pb9jb~pA3^|
z22!I>fOi4K&$Uxu1DRnsqoAwZQvdrE;2oZ`m3V*!kF|XG(Y>K)jBhA{;N+TSTq}4z
zD0K~F#lamYY~5UXUOJ}BT~aQ*8VHk(yyehDrsX~&=2Z*}Yz5wRZBY_0>BF%~TG!X-
zhoQtG)?=)x9E1&sW}127BG4=|*L^nf0xH|Ifv4Zoi?T4;c^%&ko<SIyjnWZbG5QdA
z;5C543#cYr15(V^P_{Pi%9BH2=6FLN#J8~;t9i%<Dkp0VnHMy9nWsR7qKh{0Dqmzt
z6n0LUd&Vq*FO121YzHqQwr0?52$&bs`NQDp7=0^h6RV=JpL7g(Z;-6loXre_M23Y6
zxXJUnZbrYaPqum3&AtmfkrY#qRUN6qgkkN)Rs+E<<RE24_X;r0OD{IE?P8v?sW)1*
zGVg1^tCCsWdpl=afF^q(i>(;yC5kDxw3k`$ZS*|G7DVfR4xWF2ktDpNz^ht~mC<of
zx-iXLwp|U_%`4BnqTie_nu%<|ODm08)Mq@|n01x;Q&Wni#LP1_UF3NknP=Yff=w;#
zq~%UOuKSw6Yx6u`wi%XSe$+LhSEP4RTATj~5mMkG%jQs+!at4w3cRwQ7Vj#3%PUp7
z*wiP$TSV3WyTB7k%255VMzR@Il8;|ti*MCC4$Hit>@ji@GnY25ti7Ua3$Wbt+CE(#
zowl}^dV0E`tDTfX!AM$A1M@x!o-JzY8C4st_==P+9<bJ^Q=S*KdvT4J08dBd_pCWh
z_Qw$*rdY1JoJ4=_9I&1Uld`p$B*|JvE~jGH5X-v!Fi?4(FB_Z9bdM^{w~Xqef@Hal
z;GG6Nb)v%nv3Okgkt5N;MBeAIGyWJ+Q&HOU4vF3WKu~M`?WxsdChe9d9|27O<28tS
zF2MINFRl+m=IMlCfpbhZaxaU2{j1)RO0Q}YWvs>oCSL?z`L&|#Q)BQXK)pj}>`P=>
zXcd*`h0<yR&yQ2e8s=NOPGNm7w+Ae8E%)Z`IhnR4mA`ZU0rq)L{$fNA>i_@%07*qo
IM6N<$f(q9XG5`Po

literal 0
HcmV?d00001

diff --git a/src/views/about.vue b/src/views/about.vue
index f66a027..6166e3f 100644
--- a/src/views/about.vue
+++ b/src/views/about.vue
@@ -6,30 +6,18 @@
 
     <div class="my_main content p0-100 min_h_285" style="display: flex">
       <div class="l" style="width: 77%; background-color: #fff; padding: 30px">
+        <div
+          v-if="innovateInfo.id"
+          style="text-align:center;font-weight: bold;font-size: 18px"
+        >
+          {{ innovateInfo.title }}
+        </div>
         <div id="text" class="ql-editor">
           <!-- :class="type == 'policy' && aboutInfo.method == 1 ? '' : 'ql-editor'" -->
           <!-- <editor v-model="aboutInfo.text" :min-height="192" /> -->
-          <div v-html="aboutInfo.evenMore" />
+          <div v-html="aboutInfo.evenMore" v-if="aboutInfo.id" />
+          <div v-html="innovateInfo.details" v-else />
         </div>
-        <!-- <h2 style="text-align:center">关于我们</h2>
-        <p style="color:#999;line-height:1.75;text-indent:2em">
-          合肥嘉策信息技术服务有限公司成立于2018年05月22日，注册地位于安徽省合肥市高新区嶺湖墅76幢508室，法定代表人为时加红。经营范围包括信息系统集成咨询及服务；软件开发、技术服务、技术咨询、技术推广、技术转让；数据分析、加工、处理；基础软件服务；应用软件服务；机器人系统集成设备、工业智能装备及自动化辅助设备研发及销售；计算机设备及配件、计算机耗材用品、网络设备及材料、节能设备的研发和销售。（依法须经批准的项目，经相关部门批准后方可开展经营活动）
-        </p>
-        <div style="text-align:center">
-          <img src="@/assets/image/03.png" alt="" />
-        </div>
-        <p style="color:#999;line-height:1.75;text-indent:2em">
-          合肥嘉策信息技术服务有限公司成立于2018年05月22日，注册地位于安徽省合肥市高新区嶺湖墅76幢508室，法定代表人为时加红。经营范围包括信息系统集成咨询及服务；软件开发、技术服务、技术咨询、技术推广、技术转让；数据分析、加工、处理；基础软件服务；应用软件服务；机器人系统集成设备、工业智能装备及自动化辅助设备研发及销售；计算机设备及配件、计算机耗材用品、网络设备及材料、节能设备的研发和销售。（依法须经批准的项目，经相关部门批准后方可开展经营活动）
-        </p>
-        <div style="text-align:center">
-          <img src="@/assets/image/03.png" alt="" />
-        </div>
-        <p style="color:#999;line-height:1.75;text-indent:2em">
-          合肥嘉策信息技术服务有限公司成立于2018年05月22日，注册地位于安徽省合肥市高新区嶺湖墅76幢508室，法定代表人为时加红。经营范围包括信息系统集成咨询及服务；软件开发、技术服务、技术咨询、技术推广、技术转让；数据分析、加工、处理；基础软件服务；应用软件服务；机器人系统集成设备、工业智能装备及自动化辅助设备研发及销售；计算机设备及配件、计算机耗材用品、网络设备及材料、节能设备的研发和销售。（依法须经批准的项目，经相关部门批准后方可开展经营活动）
-        </p>
-        <div style="text-align:center">
-          <img src="@/assets/image/03.png" alt="" />
-        </div> -->
       </div>
       <div
         class="r"
@@ -87,7 +75,7 @@ import {
   getInfo3
 } from '@/api/search';
 import { getPolicyList, getRead } from '@/api/home/notice';
-import { getAboutUs } from '@/api/home/home';
+import { getAboutUs, getInfo as getDetails } from '@/api/home/home';
 import { mapGetters } from 'vuex';
 import { add, cancel } from '@/api/search';
 import Editor from '@/components/Editor';
@@ -107,7 +95,8 @@ export default {
       type: '',
       noticeList: [],
       total: {},
-      aboutInfo: {}
+      aboutInfo: {},
+      innovateInfo: {}
     };
   },
   computed: {
@@ -115,15 +104,19 @@ export default {
   },
   methods: {},
   created() {
-    let { key, id } = this.$route.query;
-    this.type = key;
-
+    let { id } = this.$route.query;
+    if (id) {
+      getDetails({ id }).then(res => {
+        this.innovateInfo = res.data;
+      });
+    } else {
+      getAboutUs().then(res => {
+        this.aboutInfo = res.data;
+      });
+    }
     getPolicyList({ pageNum: 1, pageSize: 5 }).then(({ data }) => {
       this.noticeList = data.list;
     });
-    getAboutUs().then(res => {
-      this.aboutInfo = res.data;
-    });
   }
 };
 </script>
diff --git a/src/views/home/home.vue b/src/views/home/home.vue
index b464221..0da474c 100644
--- a/src/views/home/home.vue
+++ b/src/views/home/home.vue
@@ -228,8 +228,7 @@
           <img
             src="@/assets/image/icon_l.png"
             alt=""
-            style="vertical-align:
-          middle;margin-right: 3px;"
+            style="margin-right: 3px;"
           />
           <img src="@/assets/image/icon_r.png" alt="" />
         </p>
@@ -398,6 +397,30 @@
           </div>
         </div>
       </div>
+      <div style="padding:0 15px">
+        <p style="margin-bottom:0">
+          <img
+            src="@/assets/image/icon_cx.png"
+            alt=""
+            style="margin-right: 3px;"
+          />
+          <img src="@/assets/image/icon_cx2.png" alt="" />
+        </p>
+        <div class="advert">
+          <div class="item" v-for="item in innovateList" :key="item.id">
+            <router-link
+              target="_blank"
+              :to="{ path: '/about', query: { id: item.id } }"
+            >
+              <img :src="item.pic" alt="" />
+              <div class="card">
+                <div class="title text_hidden_one">{{ item.title }}</div>
+                <div class="text text_hidden_one" v-html="item.details"></div>
+              </div>
+            </router-link>
+          </div>
+        </div>
+      </div>
     </div>
     <div class="about">
       <div class="p0-100">
@@ -470,7 +493,8 @@ import {
   getPolicyRead,
   getInformation,
   getAboutUs,
-  getPartner
+  getPartner,
+  getScienceInnovate
 } from '@/api/home/home';
 import vueSeamlessScroll from 'vue-seamless-scroll';
 export default {
@@ -481,6 +505,7 @@ export default {
     return {
       listData: [],
       listData2: [],
+      innovateList: [], // 创新服务列表
       classOption: {
         step: 1,
         limitMoveNum: 8,
@@ -546,6 +571,9 @@ export default {
     getInformation(this.queryParams3).then(({ data }) => {
       this.list3 = data.list;
     });
+    getScienceInnovate().then(({ data }) => {
+      this.innovateList = data;
+    });
     getAboutUs().then(res => {
       this.aboutInfo = res.data;
     });
@@ -786,6 +814,56 @@ export default {
     }
   }
 }
+.advert {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  .item {
+    width: 24%;
+    margin-top: 12px;
+    position: relative;
+    &:nth-child(n + 5) {
+      margin-bottom: 0;
+    }
+    img {
+      width: 100%;
+      max-height: 165px;
+    }
+    .card {
+      padding: 0 15px;
+      width: 80%;
+      height: 70px;
+      text-align: center;
+      position: absolute;
+      bottom: 15px;
+      right: 10%;
+      // background: linear-gradient(to right, #8d9cff 0%, #7679ff 100%);
+      background-color: #3394ff;
+      opacity: 0.9;
+      font-size: 15px;
+      color: #fff;
+      cursor: pointer;
+      transition: bottom 0.5s;
+      &:hover {
+        bottom: 30px;
+        transition: bottom 0.5s;
+      }
+      .title {
+        width: 100%;
+        margin: 10px 0;
+      }
+      /deep/.text > p {
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        width: 100%;
+        margin: 0;
+        font-size: 12px;
+        color: #fff;
+      }
+    }
+  }
+}
 .city_list {
   margin-top: 10px;
   padding: 10px 0;