diff --git a/pages.json b/pages.json index bda3c3c..9cffb2e 100644 --- a/pages.json +++ b/pages.json @@ -68,38 +68,50 @@ "path": "home/directory", "style": { "navigationBarTitleText": "", - "navigationBarBackgroundColor": "#264C8F" + "navigationBarBackgroundColor": "#264C8F", + "navigationBarTextStyle": "white" } }, { - "path": "home/repairSubmit", + "path": "user/introduce", "style": { - "navigationBarTitleText": "报修提交" + "navigationBarTitleText": "产品介绍" } }, { - "path": "home/maintainanceSubmit", + "path": "user/policy", "style": { - "navigationBarTitleText": "保养提交" + "navigationBarTitleText": "服务协议与隐私政策" } }, { - "path": "home/RAArecord", + "path": "user/profile", "style": { - "navigationBarTitleText": "报修/保养记录" + "navigationBarTitleText": "资料修改" } }, { - "path": "repair/maintainSubmit", + "path": "user/discount", "style": { - "navigationBarTitleText": "维修单提交", - "enablePullDownRefresh": true + "navigationBarTitleText": "我的优惠券" } }, { - "path": "user/profile", + "path": "user/promote", "style": { - "navigationBarTitleText": "资料修改" + "navigationStyle": "custom" + } + }, + { + "path": "user/team", + "style": { + "navigationBarTitleText": "我的团队" + } + }, + { + "path": "user/cash", + "style": { + "navigationBarTitleText": "提现" } } ] diff --git a/pages/index/member.vue b/pages/index/member.vue index ba53413..5d75da7 100644 --- a/pages/index/member.vue +++ b/pages/index/member.vue @@ -1,2 +1,599 @@ \ No newline at end of file + + + + + 会员中心 + + + + + + + + 共19项会员特权 | 3 项年VIP专属特权 + + + + + {{userInfo.name}} + + + + + + + + + 会员权益 + + + + + + 碎片学习 系统掌握 + 根据薄弱点智能推荐，每节课3-5分钟，碎片化完成系统学习 + + + + + + + + + + 匹配水平 + 依据水平精准推课，不做无用功快速提升 + + + + + + + + + + 科学闭环测 讲练结合 + 精心设计科学的学习流程 「测试-讲解-练习-检验」知识掌握更牢固 + + + + + + + + + + + + + 学习计划 + + + + + + + + + 学习中 + + + + {{ book.title }} + + {{ book.grade }}/ + + + {{ book.duration }} + + + + + + + + + + 学习推荐 + + 更多 + + + + + + + + + + + {{ book.title }} + + {{ book.grade }}/ + + {{ book.duration }} + + + + + + + + + + + + diff --git a/pages/index/user.vue b/pages/index/user.vue index e98a182..b17507b 100644 --- a/pages/index/user.vue +++ b/pages/index/user.vue @@ -1,64 +1,138 @@ @@ -72,7 +146,14 @@ export default { nickName: '请先登录', id: 'XXXXX' }, - isLogin: uni.getStorageSync('token') + isLogin: uni.getStorageSync('token'), + // 用户展示信息 + displayInfo: { + name: '战斗世界', + phone: '19989674531', + avatar: '/static/默认头像.png', + description: '世界这么美，我想去看看～' + } } }, computed: { @@ -104,7 +185,7 @@ export default { // 跳转到基本信息页面 goToBasicInfo() { uni.navigateTo({ - url: '/subPages/user/profile' + url: '/subPages/user/profile' }) }, @@ -121,6 +202,44 @@ export default { this.$refs.privacyModal.open() }, + // 跳转到会员页面 + goToMember() { + uni.switchTab({ + url: '/pages/index/member' + }) + }, + + // 跳转到推广中心 + goToPromotion() { + uni.navigateTo({ + url: '/subPages/user/promote' + }) + }, + + // 跳转到我的优惠券 + goToCoupons() { + uni.navigateTo({ + url: '/subPages/user/discount' + }) + }, + + // 跳转到产品介绍 + goToProduct() { + uni.navigateTo({ url: '/subPages/user/introduce' }) + }, + + //// 跳转到联系我们 + goToContact() { + this.$refs.contactModal.open('bottom') + }, + + // 跳转到隐私政策页面 + goToPolicy() { + uni.navigateTo({ + url: '/subPages/user/policy' + }) + }, + // 退出登录 logout() { uni.showModal({ @@ -155,117 +274,173 @@ export default { \ No newline at end of file diff --git a/rule.txt b/rule.txt index 032a4bd..f8815ed 100644 --- a/rule.txt +++ b/rule.txt @@ -2,4 +2,5 @@ 2，优先使用uni.scss文件的SCSS变量$primary-color和其他三个还有动画变量 3，图片在/static 4，电脑系统配置Window 11 -5，阿里云上传工具封装在@utils/oss-upload，api相关封装在@api，后台动态配置参数的获取 封装在@stores/index \ No newline at end of file +5，阿里云上传工具封装在@utils/oss-upload，api相关封装在@api，后台动态配置参数的获取 封装在@stores/index +6.动态数据放到data中 \ No newline at end of file diff --git a/static/VIP.png b/static/VIP.png new file mode 100644 index 0000000..584a6b0 Binary files /dev/null and b/static/VIP.png differ diff --git a/static/二维码图标.png b/static/二维码图标.png new file mode 100644 index 0000000..928381d Binary files /dev/null and b/static/二维码图标.png differ diff --git a/static/介绍图标.png b/static/介绍图标.png new file mode 100644 index 0000000..7c4a9b8 Binary files /dev/null and b/static/介绍图标.png differ diff --git a/static/优惠卷图标.png b/static/优惠卷图标.png new file mode 100644 index 0000000..5f4e224 Binary files /dev/null and b/static/优惠卷图标.png differ diff --git a/static/会员图片1.png b/static/会员图片1.png new file mode 100644 index 0000000..96b674f Binary files /dev/null and b/static/会员图片1.png differ diff --git a/static/会员图片2.png b/static/会员图片2.png new file mode 100644 index 0000000..dd044a0 Binary files /dev/null and b/static/会员图片2.png differ diff --git a/static/会员图片3.png b/static/会员图片3.png new file mode 100644 index 0000000..a769c94 Binary files /dev/null and b/static/会员图片3.png differ diff --git a/static/会员背景.png b/static/会员背景.png new file mode 100644 index 0000000..281c614 Binary files /dev/null and b/static/会员背景.png differ diff --git a/static/会员钻石.png b/static/会员钻石.png new file mode 100644 index 0000000..1aaeed8 Binary files /dev/null and b/static/会员钻石.png differ diff --git a/static/修改信息图标.png b/static/修改信息图标.png new file mode 100644 index 0000000..8a1b562 Binary files /dev/null and b/static/修改信息图标.png differ diff --git a/static/团队图标.png b/static/团队图标.png new file mode 100644 index 0000000..874423c Binary files /dev/null and b/static/团队图标.png differ diff --git a/static/已使用盖章.png b/static/已使用盖章.png new file mode 100644 index 0000000..1b24e3e Binary files /dev/null and b/static/已使用盖章.png differ diff --git a/static/已过期盖章.png b/static/已过期盖章.png new file mode 100644 index 0000000..a99888c Binary files /dev/null and b/static/已过期盖章.png differ diff --git a/static/拨号图标.png b/static/拨号图标.png new file mode 100644 index 0000000..33728b1 Binary files /dev/null and b/static/拨号图标.png differ diff --git a/static/推广图标.png b/static/推广图标.png new file mode 100644 index 0000000..28cce3c Binary files /dev/null and b/static/推广图标.png differ diff --git a/static/推广官.png b/static/推广官.png new file mode 100644 index 0000000..196ea55 Binary files /dev/null and b/static/推广官.png differ diff --git a/static/推广标语.png b/static/推广标语.png new file mode 100644 index 0000000..f329a9f Binary files /dev/null and b/static/推广标语.png differ diff --git a/static/提现图标.png b/static/提现图标.png new file mode 100644 index 0000000..d960488 Binary files /dev/null and b/static/提现图标.png differ diff --git a/static/播放图标高亮.png b/static/播放图标高亮.png new file mode 100644 index 0000000..8f081ee Binary files /dev/null and b/static/播放图标高亮.png differ diff --git a/static/服务隐私图标.png b/static/服务隐私图标.png new file mode 100644 index 0000000..3ee1382 Binary files /dev/null and b/static/服务隐私图标.png differ diff --git a/static/联系我们图标.png b/static/联系我们图标.png new file mode 100644 index 0000000..9460916 Binary files /dev/null and b/static/联系我们图标.png differ diff --git a/static/退出登录图标.png b/static/退出登录图标.png new file mode 100644 index 0000000..04f8b82 Binary files /dev/null and b/static/退出登录图标.png differ diff --git a/subPages/home/RAArecord.vue b/subPages/home/RAArecord.vue deleted file mode 100644 index a4eafa7..0000000 --- a/subPages/home/RAArecord.vue +++ /dev/null @@ -1,608 +0,0 @@ - - - - - \ No newline at end of file diff --git a/subPages/home/directory.vue b/subPages/home/directory.vue index 0da3cfb..0eef216 100644 --- a/subPages/home/directory.vue +++ b/subPages/home/directory.vue @@ -168,6 +168,7 @@ export default { .directory-container { min-height: 100vh; background-color: #264C8F; + padding-bottom: 200rpx; } .book-container{ diff --git a/subPages/home/maintainanceSubmit.vue b/subPages/home/maintainanceSubmit.vue deleted file mode 100644 index 8ea3670..0000000 --- a/subPages/home/maintainanceSubmit.vue +++ /dev/null @@ -1,763 +0,0 @@ - - - - - \ No newline at end of file diff --git a/subPages/home/repairSubmit.vue b/subPages/home/repairSubmit.vue deleted file mode 100644 index 5758081..0000000 --- a/subPages/home/repairSubmit.vue +++ /dev/null @@ -1,690 +0,0 @@ - - - - - diff --git a/subPages/repair/maintainSubmit.vue b/subPages/repair/maintainSubmit.vue deleted file mode 100644 index e736a8d..0000000 --- a/subPages/repair/maintainSubmit.vue +++ /dev/null @@ -1,1060 +0,0 @@ - - - - - diff --git a/subPages/user/cash.vue b/subPages/user/cash.vue new file mode 100644 index 0000000..1df2bc7 --- /dev/null +++ b/subPages/user/cash.vue @@ -0,0 +1,187 @@ + + + + + \ No newline at end of file diff --git a/subPages/user/discount.vue b/subPages/user/discount.vue new file mode 100644 index 0000000..febc373 --- /dev/null +++ b/subPages/user/discount.vue @@ -0,0 +1,300 @@ + + + + + \ No newline at end of file diff --git a/subPages/user/introduce.vue b/subPages/user/introduce.vue new file mode 100644 index 0000000..59edf8f --- /dev/null +++ b/subPages/user/introduce.vue @@ -0,0 +1,31 @@ + + + + + \ No newline at end of file diff --git a/subPages/user/policy.vue b/subPages/user/policy.vue new file mode 100644 index 0000000..59edf8f --- /dev/null +++ b/subPages/user/policy.vue @@ -0,0 +1,31 @@ + + + + + \ No newline at end of file diff --git a/subPages/user/profile.vue b/subPages/user/profile.vue index c919b34..8eddad5 100644 --- a/subPages/user/profile.vue +++ b/subPages/user/profile.vue @@ -1,64 +1,68 @@ @@ -71,20 +75,27 @@ export default { nickName: '', phone: '' }, + showMask: true, saveButtonStyle: { - backgroundColor: '#C70019', + backgroundColor: '#06DADC', borderRadius: '41rpx', height: '94rpx', width: '594rpx', - border: 'none' + border: 'none', + color: '#fff', + fontSize: '32rpx', + fontWeight: '500' + }, + inputStyle: { + backgroundColor: '#fff', + borderRadius: '12rpx', + padding: '0 -20rpx', + fontSize: '28rpx' } } }, methods: { - // 返回上一页 - goBack() { - uni.navigateBack() - }, + // 上传头像 async uploadAvatar() { @@ -161,119 +172,93 @@ export default { } }, onLoad() { - this.getProfile() + // this.getProfile() + // 3秒后隐藏遮罩层 + setTimeout(() => { + this.showMask = false + }, 3000) } } diff --git a/subPages/user/promote.vue b/subPages/user/promote.vue new file mode 100644 index 0000000..6126f0a --- /dev/null +++ b/subPages/user/promote.vue @@ -0,0 +1,448 @@ + + + + + \ No newline at end of file diff --git a/subPages/user/team.vue b/subPages/user/team.vue new file mode 100644 index 0000000..436a7b5 --- /dev/null +++ b/subPages/user/team.vue @@ -0,0 +1,199 @@ + + + + + \ No newline at end of file