diff --git a/common/axios.js b/common/axios.js
index d5f4930..5766b1f 100644
--- a/common/axios.js
+++ b/common/axios.js
@@ -49,9 +49,17 @@ export default {
var [error, res] = data;
uni.hideLoading()
var res_code = res.statusCode.toString();
+ var res_codes = res.data.code.toString();
+
if (res_code.charAt(0) == 2) {
if (res_code == 200) {
- cback(res.data);
+ if (res_codes == 401) {
+ uni.navigateTo({
+ url: '/pages/student/login/login'
+ })
+ }else{
+ cback(res.data);
+ }
} else {
console.log('201', url)
uni.showToast({
@@ -60,18 +68,10 @@ export default {
})
}
} else {
- if (res_code == 401) {
- //登录失效
- console.log('401', url)
- if (again_quest) {
- // token.getTokenFromServer(()=>{
- // const again_res=that.uni_request(url,param,method,false)
- // //注意这里需要cback，因为是上一个promis的cback
- // cback(again_res);
- // });
- } else {
- console.log('再次登陆仍然失败', url)
- }
+ if (res_codes == 401) {
+ uni.navigateTo({
+ url: '/pages/student/login/login'
+ })
} else {
console.log('400/500', url, error, res)
uni.showToast({
diff --git a/pages.json b/pages.json
index e5a8d7a..b229dba 100644
--- a/pages.json
+++ b/pages.json
@@ -144,6 +144,15 @@
"navigationBarTextStyle": "white"
}
},
+ {
+ "path" : "pages/student/index/job_list",
+ "style": {
+ "navigationBarTitleText": "作业列表",
+ "navigationStyle": "default",
+ "navigationBarBackgroundColor": "#29d3b4",
+ "navigationBarTextStyle": "white"
+ }
+ },
diff --git a/pages/student/index/index.vue b/pages/student/index/index.vue
index 4dfb1bb..07b8131 100644
--- a/pages/student/index/index.vue
+++ b/pages/student/index/index.vue
@@ -5,7 +5,8 @@
-
+
+
{{member_info.name}}
@@ -65,7 +66,7 @@
课后作业
- 全部
+ 全部
@@ -144,6 +145,11 @@
uni.navigateTo({
url: '/pages/student/index/physical_examination'
})
+ },
+ jobList(){
+ uni.navigateTo({
+ url: '/pages/student/index/job_list'
+ })
}
}
}
@@ -395,4 +401,10 @@
width: 100%;
align-content: space-around;
}
+
+ .pic {
+ width: 144rpx;
+ height: 144rpx;
+ border-radius: 50%;
+ }
\ No newline at end of file
diff --git a/pages/student/index/job_list.vue b/pages/student/index/job_list.vue
new file mode 100644
index 0000000..a1261dc
--- /dev/null
+++ b/pages/student/index/job_list.vue
@@ -0,0 +1,127 @@
+
+
+
+ 课后作业
+
+
+
+
+
+
+
+ 时间：2020.05:25 15:30
+
+
+ 作业描述作业描述作业描述作业描述作业描述作业描述作业描述作业描述作业描述
+
+
+
+
+
+ 班级作业
+
+
+
+
+
+
+
+ 时间：2020.05:25 15:30
+
+
+ 作业描述作业描述作业描述作业描述作业描述作业描述作业描述作业描述作业描述
+
+
+
+
+
+ 班级作业
+
+
+
+
+
+
+
+
+
diff --git a/pages/student/my/personal_data.vue b/pages/student/my/personal_data.vue
index 97452e2..3ff5d33 100644
--- a/pages/student/my/personal_data.vue
+++ b/pages/student/my/personal_data.vue
@@ -5,10 +5,11 @@
-
-
-
- 修改头像
+
+
+
+ 修改头像
@@ -18,7 +19,7 @@
学员姓名 *
-
+
@@ -27,7 +28,7 @@
账号
-
+
@@ -36,7 +37,7 @@
住址
-
+
@@ -45,7 +46,7 @@
课程
-
+
@@ -89,7 +90,7 @@
手机 *
-
+
@@ -132,9 +133,6 @@
picker_show_sex: false,
sex_name: '请选择',
options_sex_arr: [{
- value: 0,
- text: '保密'
- },{
value: 1,
text: '男'
},
@@ -150,6 +148,7 @@
picker_show_birthday: false,
upload_type: 1,
uploadHeadimg: '',
+ editHeadimg: '',
}
},
onLoad() {},
@@ -162,24 +161,19 @@
async init() {
this.getBirthday()
},
-
+
//获取学员信息
- member_init() {
- member.member().then(res => {
- if(res.code == 1){
- this.member_info = res.data
- this.formData = {...this.member_info}
- if(res.data.sex == 0){
- this.sex_name = '保密'
- }else if(this.formData.sex == 1){
- this.sex_name = '男'
- }else if(this.formData.sex == 2){
- this.sex_name = '女'
- }
- }else{
- this.member_info = []
- }
- })
+ async member_init() {
+ const member_in = await member.member();
+ if (member_in.code == 1) {
+ this.member_info = member_in.data
+ this.formData = {
+ ...this.member_info
+ }
+ this.sex_name = member_in.data.gender
+ } else {
+ this.member_info = []
+ }
},
// 修改头像按钮
@@ -195,35 +189,30 @@
}
})
},
- async uploadFilePromise(url) {
+ uploadFilePromise(url) {
let token = uni.getStorageSync('token') || ''
- console.log(token,'AQ', this.uploadUrl, this.$store.state.token)
- return new Promise((resolve, reject) => {
- let a = uni.uploadFile({
- url: this.uploadUrl, //仅为示例，非真实的接口地址
- filePath: url,
- name: 'file',
- header: {
- 'token': `${token}`,//请求头设置token
- },
- success: (e) => {
- let res = JSON.parse(e.data.replace(/\ufeff/g, "") || "{}")
- console.log('上传成功2', res)
- if (res.code == 1) {
- this.upload_type = 2
- this.formData.headimg = res.data.path
- this.uploadHeadimg = res.data.url
- } else {
- uni.showToast({
- title: res.msg,
- icon: 'none'
- })
- }
- setTimeout(() => {
- resolve(res.data);
- }, 1000);
- },
- });
+ let a = uni.uploadFile({
+ url: this.uploadUrl, //仅为示例，非真实的接口地址
+ filePath: url,
+ name: 'file',
+ header: {
+ 'token': `${token}`, //请求头设置token
+ },
+ success: (e) => {
+ let res = JSON.parse(e.data.replace(/\ufeff/g, "") || "{}")
+ console.log('上传成功2', res)
+ if (res.code == 1) {
+ this.upload_type = 2
+ this.formData.headimg = res.data.path
+ this.editHeadimg = res.data.path
+ this.uploadHeadimg = res.data.url
+ } else {
+ uni.showToast({
+ title: res.msg,
+ icon: 'none'
+ })
+ }
+ },
});
},
//性别选择相关
@@ -280,29 +269,33 @@
this.formData.birthday = e.result
this.picker_show_birthday = false
},
-
+
//提交信息
- submit(){
+ submit() {
+ console.log(this.editHeadimg, '111')
+ if(this.editHeadimg == ''){
+ this.editHeadimg = this.formData.headimg
+ }
member.member_edit({
- header: this.formData.headimg,
+ header: this.editHeadimg,
name: this.formData.name,
address: this.formData.address,
- gender: this.formData.sex,
+ gender: this.sex_name,
birthday: this.formData.birthday,
email: this.formData.email,
- phone: this.formData.mobile,
+ phone: this.formData.phone,
}).then(res => {
- if(res.code == 1){
+ if (res.code == 1) {
uni.showToast({
title: res.msg,
icon: 'none'
})
- }else{
+ } else {
uni.showToast({
title: res.msg,
icon: 'none'
})
- }
+ }
})
}
diff --git a/static/images/index/check_mark.png b/static/images/index/check_mark.png
new file mode 100644
index 0000000..fd4a891
Binary files /dev/null and b/static/images/index/check_mark.png differ
diff --git a/static/images/index/img.jpg b/static/images/index/img.jpg
new file mode 100644
index 0000000..0c6b62f
Binary files /dev/null and b/static/images/index/img.jpg differ