Commit f9f98ba0 authored by zhangyanni's avatar zhangyanni

去掉href.split("#/"

parent 10192787
...@@ -562,7 +562,7 @@ export default { ...@@ -562,7 +562,7 @@ export default {
//获取当前url前缀 //获取当前url前缀
getCurrentHrefEnv() { getCurrentHrefEnv() {
return document.location.href.split("#/")[0]; return document.location.origin;
}, },
//获取当前网络环境 //获取当前网络环境
......
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
configFunc(){ configFunc(){
let params = { let params = {
appUrl:window.location.href //document.location.href.split("#")[0]+"/?#"+document.location.href.split("#")[1] appUrl:window.location.href
},that = this; },that = this;
api.getConfigAxios(params).then((res)=>{ api.getConfigAxios(params).then((res)=>{
if(res.code==0){ if(res.code==0){
......
...@@ -206,7 +206,7 @@ ...@@ -206,7 +206,7 @@
setTimeout(function(){ setTimeout(function(){
that.$emit("showDialogVisible",false); that.$emit("showDialogVisible",false);
},3000) },3000)
var urlData = this.isActivityList?document.location.href:document.location.href.split("#/")[0]+"#/secondStageDetail?subId="+that.detailInfo.id+"&proId="+that.detailInfo.projectId+"&activityId="+that.$route.query.id+"&stage="+this.$route.query.stage; var urlData = this.isActivityList?document.location.href:document.location.origin+"/secondStageDetail?subId="+that.detailInfo.id+"&proId="+that.detailInfo.projectId+"&activityId="+that.$route.query.id+"&stage="+this.$route.query.stage;
let dataVal; let dataVal;
if(this.isActivityList&&this.subjectInfo){ if(this.isActivityList&&this.subjectInfo){
dataVal = { dataVal = {
...@@ -250,7 +250,7 @@ ...@@ -250,7 +250,7 @@
configFunc(){ configFunc(){
let params = { let params = {
appUrl:window.location.href //document.location.href.split("#")[0]+"/?#"+document.location.href.split("#")[1] appUrl:window.location.href
},that = this; },that = this;
api.getConfigAxios(params).then((res)=>{ api.getConfigAxios(params).then((res)=>{
......
...@@ -128,8 +128,8 @@ ...@@ -128,8 +128,8 @@
if(this.isIndex) query.id = this.detailInfo.reportId; if(this.isIndex) query.id = this.detailInfo.reportId;
switch (this.pageType) { switch (this.pageType) {
case 1: case 1:
// urlData = this.isIndex?(document.location.href+"?lang="+this.lang):((document.location.href.split("#/")[0]+"#/industryReportDetail")+"?id="+this.detailInfo.reportId+"&lang="+this.lang); // urlData = this.isIndex?(document.location.href+"?lang="+this.lang):((document.location.origin+"/industryReportDetail")+"?id="+this.detailInfo.reportId+"&lang="+this.lang);
urlData = (document.location.href.split("#/")[0]+"#/industryReportDetail")+"?id="+this.detailInfo.reportId+"&lang="+this.lang; urlData = (document.location.origin+"/industryReportDetail")+"?id="+this.detailInfo.reportId+"&lang="+this.lang;
query.isShareIndustryReport = true; query.isShareIndustryReport = true;
} }
query.rDeviceId = this.publicFun.getCookie("getGuid32"); query.rDeviceId = this.publicFun.getCookie("getGuid32");
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
configFunc(){ configFunc(){
let params = { let params = {
appUrl:window.location.href //document.location.href.split("#")[0]+"/?#"+document.location.href.split("#")[1] appUrl:window.location.href
},that = this; },that = this;
api.getConfigAxios(params).then((res)=>{ api.getConfigAxios(params).then((res)=>{
if(res.code==0){ if(res.code==0){
...@@ -253,8 +253,8 @@ ...@@ -253,8 +253,8 @@
}); });
let dataVal,hrefUrl = (document.location.href.split("#/")[0]+"#/industryReportDetail")+"?id="+this.detailInfo.reportId+"&lang="+this.lang; let dataVal,hrefUrl = (document.location.origin+"/industryReportDetail")+"?id="+this.detailInfo.reportId+"&lang="+this.lang;
// hrefUrl = this.isIndex?(document.location.href.split("#/")[0]+"#/industryReportDetail"+"?id="+this.detailInfo.reportId):document.location.href; // hrefUrl = this.isIndex?(document.location.origin+"/industryReportDetail"+"?id="+this.detailInfo.reportId):document.location.href;
console.log(hrefUrl) console.log(hrefUrl)
if(this.detailInfo){ if(this.detailInfo){
if(this.pageType==1){ if(this.pageType==1){
......
...@@ -201,7 +201,7 @@ ...@@ -201,7 +201,7 @@
configFunc(){ configFunc(){
let appurlLink = !!navigator.userAgent.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/)?window.entryUrl:window.location.href; let appurlLink = !!navigator.userAgent.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/)?window.entryUrl:window.location.href;
let params = { let params = {
appUrl:appurlLink //document.location.href.split("#")[0]+"/?#"+document.location.href.split("#")[1] appUrl:appurlLink
},that = this; },that = this;
commonApi.getConfigAxios(params).then((res)=>{ commonApi.getConfigAxios(params).then((res)=>{
if(res.code==0){ if(res.code==0){
...@@ -220,7 +220,7 @@ ...@@ -220,7 +220,7 @@
}); });
let dataVal,urlData = document.location.href.split("#/")[0] + "#/redEnvelopeActDetail?id=" + this.$route.query.id+"&rDeviceId="+this.publicFun.getCookie("getGuid32")+"&rEmpId="+(this.userInfo?this.userInfo.empId:undefined)+"&rTargetType=1", let dataVal,urlData = document.location.origin + "/redEnvelopeActDetail?id=" + this.$route.query.id+"&rDeviceId="+this.publicFun.getCookie("getGuid32")+"&rEmpId="+(this.userInfo?this.userInfo.empId:undefined)+"&rTargetType=1",
title = (this.lang==1?"您的好友邀请您参与":"Your friend invites you to participate ")+"“"+that.detailInfo.channelTitle+"”"; title = (this.lang==1?"您的好友邀请您参与":"Your friend invites you to participate ")+"“"+that.detailInfo.channelTitle+"”";
if(this.detailInfo){ if(this.detailInfo){
dataVal = { dataVal = {
...@@ -289,7 +289,7 @@ ...@@ -289,7 +289,7 @@
// //
var userAgent = navigator.userAgent, shareUrl; var userAgent = navigator.userAgent, shareUrl;
var isMini = /miniProgram/i.test(userAgent); var isMini = /miniProgram/i.test(userAgent);
var urlData = document.location.href.split("#/")[0] + "#/redEnvelopeActDetail?id=" + this.$route.query.id+"&rDeviceId="+this.publicFun.getCookie("getGuid32")+"&rEmpId="+(this.userInfo?this.userInfo.empId:undefined)+"&rTargetType=1", var urlData = document.location.origin + "/redEnvelopeActDetail?id=" + this.$route.query.id+"&rDeviceId="+this.publicFun.getCookie("getGuid32")+"&rEmpId="+(this.userInfo?this.userInfo.empId:undefined)+"&rTargetType=1",
title = (this.lang==1?"您的好友邀请您参与":"Your friend invites you to participate ")+"“"+that.detailInfo.channelTitle+"”"; title = (this.lang==1?"您的好友邀请您参与":"Your friend invites you to participate ")+"“"+that.detailInfo.channelTitle+"”";
if (isMini) { if (isMini) {
that.dialogVisible = true; that.dialogVisible = true;
......
...@@ -878,7 +878,7 @@ ...@@ -878,7 +878,7 @@
configFunc(){ configFunc(){
let params = { let params = {
appUrl:window.location.href //document.location.href.split("#")[0]+"/?#"+document.location.href.split("#")[1] appUrl:window.location.href
},that = this; },that = this;
commonApi.getConfigAxios(params).then((res)=>{ commonApi.getConfigAxios(params).then((res)=>{
if(res.code==0){ if(res.code==0){
......
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
configFunc(data) { configFunc(data) {
let params = { let params = {
appUrl: window.location.href //document.location.href.split("#")[0]+"/?#"+document.location.href.split("#")[1] appUrl: window.location.href
}, that = this; }, that = this;
commonApi.getConfigAxios(params).then((res) => { commonApi.getConfigAxios(params).then((res) => {
if (res.code == 0) { if (res.code == 0) {
......
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
configFunc(data) { configFunc(data) {
let params = { let params = {
appUrl: window.location.href //document.location.href.split("#")[0]+"/?#"+document.location.href.split("#")[1] appUrl: window.location.href
}, that = this; }, that = this;
commonApi.getConfigAxios(params).then((res) => { commonApi.getConfigAxios(params).then((res) => {
if (res.code == 0) { if (res.code == 0) {
......
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
configFunc(data) { configFunc(data) {
let params = { let params = {
appUrl: window.location.href //document.location.href.split("#")[0]+"/?#"+document.location.href.split("#")[1] appUrl: window.location.href
}, that = this; }, that = this;
commonApi.getConfigAxios(params).then((res) => { commonApi.getConfigAxios(params).then((res) => {
if (res.code == 0) { if (res.code == 0) {
......
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
configFunc(data) { configFunc(data) {
let params = { let params = {
appUrl: window.location.href //document.location.href.split("#")[0]+"/?#"+document.location.href.split("#")[1] appUrl: window.location.href
}, that = this; }, that = this;
commonApi.getConfigAxios(params).then((res) => { commonApi.getConfigAxios(params).then((res) => {
if (res.code == 0) { if (res.code == 0) {
......
...@@ -380,7 +380,7 @@ ...@@ -380,7 +380,7 @@
configFunc() { configFunc() {
let appurlLink = !!navigator.userAgent.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/) ? window.entryUrl : window.location.href; let appurlLink = !!navigator.userAgent.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/) ? window.entryUrl : window.location.href;
let params = { let params = {
appUrl: appurlLink //document.location.href.split("#")[0]+"/?#"+document.location.href.split("#")[1] appUrl: appurlLink
}, that = this; }, that = this;
commonApi.getConfigAxios(params).then((res) => { commonApi.getConfigAxios(params).then((res) => {
if (res.code == 0) { if (res.code == 0) {
......
...@@ -339,7 +339,7 @@ ...@@ -339,7 +339,7 @@
configFunc() { configFunc() {
let appurlLink = !!navigator.userAgent.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/) ? window.entryUrl : window.location.href; let appurlLink = !!navigator.userAgent.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/) ? window.entryUrl : window.location.href;
let params = { let params = {
appUrl: appurlLink //document.location.href.split("#")[0]+"/?#"+document.location.href.split("#")[1] appUrl: appurlLink
}, that = this; }, that = this;
commonApi.getConfigAxios(params).then((res) => { commonApi.getConfigAxios(params).then((res) => {
if (res.code == 0) { if (res.code == 0) {
......
...@@ -286,7 +286,7 @@ ...@@ -286,7 +286,7 @@
configFunc() { configFunc() {
let appurlLink = !!navigator.userAgent.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/) ? window.entryUrl : window.location.href; let appurlLink = !!navigator.userAgent.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/) ? window.entryUrl : window.location.href;
let params = { let params = {
appUrl: appurlLink //document.location.href.split("#")[0]+"/?#"+document.location.href.split("#")[1] appUrl: appurlLink
}, that = this; }, that = this;
commonApi.getConfigAxios(params).then((res) => { commonApi.getConfigAxios(params).then((res) => {
if (res.code == 0) { if (res.code == 0) {
......
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
configFunc() { configFunc() {
let appurlLink = !!navigator.userAgent.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/) ? window.entryUrl : window.location.href; let appurlLink = !!navigator.userAgent.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/) ? window.entryUrl : window.location.href;
let params = { let params = {
appUrl: appurlLink //document.location.href.split("#")[0]+"/?#"+document.location.href.split("#")[1] appUrl: appurlLink
}, that = this; }, that = this;
commonApi.getConfigAxios(params).then((res) => { commonApi.getConfigAxios(params).then((res) => {
if (res.code == 0) { if (res.code == 0) {
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
}); });
let dataVal, let dataVal,
urlData = document.location.href.split("#/")[0]+"#/guessDetail?id="+this.$route.query.id+ "&rDeviceId=" + this.publicFun.getCookie("getGuid32") + "&rEmpId=" + (this.userInfo ? this.userInfo.empId : undefined) + "&rTargetType=1", urlData = document.location.origin+"/guessDetail?id="+this.$route.query.id+ "&rDeviceId=" + this.publicFun.getCookie("getGuid32") + "&rEmpId=" + (this.userInfo ? this.userInfo.empId : undefined) + "&rTargetType=1",
title =that.detailInfo.guessTitle; title =that.detailInfo.guessTitle;
if (this.detailInfo) { if (this.detailInfo) {
dataVal = { dataVal = {
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
// //
var userAgent = navigator.userAgent, shareUrl; var userAgent = navigator.userAgent, shareUrl;
var isMini = /miniProgram/i.test(userAgent); var isMini = /miniProgram/i.test(userAgent);
var urlData = document.location.href.split("#/")[0]+"#/guessDetail?id="+this.$route.query.id + "&rDeviceId=" + this.publicFun.getCookie("getGuid32") + "&rEmpId=" + (this.userInfo ? this.userInfo.empId : undefined) + "&rTargetType=1", var urlData = document.location.origin+"/guessDetail?id="+this.$route.query.id + "&rDeviceId=" + this.publicFun.getCookie("getGuid32") + "&rEmpId=" + (this.userInfo ? this.userInfo.empId : undefined) + "&rTargetType=1",
title = that.detailInfo.guessTitle; title = that.detailInfo.guessTitle;
if (isMini) { if (isMini) {
that.dialogVisible = true; that.dialogVisible = true;
...@@ -288,7 +288,7 @@ ...@@ -288,7 +288,7 @@
this.maiDianFunc(2,1); this.maiDianFunc(2,1);
this.userInfo = this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null; this.userInfo = this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null;
var ua = navigator.userAgent.toLowerCase(), that = this; var ua = navigator.userAgent.toLowerCase(), that = this;
var urlData = document.location.href.split("#/")[0]+"#/guessDetail?id="+this.$route.query.id+"&rDeviceId=" + this.publicFun.getCookie("getGuid32") + "&rEmpId=" + (this.userInfo ? this.userInfo.empId : undefined) + "&rTargetType=1"; var urlData = document.location.origin+"/guessDetail?id="+this.$route.query.id+"&rDeviceId=" + this.publicFun.getCookie("getGuid32") + "&rEmpId=" + (this.userInfo ? this.userInfo.empId : undefined) + "&rTargetType=1";
if (ua.match(/MicroMessenger/i) == "micromessenger") { if (ua.match(/MicroMessenger/i) == "micromessenger") {
this.shareFunc(1); this.shareFunc(1);
} else { } else {
......
...@@ -497,7 +497,7 @@ ...@@ -497,7 +497,7 @@
configFunc() { configFunc() {
let params = { let params = {
appUrl: window.location.href //document.location.href.split("#")[0]+"/?#"+document.location.href.split("#")[1] appUrl: window.location.href
}, that = this; }, that = this;
commonApi.getConfigAxios(params).then((res) => { commonApi.getConfigAxios(params).then((res) => {
if (res.code == 0) { if (res.code == 0) {
......
...@@ -563,7 +563,7 @@ ...@@ -563,7 +563,7 @@
configFunc() { configFunc() {
let params = { let params = {
appUrl: window.location.href //document.location.href.split("#")[0]+"/?#"+document.location.href.split("#")[1] appUrl: window.location.href
}, that = this; }, that = this;
commonApi.getConfigAxios(params).then((res) => { commonApi.getConfigAxios(params).then((res) => {
if (res.code == 0) { if (res.code == 0) {
......
...@@ -27,11 +27,6 @@ ...@@ -27,11 +27,6 @@
handleChange(){ handleChange(){
this.activeMethod = this.activeMethod == 1?2:1; this.activeMethod = this.activeMethod == 1?2:1;
},
handleWechatLogin(){
var url = document.location.href.split("#/")[0]+"#/newPage";
window.location.href = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx725d0e129f703106&redirect_uri="+encodeURIComponent(url)+"&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect";
} }
} }
} }
......
...@@ -802,7 +802,7 @@ ...@@ -802,7 +802,7 @@
configFunc(data) { configFunc(data) {
let params = { let params = {
appUrl: window.location.href //document.location.href.split("#")[0]+"/?#"+document.location.href.split("#")[1] appUrl: window.location.href
}, that = this; }, that = this;
commonApi.getConfigAxios(params).then((res) => { commonApi.getConfigAxios(params).then((res) => {
if (res.code == 0) { if (res.code == 0) {
......
...@@ -762,7 +762,7 @@ ...@@ -762,7 +762,7 @@
configFunc(){ configFunc(){
let params = { let params = {
appUrl:window.location.href //document.location.href.split("#")[0]+"/?#"+document.location.href.split("#")[1] appUrl:window.location.href
},that = this; },that = this;
api.getConfigAxios(params).then((res)=>{ api.getConfigAxios(params).then((res)=>{
if(res.code==0){ if(res.code==0){
......
...@@ -1088,7 +1088,7 @@ ...@@ -1088,7 +1088,7 @@
configFunc() { configFunc() {
let params = { let params = {
appUrl: window.location.href //document.location.href.split("#")[0]+"/?#"+document.location.href.split("#")[1] appUrl: window.location.href
}, that = this; }, that = this;
api.getConfigAxios(params).then((res) => { api.getConfigAxios(params).then((res) => {
if (res.code == 0) { if (res.code == 0) {
......
...@@ -523,7 +523,7 @@ ...@@ -523,7 +523,7 @@
handleOpreation(data, command) { handleOpreation(data, command) {
let query = this.$route.query, resultTitle; let query = this.$route.query, resultTitle;
var urlData = document.location.href.split("#/")[0] + "#/projectdetails?projectId=" + this.companyInfo.projectId; var urlData = document.location.origin + "/projectdetails?projectId=" + this.companyInfo.projectId;
var str = this.companyInfo.projectInstroduction; var str = this.companyInfo.projectInstroduction;
if(str!=null){ if(str!=null){
if (str.length < 31) { if (str.length < 31) {
...@@ -591,7 +591,7 @@ ...@@ -591,7 +591,7 @@
//分享处理方法 //分享处理方法
shareLoadFunc() { shareLoadFunc() {
let query = this.$route.query, resultTitle; let query = this.$route.query, resultTitle;
var urlData = document.location.href.split("#/")[0] + "#/projectdetails?projectId=" + this.companyInfo.projectId; var urlData = document.location.origin + "/projectdetails?projectId=" + this.companyInfo.projectId;
var str = this.companyInfo.projectInstroduction ? this.companyInfo.projectInstroduction : ""; var str = this.companyInfo.projectInstroduction ? this.companyInfo.projectInstroduction : "";
if (str.length < 31) { if (str.length < 31) {
resultTitle = str; resultTitle = str;
...@@ -813,7 +813,7 @@ ...@@ -813,7 +813,7 @@
// //
var userAgent = navigator.userAgent, shareUrl; var userAgent = navigator.userAgent, shareUrl;
var isMini = /miniProgram/i.test(userAgent); var isMini = /miniProgram/i.test(userAgent);
var urlData = document.location.href.split("#/")[0] + "#/projectdetails?projectId=" + that.companyInfo.projectId; var urlData = document.location.origin + "/projectdetails?projectId=" + that.companyInfo.projectId;
if (isMini) { if (isMini) {
that.dialogVisible = true; that.dialogVisible = true;
let dataVal = { let dataVal = {
...@@ -854,7 +854,7 @@ ...@@ -854,7 +854,7 @@
configFunc(data) { configFunc(data) {
let params = { let params = {
appUrl: window.location.href //document.location.href.split("#")[0]+"/?#"+document.location.href.split("#")[1] appUrl: window.location.href
}, that = this; }, that = this;
commonApi.getConfigAxios(params).then((res) => { commonApi.getConfigAxios(params).then((res) => {
if (res.code == 0) { if (res.code == 0) {
......
...@@ -341,7 +341,7 @@ ...@@ -341,7 +341,7 @@
handleOpreation(data,command){ handleOpreation(data,command){
let query= this.$route.query,resultTitle; let query= this.$route.query,resultTitle;
var urlData = document.location.href.split("#/")[0]+"#/phoneRequireDetail?id="+this.detailInfo.detailId+"&isId="+this.detailInfo.businessId; var urlData = document.location.origin+"/phoneRequireDetail?id="+this.detailInfo.detailId+"&isId="+this.detailInfo.businessId;
var str = this.detailInfo.requirementContent; var str = this.detailInfo.requirementContent;
if (str.length < 31) { if (str.length < 31) {
resultTitle = str; resultTitle = str;
...@@ -435,7 +435,7 @@ ...@@ -435,7 +435,7 @@
// //
var userAgent = navigator.userAgent,shareUrl; var userAgent = navigator.userAgent,shareUrl;
var isMini = /miniProgram/i.test(userAgent); var isMini = /miniProgram/i.test(userAgent);
var urlData = document.location.href.split("#/")[0]+"#/phoneRequireDetail?id="+that.detailInfo.detailId+"&isId="+that.detailInfo.businessId; var urlData = document.location.origin+"/phoneRequireDetail?id="+that.detailInfo.detailId+"&isId="+that.detailInfo.businessId;
if(isMini){ if(isMini){
that.dialogVisible = true; that.dialogVisible = true;
let dataVal = { let dataVal = {
...@@ -477,7 +477,7 @@ ...@@ -477,7 +477,7 @@
//分享处理方法 //分享处理方法
shareLoadFunc(){ shareLoadFunc(){
let query= this.$route.query,resultTitle; let query= this.$route.query,resultTitle;
var urlData = document.location.href.split("#/")[0]+"#/phoneRequireDetail?id="+this.detailInfo.detailId+"&isId="+this.detailInfo.businessId; var urlData = document.location.origin+"/phoneRequireDetail?id="+this.detailInfo.detailId+"&isId="+this.detailInfo.businessId;
var str = this.detailInfo.requirementContent; var str = this.detailInfo.requirementContent;
if (str.length < 31) { if (str.length < 31) {
resultTitle = str; resultTitle = str;
...@@ -495,7 +495,7 @@ ...@@ -495,7 +495,7 @@
configFunc(data){ configFunc(data){
let params = { let params = {
appUrl:window.location.href //document.location.href.split("#")[0]+"/?#"+document.location.href.split("#")[1] appUrl:window.location.href
},that = this; },that = this;
commonApi.getConfigAxios(params).then((res)=>{ commonApi.getConfigAxios(params).then((res)=>{
if(res.code==0){ if(res.code==0){
......
...@@ -1416,7 +1416,7 @@ ...@@ -1416,7 +1416,7 @@
configFunc(data) { configFunc(data) {
let params = { let params = {
appUrl: window.location.href //document.location.href.split("#")[0]+"/?#"+document.location.href.split("#")[1] appUrl: window.location.href
}, that = this; }, that = this;
api.getConfigAxios(params).then((res) => { api.getConfigAxios(params).then((res) => {
if (res.code == 0) { if (res.code == 0) {
......
...@@ -743,7 +743,7 @@ ...@@ -743,7 +743,7 @@
configFunc(data) { configFunc(data) {
let params = { let params = {
appUrl: window.location.href //document.location.href.split("#")[0]+"/?#"+document.location.href.split("#")[1] appUrl: window.location.href
}, that = this; }, that = this;
commonApi.getConfigAxios(params).then((res) => { commonApi.getConfigAxios(params).then((res) => {
if (res.code == 0) { if (res.code == 0) {
......
...@@ -644,7 +644,7 @@ ...@@ -644,7 +644,7 @@
configFunc(data) { configFunc(data) {
let params = { let params = {
appUrl: window.location.href //document.location.href.split("#")[0]+"/?#"+document.location.href.split("#")[1] appUrl: window.location.href
}, that = this; }, that = this;
commonApi.getConfigAxios(params).then((res) => { commonApi.getConfigAxios(params).then((res) => {
if (res.code == 0) { if (res.code == 0) {
...@@ -1083,7 +1083,7 @@ ...@@ -1083,7 +1083,7 @@
// //
var userAgent = navigator.userAgent, shareUrl; var userAgent = navigator.userAgent, shareUrl;
var isMini = /miniProgram/i.test(userAgent); var isMini = /miniProgram/i.test(userAgent);
var urlData = document.location.href.split("#/")[0] + "#/topicDetails?id=" + that.topicInfo.topicId; var urlData = document.location.origin + "/topicDetails?id=" + that.topicInfo.topicId;
if (isMini) { if (isMini) {
that.dialogVisible = true; that.dialogVisible = true;
let dataVal = { let dataVal = {
...@@ -1158,7 +1158,7 @@ ...@@ -1158,7 +1158,7 @@
this.currentData = data; this.currentData = data;
this.isShareAll = false; this.isShareAll = false;
let query = this.$route.query, resultTitle; let query = this.$route.query, resultTitle;
var urlData = document.location.href.split("#/")[0] + "#/topicDetails?id=" + this.topicInfo.topicId; var urlData = document.location.origin + "/topicDetails?id=" + this.topicInfo.topicId;
var str = this.publicFun.isHasTopicTitle("#", data.discussContent); var str = this.publicFun.isHasTopicTitle("#", data.discussContent);
if (data.discussContent.indexOf(str) == 0) { if (data.discussContent.indexOf(str) == 0) {
resultTitle = data.discussContent.replace(str, ""); resultTitle = data.discussContent.replace(str, "");
......
...@@ -589,7 +589,7 @@ ...@@ -589,7 +589,7 @@
call(data, command) { call(data, command) {
this.currentData = data; this.currentData = data;
let query = this.$route.query, resultTitle; let query = this.$route.query, resultTitle;
var urlData = document.location.href.split("#/")[0] + "#/topicDetails?id=" + data.topicId; var urlData = document.location.origin + "/topicDetails?id=" + data.topicId;
var str = this.publicFun.isHasTopicTitle("#", data.discussContent); var str = this.publicFun.isHasTopicTitle("#", data.discussContent);
var simpleContent = data.pcState==0?this.publicFun.getTitlewith(data.discussContent, data.projectList):this.publicFun.getTitlewith(data.simpleContent, data.projectList); var simpleContent = data.pcState==0?this.publicFun.getTitlewith(data.discussContent, data.projectList):this.publicFun.getTitlewith(data.simpleContent, data.projectList);
...@@ -700,7 +700,7 @@ ...@@ -700,7 +700,7 @@
// //
var userAgent = navigator.userAgent, shareUrl; var userAgent = navigator.userAgent, shareUrl;
var isMini = /miniProgram/i.test(userAgent); var isMini = /miniProgram/i.test(userAgent);
var urlData = document.location.href.split("#/")[0] + "#/topicDetails?id=" + that.detailInfo.topicId; var urlData = document.location.origin + "/topicDetails?id=" + that.detailInfo.topicId;
if (isMini) { if (isMini) {
that.dialogVisible = true; that.dialogVisible = true;
let dataVal = { let dataVal = {
...@@ -741,7 +741,7 @@ ...@@ -741,7 +741,7 @@
configFunc(data) { configFunc(data) {
let params = { let params = {
appUrl: window.location.href //document.location.href.split("#")[0]+"/?#"+document.location.href.split("#")[1] appUrl: window.location.href
}, that = this; }, that = this;
commonApi.getConfigAxios(params).then((res) => { commonApi.getConfigAxios(params).then((res) => {
if (res.code == 0) { if (res.code == 0) {
......
...@@ -408,7 +408,7 @@ ...@@ -408,7 +408,7 @@
call(data,command) { call(data,command) {
this.currentData = data; this.currentData = data;
let query= this.$route.query,resultTitle; let query= this.$route.query,resultTitle;
var urlData = document.location.href.split("#/")[0]+"#/discussDetail?id="+data.topicId+"&disId="+data.id; var urlData = document.location.origin+"/discussDetail?id="+data.topicId+"&disId="+data.id;
var str = this.publicFun.isHasTopicTitle("#",data.discussContent); var str = this.publicFun.isHasTopicTitle("#",data.discussContent);
if(data.discussContent.indexOf(str)==0){ if(data.discussContent.indexOf(str)==0){
resultTitle = data.discussContent.replace(str,""); resultTitle = data.discussContent.replace(str,"");
...@@ -507,7 +507,7 @@ ...@@ -507,7 +507,7 @@
// //
var userAgent = navigator.userAgent,shareUrl; var userAgent = navigator.userAgent,shareUrl;
var isMini = /miniProgram/i.test(userAgent); var isMini = /miniProgram/i.test(userAgent);
var urlData = document.location.href.split("#/")[0]+"#/discussDetail?id="+that.detailInfo.topicId+"&disId="+that.currentData.id; var urlData = document.location.origin+"/discussDetail?id="+that.detailInfo.topicId+"&disId="+that.currentData.id;
if(isMini){ if(isMini){
that.dialogVisible = true; that.dialogVisible = true;
let dataVal = { let dataVal = {
...@@ -546,7 +546,7 @@ ...@@ -546,7 +546,7 @@
configFunc(data){ configFunc(data){
let params = { let params = {
appUrl:window.location.href //document.location.href.split("#")[0]+"/?#"+document.location.href.split("#")[1] appUrl:window.location.href
},that = this; },that = this;
commonApi.getConfigAxios(params).then((res)=>{ commonApi.getConfigAxios(params).then((res)=>{
if(res.code==0){ if(res.code==0){
......
...@@ -600,7 +600,7 @@ ...@@ -600,7 +600,7 @@
configFunc(data) { configFunc(data) {
let params = { let params = {
appUrl: window.location.href //document.location.href.split("#")[0]+"/?#"+document.location.href.split("#")[1] appUrl: window.location.href
}, that = this; }, that = this;
commonApi.getConfigAxios(params).then((res) => { commonApi.getConfigAxios(params).then((res) => {
if (res.code == 0) { if (res.code == 0) {
......
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