Browse Source

'还差一半的阅读页面'

hfll
hflllll 1 month ago
parent
commit
dc182a140c
13 changed files with 117 additions and 29 deletions
  1. +1
    -1
      App.vue
  2. +3
    -2
      api/index.js
  3. +36
    -0
      api/modules/home.js
  4. +1
    -1
      config/index.js
  5. +5
    -1
      pages/index/desk.vue
  6. +6
    -0
      pages/index/home.vue
  7. +1
    -0
      pages/index/member.vue
  8. +7
    -1
      pages/index/user.vue
  9. +9
    -2
      subPages/home/directory.vue
  10. +8
    -13
      subPages/member/recharge.vue
  11. +26
    -3
      subPages/user/discount.vue
  12. +13
    -5
      subPages/user/introduce.vue
  13. +1
    -0
      subPages/user/policy.vue

+ 1
- 1
App.vue View File

@ -15,7 +15,7 @@
console.log(uni.getStorageSync('token')); console.log(uni.getStorageSync('token'));
console.log('App Show') console.log('App Show')
await this.$store.dispatch('initData')
// await this.$store.dispatch('initData')
// console.log('') // console.log('')
}, },
onHide: function() { onHide: function() {


+ 3
- 2
api/index.js View File

@ -2,11 +2,12 @@ import user from '@/api/modules/user'
import config from '@/api/modules/config' import config from '@/api/modules/config'
import exhibit from '@/api/modules/exhibit' import exhibit from '@/api/modules/exhibit'
import login from '@/api/modules/login' import login from '@/api/modules/login'
import home from '@/api/modules/home'
export { export {
user, user,
config, config,
exhibit, exhibit,
login
login,
home
} }

+ 36
- 0
api/modules/home.js View File

@ -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',
})
}
}

+ 1
- 1
config/index.js View File

@ -22,7 +22,7 @@ const config = {
baseURL: 'http://augcl.natapp1.cc/exhibit-admin/exhibit', baseURL: 'http://augcl.natapp1.cc/exhibit-admin/exhibit',
}, },
testing: { testing: {
baseURL: 'https://exhibit.augcl.com/exhibit-admin/exhibit',
baseURL: 'https://www.multipleculture.com/englishread-admin/appletApi',
}, },
production: { production: {
baseURL: 'https://exhibit.augcl.com/exhibit-admin/exhibit', baseURL: 'https://exhibit.augcl.com/exhibit-admin/exhibit',


+ 5
- 1
pages/index/desk.vue View File

@ -148,6 +148,7 @@ export default {
.desk-container { .desk-container {
background: #fff; background: #fff;
min-height: 100vh; min-height: 100vh;
padding-bottom: 50rpx;
} }
// //
@ -156,7 +157,10 @@ export default {
align-items: center; align-items: center;
padding: 20rpx 32rpx; padding: 20rpx 32rpx;
background: #fff; background: #fff;
position: sticky;
top: 0;
left: 0;
right: 0;
.search-container { .search-container {
flex: 1; flex: 1;
} }


+ 6
- 0
pages/index/home.vue View File

@ -333,10 +333,12 @@ export default {
.home-container { .home-container {
background: #fff; background: #fff;
min-height: 100vh; min-height: 100vh;
padding-bottom: 80rpx;
} }
// //
.header { .header {
display: flex; display: flex;
align-items: center; align-items: center;
padding: 6rpx 32rpx; padding: 6rpx 32rpx;
@ -353,6 +355,10 @@ export default {
background: #fff; background: #fff;
// border-bottom: 1px solid #f0f0f0; // border-bottom: 1px solid #f0f0f0;
top: 0;
left: 0;
right: 0;
z-index: 999;
.tab-scroll { .tab-scroll {
white-space: nowrap; white-space: nowrap;


+ 1
- 0
pages/index/member.vue View File

@ -247,6 +247,7 @@ export default{
.container { .container {
min-height: 100%; min-height: 100%;
padding-bottom: 50rpx;
} }
.header{ .header{


+ 7
- 1
pages/index/user.vue View File

@ -126,7 +126,7 @@
<uv-popup ref="contactModal" closeIconPos="top-left" closeable round="30rpx" :safeAreaInsetBottom="false"> <uv-popup ref="contactModal" closeIconPos="top-left" closeable round="30rpx" :safeAreaInsetBottom="false">
<view class="contact-content"> <view class="contact-content">
<view class="title">联系我们</view> <view class="title">联系我们</view>
<view class="contact-item">
<view class="contact-item" @click="callPhone">
<text class="contact-phone">0731-599327-8899</text> <text class="contact-phone">0731-599327-8899</text>
<image src="/static/拨号图标.png" class="contact-icon"></image> <image src="/static/拨号图标.png" class="contact-icon"></image>
</view> </view>
@ -169,6 +169,12 @@ export default {
} }
}, },
methods: { methods: {
//
callPhone() {
uni.makePhoneCall({
phoneNumber: '0731-599327-8899'
})
},
// //
goLogin() { goLogin() {
if (!this.isLogin) { if (!this.isLogin) {


+ 9
- 2
subPages/home/directory.vue View File

@ -168,11 +168,16 @@ export default {
.directory-container { .directory-container {
min-height: 100vh; min-height: 100vh;
background-color: #264C8F; background-color: #264C8F;
padding-bottom: 200rpx;
} }
.book-container{ .book-container{
position: sticky;
left: 0;
right: 0;
top: 0;
padding: 30rpx; padding: 30rpx;
} }
.book-info { .book-info {
display: flex; display: flex;
@ -266,13 +271,15 @@ export default {
/* 课程和简介容器 */ /* 课程和简介容器 */
.content-container { .content-container {
padding: 40rpx 32rpx;
padding: 40rpx 32rpx 240rpx;
border-radius: 40rpx 40rpx 0 0; border-radius: 40rpx 40rpx 0 0;
overflow: hidden; overflow: hidden;
background: #fff; background: #fff;
display: flex; display: flex;
gap: 24rpx; gap: 24rpx;
flex-direction: column; flex-direction: column;
position: relative;
z-index: 100;
} }
/* 课程部分 */ /* 课程部分 */


+ 8
- 13
subPages/member/recharge.vue View File

@ -9,7 +9,7 @@
/> />
<text class="header-title">会员开通</text> <text class="header-title">会员开通</text>
<!-- 加一个推出箭头 --> <!-- 加一个推出箭头 -->
<view class="header-icon" @click="goBack">
<view class="header-icon" >
<uv-icon name="arrow-left" color="#000" size="20" /> <uv-icon name="arrow-left" color="#000" size="20" />
</view> </view>
<!-- 轮播容器 --> <!-- 轮播容器 -->
@ -177,12 +177,7 @@
title: '功能开发中', title: '功能开发中',
icon: 'none' icon: 'none'
}) })
},
goBack() {
uni.navigateBack({
delta: 1
})
},
}
} }
} }
</script> </script>
@ -275,14 +270,14 @@
.gift-tag { .gift-tag {
position: absolute; position: absolute;
top: -30rpx;
left: 0;
// transform: translateX(-50%);
background: #FF4800;
top: -10rpx;
left: 50%;
transform: translateX(-50%);
background: #FF6B6B;
color: #fff; color: #fff;
font-size: 24rpx;
font-size: 20rpx;
padding: 8rpx 16rpx; padding: 8rpx 16rpx;
border-radius: 999rpx 999rpx 999rpx 0;
border-radius: 20rpx;
white-space: nowrap; white-space: nowrap;
} }


+ 26
- 3
subPages/user/discount.vue View File

@ -7,9 +7,11 @@
@change="onTabChange" @change="onTabChange"
:activeColor="tabStyle.activeColor" :activeColor="tabStyle.activeColor"
:inactiveColor="tabStyle.inactiveColor" :inactiveColor="tabStyle.inactiveColor"
:bgColor="tabStyle.bgColor"
:fontSize="tabStyle.fontSize" :fontSize="tabStyle.fontSize"
:height="tabStyle.height" :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;"
></uv-subsection> ></uv-subsection>
<!-- 优惠券列表 --> <!-- 优惠券列表 -->
@ -137,7 +139,28 @@ export default {
amount: 400, amount: 400,
expireDate: '2026-04-28', expireDate: '2026-04-28',
status: 'available' 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: [ used: [
{ {
@ -187,7 +210,7 @@ export default {
.discount-container { .discount-container {
min-height: 100vh; min-height: 100vh;
background-color: #f8f8f8; background-color: #f8f8f8;
padding-bottom: 50rpx;
.coupon-list { .coupon-list {
padding: 40rpx 30rpx; padding: 40rpx 30rpx;


+ 13
- 5
subPages/user/introduce.vue View File

@ -1,7 +1,10 @@
<template> <template>
<view class="container"> <view class="container">
<view class="body">
<rich-text :nodes="htmlContent"></rich-text>
<view class="sub-container">
<view class="rich-text">
<rich-text :nodes="htmlContent"></rich-text>
</view>
</view> </view>
</view> </view>
</template> </template>
@ -18,12 +21,17 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
.container { .container {
min-height: 100vh;
box-sizing: border-box;
height: 100vh;
margin: 0;
padding: 0;
background-color: #F7F8FA; background-color: #F7F8FA;
.body{
overflow: hidden;
.sub-container{
box-sizing: border-box;
border-radius: 32rpx; border-radius: 32rpx;
padding: 32rpx; padding: 32rpx;
margin: 40rpx;
margin: 40rpx;
background: #fff; background: #fff;
} }
} }


+ 1
- 0
subPages/user/policy.vue View File

@ -20,6 +20,7 @@ export default {
.container { .container {
min-height: 100vh; min-height: 100vh;
background-color: #F7F8FA; background-color: #F7F8FA;
overflow: hidden; // margin
.body{ .body{
border-radius: 32rpx; border-radius: 32rpx;
padding: 32rpx; padding: 32rpx;


Loading…
Cancel
Save