提交 b86d1ca7 编写于 作者: 杨广俊's avatar 杨广俊

test

上级 5d7507fe
无法预览此类型文件
...@@ -133,17 +133,16 @@ export default { ...@@ -133,17 +133,16 @@ export default {
} }
] ]
this.pageBurialPoin({
...m_search_result_health_cartoon_detail,
labelValue: orderIndex,
createdTime: new Date().getTime(),
})
let paramList = this.setEventByModuleCode(itemData); let paramList = this.setEventByModuleCode(itemData);
rocNative.dispatchEventByModuleCode({ rocNative.dispatchEventByModuleCode({
modeCode: itemData.appModuleInfo.code, modeCode: itemData.appModuleInfo.code,
jsonString: paramList jsonString: paramList
}) })
this.pageBurialPoin({
...m_search_result_health_cartoon_detail,
labelValue: item.id,
createdTime: new Date().getTime(),
})
}, },
orderAction(orderIndex) { orderAction(orderIndex) {
......
...@@ -61,9 +61,10 @@ export default { ...@@ -61,9 +61,10 @@ export default {
// _self.SET_USER_INFO(params) // _self.SET_USER_INFO(params)
_self.getData() _self.getData()
} }
if(window.__isWeb) { // if(window.__isWeb) {
// alert(window.__isWeb)
_self.getData() _self.getData()
} // }
_self.getUserInfo() _self.getUserInfo()
}, },
methods: { methods: {
......
...@@ -35,10 +35,15 @@ export default { ...@@ -35,10 +35,15 @@ export default {
gotoPage(itemData){ gotoPage(itemData){
console.log('itemData', itemData) console.log('itemData', itemData)
// 如果没有跳转信息,则直接到搜索结果页面 // 如果没有跳转信息,则直接到搜索结果页面
if(!itemData.appModuleInfo){ if(!itemData.appModuleInfo || !(itemData.appModuleInfo.code === 'M300' || itemData.appModuleInfo.code === 'M400' || itemData.appModuleInfo.code === 'M500')){
console.log('不支持的中转。。。')
this.searchAction(itemData.keyword) this.searchAction(itemData.keyword)
return return
} }
// if(!itemData.appModuleInfo || (itemData.appModuleInfo.code === 'M100' )){
// this.searchAction(itemData.keyword)
// return
// }
let paramList = this.setEventByModuleCode(itemData); let paramList = this.setEventByModuleCode(itemData);
if(paramList !== 'NO') { if(paramList !== 'NO') {
rocNative.dispatchEventByModuleCode({ rocNative.dispatchEventByModuleCode({
......
...@@ -244,17 +244,17 @@ export function jumpEvaluatPage(){ ...@@ -244,17 +244,17 @@ export function jumpEvaluatPage(){
} }
// // dev地址 // dev地址
// const baseUrl = 'http://10.177.10.149:8080/' const baseUrl = 'http://10.177.10.149:8080/'
// // const baseUrl = 'https://dev-sc.yunqueyi.com/' // const baseUrl = 'https://dev-sc.yunqueyi.com/'
// const apiUrl = 'https://dev-api.yunqueyi.com/' const apiUrl = 'https://dev-api.yunqueyi.com/'
// const evaluatPageUrl = 'https://dev-phome.yunqueyi.com/gpr/#/home' const evaluatPageUrl = 'https://dev-phome.yunqueyi.com/gpr/#/home'
// test1地址 // test1地址
// const baseUrl = 'http://10.177.10.149:8080/' // // const baseUrl = 'http://10.177.10.149:8080/'
const baseUrl = 'https://test1-sc.yunqueyi.com/' // const baseUrl = 'https://test1-sc.yunqueyi.com/'
const apiUrl = 'https://test1-api.yunqueyi.com/' // const apiUrl = 'https://test1-api.yunqueyi.com/'
const evaluatPageUrl = 'https://test1-phome.yunqueyi.com/gpr/#/home' // const evaluatPageUrl = 'https://test1-phome.yunqueyi.com/gpr/#/home'
// // uat地址 // // uat地址
// const baseUrl = 'https://uat-sc.yunqueyi.com/' // const baseUrl = 'https://uat-sc.yunqueyi.com/'
......
...@@ -128,7 +128,7 @@ module.exports = { ...@@ -128,7 +128,7 @@ module.exports = {
// 通用GET请求 // 通用GET请求
GET(api, para, callback,str) { GET(api, para, callback,str) {
para.token = para.token || this.token || '00175A13D70D4234822D90AC3C74202C' para.token = para.token || this.token || '0CDA688FFBD541E482A77D7A07DD35FA'
let url = api + this.getUrlPara(para) let url = api + this.getUrlPara(para)
return fetch({ return fetch({
url: getBaseUrl(url), url: getBaseUrl(url),
...@@ -139,7 +139,7 @@ module.exports = { ...@@ -139,7 +139,7 @@ module.exports = {
// 通用POST请求 // 通用POST请求
POST(api, para, callback) { POST(api, para, callback) {
para.token = para.token || this.token || '00175A13D70D4234822D90AC3C74202C' para.token = para.token || this.token || '0CDA688FFBD541E482A77D7A07DD35FA'
return fetch({ return fetch({
url: getBaseUrl(api), url: getBaseUrl(api),
method: 'post', method: 'post',
...@@ -149,7 +149,7 @@ module.exports = { ...@@ -149,7 +149,7 @@ module.exports = {
// 通用GET请求 // 通用GET请求
API_GET(api, para, callback) { API_GET(api, para, callback) {
para.token = para.token || this.token || '00175A13D70D4234822D90AC3C74202C' //'AF3DFCF2DD4B4115AC47ACA25D5420E9''F90DF48D3EFA49DFAE1267A67DBEFB18'//token para.token = para.token || this.token || '0CDA688FFBD541E482A77D7A07DD35FA' //'AF3DFCF2DD4B4115AC47ACA25D5420E9''F90DF48D3EFA49DFAE1267A67DBEFB18'//token
let url = api + this.getUrlPara(para) let url = api + this.getUrlPara(para)
return fetch({ return fetch({
url: getApiUrl(url), url: getApiUrl(url),
...@@ -160,7 +160,7 @@ module.exports = { ...@@ -160,7 +160,7 @@ module.exports = {
// 通用POST请求 // 通用POST请求
API_POST(api, para, callback) { API_POST(api, para, callback) {
para.token = para.token || this.token || '00175A13D70D4234822D90AC3C74202C' //'AF3DFCF2DD4B4115AC47ACA25D5420E9''F90DF48D3EFA49DFAE1267A67DBEFB18'//token para.token = para.token || this.token || '0CDA688FFBD541E482A77D7A07DD35FA' //'AF3DFCF2DD4B4115AC47ACA25D5420E9''F90DF48D3EFA49DFAE1267A67DBEFB18'//token
return fetch({ return fetch({
url: getApiUrl(api), url: getApiUrl(api),
method: 'post', method: 'post',
......
...@@ -142,12 +142,13 @@ export default { ...@@ -142,12 +142,13 @@ export default {
}, },
created(){ created(){
this.searchText = this.$route.query.searchText || '' this.searchText = this.$route.query.searchText || ''
// this.searchText = escape(this.$route.query.searchText || '')
console.log(this.searchText) console.log(this.searchText)
let _this = this; let _this = this;
window.__getUserInfo = function(params){ window.__getUserInfo = function(params){
_this.token = params.userToken _this.token = params.userToken
// _this.SET_USER_INFO(params) // _this.SET_USER_INFO(params)
_this.search() // _this.search()
_this.getAdjustData() _this.getAdjustData()
} }
if(window.__isWeb) { if(window.__isWeb) {
...@@ -159,7 +160,8 @@ export default { ...@@ -159,7 +160,8 @@ export default {
} }
}, },
mounted(){ mounted(){
// this.search() this.getUserInfo()
this.search()
// this.searchAll(this.searchText, '1', 'contentAppModels', 'contentAppModelsAll') // this.searchAll(this.searchText, '1', 'contentAppModels', 'contentAppModelsAll')
}, },
methods: { methods: {
...@@ -305,13 +307,22 @@ export default { ...@@ -305,13 +307,22 @@ export default {
} }
</script> </script>
<style > <style >
.mint-search { /* .mint-search {
position: fixed; position: fixed;
top: 0px; top: 0px;
z-index: 3 !important; z-index: 3 !important;
height: 66px; height: 66px;
width: 100%; width: 100%;
border-bottom: 1px solid #E7E7E7 !important; border-bottom: 1px solid #E7E7E7 !important;
} */
.mint-search {
position: fixed;
top: 0px;
z-index: 3;
height: 66px;
width: 100%;
/* margin: 0 20px; */
border-bottom: 1px solid #E7E7E7 !important;
} }
.mint-searchbar { .mint-searchbar {
position: relative; position: relative;
...@@ -338,15 +349,16 @@ export default { ...@@ -338,15 +349,16 @@ export default {
/* border-radius: 15px; */ /* border-radius: 15px; */
} }
.mint-searchbar-core { .mint-searchbar-core {
color: #555555;
background: #F5F6F6; background: #F5F6F6;
} }
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '../style/mixin.scss'; @import '../style/mixin.scss';
.search-form { // .search-form {
position: relative; // // position: relative;
} // }
.navbar-container { .navbar-container {
width: 100%; width: 100%;
height: px2rem(57px); height: px2rem(57px);
......
...@@ -82,7 +82,7 @@ export default { ...@@ -82,7 +82,7 @@ export default {
]), ]),
// 跳转到结果页面,并 // 跳转到结果页面,并
search() { search() {
if(!this.searchText) return; // if(!this.searchText) return;
this.$router.push({ this.$router.push({
path: '/result', path: '/result',
query: { query: {
...@@ -124,7 +124,7 @@ export default { ...@@ -124,7 +124,7 @@ export default {
z-index: 2; z-index: 2;
height: 66px; height: 66px;
width: 100%; width: 100%;
margin: 0 20px; /* margin: 0 20px; */
border-bottom: 1px solid #E7E7E7 !important; border-bottom: 1px solid #E7E7E7 !important;
} }
.mint-searchbar { .mint-searchbar {
...@@ -151,6 +151,7 @@ export default { ...@@ -151,6 +151,7 @@ export default {
background: #F5F6F6; background: #F5F6F6;
} }
.mint-searchbar-core { .mint-searchbar-core {
color: #555555;
background: #F5F6F6; background: #F5F6F6;
} }
</style> </style>
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册