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
0b5dad77
Commit
0b5dad77
authored
Nov 26, 2019
by
刘泽奇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
123
parent
edec4ab1
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
128 additions
and
69 deletions
+128
-69
igirl-channel-jdweb/app/front/entry/public/css/pagecom.css
+0
-0
igirl-channel-jdweb/app/front/vues/pages/jdindentdetail/jdindentdetail.css
+0
-2
igirl-channel-jdweb/app/front/vues/pages/jdindentdetail/jdindentdetail.html
+54
-39
igirl-channel-jdweb/app/front/vues/pages/jdindentdetail/jdindentdetail.js
+1
-2
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.css
+38
-18
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.html
+31
-8
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.js
+4
-0
No files found.
igirl-channel-jdweb/app/front/entry/public/css/pagecom.css
View file @
0b5dad77
This source diff could not be displayed because it is too large. You can
view the blob
instead.
igirl-channel-jdweb/app/front/vues/pages/jdindentdetail/jdindentdetail.css
View file @
0b5dad77
...
...
@@ -528,4 +528,3 @@
.jdindentdetail-drawer
.selftmreg_main
.el-form-item
{
margin-bottom
:
10px
!important
;
}
.jdindentdetail-drawer
.selftmreg_main
\ No newline at end of file
igirl-channel-jdweb/app/front/vues/pages/jdindentdetail/jdindentdetail.html
View file @
0b5dad77
...
...
@@ -7,6 +7,27 @@
<span>退出</span>
</div>
</div> -->
<div
class=
"jdindentlist-header"
>
<div>
京东云商标
</div>
<div>
<span><i
class=
"el-icon-user"
></i></span>
<span>
1366*565445
</span>
</div>
</div>
<div>
<div
style=
"display:flex;height: 60px;align-items: center;"
>
<div
style=
"background:#ffffff;
border:3px solid #3071fe;
width:6px;
height:6px;
border-radius:100%;margin: 0 10px 0 20px;"
>
</div>
<div
style=
"font-size: 16px;"
>
订单详情
</div>
</div>
</div>
<div
class=
"jdindentdetail"
>
<div
class=
"jdindentdetail-nav"
>
<span>
当前位置:
</span>
...
...
@@ -400,9 +421,7 @@
<!-- <h4 style="color:#535353"><i class="selftmreg_shuxian"></i>交官文件</h4> -->
<el-form
label-position=
"left"
ref=
"apply"
:rules=
"applyrules"
:model=
"editApply"
class=
"demo-ruleForm"
label-width=
"120px"
>
<div
class=
"selftmreg_main"
>
<div
style=
"clear:both;"
></div>
<div
style=
"width:100%;padding-left:30px;box-sizing: border-box;"
>
<!-- 头部 -->
<!-- <el-form-item label-width="140px" label="申请人类型"
style="width:493px;float:left;padding-right:50px;" prop="customerType">
...
...
@@ -416,7 +435,7 @@
v-if="applyInfo.customerType==\'person\'" src="/imgs/sjd.png" alt=""></div>
</el-form-item> -->
<div
style=
"clear:both;"
></div>
<div
class=
"selftmreg_main
"
>
<div
class=
"selftmreg_main"
style=
"padding:0;
"
>
<div
style=
"width: 100%;text-align: left;box-sizing: border-box;"
>
<el-form-item
class=
"gsb_items"
label=
""
>
<div
class=
"title special"
>
上传材料:营业执照
</div>
...
...
@@ -424,9 +443,9 @@
@
mouseleave=
"mouseLeaveDemo(1,\'a\')"
>
<img
class=
"upload-applyimg"
v-if=
"editApply.businessLicensePic"
:src=
"editApply.businessLicensePic?editApply.businessLicensePic:\'/imgs/sbzc/yyzzD.png\'"
/>
<gsb-upload
v-else
flag=
"yyzz"
ref=
"yyzz"
:d=
"d"
@
setKey=
"setKey
"
:action=
"action"
filetype=
"image/jpeg"
:ifshowlist=
"false
"
@
uploadsuccess=
"uploadsuccess"
@
error=
"error"
>
<gsb-upload
v-else
flag=
"yyzz"
ref=
"yyzz"
:d=
"d"
@
setKey=
"setKey"
:action=
"action
"
filetype=
"image/jpeg"
:ifshowlist=
"false"
@
uploadsuccess=
"uploadsuccess
"
@
error=
"error"
>
<div
class=
"upload-button"
@
click=
"loadingKey = 0"
>
<div><i
class=
"el-icon-plus"
></i></div>
<div>
(需盖公章)
</div>
...
...
@@ -436,15 +455,14 @@
v-show=
"editApply.businessLicensePic && toViewImgKey == \'a\'"
>
<div
@
click=
"window.open(editApply.businessLicensePic)"
>
查看大图
</div>
<gsb-upload
flag=
"yyzz"
ref=
"yyzz"
:d=
"d"
@
setKey=
"setKey
"
:action=
"action"
filetype=
"image/jpeg"
:ifshowlist=
"false
"
@
uploadsuccess=
"uploadsuccess"
@
error=
"error"
>
<gsb-upload
flag=
"yyzz"
ref=
"yyzz"
:d=
"d"
@
setKey=
"setKey"
:action=
"action
"
filetype=
"image/jpeg"
:ifshowlist=
"false"
@
uploadsuccess=
"uploadsuccess
"
@
error=
"error"
>
<div
@
click=
"loadingKey = 0"
>
重新上传
</div>
</gsb-upload>
</div>
</div>
<div
class=
"upload-img"
@
mouseover=
"mouseOverDemo(1)"
@
mouseleave=
"mouseLeaveDemo(1)"
>
<div
class=
"upload-img"
@
mouseover=
"mouseOverDemo(1)"
@
mouseleave=
"mouseLeaveDemo(1)"
>
<img
:src=
"applyInfo.customerType == \'ent\' ? \'/imgs/sbzc/yyzz1.png\' : \'imgs/sbzc/yyzz.png\'"
/>
<div
v-if=
"toViewImgKey == 1"
class=
"toViewImg"
...
...
@@ -460,9 +478,9 @@
<img
@
click=
"window.open(editApply.identityCardPic)"
class=
"upload-applyimg"
v-if=
"editApply.identityCardPic"
:src=
"editApply.identityCardPic?editApply.identityCardPic:\'/imgs/sbzc/pdf.png\'"
/>
<gsb-upload
v-else
flag=
"sfz"
ref=
"sfz"
:d=
"d"
@
setKey=
"setKey
"
:action=
"action"
filetype=
"image/jpeg"
:ifshowlist=
"false
"
@
uploadsuccess=
"uploadsuccess"
@
error=
"error"
>
<gsb-upload
v-else
flag=
"sfz"
ref=
"sfz"
:d=
"d"
@
setKey=
"setKey"
:action=
"action
"
filetype=
"image/jpeg"
:ifshowlist=
"false"
@
uploadsuccess=
"uploadsuccess
"
@
error=
"error"
>
<div
class=
"upload-button"
@
click=
"loadingKey = 1"
>
<div><i
class=
"el-icon-plus"
></i></div>
<div>
(需盖公章)
</div>
...
...
@@ -471,15 +489,14 @@
<div
class=
"upload-dialog"
v-show=
"editApply.identityCardPic && toViewImgKey == \'d\'"
>
<div
@
click=
"window.open(editApply.identityCardPic)"
>
查看大图
</div>
<gsb-upload
flag=
"sfz"
ref=
"sfz"
:d=
"d"
@
setKey=
"setKey
"
:action=
"action"
filetype=
"image/jpeg"
:ifshowlist=
"false
"
@
uploadsuccess=
"uploadsuccess"
@
error=
"error"
>
<gsb-upload
flag=
"sfz"
ref=
"sfz"
:d=
"d"
@
setKey=
"setKey"
:action=
"action
"
filetype=
"image/jpeg"
:ifshowlist=
"false"
@
uploadsuccess=
"uploadsuccess
"
@
error=
"error"
>
<div
@
click=
"loadingKey = 1"
>
重新上传
</div>
</gsb-upload>
</div>
</div>
<div
class=
"upload-img"
@
mouseover=
"mouseOverDemo(4)"
@
mouseleave=
"mouseLeaveDemo(4)"
>
<div
class=
"upload-img"
@
mouseover=
"mouseOverDemo(4)"
@
mouseleave=
"mouseLeaveDemo(4)"
>
<img
src=
"/imgs/sbzc/sfz.png"
/>
<div
v-if=
"toViewImgKey == 4"
class=
"toViewImg"
@
click=
"toViewImg(\'/imgs/sbzc/sfzD.png\')"
>
查看大图
</div>
...
...
@@ -496,9 +513,9 @@
@
mouseleave=
"mouseLeaveDemo(2,\'b\')"
>
<img
@
click=
"window.open(editDeliveryInfo.gzwtsUrl)"
class=
"upload-applyimg"
v-if=
"editDeliveryInfo.gzwtsUrl"
:src=
"editDeliveryInfo.gzwtsUrl"
/>
<gsb-upload
v-else
flag=
"wts"
ref=
"wts"
:d=
"d"
@
setKey=
"setKey
"
:action=
"action"
filetype=
"image/jpeg"
:ifshowlist=
"false
"
@
uploadsuccess=
"uploadsuccess"
@
error=
"error"
>
<gsb-upload
v-else
flag=
"wts"
ref=
"wts"
:d=
"d"
@
setKey=
"setKey"
:action=
"action
"
filetype=
"image/jpeg"
:ifshowlist=
"false"
@
uploadsuccess=
"uploadsuccess
"
@
error=
"error"
>
<div
class=
"upload-button"
@
click=
"loadingKey = 2"
>
<div><i
class=
"el-icon-plus"
></i></div>
<div>
(需盖公章)
</div>
...
...
@@ -507,15 +524,14 @@
<div
class=
"upload-dialog"
v-show=
"editDeliveryInfo.gzwtsUrl && toViewImgKey == \'b\'"
>
<div
@
click=
"window.open(editDeliveryInfo.gzwtsUrl)"
>
查看大图
</div>
<gsb-upload
flag=
"wts"
ref=
"wts"
:d=
"d"
@
setKey=
"setKey
"
:action=
"action"
filetype=
"image/jpeg"
:ifshowlist=
"false
"
@
uploadsuccess=
"uploadsuccess"
@
error=
"error"
>
<gsb-upload
flag=
"wts"
ref=
"wts"
:d=
"d"
@
setKey=
"setKey"
:action=
"action
"
filetype=
"image/jpeg"
:ifshowlist=
"false"
@
uploadsuccess=
"uploadsuccess
"
@
error=
"error"
>
<div
@
click=
"loadingKey = 2"
>
重新上传
</div>
</gsb-upload>
</div>
</div>
<div
class=
"upload-img"
@
mouseover=
"mouseOverDemo(2)"
@
mouseleave=
"mouseLeaveDemo(2)"
>
<div
class=
"upload-img"
@
mouseover=
"mouseOverDemo(2)"
@
mouseleave=
"mouseLeaveDemo(2)"
>
<img
:src=
"editApply.customerType == \'ent\' ? \'/imgs/sbzc/wts1.png\' : \'imgs/sbzc/wts.png\'"
/>
<div
v-if=
"toViewImgKey == 2"
class=
"toViewImg"
...
...
@@ -533,9 +549,9 @@
@
mouseleave=
"mouseLeaveDemo(3,\'c\')"
>
<img
@
click=
"window.open(editDeliveryInfo.smwjUrl)"
class=
"upload-applyimg"
v-if=
"editDeliveryInfo.smwjUrl"
:src=
"editDeliveryInfo.smwjUrl"
/>
<gsb-upload
v-else
flag=
"yxq"
ref=
"yxq"
:d=
"d"
@
setKey=
"setKey
"
:action=
"action"
filetype=
"image/jpeg"
:ifshowlist=
"false
"
@
uploadsuccess=
"uploadsuccess"
@
error=
"error"
>
<gsb-upload
v-else
flag=
"yxq"
ref=
"yxq"
:d=
"d"
@
setKey=
"setKey"
:action=
"action
"
filetype=
"image/jpeg"
:ifshowlist=
"false"
@
uploadsuccess=
"uploadsuccess
"
@
error=
"error"
>
<div
class=
"upload-button"
@
click=
"loadingKey = 3"
>
<div><i
class=
"el-icon-plus"
></i></div>
<div>
(需盖公章)
</div>
...
...
@@ -544,15 +560,14 @@
<div
class=
"upload-dialog"
v-show=
"editDeliveryInfo.smwjUrl && toViewImgKey == \'c\'"
>
<div
@
click=
"window.open(editDeliveryInfo.smwjUrl)"
>
查看大图
</div>
<gsb-upload
flag=
"yxq"
ref=
"yxq"
:d=
"d"
@
setKey=
"setKey
"
:action=
"action"
filetype=
"image/jpeg"
:ifshowlist=
"false
"
@
uploadsuccess=
"uploadsuccess"
@
error=
"error"
>
<gsb-upload
flag=
"yxq"
ref=
"yxq"
:d=
"d"
@
setKey=
"setKey"
:action=
"action
"
filetype=
"image/jpeg"
:ifshowlist=
"false"
@
uploadsuccess=
"uploadsuccess
"
@
error=
"error"
>
<div
@
click=
"loadingKey = 3"
>
重新上传
</div>
</gsb-upload>
</div>
</div>
<div
class=
"upload-img"
@
mouseover=
"mouseOverDemo(3)"
@
mouseleave=
"mouseLeaveDemo(3)"
>
<div
class=
"upload-img"
@
mouseover=
"mouseOverDemo(3)"
@
mouseleave=
"mouseLeaveDemo(3)"
>
<img
src=
"/imgs/sbzc/yxq.png"
/>
<div
v-if=
"toViewImgKey == 3"
class=
"toViewImg"
@
click=
"toViewImg(\'/imgs/sbzc/yxqD.png\')"
>
查看大图
</div>
...
...
@@ -561,8 +576,7 @@
<div
style=
"clear:both;"
></div>
<el-drawer
title=
""
:visible
.
sync=
"toViewImgType"
center
width=
"72%"
append-to-body
>
<img
:src=
"toViewImgSrc"
style=
"max-width:100%;display: block;margin: 0 auto;"
alt=
""
>
<img
:src=
"toViewImgSrc"
style=
"max-width:100%;display: block;margin: 0 auto;"
alt=
""
>
</el-drawer>
</div>
</div>
...
...
@@ -849,7 +863,8 @@
</div>
<div
style=
"margin-top: 10px;"
>
<span
class=
"dialog-footer"
>
<el-button
style=
"background:#66b1ff;border-color: #66b1ff;color: #FFF;"
@
click=
"closeConfrim()"
>
修 改
<el-button
style=
"background:#66b1ff;border-color: #66b1ff;color: #FFF;"
@
click=
"closeConfrim()"
>
修 改
</el-button>
<el-button
style=
"background:#fff;border-color: #DCDFE6;color: #606266;"
type=
"primary"
@
click=
"submitEdit(\'商标类别\',true)"
>
确 定
</el-button>
...
...
igirl-channel-jdweb/app/front/vues/pages/jdindentdetail/jdindentdetail.js
View file @
0b5dad77
...
...
@@ -399,7 +399,7 @@
this
.
$refs
.
tree
.
setChecked
(
newVal
[
1
].
nclThree
[
0
],
false
);
newVal
.
pop
();
this
.
message
.
show
=
!
this
.
message
.
show
;
this
.
message
.
info
=
"只能修改
一个
类别"
;
this
.
message
.
info
=
"只能修改
当前
类别"
;
var
timer
=
setTimeout
(()
=>
{
this
.
message
.
show
=
false
;
clearTimeout
(
timer
);
...
...
@@ -518,7 +518,6 @@
case
1
:
this
.
headerInfo
=
"商标信息"
;
this
.
popupValue
=
"form"
;
break
;
case
2
:
this
.
headerInfo
=
"商标类别"
;
...
...
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.css
View file @
0b5dad77
.jdindentlist-header
{
width
:
100%
;
height
:
8
0px
;
height
:
5
0px
;
display
:
flex
;
justify-content
:
space-between
;
align-items
:
center
;
padding
:
0
30px
0
36px
;
box-sizing
:
border-box
;
background
:
rgba
(
255
,
255
,
255
,
1
)
;
background
:
#212122
;
box-shadow
:
0px
2px
2px
0px
rgba
(
0
,
0
,
0
,
0.2
);
}
...
...
@@ -15,7 +15,7 @@
font-size
:
22px
;
font-family
:
PingFangSC-Semibold
,
PingFang
SC
;
font-weight
:
600
;
color
:
rgba
(
38
,
146
,
255
,
1
)
;
color
:
#ffffff
;
line-height
:
24px
;
}
...
...
@@ -23,7 +23,7 @@
font-size
:
16px
;
font-family
:
PingFangSC-Regular
,
PingFang
SC
;
font-weight
:
400
;
color
:
rgba
(
47
,
47
,
47
,
1
)
;
color
:
#ffffff
;
line-height
:
22px
;
}
...
...
@@ -31,7 +31,7 @@
font-size
:
16px
;
font-family
:
PingFangSC-Regular
,
PingFang
SC
;
font-weight
:
400
;
color
:
rgba
(
47
,
47
,
47
,
1
)
;
color
:
#ffffff
;
line-height
:
22px
;
}
...
...
@@ -39,10 +39,30 @@
font-size
:
16px
;
font-family
:
PingFangSC-Regular
,
PingFang
SC
;
font-weight
:
400
;
color
:
rgba
(
38
,
146
,
255
,
1
)
;
color
:
#ffffff
;
line-height
:
22px
;
}
.jdindentlist-warpper
.el-tabs__item
{
background
:
#eef2fb
;
width
:
130px
;
text-align
:
center
;
color
:
#777777
;
height
:
40px
;
}
.jdindentlist-warpper
.el-tabs__header
{
box-sizing
:
border-box
;
padding-left
:
20px
;
}
.jdindentlist-warpper
.el-tabs__item.is-active
{
border-top
:
2px
solid
#3071fe
;
background
:
#ffffff
;
color
:
#777777
!important
;
}
/* 上面是公共部分 */
.jdindentlist
{
padding
:
2.78%
20px
30px
;
background
:
#F9F9F9
;
...
...
@@ -128,40 +148,39 @@
font-weight
:
400
;
color
:
rgba
(
47
,
47
,
47
,
1
);
}
.jdindentlist-list
.el-table
tr
>
th
:nth-of-type
(
12n
)>
.cell
{
.jdindentlist-list
.el-table
tr
>
th
:nth-of-type
(
12n
)>
.cell
{
text-align
:
center
;
}
.jdindentlist-list-page
{
.jdindentlist-list-page
{
margin-top
:
25px
;
width
:
100%
;
text-align
:
center
;
}
.jdindentlist-list
.subtime
{
.jdindentlist-list
.subtime
{
padding-right
:
25px
;
}
.jdindentlist-list
.dsqcl
{
.jdindentlist-list
.dsqcl
{
color
:
red
;
}
.jdindentlist-null
{
.jdindentlist-null
{
width
:
34.57%
;
height
:
333px
;
margin
:
10.37%
auto
0
;
}
.jdindentlist-null
>
div
:nth-child
(
1
)
img
{
.jdindentlist-null
>
div
:nth-child
(
1
)
img
{
width
:
100%
;
height
:
100%
;
}
.jdindentlist-warpper
.demo-ruleForm
{
.jdindentlist-warpper
.demo-ruleForm
{
display
:
flex
;
justify-content
:
space-around
;
}
\ No newline at end of file
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.html
View file @
0b5dad77
<div
class=
"jdindentlist-warpper"
>
<
!-- <
div class="jdindentlist-header">
<div>
个人中心
</div>
<div
class=
"jdindentlist-header"
>
<div>
京东云商标
</div>
<div>
<span>
欢迎
</span>
<span>
<i
class=
"el-icon-user"
></i>
</span>
<span>
1366*565445
</span>
<span>退出</span>
</div>
</div> -->
</div>
<div>
<div
style=
"display:flex;height: 60px;align-items: center;"
>
<div
style=
"background:#ffffff;
border:3px solid #3071fe;
width:6px;
height:6px;
border-radius:100%;margin: 0 10px 0 20px;"
>
</div>
<div
style=
"font-size: 16px;"
>
订单列表
</div>
</div>
</div>
<el-tabs
v-model=
"navActive"
@
tab-click=
"navClick"
>
<el-tab-pane
label=
"商标订单"
name=
"first"
>
<div
class=
"jdindentlist-nav"
>
</div>
<div
class=
"jdindentlist"
>
<div
class=
"jdindentlist-inquire"
>
<div
class=
"jdindentlist-inquire-form"
>
...
...
@@ -80,14 +99,13 @@
</el-table-column>
<el-table-column
prop=
"totalSum"
label=
"订单金额"
>
</el-table-column>
<el-table-column
prop=
"deliveryStatusName"
label=
"交付状态"
class-name=
"dsqcl"
>
<el-table-column
prop=
"deliveryStatusName"
label=
"交付状态"
class-name=
"dsqcl"
>
</el-table-column>
<el-table-column
prop=
"CreateDate"
label=
"下单时间"
>
</el-table-column>
<el-table-column
prop=
"submitTime"
label=
"递交时间"
class-name=
"subtime"
>
</el-table-column>
<el-table-column
prop=
"address"
label=
"操作"
>
<el-table-column
prop=
"address"
label=
"操作"
>
<template
slot-scope=
"scope"
>
<el-button
v-show=
"showDetails(scope.$index, scope.row)"
style=
"border:0;width:100%;color: #0F8EE9;"
size=
"mini"
...
...
@@ -194,4 +212,8 @@
</div>
</div>
</div>
</el-tab-pane>
<el-tab-pane
label=
"工商订单"
name=
"second"
>
配置管理
</el-tab-pane>
</el-tabs>
</div>
\ No newline at end of file
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.js
View file @
0b5dad77
...
...
@@ -220,6 +220,7 @@
showUploadStuff
:
false
,
currentOrderNo
:
""
,
currentOrderType
:
""
,
navActive
:
'first'
,
}
},
created
:
function
()
{
...
...
@@ -248,6 +249,9 @@
},
methods
:
{
navClick
(
tab
,
e
){
console
.
log
(
tab
,
e
,
this
.
navActive
);
},
tableRowClassName
({
row
,
rowIndex
})
{
if
(
rowIndex
===
1
)
{
return
'warning-row'
;
...
...
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