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 @@
"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="
},
"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": {
"version": "5.0.0",
"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 @@
"js-cookie": "^2.2.1",
"vue": "^2.6.10",
"vue-clipboard2": "^0.3.1",
"vue-bus": "^1.2.1",
"vue-router": "^3.1.3",
"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({
headers: {}
});
// // 获取token并带上
// const getToken = function () {
// console.log(0)
// }
// request拦截器
service.interceptors.request.use(
config => {
......@@ -21,14 +16,14 @@ service.interceptors.request.use(
if (token) {
config.headers["token"] = token; // 让每个请求携带自定义token 请根据实际情况自行修改
} else {
Message("token已失效")
Message("token已失效");
}
return config;
},
error => {
// Do something with request error
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";
// 请求方法
import { getTokens } from "@/api/api.js";
import { seveCookie } from "@/utils/getToken.js";
//复制粘贴插件
import VueClipboard from "vue-clipboard2";
Vue.use(VueClipboard);
// 使用bus进行通信
import VueBus from "vue-bus";
getTokens().then(res => {
//存储token
seveCookie("token", res.data.data.token);
});
Vue.use(Element);
Vue.use(VueBus);
Vue.use(VueClipboard);
Vue.config.productionTip = false;
new Vue({
router,
......
channel-access/src/store/modules/brandreg/state.js
let state = {
userName: ""
}
};
export default state
\ No newline at end of file
export default state;
channel-access/src/views/pages/jdtrademark/Jdtmbrandreg.vue
......@@ -6,15 +6,27 @@
<div class="brand-title">商标注册申请</div>
<div class="brand-text">
<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>
<img src="../../../assets/imgs/dui.png" style="margin-right: 10px;" alt />
<img
src="../../../assets/imgs/dui.png"
style="margin-right: 10px;"
alt
/>
1v1专业服务
</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>
</div>
......@@ -25,40 +37,53 @@
<div class="swiper-wrapper">
<div
class="swiper-slide"
v-for="(item,index) in dataList"
v-for="(item, index) in dataList"
:key="index"
@mouseenter="addActive(index,$event)"
:class="{'swiper-slide-enter':index==current}"
@mouseenter="addActive(index, $event)"
:class="{ 'swiper-slide-enter': index == current }"
>
<div
class="brandreg-swiper-hearder"
:class="{'brandreg-swiper-hearder-enter':index==current}"
:class="{
'brandreg-swiper-hearder-enter': index == current
}"
>
<div>
<div>
<img :src="item.productLogo" alt />
</div>
<div>{{item.itemName}}</div>
<div>{{ item.item_name }}</div>
</div>
</div>
<div
class="brandreg-swiper-content"
:class="{'brandreg-swiper-content-button-enter':index==current}"
:class="{
'brandreg-swiper-content-button-enter': index == current
}"
>
<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>
<img src="../../../assets/imgs/dbx.png" alt />
</div>
<div>{{t}}</div>
<div>{{ t }}</div>
</li>
</ul>
<div>
<div>
<sup>￥</sup>
<span>{{item.proPrice}}</span>/件
<span>{{ item.price }}</span
>/件
</div>
<div
class="brandreg-swiper-content-button"
@click="goOwnBuyPage(index)"
>
立即购买
</div>
<div class="brandreg-swiper-content-button" @click="goOwnBuyPage(index)">立即购买</div>
</div>
</div>
</div>
......@@ -73,7 +98,7 @@
<script>
// 注册信息数据请求
import { getRegInfo } from "@/api/api.js";
import { getRegInfo } from "@/api/tmOrder.js";
export default {
data() {
......@@ -86,7 +111,8 @@ export default {
mounted() {
getRegInfo().then(res => {
// 请求数据并装填到datalist里面
this.dataList = res.data.data;
console.log(res.data);
this.dataList = res.data;
});
},
methods: {
......
channel-access/src/views/pages/selftmreg/ConfirmOrder.vue
......@@ -15,11 +15,11 @@
<div class="brand-info">
<p>
<strong>商标类型：</strong>
<span>文字图标</span>
<span>{{ msgFromParent.steponeChoose.type }}</span>
</p>
<p>
<p v-if="msgFromParent.steponeChoose.type !== 2">
<strong>商标名称：</strong>
<span>gongsibao</span>
<span>{{ msgFromParent.steponeChoose.tname }}</span>
</p>
<p>
<strong>商标图样：</strong>
......@@ -54,35 +54,58 @@
<ul>
<li>
<strong>申请人类型：</strong>
<span>企业</span>
<span>{{ msgFromParent.steptwoApplication.atype }}</span>
</li>
<li>
<li v-if="msgFromParent.steptwoApplication.atype == 1">
<strong>公司名称：</strong>
<span>company name</span>
<span>{{ msgFromParent.steptwoApplication.companyName }}</span>
</li>
<li>
<li v-if="msgFromParent.steptwoApplication.atype == 1">
<strong>邮政编码：</strong>
<span>463800</span>
<span>{{ msgFromParent.steptwoApplication.postalCode }}</span>
</li>
<li>
<li v-if="msgFromParent.steptwoApplication.atype == 1">
<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>
<strong>联系人：</strong>
<span>reqr</span>
<span>{{ msgFromParent.steptwoContact.customer }}</span>
</li>
<li>
<strong>联系电话：</strong>
<span>13525897326</span>
<span>{{ msgFromParent.steptwoContact.telNum }}</span>
</li>
<li>
<strong>电子邮箱：</strong>
<span>12e3r@qq.com</span>
<span>{{ msgFromParent.steptwoContact.email }}</span>
</li>
<li>
<li v-if="msgFromParent.steptwoApplication.atype == 1">
<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>
</ul>
</div>
......@@ -103,6 +126,8 @@
<script>
export default {
props: ["msgFromParent"],
data() {
return {
textarea: ""
......@@ -114,7 +139,8 @@ export default {
console.log(222);
// 去第二步骤的页面
}
}
},
mounted() {}
};
</script>
......
channel-access/src/views/pages/selftmreg/ModifyTrademark.vue
<!-- 第一步：填写基本信息 商标信息 分类选择-->
<template>
<div>
<!-- <div>{{ stepsParams.steponeChoose.type }}</div> -->
<!-- <button @click="handleClick">click me</button> -->
<!-- 基本信息填写 -->
<div class="modifyTrademark">
<div class="modifyTrademark-main">
......@@ -14,7 +17,10 @@
label-position="left"
>
<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="2">图形</el-radio>
<el-radio :label="3">文字及图形</el-radio>
......@@ -31,6 +37,7 @@
<el-input
v-model="ruleForm.name"
placeholder="请输入商标名称"
@blur="handleInputBrandnameBlur"
></el-input>
</el-form-item>
<el-form-item
......@@ -47,7 +54,7 @@
<div class="trademarkImg">
<img src="@/assets/imgs/zwtp.png" alt />
</div>
<p class="locate-bottom">
<p class="locate-bottom vertical-bottom">
<i class="el-icon-warning"></i
>自动生成的商标图样默认以“宋体”字样自左向右排列递交官方。
</p>
......@@ -62,7 +69,7 @@
<div class="trademark-name">
<div>
<div class="trademarkImg">
<img src alt />
<img src="@/assets/imgs/sctp.png" alt />
</div>
<div class="p-left">
<p>
......@@ -177,8 +184,12 @@
</template>
<script>
import { getJdbycdetailtmData } from "@/api/api.js";
// import { getNiceQueryLevelOne, getNiceQueryLevelTwo } from "@/api/api.js";
import { getNiceQueryLevelOne, getNiceQueryLevelTwo } from "@/api/tmTools.js";
export default {
// props: ["stepsParams"],
data() {
return {
// 基本信息填写
......@@ -280,7 +291,7 @@ export default {
},
// 分类信息选择
handleClose(tag) {
console.log(tag);
// console.log(tag);
this.classDataList.splice(this.classDataList.indexOf(tag), 1);
},
deleteClassData() {
......@@ -302,11 +313,25 @@ export default {
message: "已取消删除"
});
});
},
// 类型选择 参数传递
handleRadiosChooseClick() {
this.$bus.emit("on-radioschoose-click", this.ruleForm.resource);
},
// 输入名字 参数传递
handleInputBrandnameBlur() {
this.$bus.emit("on-input-brandname-blur", this.ruleForm.name);
}
},
mounted() {
getJdbycdetailtmData().then(res => {
console.log(res.data);
console.log(0);
getNiceQueryLevelOne().then(res => {
console.log(res);
});
getNiceQueryLevelTwo().then(res => {
console.log(res);
});
}
};
......@@ -382,6 +407,11 @@ export default {
line-height: 20px;
flex: 1;
}
p.vertical-bottom {
height: 20px;
display: block;
margin-top: 80px;
}
.p-left {
flex: 1;
display: flex;
......
channel-access/src/views/pages/selftmreg/Selftmreg.vue
......@@ -25,7 +25,7 @@
<ModifyTrademark v-if="index == 0" />
<ApplicationInfo v-if="index == 1" />
<ConfirmOrder v-if="index == 2" />
<ConfirmOrder v-if="index == 2" :msgFromParent="shareParams" />
<PayOrder v-if="index == 3" />
</div>
......@@ -84,17 +84,35 @@ export default {
// 是否已经勾选同意协议
checked: false,
firstNums: {
one: {
type: "ds",
name: "",
shareParams: {
steponeChoose: {
type: 1,
tname: "",
icon: ""
},
two: {
name: "",
steponeClassify: {
cname: "",
types: []
},
three: {}
steptwoApplication: {
atype: 1,
// 申请人类型：企业
companyName: "",
creditCode: "",
licenseAddress: "",
postalCode: "",
// 申请人类型：个体户
username: "",
idCard: "",
idAddress: "",
ucreditCode: "",
upostalCode: ""
},
steptwoContact: {
customer: "",
telNum: "",
email: ""
}
}
};
},
......@@ -138,6 +156,63 @@ export default {
// 加载上一步的组件
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>
......
channel-access/vue.config.js
module.exports = {
outputDir: 'dist', //build输出目录
assetsDir: 'assets', //静态资源目录（js, css, img）
outputDir: "dist", //build输出目录
assetsDir: "assets", //静态资源目录（js, css, img）
lintOnSave: false, //是否开启eslint
devServer: {
open: true, //是否自动弹出浏览器页面
host: "localhost",
port: '8080',
port: "8080",
https: false,
hotOnly: false,
proxy: {
'/api': {
target: 'http://zcchannel.gongsibao.com:4003', //API服务器的地址
"/api": {
target: "http://zcchannel.gongsibao.com:4003", //API服务器的地址
ws: true, //代理websockets
changeOrigin: true, // 虚拟的站点需要更管origin
pathRewrite: { //重写路径 比如'/api/aaa/ccc'重写为'/aaa/ccc'
'^/api': ''
}
pathRewrite: {
//重写路径 比如'/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