瀏覽代碼

Merge remote-tracking branch 'origin/master'

master
meixinbin 2 年之前
父節點
當前提交
6492222e34
共有 7 個檔案被更改,包括 8 行新增10 行删除
  1. +2
    -2
      src/index.less
  2. +1
    -1
      src/view/about.vue
  3. +1
    -1
      src/view/exchange.vue
  4. +1
    -1
      src/view/km.vue
  5. +1
    -1
      src/view/main/main.vue
  6. +1
    -3
      src/view/overview.vue
  7. +1
    -1
      src/view/vip-service.vue

+ 2
- 2
src/index.less 查看文件

@@ -186,8 +186,8 @@ body {
font-weight: 900;
position: absolute;
margin-right: 100px;
left: -40px;
top: 6px;
left: -100px;
top: 0px;
text-align: center;
line-height: 50px;
width: 100px;


+ 1
- 1
src/view/about.vue 查看文件

@@ -22,7 +22,7 @@
<el-row>
<el-col :span="12" v-for="(item, index) in dataList" :key="index" >
<el-card class="box-card" shadow="never" style="margin: 0 10px" :body-style="{ padding: '0px'}">
<img :src="item.aboutImg" style="border-radius: 10px;margin: 10px 0 10px 0;height: 100%;width: 100%"/>
<img :src="item.aboutImgUrl" style="border-radius: 10px;margin: 10px 0 10px 0;height: 100%;width: 100%"/>
<p style="color: #333">{{item.title}}</p>
</el-card>
</el-col>


+ 1
- 1
src/view/exchange.vue 查看文件

@@ -28,7 +28,7 @@
<li style="padding: 10px;border-bottom: 1px solid #eee;margin: 5px 0;height: 120px"
v-for="(item,index) in dataList" :key="index">
<img style="float: left;width: 100px;height: 100px;border-radius: 8px"
:src="item.aboutImg"/>
:src="item.aboutImgUrl"/>
<div style="margin-left: 120px;">
<h3 style="color:#333333;">{{item.title}}</h3>
<p style="color: #999" v-html="item.content"></p>


+ 1
- 1
src/view/km.vue 查看文件

@@ -24,7 +24,7 @@
<el-row>
<el-col :span="6" v-for="(item,index) in dataList" :key="index" >
<el-card class="box-card" shadow="never" style="margin: 0 10px" :body-style="{ padding: '0px' }">
<img :src="item.aboutImg" style="border-radius: 10px;margin: 10px 0" width="100%"/>
<img :src="item.aboutImgUrl" style="border-radius: 10px;margin: 10px 0" width="100%"/>
<p style="color: #333">{{item.title}}</p>
</el-card>
</el-col>


+ 1
- 1
src/view/main/main.vue 查看文件

@@ -3,7 +3,7 @@
<el-header class="header linear">
<el-menu :default-active="activeIndex" mode="horizontal" style="position: relative;padding-left: 100px;width: 960px;text-align: center;margin: 0 auto;border: none;background: transparent;overflow: visible">
<div class="logo">
<img src="../../assets/images/logo.jpg" style="width: 180px; height: 40px;">
<img src="../../assets/images/logo.jpg" style="width: 260px; height: 60px;">
</div>
<el-menu-item index="1"><router-link to="/overview">首页</router-link></el-menu-item>
<el-menu-item index="2"><router-link to="/about">关于我们</router-link></el-menu-item>


+ 1
- 3
src/view/overview.vue 查看文件

@@ -11,7 +11,7 @@
<el-card class="box-card" shadow="never" :body-style="{ padding: '0px 20px' }">
<div slot="header">
<span><el-divider direction="vertical"></el-divider>重要信息</span>
<el-button style="float: right; padding: 3px 0;color: #fff;font-size: 12px" type="text">更多&gt;&gt;</el-button>
<!-- <el-button style="float: right; padding: 3px 0;color: #fff;font-size: 12px" type="text">更多&gt;&gt;</el-button> -->
</div>
<div v-for="(o, index) in importList" :key="index" class="text item">
<router-link :to='"/detail?id="+o.id'>{{index+1}}、{{o.title}}</router-link>
@@ -340,8 +340,6 @@ export default {
}else if(weizhi == "N"){
// 轮播
this.lunBoList = res.data.records
console.log(JSON.stringify(this.lunBoList))
console.log(id)
}
}
}


+ 1
- 1
src/view/vip-service.vue 查看文件

@@ -32,7 +32,7 @@ import { ChartBar } from '_c/charts';
<el-table
:data="tableData"
border
style="width: 100%; height: 200px;">
style="width: 100%; ">
<el-table-column
type="index"
align="center"


Loading…
取消
儲存