Skip to content

Z
zhichan
Commit b120d509 by 刘泽奇
Options

123

parent 768edb4f
Showing with 52 additions and 55 deletions
igirl-channel-jdweb/app/front/entry/index.ejs
......@@ -6,7 +6,7 @@
<meta name="keywords" content="PAAS 开放平台">
<meta name="baidu-site-verification" content="lATAxZAm8y" />
<meta name="viewport" content="width=device-width, initial-scale=0.8, maximum-scale=0.8, user-scalable=1">
<title id="idtitle">畅捷通商标注册服务</title>
<title id="idtitle">京东云商标注册服务</title>
<!-- <%=app?app.name:'应用未启用'%> -->
<link rel="stylesheet" href="/css/ele/ele2.12.0.css">
<link rel="stylesheet" href="/css/pagecom.css">
......@@ -53,7 +53,7 @@
<div class="jc_hd"> </div>
<div id="app" v-loading.fullscreen.lock="loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="app-main" style="visibility:hidden">
<div id="admin-warpper" v-if="0">
<div></div>
<div class="admin-menu">
<el-menu default-active="2" class="el-menu-vertical-demo" @open="handleOpen" @close="handleClose"
background-color="#545c64" text-color="#fff" active-text-color="#ffd04b">
......
igirl-channel-jdweb/app/front/entry/public/css/index.css
......@@ -3,14 +3,16 @@
width: 100%;
}
.admin-menu {
/* .admin-menu {
width: 180px;
min-height: 390px;
overflow: hidden;
box-sizing: border-box;
background: rgb(84, 92, 100);
}
} */
/* .el-menu-vertical-demo{
} */
.admin-content {
width: 100%;
min-height: 390px;
......
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/vues/pages/selftmreg/selftmreg.html
......@@ -2,12 +2,12 @@
<div class="jdindentdetail-nav" style="width:1200px;margin:0 auto;padding: 0;">
<span>当前位置：</span>
<el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item :to="listPath">交付中心
<el-breadcrumb-item :to="listPath">商标注册
</el-breadcrumb-item>
<el-breadcrumb-item>自助注册</el-breadcrumb-item>
<el-breadcrumb-item>自助商标注册</el-breadcrumb-item>
</el-breadcrumb>
</div>
<div style="background-color:white;width:1200px;margin:0 auto;padding:20px 0;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 class="selftmreg_main">
<!-- <el-alert
......@@ -16,7 +16,7 @@
close-text="我了解了">
</el-alert> -->
</br>
<h3 style="border-bottom: 1px solid #E0E0E0; padding-bottom: 15px;">商标注册</h3>
<h3 style="border-bottom: 1px solid #E0E0E0; padding-bottom: 15px;display: none;">商标注册</h3>
<!-- <gsb-step :psteps="steps" :step="step"></gsb-step> -->
<div class="pointsRule">
<ul id="list">
......@@ -24,8 +24,10 @@
:style="pointsRuleBackColor(1)"></i></a></li>
<li :style="pointsRuleBackColor(2)"><a><em class="before"></em><span
:style="pointsRuleColor(2)">填写申请人信息</span><i :style="pointsRuleBackColor(2)"></i></a></li>
<li :style="pointsRuleBackColor(4)"><a><em class="before"></em><span
:style="pointsRuleColor(4)">提交订单</span></a></li>
<li :style="pointsRuleBackColor(3)"><a><em class="before"></em><span
:style="pointsRuleColor(3)">确认订单</span><i :style="pointsRuleBackColor(3)"></i></a></li>
<!-- <li :style="pointsRuleBackColor(4)"><a><em class="before"></em><span
:style="pointsRuleColor(4)">提交订单</span></a></li> -->
</ul>
</div>
</div>
......@@ -187,9 +189,7 @@
style="text-align: right; font-size: 12px;background-color:white;padding-top:10px;">
<el-button style="float:right" type="primary">导入Contact</el-button>
<el-input style="float:right;width:40%" placeholder="请输入历史订单号" clearable></el-input>
</el-header>
<el-main style="background-color: white; padding:0px;position: relative;">
<div class="selftmreg_title">已选择的商品/服务项
<span class="selftmreg_qingchu" @click="removeAll">
......@@ -234,9 +234,9 @@
<div style="width:100%;margin-top: 20px;box-sizing: border-box;">
<div class="tabButtomPrcie">
<!-- <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
style="color:#E50778;font-style: normal;font-size: 24px;">￥{{form.totalSum}}</i></span> -->
style="color:#E50778;font-style: normal;font-size: 24px;">￥{{totalPrices?totalPrices:0}}</i></span>
<el-button type="primary" style=" background: #0989C5;border-radius:0;color:#fff;"
@click="submitForm(\'form\')">下一步</el-button>
</div>
......@@ -299,15 +299,15 @@
<div style="clear:both;"></div>
<el-form-item v-if="apply.customerType==\'ent\'" label-width="140px" label="公司名称"
style="width:493px;float:left;padding-right:50px;" prop="name">
<gsb-selectentjd v-if="currentUser" @historychange="historyapplierchange" allowcreate="true" showhistory="false" @change="applierChange"
size="medium" v-model="apply.name" refMethod="getCompanyInfoByLikeName" autoComplete="true"
isFilter="true" refModel="tool" labelField="entName" valueField="entName"
style="position:relative;width:100%;" placeHolder="请输入选择公司名称">
<gsb-selectentjd v-if="currentUser" @historychange="historyapplierchange" allowcreate="true"
showhistory="false" @change="applierChange" size="medium" v-model="apply.name"
refMethod="getCompanyInfoByLikeName" autoComplete="true" isFilter="true" refModel="tool"
labelField="entName" valueField="entName" style="position:relative;width:100%;" placeHolder="请输入选择公司名称">
</gsb-selectentjd>
<gsb-selectentjd v-if="!currentUser" @historychange="historyapplierchange" frombrowser="true" allowcreate="true" showhistory="false"
@change="applierChange" size="medium" v-model="apply.name" refMethod="getCompanyInfoByLikeName"
autoComplete="true" isFilter="true" refModel="tool" labelField="entName" valueField="entName"
style="position:relative;width:100%;" placeHolder="请输入选择公司名称">
<gsb-selectentjd v-if="!currentUser" @historychange="historyapplierchange" frombrowser="true"
allowcreate="true" showhistory="false" @change="applierChange" size="medium" v-model="apply.name"
refMethod="getCompanyInfoByLikeName" autoComplete="true" isFilter="true" refModel="tool"
labelField="entName" valueField="entName" style="position:relative;width:100%;" placeHolder="请输入选择公司名称">
</gsb-selectentjd>
</el-form-item>
<el-form-item v-if="apply.customerType==\'person\'" label-width="140px" label="姓名"
......@@ -455,13 +455,14 @@
<span>JPG</span>，大小不能超过<span>10M</span></div>
</el-form-item>
<el-form-item class="gsb_items">
<div class="title special">上传材料：代理委托书<a href="http://gsb-zc.oss-cn-beijing.aliyuncs.com/igirl_channel_tmwtsdemo001.doc"
style="color:#0F8EE9;font-size:13px;cursor:pointer;position: absolute;top: 70%;left: 51%;line-height: 0px;border-bottom: 1px solid #0F8EE9;height: 5px;">生成委托书</a >
<div class="title special">上传材料：代理委托书<a
href="http://gsb-zc.oss-cn-beijing.aliyuncs.com/igirl_channel_tmwtsdemo001.doc"
style="color:#0F8EE9;font-size:13px;cursor:pointer;position: absolute;top: 70%;left: 51%;line-height: 0px;border-bottom: 1px solid #0F8EE9;height: 5px;">生成委托书</a>
</div>
<div class="upload-box" v-loading="loading2" @mouseover="mouseOverDemo(2,\'b\')"
@mouseleave="mouseLeaveDemo(2,\'b\')">
<img @click="window.open(apply.gzwtsUrl)" class="upload-applyimg"
v-if="apply.gzwtsUrl" :src="apply.gzwtsUrl" />
<img @click="window.open(apply.gzwtsUrl)" class="upload-applyimg" v-if="apply.gzwtsUrl"
:src="apply.gzwtsUrl" />
<gsb-upload v-else flag="wts" ref="wts" :d="d" @setKey="setKey" :action="action" filetype="image/jpeg"
:ifshowlist="false" @uploadsuccess="uploadsuccess" @error="error">
<div class="upload-button" @click="loadingKey = 2">
......@@ -792,7 +793,8 @@
style="color:red;">不足10项</span>，已选{{nclSelected}}项，还可选{{10-nclSelected}}个小项</span>
<span slot="footer" class="dialog-footer">
<el-button style="background:#66b1ff;border-color: #66b1ff;color: #FFF;" @click="closeConfrim()">修 改</el-button>
<el-button style="background:#fff;border-color: #DCDFE6;color: #606266;" type="primary" @click="submitForm(\'form\',true)">确 定</el-button>
<el-button style="background:#fff;border-color: #DCDFE6;color: #606266;" type="primary"
@click="submitForm(\'form\',true)">确 定</el-button>
</span>
</el-dialog>
</div>
\ No newline at end of file
igirl-channel-jdweb/app/front/vues/pages/selftmreg/selftmreg.js
......@@ -305,6 +305,7 @@
agree: false,
nclSelected: null,
orderSubInfo: null,
totalPrices: null,
}
},
computed: Vuex.mapState({
......@@ -352,30 +353,23 @@
watch: {
nclOne: {
handler(newVal, oldVal){
this.totalPrices = newVal.length * 300;
console.log(this,newVal.length, '???????????????????');
if (newVal.length > 0) {
if (newVal.length > 1) {
this.$refs.tree.setChecked(newVal[1], false);
this.$refs.tree.setChecked(newVal[1].nclThree[0], false);
newVal.pop();
this.message.show = !this.message.show;
this.message.info = "只能选择同一个类别";
var timer = setTimeout(() => {
this.message.show = false;
clearTimeout(timer);
}, 2000);
};
if (newVal[0].nclThree.length > 10) {
this.$refs.tree.setChecked(newVal[0].nclThree[10], false);
newVal[0].nclThree.pop();
console.log(newVal, newVal[0].nclThree, `xxxxxxxxxxxxxxxxxxxxxxxxxxxxx`);
this.message.show = !this.message.show;
this.message.info = "最多只能选择10项";
var timer2 = setTimeout(() => {
this.message.show = false;
clearTimeout(timer2);
}, 2000);
}
newVal.forEach((item, index) => {
if (item.nclThree.length > 10) {
this.$refs.tree.setChecked(item.nclThree[10], false);
item.nclThree.pop();
console.log(newVal, item.nclThree, `xxxxxxxxxxxxxxxxxxxxxxxxxxxxx`);
this.message.show = !this.message.show;
this.message.info = "最多只能选择10项";
var timer2 = setTimeout(() => {
this.message.show = false;
clearTimeout(timer2);
}, 2000);
}
});
}
......@@ -1138,8 +1132,9 @@
this.showConfrim = false;
},
submitForm(formName, agree) {
var that = this;
/** this.step++; */
var that = this;
if (this.nclOne.length > 0) {
if (this.nclOne[0].nclThree.length < 10 && formName == "form") {
this.showConfrim = true;
......@@ -1176,9 +1171,6 @@
this.$refs[formName].validate((valid) => {
console.log(valid);
if (valid) {
if (formName == "form" && that.nclOne.length < 1) {
that.$message.warning(`请选择商标分类`);
return false;
......@@ -1263,7 +1255,7 @@
var entobj = {
regLocation: this.apply.applyAddr, entName: this.apply.name, domainEntName: this.apply.name, creditCode: this.apply.code,
businessLicensePic: this.apply.businessLicensePic, customerType: this.apply.customerType, identityCardNo: this.apply.identityCardNo,
identityCardPic: this.apply.identityCardPic,businessLicensePdf: this.apply.businessLicensePdf,
identityCardPic: this.apply.identityCardPic, businessLicensePdf: this.apply.businessLicensePdf,
};
if (this.apply.customerType == "ent") {
var entData = localStorage.getItem("historyentlist");
......
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