cjy-Web
/
cjy_web
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	src/views/cjy/columninfo/ColumnInfoForm.vue
main
Tuzki 9 months ago
parent 55a5fad32a 9abc2cbe6d
commit 29e0009263
14 changed files with 1999 additions and 971 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. BIN
      public/favicon.ico
  2. BIN
      src/assets/images/about-step-bg.png
  3. 1
      src/assets/styles/v-global.scss
  4. 1000
      src/assets/styles/v-vision.scss
  5. 2
      src/layout/components/Sidebar/Logo.vue
  6. 2
      src/views/cjy/columninfo/ColumnInfoForm.vue
  7. 2
      src/views/components/v-bottom/index.vue
  8. 6
      src/views/components/v-header/index.vue
  9. 2
      src/views/pages/case-detail.vue
  10. 2
      src/views/pages/case-list.vue
  11. 1880
      src/views/pages/index.vue
  12. 2
      src/views/pages/news-detail.vue
  13. 17
      src/views/pages/news-list.vue
  14. 34
      src/views/pages/theme/about-us.vue

BIN
public/favicon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 17 KiB

BIN
src/assets/images/about-step-bg.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 376 KiB

1
src/assets/styles/v-global.scss
Unescape View File

@ -219,3 +219,4 @@ a:not([href]):not([class]):hover{color:inherit;text-decoration:none}
.m-t-normal{margin-top: 16px;}
.m-t-large{margin-top: 100px;}
.m-b-large{margin-bottom: 100px;}
.m-b-base{margin-bottom: 20px;}

1000
src/assets/styles/v-vision.scss
View File

File diff suppressed because it is too large Load Diff

2
src/layout/components/Sidebar/Logo.vue
Unescape View File

@ -35,7 +35,7 @@ export default {
},
data() {
return {
title: '芋道管理系统',
title: '河北创巨圆科技发展有限公司',
logo: logoImg
}
}

2
src/views/cjy/columninfo/ColumnInfoForm.vue
Unescape View File

@ -40,7 +40,7 @@
<ImageUpload :showPositionInput="formData.type==6" v-model="formData.image"/>
</el-form-item>
<el-form-item label="图库" v-if="formData.type==4">
<ImageUpload :limit="-1" v-model="formData.image"/>
<ImageUpload :limit="200" v-model="formData.image"/>
</el-form-item>
<el-form-item label="内容">
<Editor v-model="formData.content" :min-height="192"/>

2
src/views/components/v-bottom/index.vue
Unescape View File

@ -30,7 +30,7 @@
</div>
</div>
<div class="cjy-bottom-right">
<img :src="company_data.qrCode">
<img :src="company_data.qrCode" style="width: 120px">
<div class="text">关注公众号<br />
了解更多最新动态
</div>

6
src/views/components/v-header/index.vue
Unescape View File

@ -221,9 +221,9 @@
content: '';
position: absolute;
left: 50%;
bottom: 0;
bottom: -2px;
width: 100%;
height: 2px;
height: 1px;
background-color: #0B59B3;
transform-origin: center;
transform: translate(-50%, 0) scaleX(0);
@ -372,7 +372,7 @@
border-radius: 5px;
cursor: pointer;
transition: all ease-in-out 0.3s;
background: linear-gradient(to right, #33333328, #f6f6f600);
background: linear-gradient(to right, rgba(0,0,0,.1), #f6f6f600);
&:hover {
color: #0B59B3;

2
src/views/pages/case-detail.vue
Unescape View File

@ -3,7 +3,7 @@
<!-- 页面 头部 -->
<VHeader></VHeader>
<!-- 页面 广告条 -->
<div class="cjy-banner">
<div class="cjy-banner m-t-100">
<div class="cjy-banner-text">
<div class="title">{{ banner_data.title || '--' }}</div>
<div class="subtitle">{{ banner_data.subtitle || '--' }}</div>

2
src/views/pages/case-list.vue
Unescape View File

@ -3,7 +3,7 @@
<!-- 页面 头部 -->
<VHeader></VHeader>
<!-- 页面 广告条 -->
<div class="cjy-banner">
<div class="cjy-banner m-t-100">
<div class="cjy-banner-text">
<div class="title">{{ banner_data.title }}</div>
<div class="subtitle">{{ banner_data.subtitle }}</div>

1880
src/views/pages/index.vue
View File

File diff suppressed because it is too large Load Diff

2
src/views/pages/news-detail.vue
Unescape View File

@ -3,7 +3,7 @@
<!-- 页面 头部 -->
<VHeader></VHeader>
<!-- 页面 广告条 -->
<div class="cjy-banner">
<div class="cjy-banner m-t-100">
<div class="cjy-banner-text">
<div class="title">{{ banner_data.title }}</div>
<div class="subtitle">{{ banner_data.subtitle }}</div>

17
src/views/pages/news-list.vue
Unescape View File

@ -3,7 +3,7 @@
<!-- 页面 头部 -->
<VHeader></VHeader>
<!-- 页面 广告条 -->
<div class="cjy-banner">
<div class="cjy-banner m-t-100">
<div class="cjy-banner-text">
<div class="title">{{ banner_data.title }}</div>
<div class="subtitle">{{ banner_data.subtitle }}</div>
@ -19,7 +19,7 @@
</div>
<!-- 新闻 列表 -->
<div class="v-container cjy-news-list">
<el-tabs v-model="active" @tab-click="getNewsList()" class="cjy-tabs">
<el-tabs v-model="active" class="cjy-tabs" @tab-click="handleClick">
<el-tab-pane label="公司动态" name="first">
<div class="list-item" v-for="(item,index) in news_list" :key="index">
<div class="item-box row" @click="gotoPages(item.id)">
@ -27,7 +27,10 @@
<div class="item-content">
<div class="title">{{ item.title }}</div>
<div class="info" v-html="item.introduction"></div>
<div class="more"><span class="text">查询详情</span></div>
<div class="row">
<div class="more col"><span class="text">查询详情</span></div>
<div class="date"><span class="text">{{ parseTime(item.createTime) }}</span></div>
</div>
</div>
</div>
</div>
@ -39,7 +42,10 @@
<div class="item-content">
<div class="title">{{ item.title }}</div>
<div class="info" v-html="item.introduction"></div>
<div class="more"><span class="text">查询详情</span></div>
<div class="row">
<div class="more col"><span class="text">查询详情</span></div>
<div class="date"><span class="text">{{ parseTime(item.createTime) }}</span></div>
</div>
</div>
</div>
</div>
@ -95,6 +101,9 @@ export default {
let res = await Api.getColumnInfoList(this.queryParams)
this.news_list = res.data.list
},
handleClick() {
this.infoPages()
},
// 跳转页面 函数
gotoPages(val) {
this.$router.push("/news-detail?id=" + val)

34
src/views/pages/theme/about-us.vue
Unescape View File

@ -3,7 +3,7 @@
<!-- 页面 头部 -->
<VHeader></VHeader>
<!-- 页面 广告条 -->
<div class="cjy-banner">
<div class="cjy-banner m-t-100">
<div class="cjy-banner-text">
<div class="title">{{ banner_data.title }}</div>
<div class="subtitle">{{ banner_data.subtitle }}</div>
@ -38,7 +38,7 @@
</div>
</div>
</el-col>
<el-col :span="12" class="info" v-html="company_info.content"></el-col>
<el-col :span="12" class="info" v-html="company_info.introduction"></el-col>
</el-row>
</div>
</div>
@ -77,7 +77,7 @@
</div>
</div>
<div class="cjy-page-item3 m-t-large">
<div class="v-container">
<div>
<div class="cjy-about-title">企业历程</div>
<div class="cjy-about-step-info">投入资源提升技术，满足客户需求</div>
<div class="cjy-about-step row">
@ -98,13 +98,13 @@
</div>
<div class="v-container">
<div class="cjy-about-title text-center m-t-large">资质证书及相关软著</div>
<div class="cjy-about-title text-center m-t-large m-b-base">资质证书及相关软著</div>
<el-carousel :interval="5000" arrow="always" class="certificate">
<el-carousel-item v-for="group in groupedCertificates" :key="group">
<div class="row cjy-about-certificate">
<div class="col-77" v-for="(item, index) in group" :key="index">
<div class="list-item flex-align-center">
<el-image class="img" :src="item.url" :preview-src-list="[item.url]">
<el-image class="img" :src="item" :preview-src-list="[item]">
</el-image>
</div>
</div>
@ -220,25 +220,11 @@
this.certificates = [res.data.image]
}
}
// this.certificates = [
// {url: "https://www.lutongwulian.com/uploads/190506/1-1Z506153411551.jpg"},
// {url: "https://www.lutongwulian.com/uploads/190506/1-1Z506153411551.jpg"},
// {url: "https://www.lutongwulian.com/uploads/190506/1-1Z506153411551.jpg"},
// {url: "https://www.lutongwulian.com/uploads/190506/1-1Z506153411551.jpg"},
// {url: "https://www.lutongwulian.com/uploads/190506/1-1Z506153411551.jpg"},
// {url: "https://www.lutongwulian.com/uploads/190506/1-1Z506153411551.jpg"},
// {url: "https://www.lutongwulian.com/uploads/230324/1-230324141324Y9.png"},
// {url: "https://www.lutongwulian.com/uploads/230324/1-230324141324Y9.png"},
// {url: "https://www.lutongwulian.com/uploads/230324/1-230324141324Y9.png"},
// {url: "https://www.lutongwulian.com/uploads/230324/1-230324141324Y9.png"},
// {url: "https://www.lutongwulian.com/uploads/230324/1-230324141324Y9.png"},
// {url: "https://www.lutongwulian.com/uploads/230324/1-230324141324Y9.png"},
// {url: "https://www.lutongwulian.com/uploads/230324/1-230324141324Y9.png"},
// {url: "https://www.lutongwulian.com/uploads/230324/1-230324141324Y9.png"},
// ]
this.groupCertificates(); // 调用分组方法
},
groupCertificates() {
if (this.certificates && this.certificates.length > 0) {
for (let i = 0; i < this.certificates.length; i += 14) {
this.groupedCertificates.push(this.certificates.slice(i, i + 14));
@ -246,7 +232,7 @@
} else {
this.groupedCertificates = []
}
console.log('adfs',this.groupedCertificates)
},
//获取企业风采 函数
async getDemeanour() {
@ -272,7 +258,9 @@
}
.cjy-page-item3 {
background: url("~@/assets/images/about-step-bg.jpg");
padding: 70px 50px 50px 380px;
height: 514px;
background: url("~@/assets/images/about-step-bg.png");
background-size: contain;
background-position: left;
background-repeat: no-repeat;

Write Preview
Loading…
Cancel
Save