Skip to content

Z
zhichan
Commit 4efacb9c by 任建
Options

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

parents 1ff4efd8 1f9fd8c7
Showing with 233 additions and 48 deletions
channel-access/src/router/index.js
...@@ -5,17 +5,16 @@ import VueRouter from "vue-router"; ...@@ -5,17 +5,16 @@ import VueRouter from "vue-router";
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,95 +24,81 @@ const routes = [{ ...@@ -25,95 +24,81 @@ 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: "jdindentdetail", 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: "/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({
......
channel-access/src/views/pages/selftmreg/ApplicationInfo.vue
...@@ -155,6 +155,7 @@ ...@@ -155,6 +155,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<!-- 资料上传 --> <!-- 资料上传 -->
<div class="info-title"> <div class="info-title">
<i class="selftmreg_shuxian"></i> <i class="selftmreg_shuxian"></i>
...@@ -168,8 +169,21 @@ ...@@ -168,8 +169,21 @@
<!-- 上传营业执照 --> <!-- 上传营业执照 -->
<div class="from-items"> <div class="from-items">
<div class="from-item-title"><span>*</span>上传材料：营业执照</div> <div class="from-item-title"><span>*</span>上传材料：营业执照</div>
<div class="upload-box"> <div class="upload-box" v-loading="loading1">
<!-- 1 --> <img v-if="imgUrl1" :src="imgUrl1" alt="" />
<div v-else class="imgs">
<i class="el-icon-plus"></i>
<span>(需盖公章)</span>
</div>
<!-- 1 上传营业执照 -->
<UploadImg
:action="action"
:data="dataone"
ref="upImg"
flag="picUrl"
:num="1"
@getsuccess="getImgUrl"
/>
</div> </div>
<div class="upload-box-next"> <div class="upload-box-next">
<img src="@/assets/imgs/sbzc/yyzz1.png" alt /> <img src="@/assets/imgs/sbzc/yyzz1.png" alt />
...@@ -193,12 +207,25 @@ ...@@ -193,12 +207,25 @@
" "
> >
<div class="from-item-title"><span>*</span>上传材料：身份证明</div> <div class="from-item-title"><span>*</span>上传材料：身份证明</div>
<div class="upload-box"> <div class="upload-box" v-loading="loading4">
<img src="" alt /> <img v-if="imgUrl4" :src="imgUrl4" alt="" />
<div v-else class="imgs">
<i class="el-icon-plus"></i>
<span>(需盖公章)</span>
</div>
<!-- 2 身份证 -->
<UploadImg
:action="action"
:data="datatwo"
ref="upImg"
flag="picUrl"
:num="4"
@getsuccess="getImgUrl"
/>
</div> </div>
<div class="upload-box-next"> <div class="upload-box-next">
<img src="@/assets/imgs/sbzc/sfz.png" alt /> <img src="@/assets/imgs/sbzc/sfz.png" alt />
<div class="chakan" @click="lookImage(1)">查看大图</div> <div class="chakan" @click="lookImage(4)">查看大图</div>
</div> </div>
<div class="text"> <div class="text">
...@@ -217,8 +244,21 @@ ...@@ -217,8 +244,21 @@
>下载委托书模板</a >下载委托书模板</a
> >
</div> </div>
<div class="upload-box"> <div class="upload-box" v-loading="loading2">
<img v-if="imgUrl2" :src="imgUrl2" alt="" />
<div v-else class="imgs">
<i class="el-icon-plus"></i>
<span>(需盖公章)</span>
</div>
<!-- 2 --> <!-- 2 -->
<UploadImg
:action="action"
:data="datatwo"
ref="upImg"
flag="picUrl"
:num="2"
@getsuccess="getImgUrl"
/>
</div> </div>
<div class="upload-box-next"> <div class="upload-box-next">
<img src="@/assets/imgs/sbzc/wts1.png" alt /> <img src="@/assets/imgs/sbzc/wts1.png" alt />
...@@ -241,24 +281,70 @@ ...@@ -241,24 +281,70 @@
>下载优先权证明</a >下载优先权证明</a
> >
</div> </div>
<div class="upload-box"> <div class="upload-box" v-loading="loading3">
<img v-if="imgUrl3" :src="imgUrl3" alt="" />
<div v-else class="imgs">
<i class="el-icon-plus"></i>
<span>(需盖公章)</span>
</div>
<!-- 3 --> <!-- 3 -->
<UploadImg
:action="action"
:data="datathree"
ref="upImg"
flag="picUrl"
:num="3"
@getsuccess="getImgUrl"
/>
</div> </div>
<div class="upload-box-next"> <div class="upload-box-next">
<img src="@/assets/imgs/sbzc/yxq.png" alt /> <img src="@/assets/imgs/sbzc/yxq.png" alt />
<div class="chakan" @click="lookImage(3)">查看大图</div> <div class="chakan" @click="lookImage(3)">查看大图</div>
</div> </div>
<div class="text">
<i class="el-icon-warning"></i>
（非必填）如果申请人在提交申请前6个月内在政府主办的国内或国际的展会进行使用的，<br />请上传由申请人盖章或签字的中文代理委托书彩色扫描件，格式为宽高的大小为<br />
可以提交使用证明，则商标局实质审查时，按使用日开始审查。
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<!-- dialog -->
<el-dialog
style="z-index:99999;background:rgba(0,0,0,.3)"
title=""
:visible.sync="toViewImgType"
center
width="72%"
append-to-body
>
<img
:src="toViewImgSrc"
style="max-width:100%;display:block;margin: 0 auto;"
alt=""
/>
</el-dialog>
</div>
</template> </template>
<script> <script>
// 导入资料上传的查看大图的图片
import imgUrl1 from "@/assets/imgs/sbzc/yyzzD.png"; import imgUrl1 from "@/assets/imgs/sbzc/yyzzD.png";
import imgUrl2 from "@/assets/imgs/sbzc/wtsD.png"; import imgUrl2 from "@/assets/imgs/sbzc/wtsD.png";
import imgUrl3 from "@/assets/imgs/sbzc/yxqD.png"; import imgUrl3 from "@/assets/imgs/sbzc/yxqD.png";
import { getCompanyInfoByLikeName } from "@/api/tmTools.js"; import imgUrl4 from "@/assets/imgs/sbzc/sfzD.png";
// 导入公司模糊查询 和 上传材料部分的的上传
import {
getCompanyInfoByLikeName,
getOss,
uploadStandardTm,
pic2pdf
} from "@/api/tmTools.js";
//
import UploadImg from "@/components/uploadImg";
export default { export default {
components: {
UploadImg
},
// 接收父组件传过来的参数 // 接收父组件传过来的参数
// props: ["stepsParams"], // props: ["stepsParams"],
data() { data() {
...@@ -337,12 +423,97 @@ export default { ...@@ -337,12 +423,97 @@ export default {
// 资料上传 // 资料上传
chakanKey: null, chakanKey: null,
toViewImgType: false, toViewImgType: false,
toViewImgSrc: "" toViewImgSrc: "",
action: "",
dataone: {},
datatwo: {},
datathree: {},
loading1: false,
loading2: false,
loading3: false,
loading4: false,
imgUrl: "",
imgUrl1: "",
imgUrl2: "",
imgUrl3: "",
imgUrl4: ""
}; };
}, },
mounted() {}, mounted() {
//
this.getOss();
},
methods: { methods: {
// 资料上传 // 资料上传
getImgUrl(msg, num) {
this.imgUrl = msg;
if (num == 1) {
this.loading1 = true;
this.imgUrl1 = msg;
}
if (num == 2) {
this.loading2 = true;
this.imgUrl2 = msg;
}
if (num == 3) {
this.loading3 = true;
this.imgUrl3 = msg;
}
// 身份证
if (num == 4) {
this.loading4 = true;
this.imgUrl4 = msg;
}
uploadStandardTm(this.imgUrl).then(res => {
if (res.status == 0) {
//图片转pdf
pic2pdf(res.data.url).then(re => {
this.loading1 = false;
this.loading2 = false;
this.loading3 = false;
this.loading4 = false;
if (re.status == 0) {
this.$message({
type: "success",
message: "上传成功"
});
} else {
this.$message.error("上传失败，请重新上传！");
}
});
} else {
this.$message.error("上传失败，请重新上传！");
}
//上传后重新获取偶oss
this.getOss();
});
},
getOss() {
getOss().then(re => {
this.dataone = re.data;
this.datatwo = re.data;
this.datathree = re.data;
this.dataone.key = this.setKey();
this.datatwo.key = this.setKey();
this.datathree.key = this.setKey();
this.action = re.data.url;
});
},
setKey(name, flag) {
// name = name.substring(name.length - 5);
var myDate = new Date();
var key =
"zc_" +
flag +
Math.round(Math.random() * 10000) +
myDate.getTime() +
myDate.getFullYear() +
myDate.getMonth() +
myDate.getDate() +
".jpg";
return key;
},
//
enter(index) { enter(index) {
this.chakanKey = index; this.chakanKey = index;
}, },
...@@ -358,6 +529,9 @@ export default { ...@@ -358,6 +529,9 @@ export default {
case 3: case 3:
this.toViewImgSrc = imgUrl3; this.toViewImgSrc = imgUrl3;
break; break;
case 4:
this.toViewImgSrc = imgUrl4;
break;
} }
}, },
...@@ -596,6 +770,27 @@ export default { ...@@ -596,6 +770,27 @@ export default {
position: relative; position: relative;
border: 3px dashed #ccc; border: 3px dashed #ccc;
margin-left: 20px; margin-left: 20px;
img {
width: 100%;
height: 100%;
}
.imgs {
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
i {
font-size: 30px;
color: #b8b8b8;
}
span {
color: #0f8ee9;
font-size: 12px;
margin-top: 20px;
}
}
} }
.upload-box-next { .upload-box-next {
width: 98px; width: 98px;
......
channel-access/src/views/pages/selftmreg/Selftmreg.vue
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
</label> </label>
<el-button <el-button
type="primary" type="primary"
@click="next" @click="goCashier"
v-if="index == 2" v-if="index == 2"
:disabled="!checked" :disabled="!checked"
:class="{ disabled: !checked }" :class="{ disabled: !checked }"
...@@ -164,6 +164,11 @@ export default { ...@@ -164,6 +164,11 @@ export default {
}, },
created() {}, created() {},
methods: { methods: {
// 去支付页面
goCashier() {
console.log("go cashier !!!!");
this.$router.push("/cashier");
},
// 商品/服务项目不足10项 对话框 点击确定按钮 进入第二步 填写申请人信息 // 商品/服务项目不足10项 对话框 点击确定按钮 进入第二步 填写申请人信息
intoStepTwo() { intoStepTwo() {
this.dialogVisible = false; this.dialogVisible = false;
......
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