Skip to content

Z
zhichan
Commit 0df1f3e8 by 任建
Options

rj

parent 3f07b7dc
Showing with 765 additions and 70 deletions
channel-access/src/App.vue
<template> <template>
<!-- 根组件 --> <!-- 根组件 -->
<div id="app" ref="app"> <div id="app" ref="app">
<Globalheader title="" />
<router-view /> <router-view />
<Globalfooter /> <Globalfooter />
</div> </div>
</template> </template>
<script> <script>
import Globalheader from "@/components/globalheader";
import Globalfooter from "@/components/globalfooter"; import Globalfooter from "@/components/globalfooter";
export default { export default {
components: { components: {
Globalheader,
Globalfooter Globalfooter
} }
}; };
......
channel-access/src/api/paymentApi.js 0 → 100644
import http from "@/http/http.js";
let baseUrl = "/api/payment/paymentApi/getQrCode";
export function paymentApi(params) {
return http.post(baseUrl, {
actionType: "paypc",
actionBody: {
uapp_id: "12312312312", //平台渠道ID
order_num: "13221321321", //支付单号
total_fee: "1", //支付金额 分
body_desc: "146564", //产品名称
opType: "2" //支付方式 alipay阿里 wx微信
}
});
}
\ No newline at end of file
channel-access/src/api/tmTools.js
...@@ -4,21 +4,31 @@ let baseUrl3 = "/api/web/action/tmTools/springBoard"; ...@@ -4,21 +4,31 @@ let baseUrl3 = "/api/web/action/tmTools/springBoard";
// 获取selftmreg的尼斯查询 一级查询得到二级树 // 获取selftmreg的尼斯查询 一级查询得到二级树
export function getNiceQueryLevelOne() { export function getNiceQueryLevelOne() {
return http.post(baseUrl3, { return http.post(baseUrl3, {
actionBody: { actionBody: {
nclcode: "01" nclcode: "01"
}, },
actionType: "getNcl", actionType: "getNcl",
requrl: "/action/tmTools/springBoard" requrl: "/action/tmTools/springBoard"
}); });
} }
// 获取selftmreg的尼斯查询 二级查询得到三级树 // 获取selftmreg的尼斯查询 二级查询得到三级树
export function getNiceQueryLevelTwo() { export function getNiceQueryLevelTwo() {
return http.post(baseUrl3, { return http.post(baseUrl3, {
actionBody: { actionBody: {
name: "生物化学", //Y strin 尼斯名称 name: "生物化学", //Y strin 尼斯名称
ncls: ["01"] //N List 尼斯大类编码列表 ncls: ["01"] //N List 尼斯大类编码列表
}, },
actionType: "getNcl" actionType: "getNcl"
}); });
} }
//文字转图片
export function word2pic(word) {
return http.post(baseUrl3, {
actionBody: {
word: word
},
actionType: "word2pic"
});
}
\ No newline at end of file
channel-access/src/components/globalheader.vue
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<h3>启服通</h3> <h3>启服通</h3>
<p>{{ title }}</p> <p>{{ title }}</p>
</div> </div>
<div class="globalheader-main-right"> <div class="globalheader-main-right" @click="$router.push(url)">
首页 {{ name }}
</div> </div>
</div> </div>
</div> </div>
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<script> <script>
export default { export default {
props: ["title"] props: ["title", "url", "name"]
}; };
</script> </script>
...@@ -71,5 +71,6 @@ export default { ...@@ -71,5 +71,6 @@ export default {
font-weight: 400; font-weight: 400;
color: #fff; color: #fff;
line-height: 60px; line-height: 60px;
cursor: pointer;
} }
</style> </style>
channel-access/src/http/http.js
...@@ -5,7 +5,7 @@ import { getCookie } from "@/utils/getToken.js"; ...@@ -5,7 +5,7 @@ import { getCookie } from "@/utils/getToken.js";
// 创建axios实例 // 创建axios实例
const service = axios.create({ const service = axios.create({
// baseURL: process.env.BASE_API, // api 的 base_url // baseURL: process.env.BASE_API, // api 的 base_url
timeout: 5000, // 请求超时时间 timeout: 20000, // 请求超时时间
headers: {} headers: {}
}); });
...@@ -13,10 +13,20 @@ const service = axios.create({ ...@@ -13,10 +13,20 @@ const service = axios.create({
service.interceptors.request.use( service.interceptors.request.use(
config => { config => {
let token = getCookie("token"); let token = getCookie("token");
let userpin = getCookie("userpin");
console.log(config);
if (token) { if (token) {
config.headers["token"] = token; // 让每个请求携带自定义token 请根据实际情况自行修改 config.headers["token"] = token; // 让每个请求携带自定义token 请根据实际情况自行修改
}
if (!userpin) {
if (
config.url != "/a/web/action/tmOrder/springBoard" ||
config.url != "/api/web/auth/accessAuth/springBoard"
) {
Message("请重新登录");
}
} else { } else {
Message("token已失效"); config.headers["userpin"] = userpin; // 让每个请求携带自定义token 请根据实际情况自行修改
} }
return config; return config;
}, },
......
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";
Vue.use(VueRouter); Vue.use(VueRouter);
const routes = [{ const routes = [{
path: "/",
redirect: "/jdtrademark"
},
{
path: "/user", path: "/user",
name: "user", name: "user",
redirect: "/user/login", redirect: "/user/login",
...@@ -36,6 +42,12 @@ const routes = [{ ...@@ -36,6 +42,12 @@ const routes = [{
import ("@/views/pages/cashier") import ("@/views/pages/cashier")
}, },
{ {
path: "/productdetails",
name: "productdetails",
component: () =>
import ("@/views/pages/productdetails")
},
{
path: "/successfulpayment", path: "/successfulpayment",
name: "successfulpayment", name: "successfulpayment",
component: () => component: () =>
...@@ -96,4 +108,23 @@ const router = new VueRouter({ ...@@ -96,4 +108,23 @@ const router = new VueRouter({
routes routes
}); });
router.beforeEach((to, from, next) => {
let userpin = getCookie("userpin");
console.log(to.path);
if (
to.path == "/user/login" ||
to.path == "/user/register" ||
to.path == "/user/forgetPassword" ||
to.path == "/jdtrademark"
) {
next();
} else {
if (userpin == "" || userpin == null) {
next("/user/login");
} else {
next();
}
}
});
export default router; export default router;
\ No newline at end of file
channel-access/src/views/pages/cashier/alipay.vue
<template> <template>
<div class="alipay"> <div class="alipay">
<div class="alipayCode"> <div class="alipayCode">
<div><img src="" alt="" /></div> <div><img :src="imgUrl" alt="" /></div>
<p>请使用支付宝扫描二维码支付，请在5分钟内完成支付，过期请刷新支付码</p> <p>请使用支付宝扫描二维码支付，请在5分钟内完成支付，过期请刷新支付码</p>
</div> </div>
<el-button>刷新二维码</el-button> <el-button>刷新二维码</el-button>
...@@ -9,7 +9,19 @@ ...@@ -9,7 +9,19 @@
</template> </template>
<script> <script>
export default {}; import { paymentApi } from "@/api/paymentApi.js";
export default {
data() {
return {
imgUrl: ""
};
},
mounted() {
paymentApi().then(res => {
console.log(res);
});
}
};
</script> </script>
<style lang="scss"> <style lang="scss">
......
channel-access/src/views/pages/jdindentdetail/index.vue
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</el-steps> </el-steps>
<div class="hr"></div> <div class="hr"></div>
<div class="step-row"> <div class="step-row">
<el-steps direction="vertical" :active="1" space="17px"> <el-steps direction="vertical" space="17px">
<el-step title="步骤 1"></el-step> <el-step title="步骤 1"></el-step>
<el-step title="步骤 2"></el-step> <el-step title="步骤 2"></el-step>
<el-step title="步骤 3"></el-step> <el-step title="步骤 3"></el-step>
......
channel-access/src/views/pages/jdindentdetail/modifyTrademark.vue
...@@ -36,13 +36,14 @@ ...@@ -36,13 +36,14 @@
v-if="ruleForm.resource == 1" v-if="ruleForm.resource == 1"
> >
<div class="trademark-name"> <div class="trademark-name">
<div> <div class="div">
<el-button>手动上传</el-button> <el-button>手动上传</el-button>
<el-button>自动生成</el-button> <el-button @click="automatic">自动生成</el-button>
</div> </div>
<div> <div class="div">
<div class="trademarkImg"> <div class="trademarkImg">
<img src="" alt="" /> <div class="loadingImg" v-loading="loading"></div>
<img :src="imgUrl" alt="" />
</div> </div>
<p> <p>
<i class="el-icon-warning"></i <i class="el-icon-warning"></i
...@@ -57,7 +58,7 @@ ...@@ -57,7 +58,7 @@
v-if="ruleForm.resource == 2 || ruleForm.resource == 3" v-if="ruleForm.resource == 2 || ruleForm.resource == 3"
> >
<div class="trademark-name"> <div class="trademark-name">
<div> <div class="div">
<div class="trademarkImg"> <div class="trademarkImg">
<img src="" alt="" /> <img src="" alt="" />
</div> </div>
...@@ -117,6 +118,7 @@ ...@@ -117,6 +118,7 @@
</template> </template>
<script> <script>
import { word2pic } from "@/api/tmTools.js";
export default { export default {
data() { data() {
return { return {
...@@ -129,10 +131,10 @@ export default { ...@@ -129,10 +131,10 @@ export default {
}, },
rules: { rules: {
name: [{ required: true, message: "请输入商标名称", trigger: "blur" }], name: [{ required: true, message: "请输入商标名称", trigger: "blur" }],
resource: [ resource: [{ required: true, message: "", trigger: "change" }]
{ required: true, message: "请选择活动资源", trigger: "change" } },
] imgUrl: "",
} loading: false
}; };
}, },
methods: { methods: {
...@@ -140,6 +142,18 @@ export default { ...@@ -140,6 +142,18 @@ export default {
this.drawerTitle = title; this.drawerTitle = title;
this.lookIndex = index; this.lookIndex = index;
this.drawerRight = true; this.drawerRight = true;
},
automatic() {
if (this.ruleForm.name) {
this.loading = true;
word2pic(this.ruleForm.name).then(res => {
console.log(res);
this.loading = false;
if (res.status == 0) {
this.imgUrl = res.data.url;
}
});
}
} }
} }
}; };
...@@ -181,7 +195,7 @@ export default { ...@@ -181,7 +195,7 @@ export default {
} }
.trademark-name { .trademark-name {
width: 100%; width: 100%;
div { .div {
width: 100%; width: 100%;
display: flex; display: flex;
margin: 7px 0 24px; margin: 7px 0 24px;
...@@ -195,6 +209,14 @@ export default { ...@@ -195,6 +209,14 @@ export default {
width: 124px; width: 124px;
height: 124px; height: 124px;
border: 2px dashed #e9e9e9; border: 2px dashed #e9e9e9;
position: relative;
.loadingImg {
width: 100%;
height: 100%;
position: absolute;
top: 0;
left: 0;
}
img { img {
width: 100%; width: 100%;
height: 100%; height: 100%;
......
channel-access/src/views/pages/jdindentlist/from.vue
...@@ -54,8 +54,8 @@ ...@@ -54,8 +54,8 @@
</div> </div>
</div> </div>
<div class="from-right"> <div class="from-right">
<el-button @click="find()">查询</el-button> <el-button @click="find">查询</el-button>
<el-button class="btnTwo">重置</el-button> <el-button class="btnTwo" @click="reset">重置</el-button>
</div> </div>
</div> </div>
</template> </template>
...@@ -166,6 +166,25 @@ export default { ...@@ -166,6 +166,25 @@ export default {
methods: { methods: {
find() { find() {
console.log(this.from); console.log(this.from);
},
reset() {
this.from = {
channelServiceNo: null,
deliveryOrderNo: "",
itemCode: "",
deliveryStatus: "",
payStatus: "",
tmName: "",
name: "",
startTime: "2019-12-1",
entTime: "2020-1-5",
pageIndex: 1,
pageSize: 30,
timeStamp: 1577787047,
channelUserId: "a5EyZC8Ht/Gpm2rKPeDpoziYmdcA/nF0",
itemName: "",
CreateDate: []
};
} }
} }
}; };
......
channel-access/src/views/pages/jdindentlist/index.vue
...@@ -36,9 +36,8 @@ export default { ...@@ -36,9 +36,8 @@ export default {
<style lang="scss"> <style lang="scss">
.jdindentlist { .jdindentlist {
width: 100%; width: 100%;
height: 100%;
padding: 0 20px; padding: 0 20px;
overflow: auto; min-height: 600px;
} }
.jdindentList-top { .jdindentList-top {
width: 100%; width: 100%;
......
channel-access/src/views/pages/jdindentlist/tabList.vue
<template> <template>
<div class="container-list"> <div class="container-list">
<el-table :data="tableData" style="width: 100%"> <el-table :data="tableDataList" style="width: 100%">
<el-table-column <el-table-column
prop="deliveryOrderNo" prop="deliveryOrderNo"
label="交付单号" label="交付单号"
...@@ -230,17 +230,349 @@ export default { ...@@ -230,17 +230,349 @@ export default {
identityCardPic: "", identityCardPic: "",
gzwtsUrl: null, gzwtsUrl: null,
smwjUrl: null smwjUrl: null
},
{
needNo: "FW_GOODS-581976-1_6059523",
channelServiceNo: "521111800127842646",
deliveryOrderNo: "JF201912161543hQCdUw",
tmName: "kl",
nclOneCount: 1,
nclOneCodes: "02",
itemCode: "zzsbzc",
itemName: "商标注册【自助申请】",
totalSum: "0.01",
name: "中国铁路北京局集团有限公司",
deliveryStatus: "dsccl",
deliveryStatusName: "待上传材料",
payStatus: "yfk",
payStatusName: "已付款",
CreateDate: "2019-12-16T07:43:03.000Z",
submitTime: null,
customerType: "ent",
businessLicensePic: "",
identityCardPic: "",
gzwtsUrl: null,
smwjUrl: null
},
{
needNo: "FW_GOODS-581976-1_6059523",
channelServiceNo: "521111800127842646",
deliveryOrderNo: "JF201912161543hQCdUw",
tmName: "kl",
nclOneCount: 1,
nclOneCodes: "02",
itemCode: "zzsbzc",
itemName: "商标注册【自助申请】",
totalSum: "0.01",
name: "中国铁路北京局集团有限公司",
deliveryStatus: "dsccl",
deliveryStatusName: "待上传材料",
payStatus: "yfk",
payStatusName: "已付款",
CreateDate: "2019-12-16T07:43:03.000Z",
submitTime: null,
customerType: "ent",
businessLicensePic: "",
identityCardPic: "",
gzwtsUrl: null,
smwjUrl: null
},
{
needNo: "FW_GOODS-581976-1_6059523",
channelServiceNo: "521111800127842646",
deliveryOrderNo: "JF201912161543hQCdUw",
tmName: "kl",
nclOneCount: 1,
nclOneCodes: "02",
itemCode: "zzsbzc",
itemName: "商标注册【自助申请】",
totalSum: "0.01",
name: "中国铁路北京局集团有限公司",
deliveryStatus: "dsccl",
deliveryStatusName: "待上传材料",
payStatus: "yfk",
payStatusName: "已付款",
CreateDate: "2019-12-16T07:43:03.000Z",
submitTime: null,
customerType: "ent",
businessLicensePic: "",
identityCardPic: "",
gzwtsUrl: null,
smwjUrl: null
},
{
needNo: "FW_GOODS-581976-1_6059523",
channelServiceNo: "521111800127842646",
deliveryOrderNo: "JF201912161543hQCdUw",
tmName: "kl",
nclOneCount: 1,
nclOneCodes: "02",
itemCode: "zzsbzc",
itemName: "商标注册【自助申请】",
totalSum: "0.01",
name: "中国铁路北京局集团有限公司",
deliveryStatus: "dsccl",
deliveryStatusName: "待上传材料",
payStatus: "yfk",
payStatusName: "已付款",
CreateDate: "2019-12-16T07:43:03.000Z",
submitTime: null,
customerType: "ent",
businessLicensePic: "",
identityCardPic: "",
gzwtsUrl: null,
smwjUrl: null
},
{
needNo: "FW_GOODS-581976-1_6059523",
channelServiceNo: "521111800127842646",
deliveryOrderNo: "JF201912161543hQCdUw",
tmName: "kl",
nclOneCount: 1,
nclOneCodes: "02",
itemCode: "zzsbzc",
itemName: "商标注册【自助申请】",
totalSum: "0.01",
name: "中国铁路北京局集团有限公司",
deliveryStatus: "dsccl",
deliveryStatusName: "待上传材料",
payStatus: "yfk",
payStatusName: "已付款",
CreateDate: "2019-12-16T07:43:03.000Z",
submitTime: null,
customerType: "ent",
businessLicensePic: "",
identityCardPic: "",
gzwtsUrl: null,
smwjUrl: null
},
{
needNo: "FW_GOODS-581976-1_6059523",
channelServiceNo: "521111800127842646",
deliveryOrderNo: "JF201912161543hQCdUw",
tmName: "kl",
nclOneCount: 1,
nclOneCodes: "02",
itemCode: "zzsbzc",
itemName: "商标注册【自助申请】",
totalSum: "0.01",
name: "中国铁路北京局集团有限公司",
deliveryStatus: "dsccl",
deliveryStatusName: "待上传材料",
payStatus: "yfk",
payStatusName: "已付款",
CreateDate: "2019-12-16T07:43:03.000Z",
submitTime: null,
customerType: "ent",
businessLicensePic: "",
identityCardPic: "",
gzwtsUrl: null,
smwjUrl: null
},
{
needNo: "FW_GOODS-581976-1_6059523",
channelServiceNo: "521111800127842646",
deliveryOrderNo: "JF201912161543hQCdUw",
tmName: "kl",
nclOneCount: 1,
nclOneCodes: "02",
itemCode: "zzsbzc",
itemName: "商标注册【自助申请】",
totalSum: "0.01",
name: "中国铁路北京局集团有限公司",
deliveryStatus: "dsccl",
deliveryStatusName: "待上传材料",
payStatus: "yfk",
payStatusName: "已付款",
CreateDate: "2019-12-16T07:43:03.000Z",
submitTime: null,
customerType: "ent",
businessLicensePic: "",
identityCardPic: "",
gzwtsUrl: null,
smwjUrl: null
},
{
needNo: "FW_GOODS-581976-1_6059523",
channelServiceNo: "521111800127842646",
deliveryOrderNo: "JF201912161543hQCdUw",
tmName: "kl",
nclOneCount: 1,
nclOneCodes: "02",
itemCode: "zzsbzc",
itemName: "商标注册【自助申请】",
totalSum: "0.01",
name: "中国铁路北京局集团有限公司",
deliveryStatus: "dsccl",
deliveryStatusName: "待上传材料",
payStatus: "yfk",
payStatusName: "已付款",
CreateDate: "2019-12-16T07:43:03.000Z",
submitTime: null,
customerType: "ent",
businessLicensePic: "",
identityCardPic: "",
gzwtsUrl: null,
smwjUrl: null
},
{
needNo: "FW_GOODS-581976-1_6059523",
channelServiceNo: "521111800127842646",
deliveryOrderNo: "JF201912161543hQCdUw",
tmName: "kl",
nclOneCount: 1,
nclOneCodes: "02",
itemCode: "zzsbzc",
itemName: "商标注册【自助申请】",
totalSum: "0.01",
name: "中国铁路北京局集团有限公司",
deliveryStatus: "dsccl",
deliveryStatusName: "待上传材料",
payStatus: "yfk",
payStatusName: "已付款",
CreateDate: "2019-12-16T07:43:03.000Z",
submitTime: null,
customerType: "ent",
businessLicensePic: "",
identityCardPic: "",
gzwtsUrl: null,
smwjUrl: null
},
{
needNo: "FW_GOODS-581976-1_6059523",
channelServiceNo: "521111800127842646",
deliveryOrderNo: "JF201912161543hQCdUw",
tmName: "kl",
nclOneCount: 1,
nclOneCodes: "02",
itemCode: "zzsbzc",
itemName: "商标注册【自助申请】",
totalSum: "0.01",
name: "中国铁路北京局集团有限公司",
deliveryStatus: "dsccl",
deliveryStatusName: "待上传材料",
payStatus: "yfk",
payStatusName: "已付款",
CreateDate: "2019-12-16T07:43:03.000Z",
submitTime: null,
customerType: "ent",
businessLicensePic: "",
identityCardPic: "",
gzwtsUrl: null,
smwjUrl: null
},
{
needNo: "FW_GOODS-581976-1_6059523",
channelServiceNo: "521111800127842646",
deliveryOrderNo: "JF201912161543hQCdUw",
tmName: "kl",
nclOneCount: 1,
nclOneCodes: "02",
itemCode: "zzsbzc",
itemName: "商标注册【自助申请】",
totalSum: "0.01",
name: "中国铁路北京局集团有限公司",
deliveryStatus: "dsccl",
deliveryStatusName: "待上传材料",
payStatus: "yfk",
payStatusName: "已付款",
CreateDate: "2019-12-16T07:43:03.000Z",
submitTime: null,
customerType: "ent",
businessLicensePic: "",
identityCardPic: "",
gzwtsUrl: null,
smwjUrl: null
},
{
needNo: "FW_GOODS-581976-1_6059523",
channelServiceNo: "521111800127842646",
deliveryOrderNo: "JF201912161543hQCdUw",
tmName: "kl",
nclOneCount: 1,
nclOneCodes: "02",
itemCode: "zzsbzc",
itemName: "商标注册【自助申请】",
totalSum: "0.01",
name: "中国铁路北京局集团有限公司",
deliveryStatus: "dsccl",
deliveryStatusName: "待上传材料",
payStatus: "yfk",
payStatusName: "已付款",
CreateDate: "2019-12-16T07:43:03.000Z",
submitTime: null,
customerType: "ent",
businessLicensePic: "",
identityCardPic: "",
gzwtsUrl: null,
smwjUrl: null
},
{
needNo: "FW_GOODS-581976-1_6059523",
channelServiceNo: "521111800127842646",
deliveryOrderNo: "JF201912161543hQCdUw",
tmName: "kl",
nclOneCount: 1,
nclOneCodes: "02",
itemCode: "zzsbzc",
itemName: "商标注册【自助申请】",
totalSum: "0.01",
name: "中国铁路北京局集团有限公司",
deliveryStatus: "dsccl",
deliveryStatusName: "待上传材料",
payStatus: "yfk",
payStatusName: "已付款",
CreateDate: "2019-12-16T07:43:03.000Z",
submitTime: null,
customerType: "ent",
businessLicensePic: "",
identityCardPic: "",
gzwtsUrl: null,
smwjUrl: null
},
{
needNo: "FW_GOODS-581976-1_6059523",
channelServiceNo: "521111800127842646",
deliveryOrderNo: "JF201912161543hQCdUw",
tmName: "kl",
nclOneCount: 1,
nclOneCodes: "02",
itemCode: "zzsbzc",
itemName: "商标注册【自助申请】",
totalSum: "0.01",
name: "中国铁路北京局集团有限公司",
deliveryStatus: "dsccl",
deliveryStatusName: "待上传材料",
payStatus: "yfk",
payStatusName: "已付款",
CreateDate: "2019-12-16T07:43:03.000Z",
submitTime: null,
customerType: "ent",
businessLicensePic: "",
identityCardPic: "",
gzwtsUrl: null,
smwjUrl: null
} }
], ],
tableDataList: [],
showUploadStuff: false showUploadStuff: false
}; };
}, },
mounted() {
let list = this.tableData;
this.tableDataList = list.slice(0, this.pageSize);
},
methods: { methods: {
handleSizeChange(val) { handleSizeChange(val) {
console.log(`每页 ${val} 条`); console.log(`每页 ${val} 条`);
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
console.log(`当前页: ${val}`); console.log(`当前页: ${val}`);
let list = this.tableData;
this.tableDataList = list.slice(
(val - 1) * this.pageSize,
val * this.pageSize
);
}, },
drawerClick() { drawerClick() {
this.showUploadStuff = true; this.showUploadStuff = true;
......
channel-access/src/views/pages/placeorder/index.vue
...@@ -39,12 +39,21 @@ ...@@ -39,12 +39,21 @@
class="demo-ruleForm" class="demo-ruleForm"
> >
<el-form-item label="姓名" prop="name"> <el-form-item label="姓名" prop="name">
<el-input v-model="ruleForm.name" placeholder="请输入您的姓名"></el-input> <el-input
v-model="ruleForm.name"
placeholder="请输入您的姓名"
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="电话" prop="phone"> <el-form-item label="电话" prop="phone">
<el-input v-model="ruleForm.phone" placeholder="请输入您的联系方式"></el-input> </el-form-item <el-input
v-model="ruleForm.phone"
placeholder="请输入您的联系方式"
></el-input> </el-form-item
><el-form-item prop="email" label="邮箱"> ><el-form-item prop="email" label="邮箱">
<el-input v-model="ruleForm.email" placeholder="请输入您的邮箱"></el-input> <el-input
v-model="ruleForm.email"
placeholder="请输入您的邮箱"
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="备注"> <el-form-item label="备注">
<el-input type="textarea" v-model="ruleForm.desc"></el-input> <el-input type="textarea" v-model="ruleForm.desc"></el-input>
...@@ -55,13 +64,17 @@ ...@@ -55,13 +64,17 @@
</div> </div>
<div class="placeorder-footer"> <div class="placeorder-footer">
<div class="placeorder-footer-main"> <div class="placeorder-footer-main">
<p class="orderMoney">订单金额：<span>¥680.00</span></p> <p class="orderMoney">
订单金额：<span>¥{{ orderPrice }}</span>
</p>
<div class="payment-right"> <div class="payment-right">
<p> <p>
<i @click="active=!active" :class="active?'xuanzhong':''"></i> <i @click="active = !active" :class="active ? 'xuanzhong' : ''"></i>
我已阅读<span>《商标代理服务协议》</span>，且同意该合同内容 我已阅读<span>《商标代理服务协议》</span>，且同意该合同内容
</p> </p>
<el-button :class="active?'active':''" @click="submitForm">去支付</el-button> <el-button :class="active ? 'active' : ''" @click="submitForm"
>去支付</el-button
>
</div> </div>
</div> </div>
</div> </div>
...@@ -90,14 +103,15 @@ export default { ...@@ -90,14 +103,15 @@ export default {
}, 100); }, 100);
}; };
return { return {
active:false, orderPrice: 0,
active: false,
tableData: [ tableData: [
{ {
name: "专家辅助商标注册", name: "专家辅助商标注册",
count: 1, count: null,
official: 300, official: null,
service: 380, service: null,
total: 680 total: null
} }
], ],
// //
...@@ -122,9 +136,27 @@ export default { ...@@ -122,9 +136,27 @@ export default {
// //
}; };
}, },
created() {
console.log(this.$route.query);
this.tableData[0].count = this.$route.query.count;
if (this.$route.query.type == "zjfz") {
this.tableData[0].name = "专家辅助商标注册";
this.tableData[0].official = 300;
this.tableData[0].service = 380;
} else if (this.$route.query.type == "dbsb") {
this.tableData[0].name = "担保商标注册";
this.tableData[0].official = 300;
this.tableData[0].service = 1080;
}
this.tableData[0].total =
(this.tableData[0].official + this.tableData[0].service) *
this.tableData[0].count;
},
methods: { methods: {
submitForm() { submitForm() {
console.log(123); if (this.active) {
console.log(123);
}
} }
} }
}; };
...@@ -252,7 +284,7 @@ export default { ...@@ -252,7 +284,7 @@ export default {
margin-right: 30px; margin-right: 30px;
display: flex; display: flex;
align-items: center; align-items: center;
i{ i {
display: inline-block; display: inline-block;
width: 18px; width: 18px;
height: 18px; height: 18px;
...@@ -261,7 +293,7 @@ export default { ...@@ -261,7 +293,7 @@ export default {
background: #fff; background: #fff;
border: 1px solid #ccc; border: 1px solid #ccc;
} }
.xuanzhong{ .xuanzhong {
border: none; border: none;
background: url("../../../assets/imgs/xuanzhong.png") no-repeat; background: url("../../../assets/imgs/xuanzhong.png") no-repeat;
} }
...@@ -281,10 +313,10 @@ export default { ...@@ -281,10 +313,10 @@ export default {
letter-spacing: 2px; letter-spacing: 2px;
border-radius: 0; border-radius: 0;
} }
.el-button:active{ .el-button:active {
border: none; border: none;
} }
.active{ .active {
background: rgba(48, 113, 254, 1); background: rgba(48, 113, 254, 1);
} }
} }
......
channel-access/src/views/pages/productdetails/index.vue 0 → 100644
<template>
<div class="productdetails">
<div class="productdetails-main">
<div class="productdetails-main-container">
<div class="productdetails-main-top">
<el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item>首页</el-breadcrumb-item>
<el-breadcrumb-item>专家辅助商标注册</el-breadcrumb-item>
</el-breadcrumb>
</div>
<div class="productdetails-main-detail">
<div class="productdetails-left"><img src="" alt="" /></div>
<div class="productdetails-right">
<h1>专家辅助商标注册</h1>
<p>
专业知产顾问一对一商标检索分析，提高注册效率，为您优化注册方案，全方位保护
</p>
<div class="priceMsg">
<div>
<span
>总价<b>¥{{ servicecharge + officialfee }}</b></span
>
<span
>官費<b>¥{{ officialfee }}</b></span
>
<span
>服务费<b>¥{{ servicecharge }}</b></span
>
</div>
<p>
该服务由公司宝提供，<span>发票请到订单中心-发票管理开取</span>
</p>
</div>
<div class="productdetail-count">
<p>数量</p>
<el-input-number
size="mini"
v-model="count"
:min="1"
></el-input-number>
</div>
<div class="bottom-btn">
<el-button @click="goPlaceOrder()">立即购买</el-button>
<span><img src="@/assets/imgs/wenti.png" alt="" />咨询客服</span>
</div>
</div>
</div>
</div>
</div>
</div>
</template>
<script>
export default {
data() {
return {
count: 1,
officialfee: 300,
servicecharge: 380
};
},
methods: {
goPlaceOrder() {
this.$router.push({
path: "/placeorder",
query: {
count: this.count,
type: "zjfz"
}
});
}
}
};
</script>
<style lang="scss">
.productdetails {
width: 100%;
.productdetails-main {
width: 100%;
min-height: 786px;
}
}
.productdetails-main-container {
max-width: 1190px;
padding: 0 20px;
margin: 0 auto;
.productdetails-main-top {
width: 100%;
height: 60px;
display: flex;
align-items: center;
border-bottom: 1px solid #cecece;
}
.productdetails-main-detail {
width: 100%;
display: flex;
padding: 20px 0;
.productdetails-left {
width: 293px;
height: 293px;
border: 1px solid rgba(207, 207, 207, 1);
margin-right: 40px;
}
.productdetails-right {
flex: 1;
h1 {
font-size: 20px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: rgba(51, 51, 51, 1);
line-height: 28px;
margin-bottom: 5px;
}
p {
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: rgba(153, 153, 153, 1);
line-height: 20px;
}
.priceMsg {
width: 100%;
padding: 15px 17px;
background: #f3f7fd;
margin-bottom: 20px;
margin-top: 12px;
div {
width: 100%;
margin-bottom: 12px;
span {
font-size: 12px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: rgba(153, 153, 153, 1);
line-height: 17px;
margin-right: 40px;
b {
font-size: 23px;
color: #ff5b00;
margin-left: 20px;
}
}
}
p {
font-size: 12px;
font-family: PingFangSC-Light, PingFang SC;
font-weight: 300;
color: rgba(153, 153, 153, 1);
line-height: 17px;
span {
color: #3071fe;
}
}
}
.productdetail-count {
display: flex;
align-items: center;
margin-bottom: 20px;
p {
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: rgba(153, 153, 153, 1);
line-height: 20px;
margin-right: 12px;
}
}
.bottom-btn {
display: flex;
align-items: center;
button {
width: 128px;
height: 36px;
background: rgba(48, 113, 254, 1);
border: 1px solid rgba(48, 113, 254, 1);
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
line-height: 20px;
padding: 0;
border-radius: 0;
margin-right: 10px;
span {
color: rgba(255, 255, 255, 1);
}
}
span {
display: flex;
justify-content: center;
align-items: center;
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: rgba(48, 113, 254, 1);
line-height: 20px;
cursor: pointer;
img {
display: inline-block;
width: 16px;
margin-right: 7px;
}
}
}
}
}
}
</style>
channel-access/src/views/pages/user/index.vue
<template> <template>
<div class="user"> <div class="user">
<Globalheader title="登录" url="/jdtrademark" name="首页" />
<div class="user-main"> <div class="user-main">
<div class="user-main-mid"> <div class="user-main-mid">
<div class="user-main-left"> <div class="user-main-left">
...@@ -21,12 +22,19 @@ ...@@ -21,12 +22,19 @@
</template> </template>
<script> <script>
import Globalheader from "@/components/globalheader";
export default { export default {
components: {
Globalheader
},
data() { data() {
return { return {
activeName: "first" activeName: "first"
}; };
}, },
mounted() {
console.log(this.$store)
}
}; };
</script> </script>
......
channel-access/src/views/pages/user/login/username.vue
...@@ -47,7 +47,7 @@ export default { ...@@ -47,7 +47,7 @@ export default {
//提交表单 //提交表单
submitForm() { submitForm() {
let from = { let from = {
mobile: this.ruleForm.name, // Y 手机号 userName: this.ruleForm.name, // Y 手机号
password: this.ruleForm.password // Y 密码 password: this.ruleForm.password // Y 密码
}; };
if (this.ruleForm.name && this.ruleForm.password) { if (this.ruleForm.name && this.ruleForm.password) {
...@@ -59,6 +59,7 @@ export default { ...@@ -59,6 +59,7 @@ export default {
message: "登录成功！", message: "登录成功！",
type: "success" type: "success"
}); });
this.$router.push("/jdtrademark")
} else if (res.status == 2010) { } else if (res.status == 2010) {
this.$message.error("账户或密码错误！"); this.$message.error("账户或密码错误！");
} else if (res.status == 2060) { } else if (res.status == 2060) {
......
channel-access/src/views/pages/user/login/verificationCode.vue
...@@ -51,7 +51,7 @@ export default { ...@@ -51,7 +51,7 @@ export default {
// //
return { return {
dynamicValidateForm: { dynamicValidateForm: {
phone: "17600004328", phone: "",
verifyCode: "" verifyCode: ""
}, },
btnInnerText: "获取验证码", btnInnerText: "获取验证码",
......
channel-access/src/views/pages/user/register/index.vue
...@@ -71,6 +71,9 @@ export default { ...@@ -71,6 +71,9 @@ export default {
} else { } else {
this.$message.error("获取验证码失败！"); this.$message.error("获取验证码失败！");
this.btnInnerText = "重新获取验证码"; this.btnInnerText = "重新获取验证码";
clearInterval(this.timer);
this.timeNum = 60;
this.flag = true;
} }
}); });
this.btnInnerText = this.timeNum + "秒之后重新获取"; this.btnInnerText = this.timeNum + "秒之后重新获取";
...@@ -80,7 +83,7 @@ export default { ...@@ -80,7 +83,7 @@ export default {
if (this.timeNum <= 0) { if (this.timeNum <= 0) {
clearInterval(this.timer); clearInterval(this.timer);
this.btnInnerText = "重新获取验证码"; this.btnInnerText = "重新获取验证码";
this.timeNum = 10; this.timeNum = 60;
this.flag = true; this.flag = true;
} }
}, 1000); }, 1000);
......
channel-access/vue.config.js
...@@ -4,28 +4,19 @@ module.exports = { ...@@ -4,28 +4,19 @@ module.exports = {
lintOnSave: false, //是否开启eslint lintOnSave: false, //是否开启eslint
devServer: { devServer: {
open: true, //是否自动弹出浏览器页面 open: true, //是否自动弹出浏览器页面
host: "localhost", host: "gsbweb.qifu.gongsibao.com",
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://gsb.qifu.gongsibao.com:4011", //API服务器的地址
ws: true, //代理websockets ws: true, //代理websockets
changeOrigin: true, // 虚拟的站点需要更管origin changeOrigin: true, // 虚拟的站点需要更管origin
pathRewrite: { pathRewrite: {
//重写路径 比如'/api/aaa/ccc'重写为'/aaa/ccc' //重写路径 比如'/api/aaa/ccc'重写为'/aaa/ccc'
"^/api": "" "^/api": ""
} }
},
"/a": {
target: "http://tm.plus.jdcloud.com:4003", //API服务器的地址
ws: true, //代理websockets
changeOrigin: true, // 虚拟的站点需要更管origin
pathRewrite: {
//重写路径 比如'/api/aaa/ccc'重写为'/aaa/ccc'
"^/a": ""
}
} }
} }
} }
......
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