|
@@ -296,14 +296,12 @@ var entSearch = new Vue({
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
-<<<<<<< HEAD
|
|
|
|
|
company_phone_show :function (){
|
|
company_phone_show :function (){
|
|
|
return this.isLogin && !this.isFree
|
|
return this.isLogin && !this.isFree
|
|
|
-=======
|
|
|
|
|
|
|
+ },
|
|
|
getBIParams () {
|
|
getBIParams () {
|
|
|
const urlParams = new URLSearchParams(window.location.search)
|
|
const urlParams = new URLSearchParams(window.location.search)
|
|
|
return urlParams.get('resource')
|
|
return urlParams.get('resource')
|
|
|
->>>>>>> master
|
|
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
created: function () {
|
|
created: function () {
|
