Skip to content

G
gs1
Commit 87acb1b4 by Lyan
Options

官网优化提交

parent 0de613ab
Showing with 161 additions and 26 deletions
.env.development
NODE_ENV = "development"
VUE_APP_CURRENTMODE = "development"
VUE_APP_HOST_URL = "http://192.168.0.81:9091"
VUE_APP_HOST_URL = "http://dynamic.gs1cn.org"
VUE_APP_API_URL = "/"
VUE_APP_GDS_URL = "/gds"
VUE_APP_LOG = true
src/router/index.js
......@@ -1168,6 +1168,14 @@ const routes = [
},
component: () => import("@/views//Business/Faq.vue"),
},
{
path: "/Knowledge/GS1System/BarcodeArticle",
name: "BarcodeArticle",
meta: {
name: "GS1系统的应用",
},
component: () => import("@/views/Knowledge/GS1System/BarcodeArticle.vue"),
},
]
},
{
......
src/views/Business/serviceFee.vue
......@@ -42,7 +42,7 @@
<td>
易码追溯
</td>
<td>中国商品条码系统成员平台使用费为300元/年，非系统成员为700元/年，商品追溯费用80元/个，单品电子标签0.1元/个</td>
<td>平台使用费为1000元/年，商品追溯费用80元/个，单品电子标签0.1元/个</td>
<td>
《关于事业单位和社会团体有关收费管理问题的通知》（财规【2000】47号）
</td>
......
src/views/Home/index.vue
......@@ -695,7 +695,7 @@ export default {
], // 首页大轮播图
bannerSettings: {
arrows: true,
autoplay: false,
autoplay: true,
autoplaySpeed: 2000,
dots: true,
centerMode: true,
......
src/views/Knowledge/GS1System/BarcodeArticle.vue 0 → 100644
<template>
<div class="guide">
<div class="guide-msg container">
<div class="msg-cont">
<div class="title">GS1系统的应用<span>日期：2011/5/13</span></div>
<p>GS1系统主要应用于贸易项目、物流单元、位置、资产、服务的标识、自动数据采集、数据交换及其他特殊应用，涵盖了商贸流通过程中所有的产品与服务。</p>
<p> GS1系统的应用最早是从食品、日用百货等快速消费品在零售POS系统自动结算开始的，目前广泛应用于全球的贸易、物流、生产、医药、建材、产品溯源、电子商务等领域得到广泛应用，已成为全球通用的商务语言。</p>
<img src="../../../assets/image/knowledge/ancc-14.jpg" alt="">
<p style="text-align:center">图 给出了供应链过程中GS1系统的应用示意</p>
</div>
</div>
</div>
</template>
<script>
export default {
components: {
},
data() {
return {
};
},
mounted() {
// 面包屑单独处理
this.$store.commit("system/SET_BREADCRUMB", [
{ name: "技术与标准", path: "/Knowledge/index" },
{ name: "技术知识", path: "/Knowledge/index" },
{ name: "编码体系" },
]);
},
};
</script>
<style lang="scss" scoped>
.guide {
@include module-box;
.guide-msg {
margin: 30px 0;
font-size: 14px;
.msg-title {
color: rgba(0, 121, 158, 1);
margin-bottom: 20px;
}
.msg-cont {
line-height: 23px;
color: rgba(102, 102, 102, 1);
p:first-child{
line-height: 0;
}
.title {
padding: 20px 30px;
font-size: 18px;
font-weight: 500;
color: #454545;
line-height: 25px;
border-bottom: 1px solid #f3f3f3;
margin-bottom: 29px;
span{
float:right;
font-size: 14px;
}
}
p {
margin-left: 15px;
text-indent: 32px;
line-height: 28px;
// margin-bottom: 10px;
}
img{
width: 70%;
margin: 20px 15%;
}
}
}
}
</style>
\ No newline at end of file
src/views/Knowledge/GS1System2.vue
......@@ -65,6 +65,7 @@
<li><a href="/Knowledge/GS1System/tmyy?id=5" target="_blank">GS1系统在医疗卫生领域中的应用 </a></li>
<li><a href="/Knowledge/GS1System/tmyy?id=4" target="_blank">GS1系统在食品追溯领域中的应用</a></li>
<li><a href="/Knowledge/GS1System/tmyy?id=3" target="_blank">GS1系统在商业零售中的应用 </a></li>
<li><a href="/Knowledge/GS1System/BarcodeArticle" target="_blank">GS1系统的应用 </a></li>
<li><a href="/Knowledge/GS1System/tmyy?id=2" target="_blank">商品条码在零售商品的应用 </a></li>
<li><a href="/Knowledge/GS1System/tmyy?id=1" target="_blank">条码质量控制</a></li>
......
src/views/MyManage/UnVerify/changePass.vue
......@@ -13,8 +13,7 @@
prop='oldPass'
type='password'
:rules="[{required: true,message: '不能为空',},
{ pattern: pwdPattern, message: '密码长度8-20 位字符，包括数字、大、小写字母、特殊字符中的至少2种',},
{ validator:validatePass,}]">
{ validator:validatePass}]">
<el-input type='password' placeholder="请输入原密码" v-model='form.oldPass'></el-input>
</el-form-item>
<el-form-item label='新密码'
......
src/views/MyManage/index.vue
......@@ -118,20 +118,20 @@ export default {
],
},
{
id: uuid("gs_nav"),
name: "用户信息管理",
index: 2,
link: "",
children: [
{
id: uuid("gs_nav"),
name: "修改登录密码",
index: 2,
link: "/MyManage/UnVerify/changePass",
},
],
},
// {
// id: uuid("gs_nav"),
// name: "用户信息管理",
// index: 2,
// link: "",
// children: [
// {
// id: uuid("gs_nav"),
// name: "修改登录密码",
// index: 2,
// link: "/MyManage/UnVerify/changePass",
// },
// ],
// },
],
typeRouterList2: [
{
......@@ -256,6 +256,11 @@ export default {
};
},
created() {
// // TODO 判断用户状态 处理一下左侧的 sub_nav 和用户panel
const user = JSON.parse(localStorage.getItem('gs-user'))
if(!user){
......@@ -357,8 +362,33 @@ export default {
// }
// this.$store.commit("system/SET_SUB_NAV", this.routerList);
// 判断必须修改密码点击提示
let isNeedUpdatePassword =localStorage.getItem('isNeedUpdatePassword');
if(isNeedUpdatePassword==1){
this.fib(this.routerList)
this.fib(this.typeRouterList1)
this.fib(this.typeRouterList2)
this.fib(this.typeRouterList3)
this.fib(this.typeRouterList4)
}
},
methods: {
// 递归
fib(val){
console.log(val)
let list = val.map((item)=>{
if(item.children){
this.fib(item.children)
}
item.link =''
item.alert = () => {this.redirectAlert()}
return item
})
return list
},
// 跳转
async redirectGDS() {
const params = {userType: this.loginInfo.userType, id: this.loginInfo.id, carno: this.loginInfo.carno}
......@@ -383,6 +413,15 @@ export default {
this.$message.error(result.returnMsg)
}
},
redirectAlert(){
this.$alert('登录密码简单，请您及时修改！', "提示", {
confirmButtonText: "确定",
callback: action => {
return
}
});
}
},
};
</script>
......
src/views/News/DepthTopics.vue
......@@ -55,7 +55,7 @@ export default {
// if(item.directpath&&item.directpath!==''&& item.directpath.length>0){
// item.href=item.directpath
// }else{
item.href=`/News/msg?id=${item.id}`
item.href=`/News/viewsub?id=${item.id}`
// }
});
......
src/views/PGP/detail.vue
......@@ -104,6 +104,7 @@ export default {
color: #666666;
}
.content_box{
overflow: hidden;
margin-top: 21px;
padding: 26px 30px;
border-top: 1px dashed #7D9ABD;
......
src/views/User/login.vue
......@@ -286,9 +286,15 @@ export default {
}
if(res.data.isNeedUpdatePassword==1){
// 需要强制修改密码
this.$message.error('密码不符合规范，请修改密码！')
this.$router.push({name:'changePass'})
this.$alert('登录密码简单，请您及时修改！', "提示", {
confirmButtonText: "确定",
callback: action => {
this.$router.push({name:'changePass'})
}
});
}
localStorage.setItem('isNeedUpdatePassword', res.data.isNeedUpdatePassword)
}
})
......
src/views/topic/2014zly.vue
......@@ -151,7 +151,7 @@
<img src="./img/ancc-25-years.jpg">
</div>
<div class="tiaomajidi">
<a href="http://www.gs1cn.org/topic/tiaomajidi" target="_blank"><img src="./img/tmjd.png" title="商品条码与编码"></a>
<a href="http://www.gs1cn.org/News/topic/tiaomajidi" target="_blank"><img src="./img/tmjd.png" title="商品条码与编码"></a>
</div>
<div class="zxtg">
<a><img src="./img/zxtg2.png" title="在线投稿"></a>
......
src/views/topic/2017zly.vue
......@@ -112,7 +112,7 @@
<p>
为深入贯彻实施《质量发展纲要（2011-2020年）》，推进建设质量强国， 2017年9月质检总局联合相关部门、行业协会等单位共同开展“质量月”活动。</p>
<div class="ckxq">
<a href="http://www.chinatt315.org.cn/xhwj/2016-437-1.html" target="_blank" style="text-decoration: none;">查看详情&gt;&gt;</a></div>
<a href="http://www.chinatt315.org.cn/xhwj/2017-374-1.html" target="_blank" style="text-decoration: none;">查看详情&gt;&gt;</a></div>
</div>
<div class="main-middle-left-down">
<div class="application">
......
src/views/topic/zly2013.vue
......@@ -84,7 +84,7 @@
<a href="http://www.gs1cn.org/2012/MobileCom/index.html" target="_blank"><img src="./img/MBusiness.png" style="margin-top:10px; margin-left:4px;"></a>
<div class="txt-box1">
<li style="color:#cc9;"><a href="http://www.gs1cn.org/2013/dqjy/" target="_blank" style="font-size:13px;">党的群众路线教育实践活动</a></li>
<li style="color:#cc9; margin-top:6px;"><a href="http://www.gs1cn.org/topic/tiaomajidi" target="_blank" style="font-size:13px;">商品条码与编码——全球通用的标准...</a></li>
<li style="color:#cc9; margin-top:6px;"><a href="http://www.gs1cn.org/News/topic/tiaomajidi" target="_blank" style="font-size:13px;">商品条码与编码——全球通用的标准...</a></li>
<li style="color:#cc9; margin-top:6px;"><a href="http://www.gs1cn.org/2011/tiaoma2011/index.html" target="_blank" style="font-size:13px;">条码加速电子商务发展</a></li>
<li style="color:#cc9; margin-top:6px;"><a href="http://www.gs1cn.org/News/topic/xiangma" target="_blank" style="font-size:13px;">箱码Case Code</a></li>
<li style="color:#cc9; margin-top:6px;"><a href="http://www.gs1cn.org/2012/2012zly/index.html" target="_blank" style="font-size:13px;">2012年全国“质量月”活动</a></li>
......
src/views/topic/zly2015.vue
......@@ -175,7 +175,7 @@
<img src="./img/ancc-25-years.jpg">
</div>
<div class="tiaomajidi">
<a href="http://www.gs1cn.org/topic/tiaomajidi" target="_blank">
<a href="http://www.gs1cn.org/News/topic/tiaomajidi" target="_blank">
<img src="./img/tmjd.png" title="商品条码与编码"></a>
</div>
<div class="zxtg">
......
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