Commit a4d4ad31 by 任晓松

update

parent 6eaccd94
...@@ -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);
} }
......
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