- 
+
@@ -36,7 +40,7 @@
} from 'vuex'
import Breadcrumb from '@/components/Breadcrumb'
import Hamburger from '@/components/Hamburger'
-
+ import state from '@/store/modules/user.js'
export default {
components: {
Breadcrumb,
@@ -47,6 +51,15 @@
'sidebar',
'avatar'
])
+ },
+ data(){
+ return{
+ userName:''
+ }
+ },
+ created(){
+ console.log("state",state)
+ this.userName = state.state.name?state.state.name:''
},
methods: {
toggleSideBar() {
@@ -88,7 +101,7 @@
.right-menu {
float: right;
height: 100%;
- line-height: 50px;
+ line-height: 46px;
&:focus {
outline: none;
@@ -116,21 +129,26 @@
margin-right: 30px;
.avatar-wrapper {
- margin-top: 5px;
+ // margin-top: 5px;
position: relative;
-
+ display:flex;
+ align-items: center;
+ color:#3c4758;
.user-avatar {
cursor: pointer;
- width: 40px;
- height: 40px;
- border-radius: 10px;
+ width: 30px;
+ height: 30px;
+ border-radius: 10px;
+ vertical-align: middle;
+ margin-right: 10px;
}
.el-icon-caret-bottom {
cursor: pointer;
- position: absolute;
- right: -20px;
- top: 25px;
+ // position: absolute;
+ // right: -20px;
+ // top: 25px;
+
font-size: 12px;
}
}
diff --git a/src/mixin/selectMixin.js b/src/mixin/selectMixin.js
index 6913cd3..2df8bef 100644
--- a/src/mixin/selectMixin.js
+++ b/src/mixin/selectMixin.js
@@ -19,12 +19,12 @@ export default {
}],
false_or_true: [{
id: 0,
- value: '否',
- type:'info'
+ value: '否',
+ type: 'info'
}, {
id: 1,
- value: '是',
- type:''
+ value: '是',
+ type: ''
}],
apply_status_list: [{
id: 0,
@@ -78,14 +78,21 @@ export default {
type: ''
}],
course_date: [{
+ value: '课程待定',
+ type: 'info',
+ id: 30,
+ }, {
value: '课程未开始',
type: 'info',
+ id: 20,
}, {
value: '课程进行中',
type: '',
+ id: 10,
}, {
value: '课程已结束',
type: 'success',
+ id: 40,
}],
// 学员
@@ -114,19 +121,19 @@ export default {
//
is_vip_list: [{
id: 0,
- value: '普通学员',
- type:''
+ value: '普通学员',
+ type: ''
}, {
id: 1,
value: 'vip学员'
- }],
- is_schoolmate_list: [{
- id: 0,
- value: '否',
- type:''
- }, {
- id: 1,
- value: '是'
+ }],
+ is_schoolmate_list: [{
+ id: 0,
+ value: '否',
+ type: ''
+ }, {
+ id: 1,
+ value: '是'
}],
company_type_list: [{
id: 0,
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index c288974..9b1d0e5 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,7 +1,8 @@
import {
login,
logout,
- getInfo
+ getInfo,
+ loginMsg
} from '@/api/user'
import {
getToken,
@@ -67,6 +68,31 @@ const actions = {
reject(error)
})
})
+ },
+ loginMsg({
+ commit
+ }, userInfo) {
+ const {
+ mobile,
+ code
+ } = userInfo
+ return new Promise((resolve, reject) => {
+ loginMsg({
+ mobile: mobile,
+ code: code
+ }).then(response => {
+ console.log(response)
+ const {
+ data
+ } = response;
+ console.log(response.access_token)
+ commit('SET_TOKEN', response.access_token)
+ setToken(response.access_token)
+ resolve()
+ }).catch(error => {
+ reject(error)
+ })
+ })
},
// get user info
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 7ce33e8..d11e676 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -5,7 +5,8 @@ export function getToken() {
return Cookies.get(TOKEN_KEY)
}
-export function setToken(token) {
+export function setToken(token,callback) {
+ console.log("set",TOKEN_KEY, token)
return Cookies.set(TOKEN_KEY, token)
}
diff --git a/src/utils/common.js b/src/utils/common.js
index e6c9fbe..24c83fb 100644
--- a/src/utils/common.js
+++ b/src/utils/common.js
@@ -1,4 +1,15 @@
+import {
+ Message
+} from 'element-ui'
let base = {
+ showMessage(msg,type){
+ return Message({
+ message: msg,
+ type: type,
+ duration: 2 * 1000,
+ offset: window.screen.height / 4
+ })
+ },
isPhone (val) {
return /^[1][3,4,5,6,7,8,9][0-9]{9}$/.test(val)
},
diff --git a/src/utils/request.js b/src/utils/request.js
index ab840ea..a3aafa8 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -71,7 +71,8 @@ service.interceptors.response.use(
Message({
message: res.errmsg || 'Error',
type: 'error',
- duration: 5 * 1000
+ duration: 5 * 1000,
+ offset: window.screen.height / 4
})
// 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
@@ -98,10 +99,12 @@ service.interceptors.response.use(
loading?.close()
}
console.log('err' + error) // for debug
+ console.log("window.screen.height / 2",window.screen.height / 4)
Message({
message: error.message,
type: 'error',
- duration: 5 * 1000
+ duration: 5 * 1000,
+ offset: window.screen.height / 4
})
return Promise.reject(error)
}
diff --git a/src/views/book/appointment.vue b/src/views/book/appointment.vue
index ca0089a..04d42c2 100644
--- a/src/views/book/appointment.vue
+++ b/src/views/book/appointment.vue
@@ -34,9 +34,19 @@
+
+
+
+
+
+ 
+ {{userName}}
+
+
+ {{userName}}
+
+ {{scope.row.start_time}}~{{scope.row.end_time}}
+
+
+
+
-
+
+
@@ -69,6 +69,18 @@
+
+
+ 可预约时间段：
+
+
+
+
+
+
@@ -109,8 +121,11 @@
content: '',
total: '',
status: 1,
- use_student: 1,
- file_ids:[]
+ use_student: 1,
+ dateRange: ['08:30','17:30'],
+ file_ids: [],
+ start_time:'08:30',
+ end_time:'17:30'
},
action: `${process.env.VUE_APP_UPLOAD_API}`,
fileList: [],
@@ -123,29 +138,39 @@
}
},
created() {},
- methods: {
- uploadSuccesspublic(response, file, fileList) {
- this.fileList = fileList
- },
- uploadRemovepublic(file, fileList) {
- this.fileList = fileList
+ methods: {
+ changeDateRange(e) {
+ console.log(e)
+ if (e) {
+ this.form.start_time = e[0]
+ this.form.end_time = e[1]
+ } else {
+ this.form.start_time = ''
+ this.form.end_time = ''
+ }
+ },
+ uploadSuccesspublic(response, file, fileList) {
+ this.fileList = fileList
+ },
+ uploadRemovepublic(file, fileList) {
+ this.fileList = fileList
},
submit() {
if (this.id) {
this.form.id = this.id
- }else{
- this.form.id = ''
+ } else {
+ this.form.id = ''
+ }
+ let _files = []
+ if (this.fileList.length > 0) {
+ this.fileList.map(item => {
+ if (item.response) {
+ _files.push(item.response.id)
+ } else {
+ _files.push(item.id)
+ }
+ })
}
- let _files = []
- if (this.fileList.length > 0) {
- this.fileList.map(item => {
- if (item.response) {
- _files.push(item.response.id)
- } else {
- _files.push(item.id)
- }
- })
- }
this.form.file_ids = _files
save({
...this.form
@@ -165,9 +190,10 @@
id: this.id
}).then(res => {
this.form = this.base.requestToForm(res, this.form)
- this.fileList = res.files
- this.form.status = res.status?res.status:0
- this.form.use_student = res.use_student?res.use_student:0
+ this.fileList = res.files
+ this.form.status = res.status ? res.status : 0
+ this.form.use_student = res.use_student ? res.use_student : 0
+ this.form.dateRange = res.start_time?[res.start_time,res.end_time]:['','']
})
},
@@ -180,7 +206,7 @@
this.getDetail()
}
} else {
- this.id = ''
+ this.id = ''
this.fileList = []
this.$refs['dialog'].reset()
}
@@ -191,5 +217,7 @@
diff --git a/src/views/book/count.vue b/src/views/book/count.vue
index d7e8d60..055a744 100644
--- a/src/views/book/count.vue
+++ b/src/views/book/count.vue
@@ -77,7 +77,7 @@
list: [],
total:0,
table_item: [{
- prop: 'name',
+ prop: 'username',
label: '预约人',
align: 'center',
}, {
diff --git a/src/views/component/imports.vue b/src/views/component/imports.vue
index 005016c..87cbcc8 100644
--- a/src/views/component/imports.vue
+++ b/src/views/component/imports.vue
@@ -8,14 +8,13 @@
导入的时候请勿修改模版表单各列栏目名称
- 将文件拖到此处，或点击上传
只能上传xls/xlsx文件
@@ -63,8 +62,8 @@
tableData: {},
headers: [],
tableList: [],
- table: [],
- fileList:[]
+ table: [],
+ fileList: []
};
},
methods: {
@@ -100,17 +99,17 @@
item.key = 'teacher_name'
}
})
- }
- // 考勤
- if (this.tableName === 'course_keeps') {
- b.map(item => {
- if (item.key === 'user_id') {
- item.key = 'user_name'
- }
- if(item.key==='status'){
- item.key = 'status_name'
- }
- })
+ }
+ // 考勤
+ if (this.tableName === 'course_keeps') {
+ b.map(item => {
+ if (item.key === 'user_id') {
+ item.key = 'user_name'
+ }
+ if (item.key === 'status') {
+ item.key = 'status_name'
+ }
+ })
}
this.table = this.headers = b
@@ -123,18 +122,32 @@
type: "error",
});
},
- uploadSuccess(response,file,fileList) {
- if(this.tableName==='course_keeps'){
- response.map(item=>{
- console.log("item",item)
- item.status_name = item.status===1?'正常':'缺勤'
- })
- }
- this.tableList = response;
- this.fileList = fileList
+ uploadSuccess(response, file, fileList) {
+ console.log(response, file, fileList)
+ console.log("window.screen.height",window.screen.height)
+ if (response && response.hasOwnProperty("errcode")) {
+ this.$message({
+ message: response.errmsg || "上传失败",
+ type: "error",
+ duration:2000,
+ offset: window.screen.height / 4
+ });
+ this.fileList = []
+ this.tableList = []
+ return
+ }
+ if (this.tableName === 'course_keeps') {
+ response.map(item => {
+ console.log("item", item)
+ item.status_name = item.status === 1 ? '正常' : '缺勤'
+ })
+ }
+ this.tableList = response;
+ this.fileList = fileList
this.$message({
message: `上传成功`,
type: "success",
+ offset: window.screen.height / 2
});
},
@@ -201,7 +214,7 @@
this.tableList = []
this.table = []
this.headers = []
- this.tableData = []
+ this.tableData = []
this.fileList = []
}
}
diff --git a/src/views/course/apply.vue b/src/views/course/apply.vue
index c31c51c..e4eea07 100644
--- a/src/views/course/apply.vue
+++ b/src/views/course/apply.vue
@@ -176,7 +176,9 @@
const res = await index({
page: this.select.page,
page_size: this.select.page_size,
- show_relation: ['typeDetail'],
+ show_relation: ['typeDetail'],
+ sort_name:'id',
+ sort_type:'DESC',
filter: [{
key: 'name',
op: 'like',
@@ -216,7 +218,7 @@
status:status,
title: row.name,
id: row.id,
- date: row.start_date + '至' + row.end_date,
+ date: row.start_date?row.start_date + '至' + row.end_date:'',
leibie: row.type_detail.name
}
})
diff --git a/src/views/course/attendance.vue b/src/views/course/attendance.vue
index 2f6473a..432bda1 100644
--- a/src/views/course/attendance.vue
+++ b/src/views/course/attendance.vue
@@ -95,7 +95,8 @@
return {
select: {
theme: '',
- date: '',
+ date: '',
+ course_id:'',
page: 1,
page_size: 10
},
@@ -151,7 +152,8 @@
},
created() {
this.subjectObj = this.$route.query
- console.log(this.$route.query)
+ console.log(this.$route.query)
+ this.select.course_id = this.$route.query.id
this.getList()
},
methods: {
@@ -174,7 +176,11 @@
page: this.select.page,
page_size: this.select.page_size,
show_relation: ['teacher'],
- filter: [{
+ filter: [{
+ key:'course_id',
+ op:'eq',
+ value:this.select.course_id
+ },{
key: 'theme',
op: 'like',
value: this.select.theme
diff --git a/src/views/course/class.vue b/src/views/course/class.vue
index d0cfcaf..85580c0 100644
--- a/src/views/course/class.vue
+++ b/src/views/course/class.vue
@@ -171,7 +171,9 @@
const res = await index({
page: this.select.page,
page_size: this.select.page_size,
- show_relation: ['teacher','typeDetail'],
+ show_relation: ['teacher','typeDetail'],
+ sort_name:'id',
+ sort_type:'DESC',
filter: [{
key: 'name',
op: 'like',
@@ -204,7 +206,7 @@
query: {
title: row.name,
id: row.id,
- date: row.start_date + '至' + row.end_date,
+ date: row.start_date?row.start_date + '至' + row.end_date:'',
leibie: value,
teacher:teacher
}
diff --git a/src/views/course/components/addCourse.vue b/src/views/course/components/addCourse.vue
index b33b88f..4bc0b95 100644
--- a/src/views/course/components/addCourse.vue
+++ b/src/views/course/components/addCourse.vue
@@ -196,8 +196,8 @@
-
-
+
+
@@ -249,8 +249,8 @@
signRange: '',
total: '',
status: 0,
- is_arrange: '',
- is_fee: '',
+ is_arrange: 1,
+ is_fee: 1,
image_id: '',
publicize_ids: [],
content: '',
@@ -356,11 +356,24 @@
},
checkSubmit() {
this.$refs.dialog.submit(true)
+ },
+ compareTime(date,sign){
+ let date1 = this.$moment(date)
+ let sign1 = this.$moment(sign)
+ return sign1.isBefore(date1)
},
submit() {
if (this.id) {
this.form.id = this.id
- }
+ }
+ // 报名截止时间 不能晚于 日程开始时间
+ if(this.form.start_date && this.form.sign_end_date){
+ if(!this.compareTime(this.form.start_date,this.form.sign_end_date)){
+ this.$Message.warning("报名截止时间不能晚于课程开始时间")
+ return
+ }
+ }
+ // return
let pubFiles = []
if (this.publicizeList.length > 0) {
this.publicizeList.map(item => {
@@ -381,7 +394,8 @@
message: '保存课程成功'
})
this.id = res.id
- this.$emit('refresh')
+ this.$emit('refresh')
+ this.active = 1
// this.active = 1
})
@@ -402,7 +416,9 @@
this.publicizeList = res.publicize
this.form.dateRange = [res.start_date, res.end_date]
this.form.signRange = [res.sign_start_date, res.sign_end_date]
- this.form.status = res.status ? res.status : 0
+ this.form.status = res.status ? res.status : 0
+ this.form.is_arrange = res.is_arrange ? res.is_arrange : 0
+ this.form.is_fee = res.is_fee ? res.is_fee : 0
this.showTinymce = true
})
},
@@ -450,7 +466,22 @@
this.imgList = []
this.publicizeList = []
this.active = 0
- this.formList = []
+ this.formList = []
+ this.form = {
+ step: '', // 控制课程 课表
+ name: '',
+ type: '',
+ dateRange: '',
+ signRange: '',
+ total: '',
+ status: 0,
+ is_arrange: 1,
+ is_fee: 1,
+ image_id: '',
+ publicize_ids: [],
+ content: '',
+ applylabel: ''
+ }
this.$refs['dialog'].reset()
}
},
diff --git a/src/views/course/components/addTypes.vue b/src/views/course/components/addTypes.vue
index 45127f9..acf1d06 100644
--- a/src/views/course/components/addTypes.vue
+++ b/src/views/course/components/addTypes.vue
@@ -1,14 +1,14 @@
-
@@ -100,10 +100,10 @@
form: {
name:'',
status:1,
- wait_tip:"",
- pass_tip:"",
- fault_tip:'',
- back_tip:"",
+ wait_tip:"我们将在1-3个工作日内审核并通知您报名结果….",
+ pass_tip:"恭喜您，您已被录取！",
+ fault_tip:'很遗憾，您未通过审核。',
+ back_tip:"很遗憾，您未通过审核。",
year_total:""
},
rules: {
diff --git a/src/views/course/components/checkPay.vue b/src/views/course/components/checkPay.vue
index 303307b..412e4a7 100644
--- a/src/views/course/components/checkPay.vue
+++ b/src/views/course/components/checkPay.vue
@@ -12,8 +12,8 @@
![]()
- *课程类型：
+ *课程类别：
-
- 已缴
- 未缴
+ 核对通过
+ 核对不通过