SpaceOfCheng
/
admin
Watch 3
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 2 Activity
Browse Source

xcx

许成详 6 years ago
parent
67c5117531
commit
2596dc350c
3 changed files with 23 additions and 2 deletions
Split View Show Diff Stats
  1. 1
    1
      dist/index.html
  2. 8
    0
      src/pages/system/cardAndCouponManager/couponManager/edit.vue
  3. 14
    1
      src/pages/system/verificationManager/qrcodeVerification/verificationList/index.vue

+ 1
- 1
dist/index.html View File 

@@ -1 +1 @@
1 
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><title>城的空间后台管理系统</title><link href=./static/css/app.e6375a30929d491dc6b534d0abbdd641.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.992319e39e0ff64940a3.js></script><script type=text/javascript src=./static/js/app.e125f0b3cf29da3fe6a6.js></script></body></html>
1 
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><title>城的空间后台管理系统</title><link href=./static/css/app.ca5c568553d422363d3de51590c1ce78.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.992319e39e0ff64940a3.js></script><script type=text/javascript src=./static/js/app.09d071b18239c91b0a7d.js></script></body></html>

+ 8
- 0
src/pages/system/cardAndCouponManager/couponManager/edit.vue View File 

@@ -808,6 +808,10 @@ export default {
808 808 
           ...this.postData,
809 809 
           caseid: this.couponInfo.CaseId
810 810 
         }).then((res) => {
811 
+          this.goodsList = []
812 
+          for (var n = 0; n < res.list.length; n++) {
813 
+            this.goodsList.push({ ...res.list[n], TypeId: this.returnGoodsType(res.list[n].TypeId) })
814 
+          }
811 815 
           this.total = res.pagenum
812 816 
         })
813 817 
       } else if (this.couponInfo.CouponType === 'course') {

@@ -815,6 +819,10 @@ export default {
815 819 
           ...this.postData,
816 820 
           caseid: this.couponInfo.CaseId
817 821 
         }).then((res) => {
822 
+          this.courseList = []
823 
+          for (var n = 0; n < res.list.length; n++) {
824 
+            this.courseList.push({ ...res.list[n], BeginDate: this.toolClass.dateFormat(res.list[n].BeginDate), EndDate: this.toolClass.dateFormat(res.list[n].EndDate) })
825 
+          }
818 826 
           this.total = res.pagenum
819 827 
         })
820 828 
       }

+ 14
- 1
src/pages/system/verificationManager/qrcodeVerification/verificationList/index.vue View File 

@@ -47,11 +47,24 @@
47 47 
                 label="操作">
48 48 
                 <template slot-scope="scope">
49 49 
                   <el-button
50 
+                    size="mini"
51 
+                    type="success"
52 
+                    v-if="scope.row.VerifyStatus==='useable'"
53 
+                    @click="check(scope.row)">核销</el-button>
54 
+                  <el-button
55 
+                    size="mini"
56 
+                    type="info"
57 
+                    v-if="scope.row.VerifyStatus==='late'">逾期核销</el-button>
58 
+                  <el-button
59 
+                    size="mini"
60 
+                    type="info"
61 
+                    v-if="scope.row.VerifyStatus==='used'">已完成</el-button>
62 
+                  <!-- <el-button
50 63 
                     size="mini"
51 64 
                     type="success"
52 65 
                     v-if="scope.row.VerifyStatus!=='used'"
53 66 
                     @click="check(scope.row)">核销</el-button>
54 
-                  <span v-else>已完成</span>
67 
+                  <span v-else>已完成</span> -->
55 68 
                 </template>
56 69 
               </el-table-column>
57 70 
             </el-table>