Skip to content

G
gs1
Commit 6254de22 by Lyan
Options

Merge branch 'master' of https://gitee.com/gs1-office-web-sit/gs1

parents 4aa548ad d38d16b6
Showing with 181 additions and 97 deletions
src/axios/module/home.js
...@@ -9,6 +9,9 @@ const Prefix = process.env.NODE_ENV === 'development' ? '/gs1' : ''; ...@@ -9,6 +9,9 @@ const Prefix = process.env.NODE_ENV === 'development' ? '/gs1' : '';
const indexCarouselManage = (params = {}) => { const indexCarouselManage = (params = {}) => {
return GET(`${Prefix}/office/indexCarouselManage/api/info/${params.id}`, {}) return GET(`${Prefix}/office/indexCarouselManage/api/info/${params.id}`, {})
} }
const homePicture = (params = {}) => {
return GET(`${Prefix}/office/picture/api/info/${params.id}`, {})
}
// 首页大轮播图 // 首页大轮播图
const homeBigImages = (params = {}) => { const homeBigImages = (params = {}) => {
...@@ -51,6 +54,7 @@ const updateCustomService = (params = {}) => { ...@@ -51,6 +54,7 @@ const updateCustomService = (params = {}) => {
export default { export default {
indexCarouselManage, indexCarouselManage,
homePicture,
homeBigImages, homeBigImages,
homePictureImageList, homePictureImageList,
homeImportantNewList, homeImportantNewList,
......
src/components/layout/header/mock.js
...@@ -151,6 +151,17 @@ export const nav = [ ...@@ -151,6 +151,17 @@ export const nav = [
}, },
{ {
id: uuid("gs_nav"), id: uuid("gs_nav"),
name: "分支机构详情页",
index: 0,
link: "/Org/BranchMsg",
isHiddenMenu: true,
breadcrumb: [
{ name: "机构概况", path: "/Org" },
{ name: "地方编码分支机构" },
],
},
{
id: uuid("gs_nav"),
name: "国际物品编码组织（GS1）", name: "国际物品编码组织（GS1）",
index: 0, index: 0,
link: "https://www.gs1.org/", link: "https://www.gs1.org/",
......
src/views/Business/Corppaynew.vue
<template> <template>
<div class="corppaynew"> <div class="corppaynew">
<cate :father="sfgsCate"></cate> <!-- <cate :father="sfgsCate"></cate> -->
<div class="corppaynew-msg container"> <div class="corppaynew-msg container">
<div class="hidden-xs"> <div class="hidden-xs">
<p><b>收费公示表</b></p>
<table class="table table-bordered"> <table class="table table-bordered">
<thead> <thead>
<tr> <tr>
...@@ -291,6 +292,10 @@ export default { ...@@ -291,6 +292,10 @@ export default {
.corppaynew { .corppaynew {
@include module-box; @include module-box;
font-weight: 300; font-weight: 300;
p {
text-align: center;
font-size: 18px;
}
.corppaynew-msg { .corppaynew-msg {
margin: 30px 0; margin: 30px 0;
font-size: 14px; font-size: 14px;
...@@ -349,7 +354,7 @@ export default { ...@@ -349,7 +354,7 @@ export default {
display: table-row; display: table-row;
vertical-align: inherit; vertical-align: inherit;
border-color: inherit; border-color: inherit;
td{ td {
vertical-align: middle; vertical-align: middle;
} }
} }
......
src/views/Business/Training.vue
...@@ -213,6 +213,7 @@ export default { ...@@ -213,6 +213,7 @@ export default {
padding: 6px 10px; padding: 6px 10px;
color: #ffffff; color: #ffffff;
border: 0; border: 0;
border-radius: 5px;
} }
} }
.nav-tabs { .nav-tabs {
...@@ -247,10 +248,10 @@ export default { ...@@ -247,10 +248,10 @@ export default {
padding: 10px; padding: 10px;
padding-left: 10px; padding-left: 10px;
padding-right: 10px; padding-right: 10px;
font-size: 14px; font-size: 14px;
color: #ffffff; color: #ffffff;
border: 0; border: 0;
border-radius: 5px;
} }
} }
......
src/views/Business/serviceFee.vue
<template> <template>
<div class="corppaynew"> <div class="corppaynew">
<cate :father="qtzzfwfCate"></cate> <!-- <cate :father="qtzzfwfCate"></cate> -->
<div class="corppaynew-msg container"> <div class="corppaynew-msg container">
<div class="section_main"> <h2 class="page_title">关于增值服务价格公示</h2>
<table border="1"> <div class="section">
<tbody> <h3 class="section_title">其他类型定制服务</h3>
<tr> <div class="section_main">
<th>收费主体</th> <table border="1">
<th>收费项目</th> <tbody>
<th>收费标准</th> <tr>
<th>收费依据</th> <th>收费主体</th>
</tr> <th>收费项目</th>
<tr> <th>收费标准</th>
<td>中国物品编码中心</td> <th>收费依据</th>
<td> </tr>
信息咨询、技术咨询费、技术开发、技术成果转让、技术服务收费 <tr>
</td> <td>中国物品编码中心</td>
<td>市场定价（或合同定价）</td> <td>
<td> 信息咨询、技术咨询费、技术开发、技术成果转让、技术服务收费
《关于事业单位和社会团体有关收费管理问题的通知》（财规【2000】47号） </td>
</td> <td>市场定价（或合同定价）</td>
</tr> <td>
</tbody> 《关于事业单位和社会团体有关收费管理问题的通知》（财规【2000】47号）
</table> </td>
<p class="text_indent"> </tr>
除固定产品与服务外，额外对社会企业提供非标准化定制服务与解决方案，包括但不限于产品信息整理，产品信息数据清洗，产品信息逻辑处理，产品信息交换、产品信息托管、产品信息数据分析等为满足特定需求而定制的接入接出或者填写规则等多种定制化服务。 </tbody>
</p> </table>
<p class="text_indent">
除固定产品与服务外，额外对社会企业提供非标准化定制服务与解决方案，包括但不限于产品信息整理，产品信息数据清洗，产品信息逻辑处理，产品信息交换、产品信息托管、产品信息数据分析等为满足特定需求而定制的接入接出或者填写规则等多种定制化服务。
</p>
</div>
</div> </div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import cate from "../comps/cate.vue"; // import cate from "../comps/cate.vue";
export default { export default {
components: { components: {
cate, // cate,
}, },
data() { data() {
return { return {
...@@ -73,50 +77,80 @@ export default { ...@@ -73,50 +77,80 @@ export default {
.corppaynew-msg { .corppaynew-msg {
margin: 30px 0; margin: 30px 0;
font-size: 14px; font-size: 14px;
.section_main { h2 {
table { margin-top: 0;
width: 100%; margin-bottom: 15px;
margin: 0 auto; padding-bottom: 10px;
border: 1px solid #aaa; border-bottom: 1px solid #b2b2b8;
border-spacing: 0; color: #002c6c;
border-collapse: collapse; font-weight: 400;
tr { }
th { h3 {
text-align: center; margin-top: 0;
border-width: 1px; margin-bottom: 15px;
} padding-bottom: 10px;
td { border-bottom: 1px solid #b2b2b8;
border: 1px solid #aaa; }
padding: 8px; .page_title {
text-align: center; text-align: center;
} font-size: 22px;
&:last-child { }
.section {
margin-top: 30px;
margin-bottom: 40px;
.section_title {
font-size: 16px;
color: #b53434;
background-color: #b9cad0;
// margin: 0;
padding: 10px;
}
.section_main {
padding: 15px;
table {
width: 100%;
margin: 0 auto;
border: 1px solid #aaa;
border-spacing: 0;
border-collapse: collapse;
tr {
th {
text-align: center;
border-width: 1px;
}
td { td {
border-bottom: 1px solid #b1b3b3; border: 1px solid #aaa;
padding: 8px;
text-align: center;
}
&:last-child {
td {
border-bottom: 1px solid #b1b3b3;
}
} }
} }
} }
} tbody {
tbody { display: table-row-group;
display: table-row-group; vertical-align: middle;
vertical-align: middle; border-color: inherit;
border-color: inherit; }
} tr {
tr { display: table-row;
display: table-row; vertical-align: inherit;
vertical-align: inherit; border-color: inherit;
border-color: inherit; }
} th {
th { display: table-cell;
display: table-cell; vertical-align: inherit;
vertical-align: inherit; font-weight: bold;
font-weight: bold; }
} p {
p { line-height: 28px;
line-height: 28px; }
} .text_indent {
.text_indent { text-indent: 2em;
text-indent: 2em; }
} }
} }
} }
......
src/views/Home/index.vue
...@@ -107,9 +107,7 @@ ...@@ -107,9 +107,7 @@
</li> </li>
</ul> </ul>
<div class="tab-content marginTop15"> <div class="tab-content marginTop15">
<div <div class="tab-pane fade show active">
class="tab-pane fade show active"
>
<list :list="news[0].data" /> <list :list="news[0].data" />
</div> </div>
</div> </div>
...@@ -893,7 +891,7 @@ export default { ...@@ -893,7 +891,7 @@ export default {
{ {
name: "国家射频识别产品质量检验检测中心", name: "国家射频识别产品质量检验检测中心",
url: "http://www.spjc.org.cn/", url: "http://www.spjc.org.cn/",
type: 'link', type: "link",
}, },
{ {
name: "国家条码质量检验检测中心", name: "国家条码质量检验检测中心",
...@@ -905,24 +903,24 @@ export default { ...@@ -905,24 +903,24 @@ export default {
{ {
name: "中国自动识别技术协会", name: "中国自动识别技术协会",
url: "http://www.aimchina.org.cn/", url: "http://www.aimchina.org.cn/",
type: 'link', type: "link",
}, },
{ {
name: "中国条码技术与应用协会", name: "中国条码技术与应用协会",
url: "http://www.cabc.net.cn/", url: "http://www.cabc.net.cn/",
type: 'link', type: "link",
}, },
{ {
name: "《中国自动识别技术》杂志社", name: "《中国自动识别技术》杂志社",
subName: "电子版", subName: "电子版",
url: "http://www.aidchina.com.cn/", url: "http://www.aidchina.com.cn/",
subUrl: "http://www.aidchina.com.cn/zzzq/index.htm", subUrl: "http://www.aidchina.com.cn/zzzq/index.htm",
type: 'link', type: "link",
}, },
{ {
name: "中国ECR委员会", name: "中国ECR委员会",
url: "http://www.ecrchina.org/", url: "http://www.ecrchina.org/",
type: 'link', type: "link",
}, },
{ {
name: "全国物品编码标准化技术委员会", name: "全国物品编码标准化技术委员会",
...@@ -966,7 +964,7 @@ export default { ...@@ -966,7 +964,7 @@ export default {
{ {
name: "北京东方捷码科技开发中心", name: "北京东方捷码科技开发中心",
url: "http://www.anccweb.com/", url: "http://www.anccweb.com/",
type: 'link', type: "link",
}, },
], ],
}, },
...@@ -1032,7 +1030,7 @@ export default { ...@@ -1032,7 +1030,7 @@ export default {
async getCustomServiceFromServer() { async getCustomServiceFromServer() {
// 判断是否登录 // 判断是否登录
if(localStorage.getItem('loginInfo')){ if (localStorage.getItem("loginInfo")) {
const searchGlnRes = await this.$api.home.customService(); const searchGlnRes = await this.$api.home.customService();
const { returnCode, data } = searchGlnRes; const { returnCode, data } = searchGlnRes;
if (returnCode === "0") { if (returnCode === "0") {
...@@ -1071,26 +1069,34 @@ export default { ...@@ -1071,26 +1069,34 @@ export default {
}, },
// 初始化 // 初始化
init() { init() {
// 首页大轮播图
this.homeBigImages();
// 要闻左侧图片资讯
this.homePictureImageList();
// 要闻右侧标题列表 // 要闻右侧标题列表
this.homeImportantNewList(); this.homeImportantNewList();
// 商品全球身份证 // 商品全球身份证
this.homeNewGtin(); this.homeNewGtin();
// 党建文化新闻列表 // 党建文化新闻列表
Promise.all([this.homeGet4PartyTopNews(), this.homeGet1PartyTopNews()]).then((result => { Promise.all([
console.log(result, '党建文化新闻列表集合'); this.homeGet4PartyTopNews(),
this.homeGet1PartyTopNews(),
]).then((result) => {
console.log(result, "党建文化新闻列表集合");
this.djwh.data = [].concat(result[0], result[1]); this.djwh.data = [].concat(result[0], result[1]);
})); });
// 专题聚焦 // 专题聚焦
this.homeGetsdztListTopNews(); this.homeGetsdztListTopNews();
// 首页小轮播图
this.homeSmallImages();
// 后台轮播图预览 // 后台轮播图预览
if (this.$route.query && this.$route.query.indexCarouselManageId) { if (this.$route.query && this.$route.query.indexCarouselManageId) {
this.indexCarouselManage(this.$route.query.indexCarouselManageId); this.indexCarouselManage(this.$route.query.indexCarouselManageId);
} else {
// 首页大轮播图
this.homeBigImages();
// 首页小轮播图
this.homeSmallImages();
}
if (this.$route.query && this.$route.query.pictureId) {
this.homePicture(this.$route.query.pictureId);
} else {
// 要闻左侧图片资讯
this.homePictureImageList();
} }
}, },
// 后台轮播图预览 // 后台轮播图预览
...@@ -1098,23 +1104,46 @@ export default { ...@@ -1098,23 +1104,46 @@ export default {
// console.log(this.$api, 'this.$api'); // console.log(this.$api, 'this.$api');
const query = { const query = {
id: indexCarouselManageId, id: indexCarouselManageId,
} };
const indexCarouselManageRes = await this.$api.home.indexCarouselManage(query); const indexCarouselManageRes = await this.$api.home.indexCarouselManage(
query
);
const { returnCode, data } = indexCarouselManageRes; const { returnCode, data } = indexCarouselManageRes;
console.log(indexCarouselManageRes, "后台轮播图预览"); console.log(indexCarouselManageRes, "后台轮播图预览");
if (returnCode === "0") { if (returnCode === "0") {
const list = []; const list = [];
const childList = []; const childList = [];
if (data.classnum === '大轮播') { if (data.classnum === "大轮播") {
list.push(data); list.push(data);
this.banner = list; this.banner = list;
// 首页小轮播图
this.homeSmallImages();
} else { } else {
childList.push(data); childList.push(data);
list.push(childList); list.push(childList);
this.smallPCImages = list; this.smallPCImages = list;
// 首页大轮播图
this.homeBigImages();
} }
} }
},
async homePicture(pictureId) {
// console.log(this.$api, 'this.$api');
const query = {
id: pictureId,
};
const indexCarouselManageRes = await this.$api.home.indexCarouselManage(
query
);
const { returnCode, data } = indexCarouselManageRes;
console.log(indexCarouselManageRes, "后台轮播图预览2");
if (returnCode === "0") {
const list = [];
data.jumppath = data.directpath;
data.picFile = data.picIndexPath;
list.push(data);
this.newsBanner = list;
}
}, },
// 首页大轮播图 // 首页大轮播图
async homeBigImages() { async homeBigImages() {
...@@ -1445,7 +1474,7 @@ export default { ...@@ -1445,7 +1474,7 @@ export default {
height: 18px; height: 18px;
background: url("../../assets/image/home/prevArrow-hover.png") background: url("../../assets/image/home/prevArrow-hover.png")
no-repeat; no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
} }
} }
...@@ -1459,7 +1488,7 @@ export default { ...@@ -1459,7 +1488,7 @@ export default {
height: 18px; height: 18px;
background: url("../../assets/image/home/nextArrow-hover.png") background: url("../../assets/image/home/nextArrow-hover.png")
no-repeat; no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
} }
} }
} }
...@@ -1829,7 +1858,7 @@ export default { ...@@ -1829,7 +1858,7 @@ export default {
padding: 18px 0; padding: 18px 0;
} }
.marginTop15{ .marginTop15 {
margin-top: 15px; margin-top: 15px;
} }
...@@ -2104,7 +2133,7 @@ export default { ...@@ -2104,7 +2133,7 @@ export default {
align-items: center; align-items: center;
justify-content: center; justify-content: center;
width: 100%; width: 100%;
.ywdt-bt{ .ywdt-bt {
width: 100%; width: 100%;
text-align: center; text-align: center;
} }
......
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