Skip to content

G
gs1
Commit f7ba9b9f by Lyan
Options

bug修改

parent 0d014ab0
Showing with 643 additions and 135 deletions
.env.prod1
NODE_ENV = "production" NODE_ENV = "production"
VUE_APP_CURRENTMODE = "production" VUE_APP_CURRENTMODE = "production"
VUE_APP_HOST_URL = "http://192.168.0.77:9091" VUE_APP_HOST_URL = "http://192.168.0.81:9091"
VUE_APP_API_URL = "http://192.168.0.77:9091" VUE_APP_API_URL = "http://192.168.0.81:9091"
VUE_APP_GDS_URL = "http://data-studio.gds.org.cn" VUE_APP_GDS_URL = "http://data-studio.gds.org.cn"
VUE_APP_LOG = false VUE_APP_LOG = false
VUE_APP_CHINATM_URL = http://192.168.0.77/chinatm VUE_APP_CHINATM_URL = http://192.168.0.81/chinatm
.env.production
NODE_ENV = "production" NODE_ENV = "production"
VUE_APP_CURRENTMODE = "production" VUE_APP_CURRENTMODE = "production"
VUE_APP_HOST_URL = "http://192.168.0.77:9091" VUE_APP_HOST_URL = "http://192.168.0.81:9091"
VUE_APP_API_URL = "http://192.168.0.77:9091" VUE_APP_API_URL = "http://192.168.0.81:9091"
VUE_APP_GDS_URL = "http://data-studio.gds.org.cn" VUE_APP_GDS_URL = "http://data-studio.gds.org.cn"
VUE_APP_CHINATM_URL = "http://192.168.0.77:80/chinatm" VUE_APP_CHINATM_URL = "http://192.168.0.81:80/chinatm"
VUE_APP_LOG = false VUE_APP_LOG = false
src/axios/module/service.js
...@@ -30,6 +30,10 @@ const serviceGetCaseDetailInfo = (params = {}) => { ...@@ -30,6 +30,10 @@ const serviceGetCaseDetailInfo = (params = {}) => {
const serviceGetPartnersDetailInfo = (params = {}) => { const serviceGetPartnersDetailInfo = (params = {}) => {
return POST(`${Prefix}/office/partners/api/getDetailInfo`, params) return POST(`${Prefix}/office/partners/api/getDetailInfo`, params)
} }
// 获取路径
const filePath = (params = {}) => {
return POST(`${Prefix}/office/domain/api/filePath`, params)
}
export default { export default {
getCodeBook, getCodeBook,
...@@ -37,4 +41,5 @@ export default { ...@@ -37,4 +41,5 @@ export default {
serviceCasesFrontList, serviceCasesFrontList,
serviceGetCaseDetailInfo, serviceGetCaseDetailInfo,
serviceGetPartnersDetailInfo, serviceGetPartnersDetailInfo,
filePath
} }
src/components/layout/header/HeaderDropdown.vue
...@@ -72,6 +72,7 @@ export default { ...@@ -72,6 +72,7 @@ export default {
if (nav.class) { if (nav.class) {
classNames.push(...nav.class) classNames.push(...nav.class)
} }
return ( return (
<div class={classNames.join(" ").trim()} style={{...nav.style}}> <div class={classNames.join(" ").trim()} style={{...nav.style}}>
<div <div
......
src/components/layout/header/index.vue
...@@ -84,6 +84,7 @@ export default { ...@@ -84,6 +84,7 @@ export default {
currentNav: "0", currentNav: "0",
preActive: "", preActive: "",
showDropDown: '', showDropDown: '',
navShow:false
}; };
}, },
watch: { watch: {
...@@ -162,9 +163,7 @@ export default { ...@@ -162,9 +163,7 @@ export default {
}, },
handleWindowClick() { handleWindowClick() {
console.log('handleWindowClick', this.fromNav, this.preActive);
console.log('fromNav', this.fromNav);
console.log('preActive', this.preActive);
if (!this.fromNav) { if (!this.fromNav) {
this.showDropDown = '' this.showDropDown = ''
} }
...@@ -177,8 +176,8 @@ export default { ...@@ -177,8 +176,8 @@ export default {
}, },
handleNavClick(nav) { handleNavClick(nav) {
console.log('handleNavClick', nav) console.log('handleNavClick', nav)
this.showDropDown = nav.id; this.showDropDown = nav.id;
if (!nav.children || nav.children.length === 0) { if (!nav.children || nav.children.length === 0) {
this.currentNav = nav.id; this.currentNav = nav.id;
...@@ -187,7 +186,7 @@ export default { ...@@ -187,7 +186,7 @@ export default {
} else { } else {
// 点击事件不来自子代导航item // 点击事件不来自子代导航item
if (!this.fromDropdown) { if (!this.fromDropdown) {
// console.log('!this.fromDropdown', this.currentNav, nav.id) console.log(this.fromDropdown, this.currentNav, nav.id)
// 重复点击同一个nav // 重复点击同一个nav
if (this.currentNav === nav.id) { if (this.currentNav === nav.id) {
// 不改变状态 // 不改变状态
...@@ -204,6 +203,8 @@ export default { ...@@ -204,6 +203,8 @@ export default {
} }
} }
} }
}, },
handleItemClick(item) { handleItemClick(item) {
......
src/views/BarCode/GRAI.vue
...@@ -118,7 +118,7 @@ export default { ...@@ -118,7 +118,7 @@ export default {
<style> <style>
.enter_box .input_box .el-input, .enter_box .input_box .el-input,
.enter_box .input_box .el-input .el-input__inner { .enter_box .input_box .el-input .el-input__inner {
width: 242px; width: 270px;
height: 42px; height: 42px;
} }
.enter_box .input_box .el-input { .enter_box .input_box .el-input {
......
src/views/Business/Notice.vue
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</button> </button>
</li> </li>
</ul> </ul>
<div class="tab-content" id="myTabContent"> <div class="tab-content" id="myTabContent" ref="tablist">
<div <div
v-for="(tmp, i) in list" v-for="(tmp, i) in list"
:key="i" :key="i"
...@@ -88,6 +88,13 @@ export default { ...@@ -88,6 +88,13 @@ export default {
immediate: true, immediate: true,
} }
}, },
created() {
this.$nextTick(() => {
// 禁用选择
this.$refs.tablist.onselectstart = new Function("event.returnValue=false");
});
},
methods: { methods: {
init() { init() {
this.setLogoutFlag(this.$route.query.type); this.setLogoutFlag(this.$route.query.type);
...@@ -183,5 +190,6 @@ export default { ...@@ -183,5 +190,6 @@ export default {
} }
} }
} }
} }
</style> </style>
\ No newline at end of file
src/views/MyManage/SystemMember/index.vue
...@@ -184,7 +184,7 @@ export default { ...@@ -184,7 +184,7 @@ export default {
display: inline-block; display: inline-block;
width: 11px; width: 11px;
height: 11px; height: 11px;
background: #50c96b; // background: #50c96b;
margin-left: 3px; margin-left: 3px;
margin-right: 9px; margin-right: 9px;
border-radius: 50%; border-radius: 50%;
......
src/views/MyManage/UnVerify/changePass.vue
...@@ -91,10 +91,16 @@ export default { ...@@ -91,10 +91,16 @@ export default {
}, },
async saveUpdatePass() { async saveUpdatePass() {
this.form['id'] = this.loginInfo.id this.form['id'] = this.loginInfo.id
this.form['userType']=this.loginInfo.userType
let that =this
const result = await this.$api.myManage.saveUpdatePass(this.form) const result = await this.$api.myManage.saveUpdatePass(this.form)
if (result.success) { if (result.success) {
this.$message.success('密码修改成功') this.$message.success('密码修改成功')
this.resetForm() this.resetForm()
localStorage.clear()
setTimeout(function(){
that.$router.push({path: "/login"});
},1000)
} else { } else {
this.$message.error(result.returnMsg) this.$message.error(result.returnMsg)
} }
......
src/views/MyManage/UnVerify/index.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="header"> <div class="header">
<p> <p>
网站最新推出<a href="http://wsdt.ancc.org.cn/anccoh/">在线注册</a> 网站最新推出<a href="http://wsdt.ancc.org.cn/anccoh/">在线注册</a>
&nbsp;&nbsp;<a href="#">在线续展</a>&nbsp;&nbsp;<a href="#"> &nbsp;&nbsp;<a href="/Business/Renewal">在线续展</a>&nbsp;&nbsp;<a href="http://wsdt.ancc.org.cn/anccoh/">
产品信息通报</a 产品信息通报</a
>等业务 >等业务
</p> </p>
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<p>请直接登录<a @click="redirectYWDT">网上业务大厅</a>办理商品条码</p> <p>请直接登录<a @click="redirectYWDT">网上业务大厅</a>办理商品条码</p>
</li> </li>
<!-- 厂商实名认证已认证 --> <!-- 厂商实名认证已认证 -->
<li v-if="loginInfo.isQY === 1"> <li v-if="loginInfo.userType === 3">
<p class="content-title"> <p class="content-title">
厂商实名认证（办理“进口商品信息通报、GLN”等业务需先完成此认证） 厂商实名认证（办理“进口商品信息通报、GLN”等业务需先完成此认证）
</p> </p>
...@@ -25,19 +25,19 @@ ...@@ -25,19 +25,19 @@
<i class="bi bi-check-circle-fill"></i> <i class="bi bi-check-circle-fill"></i>
您已成为中国物品编码中心实名认证企业！ 您已成为中国物品编码中心实名认证企业！
</p> </p>
<p v-if="isShowGDS" style="padding-left:24px"> <p style="padding-left:24px">
您可以——前往 您可以——前往
<a @click="redirectGDS">中国商品信息服务平台</a> <a @click="redirectGDS">中国商品信息服务平台</a>
<!-- 办理 办理“通报进口商品信息” “开通条码微站” “使用数据总资产服务”！
<a @click="redirectGDS">“通报进口商品信息” “开通条码微站” “使用数据总资产服务”！</a> -->
</p> </p>
<p v-if="loginInfo.isXT === 2" style="padding-left:24px"> <p style="padding-left:24px">
您可以——前往<a @click="redirectGLN">购买GLN</a 您可以——前往<a @click="redirectGLN">购买GLN</a
> >
</p> </p>
</li> </li>
<!-- 厂商实名认证未认证 --> <!-- 厂商实名认证未认证 -->
<li v-if="loginInfo.isQY === 2"> <li v-if="loginInfo.userType === 4">
<p class="content-title"> <p class="content-title">
厂商实名认证（办理“进口商品信息通报、GLN”等业务需先完成此认证） 厂商实名认证（办理“进口商品信息通报、GLN”等业务需先完成此认证）
<!-- <label :style="tycpdmFirmInfo.logoutFlag === 0?'color: #50c96b':'color: #ff0033'">{{tycpdmFirmInfo.logoutFlag === 0 ? '(审核中)' : tycpdmFirmInfo.logoutFlag === 2 ? '(审核不通过)' : ''}}</label> --> <!-- <label :style="tycpdmFirmInfo.logoutFlag === 0?'color: #50c96b':'color: #ff0033'">{{tycpdmFirmInfo.logoutFlag === 0 ? '(审核中)' : tycpdmFirmInfo.logoutFlag === 2 ? '(审核不通过)' : ''}}</label> -->
...@@ -74,68 +74,7 @@ ...@@ -74,68 +74,7 @@
</div> </div>
</div> --> </div> -->
</li> </li>
<!-- 一期先不上线检测校准申请，暂时把个人中心首页的检测校准申请相关内容进行隐藏（包括检测校准申请菜单项）-->
<!-- 校准未认证 -->
<!-- <li>-->
<!-- <p class="content-title">-->
<!-- 检测校准申请（办理“条码印制品检测”、“条码检测仪校准”等业务需先完成此申请）-->
<!-- </p>-->
<!-- <p>1、条码印制品检测</p>-->
<!-- <p class="list-cnt">-->
<!-- 对商品条码、商品二维码、GS1通用规范（GS1 General-->
<!-- Specifications）、医疗UDI、汽车零部件标识、追溯码、服装条码、名片二维码、物流编码等提供检验检测服务，出具检验检测报告。-->
<!-- </p>-->
<!-- <p>2、条码检测仪校准</p>-->
<!-- <p class="list-cnt">-->
<!-- 对条码检测仪的最高反射率、最低反射率、可译码度、缺陷度、轴向不一致性、网格不一致性、反差一致性等测量参数进行校准，出具校准证书。-->
<!-- </p>-->
<!-- <div class="list-img row">-->
<!-- <div class="img-p col-lg-4">-->
<!-- <a href="/MyManage/UnVerify/calibration">-->
<!-- <img src="../../../assets/image/mymanage/tx.png" alt="" />-->
<!-- <p>填写校准信息</p>-->
<!-- </a>-->
<!-- </div>-->
<!-- <div class="img-p col-lg-4">-->
<!-- <a href="/MyManage/UnVerify/uploadcalibration">-->
<!-- <img src="../../../assets/image/mymanage/tj.png" alt="" />-->
<!-- <p>提交书面材料</p>-->
<!-- </a>-->
<!-- </div>-->
<!-- <div class="img-p col-lg-4">-->
<!-- <a href="/MyManage/UnVerify/shcalibration">-->
<!-- <img src="../../../assets/image/mymanage/sh.png" alt="" />-->
<!-- <p>审核状态</p>-->
<!-- </a>-->
<!-- </div>-->
<!-- </div>-->
<!-- </li>-->
<!-- 校准已认证 -->
<!-- <li v-if="false">-->
<!-- <p class="content-title">-->
<!-- 检测校准申请（办理“条码印制品检测”、“条码检测仪校准”等业务需先完成此申请）-->
<!-- </p>-->
<!-- <p>-->
<!-- <i class="bi bi-check-circle-fill"></i-->
<!-- >您已成为中国物品编码中心检验检测/校准客户！-->
<!-- </p>-->
<!-- <p style="padding-left:24px">您可以——办理条码印制品检测</p>-->
<!-- <p style="padding-left:24px">您可以——办理条码检测仪校准</p>-->
<!-- <p style="padding-left:24px">若想申请办理上述业务，请您联系：</p>-->
<!-- <p style="padding-left:24px">-->
<!-- 王工<i class="bi bi-telephone-fill color-grey"></i>010-84295493-->
<!-- <i class="bi bi-envelope-fill color-grey"></i>wanghy@ancc.org.cn-->
<!-- <i class="qe color-grey"></i>2308350380-->
<!-- </p>-->
<!-- <p style="padding-left:24px">-->
<!-- 胡工<i class="bi bi-telephone-fill color-grey"></i>010-84295499-->
<!-- <i class="bi bi-envelope-fill color-grey"></i-->
<!-- >hum@ancc.org.cn&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i-->
<!-- class="qe color-grey"-->
<!-- ></i-->
<!-- >1246978728-->
<!-- </p>-->
<!-- </li>-->
</ul> </ul>
</div> </div>
</div> </div>
......
src/views/MyManage/comps/userInfo copy.vue 0 → 100644
<template>
<div class="userInfo">
<div class="cnt">
<img src="../../../assets/image/mymanage/headImg.png" alt="">
<template v-if="type === UN_VERIFY">
<p>{{ userName }}/{{ phone }}{{ cardNo ? '/'+cardNo : '' }}</p>
<p>{{ userType }} | {{ nocardNo }}</p>
</template>
<template v-if="type === SYSTEM_MEMBER">
<p>{{ userName }}/{{ phone }}{{ cardNo ? '/'+cardNo : '' }}</p>
<p>{{ userType }} | {{ nocardNo }}</p>
</template>
<template v-else-if="type === ADMIN">
<p class="admin_name">{{ userName }}</p>
<p>- - - | 中心管理员</p>
</template>
<template v-else-if="type === ADMINBRANCH">
<p class="admin_name">{{ userName }}</p>
<p>- - - | 分中心管理员</p>
</template>
</div>
</div>
</template>
<script>
const UN_VERIFY = 0;
const SYSTEM_MEMBER = 1;
const ADMIN = 2;
const ADMINBRANCH = 3;
export default {
props: {
type: Number,
loginInfo: {type: Object, default: () => {}}
},
data() {
return {
UN_VERIFY,
SYSTEM_MEMBER,
ADMIN,
ADMINBRANCH,
userName: '用户名',
phone: '手机号',
cardNo: '条码卡号',
userType: '用户类别',
nocardNo: '未申请条码卡',
memberInfo: {}
};
},
methods: {
async getMemberInfo() {
this.memberInfo = (await this.$api.myManage.memberInfo({id: this.loginInfo.id})).data
if (this.loginInfo.userType === 1) {
this.userName = this.loginInfo.username
this.phone = this.loginInfo.phone
} else {
this.userName = this.memberInfo.username
this.phone = this.memberInfo.phone
}
if (this.loginInfo.carno) {
this.nocardNo = '已申请条码卡'
this.cardNo = this.loginInfo.carno
} else {
this.nocardNo = '未申请条码卡'
this.cardNo = ''
}
switch (this.loginInfo.userType) {
case 1:
this.userType = '手机号用户'
break
case 2:
this.userType = '条码成员'
break
case 3:
this.userType = '网站用户'
}
this.loginInfo.isQY === 1 && (this.userType = '实名认证企业')
this.loginInfo.isXT === 1 && (this.userType = '系统成员')
}
},
mounted() {
this.getMemberInfo()
},
created() {
},
};
</script>
<style lang="scss" scoped>
.userInfo {
background: #fff;
min-height: 224px;
margin-bottom: 14px;
.cnt {
text-align: center;
img {
width: 80px;
height: 80px;
margin-top: 40px;
margin-bottom: 20px;
}
p {
margin-bottom: 0;
}
p:first-child {
font-size: 16px;
line-height: 24px;
color: #414345;
}
p:last-child {
font-size: 13px;
line-height: 18px;
color: #999999;
}
.admin_name{
margin-bottom: 6px;
}
}
}
</style>
src/views/MyManage/comps/userInfo.vue
...@@ -2,22 +2,23 @@ ...@@ -2,22 +2,23 @@
<div class="userInfo"> <div class="userInfo">
<div class="cnt"> <div class="cnt">
<img src="../../../assets/image/mymanage/headImg.png" alt=""> <img src="../../../assets/image/mymanage/headImg.png" alt="">
<template v-if="type === UN_VERIFY"> <template v-if="loginInfo.userType === 1">
<p>{{ userName }}/{{ phone }}{{ cardNo ? '/'+cardNo : '' }}</p> <p>{{ userName }} | {{ cardNo }}</p>
<p>{{ userType }} | {{ nocardNo }}</p> <p>{{ userType }} | {{ nocardNo }}</p>
</template> </template>
<template v-if="type === SYSTEM_MEMBER"> <template v-if="loginInfo.userType === 2">
<p>{{ userName }}/{{ phone }}{{ cardNo ? '/'+cardNo : '' }}</p> <p>{{ userName }}</p>
<p>{{ userType }} | {{ nocardNo }}</p> <p>{{ userType }} | {{ nocardNo }}</p>
</template> </template>
<template v-else-if="type === ADMIN"> <template v-if="loginInfo.userType === 3">
<p class="admin_name">{{ userName }}</p> <p>{{ userName }} | {{ phone }}</p>
<p>- - - | 中心管理员</p> <p>{{ userType }} | {{ nocardNo }}</p>
</template> </template>
<template v-else-if="type === ADMINBRANCH"> <template v-if="loginInfo.userType === 4">
<p class="admin_name">{{ userName }}</p> <p>{{ userName }} | {{ phone }}</p>
<p>- - - | 分中心管理员</p> <p>{{ userType }} | {{ nocardNo }}</p>
</template> </template>
</div> </div>
</div> </div>
...@@ -28,20 +29,14 @@ const SYSTEM_MEMBER = 1; ...@@ -28,20 +29,14 @@ const SYSTEM_MEMBER = 1;
const ADMIN = 2; const ADMIN = 2;
const ADMINBRANCH = 3; const ADMINBRANCH = 3;
export default { export default {
props: { props: ['type','loginInfo'],
type: Number,
loginInfo: {type: Object, default: () => {}}
},
data() { data() {
return { return {
UN_VERIFY,
SYSTEM_MEMBER,
ADMIN,
ADMINBRANCH,
userName: '用户名', userName: '用户名',
phone: '手机号', phone: '手机号',
cardNo: '条码卡号', cardNo: '条码卡号',
userType: '用户类别', userType: '',
nocardNo: '未申请条码卡', nocardNo: '未申请条码卡',
memberInfo: {} memberInfo: {}
}; };
...@@ -49,7 +44,7 @@ export default { ...@@ -49,7 +44,7 @@ export default {
methods: { methods: {
async getMemberInfo() { async getMemberInfo() {
this.memberInfo = (await this.$api.myManage.memberInfo({id: this.loginInfo.id})).data this.memberInfo = (await this.$api.myManage.memberInfo({id: this.loginInfo.id})).data
if (this.loginInfo.userType === 1) { if (this.loginInfo.userType === 1 || this.loginInfo.userType==2) {
this.userName = this.loginInfo.username this.userName = this.loginInfo.username
this.phone = this.loginInfo.phone this.phone = this.loginInfo.phone
} else { } else {
...@@ -65,16 +60,19 @@ export default { ...@@ -65,16 +60,19 @@ export default {
} }
switch (this.loginInfo.userType) { switch (this.loginInfo.userType) {
case 1: case 1:
this.userType = '手机号用户' this.userType = '系统成员'
break break
case 2: case 2:
this.userType = '条码成员' this.userType = '手机用户'
break break
case 3: case 3:
this.userType = '网站用户' this.userType = '实名认证企业'
break
case 4:
this.userType='网站用户'
} }
this.loginInfo.isQY === 1 && (this.userType = '实名认证企业')
this.loginInfo.isXT === 1 && (this.userType = '系统成员')
} }
}, },
mounted() { mounted() {
...@@ -82,6 +80,7 @@ export default { ...@@ -82,6 +80,7 @@ export default {
}, },
created() { created() {
}, },
}; };
</script> </script>
......
src/views/Search/bike.vue
...@@ -100,6 +100,8 @@ export default { ...@@ -100,6 +100,8 @@ export default {
}, },
methods: { methods: {
async handleSearch() { async handleSearch() {
this.errorMsg ='正在查询……'
this.result=null
const params = { const params = {
code: "", code: "",
firmName: "", firmName: "",
......
src/views/Search/external.vue
...@@ -112,6 +112,7 @@ export default { ...@@ -112,6 +112,7 @@ export default {
window.open(url, '_blank') window.open(url, '_blank')
}, },
async handleSearch() { async handleSearch() {
this.errorMsg ='正在查询……'
this.searchCodeShow = this.search.code; this.searchCodeShow = this.search.code;
if(this.hasSpecialString(this.searchCodeShow)){ if(this.hasSpecialString(this.searchCodeShow)){
return true return true
......
src/views/Search/gln.vue
...@@ -132,12 +132,14 @@ export default { ...@@ -132,12 +132,14 @@ export default {
// } // }
const regName =/^[0-9]*[1-9][0-9]*$/; const regName =/^[0-9]*[1-9][0-9]*$/;
if(!regName.test(string)){ if(!regName.test(string)){
this.$message.error('查询值只能数字！'); this.$message.error('请输入正确的条码信息');
return true; return true;
} }
return false return false
}, },
async handleSearch() { async handleSearch() {
this.errorMsg ='正在查询……'
this.result = null;
this.searchCodeShow = this.search.code; this.searchCodeShow = this.search.code;
if(this.hasSpecialString(this.searchCodeShow)){ if(this.hasSpecialString(this.searchCodeShow)){
return true return true
......
src/views/Search/glossary.vue
...@@ -93,6 +93,8 @@ export default { ...@@ -93,6 +93,8 @@ export default {
}, },
methods: { methods: {
async handleSearch() { async handleSearch() {
this.errorMsg ='正在查询……'
this.result=null
const params = { const params = {
keyword: this.search.code, keyword: this.search.code,
type: this.type, type: this.type,
......
src/views/Search/internal.vue
...@@ -304,6 +304,7 @@ export default { ...@@ -304,6 +304,7 @@ export default {
captcha:'' captcha:''
}, },
result: null, result: null,
currentData:null,
resultType: 'company', resultType: 'company',
searchCodeShow: "", searchCodeShow: "",
errorMsg: "", errorMsg: "",
...@@ -393,6 +394,9 @@ export default { ...@@ -393,6 +394,9 @@ export default {
}, },
async handleSearchCompany() { async handleSearchCompany() {
this.errorMsg ='正在查询……'
this.currentData = null
this.dataTotal=null
if (this.company === CODE) { if (this.company === CODE) {
this.searchCodeShow = this.companySearch.code; this.searchCodeShow = this.companySearch.code;
} else if (this.company === NAME) { } else if (this.company === NAME) {
...@@ -409,7 +413,9 @@ export default { ...@@ -409,7 +413,9 @@ export default {
const searchGlnRes = await this.$api.search.searchInternal(params); const searchGlnRes = await this.$api.search.searchInternal(params);
const {returnCode, data} = searchGlnRes; const {returnCode, data} = searchGlnRes;
if (returnCode === "0" || returnCode === 0) { if (returnCode === "0" || returnCode === 0) {
console.log(data)
// this.result = data.hits.hits; // this.result = data.hits.hits;
this.currentData = data.hits.hits;
this.dataTotal = data.hits.hits; this.dataTotal = data.hits.hits;
this.pagination.total = data.hits.hits.length; this.pagination.total = data.hits.hits.length;
this.pagination.totalPage = Math.floor(data.hits.hits.length / this.pagination.pageSize) + 1; this.pagination.totalPage = Math.floor(data.hits.hits.length / this.pagination.pageSize) + 1;
......
src/views/Search/shortcode.vue
...@@ -129,6 +129,8 @@ export default { ...@@ -129,6 +129,8 @@ export default {
}, },
methods: { methods: {
async handleSearchCompany() { async handleSearchCompany() {
this.errorMsg ='正在查询……'
this.currentData = null
const params = { const params = {
shortCode: "", shortCode: "",
firmName: "", firmName: "",
...@@ -156,6 +158,8 @@ export default { ...@@ -156,6 +158,8 @@ export default {
const searchGlnRes = await this.$api.search.searchGetList(params); const searchGlnRes = await this.$api.search.searchGetList(params);
const {returnCode, data} = searchGlnRes; const {returnCode, data} = searchGlnRes;
if (returnCode === "0") { if (returnCode === "0") {
this.currentData = data
// this.result = data; // this.result = data;
this.dataTotal = data; this.dataTotal = data;
this.pagination.total = data.length; this.pagination.total = data.length;
......
src/views/Search/validation.js
...@@ -24,7 +24,7 @@ export default { ...@@ -24,7 +24,7 @@ export default {
hasSpecialString(string){ hasSpecialString(string){
const regName =/^[\u4e00-\u9fa5_a-zA-Z0-9]+$/; const regName =/^[\u4e00-\u9fa5_a-zA-Z0-9]+$/;
if(!regName.test(string)){ if(!regName.test(string)){
this.$message.error('查询值只能包含中英文字符和数字！'); this.$message.error('请输入正确的条码信息');
return true; return true;
} }
return false return false
......
src/views/Service/Partners/content.vue
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<i class="iconfont icon-jurassic_email"></i> <i class="iconfont icon-jurassic_email"></i>
<span style="font-size: 14px; color: #666; margin-left: 6px" <span style="font-size: 14px; color: #666; margin-left: 6px"
>邮箱： >邮箱：
<a :href="partnersMsg.email">{{ partnersMsg.email }}</a> <a :href="partnersMsgHref">{{ partnersMsg.email }}</a>
</span> </span>
</div> </div>
</div> </div>
...@@ -51,7 +51,9 @@ ...@@ -51,7 +51,9 @@
export default { export default {
data() { data() {
return { return {
partnersMsg: {}, partnersMsg: {
},
partnersMsgHref:''
} }
}, },
created() { created() {
...@@ -76,6 +78,9 @@ export default { ...@@ -76,6 +78,9 @@ export default {
console.log(serviceGetPartnersDetailInfoRes, "serviceGetPartnersDetailInfoRes"); console.log(serviceGetPartnersDetailInfoRes, "serviceGetPartnersDetailInfoRes");
if (returnCode === "0") { if (returnCode === "0") {
this.partnersMsg = data; this.partnersMsg = data;
console.log(this.partnersMsg)
this.partnersMsgHref='mailto:'+this.partnersMsg.email
console.log(this.partnersMsgHref)
} }
}, },
}, },
......
src/views/Service/book.vue
...@@ -89,6 +89,7 @@ export default { ...@@ -89,6 +89,7 @@ export default {
}, },
data() { data() {
return { return {
pathUrl:'',
dialogVisible: false, dialogVisible: false,
currentBook: {}, currentBook: {},
activeName: 'second', activeName: 'second',
...@@ -107,7 +108,7 @@ export default { ...@@ -107,7 +108,7 @@ export default {
desc: '生成识读功能', desc: '生成识读功能',
android: 'http://www.anzhi.com/soft_969237.html', android: 'http://www.anzhi.com/soft_969237.html',
ios: `https://apps.apple.com/us/app/han-xin-er-wei-ma/id665768613`, ios: `https://apps.apple.com/us/app/han-xin-er-wei-ma/id665768613`,
local: 'http://www.gs1cn.org/Manage/down/%E6%B1%89%E4%BF%A1%E7%A0%81%E7%94%9F%E6%88%90%E5%B7%A5%E5%85%B7V2.1.rar', local:'',
}, },
{ {
name: '条码追溯', name: '条码追溯',
...@@ -139,10 +140,12 @@ export default { ...@@ -139,10 +140,12 @@ export default {
pageCount: 1, pageCount: 1,
total: 10, total: 10,
}, },
id:this.$route.query.id||'' id:this.$route.query.id||'',
} }
}, },
created() { created() {
this.filePath()
if(this.id){ if(this.id){
this.activeName='first' this.activeName='first'
}else{ }else{
...@@ -150,13 +153,23 @@ export default { ...@@ -150,13 +153,23 @@ export default {
} }
this.getBooks() this.getBooks()
}, },
methods: { methods: {
showBookDetail(book) { showBookDetail(book) {
this.currentBook = book; this.currentBook = book;
this.dialogVisible = true; this.dialogVisible = true;
}, },
async filePath() {
const res = await this.$api.service.filePath()
const {returnCode, data} = res;
if (returnCode === "0") {
console.log(data)
this.appList[1].local=`${data}Manage/down/%E6%B1%89%E4%BF%A1%E7%A0%81%E7%94%9F%E6%88%90%E5%B7%A5%E5%85%B7V2.1.rar`
}
},
async getBooks(page = 1) { async getBooks(page = 1) {
const res = await this.$api.service.getCodeBook({page: page, size: this.page.pageSize,id:this.id}) const res = await this.$api.service.getCodeBook({page: page, size: this.page.pageSize,id:this.id})
...@@ -206,6 +219,16 @@ export default { ...@@ -206,6 +219,16 @@ export default {
.book-content { .book-content {
padding: 16px 20px; padding: 16px 20px;
@media screen and (max-width: 992px) {
display: grid;
}
>div{
width: 100%;
overflow:hidden;
white-space: nowrap;
text-overflow: ellipsis!important;
-o-text-overflow:ellipsis;
}
> .title { > .title {
font-size: 21px; font-size: 21px;
...@@ -240,6 +263,10 @@ export default { ...@@ -240,6 +263,10 @@ export default {
border: 1px solid rgba(197, 216, 238, 0.5); border: 1px solid rgba(197, 216, 238, 0.5);
margin-bottom: 25px; margin-bottom: 25px;
cursor: pointer; cursor: pointer;
@media screen and (max-width: 992px) {
display:inherit;
height: auto;
}
&:hover { &:hover {
box-shadow: 0px 4px 15px 2px rgba(4, 64, 141, 0.08); box-shadow: 0px 4px 15px 2px rgba(4, 64, 141, 0.08);
...@@ -286,7 +313,7 @@ export default { ...@@ -286,7 +313,7 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
margin-right: 60px; margin-right: 60px;
img { img {
max-width: 14px; max-width: 14px;
margin-right: 10px; margin-right: 10px;
...@@ -305,7 +332,9 @@ export default { ...@@ -305,7 +332,9 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
@media screen and (max-width: 992px) {
padding-bottom: 20px;
}
img { img {
max-width: 80%; max-width: 80%;
} }
......
src/views/User/login.vue
...@@ -128,19 +128,34 @@ export default { ...@@ -128,19 +128,34 @@ export default {
console.log(memberInfo) console.log(memberInfo)
const loginInfo = res.data const loginInfo = res.data
localStorage.setItem('loginInfo', JSON.stringify({...memberInfo.data, ...loginInfo})) localStorage.setItem('loginInfo', JSON.stringify({...memberInfo.data, ...loginInfo}))
if ((loginInfo.userType === 1 && loginInfo.isXT !== 1) || (loginInfo.userType === 2 && loginInfo.isXT !== 1) || (loginInfo.userType === 3 && loginInfo.levels === null)) { // if ((loginInfo.userType === 1 && loginInfo.isXT !== 1) || (loginInfo.userType === 2 && loginInfo.isXT !== 1) || (loginInfo.userType === 3 && loginInfo.levels === null)) {
localStorage.setItem('gs-user', JSON.stringify({type: 'unVerify'})) // localStorage.setItem('gs-user', JSON.stringify({type: 'unVerify'}))
this.$router.push({path: '/MyManage/UnVerify/index'}) // this.$router.push({path: '/MyManage/UnVerify/index'})
} else if (loginInfo.isXT === 1) { // } else if (loginInfo.isXT === 1) {
localStorage.setItem('gs-user', JSON.stringify({type: 'verify'})) // localStorage.setItem('gs-user', JSON.stringify({type: 'verify'}))
this.$router.push({path: '/MyManage/SystemMember/index'}) // this.$router.push({path: '/MyManage/SystemMember/index'})
} else if (loginInfo.levels === 0) { // } else if (loginInfo.levels === 0) {
localStorage.setItem('gs-user', JSON.stringify({type: 'admin'})) // localStorage.setItem('gs-user', JSON.stringify({type: 'admin'}))
this.$router.push({path: '/MyManage/admin/check'}) // this.$router.push({path: '/MyManage/admin/check'})
} else if (String(loginInfo.levels).length === 4) { // } else if (String(loginInfo.levels).length === 4) {
localStorage.setItem('gs-user', JSON.stringify({type: 'adminBranch'})) // localStorage.setItem('gs-user', JSON.stringify({type: 'adminBranch'}))
this.$router.push({path: '/MyManage/admin/check'}) // this.$router.push({path: '/MyManage/admin/check'})
} // }
// userType 1.系统成员 2.手机用户 3.实名认证企业 4.网站用户
if(loginInfo.userType===1){
localStorage.setItem('gs-user', JSON.stringify({type: 1}))
this.$router.push({path: '/MyManage/SystemMember/index'})
}else if(loginInfo.userType===2){
this.$router.push({path: '/MyManage/UnVerify/index'})
localStorage.setItem('gs-user', JSON.stringify({type: 2}))
}else if(loginInfo.userType===3){
this.$router.push({path: '/MyManage/UnVerify/index'})
localStorage.setItem('gs-user', JSON.stringify({type: 3}))
}else if(loginInfo.userType===4){
this.$router.push({path: '/MyManage/UnVerify/index'})
localStorage.setItem('gs-user', JSON.stringify({type: 4}))
}
} }
}) })
} else { } else {
......
src/views/comps/pages.vue
...@@ -18,10 +18,11 @@ ...@@ -18,10 +18,11 @@
<div class="pages-middle"> <div class="pages-middle">
<button class="pages-btn" v-if="false">首页</button> <button class="pages-btn" v-if="false">首页</button>
<el-pagination <el-pagination
:small="small"
:page-size="pageSize" :page-size="pageSize"
:current-page="currPage" :current-page="currPage"
layout="prev, pager, next" :layout="layout"
:pager-count="5" :pager-count="showSize"
:total="total" :total="total"
@current-change="goPage" @current-change="goPage"
background background
...@@ -60,10 +61,33 @@ export default { ...@@ -60,10 +61,33 @@ export default {
pages: { pages: {
size: 10, size: 10,
}, },
screenWidth:null,
showSize:5,
small:false,
layout:'prev, pager, next'
}; };
}, },
watch:{
screenWidth:function(a,b){
if(a<=992){
this.showSize=5
this.small=true
this.layout='prev, next'
}else{
this.showSize=7
this.small=false
this.layout='prev, pager, next'
}
}
},
mounted(){ mounted(){
this.screenWidth=document.body.clientWidth
window.onresize=()=>{
return(()=>{
this.screenWidth=document.body.clientWidth
})
}
}, },
methods:{ methods:{
changeSize(){ changeSize(){
......
src/views/comps/pages2.vue
...@@ -18,10 +18,11 @@ ...@@ -18,10 +18,11 @@
<div class="pages-middle" v-if="total!=0"> <div class="pages-middle" v-if="total!=0">
<button class="pages-btn" v-if="false">首页</button> <button class="pages-btn" v-if="false">首页</button>
<el-pagination <el-pagination
:small="small"
:page-size="pageSize" :page-size="pageSize"
:current-page="currPage" :current-page="currPage"
layout="prev, pager, next" :layout="layout"
:pager-count="5" :pager-count="showSize"
:total="total" :total="total"
@size-change="changeSize" @size-change="changeSize"
@current-change="goPage" @current-change="goPage"
...@@ -61,10 +62,33 @@ export default { ...@@ -61,10 +62,33 @@ export default {
pages: { pages: {
size: 10, size: 10,
}, },
screenWidth:null,
showSize:5,
small:false,
layout:'prev, pager, next'
}; };
}, },
watch:{
screenWidth:function(a,b){
if(a<=992){
this.showSize=5
this.small=true
this.layout='pager'
}else{
this.showSize=7
this.small=false
this.layout='prev, pager, next'
}
}
},
mounted(){ mounted(){
this.screenWidth=document.body.clientWidth
window.onresize=()=>{
return(()=>{
this.screenWidth=document.body.clientWidth
})
}
}, },
methods:{ methods:{
changeSize(i){ changeSize(i){
......
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