Commit 842432ed authored by chenjiahao's avatar chenjiahao

Merge remote-tracking branch 'origin/master'

parents 10fec434 fa2caa3d
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
margin-top: 24px; margin-top: 24px;
background-color: #754e9e; background-color: #754e9e;
" "
></div> ><img :src="dynamicImg" /></div>
<div class="mt-5 big-event"> <div class="mt-5 big-event">
<el-tag style="font-size: 14px">大事件</el-tag> <el-tag style="font-size: 14px">大事件</el-tag>
<span class="ml-2" style="font-size: 18px">大数据平台上线</span> <span class="ml-2" style="font-size: 18px">大数据平台上线</span>
...@@ -402,6 +402,7 @@ ...@@ -402,6 +402,7 @@
activeName2: 'first', activeName2: 'first',
cardLogo: 'src/assets/images/mallHome/biaoqian.png', cardLogo: 'src/assets/images/mallHome/biaoqian.png',
industryImg: 'src/assets/images/mallHome/行业动态.png', industryImg: 'src/assets/images/mallHome/行业动态.png',
dynamicImg: 'src/assets/images/mallHome/hangyedongtai.png',
items: [ items: [
{ {
id: '1', id: '1',
......
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