diff --git a/config/baseUrl.js b/config/baseUrl.js index 46bddf3..f725c58 100644 --- a/config/baseUrl.js +++ b/config/baseUrl.js @@ -2,8 +2,8 @@ let baseUrl = ""; let socketUrl = ""; if (process.env.NODE_ENV === 'development') { // 开发环境 - // baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川 - baseUrl = "https://api.nuttyreading.com/"; //线上正式 + baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川 + // baseUrl = "https://api.nuttyreading.com/"; //线上正式 } else if (process.env.NODE_ENV === 'production') { // baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川 baseUrl = "https://api.nuttyreading.com/"; //线上正式 diff --git a/main.js b/main.js index 1e1cde6..4f80067 100644 --- a/main.js +++ b/main.js @@ -82,6 +82,9 @@ Vue.component('common-anchor-link', commonAnchorLink); import commonSelectVip from '@/pages/component/commonComponents/selectVip.vue' Vue.component('common-select-vip', commonSelectVip); +import commonAdvertisement from '@/pages/component/commonComponents/advertisement.vue' +Vue.component('common-advertisement', commonAdvertisement); + App.mpType = 'app' const app = new Vue({ diff --git a/manifest.json b/manifest.json index eab0c3a..fb11b2a 100644 --- a/manifest.json +++ b/manifest.json @@ -2,9 +2,9 @@ "name" : "心灵空间", "appid" : "__UNI__BBBDFD2", "description" : "心灵空间", - "versionName" : "1.0.46", + "versionName" : "1.0.47", "sassImplementationName" : "node-sass", - "versionCode" : 1046, + "versionCode" : 1047, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages/component/commonComponents/advertisement.vue b/pages/component/commonComponents/advertisement.vue new file mode 100644 index 0000000..a920b6e --- /dev/null +++ b/pages/component/commonComponents/advertisement.vue @@ -0,0 +1,260 @@ + + + + + diff --git a/pages/home/index.vue b/pages/home/index.vue index 635ed20..197258c 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -118,6 +118,11 @@ + + @@ -151,6 +156,7 @@ export default { studyList: [], //正在学习 flashSaleList: [], //欢迎试听 subList: [], + advertisementList: [], cateIndex: 0 //分类默认选中第一个 } }, @@ -160,6 +166,9 @@ export default { this.isShowTaihu=false } this.getCateList(); + this.$nextTick(() => { + this.getAdvertisement(); + }); }, onShow() { @@ -172,6 +181,27 @@ export default { this.getMarketCourseList(); }, methods: { + async getAdvertisement() { + await $http + .request({ + url: "common/mainAd/getMainAd", + method: "POST", + data: { + type: 3, + }, + header: { + //默认 无 说明:请求头 + "Content-Type": "application/json", + }, + }) + .then(async (res) => { + if (res.code == 0 && res.list && res.list.length > 0) { + this.advertisementList = res.list; + + this.$refs.commonAdvertisement.open(); + } + }); + }, //获取列表数据 getCateList(){ uni.showLoading({