Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/admin into dev

src/pages/system/courseManager/courseList/index.vue

@@ -173,7 +173,7 @@
                 :action='$api.file.image.url'
                 :show-file-list="false"
                 :on-success="handleAvatarSuccess">
-                <img v-if="editCourseDetail.newImg" :src="editCourseDetail.newImg" class="avatar">
+                <img v-if="newImg" :src="newImg" class="avatar">
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
               </el-upload>
             </div>
@@ -181,19 +181,19 @@
           <el-button
             size="mini"
             type="success"
-            v-if="editCourseDetail.newImg"
+            v-if="newImg"
             @click="addThisImg">确定添加图片</el-button>
         </li>
       </ul>
       <el-table
-        :data="currentCourseDetail"
+        :data="courseImgs"
         stripe
         style="width: 100%">
         <el-table-column
           prop="img"
           label="图片">
           <template slot-scope="scope">
-            <img :src="scope.row.img" alt="">
+            <img :src="scope.row.ImgUrl" style="width:100%" alt="">
           </template>
         </el-table-column>
         <el-table-column
@@ -202,8 +202,7 @@
           <template slot-scope="scope">
             <el-input
               placeholder="请输入内容"
-              v-model="scope.row.sort"
-              :disabled="scope.row.edit ? false : true">
+              v-model="scope.row.Sort">
             </el-input>
           </template>
         </el-table-column>
@@ -213,12 +212,6 @@
             <el-button
               size="mini"
               type="success"
-              v-if="!scope.row.edit"
-              @click="editItem(scope.$index, scope.row)">编辑</el-button>
-            <el-button
-              size="mini"
-              type="success"
-              v-if="scope.row.edit"
               @click="sureSort(scope.$index, scope.row)">确认</el-button>
             <el-button
               size="mini"
@@ -241,15 +234,13 @@ export default {
   name: '',
   data () {
     return {
+      selCourseId: '',
       currentCourseDetail: [{
         img: '',
         sort: 1,
         edit: false,
       }],
-      editCourseDetail: {
-        newImg: '',
-        list: [],
-      },
+      newImg: '',
       centerDialogVisible: false, // 课程详情弹窗显隐
       total: 0,
       postData: { // 表格搜索条件
@@ -275,6 +266,7 @@ export default {
     }),
     ...mapCourseState({
       courses: x => x.courseList,
+      courseImgs: x => x.courseImgs
     }),
     ...mapLocationState({
       location: x => x.location
@@ -290,21 +282,46 @@ export default {
   },
   methods: {
     deleteItem (index, item) { // 删除图片
-
+      this.$confirm('确认删除此课程?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          this.DelCourseImg({id: item.ImgId, callback: this.afterImgAction})
+        })
     },
     sureSort (index, item) { // 确认图片排序
-      this.currentCourseDetail[index].edit = false
+      this.UpdateCourseImg({...item, callback: this.afterImgAction})
     },
     editItem (index, item) { // 编辑图片排序
-      this.currentCourseDetail[index].edit = true
+      let imglist = {...this.courseImgs}
+      imglist[index].edit = true
+      this.UpdateImgList(imglist)
     },
     addThisImg () { // 添加图片到课程详情
-
+      const data = {
+        CourseId: this.selCourseId,
+        ImgUrl: this.newImg,
+        Sort: 0,
+        callback: this.afterImgAction
+      }
+      this.newImg = ''
+      this.AddCourseImg(data)
+    },
+    afterImgAction () {
+      this.$message({
+        type: 'success',
+        message: '操作成功!'
+      })
+      this.GetCourseImgs({id: this.selCourseId})
     },
     handleAvatarSuccess (res, file) {
-      this.editCourseDetail.newImg = res.result.url
+      this.newImg = res.result.url
     },
-    addDetail (val) { // 添加课程详情
+    addDetail (row) { // 添加课程详情
+      this.selCourseId = row.CourseId
+      this.GetCourseImgs({id: this.selCourseId})
       this.centerDialogVisible = true
     },
     ...mapCourseActions([
@@ -313,7 +330,12 @@ export default {
       'UnPublic',
       'DelCourse',
       'SetNull',
-      'GetCourseByID'
+      'GetCourseByID',
+      'GetCourseImgs',
+      'AddCourseImg',
+      'UpdateCourseImg',
+      'DelCourseImg',
+      'UpdateImgList'
     ]),
     ...mapLocationActions([
       'updateLocationInfo',
@@ -325,7 +347,7 @@ export default {
       return (this.cases.filter(x => x.CaseId === id)[0] || {}).CaseName
     },
     FormatDate (date) {
-      return this.toolClass.dateFormat(date, 'yyyy-mm-dd')
+      return this.toolClass.dateFormat(date, 'yyyy-MM-dd')
     },
     search () { // 搜索
       this.postData.page = 1

src/pages/system/courseManager/courseTag/index.vue

@@ -2,11 +2,11 @@
   <div class="subPage">
     <div class="system-table-box">
       <el-table
-        :data="tableData"
+        :data="tags.list"
         stripe
         style="width: 100%">
         <el-table-column
-          prop="tagName"
+          prop="TagName"
           label="标签名称">
         </el-table-column>
       </el-table>
@@ -15,18 +15,17 @@
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
       :current-page.sync="currentPage"
-      :page-size="10"
+      :page-size="tableSearch.pagesize"
       layout="prev, pager, next, jumper"
-      :total="100">
+      :total="tags.pagenum">
     </el-pagination>
   </div>
 </template>
 
 <script>
-import tableSearch from '@/components/tableSearch/index'
 import { createNamespacedHelpers } from 'vuex'
 
-const { mapState: mapCaseState } = createNamespacedHelpers('case')
+const { mapState: mapCourseTagState, mapActions: mapCourseTagActions } = createNamespacedHelpers('coursetag')
 
 export default {
   name: '',
@@ -34,39 +33,34 @@ export default {
     return {
       currentPage: 0, // 当前页码
       tableSearch: { // 表格搜索条件
-        key: '', // 搜索关键字
-        caseId: '', // 案场id
+        page: 1,
+        pagesize: 10,
       },
-      tableData: [{
-        tagName: 'xxx'
-      }, {
-        tagName: 'xxx'
-      }, {
-        tagName: 'xxx'
-      }, {
-        tagName: 'xxx'
-      }]
     }
   },
   computed: {
-    ...mapCaseState({
-      caseList: x => x.caseList,
+    ...mapCourseTagState({
+      tags: x => x.tagList,
     })
   },
-  components: {
-    tableSearch,
-  },
   methods: {
+    ...mapCourseTagActions([
+      'GetCourseTagList',
+    ]),
     handleSizeChange (val) {
       console.log(`每页 ${val} 条`)
     },
     handleCurrentChange (val) {
-      console.log(`当前页: ${val}`)
-    },
-    searchList (key) { // 搜索列表
-      console.log(key)
+      this.tableSearch.page = val
+      this.getList()
     },
-  }
+    getList () {
+      this.GetCourseTagList(this.tableSearch)
+    }
+  },
+  mounted () {
+    this.getList()
+  },
 }
 </script>
 

src/pages/system/courseManager/scheduleManager/edit.vue

@@ -4,16 +4,6 @@
       <div class="flex-h">
         <div class="flex-item flex-h"></div>
         <ul>
-          <li>
-            <el-select v-model="postData.caseid" placeholder="请选择">
-              <el-option
-                v-for="item in cases"
-                :key="item.CaseId"
-                :label="item.CaseName"
-                :value="item.CaseId">
-              </el-option>
-            </el-select>
-          </li>
           <li>
             <el-input
               placeholder="请输入课程名称"
@@ -30,7 +20,7 @@
     </div>
     <div class="system-table-box">
       <el-table
-        :data="currentList"
+        :data="schedules.list"
         stripe
         style="width: 100%">
         <el-table-column
@@ -50,12 +40,18 @@
           label="已排课时数">
         </el-table-column>
         <el-table-column
-          prop="LocationId"
-          label="课程分类">
+          label="课程类别"
+          width="150">
+          <template slot-scope="scope">
+            <label>{{getLocationName(scope.row.LocationId)}}</label>
+          </template>
         </el-table-column>
         <el-table-column
-          prop="CaseName"
-          label="所在案场">
+          label="所在案场"
+          width="150">
+          <template slot-scope="scope">
+            <label>{{getCaseName(scope.row.CaseId)}}</label>
+          </template>
         </el-table-column>
         <el-table-column
           label="操作">
@@ -73,7 +69,7 @@
       :current-page.sync="postData.page"
       :page-size="postData.pagesize"
       layout="prev, pager, next, jumper"
-      :total="total">
+      :total="schedules.pagenum">
     </el-pagination>
     <el-dialog
       title="设置课时时间"
@@ -86,11 +82,11 @@
             <span>开始时间：</span>
             <div class="flex-item">
               <div>
-                <el-date-picker
+                <el-time-picker
                   v-model="currentCourseItem.BeginDate"
-                  type="date"
+                  value-format="HH:mm:ss"
                   placeholder="选择开始日期">
-                </el-date-picker>
+                </el-time-picker>
               </div>
             </div>
           </li>
@@ -98,11 +94,11 @@
             <span>结束时间：</span>
             <div class="flex-item">
               <div>
-                <el-date-picker
+                <el-time-picker
                   v-model="currentCourseItem.EndDate"
-                  type="date"
+                  value-format="HH:mm:ss"
                   placeholder="选择结束日期">
-                </el-date-picker>
+                </el-time-picker>
               </div>
             </div>
           </li>
@@ -134,7 +130,7 @@
         </ul>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
+        <el-button type="primary" @click="handleDetailSave">确 定</el-button>
         <el-button type="danger" @click="centerDialogVisible = false">取 消</el-button>
       </span>
     </el-dialog>
@@ -142,7 +138,10 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { createNamespacedHelpers, mapState } from 'vuex'
+
+const { mapState: mapScheduleState, mapActions: mapScheduleActions } = createNamespacedHelpers('schedule')
+const { mapState: mapLocationState, mapActions: mapLocationActions } = createNamespacedHelpers('cms')
 
 export default {
   name: '',
@@ -153,60 +152,96 @@ export default {
         EndDate: null,
         DetailName: null,
         DetailDesc: null,
+        CourseId: '',
       },
       centerDialogVisible: false,
-      total: 0,
       postData: { // 表格搜索条件
         caseid: '', // 案场id
         page: 1, // 当前页码
         pagesize: 10, // 请求数据量
-        typeid: '', // 课程类型
         name: '', // 课程名称
+        date: '',
       },
-      currentList: [{
-        CourseName: 'xxx',
-        Price: 'xxx',
-        CourseNum: 'xxx',
-        ScheduleNum: 'xxx',
-        LocationId: 'xxx',
-        CaseName: 'xxx',
-      }],
-      courseTypeList: [],
     }
   },
   mounted () {
+    const { date, caseid } = this.$route.query
+    if (!date || date === '' || !caseid || caseid === '') {
+      this.$message({
+        type: 'error',
+        message: '请先选择排课时间与案场'
+      })
+      this.$router.push({ name: 'scheduleManager' })
+    }
+    this.postData.date = date
+    this.postData.caseid = caseid
+    this.updateLocationInfo()
     this.$nextTick(function () {
       this.getList()
     })
   },
   computed: {
+    ...mapScheduleState({
+      schedules: x => x.scheduleList
+    }),
     ...mapState({
       cases: x => x.app.cases.list,
-      defaultCaseId: x => x.app.cases.default
+      orgid: x => x.app.user.OrgId,
+    }),
+    ...mapLocationState({
+      location: x => x.location
     }),
-    CaseId: {
-      get () {
-        return this.postData.caseid || this.defaultCaseId
-      },
-      set (val) {
-        this.postData.caseid = val
-      }
-    }
   },
   methods: {
-    setCourseDate (target) { // 设置课程时间
+    ...mapScheduleActions([
+      'GetScheduleList',
+      'AddDetail'
+    ]),
+    ...mapLocationActions([
+      'updateLocationInfo',
+    ]),
+    getLocationName (id) {
+      return (this.location.filter(x => x.LocationId === id)[0] || {}).LocationName
+    },
+    getCaseName (id) {
+      return (this.cases.filter(x => x.CaseId === id)[0] || {}).CaseName
+    },
+    setCourseDate (row) { // 设置课程时间
+      this.currentCourseItem.CourseId = row.CourseId
+      this.currentCourseItem.BeginDate = null
+      this.currentCourseItem.EndDate = null
+      this.currentCourseItem.DetailName = null
+      this.currentCourseItem.DetailDesc = null
       this.centerDialogVisible = true
     },
     search () { // 搜索
       this.postData.page = 1
-      this.currentList = []
       this.getList()
     },
     getList () { // 获取列表
+      this.GetScheduleList({...this.postData})
     },
     handleCurrentChange (val) { // 跳转到分页
       this.getList()
     },
+    handleDetailSave () {
+      const item = {...this.currentCourseItem,
+        OrgId: this.orgid,
+        CaseId: this.postData.caseid,
+        BeginDate: this.postData.date + 'T' + this.currentCourseItem.BeginDate,
+        EndDate: this.postData.date + 'T' + this.currentCourseItem.EndDate,
+        callback: this.afterSave
+      }
+      this.AddDetail(item)
+    },
+    afterSave () {
+      this.$message({
+        type: 'success',
+        message: '操作成功！'
+      })
+      this.search()
+      this.centerDialogVisible = false
+    },
   }
 }
 </script>

src/pages/system/courseManager/scheduleManager/index.vue

@@ -3,11 +3,23 @@
     <div class="system-table-search">
       <div class="flex-h">
         <div class="flex-item flex-h">
-          <el-button size="mini" type="success" @click="addSchedule">新增排课</el-button>
+          <!-- <el-button size="mini" type="success" @click="addSchedule">新增排课</el-button> -->
         </div>
+        <ul>
+          <li>
+            <el-select v-model="CaseId" placeholder="请选择案场">
+              <el-option
+                v-for="item in cases"
+                :key="item.CaseId"
+                :label="item.CaseName"
+                :value="item.CaseId">
+              </el-option>
+            </el-select>
+          </li>
+        </ul>
       </div>
       <div class="moreFilter"></div>
-      <full-calendar :events="fcEvents" locale="zh" @eventClick="eventClick" @dayClick="dayClick"></full-calendar>
+      <full-calendar :events="fcEvents" @changeMonth="changeMonth" locale="en" @eventClick="eventClick" @dayClick="dayClick"></full-calendar>
     </div>
     <el-dialog
       title="课时信息"
@@ -16,21 +28,21 @@
       center>
       <div>
         <ul class="courseDetailForm">
+          <li class="flex-h">
+            <span>案场名称：</span>
+            <span>{{currentCourseItem.CaseName}}</span>
+          </li>
+          <li class="flex-h">
+            <span>案场地址：</span>
+            <span>{{currentCourseItem.CaseAddress}}</span>
+          </li>
           <li class="flex-h">
             <span>课程名称：</span>
-            <div class="flex-item">
-              <div>
-                <el-input
-                  placeholder="请输入课程名称"
-                  v-model="currentCourseItem.CourseName"
-                  clearable>
-                </el-input>
-              </div>
-            </div>
+            <span>{{currentCourseItem.CourseName}}</span>
           </li>
           <li class="flex-h">
             <span>课时名称：</span>
-            <div class="flex-item">
+            <div class="flex-item" v-if="currentCourseItem.CourseStatus===0">
               <div>
                 <el-input
                   placeholder="请输入课时名称"
@@ -39,10 +51,11 @@
                 </el-input>
               </div>
             </div>
+            <span v-else>{{currentCourseItem.DetailName}}</span>
           </li>
           <li class="flex-h">
             <span>课时简介：</span>
-            <div class="flex-item">
+            <div class="flex-item" v-if="currentCourseItem.CourseStatus===0">
               <div>
                 <el-input
                   type="textarea"
@@ -52,107 +65,157 @@
                 </el-input>
               </div>
             </div>
-          </li>
-          <li class="flex-h">
-            <span>案场名称：</span>
-            <div class="flex-item">
-              <div>
-                <el-input
-                  placeholder="请输入案场名称"
-                  v-model="currentCourseItem.CaseName"
-                  clearable>
-                </el-input>
-              </div>
-            </div>
-          </li>
-          <li class="flex-h">
-            <span>案场地址：</span>
-            <div class="flex-item">
-              <div>
-                <el-input
-                  placeholder="请输入案场地址"
-                  v-model="currentCourseItem.CaseAddress"
-                  clearable>
-                </el-input>
-              </div>
-            </div>
+            <span v-else>{{currentCourseItem.DetailDesc}}</span>
           </li>
           <li class="flex-h">
             <span>开始时间：</span>
-            <div class="flex-item">
+            <div class="flex-item" v-if="currentCourseItem.CourseStatus===0">
               <div>
                 <el-date-picker
                   v-model="currentCourseItem.BeginDate"
-                  type="date"
-                  placeholder="选择开始日期">
+                  type="datetime"
+                  placeholder="选择开始日期"
+                  >
                 </el-date-picker>
               </div>
             </div>
+            <span v-else>{{this.toolClass.dateFormat(currentCourseItem.BeginDate, 'yyyy-MM-dd hh:mm')}}</span>
           </li>
           <li class="flex-h">
             <span>结束时间：</span>
-            <div class="flex-item">
+            <div class="flex-item" v-if="currentCourseItem.CourseStatus===0">
               <div>
                 <el-date-picker
                   v-model="currentCourseItem.EndDate"
-                  type="date"
+                  type="datetime"
                   placeholder="选择结束日期">
                 </el-date-picker>
               </div>
             </div>
+            <span v-else>{{this.toolClass.dateFormat(currentCourseItem.EndDate, 'yyyy-MM-dd hh:mm')}}</span>
           </li>
         </ul>
       </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="danger" @click="centerDialogVisible = false">删除该课时</el-button>
-        <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
+      <span slot="footer" class="dialog-footer" v-if="currentCourseItem.CourseStatus===0">
+        <el-button type="danger" @click="handlDelDetail">删除该课时</el-button>
+        <el-button type="primary" @click="handlUpdateDetail">确 定</el-button>
       </span>
     </el-dialog>
   </div>
 </template>
 
 <script>
+import { createNamespacedHelpers, mapState } from 'vuex'
 import fullCalendar from 'vue-fullcalendar'
 
+const { mapState: mapScheduleState, mapActions: mapScheduleActions } = createNamespacedHelpers('schedule')
+
 export default {
   name: '',
   data () {
     return {
-      currentCourseItem: {
-        CourseName: 'xxx', // 课程名称
-        DetailName: 'xxx', // 课时名称
-        DetailDesc: 'xxx', // 课时简介
-        CaseName: 'xxx', // 案场名称
-        CaseAddress: 'xxx', // 案场地点
-        BeginDate: 'xxx', // 开始时间
-        EndDate: 'xxx', // 结束时间
-      },
+      caseid: '',
+      seldate: '',
+      currentCourseItem: {},
       centerDialogVisible: false,
-      fcEvents: [{
-        title: '课程名称',
-        start: '2018-09-25',
-        end: '2018-09-25',
-      }, {
-        title: '课程名称1',
-        start: '2018-09-25',
-        end: '2018-09-25',
-      }]
     }
   },
+  computed: {
+    ...mapState({
+      cases: x => x.app.cases.list,
+      defaultCaseId: x => x.app.cases.default
+    }),
+    ...mapScheduleState({
+      details: x => x.detailList
+    }),
+    CaseId: {
+      get () {
+        return this.caseid || this.defaultCaseId
+      },
+      set (val) {
+        this.caseid = val
+        this.getList()
+      }
+    },
+    fcEvents () {
+      return this.details.map(x => {
+        return {
+          title: x.DetailName,
+          start: x.BeginDate,
+          end: x.EndDate,
+          id: x.DetailId,
+          detail: x,
+        }
+      })
+    },
+    CurrentMonth: {
+      get () {
+        const now = new Date()
+        return this.seldate || this.getFullDate(now)
+      },
+      set (val) {
+        this.seldate = val
+      }
+    },
+  },
   components: {
     fullCalendar,
   },
   methods: {
+    ...mapScheduleActions([
+      'GetDetailList',
+      'UpdateDetail',
+      'DelDetail'
+    ]),
     dayClick (day, jsEvent) { // 点击某天进入排课
-      console.log('dayClick', day, jsEvent)
-    },
-    addSchedule () { // 新增排课
-      this.$router.push({ name: 'editSchedule', query: {} })
+      this.$router.push({ name: 'editSchedule', query: {caseid: this.CaseId, date: this.toolClass.dateFormat(day, 'yyyy-MM-dd')} })
     },
     eventClick (event, jsEvent, pos) { // 点击日历
-      console.log(event, jsEvent, pos)
+      this.currentCourseItem = {...event.detail}
       this.centerDialogVisible = true
     },
+    changeMonth (start, end, current) {
+      this.CurrentMonth = this.toolClass.dateFormat(current, 'yyyy-MM')
+      this.getList()
+    },
+    search () { // 搜索
+      this.getList()
+    },
+    getList () {
+      this.GetDetailList({
+        caseid: this.CaseId,
+        date: this.CurrentMonth,
+      })
+    },
+    handlUpdateDetail () {
+      this.UpdateDetail({...this.currentCourseItem,
+        BeginDate: this.toolClass.dateFormat(this.currentCourseItem.BeginDate, 'yyyy-MM-ddThh:mm:ss'),
+        EndDate: this.toolClass.dateFormat(this.currentCourseItem.EndDate, 'yyyy-MM-ddThh:mm:ss'),
+        callback: this.AfterAction})
+    },
+    AfterAction () {
+      this.$message({
+        type: 'success',
+        message: '操作成功！'
+      })
+      this.search()
+      this.centerDialogVisible = false
+    },
+    handlDelDetail () {
+      this.$confirm('确认删除此课时?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          this.DelDetail({id: this.currentCourseItem.DetailId, callback: this.AfterAction})
+        })
+    }
+  },
+  mounted () {
+    this.$nextTick(function () {
+      this.getList()
+    })
   }
 }
 </script>

src/pages/system/systemSet/roleManager/add.vue

@@ -75,10 +75,12 @@ export default {
       if ((this.detail.RoleId || '') === '') {
         this.detail.CaseId = this.caseid
         this.detail.OrgId = this.orgid
-        this.AddRole(this.detail)
+        this.AddRole({...this.detail, callback: this.afterSave})
       } else {
-        this.UpdateRole(this.detail)
+        this.UpdateRole({...this.detail, callback: this.afterSave})
       }
+    },
+    afterSave () {
       this.$message({
         type: 'success',
         message: '操作成功'

src/store/course/course.js

@@ -6,6 +6,7 @@ export default {
   state: {
     courseList: [],
     courseInfo: {},
+    courseImgs: [],
   },
   mutations: {
     updateList (state, payload) {
@@ -14,6 +15,9 @@ export default {
     updateInfo (state, payload) {
       state.courseInfo = payload || {}
     },
+    updateImgList (state, payload) {
+      state.courseImgs = payload
+    }
   },
   actions: {
     GetCourseList ({ commit }, payload) {
@@ -44,6 +48,9 @@ export default {
         }
       }).then(res => {
         commit('updateInfo', res)
+        if (payload.callback) {
+          payload.callback()
+        }
       })
     },
     UpdateCourse ({ commit }, payload) {
@@ -56,6 +63,9 @@ export default {
           id: payload.GoodsId,
         }
       }).then(res => {
+        if (payload.callback) {
+          payload.callback()
+        }
       })
     },
     DelCourse ({ commit }, { id, callback }) {
@@ -99,6 +109,61 @@ export default {
     },
     UpdateInfo ({ commit }, payload) {
       commit('updateInfo', payload)
-    }
+    },
+    UpdateImgList ({ commit }, payload) {
+      commit('updateImgList', payload)
+    },
+    GetCourseImgs ({ commit }, {id, callback}) {
+      ajax(api.course.getimgs.url, {
+        method: api.course.getimgs.method,
+        urlData: {
+          id: id,
+        }
+      }).then(res => {
+        commit('updateImgList', res)
+        if (callback) {
+          callback()
+        }
+      })
+    },
+    AddCourseImg ({ commit }, payload) {
+      ajax(api.course.addimgs.url, {
+        method: api.course.addimgs.method,
+        data: {
+          ...payload
+        }
+      }).then(res => {
+        if (payload.callback) {
+          payload.callback()
+        }
+      })
+    },
+    UpdateCourseImg ({ commit }, payload) {
+      ajax(api.course.updateimgs.url, {
+        method: api.course.updateimgs.method,
+        data: {
+          ...payload
+        },
+        urlData: {
+          id: payload.id
+        }
+      }).then(res => {
+        if (payload.callback) {
+          payload.callback()
+        }
+      })
+    },
+    DelCourseImg ({ commit }, { id, callback }) {
+      ajax(api.course.deleteimgs.url, {
+        method: api.course.deleteimgs.method,
+        urlData: {
+          id: id,
+        }
+      }).then(res => {
+        if (callback) {
+          callback()
+        }
+      })
+    },
   }
 }

src/store/course/schedule.js

@@ -0,0 +1,93 @@
+import ajax from '../../util/ajax'
+import api from '../../util/api'
+
+export default {
+  namespaced: true,
+  state: {
+    detailList: [],
+    detailInfo: {},
+    scheduleList: [],
+  },
+  mutations: {
+    updateList (state, payload) {
+      state.detailList = payload || []
+    },
+    updatesSheduleList (state, payload) {
+      state.scheduleList = payload || []
+    },
+    updateInfo (state, payload) {
+      state.detailInfo = payload || {}
+    },
+  },
+  actions: {
+    GetDetailList ({ commit }, payload) {
+      ajax(api.course.detail.url, {
+        method: api.course.detail.method,
+        queryData: {
+          ...payload,
+        }
+      }).then(res => {
+        commit('updateList', res)
+      })
+    },
+    GetScheduleList ({ commit }, payload) {
+      ajax(api.course.schedule.url, {
+        method: api.course.schedule.method,
+        queryData: {
+          ...payload,
+        }
+      }).then(res => {
+        commit('updatesSheduleList', res)
+      })
+    },
+    GetDetailInfo ({ commit }, { id }) {
+      ajax(api.course.info.url, {
+        method: api.course.info.method,
+        urlData: {
+          id: id,
+        }
+      }).then(res => {
+        commit('updateInfo', res)
+      })
+    },
+    AddDetail ({ commit }, payload) {
+      ajax(api.course.addDetail.url, {
+        method: api.course.addDetail.method,
+        data: {
+          ...payload
+        }
+      }).then(res => {
+        if (payload.callback) {
+          payload.callback()
+        }
+      })
+    },
+    UpdateDetail ({ commit }, payload) {
+      ajax(api.course.updateDetail.url, {
+        method: api.course.updateDetail.method,
+        data: {
+          ...payload
+        },
+        urlData: {
+          id: payload.DetailId,
+        }
+      }).then(res => {
+        if (payload.callback) {
+          payload.callback()
+        }
+      })
+    },
+    DelDetail ({ commit }, { id, callback }) {
+      ajax(api.course.delDetail.url, {
+        method: api.course.delDetail.method,
+        urlData: {
+          id: id,
+        }
+      }).then(res => {
+        if (callback) {
+          callback()
+        }
+      })
+    },
+  }
+}

src/store/index.js

@@ -20,6 +20,7 @@ export const modules = {
   goods: () => require('./goods/goods').default,
   course: () => require('./course/course').default,
   coursetag: () => require('./course/tag').default,
+  schedule: () => require('./course/schedule').default,
 }
 
 Object.keys(modules).forEach((modKey) => {

src/store/system/role.js

@@ -48,6 +48,9 @@ export default {
         }
       }).then(res => {
         commit('updateInfo', res)
+        if (payload.callback) {
+          payload.callback()
+        }
       })
     },
     UpdateRole ({ commit }, payload) {
@@ -57,6 +60,9 @@ export default {
           ...payload
         }
       }).then(res => {
+        if (payload.callback) {
+          payload.callback()
+        }
       })
     },
     DelRole ({ commit }, { id, callback }) {

src/util/api.js

@@ -486,6 +486,30 @@ const $api = {
       method: 'delete',
       url: `${baseUrl}${common}/courseimg/:id`
     },
+    schedule: {
+      method: 'get',
+      url: `${baseUrl}${common}/schedule`
+    },
+    detail: {
+      method: 'get',
+      url: `${baseUrl}${common}/detail`
+    },
+    getDetailByID: {
+      method: 'get',
+      url: `${baseUrl}${common}/detail/:id`
+    },
+    addDetail: {
+      method: 'post',
+      url: `${baseUrl}${common}/detail`
+    },
+    updateDetail: {
+      method: 'put',
+      url: `${baseUrl}${common}/detail`
+    },
+    delDetail: {
+      method: 'delete',
+      url: `${baseUrl}${common}/detail/:id`
+    },
   }
 }
 export default $api

src/util/util.js

@@ -1,25 +1,30 @@
 const toolClass = {
-  dateFormat: (timestamp) => {
-    let date = new Date(timestamp)
-    let y = date.getFullYear()
-    let m = date.getMonth() + 1
-    let d = date.getDate()
-    let h = date.getHours()
-    let min = date.getMinutes()
-    if (m < 10) {
-      m = '0' + m
+  dateFormat: (timestamp, fmt) => {
+    if (!fmt) {
+      fmt = 'yyyy-MM-dd hh:mm'
     }
-    if (d < 10) {
-      d = '0' + d
+
+    let date = new Date(timestamp)
+    var o = {
+      'M+': date.getMonth() + 1,
+      'd+': date.getDate(),
+      'h+': date.getHours(),
+      'm+': date.getMinutes(),
+      's+': date.getSeconds(),
+      'q+': Math.floor((date.getMonth() + 3) / 3),
+      'S': date.getMilliseconds()
     }
-    if (h < 10) {
-      h = '0' + h
+    if (/(y+)/.test(fmt)) {
+      fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length))
     }
-    if (min < 10) {
-      min = '0' + min
+    for (var k in o) {
+      if (new RegExp('(' + k + ')').test(fmt)) {
+        fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)))
+      }
     }
-    return y + '-' + m + '-' + d + ' ' + h + ':' + min
-  }
+    return fmt
+  },
+
 }
 
 export default toolClass