diff --git a/App.vue b/App.vue
index 48ac672..d7b76a3 100644
--- a/App.vue
+++ b/App.vue
@@ -7,6 +7,13 @@
},
async onShow() {
+ // if(!uni.getStorageSync('token')){
+ // uni.redirectTo({
+ // url: '/subPages/login/login',
+ // })
+ // }
+ console.log(uni.getStorageSync('token'));
+
console.log('App Show')
await this.$store.dispatch('initData')
// console.log('配置数据初始化完成')
diff --git a/pages.json b/pages.json
index 9cffb2e..1570546 100644
--- a/pages.json
+++ b/pages.json
@@ -41,7 +41,7 @@
{
"path": "login/userInfo",
"style": {
- "navigationBarTitleText": "补充信息"
+ "navigationStyle": "custom"
}
},
{
@@ -113,6 +113,12 @@
"style": {
"navigationBarTitleText": "提现"
}
+ },
+ {
+ "path": "member/recharge",
+ "style": {
+ "navigationStyle": "custom"
+ }
}
]
}
diff --git a/pages/index/member.vue b/pages/index/member.vue
index 5d75da7..c09528e 100644
--- a/pages/index/member.vue
+++ b/pages/index/member.vue
@@ -35,6 +35,7 @@
{{userInfo.name}}
-
+
@@ -14,11 +14,11 @@
@@ -29,10 +29,10 @@
- 阅读并同意我们的
- 《服务协议与隐私条款》
- 与
- 《个人信息保护指引》
+ 我已阅读并同意
+ 《服务协议》
+ 和
+ 《隐私政策》
@@ -71,6 +71,9 @@ export default {
// 授权登录
handleLogin() {
+ uni.redirectTo({ url: '/subPages/login/userInfo' })
+ return
+
if (!this.isAgreed) {
this.$refs.serviceModal.open();
this.$refs.guideModal.open();
@@ -146,7 +149,7 @@ export default {
width: 100vw;
height: 100vh;
overflow: hidden;
-
+ background: #E8FBFB;
.bg-image {
position: absolute;
top: 0;
@@ -211,9 +214,9 @@ export default {
width: 630rpx;
height: 88rpx;
margin-bottom: 60rpx;
- border: 2rpx solid $secondary-text-color;
+ border: 2rpx solid $primary-color;
border-radius: 44rpx;
- color: $secondary-text-color;
+ color: $primary-color;
font-size: 32rpx;
font-weight: 400;
background-color: transparent;
@@ -264,7 +267,7 @@ export default {
display: flex;
.link-text {
color: $primary-color;
- text-decoration: underline;
+ // text-decoration: underline;
}
}
}
diff --git a/subPages/login/userInfo.vue b/subPages/login/userInfo.vue
index b1b2f71..704d298 100644
--- a/subPages/login/userInfo.vue
+++ b/subPages/login/userInfo.vue
@@ -38,7 +38,7 @@
-
+
-
+
-
+
@@ -113,7 +113,7 @@ export default {
},
async onLoad() {
this.calculateContainerHeight();
- await this.getUserInfo();
+ // await this.getUserInfo();
},
computed: {
// 部门选择器数据格式转换
@@ -317,6 +317,7 @@ export default {
.user-info-container {
background-color: #fff;
box-sizing: border-box;
+ padding-top: 200rpx;
}
.content {
diff --git a/subPages/member/recharge.vue b/subPages/member/recharge.vue
new file mode 100644
index 0000000..de6afe4
--- /dev/null
+++ b/subPages/member/recharge.vue
@@ -0,0 +1,415 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 赠送{{ item.gift }}天
+
+
+ {{ item.title }}
+
+ ¥{{ getInt(item.price) }}.{{ getDecimal(item.price) }}
+ ¥{{ item.originalPrice }}
+
+
+
+ {{ selectedPackage === index ? '已选择' : '点击选择' }}
+
+
+
+
+
+
+ 选择优惠券
+
+ 请选择
+
+
+
+
+
+
+
+ 会员权益
+
+
+
+
+
+ 碎片学习 系统掌握
+ 根据薄弱点智能推荐,每节课3-5分钟,碎片化完成系统学习
+
+
+
+
+
+
+
+
+
+ 匹配水平
+ 依据水平精准推课,不做无用功快速提升
+
+
+
+
+
+
+
+
+
+ 科学闭环测 讲练结合
+ 精心设计科学的学习流程 「测试-讲解-练习-检验」知识掌握更牢固
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file