Skip to content

Z
zhichan
Commit 763a5d92 by 尹亚亭
Options

0117

parent c42cb7a9
Showing with 261 additions and 92 deletions
channel-access/src/api/api.js
import axios from "axios"; import axios from "axios";
let baseUrl = "/web/auth/accessAuth/getAppTokenByHosts"; let baseUrl = "api/web/auth/accessAuth/getAppTokenByHosts";
//获取token //获取token
export function getTokens() { export function getTokens() {
return axios.post(baseUrl, { return axios.post(baseUrl, {
......
channel-access/src/api/tmOrder.js
import http from "@/http/http.js"; import http from "@/http/http.js";
let baseUrl = "/web/action/tmOrder/springBoard"; let baseUrl = "api/web/action/tmOrder/springBoard";
// 获取jdtrademark商标注册申请类型：自主/专家辅助/担保 卡片信息 // 获取jdtrademark商标注册申请类型：自主/专家辅助/担保 卡片信息
// 产品列表-根据产品大类获取-应用中心 // 产品列表-根据产品大类获取-应用中心
...@@ -16,15 +16,87 @@ export function getProductListCards() { ...@@ -16,15 +16,87 @@ export function getProductListCards() {
// 产品详情:点击首页的 专家辅助申请 和 担保申请-进入相应的专家辅助申请 和 担保申请产品详情页面 // 产品详情:点击首页的 专家辅助申请 和 担保申请-进入相应的专家辅助申请 和 担保申请产品详情页面
// 产品详情-应用中心 // 产品详情-应用中心
export function getProductDetail() { export function getProductDetail(channelitemcode) {
return http.post(baseUrl, { return http.post(baseUrl, {
actionBody: { actionBody: {
// 自助: FW_GOODS-581976-1 // 自助: FW_GOODS-581976-1
// 辅助：FW_GOODS-580010-1 // 辅助：FW_GOODS-580010-1
// 担保：FW_GOODS-581978-1 // 担保：FW_GOODS-581978-1
channelItemCode: "FW_GOODS-581978-1" channelItemCode: channelitemcode
}, },
actionType: "getCAProductDetail", actionType: "getCAProductDetail",
actionProcess: "bw" actionProcess: "bw"
}); });
} }
// 自主提报商标注册方式的获取订单编号
// 商标提报
export function subSelfregTmOrder(channelitemcode) {
return http.post(baseUrl, {
actionBody: {
apply: {
applyAddr: "上海市杨浦区国定路346号三楼0624室",
applyArea: "",
businessLicensePic:
"https://gsb-zc.oss-cn-beijing.aliyuncs.com/zc_yyzz120315554031547442019316.jpg",
businessLicensePdf:
"https://gsb-zc.oss-cn-beijing.aliyuncs.com/zc_yyzz120315554031547442019316.pdf",
code: "91310110398635929J",
contacts: "宋毅",
customerType: "ent",
email: "songyi@gongsibao.com",
fax: "",
identityCardNo: "",
identityCardPic: "",
identityCardPdf: "",
mobile: "15010929368",
name: "上海辰者信息科技有限公司",
notes: "订单备注信息",
gzwtsUrl:
"https://gsb-zc.oss-cn-beijing.aliyuncs.com/zc_wts863215710393842862019914.jpg",
smwjUrl: "",
zipCode: "100000"
},
channelOrder: {
channelServiceNo: "z1203155540315474420",
channelOrderNo: "z12031,z1203d1",
needNo: "z120303d1",
quantity: 1,
nclCount: 10,
payStatus: "yfk",
payTime: "2019-09-11 10:23:21"
},
channelUser: {
channelUserId: "z1203155540315474420",
channelUserName: "testUser",
channelUserMoblie: "15010929368",
nickname: "",
orgName: "",
orgPath: ""
},
nclones: [
{
code: "02",
name: "颜料油漆",
nclThree: [
{
code: "020008",
disabled: false,
fullname: "020008 绘画用铝粉",
name: "绘画用铝粉",
pcode: "0202"
},
{
code: "020005",
disabled: false,
fullname: "020005 食品用着色剂",
name: "食品用着色剂",
pcode: "0203"
}
]
}
]
},
actionType: "subTmOrder"
});
}
channel-access/src/api/tmQuery.js
import http from "@/http/http.js"; import http from "@/http/http.js";
let baseUrl = "/web/action/tmQuery/springBoard"; let baseUrl = "api/web/action/tmQuery/springBoard";
// 商标详情查询接口 // 商标详情查询接口
export function tradeMarkDetail(params) { export function tradeMarkDetail(params) {
......
channel-access/src/api/tmTools.js
import http from "@/http/http.js"; import http from "@/http/http.js";
import axios from "axios"; import axios from "axios";
let baseUrl = "/web/action/tmTools/springBoard"; let baseUrl = "api/web/action/tmTools/springBoard";
// 获取selftmreg的尼斯查询 一级查询得到二级树 二级查询得到三级树 // 获取selftmreg的尼斯查询 一级查询得到二级树 二级查询得到三级树
export function getNiceQueryCategory(nclcodeSCode) { export function getNiceQueryCategory(nclcodeSCode) {
...@@ -84,7 +84,8 @@ export function getEntregistryByCompanyName(name) { ...@@ -84,7 +84,8 @@ export function getEntregistryByCompanyName(name) {
//企业注册信息查询2 //企业注册信息查询2
export function getEntregistryByCompanyName2(name) { export function getEntregistryByCompanyName2(name) {
return axios.post( return axios.post(
"http://boss.gongsibao.com/api/gsbicsearch/companynameonesearch", { "http://boss.gongsibao.com/api/gsbicsearch/companynameonesearch",
{
appKey: "c90f935cd5ec49ff848edad31f53c14d", appKey: "c90f935cd5ec49ff848edad31f53c14d",
companyName: name companyName: name
} }
...@@ -94,7 +95,8 @@ export function getEntregistryByCompanyName2(name) { ...@@ -94,7 +95,8 @@ export function getEntregistryByCompanyName2(name) {
//股东 //股东
export function getGuDong(name) { export function getGuDong(name) {
return axios.post( return axios.post(
"http://boss.gongsibao.com/api/gsbicsearch/shareholdersearch", { "http://boss.gongsibao.com/api/gsbicsearch/shareholdersearch",
{
appKey: "c90f935cd5ec49ff848edad31f53c14d", appKey: "c90f935cd5ec49ff848edad31f53c14d",
companyName: name companyName: name
} }
......
channel-access/src/components/globalheader.vue
...@@ -65,9 +65,9 @@ export default { ...@@ -65,9 +65,9 @@ export default {
case "myMsg": case "myMsg":
break; break;
case "exit": case "exit":
console.log(this.userpin) console.log(this.userpin);
logout(this.userpin).then(res => { logout(this.userpin).then(res => {
console.log(res) console.log(res);
if (res.status == 0) { if (res.status == 0) {
removeCookie("userpin"); removeCookie("userpin");
removeCookie("username"); removeCookie("username");
...@@ -89,7 +89,7 @@ export default { ...@@ -89,7 +89,7 @@ export default {
<style lang="scss"> <style lang="scss">
.globalheader-red { .globalheader-red {
background: rgb(46, 35, 35) !important; background: rgb(226, 87, 87) !important;
} }
.globalheader { .globalheader {
width: 100%; width: 100%;
......
channel-access/src/router/index.js
import Vue from "vue"; import Vue from "vue";
import VueRouter from "vue-router"; import VueRouter from "vue-router";
// import { getCookie } from "@/utils/getToken.js"; import { getCookie } from "@/utils/getToken.js";
Vue.use(VueRouter); Vue.use(VueRouter);
const routes = [{ const routes = [
{
path: "/home", path: "/home",
name: "home", name: "home",
component: () => component: () => import("@/views/pages/home")
import ("@/views/pages/home")
}, },
{ {
path: "/companyinformation", path: "/companyinformation",
name: "companyinformation", name: "companyinformation",
component: () => component: () => import("@/views/pages/companyinformation")
import ("@/views/pages/companyinformation")
}, },
{ {
path: "/", path: "/",
...@@ -25,101 +24,86 @@ const routes = [{ ...@@ -25,101 +24,86 @@ const routes = [{
path: "/user", path: "/user",
name: "user", name: "user",
redirect: "/user/login", redirect: "/user/login",
component: () => component: () => import("@/views/pages/user"),
import ("@/views/pages/user"), children: [
children: [{ {
path: "login", path: "login",
name: "login", name: "login",
component: () => component: () => import("@/views/pages/user/login")
import ("@/views/pages/user/login")
}, },
{ {
path: "register", path: "register",
name: "register", name: "register",
component: () => component: () => import("@/views/pages/user/register")
import ("@/views/pages/user/register")
}, },
{ {
path: "forgetpassword", path: "forgetpassword",
name: "forgetpassword", name: "forgetpassword",
component: () => component: () => import("@/views/pages/user/forgetPassword")
import ("@/views/pages/user/forgetPassword")
} }
] ]
}, },
{ {
path: "/cashier", path: "/cashier",
name: "cashier", name: "cashier",
component: () => component: () => import("@/views/pages/cashier")
import ("@/views/pages/cashier")
}, },
{ {
path: "/productdetails", path: "/productdetails",
name: "productdetails", name: "productdetails",
component: () => component: () => import("@/views/pages/productdetails")
import ("@/views/pages/productdetails")
}, },
{ {
path: "/successfulpayment", path: "/successfulpayment",
name: "successfulpayment", name: "successfulpayment",
component: () => component: () => import("@/views/pages/successfulpayment")
import ("@/views/pages/successfulpayment")
}, },
{ {
path: "/placeorder", path: "/placeorder",
name: "placeorder", name: "placeorder",
component: () => component: () => import("@/views/pages/placeorder")
import ("@/views/pages/placeorder")
}, },
{ {
path: "/jdbycdetailtm", path: "/jdbycdetailtm",
name: "jdbycdetailtm", name: "jdbycdetailtm",
component: () => component: () => import("@/views/pages/jdbycdetailtm")
import ("@/views/pages/jdbycdetailtm")
}, },
{ {
path: "/companydetail", path: "/companydetail",
name: "companydetail", name: "companydetail",
component: () => component: () => import("@/views/pages/companydetail")
import ("@/views/pages/companydetail")
}, },
{ {
path: "/jdindentlist", path: "/jdindentlist",
name: "jdindentlist", name: "jdindentlist",
component: () => component: () => import("@/views/pages/jdindentlist")
import ("@/views/pages/jdindentlist")
}, },
{ {
path: "/jdindentdetail", path: "/jdindentdetail",
name: "jdindentdetail", name: "jdindentdetail",
component: () => component: () => import("@/views/pages/jdindentdetail")
import ("@/views/pages/jdindentdetail")
}, },
///////// /////////
{ {
path: "/jdtrademark", path: "/jdtrademark",
name: "jdtrademark", name: "jdtrademark",
component: () => component: () => import("@/views/pages/jdtrademark/Jdtrademark")
import ("@/views/pages/jdtrademark/Jdtrademark")
}, },
{ {
path: "/selftmreg", path: "/selftmreg",
name: "selftmreg", name: "selftmreg",
component: () => component: () => import("@/views/pages/selftmreg/Selftmreg")
import ("@/views/pages/selftmreg/Selftmreg")
}, },
{ {
path: "/guaranteereg", path: "/guaranteereg",
name: "guaranteereg", name: "guaranteereg",
component: () => component: () => import("@/views/pages/guaranteereg/Guaranteereg")
import ("@/views/pages/guaranteereg/Guaranteereg")
}, },
{ {
// path: "/bycnoticeindex", // path: "/bycnoticeindex",
path: "/bycnoticeindex", path: "/bycnoticeindex",
name: "bycnoticeindex", name: "bycnoticeindex",
component: () => component: () => import("@/views/pages/bycnoticeindex/Bycnoticeindex")
import ("@/views/pages/bycnoticeindex/Bycnoticeindex")
} }
]; ];
const router = new VueRouter({ const router = new VueRouter({
...@@ -133,22 +117,22 @@ const router = new VueRouter({ ...@@ -133,22 +117,22 @@ const router = new VueRouter({
} }
}); });
// router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
// let userpin = getCookie("userpin"); let userpin = getCookie("userpin");
// if ( if (
// to.path == "/user/login" || to.path == "/user/login" ||
// to.path == "/user/register" || to.path == "/user/register" ||
// to.path == "/user/forgetPassword" || to.path == "/user/forgetPassword" ||
// to.path == "/jdtrademark" to.path == "/jdtrademark"
// ) { ) {
// next(); next();
// } else { } else {
// if (userpin == "" || userpin == null) { if (userpin == "" || userpin == null) {
// next("/user/login"); next("/user/login");
// } else { } else {
// next(); next();
// } }
// } }
// }); });
export default router; export default router;
channel-access/src/views/pages/guaranteereg/Guaranteereg.vue
...@@ -7,34 +7,71 @@ ...@@ -7,34 +7,71 @@
<el-breadcrumb-item :to="{ path: '/jdtrademark' }" <el-breadcrumb-item :to="{ path: '/jdtrademark' }"
>首页</el-breadcrumb-item >首页</el-breadcrumb-item
> >
<el-breadcrumb-item>担保商标注册</el-breadcrumb-item> <el-breadcrumb-item>{{
productDetails.channel_item_name
}}</el-breadcrumb-item>
</el-breadcrumb> </el-breadcrumb>
</div> </div>
<div class="productdetails-main-detail"> <div class="productdetails-main-detail">
<div class="productdetails-left"> <div class="productdetails-left">
<img src="@/assets/imgs/商标注册-担保申请.png" alt="" /> <img :src="productDetails.pic_url" alt="" />
</div> </div>
<div class="productdetails-right"> <div class="productdetails-right">
<h1>担保商标注册</h1> <h1>{{ productDetails.item_name }}</h1>
<p> <p v-if="regType == 'FW_GOODS-580010-1'">
专业知产顾问一对一商标检索分析，提高注册效率，为您优化注册方案，全方位保护
</p>
<p v-if="regType == 'FW_GOODS-581978-1'">
专业知产顾问一对一商标检索分析，提高注册成功率，注册不成功，全额退款！ 专业知产顾问一对一商标检索分析，提高注册成功率，注册不成功，全额退款！
</p> </p>
<div class="priceMsg"> <div class="priceMsg">
<div> <div v-if="productPriceList.length != 0">
<span <!-- <span
>总价<b>¥{{ (servicecharge + officialfee) * count }}</b></span >总价<b>¥{{ (servicecharge + officialfee) * count }}</b></span
> -->
<span
>总价<b
>¥{{ productPriceList[clickedproduct].price * count }}</b
></span
> >
<span <span
>官費<b>¥{{ officialfee }}</b></span >官費<b
>¥{{ productPriceList[clickedproduct].public_expense }}</b
></span
> >
<span <span
>服务费<b>¥{{ servicecharge }}</b></span >服务费<b
>¥{{ productPriceList[clickedproduct].service_charge }}</b
></span
> >
</div> </div>
<p> <p>
该服务由公司宝提供，<span>发票请到订单中心-发票管理开取</span> 该服务由公司宝提供，<span>发票请到订单中心-发票管理开取</span>
</p> </p>
</div> </div>
<div class="product-service-type">
<table>
<tbody>
<tr>
<td class="td-title">商标注册申请服务项目</td>
<td class="td-cont">
<ul class="clearfix">
<li
data-no="PC10064"
class="list"
:class="{ active: clickedproduct == index }"
v-for="(item, index) in productPriceList"
:key="index"
@click="clickedproduct = index"
>
{{ item.price_type_name }}
</li>
</ul>
</td>
</tr>
</tbody>
</table>
</div>
<div class="productdetail-count"> <div class="productdetail-count">
<p>数量</p> <p>数量</p>
<el-input-number <el-input-number
...@@ -52,7 +89,8 @@ ...@@ -52,7 +89,8 @@
<div class="productdetails-main-space"></div> <div class="productdetails-main-space"></div>
<div class="productdetails-main-bottom-pic"> <div class="productdetails-main-bottom-pic">
<h3><span>产品详情</span><i></i></h3> <h3><span>产品详情</span><i></i></h3>
<img src="@/assets/imgs/dbsqPic.jpg" alt="" /> <!-- <img src="@/assets/imgs/dbsqPic.jpg" alt="" /> -->
<img :src="productDetails.desc_url" alt="" />
</div> </div>
</div> </div>
</div> </div>
...@@ -65,33 +103,50 @@ export default { ...@@ -65,33 +103,50 @@ export default {
data() { data() {
return { return {
count: 1, count: 1,
officialfee: 300, clickedproduct: 0,
servicecharge: 1080, productDetails: {},
productDetails: {} productPriceList: []
}; };
}, },
methods: { methods: {
goPlaceOrder() { goPlaceOrder() {
this.$router.push({ this.$router.push({
path: "/placeorder", path: "/placeorder",
query: { query: {
count: this.count, count: this.count
type: "zjfz"
} }
}); });
} }
}, },
created() { created() {
getProductDetail().then(res => { this.regType = this.$route.query.channelItemCode;
// 专家辅助申请 或是 担保申请
getProductDetail(this.$route.query.channelItemCode).then(res => {
// 请求数据并装填到productDetails里面 // 请求数据并装填到productDetails里面
if (res.status == 0) {
// if (res.) { if (res.data.length == 0) {
this.$notify({
// } title: "警告",
console.log(res.data); message: "没有该商品",
this.productDetails = res.data; type: "warning"
});
// alert("服务器返回的数据为空");
} else {
this.productDetails = res.data[0];
console.log("注册申请", this.productDetails);
this.productPriceList = res.data[0].productPriceList;
console.log("服务项", this.productPriceList);
}
} else {
this.$notify.error({
title: "错误",
message: res.msg
}); });
} }
});
},
mounted() {}
}; };
</script> </script>
...@@ -119,13 +174,15 @@ export default { ...@@ -119,13 +174,15 @@ export default {
display: flex; display: flex;
padding: 20px 0; padding: 20px 0;
.productdetails-left { .productdetails-left {
display: inline-block; display: block;
width: 400px; width: 400px;
height: 340px; height: 340px;
border: 1px solid rgba(207, 207, 207, 1); border: 1px solid rgba(207, 207, 207, 1);
margin-right: 40px; margin-right: 40px;
img { img {
display: block; display: block;
width: 400px;
height: 340px;
} }
} }
.productdetails-right { .productdetails-right {
...@@ -186,6 +243,41 @@ export default { ...@@ -186,6 +243,41 @@ export default {
} }
} }
} }
// 商标注册服务类型：专家辅助申请 担保申请
.product-service-type {
.td-title {
color: #888;
width: 165px;
text-align: left;
}
.td-cont {
.list {
display: inline-block;
margin: 5px 0;
color: #666;
height: 30px;
line-height: 30px;
padding: 0 12px;
border: solid 1px #ccc;
border-radius: 2px;
cursor: pointer;
margin-right: 15px;
position: relative;
font-size: 14px;
}
.list.active {
color: #fc461e;
border: solid 0.9px #fc461e;
}
.clearfix:after {
content: "";
display: block;
clear: both;
height: 0;
visibility: hidden;
}
}
}
.productdetail-count { .productdetail-count {
display: flex; display: flex;
align-items: center; align-items: center;
......
channel-access/src/views/pages/jdtrademark/Jdtmbrandreg.vue
...@@ -112,7 +112,8 @@ export default { ...@@ -112,7 +112,8 @@ export default {
getProductListCards().then(res => { getProductListCards().then(res => {
// 请求数据并装填到datalist里面 // 请求数据并装填到datalist里面
// console.log(res.data); // console.log(res.data);
this.dataList = res.data; this.dataList = res.data.splice(0, 3);
// console.log(this.dataList);
}); });
}, },
methods: { methods: {
...@@ -126,10 +127,26 @@ export default { ...@@ -126,10 +127,26 @@ export default {
this.$router.push("/selftmreg"); this.$router.push("/selftmreg");
} }
if (index == 1) { if (index == 1) {
this.$router.push("/productdetails"); // this.$router.push("/productdetails");
this.$router.push({
path: `/guaranteereg`,
query: {
// sdsId: "fzsbzc"
channelItemCode: "FW_GOODS-580010-1"
}
});
// 获取：this.$route.query
} }
if (index == 2) { if (index == 2) {
this.$router.push("/guaranteereg"); // this.$router.push("/guaranteereg");
this.$router.push({
path: `/guaranteereg`,
query: {
// sdsId: "dbsbzc"
channelItemCode: "FW_GOODS-581978-1"
}
});
} }
} }
} }
......
channel-access/src/views/pages/selftmreg/ConfirmOrder.vue
...@@ -278,6 +278,8 @@ export default { ...@@ -278,6 +278,8 @@ export default {
// 获取缓存里面的商标图片地址 // 获取缓存里面的商标图片地址
let brandIcon = localStorage.getItem("icon"); let brandIcon = localStorage.getItem("icon");
this.brandIcon = brandIcon; this.brandIcon = brandIcon;
// 确认订单编号的请求
} }
}; };
</script> </script>
......
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