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

src/components/dashboardList/index.vue

@@ -2,7 +2,7 @@
   <div class="dashboardList">
     <ul class="flex-h">
       <li class="flex-item" v-for="(item,index) in data.list" :key="index">
-        <div>
+        <div :style="{background:colorList[index%colorList.length]}">
           <div class="centerLabel">
             <span>{{item.name}}</span>
             <span>{{item.value}}</span>
@@ -19,7 +19,7 @@ export default {
   props: ['data'],
   data () {
     return {
-
+      colorList: ['#fc6243', '#409EFF', '#4ddea2', '#f6e259', '#5c59f6', '#f66f59'],
     }
   },
   mounted () {

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

@@ -358,6 +358,7 @@ export default {
       this.GetCourseList(this.postData)
     },
     handleCurrentChange (val) { // 跳转到分页
+      this.postData.page = val
       this.getList()
     },
     handleEdit (index, row) { // 编辑

src/pages/system/page.js

@@ -71,7 +71,7 @@ import editSchedule from './courseManager/scheduleManager/edit' // 新增、编
 
 import verificationManager from './verificationManager/index' // 核销管理
 import qrcodeVerification from './verificationManager/qrcodeVerification/index' // 二维码核销
-import qrcodeVerificationList from './verificationManager/qrcodeVerification/verificationList/index' // 二维码核销列表
+// import qrcodeVerificationList from './verificationManager/qrcodeVerification/verificationList/index' // 二维码核销列表
 import phoneVerification from './verificationManager/phoneVerification/index' // 手机核销
 import phoneVerificationList from './verificationManager/phoneVerification/verificationList/index' // 手机核销列表
 
@@ -403,7 +403,7 @@ export default {
           children: [{ // 二维码核销列表
             path: 'qrcodeVerificationList',
             name: 'qrcodeVerificationList',
-            component: qrcodeVerificationList,
+            component: phoneVerificationList,
             children: []
           }]
         }, { // 手机核销

src/pages/system/verificationManager/phoneVerification/index.vue

@@ -31,7 +31,7 @@ export default {
   },
   methods: {
     toVerificationList () { // 前往核销列表
-      this.$router.push({name: 'phoneVerificationList', query: {code: this.phone}})
+      this.$router.push({name: 'phoneVerificationList', query: {tel: this.phone}})
     },
   }
 }

src/pages/system/verificationManager/phoneVerification/verificationList/index.vue

@@ -6,9 +6,9 @@
           <div class="flex-item">
             <div class="userInfo">
               <span>用户名：</span>
-              <b>某某某</b>
+              <b>{{(courses.customerInfo || {}).Name || (courses.customerInfo || {}).CustomerName }}</b>
               <span>手机号：</span>
-              <b>{{phone}}</b>
+              <b>{{(courses.customerInfo || {}).Phone}}</b>
             </div>
           </div>
           <el-button
@@ -16,9 +16,9 @@
             type="warning"
             @click="reback">返回</el-button>
         </div>
-        <div>
+        <div v-if="(courses.list||[]).length>0">
           <el-table
-              :data="coursesList"
+              :data="courses.list"
               stripe
               style="width: 100%">
               <el-table-column
@@ -26,8 +26,8 @@
                 label="所在案场">
               </el-table-column>
               <el-table-column
-                prop="LocationId"
-                label="课程类别">
+                prop="LocationName"
+                label="课程分类">
               </el-table-column>
               <el-table-column
                 prop="CourseName"
@@ -38,12 +38,18 @@
                 label="课时名称">
               </el-table-column>
               <el-table-column
-                prop="BeginDate"
+                prop="StartDate"
                 label="课程开始时间">
+                <template slot-scope="scope">
+                  <span>{{toolClass.dateFormat(scope.row.StartDate)}}</span>
+                </template>
               </el-table-column>
               <el-table-column
                 prop="EndDate"
                 label="课程结束时间">
+                <template slot-scope="scope">
+                  <span>{{toolClass.dateFormat(scope.row.EndDate)}}</span>
+                </template>
               </el-table-column>
               <el-table-column
                 label="操作">
@@ -51,55 +57,92 @@
                   <el-button
                     size="mini"
                     type="success"
+                    v-if="scope.row.VerifyStatus!=='used'"
                     @click="check(scope.row)">核销</el-button>
+                  <span>已完成</span>
                 </template>
               </el-table-column>
             </el-table>
+            <el-pagination
+            @current-change="handleCurrentChange"
+            :current-page.sync="courses.page"
+            :page-size="courses.pagesize"
+            layout="prev, pager, next, jumper"
+            :total="courses.pagenum">
+          </el-pagination>
         </div>
-        <span class="noData">今日暂无可核销的课程</span>
+        <span class="noData" v-else>今日暂无可核销的课程</span>
       </div>
     </div>
-    <el-dialog
-      title="提示"
-      :visible.sync="centerDialogVisible"
-      width="300px"
-      center>
-      <span style="width:100%;display:block;text-align:center;margin:20px 0;">确认核销此课程？</span>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="centerDialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
-      </span>
-    </el-dialog>
   </div>
 </template>
 
 <script>
+import { createNamespacedHelpers } from 'vuex'
+
+const { mapState: mapVerifState, mapActions: mapVerifActions } = createNamespacedHelpers('verification')
 
 export default {
   name: '',
   data () {
     return {
-      phone: this.$route.query.code,
-      centerDialogVisible: false,
-      coursesList: [{
-        CaseName: 'xxx',
-        LocationId: 'xxx',
-        CourseName: 'xxx',
-        DetailName: 'xxx',
-        BeginDate: 'xxx',
-        EndDate: 'xxx',
-      }],
+      code: '',
+      tel: '',
+      page: 1,
+      pagesize: 10,
     }
   },
   mounted () {
-    this.$nextTick(function () { })
+    const { code, tel } = this.$route.query
+    this.code = code
+    this.tel = tel
+    this.$nextTick(function () {
+      this.getList()
+    })
+  },
+  computed: {
+    ...mapVerifState({
+      courses: x => x.courseVerifs
+    })
   },
   methods: {
+    ...mapVerifActions([
+      'GetCourseVerList',
+      'CourseVerifs',
+      'GetCourseVerListByTel',
+    ]),
     check (item) { // 核销
-      this.centerDialogVisible = true
+      this.$confirm('确认核销此课程?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          this.CourseVerifs({id: item.CustomerDetailId, callback: this.afterCheck})
+        })
+    },
+    getList () {
+      if (this.code && this.code !== '') {
+        this.GetCourseVerList({id: this.code, page: this.page, pagesize: this.pagesize})
+      } else {
+        if (this.tel && this.tel !== '') {
+          this.GetCourseVerListByTel({tel: this.tel, page: this.page, pagesize: this.pagesize})
+        }
+      }
+    },
+    handleCurrentChange (val) { // 跳转到分页
+      this.page = val
+      this.getList()
+    },
+    afterCheck () {
+      this.$message({
+        type: 'success',
+        message: '操作成功!'
+      })
+      this.getList()
     },
     reback () { // 返回
-      this.$router.push({name: 'phoneVerification'})
+      this.$router.push({name: 'qrcodeVerification'})
     },
   }
 }

src/pages/system/verificationManager/qrcodeVerification/index.vue

@@ -49,7 +49,6 @@
 </template>
 
 <script>
-
 export default {
   name: '',
   data () {

src/pages/system/verificationManager/qrcodeVerification/verificationList/index.vue

@@ -8,9 +8,9 @@
             type="warning"
             @click="reback">返回</el-button>
         </div>
-        <div>
+        <div v-if="(courses.list||[]).length>0">
           <el-table
-              :data="coursesList"
+              :data="courses.list"
               stripe
               style="width: 100%">
               <el-table-column
@@ -18,8 +18,8 @@
                 label="所在案场">
               </el-table-column>
               <el-table-column
-                prop="LocationId"
-                label="课程类别">
+                prop="LocationName"
+                label="课程分类">
               </el-table-column>
               <el-table-column
                 prop="CourseName"
@@ -30,12 +30,18 @@
                 label="课时名称">
               </el-table-column>
               <el-table-column
-                prop="BeginDate"
+                prop="StartDate"
                 label="课程开始时间">
+                <template slot-scope="scope">
+                  <span>{{toolClass.dateFormat(scope.row.StartDate)}}</span>
+                </template>
               </el-table-column>
               <el-table-column
                 prop="EndDate"
                 label="课程结束时间">
+                <template slot-scope="scope">
+                  <span>{{toolClass.dateFormat(scope.row.EndDate)}}</span>
+                </template>
               </el-table-column>
               <el-table-column
                 label="操作">
@@ -43,51 +49,67 @@
                   <el-button
                     size="mini"
                     type="success"
+                    v-if="scope.row.VerifyStatus!=='used'"
                     @click="check(scope.row)">核销</el-button>
+                  <span>已完成</span>
                 </template>
               </el-table-column>
             </el-table>
         </div>
-        <span class="noData">今日暂无可核销的课程</span>
+        <span class="noData" v-else>今日暂无可核销的课程</span>
       </div>
     </div>
-    <el-dialog
-      title="提示"
-      :visible.sync="centerDialogVisible"
-      width="300px"
-      center>
-      <span style="width:100%;display:block;text-align:center;margin:20px 0;">确认核销此课程？</span>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="centerDialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
-      </span>
-    </el-dialog>
   </div>
 </template>
 
 <script>
+import { createNamespacedHelpers } from 'vuex'
+
+const { mapState: mapVerifState, mapActions: mapVerifActions } = createNamespacedHelpers('verification')
 
 export default {
   name: '',
   data () {
     return {
-      centerDialogVisible: false,
-      coursesList: [{
-        CaseName: 'xxx',
-        LocationId: 'xxx',
-        CourseName: 'xxx',
-        DetailName: 'xxx',
-        BeginDate: 'xxx',
-        EndDate: 'xxx',
-      }],
+      code: '',
     }
   },
   mounted () {
-    this.$nextTick(function () { })
+    const { code } = this.$route.query
+    this.code = code
+    this.$nextTick(function () {
+      this.getList()
+    })
+  },
+  computed: {
+    ...mapVerifState({
+      courses: x => x.courseVerifs
+    })
   },
   methods: {
+    ...mapVerifActions([
+      'GetCourseVerList',
+      'CourseVerifs',
+    ]),
     check (item) { // 核销
-      this.centerDialogVisible = true
+      this.$confirm('确认核销此课程?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          this.CourseVerifs({id: item.CustomerDetailId, callback: this.afterCheck})
+        })
+    },
+    getList () {
+      this.GetCourseVerList({id: this.code})
+    },
+    afterCheck () {
+      this.$message({
+        type: 'success',
+        message: '操作成功!'
+      })
+      this.getList()
     },
     reback () { // 返回
       this.$router.push({name: 'qrcodeVerification'})

src/store/index.js

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

src/store/verification/verification.js

@@ -0,0 +1,54 @@
+import ajax from '../../util/ajax'
+import api from '../../util/api'
+
+export default {
+  namespaced: true,
+  state: {
+    courseVerifs: [],
+  },
+  mutations: {
+    updateCourseList (state, payload) {
+      state.courseVerifs = payload || []
+    },
+  },
+  actions: {
+    GetCourseVerList ({ commit }, payload) {
+      ajax(api.verification.coursebycode.url, {
+        method: api.verification.coursebycode.method,
+        urlData: {
+          id: payload.id
+        },
+        queryData: {
+          ...payload
+        }
+      }).then(res => {
+        commit('updateCourseList', res)
+      })
+    },
+    GetCourseVerListByTel ({ commit }, payload) {
+      ajax(api.verification.coursebytel.url, {
+        method: api.verification.coursebytel.method,
+        urlData: {
+          tel: payload.tel
+        },
+        queryData: {
+          ...payload
+        }
+      }).then(res => {
+        commit('updateCourseList', res)
+      })
+    },
+    CourseVerifs ({ commit }, payload) {
+      ajax(api.verification.courseverify.url, {
+        method: api.verification.courseverify.method,
+        urlData: {
+          id: payload.id
+        }
+      }).then(res => {
+        if (payload.callback) {
+          payload.callback()
+        }
+      })
+    }
+  },
+}

src/util/api.js

@@ -510,6 +510,20 @@ const $api = {
       method: 'delete',
       url: `${baseUrl}${common}/detail/:id`
     },
-  }
+  },
+  verification: {
+    coursebycode: {
+      method: 'get',
+      url: `${baseUrl}${common}/verify/course/code/:id`
+    },
+    coursebytel: {
+      method: 'get',
+      url: `${baseUrl}${common}/verify/course/tel/:tel`
+    },
+    courseverify: {
+      method: 'put',
+      url: `${baseUrl}${common}/verify/course/:id`
+    },
+  },
 }
 export default $api