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
44a406e8
Commit
44a406e8
authored
Aug 26, 2020
by
王悦
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add商标校验
parent
1c22e4d5
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
64 additions
and
1 deletions
+64
-1
fqboss/app/base/controller/impl/calculatepriceCtl.js
+18
-0
fqboss/app/config/settings.js
+4
-0
fqboss/app/front/vues/pages/automatictmsubmitedit/automatictmsubmitedit.html
+3
-1
fqboss/app/front/vues/pages/automatictmsubmitedit/automatictmsubmitedit.js
+18
-0
fqboss/app/front/vues/pages/automatictmsubmitinside/automatictmsubmitinside.html
+3
-0
fqboss/app/front/vues/pages/automatictmsubmitinside/automatictmsubmitinside.js
+18
-0
No files found.
fqboss/app/base/controller/impl/calculatepriceCtl.js
View file @
44a406e8
...
...
@@ -27,6 +27,24 @@ class calculatepriceCtl extends CtlBase {
var
result
=
await
this
.
service
.
hookOrder
(
obj
);
return
System
.
getResult2
(
result
,
null
);
}
async
checkname
(
o
,
req
)
{
let
url
=
settings
.
apiconfig
.
aliPOPUrl
();
let
app
=
req
.
session
.
app
||
null
;
let
obj
=
{
methodType
:
"CheckTmName"
,
body
:{
TmName
:
req
.
query
.
name
},
appKey
:
app
?
app
.
appid
:
""
,
};
let
rc
=
System
.
getObject
(
"util.execClient"
);
let
rtn
=
null
;
try
{
rtn
=
await
rc
.
execPost
(
obj
,
url
);
return
JSON
.
parse
(
rtn
.
stdout
);
}
catch
(
e
)
{
console
.
log
(
e
);
return
System
.
getResult2
(
null
,
null
);
}
}
async
word2pic
(
o
,
req
)
{
console
.
log
(
"qqqqqqqqqqqwwwwwwwwwwwwwwwwwwwwwwwweeeeeeeeeeeeeeeeee"
);
console
.
log
(
req
.
session
.
user
.
account
);
...
...
fqboss/app/config/settings.js
View file @
44a406e8
...
...
@@ -74,6 +74,10 @@ var settings = {
},
apiconfig
:
{
imageQueryKey
:
"4S3ypgaRq19bhKwB"
,
//阿里专家辅助注册服务商接口
aliPOPUrl
:
function
(){
return
"https://fqgirl.gongsibao.com/api/tmsub/queryAliTmStatus"
},
MgphoneSearchUrl
:
function
()
{
return
settings
.
reqMgAddr
()
+
"phones"
},
...
...
fqboss/app/front/vues/pages/automatictmsubmitedit/automatictmsubmitedit.html
View file @
44a406e8
...
...
@@ -27,10 +27,12 @@
<el-form-item
label=
"商标名称"
style=
"width:450px;float:left"
prop=
"tmName"
>
<el-input
v-model=
"form.tmName"
></el-input>
</el-form-item>
<div
style=
"float:left;padding-left:10px"
>
<el-button
@
click=
"checkname"
>
检查名称
</el-button>
</div>
<div
style=
"float:left;padding-left:10px"
v-if=
"form.tmFormType==3"
>
<el-button
@
click=
"word2pic"
>
文字商标在线生成
</el-button>
</div>
<div
style=
"clear:both;"
></div>
<el-form-item
style=
"width:350px;float:left"
label=
"商标图样_黑白"
prop=
"picUrl"
>
<img
width=
"120px"
height=
"120px"
style=
"border:2px dashed #e9e9e9"
v-if=
"form.picUrl"
...
...
fqboss/app/front/vues/pages/automatictmsubmitedit/automatictmsubmitedit.js
View file @
44a406e8
...
...
@@ -811,6 +811,24 @@
});
},
checkname
()
{
if
(
!
this
.
form
.
tmName
)
{
return
this
.
$message
.
error
(
'商标名称不能为空!'
);
}
this
.
$root
.
showMask
();
this
.
$root
.
getReq
(
"/web/calculatepriceCtl/checkname"
,
{
name
:
this
.
form
.
tmName
}).
then
(
d
=>
{
console
.
log
(
d
);
if
(
d
.
data
.
data
.
Result
===
"PASS"
)
{
this
.
$message
.
success
(
`名称可以使用`
);
}
else
if
(
d
.
data
.
data
.
Result
===
"BLOCK"
)
{
this
.
form
.
tmName
=
""
;
this
.
$message
.
warning
(
d
.
data
.
data
.
Message
)
}
}).
finally
(()
=>
{
this
.
$root
.
hideMask
();
});
},
updatePrice
(){
this
.
form
.
totalSum
=
0
;
this
.
form
.
invoiceTaxes
=
0
;
...
...
fqboss/app/front/vues/pages/automatictmsubmitinside/automatictmsubmitinside.html
View file @
44a406e8
...
...
@@ -26,6 +26,9 @@
<el-form-item
label=
"商标名称"
style=
"width:450px;float:left"
prop=
"tmName"
>
<el-input
v-model=
"form.tmName"
></el-input>
</el-form-item>
<div
style=
"float:left;padding-left:10px"
>
<el-button
@
click=
"checkname"
>
检查名称
</el-button>
</div>
<div
style=
"float:left;padding-left:10px"
v-if=
"form.tmFormType==3"
>
<el-button
@
click=
"word2pic"
>
文字商标在线生成
</el-button>
</div>
...
...
fqboss/app/front/vues/pages/automatictmsubmitinside/automatictmsubmitinside.js
View file @
44a406e8
...
...
@@ -739,6 +739,24 @@
});
},
checkname
()
{
if
(
!
this
.
form
.
tmName
)
{
return
this
.
$message
.
error
(
'商标名称不能为空!'
);
}
this
.
$root
.
showMask
();
this
.
$root
.
getReq
(
"/web/calculatepriceCtl/checkname"
,
{
name
:
this
.
form
.
tmName
}).
then
(
d
=>
{
console
.
log
(
d
);
if
(
d
.
data
.
data
.
Result
===
"PASS"
)
{
this
.
$message
.
success
(
`名称可以使用`
);
}
else
if
(
d
.
data
.
data
.
Result
===
"BLOCK"
)
{
this
.
form
.
tmName
=
""
;
this
.
$message
.
warning
(
d
.
data
.
data
.
Message
)
}
}).
finally
(()
=>
{
this
.
$root
.
hideMask
();
});
},
updatePrice
(){
this
.
form
.
totalSum
=
0
;
this
.
form
.
invoiceTaxes
=
0
;
...
...
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