Skip to content

Z
zhichan
Commit 3f07b7dc by 任建
Options

rj

parents 335e6ac9 2966215e
Showing with 423 additions and 92 deletions
channel-access/package-lock.json
...@@ -11545,6 +11545,11 @@ ...@@ -11545,6 +11545,11 @@
"resolved": "https://registry.npm.taobao.org/vue/download/vue-2.6.11.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue%2Fdownload%2Fvue-2.6.11.tgz", "resolved": "https://registry.npm.taobao.org/vue/download/vue-2.6.11.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue%2Fdownload%2Fvue-2.6.11.tgz",
"integrity": "sha1-dllNh31LEiNEBuhONSdcbVFBJcU=" "integrity": "sha1-dllNh31LEiNEBuhONSdcbVFBJcU="
}, },
"vue-bus": {
"version": "1.2.1",
"resolved": "https://registry.npm.taobao.org/vue-bus/download/vue-bus-1.2.1.tgz",
"integrity": "sha1-UFd7C3P8GvnNqKR1/vL38P2tcEU="
},
"vue-eslint-parser": { "vue-eslint-parser": {
"version": "5.0.0", "version": "5.0.0",
"resolved": "https://registry.npm.taobao.org/vue-eslint-parser/download/vue-eslint-parser-5.0.0.tgz", "resolved": "https://registry.npm.taobao.org/vue-eslint-parser/download/vue-eslint-parser-5.0.0.tgz",
......
channel-access/package.json
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
"js-cookie": "^2.2.1", "js-cookie": "^2.2.1",
"vue": "^2.6.10", "vue": "^2.6.10",
"vue-clipboard2": "^0.3.1", "vue-clipboard2": "^0.3.1",
"vue-bus": "^1.2.1",
"vue-router": "^3.1.3", "vue-router": "^3.1.3",
"vuex": "^3.1.2" "vuex": "^3.1.2"
}, },
......
channel-access/src/api/tmOrder.js 0 → 100644
import http from "@/http/http.js";
let baseUrl2 = "/a/web/action/tmOrder/springBoard";
// 获取jdtrademark商标注册卡片信息
// 产品详情-应用中心
// export function getRegInfo() {
// return http.post(baseUrl2, {
// actionBody: {
// channelItemCode: "FW_GOODS-581976-1"
// },
// actionType: "getCAProductDetail",
// actionProcess: "jd"
// });
// }
// 获取jdtrademark商标注册卡片信息
// 产品列表-根据产品大类获取-应用中心
export function getRegInfo() {
return http.post(baseUrl2, {
actionBody: {
typeOneCode: "sbfu"
},
actionType: "getCAProductListByTypeOneCode",
actionProcess: "jd"
});
}
channel-access/src/api/tmTools.js 0 → 100644
import http from "@/http/http.js";
let baseUrl3 = "/api/web/action/tmTools/springBoard";
// 获取selftmreg的尼斯查询 一级查询得到二级树
export function getNiceQueryLevelOne() {
return http.post(baseUrl3, {
actionBody: {
nclcode: "01"
},
actionType: "getNcl",
requrl: "/action/tmTools/springBoard"
});
}
// 获取selftmreg的尼斯查询 二级查询得到三级树
export function getNiceQueryLevelTwo() {
return http.post(baseUrl3, {
actionBody: {
name: "生物化学", //Y strin 尼斯名称
ncls: ["01"] //N List 尼斯大类编码列表
},
actionType: "getNcl"
});
}
channel-access/src/http/http.js
...@@ -9,11 +9,6 @@ const service = axios.create({ ...@@ -9,11 +9,6 @@ const service = axios.create({
headers: {} headers: {}
}); });
// // 获取token并带上
// const getToken = function () {
// console.log(0)
// }
// request拦截器 // request拦截器
service.interceptors.request.use( service.interceptors.request.use(
config => { config => {
...@@ -21,14 +16,14 @@ service.interceptors.request.use( ...@@ -21,14 +16,14 @@ service.interceptors.request.use(
if (token) { if (token) {
config.headers["token"] = token; // 让每个请求携带自定义token 请根据实际情况自行修改 config.headers["token"] = token; // 让每个请求携带自定义token 请根据实际情况自行修改
} else { } else {
Message("token已失效") Message("token已失效");
} }
return config; return config;
}, },
error => { error => {
// Do something with request error // Do something with request error
console.log(error); // for debug console.log(error); // for debug
Promise.reject(error, "12321"); Promise.reject(error);
} }
); );
......
channel-access/src/main.js
...@@ -9,15 +9,20 @@ import "./assets/css/reset.scss"; ...@@ -9,15 +9,20 @@ import "./assets/css/reset.scss";
// 请求方法 // 请求方法
import { getTokens } from "@/api/api.js"; import { getTokens } from "@/api/api.js";
import { seveCookie } from "@/utils/getToken.js"; import { seveCookie } from "@/utils/getToken.js";
//复制粘贴插件 //复制粘贴插件
import VueClipboard from "vue-clipboard2"; import VueClipboard from "vue-clipboard2";
Vue.use(VueClipboard);
// 使用bus进行通信
import VueBus from "vue-bus";
getTokens().then(res => { getTokens().then(res => {
//存储token //存储token
seveCookie("token", res.data.data.token); seveCookie("token", res.data.data.token);
}); });
Vue.use(Element); Vue.use(Element);
Vue.use(VueBus);
Vue.use(VueClipboard);
Vue.config.productionTip = false; Vue.config.productionTip = false;
new Vue({ new Vue({
router, router,
......
channel-access/src/store/modules/brandreg/state.js
let state = { let state = {
userName: "" userName: ""
} };
export default state export default state;
\ No newline at end of file
channel-access/src/views/pages/jdtrademark/Jdtmbrandreg.vue
...@@ -6,15 +6,27 @@ ...@@ -6,15 +6,27 @@
<div class="brand-title">商标注册申请</div> <div class="brand-title">商标注册申请</div>
<div class="brand-text"> <div class="brand-text">
<span> <span>
<img src="../../../assets/imgs/dui.png" style="margin-right: 10px;" alt /> <img
src="../../../assets/imgs/dui.png"
style="margin-right: 10px;"
alt
/>
诚信商家 诚信商家
</span> </span>
<span> <span>
<img src="../../../assets/imgs/dui.png" style="margin-right: 10px;" alt /> <img
src="../../../assets/imgs/dui.png"
style="margin-right: 10px;"
alt
/>
1v1专业服务 1v1专业服务
</span> </span>
<span> <span>
<img src="../../../assets/imgs/dui.png" style="margin-right: 10px;" alt /> <img
src="../../../assets/imgs/dui.png"
style="margin-right: 10px;"
alt
/>
省钱省心省力 省钱省心省力
</span> </span>
</div> </div>
...@@ -25,40 +37,53 @@ ...@@ -25,40 +37,53 @@
<div class="swiper-wrapper"> <div class="swiper-wrapper">
<div <div
class="swiper-slide" class="swiper-slide"
v-for="(item,index) in dataList" v-for="(item, index) in dataList"
:key="index" :key="index"
@mouseenter="addActive(index,$event)" @mouseenter="addActive(index, $event)"
:class="{'swiper-slide-enter':index==current}" :class="{ 'swiper-slide-enter': index == current }"
> >
<div <div
class="brandreg-swiper-hearder" class="brandreg-swiper-hearder"
:class="{'brandreg-swiper-hearder-enter':index==current}" :class="{
'brandreg-swiper-hearder-enter': index == current
}"
> >
<div> <div>
<div> <div>
<img :src="item.productLogo" alt /> <img :src="item.productLogo" alt />
</div> </div>
<div>{{item.itemName}}</div> <div>{{ item.item_name }}</div>
</div> </div>
</div> </div>
<div <div
class="brandreg-swiper-content" class="brandreg-swiper-content"
:class="{'brandreg-swiper-content-button-enter':index==current}" :class="{
'brandreg-swiper-content-button-enter': index == current
}"
> >
<ul> <ul>
<li v-for="(t, i) in JSON.parse(item.productDesc).desc" :key="i+t"> <li
v-for="(t, i) in JSON.parse(item.product_desc).desc"
:key="i + t"
>
<div> <div>
<img src="../../../assets/imgs/dbx.png" alt /> <img src="../../../assets/imgs/dbx.png" alt />
</div> </div>
<div>{{t}}</div> <div>{{ t }}</div>
</li> </li>
</ul> </ul>
<div> <div>
<div> <div>
<sup>￥</sup> <sup>￥</sup>
<span>{{item.proPrice}}</span>/件 <span>{{ item.price }}</span
>/件
</div>
<div
class="brandreg-swiper-content-button"
@click="goOwnBuyPage(index)"
>
立即购买
</div> </div>
<div class="brandreg-swiper-content-button" @click="goOwnBuyPage(index)">立即购买</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -73,7 +98,7 @@ ...@@ -73,7 +98,7 @@
<script> <script>
// 注册信息数据请求 // 注册信息数据请求
import { getRegInfo } from "@/api/api.js"; import { getRegInfo } from "@/api/tmOrder.js";
export default { export default {
data() { data() {
...@@ -86,7 +111,8 @@ export default { ...@@ -86,7 +111,8 @@ export default {
mounted() { mounted() {
getRegInfo().then(res => { getRegInfo().then(res => {
// 请求数据并装填到datalist里面 // 请求数据并装填到datalist里面
this.dataList = res.data.data; console.log(res.data);
this.dataList = res.data;
}); });
}, },
methods: { methods: {
......
channel-access/src/views/pages/selftmreg/ApplicationInfo.vue
...@@ -10,30 +10,35 @@ ...@@ -10,30 +10,35 @@
<!-- 申请人信息 --> <!-- 申请人信息 -->
<div class="applicantInfo"> <div class="applicantInfo">
<el-form <el-form
:model="ruleForm" :model="aruleForm"
:rules="rules" :rules="arules"
ref="ruleForm" ref="aruleForm"
label-width="150px" label-width="150px"
class="demo-ruleForm" class="application-ruleForm"
label-position="left" label-position="left"
> >
<el-form-item label="申请人类型：" prop="resource"> <el-form-item label="申请人类型：" prop="resource">
<el-radio-group v-model="ruleForm.resource"> <el-radio-group
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="ruleForm.resource == 1"> <div v-if="aruleForm.resource == 1">
<el-form-item label="公司名称：" prop="name"> <el-form-item label="公司名称：" prop="name">
<el-input <el-input
v-model="ruleForm.name" v-model="aruleForm.name"
placeholder="请输入公司名称" placeholder="请输入公司名称"
@blur="handleInputCompanyNameBlur"
></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="ruleForm.xinyongma" v-model="aruleForm.xinyongma"
placeholder="请输入统一社会信用代码" placeholder="请输入统一社会信用代码"
@blur="handleInputCreditCodeBlur"
></el-input> ></el-input>
<el-popover <el-popover
placement="right-end" placement="right-end"
...@@ -46,41 +51,47 @@ ...@@ -46,41 +51,47 @@
</el-form-item> </el-form-item>
<el-form-item label="执照详细地址：" prop="address"> <el-form-item label="执照详细地址：" prop="address">
<el-input <el-input
v-model="ruleForm.address" v-model="aruleForm.address"
placeholder="请输入执照详细地址" placeholder="请输入执照详细地址"
@blur="handleInputLicenseAddressBlur"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="邮政编码：" prop="postal"> <el-form-item label="邮政编码：" prop="postal">
<el-input <el-input
v-model="ruleForm.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>
<div v-if="ruleForm.resource == 2"> <div v-if="aruleForm.resource == 2">
<el-form-item label="姓名：" prop="name"> <el-form-item label="姓名：" prop="uname">
<el-input <el-input
v-model="ruleForm.username" v-model="aruleForm.uname"
placeholder="请输入您的姓名" placeholder="请输入您的姓名"
@blur="handleInputUserNameBlur"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="身份证号：" prop="name"> <el-form-item label="身份证号：" prop="uid">
<el-input <el-input
v-model="ruleForm.idCard" v-model="aruleForm.uid"
placeholder="请输入您的身份证号" placeholder="请输入您的身份证号"
@blur="handleInputIdCardBlur"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="注册地址：" prop="name"> <el-form-item label="身份证住址：" prop="uaddress">
<el-input <el-input
v-model="ruleForm.idCard" 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="ruleForm.xinyongma" v-model="aruleForm.xinyongma"
placeholder="请输入统一社会信用代码" placeholder="请输入统一社会信用代码"
@blur="handleInputUCreditCodeBlur"
></el-input> ></el-input>
<el-popover <el-popover
placement="right-end" placement="right-end"
...@@ -93,9 +104,10 @@ ...@@ -93,9 +104,10 @@
</el-form-item> </el-form-item>
<el-form-item label="邮政编码：" prop="postal"> <el-form-item label="邮政编码：" prop="postal">
<el-input <el-input
v-model="ruleForm.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>
...@@ -120,18 +132,21 @@ ...@@ -120,18 +132,21 @@
<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="座机：">
...@@ -179,6 +194,24 @@ ...@@ -179,6 +194,24 @@
>。 >。
</div> </div>
</div> </div>
<!-- 如果是个体户，上传身份证明 -->
<div class="from-items">
<div class="from-item-title"><span>*</span>上传材料：身份证明</div>
<div class="upload-box">
<img src="@/assets/imgs/sbzc/sfz.png" alt />
</div>
<div class="upload-box-next">
<img src="@/assets/imgs/sbzc/sfz.png" alt />
<div class="chakan" @click="lookImage(1)">查看大图</div>
</div>
<div class="text">
<i class="el-icon-warning"></i>
格式为<span>PDF</span>或<span>JPG</span>，大小不能超过<span
>10M</span
>
</div>
</div>
<!-- 上传代理委托书 --> <!-- 上传代理委托书 -->
<div class="from-items"> <div class="from-items">
<div class="from-item-title"> <div class="from-item-title">
...@@ -232,7 +265,7 @@ export default { ...@@ -232,7 +265,7 @@ export default {
data() { data() {
return { return {
// 申请人信息表格 及 验证 // 申请人信息表格 及 验证
ruleForm: { aruleForm: {
name: "", name: "",
resource: 1, resource: 1,
xinyongma: "", xinyongma: "",
...@@ -240,9 +273,12 @@ export default { ...@@ -240,9 +273,12 @@ export default {
postal: "", postal: "",
username: "", username: "",
idCard: "", idCard: "",
zhuAddress: "" zhuAddress: "",
uname: "",
uid: "",
uaddress: ""
}, },
rules: { arules: {
resource: [ resource: [
{ required: true, message: "请选择申请人类型", trigger: "change" } { required: true, message: "请选择申请人类型", trigger: "change" }
], ],
...@@ -253,7 +289,16 @@ export default { ...@@ -253,7 +289,16 @@ export default {
address: [ address: [
{ required: true, message: "请输入执照详细地址", trigger: "blur" } { required: true, message: "请输入执照详细地址", trigger: "blur" }
], ],
postal: [{ required: true, message: "请输入邮政编码", trigger: "blur" }] postal: [
{ required: true, message: "请输入邮政编码", trigger: "blur" }
],
uname: [
{ required: true, message: "请输入身份证姓名", trigger: "blur" }
],
uid: [{ required: true, message: "请输入身份证号码", trigger: "blur" }],
uaddress: [
{ required: true, message: "请输入身份证住址", trigger: "blur" }
]
}, },
// 订单联系人表格信息 及验证 // 订单联系人表格信息 及验证
ruleForm: { ruleForm: {
...@@ -292,7 +337,7 @@ export default { ...@@ -292,7 +337,7 @@ export default {
this.chakanKey = index; this.chakanKey = index;
}, },
lookImage(index) { lookImage(index) {
console.log(123123); // console.log(123123);
this.toViewImgType = true; this.toViewImgType = true;
switch (index) { switch (index) {
case 1: case 1:
...@@ -305,6 +350,55 @@ export default { ...@@ -305,6 +350,55 @@ export default {
this.toViewImgSrc = imgUrl3; this.toViewImgSrc = imgUrl3;
break; break;
} }
},
//申请人类型 参数传递
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);
} }
} }
}; };
...@@ -338,6 +432,11 @@ export default { ...@@ -338,6 +432,11 @@ export default {
/* 申请人信息 */ /* 申请人信息 */
.applicantInfo { .applicantInfo {
width: 100%; width: 100%;
.application-ruleForm {
padding-left: 30px;
}
.el-radio { .el-radio {
height: auto; height: auto;
padding: 7px 28px; padding: 7px 28px;
...@@ -381,6 +480,11 @@ export default { ...@@ -381,6 +480,11 @@ export default {
/* 订单联系人 */ /* 订单联系人 */
.orderContact { .orderContact {
width: 100%; width: 100%;
.demo-ruleForm {
padding-left: 30px;
}
.el-radio { .el-radio {
height: auto; height: auto;
padding: 7px 28px; padding: 7px 28px;
...@@ -425,6 +529,8 @@ export default { ...@@ -425,6 +529,8 @@ export default {
.jdindentlist-drawerDetail { .jdindentlist-drawerDetail {
.from-main { .from-main {
width: 100%; width: 100%;
margin-left: 30px;
// 资料上传的文本说明 // 资料上传的文本说明
.text { .text {
margin-top: 25px; margin-top: 25px;
......
channel-access/src/views/pages/selftmreg/ConfirmOrder.vue
...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
<div class="brand-info"> <div class="brand-info">
<p> <p>
<strong>商标类型：</strong> <strong>商标类型：</strong>
<span>文字图标</span> <span>{{ msgFromParent.steponeChoose.type }}</span>
</p> </p>
<p> <p v-if="msgFromParent.steponeChoose.type !== 2">
<strong>商标名称：</strong> <strong>商标名称：</strong>
<span>gongsibao</span> <span>{{ msgFromParent.steponeChoose.tname }}</span>
</p> </p>
<p> <p>
<strong>商标图样：</strong> <strong>商标图样：</strong>
...@@ -54,35 +54,58 @@ ...@@ -54,35 +54,58 @@
<ul> <ul>
<li> <li>
<strong>申请人类型：</strong> <strong>申请人类型：</strong>
<span>企业</span> <span>{{ msgFromParent.steptwoApplication.atype }}</span>
</li> </li>
<li> <li v-if="msgFromParent.steptwoApplication.atype == 1">
<strong>公司名称：</strong> <strong>公司名称：</strong>
<span>company name</span> <span>{{ msgFromParent.steptwoApplication.companyName }}</span>
</li> </li>
<li> <li v-if="msgFromParent.steptwoApplication.atype == 1">
<strong>邮政编码：</strong> <strong>邮政编码：</strong>
<span>463800</span> <span>{{ msgFromParent.steptwoApplication.postalCode }}</span>
</li> </li>
<li> <li v-if="msgFromParent.steptwoApplication.atype == 1">
<strong>公司地址：</strong> <strong>公司地址：</strong>
<span>company address</span> <span>{{ msgFromParent.steptwoApplication.licenseAddress }}</span>
</li>
<li v-if="msgFromParent.steptwoApplication.atype == 2">
<strong>申请人姓名：</strong>
<span>{{ msgFromParent.steptwoApplication.username }}</span>
</li>
<li v-if="msgFromParent.steptwoApplication.atype == 2">
<strong>邮政编码：</strong>
<span>{{ msgFromParent.steptwoApplication.upostalCode }}</span>
</li>
<li v-if="msgFromParent.steptwoApplication.atype == 2">
<strong>申请人地址：</strong>
<span>{{ msgFromParent.steptwoApplication.idAddress }}</span>
</li> </li>
<li> <li>
<strong>联系人：</strong> <strong>联系人：</strong>
<span>reqr</span> <span>{{ msgFromParent.steptwoContact.customer }}</span>
</li> </li>
<li> <li>
<strong>联系电话：</strong> <strong>联系电话：</strong>
<span>13525897326</span> <span>{{ msgFromParent.steptwoContact.telNum }}</span>
</li> </li>
<li> <li>
<strong>电子邮箱：</strong> <strong>电子邮箱：</strong>
<span>12e3r@qq.com</span> <span>{{ msgFromParent.steptwoContact.email }}</span>
</li> </li>
<li> <li v-if="msgFromParent.steptwoApplication.atype == 1">
<strong>信用编码：</strong> <strong>信用编码：</strong>
<span>91110000551350971K</span> <span>{{ msgFromParent.steptwoApplication.creditCode }}</span>
</li>
<li v-if="msgFromParent.steptwoApplication.atype == 2">
<strong>信用编码：</strong>
<span>{{ msgFromParent.steptwoApplication.ucreditCode }}</span>
</li>
<li v-if="msgFromParent.steptwoApplication.atype == 2">
<strong>身份证号：</strong>
<span>{{ msgFromParent.steptwoApplication.idCard }}</span>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -103,6 +126,8 @@ ...@@ -103,6 +126,8 @@
<script> <script>
export default { export default {
props: ["msgFromParent"],
data() { data() {
return { return {
textarea: "" textarea: ""
...@@ -114,7 +139,8 @@ export default { ...@@ -114,7 +139,8 @@ export default {
console.log(222); console.log(222);
// 去第二步骤的页面 // 去第二步骤的页面
} }
} },
mounted() {}
}; };
</script> </script>
......
channel-access/src/views/pages/selftmreg/ModifyTrademark.vue
<!-- 第一步：填写基本信息 商标信息 分类选择--> <!-- 第一步：填写基本信息 商标信息 分类选择-->
<template> <template>
<div> <div>
<!-- <div>{{ stepsParams.steponeChoose.type }}</div> -->
<!-- <button @click="handleClick">click me</button> -->
<!-- 基本信息填写 --> <!-- 基本信息填写 -->
<div class="modifyTrademark"> <div class="modifyTrademark">
<div class="modifyTrademark-main"> <div class="modifyTrademark-main">
...@@ -14,7 +17,10 @@ ...@@ -14,7 +17,10 @@
label-position="left" label-position="left"
> >
<el-form-item label="商标类型：" prop="resource"> <el-form-item label="商标类型：" prop="resource">
<el-radio-group v-model="ruleForm.resource"> <el-radio-group
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>
...@@ -31,6 +37,7 @@ ...@@ -31,6 +37,7 @@
<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
...@@ -47,7 +54,7 @@ ...@@ -47,7 +54,7 @@
<div class="trademarkImg"> <div class="trademarkImg">
<img src="@/assets/imgs/zwtp.png" alt /> <img src="@/assets/imgs/zwtp.png" alt />
</div> </div>
<p class="locate-bottom"> <p class="locate-bottom vertical-bottom">
<i class="el-icon-warning"></i <i class="el-icon-warning"></i
>自动生成的商标图样默认以“宋体”字样自左向右排列递交官方。 >自动生成的商标图样默认以“宋体”字样自左向右排列递交官方。
</p> </p>
...@@ -62,7 +69,7 @@ ...@@ -62,7 +69,7 @@
<div class="trademark-name"> <div class="trademark-name">
<div> <div>
<div class="trademarkImg"> <div class="trademarkImg">
<img src alt /> <img src="@/assets/imgs/sctp.png" alt />
</div> </div>
<div class="p-left"> <div class="p-left">
<p> <p>
...@@ -177,8 +184,12 @@ ...@@ -177,8 +184,12 @@
</template> </template>
<script> <script>
import { getJdbycdetailtmData } from "@/api/api.js"; // import { getNiceQueryLevelOne, getNiceQueryLevelTwo } from "@/api/api.js";
import { getNiceQueryLevelOne, getNiceQueryLevelTwo } from "@/api/tmTools.js";
export default { export default {
// props: ["stepsParams"],
data() { data() {
return { return {
// 基本信息填写 // 基本信息填写
...@@ -280,7 +291,7 @@ export default { ...@@ -280,7 +291,7 @@ export default {
}, },
// 分类信息选择 // 分类信息选择
handleClose(tag) { handleClose(tag) {
console.log(tag); // console.log(tag);
this.classDataList.splice(this.classDataList.indexOf(tag), 1); this.classDataList.splice(this.classDataList.indexOf(tag), 1);
}, },
deleteClassData() { deleteClassData() {
...@@ -302,11 +313,25 @@ export default { ...@@ -302,11 +313,25 @@ export default {
message: "已取消删除" message: "已取消删除"
}); });
}); });
},
// 类型选择 参数传递
handleRadiosChooseClick() {
this.$bus.emit("on-radioschoose-click", this.ruleForm.resource);
},
// 输入名字 参数传递
handleInputBrandnameBlur() {
this.$bus.emit("on-input-brandname-blur", this.ruleForm.name);
} }
}, },
mounted() { mounted() {
getJdbycdetailtmData().then(res => { console.log(0);
console.log(res.data); getNiceQueryLevelOne().then(res => {
console.log(res);
});
getNiceQueryLevelTwo().then(res => {
console.log(res);
}); });
} }
}; };
...@@ -382,6 +407,11 @@ export default { ...@@ -382,6 +407,11 @@ export default {
line-height: 20px; line-height: 20px;
flex: 1; flex: 1;
} }
p.vertical-bottom {
height: 20px;
display: block;
margin-top: 80px;
}
.p-left { .p-left {
flex: 1; flex: 1;
display: flex; display: flex;
......
channel-access/src/views/pages/selftmreg/Selftmreg.vue
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<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" /> <ConfirmOrder v-if="index == 2" :msgFromParent="shareParams" />
<PayOrder v-if="index == 3" /> <PayOrder v-if="index == 3" />
</div> </div>
...@@ -84,17 +84,35 @@ export default { ...@@ -84,17 +84,35 @@ export default {
// 是否已经勾选同意协议 // 是否已经勾选同意协议
checked: false, checked: false,
firstNums: { shareParams: {
one: { steponeChoose: {
type: "ds", type: 1,
name: "", tname: "",
icon: "" icon: ""
}, },
two: { steponeClassify: {
name: "", cname: "",
types: [] types: []
}, },
three: {} steptwoApplication: {
atype: 1,
// 申请人类型：企业
companyName: "",
creditCode: "",
licenseAddress: "",
postalCode: "",
// 申请人类型：个体户
username: "",
idCard: "",
idAddress: "",
ucreditCode: "",
upostalCode: ""
},
steptwoContact: {
customer: "",
telNum: "",
email: ""
}
} }
}; };
}, },
...@@ -138,6 +156,63 @@ export default { ...@@ -138,6 +156,63 @@ export default {
// 加载上一步的组件 // 加载上一步的组件
this.index--; this.index--;
} }
},
mounted() {
// 类型选择 参数更新
this.$bus.on("on-radioschoose-click", msg => {
this.shareParams.steponeChoose.type = msg;
});
// 输入名字 参数更新
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.shareParams.steptwoContact.customer = msg;
});
// 联系电话 参数更新
this.$bus.on("on-input-telnum-blur", msg => {
this.shareParams.steptwoContact.telNum = msg;
});
// 电子邮箱 参数更新
this.$bus.on("on-input-email-blur", msg => {
this.shareParams.steptwoContact.email = msg;
});
} }
}; };
</script> </script>
......
channel-access/vue.config.js
module.exports = { module.exports = {
outputDir: 'dist', //build输出目录 outputDir: "dist", //build输出目录
assetsDir: 'assets', //静态资源目录（js, css, img） assetsDir: "assets", //静态资源目录（js, css, img）
lintOnSave: false, //是否开启eslint lintOnSave: false, //是否开启eslint
devServer: { devServer: {
open: true, //是否自动弹出浏览器页面 open: true, //是否自动弹出浏览器页面
host: "localhost", host: "localhost",
port: '8080', port: "8080",
https: false, https: false,
hotOnly: false, hotOnly: false,
proxy: { proxy: {
'/api': { "/api": {
target: 'http://zcchannel.gongsibao.com:4003', //API服务器的地址 target: "http://zcchannel.gongsibao.com:4003", //API服务器的地址
ws: true, //代理websockets ws: true, //代理websockets
changeOrigin: true, // 虚拟的站点需要更管origin changeOrigin: true, // 虚拟的站点需要更管origin
pathRewrite: { //重写路径 比如'/api/aaa/ccc'重写为'/aaa/ccc' pathRewrite: {
'^/api': '' //重写路径 比如'/api/aaa/ccc'重写为'/aaa/ccc'
} "^/api": ""
} }
}, },
"/a": {
target: "http://tm.plus.jdcloud.com:4003", //API服务器的地址
ws: true, //代理websockets
changeOrigin: true, // 虚拟的站点需要更管origin
pathRewrite: {
//重写路径 比如'/api/aaa/ccc'重写为'/aaa/ccc'
"^/a": ""
}
}
}
} }
} };
\ No newline at end of file \ No newline at end of file
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