diff --git a/Activity/pages/index/index.vue b/Activity/pages/index/index.vue new file mode 100644 index 0000000..26f9183 --- /dev/null +++ b/Activity/pages/index/index.vue @@ -0,0 +1,133 @@ + + + + + \ No newline at end of file diff --git a/api/oil-site.js b/api/oil-site.js index a04a5e3..1c23b96 100644 --- a/api/oil-site.js +++ b/api/oil-site.js @@ -38,6 +38,13 @@ export default { data: data }) }, + getBCSitesByActivity(data) { + return request({ + url: `/${service_name}/${group_name}/getBCSitesByActivity`, + method: 'post', + data: data + }) + }, getSiteDetails(data) { return request({ url: `/${service_name}/${group_name}/getSiteDetails`, diff --git a/pages.json b/pages.json index 247acaf..0beffd7 100644 --- a/pages.json +++ b/pages.json @@ -120,6 +120,22 @@ } ] }, + { + "root": "Activity", + "pages": [{ + "path" : "pages/index/index", + "style" : + { + "navigationBarTitleText": "油站活动", + "enablePullDownRefresh": false, + "navigationStyle": "default", + "navigationBarBackgroundColor": "#fe0505", + "navigationBarTextStyle": "white" + } + + } + ] + }, { "root": "Financial", "pages": [{ diff --git a/pages/tabbar/home/home.vue b/pages/tabbar/home/home.vue index f79cf6a..67ccd04 100644 --- a/pages/tabbar/home/home.vue +++ b/pages/tabbar/home/home.vue @@ -59,12 +59,13 @@ - + 中交风控 + @@ -151,12 +152,12 @@ - - - + @@ -204,9 +205,13 @@ // src:this.global.starUrl+'banner.png', // link:'' // }, + // { + // src: 'https://xoil-public.oss-cn-beijing.aliyuncs.com/WMP-IMG/banner-2dwk.png', + // link: 'https://tengxun.hkzj168.com/?ChannelId=20220831152210221048473' + // }, { - src: 'https://xoil-public.oss-cn-beijing.aliyuncs.com/WMP-IMG/banner-2dwk.png', - link: 'https://tengxun.hkzj168.com/?ChannelId=20220831152210221048473' + src:'https://xoil-public.oss-cn-beijing.aliyuncs.com/baichuan_MP/banner_baichuan.png', + JumpPage:'/Activity/pages/index/index' }, ], listHeight: 160, @@ -354,6 +359,7 @@ }, methods: { + toActivity(){}, toManagement() { const user = uni.getStorageSync('user'); if (user) { @@ -378,10 +384,15 @@ } }, swiperClick(item, index) { - if (!item?.link) return - uni.navigateTo({ - url: '/pages/tabbar/home/link?url=' + encodeURIComponent(JSON.stringify(item.link)) - }) + // if (!item?.link) return + // uni.navigateTo({ + // url: '/pages/tabbar/home/link?url=' + encodeURIComponent(JSON.stringify(item.link)) + // }) + if(item?.JumpPage){ + uni.navigateTo({ + url: item.JumpPage + }) + } }, goToPage(url) { if (!url) return; diff --git a/utils/request.js b/utils/request.js index c481db6..86de926 100644 --- a/utils/request.js +++ b/utils/request.js @@ -4,7 +4,7 @@ import utils from '@/utils/encode' // const env = process.env.NODE_ENV const env = 'production'/* */ // const env = 'test' -const testUrl = 'http://192.168.0.45:38080' +const testUrl = 'http://192.168.0.254:38080' // const productUrl = 'http://121.196.213.68/adminapi' //预生产 const productUrl = 'https://www.xingoil.com/adminapi' // 生产,加密 new