Skip to content

Z
zhichan
Commit 4447e031 by 宋毅
Options

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

parents b80e117a 97b532a7
Showing with 144 additions and 51 deletions
igirl-channel-web/app/base/controller/impl/trademark/tmqueryCtl.js
...@@ -30,7 +30,6 @@ class tmqueryCtl extends CtlBase { ...@@ -30,7 +30,6 @@ class tmqueryCtl extends CtlBase {
} }
pobj.isDecryptUser = "yes"; pobj.isDecryptUser = "yes";
} }
var rc = system.getObject("util.execClient"); var rc = system.getObject("util.execClient");
try { try {
if (!pobj.requrl) { if (!pobj.requrl) {
......
igirl-channel-web/app/config/settings.js
...@@ -21,7 +21,7 @@ var settings = { ...@@ -21,7 +21,7 @@ var settings = {
port: process.env.NODE_PORT || 4004, port: process.env.NODE_PORT || 4004,
channelApiUrl: function () { channelApiUrl: function () {
if (this.env == "dev") { if (this.env == "dev") {
return "http://zcchannel.apps.com"; return "http://zcchannel.apps.com:4003";
} else { } else {
return "http://zc-channel-service"; return "http://zc-channel-service";
} }
......
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
...@@ -163,7 +163,6 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => { ...@@ -163,7 +163,6 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
}; };
}, },
created() { created() {
$(window).resize(() => { $(window).resize(() => {
$("#app").css("min-height", $(window).height()); $("#app").css("min-height", $(window).height());
}); });
...@@ -182,11 +181,12 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => { ...@@ -182,11 +181,12 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
var jdindentlist = location.hash.includes('/jdindentlist'); var jdindentlist = location.hash.includes('/jdindentlist');
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');
console.log(find, "lllllllllllllllllllllllllllllll"); console.log(find, "lllllllllllllllllllllllllllllll");
if (OAjdlist || selftmreg || jdindentlist || jdindentdetail || OAjddetails) { if (OAjdlist || selftmreg || jdindentlist || jdindentdetail || OAjddetails || OAjdcompany) {
$('.jdc-footer').hide(); $('.jdc-footer').hide();
} }
if (OAjdlist || jdindentlist || jdindentdetail || OAjddetails) { if (OAjdlist || jdindentlist || jdindentdetail || OAjddetails || OAjdcompany) {
$('.jc_hd').hide(); $('.jc_hd').hide();
} }
} else { } else {
...@@ -194,7 +194,7 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => { ...@@ -194,7 +194,7 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
$('.jdc-footer').hide(); $('.jdc-footer').hide();
console.log("zzzzzzzzzzzzzzz", location.hash.split('/')[1], this.headerHidden); console.log("zzzzzzzzzzzzzzz", location.hash.split('/')[1], this.headerHidden);
} }
}, 0); }, 300);
var self = this; var self = this;
if (!this.currentUser) { if (!this.currentUser) {
this.logins.push({ "icon": "el-icon-location-outline", "title": "登录", "type": "text", key: "login", "isOnGrid": true }); this.logins.push({ "icon": "el-icon-location-outline", "title": "登录", "type": "text", key: "login", "isOnGrid": true });
......
igirl-channel-web/app/front/vues/pages/OAjdcompany/OAjdcompany.html
<div class="companydetail-warpper"> <div class="companydetail-warpper">
<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>
<span @click="loginOut" v-if="user_Name">退出</span>
</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> </div>
<div> <div>
......
igirl-channel-web/app/front/vues/pages/OAjdcompany/OAjdcompany.js
...@@ -5,15 +5,44 @@ ...@@ -5,15 +5,44 @@
listPath: { path: `/${this.$root.channelName}/jdindentlist`, query: {} }, listPath: { path: `/${this.$root.channelName}/jdindentlist`, query: {} },
currentStep:1, currentStep:1,
companyData:[], companyData:[],
user_Name:"",
channelFrom:"",
} }
}, },
mounted: function() { mounted: function() {
}, },
created: function() { created: function() {
document.cookie.split('; ').map((item, index) => {
if (item.includes('pin=')) {
this.user_Name = item.substring(4);
}
});
this.getChannelFrom();
}, },
methods: { methods: {
getChannelFrom(){
this.channelFrom = this.$root.getChannelPath();
},
loginOut(){
let _this = this;
$.ajax({
async: true,
url: "http://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){
_this.user_Name = "";
}
}
});
},
}, },
vname: "gsb-OAjdcompany" vname: "gsb-OAjdcompany"
......
igirl-channel-web/app/front/vues/pages/OAjddetails/OAjddetails.html
...@@ -7,13 +7,18 @@ ...@@ -7,13 +7,18 @@
<span>退出</span> <span>退出</span>
</div> </div>
</div> --> </div> -->
<div class="jdindentlist-header"> <div class="jdindentlist-header" v-if="channelFrom == \'jd\'">
<div>京东云PLUS工商、商标注册平台</div> <div>京东云PLUS工商、商标注册平台</div>
<div> <div v-if="user_Name">
<span v-if="user_Name"><i class="el-icon-user"></i></span> <span v-if="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>
<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>
<!-- <div> <!-- <div>
<div style="display:flex;height: 60px;align-items: center;"> <div style="display:flex;height: 60px;align-items: center;">
...@@ -28,7 +33,6 @@ ...@@ -28,7 +33,6 @@
</div> </div>
</div> </div>
</div> --> </div> -->
<div class="jdindentdetail"> <div class="jdindentdetail">
<div class="jdindentdetail-nav"> <div class="jdindentdetail-nav">
<div style="background:#ffffff; <div style="background:#ffffff;
......
igirl-channel-web/app/front/vues/pages/OAjddetails/OAjddetails.js
...@@ -332,6 +332,7 @@ ...@@ -332,6 +332,7 @@
/**订单付款信息 */ /**订单付款信息 */
receiptVoucher: {}, receiptVoucher: {},
user_Name: "", user_Name: "",
channelFrom:"",
} }
}, },
mounted: function() { mounted: function() {
...@@ -393,6 +394,7 @@ ...@@ -393,6 +394,7 @@
this.user_Name = item.substring(4); this.user_Name = item.substring(4);
} }
}); });
this.getChannelFrom();
}, },
computed: { computed: {
...@@ -435,6 +437,9 @@ ...@@ -435,6 +437,9 @@
}, },
methods: { methods: {
getChannelFrom(){
this.channelFrom = this.$root.getChannelPath();
},
loginOut(){ loginOut(){
$.ajax({ $.ajax({
async: true, async: true,
......
igirl-channel-web/app/front/vues/pages/OAjdlist/OAjdlist.html
<div class="jdindentlist-warpper"> <div class="jdindentlist-warpper">
<div class="jdindentlist-header"> <div class="jdindentlist-header" v-if="channelFrom == \'jd\'">
<div>京东云PLUS工商、商标注册平台</div> <div>京东云PLUS工商、商标注册平台</div>
<div> <div v-if="user_Name">
<span v-if="user_Name"><i class="el-icon-user"></i></span> <span v-if="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>
<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>
<div> <div>
......
igirl-channel-web/app/front/vues/pages/OAjdlist/OAjdlist.js
...@@ -438,6 +438,7 @@ ...@@ -438,6 +438,7 @@
], ],
hidePage: true, hidePage: true,
user_Name:"", user_Name:"",
channelFrom:"",
} }
}, },
...@@ -452,6 +453,7 @@ ...@@ -452,6 +453,7 @@
this.user_Name = item.substring(4); this.user_Name = item.substring(4);
} }
}); });
this.getChannelFrom();
}, },
mounted: function() { mounted: function() {
var that = this; var that = this;
...@@ -473,6 +475,9 @@ ...@@ -473,6 +475,9 @@
}, },
methods: { methods: {
getChannelFrom(){
this.channelFrom = this.$root.getChannelPath();
},
loginOut(){ loginOut(){
$.ajax({ $.ajax({
async: true, async: true,
......
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.html
<div class="wrapper-bg"> <div class="wrapper-bg">
<div class="jdindentdetail-warpper"> <div class="jdindentdetail-warpper">
<!-- <div class="jdindentdetail-header">
<div>个人中心</div> <div class="jdindentlist-header" v-if="channelFrom == \'jd\'">
<div>
<span>欢迎</span>
<span>1366*565445</span>
<span>退出</span>
</div>
</div> -->
<div class="jdindentlist-header">
<div>京东云PLUS工商、商标注册平台</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>{{user_Name}}</span> <span>{{user_Name}}</span>
<span>退出</span> <span @click="loginOut" v-if="user_Name">退出</span>
</div>
</div>
<div>
<!-- <div style="display:flex;height: 60px;align-items: center;">
<div style="background:#ffffff;
border:3px solid #3071fe;
width:6px;
height:6px;
border-radius:100%;margin: 0 10px 0 20px;">
</div> </div>
<div style="font-size: 16px;"> <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> -->
</div> </div>
<div class="jdindentdetail"> <div class="jdindentdetail">
<div class="jdindentdetail-nav"> <div class="jdindentdetail-nav">
<div style="background:#ffffff; <div style="background:#ffffff;
......
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.js
...@@ -331,7 +331,8 @@ ...@@ -331,7 +331,8 @@
popupValue: "", popupValue: "",
/**订单付款信息 */ /**订单付款信息 */
receiptVoucher: {}, receiptVoucher: {},
user_Name:"" user_Name:"",
channelFrom:"",
} }
}, },
mounted: function() { mounted: function() {
...@@ -393,6 +394,7 @@ ...@@ -393,6 +394,7 @@
this.user_Name = item.substring(4); this.user_Name = item.substring(4);
} }
}); });
this.getChannelFrom();
}, },
computed: { computed: {
...@@ -434,7 +436,9 @@ ...@@ -434,7 +436,9 @@
}, },
methods: { methods: {
getChannelFrom(){
this.channelFrom = this.$root.getChannelPath();
},
/*初始化订单数据 */ /*初始化订单数据 */
initIndent(){ initIndent(){
var deliveryObj = this.$root.copyParams({ "deliveryOrderNo": this.deliveryOrderNo, "channelUserId": this.$route.query.channelUserId }, "getTmOrderInfo", "/action/tmOrder/springBoard"); var deliveryObj = this.$root.copyParams({ "deliveryOrderNo": this.deliveryOrderNo, "channelUserId": this.$route.query.channelUserId }, "getTmOrderInfo", "/action/tmOrder/springBoard");
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.css
...@@ -20,6 +20,14 @@ ...@@ -20,6 +20,14 @@
line-height: 24px; line-height: 24px;
} }
.jdindentlist-header-login {
color: #fff;
margin-right: 13px;
}
.jdindentlist-header-login:hover{
color: #3171ff;
}
.jdindentlist-header>div:nth-child(2)>span:nth-child(1) { .jdindentlist-header>div:nth-child(2)>span:nth-child(1) {
font-size: 16px; font-size: 16px;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.html
<div class="jdindentlist-warpper"> <div class="jdindentlist-warpper">
<div class="jdindentlist-header"> <div class="jdindentlist-header" v-if="channelFrom == \'jd\'">
<div>京东云PLUS工商、商标注册平台</div> <div>京东云PLUS工商、商标注册平台</div>
<div> <div v-if="user_Name">
<span v-if="user_Name"><i class="el-icon-user"></i></span> <span v-if="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>
<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>
<div> <div>
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.js
...@@ -441,6 +441,7 @@ ...@@ -441,6 +441,7 @@
], ],
hidePage: true, hidePage: true,
user_Name: "", user_Name: "",
channelFrom: "",
} }
}, },
...@@ -455,6 +456,7 @@ ...@@ -455,6 +456,7 @@
this.user_Name = item.substring(4); this.user_Name = item.substring(4);
} }
}); });
this.getChannelFrom();
}, },
mounted: function() { mounted: function() {
var that = this; var that = this;
...@@ -476,6 +478,10 @@ ...@@ -476,6 +478,10 @@
}, },
methods: { methods: {
getChannelFrom(){
this.channelFrom = this.$root.getChannelPath();
console.log(this.channelFrom, '~~~~~~~~~~~~~~~~~~~~~~~~~');
},
checkedCity(e){ checkedCity(e){
let city = this.regionValue[0]; let city = this.regionValue[0];
let area = this.regionValue[1]; let area = this.regionValue[1];
...@@ -495,6 +501,7 @@ ...@@ -495,6 +501,7 @@
} }
}, },
loginOut(){ loginOut(){
let _this = this;
$.ajax({ $.ajax({
async: true, async: true,
url: "http://login.jdcloud.com/logout", url: "http://login.jdcloud.com/logout",
...@@ -503,11 +510,14 @@ ...@@ -503,11 +510,14 @@
jsonp: 'callback', jsonp: 'callback',
jsonpCallback: 'handleResponse', jsonpCallback: 'handleResponse',
data: { data: {
}, },
success: function (response, status, xhr) { success: function (response, status, xhr) {
console.log('状态为：' + status + ',状态是：' + xhr.statusText); console.log('状态为：' + status + ',状态是：' + xhr.statusText);
console.log(response); console.log(response);
if (response.code == 0) {
console.log(document.cookie);
}
} }
}); });
}, },
......
igirl-channel-web/app/front/vues/pages/jdtrademark/jdtrademark.css
...@@ -13,8 +13,25 @@ li { ...@@ -13,8 +13,25 @@ li {
min-height: 480px; min-height: 480px;
background: url(/imgs/jdcloud/jdtrademark/banner.png) center center no-repeat; background: url(/imgs/jdcloud/jdtrademark/banner.png) center center no-repeat;
background-size: cover; background-size: cover;
position: relative;
}
.jdtrademark-banner>div {
padding: 10px 40px;
border: 1px solid rgba(207, 235, 252);
color: rgba(207, 235, 252);
position: absolute;
left: 10.8%;
top: 66%;
cursor: pointer;
font-size: 16px;
} }
/* .jdtrademark-banner>div:hover {
background: rgba(207, 235, 252);
color: #fff;
} */
.jdtrademark-warpper { .jdtrademark-warpper {
width: 100%; width: 100%;
height: 110px; height: 110px;
...@@ -153,7 +170,7 @@ li { ...@@ -153,7 +170,7 @@ li {
.brandreg-swiper .swiper-container { .brandreg-swiper .swiper-container {
width: 1203px; width: 1203px;
height: 380px; height: 380px;
padding-left: 3px ; padding-left: 3px;
} }
.brandreg-swiper .swiper-wrapper { .brandreg-swiper .swiper-wrapper {
...@@ -212,14 +229,17 @@ li { ...@@ -212,14 +229,17 @@ li {
background: #2F3353; background: #2F3353;
color: #fff; color: #fff;
} }
.brandreg-swiper-hearder>div{
.brandreg-swiper-hearder>div {
width: 100%; width: 100%;
height: 100%; height: 100%;
line-height:70px ; line-height: 70px;
} }
.brandreg-swiper-hearder>div>div{
.brandreg-swiper-hearder>div>div {
display: inline-block; display: inline-block;
} }
.brandreg-swiper-hearder>div>div:nth-child(1) { .brandreg-swiper-hearder>div>div:nth-child(1) {
width: 39px; width: 39px;
height: 39px; height: 39px;
......
igirl-channel-web/app/front/vues/pages/jdtrademark/jdtrademark.html
<div class="jdtrademark"> <div class="jdtrademark">
<div class="jdtrademark-banner"> <div class="jdtrademark-banner">
<div @click="goIndentList">我的订单</div>
</div> </div>
<div class="jdtrademark-warpper"> <div class="jdtrademark-warpper">
<div class="jdtrademark-search"> <div class="jdtrademark-search">
......
igirl-channel-web/app/front/vues/pages/jdtrademark/jdtrademark.js
...@@ -156,6 +156,9 @@ ...@@ -156,6 +156,9 @@
}, },
methods: { methods: {
/*全选 */ /*全选 */
goIndentList(){
location.href="http://oauth2.jdcloud.com/authorize?response_type=token&redirect_uri=http://tm.plus.jdcloud.com/jdtm/getUser&state=jdindentlist&client_id=9841572588670903";
},
handleCheckAllChange(val) { handleCheckAllChange(val) {
if (val) { if (val) {
let data = []; let data = [];
...@@ -193,6 +196,7 @@ ...@@ -193,6 +196,7 @@
}); });
}, },
jumpJdProductDetails(code, e){ jumpJdProductDetails(code, e){
if (code.channelItemCode) { if (code.channelItemCode) {
switch (code.itemCode) { switch (code.itemCode) {
case "zzsbzc": case "zzsbzc":
......
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