123

igirl-channel-web/app/front/vues/pages/OAjdcompany/OAjdcompany.js

@@ -6,6 +6,7 @@
                 currentStep:1,
                 companyData:[],
                 user_Name:"",
+                channelFrom:"",
             }
         },
     mounted: function() {
@@ -16,9 +17,12 @@
                 this.user_Name = item.substring(4);
             }
         });
+        this.getChannelFrom();
     },
     methods: {
-        
+        getChannelFrom(){
+            this.channelFrom = this.$root.getChannelPath();
+        },
         loginOut(){
             /*
             var url = encodeURIComponent("http://tm.plus.jdcloud.com/#/jd/jdtrademark") ;

igirl-channel-web/app/front/vues/pages/OAjddetails/OAjddetails.js

@@ -332,6 +332,7 @@
                 /**订单付款信息 */
                 receiptVoucher: {},
                 user_Name: "",
+                channelFrom:"",
             }
         },
     mounted: function() {
@@ -393,6 +394,7 @@
                 this.user_Name = item.substring(4);
             }
         });
+        this.getChannelFrom();
     },
     computed: {
 
@@ -435,7 +437,9 @@
 
     },
     methods: {
-        
+        getChannelFrom(){
+            this.channelFrom = this.$root.getChannelPath();
+        },
         loginOut(){
             /*
             var url = encodeURIComponent("http://tm.plus.jdcloud.com/#/jd/jdtrademark") ;

igirl-channel-web/app/front/vues/pages/OAjdlist/OAjdlist.js

@@ -438,6 +438,7 @@
                 ],
                 hidePage: true,
                 user_Name:"",
+                channelFrom:"",
             }
 
         },
@@ -452,6 +453,7 @@
                 this.user_Name = item.substring(4);
             }
         });
+        this.getChannelFrom();
     },
     mounted: function() {
         var that = this;
@@ -473,7 +475,9 @@
     },
 
     methods: {
-        
+        getChannelFrom(){
+            this.channelFrom = this.$root.getChannelPath();
+        },
         loginOut(){
             /*
             var url = encodeURIComponent("http://tm.plus.jdcloud.com/#/jd/jdtrademark") ;

igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.html

@@ -2,21 +2,19 @@
 	<div class="jdindentdetail-warpper">
 
 
-		<div class="jdindentlist-header" v-if="channelFrom == \'jd\'">
-			<div>京东云PLUS工商、商标注册平台</div>
-			<div v-if="user_Name">
-				<span v-if="user_Name"><i class="el-icon-user"></i></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 class="jdindentlist-header" v-if="channelFrom == \'jd\'">
+					<div>京东云PLUS工商、商标注册平台</div>
+					<div v-if="user_Name">
+						<span v-if="user_Name"><i class="el-icon-user"></i></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 class="jdindentdetail">

igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.js

@@ -332,6 +332,7 @@
                 /**订单付款信息 */
                 receiptVoucher: {},
                 user_Name:"",
+                channelFrom:"",
             }
         },
     mounted: function() {
@@ -393,7 +394,7 @@
                 this.user_Name = item.substring(4);
             }
         });
-      
+        this.getChannelFrom();
     },
     computed: {
 
@@ -435,36 +436,8 @@
 
     },
     methods: {
-        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: "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) {
-                        console.log(response);
-                        _this.$router.push({ path: `/${_this.$root.channelName}/jdtrademark` });
-                    }
-                }
-            });
-
-
+        getChannelFrom(){
+            this.channelFrom = this.$root.getChannelPath();
         },
         /*初始化订单数据 */
         initIndent(){

igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.js

@@ -441,6 +441,7 @@
                 ],
                 hidePage: true,
                 user_Name: "",
+                channelFrom:"",
             }
 
         },
@@ -473,10 +474,13 @@
         if (this.$root.channelUserId != "") {
             this.handleSizeChange();
         }
+        this.getChannelFrom();
     },
 
     methods: {
-        
+        getChannelFrom(){
+            this.channelFrom = this.$root.getChannelPath();
+        },
         checkedCity(e){
             let city = this.regionValue[0];
             let area = this.regionValue[1];