xcx

src/pages/system/cardAndCouponManager/cardManager/edit.vue

@@ -26,7 +26,7 @@
                 :action='$api.file.image.url'
                 :show-file-list="false"
                 :on-success="handleAvatarSuccess">
-                <img v-if="cardInfo.Images[0].CardImageUrl" :src="cardInfo.Images[0].CardImageUrl" class="avatar">
+                <img v-if="cardInfo.Images" :src="cardInfo.Images[0].CardImageUrl" class="avatar">
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
               </el-upload>
             </div>
@@ -225,32 +225,29 @@ export default {
         Type: 'xxx'
       }], // 指定商品数据
       cardInfo: {
-        CardId: '',
         CardName: '',
         SendType: '',
         VideoUrl: '',
-        Price: '',
+        Price: ' ',
         StartDate: '',
         EndDate: '',
         TotalCount: '',
-        SentCount: '',
-        UsedCount: '',
-        Status: '',
         CaseId: '',
         OrgId: '',
         Share: {
           CardShareInfo: '',
           CardUseRule: '',
-          CardUseInstruction: '',
+          CardUseInstruction: ''
         },
         Images: [{
-          CardImageUrl: '',
+          CardImageUrl: ''
         }],
         Targets: [{
           TargetType: '',
           TargetId: '',
           TargetName: ''
         }],
+        ChannelId: ''
       },
       postData: {
         page: 1,
@@ -264,14 +261,33 @@ export default {
         caseid: this.defaultCaseId,
         page: 1,
         pagesize: 10000
-      })
-      this.GetCourseList({
-        caseid: this.defaultCaseId,
-        page: 1,
-        pagesize: 10000
-      }).then((res) => {
-        // console.log(JSON.stringify(res))
-        this.courseList = res.list
+      }).then(() => {
+        this.GetCourseList({
+          caseid: this.defaultCaseId,
+          page: 1,
+          pagesize: 10000
+        }).then((res) => {
+          this.courseList = res.list
+          if (this.$route.query.id) {
+            this.getCardById({
+              id: this.$route.query.id
+            }).then((res) => {
+              // console.log(JSON.stringify(res.Card))
+              this.cardInfo = res.Card
+              if (res.Card.VideoUrl) {
+                this.videoOff = true
+              }
+              if (res.Card.Images === null) {
+                this.cardInfo.Images = [{
+                  CardImageUrl: ''
+                }]
+              }
+              if (res.Card.StartDate) {
+                this.date = [res.Card.StartDate, res.Card.EndDate]
+              }
+            })
+          }
+        })
       })
     })
   },
@@ -349,13 +365,47 @@ export default {
     },
     submit () { // 保存
       if (this.$route.query.id) {
-        // 1
+        if (this.date !== '') {
+          this.cardInfo.StartDate = this.date[0]
+          this.cardInfo.EndDate = this.date[1]
+        }
+        for (var x = 0; x < this.courseList.length; x++) {
+          if (this.courseList[x].CourseId === this.cardInfo.Targets[0].TargetId) {
+            this.cardInfo.Targets[0].TargetType = this.courseList[x].CourseType
+            this.cardInfo.Targets[0].TargetName = this.courseList[x].CourseName
+          }
+        }
+        this.cardInfo.TotalCount = this.cardInfo.TotalCount - 0
+        console.log(JSON.stringify(this.cardInfo))
+        this.editCard(this.cardInfo).then((res) => {
+          this.$alert('操作成功', '提示', {
+            confirmButtonText: '确定',
+            callback: action => {
+              this.$router.push({ name: 'cardList' })
+            }
+          })
+        })
       } else {
         this.cardInfo.OrgId = this.OrgId
+        if (this.date !== '') {
+          this.cardInfo.StartDate = this.date[0]
+          this.cardInfo.EndDate = this.date[1]
+        }
+        for (var n = 0; n < this.courseList.length; n++) {
+          if (this.courseList[n].CourseId === this.cardInfo.Targets[0].TargetId) {
+            this.cardInfo.Targets[0].TargetType = this.courseList[n].CourseType
+            this.cardInfo.Targets[0].TargetName = this.courseList[n].CourseName
+          }
+        }
+        this.cardInfo.TotalCount = this.cardInfo.TotalCount - 0
         console.log(JSON.stringify(this.cardInfo))
-        this.addCard({
-          info: this.cardInfo
-        }).then((res) => {
+        this.addCard(this.cardInfo).then((res) => {
+          this.$alert('操作成功', '提示', {
+            confirmButtonText: '确定',
+            callback: action => {
+              this.$router.push({ name: 'cardList' })
+            }
+          })
         })
       }
     },

src/pages/system/cardAndCouponManager/cardManager/index.vue

@@ -3,8 +3,7 @@
     <div class="system-table-search">
       <div class="flex-h">
         <div class="flex-item flex-h">
-          <el-button size="mini" type="success" @click="addCard('course')">新增课程体验卡</el-button>
-          <el-button size="mini" type="success" @click="addCard('bodybuilding')">新增健身卡</el-button>
+          <el-button size="mini" type="success" @click="addCard">新增课程体验卡</el-button>
         </div>
         <ul>
           <li>
@@ -27,44 +26,53 @@
     </div>
     <div class="system-table-box">
       <el-table
-        :data="currentList"
+        :data="cardList.list"
         stripe
         style="width: 100%">
         <el-table-column
-          prop="xxx"
+          prop="CardName"
           label="卡名称">
         </el-table-column>
-        <el-table-column
+        <!-- <el-table-column
           prop="xxx"
           label="卡类型">
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column
-          prop="xxx"
+          prop="Price"
           label="卡价格">
         </el-table-column>
         <el-table-column
-          prop="xxx"
-          label="有效期">
+          prop="StartDate"
+          label="有效期"
+          width="150">
+          <template slot-scope="scope">
+            <span style="width:100%;display:block;text-align:center;white-space: nowrap;">{{toolClass.dateFormat(scope.row.StartDate)}}</span>
+            <span style="width:100%;display:block;text-align:center;white-space: nowrap;">至</span>
+            <span style="width:100%;display:block;text-align:center;white-space: nowrap;">{{toolClass.dateFormat(scope.row.EndDate)}}</span>
+          </template>
         </el-table-column>
         <el-table-column
-          prop="xxx"
+          prop="SendType"
           label="发放类型">
         </el-table-column>
         <el-table-column
-          prop="xxx"
+          prop="TotalCount"
           label="总数量">
         </el-table-column>
         <el-table-column
-          prop="xxx"
+          prop="SentCount"
           label="已发">
         </el-table-column>
         <el-table-column
-          prop="xxx"
+          prop="UsedCount"
           label="实际使用">
         </el-table-column>
         <el-table-column
-          prop="xxx"
+          prop="Status"
           label="状态">
+          <template slot-scope="scope">
+            {{scope.row.Status == 1 ? '正常' : '已过期'}}
+          </template>
         </el-table-column>
         <el-table-column label="操作" fixed='right' width="350">
           <template slot-scope="scope">
@@ -188,7 +196,8 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapState, createNamespacedHelpers } from 'vuex'
+const { mapState: mapCardState, mapActions: mapCardActions } = createNamespacedHelpers('card')
 
 export default {
   name: '',
@@ -208,9 +217,6 @@ export default {
         page: 1, // 当前页码
         pagesize: 10, // 请求数据量
       },
-      currentList: [{
-        xxx: 'xxx'
-      }]
     }
   },
   mounted () {
@@ -219,6 +225,9 @@ export default {
     })
   },
   computed: {
+    ...mapCardState({
+      cardList: x => x.cardList,
+    }),
     ...mapState({
       cases: x => x.app.cases.list,
       defaultCaseId: x => x.app.cases.default
@@ -233,6 +242,9 @@ export default {
     }
   },
   methods: {
+    ...mapCardActions([
+      'GetCardList',
+    ]),
     toSendHistory () { // 查看赠送记录
       this.$router.push({name: 'givingRecords'})
     },
@@ -243,7 +255,8 @@ export default {
       // 1
     },
     handleSelectionChange (val) {
-      // 1
+      this.postData.page = val
+      this.getList()
     },
     sendCard (index, row) { // 赠送卡
       this.centerDialogVisible = true
@@ -254,20 +267,19 @@ export default {
       this.getList()
     },
     getList () { // 获取列表
-      this.$ajax(this.$api.channelManager.getChannelList.url, {
-        method: this.$api.channelManager.getChannelList.method,
-        queryData: { ...this.postData, caseid: this.CaseId }
-      }).then(res => {
-        this.currentList = res.list
-        this.postData.page = res.page
+      this.GetCardList({
+        ...this.postData,
+        caseid: this.CaseId || this.defaultCaseId
+      }).then((res) => {
         this.total = res.pagenum
+        // console.log(JSON.stringify(res))
       })
     },
     handleCurrentChange (val) { // 跳转到分页
       this.getList()
     },
     handleEdit (index, row) { // 编辑
-      this.$router.push({ name: 'editChannel', query: { id: row.ChannelId } })
+      this.$router.push({ name: 'editCard', query: { id: row.CardId } })
     },
     handleDelete (index, row) { // 删除
       let name = '确认删除渠道“' + row.ChannelName + '”?'
@@ -293,8 +305,8 @@ export default {
         })
       })
     },
-    addCard (val) {
-      this.$router.push({ name: 'editCard', query: { type: val } })
+    addCard () {
+      this.$router.push({ name: 'editCard', query: {} })
     }
   }
 }

src/pages/system/cardAndCouponManager/couponManager/index.vue

@@ -52,7 +52,7 @@
             <span style="width:100%;display:block;text-align:center;white-space: nowrap;">{{toolClass.dateFormat(scope.row.StartDate)}}</span>
             <span style="width:100%;display:block;text-align:center;white-space: nowrap;">至</span>
             <span style="width:100%;display:block;text-align:center;white-space: nowrap;">{{toolClass.dateFormat(scope.row.EndDate)}}</span>
-            </template>
+          </template>
         </el-table-column>
         <el-table-column
           prop="SendType"
@@ -74,6 +74,9 @@
         <el-table-column
           prop="Status"
           label="状态">
+          <template slot-scope="scope">
+            {{scope.row.Status == 1 ? '正常' : '已过期'}}
+          </template>
         </el-table-column>
         <el-table-column label="操作" fixed='right' width="350">
           <template slot-scope="scope">