Skip to content

T
techbook
Commit 8f68f5c9 authored by anxixi's avatar anxixi
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 894836ef 273ca1cb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 112 additions and 2 deletions
public/css/phone.scss
View file @ 8f68f5c9
......@@ -676,6 +676,51 @@ i, em {
padding-top: .3rem;
}
}
.articleContent {
text-align: left;
}
.articleContent li{
background: #fff;
padding: .15rem .2rem;
font-size: .32rem;
color: #1A1A1E;
&:first-of-type{
padding-top: .3rem;
}
.articleTitle{
line-height: .5rem;
}
.originalTitle{
color:#FF5D5D;
}
.articleNoImg{
padding-bottom: .1rem;
}
.articleHasImg{
display: flex;
margin-bottom: .2rem;
padding-bottom: .1rem;
.rightInfo{
width: 2.32rem;
height: 1.54rem;
background-size: cover;
background-repeat: no-repeat;
}
.leftInfo{
width:calc(100% - 2.32rem);
padding-top: .1rem;
display: -webkit-box;
text-overflow: ellipsis;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
word-break: break-all;
overflow: hidden;
height: 1rem;
}
}
}
.mobilerequireContent .companyInfo {
display: flex;
......
src/assets/font/iconfont.css
View file @ 8f68f5c9
This diff is collapsed.
src/assets/font/iconfont.js
View file @ 8f68f5c9
This source diff could not be displayed because it is too large. You can view the blob instead.
src/assets/font/iconfont.svg
View file @ 8f68f5c9
......@@ -20,6 +20,21 @@ Created by iconfont
/>
<missing-glyph />
<glyph glyph-name="pinglun1" unicode="&#58977;" d="M989.481 827.768l23.487-23.609-634.285-632.523-75.104-8.285-8.395 8.285 8.395 75.281 634.285 632.523 23.374-23.431 28.243-28.241zM809.21-120.848h-627.355c-99.416 0-180.271 80.742-180.271 180.038v627.476c0 99.297 80.855 180.094 180.271 180.094h421.138c17.784 0 32.116-14.388 32.116-32.062 0-17.68-14.333-32.004-32.116-32.004h-421.138c-64.12 0-116.206-52.085-116.206-116.084v-627.365c0-63.998 52.085-116.086 116.206-116.086h627.355c64.008 0 116.095 52.088 116.095 116.086v413.794c0 17.793 14.321 32.127 31.995 32.127 17.793 0 32.127-14.334 32.127-32.127v-413.793c-0.068-99.352-80.92-180.094-180.217-180.094zM809.21-120.848z" horiz-adv-x="1029" />
<glyph glyph-name="xingxing" unicode="&#59159;" d="M539.101965 879.121751l134.794872-273.246686c4.38833-8.849799 12.945574-15.0666 22.746177-16.456237l301.478276-43.810162c24.794065-3.656942 34.667808-34.009558 16.821932-51.416601l-218.246282-212.760869a30.206339 30.206339 0 0 1-8.703522-26.622536l51.562879-300.308055a30.206339 30.206339 0 0 0-43.810162-31.815393L526.083252 64.355135a29.986922 29.986922 0 0 1-28.085312 0L228.261918-77.314788a30.1332 30.1332 0 0 0-43.663884 31.815393l51.489739 300.308055a29.986922 29.986922 0 0 1-8.630382 26.622536L9.211109 494.192065a30.1332 30.1332 0 0 0 16.675654 51.416601l301.551415 43.810162a30.206339 30.206339 0 0 1 22.746177 16.456237L485.052366 879.121751a30.1332 30.1332 0 0 0 54.049599 0z" horiz-adv-x="1024" />
<glyph glyph-name="lajitongshanchu" unicode="&#59381;" d="M800 512C782.08 512 768 497.92 768 480L768 64c0-35.2-28.8-64-64-64l-64 0L640 480C640 497.92 625.92 512 608 512 590.08 512 576 497.92 576 480L576 0 448 0 448 480C448 497.92 433.92 512 416 512 398.08 512 384 497.92 384 480L384 0 320 0c-35.2 0-64 28.8-64 64L256 480C256 497.92 241.92 512 224 512 206.08 512 192 497.92 192 480L192 64c0-70.4 57.6-128 128-128l384 0c70.4 0 128 57.6 128 128L832 480C832 497.92 817.92 512 800 512zM864 640l-704 0C142.08 640 128 625.92 128 608 128 590.08 142.08 576 160 576l704 0C881.92 576 896 590.08 896 608 896 625.92 881.92 640 864 640zM352 704l320 0C689.92 704 704 718.08 704 736 704 753.92 689.92 768 672 768l-320 0C334.08 768 320 753.92 320 736 320 718.08 334.08 704 352 704z" horiz-adv-x="1024" />
<glyph glyph-name="gengduo-2" unicode="&#58975;" d="M363.23 620.547h497.825c23.942 0 43.35 19.408 43.35 43.35s-19.408 43.35-43.35 43.35h-497.825c-23.942 0-43.35-19.408-43.35-43.35s19.408-43.35 43.35-43.35zM861.054 424.070h-497.825c-23.939-0.004-43.343-19.411-43.343-43.35 0-23.939 19.405-43.346 43.343-43.35l497.825-0c23.939 0.004 43.343 19.411 43.343 43.35 0 23.939-19.405 43.346-43.343 43.35zM861.054 140.9h-497.825c-23.942 0-43.35-19.408-43.35-43.35s19.408-43.35 43.35-43.35l497.825 0c23.942-0 43.35 19.408 43.35 43.35s-19.408 43.35-43.35 43.35zM125.123 663.897c-0-42.297 34.288-76.585 76.585-76.585s76.585 34.288 76.585 76.585c0 42.297-34.288 76.585-76.585 76.585-42.297 0-76.585-34.288-76.585-76.585zM125.123 382.121c-0-42.297 34.288-76.585 76.585-76.585s76.585 34.288 76.585 76.585c0 42.297-34.288 76.585-76.585 76.585-42.297 0-76.585-34.288-76.585-76.585zM125.123 100.346c-0-42.297 34.288-76.585 76.585-76.585s76.585 34.288 76.585 76.585c0 42.297-34.288 76.585-76.585 76.585-42.297 0-76.585-34.288-76.585-76.585z" horiz-adv-x="1024" />
<glyph glyph-name="erweima" unicode="&#58976;" d="M432 832H104a40 40 0 0 1-40-40v-328a40 40 0 0 1 40-40h328a40 40 0 0 1 40 40V792a40 40 0 0 1-40 40z m-41.5-328.24h-248v248h248zM222.5 628.4300000000001q0-18.85 12.57-31.42c8.38-8.39 20.95-12.58 31.43-12.58q18.86 0 31.43 12.58c8.38 8.37 12.57 20.95 12.57 31.42q0 18.87-12.57 31.43c-8.38 8.38-21 12.57-31.43 12.57q-18.85 0-31.43-12.57c-8.38-6.29-12.57-18.85-12.57-31.43z m0 0M432 344H104a40 40 0 0 1-40-40v-328a40 40 0 0 1 40-40h328a40 40 0 0 1 40 40V304a40 40 0 0 1-40 40z m-41.5-328.24h-248v248h248zM222.5 140.42999999999995q0-18.85 12.57-31.42c8.38-8.39 20.95-12.58 31.43-12.58q18.86 0 31.43 12.58c8.38 8.37 12.57 21 12.57 31.42q0 18.87-12.57 31.43c-8.38 8.38-21 12.57-31.43 12.57q-18.85 0-31.43-12.57c-8.38-6.29-12.57-18.85-12.57-31.43z m0 0M920 832H592a40 40 0 0 1-40-40v-328a40 40 0 0 1 40-40h328a40 40 0 0 1 40 40V792a40 40 0 0 1-40 40z m-41.5-328.12h-248v248h248zM710.5 628.4300000000001q0-18.85 12.57-31.42c8.38-8.39 20.95-12.58 31.43-12.58q18.86 0 31.43 12.58c8.38 8.37 12.57 20.95 12.57 31.42q0 18.87-12.57 31.43c-8.38 8.38-21 12.57-31.43 12.57q-18.86 0-31.43-12.57c-8.38-6.29-12.57-18.85-12.57-31.43z m0 0M714.5 15.730000000000018h80V-64h-80zM920 344h-41.5v-162h-84V344H592a40 40 0 0 1-40-40v-328a40 40 0 0 1 40-40h38.5V184h84v-84.27H960V304a40 40 0 0 1-40 40zM878.5-64H920a40 40 0 0 1 40 40v39.73h-81.5z" horiz-adv-x="1024" />
<glyph glyph-name="hezuo" unicode="&#58970;" d="M1018.368 558.08c-0.512 158.72-129.536 287.232-288.256 286.72-75.776 0-148.48-30.208-202.24-83.968l-15.872-15.872-15.872 15.872C384 872.96 202.24 872.96 89.6 760.832c-112.128-111.616-112.128-292.864-0.512-404.992l0.512-0.512 26.112-26.112c-23.552-61.44-8.704-130.56 37.888-176.64l170.496-169.984c49.152-49.152 123.904-62.464 187.392-33.28 63.488-29.184 138.24-15.872 187.904 33.28l170.496 169.984c46.08 46.08 60.928 115.712 37.888 176.64l26.624 26.112C988.16 409.088 1018.368 481.792 1018.368 558.08zM510.464 36.352l-2.048-2.048c-27.648-27.136-67.584-34.304-101.376-20.48l55.296 55.296c14.336 14.336 14.336 37.888 0 52.224l-0.512 0.512c-14.336 14.336-37.888 14.336-52.224 0L349.184 61.44l-31.744 31.744L377.856 153.6c14.336 14.336 14.336 37.888 0 52.224l-0.512 0.512c-14.336 14.336-37.888 14.336-52.224 0l-60.416-60.416-26.624 26.624 60.416 60.416c14.336 14.336 14.336 37.888 0 52.224l-0.512 0.512c-14.336 14.336-37.888 14.336-52.224 0l-57.344-56.832c-17.408 34.816-11.776 78.336 17.408 107.52 30.208 30.208 78.848 30.208 109.568 0.512l194.048-190.464c30.72-30.72 30.72-79.872 1.024-110.08z m137.216-2.56c-17.92-17.408-41.984-27.648-67.072-27.136 39.936 60.416 31.744 140.288-19.968 191.488L367.104 388.608c-57.856 56.32-150.016 57.344-209.408 2.56l-15.872 15.872c-83.456 83.456-82.944 218.624 0.512 302.08 83.456 83.456 218.624 82.944 302.08-0.512l15.872-15.872-143.36-142.848c-23.552-24.064-24.064-62.464-0.512-86.528 26.112-26.624 81.408-71.168 157.184-67.584 61.44 2.56 122.368 35.84 181.248 98.304l163.328-157.696c27.648-27.648 34.304-68.096 19.968-101.888l-153.6 145.408c-14.848 13.824-38.4 13.312-52.224-1.536l-0.512-0.512c-13.824-14.848-13.312-38.4 1.536-52.224l157.184-148.48-31.744-31.232-165.376 156.16c-14.848 13.824-38.4 13.312-52.224-1.536l-0.512-0.512c-13.824-14.848-13.312-38.4 1.536-52.224l163.84-154.624-58.368-59.392z m234.496 373.248l-15.872-15.872-184.32 178.176c-2.048 1.536-3.584 3.072-5.632 4.608-0.512 0-0.512 0.512-0.512 0.512-15.872 12.8-38.912 10.752-51.712-5.12-53.248-64.512-104.96-98.816-153.6-100.864-40.96-2.048-73.728 19.968-93.184 37.376l202.752 202.24c39.936 39.936 94.72 62.464 151.04 62.464 117.76 0.512 213.504-95.232 214.016-212.992 0-55.808-22.528-110.08-62.976-150.528z" horiz-adv-x="1024" />
......
src/common/lang/en.js
View file @ 8f68f5c9
......@@ -165,7 +165,8 @@ module.exports = {
lookMore:"More",
senProject:"Tech Startups",
cooperationCase:"Success Cases",
unitTiao:"strip"
unitTiao:"strip",
newsArticle:"最新资讯"
},
bottomNav:{ //底部nav
......
src/common/lang/zh.js
View file @ 8f68f5c9
......@@ -164,7 +164,8 @@ module.exports = {
lookMore: "更多",
senProject: "科创项目",
cooperationCase: "合作案例",
unitTiao: "条"
unitTiao: "条",
newsArticle:"最新资讯"
},
bottomNav: { //底部nav
......
src/views/mobile/index/index.vue
View file @ 8f68f5c9
......@@ -22,6 +22,50 @@
</div>
</div>
<div class="tabWrapper" v-if="lang==1">
<div class="topTitle">
<div>
<h4><span></span>{{$t("indexCount.newsArticle")}}</h4>
<div @click="handleMore(3)"><span>{{$t("indexCount.lookMore")}}</span><i class="iconfont icon-you"></i></div>
</div>
<div class="div1px">
</div>
</div>
<div class="articleContent">
<ul>
<li @click="handleToArticle()">
<div class="articleNoImg" v-if="false">
<span v-if="false"><span class="originalTitle" >原创</span><i> | </i></span>
<span class="articleTitle">国家互联网信息办公室发布《信息内容生态治理规定》</span>
</div>
<div class="articleHasImg">
<div class="leftInfo">
<span v-if="false"><span class="originalTitle" >原创</span><i> | </i></span>
<span class="articleTitle">国家互联网信息办公室发布《信息内容生态治理规定》</span>
</div>
<!--<div class="rightInfo" :style="{backgroundImage:'url('+item.subjectBackground+')'}">-->
<!--</div>-->
<div class="rightInfo" :style="{backgroundImage:'url('+require('../../../assets/img/index/bdefaultLogo.png')+')'}">
</div>
</div>
<div class="div1px"></div>
<!--<div class="div1px" v-if="index < companyInfo.length-1"></div>-->
</li>
<li @click="handleToArticle()">
<div class="articleNoImg">
<span><span class="originalTitle" >原创</span><i> | </i></span>
<span class="articleTitle">国家互联网信息办公室发布《信息内容生态治理规定》</span>
</div>
</li>
</ul>
</div>
</div>
<div class="tabWrapper">
<div class="topTitle">
<div>
......@@ -467,6 +511,10 @@
});
},
handleToArticle(){
}
},
mounted() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment