Skip to content

G
gs1
Commit 4320784f by tang
Options

feat: BUG修复

parent 99247fd1
Showing with 95 additions and 65 deletions
src/views/Search/external.vue
......@@ -10,30 +10,30 @@
<el-form label-position="left" label-width="180px" :model="search">
<el-form-item label="境外商品条码信息查询：">
<el-input
v-model="search.code"
placeholder="请输入正确的境外商品条码！"
class="w240"
v-model="search.code"
placeholder="请输入正确的境外商品条码！"
class="w240"
></el-input>
</el-form-item>
<el-form-item label="验证码：">
<div class="y-center">
<el-input
v-model="search.captcha"
placeholder="请输入验证码"
class="w160"
v-model="search.captcha"
placeholder="请输入验证码"
class="w160"
></el-input>
<div class="validate-code">
<img :src="captchaPath" @click="getCaptcha()" alt="" />
<img :src="captchaPath" @click="getCaptcha()" alt=""/>
<!-- <img src="../../assets/image/validate.jpg" alt=""/> -->
</div>
<el-button
style="margin-left: 40px"
type="primary"
@click="handleSearch"
>查询
style="margin-left: 40px"
type="primary"
@click="handleSearch"
>查询
</el-button>
</div>
</el-form-item>
......@@ -45,11 +45,11 @@
<template v-if="result">
<div class="company-info">
<el-table
:data="result"
header-cell-class-name="search-table-hc"
style="width: 100%"
:data="result"
header-cell-class-name="search-table-hc"
style="width: 100%"
>
<el-table-column prop="address.name" label="企业名称"></el-table-column>
<el-table-column prop="gs1CompanyPrefixLicensee.partyName" label="企业名称"></el-table-column>
<el-table-column prop="gepirRequestedKey.requestedKeyValue" label="GTIN"></el-table-column>
<el-table-column prop="address.streetAddressOne" label="地址"></el-table-column>
<el-table-column prop="address.city" label="城市"></el-table-column>
......@@ -64,7 +64,7 @@
<div class="notice">
<div class="title">友情提示</div>
<div class="content-wrapper">
<img src="./img/query-external-barcode.png" align="right" alt="" />
<img src="./img/query-external-barcode.png" align="right" alt=""/>
<p>
1、目前，国际物品编码组织（GS1）已将690至697之间的前缀码分配给中国物品编码中心使用，通常以这些前缀码开始的厂商识别代码都是由中国物品编码中心负责分配和管理的；以其他前缀码开始的则由境外GS1成员组织负责，一般称为"境外条码"，以下为您提供了境外商品条码信息的查询工具，请根据提示进行相关查询。欲了解GS1分配的前缀码，请点击：
<a href="/search/country" target="_blank" style="color: #5AC8FA;">了解更多 >></a>
......@@ -77,13 +77,13 @@
<script>
import validation from "@/views/Search/validation";
import { mapState } from "vuex";
import {mapState} from "vuex";
export default {
mixins: [validation],
data() {
return {
search: { code: "" },
search: {code: ""},
searchCodeShow: "",
showResult: false,
result: null,
......@@ -93,18 +93,21 @@ export default {
...mapState(["urls"]),
},
methods: {
async handleSearch() {
openUrl(url) {
window.open(url, '_blank')
},
async handleSearch() {
this.searchCodeShow = this.search.code;
this.showResult = true;
const params = {
"code": this.search.code,
"type": "GTIN",
"requestedLanguage":"en",
"captcha":this.captcha,
"uuid":this.uuid
"requestedLanguage": "en",
"captcha": this.captcha,
"uuid": this.uuid
};
const searchGlnRes = await this.$api.search.searchGln(params);
const { returnCode, data } = searchGlnRes;
const {returnCode, data} = searchGlnRes;
if (returnCode === "0") {
if (data.returnCode === '0') {
this.result = [data];
......@@ -117,7 +120,7 @@ export default {
"您输入的商品条码格式不正确，请确认后重试。";
this.result = null;
}
this.getCaptcha();
this.getCaptcha();
},
},
};
......@@ -128,6 +131,7 @@ export default {
.banner-box {
width: 100%;
height: auto;
> img {
width: 100%;
height: auto;
......@@ -137,6 +141,7 @@ export default {
.product-info {
margin-top: -15px;
.left {
.row_ {
display: flex;
......
src/views/Service/Partners/caseList.vue
......@@ -5,16 +5,16 @@
<div class="search row" style="margin: 15px 0">
<div class="col-lg-4">
<el-select
style="width: 100%"
size="small"
v-model="search.service"
placeholder="请选择"
style="width: 100%"
size="small"
v-model="search.service"
placeholder="请选择"
>
<el-option
v-for="item in serviceList"
:key="item.value"
:label="item.label"
:value="item.value"
v-for="item in serviceList"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
......@@ -22,7 +22,8 @@
<div class="col-lg-4 text-left">
<el-button type="primary" size="small" @click="casesFrontList"
>搜索</el-button
>搜索
</el-button
>
</div>
......@@ -34,10 +35,10 @@
</li>
</ul>
<pages
:currPage="pageParams.currPage"
:pageSize="pageParams.pageSize"
:total="pageParams.total"
@getLimit="receivePagesChild"
:currPage="pageParams.currPage"
:pageSize="pageParams.pageSize"
:total="pageParams.total"
@getLimit="receivePagesChild"
/>
</div>
</div>
......@@ -45,7 +46,7 @@
</template>
<script>
import { mapMutations } from "vuex";
import {mapMutations} from "vuex";
import pages from "../../comps/pages2.vue";
export default {
......@@ -63,18 +64,18 @@ export default {
service: "",
},
serviceList: [
{ value: "", label: "全部服务行业" },
{ value: "医疗", label: "医疗" },
{ value: "零售", label: "零售" },
{ value: "电子商务", label: "电子商务" },
{ value: "食品烟酒", label: "食品烟酒" },
{ value: "物流", label: "物流" },
{ value: "服装", label: "服装" },
{ value: "快速消费品", label: "快速消费品" },
{ value: "消费电子产品", label: "消费电子产品" },
{ value: "制造和零部件", label: "制造和零部件" },
{ value: "建材", label: "建材" },
{ value: "其他", label: "其他" },
{value: "", label: "全部服务行业"},
{value: "医疗", label: "医疗"},
{value: "零售", label: "零售"},
{value: "电子商务", label: "电子商务"},
{value: "食品烟酒", label: "食品烟酒"},
{value: "物流", label: "物流"},
{value: "服装", label: "服装"},
{value: "快速消费品", label: "快速消费品"},
{value: "消费电子产品", label: "消费电子产品"},
{value: "制造和零部件", label: "制造和零部件"},
{value: "建材", label: "建材"},
{value: "其他", label: "其他"},
],
list: [],
};
......@@ -88,6 +89,8 @@ export default {
}),
// 点击列表跳转详情
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({
path: "/Service/Partners/content",
......@@ -107,8 +110,8 @@ export default {
service: this.search.service,
};
const serviceCasesFrontListRes =
await this.$api.service.serviceCasesFrontList(params);
const { success, data } = serviceCasesFrontListRes;
await this.$api.service.serviceCasesFrontList(params);
const {success, data} = serviceCasesFrontListRes;
console.log(serviceCasesFrontListRes, "serviceCasesFrontListRes");
if (success) {
console.log(data, "案例介绍");
......
src/views/Service/Partners/content.vue
......@@ -17,7 +17,7 @@
</template>
<script>
import { mapState } from "vuex";
import {mapState} from "vuex";
export default {
computed: {
......@@ -31,9 +31,9 @@ export default {
mounted() {
// 面包屑单独处理
this.$store.commit("system/SET_BREADCRUMB", [
{ name: "服务中心", path: "/Service/BarcodeV" },
{ name: "标准服务提供商", path: "/Service/Partners/index" },
{ name: "服务提供商介绍" },
{name: "服务中心", path: "/Service/BarcodeV"},
{name: "标准服务提供商", path: "/Service/Partners/index"},
{name: "服务提供商介绍"},
]);
},
methods: {},
......@@ -44,11 +44,13 @@ export default {
.msg-cont {
@include module-box;
padding: 30px 0;
.msg-title {
color: #454545;
font-size: 26px;
text-align: center;
}
.msg-head {
border-bottom: 1px dashed #c5d8ee;
padding: 20px 0;
......@@ -56,30 +58,41 @@ export default {
justify-content: space-between;
font-size: 12px;
flex-wrap: wrap;
.msg-head-left {
span {
margin-right: 25px;
&:last-child {
margin: 0;
}
}
}
.msg-head-right {
display: flex;
align-items: center;
img {
margin-left: 14px;
}
}
}
.msg-text {
margin-top: 20px;
img {
max-width: 95%;
}
p {
text-indent: 25px;
font-size: 14px;
font-weight: 400;
color: #414345;
}
.strong {
font-size: 14px;
font-weight: bold;
......
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="item.graph" alt="">
<img :src="prefix+item.graph" alt="">
</div>
<div class="book-content">
<div class="title">{{ item.prename }}</div>
......@@ -40,6 +40,10 @@
<img src="./img/ios.png" alt="">
<a target="_blank" :href="item.ios">iphone</a>
</div>
<div v-if="item.local">
<a target="_blank" :href="item.local">本地下载</a>
</div>
</div>
</div>
<div v-if="item.qrcode" class="qr-code">
......@@ -54,7 +58,7 @@
<script>
import pages from "../comps/pages.vue";
import { mapState } from "vuex";
import {mapState} from "vuex";
export default {
components: {pages},
......@@ -64,6 +68,7 @@ export default {
data() {
return {
activeName: 'second',
prefix: 'http://www.gs1cn.org/Knowledge/img/',
appList: [
{
name: '中国物品编码中心',
......@@ -77,8 +82,9 @@ export default {
name: '汉信码生成工具V2.1',
icon: require('./img/hxcode-icon.png'),
desc: '生成识读功能',
// android: `${this.urls.gs1cnTwo}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`,
// ios: `${this.urls.gs1cnTwo}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`,
android: 'http://www.anzhi.com/soft_969237.html',
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',
},
{
name: '条码追溯',
......
src/views/User/register.vue
......@@ -131,9 +131,12 @@ export default {
"passWord": this.form.password,
"passWord_repeat": this.form.rePassword,
}).then(res => {
if(res.success){
if (res.success) {
this.$message({type: 'success', message: '注册成功'});
}else{
setTimeout(()=>{
window.location.href = '/login'
},300)
} else {
this.$message({type: 'error', message: res.returnMsg || '注册失败，请联系管理员'});
}
}).catch(err => {
......@@ -153,7 +156,7 @@ export default {
"phone": this.form.mobile,
}).then(res => {
console.log(res)
if(res.success){
if (res.success) {
this.$message({type: 'success', message: '发送成功'});
this.hasSent = true;
this.timer = setInterval(() => {
......@@ -164,8 +167,8 @@ export default {
this.hasSent = false;
}
}, 1000);
}else{
} else {
this.$message({type: 'error', message: res.returnMsg || '发送失败'});
}
}).catch(err => {
console.log(err)
......
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