Commit ce41eddb by 任建

rj

parent 0c37f553
<template>
<!-- 根组件 -->
<div id="app">
<div id="app" ref="app">
<router-view />
</div>
</template>
......@@ -26,4 +26,5 @@ html,body{
.v-modal{
z-index: 1999 !important;
}
</style>
......@@ -7,5 +7,4 @@
$--font-path: '~element-ui/lib/theme-chalk/fonts';
// 自定义主题色变量
$themecolor:#409EFF;
;
@import "~element-ui/packages/theme-chalk/src/index";
\ No newline at end of file
@charset "utf-8";
/* CSS Document */
body,p,td,th,fieldset,legend,option,textarea,button,hr,input,h1,h3,h4,h5,h6,h2,ol,ul,dd,dl{ margin:0; padding:0;}
li{list-style:none;}
a{text-decoration:none; color:#666;}
i,em{font-style:normal;}
h1,h2,h4,h3,h5,h6,b,strong{font-weight:normal;}
img{border:none;display:block;}
input{outline:none;}
body{
font-family:PingFangSC, "helvetica neue", "hiragino sans gb", "Segoe UI", Calibri, "microsoft yahei ui", "microsoft yahei", simsun, sans-serif;
font-size:14px;
color:#333;
}
html,body{
body,
p,
td,
th,
fieldset,
legend,
option,
textarea,
button,
hr,
input,
h1,
h3,
h4,
h5,
h6,
h2,
ol,
ul,
dd,
dl {
margin: 0;
padding: 0;
}
li {
list-style: none;
}
a {
text-decoration: none;
color: #666;
}
i,
em {
font-style: normal;
}
h1,
h2,
h4,
h3,
h5,
h6,
b,
strong {
font-weight: normal;
}
img {
border: none;
display: block;
}
input {
outline: none;
}
body {
font-family: PingFangSC, "helvetica neue", "hiragino sans gb", "Segoe UI", Calibri, "microsoft yahei ui", "microsoft yahei", simsun, sans-serif;
font-size: 14px;
color: #333;
}
html,
body {
margin: 0;
padding: 0;
}
table{border-collapse:collapse;}
a:hover{}
table {
border-collapse: collapse;
}
a:hover {}
/*万能清除法,针对ie8及以上的浏览器的高度塌陷*/
.clearfix:after{
.clearfix:after {
content: " ";
display: block;
clear: both;
height: 0;
visibility: hidden;
}
/*ie7及以下的浏览器的高度塌陷*/
.clearfix{zoom:1;}
/* border-spacing调整相邻单元格间距*/
table{width:500px;height:300px; border:1px solid #333; border-spacing:0; }
td,th{border:1px solid #333;}
.clearfix {
zoom: 1;
}
/* border-spacing调整相邻单元格间距*/
// table {
// width: 500px;
// height: 300px;
// border: 1px solid #333;
// border-spacing: 0;
// }
* {
// margin: 0;
// padding: 0;
......@@ -42,7 +113,7 @@ td,th{border:1px solid #333;}
// text-decoration: none;
// outline: none;
box-sizing: border-box;
}
}
// html,
// body {
......
......@@ -11,9 +11,11 @@ import http from './http/request'
Vue.prototype.$axios = http;
Vue.use(Element)
Vue.config.productionTip = false
new Vue({
let that = new Vue({
router,
store,
render: h => h(App)
}).$mount('#app')
\ No newline at end of file
}).$mount('#app');
console.log(that)
\ No newline at end of file
......@@ -4,6 +4,18 @@ 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: () =>
......@@ -16,13 +28,13 @@ const routes = [{
import ("@/views/pages/jdindentdetail")
},
{
path: "/jdtrademark",
path: "/:chanue/jdtrademark",
name: "jdtrademark",
component: () =>
import ("@/views/pages/jdtrademark/Jdtrademark")
},
{
path: "/selftmreg",
path: "/:chanue/selftmreg",
name: "selftmreg",
component: () =>
import ("@/views/pages/selftmreg/Selftmreg")
......
<template>
<div class="jdbycdetailtm">
<div class="jdindentdetail-top">
<div class="quan"></div>
<div class="dangqian">
当前位置:
</div>
<el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item>交付中心</el-breadcrumb-item>
<el-breadcrumb-item>订单详情</el-breadcrumb-item>
</el-breadcrumb>
</div>
</div>
</template>
<script>
export default {};
</script>
<style lang="scss">
.jdbycdetailtm {
padding: 0 20px;
}
</style>
......@@ -14,19 +14,89 @@
<el-radio :label="2" border>个体户</el-radio>
</el-radio-group>
</el-form-item>
<div v-if="ruleForm.resource == 1">
<el-form-item label="公司名称:" prop="name">
<el-input v-model="ruleForm.name"></el-input>
<el-input
v-model="ruleForm.name"
placeholder="请输入公司名称"
></el-input>
</el-form-item>
<el-form-item label="统一社会信用代码:" prop="name">
<el-input v-model="ruleForm.name"></el-input>
<el-form-item label="统一社会信用代码:" prop="xinyongma">
<el-input
v-model="ruleForm.xinyongma"
placeholder="请输入统一社会信用代码"
></el-input>
<el-popover
placement="right-end"
width="170"
trigger="hover"
content="由于官方商标注册增加“统一社会信用代码”的填写,企业申请必填,个体工商户申请可不填此项,请仔细核对营业执照填写。"
>
<el-button class="el-icon-question" slot="reference"></el-button>
</el-popover>
</el-form-item>
<el-form-item label="执照详细地址:" prop="address">
<el-input
v-model="ruleForm.address"
placeholder="请输入执照详细地址"
></el-input>
</el-form-item>
<el-form-item label="邮政编码:" prop="postal">
<el-input
v-model="ruleForm.postal"
placeholder="请输入邮政编码"
:maxlength="6"
></el-input>
</el-form-item>
</div>
<div v-if="ruleForm.resource == 2">
<el-form-item label="姓名:" prop="name">
<el-input
v-model="ruleForm.username"
placeholder="请输入您的姓名"
></el-input>
</el-form-item>
<el-form-item label="身份证号:" prop="name">
<el-input
v-model="ruleForm.idCard"
placeholder="请输入您的身份证号"
></el-input>
</el-form-item>
<el-form-item label="注册地址:" prop="name">
<el-input
v-model="ruleForm.idCard"
placeholder="请输入注册地址"
></el-input>
</el-form-item>
<el-form-item label="执照详细地址:" prop="name">
<el-input v-model="ruleForm.name"></el-input>
<el-form-item label="统一社会信用代码:" prop="xinyongma">
<el-input
v-model="ruleForm.xinyongma"
placeholder="请输入统一社会信用代码"
></el-input>
<el-popover
placement="right-end"
width="170"
trigger="hover"
content="由于官方商标注册增加“统一社会信用代码”的填写,企业申请必填,个体工商户申请可不填此项,请仔细核对营业执照填写。"
>
<el-button class="el-icon-question" slot="reference"></el-button>
</el-popover>
</el-form-item>
<el-form-item label="邮政编码:" prop="name">
<el-input v-model="ruleForm.name"></el-input>
<el-form-item label="邮政编码:" prop="postal">
<el-input
v-model="ruleForm.postal"
placeholder="请输入邮政编码"
:maxlength="6"
></el-input>
</el-form-item>
</div>
</el-form>
<!-- 底部按钮 -->
<div class="drawer-bottom">
<button class="esc">取消</button>
<button class="enter">保存</button>
</div>
</div>
</template>
<script>
......@@ -35,75 +105,72 @@ export default {
return {
ruleForm: {
name: "",
region: "",
date1: "",
date2: "",
delivery: false,
type: [],
resource: 1,
desc: ""
xinyongma: "",
address: "",
postal: "",
username: "",
idCard: "",
zhuAddress: ""
},
rules: {
name: [
{ required: true, message: "请输入活动名称", trigger: "blur" },
{ min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" }
],
region: [
{ required: true, message: "请选择活动区域", trigger: "change" }
],
date1: [
{
type: "date",
required: true,
message: "请选择日期",
trigger: "change"
}
],
date2: [
{
type: "date",
required: true,
message: "请选择时间",
trigger: "change"
}
resource: [
{ required: true, message: "请选择申请人类型", trigger: "change" }
],
type: [
{
type: "array",
required: true,
message: "请至少选择一个活动性质",
trigger: "change"
}
name: [{ required: true, message: "请输入公司名称", trigger: "blur" }],
xinyongma: [
{ required: true, message: "请输入统一社会信用代码", trigger: "blur" }
],
resource: [
{ required: true, message: "请选择活动资源", trigger: "change" }
address: [
{ required: true, message: "请输入执照详细地址", trigger: "blur" }
],
desc: [{ required: true, message: "请填写活动形式", trigger: "blur" }]
postal: [{ required: true, message: "请输入邮政编码", trigger: "blur" }]
}
};
},
methods: {
submitForm(formName) {
this.$refs[formName].validate(valid => {
if (valid) {
alert("submit!");
} else {
console.log("error submit!!");
return false;
}
});
},
resetForm(formName) {
this.$refs[formName].resetFields();
}
}
methods: {}
};
</script>
<style lang="scss">
.applicantInfo {
width: 100%;
.el-radio {
height: auto;
padding: 7px 28px;
border-radius: 0px;
border: 1px solid #dee0eb;
.el-radio__label {
padding: 0;
font-family: PingFangSC-Regular;
font-size: 12px;
color: #333333;
}
}
.el-radio__input {
display: none;
}
.el-form-item {
.el-button {
border: none;
width: 12px;
height: 12px;
border-radius: 100%;
font-size: 12px;
padding: 0;
color: #3071fe;
line-height: 10px;
text-align: left;
margin-left: 10px;
}
}
.el-input {
width: 350px;
height: 40px;
input {
width: 350px;
height: 40px;
border-radius: 0px;
}
}
}
</style>
......@@ -19,7 +19,7 @@
</div>
<div class="main-item-container">
<div class="items-container">
<el-steps :active="2" align-center space="200px">
<el-steps :active="2" align-center>
<el-step title="待上传材料"></el-step>
<el-step title="待审核"></el-step>
<el-step title="待递交"></el-step>
......@@ -226,7 +226,7 @@
</div>
</div>
<!-- -->
<div class="jdindentdetail-main-item">
<div class="jdindentdetail-main-item" ref="qwe">
<div class="main-item-title">
付款信息
<span></span>
......@@ -243,10 +243,10 @@
<!-- -->
</div>
</div>
<el-drawer
<el-drawer ref="apps"
:title="drawerTitle"
custom-class="jdindentdetail-drawer"
size="700px"
size="750px"
:visible.sync="showUploadStuff"
>
<!-- 修改商标信息 -->
......@@ -257,6 +257,8 @@
<JiaoFile v-if="drawerIndex == 3" />
<!-- 修改申请人信息 -->
<ApplicantInfo v-if="drawerIndex == 4" />
<!-- 修改订单联系人 -->
<OrderContact v-if="drawerIndex == 5" />
</el-drawer>
</div>
</template>
......@@ -266,13 +268,15 @@ import JiaoFile from "@/components/drawer";
import ClassTrademark from "./classTrademark";
import ModifyTrademark from "./modifyTrademark";
import ApplicantInfo from "./applicantInfo";
import OrderContact from "./orderContact";
export default {
components: {
JiaoFile,
ClassTrademark,
ModifyTrademark,
ApplicantInfo
ApplicantInfo,
OrderContact
},
data() {
return {
......@@ -288,7 +292,8 @@ export default {
this.showUploadStuff = true;
}
},
mounted() {}
mounted() {
}
};
</script>
......
......@@ -105,11 +105,12 @@
v-if="lookIndex == 1"
/>
<p v-if="lookIndex == 2">
图样文件格式应为jpg,图形应清晰,图样文件大小应小于“200KB”,且图形像素介于“600X600
- 1500X1500”之间,如果通过扫描获得图样的,应按
24位彩色,300dpi分辨率扫描符合《商标法》及其实施条例规定的图形(图形清晰,大于5X5厘米且小于10X10厘米),申请人(或代理人)应确保扫描后的图
形与原图形的色彩深浅(或灰度)一致,否则,可能影响《商标注册证》上图形的清晰度)如上传图样为黑白,取得注册后,可以更换商标颜色使用;如上传图样为彩色,取得注册后只能按
照该彩色图样使用;如确认提交彩色图样,需在委托书商标名称后方增加以下文字“(指定颜色)”
图样文件格式应为jpg,图形应清晰,图样文件大小应小于“200KB”,且图形像素介于“600X600-
1500X1500”之间,如果通过扫描获得图样的,应按24位彩色,300dpi分辨率扫描符合《商标法》
及其实施条例规定的图形(图形清晰,大于5X5厘米且小于10X10厘米),申请人(或代理人)应
确保扫描后的图形与原图形的色彩深浅(或灰度)一致,否则,可能影响《商标注册证》上图形
的清晰度)如上传图样为黑白,取得注册后,可以更换商标颜色使用;如上传图样为彩色,取得
注册后只能按照该彩色图样使用;如确认提交彩色图样,需在委托书商标名称后方增加以下文字“(指定颜色)”
</p>
</el-drawer>
</div>
......
<template>
<div class="orderContact">
<el-form
:model="ruleForm"
:rules="rules"
ref="ruleForm"
label-width="110px"
class="demo-ruleForm"
label-position="left"
>
<el-form-item label="客户联系人:" prop="contanct">
<el-input
v-model="ruleForm.contanct"
placeholder="请输入联系人"
></el-input>
</el-form-item>
<el-form-item label="联系电话:" prop="phone">
<el-input
v-model="ruleForm.phone"
placeholder="请输入联系电话"
></el-input>
</el-form-item>
<el-form-item label="电子邮箱:" prop="email">
<el-input
v-model="ruleForm.email"
placeholder="请输入电子邮箱"
></el-input>
</el-form-item>
<el-form-item label="座机:">
<el-input v-model="ruleForm.tel" placeholder="区号座机号码"></el-input>
</el-form-item>
<el-form-item label="传真:">
<el-input
v-model="ruleForm.faxNumber"
placeholder="请输入传真号"
:maxlength="6"
></el-input>
</el-form-item>
</el-form>
<!-- 底部按钮 -->
<div class="drawer-bottom">
<button class="esc">取消</button>
<button class="enter">保存</button>
</div>
</div>
</template>
<script>
export default {
data() {
return {
ruleForm: {
contanct: "",
phone: "",
email: "",
tel: "",
faxNumber: ""
},
rules: {
contanct: [
{ required: true, message: "请输入联系人", trigger: "blur" }
],
phone: [
{ required: true, message: "请输入统一社会信用代码", trigger: "blur" }
],
email: [
{ required: true, message: "请输入邮箱地址", trigger: "blur" },
{
type: "email",
message: "请输入正确的邮箱地址",
trigger: ["blur", "change"]
}
]
}
};
},
methods: {}
};
</script>
<style lang="scss">
.orderContact {
width: 100%;
.el-radio {
height: auto;
padding: 7px 28px;
border-radius: 0px;
border: 1px solid #dee0eb;
.el-radio__label {
padding: 0;
font-family: PingFangSC-Regular;
font-size: 12px;
color: #333333;
}
}
.el-radio__input {
display: none;
}
.el-form-item {
.el-button {
border: none;
width: 12px;
height: 12px;
border-radius: 100%;
font-size: 12px;
padding: 0;
color: #3071fe;
line-height: 10px;
text-align: left;
margin-left: 10px;
}
}
.el-input {
width: 350px;
height: 40px;
input {
width: 350px;
height: 40px;
border-radius: 0px;
}
}
}
</style>
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