Commit 456bf2bf by 刘泽奇

123

parent 08dfc077
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -6,10 +6,10 @@ ...@@ -6,10 +6,10 @@
} }
.selftmreg_shu { .selftmreg_shu {
width: 100%; width: 1143px;
height: 1px; height: 1px;
background-color: #eeeeee; background-color: #eeeeee;
margin: 10px auto 20px; margin: 20px 0 ;
} }
.selftmreg_main1 { .selftmreg_main1 {
...@@ -462,7 +462,7 @@ ...@@ -462,7 +462,7 @@
bottom: 0; bottom: 0;
left: 0; left: 0;
width: 100%; width: 100%;
height: 70px; height: 0;
line-height: 70px; line-height: 70px;
background-color: #F7F8FC; background-color: #F7F8FC;
} }
...@@ -470,8 +470,12 @@ ...@@ -470,8 +470,12 @@
.step3-submit-main { .step3-submit-main {
width: 1200px; width: 1200px;
margin: 0 auto; margin: 0 auto;
float: right;
}
.step3-submit-main::after{
content:" ";
clear:both;
} }
#selftmreg .el-form-item__error { #selftmreg .el-form-item__error {
color: #f56c6c; color: #f56c6c;
font-size: 12px; font-size: 12px;
......
<div id="selftmreg" style="background-color:white;"> <div id="selftmreg" style="background-color:white;">
<div class="jdindentdetail-nav" style="width:1200px;margin:12px auto;padding: 0;height:24px;"> <div class="jdindentdetail-nav" style="width:1200px;margin:12px auto;padding: 0;height:24px;line-height: 24px;">
<el-breadcrumb separator-class="el-icon-arrow-right"> <el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item :to="listPath">商标注册服务 <el-breadcrumb-item :to="listPath">商标注册服务
</el-breadcrumb-item> </el-breadcrumb-item>
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<li :style="pointsRuleBackColor(3)"><a><em class="before"></em><span <li :style="pointsRuleBackColor(3)"><a><em class="before"></em><span
:style="pointsRuleColor(3)">确认订单</span><i :style="pointsRuleBackColor(3)"></i></a></li> :style="pointsRuleColor(3)">确认订单</span><i :style="pointsRuleBackColor(3)"></i></a></li>
<li :style="pointsRuleBackColor(4)"><a><em class="before"></em><span <li :style="pointsRuleBackColor(4)"><a><em class="before"></em><span
:style="pointsRuleColor(4)">提交订单</span></a></li> :style="pointsRuleColor(4)">支付订单</span></a></li>
</ul> </ul>
</div> </div>
</div> </div>
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
<el-form v-show="step==1" ref="form" :rules="rules" :model="form" class="demo-ruleForm" label-width="120px"> <el-form v-show="step==1" ref="form" :rules="rules" :model="form" class="demo-ruleForm" label-width="120px">
<div class="selftmreg_main"> <div class="selftmreg_main">
<!-- <h4>商标信息</h4> --> <!-- <h4>商标信息</h4> -->
<div class="selftmreg_shu" style="margin-top:20px;margin-bottom:20px;"></div>
<!-- <div class="selftmreg_shu"></div> --> <!-- <div class="selftmreg_shu"></div> -->
<div class="categoryFrom"> <div class="categoryFrom">
<el-form-item label="商标类型" style="float:left;padding-right:10px;" prop="tmFormType"> <el-form-item label="商标类型" style="float:left;padding-right:10px;" prop="tmFormType">
...@@ -234,8 +235,8 @@ ...@@ -234,8 +235,8 @@
<div class="tabButtomPrcie"> <div class="tabButtomPrcie">
<!-- <span style="margin-right:30px;text-align: center;color: #03004C;">官费总额:<i <!-- <span style="margin-right:30px;text-align: center;color: #03004C;">官费总额:<i
style="color:#E50778;font-style: normal;">¥{{form.totalPublicExpense}}</i></span> --> style="color:#E50778;font-style: normal;">¥{{form.totalPublicExpense}}</i></span> -->
<span style="margin-right:30px;text-align: center;color: #03004C;">应付总额:<i <span style="margin-right:30px;text-align: center;color: #03004C;font-weight: 700;">应付总额:<i
style="color:#E50778;font-style: normal;font-size: 24px;">¥{{totalPrices?totalPrices:0}}</i></span> style="color:#E50778;font-style: normal;font-size: 24px;">¥{{totalPrices?totalPrices:\'0.00\'}}</i></span>
<el-button type="primary" style="padding:8px 20px;width:150px; background: rgb(81, 210, 183);width: 170px;border-radius:0;color:#fff;border:0;" <el-button type="primary" style="padding:8px 20px;width:150px; background: rgb(81, 210, 183);width: 170px;border-radius:0;color:#fff;border:0;"
@click="submitForm(\'form\')">下一步</el-button> @click="submitForm(\'form\')">下一步</el-button>
</div> </div>
...@@ -399,7 +400,7 @@ ...@@ -399,7 +400,7 @@
<div class="title special">上传材料:营业执照</div> <div class="title special">上传材料:营业执照</div>
<div class="upload-box" v-loading="loading" @mouseover="mouseOverDemo(1,\'a\')" <div class="upload-box" v-loading="loading" @mouseover="mouseOverDemo(1,\'a\')"
@mouseleave="mouseLeaveDemo(1,\'a\')"> @mouseleave="mouseLeaveDemo(1,\'a\')">
<img class="upload-applyimg" v-if="apply.businessLicensePic" src="/imgs/sbzc/yyzzD.png" /> <img class="upload-applyimg" v-if="apply.businessLicensePic" :src="apply.businessLicensePic" />
<gsb-upload v-else flag="yyzz" ref="yyzz" :d="d" @setKey="setKey" :action="action" filetype="image/jpeg" <gsb-upload v-else flag="yyzz" ref="yyzz" :d="d" @setKey="setKey" :action="action" filetype="image/jpeg"
:ifshowlist="false" @uploadsuccess="uploadsuccess" @error="error"> :ifshowlist="false" @uploadsuccess="uploadsuccess" @error="error">
<div class="upload-button" @click="loadingKey = 0"> <div class="upload-button" @click="loadingKey = 0">
...@@ -549,7 +550,7 @@ ...@@ -549,7 +550,7 @@
<!-- page3 --> <!-- page3 -->
<el-form v-show="step==3" ref="form" :rules="rules" :model="form" class="demo-ruleForm" label-width="120px"> <el-form v-show="step==3" ref="form" :rules="rules" :model="form" class="demo-ruleForm" label-width="120px">
<div class="selftmreg_main"> <div class="selftmreg_main">
<div class="selftmreg_shu"></div> <div class="selftmreg_shu" style="margin-bottom:40px;"></div>
<div style="display:inline-block;margin-right:10px;"> <div style="display:inline-block;margin-right:10px;">
<h4><i class="selftmreg_shuxian"></i>商标信息</h4> <h4><i class="selftmreg_shuxian"></i>商标信息</h4>
</div> </div>
...@@ -595,7 +596,7 @@ ...@@ -595,7 +596,7 @@
<div style="width: 100%;font-size:14px;font-family:PingFangSC-Regular; font-weight:400;"> <div style="width: 100%;font-size:14px;font-family:PingFangSC-Regular; font-weight:400;">
<div style="min-width: 35%;margin-bottom: 23px;display:inline-block;"> <div style="min-width: 35%;margin-bottom: 23px;display:inline-block;">
<div style="width:120px;display:inline-block;text-align: right;color:#636569;">申请人资质:</div> <div style="width:120px;display:inline-block;text-align: left;color:#636569;box-sizing: border-box;padding-left: 44px;">申请人类型:</div>
<div style="display:inline-block;padding-left:10px;"> <div style="display:inline-block;padding-left:10px;">
{{apply.customerType=="ent"?"企业":""}}{{apply.customerType=="person"?"个体户":""}}</div> {{apply.customerType=="ent"?"企业":""}}{{apply.customerType=="person"?"个体户":""}}</div>
</div> </div>
...@@ -608,7 +609,7 @@ ...@@ -608,7 +609,7 @@
</div> </div>
<div style="clear:both"></div> <div style="clear:both"></div>
<div style="min-width: 35%;margin-bottom: 23px;display:inline-block;"> <div style="min-width: 35%;margin-bottom: 23px;display:inline-block;">
<div style="width:120px;display:inline-block;text-align: right;color:#636569;">邮政编码:</div> <div style="width:120px;display:inline-block;text-align: left;color:#636569;box-sizing: border-box;padding-left: 44px;">邮政编码:</div>
<div style="display:inline-block;padding-left:10px;">{{apply.zipCode}}</div> <div style="display:inline-block;padding-left:10px;">{{apply.zipCode}}</div>
</div> </div>
<div style="min-width: 35%;margin-bottom: 23px;display:inline-block;"> <div style="min-width: 35%;margin-bottom: 23px;display:inline-block;">
...@@ -621,7 +622,7 @@ ...@@ -621,7 +622,7 @@
</div> </div>
<div style="clear:both"></div> <div style="clear:both"></div>
<div style="min-width: 35%;margin-bottom: 23px;display:inline-block;"> <div style="min-width: 35%;margin-bottom: 23px;display:inline-block;">
<div style="width:120px;display:inline-block;text-align: right;color:#636569;">联系人:</div> <div style="width:120px;display:inline-block;text-align: left;color:#636569;box-sizing: border-box;padding-left: 44px;">联系人:</div>
<div style="display:inline-block;padding-left:10px;">{{apply.contacts}}</div> <div style="display:inline-block;padding-left:10px;">{{apply.contacts}}</div>
</div> </div>
<div style="min-width: 35%;margin-bottom: 23px;display:inline-block;"> <div style="min-width: 35%;margin-bottom: 23px;display:inline-block;">
...@@ -630,7 +631,7 @@ ...@@ -630,7 +631,7 @@
</div> </div>
<div style="clear:both"></div> <div style="clear:both"></div>
<div style="min-width: 35%;margin-bottom: 23px;display:inline-block;"> <div style="min-width: 35%;margin-bottom: 23px;display:inline-block;">
<div style="width:120px;display:inline-block;text-align: right;color:#636569;">电子邮箱:</div> <div style="width:120px;display:inline-block;text-align: left;color:#636569;box-sizing: border-box;padding-left: 44px;">电子邮箱:</div>
<div style="display:inline-block;padding-left:10px;">{{apply.email}}</div> <div style="display:inline-block;padding-left:10px;">{{apply.email}}</div>
</div> </div>
<div style="min-width: 35%;margin-bottom: 23px;display:inline-block;"> <div style="min-width: 35%;margin-bottom: 23px;display:inline-block;">
...@@ -686,7 +687,7 @@ ...@@ -686,7 +687,7 @@
</div> </div>
<br /> <br />
<div class="step3-submit"> <div class="tabButtomPrcie">
<div class="step3-submit-main"> <div class="step3-submit-main">
<div style="width:49%;text-align: left;display: inline-block;"> <div style="width:49%;text-align: left;display: inline-block;">
<div style="width: 100%;margin-bottom: 23px;box-sizing: border-box;padding-left: 17px;"> <div style="width: 100%;margin-bottom: 23px;box-sizing: border-box;padding-left: 17px;">
...@@ -698,7 +699,7 @@ ...@@ -698,7 +699,7 @@
style="margin-right:20px;font-size:16px;font-family:PingFangSC;font-weight:600;color:#E50778;">应付总额:¥{{form.totalSum}}</span> --> style="margin-right:20px;font-size:16px;font-family:PingFangSC;font-weight:600;color:#E50778;">应付总额:¥{{form.totalSum}}</span> -->
</div> </div>
</div> </div>
<div style="width:50%;text-align: right;display: inline-block;float: right;padding-right: 20px; <div style="width:50%;text-align: right;display: inline-block;float: right;
box-sizing: border-box;"> box-sizing: border-box;">
<div style="margin-bottom:10px;display: inline-block;font-size:14px; <div style="margin-bottom:10px;display: inline-block;font-size:14px;
font-family:PingFangSC; font-family:PingFangSC;
...@@ -708,11 +709,19 @@ ...@@ -708,11 +709,19 @@
<label style="cursor: pointer;">我已阅读 <span style="color:#0F8EE9">《商标服务合同》</span>且同意该合同内容</label> <label style="cursor: pointer;">我已阅读 <span style="color:#0F8EE9">《商标服务合同》</span>且同意该合同内容</label>
</div> </div>
<el-button type="primary" style="background:rgb(81, 210, 183);border:0; " @click="submitForm(\'order\')" <el-button type="primary" style="padding: 8px 20px;
width: 170px;
background: rgb(81, 210, 183);
border-radius: 0px;
color: rgb(255, 255, 255);
border: 0px;" @click="submitForm(\'order\')"
:disabled="!isRead">提交订单</el-button> :disabled="!isRead">提交订单</el-button>
</div> </div>
</div> </div>
</div>
<div class="step3-submit">
<!-- <el-button v-if="!isRead" type="primary" disabled>提交订单</el-button> --> <!-- <el-button v-if="!isRead" type="primary" disabled>提交订单</el-button> -->
</div> </div>
</el-form> </el-form>
......
...@@ -238,7 +238,7 @@ ...@@ -238,7 +238,7 @@
d: {}, d: {},
action: "", action: "",
invoiceTaxRate: 10, invoiceTaxRate: 10,
step: "2", step: "1",
isRead: false, isRead: false,
steps: [ steps: [
{ title: "填写基本信息" }, { title: "填写基本信息" },
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
{ type: 'string', required: true, message: '请选择申请类型', trigger: 'change' } { type: 'string', required: true, message: '请选择申请类型', trigger: 'change' }
], ],
name: [ name: [
{ message: '请输入公司/申请人名称' }, { required: true ,message: '请输入公司/申请人名称',trigger: 'blur' },
{ validator: validateIdConmpany, trigger: 'blur' } { validator: validateIdConmpany, trigger: 'blur' }
], ],
code: [ code: [
...@@ -364,7 +364,7 @@ ...@@ -364,7 +364,7 @@
watch: { watch: {
nclOne: { nclOne: {
handler(newVal, oldVal){ handler(newVal, oldVal){
this.totalPrices = newVal.length * 300; this.totalPrices = (newVal.length * 300).toFixed(2);
if (newVal.length > 0) { if (newVal.length > 0) {
if (newVal.length > 1) { if (newVal.length > 1) {
this.$refs.tree.setChecked(newVal[1], false); this.$refs.tree.setChecked(newVal[1], false);
......
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