xcx

config/index.js

@@ -24,7 +24,7 @@ module.exports = {
     },
     // Various Dev Server settings
     host: '0.0.0.0', // can be overwritten by process.env.HOST
-    port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+    port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,
     notifyOnErrors: true,

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

@@ -42,13 +42,15 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="centerDialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="toVerificationList">确 定</el-button>
+        <el-button type="primary" @click="toVerify">确 定</el-button>
       </span>
     </el-dialog>
   </div>
 </template>
 
 <script>
+import { createNamespacedHelpers } from 'vuex'
+const { mapActions: mapVerificActions } = createNamespacedHelpers('verification')
 export default {
   name: '',
   data () {
@@ -61,8 +63,21 @@ export default {
     this.$nextTick(function () { })
   },
   methods: {
+    ...mapVerificActions([
+      'drawVerifyList',
+    ]),
+    toVerify () {
+      this.drawVerifyList({
+        id: this.verificationCode
+      }).then((res) => {
+        // console.log(JSON.stringify(res))
+        if (res !== null) {
+          this.toVerificationList()
+        }
+      })
+    },
     toVerificationList () { // 定向到核销列表
-      this.$router.push({name: 'drawVerificationList', query: {code: this.verificationCode}})
+      this.$router.push({ name: 'drawVerificationList', query: { code: this.verificationCode } })
     },
   }
 }

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

@@ -8,9 +8,9 @@
             type="warning"
             @click="reback">返回</el-button>
         </div>
-        <div v-if="(courses.list||[]).length>0">
+        <div>
           <el-table
-              :data="courses.list"
+              :data="info"
               stripe
               style="width: 100%">
               <el-table-column
@@ -18,29 +18,38 @@
                 label="所在案场">
               </el-table-column>
               <el-table-column
-                prop="LocationName"
-                label="课程分类">
+                prop="PrizeName"
+                label="奖品名称">
               </el-table-column>
               <el-table-column
-                prop="CourseName"
-                label="课程名称">
+                prop="Name"
+                label="姓名">
               </el-table-column>
               <el-table-column
-                prop="DetailName"
-                label="课时名称">
+                prop="CustomerName"
+                label="微信昵称">
               </el-table-column>
               <el-table-column
-                prop="StartDate"
-                label="课程开始时间">
+                prop="Phone"
+                label="手机号">
+              </el-table-column>
+              <el-table-column
+                prop="ActivitName"
+                label="活动名称">
+              </el-table-column>
+              <el-table-column
+                prop="CreateDate"
+                label="获取时间"
+                width="140px">
                 <template slot-scope="scope">
-                  <span>{{toolClass.dateFormat(scope.row.StartDate)}}</span>
+                  {{toolClass.dateFormat(scope.row.CreateDate)}}
                 </template>
               </el-table-column>
               <el-table-column
-                prop="EndDate"
-                label="课程结束时间">
+                prop="Status"
+                label="状态">
                 <template slot-scope="scope">
-                  <span>{{toolClass.dateFormat(scope.row.EndDate)}}</span>
+                  {{scope.row.Status === 0 ? '未核销' : '已核销'}}
                 </template>
               </el-table-column>
               <el-table-column
@@ -49,14 +58,14 @@
                   <el-button
                     size="mini"
                     type="success"
-                    v-if="scope.row.VerifyStatus!=='used'"
+                    v-if="scope.row.Status === 0"
                     @click="check(scope.row)">核销</el-button>
-                  <span v-else>已完成</span>
+                  <span v-else>已核销</span>
                 </template>
               </el-table-column>
             </el-table>
         </div>
-        <span class="noData" v-else>今日暂无可核销的课程</span>
+        <span class="noData" v-if="!info.length && ajaxOff">今日暂无可核销的课程</span>
       </div>
     </div>
   </div>
@@ -65,44 +74,55 @@
 <script>
 import { createNamespacedHelpers } from 'vuex'
 
-const { mapState: mapVerifState, mapActions: mapVerifActions } = createNamespacedHelpers('verification')
+const { mapActions: mapVerifActions } = createNamespacedHelpers('verification')
 
 export default {
   name: '',
   data () {
     return {
-      code: '',
+      ajaxOff: false,
+      info: [],
     }
   },
   mounted () {
-    const { code } = this.$route.query
-    this.code = code
     this.$nextTick(function () {
-      this.getList()
+      this.drawVerifyList({
+        id: this.$route.query.code
+      }).then((res) => {
+        // console.log(JSON.stringify(res))
+        if (res !== null) {
+          this.info.push(res)
+        }
+        this.ajaxOff = true
+      })
     })
   },
   computed: {
-    ...mapVerifState({
-      courses: x => x.courseVerifs
-    })
   },
   methods: {
     ...mapVerifActions([
-      'GetCourseVerList',
-      'CourseVerifs',
+      'drawVerify',
+      'drawVerifyList',
     ]),
     check (item) { // 核销
-      this.$confirm('确认核销此课程?', '提示', {
+      this.$confirm('确认核销此卡?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      })
-        .then(() => {
-          this.CourseVerifs({id: item.CustomerDetailId, callback: this.afterCheck})
+      }).then(() => {
+        this.drawVerify({
+          id: this.$route.query.code
+        }).then((res) => {
+          this.$message({
+            type: 'success',
+            message: '操作成功!'
+          })
+          this.$router.push({ name: 'drawVerification' })
         })
+      })
     },
     getList () {
-      this.GetCourseVerList({id: this.code})
+      // 1
     },
     afterCheck () {
       this.$message({
@@ -112,7 +132,7 @@ export default {
       this.getList()
     },
     reback () { // 返回
-      this.$router.push({name: 'drawVerificationList'})
+      this.$router.push({ name: 'drawVerificationList' })
     },
   }
 }
@@ -135,7 +155,7 @@ export default {
       }
     }
   }
-  .noData{
+  .noData {
     width: 100%;
     display: block;
     line-height: 40px;

src/store/verification/verification.js

@@ -49,6 +49,30 @@ export default {
           payload.callback()
         }
       })
-    }
+    },
+    drawVerify ({ commit }, { id }) {
+      return new Promise((resolve, reject) => {
+        ajax(api.verification.drawVerify.url, {
+          method: api.verification.drawVerify.method,
+          urlData: {
+            id,
+          }
+        }).then(res => {
+          resolve(res)
+        }).catch(reject)
+      })
+    },
+    drawVerifyList ({ commit }, { id }) {
+      return new Promise((resolve, reject) => {
+        ajax(api.verification.drawVerifyList.url, {
+          method: api.verification.drawVerifyList.method,
+          urlData: {
+            id,
+          }
+        }).then(res => {
+          resolve(res)
+        }).catch(reject)
+      })
+    },
   },
 }

src/util/api.js

@@ -541,6 +541,14 @@ const $api = {
       method: 'put',
       url: `${baseUrl}${common}/verify/course/:id`
     },
+    drawVerify: {
+      method: 'put',
+      url: `${baseUrl}${common}/luckdrawlist/verify/:id`
+    },
+    drawVerifyList: {
+      method: 'get',
+      url: `${baseUrl}${common}/luckdrawlist/verify/:id`
+    },
   },
   goodsOrder: {
     getOnlineOrder: {