Skip to content

Z
zhichan
Commit 4921df69 by 宋毅
Options

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

parents 3e4aac15 55a2901b
Showing with 109 additions and 32 deletions
igirl-channel-web/app/front/entry/public/css/pagecom.css
This source diff could not be displayed because it is too large. You can view the blob instead.
igirl-channel-web/app/front/entry/public/js/index.js
...@@ -178,6 +178,7 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => { ...@@ -178,6 +178,7 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
isLogin: false, isLogin: false,
logoImg: null, logoImg: null,
homeUrl: "", homeUrl: "",
footerText:"",
}; };
}, },
created() { created() {
...@@ -228,6 +229,7 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => { ...@@ -228,6 +229,7 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
title.innerText = "小望商标注册服务"; title.innerText = "小望商标注册服务";
this.logoImg = '/imgs/bwlogo.png'; this.logoImg = '/imgs/bwlogo.png';
this.homeUrl = "/bw/jdtrademark"; this.homeUrl = "/bw/jdtrademark";
this.footerText = "浙江小望科技有限公司";
break; break;
case '1688': case '1688':
title.innerText = "1688商标注册服务"; title.innerText = "1688商标注册服务";
......
igirl-channel-web/app/front/vues/pages/bwselftmreg/bwselftmreg.html
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
形与原图形的色彩深浅（或灰度）一致，否则，可能影响《商标注册证》上图形的清晰度）如上传图样为黑白，取得注册后，可以更换商标颜色使用；<span>如上传图样为彩色，取得注册后只能按 形与原图形的色彩深浅（或灰度）一致，否则，可能影响《商标注册证》上图形的清晰度）如上传图样为黑白，取得注册后，可以更换商标颜色使用；<span>如上传图样为彩色，取得注册后只能按
照该彩色图样使用；如确认提交彩色图样，需在委托书商标名称后方增加以下文字“（指定颜色）”</span></div> 照该彩色图样使用；如确认提交彩色图样，需在委托书商标名称后方增加以下文字“（指定颜色）”</span></div>
</el-dialog> </el-dialog>
<div > <div>
<div> <div>
<!-- <el-form-item label="选择商标方式" style="float:left;padding-right:10px;"> <!-- <el-form-item label="选择商标方式" style="float:left;padding-right:10px;">
<el-radio-group v-model="form.selecttype" style="float:left;padding-left:10px;margin-bottom: 22px;"> <el-radio-group v-model="form.selecttype" style="float:left;padding-left:10px;margin-bottom: 22px;">
...@@ -837,7 +837,8 @@ ...@@ -837,7 +837,8 @@
type="primary" @click="submitForm(\'form\',true)">确 定</el-button> type="primary" @click="submitForm(\'form\',true)">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
<el-dialog title="提示" custom-class="selftmreg-loginmask" :visible.sync="toLogin" width="30%" :close-on-click-modal="false" :close-on-press-escape="false" > <el-dialog title="提示" custom-class="selftmreg-loginmask" :visible.sync="toLogin" width="30%"
:close-on-click-modal="false" :close-on-press-escape="false">
<span>需要先登录才能注册噢 !</span> <span>需要先登录才能注册噢 !</span>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" @click="goGsbLogin">去登录</el-button> <el-button type="primary" @click="goGsbLogin">去登录</el-button>
......
igirl-channel-web/app/front/vues/pages/bwselftmreg/bwselftmreg.js
...@@ -1185,25 +1185,33 @@ ...@@ -1185,25 +1185,33 @@
}, },
submitForm(formName, agree) { submitForm(formName, agree) {
console.log(agree,"mmmmmmmmmmmmmmmmmmmmmmmmmmmmmm");
var that = this; var that = this;
if (this.nclOne.length > 0) { if (this.nclOne.length > 0) {
console.log(this.nclOne, ",,,,,,,,,,,,,,,,,,,,,,,,"); console.log(this.nclOne, ",,,,,,,,,,,,,,,,,,,,,,,,");
this.nclOne.map((item, index) => { this.nclOne.map((item, index) => {
if (item.nclThree.length < 10 && formName == "form") { if (item.nclThree.length < 10 && formName == "form") {
console.log(item, '111111111111111111111111111111111111111'); console.log(item, 'jjjjjjjjjjjjjjjjjjjjjjjjjj', agree);
item.checked = item.nclThree.length; item.checked = item.nclThree.length;
this.showConfrim = true; this.showConfrim = true;
if (agree) { if (agree) {
if (!this.form.tmName || !this.form.colorizedPicUrl) { if (this.form.tmFormType == "4") {
this.$message.warning("请完善信息"); if (!this.form.colorizedPicUrl) {
console.log('ppppppppppppppppppppp'); this.$message.warning("请完善信息");
return; console.log("]]]]]]]]]]]]]]]]]]]]]]]]]]]]]");
return
}else{
this.showConfrim = false;
}
} else { } else {
this.showConfrim = false; if (!this.form.tmName || !this.form.colorizedPicUrl) {
this.$message.warning("请完善信息");
return
console.log('ttttttttttttttttttttttttttt');
}else{
this.showConfrim = false;
}
} }
} else {
return;
} }
} }
...@@ -1259,7 +1267,6 @@ ...@@ -1259,7 +1267,6 @@
switch (this.$root.channelName) { switch (this.$root.channelName) {
case 'jd': case 'jd':
/**提报接口 */ /**提报接口 */
var obj = { var obj = {
tm: that.form, tm: that.form,
apply: that.apply, apply: that.apply,
......
igirl-channel-web/app/front/vues/pages/jdtrademark/jdtrademark.css
...@@ -476,4 +476,14 @@ li { ...@@ -476,4 +476,14 @@ li {
.showncllist-enter-to, .showncllist-enter-to,
.showncllist-leave { .showncllist-leave {
opacity: 1; opacity: 1;
}
.jdtrademark-footer-copyright {
background: #080b4f;
height: 40px;
width: 100%;
position: fixed;
z-index: 9999;
bottom: 0;
left: 0;
} }
\ No newline at end of file
igirl-channel-web/app/front/vues/pages/jdtrademark/jdtrademark.html
...@@ -152,5 +152,9 @@ ...@@ -152,5 +152,9 @@
</ul> </ul>
</div> </div>
</div> </div>
<div class="jdtrademark-footer-copyright" v-if="this.$root.channelName==\'bw\' ">
<div class="login-footer-copyright">
© 2020 {{this.$root.footerText}}版权所有 浙ICP备18049567号
</div>
</div>
</div> </div>
\ No newline at end of file
igirl-channel-web/app/front/vues/pages/jdtrademark/jdtrademark.js
...@@ -264,7 +264,6 @@ ...@@ -264,7 +264,6 @@
} }
break; break;
case "bw": case "bw":
if (code.channelItemCode) { if (code.channelItemCode) {
switch (code.itemCode) { switch (code.itemCode) {
case "zzsbzc": case "zzsbzc":
...@@ -275,12 +274,8 @@ ...@@ -275,12 +274,8 @@
} }
}); });
} else { } else {
this.$message({ this.$router.push({ path: `/${this.$root.channelName}/login` });
type: "warning",
message: "当前未登录"
})
} }
/*this.$router.push({ path: "/jd/selftmreg", query: {} });*/ /*this.$router.push({ path: "/jd/selftmreg", query: {} });*/
break; break;
case "fzsbzc": case "fzsbzc":
......
igirl-channel-web/app/front/vues/pages/login/login.css
...@@ -43,4 +43,12 @@ ...@@ -43,4 +43,12 @@
font-size: 18px; font-size: 18px;
font-weight: 400; font-weight: 400;
color: rgba(47, 47, 47, 1); color: rgba(47, 47, 47, 1);
}
.login-footer-copyright{
position: fixed;
bottom: 1%;
left: 50%;
transform: translateX(-50%);
color: #ffffff;
} }
\ No newline at end of file
igirl-channel-web/app/front/vues/pages/login/login.html
...@@ -8,6 +8,12 @@ ...@@ -8,6 +8,12 @@
width: 100vw;"> width: 100vw;">
<img style="width:100%;height:100%" :src="loginUrl" /> <img style="width:100%;height:100%" :src="loginUrl" />
<div class="login-text"> <div class="login-text">
<div>小望科技商标注册平台</div>
<ul>
<li>高效极速递交商标局</li>
<li>全流程线上进度透明</li>
<li>实时同步商标局回执文件</li>
</ul>
</div> </div>
<div class="login-div" v-show="a"> <div class="login-div" v-show="a">
<div class="login-content" id="baoguo" style="height:auto;"> <div class="login-content" id="baoguo" style="height:auto;">
...@@ -116,6 +122,9 @@ ...@@ -116,6 +122,9 @@
</div> </div>
</div> </div>
<div class="login-footer-copyright" v-if="this.$root.channelName==\'bw\' ">
© 2020 {{this.$root.footerText}}版权所有 浙ICP备18049567号
</div>
</div> </div>
<!-- <gsb-pcpage style="text-align:center;margin-top:80px"> <!-- <gsb-pcpage style="text-align:center;margin-top:80px">
......
igirl-channel-web/app/front/vues/pages/login/login.js
...@@ -107,10 +107,8 @@ ...@@ -107,10 +107,8 @@
}, },
created: function() { created: function() {
console.log(this.pfooterinfo); console.log(this.pfooterinfo);
if (this.pfooterinfo && this.pfooterinfo.loginUrl) { if (this.$root.channelName == "bw"){
this.loginUrl = this.pfooterinfo.loginUrl; this.loginUrl = "/imgs/loginbg.png";
} else {
this.loginUrl = "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_41110157500594182420192913391824zhuce_background.png";
} }
}, },
destroyed() { destroyed() {
......
igirl-channel-web/app/front/vues/pages/nowbuy/nowbuy.html
...@@ -29,9 +29,15 @@ ...@@ -29,9 +29,15 @@
</el-table-column> </el-table-column>
<el-table-column prop="" label=""> <el-table-column prop="" label="">
</el-table-column> </el-table-column>
<el-table-column prop="" label="">
</el-table-column>
<el-table-column prop="" label="">
</el-table-column>
<el-table-column prop="" label="">
</el-table-column>
</el-table> </el-table>
</div> </div>
<div class="nowbuy-title"> <div class="nowbuy-title">
<div> <div>
订单联系人 订单联系人
......
igirl-channel-web/app/front/vues/pages/nowbuy/nowbuy.js
...@@ -82,6 +82,9 @@ ...@@ -82,6 +82,9 @@
} }
}, },
goOrder(){ goOrder(){
if ($.cookie('userpin') && $.cookie('userpin') != "") {
this.$router.push(`/${this.$root.channelName}/login`);
}
this.$refs.apply.validate((v) => { this.$refs.apply.validate((v) => {
console.log(v); console.log(v);
if (v) { if (v) {
......
igirl-channel-web/app/front/vues/pages/register/register.css
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
} }
.login-content-inputs { .login-content-inputs {
margin-left: 30px; margin: 0 auto;
width: 315px; width: 315px;
height: 44px; height: 44px;
} }
...@@ -46,6 +46,29 @@ ...@@ -46,6 +46,29 @@
.login-text { .login-text {
position: absolute; position: absolute;
left: 34%; left: 18.75%;
top: 29%; top: 26%;
}
.login-text>div:nth-child(1) {
font-size: 54px;
font-family: PingFangSC-Semibold, PingFang SC;
font-weight: 600;
color: rgba(255, 255, 255, 1);
margin-bottom: 80px;
margin-left: -24px;
}
.login-text ul{
list-style: disc;
}
.login-text ul li {
list-style: disc;
color: #ffffff;
margin: 25px 0;
font-size: 20px;
font-family: MicrosoftYaHei;
color: rgba(255, 255, 255, 1);
line-height: 26px;
} }
\ No newline at end of file
igirl-channel-web/app/front/vues/pages/register/register.html
...@@ -8,9 +8,15 @@ ...@@ -8,9 +8,15 @@
width: 100vw;"> width: 100vw;">
<img style="width:100%;height:100%" :src="loginUrl" /> <img style="width:100%;height:100%" :src="loginUrl" />
<div class="login-text"> <div class="login-text">
<div>小望科技商标注册平台</div>
<ul>
<li>高效极速递交商标局</li>
<li>全流程线上进度透明</li>
<li>实时同步商标局回执文件</li>
</ul>
</div> </div>
<div class="login-div" v-if="a"> <div class="login-div" v-if="a">
<div class="login-content" style="width: 380px; <div class="login-content" style="width: 361.97px;
height: 430px; height: 430px;
background: rgba(255,255,255,1); background: rgba(255,255,255,1);
border: 1px solid rgba(151,151,151,1);"> border: 1px solid rgba(151,151,151,1);">
...@@ -56,6 +62,9 @@ ...@@ -56,6 +62,9 @@
</div> </div>
</div> </div>
<div class="login-footer-copyright" v-if="this.$root.channelName==\'bw\' ">
© 2020 {{this.$root.footerText}}版权所有 浙ICP备18049567号
</div>
</div> </div>
<!-- <gsb-pcpage style="text-align:center;margin-top:80px"> <!-- <gsb-pcpage style="text-align:center;margin-top:80px">
......
igirl-channel-web/app/front/vues/pages/register/register.js
...@@ -108,10 +108,8 @@ ...@@ -108,10 +108,8 @@
}, },
created: function() { created: function() {
console.log(this.pfooterinfo); console.log(this.pfooterinfo);
if (this.pfooterinfo && this.pfooterinfo.loginUrl) { if (this.$root.channelName == "bw"){
this.loginUrl = this.pfooterinfo.loginUrl; this.loginUrl = "/imgs/loginbg.png";
} else {
this.loginUrl = "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_41110157500594182420192913391824zhuce_background.png";
} }
}, },
destroyed() { destroyed() {
......
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