diff --git a/src/js/api.js b/src/js/api.js index ce231ba..b433f72 100644 --- a/src/js/api.js +++ b/src/js/api.js @@ -1,14 +1,23 @@ -export const ORIGIN = `https://test.ouxuanzhineng.cn`; // 测试 +// export const ORIGIN = `https://test.ouxuanzhineng.cn`; // 测试 +export const ORIGIN = `http://kahing.local:9090`; // 本地测试 // export const ORIGIN = `https://coach.ouxuanzhineng.cn`; // 正式 export const API = { coachLogin: `${ORIGIN}/stadium/coach/login`, // 小程序-账号登录 + getCoachCourseTimes: `${ORIGIN}/stadium/coach/getCoachCourseTimes`, // 小程序-账号登录 saveFeedback: `${ORIGIN}/stadium/coach/saveFeedback`, // 小程序-保存教练反馈 + + coach_feedback: `${ORIGIN}/upload/file/coach_feedback`, // 上传文件 } API['course'] = { courseList: `${ORIGIN}/stadium/coach/courseList`, // 小程序-课程列表 + getClassList: `${ORIGIN}/stadium/coach/getClassList`, // 小程序-班级列表 + getCourseStudentList: `${ORIGIN}/stadium/coach/getCourseStudentList`, // 小程序-学员列表 + getCourseStudentList: `${ORIGIN}/stadium/coach/getCourseStudentList`, // 小程序-学员列表 + SaveStudentComment: `${ORIGIN}/stadium/coach/SaveStudentComment`, // 小程序-学员点评保存 + courseList: `${ORIGIN}/stadium/coach/courseList`, // 小程序-课程列表 } diff --git a/src/js/server.js b/src/js/server.js index 19be11c..76456ae 100644 --- a/src/js/server.js +++ b/src/js/server.js @@ -12,7 +12,7 @@ export class Server { if(_loginInfo || true){ data = Object.assign({ - coach_token: _loginInfo.coach_token || '0c30100d-5ba8-11eb-9029-5254005df464', + coach_token: _loginInfo.coach_token || '7a04dc20-62c0-11eb-8979-00e04c0166b9', brand_id: _loginInfo.brand_id || '63', }, data); } diff --git a/src/pages.json b/src/pages.json index 06de9b1..1e273f7 100644 --- a/src/pages.json +++ b/src/pages.json @@ -114,6 +114,12 @@ } }, { + "path": "pages/approve/record/record", + "style": { + "navigationBarTitleText": "我的审批" + } + }, + { "path": "pages/shift/application/application", "style": { "navigationBarTitleText": "换班" diff --git a/src/pages/approve/list/list.vue b/src/pages/approve/list/list.vue index 22f4e30..708dc46 100644 --- a/src/pages/approve/list/list.vue +++ b/src/pages/approve/list/list.vue @@ -1,16 +1,28 @@ @@ -238,7 +263,6 @@ export default { margin-left: 10upx; width: 24upx; height: 24upx; - background-color: skyblue; } } } diff --git a/src/pages/approve/record/record.vue b/src/pages/approve/record/record.vue new file mode 100644 index 0000000..50a8ce4 --- /dev/null +++ b/src/pages/approve/record/record.vue @@ -0,0 +1,225 @@ + + + + + \ No newline at end of file diff --git a/src/pages/course/list/list.vue b/src/pages/course/list/list.vue index 6630899..e08fe4f 100644 --- a/src/pages/course/list/list.vue +++ b/src/pages/course/list/list.vue @@ -25,7 +25,7 @@ {{e.name || '-'}} - 预约中 + {{e.experience_class_status || '-'}} 预约人数:{{e.experience_person_number || 0}} @@ -100,6 +100,7 @@ export default { methods: { tabChange: util.debounce(function(i){ this.curTabIdx = i; + this.courseList = []; this.getCourseList({ is_experience_class: i }) @@ -121,7 +122,7 @@ export default { util.hideLoad(); let _list = res.list || []; if(_list.length<=0)return util.showNone('没有更多!'); - + this.courseList = _list; console.warn(res); }) .catch(util.hideLoad) @@ -212,6 +213,7 @@ export default { } } .cl-ex-item{ + margin-bottom: 24upx; padding: 44upx 24upx 34upx; border-radius: 10upx; background-color: #fff; diff --git a/src/pages/feedback/feedback.vue b/src/pages/feedback/feedback.vue index 5293459..1821452 100644 --- a/src/pages/feedback/feedback.vue +++ b/src/pages/feedback/feedback.vue @@ -1,28 +1,101 @@ @@ -72,18 +145,18 @@ export default { display: inline-block; width: 200upx; height: 200upx; - background-color: skyblue; border-radius: 10upx; overflow: hidden; &.fi-add{ padding-top: 36upx; + border: 2upx solid #D8D8D8; >view{ &:first-child{ position: relative; margin: 0 auto 30upx; width: 60upx; height: 60upx; - &::before{ + &::before,&::after{ content: ''; position: absolute; left: 50%; @@ -95,15 +168,8 @@ export default { } &::after{ - content: ''; - position: absolute; - left: 50%; - top: 50%; - transform: translate(-50%, -50%); height: 60upx; width: 4upx; - background-color: #d8d8d8; - } } &+view{ @@ -116,7 +182,6 @@ export default { .fi-img{ width: 100%; height: 100%; - background-color: slateblue; } .fi-close{ position: absolute; @@ -124,7 +189,6 @@ export default { top: 6upx; width: 40upx; height: 40upx; - background-color: red; } } } diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 18a3ffa..9dee164 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -7,7 +7,7 @@ --> 本月课时 - 0 + {{ course_times || 0 }} @@ -37,6 +37,8 @@