Skip to content

Z
zhichan
Commit 7c67cb35 by 任建
Options

Merge branch 'channel-access' of gitlab.gongsibao.com:jiangyong/zhichan into channel-access

parents d9c150d5 4d2bdadc
Showing with 387 additions and 156 deletions
channel-access/src/router/index.js
......@@ -4,48 +4,78 @@ import VueRouter from "vue-router";
Vue.use(VueRouter);
const routes = [{
path: "/:chanue/jdbycdetailtm",
name: "jdbycdetailtm",
component: () =>
import ("@/views/pages/jdbycdetailtm")
},
{
path: "/:chanue/companydetail",
name: "companydetail",
component: () =>
import ("@/views/pages/companydetail")
},
{
path: "/:chanue/jdindentlist",
name: "jdindentdetail",
component: () =>
import ("@/views/pages/jdindentlist")
},
{
path: "/:chanue/jdindentdetail",
name: "jdindentdetail",
component: () =>
import ("@/views/pages/jdindentdetail")
},
/////////
{
path: "/:chanue/jdtrademark",
name: "jdtrademark",
component: () =>
import ("@/views/pages/jdtrademark/Jdtrademark")
},
{
path: "/:chanue/selftmreg",
name: "selftmreg",
component: () =>
import ("@/views/pages/selftmreg/Selftmreg")
},
{
path: "/bycnoticeindex",
name: "bycnoticeindex",
component: () =>
import ("@/views/pages/bycnoticeindex/Bycnoticeindex")
}
path: "/:chanue/jdbycdetailtm",
name: "jdbycdetailtm",
component: () =>
import("@/views/pages/jdbycdetailtm")
},
{
path: "/:chanue/companydetail",
name: "companydetail",
component: () =>
import("@/views/pages/companydetail")
},
{
path: "/:chanue/jdindentlist",
name: "jdindentdetail",
component: () =>
import("@/views/pages/jdindentlist")
},
{
path: "/:chanue/jdindentdetail",
name: "jdindentdetail",
component: () =>
import("@/views/pages/jdindentdetail")
},
/////////
{
path: "/:chanue/jdtrademark",
name: "jdtrademark",
component: () =>
import("@/views/pages/jdtrademark/Jdtrademark")
},
{
path: "/:chanue/selftmreg",
name: "selftmreg",
component: () =>
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: "confirm",
component: () =>
import("@/views/pages/selftmreg/ConfirmOrder"),
},
// 第四步：支付订单
{
path: "pay",
component: () =>
import("@/views/pages/selftmreg/PayOrder"),
},
]
},
{
// path: "/bycnoticeindex",
path: "/:chanue/bycnoticeindex",
name: "bycnoticeindex",
component: () =>
import("@/views/pages/bycnoticeindex/Bycnoticeindex")
}
];
const router = new VueRouter({
routes
......
channel-access/src/views/pages/selftmreg/ConfirmOrder.vue 0 → 100644
<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/PayOrder.vue 0 → 100644
<template>
<div>支付订单页面</div>
</template>
\ No newline at end of file
channel-access/src/views/pages/selftmreg/Selftmreg.vue
......@@ -3,8 +3,6 @@
<!-- 导航面包屑 -->
<div class="jdindentdetail-nav">
<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>自助商标注册</el-breadcrumb-item>
</el-breadcrumb>
......@@ -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">
......@@ -21,20 +51,43 @@
应付总额：
<i>￥0.00</i>
</span>
<el-button type="primary">下一步</el-button>
<el-button type="primary" @click="next">下一步</el-button>
</div>
</div>
</div>
</template>
<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 {
components: {
SelftmregPage
SelftmregPageSteps,
ModifyTrademark,
ApplicationInfo,
ConfirmOrder,
PayOrder
},
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>
......@@ -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 {
width: 100%;
......
channel-access/src/views/pages/selftmreg/SelftmregPage.vue deleted 100644 → 0
<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
<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
<template>
<div class="selftmreg_main">
<div class="selftmreg_steps">
<div class="pointsRule">
<ul id="list">
<li>
......@@ -38,7 +38,7 @@ export default {};
</script>
<style lang="scss" scoped>
.selftmreg_main {
.selftmreg_steps {
width: 100%;
padding: 0px 20px;
box-sizing: border-box;
......@@ -90,22 +90,27 @@ export default {};
i {
float: right;
/* border: #e3e3e3 solid;
border-width: 1px 1px 0 0; */
border: #e3e3e3 solid;
border-width: 1px 1px 0 0;
width: 21px;
height: 22px;
/* 往左上的位移变化 */
margin: -4px -11px 0px 10px;
// margin: -4px -11px 0px 10px;
margin: 2px 0px 0px 14px;
top: 2px;
transform: rotate(45deg);
-webkit-transform: rotate(45deg);
/* background: #e3e3e3; */
background: #e3e3e3;
-moz-transform: rotate(45deg);
/* Firefox浏览器 */
-ms-transform: rotate(45deg);
position: absolute;
z-index: 22;
}
em.before {
......@@ -119,6 +124,7 @@ export default {};
margin: -4px 10px 0px -11px;
top: 2px;
background: #fff;
z-index: 2;
}
}
}
......@@ -126,6 +132,11 @@ export default {};
li:first-child {
border-left: 1px solid #e3e3e3;
background: #e3e3e3;
i {
margin: 2px 0px 0px 25px;
background: #51d2b7;
}
}
}
}
......@@ -135,4 +146,8 @@ export default {};
.active {
background: #51d2b7;
}
// ul li a
// ul li a i
// background: #51d2b7;
</style>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment