diff --git a/App.vue b/App.vue index d7b76a3..7b0f2b7 100644 --- a/App.vue +++ b/App.vue @@ -15,7 +15,7 @@ console.log(uni.getStorageSync('token')); console.log('App Show') - await this.$store.dispatch('initData') + // await this.$store.dispatch('initData') // console.log('配置数据初始化完成') }, onHide: function() { diff --git a/api/index.js b/api/index.js index d4de01c..9916107 100644 --- a/api/index.js +++ b/api/index.js @@ -2,11 +2,12 @@ import user from '@/api/modules/user' import config from '@/api/modules/config' import exhibit from '@/api/modules/exhibit' import login from '@/api/modules/login' - +import home from '@/api/modules/home' export { user, config, exhibit, - login + login, + home } diff --git a/api/modules/home.js b/api/modules/home.js new file mode 100644 index 0000000..bc1cc2b --- /dev/null +++ b/api/modules/home.js @@ -0,0 +1,36 @@ +import http from "@/api/http"; + +export default{ + + async getSignup() { + // 首页底部内容添加报名 + return http({ + url: '/index/linkSignup', + method: 'GET', + }) + }, + + // 首页底部内容链接 + async getLink() { + return http({ + url: '/index/link', + method: 'GET', + }) + }, + + // 首页底部内容链接详情 + async getLinkDetails() { + return http({ + url: '/index/linkDetails', + method: 'GET', + }) + }, + + // 查询轮播图 + async getBanner() { + return http({ + url: '/index/banner', + method: 'GET', + }) + } +} \ No newline at end of file diff --git a/config/index.js b/config/index.js index a7cee55..8702446 100644 --- a/config/index.js +++ b/config/index.js @@ -22,7 +22,7 @@ const config = { baseURL: 'http://augcl.natapp1.cc/exhibit-admin/exhibit', }, testing: { - baseURL: 'https://exhibit.augcl.com/exhibit-admin/exhibit', + baseURL: 'https://www.multipleculture.com/englishread-admin/appletApi', }, production: { baseURL: 'https://exhibit.augcl.com/exhibit-admin/exhibit', diff --git a/pages/index/desk.vue b/pages/index/desk.vue index 5368526..e088505 100644 --- a/pages/index/desk.vue +++ b/pages/index/desk.vue @@ -148,6 +148,7 @@ export default { .desk-container { background: #fff; min-height: 100vh; + padding-bottom: 50rpx; } // 顶部搜索栏 @@ -156,7 +157,10 @@ export default { align-items: center; padding: 20rpx 32rpx; background: #fff; - + position: sticky; + top: 0; + left: 0; + right: 0; .search-container { flex: 1; } diff --git a/pages/index/home.vue b/pages/index/home.vue index 0dc7efa..9bd6b45 100644 --- a/pages/index/home.vue +++ b/pages/index/home.vue @@ -333,10 +333,12 @@ export default { .home-container { background: #fff; min-height: 100vh; + padding-bottom: 80rpx; } // 顶部搜索栏 .header { + display: flex; align-items: center; padding: 6rpx 32rpx; @@ -353,6 +355,10 @@ export default { background: #fff; // border-bottom: 1px solid #f0f0f0; + top: 0; + left: 0; + right: 0; + z-index: 999; .tab-scroll { white-space: nowrap; diff --git a/pages/index/member.vue b/pages/index/member.vue index c09528e..8597e82 100644 --- a/pages/index/member.vue +++ b/pages/index/member.vue @@ -247,6 +247,7 @@ export default{ .container { min-height: 100%; + padding-bottom: 50rpx; } .header{ diff --git a/pages/index/user.vue b/pages/index/user.vue index b17507b..c9ccebd 100644 --- a/pages/index/user.vue +++ b/pages/index/user.vue @@ -126,7 +126,7 @@ 联系我们 - + 0731-599327-8899 @@ -169,6 +169,12 @@ export default { } }, methods: { + // 拨打电话 + callPhone() { + uni.makePhoneCall({ + phoneNumber: '0731-599327-8899' + }) + }, // 跳转登录页面 goLogin() { if (!this.isLogin) { diff --git a/subPages/home/directory.vue b/subPages/home/directory.vue index 0eef216..1ed31b7 100644 --- a/subPages/home/directory.vue +++ b/subPages/home/directory.vue @@ -168,11 +168,16 @@ export default { .directory-container { min-height: 100vh; background-color: #264C8F; - padding-bottom: 200rpx; + } .book-container{ + position: sticky; + left: 0; + right: 0; + top: 0; padding: 30rpx; + } .book-info { display: flex; @@ -266,13 +271,15 @@ export default { /* 课程和简介容器 */ .content-container { - padding: 40rpx 32rpx; + padding: 40rpx 32rpx 240rpx; border-radius: 40rpx 40rpx 0 0; overflow: hidden; background: #fff; display: flex; gap: 24rpx; flex-direction: column; + position: relative; + z-index: 100; } /* 课程部分 */ diff --git a/subPages/member/recharge.vue b/subPages/member/recharge.vue index de6afe4..080699a 100644 --- a/subPages/member/recharge.vue +++ b/subPages/member/recharge.vue @@ -9,7 +9,7 @@ /> 会员开通 - + @@ -177,12 +177,7 @@ title: '功能开发中', icon: 'none' }) - }, - goBack() { - uni.navigateBack({ - delta: 1 - }) - }, + } } } @@ -275,14 +270,14 @@ .gift-tag { position: absolute; - top: -30rpx; - left: 0; - // transform: translateX(-50%); - background: #FF4800; + top: -10rpx; + left: 50%; + transform: translateX(-50%); + background: #FF6B6B; color: #fff; - font-size: 24rpx; + font-size: 20rpx; padding: 8rpx 16rpx; - border-radius: 999rpx 999rpx 999rpx 0; + border-radius: 20rpx; white-space: nowrap; } diff --git a/subPages/user/discount.vue b/subPages/user/discount.vue index febc373..baecfd5 100644 --- a/subPages/user/discount.vue +++ b/subPages/user/discount.vue @@ -7,9 +7,11 @@ @change="onTabChange" :activeColor="tabStyle.activeColor" :inactiveColor="tabStyle.inactiveColor" - :bgColor="tabStyle.bgColor" + :fontSize="tabStyle.fontSize" :height="tabStyle.height" + custom-style="height: 80rpx;border-radius: 70rpx;position: sticky; left: 0; top: 0;right: 0;zIndex: 999" + custom-item-style="border-radius: 60rpx;" > @@ -137,7 +139,28 @@ export default { amount: 400, expireDate: '2026-04-28', status: 'available' - } + }, + { + id: 1, + title: '专属福利】20元红包', + amount: 20, + expireDate: '2026-04-28', + status: 'available' + }, + { + id: 2, + title: '专属福利】400元红包', + amount: 400, + expireDate: '2026-04-28', + status: 'available' + }, + { + id: 3, + title: '专属福利】400元红包', + amount: 400, + expireDate: '2026-04-28', + status: 'available' + }, ], used: [ { @@ -187,7 +210,7 @@ export default { .discount-container { min-height: 100vh; background-color: #f8f8f8; - + padding-bottom: 50rpx; .coupon-list { padding: 40rpx 30rpx; diff --git a/subPages/user/introduce.vue b/subPages/user/introduce.vue index 59edf8f..94811f5 100644 --- a/subPages/user/introduce.vue +++ b/subPages/user/introduce.vue @@ -1,7 +1,10 @@ @@ -18,12 +21,17 @@ export default {