Skip to content

G
gs1
Commit d41ef0cd by Lyan
Options

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

parents b74e397c 37a80454
Showing with 534 additions and 133 deletions
.env.production
......@@ -3,5 +3,5 @@ VUE_APP_CURRENTMODE = "production"
VUE_APP_HOST_URL = "http://192.168.0.77:9091"
VUE_APP_API_URL = "http://192.168.0.77:9091"
VUE_APP_GDS_URL = "http://data-studio.gds.org.cn"
VUE_APP_CHINATM_URL = "http://member.gds.org.cn:8080/chinatm"
VUE_APP_CHINATM_URL = "http://192.168.0.77:8080/chinatm"
VUE_APP_LOG = false
.env.test
......@@ -3,5 +3,5 @@ VUE_APP_CURRENTMODE = "test"
VUE_APP_HOST_URL = "http://81.68.189.225:9091"
VUE_APP_API_URL = "http://81.68.189.225:9091"
VUE_APP_GDS_URL = "http://data-studio.gds.org.cn"
VUE_APP_CHINATM_URL = "http://member.gds.org.cn:8080/chinatm"
VUE_APP_CHINATM_URL = "http://81.68.189.225:8080/chinatm"
VUE_APP_LOG = false
src/axios/module/business.js
......@@ -12,6 +12,12 @@ const businessDownLoad = (params = {}) => {
return POST(`${Prefix}/office/doc/api/downLoad`, params)
}
// 表格列表
const businessDownLoadList = (params = {}) => {
return POST(`${Prefix}/office/doc/api/list`, params)
}
// 右侧政策法规前四条数据
const businessGetTop4 = (params = {}) => {
return POST(`${Prefix}/office/policy/api/getTop4`, params)
......@@ -50,6 +56,7 @@ const businessGetFaqById = (params = {}) => {
export default {
businessDownLoad,
businessDownLoadList,
businessGetTop4,
businessGetEanUpcTop4,
businessGetEanUpcByCondition,
......
src/axios/module/sell.js
......@@ -5,7 +5,6 @@ import {
const Prefix = process.env.NODE_ENV === 'development' ? '/gs1' : '';
const Prefix2 = process.env.NODE_ENV === 'development' ? '/chinatm' : '';
// 获取首页最新动态
const getHomeLatestNews = (params = {}) => {
......
src/axios/module/service.js
import {
POST
POST,
} from "../fetch.js"
const Prefix = process.env.NODE_ENV === 'development' ? '/gs1' : '';
......@@ -21,8 +21,20 @@ const serviceCasesFrontList = (params = {}) => {
}
// 案例介绍根据id获取详情
const serviceGetCaseDetailInfo = (params = {}) => {
return POST(`${Prefix}/office/cases/api/getDetailInfo`, params)
}
// 案例介绍根据id获取详情
const serviceGetPartnersDetailInfo = (params = {}) => {
return POST(`${Prefix}/office/partners/api/getDetailInfo`, params)
}
export default {
getCodeBook,
servicePartnersFrontList,
serviceCasesFrontList,
serviceGetCaseDetailInfo,
serviceGetPartnersDetailInfo,
}
src/components/layout/header/index.vue
......@@ -84,7 +84,6 @@ export default {
fromNav: false,
// 点击事件来自dropdown
fromDropdown: false,
navList: nav,
currentNav: "0",
preActive: "",
};
......@@ -98,6 +97,18 @@ export default {
immediate: true,
}
},
computed: {
navList() {
let list = [];
nav.forEach(el => {
if (!el.isHiddenMenu) {
list.push(el);
}
})
return list;
// return nav;
}
},
mounted() {
window.addEventListener("click", this.handleWindowClick);
},
......
src/components/layout/header/mock.js
......@@ -634,6 +634,14 @@ export const nav = [
}
],
},
{
id: "0",
name: "表格下载",
index: 2,
link: "/statute/FormDownload",
isHiddenMenu: true,
breadcrumb: [{ name: "业务办理", path: "/Business" }, { name: "表格下载" }],
},
search,
service,
{
......
src/router/index.js
......@@ -451,6 +451,14 @@ const routes = [{
],
},
{
path: "/statute/FormDownload",
name: "FormDownload",
meta: {
name: "表格下载",
},
component: () => import("@/views/Business/FormDownload"),
},
{
path: "/BarCode",
name: "BarCode",
meta: {
......
src/utils/links.js
export const link = {
pxspkc: 'http://v3.gds.org.cn/LoginService.aspx',
wyxz: 'http://wsdt.gs1cn.org/anccoh/login.jsp',
zxzc: 'http://wsdt.ancc.org.cn/anccoh', // 我要申请商品条码里的在线注册
}
\ No newline at end of file
src/views/Business/2dcode.vue
......@@ -87,7 +87,7 @@ export default {
return {
wyscspewm: {
title1: {
name: "我要申请商品条码",
name: "我要生成商品二维码",
},
},
};
......
src/views/Business/FoodSafety.vue
......@@ -135,6 +135,8 @@ export default {
text-indent: 28px;
font-size: 14px;
line-height: 24px;
color: #454545;
margin: 0 0 10px;
}
a {
color: #008dbd;
......
src/views/Business/FormDownload.vue 0 → 100644
<template>
<div class="msg container">
<breadcrumb />
<div class="row">
<div class="col-lg-8">
<div class="msg-cont">
<cate :father="tmggCate"></cate>
<div class="container">
<DownloadList :list="list" @toListFather="receiveListChild" />
<pages
:currPage="pageParams.currPage"
:pageSize="pageParams.pageSize"
:total="pageParams.total"
@getLimit="receivePagesChild"
/>
</div>
</div>
</div>
<div class="col-lg-4">
<div class="beizhu">
<div class="container">
<div class="cate">
<span>备注</span>
</div>
<ul class="meminfo">
<li>表格成功下载后，填写时请务必字迹清楚。</li>
<li>表格中，深色区域为必填项，请完整填写。</li>
<li>
填写表格时，“<font color="#DF4A1A"
>中华人民共和国行政区划代码</font
>”和“<font color="#DF4A1A">国民经济行业分类</font
>”请参照国家标准填写。
</li>
<li>
下载表格还需打印、盖章，然后提交到<a
href="/Org/Branch.aspx"
target="_blank"
><font color="#DF4A1A">当地编码分支机构</font></a
>。
</li>
</ul>
</div>
</div>
<div class="zhcx">
<div class="container">
<div class="cate">
<span>综合查询</span>
</div>
<SubNav/>
</div>
</div>
</div>
</div>
</div>
</template>
<script>
import { mapState } from "vuex";
import cate from "../comps/cate.vue";
import DownloadList from "./copms/download-list.vue";
import pages from "../comps/pages2.vue";
import breadcrumb from "../comps/breadcrumb.vue";
import SubNav from "../comps/SubNav.vue";
import search from "@/components/layout/header/search.js";
export default {
components: {
cate,
breadcrumb,
DownloadList,
pages,
SubNav,
},
computed: {
...mapState({
matche: (state) => state.matche,
}),
...mapState(["urls"]),
},
data() {
return {
tmggCate: {
name: "表格下载 ",
ico: "",
},
list: [],
pageParams: {
currPage: 1,
pageSize: 10,
total: 0,
},
};
},
created() {
this.$store.commit("system/SET_SUB_NAV", search.children);
this.businessDownLoadList();
},
methods: {
// 接收分页子组件传过来的值
receivePagesChild(val) {
this.pageParams.currPage = val;
this.businessDownLoadList();
},
// 接收列表子组件传过来的值
receiveListChild(obj) {
console.log(obj, "obj");
window.open(obj.docfile, '_blank');
},
// 右侧表格下载功能
async businessDownLoadList() {
const params = {
page: this.pageParams.currPage,
size: this.pageParams.pageSize,
}
const businessDownLoadListRes = await this.$api.business.businessDownLoadList(params);
const { returnCode, data } = businessDownLoadListRes;
console.log(businessDownLoadListRes, "businessDownLoadListRes");
if (returnCode === "0") {
this.list = data.list;
this.pageParams.total = data.totalCount
}
console.log(businessDownLoadListRes, "表格下载功能");
},
},
};
</script>
<style lang="scss">
.msg {
.list {
.row {
&:last-child {
border-bottom: none;
}
}
}
}
</style>
<style lang="scss" scoped>
.msg {
padding-bottom: 20px;
.cate {
display: flex;
justify-content: space-between;
border-bottom: 1px dashed #c5d8ee;
padding: 15px 0;
span {
&:nth-child(1) {
font-size: 16px;
color: #454545;
}
&:nth-child(2) {
color: #f26335;
font-size: 12px;
cursor: pointer;
}
}
}
.msg-cont {
@include module-box;
// padding: 30px 0;
padding-bottom: 30px;
}
.beizhu {
@include module-box;
.meminfo {
margin: 15px 0;
li {
padding-top: 5px;
padding-bottom: 5px;
list-style: disc;
font-size: 14px;
margin-left: 20px;
}
}
}
.zhcx{
@include module-box;
margin-top: 20px;
}
}
</style>
src/views/Business/Register.vue
......@@ -5,7 +5,7 @@
<div class="register-top register-border">
<div class="container">
<div class="register-top-cont">
<div class="zxzc-btn">在线注册</div>
<div class="zxzc-btn" @click="zxzcHandelClick">在线注册</div>
<img
src="../../assets/image/business/barcode-register.png"
class="barcode-register"
......@@ -33,6 +33,7 @@ import bgxz from "./copms/bgxz.vue";
import dffzjg from "./copms/dffzjg.vue";
import zcfg from "./copms/zcfg.vue";
import zxcxgj from "./copms/zxcxgj.vue";
import { link } from "@/utils/links";
export default {
components: {
......@@ -72,6 +73,11 @@ export default {
},
};
},
methods: {
zxzcHandelClick() {
window.open(link.zxzc, '_blank')
},
},
};
</script>
<style lang="scss" scoped>
......@@ -89,6 +95,7 @@ export default {
color: #ffffff;
font-size: 14px;
text-align: center;
cursor: pointer;
}
.register-top-cont {
max-width: 450px;
......
src/views/Business/copms/bgxz.vue
<template>
<div class="bgxz">
<cate :father="bgxzCate"></cate>
<cate :father="bgxzCate" @toCateFather="receiveCateChild"></cate>
<div class="container">
<ul class="tmgg-ul">
<li v-for="(tmp, i) in list" :key="i" @click="handelDownload(i)">
......@@ -36,14 +36,18 @@ export default {
this.businessDownLoad();
},
methods: {
// 标题跳转
receiveCateChild() {
window.open('/statute/FormDownload', '_blank');
},
// 右侧表格下载功能
async businessDownLoad() {
const businessDownLoadRes = await this.$api.business.businessDownLoad();
const { returnCode, data } = businessDownLoadRes;
if (returnCode === "0") {
data.forEach(el => {
el.docfile = `${this.urls.gs1cnTwo}manage/down/${el.docfile}`;
});
// data.forEach(el => {
// el.docfile = `${this.urls.gs1cnTwo}manage/down/${el.docfile}`;
// });
this.list = data;
}
console.log(businessDownLoadRes, "右侧表格下载功能");
......
src/views/Business/copms/dffzjg.vue
<template>
<div class="dffzjg">
<cate :father="dffzjgCate"></cate>
<cate :father="dffzjgCate" @toCateFather="receiveCateChild"></cate>
<div class="container">
<div class="row dffzjg-ul">
<div
......@@ -221,6 +221,10 @@ export default {
};
},
methods: {
// 标题跳转
receiveCateChild() {
window.open('/Org/Branch', '_blank');
},
openMsg(branchCode) {
let routeData = this.$router.resolve({
path: '/Org/BranchMsg',
......
src/views/Business/copms/download-list.vue 0 → 100644
<template>
<div class="list">
<div v-for="(tmp, i) in list" :key="i" class="row" @click="handelClick(i)">
<div class="col-lg-6 list-left">
<span></span>
<span>{{tmp.title}}</span>
</div>
<div class="col-lg-2 list-right"></div>
</div>
</div>
</template>
<script>
export default {
props: ['list'],
methods: {
// 跳转至详情页
handelClick(i) {
this.$emit('toListFather', this.list[i]);
},
},
}
</script>
<style lang="scss" scoped>
.list {
margin: 0;
padding: 0;
.row {
display: flex;
justify-content: space-between;
border-bottom: 1px dashed #c5d8ee;
padding: 20px 0;
margin: 0;
font-size: 14px;
color: #454545;
cursor: pointer;
.list-left {
flex: 1;
display: flex;
align-items: center;
@include ellipsis;
span {
display: inline-block;
&:nth-child(1) {
width: 4px;
height: 4px;
background: #f26335;
border-radius: 50%;
margin-right: 10px;
}
&:nth-child(2) {
flex: 1;
@include ellipsis;
}
}
}
.list-right{
text-align: right;
font-style: oblique;
}
}
}
</style>
\ No newline at end of file
src/views/Business/copms/list.vue
......@@ -5,7 +5,7 @@
<span></span>
<span>{{tmp.name}}</span>
</div>
<div class="col-lg-2 list-right">{{tmp.time}}</div>
<div class="col-lg-2 list-right">[{{tmp.code}}]</div>
</div>
</div>
</template>
......@@ -55,6 +55,7 @@ export default {
}
.list-right{
text-align: right;
font-style: oblique;
}
}
}
......
src/views/Business/copms/tmgg.vue
<template>
<div class="tmgg">
<cate :father="tmggCate"></cate>
<cate :father="tmggCate" @toCateFather="receiveCateChild"></cate>
<div class="container">
<ul class="tmgg-ul">
<li v-for="(tmp, i) in list" :key="i" @click="openMsg(tmp)">
......@@ -33,6 +33,10 @@ export default {
this.getEanUpcTop4();
},
methods: {
// 标题跳转
receiveCateChild() {
window.open('/Business/Notice?type=zhuce', '_blank');
},
// 条码公告前四条数据
async getEanUpcTop4() {
// console.log(params, "params");
......
src/views/Business/copms/zcfg.vue
<template>
<div class="zcfg">
<cate :father="zcfgCate"></cate>
<cate :father="zcfgCate" @toCateFather="receiveCateChild"></cate>
<div class="container">
<ul class="zcfg-ul">
<li v-for="(tmp, i) in list" :key="i" @click="openMsg(tmp.id)">
......@@ -31,6 +31,10 @@ export default {
this.businessGetTop4();
},
methods: {
// 标题跳转
receiveCateChild() {
window.open('/Knowledge/Statute', '_blank');
},
// 右侧政策法规前四条数据
async businessGetTop4() {
const businessGetTop4Res = await this.$api.business.businessGetTop4();
......
src/views/Home/comps/notice.vue
......@@ -9,19 +9,20 @@
/>
<div class="container">
<div class="row">
<div class="col-lg-5 notice-tp d-lg-block">
<div class="col-lg-5 notice-tp d-lg-block" v-if="false">
<img src="../../../assets/image/home/notice-tp.png" alt="" />
</div>
<div class="col-lg-7 notice-nr">
<div class="col-lg-12 notice-nr">
<div class="notice-cate">
<span></span>
<span>公告</span>
<span></span>
</div>
<div class="notice-nr-kj">
<div class="notice-cate">
<span></span>
<span>公告</span>
<span></span>
</div>
<p class="notice-note">
为应对疫情，切实减轻企业负担，协助企业复工复产、渡过难关，编码中心决定自2020年3月1日至2021年9月30日，采取阶段性降费措施。<span
@click="handelJump">点击查看收费公示表</span
为应对疫情，切实减轻企业负担，协助企业复工复产、渡过难关，编码中心决定自2020年3月1日至2021年12月31日，采取阶段性降费措施。<span
@click="handelJump"
>点击查看收费公示表</span
>
</p>
<div class="notice-cont">
......@@ -29,25 +30,46 @@
<span></span>
<span>一次性加入费用：</span>
</div>
<ul class="cont-ul">
<li>
<span>十三位数字标准码- - - - - -</span><span>720元</span>
</li>
<li>
<span>十三位数字标准码和八位数字缩短码- - - - - -</span
><span>1120元</span>
</li>
</ul>
<table align="center" border="1">
<tbody>
<tr>
<td>十三位数字标准码一次性加入费</td>
<td>收费标准<br />720元</td>
</tr>
<tr>
<td>十三位数字标准码和八位数字缩短码一次性加入费</td>
<td>收费标准<br />1120元</td>
</tr>
</tbody>
</table>
</div>
<div class="notice-cont">
<div class="cont-cate">
<span></span>
<span>系统维护费用：</span>
</div>
<ul class="cont-ul">
<li><span>单个企业- - - - - -</span><span>580元/年</span></li>
</ul>
<table align="center" border="1">
<tbody>
<tr>
<td>系统成员类别</td>
<td>收费标准</td>
</tr>
<tr>
<td>单个企业</td>
<td>580元/年</td>
</tr>
<tr>
<td>集团公司</td>
<td>1080元/年</td>
</tr>
<tr>
<td>进出口公司</td>
<td>1080元/年</td>
</tr>
</tbody>
</table>
</div>
<div class="notice-note" style="text-align:right"><br>2020年2月28日</div>
</div>
</div>
</div>
......@@ -67,7 +89,7 @@ export default {
this.show = false;
},
handelJump() {
window.open('/Business/Corppaynew', '_blank');
window.open("/Business/Corppaynew", "_blank");
},
},
};
......@@ -76,7 +98,7 @@ export default {
@media screen and (max-width: 992px) {
.notice {
.notice-kj {
width: 90% !important;
width: 80% !important;
}
}
}
......@@ -89,8 +111,8 @@ export default {
width: 100vw;
height: 100vh;
z-index: 999;
&.mask{
&.mask {
background: rgba(0, 0, 0, 0.7);
}
.notice-kj {
......@@ -98,7 +120,7 @@ export default {
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
width: 36%;
width: 25%;
background: #fff;
border-radius: 8px;
.notice-close {
......@@ -114,56 +136,60 @@ export default {
> * {
padding: 0;
}
.notice-tp {
display: none;
overflow: hidden;
img {
height: 100%;
// max-width: 100%;
}
// .notice-tp {
// display: none;
// overflow: hidden;
// img {
// height: 100%;
// // max-width: 100%;
// }
// }
}
}
.notice-cate {
display: flex;
align-items: center;
justify-content: center;
margin-top: 35px;
span {
display: inline-block;
&:nth-child(1) {
width: 20%;
height: 2px;
background: linear-gradient(to right, #fff, #f26335);
}
&:nth-child(2) {
color: #f26335;
font-size: 26px;
margin: 0 20px;
}
&:nth-child(3) {
width: 20%;
height: 2px;
background: linear-gradient(to left, #fff, #f26335);
}
}
}
.notice-nr-kj {
width: 90%;
margin: 0 auto;
.notice-cate {
display: flex;
align-items: center;
justify-content: center;
margin-top: 35px;
span {
display: inline-block;
&:nth-child(1) {
width: 20%;
height: 2px;
background: linear-gradient(to right, #fff, #f26335);
}
&:nth-child(2) {
color: #f26335;
font-size: 26px;
margin: 0 20px;
}
&:nth-child(3) {
width: 20%;
height: 2px;
background: linear-gradient(to left, #fff, #f26335);
}
}
}
margin: 20px auto;
padding: 0 10px;
height: 300px;
overflow: hidden;
overflow-y: auto;
.notice-note {
font-size: 14px;
margin-top: 20px;
span {
color: rgba(242, 99, 53, 1);
cursor: pointer;
}
}
.notice-cont {
margin-top: 20px;
// margin-top: 20px;
.cont-cate {
display: flex;
align-items: center;
margin: 10px 0;
span {
&:nth-child(1) {
display: inline-block;
......@@ -173,17 +199,35 @@ export default {
transform: rotate(45deg);
margin-right: 15px;
}
&:nth-child(2) {
color: #454545;
font-size: 14px;
}
}
}
.cont-ul {
padding: 0;
font-size: 14px;
li {
padding: 10px 0;
span {
&:nth-child(2) {
color: rgba(242, 99, 53, 1);
}
}
table {
display: table;
border-collapse: separate;
box-sizing: border-box;
text-indent: initial;
border-spacing: 2px;
border-color: grey;
table-layout: fixed;
text-align: center;
width: 80%;
tbody {
display: table-row-group;
vertical-align: middle;
border-color: inherit;
tr {
display: table-row;
vertical-align: inherit;
border-color: inherit;
td {
display: table-cell;
vertical-align: inherit;
border-width: 1px;
}
}
}
......
src/views/MyManage/SystemMember/companyInfo.vue
......@@ -376,8 +376,6 @@ export default {
<style lang="scss" scoped>
.container2{
.content{
@include module-box;
margin-top: 14px;
......@@ -475,6 +473,9 @@ export default {
}
}
}
/deep/.el-input.is-disabled .el-input__inner {
color: #000 !important;
}
</style>
<style lang="scss" scoped>
@media (max-width: 768px) {
......
src/views/MyManage/UnVerify/index.vue
......@@ -162,7 +162,7 @@ export default {
const params = {userType: this.loginInfo.userType, id: this.loginInfo.id}
const result = await this.$api.myManage.redirectYWDT(params)
if (result.success) {
window.open(result.data, '_black')
// window.open(result.data, '_black')
} else {
this.$message.error(result.returnMsg)
}
......@@ -171,7 +171,7 @@ export default {
const params = {userType: this.loginInfo.userType, id: this.loginInfo.id, carno: this.loginInfo.carno}
const result = await this.$api.myManage.redirectGDS(params)
if (result.success) {
window.open(result.data, '_black')
// window.open(result.data, '_black')
} else {
this.$message.error(result.returnMsg)
}
......@@ -179,7 +179,7 @@ export default {
async redirectGLN() {
const result = await this.$api.myManage.redirectGLN()
if (result.success) {
window.open(result.data, '_black')
// window.open(result.data, '_black')
} else {
this.$message.error(result.returnMsg)
}
......
src/views/MyManage/UnVerify/uploadvendor.vue
......@@ -55,7 +55,7 @@ export default {
this.$message.success('上传成功')
await this.getTycpdmFirmInfo()
} else {
this.$message.error('上传失败')
this.$message.error(result.returnMsg)
}
this.uploading = false
},
......
src/views/MyManage/UnVerify/vendor.vue
......@@ -484,7 +484,7 @@ export default {
this.$message.success('上传成功')
this.form.firmBusinessLicenseFile = result.data
} else {
this.$message.error('上传失败')
this.$message.error(result.returnMsg)
}
this.uploading = false
},
......
src/views/MyManage/index.vue
......@@ -249,7 +249,7 @@ export default {
if (this.loginInfo.isXT === 1 && !this.loginInfo.carno) { // 未申请条码卡的系统成员没有商品条码在线注册菜单
this.routerList[1].children = this.routerList[1].children.filter(item => item.name !== '商品条码在线注册')
}
if (this.loginInfo.userType === 1) { // 手机号登陆用户不能有修改手机号菜单
if (this.loginInfo.userType === 1 || this.loginInfo.userType === 2) { // 手机号登陆和条码可登陆用户不能有修改手机号菜单
this.routerList[2].children = this.routerList[2].children.filter(item => item.name !== '修改手机号码')
}
this.routerList[0].link = '/MyManage/SystemMember/index'
......@@ -268,6 +268,16 @@ export default {
alert: () => {window.alert('系统成员请联系所属分支机构办理企业信息变更！')}
})
}
if (this.loginInfo.userType === 2) { // 条码卡登陆用户，修改登录密码给出提示
this.routerList[2].children.some(item => {
const isReturn = item.name === '修改登录密码'
if (isReturn) {
item.link = ''
item.alert = () => {window.alert('系统成员请前往中国商品信息服务平台修改条码卡密码。')}
}
return isReturn
})
}
// 由于屏蔽了检测校准申请，所以未申请条码卡的系统成员的业务管理模块没有任何菜单（去除业务管理，二期开始开发后注销掉下方处理代码即可）
if (this.loginInfo.isXT === 1 && !this.loginInfo.carno) { // 未申请条码卡的系统成员没有商品条码在线注册菜单
this.routerList = this.routerList.filter(item => item.name !== '业务管理')
......
src/views/Org/Intro.vue
......@@ -36,7 +36,8 @@
<p>（九）承办国家市场监督管理总局交办的其他工作。</p>
<div class="zzjg">
<Title :father="intro.title1"></Title>
<img src="../../assets/image/home/zzjg-tp.jpg" alt="" />
<div class="zzjg-tp"><img src="../../assets/image/home/zzjg-tp.jpg" alt="" /></div>
</div>
<div class="zzjg">
<Title :father="intro.title2"></Title>
......@@ -131,8 +132,13 @@ export default {
margin-bottom: 10px;
}
.zzjg {
.zzjg-tp{
text-align: center;
}
img {
width: 100%;
max-width: 750px;
margin: 0 auto;
}
}
.map {
......
src/views/Service/Partners/caseList.vue
......@@ -46,7 +46,6 @@
</template>
<script>
import {mapMutations} from "vuex";
import pages from "../../comps/pages2.vue";
export default {
......@@ -84,17 +83,15 @@ export default {
this.casesFrontList();
},
methods: {
...mapMutations("service", {
setPartnersMsg: "setPartnersMsg",
}),
// 点击列表跳转详情
handelJumpMsg(msg) {
const prefix = 'http://www.gs1cn.org'
msg.brief = msg.brief.replace(new RegExp('src="/UserFiles/Image', 'g'), `src="${prefix}/UserFiles/Image`);
this.setPartnersMsg(msg);
this.$router.push({
let routeData = this.$router.resolve({
path: "/Service/Partners/caseMsg",
query: {
id: msg.id
}
});
window.open(routeData.href, "_blank");
},
// 接收分页子组件传过来的值
receivePagesChild(val) {
......@@ -112,9 +109,8 @@ export default {
const serviceCasesFrontListRes =
await this.$api.service.serviceCasesFrontList(params);
const {success, data} = serviceCasesFrontListRes;
console.log(serviceCasesFrontListRes, "serviceCasesFrontListRes");
console.log(serviceCasesFrontListRes, "案例介绍");
if (success) {
console.log(data, "案例介绍");
this.pageParams.total = data.totalCount;
this.list = data.list;
}
......
src/views/Service/Partners/caseMsg.vue
......@@ -17,16 +17,14 @@
</template>
<script>
import {mapState} from "vuex";
export default {
computed: {
...mapState("service", {
partnersMsg: "partnersMsg",
}),
data() {
return {
partnersMsg: {},
}
},
created() {
console.log("TODO QUERY", this.$route.query, this.partnersMsg);
this.serviceGetCaseDetailInfo();
},
mounted() {
// 面包屑单独处理
......@@ -36,7 +34,20 @@ export default {
{name: "GS1标准服务提供商案例"},
]);
},
methods: {},
methods: {
async serviceGetCaseDetailInfo() {
const query = {
id: this.$route.query.id,
}
const serviceGetCaseDetailInfoRes =
await this.$api.service.serviceGetCaseDetailInfo(query);
const { returnCode, data } = serviceGetCaseDetailInfoRes;
console.log(serviceGetCaseDetailInfoRes, "serviceGetCaseDetailInfoRes");
if (returnCode === "0") {
this.partnersMsg = data;
}
},
},
};
</script>
......
src/views/Service/Partners/content.vue
......@@ -2,7 +2,7 @@
<div class="msg-cont">
<div class="container">
<div class="msg-title">
{{ partnersMsg.title }}
{{ partnersMsg.firmname }}
</div>
<div class="msg-head">
<div class="msg-head-left">
......@@ -26,7 +26,7 @@
<div class="col-md-6">
<i class="iconfont icon-lianxiren"></i
><span style="font-size: 14px; color: #666; margin-left: 6px"
>联系人：<span id="Lab_name">{{ partnersMsg.firmname }}</span></span
>联系人：<span id="Lab_name">{{ partnersMsg.name }}</span></span
>
</div>
<div class="col-md-6">
......@@ -48,16 +48,14 @@
</template>
<script>
import { mapState } from "vuex";
export default {
computed: {
...mapState("service", {
partnersMsg: "partnersMsg",
}),
data() {
return {
partnersMsg: {},
}
},
created() {
console.log("TODO QUERY", this.$route.query, this.partnersMsg);
this.serviceGetPartnersDetailInfo();
},
mounted() {
// 面包屑单独处理
......@@ -67,7 +65,20 @@ export default {
{ name: "服务提供商介绍" },
]);
},
methods: {},
methods: {
async serviceGetPartnersDetailInfo() {
const query = {
id: this.$route.query.id,
}
const serviceGetPartnersDetailInfoRes =
await this.$api.service.serviceGetPartnersDetailInfo(query);
const { returnCode, data } = serviceGetPartnersDetailInfoRes;
console.log(serviceGetPartnersDetailInfoRes, "serviceGetPartnersDetailInfoRes");
if (returnCode === "0") {
this.partnersMsg = data;
}
},
},
};
</script>
......@@ -140,7 +151,7 @@ export default {
padding-top: 6px;
padding-bottom: 6px;
}
i{
i {
color: #aaa;
}
}
......
src/views/Service/Partners/list.vue
......@@ -64,7 +64,6 @@
</template>
<script>
import { mapMutations } from "vuex";
import pages from "../../comps/pages2.vue";
export default {
......@@ -111,15 +110,15 @@ export default {
this.partnersFrontList();
},
methods: {
...mapMutations("service", {
setPartnersMsg: "setPartnersMsg",
}),
// 点击列表跳转详情
handelJumpMsg(msg) {
this.setPartnersMsg(msg);
this.$router.push({
let routeData = this.$router.resolve({
path: "/Service/Partners/content",
query: {
id: msg.id
}
});
window.open(routeData.href, "_blank");
},
// 接收分页子组件传过来的值
receivePagesChild(val) {
......@@ -137,9 +136,8 @@ export default {
const businessGetPlanBranchListRes =
await this.$api.service.servicePartnersFrontList(params);
const { success, data } = businessGetPlanBranchListRes;
console.log(businessGetPlanBranchListRes, "businessGetPlanBranchListRes");
console.log(businessGetPlanBranchListRes, "服务商列表");
if (success) {
console.log(data, "服务商列表");
this.pageParams.total = data.totalCount;
this.list = data.list;
this.list.forEach(el => {
......
src/views/Service/book.vue
......@@ -6,7 +6,7 @@
<el-tab-pane label="条码图书" name="first">
<div class="book-card" :key="i" v-for="(item,i) in bookList">
<div class="book-img">
<img :src="prefix+item.graph" alt="">
<img :src="item.graph" alt="">
</div>
<div class="book-content">
<div class="title">{{ item.prename }}</div>
......@@ -68,7 +68,6 @@ export default {
data() {
return {
activeName: 'second',
prefix: 'http://www.gs1cn.org/Knowledge/img/',
appList: [
{
name: '中国物品编码中心',
......@@ -125,6 +124,7 @@ export default {
async getBooks(page = 1) {
const res = await this.$api.service.getCodeBook({page: page, size: this.page.pageSize})
const {returnCode, data} = res;
console.log(data, 'datadatadatadata');
if (returnCode === "0") {
this.bookList = data.list
this.page.currentPage = data.currPage
......
src/views/comps/cate.vue
......@@ -2,7 +2,7 @@
<div class="zxcxgj-cate">
<div class="container">
<div class="cate-left">
<img :src="father.ico" v-if="father.ico" />{{ father.name }}
<img :src="father.ico" v-if="father.ico" /><span @click="cateHandelClick">{{ father.name }}</span>
</div>
<div class="cate-right">
<slot v-solt="right"></slot>
......@@ -13,6 +13,11 @@
<script>
export default {
props: ["father"],
methods: {
cateHandelClick() {
this.$emit('toCateFather')
},
},
};
</script>
<style lang="scss">
......@@ -28,6 +33,9 @@ export default {
justify-content: space-between;
.cate-left{
flex: 1;
span{
cursor: pointer;
}
}
}
img {
......
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