Skip to content

Z
zhichan
Commit 7d5eacf0 by 任建
Options

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

parents f355d52d 0898a82a
Showing with 347 additions and 284 deletions
channel-access/src/views/pages/selftmreg/ApplicationInfo.vue
...@@ -18,17 +18,13 @@ ...@@ -18,17 +18,13 @@
label-position="left" label-position="left"
> >
<el-form-item label="申请人类型：" prop="resource"> <el-form-item label="申请人类型：" prop="resource">
<el-radio-group <el-radio-group v-model="aruleForm.resource">
v-model="aruleForm.resource"
@change="handleUsersChooseClick"
>
<el-radio :label="1" border>企业</el-radio> <el-radio :label="1" border>企业</el-radio>
<el-radio :label="2" border>个体户</el-radio> <el-radio :label="2" border>个体户</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<div v-if="aruleForm.resource == 1"> <div v-if="aruleForm.resource == 1">
<el-form-item label="公司名称：" prop="name"> <el-form-item label="公司名称：" prop="name">
<!-- @blur.native="handleInputCompanyNameBlur" -->
<el-autocomplete <el-autocomplete
v-model="aruleForm.name" v-model="aruleForm.name"
:fetch-suggestions="querySearchAsync" :fetch-suggestions="querySearchAsync"
...@@ -40,7 +36,6 @@ ...@@ -40,7 +36,6 @@
></el-autocomplete> ></el-autocomplete>
</el-form-item> </el-form-item>
<el-form-item label="统一社会信用代码：" prop="xinyongma"> <el-form-item label="统一社会信用代码：" prop="xinyongma">
<!-- @blur="handleInputCreditCodeBlur" -->
<el-input <el-input
v-model="aruleForm.xinyongma" v-model="aruleForm.xinyongma"
placeholder="请输入统一社会信用代码" placeholder="请输入统一社会信用代码"
...@@ -55,7 +50,6 @@ ...@@ -55,7 +50,6 @@
</el-popover> </el-popover>
</el-form-item> </el-form-item>
<el-form-item label="执照详细地址：" prop="address"> <el-form-item label="执照详细地址：" prop="address">
<!-- @blur="handleInputLicenseAddressBlur" -->
<el-input <el-input
v-model="aruleForm.address" v-model="aruleForm.address"
placeholder="请输入执照详细地址" placeholder="请输入执照详细地址"
...@@ -66,7 +60,6 @@ ...@@ -66,7 +60,6 @@
v-model="aruleForm.postal" v-model="aruleForm.postal"
placeholder="请输入邮政编码" placeholder="请输入邮政编码"
:maxlength="6" :maxlength="6"
@blur="handleInputPostalCodeBlur"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</div> </div>
...@@ -75,7 +68,6 @@ ...@@ -75,7 +68,6 @@
<el-input <el-input
v-model="aruleForm.uname" v-model="aruleForm.uname"
placeholder="请输入您的姓名" placeholder="请输入您的姓名"
@blur="handleInputUserNameBlur"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="身份证号：" prop="uid"> <el-form-item label="身份证号：" prop="uid">
...@@ -83,21 +75,18 @@ ...@@ -83,21 +75,18 @@
v-model="aruleForm.uid" v-model="aruleForm.uid"
placeholder="请输入您的身份证号" placeholder="请输入您的身份证号"
:maxlength="18" :maxlength="18"
@blur="handleInputIdCardBlur"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="身份证住址：" prop="uaddress"> <el-form-item label="身份证住址：" prop="uaddress">
<el-input <el-input
v-model="aruleForm.uaddress" v-model="aruleForm.uaddress"
placeholder="请输入身份证住址" placeholder="请输入身份证住址"
@blur="handleInputIdAddressBlur"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="统一社会信用代码：" prop="xinyongma"> <el-form-item label="统一社会信用代码：" prop="xinyongma">
<el-input <el-input
v-model="aruleForm.xinyongma" v-model="aruleForm.xinyongma"
placeholder="请输入统一社会信用代码" placeholder="请输入统一社会信用代码"
@blur="handleInputUCreditCodeBlur"
></el-input> ></el-input>
<el-popover <el-popover
placement="right-end" placement="right-end"
...@@ -113,7 +102,6 @@ ...@@ -113,7 +102,6 @@
v-model="aruleForm.postal" v-model="aruleForm.postal"
placeholder="请输入邮政编码" placeholder="请输入邮政编码"
:maxlength="6" :maxlength="6"
@blur="handleInputUPostalCodeBlur"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</div> </div>
...@@ -138,21 +126,18 @@ ...@@ -138,21 +126,18 @@
<el-input <el-input
v-model="ruleForm.contanct" v-model="ruleForm.contanct"
placeholder="请输入联系人" placeholder="请输入联系人"
@blur="handleInputCustomerBlur"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="联系电话：" prop="phone"> <el-form-item label="联系电话：" prop="phone">
<el-input <el-input
v-model="ruleForm.phone" v-model="ruleForm.phone"
placeholder="请输入联系电话" placeholder="请输入联系电话"
@blur="handleInputTelnumBlur"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="电子邮箱：" prop="email"> <el-form-item label="电子邮箱：" prop="email">
<el-input <el-input
v-model="ruleForm.email" v-model="ruleForm.email"
placeholder="请输入电子邮箱" placeholder="请输入电子邮箱"
@blur="handleInputEmailBlur"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="座机："> <el-form-item label="座机：">
...@@ -375,100 +360,40 @@ export default { ...@@ -375,100 +360,40 @@ export default {
}, },
addMessage() { addMessage() {
console.log(this.ruleForm); console.log(this.ruleForm);
},
//申请人类型 参数传递
handleUsersChooseClick() {
this.$bus.emit("on-userschoose-click", this.aruleForm.resource);
},
// 企业申请人 参数传递
handleInputCompanyNameBlur() {
this.$bus.emit("on-input-companyname-blur", this.aruleForm.name);
},
handleInputCreditCodeBlur() {
this.$bus.emit("on-input-creditcode-blur", this.aruleForm.xinyongma);
},
handleInputLicenseAddressBlur() {
this.$bus.emit("on-input-licenseaddress-blur", this.aruleForm.address);
},
handleInputPostalCodeBlur() {
this.$bus.emit("on-input-postalcode-blur", this.aruleForm.postal);
},
// 个体户申请人 参数传递
handleInputUserNameBlur() {
this.$bus.emit("on-input-username-blur", this.aruleForm.uname);
},
handleInputIdCardBlur() {
this.$bus.emit("on-input-idcard-blur", this.aruleForm.uid);
},
handleInputIdAddressBlur() {
this.$bus.emit("on-input-idaddress-blur", this.aruleForm.uaddress);
},
handleInputUCreditCodeBlur() {
this.$bus.emit("on-input-ucreditcode-blur", this.aruleForm.xinyongma);
},
handleInputUPostalCodeBlur() {
this.$bus.emit("on-input-upostalcode-blur", this.aruleForm.postal);
},
// 客户联系人 参数传递
handleInputCustomerBlur() {
this.$bus.emit("on-input-customer-blur", this.ruleForm.contanct);
},
// 联系电话 参数传递
handleInputTelnumBlur() {
this.$bus.emit("on-input-telnum-blur", this.ruleForm.phone);
},
// 电子邮箱 参数传递
handleInputEmailBlur() {
this.$bus.emit("on-input-email-blur", this.ruleForm.email);
} }
}, },
updated() { updated() {
this.$nextTick(() => { this.$nextTick(() => {
// // 申请人类别
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.atype = this.aruleForm.resource; this.$parent.$parent.confirmStepsParams.stepTwoNineParams.atype = this.aruleForm.resource;
console.log( // 企业
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.atype // 公司名称
);
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.companyName = this.aruleForm.name; this.$parent.$parent.confirmStepsParams.stepTwoNineParams.companyName = this.aruleForm.name;
console.log( // 统一社会信用代码
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.companyName
);
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.creditCode = this.aruleForm.xinyongma; this.$parent.$parent.confirmStepsParams.stepTwoNineParams.creditCode = this.aruleForm.xinyongma;
console.log( // 执照详细地址
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.creditCode
);
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.licenseAddress = this.aruleForm.address; this.$parent.$parent.confirmStepsParams.stepTwoNineParams.licenseAddress = this.aruleForm.address;
console.log( // 邮政编码
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.licenseAddress
);
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.postalCode = this.aruleForm.postal; this.$parent.$parent.confirmStepsParams.stepTwoNineParams.postalCode = this.aruleForm.postal;
console.log( // 个体户
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.postalCode // 姓名
);
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.username = this.aruleForm.uname; this.$parent.$parent.confirmStepsParams.stepTwoNineParams.username = this.aruleForm.uname;
console.log( // 身份证号
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.username
);
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.idCard = this.aruleForm.uid; this.$parent.$parent.confirmStepsParams.stepTwoNineParams.idCard = this.aruleForm.uid;
console.log( // 身份证住址
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.idCard
);
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.idAddress = this.aruleForm.uaddress; this.$parent.$parent.confirmStepsParams.stepTwoNineParams.idAddress = this.aruleForm.uaddress;
console.log( // 统一社会信用代码
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.idAddress this.$parent.$parent.confirmStepsParams.stepTwoNineParams.ucreditCode = this.aruleForm.xinyongma;
); // 邮政编码
// this.$parent.$parent.confirmStepsParams.stepTwoNineParams.ucreditCode = this.aruleForm.xinyongma; this.$parent.$parent.confirmStepsParams.stepTwoNineParams.upostalCode = this.aruleForm.postal;
// console.log(
// this.$parent.$parent.confirmStepsParams.stepTwoNineParams.ucreditCode // 联系人
// ); // 客户联系人
// this.$parent.$parent.confirmStepsParams.stepTwoNineParams.upostalCode = this.aruleForm.postal; this.$parent.$parent.confirmStepsParams.stepTwoNineParams.customer = this.ruleForm.contanct;
// console.log( // 联系电话
// this.$parent.$parent.confirmStepsParams.stepTwoNineParams.upostalCode this.$parent.$parent.confirmStepsParams.stepTwoNineParams.telNum = this.ruleForm.phone;
// ); // 电子邮箱
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.email = this.ruleForm.email;
}); });
} }
}; };
......
channel-access/src/views/pages/selftmreg/ConfirmOrder.vue
<!-- 第三步：确认订单 --> <!-- 第三步：确认订单 -->
<template> <template>
<div class="confirm"> <div class="confirm">
<div class="info-title"> <div class="info-title">
<i class="selftmreg_shuxian"></i> <i class="selftmreg_shuxian"></i>
<h4> <h4>
商标信息 商标信息
<span class="edit"> <span class="edit" @click="goStepOne">
<i class="el-icon-edit"></i> <i class="el-icon-edit"></i>
<b>编辑</b> <b>编辑</b>
</span> </span>
...@@ -15,24 +14,52 @@ ...@@ -15,24 +14,52 @@
<div class="brand-info"> <div class="brand-info">
<p> <p>
<strong>商标类型：</strong> <strong>商标类型：</strong>
<span>{{ msgFromParent.steponeChoose.type }}</span> <span>{{
this.$parent.$parent.confirmStepsParams.stepOneThreeParams.type == 1
? "文字"
: this.$parent.$parent.confirmStepsParams.stepOneThreeParams.type ==
2
? "图形"
: "文字及图形"
}}</span>
</p> </p>
<p v-if="msgFromParent.steponeChoose.type !== 2"> <p
v-if="
this.$parent.$parent.confirmStepsParams.stepOneThreeParams.type !== 2
"
>
<strong>商标名称：</strong> <strong>商标名称：</strong>
<span>{{ msgFromParent.steponeChoose.tname }}</span> <span>{{
this.$parent.$parent.confirmStepsParams.stepOneThreeParams.tname
}}</span>
</p> </p>
<p> <p>
<strong>商标图样：</strong> <strong>商标图样：</strong>
<img :src="brandIcon" alt /> <img
:src="
this.$parent.$parent.confirmStepsParams.stepOneThreeParams.type ==
1 &&
this.$parent.$parent.confirmStepsParams.stepOneThreeParams
.brandauto == true
? brandIconAuto
: brandIconManual
"
alt
/>
</p> </p>
<p> <p>
<strong>商标类别：</strong> <strong>商标类别：</strong>
<span class="detail-type"> <span class="detail-type">
<i>15 类 乐器</i> <i>{{
this.$parent.$parent.confirmStepsParams.stepOneThreeParams.bigKind
}}</i>
<br /> <br />
<b v-for="item in checkedKinds" :key="item.fullname">{{ <b
item.fullname v-for="item in this.$parent.$parent.confirmStepsParams
}}</b> .stepOneThreeParams.smallKinds"
:key="item.fullname"
>{{ item.fullname }}</b
>
</span> </span>
</p> </p>
</div> </div>
...@@ -41,7 +68,7 @@ ...@@ -41,7 +68,7 @@
<i class="selftmreg_shuxian"></i> <i class="selftmreg_shuxian"></i>
<h4> <h4>
申请人及联系人信息 申请人及联系人信息
<span class="edit" @click="goSteptwo"> <span class="edit" @click="goStepTwo">
<i class="el-icon-edit"></i> <i class="el-icon-edit"></i>
<b>编辑</b> <b>编辑</b>
</span> </span>
...@@ -51,58 +78,126 @@ ...@@ -51,58 +78,126 @@
<ul> <ul>
<li> <li>
<strong>申请人类型：</strong> <strong>申请人类型：</strong>
<span>{{ msgFromParent.steptwoApplication.atype }}</span> <span>{{
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.atype == 1
? "企业"
: "个体户"
}}</span>
</li> </li>
<li v-if="msgFromParent.steptwoApplication.atype == 1"> <li
v-if="
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.atype == 1
"
>
<strong>公司名称：</strong> <strong>公司名称：</strong>
<span>{{ msgFromParent.steptwoApplication.companyName }}</span> <span>{{
this.$parent.$parent.confirmStepsParams.stepTwoNineParams
.companyName
}}</span>
</li> </li>
<li v-if="msgFromParent.steptwoApplication.atype == 1"> <li
v-if="
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.atype == 1
"
>
<strong>邮政编码：</strong> <strong>邮政编码：</strong>
<span>{{ msgFromParent.steptwoApplication.postalCode }}</span> <span>{{
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.postalCode
}}</span>
</li> </li>
<li v-if="msgFromParent.steptwoApplication.atype == 1"> <li
v-if="
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.atype == 1
"
>
<strong>公司地址：</strong> <strong>公司地址：</strong>
<span>{{ msgFromParent.steptwoApplication.licenseAddress }}</span> <span>{{
this.$parent.$parent.confirmStepsParams.stepTwoNineParams
.licenseAddress
}}</span>
</li> </li>
<li v-if="msgFromParent.steptwoApplication.atype == 2"> <li
v-if="
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.atype == 2
"
>
<strong>申请人姓名：</strong> <strong>申请人姓名：</strong>
<span>{{ msgFromParent.steptwoApplication.username }}</span> <span>{{
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.username
}}</span>
</li> </li>
<li v-if="msgFromParent.steptwoApplication.atype == 2"> <li
v-if="
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.atype == 2
"
>
<strong>邮政编码：</strong> <strong>邮政编码：</strong>
<span>{{ msgFromParent.steptwoApplication.upostalCode }}</span> <span>{{
this.$parent.$parent.confirmStepsParams.stepTwoNineParams
.upostalCode
}}</span>
</li> </li>
<li v-if="msgFromParent.steptwoApplication.atype == 2"> <li
v-if="
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.atype == 2
"
>
<strong>申请人地址：</strong> <strong>申请人地址：</strong>
<span>{{ msgFromParent.steptwoApplication.idAddress }}</span> <span>{{
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.idAddress
}}</span>
</li> </li>
<li> <li>
<strong>联系人：</strong> <strong>联系人：</strong>
<span>{{ msgFromParent.steptwoContact.customer }}</span> <span>{{
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.customer
}}</span>
</li> </li>
<li> <li>
<strong>联系电话：</strong> <strong>联系电话：</strong>
<span>{{ msgFromParent.steptwoContact.telNum }}</span> <span>{{
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.telNum
}}</span>
</li> </li>
<li> <li>
<strong>电子邮箱：</strong> <strong>电子邮箱：</strong>
<span>{{ msgFromParent.steptwoContact.email }}</span> <span>{{
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.email
}}</span>
</li> </li>
<li v-if="msgFromParent.steptwoApplication.atype == 1"> <li
v-if="
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.atype == 1
"
>
<strong>信用编码：</strong> <strong>信用编码：</strong>
<span>{{ msgFromParent.steptwoApplication.creditCode }}</span> <span>{{
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.creditCode
}}</span>
</li> </li>
<li v-if="msgFromParent.steptwoApplication.atype == 2"> <li
v-if="
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.atype == 2
"
>
<strong>信用编码：</strong> <strong>信用编码：</strong>
<span>{{ msgFromParent.steptwoApplication.ucreditCode }}</span> <span>{{
this.$parent.$parent.confirmStepsParams.stepTwoNineParams
.ucreditCode
}}</span>
</li> </li>
<li v-if="msgFromParent.steptwoApplication.atype == 2"> <li
v-if="
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.atype == 2
"
>
<strong>身份证号：</strong> <strong>身份证号：</strong>
<span>{{ msgFromParent.steptwoApplication.idCard }}</span> <span>{{
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.idCard
}}</span>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -131,29 +226,34 @@ export default { ...@@ -131,29 +226,34 @@ export default {
// 选中的商标种类 // 选中的商标种类
checkedKinds: [], checkedKinds: [],
// 商标展示 // 商标展示
brandIcon: "",
brandIcon1: "", brandIconManual: "",
brandIcon2: "" brandIconAuto: ""
}; };
}, },
methods: { methods: {
// click未生效 // 编辑 商标信息
goSteptwo() { goStepOne() {
console.log(111);
// 去第一步骤的页面
this.$emit("getIndex", 0);
},
// 编辑 申请人及联系人信息
goStepTwo() {
console.log(222); console.log(222);
// 去第二步骤的页面 // 去第二步骤的页面
this.$emit("getIndex", 1);
} }
}, },
created() { created() {
let checkedKinds = JSON.parse(localStorage.getItem("classDataList")); let checkedKinds = JSON.parse(localStorage.getItem("classDataList"));
this.checkedKinds = checkedKinds; this.checkedKinds = checkedKinds;
let brandIcon1 = localStorage.getItem("manualImgToConfirm"); let brandIconManual = localStorage.getItem("manualImgToConfirm");
this.brandIcon1 = brandIcon1; this.brandIconManual = brandIconManual;
let brandIcon2 = localStorage.getItem("autoImgToConfirm"); let brandIconAuto = localStorage.getItem("autoImgToConfirm");
this.brandIcon2 = brandIcon2; this.brandIconAuto = brandIconAuto;
this.brandIcon = this.brandIcon1;
console.log(this.brandIcon);
} }
}; };
</script> </script>
......
channel-access/src/views/pages/selftmreg/ModifyTrademark.vue
...@@ -14,10 +14,7 @@ ...@@ -14,10 +14,7 @@
label-position="left" label-position="left"
> >
<el-form-item label="商标类型：" prop="resource"> <el-form-item label="商标类型：" prop="resource">
<el-radio-group <el-radio-group v-model="ruleForm.resource">
v-model="ruleForm.resource"
@change="handleRadiosChooseClick"
>
<el-radio :label="1">文字</el-radio> <el-radio :label="1">文字</el-radio>
<el-radio :label="2">图形</el-radio> <el-radio :label="2">图形</el-radio>
<el-radio :label="3">文字及图形</el-radio> <el-radio :label="3">文字及图形</el-radio>
...@@ -34,7 +31,6 @@ ...@@ -34,7 +31,6 @@
<el-input <el-input
v-model="ruleForm.name" v-model="ruleForm.name"
placeholder="请输入商标名称" placeholder="请输入商标名称"
@blur="handleInputBrandnameBlur"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
...@@ -229,13 +225,6 @@ ...@@ -229,13 +225,6 @@
</div> </div>
</div> </div>
</div> </div>
<!-- 底部按钮的重写 -->
<!-- <div
style="float:left;display:inline-flex; z-index:100000000;position:absolute;left:0;right:0;height:30px;width:90000px;background:red;"
>
hello
</div> -->
</div> </div>
</template> </template>
...@@ -368,10 +357,10 @@ export default { ...@@ -368,10 +357,10 @@ export default {
this.loading = true; this.loading = true;
this.imgUrl = msg; this.imgUrl = msg;
uploadStandardTm(this.imgUrl).then(res => { uploadStandardTm(this.imgUrl).then(res => {
// 手动上传图片的保存 // 手动上传图片的 保存在 localStorage里面
this.manualImgToConfirm = res.data.url; this.manualImgToConfirm = res.data.url;
localStorage.setItem("manualImgToConfirm", this.manualImgToConfirm); localStorage.setItem("manualImgToConfirm", this.manualImgToConfirm);
// console.log(this.manualImgToConfirm);
this.loading = false; this.loading = false;
if (res.status == 0) { if (res.status == 0) {
this.$message({ this.$message({
...@@ -409,16 +398,19 @@ export default { ...@@ -409,16 +398,19 @@ export default {
this.loading = false; this.loading = false;
if (res.status == 0) { if (res.status == 0) {
this.imgUrl = res.data.url; this.imgUrl = res.data.url;
// 自动生成的图片 保存在 localStorage里面
// 自动生成的图片
this.autoImgToConfirm = res.data.url; this.autoImgToConfirm = res.data.url;
localStorage.setItem("autoImgToConfirm", this.autoImgToConfirm); localStorage.setItem("autoImgToConfirm", this.autoImgToConfirm);
// console.log(this.autoImgToConfirm);
} }
}); });
} }
// 传递参数，改变点击状态为true
this.$bus.emit("on-click-brandauto", true);
},
manualupload() {
// 传递参数，改变点击状态为true
this.$bus.emit("on-click-brandmanual", true);
}, },
manualupload() {},
// 分类信息选择 // 分类信息选择
// 清除选中的标签 // 清除选中的标签
...@@ -454,19 +446,6 @@ export default { ...@@ -454,19 +446,6 @@ export default {
}); });
}, },
// 类型选择 参数传递
handleRadiosChooseClick() {
// this.$parent.$parent.confirmStepsParams.stepOneThreeParams.type = this.ruleForm.resource;
// console.log(
// this.$parent.$parent.confirmStepsParams.stepOneThreeParams.type
// );
// this.$bus.emit("on-radioschoose-click", this.ruleForm.resource);
},
// 输入名字 参数传递
handleInputBrandnameBlur() {
this.$bus.emit("on-input-brandname-blur", this.ruleForm.name);
},
// 树形结构的处理节点是否被选中 // 树形结构的处理节点是否被选中
handleCheckChange(data, checked, indeterminate) { handleCheckChange(data, checked, indeterminate) {
// 检测第三级节点是否被选中(一级节点两位code，二级节点四位code,三级节点6位或是0位code) // 检测第三级节点是否被选中(一级节点两位code，二级节点四位code,三级节点6位或是0位code)
...@@ -547,7 +526,7 @@ export default { ...@@ -547,7 +526,7 @@ export default {
let index = this.ncldata.findIndex((item, index) => { let index = this.ncldata.findIndex((item, index) => {
return item.code == node.data.code; return item.code == node.data.code;
}); });
console.log(index); // console.log(index);
this.ncldata[index].children = res.data.rows; this.ncldata[index].children = res.data.rows;
setTimeout(() => { setTimeout(() => {
var data; var data;
...@@ -641,24 +620,18 @@ export default { ...@@ -641,24 +620,18 @@ export default {
}, },
updated() { updated() {
this.$nextTick(() => { this.$nextTick(() => {
// 商标类型
this.$parent.$parent.confirmStepsParams.stepOneThreeParams.type = this.ruleForm.resource; this.$parent.$parent.confirmStepsParams.stepOneThreeParams.type = this.ruleForm.resource;
console.log( // 商标名称
this.$parent.$parent.confirmStepsParams.stepOneThreeParams.type
);
this.$parent.$parent.confirmStepsParams.stepOneThreeParams.tname = this.ruleForm.name; this.$parent.$parent.confirmStepsParams.stepOneThreeParams.tname = this.ruleForm.name;
console.log( // 如果已经选择了某一类，第xx类 xxx 已经渲染出来
this.$parent.$parent.confirmStepsParams.stepOneThreeParams.tname
);
if (this.$refs.bigKind) { if (this.$refs.bigKind) {
this.$parent.$parent.confirmStepsParams.stepOneThreeParams.bigKind = this.$refs.bigKind.innerHTML; this.$parent.$parent.confirmStepsParams.stepOneThreeParams.bigKind = this.$refs.bigKind.innerHTML;
console.log(
this.$parent.$parent.confirmStepsParams.stepOneThreeParams.bigKind
);
this.$parent.$parent.confirmStepsParams.stepOneThreeParams.smallKinds = this.classDataList; this.$parent.$parent.confirmStepsParams.stepOneThreeParams.smallKinds = this.classDataList;
console.log(
this.$parent.$parent.confirmStepsParams.stepOneThreeParams.smallKinds
);
} }
// 手动上传按钮的改变
// this.manualupload();
}); });
} }
}; };
......
channel-access/src/views/pages/selftmreg/Selftmreg.vue
...@@ -22,13 +22,40 @@ ...@@ -22,13 +22,40 @@
<div class="selftmreg_shu"></div> <div class="selftmreg_shu"></div>
<ModifyTrademark v-if="index == 0" /> <ModifyTrademark v-if="index == 0" />
<ApplicationInfo v-if="index == 1" /> <ApplicationInfo v-if="index == 1" />
<ConfirmOrder v-if="index == 2" :msgFromParent="shareParams" /> <ConfirmOrder v-if="index == 2" @getIndex="getindex" />
<PayOrder v-if="index == 3" /> <PayOrder v-if="index == 3" />
</div> </div>
</el-form> </el-form>
</div> </div>
</div> </div>
<!-- 商品/服务项目不足10项 对话框 -->
<el-dialog
title="提示"
:visible.sync="dialogVisible"
width="30%"
:before-close="handleClose"
>
<span
>01类化学原料，商品/服务项目<i>不足10项</i>，已选{{
this.confirmStepsParams.stepOneThreeParams.smallKinds.length
}}项，还可选{{
10 - this.confirmStepsParams.stepOneThreeParams.smallKinds.length
}}个小项</span
>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">修改</el-button>
<el-button
type="primary"
@click="
dialogVisible = false;
index++;
"
>确 定</el-button
>
</span>
</el-dialog>
<!-- 底部付款按钮 --> <!-- 底部付款按钮 -->
<div class="footer-wrap"> <div class="footer-wrap">
<div class="tabButtomPrcie"> <div class="tabButtomPrcie">
...@@ -80,13 +107,17 @@ export default { ...@@ -80,13 +107,17 @@ export default {
checked: false, checked: false,
abc: 1243, abc: 1243,
// 验证参数 // 验证参数:步骤一二的必填项参数验证
confirmStepsParams: { confirmStepsParams: {
stepOneThreeParams: { stepOneThreeParams: {
// 商标选择 // 商标选择
type: 1, type: 1,
tname: "", tname: "",
icon: "", icon: "",
// 手动上传或是上传图片
brandmanual: false,
// 自动生成图片
brandauto: false,
// 分类选择 // 分类选择
bigKind: "", bigKind: "",
smallKinds: [] smallKinds: []
...@@ -113,36 +144,8 @@ export default { ...@@ -113,36 +144,8 @@ export default {
} }
}, },
shareParams: { // 商品/服务项目不足10项 对话框
steponeChoose: { dialogVisible: false
type: 1,
tname: "",
icon: ""
},
steponeClassify: {
cname: "",
types: []
},
steptwoApplication: {
atype: 1,
// 申请人类型：企业
companyName: "",
creditCode: "",
licenseAddress: "",
postalCode: "",
// 申请人类型：个体户
username: "",
idCard: "",
idAddress: "",
ucreditCode: "",
upostalCode: ""
},
steptwoContact: {
customer: "",
telNum: "",
email: ""
}
}
}; };
}, },
created() { created() {
...@@ -151,28 +154,124 @@ export default { ...@@ -151,28 +154,124 @@ export default {
} }
}, },
methods: { methods: {
// 去编辑的对应步骤
getindex(index) {
console.log(index);
this.index = index;
},
next() { next() {
// console.log(this.$refs.steps.$refs.uls.children);
this.index++;
// 获取a标签和i标签以给其加入高亮的样式 // 获取a标签和i标签以给其加入高亮的样式
let as = document.getElementsByTagName("a"); let as = document.getElementsByTagName("a");
let is = document.getElementsByTagName("i"); let is = document.getElementsByTagName("i");
if (this.index == 1) { // 有选择好的 自动上传图标 或 手动上传图标
// 给 第二步填写申请人信息对应的步骤进度条 添加高亮样式 this.confirmStepsParams.stepOneThreeParams.icon =
as[1].classList.add("active"); localStorage.getItem("autoImgToConfirm") ||
is[3].classList.add("active"); localStorage.getItem("manualImgToConfirm");
}
if (this.index == 2) { if (this.index == 2) {
// 给 第三步确认订单信息对应的步骤进度条 添加高亮样式 // 给 第三步确认订单信息对应的步骤进度条 添加高亮样式
as[2].classList.add("active"); as[2].classList.add("active");
is[4].classList.add("active"); is[4].classList.add("active");
} }
if (this.index == 3) { if (this.index == 1) {
// 给 第四步支付订单对应的步骤进度条 添加高亮样式 // 给 第二步填写申请人信息对应的步骤进度条 添加高亮样式
as[3].classList.add("active"); as[1].classList.add("active");
is[5].classList.add("active"); is[3].classList.add("active");
} else { // 进入第三步之前的信息验证
if (this.confirmStepsParams.stepTwoNineParams.atype == 1) {
if (
this.confirmStepsParams.stepTwoNineParams.companyName == "" ||
this.confirmStepsParams.stepTwoNineParams.creditCode == "" ||
this.confirmStepsParams.stepTwoNineParams.licenseAddress == "" ||
this.confirmStepsParams.stepTwoNineParams.postalCode == "" ||
this.confirmStepsParams.stepTwoNineParams.customer == "" ||
this.confirmStepsParams.stepTwoNineParams.telNum == "" ||
this.confirmStepsParams.stepTwoNineParams.email == ""
) {
this.$message({
type: "warning",
message: "请完善信息"
});
} else {
this.index++;
}
} else if (this.confirmStepsParams.stepTwoNineParams.atype == 2) {
if (
this.confirmStepsParams.stepTwoNineParams.username == "" ||
this.confirmStepsParams.stepTwoNineParams.idCard == "" ||
this.confirmStepsParams.stepTwoNineParams.idAddress == "" ||
this.confirmStepsParams.stepTwoNineParams.ucreditCode == "" ||
this.confirmStepsParams.stepTwoNineParams.upostalCode == "" ||
this.confirmStepsParams.stepTwoNineParams.customer == "" ||
this.confirmStepsParams.stepTwoNineParams.telNum == "" ||
this.confirmStepsParams.stepTwoNineParams.email == ""
) {
this.$message({
type: "warning",
message: "请完善信息"
});
} else {
this.index++;
}
}
}
if (this.index == 0) {
// 进入第二步之前的信息验证
if (
this.confirmStepsParams.stepOneThreeParams.type == 1 ||
this.confirmStepsParams.stepOneThreeParams.type == 3
) {
console.log(
this.confirmStepsParams.stepOneThreeParams.tname,
this.confirmStepsParams.stepOneThreeParams.icon,
this.confirmStepsParams.stepOneThreeParams.bigKind
);
if (
this.confirmStepsParams.stepOneThreeParams.tname == "" ||
this.confirmStepsParams.stepOneThreeParams.icon == ""
) {
this.$message({
type: "warning",
message: "请完善信息"
});
console.log("asdasdsadsa");
} else if (this.confirmStepsParams.stepOneThreeParams.bigKind == "") {
this.$message({
type: "warning",
message: "请完善信息"
});
} else {
if (
this.confirmStepsParams.stepOneThreeParams.smallKinds.length < 10
) {
// 弹出提示框
this.dialogVisible = true;
}
// this.index++;
// 给 第二步填写申请人信息对应的步骤进度条 添加高亮样式
as[1].classList.add("active");
is[3].classList.add("active");
}
} else if (this.confirmStepsParams.stepOneThreeParams.type == 2) {
if (
this.confirmStepsParams.stepOneThreeParams.icon == "" ||
this.confirmStepsParams.stepOneThreeParams.bigKind == ""
) {
this.$message({
type: "warning",
message: "请完善信息"
});
} else {
if (
this.confirmStepsParams.stepOneThreeParams.smallKinds.length < 10
) {
this.$message({
type: "warning",
message: "商品/服务项目不足10项"
});
}
}
}
} }
}, },
prev() { prev() {
...@@ -184,63 +283,29 @@ export default { ...@@ -184,63 +283,29 @@ export default {
is[this.index + 2].classList.remove("active"); is[this.index + 2].classList.remove("active");
// 加载上一步的组件 // 加载上一步的组件
this.index--; this.index--;
},
// 商品/服务项目不足10项 对话框
handleClose(done) {
this.$confirm("确认关闭？")
.then(_ => {
done();
})
.catch(_ => {});
} }
}, },
mounted() { mounted() {
// 类型选择 参数更新 // 页面初始挂载成功之后先清除之前的缓存的图片信息
this.$bus.on("on-radioschoose-click", msg => { localStorage.removeItem("manualImgToConfirm");
this.shareParams.steponeChoose.type = msg; localStorage.removeItem("autoImgToConfirm");
});
// 输入名字 参数更新
this.$bus.on("on-input-brandname-blur", msg => {
this.shareParams.steponeChoose.tname = msg;
});
// 申请人类型 参数更新
this.$bus.on("on-userschoose-click", msg => {
this.shareParams.steptwoApplication.atype = msg;
});
// 企业申请人 参数更新
this.$bus.on("on-input-companyname-blur", msg => {
this.shareParams.steptwoApplication.companyName = msg;
});
this.$bus.on("on-input-creditcode-blur", msg => {
this.shareParams.steptwoApplication.creditCode = msg;
});
this.$bus.on("on-input-licenseaddress-blur", msg => {
this.shareParams.steptwoApplication.licenseAddress = msg;
});
this.$bus.on("on-input-postalcode-blur", msg => {
this.shareParams.steptwoApplication.postalCode = msg;
});
// 个体户申请人 参数更新
this.$bus.on("on-input-username-blur", msg => {
this.shareParams.steptwoApplication.username = msg;
});
this.$bus.on("on-input-idcard-blur", msg => {
this.shareParams.steptwoApplication.idCard = msg;
});
this.$bus.on("on-input-idaddress-blur", msg => {
this.shareParams.steptwoApplication.idAddress = msg;
});
this.$bus.on("on-input-ucreditcode-blur", msg => {
this.shareParams.steptwoApplication.ucreditCode = msg;
});
this.$bus.on("on-input-upostalcode-blur", msg => {
this.shareParams.steptwoApplication.upostalCode = msg;
});
// 客户联系人 参数更新 // 手动上传或上传 参数更新
this.$bus.on("on-input-customer-blur", msg => { this.$bus.on("on-click-brandmanual", msg => {
this.shareParams.steptwoContact.customer = msg; this.confirmStepsParams.stepOneThreeParams.brandmanual = msg;
});
// 联系电话 参数更新
this.$bus.on("on-input-telnum-blur", msg => {
this.shareParams.steptwoContact.telNum = msg;
}); });
// 电子邮箱 参数更新 // 自动生成 参数更新
this.$bus.on("on-input-email-blur", msg => { this.$bus.on("on-click-brandauto", msg => {
this.shareParams.steptwoContact.email = msg; this.confirmStepsParams.stepOneThreeParams.brandauto = msg;
}); });
} }
}; };
......
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