diff --git a/src/assets/banner/banner5.png b/src/assets/banner/banner5.png new file mode 100644 index 0000000..828c643 Binary files /dev/null and b/src/assets/banner/banner5.png differ diff --git a/src/assets/banner/banner6.png b/src/assets/banner/banner6.png new file mode 100644 index 0000000..71db0ce Binary files /dev/null and b/src/assets/banner/banner6.png differ diff --git a/src/assets/banner/banner7.png b/src/assets/banner/banner7.png new file mode 100644 index 0000000..4cd6580 Binary files /dev/null and b/src/assets/banner/banner7.png differ diff --git a/src/common/portrait.styl b/src/common/portrait.styl index e61c80d..0c47a22 100644 --- a/src/common/portrait.styl +++ b/src/common/portrait.styl @@ -442,6 +442,15 @@ img{ font-weight: bold; } +.font-bold-18{ + font-size: 18px; + font-weight: bold; +} + +.font-18{ + font-size: 18px; +} + .font-bold-16{ font-size: 16px; font-weight: bold; @@ -552,3 +561,58 @@ h2{ .line-height-36{ line-height: 36px } + + +// 合作伙伴样式 +.partner-flex { + text-align: left; + display: flex; + flex-wrap: wrap; + + .partner-item { + margin: 20px 0; + width: 14.2%; + text-align: center; + display: flex; + flex-direction: column; + align-items: center; + + .partner-item-img { + margin-bottom: 20px; + width: 100px; + height: 100px; + text-align: center; + line-height: 100px; + + .img-box{ + width: 100px; + height: 100px; + line-height: 24px; + background: #f5f5f5; + border-radius: 50%; + display: flex; + flex-direction: column; + justify-content: center; + padding: 0 5px; + } + } + + img { + width: 100%; + } + + .partner-name { + font-size: 18px; + padding: 0 10px; + } + } + + .partner-txt{ + height: 163px; + + .partner-name { + font-size: 18px; + line-height: 30px; + } + } + } diff --git a/src/components/SettledEnterprise/SettledEnterprise.vue b/src/components/SettledEnterprise/SettledEnterprise.vue index 4a4735d..dc2b570 100644 --- a/src/components/SettledEnterprise/SettledEnterprise.vue +++ b/src/components/SettledEnterprise/SettledEnterprise.vue @@ -24,8 +24,10 @@ >

{{ i + 1 }}

- {{ item.company }} - {{ item.mainBusiness }} + {{ item.company }} + {{ item.mainBusiness }} +
姓名:{{ item.name || '暂无' }}
+
电话:{{ (!item.phone || item.phone == 0) ? '暂无' : item.phone }}
@@ -231,11 +233,15 @@ export default { color: #13acc4 } +.fast-box{ + width: 84%; + margin 0 auto; +} + .ent-box-div { - width: 48%; - margin-right: 2%; + width: 100%; + // margin-right: 2%; position: relative; - // height: 76px; display: flex; flex-direction: column; box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16); @@ -255,7 +261,7 @@ export default { .ent-index { width: 28px; position: absolute; - top: 14px; + top: 9px; line-height: 28px; text-align: center; font-size: 20px; @@ -267,10 +273,10 @@ export default { margin-bottom: 0; } -.ent-name { +.ent-title { position: absolute; - left: 0; - width: 50%; + left: 5%; + width: 40%; height: 24px; top: 50%; margin-top: -12px; @@ -285,7 +291,7 @@ export default { .ent-mainBusiness { position: absolute; left: 40%; - width: 25%; + width: 30%; height: 24px; top: 50%; margin-top: -12px; @@ -297,6 +303,34 @@ export default { overflow: hidden; } +.ent-name{ + position: absolute; + left: 60%; + width: 15%; + height: 24px; + top: 50%; + margin-top: -12px; + // font-size: 20px; + font-family: Microsoft YaHei; + line-height: 24px; + color: rgba(0, 0, 0, 0.65); + opacity: 1; +} + +.ent-phone{ + position: absolute; + left: 78%; + width: 17%; + height: 24px; + top: 50%; + margin-top: -12px; + // font-size: 20px; + font-family: Microsoft YaHei; + line-height: 24px; + color: rgba(0, 0, 0, 0.65); + opacity: 1; +} + .ent-icon{ position: absolute; top: 50%; diff --git a/src/store/modules/home/state.js b/src/store/modules/home/state.js index 20ce623..48973d5 100644 --- a/src/store/modules/home/state.js +++ b/src/store/modules/home/state.js @@ -16,7 +16,7 @@ const state = { zg: 0, value: 1, // 搜索框当前选项value code: 'title', // 搜索框当前选项code - policyText: ['标题', '地区', '发布部门'], // 搜索框选项列表 + policyText: ['主题词', '地区', '发布部门'], // 搜索框选项列表 iptCon: '', // 搜索框input内容 }, postDetail: {}, // 当前帖子详情 diff --git a/src/views/About/Children/Index.vue b/src/views/About/Children/Index.vue index 444bbdc..b0863c7 100644 --- a/src/views/About/Children/Index.vue +++ b/src/views/About/Children/Index.vue @@ -55,17 +55,14 @@
- -
-
- +
+
- +
-

{{ v.name }}

+
{{ item.name }}
-
@@ -151,10 +148,12 @@ export default { } } - // arr_list.push(arr_len); - this.lists.push(arr_len); - } + arr_len.forEach((list) => { + this.lists.push(list); + }) + // this.lists.push(arr_len); + } }, mounted() { @@ -210,7 +209,7 @@ export default { } .w-1200{ - width: 75%; + width: 70%; margin: 0 auto; } @@ -282,13 +281,14 @@ export default { li{ list-style: none; - background: #fff; + background: rgba(19,172,196,0.8); width: 49%; margin-right: 2%; padding: 26px 26px 50px; margin-bottom: 30px; text-align: left; position: relative; + color: #fff; .organize-title{ font-weight: bold; @@ -322,37 +322,6 @@ export default { margin-bottom: 30px; text-align: left; } - - .partner-flex { - text-align: left; - display: flex; - flex-direction: row; - - .partner-item { - margin: 20px 0; - width: 10%; - text-align: center; - display: flex; - flex-direction: column; - align-items: center; - - .partner-item-img { - margin-bottom: 20px; - width: 100px; - height: 100px; - text-align: center; - line-height: 100px; - } - - img { - width: 100%; - } - - p { - font-size: 15px; - } - } - } } .contact-box { diff --git a/src/views/IncubationPlatform/Children/Index.vue b/src/views/IncubationPlatform/Children/Index.vue index 75eda5b..428699a 100644 --- a/src/views/IncubationPlatform/Children/Index.vue +++ b/src/views/IncubationPlatform/Children/Index.vue @@ -8,16 +8,10 @@
- +
@@ -84,34 +78,34 @@
-
+
- + /> -->

{{ item.name }} - 需求填报 + 需求填报

-
- {{ item.intro.slice(0, 45) }} - +
+ {{ item.intro.slice(0, 60) }}... ... + more
-
+

{{ item.intro }}

@@ -136,12 +130,15 @@
-
+
+
+
+
{{ item.name }}
@@ -560,15 +557,26 @@ a { } .w-1500 { - // display: inline-block; - // width: 1500px; width: 82%; margin: 0 auto; } +.w-1200{ + width: 70%; + margin: 0 auto; +} + .item-intro{ - text-align: left; - // text-indent: 2em; + text-align: left; + display: flex; + flex-direction: column; + + button{ + height: 20px; + padding: 0px; + color: #fff; + text-align: right; + } } .text-center { @@ -672,6 +680,10 @@ a { background-color: #fff; } + .con{ + text-align: justify; + } + .con p { font-size: 16px; line-height: 40px; @@ -683,7 +695,7 @@ a { } .service-box { - padding: 60px 0; + padding-top: 40px; .title { text-align: left; @@ -696,12 +708,12 @@ a { } .service-flow { - margin: 50px 0; + margin: 20px 0; } } .partner-box { - padding: 60px 0; + padding: 40px 0; .title { margin-bottom: 30px; @@ -732,55 +744,7 @@ a { } } - .partner-flex { - text-align: left; - display: flex; - align-items: center; - flex-wrap: wrap; - - .partner-item { - height: 163px; - margin: 20px 0; - padding: 10px 0; - margin-right: 40px; - width: calc(((100% - 200px) / 6)); - text-align: center; - border: 1px solid #D9D9D9; - border-radius: 5px; - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - - &:nth-child(6n) { - margin-right: 0; - } - .partner-item-img { - margin-bottom: 15px; - width: 80px; - height: 80px; - text-align: center; - line-height: 80px; - } - - img { - max-width: 100%; - max-height: 100%; - } - - .partner-name { - font-size: 16px; - color: #000; - margin: 0; - line-height: 24px; - } - } - - .partner-txt{ - height: 163px; - } - } } .contact-box { @@ -839,10 +803,14 @@ a { } .item-box { - position: relative; - width: 26%; - margin-right: 11%; - border-radius: 4px; + position: relative; + width: 30%; + height: 180px; + margin-right: 5%; + padding: 0 30px; + border-radius: 4px; + background-color: rgba(19,172,196,0.8); + color: #fff; } .service-title{ @@ -856,7 +824,6 @@ a { } .place{ - display: inline-block; position: relative; top: -100px; } diff --git a/src/views/IncubationPlatform/Children/place/EntitySpace.vue b/src/views/IncubationPlatform/Children/place/EntitySpace.vue index 4090fd6..c78b70d 100644 --- a/src/views/IncubationPlatform/Children/place/EntitySpace.vue +++ b/src/views/IncubationPlatform/Children/place/EntitySpace.vue @@ -54,6 +54,7 @@ 液相色谱仪、万级无菌工作间、P2实验室等多种高端、大型实验仪器设备;可提供生物医药、 食品检测、食用菌、肠道微生物等方面的科学实验、检验检测、小试中试等技术服务与科研成果转化。 +
乔晓阳:18635939333
@@ -67,6 +68,7 @@
干果精深加工中试基地位于吕梁的交城天娇红农业科技有限公司,拥有300余万元的先进分析检测仪器设备及免洗干枣生产车间、浓缩枣汁生产车间等生产加工条件,可提供相关中试研究。
+
乔晓阳:18635939333
-
-
- +
+
+

{{ item.name }} - 需求填报 + 需求填报

-
- {{ item.intro.slice(0, 45) }} - +
+ {{ item.intro.slice(0, 60) }} + more
-
+

{{ item.intro }}

@@ -89,13 +83,16 @@
-
+
-
-
- +
+
+ +
+
+
-

{{ item.name }}

+
{{ item.name }}
@@ -508,14 +505,14 @@ export default { } .w-1500 { - // display: inline-block; - // width: 1500px; width: 82%; margin: 0 auto; } -.w-1500.title{ - margin-bottom: 30px + +.w-1200{ + width: 70%; + margin: 0 auto; } .item-intro{ @@ -584,7 +581,9 @@ export default { } .service-box { - padding: 60px 0; + padding-top: 40px; + display: flex; + flex-direction: column; .title { text-align: left; @@ -597,12 +596,12 @@ export default { } .service-flow { - margin: 50px 0; + margin-top: 20px; } } .partner-box { - padding: 60px 0; + padding: 40px 0; .title { margin-bottom: 30px; @@ -632,54 +631,10 @@ export default { background-color: #13ACC4; } } - - .partner-flex { - text-align: left; - display: flex; - align-items: center; - flex-wrap: wrap; - - .partner-item { - margin: 20px 0; - padding: 10px 0; - margin-right: 40px; - width: calc(((100% - 160px) / 5)); - text-align: center; - border: 1px solid #D9D9D9; - border-radius: 5px; - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - - &:nth-child(5n) { - margin-right: 0; - } - - .partner-item-img { - margin-bottom: 15px; - width: 80px; - height: 80px; - text-align: center; - line-height: 80px; - } - - img { - max-width: 100%; - max-height: 100%; - } - - p { - font-size: 16px; - color: #000; - margin: 0; - } - } - } } .contact-box { - padding: 60px 0; + padding: 40px 0; .title { margin-bottom: 50px; @@ -734,10 +689,14 @@ export default { } .item-box { - position: relative; - width: 26%; - margin-right: 11%; - border-radius: 4px; + position: relative; + width: 30%; + height: 180px; + margin-right: 5%; + padding: 0 30px; + border-radius: 4px; + background-color: rgba(19,172,196,0.8); + color: #fff; } .service-title{ @@ -751,14 +710,14 @@ export default { } .place{ - display: inline-block; position: relative; top: -100px; } .organize-bor { - // padding-top: 30px; - // padding-bottom: 30px; + .title{ + padding-bottom: 10px; + } .contact{ font-size: 18px; diff --git a/src/views/Knowledge/Knowledge.vue b/src/views/Knowledge/Knowledge.vue index 4f76d3c..64396f0 100644 --- a/src/views/Knowledge/Knowledge.vue +++ b/src/views/Knowledge/Knowledge.vue @@ -8,15 +8,9 @@