Skip to content

Z
zhichan
Commit 30cd869e by 尹亚亭
Options

aa

parent e219c985
Showing with 169 additions and 62 deletions
channel-access/src/views/pages/selftmreg/ApplicationInfo.vue
...@@ -28,11 +28,16 @@ ...@@ -28,11 +28,16 @@
</el-form-item> </el-form-item>
<div v-if="aruleForm.resource == 1"> <div v-if="aruleForm.resource == 1">
<el-form-item label="公司名称：" prop="name"> <el-form-item label="公司名称：" prop="name">
<el-input <el-autocomplete
v-model="aruleForm.name" v-model="aruleForm.name"
:fetch-suggestions="querySearchAsync"
placeholder="请输入公司名称" placeholder="请输入公司名称"
@blur="handleInputCompanyNameBlur" @select="handleSelect"
></el-input> :trigger-on-focus="false"
clearable
:debounce="700"
@blur.native="handleInputCompanyNameBlur"
></el-autocomplete>
</el-form-item> </el-form-item>
<el-form-item label="统一社会信用代码：" prop="xinyongma"> <el-form-item label="统一社会信用代码：" prop="xinyongma">
<el-input <el-input
...@@ -77,6 +82,7 @@ ...@@ -77,6 +82,7 @@
<el-input <el-input
v-model="aruleForm.uid" v-model="aruleForm.uid"
placeholder="请输入您的身份证号" placeholder="请输入您的身份证号"
:maxlength="18"
@blur="handleInputIdCardBlur" @blur="handleInputIdCardBlur"
></el-input> ></el-input>
</el-form-item> </el-form-item>
...@@ -261,12 +267,13 @@ ...@@ -261,12 +267,13 @@
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";
export default { export default {
data() { data() {
return { return {
// 申请人信息表格 及 验证 // 申请人信息表格 及 验证
aruleForm: { aruleForm: {
name: "", name: "中",
resource: 1, resource: 1,
xinyongma: "", xinyongma: "",
address: "", address: "",
...@@ -352,6 +359,24 @@ export default { ...@@ -352,6 +359,24 @@ export default {
} }
}, },
// 申请人模糊查询
querySearchAsync(queryString, cb) {
//企业近似查询
getCompanyInfoByLikeName(this.ruleForm.name).then(res => {
res.data.map(item => {
item.value = item.domainEntName;
});
cb(res.data);
});
},
handleSelect(item) {
this.ruleForm.xinyongma = item.creditCode;
this.ruleForm.address = item.regLocation;
},
addMessage() {
console.log(this.ruleForm);
},
//申请人类型 参数传递 //申请人类型 参数传递
handleUsersChooseClick() { handleUsersChooseClick() {
this.$bus.emit("on-userschoose-click", this.aruleForm.resource); this.$bus.emit("on-userschoose-click", this.aruleForm.resource);
...@@ -554,30 +579,7 @@ export default { ...@@ -554,30 +579,7 @@ export default {
} }
} }
} }
.drawer-bottom {
width: 100%;
padding: 10px 20px 20px;
position: absolute;
bottom: 0px;
left: 0;
border-top: 1px solid #dee0eb;
button {
padding: 6px 28px;
border-radius: 100px;
border: none;
font-family: PingFangSC-Regular;
font-size: 12px;
margin-right: 10px;
}
.esc {
background: #e7eaf3;
color: #777777;
}
.enter {
background: #3071fe;
color: #ffffff;
}
}
.from-items { .from-items {
width: 100%; width: 100%;
height: 120px; height: 120px;
......
channel-access/src/views/pages/selftmreg/ModifyTrademark.vue
...@@ -43,15 +43,24 @@ ...@@ -43,15 +43,24 @@
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 @click="manualupload"
<el-button>自动生成</el-button> >手动上传<UploadImg
:action="action"
:data="data"
ref="upImg"
flag="picUrl"
@getsuccess="getImgUrl"
/></el-button>
<el-button @click="automatic">自动生成</el-button>
</div> </div>
<div> <div class="div">
<div class="trademarkImg"> <div class="trademarkImg">
<img src="@/assets/imgs/zwtp.png" alt /> <div class="loadingImg" v-loading="loading"></div>
<img v-if="!imgUrl" src="@/assets/imgs/zwtp.png" alt />
<img v-else :src="imgUrl" alt="" />
</div> </div>
<p class="locate-bottom vertical-bottom"> <p>
<i class="el-icon-warning"></i <i class="el-icon-warning"></i
>自动生成的商标图样默认以“宋体”字样自左向右排列递交官方。 >自动生成的商标图样默认以“宋体”字样自左向右排列递交官方。
</p> </p>
...@@ -64,9 +73,17 @@ ...@@ -64,9 +73,17 @@
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" v-loading="loading">
<img src="@/assets/imgs/sctp.png" alt /> <img v-if="!imgUrl" src="@/assets/imgs/sctp.png" alt="" />
<img v-else :src="imgUrl" alt="" />
<UploadImg
:action="action"
:data="data"
ref="upImg"
flag="picUrl"
@getsuccess="getImgUrl"
/>
</div> </div>
<div class="p-left"> <div class="p-left">
<p> <p>
...@@ -93,25 +110,27 @@ ...@@ -93,25 +110,27 @@
</el-form> </el-form>
</div> </div>
</div> </div>
<!-- --> <!-- -->
<el-drawer <el-drawer
:title="drawerTitle" :title="drawerTitle"
custom-class="jdindentdetail-drawer" custom-class="jdindentdetail-drawer"
size="510px" size="430px"
:visible.sync="drawerRight" :visible.sync="drawerRight"
> >
<img <img
class="shangImg" class="shangImg"
src="@/assets/imgs/jdt/shuoming.png" src="@/assets/imgs/jdt/shuoming.png"
alt alt=""
v-if="lookIndex == 1" v-if="lookIndex == 1"
/> />
<p v-if="lookIndex == 2"> <p v-if="lookIndex == 2">
图样文件格式应为jpg，图形应清晰，图样文件大小应小于“200KB”，且图形像素介于“600X600 图样文件格式应为jpg，图形应清晰，图样文件大小应小于“200KB”，且图形像素介于“600X600-
- 1500X1500”之间，如果通过扫描获得图样的，应按 1500X1500”之间，如果通过扫描获得图样的，应按24位彩色，300dpi分辨率扫描符合《商标法》
24位彩色，300dpi分辨率扫描符合《商标法》及其实施条例规定的图形（图形清晰，大于5X5厘米且小于10X10厘米），申请人（或代理人）应确保扫描后的图 及其实施条例规定的图形（图形清晰，大于5X5厘米且小于10X10厘米），申请人（或代理人）应
形与原图形的色彩深浅（或灰度）一致，否则，可能影响《商标注册证》上图形的清晰度）如上传图样为黑白，取得注册后，可以更换商标颜色使用；如上传图样为彩色，取得注册后只能按 确保扫描后的图形与原图形的色彩深浅（或灰度）一致，否则，可能影响《商标注册证》上图形
照该彩色图样使用；如确认提交彩色图样，需在委托书商标名称后方增加以下文字“（指定颜色）” 的清晰度）如上传图样为黑白，取得注册后，可以更换商标颜色使用；如上传图样为彩色，取得
注册后只能按照该彩色图样使用；如确认提交彩色图样，需在委托书商标名称后方增加以下文字“（指定颜色）”
</p> </p>
</el-drawer> </el-drawer>
</div> </div>
...@@ -133,10 +152,6 @@ ...@@ -133,10 +152,6 @@
<!-- 全部分类类别展示 --> <!-- 全部分类类别展示 -->
<div class="classTrademark-typelist" v-if="typeListShow"> <div class="classTrademark-typelist" v-if="typeListShow">
<div class="typelist-nav"> <div class="typelist-nav">
<!--
@change="handleCheckAllChange"
@keyup.enter="handleCheckAllChange"
-->
<el-checkbox <el-checkbox
:indeterminate="isIndeterminate" :indeterminate="isIndeterminate"
v-model="checkAll" v-model="checkAll"
...@@ -212,13 +227,30 @@ ...@@ -212,13 +227,30 @@
</div> </div>
</div> </div>
</div> </div>
<!-- 底部按钮的重写 -->
<!-- <div
style="float:left;display:inline-flex; z-index:100000000;position:absolute;left:0;right:0;height:30px;width:90000px;background:red;"
>
hello
</div> -->
</div> </div>
</template> </template>
<script> <script>
import { getNiceQueryCategory, getNiceQueryFilter } from "@/api/tmTools.js"; import {
getNiceQueryCategory,
getNiceQueryFilter,
word2pic,
getOss,
uploadStandardTm
} from "@/api/tmTools.js";
import UploadImg from "@/components/uploadImg";
export default { export default {
components: {
UploadImg
},
data() { data() {
return { return {
// 基本信息填写 // 基本信息填写
...@@ -231,9 +263,18 @@ export default { ...@@ -231,9 +263,18 @@ 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,
action: "",
data: {
key: "zc_picUrl670615786273319262020010.jpg",
Bucket: "gsb-zc",
OSSAccessKeyId: "",
Signature: "",
policy: "",
success_action_status: null
}, },
// 分类信息选择 // 分类信息选择
...@@ -319,11 +360,55 @@ export default { ...@@ -319,11 +360,55 @@ export default {
}, },
methods: { methods: {
// 抽屉展示 // 抽屉展示
getImgUrl(msg) {
this.loading = true;
this.imgUrl = msg;
uploadStandardTm(this.imgUrl).then(res => {
console.log(res);
this.loading = false;
if (res.status == 0) {
this.$message({
type: "success",
message: "上传成功"
});
} else {
this.$message.error("上传失败，请重新上传！");
}
});
},
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";
// this.$refs[flag].data.key = key;
return key;
},
lookImg(title, index) { lookImg(title, index) {
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;
}
});
}
},
manualupload() {},
// 分类信息选择 // 分类信息选择
// 清除选中的标签 // 清除选中的标签
...@@ -365,6 +450,7 @@ export default { ...@@ -365,6 +450,7 @@ export default {
}, },
// 输入名字 参数传递 // 输入名字 参数传递
handleInputBrandnameBlur() { handleInputBrandnameBlur() {
console.log(1, this.ruleForm.name);
this.$bus.emit("on-input-brandname-blur", this.ruleForm.name); this.$bus.emit("on-input-brandname-blur", this.ruleForm.name);
}, },
...@@ -427,7 +513,9 @@ export default { ...@@ -427,7 +513,9 @@ export default {
if (node.data !== null) { if (node.data !== null) {
hasChild = true; hasChild = true;
} }
console.log(node);
// console.log(node);
// 初始的一级45个类别的静态数据的装填 // 初始的一级45个类别的静态数据的装填
if (node.level === 0) { if (node.level === 0) {
return resolve(this.ncldata); return resolve(this.ncldata);
...@@ -522,7 +610,14 @@ export default { ...@@ -522,7 +610,14 @@ export default {
this.checkedType = []; this.checkedType = [];
} }
}, },
mounted() {} mounted() {
// 获取Oss
getOss().then(res => {
this.data = res.data;
this.data.key = this.setKey();
this.action = res.data.url;
});
}
}; };
</script> </script>
...@@ -555,6 +650,12 @@ export default { ...@@ -555,6 +650,12 @@ export default {
} }
} }
.a-span { .a-span {
font-family: PingFangSC-Regular;
font-size: 12px;
color: #409eff;
cursor: pointer;
margin-left: 30px;
width: 108px; width: 108px;
height: 17px; height: 17px;
font-size: 12px; font-size: 12px;
...@@ -563,13 +664,15 @@ export default { ...@@ -563,13 +664,15 @@ export default {
line-height: 17px; line-height: 17px;
margin-left: 30px; margin-left: 30px;
} }
.a-span:hover { .a-span:hover {
color: #0989c5; color: #0989c5;
text-decoration: underline; text-decoration: underline;
} }
.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;
...@@ -578,11 +681,20 @@ export default { ...@@ -578,11 +681,20 @@ export default {
border-radius: 100px; border-radius: 100px;
color: rgb(102, 102, 102); color: rgb(102, 102, 102);
font-size: 12px; font-size: 12px;
position: relative;
} }
.trademarkImg { .trademarkImg {
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/selftmreg/Selftmreg.vue
...@@ -11,8 +11,6 @@ ...@@ -11,8 +11,6 @@
</div> </div>
<!-- 主体页面 --> <!-- 主体页面 -->
<!-- <SelftmregPage /> -->
<div class="jdindentdetail-page"> <div class="jdindentdetail-page">
<div class="jdindentdetail-wrap"> <div class="jdindentdetail-wrap">
<!-- 主体内容步骤条 --> <!-- 主体内容步骤条 -->
...@@ -22,14 +20,11 @@ ...@@ -22,14 +20,11 @@
<el-form class="demo-ruleForm" label-width="120px"> <el-form class="demo-ruleForm" label-width="120px">
<div class="selftmreg_main"> <div class="selftmreg_main">
<div class="selftmreg_shu"></div> <div class="selftmreg_shu"></div>
<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" :msgFromParent="shareParams" /> <ConfirmOrder v-if="index == 2" :msgFromParent="shareParams" />
<PayOrder v-if="index == 3" /> <PayOrder v-if="index == 3" />
</div> </div>
<div style="clear:both;"></div>
</el-form> </el-form>
</div> </div>
</div> </div>
...@@ -341,6 +336,4 @@ export default { ...@@ -341,6 +336,4 @@ export default {
} }
} }
} }
// 底部按钮样式重写
</style> </style>
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