Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gs1
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
吴迪
gs1
Commits
4320784f
Commit
4320784f
authored
Dec 25, 2021
by
tang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: BUG修复
parent
99247fd1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
95 additions
and
65 deletions
+95
-65
external.vue
src/views/Search/external.vue
+29
-24
caseList.vue
src/views/Service/Partners/caseList.vue
+31
-28
content.vue
src/views/Service/Partners/content.vue
+17
-4
book.vue
src/views/Service/book.vue
+10
-4
register.vue
src/views/User/register.vue
+8
-5
No files found.
src/views/Search/external.vue
View file @
4320784f
...
@@ -10,30 +10,30 @@
...
@@ -10,30 +10,30 @@
<el-form
label-position=
"left"
label-width=
"180px"
:model=
"search"
>
<el-form
label-position=
"left"
label-width=
"180px"
:model=
"search"
>
<el-form-item
label=
"境外商品条码信息查询:"
>
<el-form-item
label=
"境外商品条码信息查询:"
>
<el-input
<el-input
v-model=
"search.code"
v-model=
"search.code"
placeholder=
"请输入正确的境外商品条码!"
placeholder=
"请输入正确的境外商品条码!"
class=
"w240"
class=
"w240"
></el-input>
></el-input>
</el-form-item>
</el-form-item>
<el-form-item
label=
"验证码:"
>
<el-form-item
label=
"验证码:"
>
<div
class=
"y-center"
>
<div
class=
"y-center"
>
<el-input
<el-input
v-model=
"search.captcha"
v-model=
"search.captcha"
placeholder=
"请输入验证码"
placeholder=
"请输入验证码"
class=
"w160"
class=
"w160"
></el-input>
></el-input>
<div
class=
"validate-code"
>
<div
class=
"validate-code"
>
<img
:src=
"captchaPath"
@
click=
"getCaptcha()"
alt=
""
/>
<img
:src=
"captchaPath"
@
click=
"getCaptcha()"
alt=
""
/>
<!--
<img
src=
"../../assets/image/validate.jpg"
alt=
""
/>
-->
<!--
<img
src=
"../../assets/image/validate.jpg"
alt=
""
/>
-->
</div>
</div>
<el-button
<el-button
style=
"margin-left: 40px"
style=
"margin-left: 40px"
type=
"primary"
type=
"primary"
@
click=
"handleSearch"
@
click=
"handleSearch"
>
查询
>
查询
</el-button>
</el-button>
</div>
</div>
</el-form-item>
</el-form-item>
...
@@ -45,11 +45,11 @@
...
@@ -45,11 +45,11 @@
<template
v-if=
"result"
>
<template
v-if=
"result"
>
<div
class=
"company-info"
>
<div
class=
"company-info"
>
<el-table
<el-table
:data=
"result"
:data=
"result"
header-cell-class-name=
"search-table-hc"
header-cell-class-name=
"search-table-hc"
style=
"width: 100%"
style=
"width: 100%"
>
>
<el-table-column
prop=
"
address.n
ame"
label=
"企业名称"
></el-table-column>
<el-table-column
prop=
"
gs1CompanyPrefixLicensee.partyN
ame"
label=
"企业名称"
></el-table-column>
<el-table-column
prop=
"gepirRequestedKey.requestedKeyValue"
label=
"GTIN"
></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.streetAddressOne"
label=
"地址"
></el-table-column>
<el-table-column
prop=
"address.city"
label=
"城市"
></el-table-column>
<el-table-column
prop=
"address.city"
label=
"城市"
></el-table-column>
...
@@ -64,7 +64,7 @@
...
@@ -64,7 +64,7 @@
<div
class=
"notice"
>
<div
class=
"notice"
>
<div
class=
"title"
>
友情提示
</div>
<div
class=
"title"
>
友情提示
</div>
<div
class=
"content-wrapper"
>
<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>
<p>
1、目前,国际物品编码组织(GS1)已将690至697之间的前缀码分配给中国物品编码中心使用,通常以这些前缀码开始的厂商识别代码都是由中国物品编码中心负责分配和管理的;以其他前缀码开始的则由境外GS1成员组织负责,一般称为"境外条码",以下为您提供了境外商品条码信息的查询工具,请根据提示进行相关查询。欲了解GS1分配的前缀码,请点击:
1、目前,国际物品编码组织(GS1)已将690至697之间的前缀码分配给中国物品编码中心使用,通常以这些前缀码开始的厂商识别代码都是由中国物品编码中心负责分配和管理的;以其他前缀码开始的则由境外GS1成员组织负责,一般称为"境外条码",以下为您提供了境外商品条码信息的查询工具,请根据提示进行相关查询。欲了解GS1分配的前缀码,请点击:
<a
href=
"/search/country"
target=
"_blank"
style=
"color: #5AC8FA;"
>
了解更多 >>
</a>
<a
href=
"/search/country"
target=
"_blank"
style=
"color: #5AC8FA;"
>
了解更多 >>
</a>
...
@@ -77,13 +77,13 @@
...
@@ -77,13 +77,13 @@
<
script
>
<
script
>
import
validation
from
"@/views/Search/validation"
;
import
validation
from
"@/views/Search/validation"
;
import
{
mapState
}
from
"vuex"
;
import
{
mapState
}
from
"vuex"
;
export
default
{
export
default
{
mixins
:
[
validation
],
mixins
:
[
validation
],
data
()
{
data
()
{
return
{
return
{
search
:
{
code
:
""
},
search
:
{
code
:
""
},
searchCodeShow
:
""
,
searchCodeShow
:
""
,
showResult
:
false
,
showResult
:
false
,
result
:
null
,
result
:
null
,
...
@@ -93,18 +93,21 @@ export default {
...
@@ -93,18 +93,21 @@ export default {
...
mapState
([
"urls"
]),
...
mapState
([
"urls"
]),
},
},
methods
:
{
methods
:
{
async
handleSearch
()
{
openUrl
(
url
)
{
window
.
open
(
url
,
'_blank'
)
},
async
handleSearch
()
{
this
.
searchCodeShow
=
this
.
search
.
code
;
this
.
searchCodeShow
=
this
.
search
.
code
;
this
.
showResult
=
true
;
this
.
showResult
=
true
;
const
params
=
{
const
params
=
{
"code"
:
this
.
search
.
code
,
"code"
:
this
.
search
.
code
,
"type"
:
"GTIN"
,
"type"
:
"GTIN"
,
"requestedLanguage"
:
"en"
,
"requestedLanguage"
:
"en"
,
"captcha"
:
this
.
captcha
,
"captcha"
:
this
.
captcha
,
"uuid"
:
this
.
uuid
"uuid"
:
this
.
uuid
};
};
const
searchGlnRes
=
await
this
.
$api
.
search
.
searchGln
(
params
);
const
searchGlnRes
=
await
this
.
$api
.
search
.
searchGln
(
params
);
const
{
returnCode
,
data
}
=
searchGlnRes
;
const
{
returnCode
,
data
}
=
searchGlnRes
;
if
(
returnCode
===
"0"
)
{
if
(
returnCode
===
"0"
)
{
if
(
data
.
returnCode
===
'0'
)
{
if
(
data
.
returnCode
===
'0'
)
{
this
.
result
=
[
data
];
this
.
result
=
[
data
];
...
@@ -117,7 +120,7 @@ export default {
...
@@ -117,7 +120,7 @@ export default {
"您输入的商品条码格式不正确,请确认后重试。"
;
"您输入的商品条码格式不正确,请确认后重试。"
;
this
.
result
=
null
;
this
.
result
=
null
;
}
}
this
.
getCaptcha
();
this
.
getCaptcha
();
},
},
},
},
};
};
...
@@ -128,6 +131,7 @@ export default {
...
@@ -128,6 +131,7 @@ export default {
.banner-box
{
.banner-box
{
width
:
100%
;
width
:
100%
;
height
:
auto
;
height
:
auto
;
>
img
{
>
img
{
width
:
100%
;
width
:
100%
;
height
:
auto
;
height
:
auto
;
...
@@ -137,6 +141,7 @@ export default {
...
@@ -137,6 +141,7 @@ export default {
.product-info
{
.product-info
{
margin-top
:
-15px
;
margin-top
:
-15px
;
.left
{
.left
{
.row_
{
.row_
{
display
:
flex
;
display
:
flex
;
...
...
src/views/Service/Partners/caseList.vue
View file @
4320784f
...
@@ -5,16 +5,16 @@
...
@@ -5,16 +5,16 @@
<div
class=
"search row"
style=
"margin: 15px 0"
>
<div
class=
"search row"
style=
"margin: 15px 0"
>
<div
class=
"col-lg-4"
>
<div
class=
"col-lg-4"
>
<el-select
<el-select
style=
"width: 100%"
style=
"width: 100%"
size=
"small"
size=
"small"
v-model=
"search.service"
v-model=
"search.service"
placeholder=
"请选择"
placeholder=
"请选择"
>
>
<el-option
<el-option
v-for=
"item in serviceList"
v-for=
"item in serviceList"
:key=
"item.value"
:key=
"item.value"
:label=
"item.label"
:label=
"item.label"
:value=
"item.value"
:value=
"item.value"
>
>
</el-option>
</el-option>
</el-select>
</el-select>
...
@@ -22,7 +22,8 @@
...
@@ -22,7 +22,8 @@
<div
class=
"col-lg-4 text-left"
>
<div
class=
"col-lg-4 text-left"
>
<el-button
type=
"primary"
size=
"small"
@
click=
"casesFrontList"
<el-button
type=
"primary"
size=
"small"
@
click=
"casesFrontList"
>
搜索
</el-button
>
搜索
</el-button
>
>
</div>
</div>
...
@@ -34,10 +35,10 @@
...
@@ -34,10 +35,10 @@
</li>
</li>
</ul>
</ul>
<pages
<pages
:currPage=
"pageParams.currPage"
:currPage=
"pageParams.currPage"
:pageSize=
"pageParams.pageSize"
:pageSize=
"pageParams.pageSize"
:total=
"pageParams.total"
:total=
"pageParams.total"
@
getLimit=
"receivePagesChild"
@
getLimit=
"receivePagesChild"
/>
/>
</div>
</div>
</div>
</div>
...
@@ -45,7 +46,7 @@
...
@@ -45,7 +46,7 @@
</
template
>
</
template
>
<
script
>
<
script
>
import
{
mapMutations
}
from
"vuex"
;
import
{
mapMutations
}
from
"vuex"
;
import
pages
from
"../../comps/pages2.vue"
;
import
pages
from
"../../comps/pages2.vue"
;
export
default
{
export
default
{
...
@@ -63,18 +64,18 @@ export default {
...
@@ -63,18 +64,18 @@ export default {
service
:
""
,
service
:
""
,
},
},
serviceList
:
[
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
:
[],
list
:
[],
};
};
...
@@ -88,6 +89,8 @@ export default {
...
@@ -88,6 +89,8 @@ export default {
}),
}),
// 点击列表跳转详情
// 点击列表跳转详情
handelJumpMsg
(
msg
)
{
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
.
setPartnersMsg
(
msg
);
this
.
$router
.
push
({
this
.
$router
.
push
({
path
:
"/Service/Partners/content"
,
path
:
"/Service/Partners/content"
,
...
@@ -107,8 +110,8 @@ export default {
...
@@ -107,8 +110,8 @@ export default {
service
:
this
.
search
.
service
,
service
:
this
.
search
.
service
,
};
};
const
serviceCasesFrontListRes
=
const
serviceCasesFrontListRes
=
await
this
.
$api
.
service
.
serviceCasesFrontList
(
params
);
await
this
.
$api
.
service
.
serviceCasesFrontList
(
params
);
const
{
success
,
data
}
=
serviceCasesFrontListRes
;
const
{
success
,
data
}
=
serviceCasesFrontListRes
;
console
.
log
(
serviceCasesFrontListRes
,
"serviceCasesFrontListRes"
);
console
.
log
(
serviceCasesFrontListRes
,
"serviceCasesFrontListRes"
);
if
(
success
)
{
if
(
success
)
{
console
.
log
(
data
,
"案例介绍"
);
console
.
log
(
data
,
"案例介绍"
);
...
...
src/views/Service/Partners/content.vue
View file @
4320784f
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
</
template
>
</
template
>
<
script
>
<
script
>
import
{
mapState
}
from
"vuex"
;
import
{
mapState
}
from
"vuex"
;
export
default
{
export
default
{
computed
:
{
computed
:
{
...
@@ -31,9 +31,9 @@ export default {
...
@@ -31,9 +31,9 @@ export default {
mounted
()
{
mounted
()
{
// 面包屑单独处理
// 面包屑单独处理
this
.
$store
.
commit
(
"system/SET_BREADCRUMB"
,
[
this
.
$store
.
commit
(
"system/SET_BREADCRUMB"
,
[
{
name
:
"服务中心"
,
path
:
"/Service/BarcodeV"
},
{
name
:
"服务中心"
,
path
:
"/Service/BarcodeV"
},
{
name
:
"标准服务提供商"
,
path
:
"/Service/Partners/index"
},
{
name
:
"标准服务提供商"
,
path
:
"/Service/Partners/index"
},
{
name
:
"服务提供商介绍"
},
{
name
:
"服务提供商介绍"
},
]);
]);
},
},
methods
:
{},
methods
:
{},
...
@@ -44,11 +44,13 @@ export default {
...
@@ -44,11 +44,13 @@ export default {
.msg-cont
{
.msg-cont
{
@include
module-box;
@include
module-box;
padding
:
30px
0
;
padding
:
30px
0
;
.msg-title
{
.msg-title
{
color
:
#454545
;
color
:
#454545
;
font-size
:
26px
;
font-size
:
26px
;
text-align
:
center
;
text-align
:
center
;
}
}
.msg-head
{
.msg-head
{
border-bottom
:
1px
dashed
#c5d8ee
;
border-bottom
:
1px
dashed
#c5d8ee
;
padding
:
20px
0
;
padding
:
20px
0
;
...
@@ -56,30 +58,41 @@ export default {
...
@@ -56,30 +58,41 @@ export default {
justify-content
:
space-between
;
justify-content
:
space-between
;
font-size
:
12px
;
font-size
:
12px
;
flex-wrap
:
wrap
;
flex-wrap
:
wrap
;
.msg-head-left
{
.msg-head-left
{
span
{
span
{
margin-right
:
25px
;
margin-right
:
25px
;
&:last-child
{
&:last-child
{
margin
:
0
;
margin
:
0
;
}
}
}
}
}
}
.msg-head-right
{
.msg-head-right
{
display
:
flex
;
display
:
flex
;
align-items
:
center
;
align-items
:
center
;
img
{
img
{
margin-left
:
14px
;
margin-left
:
14px
;
}
}
}
}
}
}
.msg-text
{
.msg-text
{
margin-top
:
20px
;
margin-top
:
20px
;
img
{
max-width
:
95%
;
}
p
{
p
{
text-indent
:
25px
;
text-indent
:
25px
;
font-size
:
14px
;
font-size
:
14px
;
font-weight
:
400
;
font-weight
:
400
;
color
:
#414345
;
color
:
#414345
;
}
}
.strong
{
.strong
{
font-size
:
14px
;
font-size
:
14px
;
font-weight
:
bold
;
font-weight
:
bold
;
...
...
src/views/Service/book.vue
View file @
4320784f
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
<el-tab-pane
label=
"条码图书"
name=
"first"
>
<el-tab-pane
label=
"条码图书"
name=
"first"
>
<div
class=
"book-card"
:key=
"i"
v-for=
"(item,i) in bookList"
>
<div
class=
"book-card"
:key=
"i"
v-for=
"(item,i) in bookList"
>
<div
class=
"book-img"
>
<div
class=
"book-img"
>
<img
:src=
"item.graph"
alt=
""
>
<img
:src=
"
prefix+
item.graph"
alt=
""
>
</div>
</div>
<div
class=
"book-content"
>
<div
class=
"book-content"
>
<div
class=
"title"
>
{{
item
.
prename
}}
</div>
<div
class=
"title"
>
{{
item
.
prename
}}
</div>
...
@@ -40,6 +40,10 @@
...
@@ -40,6 +40,10 @@
<img
src=
"./img/ios.png"
alt=
""
>
<img
src=
"./img/ios.png"
alt=
""
>
<a
target=
"_blank"
:href=
"item.ios"
>
iphone
</a>
<a
target=
"_blank"
:href=
"item.ios"
>
iphone
</a>
</div>
</div>
<div
v-if=
"item.local"
>
<a
target=
"_blank"
:href=
"item.local"
>
本地下载
</a>
</div>
</div>
</div>
</div>
</div>
<div
v-if=
"item.qrcode"
class=
"qr-code"
>
<div
v-if=
"item.qrcode"
class=
"qr-code"
>
...
@@ -54,7 +58,7 @@
...
@@ -54,7 +58,7 @@
<
script
>
<
script
>
import
pages
from
"../comps/pages.vue"
;
import
pages
from
"../comps/pages.vue"
;
import
{
mapState
}
from
"vuex"
;
import
{
mapState
}
from
"vuex"
;
export
default
{
export
default
{
components
:
{
pages
},
components
:
{
pages
},
...
@@ -64,6 +68,7 @@ export default {
...
@@ -64,6 +68,7 @@ export default {
data
()
{
data
()
{
return
{
return
{
activeName
:
'second'
,
activeName
:
'second'
,
prefix
:
'http://www.gs1cn.org/Knowledge/img/'
,
appList
:
[
appList
:
[
{
{
name
:
'中国物品编码中心'
,
name
:
'中国物品编码中心'
,
...
@@ -77,8 +82,9 @@ export default {
...
@@ -77,8 +82,9 @@ export default {
name
:
'汉信码生成工具V2.1'
,
name
:
'汉信码生成工具V2.1'
,
icon
:
require
(
'./img/hxcode-icon.png'
),
icon
:
require
(
'./img/hxcode-icon.png'
),
desc
:
'生成识读功能'
,
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`,
android
:
'http://www.anzhi.com/soft_969237.html'
,
// 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`,
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
:
'条码追溯'
,
name
:
'条码追溯'
,
...
...
src/views/User/register.vue
View file @
4320784f
...
@@ -131,9 +131,12 @@ export default {
...
@@ -131,9 +131,12 @@ export default {
"passWord"
:
this
.
form
.
password
,
"passWord"
:
this
.
form
.
password
,
"passWord_repeat"
:
this
.
form
.
rePassword
,
"passWord_repeat"
:
this
.
form
.
rePassword
,
}).
then
(
res
=>
{
}).
then
(
res
=>
{
if
(
res
.
success
)
{
if
(
res
.
success
)
{
this
.
$message
({
type
:
'success'
,
message
:
'注册成功'
});
this
.
$message
({
type
:
'success'
,
message
:
'注册成功'
});
}
else
{
setTimeout
(()
=>
{
window
.
location
.
href
=
'/login'
},
300
)
}
else
{
this
.
$message
({
type
:
'error'
,
message
:
res
.
returnMsg
||
'注册失败,请联系管理员'
});
this
.
$message
({
type
:
'error'
,
message
:
res
.
returnMsg
||
'注册失败,请联系管理员'
});
}
}
}).
catch
(
err
=>
{
}).
catch
(
err
=>
{
...
@@ -153,7 +156,7 @@ export default {
...
@@ -153,7 +156,7 @@ export default {
"phone"
:
this
.
form
.
mobile
,
"phone"
:
this
.
form
.
mobile
,
}).
then
(
res
=>
{
}).
then
(
res
=>
{
console
.
log
(
res
)
console
.
log
(
res
)
if
(
res
.
success
)
{
if
(
res
.
success
)
{
this
.
$message
({
type
:
'success'
,
message
:
'发送成功'
});
this
.
$message
({
type
:
'success'
,
message
:
'发送成功'
});
this
.
hasSent
=
true
;
this
.
hasSent
=
true
;
this
.
timer
=
setInterval
(()
=>
{
this
.
timer
=
setInterval
(()
=>
{
...
@@ -164,8 +167,8 @@ export default {
...
@@ -164,8 +167,8 @@ export default {
this
.
hasSent
=
false
;
this
.
hasSent
=
false
;
}
}
},
1000
);
},
1000
);
}
else
{
}
else
{
this
.
$message
({
type
:
'error'
,
message
:
res
.
returnMsg
||
'发送失败'
});
}
}
}).
catch
(
err
=>
{
}).
catch
(
err
=>
{
console
.
log
(
err
)
console
.
log
(
err
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment