Skip to content

Z
zhichan
Commit b2f4df12 by 刘泽奇
Options

123

parent 686bab32
Showing with 80 additions and 20 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
...@@ -218,10 +218,11 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => { ...@@ -218,10 +218,11 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
var jdindentdetail = location.hash.includes('/jdindentdetail'); var jdindentdetail = location.hash.includes('/jdindentdetail');
var OAjddetails = location.hash.includes('/OAjddetails'); var OAjddetails = location.hash.includes('/OAjddetails');
var OAjdcompany = location.hash.includes('/OAjdcompany'); var OAjdcompany = location.hash.includes('/OAjdcompany');
if (OAjdlist || selftmreg || jdindentlist || jdindentdetail || OAjddetails || OAjdcompany) { var companydetail = location.hash.includes('/companydetail');
if (OAjdlist || selftmreg || jdindentlist || jdindentdetail || OAjddetails || OAjdcompany || companydetail) {
this.selfFooterShow = false; this.selfFooterShow = false;
} }
if (OAjdlist || jdindentlist || jdindentdetail || OAjddetails || OAjdcompany) { if (OAjdlist || jdindentlist || jdindentdetail || OAjddetails || OAjdcompany || companydetail) {
this.selfHeaderShow = false; this.selfHeaderShow = false;
} }
break; break;
......
igirl-channel-web/app/front/vues/pages/OAjdlist/OAjdlist.html
...@@ -399,7 +399,7 @@ ...@@ -399,7 +399,7 @@
</el-tab-pane> </el-tab-pane>
<!-- channelFrom != \'gsbhome\' -->
<el-tab-pane label="工商订单" name="second" v-if="0"> <el-tab-pane label="工商订单" name="second" v-if="0">
<div class="jdindentlist"> <div class="jdindentlist">
<div class="jdindentlist-inquire"> <div class="jdindentlist-inquire">
......
igirl-channel-web/app/front/vues/pages/companydetail/companydetail.css
.companydetail-warpper .jdindentdetail-main-step-row>div { .companydetail-warpper .jdindentdetail-main-step-row>div {
min-height: 0; min-height: 0;
} }
.companydetail-warpper{
width: 1320px;
margin: 0 auto;
}
.companydetail-warpper>.jdindentdetail { .companydetail-warpper>.jdindentdetail {
margin: 0 auto; margin: 0 auto;
......
igirl-channel-web/app/front/vues/pages/companydetail/companydetail.html
<div class="companydetail-warpper"> <div class="warpper-bg">
<div class="jdindentlist-header"> <div class="jdindentlist-header" v-if="channelFrom == \'jd\'">
<div>京东云商标</div> <div>京东云PLUS工商、商标注册平台</div>
<div> <div v-if="user_Name">
<span><i class="el-icon-user"></i></span> <span v-if="user_Name"><i class="el-icon-user"></i></span>
<span>1366*565445</span> <span>{{user_Name}}</span>
</div> <span @click="loginOut" v-if="user_Name">退出</span>
</div> </div>
<div v-else>
<a href="https://login.jdcloud.com/?returnUrl=http%3A%2F%2Ftm.plus.jdcloud.com%2F%23%2Fjd%2Fjdindentlist"
class="jdindentlist-header-login">登录</a>
<a href="https://user.jdcloud.com/register?source=jdcloud&ReturnUrl=https%3A%2F%2Fwww.jdcloud.com" style="display:inline-block;color: #fff;padding: 0 15px;background:linear-gradient(80deg,#3171ff 0,#a14faf 100%);border-radius:13px;height: 26px;
line-height: 26px;">免费注册</a>
</div>
</div>
<div class="companydetail-warpper">
<div> <div>
<div style="display:flex;height: 60px;align-items: center;"> <div style="display:flex;height: 60px;align-items: center;">
<div style="background:#ffffff; <div style="background:#ffffff;
...@@ -237,4 +246,6 @@ ...@@ -237,4 +246,6 @@
</div> </div>
</div> </div>
</div>
</div> </div>
\ No newline at end of file
igirl-channel-web/app/front/vues/pages/companydetail/companydetail.js
...@@ -3,18 +3,59 @@ ...@@ -3,18 +3,59 @@
data: function() { data: function() {
return { return {
listPath: { path: `/${this.$root.channelName}/jdindentlist`, query: {} }, listPath: { path: `/${this.$root.channelName}/jdindentlist`, query: {} },
currentStep:1, currentStep: 1,
companyData:[], companyData: [],
channelFrom: null,
user_Name: "",
} }
}, },
mounted: function() { mounted: function() {
document.cookie.split('; ').map((item, index) => {
if (item.includes('pin=')) {
this.user_Name = decodeURIComponent(item.substring(4));
console.log(this.user_Name, "bbbbbbbbbbbbbbbbbbbbbbbb");
}
});
this.getChannelFrom();
}, },
created: function() { created: function() {
}, },
methods: { methods: {
getChannelFrom(){
this.channelFrom = this.$root.getChannelPath();
},
loginOut(){
/*
var url = encodeURIComponent("http://tm.plus.jdcloud.com/#/jd/jdtrademark") ;
*/
/*
location.href = `http://login.jdcloud.com/logout?callback=http://tm.plus.jdcloud.com/#/jd/jdtrademark`;
*/
let _this = this;
$.ajax({
async: true,
url: "https://login.jdcloud.com/logout",
type: "GET",
dataType: "jsonp",
jsonp: 'callback',
jsonpCallback: 'handleResponse',
data: {
},
success: function (response, status, xhr) {
console.log('状态为：' + status + ',状态是：' + xhr.statusText);
console.log(response);
if (response.code == 0) {
console.log(response);
_this.$router.push({ path: `/${_this.$root.channelName}/jdtrademark` });
}
}
});
}, },
},
vname: "gsb-companydetail" vname: "gsb-companydetail"
} }
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.html
<div class="wrapper-bg"> <div class="wrapper-bg">
<div class="jdindentdetail-warpper">
<div class="jdindentlist-header" v-if="channelFrom == \'jd\'"> <div class="jdindentlist-header" v-if="channelFrom == \'jd\'">
<div>京东云PLUS工商、商标注册平台</div> <div>京东云PLUS工商、商标注册平台</div>
<div v-if="user_Name"> <div v-if="user_Name">
<span v-if="user_Name"><i class="el-icon-user"></i></span> <span v-if=s"user_Name"><i class="el-icon-user"></i></span>
<span>{{user_Name}}</span> <span>{{user_Name}}</span>
<span @click="loginOut" v-if="user_Name">退出</span> <span @click="loginOut" v-if="user_Name">退出</span>
</div> </div>
...@@ -17,6 +14,8 @@ ...@@ -17,6 +14,8 @@
line-height: 26px;">免费注册</a> line-height: 26px;">免费注册</a>
</div> </div>
</div> </div>
<div class="jdindentdetail-warpper">
<div class="jdindentdetail"> <div class="jdindentdetail">
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.css
...@@ -222,7 +222,10 @@ ...@@ -222,7 +222,10 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.jdindentlist-null>p{
text-align: center;
margin-top: 10px;
}
.jdindentlist-warpper .demo-ruleForm { .jdindentlist-warpper .demo-ruleForm {
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.html
<div class="jdindentlist-warpper"> <div class="jdindentlist-warpper">
<div class="jdindentlist-header" v-if="channelFrom == \'jd\'"> <div class="jdindentlist-header" v-if="channelFrom == \'jd\'">
<div>京东云PLUS工商、商标注册平台</div> <div>京东云PLUS工商、商标注册平台</div>
...@@ -399,7 +400,7 @@ ...@@ -399,7 +400,7 @@
</el-tab-pane> </el-tab-pane>
<!-- channelFrom != \'gsbhome\' -->
<el-tab-pane label="工商订单" name="second" v-if="0"> <el-tab-pane label="工商订单" name="second" v-if="0">
<div class="jdindentlist"> <div class="jdindentlist">
<div class="jdindentlist-inquire"> <div class="jdindentlist-inquire">
......
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