ytj

config/index.js

@@ -15,6 +15,7 @@ module.exports = {
         // target: 'http://192.168.0.62:8080', //wf
         // target: 'http://localhost:8080', 
         target: 'http://192.168.0.11', //ys
+        // target: 'http://192.168.0.11', //ys
         // target: 'http://dev.ycjcjy.com/', //frp
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
         // pathRewrite: {

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

@@ -6,7 +6,7 @@
           <span>选择案场：</span>
           <div class="flex-item">
             <div style="width:50%">
-              <el-select v-model="cardInfo.CaseId" placeholder="请选择" @change="caseChange">
+              <el-select v-model="cardInfo.CaseId" placeholder="请选择" @change="caseChange" :disabled="disabled">
                 <el-option
                   v-for="item in cases"
                   :key="item.CaseId"
@@ -21,13 +21,15 @@
           <span>卡图片：</span>
           <div class="flex-item">
             <div>
+              <a v-if="cardInfo.CardImageUrl && cardInfo.CardImageUrl.indexOf('.mp4') > -1" :href="cardInfo.CardImageUrl" target="blank" style="line-height:40px;">{{cardInfo.CardImageUrl}}</a>
               <el-upload
                 class="avatar-uploader"
                 :action='$api.file.image.url'
                 :show-file-list="false"
                 :on-success="handleAvatarSuccess">
-                <img v-if="cardInfo.Images" :src="cardInfo.Images[0].CardImageUrl" class="avatar">
-                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                <img v-if="cardInfo.CardImageUrl && cardInfo.CardImageUrl.indexOf('.mp4') === -1" :src="cardInfo.CardImageUrl" class="avatar">
+                <el-button type="primary" size="mini" v-if="!cardInfo.CardImageUrl || cardInfo.CardImageUrl.indexOf('.mp4') > -1">{{cardInfo.CardImageUrl.indexOf('.mp4') > -1 ? '更换' : '上传'}}文件</el-button>
+                <!-- <i v-else class="el-icon-plus avatar-uploader-icon"></i> -->
               </el-upload>
             </div>
           </div>
@@ -38,12 +40,28 @@
             <div style="width:200px;">
               <el-input
                 placeholder="请输入"
-                v-model="cardInfo.CardName"
-                clearable>
+                v-model="cardInfo.GymCardName"
+                clearable
+                :disabled="disabled">
               </el-input>
             </div>
           </div>
         </li>
+        <li class="flex-h">
+          <span>卡类型：</span>
+          <div class="flex-item">
+            <div>
+              <el-select v-model="cardInfo.GymTypeId" placeholder="请选择" :disabled="disabled">
+                <el-option
+                  v-for="item in GymTypeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+        </li>
         <li class="flex-h">
           <span>卡价格：</span>
           <div class="flex-item">
@@ -51,7 +69,8 @@
               <el-input
                 placeholder="请输入"
                 v-model="cardInfo.Price"
-                clearable>
+                clearable
+                :disabled="disabled">
               </el-input>
             </div>
           </div>
@@ -63,7 +82,8 @@
               <el-input
                 placeholder="请输入"
                 v-model="cardInfo.TotalCount"
-                clearable>
+                clearable
+                :disabled="disabled">
               </el-input>
             </div>
           </div>
@@ -72,9 +92,9 @@
           <span>发送类型：</span>
           <div class="flex-item">
             <div>
-              <el-radio v-model="cardInfo.SendType" label="channel">渠道</el-radio>
-              <el-radio v-model="cardInfo.SendType" label="case">案场</el-radio>
-              <el-radio v-model="cardInfo.SendType" label="system">系统</el-radio>
+              <el-radio v-model="cardInfo.SendType" label="channel" :disabled="disabled">渠道</el-radio>
+              <el-radio v-model="cardInfo.SendType" label="case" :disabled="disabled">案场</el-radio>
+              <el-radio v-model="cardInfo.SendType" label="system" :disabled="disabled">系统</el-radio>
             </div>
           </div>
         </li>
@@ -82,7 +102,7 @@
           <span>选择渠道：</span>
           <div class="flex-item">
             <div style="width:50%">
-              <el-select v-model="cardInfo.ChannelId" placeholder="请选择">
+              <el-select v-model="cardInfo.ChannelId" placeholder="请选择" :disabled="disabled">
                 <el-option
                   v-for="item in channelList"
                   :key="item.ChannelId"
@@ -93,66 +113,28 @@
             </div>
           </div>
         </li>
-        <li class="flex-h">
-          <span>目标课程：</span>
-          <div class="flex-item">
-            <div>
-              <el-select v-model="cardInfo.Targets[0].TargetId" placeholder="请选择">
-                <el-option
-                  v-for="item in courseList"
-                  :key="item.CourseId"
-                  :label="item.CourseName"
-                  :value="item.CourseId"
-                  :disabled="item.Status !== 1">
-                </el-option>
-              </el-select>
-            </div>
-          </div>
-        </li>
         <li class="flex-h">
           <span>卡有效时间：</span>
           <div class="flex-item">
             <div>
               <div class="addLine flex-h" style="align-item:center;margin-bottom:20px;">
-                <!-- <el-date-picker
+                <el-date-picker
                   v-model="cardInfo.StartDate"
                   type="date"
-                  placeholder="选择起始日期">
+                  placeholder="选择起始日期"
+                  :disabled="disabled">
                 </el-date-picker>
                 <span style="line-height:40px;">至</span>
                 <el-date-picker
                   v-model="cardInfo.EndDate"
                   type="date"
-                  placeholder="选择截止日期">
-                </el-date-picker> -->
-                <el-date-picker
-                  v-model="date"
-                  type="daterange"
-                  range-separator="至"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                  :picker-options="pickerOptions">
+                  placeholder="选择截止日期"
+                  :disabled="disabled">
                 </el-date-picker>
               </div>
             </div>
           </div>
         </li>
-        <li class="flex-h">
-          <span>视频：</span>
-          <div class="flex-item">
-            <div style="vertical-align: middle;">
-              <a style="line-height: 40px;" v-if="videoOff" :href="cardInfo.VideoUrl" target="blank">{{cardInfo.VideoUrl}}</a>
-              <el-upload
-                class="avatar-uploader"
-                :action='$api.file.image.url'
-                :show-file-list="false"
-                :on-success="videoSuccess">
-                <a style="line-height: 40px;padding: 0 10px;">{{videoOff ? '更换' : '添加'}}视频</a>
-              </el-upload>
-              <el-button v-if="videoOff" type="danger" @click="deleteVideo">删除视频</el-button>
-            </div>
-          </div>
-        </li>
         <li class="flex-h">
           <span>分享描述：</span>
           <div class="flex-item">
@@ -161,7 +143,7 @@
                 type="textarea"
                 :rows="2"
                 placeholder="请输入"
-                v-model="cardInfo.Share.CardShareInfo">
+                v-model="cardInfo.CardShareInfo">
               </el-input>
             </div>
           </div>
@@ -174,7 +156,7 @@
                 type="textarea"
                 :rows="2"
                 placeholder="请输入"
-                v-model="cardInfo.Share.CardUseRule">
+                v-model="cardInfo.CardUseRule">
               </el-input>
             </div>
           </div>
@@ -187,7 +169,7 @@
                 type="textarea"
                 :rows="2"
                 placeholder="请输入"
-                v-model="cardInfo.Share.CardUseInstruction">
+                v-model="cardInfo.CardUseInstruction">
               </el-input>
             </div>
           </div>
@@ -203,51 +185,52 @@
 
 <script>
 import { mapState, createNamespacedHelpers } from 'vuex'
-const { mapActions: mapCardActions } = createNamespacedHelpers('card')
+const { mapActions: mapGymCardActions } = createNamespacedHelpers('gymcard')
 const { mapState: mapChannelState, mapActions: mapChannelActions } = createNamespacedHelpers('channel')
-const { mapActions: mapCourseActions } = createNamespacedHelpers('course')
 
 export default {
   name: '',
   data () {
     return {
+      disabled: false,
       date: '',
       courseList: [],
       videoOff: false,
       total: 0,
       type: this.$route.query.type,
       isEdit: this.$route.query.id === undefined ? 0 : 1,
+      GymTypeList: [{ // 卡类型
+        id: 'once',
+        name: '次卡'
+      }, {
+        id: 'month',
+        name: '月卡'
+      }, {
+        id: 'quarter',
+        name: '季卡'
+      }, {
+        id: 'year',
+        name: '年卡'
+      }],
       ChannelList: [], // 渠道列表
       TypeList: [], // 类型列表
       GoodsList: [], // 商品列表
-      currentList: [{
-        Name: 'ccc',
-        Type: 'xxx'
-      }], // 指定商品数据
       cardInfo: {
-        CardName: '',
+        GymCardId: '',
+        CardImageUrl: '',
+        GymCardName: '',
+        GymTypeId: '',
+        Price: '',
+        TotalCount: '',
         SendType: '',
-        VideoUrl: '',
-        Price: ' ',
+        ChannelId: '',
         StartDate: '',
         EndDate: '',
-        TotalCount: '',
+        CardShareInfo: '',
+        CardUseRule: '',
+        CardUseInstruction: '',
         CaseId: '',
-        OrgId: '',
-        Share: {
-          CardShareInfo: '',
-          CardUseRule: '',
-          CardUseInstruction: ''
-        },
-        Images: [{
-          CardImageUrl: ''
-        }],
-        Targets: [{
-          TargetType: '',
-          TargetId: '',
-          TargetName: ''
-        }],
-        ChannelId: ''
+        OrgId: ''
       },
       postData: {
         page: 1,
@@ -262,32 +245,15 @@ export default {
         page: 1,
         pagesize: 10000
       }).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]
-              }
-            })
-          }
-        })
+        if (this.$route.query.id) {
+          this.disabled = true
+          this.getGymCardById({
+            id: this.$route.query.id
+          }).then((res) => {
+            // console.log(JSON.stringify(res.Card))
+            this.cardInfo = res
+          })
+        }
       })
     })
   },
@@ -300,17 +266,6 @@ export default {
       defaultCaseId: x => x.app.cases.default,
       OrgId: x => x.app.user.OrgId,
     }),
-    pickerOptions () {
-      const courseId = this.cardInfo.Targets[0].TargetId
-      const couse = (this.courseList || []).filter(x => x.CourseId === courseId)[0] || {}
-      const beginDate = new Date(couse.BeginDate).getTime()
-      const endDate = new Date(couse.EndDate).getTime()
-      return {
-        disabledDate (time) {
-          return time.getTime() < beginDate || time.getTime() > endDate
-        }
-      }
-    },
     CaseId: {
       get () {
         return this.postData.caseid || this.defaultCaseId
@@ -321,13 +276,10 @@ export default {
     }
   },
   methods: {
-    ...mapCardActions([
-      'addCard',
-      'getCardById',
-      'editCard',
-    ]),
-    ...mapCourseActions([
-      'GetCourseList',
+    ...mapGymCardActions([
+      'addGymCard',
+      'getGymCardById',
+      'editGymCard',
     ]),
     ...mapChannelActions([
       'GetChannelListList',
@@ -338,82 +290,39 @@ export default {
         page: 1,
         pagesize: 10000
       })
-      this.GetCourseList({
-        caseid: this.cardInfo.CaseId,
-        page: 1,
-        pagesize: 10000
-      }).then((res) => {
-        this.courseList = res.list
-      })
-      this.cardInfo.Targets = [{
-        TargetType: '',
-        TargetId: '',
-        TargetName: ''
-      }]
       this.cardInfo.ChannelId = ''
     },
-    deleteVideo () { // 删除视频
-      this.cardInfo.VideoUrl = ''
-      this.videoOff = false
-    },
-    videoSuccess (res, file) {
-      this.videoOff = true
-      this.cardInfo.VideoUrl = res.result.url
-    },
-    addGoods () { // 添加指定商品
-      this.centerDialogVisible = true
-    },
     submit () { // 保存
       if (this.$route.query.id) {
-        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.editGymCard(this.cardInfo).then((res) => {
           this.$alert('操作成功', '提示', {
             confirmButtonText: '确定',
             callback: action => {
-              this.$router.push({ name: 'cardList' })
+              this.$router.push({ name: 'bodyBuildingCardManager' })
             }
           })
         })
       } 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(this.cardInfo).then((res) => {
+        this.addGymCard(this.cardInfo).then((res) => {
           this.$alert('操作成功', '提示', {
             confirmButtonText: '确定',
             callback: action => {
-              this.$router.push({ name: 'cardList' })
+              this.$router.push({ name: 'bodyBuildingCardManager' })
             }
           })
         })
       }
     },
     cancel () { // 取消
-      this.$router.push({ name: 'couponList' })
+      this.$router.push({ name: 'bodyBuildingCardManager' })
     },
     handleAvatarSuccess (res, file) {
-      this.cardInfo.Images[0].CardImageUrl = res.result.url
+      this.cardInfo.CardImageUrl = res.result.url
     },
   }
 }

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

@@ -25,17 +25,13 @@
     </div>
     <div class="system-table-box">
       <el-table
-        :data="cardList.list"
+        :data="gymCardList.list"
         stripe
         style="width: 100%">
         <el-table-column
-          prop="CardName"
+          prop="GymCardName"
           label="卡名称">
         </el-table-column>
-        <!-- <el-table-column
-          prop="xxx"
-          label="卡类型">
-        </el-table-column> -->
         <el-table-column
           prop="Price"
           label="卡价格">
@@ -53,6 +49,9 @@
         <el-table-column
           prop="SendType"
           label="发放类型">
+          <template slot-scope="scope">
+            {{scope.row.SendType === 'channel' ? '渠道' : scope.row.SendType === 'system' ? '系统' : '案场'}}
+          </template>
         </el-table-column>
         <el-table-column
           prop="TotalCount"
@@ -214,7 +213,7 @@
 <script>
 import Clipboard from 'clipboard'
 import { mapState, createNamespacedHelpers } from 'vuex'
-const { mapState: mapCardState, mapActions: mapCardActions } = createNamespacedHelpers('card')
+const { mapState: mapGymCardState, mapActions: mapGymCardActions } = createNamespacedHelpers('gymcard')
 const { mapState: mapCustomerState, mapActions: mapCustomerActions } = createNamespacedHelpers('customer')
 
 export default {
@@ -250,8 +249,8 @@ export default {
     })
   },
   computed: {
-    ...mapCardState({
-      cardList: x => x.cardList,
+    ...mapGymCardState({
+      gymCardList: x => x.gymCardList,
     }),
     ...mapState({
       cases: x => x.app.cases.list,
@@ -270,9 +269,8 @@ export default {
     }
   },
   methods: {
-    ...mapCardActions([
-      'GetCardList',
-      'giveCard',
+    ...mapGymCardActions([
+      'getGymCardList',
     ]),
     ...mapCustomerActions([
       'GetCustomerList',
@@ -333,7 +331,7 @@ export default {
       this.getList()
     },
     getList () { // 获取列表
-      this.GetCardList({
+      this.getGymCardList({
         ...this.postData,
         caseid: this.CaseId || this.defaultCaseId
       }).then((res) => {
@@ -345,12 +343,8 @@ export default {
       this.getList()
     },
     handleEdit (index, row) { // 编辑
-      this.$router.push({ name: 'editCard', query: { id: row.CardId } })
+      this.$router.push({ name: 'editBodyBuildingCard', query: { id: row.GymCardId } })
     },
-    // handleCopy (url) { // 复制弹窗
-    //   this.currentCopyUrl = url
-    //   this.copyDialogVisible = true
-    // },
     toCopy (index, row) { // 复制
       console.log(1)
       var clipboard = new Clipboard(this.$refs['copy' + index])
@@ -364,7 +358,7 @@ export default {
       })
     },
     addCard () {
-      this.$router.push({ name: 'editCard', query: {} })
+      this.$router.push({ name: 'editBodyBuildingCard', query: {} })
     }
   }
 }

src/store/card/gymCard.js

@@ -0,0 +1,78 @@
+import ajax from '../../util/ajax'
+import api from '../../util/api'
+
+export default {
+  namespaced: true,
+  state: {
+    gymCardList: [],
+  },
+  mutations: {
+    updateList (state, payload) {
+      state.gymCardList = payload || []
+    },
+  },
+  actions: {
+    getGymCardList ({ commit }, payload) { // 获取卡列表
+      return new Promise((resolve, reject) => {
+        ajax(api.gymCardManager.gymCardList.url, {
+          method: api.gymCardManager.gymCardList.method,
+          queryData: {
+            ...payload,
+          }
+        }).then(res => {
+          commit('updateList', res)
+          resolve(res)
+        }).catch(reject)
+      })
+    },
+    addGymCard ({ commit }, payload) { // 新增卡
+      return new Promise((resolve, reject) => {
+        ajax(api.gymCardManager.addGymCard.url, {
+          method: api.gymCardManager.addGymCard.method,
+          data: {
+            info: JSON.stringify(payload)
+          }
+        }).then(res => {
+          resolve(res)
+        }).catch(reject)
+      })
+    },
+    getGymCardById ({ commit }, { id }) { // 获取卡详情
+      return new Promise((resolve, reject) => {
+        ajax(api.gymCardManager.getGymCardById.url, {
+          method: api.gymCardManager.getGymCardById.method,
+          urlData: {
+            id,
+          }
+        }).then(res => {
+          resolve(res)
+        }).catch(reject)
+      })
+    },
+    editGymCard ({ commit }, payload) { // 编辑更新卡
+      return new Promise((resolve, reject) => {
+        ajax(api.gymCardManager.editGymCard.url, {
+          method: api.gymCardManager.editGymCard.method,
+          data: {
+            info: JSON.stringify(payload)
+          },
+        }).then(res => {
+          resolve(res)
+        }).catch(reject)
+      })
+    },
+    // giveCard ({ commit }, { id, users }) {
+    //   return new Promise((resolve, reject) => {
+    //     ajax(api.cardManager.giveCard.url, {
+    //       method: api.cardManager.giveCard.method,
+    //       urlData: {
+    //         id,
+    //         users
+    //       },
+    //     }).then(res => {
+    //       resolve(res)
+    //     }).catch(reject)
+    //   })
+    // }
+  }
+}

src/store/index.js

@@ -26,6 +26,7 @@ export const modules = {
   cmscase: () => require('./cms/case').default,
   caserecord: () => require('./case/record').default,
   vip: () => require('./card/vip').default,
+  gymcard: () => require('./card/gymCard').default,
   card: () => require('./card/card').default,
   coupon: () => require('./coupon/coupon').default,
   channel: () => require('./channel/channel').default,

src/util/api.js

@@ -632,6 +632,24 @@ const $api = {
       url: `${baseUrl}${common}/coupon/:id/to/:users`
     },
   },
+  gymCardManager: {
+    gymCardList: {
+      method: 'get',
+      url: `${baseUrl}${common}/gymcard`
+    },
+    addGymCard: {
+      method: 'post',
+      url: `${baseUrl}${common}/gymcard`
+    },
+    editGymCard: {
+      method: 'put',
+      url: `${baseUrl}${common}/gymcard`
+    },
+    getGymCardById: {
+      method: 'get',
+      url: `${baseUrl}${common}/gymcard/:id`
+    }
+  },
   customerManager: {
     getByTel: {
       method: 'get',