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
abe9cc0c
Commit
abe9cc0c
authored
Feb 23, 2020
by
刘泽奇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
123
parent
9da59ecf
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
11 deletions
+15
-11
igirl-channel-web/app/front/entry/public/js/index.js
+3
-0
igirl-channel-web/app/front/vues/pages/companydetail/companydetail.js
+3
-3
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.html
+4
-4
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.js
+5
-4
No files found.
igirl-channel-web/app/front/entry/public/js/index.js
View file @
abe9cc0c
...
@@ -81,6 +81,9 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
...
@@ -81,6 +81,9 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
if
(
to
.
path
==
"/"
&&
location
.
hostname
==
"xwzc.xiaowangtech.com"
)
{
if
(
to
.
path
==
"/"
&&
location
.
hostname
==
"xwzc.xiaowangtech.com"
)
{
router
.
replace
({
path
:
'/bw/jdtrademark'
});
router
.
replace
({
path
:
'/bw/jdtrademark'
});
}
}
if
(
to
.
path
==
"/"
&&
location
.
hostname
==
"gs.plus.jdcloud.com"
)
{
router
.
replace
({
path
:
'/jd/jdindustry });
}
if (to.path.includes('
login
')) {
if (to.path.includes('
login
')) {
store.state.reqUrl = from.path;
store.state.reqUrl = from.path;
store.state.reqQuery = from.query;
store.state.reqQuery = from.query;
...
...
igirl-channel-web/app/front/vues/pages/companydetail/companydetail.js
View file @
abe9cc0c
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
employees
:
[],
employees
:
[],
logistics
:
[],
logistics
:
[],
attachFiles
:
[],
attachFiles
:
[],
payTime
:
''
,
created_at
:
''
,
regInfo
:
[]
regInfo
:
[]
}
}
},
},
...
@@ -29,8 +29,8 @@
...
@@ -29,8 +29,8 @@
console
.
log
(
this
.
user_Name
,
"bbbbbbbbbbbbbbbbbbbbbbbb"
);
console
.
log
(
this
.
user_Name
,
"bbbbbbbbbbbbbbbbbbbbbbbb"
);
}
}
});
});
if
(
this
.
$route
.
query
.
payTime
)
{
if
(
this
.
$route
.
query
.
created_at
)
{
this
.
payTime
=
this
.
$route
.
query
.
payTime
this
.
created_at
=
this
.
$route
.
query
.
created_at
}
}
this
.
getChannelFrom
();
this
.
getChannelFrom
();
this
.
getDetail
();
this
.
getDetail
();
...
...
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.html
View file @
abe9cc0c
...
@@ -540,11 +540,11 @@
...
@@ -540,11 +540,11 @@
</el-tooltip>
</el-tooltip>
</template>
</template>
</el-table-column>
</el-table-column>
<el-table-column
prop=
"
payTime
"
label=
"下单时间"
>
<el-table-column
prop=
"
created_at
"
label=
"下单时间"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
<el-tooltip
placement=
"top"
:content=
"scope.row.
payTime
"
<el-tooltip
placement=
"top"
:content=
"scope.row.
created_at
"
:disabled=
"scope.row.
payTime
? false : true"
>
:disabled=
"scope.row.
created_at
? false : true"
>
<p
solt=
"content"
>
{{scope.row.
payTime ? scope.row.payTime
: \'---\'}}
<p
solt=
"content"
>
{{scope.row.
created_at ? scope.row.created_at
: \'---\'}}
</p>
</p>
</el-tooltip>
</el-tooltip>
</template>
</template>
...
...
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.js
View file @
abe9cc0c
...
@@ -419,7 +419,7 @@
...
@@ -419,7 +419,7 @@
"channelServiceNo"
:
""
,
"channelServiceNo"
:
""
,
"orderStatus"
:
""
,
"orderStatus"
:
""
,
"startTime"
:
""
,
"startTime"
:
""
,
"entTime"
:
""
"entTime"
:
""
,
"pageIndex"
:
1
,
"pageIndex"
:
1
,
"pageSize"
:
30
"pageSize"
:
30
},
},
...
@@ -636,7 +636,7 @@
...
@@ -636,7 +636,7 @@
query
:
{
query
:
{
orderNo
:
row
.
orderNo
,
orderNo
:
row
.
orderNo
,
channelUserId
:
this
.
$route
.
query
.
channelUserId
,
channelUserId
:
this
.
$route
.
query
.
channelUserId
,
payTime
:
row
.
payTime
created_at
:
row
.
created_at
}
}
});
});
},
},
...
@@ -731,12 +731,13 @@
...
@@ -731,12 +731,13 @@
console
.
log
({
...
d
.
data
});
console
.
log
({
...
d
.
data
});
if
(
d
.
status
==
0
)
{
if
(
d
.
status
==
0
)
{
this
.
icbcData
=
d
.
data
;
this
.
icbcData
=
d
.
data
;
this
.
icbcData
.
map
((
item
,
index
)
=>
{
item
.
created_at
=
new
Date
(
item
.
created_at
).
toLocaleDateString
(
'chinese'
,
{
hour12
:
false
}).
replace
(
/
\/
/g
,
'-'
)
});
this
.
IndustryCountPage
=
d
.
dataCount
;
this
.
IndustryCountPage
=
d
.
dataCount
;
}
else
{
}
else
{
this
.
$message
(
"请重试"
);
this
.
$message
(
"请重试"
);
}
}
})
})
}
else
{
}
else
{
this
.
$message
(
'当前未登录'
);
this
.
$message
(
'当前未登录'
);
...
...
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