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
487e1702
Commit
487e1702
authored
Dec 14, 2019
by
宋毅
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tj
parent
061d2da3
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
4 deletions
+27
-4
igirl-channel-jdweb/app/config/routes/web.js
+21
-3
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.js
+2
-0
igirl-channel-jdweb/app/front/vues/pages/selftmreg/selftmreg.html
+1
-1
igirl-channel-jdweb/app/front/vues/pages/selftmreg/selftmreg.js
+3
-0
No files found.
igirl-channel-jdweb/app/config/routes/web.js
View file @
487e1702
...
@@ -102,6 +102,15 @@ module.exports = function (app) {
...
@@ -102,6 +102,15 @@ module.exports = function (app) {
});
});
app
.
get
(
"/1688/selfRegister"
,
async
function
(
req
,
res
)
{
app
.
get
(
"/1688/selfRegister"
,
async
function
(
req
,
res
)
{
var
getUserparams
=
{
actionProcess
:
"1688"
,
channelUserId
:
req
.
query
.
channelUserId
};
var
userItemResult
=
await
tmqueryCtl
.
getUserIdEncryptStr
(
getUserparams
,
req
.
query
,
req
);
if
(
userItemResult
.
status
!=
0
)
{
res
.
end
({
user
:
"user is null"
});
return
;
}
var
params
=
{
var
params
=
{
actionProcess
:
"1688"
,
actionProcess
:
"1688"
,
requrl
:
"/action/tmOrder/springBoard"
,
requrl
:
"/action/tmOrder/springBoard"
,
...
@@ -115,10 +124,19 @@ module.exports = function (app) {
...
@@ -115,10 +124,19 @@ module.exports = function (app) {
res
.
end
(
JSON
.
stringify
(
result
));
res
.
end
(
JSON
.
stringify
(
result
));
return
;
return
;
}
}
var
skipUrl
=
"/#/1688/jdindentlist?channelUserId="
+
encodeURIComponent
(
result
.
data
);
var
skipUrl
=
"/#/1688/jdindentlist?channelUserId="
+
encodeURIComponent
(
userItemResult
.
data
.
encryptChannelUserId
);
res
.
redirect
(
skipUrl
);
res
.
redirect
(
skipUrl
);
});
});
app
.
get
(
"/1688/auxRegister"
,
async
function
(
req
,
res
)
{
app
.
get
(
"/1688/auxRegister"
,
async
function
(
req
,
res
)
{
var
getUserparams
=
{
actionProcess
:
"1688"
,
channelUserId
:
req
.
query
.
channelUserId
};
var
userItemResult
=
await
tmqueryCtl
.
getUserIdEncryptStr
(
getUserparams
,
req
.
query
,
req
);
if
(
userItemResult
.
status
!=
0
)
{
res
.
end
({
user
:
"user is null"
});
return
;
}
var
params
=
{
var
params
=
{
actionProcess
:
"1688"
,
actionProcess
:
"1688"
,
requrl
:
"/action/tmOrder/springBoard"
,
requrl
:
"/action/tmOrder/springBoard"
,
...
@@ -132,10 +150,10 @@ module.exports = function (app) {
...
@@ -132,10 +150,10 @@ module.exports = function (app) {
res
.
end
(
JSON
.
stringify
(
result
));
res
.
end
(
JSON
.
stringify
(
result
));
return
;
return
;
}
}
var
skipUrl
=
"/#/1688/jdindentlist?channelUserId="
+
encodeURIComponent
(
result
.
data
);
var
skipUrl
=
"/#/1688/jdindentlist?channelUserId="
+
encodeURIComponent
(
userItemResult
.
data
.
encryptChannelUserId
);
res
.
redirect
(
skipUrl
);
res
.
redirect
(
skipUrl
);
});
});
app
.
get
(
"/"
,
async
function
(
req
,
res
)
{
app
.
get
(
"/"
,
async
function
(
req
,
res
)
{
try
{
try
{
var
appinfo
=
await
metaCtl
.
getAppInfo
(
req
);
var
appinfo
=
await
metaCtl
.
getAppInfo
(
req
);
...
...
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.js
View file @
487e1702
...
@@ -578,6 +578,8 @@
...
@@ -578,6 +578,8 @@
channelUserId
:
this
.
$route
.
query
.
channelUserId
,
channelUserId
:
this
.
$route
.
query
.
channelUserId
,
deliveryOrderNo
:
row
.
deliveryOrderNo
,
deliveryOrderNo
:
row
.
deliveryOrderNo
,
channelOrderNo
:
row
.
channelServiceNo
,
channelOrderNo
:
row
.
channelServiceNo
,
dqPath
:
'/jdindentlist'
,
dqName
:
'订单列表'
}
}
});
});
window
.
scrollTo
(
0
,
0
);
window
.
scrollTo
(
0
,
0
);
...
...
igirl-channel-jdweb/app/front/vues/pages/selftmreg/selftmreg.html
View file @
487e1702
<div
id=
"selftmreg"
style=
"background-color:white;"
>
<div
id=
"selftmreg"
style=
"background-color:white;"
>
<div
class=
"jdindentdetail-nav"
style=
"width:1200px;margin:12px auto;padding: 0;height:24px;line-height: 24px;"
>
<div
class=
"jdindentdetail-nav"
style=
"width:1200px;margin:12px auto;padding: 0;height:24px;line-height: 24px;"
>
<el-breadcrumb
separator-class=
"el-icon-arrow-right"
>
<el-breadcrumb
separator-class=
"el-icon-arrow-right"
>
<el-breadcrumb-item
:to=
"listPath"
>
商标注册服务
<el-breadcrumb-item
:to=
"listPath"
>
{{titleName}}
</el-breadcrumb-item>
</el-breadcrumb-item>
<el-breadcrumb-item>
自助商标注册
</el-breadcrumb-item>
<el-breadcrumb-item>
自助商标注册
</el-breadcrumb-item>
</el-breadcrumb>
</el-breadcrumb>
...
...
igirl-channel-jdweb/app/front/vues/pages/selftmreg/selftmreg.js
View file @
487e1702
...
@@ -317,6 +317,7 @@
...
@@ -317,6 +317,7 @@
totalPrices
:
null
,
totalPrices
:
null
,
dataList
:
[],
dataList
:
[],
options
:
[],
options
:
[],
titleName
:
''
}
}
},
},
computed
:
{
computed
:
{
...
@@ -416,6 +417,8 @@
...
@@ -416,6 +417,8 @@
}
}
},
},
mounted
:
function
()
{
mounted
:
function
()
{
this
.
titleName
=
this
.
$route
.
query
.
dqName
||
'商标注册服务'
;
this
.
listPath
.
path
=
this
.
$route
.
query
.
dqPath
?
`/
${
this
.
$root
.
channelName
}
`
+
this
.
$route
.
query
.
dqPath
:
`/
${
this
.
$root
.
channelName
}
/jdtrademark`
;
this
.
$root
.
selfFooterShow
=
false
;
this
.
$root
.
selfFooterShow
=
false
;
this
.
getItemCode
();
this
.
getItemCode
();
var
that
=
this
;
var
that
=
this
;
...
...
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