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
7c67cb35
Commit
7c67cb35
authored
Jan 06, 2020
by
任建
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'channel-access' of gitlab.gongsibao.com:jiangyong/zhichan into channel-access
parents
d9c150d5
4d2bdadc
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
659 additions
and
134 deletions
+659
-134
channel-access/src/router/index.js
+50
-20
channel-access/src/views/pages/selftmreg/ApplicationInfo.vue
+0
-0
channel-access/src/views/pages/selftmreg/ConfirmOrder.vue
+203
-0
channel-access/src/views/pages/selftmreg/ModifyTrademark.vue
+294
-0
channel-access/src/views/pages/selftmreg/PayOrder.vue
+4
-0
channel-access/src/views/pages/selftmreg/Selftmreg.vue
+86
-7
channel-access/src/views/pages/selftmreg/SelftmregPage.vue
+0
-79
channel-access/src/views/pages/selftmreg/SelftmregPageConfirmStep.vue
+0
-22
channel-access/src/views/pages/selftmreg/SelftmregPageSteps.vue
+22
-6
No files found.
channel-access/src/router/index.js
View file @
7c67cb35
...
@@ -7,45 +7,75 @@ const routes = [{
...
@@ -7,45 +7,75 @@ const routes = [{
path
:
"/:chanue/jdbycdetailtm"
,
path
:
"/:chanue/jdbycdetailtm"
,
name
:
"jdbycdetailtm"
,
name
:
"jdbycdetailtm"
,
component
:
()
=>
component
:
()
=>
import
(
"@/views/pages/jdbycdetailtm"
)
import
(
"@/views/pages/jdbycdetailtm"
)
},
},
{
{
path
:
"/:chanue/companydetail"
,
path
:
"/:chanue/companydetail"
,
name
:
"companydetail"
,
name
:
"companydetail"
,
component
:
()
=>
component
:
()
=>
import
(
"@/views/pages/companydetail"
)
import
(
"@/views/pages/companydetail"
)
},
},
{
{
path
:
"/:chanue/jdindentlist"
,
path
:
"/:chanue/jdindentlist"
,
name
:
"jdindentdetail"
,
name
:
"jdindentdetail"
,
component
:
()
=>
component
:
()
=>
import
(
"@/views/pages/jdindentlist"
)
import
(
"@/views/pages/jdindentlist"
)
},
},
{
{
path
:
"/:chanue/jdindentdetail"
,
path
:
"/:chanue/jdindentdetail"
,
name
:
"jdindentdetail"
,
name
:
"jdindentdetail"
,
component
:
()
=>
component
:
()
=>
import
(
"@/views/pages/jdindentdetail"
)
import
(
"@/views/pages/jdindentdetail"
)
},
},
/////////
/////////
{
{
path
:
"/:chanue/jdtrademark"
,
path
:
"/:chanue/jdtrademark"
,
name
:
"jdtrademark"
,
name
:
"jdtrademark"
,
component
:
()
=>
component
:
()
=>
import
(
"@/views/pages/jdtrademark/Jdtrademark"
)
import
(
"@/views/pages/jdtrademark/Jdtrademark"
)
},
},
{
{
path
:
"/:chanue/selftmreg"
,
path
:
"/:chanue/selftmreg"
,
name
:
"selftmreg"
,
name
:
"selftmreg"
,
component
:
()
=>
component
:
()
=>
import
(
"@/views/pages/selftmreg/Selftmreg"
)
import
(
"@/views/pages/selftmreg/Selftmreg"
),
// 默认页面是一级路由下的第一个子路由
redirect
:
'/:chanue/selftmreg/basic'
,
// 配置二级路由
children
:
[
// 第一步:填写基本信息
{
path
:
"basic"
,
component
:
()
=>
import
(
"@/views/pages/selftmreg/ModifyTrademark"
),
},
// 第二步:填写申请人信息
{
path
:
"user"
,
component
:
()
=>
import
(
"@/views/pages/selftmreg/ApplicationInfo"
),
},
},
// 第三步:确认订单
{
{
path
:
"/bycnoticeindex"
,
path
:
"confirm"
,
component
:
()
=>
import
(
"@/views/pages/selftmreg/ConfirmOrder"
),
},
// 第四步:支付订单
{
path
:
"pay"
,
component
:
()
=>
import
(
"@/views/pages/selftmreg/PayOrder"
),
},
]
},
{
// path: "/bycnoticeindex",
path
:
"/:chanue/bycnoticeindex"
,
name
:
"bycnoticeindex"
,
name
:
"bycnoticeindex"
,
component
:
()
=>
component
:
()
=>
import
(
"@/views/pages/bycnoticeindex/Bycnoticeindex"
)
import
(
"@/views/pages/bycnoticeindex/Bycnoticeindex"
)
}
}
];
];
const
router
=
new
VueRouter
({
const
router
=
new
VueRouter
({
routes
routes
...
...
channel-access/src/views/pages/selftmreg/ApplicationInfo.vue
View file @
7c67cb35
This diff is collapsed.
Click to expand it.
channel-access/src/views/pages/selftmreg/ConfirmOrder.vue
0 → 100644
View file @
7c67cb35
<
template
>
<div
class=
"confirm"
>
<div
class=
"info-title"
>
<i
class=
"selftmreg_shuxian"
></i>
<h4>
商标信息
<span
class=
"edit"
>
<i
class=
"el-icon-edit"
></i>
<b>
编辑
</b>
</span>
</h4>
</div>
<div
class=
"brand-info"
>
<p>
<strong>
商标类型:
</strong>
<span>
文字图标
</span>
</p>
<p>
<strong>
商标名称:
</strong>
<span>
gongsibao
</span>
</p>
<p>
<strong>
商标图样:
</strong>
<img
src=
"http://temp.im/104x104/ff5a5f/fff"
alt
/>
</p>
<p>
<strong>
商标类别:
</strong>
<span
class=
"detail-type"
>
<i>
15 类 乐器
</i>
<br
/>
<b>
150001 手风琴
</b>
<b>
150008 钢琴
</b>
<b>
150011 小六角手风琴
</b>
<b>
150013 低音提琴(乐器)
</b>
<b>
150016 大号(号)
</b>
<b>
150019 小铃帽(乐器)
</b>
</span>
</p>
</div>
<div
class=
"info-title"
>
<i
class=
"selftmreg_shuxian"
></i>
<h4>
申请人及联系人信息
<span
class=
"edit"
>
<i
class=
"el-icon-edit"
></i>
<b>
编辑
</b>
</span>
</h4>
</div>
<div
class=
"user-info"
>
<ul>
<li>
<strong>
申请人类型:
</strong>
<span>
企业
</span>
</li>
<li>
<strong>
公司名称:
</strong>
<span>
company name
</span>
</li>
<li>
<strong>
邮政编码:
</strong>
<span>
463800
</span>
</li>
<li>
<strong>
公司地址:
</strong>
<span>
company address
</span>
</li>
<li>
<strong>
联系人:
</strong>
<span>
reqr
</span>
</li>
<li>
<strong>
联系电话:
</strong>
<span>
13525897326
</span>
</li>
<li>
<strong>
电子邮箱:
</strong>
<span>
12e3r@qq.com
</span>
</li>
<li>
<strong>
信用编码:
</strong>
<span>
91110000551350971K
</span>
</li>
</ul>
</div>
<div
class=
"info-title"
>
<i
class=
"selftmreg_shuxian"
></i>
<h4>
订单备注
</h4>
</div>
<!-- 文本域 -->
<el-input
type=
"textarea"
:rows=
"2"
placeholder=
"如有特殊需要,请填写订单备注"
v-model=
"textarea"
></el-input>
</div>
</
template
>
<
script
>
export
default
{
data
()
{
return
{
textarea
:
""
};
}
};
</
script
>
<
style
lang=
"scss"
scoped
>
.info-title
{
.selftmreg_shuxian
{
width
:
3px
;
height
:
15px
;
background-color
:
#0989c5
;
display
:
inherit
;
float
:
left
;
margin-top
:
4px
;
margin-right
:
10px
;
}
h4
{
font-size
:
16px
;
font-family
:
PingFangSC
;
font-weight
:
400
;
color
:
rgba
(
83
,
83
,
83
,
1
);
margin-bottom
:
15px
;
}
}
//
编辑图文
.edit
{
color
:
#409efe
;
}
//
商标信息
.brand-info
{
p
{
margin-bottom
:
23px
;
strong
{
width
:
120px
;
display
:
inline-block
;
text-align
:
right
;
color
:
rgb
(
99
,
101
,
105
);
}
span
{
font-size
:
14px
;
font-weight
:
400
;
color
:
#333
;
}
span
.detail-type
{
display
:
inline-block
;
width
:
900px
;
vertical-align
:
top
;
i
{
font-size
:
14px
;
font-weight
:
600
;
display
:
inline-block
;
padding-bottom
:
10px
;
}
b
{
font-size
:
14px
;
font-weight
:
400
;
margin-right
:
20px
;
text-align
:
left
;
color
:
#333
;
}
}
img
{
display
:
inline-block
;
border
:
2px
dashed
rgb
(
233
,
233
,
233
);
vertical-align
:
top
;
}
}
}
//
申请人及联系人信息
.user-info
{
ul
{
li
{
display
:
inline-block
;
width
:
50%
;
padding-bottom
:
23px
;
strong
{
width
:
120px
;
display
:
inline-block
;
text-align
:
right
;
color
:
rgb
(
99
,
101
,
105
);
}
span
{
font-size
:
14px
;
font-weight
:
400
;
color
:
#333
;
}
}
}
}
//
订单备注
样式没加上!!
.confirm
div
.el-textarea
textarea
.el-textarea__inner
{
border-radius
:
0
;
min-width
:
980px
;
height
:
82px
;
resize
:
none
;
border
:
1px
solid
#d6daeb
;
}
</
style
>
\ No newline at end of file
channel-access/src/views/pages/selftmreg/ModifyTrademark.vue
View file @
7c67cb35
<
template
>
<
template
>
<div>
<!-- 基本信息填写 -->
<div
class=
"modifyTrademark"
>
<div
class=
"modifyTrademark"
>
<div
class=
"modifyTrademark-main"
>
<div
class=
"modifyTrademark-main"
>
<div
class=
"categoryFrom"
>
<div
class=
"categoryFrom"
>
...
@@ -88,12 +90,70 @@
...
@@ -88,12 +90,70 @@
</p>
</p>
</el-drawer>
</el-drawer>
</div>
</div>
<!-- 分类信息选择 -->
<div
class=
"classTrademark"
>
<div
class=
"classTrademark-left"
>
<div
class=
"classTrademark-left-top"
>
<el-button>
分类
</el-button>
<el-input
placeholder=
"请输入关键字进行过滤"
suffix-icon=
"el-icon-search"
v-model=
"keyZi"
></el-input>
<span
class=
"quxiao"
>
取消
</span>
</div>
<!-- 树形控件 -->
<div
class=
"classTrademark-left-tree"
>
<el-tree
:data=
"ncldata"
show-checkbox
empty-text=
"暂无数据"
node-key=
"id"
default-expand-all
:expand-on-click-node=
"false"
:props=
"props"
></el-tree>
</div>
</div>
<!-- -->
<div
class=
"classTrademark-right"
>
<div
class=
"classTrademark-right-top"
>
<p>
已选择的商品/服务项
</p>
<span
class=
"el-icon-delete"
>
清除全部
</span>
</div>
<div
class=
"classTrademark-right-main"
>
<div
class=
"notData"
v-if=
"classDataList.length == 0"
>
<img
src=
"@/assets/imgs/kong-2.png"
alt
/>
<span>
请点击左侧选择商标类别
</span>
</div>
<div
class=
"classData"
>
<div
class=
"classData-top"
>
<h4>
第02类 颜料油漆
</h4>
<p>
已选择
<span>
1
</span>
项
</p>
<i
class=
"el-icon-delete"
></i>
</div>
<div
class=
"classData-main"
>
<el-tag
:key=
"tag"
v-for=
"tag in classDataList"
closable
:disable-transitions=
"false"
@
close=
"handleClose(tag)"
>
{{
tag
}}
</el-tag>
</div>
</div>
</div>
</div>
</div>
</div>
</
template
>
</
template
>
<
script
>
<
script
>
import
{
getNcldata
}
from
"@/api/api.js"
;
export
default
{
export
default
{
data
()
{
data
()
{
return
{
return
{
// 基本信息填写
drawerRight
:
false
,
drawerRight
:
false
,
lookIndex
:
null
,
lookIndex
:
null
,
drawerTitle
:
""
,
drawerTitle
:
""
,
...
@@ -106,7 +166,80 @@ export default {
...
@@ -106,7 +166,80 @@ export default {
resource
:
[
resource
:
[
{
required
:
true
,
message
:
"请选择活动资源"
,
trigger
:
"change"
}
{
required
:
true
,
message
:
"请选择活动资源"
,
trigger
:
"change"
}
]
]
},
// 分类信息选择
keyZi
:
""
,
props
:
{
label
(
data
)
{
if
(
data
.
code
==
null
||
data
.
code
==
null
)
{
return
data
.
name
;
}
else
{
return
data
.
code
+
" "
+
data
.
name
;
}
}
},
children
:
"children"
},
ncldata
:
[
{
code
:
"01"
,
name
:
"化学原料"
,
type
:
1
},
{
code
:
"02"
,
name
:
"颜料油漆"
,
type
:
1
},
{
code
:
"03"
,
name
:
"日化用品"
,
type
:
1
},
{
code
:
"04"
,
name
:
"燃料油脂"
,
type
:
1
},
{
code
:
"05"
,
name
:
"医药"
,
type
:
1
},
{
code
:
"06"
,
name
:
"金属材料"
,
type
:
1
},
{
code
:
"07"
,
name
:
"机械设备"
,
type
:
1
},
{
code
:
"08"
,
name
:
"手工器械"
,
type
:
1
},
{
code
:
"09"
,
name
:
"科学仪器"
,
type
:
1
},
{
code
:
"10"
,
name
:
"医疗器械"
,
type
:
1
},
{
code
:
"11"
,
name
:
"灯具空调"
,
type
:
1
},
{
code
:
"12"
,
name
:
"运输工具"
,
type
:
1
},
{
code
:
"13"
,
name
:
"军火烟火"
,
type
:
1
},
{
code
:
"14"
,
name
:
"珠宝钟表"
,
type
:
1
},
{
code
:
"15"
,
name
:
"乐器"
,
type
:
1
},
{
code
:
"16"
,
name
:
"办公用品"
,
type
:
1
},
{
code
:
"17"
,
name
:
"橡胶制品"
,
type
:
1
},
{
code
:
"18"
,
name
:
"皮革皮具"
,
type
:
1
},
{
code
:
"19"
,
name
:
"建筑材料"
,
type
:
1
},
{
code
:
"20"
,
name
:
"家具"
,
type
:
1
},
{
code
:
"21"
,
name
:
"厨房洁具"
,
type
:
1
},
{
code
:
"22"
,
name
:
"绳网袋篷"
,
type
:
1
},
{
code
:
"23"
,
name
:
"纱线丝"
,
type
:
1
},
{
code
:
"24"
,
name
:
"布料床单"
,
type
:
1
},
{
code
:
"25"
,
name
:
"服装鞋帽"
,
type
:
1
},
{
code
:
"26"
,
name
:
"纽扣拉链"
,
type
:
1
},
{
code
:
"27"
,
name
:
"地毯席垫"
,
type
:
1
},
{
code
:
"28"
,
name
:
"健身器材"
,
type
:
1
},
{
code
:
"29"
,
name
:
"食品"
,
type
:
1
},
{
code
:
"30"
,
name
:
"方便食品"
,
type
:
1
},
{
code
:
"31"
,
name
:
"饲料种籽"
,
type
:
1
},
{
code
:
"32"
,
name
:
"啤酒饮料"
,
type
:
1
},
{
code
:
"33"
,
name
:
"酒"
,
type
:
1
},
{
code
:
"34"
,
name
:
"烟草烟具"
,
type
:
1
},
{
code
:
"35"
,
name
:
"广告销售"
,
type
:
1
},
{
code
:
"36"
,
name
:
"金融物管"
,
type
:
1
},
{
code
:
"37"
,
name
:
"建筑修理"
,
type
:
1
},
{
code
:
"38"
,
name
:
"通讯服务"
,
type
:
1
},
{
code
:
"39"
,
name
:
"运输贮藏"
,
type
:
1
},
{
code
:
"40"
,
name
:
"材料加工"
,
type
:
1
},
{
code
:
"41"
,
name
:
"教育娱乐"
,
type
:
1
},
{
code
:
"42"
,
name
:
"网站服务"
,
type
:
1
},
{
code
:
"43"
,
name
:
"餐饮住宿"
,
type
:
1
},
{
code
:
"44"
,
name
:
"医疗园艺"
,
type
:
1
},
{
code
:
"45"
,
name
:
"社会服务"
,
type
:
1
}
],
classDataList
:
[
"121233"
,
"1qwe23"
,
"12qwe3"
,
"12weqwe3"
,
"123"
,
"12adsa3"
,
"12qweq3"
,
"12dad3"
,
"1asd23"
,
"12asd3"
,
"12adqwe3"
]
};
};
},
},
methods
:
{
methods
:
{
...
@@ -114,7 +247,17 @@ export default {
...
@@ -114,7 +247,17 @@ export default {
this
.
drawerTitle
=
title
;
this
.
drawerTitle
=
title
;
this
.
lookIndex
=
index
;
this
.
lookIndex
=
index
;
this
.
drawerRight
=
true
;
this
.
drawerRight
=
true
;
},
// 分类信息选择
handleClose
(
tag
)
{
console
.
log
(
tag
);
this
.
classDataList
.
splice
(
this
.
classDataList
.
indexOf
(
tag
),
1
);
}
}
},
mounted
()
{
getNcldata
().
then
(
res
=>
{
console
.
log
(
res
.
data
);
});
}
}
};
};
</
script
>
</
script
>
...
@@ -200,4 +343,155 @@ export default {
...
@@ -200,4 +343,155 @@ export default {
}
}
}
}
}
}
//
分类信息选择
.classTrademark
{
width
:
100%
;
display
:
flex
;
.classTrademark-left
{
width
:
295px
;
}
.classTrademark-right
{
flex
:
1
;
}
}
.classTrademark-left-top
{
width
:
100%
;
height
:
54px
;
border
:
1px
solid
#dee0eb
;
background
:
#eef2fb
;
display
:
flex
;
.el-button
{
width
:
50px
;
height
:
34px
;
display
:
flex
;
justify-content
:
center
;
align-items
:
center
;
font-size
:
12px
;
border-radius
:
0px
;
margin
:
10px
;
}
.el-input
{
width
:
180px
;
height
:
34px
;
font-size
:
12px
;
margin
:
10px
0
;
input
{
width
:
100%
;
height
:
100%
;
border-radius
:
0px
;
}
}
.quxiao
{
flex
:
1
;
font-size
:
12px
;
color
:
#3f7bff
;
justify-content
:
center
;
align-items
:
center
;
display
:
flex
;
cursor
:
pointer
;
}
}
.classTrademark-left-tree
::-webkit-scrollbar
{
width
:
10px
;
height
:
1px
;
}
.classTrademark-left-tree
::-webkit-scrollbar-thumb
{
border-radius
:
10px
;
background
:
#eef2fb
;
}
.classTrademark-left-tree
::-webkit-scrollbar-track
{
border-radius
:
10px
;
background
:
#fff
;
}
.classTrademark-left-tree
{
width
:
100%
;
height
:
500px
;
border
:
1px
solid
#dee0eb
;
border-top
:
none
;
overflow
:
auto
;
}
.classTrademark-right-top
{
width
:
100%
;
height
:
54px
;
border
:
1px
solid
#dee0eb
;
border-left
:
none
;
background
:
#eef2fb
;
padding
:
0
10px
0
20px
;
p
{
line-height
:
53px
;
float
:
left
;
font-family
:
PingFangSC-Regular
;
font-size
:
14px
;
color
:
#333333
;
}
span
{
float
:
right
;
line-height
:
53px
;
font-family
:
PingFangSC-Regular
;
font-size
:
12px
;
color
:
#3f7bff
;
cursor
:
pointer
;
}
}
.classTrademark-right-main
{
width
:
100%
;
height
:
500px
;
border
:
1px
solid
#dee0eb
;
border-top
:
none
;
border-left
:
none
;
overflow
:
auto
;
.notData
{
width
:
100%
;
height
:
100%
;
display
:
flex
;
flex-direction
:
column
;
justify-content
:
center
;
align-items
:
center
;
span
{
font-size
:
13px
;
color
:
#828282
;
line-height
:
30px
;
}
}
.classData
{
width
:
100%
;
height
:
100%
;
padding
:
20px
;
display
:
flex
;
flex-direction
:
column
;
.classData-top
{
width
:
100%
;
display
:
flex
;
margin-bottom
:
14px
;
h4
{
flex
:
6
;
}
p
{
flex
:
2
;
span
{
color
:
#3f7bff
;
}
}
i
{
flex
:
1
;
display
:
flex
;
justify-content
:
center
;
align-items
:
center
;
cursor
:
pointer
;
}
}
.classData-main
{
flex
:
1
;
overflow
:
auto
;
.el-tag
{
border-radius
:
0
;
background
:
#fff
;
margin
:
7px
7px
;
font-family
:
PingFangSC-Regular
;
font-size
:
12px
;
}
}
}
}
</
style
>
</
style
>
channel-access/src/views/pages/selftmreg/PayOrder.vue
0 → 100644
View file @
7c67cb35
<
template
>
<div>
支付订单页面
</div>
</
template
>
\ No newline at end of file
channel-access/src/views/pages/selftmreg/Selftmreg.vue
View file @
7c67cb35
...
@@ -3,8 +3,6 @@
...
@@ -3,8 +3,6 @@
<!-- 导航面包屑 -->
<!-- 导航面包屑 -->
<div
class=
"jdindentdetail-nav"
>
<div
class=
"jdindentdetail-nav"
>
<el-breadcrumb
separator-class=
"el-icon-arrow-right"
>
<el-breadcrumb
separator-class=
"el-icon-arrow-right"
>
<!-- titleName:商标注册服务 -->
<!--
<el-breadcrumb-item
:to=
"listPath"
class=
"isActive"
>
商标注册服务
{{
titleName
}}
</el-breadcrumb-item>
-->
<el-breadcrumb-item
class=
"isActive"
>
商标注册服务
</el-breadcrumb-item>
<el-breadcrumb-item
class=
"isActive"
>
商标注册服务
</el-breadcrumb-item>
<el-breadcrumb-item>
自助商标注册
</el-breadcrumb-item>
<el-breadcrumb-item>
自助商标注册
</el-breadcrumb-item>
</el-breadcrumb>
</el-breadcrumb>
...
@@ -12,7 +10,39 @@
...
@@ -12,7 +10,39 @@
<!-- 主体页面 -->
<!-- 主体页面 -->
<SelftmregPage
/>
<!--
<SelftmregPage
/>
-->
<div
class=
"jdindentdetail-page"
>
<div
class=
"jdindentdetail-wrap"
>
<!-- 主体内容步骤条 -->
<SelftmregPageSteps
/>
<!-- 主页内容 -->
<el-form
class=
"demo-ruleForm"
label-width=
"120px"
>
<div
class=
"selftmreg_main"
>
<div
class=
"selftmreg_shu"
></div>
<!-- Divider 分割线 -->
<!--
<el-divider></el-divider>
-->
<router-view></router-view>
<!-- 第一步:填写基本信息 商标信息 分类选择-->
<!--
<ModifyTrademark
/>
-->
<!-- 第二步:填写申请人信息 -->
<!--
<ApplicationInfo
/>
-->
<!-- 第三步:确认订单 -->
<!--
<ConfirmOrder
/>
-->
<!-- 第四步:支付订单页面 -->
<!--
<PayOrder
/>
-->
</div>
<div
style=
"clear:both;"
></div>
</el-form>
</div>
</div>
<!-- 底部付款按钮 -->
<!-- 底部付款按钮 -->
<div
class=
"footer-wrap"
>
<div
class=
"footer-wrap"
>
...
@@ -21,20 +51,43 @@
...
@@ -21,20 +51,43 @@
应付总额:
应付总额:
<i>
¥0.00
</i>
<i>
¥0.00
</i>
</span>
</span>
<el-button
type=
"primary"
>
下一步
</el-button>
<el-button
type=
"primary"
@
click=
"next"
>
下一步
</el-button>
</div>
</div>
</div>
</div>
</div>
</div>
</
template
>
</
template
>
<
script
>
<
script
>
import
SelftmregPage
from
"./SelftmregPage"
;
// 主体页面里面的组件
import
SelftmregPageSteps
from
"./SelftmregPageSteps"
;
import
ModifyTrademark
from
"./ModifyTrademark"
;
import
ApplicationInfo
from
"./ApplicationInfo"
;
import
ConfirmOrder
from
"./ConfirmOrder"
;
import
PayOrder
from
"./PayOrder"
;
export
default
{
export
default
{
components
:
{
components
:
{
SelftmregPage
SelftmregPageSteps
,
ModifyTrademark
,
ApplicationInfo
,
ConfirmOrder
,
PayOrder
},
},
data
()
{
data
()
{
return
{};
return
{
//
};
},
methods
:
{
next
()
{
console
.
log
(
"two level router"
);
// 加载二级路由组件:第二步,填写申请人信息
// this.$router.push("/:chanue/selftmreg/user");
console
.
log
(
this
);
// 加载二级路由组件:第三步,确认订单
// this.$router.push("/:chanue/selftmreg/confirm");
// 加载二级路由组件:第四步,支付订单
// this.$router.push("/:chanue/selftmreg/pay");
}
}
}
};
};
</
script
>
</
script
>
...
@@ -71,6 +124,32 @@ export default {
...
@@ -71,6 +124,32 @@ export default {
}
}
}
}
//
主体页面
.jdindentdetail-page
{
background-color
:
white
;
width
:
1200px
;
margin
:
0
auto
;
padding-bottom
:
90px
;
}
.jdindentdetail-wrap
{
text-align
:
left
;
border
:
1px
solid
rgba
(
220
,
223
,
230
,
1
);
position
:
relative
;
}
.selftmreg_main
{
width
:
100%
;
padding
:
0px
20px
;
box-sizing
:
border-box
;
overflow
:
hidden
;
margin-bottom
:
50px
;
}
.selftmreg_shu
{
width
:
1143px
;
height
:
1px
;
background-color
:
#eeeeee
;
margin
:
20px
0
;
}
/* 底部付款按钮 */
/* 底部付款按钮 */
.footer-wrap
{
.footer-wrap
{
width
:
100%
;
width
:
100%
;
...
...
channel-access/src/views/pages/selftmreg/SelftmregPage.vue
deleted
100644 → 0
View file @
d9c150d5
<
template
>
<div
class=
"jdindentdetail-page"
>
<div
class=
"jdindentdetail-wrap"
>
<!-- 主体内容步骤条 -->
<SelftmregPageSteps
/>
<!-- 主页内容 -->
<el-form
class=
"demo-ruleForm"
label-width=
"120px"
>
<div
class=
"selftmreg_main"
>
<div
class=
"selftmreg_shu"
></div>
<!-- 第一步:填写基本信息 商标信息 -->
<!--
<ModifyTrademark
/>
-->
<!-- 第一步:填写基本信息 分类选择 -->
<!--
<ClassTrademark
/>
-->
<!-- 第二步:填写申请人信息 -->
<ApplicationInfo
/>
<!-- 第三步:确认订单 -->
<!--
<SelftmregPageConfirmStep
/>
-->
</div>
<div
style=
"clear:both;"
></div>
</el-form>
</div>
</div>
</
template
>
<
script
>
import
SelftmregPageSteps
from
"./SelftmregPageSteps"
;
import
ModifyTrademark
from
"./ModifyTrademark"
;
import
ClassTrademark
from
"../jdindentdetail/classTrademark"
;
import
ApplicationInfo
from
"./ApplicationInfo"
;
import
SelftmregPageConfirmStep
from
"./SelftmregPageConfirmStep"
;
export
default
{
components
:
{
SelftmregPageSteps
,
ModifyTrademark
,
ClassTrademark
,
ApplicationInfo
,
SelftmregPageConfirmStep
},
data
()
{
return
{};
}
};
</
script
>
<
style
lang=
"scss"
scoped
>
.jdindentdetail-page
{
background-color
:
white
;
width
:
1200px
;
margin
:
0
auto
;
padding-bottom
:
90px
;
}
.jdindentdetail-wrap
{
text-align
:
left
;
border
:
1px
solid
rgba
(
220
,
223
,
230
,
1
);
position
:
relative
;
}
/* 主页内容 */
.selftmreg_main
{
width
:
100%
;
padding
:
0px
20px
;
box-sizing
:
border-box
;
overflow
:
hidden
;
}
.selftmreg_shu
{
width
:
1143px
;
height
:
1px
;
background-color
:
#eeeeee
;
margin
:
20px
0
;
}
</
style
>
\ No newline at end of file
channel-access/src/views/pages/selftmreg/SelftmregPageConfirmStep.vue
deleted
100644 → 0
View file @
d9c150d5
<
template
>
<div
class=
"confirm"
>
<i
class=
"selftmreg_shuxian"
></i>
</div>
</
template
>
<
script
>
export
default
{};
</
script
>
<
style
lang=
"scss"
scoped
>
.selftmreg_shuxian
{
width
:
3px
;
height
:
15px
;
background-color
:
#0989c5
;
display
:
inherit
;
float
:
left
;
margin-top
:
4px
;
margin-right
:
10px
;
}
</
style
>
\ No newline at end of file
channel-access/src/views/pages/selftmreg/SelftmregPageSteps.vue
View file @
7c67cb35
<
template
>
<
template
>
<div
class=
"selftmreg_
main
"
>
<div
class=
"selftmreg_
steps
"
>
<div
class=
"pointsRule"
>
<div
class=
"pointsRule"
>
<ul
id=
"list"
>
<ul
id=
"list"
>
<li>
<li>
...
@@ -38,7 +38,7 @@ export default {};
...
@@ -38,7 +38,7 @@ export default {};
</
script
>
</
script
>
<
style
lang=
"scss"
scoped
>
<
style
lang=
"scss"
scoped
>
.selftmreg_
main
{
.selftmreg_
steps
{
width
:
100%
;
width
:
100%
;
padding
:
0px
20px
;
padding
:
0px
20px
;
box-sizing
:
border-box
;
box-sizing
:
border-box
;
...
@@ -90,22 +90,27 @@ export default {};
...
@@ -90,22 +90,27 @@ export default {};
i
{
i
{
float
:
right
;
float
:
right
;
/*
border: #e3e3e3 solid;
border
:
#e3e3e3
solid
;
border-width: 1px 1px 0 0;
*/
border-width
:
1px
1px
0
0
;
width
:
21px
;
width
:
21px
;
height
:
22px
;
height
:
22px
;
/* 往左上的位移变化 */
/* 往左上的位移变化 */
margin
:
-4px
-11px
0px
10px
;
//
margin
:
-4px
-11px
0px
10px
;
margin
:
2px
0px
0px
14px
;
top
:
2px
;
top
:
2px
;
transform
:
rotate
(
45deg
);
transform
:
rotate
(
45deg
);
-webkit-transform
:
rotate
(
45deg
);
-webkit-transform
:
rotate
(
45deg
);
/* background: #e3e3e3; */
background
:
#e3e3e3
;
-moz-transform
:
rotate
(
45deg
);
-moz-transform
:
rotate
(
45deg
);
/* Firefox浏览器 */
/* Firefox浏览器 */
-ms-transform
:
rotate
(
45deg
);
-ms-transform
:
rotate
(
45deg
);
position
:
absolute
;
z-index
:
22
;
}
}
em
.before
{
em
.before
{
...
@@ -119,6 +124,7 @@ export default {};
...
@@ -119,6 +124,7 @@ export default {};
margin
:
-4px
10px
0px
-11px
;
margin
:
-4px
10px
0px
-11px
;
top
:
2px
;
top
:
2px
;
background
:
#fff
;
background
:
#fff
;
z-index
:
2
;
}
}
}
}
}
}
...
@@ -126,6 +132,11 @@ export default {};
...
@@ -126,6 +132,11 @@ export default {};
li
:first-child
{
li
:first-child
{
border-left
:
1px
solid
#e3e3e3
;
border-left
:
1px
solid
#e3e3e3
;
background
:
#e3e3e3
;
background
:
#e3e3e3
;
i
{
margin
:
2px
0px
0px
25px
;
background
:
#51d2b7
;
}
}
}
}
}
}
}
...
@@ -135,4 +146,8 @@ export default {};
...
@@ -135,4 +146,8 @@ export default {};
.active
{
.active
{
background
:
#51d2b7
;
background
:
#51d2b7
;
}
}
//
ul
li
a
//
ul
li
a
i
//
background
:
#51d2b7
;
</
style
>
</
style
>
\ No newline at end of file
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