Skip to content

Z
zhichan
Commit 9e17a2c8 by 宋毅
Options

Merge branch 'igirl-channel-jdweb' of gitlab.gongsibao.com:jiangyong/zhichan… 

Merge branch 'igirl-channel-jdweb' of gitlab.gongsibao.com:jiangyong/zhichan into igirl-channel-jdweb
parents fda4caf3 8d709950
Showing with 190 additions and 50 deletions
igirl-channel-jdweb/app/front/entry/public/css/pagecom.css
This source diff could not be displayed because it is too large. You can view the blob instead.
igirl-channel-jdweb/app/front/entry/public/js/index.js
...@@ -183,7 +183,10 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => { ...@@ -183,7 +183,10 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
if (find == -1) { if (find == -1) {
this.selfFooterShow = true; this.selfFooterShow = true;
} else { } else {
$('.jdc-footer').hide();
this.selfFooterShow = false; this.selfFooterShow = false;
console.log(find,'...........................',this.selfFooterShow)
} }
} else { } else {
this.headerHidden = false; this.headerHidden = false;
......
igirl-channel-jdweb/app/front/vues/pages/selftmreg/index.css
...@@ -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 {
...@@ -41,6 +41,8 @@ ...@@ -41,6 +41,8 @@
#selftmreg .el-tag { #selftmreg .el-tag {
margin: 5px 0px; margin: 5px 0px;
background:none;
border-radius:0;
} }
#selftmreg .el-tree-node__content .el-tree-node__label { #selftmreg .el-tree-node__content .el-tree-node__label {
...@@ -68,7 +70,7 @@ ...@@ -68,7 +70,7 @@
width: 100%; width: 100%;
height: 65px; height: 65px;
line-height: 50px; line-height: 50px;
z-index: 999; z-index: 298;
} }
.selftmreg_Stickie .el-input__inner { .selftmreg_Stickie .el-input__inner {
...@@ -120,7 +122,7 @@ ...@@ -120,7 +122,7 @@
box-sizing: border-box; box-sizing: border-box;
border-left: 1px solid #E1E1E1; border-left: 1px solid #E1E1E1;
background-color: #EFF0F7; background-color: #EFF0F7;
z-index: 999; z-index: 298;
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
letter-spacing: 0; letter-spacing: 0;
} }
...@@ -223,16 +225,17 @@ ...@@ -223,16 +225,17 @@
.tabButtomPrcie { .tabButtomPrcie {
width: 100%; width: 100%;
height: 60px; height: 60px;
line-height: 53px; line-height: 60px;
font-size: 16px; font-size: 16px;
color: #828282; color: #828282;
text-align: right; text-align: right;
box-sizing: border-box; box-sizing: border-box;
background: #F7F8FC; background: #EFF0F7;
position: absolute; z-index: 299;
position: fixed;
bottom: 0; bottom: 0;
left: 0; left: 0;
padding-right: 20px; padding-right: 159px;
} }
.selftmregType { .selftmregType {
...@@ -459,7 +462,7 @@ ...@@ -459,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;
} }
...@@ -467,8 +470,15 @@ ...@@ -467,8 +470,15 @@
.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;
}
.step3-submit-main .is-disabled{
opacity:.5 ;
} }
#selftmreg .el-form-item__error { #selftmreg .el-form-item__error {
color: #f56c6c; color: #f56c6c;
font-size: 12px; font-size: 12px;
...@@ -640,10 +650,15 @@ ...@@ -640,10 +650,15 @@
border: 0px solid #0989C5; border: 0px solid #0989C5;
color: #fff; color: #fff;
border-radius: 0; border-radius: 0;
padding:8px 20px;
width:170px;
} }
.step2-footer>button:nth-child(1) { .step2-footer>button:nth-child(1) {
transform: translateX(-10px); transform: translateX(-10px);
background: #fff;
color: #51d2b7;
border: 1px solid;
} }
.step3-indent .el-textarea__inner { .step3-indent .el-textarea__inner {
...@@ -720,3 +735,7 @@ ...@@ -720,3 +735,7 @@
{ {
opacity: 0; opacity: 0;
} }
.selftmreg .el-dialog__wrapper .el-dialog__header {
text-align:center;
}
\ No newline at end of file
igirl-channel-jdweb/app/front/vues/pages/selftmreg/selftmreg.html
<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>
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
</el-breadcrumb> </el-breadcrumb>
</div> </div>
<div style="background-color:white;width:1200px;margin:0 auto;padding-bottom: 90px; "> <div style="background-color:white;width:1200px;margin:0 auto;padding-bottom: 90px; ">
<div style="text-align:left;border:1px solid rgba(220,223,230,1);position: relative;padding-bottom: 50px;"> <div style="text-align:left;border:1px solid rgba(220,223,230,1);position: relative;">
<div class="selftmreg_main"> <div class="selftmreg_main">
<!-- <el-alert <!-- <el-alert
title="商标注册申请递交后，在审查阶段存在被商标审查机构驳回的可能，且驳回后不予退费，请知悉。" title="商标注册申请递交后，在审查阶段存在被商标审查机构驳回的可能，且驳回后不予退费，请知悉。"
...@@ -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,9 +235,9 @@ ...@@ -234,9 +235,9 @@
<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=" background: rgb(81, 210, 183);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>
</div> </div>
...@@ -352,7 +353,7 @@ ...@@ -352,7 +353,7 @@
<div style="clear:both;"></div> <div style="clear:both;"></div>
<el-form-item label-width="140px" label="邮政编码" style="width:493px;float:left;padding-right:50px;" <el-form-item label-width="140px" label="邮政编码" style="width:493px;float:left;padding-right:50px;"
prop="zipCode"> prop="zipCode">
<el-input placeHolder="请输入邮政编码" v-model="apply.zipCode"></el-input> <el-input @input="maxZipCode" placeHolder="请输入邮政编码" v-model="apply.zipCode"></el-input>
</el-form-item> </el-form-item>
<div style="clear:both;"></div> <div style="clear:both;"></div>
...@@ -369,7 +370,7 @@ ...@@ -369,7 +370,7 @@
<div style="clear:both;"></div> <div style="clear:both;"></div>
<el-form-item label-width="140px" label="联系电话" style="width:493px;float:left;padding-right:50px;" <el-form-item label-width="140px" label="联系电话" style="width:493px;float:left;padding-right:50px;"
prop="mobile"> prop="mobile">
<el-input v-model="apply.mobile" placeHolder="请填写11位手机号码"></el-input> <el-input v-model="apply.mobile" @input="maxPhoneNumber" placeHolder="请填写11位手机号码"></el-input>
</el-form-item> </el-form-item>
<div style="clear:both;"></div> <div style="clear:both;"></div>
<el-form-item label-width="140px" label="电子邮箱" style="width:493px;float:left;padding-right:50px;" <el-form-item label-width="140px" label="电子邮箱" style="width:493px;float:left;padding-right:50px;"
...@@ -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">
...@@ -525,16 +526,31 @@ ...@@ -525,16 +526,31 @@
</div> </div>
</div> </div>
<div style="text-align:center;padding-bottom:50px;" class="step2-footer">
<el-button @click="tobefore">上一步</el-button>
<el-button style="" type="primary" @click="submitForm(\'apply\')"> <div class="tabButtomPrcie">
<!-- <span style="margin-right:30px;text-align: center;color: #03004C;">官费总额：<i
style="color:#E50778;font-style: normal;">￥{{form.totalPublicExpense}}</i></span> -->
<el-button style="padding: 8px 20px;
width: 170px;
background: none;
border-radius: 0px;
color: rgb(81, 210, 183);
border: 1px solid" @click="tobefore">上一步</el-button>
<el-button style="padding: 8px 20px;
width: 170px;
background: rgb(81, 210, 183);
border-radius: 0px;
color: rgb(255, 255, 255);
border: 0px" type="primary" @click="submitForm(\'apply\')">
下一步</el-button> 下一步</el-button>
</div> </div>
</el-form> </el-form>
<!-- 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>
...@@ -580,7 +596,7 @@ ...@@ -580,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>
...@@ -593,7 +609,7 @@ ...@@ -593,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;">
...@@ -606,7 +622,7 @@ ...@@ -606,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;">
...@@ -615,7 +631,7 @@ ...@@ -615,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;">
...@@ -635,7 +651,7 @@ ...@@ -635,7 +651,7 @@
<div v-if="apply.businessLicensePic" <div v-if="apply.businessLicensePic"
style="display:inline-block;padding-left:10px;cursor: pointer;text-align: center;color: rgb(99, 101, 105);"> style="display:inline-block;padding-left:10px;cursor: pointer;text-align: center;color: rgb(99, 101, 105);">
<img @click="window.open(apply.businessLicensePic)" v-if="apply.businessLicensePic" <img @click="window.open(apply.businessLicensePic)" v-if="apply.businessLicensePic"
src="/imgs/sbzc/yyzzD.png" style="height:118px;width:98px;border: 2px dashed rgb(233, 233, 233);"> :src="apply.businessLicensePic" style="height:118px;width:98px;border: 2px dashed rgb(233, 233, 233);">
<div>营业执照</div> <div>营业执照</div>
</div> </div>
<div v-if="apply.identityCardPic" <div v-if="apply.identityCardPic"
...@@ -671,7 +687,7 @@ ...@@ -671,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;">
...@@ -683,7 +699,7 @@ ...@@ -683,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;
...@@ -693,11 +709,19 @@ ...@@ -693,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>
...@@ -794,9 +818,9 @@ ...@@ -794,9 +818,9 @@
{{item.code}}类{{item.name}}，商品/服务项目<span {{item.code}}类{{item.name}}，商品/服务项目<span
style="color:red;">不足10项</span>，已选{{item.checked}}项，还可选{{10-item.checked}}个小项</span> style="color:red;">不足10项</span>，已选{{item.checked}}项，还可选{{10-item.checked}}个小项</span>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer" style="text-align:center;">
<el-button style="background:#66b1ff;border-color: #66b1ff;color: #FFF;" @click="closeConfrim()">修 改</el-button> <el-button style="background:#51d2b7;border-color: #66b1ff;color: #FFF;border-radius:0;width:170px;padding:8px 20px;" @click="closeConfrim()">修 改</el-button>
<el-button style="background:#fff;border-color: #DCDFE6;color: #606266;" type="primary" <el-button style="background:#fff;border-color: #DCDFE6;color: #606266;border-radius:0;width:170px;padding:8px 20px;" type="primary"
@click="submitForm(\'form\',true)">确 定</el-button> @click="submitForm(\'form\',true)">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
......
igirl-channel-jdweb/app/front/vues/pages/selftmreg/selftmreg.js
...@@ -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: [
...@@ -316,15 +316,15 @@ ...@@ -316,15 +316,15 @@
orderSubInfo: null, orderSubInfo: null,
totalPrices: null, totalPrices: null,
dataList: [], dataList: [],
options: [] options: [],
} }
}, },
computed: Vuex.mapState({ computed:{
count: state => state.count,
headStyle: function () { },
return { "background-color": "white" };
}
}),
created: function() { created: function() {
var that = this; var that = this;
var itemCode = this.$router.history.current.query.itemCode || 'zzsbzc'; var itemCode = this.$router.history.current.query.itemCode || 'zzsbzc';
...@@ -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);
...@@ -452,7 +452,17 @@ ...@@ -452,7 +452,17 @@
*/ */
}, },
methods: { methods: {
maxZipCode(){
if(this.apply.zipCode.length>6){
console.log(this.apply.zipCode);
this.apply.zipCode = this.apply.zipCode.substring(0,6);
}
},
maxPhoneNumber(){
if(this.apply.mobile.length>11){
this.apply.mobile = this.apply.mobile.substring(0,11);
}
},
getItemCode(){ getItemCode(){
var obj = this.$root.copyParams({ channelUserId: "", itemCode: "sbfu" }, "getProductListByTypeOneCode", "/action/tmOrder/springBoard"); var obj = this.$root.copyParams({ channelUserId: "", itemCode: "sbfu" }, "getProductListByTypeOneCode", "/action/tmOrder/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => {
...@@ -473,7 +483,7 @@ ...@@ -473,7 +483,7 @@
} else if (i == parseInt(this.step)) { } else if (i == parseInt(this.step)) {
return 'color: #FFFFFF;' return 'color: #FFFFFF;'
} else if (i > parseInt(this.step)) { } else if (i > parseInt(this.step)) {
return 'color: #FFFFFF;' return 'color: #BBB;'
} }
}, },
pointsRuleBackColor(i) { pointsRuleBackColor(i) {
...@@ -482,7 +492,7 @@ ...@@ -482,7 +492,7 @@
} else if (i == parseInt(this.step)) { } else if (i == parseInt(this.step)) {
return 'background: #51d2b7;z-index: ' + Math.abs(i - 5) return 'background: #51d2b7;z-index: ' + Math.abs(i - 5)
} else if (i > parseInt(this.step)) { } else if (i > parseInt(this.step)) {
return 'background: #eee;z-index: ' + Math.abs(i - 5) return 'background:#EFF0F7;z-index: ' + Math.abs(i - 5)
} }
}, },
toViewImg(src) { toViewImg(src) {
...@@ -1194,10 +1204,6 @@ ...@@ -1194,10 +1204,6 @@
}, },
submitForm(formName, agree) { submitForm(formName, agree) {
console.log(document.documentElement.scrollTop, "llllllllllllllllllllll");
/*
*/
var that = this; var that = this;
if (this.nclOne.length > 0) { if (this.nclOne.length > 0) {
......
igirl-channel-jdweb/package-lock.json
...@@ -1726,6 +1726,11 @@ ...@@ -1726,6 +1726,11 @@
"resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz", "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz",
"integrity": "sha512-vKQ9DTQPN1FLYiiEEOQ6IBGFqvjCa5rSK3cWMy/Nespm5d/x3dGFT9UBZnkLxCwua/IXBi2TYnwTEpsOvhC4UQ==" "integrity": "sha512-vKQ9DTQPN1FLYiiEEOQ6IBGFqvjCa5rSK3cWMy/Nespm5d/x3dGFT9UBZnkLxCwua/IXBi2TYnwTEpsOvhC4UQ=="
}, },
"date-format": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/date-format/-/date-format-3.0.0.tgz",
"integrity": "sha512-eyTcpKOcamdhWJXj56DpQMo1ylSQpcGtGKXcU0Tb97+K56/CF5amAqqqNj0+KvA0iw2ynxtHWFsPDSClCxe48w=="
},
"dateformat": { "dateformat": {
"version": "2.2.0", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz", "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz",
...@@ -3328,6 +3333,11 @@ ...@@ -3328,6 +3333,11 @@
"integrity": "sha1-Tnmumy6zi/hrO7Vr8+ClaqX8q9c=", "integrity": "sha1-Tnmumy6zi/hrO7Vr8+ClaqX8q9c=",
"dev": true "dev": true
}, },
"flatted": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz",
"integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg=="
},
"follow-redirects": { "follow-redirects": {
"version": "1.9.0", "version": "1.9.0",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.9.0.tgz", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.9.0.tgz",
...@@ -6082,6 +6092,33 @@ ...@@ -6082,6 +6092,33 @@
"chalk": "^1.0.0" "chalk": "^1.0.0"
} }
}, },
"log4js": {
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/log4js/-/log4js-6.1.0.tgz",
"integrity": "sha512-fSCHMYsMJbHwfNTuMlopVVcfkKwIRLh5mpNZGB2oBbnSmr3yUTo4tL4xGBA0/q29xowlu96eTXGghJFNhPXMnA==",
"requires": {
"date-format": "^3.0.0",
"debug": "^4.1.1",
"flatted": "^2.0.1",
"rfdc": "^1.1.4",
"streamroller": "^2.2.3"
},
"dependencies": {
"debug": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
"requires": {
"ms": "^2.1.1"
}
},
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
}
}
},
"logalot": { "logalot": {
"version": "2.1.0", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/logalot/-/logalot-2.1.0.tgz", "resolved": "https://registry.npmjs.org/logalot/-/logalot-2.1.0.tgz",
...@@ -7975,6 +8012,11 @@ ...@@ -7975,6 +8012,11 @@
"integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
"dev": true "dev": true
}, },
"rfdc": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.1.4.tgz",
"integrity": "sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug=="
},
"rimraf": { "rimraf": {
"version": "2.6.2", "version": "2.6.2",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
...@@ -8942,6 +8984,51 @@ ...@@ -8942,6 +8984,51 @@
"resolved": "https://registry.npmjs.org/stream-wormhole/-/stream-wormhole-1.1.0.tgz", "resolved": "https://registry.npmjs.org/stream-wormhole/-/stream-wormhole-1.1.0.tgz",
"integrity": "sha512-gHFfL3px0Kctd6Po0M8TzEvt3De/xu6cnRrjlfYNhwbhLPLwigI2t1nc6jrzNuaYg5C4YF78PPFuQPzRiqn9ew==" "integrity": "sha512-gHFfL3px0Kctd6Po0M8TzEvt3De/xu6cnRrjlfYNhwbhLPLwigI2t1nc6jrzNuaYg5C4YF78PPFuQPzRiqn9ew=="
}, },
"streamroller": {
"version": "2.2.3",
"resolved": "https://registry.npmjs.org/streamroller/-/streamroller-2.2.3.tgz",
"integrity": "sha512-AegmvQsscTRhHVO46PhCDerjIpxi7E+d2GxgUDu+nzw/HuLnUdxHWr6WQ+mVn/4iJgMKKFFdiUwFcFRDvcjCtw==",
"requires": {
"date-format": "^2.1.0",
"debug": "^4.1.1",
"fs-extra": "^8.1.0"
},
"dependencies": {
"date-format": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/date-format/-/date-format-2.1.0.tgz",
"integrity": "sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA=="
},
"debug": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
"requires": {
"ms": "^2.1.1"
}
},
"fs-extra": {
"version": "8.1.0",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
"integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
"requires": {
"graceful-fs": "^4.2.0",
"jsonfile": "^4.0.0",
"universalify": "^0.1.0"
}
},
"graceful-fs": {
"version": "4.2.3",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
"integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="
},
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
}
}
},
"streamsearch": { "streamsearch": {
"version": "0.1.2", "version": "0.1.2",
"resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz", "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz",
......
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