Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Z
zhichan
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
蒋勇
zhichan
Commits
a4d4ad31
Commit
a4d4ad31
authored
Aug 28, 2020
by
任晓松
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
6eaccd94
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
10 deletions
+10
-10
igirl-zcapi/app/base/api/impl/trademark/tmqueryApi.js
+10
-10
No files found.
igirl-zcapi/app/base/api/impl/trademark/tmqueryApi.js
View file @
a4d4ad31
...
@@ -1268,10 +1268,10 @@ class tmqueryApi extends ApiBase{
...
@@ -1268,10 +1268,10 @@ class tmqueryApi extends ApiBase{
}
}
async
tradeMarkDetail
(
query
,
obj
){
//商标详情
async
tradeMarkDetail
(
query
,
obj
){
//商标详情
console
.
log
(
obj
);
//
console.log(obj);
var
result
=
{
detaildata
:[],
nclexist
:[],
nclnotexist
:[]};
var
result
=
{
detaildata
:[],
nclexist
:[],
nclnotexist
:[]};
var
sbzch
=
obj
.
sbzch
;
var
sbzch
=
query
.
sbzch
;
var
gjfl
=
obj
.
gjfl
;
var
gjfl
=
query
.
gjfl
;
var
sources
=
[];
var
sources
=
[];
var
data
=
{
var
data
=
{
sbzch
:
sbzch
,
sbzch
:
sbzch
,
...
@@ -1281,15 +1281,15 @@ class tmqueryApi extends ApiBase{
...
@@ -1281,15 +1281,15 @@ class tmqueryApi extends ApiBase{
regNum
:
sbzch
regNum
:
sbzch
};
};
var
detailtms
=
await
this
.
GsbByTmSearchApi
.
tradeMarkDetailapi
(
data
);
var
detailtms
=
await
this
.
GsbByTmSearchApi
.
tradeMarkDetailapi
(
data
);
console
.
log
(
"00000000000000000000000000000000000000000000000000000000"
);
//
console.log("00000000000000000000000000000000000000000000000000000000");
console
.
log
(
detailtms
);
//
console.log(detailtms);
var
data2
=
{
var
data2
=
{
reg_num
:
sbzch
,
reg_num
:
sbzch
,
nclone_code
:
gjfl
nclone_code
:
gjfl
}
}
var
qunzutms
=
await
this
.
utilstmSve
.
getGroupNclInfo
(
data2
);
var
qunzutms
=
await
this
.
utilstmSve
.
getGroupNclInfo
(
data2
);
console
.
log
(
"11111111111111111111111111111111111111111111111111111"
);
//
console.log("11111111111111111111111111111111111111111111111111111");
console
.
log
(
qunzutms
.
data
);
//
console.log(qunzutms.data);
if
(
qunzutms
.
status
==
0
){
if
(
qunzutms
.
status
==
0
){
var
qunzuexist
=
[];
var
qunzuexist
=
[];
var
qunzuexistnorepeat
=
[]
var
qunzuexistnorepeat
=
[]
...
@@ -1324,8 +1324,8 @@ class tmqueryApi extends ApiBase{
...
@@ -1324,8 +1324,8 @@ class tmqueryApi extends ApiBase{
lcxx
.
push
(
lcjson
);
lcxx
.
push
(
lcjson
);
});
});
}
}
console
.
log
(
"lcxx===================================="
);
//
console.log("lcxx====================================");
console
.
log
(
lcxx
);
//
console.log(lcxx);
if
(
detailtms
.
status
==
0
&&
detailtms
.
data
.
length
>
0
){
if
(
detailtms
.
status
==
0
&&
detailtms
.
data
.
length
>
0
){
var
tm
=
detailtms
.
data
[
0
];
var
tm
=
detailtms
.
data
[
0
];
var
source
=
{
var
source
=
{
...
@@ -1388,7 +1388,7 @@ class tmqueryApi extends ApiBase{
...
@@ -1388,7 +1388,7 @@ class tmqueryApi extends ApiBase{
// sources.push(source);
// sources.push(source);
// }
// }
result
.
detaildata
=
sources
;
result
.
detaildata
=
sources
;
console
.
log
(
result
);
//
console.log(result);
return
System
.
getResult2
(
result
,
null
);
return
System
.
getResult2
(
result
,
null
);
}
}
...
...
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