Skip to content

Z
zhichan
Commit 97b532a7 by 刘泽奇
Options

123

parent da044175
Showing with 42 additions and 20 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/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>京东云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="user_Name"><i class="el-icon-user"></i></span>
......
igirl-channel-web/app/front/vues/pages/OAjdcompany/OAjdcompany.js
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
currentStep:1, currentStep:1,
companyData:[], companyData:[],
user_Name:"", user_Name:"",
channelFrom:"",
} }
}, },
mounted: function() { mounted: function() {
...@@ -16,8 +17,12 @@ ...@@ -16,8 +17,12 @@
this.user_Name = item.substring(4); this.user_Name = item.substring(4);
} }
}); });
this.getChannelFrom();
}, },
methods: { methods: {
getChannelFrom(){
this.channelFrom = this.$root.getChannelPath();
},
loginOut(){ loginOut(){
let _this = this; let _this = this;
$.ajax({ $.ajax({
......
igirl-channel-web/app/front/vues/pages/OAjddetails/OAjddetails.html
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<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 v-if="user_Name"> <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>
......
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 v-if="user_Name"> <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>
......
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
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="jdindentdetail-warpper"> <div class="jdindentdetail-warpper">
<div class="jdindentlist-header"> <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="user_Name"><i class="el-icon-user"></i></span>
......
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.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 v-if="user_Name"> <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>
......
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];
...@@ -500,21 +506,22 @@ ...@@ -500,21 +506,22 @@
async: true, async: true,
url: "http://login.jdcloud.com/logout", url: "http://login.jdcloud.com/logout",
type: "GET", type: "GET",
dataType: "jsonp", dataType: "jsonp",
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){ if (response.code == 0) {
_this.user_Name = "";
console.log(document.cookie);
} }
} }
}); });
}, },
toViewImg(src) { toViewImg(src) {
this.toViewImgSrc = src; this.toViewImgSrc = src;
this.toViewImgType = true this.toViewImgType = true
......
igirl-channel-web/app/front/vues/pages/jdtrademark/jdtrademark.js
...@@ -157,11 +157,7 @@ ...@@ -157,11 +157,7 @@
methods: { methods: {
/*全选 */ /*全选 */
goIndentList(){ goIndentList(){
location.href="http://oauth2.jdcloud.com/authorize?response_type=token&redirect_uri=http://tm.plus.jdcloud.com/jdtm/getUser&state=selftmreg&client_id=9841572588670903"; location.href="http://oauth2.jdcloud.com/authorize?response_type=token&redirect_uri=http://tm.plus.jdcloud.com/jdtm/getUser&state=jdindentlist&client_id=9841572588670903";
this.$router.push({
path: `/${this.$root.channelName}/jdindentlist`,
});
}, },
handleCheckAllChange(val) { handleCheckAllChange(val) {
if (val) { if (val) {
...@@ -200,6 +196,7 @@ ...@@ -200,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