diff --git a/pages.json b/pages.json
index ee4d933..53fab35 100644
--- a/pages.json
+++ b/pages.json
@@ -392,12 +392,29 @@
"navigationBarTitleText": "我的关注"
}
},
-
{
"path": "invoiceList",
"style": {
"navigationBarTitleText": "开票申请"
}
+ },
+ {
+ "path": "orgCooperation",
+ "style": {
+ "navigationBarTitleText": "出国留学"
+ }
+ },
+ {
+ "path": "helpCenter",
+ "style": {
+ "navigationBarTitleText": "帮助与反馈"
+ }
+ },
+ {
+ "path": "feedback",
+ "style": {
+ "navigationBarTitleText": "帮助与反馈"
+ }
}
]
},
@@ -429,6 +446,29 @@
}
]
},
+ {
+ "root": "pages/learningCenter",
+ "pages": [
+ {
+ "path": "recite",
+ "style": {
+ "navigationBarTitleText": "背诵过关"
+ }
+ },
+ {
+ "path": "reciteContent",
+ "style": {
+ "navigationBarTitleText": "内容列表"
+ }
+ },
+ {
+ "path": "reciteDetail",
+ "style": {
+ "navigationBarTitleText": "详情"
+ }
+ }
+ ]
+ },
{
"root": "pages/live",
"pages": [
diff --git a/pages/forgotPwd/index.vue b/pages/forgotPwd/index.vue
index ce1bdd1..dedc9b6 100644
--- a/pages/forgotPwd/index.vue
+++ b/pages/forgotPwd/index.vue
@@ -69,7 +69,11 @@ export default {
commitPwdShow: false, // 密码显示隐藏
};
},
- onLoad() {},
+ onLoad(options) {
+ if (options.phone) {
+ this.phone = options.phone;
+ }
+ },
methods: {
// 获取验证码
async getCode() {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index c0cba15..88a8458 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -985,9 +985,9 @@ page {
}
.goodsList .image {
- width: 156rpx;
- height: 184rpx;
- margin-right: 52rpx;
+ width: 270rpx;
+ height: 160rpx;
+ margin-right: 24rpx;
flex-shrink: 0;;
}
diff --git a/pages/learningCenter/recite.vue b/pages/learningCenter/recite.vue
new file mode 100644
index 0000000..31221f3
--- /dev/null
+++ b/pages/learningCenter/recite.vue
@@ -0,0 +1,136 @@
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+ 今日{{ item.todayRecite ? '已' : '未' }}背诵
+ 词汇量：{{ item.count }}
+
+
+
+ {{ item.type === 0 ? '免费' : '试看' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/learningCenter/reciteContent.vue b/pages/learningCenter/reciteContent.vue
new file mode 100644
index 0000000..cc0624d
--- /dev/null
+++ b/pages/learningCenter/reciteContent.vue
@@ -0,0 +1,185 @@
+
+
+
+
+
+
+
+ {{ info.name }}
+ 修改
+
+
+
+
+
+ 已练习：{{ info.hasRecite }}/{{ info.count }}
+ 试看剩余：{{ info.surplus }}
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+ {{ k + 1 < 10 ? `0${k+1}` : k }}.{{ con }}
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/learningCenter/reciteDetail.vue b/pages/learningCenter/reciteDetail.vue
new file mode 100644
index 0000000..15ef46f
--- /dev/null
+++ b/pages/learningCenter/reciteDetail.vue
@@ -0,0 +1,238 @@
+
+
+
+
+
+
+ {{ detailInfo.name }}
+
+
+
+
+ 英 {{ detailInfo.enAudio }}
+
+
+
+
+ 美 {{ detailInfo.uaAudio }}
+
+
+
+
+
+
+ 副词 {{ detailInfo.adverb }}
+
+
+
+ 例句
+
+
+
+
+
+ {{ item.translate }}
+
+
+
+ 词根词缀句
+ {{ detailInfo.analysis }}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 27544c8..f616a8d 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -87,9 +87,9 @@
-->
-
-
- {{ item.title }}
+
+
+ {{ item.title }}
diff --git a/pages/my/about_us.vue b/pages/my/about_us.vue
index 47f2f6b..a62c291 100644
--- a/pages/my/about_us.vue
+++ b/pages/my/about_us.vue
@@ -37,4 +37,12 @@ export default {
};
-
+
diff --git a/pages/my/feedback.vue b/pages/my/feedback.vue
new file mode 100644
index 0000000..ac47c36
--- /dev/null
+++ b/pages/my/feedback.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+ 提交
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/my/helpCenter.vue b/pages/my/helpCenter.vue
new file mode 100644
index 0000000..c143f93
--- /dev/null
+++ b/pages/my/helpCenter.vue
@@ -0,0 +1,115 @@
+
+
+
+
+
+ 常见问题解答
+ 如您问题未得到解决可咨询我们客服哦 ~
+
+
+
+ 意见反馈
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/my/orgCooperation.vue b/pages/my/orgCooperation.vue
new file mode 100644
index 0000000..1fcea46
--- /dev/null
+++ b/pages/my/orgCooperation.vue
@@ -0,0 +1,283 @@
+
+
+
+
+
+ 姓名：
+
+
+
+
+
+ 电话：
+
+
+
+
+
+ 推荐人：
+
+
+
+
+
+ 详细地址：
+
+
+
+
+
+
+
+ ￥{{ 200 }}
+
+ 立即报名
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/my/sign_in.vue b/pages/my/sign_in.vue
index 41c2757..5e41a47 100644
--- a/pages/my/sign_in.vue
+++ b/pages/my/sign_in.vue
@@ -78,7 +78,7 @@
-
+
-
- 头像
-
-
-
-
-
- ID
-
-
-
- 昵称
-
-
-
- 手机号
- {{ xUserInfo.phone }}
-
-
-
- 密码
- ******
-
-
- 用户协议
- 用户协议
-
-
-
- 隐私政策
- 隐私政策
-
-
+
+
+ 头像
+
+
+
+
+
+ 昵称
+
+
+
+ 手机号
+ {{ xUserInfo.phone }}
+
+
+
+
+
+
+
+ 收货邮箱
+
+
+
+ 修改密码
+
+
+
+
@@ -142,10 +139,14 @@ export default {
}
},
async save_user_info() {
- let { nickname, avatar } = this.xUserInfo;
+ let { nickname, avatar, email } = this.xUserInfo;
nickname = nickname.trim();
- if (nickname == "" || nickname.length > 15)
+ if (nickname == "" || nickname.length > 15) {
return this.$util.showMsg("昵称长度必须在1-15个字符之间！");
+ }
+ if (email === '' || !(/\w+[@]{1}\w+[.]\w+/.test(email))) {
+ return this.$util.showMsg("邮箱格式错误！");
+ }
uni.showLoading({
mask: true,
});
@@ -154,6 +155,7 @@ export default {
const result = await saveUserInfo({
nickname,
avatar,
+ email,
});
this.$util.showMsg(result.msg);
@@ -244,6 +246,15 @@ export default {
input {
height: 98rpx;
}
+.user-info {
+ padding-top: 10rpx;
+ background: #f6f6f6;
+ .info-box {
+ background: #fff;
+ padding: 0 30rpx;
+ margin-bottom: 20rpx;
+ }
+}
.user-info .avatar {
@@ -252,8 +263,8 @@ input {
align-items: center;
- padding: 30rpx;
background-color: #ffffff;
+ border-bottom: 1px solid #f5f5f5;
}
.user-info .avatar .name {
@@ -288,12 +299,10 @@ input {
display: flex;
align-items: center;
height: 98rpx;
- padding-right: 30rpx;
- padding-left: 30rpx;
-}
-
-.user-info .list .item~.item {
- border-top: 1px solid #f5f5f5;
+ border-bottom: 1px solid #e6e6e6;
+ &:last-child {
+ border-bottom: none;
+ }
}
.user-info .list .item .name {
@@ -304,7 +313,7 @@ input {
}
.user-info .list .item .value {
- font-size: 30rpx;
+ font-size: 28rpx;
color: #666;
}
@@ -321,17 +330,21 @@ input {
}
.user-info .btn-group {
- padding: 80rpx 30rpx 0;
+ padding: 176rpx 30rpx 0;
}
.user-info .btn-group .btn {
width: 100%;
- height: 90rpx;
- border-radius: 45rpx;
+ height: 88rpx;
+ border-radius: 44rpx;
margin-bottom: 30rpx;
- background-color: #2c8eff;
+ background: linear-gradient(0deg, #0F74BB 0%, #3293FF 100%);;
font-size: 32rpx;
color: #ffffff;
+ border: none;
+ &:after {
+ display: none;
+ }
}
.user-info .btn-group .btn:last-child {
@@ -339,9 +352,8 @@ input {
}
.user-info .btn-group .out-btn {
- border: 1px solid #2c8eff;
- background-color: #ffffff;
- color: #2c8eff;
+ background: #E5E5E5;
+ color: #A2A2A2;
}
.user-info .group .link {
diff --git a/pages/special/details.vue b/pages/special/details.vue
index e0660c1..ebe3f6b 100644
--- a/pages/special/details.vue
+++ b/pages/special/details.vue
@@ -1469,6 +1469,7 @@
getTopicSpecialTestPaper(this.special_id, 2).then(
({ data: questions }) => {
if (questions.length) {
+ console.log(this.special.type, 1472);
if (this.special.type === 5) {
this.cloumnNavlist.splice(this.cloumnNavlist.length - 1, 0, {
title: "考试",
@@ -1479,6 +1480,7 @@
title: "考试",
value: 4,
});
+ console.log(this.otherNavlist);
}
}
this.questionList = questions;
diff --git a/pages/special/grade_list.vue b/pages/special/grade_list.vue
index 19fd434..e4bea74 100644
--- a/pages/special/grade_list.vue
+++ b/pages/special/grade_list.vue
@@ -1,47 +1,63 @@
-
+
资料
+ 老师
课程
-
-
-
- {{ type == 1 ? item.types : item.type }}
-
-
- {{ item.title }}
-
-
- ￥{{item.money}}
- 免费
-
-
- {{ item.ficti + item.sales }}人已下载
- 去下载
-
-
-
-
-
- {{ label }}
-
-
-
-
-
- ￥{{ item.is_pink ? item.pink_money : item.money }}
-
- 免费
-
- 共{{ item.count }}节
-
-
-
-
+
+
+
+
+
+
+
+ 取消收藏
+
+
+ {{ item.title }}
+
+
+ ￥{{item.money}}
+ 免费
+
+
+ {{ item.ficti + item.sales }}人已下载
+ 去下载
+
+
+
+
+
+ {{ label }}
+
+
+
+
+
+ ￥{{ item.is_pink ? item.pink_money : item.money }}
+
+ 免费
+
+ 共{{ item.count }}节
+
+
+
+
+
+
@@ -69,7 +85,6 @@ import specialType from "@/constants/special-type";
export default {
data() {
return {
- navlist: [{ title: "我的课程" }, { title: "我的收藏" }],
loadend: false,
loading: false,
active: 0,
@@ -146,6 +161,44 @@ export default {
this.loadend = false;
this.getGradeList();
},
+ // 开始触摸
+ drawStart(e) {
+ console.log('触摸',e);
+ this.clientX = e.changedTouches[0].clientX
+ },
+ // 触摸过程
+ drawMove(id, e) {
+ console.log('过程',e.changedTouches[0]);
+ var endX = e.changedTouches[0].clientX;
+ let diff = endX - this.clientX;
+ console.log(diff);
+
+ if (Math.abs(diff) <= 60 && diff < 0) {
+ let box_center = this.$refs.box_center[id]
+ // console.log(diff);
+ box_center.$el.style.left = diff + 'px'
+ }
+
+ },
+ // 结束触摸
+ drawEnd(id, e) {
+ // console.log('结束',e.changedTouches[0]);
+ var endX = e.changedTouches[0].clientX;
+ let diff = endX - this.clientX;
+ let box_center = this.$refs.box_center[id]
+ if (Math.abs(diff) > 20) {
+ // console.log('移动',diff,id,e);
+ if (diff < 0) {
+ box_center.$el.style.left = '-60px'
+ } else {
+ box_center.$el.style.left = '0'
+ }
+
+ }else{
+ box_center.$el.style.left = '0'
+ }
+
+ },
},
};
@@ -160,30 +213,53 @@ page{