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

config/index.js

@@ -12,7 +12,8 @@ module.exports = {
     proxyTable: {
       '/api': {
         // target: 'https://dp.huiju360.com.cn/hj_operations',
-        target: 'http://192.168.0.62:8080', //wf
+        // target: 'http://192.168.0.62:8080', //wf
+        target: 'http://localhost:8080', 
         // target: 'http://192.168.0.11', //ys
         // target: 'http://dev.ycjcjy.com/', //frp
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置

package.json

@@ -17,6 +17,7 @@
   "dependencies": {
     "@antv/g2": "^3.2.7",
     "axios": "^0.18.0",
+    "clipboard": "^2.0.1",
     "element-ui": "^2.4.5",
     "g2-vue": "^1.0.1",
     "js-base64": "^2.4.8",

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

@@ -0,0 +1,432 @@
+<template>
+  <div class="subPage">
+    <form class="mainForm">
+      <ul>
+        <li class="flex-h">
+          <span>选择案场：</span>
+          <div class="flex-item">
+            <div style="width:50%">
+              <el-select v-model="cardInfo.CaseId" placeholder="请选择" @change="caseChange">
+                <el-option
+                  v-for="item in cases"
+                  :key="item.CaseId"
+                  :label="item.CaseName"
+                  :value="item.CaseId">
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+        </li>
+        <li class="flex-h">
+          <span>卡图片：</span>
+          <div class="flex-item">
+            <div>
+              <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>
+              </el-upload>
+            </div>
+          </div>
+        </li>
+        <li class="flex-h">
+          <span>卡名称：</span>
+          <div class="flex-item">
+            <div style="width:200px;">
+              <el-input
+                placeholder="请输入"
+                v-model="cardInfo.CardName"
+                clearable>
+              </el-input>
+            </div>
+          </div>
+        </li>
+        <li class="flex-h">
+          <span>卡价格：</span>
+          <div class="flex-item">
+            <div style="width:200px;">
+              <el-input
+                placeholder="请输入"
+                v-model="cardInfo.Price"
+                clearable>
+              </el-input>
+            </div>
+          </div>
+        </li>
+        <li class="flex-h">
+          <span>总张数：</span>
+          <div class="flex-item">
+            <div style="width:200px;">
+              <el-input
+                placeholder="请输入"
+                v-model="cardInfo.TotalCount"
+                clearable>
+              </el-input>
+            </div>
+          </div>
+        </li>
+        <li class="flex-h">
+          <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>
+            </div>
+          </div>
+        </li>
+        <li class="flex-h" v-if="cardInfo.SendType === 'channel'">
+          <span>选择渠道：</span>
+          <div class="flex-item">
+            <div style="width:50%">
+              <el-select v-model="cardInfo.ChannelId" placeholder="请选择">
+                <el-option
+                  v-for="item in channelList"
+                  :key="item.ChannelId"
+                  :label="item.ChannelName"
+                  :value="item.ChannelId">
+                </el-option>
+              </el-select>
+            </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
+                  v-model="cardInfo.StartDate"
+                  type="date"
+                  placeholder="选择起始日期">
+                </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">
+                </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">
+            <div>
+              <el-input
+                type="textarea"
+                :rows="2"
+                placeholder="请输入"
+                v-model="cardInfo.Share.CardShareInfo">
+              </el-input>
+            </div>
+          </div>
+        </li>
+        <li class="flex-h">
+          <span>规则描述：</span>
+          <div class="flex-item">
+            <div>
+              <el-input
+                type="textarea"
+                :rows="2"
+                placeholder="请输入"
+                v-model="cardInfo.Share.CardUseRule">
+              </el-input>
+            </div>
+          </div>
+        </li>
+        <li class="flex-h">
+          <span>使用说明：</span>
+          <div class="flex-item">
+            <div>
+              <el-input
+                type="textarea"
+                :rows="2"
+                placeholder="请输入"
+                v-model="cardInfo.Share.CardUseInstruction">
+              </el-input>
+            </div>
+          </div>
+        </li>
+        <li style="text-align:center">
+          <el-button type="primary" size="mini" @click="submit">保存</el-button>
+          <el-button type="danger" size="mini" @click="cancel">取消</el-button>
+        </li>
+      </ul>
+    </form>
+  </div>
+</template>
+
+<script>
+import { mapState, createNamespacedHelpers } from 'vuex'
+const { mapActions: mapCardActions } = createNamespacedHelpers('card')
+const { mapState: mapChannelState, mapActions: mapChannelActions } = createNamespacedHelpers('channel')
+const { mapActions: mapCourseActions } = createNamespacedHelpers('course')
+
+export default {
+  name: '',
+  data () {
+    return {
+      date: '',
+      courseList: [],
+      videoOff: false,
+      total: 0,
+      type: this.$route.query.type,
+      isEdit: this.$route.query.id === undefined ? 0 : 1,
+      ChannelList: [], // 渠道列表
+      TypeList: [], // 类型列表
+      GoodsList: [], // 商品列表
+      currentList: [{
+        Name: 'ccc',
+        Type: 'xxx'
+      }], // 指定商品数据
+      cardInfo: {
+        CardName: '',
+        SendType: '',
+        VideoUrl: '',
+        Price: ' ',
+        StartDate: '',
+        EndDate: '',
+        TotalCount: '',
+        CaseId: '',
+        OrgId: '',
+        Share: {
+          CardShareInfo: '',
+          CardUseRule: '',
+          CardUseInstruction: ''
+        },
+        Images: [{
+          CardImageUrl: ''
+        }],
+        Targets: [{
+          TargetType: '',
+          TargetId: '',
+          TargetName: ''
+        }],
+        ChannelId: ''
+      },
+      postData: {
+        page: 1,
+        pagesize: 10,
+      },
+    }
+  },
+  mounted () {
+    this.$nextTick(function () {
+      this.GetChannelListList({
+        caseid: this.defaultCaseId,
+        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]
+              }
+            })
+          }
+        })
+      })
+    })
+  },
+  computed: {
+    ...mapChannelState({
+      channelList: x => x.channelList,
+    }),
+    ...mapState({
+      cases: x => x.app.cases.list,
+      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
+      },
+      set (val) {
+        this.postData.caseid = val
+      }
+    }
+  },
+  methods: {
+    ...mapCardActions([
+      'addCard',
+      'getCardById',
+      'editCard',
+    ]),
+    ...mapCourseActions([
+      'GetCourseList',
+    ]),
+    ...mapChannelActions([
+      'GetChannelListList',
+    ]),
+    caseChange () { // 选择案场
+      this.GetChannelListList({
+        caseid: this.cardInfo.CaseId,
+        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.$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(this.cardInfo).then((res) => {
+          this.$alert('操作成功', '提示', {
+            confirmButtonText: '确定',
+            callback: action => {
+              this.$router.push({ name: 'cardList' })
+            }
+          })
+        })
+      }
+    },
+    cancel () { // 取消
+      this.$router.push({ name: 'couponList' })
+    },
+    handleAvatarSuccess (res, file) {
+      this.cardInfo.Images[0].CardImageUrl = res.result.url
+    },
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+.addLine {
+  > * {
+    margin-right: 10px;
+  }
+}
+.mainForm > ul > li > div > div > button {
+  margin-top: 0;
+}
+</style>

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

@@ -0,0 +1,398 @@
+<template>
+  <div class="subPage">
+    <div class="system-table-search">
+      <div class="flex-h">
+        <div class="flex-item flex-h">
+          <el-button size="mini" type="success" @click="addCard">新增健身卡</el-button>
+        </div>
+        <ul>
+          <li>
+            <el-select v-model="CaseId" placeholder="请选择案场">
+              <el-option
+                v-for="item in cases"
+                :key="item.CaseId"
+                :label="item.CaseName"
+                :value="item.CaseId">
+              </el-option>
+            </el-select>
+          </li>
+        </ul>
+        <el-button
+          size="mini"
+          type="primary" @click="search">搜索</el-button>
+      </div>
+      <div class="moreFilter"></div>
+    </div>
+    <div class="system-table-box">
+      <el-table
+        :data="cardList.list"
+        stripe
+        style="width: 100%">
+        <el-table-column
+          prop="CardName"
+          label="卡名称">
+        </el-table-column>
+        <!-- <el-table-column
+          prop="xxx"
+          label="卡类型">
+        </el-table-column> -->
+        <el-table-column
+          prop="Price"
+          label="卡价格">
+        </el-table-column>
+        <el-table-column
+          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="SendType"
+          label="发放类型">
+        </el-table-column>
+        <el-table-column
+          prop="TotalCount"
+          label="总数量">
+        </el-table-column>
+        <el-table-column
+          prop="SentCount"
+          label="已发">
+        </el-table-column>
+        <el-table-column
+          prop="UsedCount"
+          label="实际使用">
+        </el-table-column>
+        <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">
+            <el-button
+              size="mini"
+              type="warning"
+              @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+            <el-button
+              size="mini"
+              type="danger"
+              @click="sendCard(scope.$index, scope.row)">赠送客户</el-button>
+            <a class="copyBtn" :data-clipboard-text="'www.baidu.com'" :ref="'copy' + scope.$index" @click="toCopy(scope.$index, scope.row)">点击复制链接</a>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <el-pagination
+      @current-change="handleCurrentChange"
+      :current-page.sync="postData.page"
+      :page-size="postData.pagesize"
+      layout="prev, pager, next, jumper"
+      :total="total">
+    </el-pagination>
+    <el-dialog
+      title="选择赠送客户"
+      :visible.sync="centerDialogVisible"
+      width="800px"
+      center>
+      <div>
+        <ul class="dialogSearchList flex-h" style="margin-bottom:10px;">
+          <li class="flex-item">
+            <el-input
+              placeholder="请输入用户名"
+              v-model="dialogPostData.username"
+              clearable>
+            </el-input>
+          </li>
+          <li class="flex-item">
+            <el-input
+              placeholder="请输入手机号"
+              v-model="dialogPostData.phone"
+              clearable>
+            </el-input>
+          </li>
+          <li class="flex-item">
+            <el-input
+              placeholder="请输入推荐人"
+              v-model="dialogPostData.recommendname"
+              clearable>
+            </el-input>
+          </li>
+          <li>
+            <el-button type="primary" @click="dialogSearch">搜索</el-button>
+          </li>
+        </ul>
+        <ul class="dialogSearchList flex-h">
+          <li class="flex-item">
+            <el-date-picker
+              v-model="dialogPostData.begindate"
+              type="date"
+              placeholder="选择起始日期">
+            </el-date-picker>
+            <el-date-picker
+              v-model="dialogPostData.enddate"
+              type="date"
+              placeholder="选择截止日期">
+            </el-date-picker>
+          </li>
+        </ul>
+      </div>
+      <div>
+        <el-table
+          ref="multipleTable"
+          :data="customers.list"
+          tooltip-effect="dark"
+          style="width: 100%"
+          @selection-change="handleSelectionChange">
+          <el-table-column
+            type="selection">
+          </el-table-column>
+          <el-table-column
+            prop="Name"
+            label="姓名">
+          </el-table-column>
+          <el-table-column
+            prop="CustomerName"
+            label="微信昵称">
+          </el-table-column>
+          <el-table-column
+            prop="Phone"
+            label="手机号">
+          </el-table-column>
+          <el-table-column
+            prop="CreatDate"
+            label="创建时间">
+            <template slot-scope="scope">
+              <span>{{toolClass.dateFormat(scope.row.CreateDate, 'yyyy-MM-dd')}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="RecommendName"
+            label="推荐人">
+          </el-table-column>
+        </el-table>
+      </div>
+      <div>
+        <el-pagination
+          @current-change="handleCurrentChangeDialog"
+          :current-page.sync="dialogPostData.page"
+          :page-size="dialogPostData.pagesize"
+          layout="prev, pager, next, jumper"
+          :total="dialogTotal">
+        </el-pagination>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="closeDialog">取 消</el-button>
+        <el-button type="primary" @click="toSendCard">确 定</el-button>
+      </span>
+    </el-dialog>
+    <el-dialog
+      title="手动复制"
+      :visible.sync="copyDialogVisible"
+      width="300px"
+      center>
+      <div>
+        <el-input
+          placeholder="请输入内容"
+          v-model="currentCopyUrl"
+          clearable>
+        </el-input>
+        <!-- <a :data-clipboard-text="currentCopyUrl" ref="copy" @click="toCopy">复制链接</a> -->
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="copyDialogVisible = false">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import Clipboard from 'clipboard'
+import { mapState, createNamespacedHelpers } from 'vuex'
+const { mapState: mapCardState, mapActions: mapCardActions } = createNamespacedHelpers('card')
+const { mapState: mapCustomerState, mapActions: mapCustomerActions } = createNamespacedHelpers('customer')
+
+export default {
+  name: '',
+  data () {
+    return {
+      currentCopyUrl: '',
+      copyDialogVisible: false,
+      selectCustomer: [],
+      dialogTotal: 0,
+      dialogPostData: {
+        username: '',
+        phone: '',
+        recommendname: '',
+        begindate: '',
+        enddate: '',
+        page: 1, // 当前页码
+        pagesize: 10, // 请求数据量
+      },
+      customerList: [],
+      centerDialogVisible: false,
+      total: 0,
+      postData: { // 表格搜索条件
+        caseid: '', // 案场id
+        page: 1, // 当前页码
+        pagesize: 10, // 请求数据量
+      },
+    }
+  },
+  mounted () {
+    this.$nextTick(function () {
+      this.getList()
+    })
+  },
+  computed: {
+    ...mapCardState({
+      cardList: x => x.cardList,
+    }),
+    ...mapState({
+      cases: x => x.app.cases.list,
+      defaultCaseId: x => x.app.cases.default
+    }),
+    ...mapCustomerState({
+      customers: x => x.customers,
+    }),
+    CaseId: {
+      get () {
+        return this.postData.caseid || this.defaultCaseId
+      },
+      set (val) {
+        this.postData.caseid = val
+      }
+    }
+  },
+  methods: {
+    ...mapCardActions([
+      'GetCardList',
+      'giveCard',
+    ]),
+    ...mapCustomerActions([
+      'GetCustomerList',
+      'SetCustomerListNull',
+    ]),
+    toSendHistory () { // 查看赠送记录
+      this.$router.push({ name: 'givingRecords' })
+    },
+    dialogSearch () { // 赠送客户搜索
+      this.GetCustomerList(this.dialogPostData)
+    },
+    handleCurrentChangeDialog (val) {
+      this.dialogPostData.page = val
+      this.GetCustomerList(this.dialogPostData)
+    },
+    handleSelectionChange (val) {
+      // console.log(val)
+      this.selectCustomer = val
+    },
+    toSendCard () { // 赠送卡
+      if (this.selectCustomer.length) {
+        this.selectCustomer = this.selectCustomer.map(x => x.CustomerId).join(',')
+        this.giveCard({
+          id: this.currentCardId,
+          users: this.selectCustomer,
+        }).then(res => {
+          this.$message({
+            type: 'success',
+            message: '赠送成功！'
+          })
+          this.centerDialogVisible = false
+          this.selectCustomer = []
+          if (this.customers.list.length) {
+            this.customers.list = []
+          }
+          this.getList()
+        })
+      } else {
+        this.$message({
+          type: 'error',
+          message: '请先选择需要赠送的客户!'
+        })
+      }
+    },
+    closeDialog () { // 关闭弹窗
+      this.centerDialogVisible = false
+      if (this.customers.list.length) {
+        this.customers.list = []
+      }
+    },
+    sendCard (index, row) { // 赠送卡弹窗
+      this.currentCardId = row.CardId
+      this.centerDialogVisible = true
+    },
+    search () { // 搜索
+      this.postData.page = 1
+      this.currentList = []
+      this.getList()
+    },
+    getList () { // 获取列表
+      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: 'editCard', query: { id: row.CardId } })
+    },
+    // handleCopy (url) { // 复制弹窗
+    //   this.currentCopyUrl = url
+    //   this.copyDialogVisible = true
+    // },
+    toCopy (index, row) { // 复制
+      console.log(1)
+      var clipboard = new Clipboard(this.$refs['copy' + index])
+      clipboard.on('success', e => {
+        console.log('复制成功')
+        clipboard.destroy()
+      })
+      clipboard.on('error', e => {
+        console.log('该浏览器不支持自动复制')
+        clipboard.destroy()
+      })
+    },
+    addCard () {
+      this.$router.push({ name: 'editCard', query: {} })
+    }
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+@import "page.scss";
+.dialogSearchList {
+  align-items: center;
+  > li {
+    font-size: 0;
+    margin-left: 10px;
+    &:first-child {
+      margin-left: 0;
+    }
+    > *:nth-child(2) {
+      margin-left: 10px;
+    }
+  }
+}
+.copyBtn{
+  line-height: 29px;
+  border-radius: 3px;
+  color: #fff;
+  background: #67c23a;
+  display: inline-block;
+  padding: 0 15px;
+  margin-left: 10px;
+}
+</style>

src/pages/system/cardAndCouponManager/bodyBuildingCardManager/page.scss

@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

@@ -1,13 +1,12 @@
 <template>
   <div class="subPage">
     <form class="mainForm">
-      <h1 style="font-size:22px;">{{isEdit === 0 ? '新建' : '编辑'}}{{type === 'course' ? '课程体验卡' : '健身卡'}}</h1>
       <ul>
         <li class="flex-h">
           <span>选择案场：</span>
           <div class="flex-item">
             <div style="width:50%">
-              <el-select v-model="postData.CaseId" placeholder="请选择">
+              <el-select v-model="cardInfo.CaseId" placeholder="请选择" @change="caseChange">
                 <el-option
                   v-for="item in cases"
                   :key="item.CaseId"
@@ -27,7 +26,7 @@
                 :action='$api.file.image.url'
                 :show-file-list="false"
                 :on-success="handleAvatarSuccess">
-                <img v-if="postData.Img" :src="postData.Img" 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>
@@ -39,34 +38,19 @@
             <div style="width:200px;">
               <el-input
                 placeholder="请输入"
-                v-model="postData.Name"
+                v-model="cardInfo.CardName"
                 clearable>
               </el-input>
             </div>
           </div>
         </li>
-        <li class="flex-h">
-          <span>卡类型：</span>
-          <div class="flex-item">
-            <div style="width:50%">
-              <el-select v-model="postData.Type" placeholder="请选择">
-                <el-option
-                  v-for="item in TypeList"
-                  :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">
             <div style="width:200px;">
               <el-input
                 placeholder="请输入"
-                v-model="postData.Price"
+                v-model="cardInfo.Price"
                 clearable>
               </el-input>
             </div>
@@ -78,7 +62,7 @@
             <div style="width:200px;">
               <el-input
                 placeholder="请输入"
-                v-model="postData.TotalNum"
+                v-model="cardInfo.TotalCount"
                 clearable>
               </el-input>
             </div>
@@ -88,126 +72,85 @@
           <span>发送类型：</span>
           <div class="flex-item">
             <div>
-              <el-radio v-model="postData.SendType" label="1">渠道</el-radio>
-              <el-radio v-model="postData.SendType" label="3">案场</el-radio>
-              <el-radio v-model="postData.SendType" label="2">系统</el-radio>
+              <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>
             </div>
           </div>
         </li>
-        <li class="flex-h" v-if="type === 'bodybuilding'">
+        <li class="flex-h" v-if="cardInfo.SendType === 'channel'">
           <span>选择渠道：</span>
           <div class="flex-item">
             <div style="width:50%">
-              <el-select v-model="postData.ChannelId" placeholder="请选择">
+              <el-select v-model="cardInfo.ChannelId" placeholder="请选择">
                 <el-option
-                  v-for="item in ChannelList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id">
+                  v-for="item in channelList"
+                  :key="item.ChannelId"
+                  :label="item.ChannelName"
+                  :value="item.ChannelId">
                 </el-option>
               </el-select>
             </div>
           </div>
         </li>
-        <li class="flex-h" v-if="type === 'course'">
-          <span>目标商品：</span>
+        <li class="flex-h">
+          <span>目标课程：</span>
           <div class="flex-item">
             <div>
-              <el-select v-model="postData.GoodsId" placeholder="请选择">
+              <el-select v-model="cardInfo.Targets[0].TargetId" placeholder="请选择">
                 <el-option
-                  v-for="item in GoodsList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id">
+                  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" v-if="postData.Assign === '2'">
-          <div class="flex-item">
-            <div style="border: 1px solid #eee;">
-              <el-table
-                :data="currentList"
-                stripe
-                style="width: 100%">
-                <el-table-column
-                  prop="Name"
-                  label="商品">
-                </el-table-column>
-                <el-table-column
-                  prop="Type"
-                  label="分类">
-                </el-table-column>
-                <el-table-column label="操作">
-                  <template slot-scope="scope">
-                    <el-button
-                      size="mini"
-                      type="warning"
-                      @click="deleteGoodsItem(scope.$index, scope.row)">删除</el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
-              <div style="text-align:center;padding:10px 0;">
-                <el-button type="success" size="mini" @click="addGoods">添加商品</el-button>
-              </div>
-            </div>
-          </div>
-        </li>
-        <li class="flex-h" v-if="type === 'drink'">
+        <li class="flex-h">
           <span>卡有效时间：</span>
           <div class="flex-item">
             <div>
               <div class="addLine flex-h" style="align-item:center;margin-bottom:20px;">
-                <el-radio v-model="postData.TimeType" label="1">固定时间</el-radio>
-                <el-date-picker
-                  v-model="postData.StartDate"
+                <!-- <el-date-picker
+                  v-model="cardInfo.StartDate"
                   type="date"
                   placeholder="选择起始日期">
                 </el-date-picker>
                 <span style="line-height:40px;">至</span>
                 <el-date-picker
-                  v-model="postData.EndDate"
+                  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">
                 </el-date-picker>
               </div>
-              <div class="addLine flex-h" style="align-item:center;">
-                <el-radio v-model="postData.TimeType" label="2">领取后</el-radio>
-                <span style="width:100px;">
-                  <el-input
-                    placeholder="请输入"
-                    v-model="postData.Days"
-                    clearable>
-                  </el-input>
-                </span>
-                <span style="line-height:40px;">天</span>
-              </div>
-            </div>
-          </div>
-        </li>
-        <li class="flex-h" v-if="type === 'course'">
-          <span>卡有效时间：</span>
-          <div class="flex-item">
-            <div>
-              <el-date-picker
-                v-model="postData.StartDate"
-                type="date"
-                placeholder="选择起始日期">
-              </el-date-picker>
-              <span style="line-height:40px;">至</span>
-              <el-date-picker
-                v-model="postData.EndDate"
-                type="date"
-                placeholder="选择截止日期">
-              </el-date-picker>
             </div>
           </div>
         </li>
         <li class="flex-h">
           <span>视频：</span>
           <div class="flex-item">
-            <div></div>
+            <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">
@@ -218,7 +161,7 @@
                 type="textarea"
                 :rows="2"
                 placeholder="请输入"
-                v-model="postData.ShareDesc">
+                v-model="cardInfo.Share.CardShareInfo">
               </el-input>
             </div>
           </div>
@@ -231,7 +174,7 @@
                 type="textarea"
                 :rows="2"
                 placeholder="请输入"
-                v-model="postData.RuleDesc">
+                v-model="cardInfo.Share.CardUseRule">
               </el-input>
             </div>
           </div>
@@ -244,7 +187,7 @@
                 type="textarea"
                 :rows="2"
                 placeholder="请输入"
-                v-model="postData.UsedDesc">
+                v-model="cardInfo.Share.CardUseInstruction">
               </el-input>
             </div>
           </div>
@@ -259,12 +202,18 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapState, createNamespacedHelpers } from 'vuex'
+const { mapActions: mapCardActions } = createNamespacedHelpers('card')
+const { mapState: mapChannelState, mapActions: mapChannelActions } = createNamespacedHelpers('channel')
+const { mapActions: mapCourseActions } = createNamespacedHelpers('course')
 
 export default {
   name: '',
   data () {
     return {
+      date: '',
+      courseList: [],
+      videoOff: false,
       total: 0,
       type: this.$route.query.type,
       isEdit: this.$route.query.id === undefined ? 0 : 1,
@@ -275,6 +224,31 @@ export default {
         Name: 'ccc',
         Type: 'xxx'
       }], // 指定商品数据
+      cardInfo: {
+        CardName: '',
+        SendType: '',
+        VideoUrl: '',
+        Price: ' ',
+        StartDate: '',
+        EndDate: '',
+        TotalCount: '',
+        CaseId: '',
+        OrgId: '',
+        Share: {
+          CardShareInfo: '',
+          CardUseRule: '',
+          CardUseInstruction: ''
+        },
+        Images: [{
+          CardImageUrl: ''
+        }],
+        Targets: [{
+          TargetType: '',
+          TargetId: '',
+          TargetName: ''
+        }],
+        ChannelId: ''
+      },
       postData: {
         page: 1,
         pagesize: 10,
@@ -282,13 +256,61 @@ export default {
     }
   },
   mounted () {
-    this.$nextTick(function () { })
+    this.$nextTick(function () {
+      this.GetChannelListList({
+        caseid: this.defaultCaseId,
+        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]
+              }
+            })
+          }
+        })
+      })
+    })
   },
   computed: {
+    ...mapChannelState({
+      channelList: x => x.channelList,
+    }),
     ...mapState({
       cases: x => x.app.cases.list,
-      defaultCaseId: x => x.app.cases.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
@@ -299,20 +321,99 @@ export default {
     }
   },
   methods: {
+    ...mapCardActions([
+      'addCard',
+      'getCardById',
+      'editCard',
+    ]),
+    ...mapCourseActions([
+      'GetCourseList',
+    ]),
+    ...mapChannelActions([
+      'GetChannelListList',
+    ]),
+    caseChange () { // 选择案场
+      this.GetChannelListList({
+        caseid: this.cardInfo.CaseId,
+        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 () { // 保存
-      // 1
+      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.$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(this.cardInfo).then((res) => {
+          this.$alert('操作成功', '提示', {
+            confirmButtonText: '确定',
+            callback: action => {
+              this.$router.push({ name: 'cardList' })
+            }
+          })
+        })
+      }
     },
     cancel () { // 取消
       this.$router.push({ name: 'couponList' })
     },
-    deleteGoodsItem () { // 删除指定商品item
-      // 1
-    },
     handleAvatarSuccess (res, file) {
-      this.postData.Img = res.result.url
+      this.cardInfo.Images[0].CardImageUrl = res.result.url
     },
   }
 }
@@ -325,4 +426,7 @@ export default {
     margin-right: 10px;
   }
 }
+.mainForm > ul > li > div > div > button {
+  margin-top: 0;
+}
 </style>

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">
@@ -76,10 +84,7 @@
               size="mini"
               type="danger"
               @click="sendCard(scope.$index, scope.row)">赠送客户</el-button>
-            <el-button
-              size="mini"
-              type="success"
-              @click="handleDelete(scope.$index, scope.row)">点击复制链接</el-button>
+            <a class="copyBtn" :data-clipboard-text="'www.baidu.com'" :ref="'copy' + scope.$index" @click="toCopy(scope.$index, scope.row)">点击复制链接</a>
           </template>
         </el-table-column>
       </el-table>
@@ -115,7 +120,7 @@
           <li class="flex-item">
             <el-input
               placeholder="请输入推荐人"
-              v-model="dialogPostData.referrer"
+              v-model="dialogPostData.recommendname"
               clearable>
             </el-input>
           </li>
@@ -126,7 +131,7 @@
         <ul class="dialogSearchList flex-h">
           <li class="flex-item">
             <el-date-picker
-              v-model="dialogPostData.startdate"
+              v-model="dialogPostData.begindate"
               type="date"
               placeholder="选择起始日期">
             </el-date-picker>
@@ -141,7 +146,7 @@
       <div>
         <el-table
           ref="multipleTable"
-          :data="customerList"
+          :data="customers.list"
           tooltip-effect="dark"
           style="width: 100%"
           @selection-change="handleSelectionChange">
@@ -153,7 +158,7 @@
             label="姓名">
           </el-table-column>
           <el-table-column
-            prop="NickName"
+            prop="CustomerName"
             label="微信昵称">
           </el-table-column>
           <el-table-column
@@ -163,9 +168,12 @@
           <el-table-column
             prop="CreatDate"
             label="创建时间">
+            <template slot-scope="scope">
+              <span>{{toolClass.dateFormat(scope.row.CreateDate, 'yyyy-MM-dd')}}</span>
+            </template>
           </el-table-column>
           <el-table-column
-            prop="Referrer"
+            prop="RecommendName"
             label="推荐人">
           </el-table-column>
         </el-table>
@@ -180,23 +188,50 @@
         </el-pagination>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="centerDialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
+        <el-button @click="closeDialog">取 消</el-button>
+        <el-button type="primary" @click="toSendCard">确 定</el-button>
+      </span>
+    </el-dialog>
+    <el-dialog
+      title="手动复制"
+      :visible.sync="copyDialogVisible"
+      width="300px"
+      center>
+      <div>
+        <el-input
+          placeholder="请输入内容"
+          v-model="currentCopyUrl"
+          clearable>
+        </el-input>
+        <!-- <a :data-clipboard-text="currentCopyUrl" ref="copy" @click="toCopy">复制链接</a> -->
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="copyDialogVisible = false">确 定</el-button>
       </span>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import Clipboard from 'clipboard'
+import { mapState, createNamespacedHelpers } from 'vuex'
+const { mapState: mapCardState, mapActions: mapCardActions } = createNamespacedHelpers('card')
+const { mapState: mapCustomerState, mapActions: mapCustomerActions } = createNamespacedHelpers('customer')
 
 export default {
   name: '',
   data () {
     return {
+      currentCopyUrl: '',
+      copyDialogVisible: false,
+      selectCustomer: [],
       dialogTotal: 0,
       dialogPostData: {
-        caseid: '', // 案场id
+        username: '',
+        phone: '',
+        recommendname: '',
+        begindate: '',
+        enddate: '',
         page: 1, // 当前页码
         pagesize: 10, // 请求数据量
       },
@@ -208,9 +243,6 @@ export default {
         page: 1, // 当前页码
         pagesize: 10, // 请求数据量
       },
-      currentList: [{
-        xxx: 'xxx'
-      }]
     }
   },
   mounted () {
@@ -219,10 +251,16 @@ export default {
     })
   },
   computed: {
+    ...mapCardState({
+      cardList: x => x.cardList,
+    }),
     ...mapState({
       cases: x => x.app.cases.list,
       defaultCaseId: x => x.app.cases.default
     }),
+    ...mapCustomerState({
+      customers: x => x.customers,
+    }),
     CaseId: {
       get () {
         return this.postData.caseid || this.defaultCaseId
@@ -233,19 +271,61 @@ export default {
     }
   },
   methods: {
+    ...mapCardActions([
+      'GetCardList',
+      'giveCard',
+    ]),
+    ...mapCustomerActions([
+      'GetCustomerList',
+      'SetCustomerListNull',
+    ]),
     toSendHistory () { // 查看赠送记录
-      this.$router.push({name: 'givingRecords'})
+      this.$router.push({ name: 'givingRecords' })
     },
     dialogSearch () { // 赠送客户搜索
-      // 1
+      this.GetCustomerList(this.dialogPostData)
     },
     handleCurrentChangeDialog (val) {
-      // 1
+      this.dialogPostData.page = val
+      this.GetCustomerList(this.dialogPostData)
     },
     handleSelectionChange (val) {
-      // 1
+      // console.log(val)
+      this.selectCustomer = val
+    },
+    toSendCard () { // 赠送卡
+      if (this.selectCustomer.length) {
+        this.selectCustomer = this.selectCustomer.map(x => x.CustomerId).join(',')
+        this.giveCard({
+          id: this.currentCardId,
+          users: this.selectCustomer,
+        }).then(res => {
+          this.$message({
+            type: 'success',
+            message: '赠送成功！'
+          })
+          this.centerDialogVisible = false
+          this.selectCustomer = []
+          if (this.customers.list.length) {
+            this.customers.list = []
+          }
+          this.getList()
+        })
+      } else {
+        this.$message({
+          type: 'error',
+          message: '请先选择需要赠送的客户!'
+        })
+      }
     },
-    sendCard (index, row) { // 赠送卡
+    closeDialog () { // 关闭弹窗
+      this.centerDialogVisible = false
+      if (this.customers.list.length) {
+        this.customers.list = []
+      }
+    },
+    sendCard (index, row) { // 赠送卡弹窗
+      this.currentCardId = row.CardId
       this.centerDialogVisible = true
     },
     search () { // 搜索
@@ -254,47 +334,38 @@ 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 + '”?'
-      this.$confirm(name, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.$ajax(this.$api.channelManager.deleteChannel.url, {
-          method: this.$api.channelManager.deleteChannel.method,
-          urlData: { channelId: row.ChannelId }
-        }).then(res => {
-          this.$message({
-            type: 'success',
-            message: '删除成功!'
-          })
-          this.search()
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
+    // handleCopy (url) { // 复制弹窗
+    //   this.currentCopyUrl = url
+    //   this.copyDialogVisible = true
+    // },
+    toCopy (index, row) { // 复制
+      console.log(1)
+      var clipboard = new Clipboard(this.$refs['copy' + index])
+      clipboard.on('success', e => {
+        console.log('复制成功')
+        clipboard.destroy()
+      })
+      clipboard.on('error', e => {
+        console.log('该浏览器不支持自动复制')
+        clipboard.destroy()
       })
     },
-    addCard (val) {
-      this.$router.push({ name: 'editCard', query: { type: val } })
+    addCard () {
+      this.$router.push({ name: 'editCard', query: {} })
     }
   }
 }
@@ -316,4 +387,13 @@ export default {
     }
   }
 }
+.copyBtn{
+  line-height: 29px;
+  border-radius: 3px;
+  color: #fff;
+  background: #67c23a;
+  display: inline-block;
+  padding: 0 15px;
+  margin-left: 10px;
+}
 </style>

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

@@ -1,13 +1,13 @@
 <template>
   <div class="subPage">
     <form class="mainForm">
-      <h1 style="font-size:22px;">{{isEdit === 0 ? '新建' : '编辑'}}{{type === 'drink' ? '饮品优惠券' : '课程优惠券'}}</h1>
+      <!-- <h1 style="font-size:22px;">{{isEdit === 0 ? '新建' : '编辑'}}{{couponInfo.CouponType === 'goods' ? '饮品优惠券' : '课程优惠券'}}</h1> -->
       <ul>
         <li class="flex-h">
           <span>选择案场：</span>
           <div class="flex-item">
             <div style="width:50%">
-              <el-select v-model="postData.CaseId" placeholder="请选择">
+              <el-select v-model="couponInfo.CaseId" placeholder="请选择" @change="caseChange">
                 <el-option
                   v-for="item in cases"
                   :key="item.CaseId"
@@ -27,7 +27,7 @@
                 :action='$api.file.image.url'
                 :show-file-list="false"
                 :on-success="handleAvatarSuccess">
-                <img v-if="postData.Img" :src="postData.Img" class="avatar">
+                <img v-if="couponInfo.Images[0].CouponImageUrl" :src="couponInfo.Images[0].CouponImageUrl" class="avatar">
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
               </el-upload>
             </div>
@@ -39,7 +39,7 @@
             <div style="width:200px;">
               <el-input
                 placeholder="请输入"
-                v-model="postData.Name"
+                v-model="couponInfo.CouponName"
                 clearable>
               </el-input>
             </div>
@@ -49,11 +49,11 @@
           <span>券类型：</span>
           <div class="flex-item">
             <div style="width:50%">
-              <el-select v-model="postData.Type" placeholder="请选择">
+              <el-select v-model="couponInfo.CouponType" placeholder="请选择" @change="couponTypeChange">
                 <el-option
                   v-for="item in TypeList"
                   :key="item.id"
-                  :label="item.name"
+                  :label="item.value"
                   :value="item.id">
                 </el-option>
               </el-select>
@@ -66,7 +66,7 @@
             <div style="width:200px;">
               <el-input
                 placeholder="请输入"
-                v-model="postData.Price"
+                v-model="couponInfo.Price"
                 clearable>
               </el-input>
             </div>
@@ -78,7 +78,7 @@
             <div style="width:200px;">
               <el-input
                 placeholder="请输入"
-                v-model="postData.TotalNum"
+                v-model="couponInfo.TotalCount"
                 clearable>
               </el-input>
             </div>
@@ -88,22 +88,22 @@
           <span>发送类型：</span>
           <div class="flex-item">
             <div>
-              <el-radio v-model="postData.SendType" label="1">渠道</el-radio>
-              <el-radio v-if="type === 'course'" v-model="postData.SendType" label="3">案场</el-radio>
-              <el-radio v-model="postData.SendType" label="2">系统</el-radio>
+              <el-radio v-model="couponInfo.SendType" label="channel">渠道</el-radio>
+              <el-radio v-if="couponInfo.CouponType === 'case'" v-model="couponInfo.SendType" label="case">案场</el-radio>
+              <el-radio v-model="couponInfo.SendType" label="system">系统</el-radio>
             </div>
           </div>
         </li>
-        <li class="flex-h">
+        <li class="flex-h" v-if="couponInfo.SendType === 'channel'">
           <span>选择渠道：</span>
           <div class="flex-item">
             <div style="width:50%">
-              <el-select v-model="postData.ChannelId" placeholder="请选择">
+              <el-select v-model="couponInfo.ChannelId" placeholder="请选择">
                 <el-option
-                  v-for="item in ChannelList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id">
+                  v-for="item in channelList"
+                  :key="item.ChannelId"
+                  :label="item.ChannelName"
+                  :value="item.ChannelId">
                 </el-option>
               </el-select>
             </div>
@@ -113,25 +113,28 @@
           <span>目标商品：</span>
           <div class="flex-item">
             <div>
-              <el-radio v-model="postData.Assign" label="1">全部商品</el-radio>
-              <el-radio v-model="postData.Assign" label="2">指定商品</el-radio>
+              <el-radio v-model="couponInfo.IsAll" label="1">全部商品</el-radio>
+              <el-radio v-model="couponInfo.IsAll" label="0">指定商品</el-radio>
             </div>
           </div>
         </li>
-        <li class="flex-h" v-if="postData.Assign === '2'">
+        <li class="flex-h" v-if="couponInfo.IsAll === '0'">
           <div class="flex-item">
             <div style="border: 1px solid #eee;">
               <el-table
-                :data="currentList"
+                :data="couponInfo.Targets"
                 stripe
                 style="width: 100%">
                 <el-table-column
-                  prop="Name"
+                  prop="TargetName"
                   label="商品">
                 </el-table-column>
                 <el-table-column
-                  prop="Type"
+                  prop="TargetType"
                   label="分类">
+                  <template slot-scope="scope">
+                    {{returnGoodsType(scope.row.TargetType)}}
+                  </template>
                 </el-table-column>
                 <el-table-column label="操作">
                   <template slot-scope="scope">
@@ -148,20 +151,20 @@
             </div>
           </div>
         </li>
-        <li class="flex-h" v-if="type === 'drink'">
+        <li class="flex-h" v-if="couponInfo.CouponType === 'goods'">
           <span>券有效时间：</span>
           <div class="flex-item">
             <div>
               <div class="addLine flex-h" style="align-item:center;margin-bottom:20px;">
                 <el-radio v-model="postData.TimeType" label="1">固定时间</el-radio>
                 <el-date-picker
-                  v-model="postData.StartDate"
+                  v-model="couponInfo.StartDate"
                   type="date"
                   placeholder="选择起始日期">
                 </el-date-picker>
                 <span style="line-height:40px;">至</span>
                 <el-date-picker
-                  v-model="postData.EndDate"
+                  v-model="couponInfo.EndDate"
                   type="date"
                   placeholder="选择截止日期">
                 </el-date-picker>
@@ -171,7 +174,7 @@
                 <span style="width:100px;">
                   <el-input
                     placeholder="请输入"
-                    v-model="postData.Days"
+                    v-model="couponInfo.ValidDays"
                     clearable>
                   </el-input>
                 </span>
@@ -185,13 +188,13 @@
           <div class="flex-item">
             <div>
               <el-date-picker
-                v-model="postData.StartDate"
+                v-model="couponInfo.StartDate"
                 type="date"
                 placeholder="选择起始日期">
               </el-date-picker>
               <span style="line-height:40px;">至</span>
               <el-date-picker
-                v-model="postData.EndDate"
+                v-model="couponInfo.EndDate"
                 type="date"
                 placeholder="选择截止日期">
               </el-date-picker>
@@ -201,7 +204,17 @@
         <li class="flex-h">
           <span>视频：</span>
           <div class="flex-item">
-            <div></div>
+            <div style="vertical-align: middle;">
+              <a style="line-height: 40px;" v-if="videoOff" :href="couponInfo.VideoUrl" target="blank">{{couponInfo.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">
@@ -212,7 +225,7 @@
                 type="textarea"
                 :rows="2"
                 placeholder="请输入"
-                v-model="postData.ShareDesc">
+                v-model="couponInfo.Share.CouponShareInfo">
               </el-input>
             </div>
           </div>
@@ -225,7 +238,7 @@
                 type="textarea"
                 :rows="2"
                 placeholder="请输入"
-                v-model="postData.RuleDesc">
+                v-model="couponInfo.Share.UseRule">
               </el-input>
             </div>
           </div>
@@ -238,7 +251,7 @@
                 type="textarea"
                 :rows="2"
                 placeholder="请输入"
-                v-model="postData.UsedDesc">
+                v-model="couponInfo.Share.UseInstruction">
               </el-input>
             </div>
           </div>
@@ -255,22 +268,22 @@
       width="650px"
       center>
       <div>
-        <div v-if="type === 'drink'">
+        <div v-if="couponInfo.CouponType === 'goods'">
           <el-table
             ref="multipleTable"
-            :data="drinkList"
+            :data="goodsList.list"
             tooltip-effect="dark"
             style="width: 100%"
-            @selection-change="handleSelectionChange">
+            @selection-change="handleGoodsChange">
             <el-table-column
               type="selection">
             </el-table-column>
             <el-table-column
-              prop="Name"
+              prop="GoodsName"
               label="商品名称">
             </el-table-column>
             <el-table-column
-              prop="Type"
+              prop="TypeId"
               label="类别">
             </el-table-column>
             <el-table-column
@@ -286,22 +299,22 @@
             :total="total">
           </el-pagination>
         </div>
-        <div v-if="type === 'course'">
+        <div v-if="couponInfo.CouponType === 'course'">
           <el-table
             ref="multipleTable"
-            :data="courseList"
+            :data="courseList.list"
             tooltip-effect="dark"
             style="width: 100%"
-            @selection-change="handleSelectionChange">
+            @selection-change="handleCourseChange">
             <el-table-column
               type="selection">
             </el-table-column>
             <el-table-column
-              prop="Name"
+              prop="CourseName"
               label="商品名称">
             </el-table-column>
             <el-table-column
-              prop="StartDate"
+              prop="BeginDate"
               label="开始时间">
             </el-table-column>
             <el-table-column
@@ -309,7 +322,7 @@
               label="结束时间">
             </el-table-column>
             <el-table-column
-              prop="Type"
+              prop="CourseType"
               label="类别">
             </el-table-column>
             <el-table-column
@@ -328,75 +341,301 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="centerDialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
+        <el-button type="primary" @click="sureAddItem">确 定</el-button>
       </span>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapState, createNamespacedHelpers } from 'vuex'
+const { mapActions: mapCouponActions } = createNamespacedHelpers('coupon')
+const { mapState: mapChannelState, mapActions: mapChannelActions } = createNamespacedHelpers('channel')
+const { mapState: mapGoodsState, mapActions: mapGoodsActions } = createNamespacedHelpers('goods')
+const { mapState: mapCourseState, mapActions: mapCourseActions } = createNamespacedHelpers('course')
 
 export default {
   name: '',
   data () {
     return {
+      videoOff: false,
       total: 0,
-      drinkList: [], // 饮品列表
-      courseList: [], // 课程列表
       centerDialogVisible: false,
-      type: this.$route.query.type,
+      type: this.$route.query.type || '', // goods、course
       isEdit: this.$route.query.id === undefined ? 0 : 1,
       ChannelList: [], // 渠道列表
-      TypeList: [], // 类型列表
+      TypeList: [{ // 类型列表
+        value: '商品券',
+        id: 'goods'
+      }, {
+        value: '课程券',
+        id: 'course'
+      }],
       currentList: [{
         Name: 'ccc',
         Type: 'xxx'
       }], // 指定商品数据
+      couponInfo: {
+        CaseId: '',
+        CouponName: '',
+        CouponType: '',
+        Price: '',
+        TotalCount: '',
+        SendType: '',
+        IsAll: '',
+        StartDate: '',
+        EndDate: '',
+        ValidDays: '',
+        VideoUrl: '',
+        ChannelId: '',
+        Images: [{
+          CouponImageUrl: ''
+        }],
+        Share: {
+          CouponShareInfo: '',
+          UseRule: '',
+          UseInstruction: ''
+        },
+        Targets: []
+      },
       postData: {
         page: 1,
-        pagesize: 10,
+        pagesize: 6,
       },
+      currentSelectArr: [],
     }
   },
   mounted () {
-    this.$nextTick(function () { })
+    this.$nextTick(function () {
+      this.GetChannelListList({
+        caseid: this.defaultCaseId,
+        page: 1,
+        pagesize: 10000
+      }).then(() => {
+        this.GetGoodTypes({ pagesize: 1000, caseid: this.$route.query.caseid }).then(() => {
+          if (this.$route.query.id) {
+            this.getCouponById({
+              id: this.$route.query.id
+            }).then((res) => {
+              // console.log(JSON.stringify(res))
+              res.coupon.IsAll = String(res.coupon.IsAll)
+              if (res.coupon.VideoUrl !== '') {
+                this.videoOff = true
+              }
+              this.couponInfo = res.coupon
+            })
+          }
+        })
+      })
+    })
   },
   computed: {
     ...mapState({
       cases: x => x.app.cases.list,
       defaultCaseId: x => x.app.cases.default
     }),
+    ...mapChannelState({
+      channelList: x => x.channelList,
+    }),
+    ...mapGoodsState({
+      goodsList: x => x.goodsList,
+      goodsTypes: x => x.goodsTypes.list,
+    }),
+    ...mapCourseState({
+      courseList: x => x.courseList,
+    }),
     CaseId: {
       get () {
-        return this.postData.caseid || this.defaultCaseId
+        return this.couponInfo.caseid || this.defaultCaseId
       },
       set (val) {
-        this.postData.caseid = val
+        this.couponInfo.caseid = val
       }
     }
   },
   methods: {
-    handleSelectionChange (val) {
-      // this.multipleSelection = val;
+    ...mapGoodsActions([
+      'GetGoodsList',
+      'GetGoodTypes',
+    ]),
+    ...mapCouponActions([
+      'addCoupon',
+      'getCouponById',
+      'editCoupon',
+    ]),
+    ...mapChannelActions([
+      'GetChannelListList',
+    ]),
+    ...mapCourseActions([
+      'GetCourseList',
+    ]),
+    returnGoodsType (val) {
+      for (var n = 0; n < this.goodsTypes.length; n++) {
+        if (this.goodsTypes[n].TypeId === val) {
+          return this.goodsTypes[n].TypeName
+        }
+      }
+    },
+    deleteVideo () { // 删除视频
+      this.couponInfo.VideoUrl = ''
+      this.videoOff = false
+    },
+    caseChange () { // 选择案场
+      this.couponInfo.ChannelId = ''
+      this.GetChannelListList({
+        caseid: this.couponInfo.CaseId,
+        page: 1,
+        pagesize: 10000
+      })
+    },
+    sureAddItem () { // 确定添加指定商品
+      var bool = true
+      if (this.couponInfo.CouponType === 'goods') {
+        for (var n = 0; n < this.currentSelectArr.length; n++) {
+          if (this.couponInfo.Targets.length) {
+            bool = true
+            for (var a = 0; a < this.couponInfo.Targets.length; a++) {
+              if (this.currentSelectArr[n].GoodsId === this.couponInfo.Targets[a].TargetId) {
+                bool = false
+              }
+            }
+            if (bool) {
+              this.couponInfo.Targets.push({
+                TargetName: this.currentSelectArr[n].GoodsName,
+                TargetId: this.currentSelectArr[n].GoodsId,
+                TargetType: this.currentSelectArr[n].TypeId
+              })
+            }
+          } else {
+            this.couponInfo.Targets.push({
+              TargetName: this.currentSelectArr[n].GoodsName,
+              TargetId: this.currentSelectArr[n].GoodsId,
+              TargetType: this.currentSelectArr[n].TypeId
+            })
+          }
+        }
+      } else if (this.couponInfo.CouponType === 'course') {
+        for (var x = 0; x < this.currentSelectArr.length; x++) {
+          if (this.couponInfo.Targets.length) {
+            bool = true
+            for (var y = 0; y < this.couponInfo.Targets.length; y++) {
+              if (this.currentSelectArr[x].CourseId === this.couponInfo.Targets[y].TargetId) {
+                bool = false
+              }
+            }
+            if (bool) {
+              this.couponInfo.Targets.push({
+                TargetName: this.currentSelectArr[x].CourseName,
+                TargetId: this.currentSelectArr[x].CourseId,
+                TargetType: this.currentSelectArr[x].CourseType
+              })
+            }
+          } else {
+            this.couponInfo.Targets.push({
+              TargetName: this.currentSelectArr[x].CourseName,
+              TargetId: this.currentSelectArr[x].CourseId,
+              TargetType: this.currentSelectArr[x].CourseType
+            })
+          }
+        }
+      }
+      this.centerDialogVisible = false
+    },
+    handleGoodsChange (val) {
+      this.currentSelectArr = val
+    },
+    handleCourseChange (val) {
+      this.currentSelectArr = val
+    },
+    couponTypeChange () {
+      if (this.goodsList.length) {
+        this.goodsList = []
+      }
+      if (this.courseList.length) {
+        this.courseList = []
+      }
+      this.couponInfo.Targets = []
     },
     addGoods () { // 添加指定商品
-      this.centerDialogVisible = true
+      if (this.couponInfo.CouponType === 'goods') {
+        this.GetGoodsList({
+          ...this.postData,
+          caseid: this.couponInfo.CaseId
+        }).then((res) => {
+          this.total = res.pagenum
+          this.centerDialogVisible = true
+        })
+      } else if (this.couponInfo.CouponType === 'course') {
+        this.GetCourseList({
+          ...this.postData,
+          caseid: this.couponInfo.CaseId
+        }).then((res) => {
+          this.total = res.pagenum
+          this.centerDialogVisible = true
+        })
+      }
     },
     submit () { // 保存
-      // 1
+      if (this.$route.query.id) {
+        this.editCoupon({
+          ...this.couponInfo,
+          IsAll: this.couponInfo.IsAll - 0,
+          TotalCount: this.couponInfo.TotalCount - 0,
+          ValidDays: this.couponInfo.ValidDays || 0
+        }).then((res) => {
+          this.$alert('操作成功', '提示', {
+            confirmButtonText: '确定',
+            callback: action => {
+              this.$router.push({ name: 'couponList' })
+            }
+          })
+        })
+      } else {
+        this.addCoupon({
+          ...this.couponInfo,
+          IsAll: this.couponInfo.IsAll - 0,
+          TotalCount: this.couponInfo.TotalCount - 0,
+          ValidDays: this.couponInfo.ValidDays || 0
+        }).then((res) => {
+          this.$alert('操作成功', '提示', {
+            confirmButtonText: '确定',
+            callback: action => {
+              this.$router.push({ name: 'couponList' })
+            }
+          })
+        })
+      }
     },
     cancel () { // 取消
       this.$router.push({ name: 'couponList' })
     },
-    deleteGoodsItem () { // 删除指定商品item
-      // 1
+    deleteGoodsItem (index, row) { // 删除指定商品item
+      this.couponInfo.Targets.splice(index, 1)
     },
     handleAvatarSuccess (res, file) {
-      this.postData.Img = res.result.url
+      this.couponInfo.Images[0].CouponImageUrl = res.result.url
+    },
+    videoSuccess (res, file) {
+      this.videoOff = true
+      this.couponInfo.VideoUrl = res.result.url
     },
     handleCurrentChange (val) { // 跳转到分页
-      // this.getList()
+      this.postData.page = val
+      if (this.couponInfo.CouponType === 'goods') {
+        this.GetGoodsList({
+          ...this.postData,
+          caseid: this.couponInfo.CaseId
+        }).then((res) => {
+          this.total = res.pagenum
+        })
+      } else if (this.couponInfo.CouponType === 'course') {
+        this.GetCourseList({
+          ...this.postData,
+          caseid: this.couponInfo.CaseId
+        }).then((res) => {
+          this.total = res.pagenum
+        })
+      }
     },
   }
 }
@@ -409,4 +648,7 @@ export default {
     margin-right: 10px;
   }
 }
+.mainForm > ul > li > div > div > button {
+  margin-top: 0;
+}
 </style>

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

@@ -3,8 +3,9 @@
     <div class="system-table-search">
       <div class="flex-h">
         <div class="flex-item flex-h">
-          <el-button size="mini" type="success" @click="addCoupon('drink')">新增饮品优惠券</el-button>
-          <el-button size="mini" type="success" @click="addCoupon('course')">新增课程优惠券</el-button>
+          <el-button size="mini" type="success" @click="addCoupon('')">新增优惠券</el-button>
+          <!-- <el-button size="mini" type="success" @click="addCoupon('drink')">新增饮品优惠券</el-button>
+          <el-button size="mini" type="success" @click="addCoupon('course')">新增课程优惠券</el-button> -->
         </div>
         <ul>
           <li>
@@ -27,44 +28,55 @@
     </div>
     <div class="system-table-box">
       <el-table
-        :data="currentList"
+        :data="couponList.list"
         stripe
         style="width: 100%">
         <el-table-column
-          prop="xxx"
+          prop="CouponName"
           label="券名称">
         </el-table-column>
         <el-table-column
-          prop="xxx"
+          prop="CouponType"
           label="券类型">
+          <template slot-scope="scope">{{scope.row.CouponType === 'goods' ? '商品券' : '课程券'}}</template>
         </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="发放类型">
+          <template slot-scope="scope">{{scope.row.SendType === 'channel' ? '渠道' : scope.row.SendType === 'case' ? '案场' : '系统'}}</template>
         </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">
+            <span>{{scope.row.Status === 1 ? '正常' : '已过期'}}</span>
+          </template>
         </el-table-column>
         <el-table-column label="操作" fixed='right' width="350">
           <template slot-scope="scope">
@@ -115,7 +127,7 @@
           <li class="flex-item">
             <el-input
               placeholder="请输入推荐人"
-              v-model="dialogPostData.referrer"
+              v-model="dialogPostData.recommendname"
               clearable>
             </el-input>
           </li>
@@ -126,7 +138,7 @@
         <ul class="dialogSearchList flex-h">
           <li class="flex-item">
             <el-date-picker
-              v-model="dialogPostData.startdate"
+              v-model="dialogPostData.begindate"
               type="date"
               placeholder="选择起始日期">
             </el-date-picker>
@@ -141,7 +153,7 @@
       <div>
         <el-table
           ref="multipleTable"
-          :data="customerList"
+          :data="customers.list"
           tooltip-effect="dark"
           style="width: 100%"
           @selection-change="handleSelectionChange">
@@ -153,7 +165,7 @@
             label="姓名">
           </el-table-column>
           <el-table-column
-            prop="NickName"
+            prop="CustomerName"
             label="微信昵称">
           </el-table-column>
           <el-table-column
@@ -161,11 +173,14 @@
             label="手机号">
           </el-table-column>
           <el-table-column
-            prop="CreatDate"
+            prop="CreateDate"
             label="创建时间">
+            <template slot-scope="scope">
+              <span>{{toolClass.dateFormat(scope.row.CreateDate, 'yyyy-MM-dd')}}</span>
+            </template>
           </el-table-column>
           <el-table-column
-            prop="Referrer"
+            prop="RecommendName"
             label="推荐人">
           </el-table-column>
         </el-table>
@@ -176,19 +191,21 @@
           :current-page.sync="dialogPostData.page"
           :page-size="dialogPostData.pagesize"
           layout="prev, pager, next, jumper"
-          :total="dialogTotal">
+          :total="customers.pagenum">
         </el-pagination>
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="centerDialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
+        <el-button type="primary" @click="ForCustomer">确 定</el-button>
       </span>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapState, createNamespacedHelpers } from 'vuex'
+const { mapState: mapCouponState, mapActions: mapCouponActions } = createNamespacedHelpers('coupon')
+const { mapState: mapCustomerState, mapActions: mapCustomerActions } = createNamespacedHelpers('customer')
 
 export default {
   name: '',
@@ -196,11 +213,14 @@ export default {
     return {
       dialogTotal: 0,
       dialogPostData: {
-        caseid: '', // 案场id
+        username: '',
+        phone: '',
+        recommendname: '',
+        begindate: '',
+        enddate: '',
         page: 1, // 当前页码
         pagesize: 10, // 请求数据量
       },
-      customerList: [],
       centerDialogVisible: false,
       total: 0,
       postData: { // 表格搜索条件
@@ -208,9 +228,8 @@ export default {
         page: 1, // 当前页码
         pagesize: 10, // 请求数据量
       },
-      currentList: [{
-        xxx: 'xxx'
-      }]
+      currentInfo: {},
+      selUsers: '',
     }
   },
   mounted () {
@@ -219,6 +238,12 @@ export default {
     })
   },
   computed: {
+    ...mapCouponState({
+      couponList: x => x.couponList,
+    }),
+    ...mapCustomerState({
+      customers: x => x.customers,
+    }),
     ...mapState({
       cases: x => x.app.cases.list,
       defaultCaseId: x => x.app.cases.default
@@ -233,38 +258,53 @@ export default {
     }
   },
   methods: {
+    ...mapCouponActions([
+      'GetCouponList',
+      'GiveCoupon',
+    ]),
+    ...mapCustomerActions([
+      'GetCustomerList',
+      'SetCustomerListNull',
+    ]),
     dialogSearch () { // 赠送客户搜索
+      this.GetCustomerList(this.dialogPostData)
       // 1
     },
     handleCurrentChangeDialog (val) {
       // 1
     },
     handleSelectionChange (val) {
+      this.selUsers = val.map(x => x.CustomerId).join(',')
       // 1
     },
     sendCoupon (index, row) { // 赠送优惠券
+      this.currentInfo = row
+      this.selUsers = ''
+      this.SetCustomerListNull()
       this.centerDialogVisible = true
     },
     search () { // 搜索
       this.postData.page = 1
-      this.currentList = []
+      if (this.couponList.length) {
+        this.couponList = []
+      }
       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.GetCouponList({
+        ...this.postData,
+        caseid: this.CaseId || this.defaultCaseId
+      }).then((res) => {
         this.total = res.pagenum
+        // console.log(JSON.stringify(res))
       })
     },
     handleCurrentChange (val) { // 跳转到分页
+      this.postData.page = val
       this.getList()
     },
     handleEdit (index, row) { // 编辑
-      this.$router.push({ name: 'editChannel', query: { id: row.ChannelId } })
+      this.$router.push({ name: 'editCoupon', query: { type: row.CouponType, id: row.CouponId, caseid: row.CaseId } })
     },
     handleDelete (index, row) { // 删除
       let name = '确认删除渠道“' + row.ChannelName + '”?'
@@ -292,12 +332,39 @@ export default {
     },
     addCoupon (val) {
       this.$router.push({ name: 'editCoupon', query: { type: val } })
+    },
+    ForCustomer () {
+      if (this.selUsers === '') {
+        this.$message({
+          type: 'error',
+          message: '请先选择客户!'
+        })
+        return false
+      }
+      if (!this.currentInfo || this.currentInfo.CouponId === '') {
+        this.$message({
+          type: 'error',
+          message: '请先选择需要赠送的优惠券!'
+        })
+        return false
+      }
+      this.GiveCoupon({
+        id: this.currentInfo.CouponId,
+        users: this.selUsers,
+      }).then(res => {
+        this.$message({
+          type: 'success',
+          message: '赠送成功！'
+        })
+        this.centerDialogVisible = false
+        this.getList()
+      })
     }
   }
 }
 </script>
 
-<!-- Add "scoped" attribute to limit CSS to this component only -->
+<!-- Add "scoped" attrib0 0ute to limit CSS to this component only -->
 <style lang="scss" scoped>
 @import "page.scss";
 .dialogSearchList {

src/pages/system/cardAndCouponManager/couponManager/page.scss

@@ -23,5 +23,6 @@
 
 
 
+
 
 

src/pages/system/caseManager/caseAreaManager/index.vue

@@ -57,8 +57,10 @@
           </template>
         </el-table-column>
         <el-table-column
-          prop="CaseName"
-          label="案场">
+          label="案场" >
+          <template slot-scope="scope">
+            <span>{{getCaseName(scope.row.CaseId)}}</span>
+          </template>
         </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
@@ -117,7 +119,7 @@ export default {
       set (val) {
         this.postData.caseid = val
       }
-    }
+    },
   },
   methods: {
     search () { // 搜索
@@ -125,14 +127,17 @@ export default {
       this.currentList = []
       this.getList()
     },
+    getCaseName (caseid) {
+      return (this.cases.filter(x => x.CaseId === caseid)[0] || {}).CaseName
+    },
     getList () { // 获取列表
       this.$ajax(this.$api.caseManager.getCaseAreaList.url, {
         method: this.$api.caseManager.getCaseAreaList.method,
         queryData: { ...this.postData, caseid: this.CaseId }
       }).then(res => {
-        for (var n = 0; n < res.list.length; n++) {
-          res.list[n].CaseName = this.cases.filter(x => x.CaseId === res.list[n].CaseId)[0].CaseName
-        }
+        // for (var n = 0; n < res.list.length; n++) {
+        //   res.list[n].CaseName = this.cases.filter(x => x.CaseId === res.list[n].CaseId)[0].CaseName
+        // }
         this.currentList = res.list
         this.postData.page = res.page
         this.total = res.pagenum

src/pages/system/caseManager/caseInfo/addCase/index.vue

@@ -16,7 +16,7 @@
           </div>
         </li>
         <li class="flex-h">
-          <span>案场地址：</span>
+          <span>案场地址：<em>*</em></span>
           <div class="flex-item">
             <div>
               <el-input
@@ -57,7 +57,7 @@
           </div>
         </li>
         <li class="flex-h">
-          <span>案场头像：</span>
+          <span>案场头像：<em>*</em></span>
           <div class="flex-item">
             <div>
               <!-- <a class="formImg">
@@ -176,14 +176,28 @@ export default {
       if (this.postData.CaseName === '') {
         this.$message({
           type: 'error',
-          message: '案场名称不能为空'
+          message: '请填写案场名称！'
+        })
+        return false
+      }
+      if (this.postData.CaseAddress === '') {
+        this.$message({
+          type: 'error',
+          message: '请填写案场地址！'
+        })
+        return false
+      }
+      if (this.postData.CaseIcon === '') {
+        this.$message({
+          type: 'error',
+          message: '请上传案场图片！'
         })
         return false
       }
       if (this.postData.Coordinate === '') {
         this.$message({
           type: 'error',
-          message: '案场经纬度不能为空'
+          message: '案场在地图上的位置不明确，请在地图上抓取地址获取经纬度！'
         })
         return false
       }

src/pages/system/caseManager/caseInfo/editCase/index.vue

@@ -15,7 +15,7 @@
           </div>
         </li>
         <li class="flex-h">
-          <span>案场地址：</span>
+          <span>案场地址：<em>*</em></span>
           <div class="flex-item">
             <div>
               <el-input
@@ -53,7 +53,7 @@
           </div>
         </li>
         <li class="flex-h">
-          <span>案场头像：</span>
+          <span>案场头像：<em>*</em></span>
           <div class="flex-item">
             <div>
               <!-- <a class="formImg">
@@ -183,14 +183,28 @@ export default {
       if (this.postData.CaseName === '') {
         this.$message({
           type: 'error',
-          message: '案场名称不能为空'
+          message: '请填写案场名称！'
+        })
+        return false
+      }
+      if (this.postData.CaseAddress === '') {
+        this.$message({
+          type: 'error',
+          message: '请填写案场地址！'
+        })
+        return false
+      }
+      if (this.postData.CaseIcon === '') {
+        this.$message({
+          type: 'error',
+          message: '请上传案场图片！'
         })
         return false
       }
       if (this.postData.Coordinate === '') {
         this.$message({
           type: 'error',
-          message: '案场经纬度不能为空'
+          message: '案场在地图上的位置不明确，请在地图上抓取地址获取经纬度！'
         })
         return false
       }

src/pages/system/caseManager/caseInfo/index.vue

@@ -48,6 +48,7 @@
 
 <script>
 import tableSearch from '@/components/tableSearch/index'
+import { mapActions } from 'vuex'
 
 export default {
   name: '',
@@ -71,6 +72,9 @@ export default {
     })
   },
   methods: {
+    ...mapActions([
+      'updateSystemInfo',
+    ]),
     pplConcerned (index, row) { // 相关人员
       this.$router.push({name: 'pplConcerned', query: {id: row.CaseId}})
     },

src/pages/system/caseManager/caseTableManager/add.vue

@@ -9,6 +9,7 @@
               <el-input
                 placeholder="请输入名称"
                 v-model="postData.TableNo"
+                maxlength="6"
                 clearable>
               </el-input>
             </div>

src/pages/system/caseManager/caseTableManager/edit.vue

@@ -9,6 +9,7 @@
               <el-input
                 placeholder="请输入名称"
                 v-model="postData.TableNo"
+                maxlength="6"
                 clearable>
               </el-input>
             </div>

src/pages/system/caseManager/signinManager/index.vue

@@ -101,7 +101,7 @@ export default {
         page: 1, // 当前页码
         pageSize: 10, // 请求数据量
       },
-      total: '', // 总数
+      total: 0, // 总数
       // 数据体
       // {date: '2016-05-02',name: '王小虎',address: '上海市普陀区金沙江路 1518 弄'}
       tableData: [],

src/pages/system/cmsManager/bannerManager/add.vue

@@ -77,7 +77,7 @@
         <li class="flex-h">
           <span>图片：</span>
           <div class="flex-item">
-            <el-upload
+            <!-- <el-upload
               :action="$api.file.image.url"
               :limit='limit'
               list-type="picture-card"
@@ -89,7 +89,15 @@
             </el-upload>
             <el-dialog :visible.sync="dialogVisible">
               <img width="100%" :src="imgs" alt="">
-            </el-dialog>
+            </el-dialog> -->
+            <el-upload
+              class="avatar-uploader"
+              :action='$api.file.image.url'
+              :show-file-list="false"
+              :on-success="handleAvatarSuccess">
+              <img v-if="postData.ImageUrl" :src="postData.ImageUrl" class="avatar">
+              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+            </el-upload>
           </div>
         </li>
         <!-- <li class="flex-h">
@@ -192,13 +200,13 @@ export default {
       }
       this.postData.OrgId = this.OrgId
       this.postData.ForwardType === '1' ? this.postData.ForwardType = 'url' : this.postData.ForwardType = 'course'
-      this.postData.ImageUrl = ''
-      for (let i = 0; i < this.imgsArr.length; i++) {
-        this.postData.ImageUrl += this.imgsArr[i].response.result.url + ','
-      }
-      if (this.postData.ImageUrl) {
-        this.postData.ImageUrl = this.postData.ImageUrl.substr(0, this.postData.ImageUrl.length - 1)
-      }
+      // this.postData.ImageUrl = ''
+      // for (let i = 0; i < this.imgsArr.length; i++) {
+      //   this.postData.ImageUrl += this.imgsArr[i].response.result.url + ','
+      // }
+      // if (this.postData.ImageUrl) {
+      //   this.postData.ImageUrl = this.postData.ImageUrl.substr(0, this.postData.ImageUrl.length - 1)
+      // }
       this.$ajax(this.$api.cms.addImage.url, {
         method: this.$api.cms.addImage.method,
         data: this.postData
@@ -218,21 +226,24 @@ export default {
     cancel () {
       this.$router.go(-1)
     },
-    handlePictureCardPreview (res, file, fileList) {
-      this.imgs = res.result.url
-      this.dialogVisible = false
-      this.imgsArr = fileList
-    },
-    handleRemove (file, fileList) {
-      this.imgsArr = fileList
+    // handlePictureCardPreview (res, file, fileList) {
+    //   this.imgs = res.result.url
+    //   this.dialogVisible = false
+    //   this.imgsArr = fileList
+    // },
+    // handleRemove (file, fileList) {
+    //   this.imgsArr = fileList
+    // },
+    // exceed () {
+    //   this.$message({
+    //     message: '超过可传的图片上限',
+    //     type: 'info',
+    //     duration: 1000
+    //   })
+    // }
+    handleAvatarSuccess (res, file) {
+      this.postData.ImageUrl = res.result.url
     },
-    exceed () {
-      this.$message({
-        message: '超过可传的图片上限',
-        type: 'info',
-        duration: 1000
-      })
-    }
   }
 }
 </script>

src/pages/system/cmsManager/bannerManager/edit.vue

@@ -77,7 +77,7 @@
         <li class="flex-h">
           <span>图片：</span>
           <div class="flex-item">
-            <el-upload
+            <!-- <el-upload
               :action="$api.file.image.url"
               :limit='limit'
               list-type="picture-card"
@@ -89,7 +89,15 @@
             </el-upload>
             <el-dialog :visible.sync="dialogVisible">
               <img width="100%" :src="imgs" alt="">
-            </el-dialog>
+            </el-dialog> -->
+            <el-upload
+              class="avatar-uploader"
+              :action='$api.file.image.url'
+              :show-file-list="false"
+              :on-success="handleAvatarSuccess">
+              <img v-if="postData.ImageUrl" :src="postData.ImageUrl" class="avatar">
+              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+            </el-upload>
           </div>
         </li>
         <!-- <li class="flex-h">
@@ -187,13 +195,13 @@ export default {
       this.postData.OrgId = this.OrgId
       this.postData.CaseId = this.CaseId
       this.postData.ForwardType === '1' ? this.postData.ForwardType = 'url' : this.postData.ForwardType = 'course'
-      this.postData.ImageUrl = ''
-      for (let i = 0; i < this.imgsArr.length; i++) {
-        this.postData.ImageUrl += this.imgsArr[i].response.result.url + ','
-      }
-      if (this.postData.ImageUrl) {
-        this.postData.ImageUrl = this.postData.ImageUrl.substr(0, this.postData.ImageUrl.length - 1)
-      }
+      // this.postData.ImageUrl = ''
+      // for (let i = 0; i < this.imgsArr.length; i++) {
+      //   this.postData.ImageUrl += this.imgsArr[i].response.result.url + ','
+      // }
+      // if (this.postData.ImageUrl) {
+      //   this.postData.ImageUrl = this.postData.ImageUrl.substr(0, this.postData.ImageUrl.length - 1)
+      // }
       this.$ajax(this.$api.cms.editImage.url, {
         method: this.$api.cms.editImage.method,
         data: this.postData,
@@ -226,37 +234,40 @@ export default {
         console.log(res)
         res.Status = res.Status + ''
         res.ForwardType === 'url' ? res.ForwardType = '1' : res.ForwardType = '0'
-        let imgsArr = []
-        let item = {
-          url: res.ImageUrl,
-          response: {
-            result: {
-              url: res.ImageUrl
-            }
-          }
-        }
-        imgsArr.push(item)
-        this.imgsArr = imgsArr
+        // let imgsArr = []
+        // let item = {
+        //   url: res.ImageUrl,
+        //   response: {
+        //     result: {
+        //       url: res.ImageUrl
+        //     }
+        //   }
+        // }
+        // imgsArr.push(item)
+        // this.imgsArr = imgsArr
         this.postData = res
       }).catch(msg => {
 
       })
     },
-    handlePictureCardPreview (res, file, fileList) {
-      this.imgs = res.result.url
-      this.dialogVisible = false
-      this.imgsArr = fileList
-    },
-    handleRemove (file, fileList) {
-      this.imgsArr = fileList
+    // handlePictureCardPreview (res, file, fileList) {
+    //   this.imgs = res.result.url
+    //   this.dialogVisible = false
+    //   this.imgsArr = fileList
+    // },
+    // handleRemove (file, fileList) {
+    //   this.imgsArr = fileList
+    // },
+    // exceed () {
+    //   this.$message({
+    //     message: '超过可传的图片上限',
+    //     type: 'info',
+    //     duration: 1000
+    //   })
+    // }
+    handleAvatarSuccess (res, file) {
+      this.postData.ImageUrl = res.result.url
     },
-    exceed () {
-      this.$message({
-        message: '超过可传的图片上限',
-        type: 'info',
-        duration: 1000
-      })
-    }
   }
 }
 </script>

src/pages/system/cmsManager/majorProjects/edit.vue

@@ -44,7 +44,7 @@
         <li class="flex-h">
           <span>图片：</span>
           <div class="flex-item">
-            <el-upload
+            <!-- <el-upload
               :action="$api.file.image.url"
               list-type="picture-card"
               :limit='limit'
@@ -53,13 +53,22 @@
               :on-remove="handleRemove"
               :on-exceed="exceed">
               <i class="el-icon-plus"></i>
+            </el-upload> -->
+            <!-- 单选 -->
+            <el-upload
+              class="avatar-uploader"
+              :action='$api.file.image.url'
+              :show-file-list="false"
+              :on-success="handleImgSuccess">
+              <img v-if="imgShow" :src="imgShow" class="avatar">
+              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
             </el-upload>
           </div>
         </li>
         <li class="flex-h">
           <span>详细图片：</span>
           <div class="flex-item">
-            <el-upload
+            <!-- <el-upload
               :action='$api.file.image.url'
               list-type="picture-card"
               :limit='limit'
@@ -68,6 +77,15 @@
               :on-remove="handleRemoveDetail"
               :on-exceed="exceed">
               <i class="el-icon-plus"></i>
+            </el-upload> -->
+            <!-- 单选 -->
+            <el-upload
+              class="avatar-uploader"
+              :action='$api.file.image.url'
+              :show-file-list="false"
+              :on-success="handleDetailImgSuccess">
+              <img v-if="detailImgShow" :src="detailImgShow" class="avatar">
+              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
             </el-upload>
           </div>
         </li>
@@ -200,8 +218,10 @@ export default {
     return {
       id: '',
       limit: 1,
-      imgs: null,
-      detailimgs: null,
+      // imgs: null,
+      // detailimgs: null,
+      img: '',
+      detailimg: '',
       selCourseVisible: false,
       selCourseList: [],
     }
@@ -228,40 +248,46 @@ export default {
         this.getCourse()
       }
     },
-    imgsArr: {
-      get () {
-        return this.imgs || (this.detail.CmsCaseImgs || []).filter(x => x.ImageType === 'cover').map(x => {
-          return {
-            url: x.CaseImageUrl,
-            response: {
-              result: {
-                url: x.CaseImageUrl
-              }
-            }
-          }
-        })
-      },
-      set (val) {
-        this.imgs = val
-      }
+    imgShow () {
+      return this.img || ((this.detail.CmsCaseImgs || []).filter(x => x.ImageType === 'cover')[0] || {}).CaseImageUrl
     },
-    detailimgsArr: {
-      get () {
-        return this.detailimgs || (this.detail.CmsCaseImgs || []).filter(x => x.ImageType === 'detail').map(x => {
-          return {
-            url: x.CaseImageUrl,
-            response: {
-              result: {
-                url: x.CaseImageUrl
-              }
-            }
-          }
-        })
-      },
-      set (val) {
-        this.detailimgs = val
-      }
+    detailImgShow () {
+      return this.detailimg || ((this.detail.CmsCaseImgs || []).filter(x => x.ImageType === 'detail')[0] || {}).CaseImageUrl
     },
+    // imgsArr: {
+    //   get () {
+    //     return this.imgs || (this.detail.CmsCaseImgs || []).filter(x => x.ImageType === 'cover').map(x => {
+    //       return {
+    //         url: x.CaseImageUrl,
+    //         response: {
+    //           result: {
+    //             url: x.CaseImageUrl
+    //           }
+    //         }
+    //       }
+    //     })
+    //   },
+    //   set (val) {
+    //     this.imgs = val
+    //   }
+    // },
+    // detailimgsArr: {
+    //   get () {
+    //     return this.detailimgs || (this.detail.CmsCaseImgs || []).filter(x => x.ImageType === 'detail').map(x => {
+    //       return {
+    //         url: x.CaseImageUrl,
+    //         response: {
+    //           result: {
+    //             url: x.CaseImageUrl
+    //           }
+    //         }
+    //       }
+    //     })
+    //   },
+    //   set (val) {
+    //     this.detailimgs = val
+    //   }
+    // },
     coursesList () {
       return (this.courses.list || []).map(x => {
         return {
@@ -284,16 +310,17 @@ export default {
       'GetCourseList',
     ]),
     submit () {
-      const imgs = this.imgsArr.map(x => x.response.result.url).join(',')
-      const detailimgs = this.detailimgsArr.map(x => x.response.result.url).join(',')
+      // const imgs = this.imgsArr.map(x => x.response.result.url).join(',')
+      // const detailimgs = this.detailimgsArr.map(x => x.response.result.url).join(',')
+
       const courseids = (this.detail.Courses || []).map(x => x.CourseId).join(',')
       if (this.id === '') {
         this.detail.OrgId = this.OrgId
-        this.AddCaseInfo({...this.detail, OrgId: this.OrgId, imgs, detailimgs, courseids}).then(res => {
+        this.AddCaseInfo({...this.detail, OrgId: this.OrgId, imgs: this.img, detailimgs: this.detailimg, courseids}).then(res => {
           this.afterSave()
         })
       } else {
-        this.AddCaseInfo({...this.detail, imgs, detailimgs, courseids}).then(res => {
+        this.AddCaseInfo({...this.detail, imgs: this.img, detailimgs: this.detailimg, courseids}).then(res => {
           this.afterSave()
         })
       }
@@ -311,18 +338,18 @@ export default {
     cancel () {
       this.$router.go(-1)
     },
-    handlePictureCardPreview (res, file, fileList) {
-      this.imgsArr = fileList
-    },
-    handleRemove (file, fileList) {
-      this.imgsArr = fileList
-    },
-    handlePictureCardPreviewDetail (res, file, fileList) {
-      this.detailimgsArr = fileList
-    },
-    handleRemoveDetail (file, fileList) {
-      this.detailimgsArr = fileList
-    },
+    // handlePictureCardPreview (res, file, fileList) {
+    //   this.imgsArr = fileList
+    // },
+    // handleRemove (file, fileList) {
+    //   this.imgsArr = fileList
+    // },
+    // handlePictureCardPreviewDetail (res, file, fileList) {
+    //   this.detailimgsArr = fileList
+    // },
+    // handleRemoveDetail (file, fileList) {
+    //   this.detailimgsArr = fileList
+    // },
     getDetail () {
       this.GetCaseInfo({id: this.id})
     },
@@ -338,13 +365,13 @@ export default {
         this.$refs.courseTable.clearSelection()
       }
     },
-    exceed () {
-      this.$message({
-        message: '超过可传的图片上限',
-        type: 'info',
-        duration: 1000
-      })
-    },
+    // exceed () {
+    //   this.$message({
+    //     message: '超过可传的图片上限',
+    //     type: 'info',
+    //     duration: 1000
+    //   })
+    // },
     addCourse () {
       this.GetCourseList({caseid: this.CaseId, page: 1, pagesize: 100, callback: this.coursesShow})
     },
@@ -365,7 +392,13 @@ export default {
     },
     deleteItem (row) {
       this.UpdateInfo({...this.detail, Courses: this.detail.Courses.filter(x => x.CourseId !== row.CourseId)})
-    }
+    },
+    handleImgSuccess (res, file) {
+      this.img = res.result.url
+    },
+    handleDetailImgSuccess (res, file) {
+      this.detailimg = res.result.url
+    },
   },
   mounted () {
     this.getCourse()

src/pages/system/cmsManager/newsManager/add.vue

@@ -62,7 +62,7 @@
         <li class="flex-h">
           <span>图片：</span>
           <div class="flex-item">
-            <el-upload
+            <!-- <el-upload
               :action="$api.file.image.url"
               :limit='limit'
               list-type="picture-card"
@@ -74,7 +74,16 @@
             </el-upload>
             <el-dialog :visible.sync="dialogVisible">
               <img width="100%" :src="imgs" alt="">
-            </el-dialog>
+            </el-dialog> -->
+            <!-- 单选 -->
+            <el-upload
+              class="avatar-uploader"
+              :action='$api.file.image.url'
+              :show-file-list="false"
+              :on-success="handleAvatarSuccess">
+              <img v-if="postData.ImageUrl" :src="postData.ImageUrl" class="avatar">
+              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+            </el-upload>
           </div>
         </li>
         <li style="text-align:center">
@@ -148,13 +157,13 @@ export default {
       }
       this.postData.ForwardType === '1' ? this.postData.ForwardType = 'url' : this.postData.ForwardType = 'course'
       this.postData.locationids = this.postData.LocationIds.join(',')
-      this.postData.ImageUrl = ''
-      for (let i = 0; i < this.imgsArr.length; i++) {
-        this.postData.ImageUrl += this.imgsArr[i].response.result.url + ','
-      }
-      if (this.postData.ImageUrl) {
-        this.postData.ImageUrl = this.postData.ImageUrl.substr(0, this.postData.ImageUrl.length - 1)
-      }
+      // this.postData.ImageUrl = ''
+      // for (let i = 0; i < this.imgsArr.length; i++) {
+      //   this.postData.ImageUrl += this.imgsArr[i].response.result.url + ','
+      // }
+      // if (this.postData.ImageUrl) {
+      //   this.postData.ImageUrl = this.postData.ImageUrl.substr(0, this.postData.ImageUrl.length - 1)
+      // }
       this.$ajax(this.$api.cms.addNews.url, {
         method: this.$api.cms.addNews.method,
         data: this.postData
@@ -174,21 +183,24 @@ export default {
     cancel () {
       this.$router.go(-1)
     },
-    handlePictureCardPreview (res, file, fileList) {
-      this.imgs = res.result.url
-      this.dialogVisible = false
-      this.imgsArr = fileList
-    },
-    handleRemove (file, fileList) {
-      this.imgsArr = fileList
+    // handlePictureCardPreview (res, file, fileList) {
+    //   this.imgs = res.result.url
+    //   this.dialogVisible = false
+    //   this.imgsArr = fileList
+    // },
+    // handleRemove (file, fileList) {
+    //   this.imgsArr = fileList
+    // },
+    // exceed () {
+    //   this.$message({
+    //     message: '超过可传的图片上限',
+    //     type: 'info',
+    //     duration: 1000
+    //   })
+    // }
+    handleAvatarSuccess (res, file) {
+      this.postData.ImageUrl = res.result.url
     },
-    exceed () {
-      this.$message({
-        message: '超过可传的图片上限',
-        type: 'info',
-        duration: 1000
-      })
-    }
   }
 }
 </script>

src/pages/system/cmsManager/newsManager/edit.vue

@@ -62,7 +62,7 @@
         <li class="flex-h">
           <span>图片：</span>
           <div class="flex-item">
-            <el-upload
+            <!-- <el-upload
               :action="$api.file.image.url"
               :limit='limit'
               list-type="picture-card"
@@ -74,7 +74,15 @@
             </el-upload>
             <el-dialog :visible.sync="dialogVisible">
               <img width="100%" :src="imgs" alt="">
-            </el-dialog>
+            </el-dialog> -->
+            <el-upload
+              class="avatar-uploader"
+              :action='$api.file.image.url'
+              :show-file-list="false"
+              :on-success="handleAvatarSuccess">
+              <img v-if="postData.ImageUrl" :src="postData.ImageUrl" class="avatar">
+              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+            </el-upload>
           </div>
         </li>
         <li style="text-align:center">
@@ -144,13 +152,13 @@ export default {
       }
       this.postData.ForwardType === '1' ? this.postData.ForwardType = 'url' : this.postData.ForwardType = 'course'
       this.postData.locationids = this.postData.LocationIds.join(',')
-      this.postData.ImageUrl = ''
-      for (let i = 0; i < this.imgsArr.length; i++) {
-        this.postData.ImageUrl += this.imgsArr[i].response.result.url + ','
-      }
-      if (this.postData.ImageUrl) {
-        this.postData.ImageUrl = this.postData.ImageUrl.substr(0, this.postData.ImageUrl.length - 1)
-      }
+      // this.postData.ImageUrl = ''
+      // for (let i = 0; i < this.imgsArr.length; i++) {
+      //   this.postData.ImageUrl += this.imgsArr[i].response.result.url + ','
+      // }
+      // if (this.postData.ImageUrl) {
+      //   this.postData.ImageUrl = this.postData.ImageUrl.substr(0, this.postData.ImageUrl.length - 1)
+      // }
       this.$ajax(this.$api.cms.editNews.url, {
         method: this.$api.cms.editNews.method,
         urlData: {
@@ -173,21 +181,21 @@ export default {
     cancel () {
       this.$router.go(-1)
     },
-    handlePictureCardPreview (res, file, fileList) {
-      this.imgs = res.result.url
-      this.dialogVisible = false
-      this.imgsArr = fileList
-    },
-    handleRemove (file, fileList) {
-      this.imgsArr = fileList
-    },
-    exceed () {
-      this.$message({
-        message: '超过可传的图片上限',
-        type: 'info',
-        duration: 1000
-      })
-    },
+    // handlePictureCardPreview (res, file, fileList) {
+    //   this.imgs = res.result.url
+    //   this.dialogVisible = false
+    //   this.imgsArr = fileList
+    // },
+    // handleRemove (file, fileList) {
+    //   this.imgsArr = fileList
+    // },
+    // exceed () {
+    //   this.$message({
+    //     message: '超过可传的图片上限',
+    //     type: 'info',
+    //     duration: 1000
+    //   })
+    // },
     getDetail () {
       this.$ajax(this.$api.cms.newsDetail.url, {
         method: this.$api.cms.newsDetail.method,
@@ -203,22 +211,25 @@ export default {
           return previousValue
         }, [])
         console.log(res.LocationIds)
-        let imgsArr = []
-        let item = {
-          url: res.ImageUrl,
-          response: {
-            result: {
-              url: res.ImageUrl
-            }
-          }
-        }
-        imgsArr.push(item)
-        this.imgsArr = imgsArr
+        // let imgsArr = []
+        // let item = {
+        //   url: res.ImageUrl,
+        //   response: {
+        //     result: {
+        //       url: res.ImageUrl
+        //     }
+        //   }
+        // }
+        // imgsArr.push(item)
+        // this.imgsArr = imgsArr
         this.postData = res
       }).catch(msg => {
 
       })
-    }
+    },
+    handleAvatarSuccess (res, file) {
+      this.postData.ImageUrl = res.result.url
+    },
   }
 }
 </script>

src/pages/system/courseManager/fiveA/edit.vue

@@ -149,13 +149,12 @@ export default {
           id: this.$route.query.id
         }
       }).then(res => {
-        console.log(res)
         let imgsArr = []
         let item = {
-          url: res.ImageUrl,
+          url: res.TypeImg,
           response: {
             result: {
-              url: res.ImageUrl
+              url: res.TypeImg
             }
           }
         }

src/pages/system/dataStatistics/courseOrderList/index.vue

@@ -62,21 +62,29 @@
         :data="currentList"
         stripe
         style="width: 100%">
+        <el-table-column
+          prop="OrderNo"
+          label="订单编号">
+        </el-table-column>
+        <el-table-column
+          prop="Name"
+          label="课程名称">
+        </el-table-column>
         <el-table-column
           prop="CaseName"
           label="所属案场">
         </el-table-column>
         <el-table-column
-          prop="Name"
-          label="卡券名称">
+          prop="Type"
+          label="课程类别">
         </el-table-column>
         <el-table-column
-          prop="GoodsList"
-          label="使用商品">
+          prop="Date"
+          label="课程时间">
         </el-table-column>
         <el-table-column
-          prop="GetType"
-          label="获取方式">
+          prop="UserName"
+          label="用户姓名">
         </el-table-column>
         <el-table-column
           prop="NickName"
@@ -87,24 +95,8 @@
           label="手机号">
         </el-table-column>
         <el-table-column
-          prop="SalerName"
-          label="销售">
-        </el-table-column>
-        <el-table-column
-          prop="EndDate"
-          label="有效期">
-        </el-table-column>
-        <el-table-column
-          prop="GetDate"
-          label="获取时间">
-        </el-table-column>
-        <el-table-column
-          prop="CheckDate"
-          label="核销时间">
-        </el-table-column>
-        <el-table-column
-          prop="Status"
-          label="状态">
+          prop="CreatDate"
+          label="下单时间">
         </el-table-column>
       </el-table>
     </div>

src/pages/system/dataStatistics/goodsOrderList/index.vue

@@ -60,57 +60,41 @@
       </div>
       <div class="moreFilter"></div>
     </div>
-    <div class="system-table-box">
-      <el-table
-        :data="currentList"
-        stripe
-        style="width: 100%">
-        <el-table-column
-          prop="CaseName"
-          label="所属案场">
-        </el-table-column>
-        <el-table-column
-          prop="Name"
-          label="卡券名称">
-        </el-table-column>
-        <el-table-column
-          prop="GoodsList"
-          label="使用商品">
-        </el-table-column>
-        <el-table-column
-          prop="GetType"
-          label="获取方式">
-        </el-table-column>
-        <el-table-column
-          prop="NickName"
-          label="微信昵称">
-        </el-table-column>
-        <el-table-column
-          prop="Phone"
-          label="手机号">
-        </el-table-column>
-        <el-table-column
-          prop="SalerName"
-          label="销售">
-        </el-table-column>
-        <el-table-column
-          prop="EndDate"
-          label="有效期">
-        </el-table-column>
-        <el-table-column
-          prop="GetDate"
-          label="获取时间">
-        </el-table-column>
-        <el-table-column
-          prop="CheckDate"
-          label="核销时间">
-        </el-table-column>
-        <el-table-column
-          prop="Status"
-          label="状态">
-        </el-table-column>
-      </el-table>
-    </div>
+    <table>
+      <tr v-for="(item,index) in currentList.length*2" :key="index">
+        <td v-if="index%2 === 0" colspan="16" class="title">
+          <div class="flex-h">
+            <div class="flex-item" style="text-align:left;">
+              <span>订单编号：{{returnListItem(currentList, index).OrderNo}}</span>
+              <span>案场：{{returnListItem(currentList, index).CaseName}}</span>
+              <span>用户类型：{{returnListItem(currentList, index).UserType}}</span>
+              <span>下单时间：{{returnListItem(currentList, index).CreatDate}}</span>
+            </div>
+            <span>{{returnListItem(currentList, index).Status}}</span>
+          </div>
+        </td>
+        <td v-if="index%2 !== 0" colspan="4" class="noborder">
+          <span v-for="(subItem,subIndex) in returnListItem(currentList, index).OrderDetail" :key="subIndex">{{subItem.GoodsName}}（{{subItem.SpecName}}）</span>
+        </td>
+        <td v-if="index%2 !== 0" colspan="1" class="noborder">
+          <span v-for="(subItem,subIndex) in returnListItem(currentList, index).OrderDetail" :key="subIndex">x{{subItem.Num}}</span>
+        </td>
+        <td v-if="index%2 !== 0" colspan="1" class="noborder">
+          <span v-for="(subItem,subIndex) in returnListItem(currentList, index).OrderDetail" :key="subIndex">￥{{subItem.Price}}</span>
+        </td>
+        <td v-if="index%2 !== 0" colspan="4">
+          <span>{{returnListItem(currentList, index).AreaName}}{{returnListItem(currentList, index).TableNo}}</span>
+        </td>
+        <td v-if="index%2 !== 0" colspan="4">
+          <span>{{returnListItem(currentList, index).OrderPlacer}}/{{returnListItem(currentList, index).OrderPlacerPhone}}</span>
+        </td>
+        <td v-if="index%2 !== 0" colspan="2">
+          <el-button
+          size="mini"
+          type="success">重打</el-button>
+        </td>
+      </tr>
+    </table>
     <el-pagination
       @current-change="handleCurrentChange"
       :current-page.sync="postData.page"
@@ -141,7 +125,91 @@ export default {
         page: 1, // 当前页码
         pagesize: 10, // 请求数据量
       },
-      currentList: [],
+      currentList: [{
+        OrderNo: '1234567890000',
+        OrderId: '123456',
+        CaseName: '案场名称',
+        CaseId: '123456',
+        UserType: 'manager',
+        CreatDate: '12345678900000',
+        Status: '已完成',
+        AreaName: '区域名称',
+        TableNo: '桌号',
+        OrderPlacer: '下单人',
+        OrderPlacerPhone: '18266666666',
+        OrderDetail: [{
+          GoodsName: '商品名称',
+          SpecName: '商品规格',
+          Num: '1',
+          Price: '30',
+        }, {
+          GoodsName: '商品名称',
+          SpecName: '商品规格',
+          Num: '1',
+          Price: '30',
+        }, {
+          GoodsName: '商品名称',
+          SpecName: '商品规格',
+          Num: '1',
+          Price: '30',
+        }]
+      }, {
+        OrderNo: '1234567890000',
+        OrderId: '123456',
+        CaseName: '案场名称',
+        CaseId: '123456',
+        UserType: 'manager',
+        CreatDate: '12345678900000',
+        Status: '已完成',
+        AreaName: '区域名称',
+        TableNo: '桌号',
+        OrderPlacer: '下单人',
+        OrderPlacerPhone: '18266666666',
+        OrderDetail: [{
+          GoodsName: '商品名称',
+          SpecName: '商品规格',
+          Num: '1',
+          Price: '30',
+        }, {
+          GoodsName: '商品名称',
+          SpecName: '商品规格',
+          Num: '1',
+          Price: '30',
+        }, {
+          GoodsName: '商品名称',
+          SpecName: '商品规格',
+          Num: '1',
+          Price: '30',
+        }]
+      }, {
+        OrderNo: '1234567890000',
+        OrderId: '123456',
+        CaseName: '案场名称',
+        CaseId: '123456',
+        UserType: 'manager',
+        CreatDate: '12345678900000',
+        Status: '已完成',
+        AreaName: '区域名称',
+        TableNo: '桌号',
+        OrderPlacer: '下单人',
+        OrderPlacerPhone: '18266666666',
+        OrderDetail: [{
+          GoodsName: '商品名称',
+          SpecName: '商品规格',
+          Num: '1',
+          Price: '30',
+        }, {
+          GoodsName: '商品名称',
+          SpecName: '商品规格',
+          Num: '1',
+          Price: '30',
+        }, {
+          GoodsName: '商品名称',
+          SpecName: '商品规格',
+          Num: '1',
+          Price: '30',
+        }]
+      }],
       typeList: [],
       statusList: [],
     }
@@ -168,6 +236,9 @@ export default {
     })
   },
   methods: {
+    returnListItem (target, index) {
+      return target[Math.ceil((index + 1) / 2) - 1]
+    },
     search () { // 搜索
       // 1
     },
@@ -181,8 +252,8 @@ export default {
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style lang="scss" scoped>
 @import "page.scss";
-.searchFilterLine{
-  >li{
+.searchFilterLine {
+  > li {
     margin-bottom: 20px;
   }
 }

src/pages/system/dataStatistics/goodsOrderList/page.scss

@@ -1,4 +1,46 @@
 
+table{
+  width: calc(100% - 40px);
+  border: 1px solid #eee;
+  margin: 20px auto 0;
+  border-collapse: collapse;
+  td{
+    border: 1px solid #eee;
+    text-align: center;
+    &.noborder{
+      border: none;
+    }
+    &.title{
+      background: #409EFF;
+      div{
+        font-size: 0;
+        white-space: nowrap;
+        span{
+          color: #fff;
+          line-height: 40px;
+          margin-left: 20px;
+        }
+      }
+      >div{
+        >span{
+          font-weight: bolder;
+          margin-right: 20px;
+        }
+      }
+    }
+    >span{
+      width: 100%;
+      display: block;
+      text-align: center;
+      line-height: 40px;
+      border-top: 1px solid #eee;
+      &:nth-child(1){
+        border-top: none;
+      }
+    }
+  }
+}
+
 
 
 

src/pages/system/goodsManager/goodManager/edit.vue

@@ -33,7 +33,8 @@
           <span>商品图片：</span>
           <div class="flex-item">
             <div style="width:50%">
-              <el-upload
+              <!-- 多选 -->
+              <!-- <el-upload
                 :action="$api.file.image.url"
                 :limit='limit'
                 list-type="picture-card"
@@ -42,6 +43,15 @@
                 :on-remove="handleRemove"
                 :on-exceed="exceed">
                 <i class="el-icon-plus"></i>
+              </el-upload> -->
+              <!-- 单选 -->
+              <el-upload
+                class="avatar-uploader"
+                :action='$api.file.image.url'
+                :show-file-list="false"
+                :on-success="handleAvatarSuccess">
+                <img v-if="Image" :src="Image" class="avatar">
+                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
               </el-upload>
             </div>
           </div>
@@ -105,7 +115,7 @@ export default {
   name: '',
   data () {
     return {
-      limit: 2,
+      limit: 1,
       dialogVisible: false,
       infoSpecs: null,
     }
@@ -128,23 +138,28 @@ export default {
       },
       set (val) {
         this.UpdateInfo({...this.detail, CaseId: val})
+        this.detail.TypeId = ''
         this.GetGoodTypes({ pagesize: 1000, caseid: this.Case })
         this.GetGoodSpecs({ pagesize: 1000, caseid: this.Case })
       }
     },
     detailSpecs: {
       get () {
+        console.log(this.infoSpecs || (this.detail.Specs || []).map(x => x.SpecId))
         return this.infoSpecs || (this.detail.Specs || []).map(x => x.SpecId)
       },
       set (val) {
         this.infoSpecs = val
       },
     },
-    imgsArr () {
-      return (this.detail.Images || []).map(x => {
-        return {...x, url: x.url || x.ImgUrl}
-      })
-    },
+    // imgsArr () {
+    //   return (this.detail.Images || []).map(x => {
+    //     return {...x, url: x.url || x.ImgUrl}
+    //   })
+    // },
+    Image () {
+      return ((this.detail.Images || [])[0] || {}).ImgUrl
+    }
   },
   methods: {
     ...mapGoodsActions([
@@ -183,19 +198,22 @@ export default {
     cancel () {
       this.$router.go(-1)
     },
-    handlePictureCardPreview (res, file, fileList) {
-      this.detail.Images = fileList
+    // handlePictureCardPreview (res, file, fileList) {
+    //   this.detail.Images = fileList
+    // },
+    // handleRemove (file, fileList) {
+    //   this.detail.Images = fileList
+    // },
+    // exceed () {
+    //   this.$message({
+    //     message: '超过可传的图片上限',
+    //     type: 'info',
+    //     duration: 1000
+    //   })
+    // },
+    handleAvatarSuccess (res, file) {
+      this.UpdateInfo({...this.detail, Images: [{ImgUrl: res.result.url}]})
     },
-    handleRemove (file, fileList) {
-      this.detail.Images = fileList
-    },
-    exceed () {
-      this.$message({
-        message: '超过可传的图片上限',
-        type: 'info',
-        duration: 1000
-      })
-    }
   },
   created () {
     this.GetGoodTypes({ pagesize: 1000, caseid: this.Case })
@@ -203,8 +221,6 @@ export default {
     const { id } = this.$route.query
     if (id && id !== '') {
       this.GetGoodsByID({ id: id })
-    } else {
-      this.SetNull()
     }
   }
 }

src/pages/system/goodsManager/goodManager/index.vue

@@ -140,6 +140,7 @@ export default {
       'GetGoodsList',
       'GetGoodTypes',
       'DelGoods',
+      'SetNull',
     ]),
     getTypeName (typeid) {
       return (this.types.list.filter(x => x.TypeId === typeid)[0] || {}).TypeName
@@ -167,6 +168,7 @@ export default {
     },
     handleEdit (index, row) {
       // 编辑
+      this.SetNull()
       this.$router.push({ name: 'editGoods', query: { id: row.GoodsId } })
     },
     handleDelete (index, row) {
@@ -194,6 +196,7 @@ export default {
       this.getList()
     },
     addRole () {
+      this.SetNull()
       this.$router.push({ name: 'editGoods' })
     },
   },

src/pages/system/goodsManager/goodsTypeManager/index.vue

@@ -41,6 +41,9 @@
         <el-table-column
           prop="CaseName"
           label="所属案场">
+          <template slot-scope="scope">
+            <span>{{getCaseName(scope.row.CaseId)}}</span>
+          </template>
         </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
@@ -107,14 +110,17 @@ export default {
       this.currentList = []
       this.getList()
     },
+    getCaseName (caseid) {
+      return (this.cases.filter(x => x.CaseId === caseid)[0] || {}).CaseName
+    },
     getList () { // 获取列表
       this.$ajax(this.$api.goodsManager.getGoodsTypeList.url, {
         method: this.$api.goodsManager.getGoodsTypeList.method,
         queryData: { ...this.postData, caseid: this.CaseId }
       }).then(res => {
-        for (var n = 0; n < res.list.length; n++) {
-          res.list[n].CaseName = this.cases.filter(x => x.CaseId === res.list[n].CaseId)[0].CaseName
-        }
+        // for (var n = 0; n < res.list.length; n++) {
+        //   res.list[n].CaseName = this.cases.filter(x => x.CaseId === res.list[n].CaseId)[0].CaseName
+        // }
         this.currentList = res.list
         this.postData.page = res.page
         this.total = res.pagenum

src/pages/system/marketingActivities/activitiesList/index.vue

@@ -0,0 +1,214 @@
+<template>
+  <div class="subPage">
+    <div class="title">
+      活动列表
+    </div>
+    <div class="head-div">
+      每页数量/条
+      <template>
+        <el-select v-model="postData.pageSize" placeholder="请选择">
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </template>
+    </div>
+    <!-- 包含 按钮的div -->
+    <div class="button-div">
+      <el-row>
+        <el-button type="warning" style="float: right;">重置</el-button>
+        <el-button type="primary" style="float: right; margin-right: 10px;" @click="clickList">查询</el-button>
+        <el-button type="success" style="float: right;" @click="redirection('addActivities')">新增</el-button>
+      </el-row>
+    </div>
+    <div class="content">
+      <template>
+        <el-table
+          :data="tableData"
+          border
+          style="width: 100%">
+          <el-table-column
+            prop="CaseName"
+            label="案场"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            prop="ActivityName"
+            label="活动名称"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            prop="ActivityType"
+            label="活动类型">
+            <template slot-scope="scope">
+              <span>{{getActivitName(scope.row.ActivityType)}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="giftLabel"
+            label="卡券名称">
+            <template slot-scope="scope">
+              <span>{{getGiftLabel(scope.row.ResourceDesc)}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="address"
+            label="赠送数量">
+            <template slot-scope="scope">
+              <span>{{getNum(scope.row.ResourceDesc)}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="Status"
+            label="状态">
+            <template slot-scope="scope">
+              <span>{{scope.row.Status === 0 ? '启用' : '停用'}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="address"
+            label="操作">
+            <template slot-scope="scope">
+              <div v-if="scope.row.Status === 0">
+                <a href="#" @click="disable(scope.row.ActivityId)">停用</a>&nbsp;&nbsp;<a href="#" @click="delet(scope.row.ActivityId)">删除</a>
+              </div>
+              <div v-else>
+                <a href="#" @click="normal(scope.row.ActivityId)">启用</a>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </template>
+    </div>
+    <div class="block">
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page.sync="currentPage2"
+        :page-size="Number(value)"
+        layout="prev, pager, next, jumper"
+        :total="total">
+      </el-pagination>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data () {
+    return {
+      options: [{ // 下拉框数数据,分页的每页多少
+        value: '5',
+        label: '5'
+      }, {
+        value: '10',
+        label: '10'
+      }, {
+        value: '20',
+        label: '20'
+      }],
+      value: '10', // 一页多少数据
+      tableData: [],
+      postData: { // 表格搜索条件 //caseid: '', // 案场id
+        page: 1, // 当前页码
+        pageSize: 10, // 请求数据量
+      },
+      currentPage2: 1,
+      total: 0 // 数据条数
+    }
+  },
+  mounted () {
+    this.getList()
+  },
+  methods: {
+    getNum (desc) {
+      if (desc === '') {
+        return 0
+      }
+      const descjson = JSON.parse(desc)
+      return descjson.giftNum
+    },
+    getActivitName (desc) { // 根据活动类型编号,获取活动名称
+      if (desc === '1') {
+        return '注册类型'
+      }
+      return '未知类型'
+    },
+    getGiftLabel (desc) {
+      if (desc === '') {
+        return '未知卡券'
+      }
+      const descjson = JSON.parse(desc)
+      return descjson.giftLabel
+    },
+    handleSizeChange (val) {
+      console.log(`每页 ${val} 条`)
+    },
+    handleCurrentChange (val) {
+      console.log(`当前页: ${val}`)
+      this.$data.postData.page = val
+      this.getList()
+    },
+    redirection (pathName) { // 重定向
+      this.$router.push({ name: pathName })
+    },
+    getList () { // 获取数据列表
+      this.$ajax(this.$api.marketingActivities.getMarketingList.url, {
+        method: this.$api.marketingActivities.getMarketingList.method,
+        queryData: { ...this.postData }
+      }).then(res => {
+        this.tableData = res.list
+        this.postData.page = res.page
+        this.total = res.pagenum
+      })
+    },
+    disable (ActivityId) { // 停用
+      this.$ajax(this.$api.marketingActivities.delMarketingDisable.url, {
+        method: this.$api.marketingActivities.delMarketingDisable.method,
+        urlData: { activityId: ActivityId }
+      }).then(res => {
+        this.$message({
+          type: 'success',
+          message: '操作成功'
+        })
+        this.getList()
+      })
+    },
+    normal (ActivityId) { // 启用
+      this.$ajax(this.$api.marketingActivities.delMarketingNormal.url, {
+        method: this.$api.marketingActivities.delMarketingNormal.method,
+        urlData: { activityId: ActivityId }
+      }).then(res => {
+        this.$message({
+          type: 'success',
+          message: '操作成功'
+        })
+        this.getList()
+      })
+    },
+    delet (ActivityId) { // 删除
+      this.$ajax(this.$api.marketingActivities.delMarketing.url, {
+        method: this.$api.marketingActivities.delMarketing.method,
+        urlData: { activityId: ActivityId }
+      }).then(res => {
+        this.$message({
+          type: 'success',
+          message: '操作成功'
+        })
+        this.getList()
+      })
+    },
+    clickList () { // 点击查询按钮
+      this.$data.postData.page = 1
+      this.getList()
+    }
+  },
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+@import "page.scss";
+</style>

src/pages/system/marketingActivities/activitiesList/page.scss

@@ -0,0 +1,33 @@
+
+// 活动列表 标题
+.title{
+  font-size: 28px;
+  color: darkgray;
+  width: 100%;
+  border-bottom: 1px solid darkgray;
+  padding-left: 30px;
+  padding-top: 20px;
+  padding-bottom: 20px;
+}
+
+// 头部div
+.head-div {
+  width: 100%;
+  margin-left: 30px;
+  margin-right: 30px;
+  padding-top: 30px;
+}
+
+.button-div {
+  width: 100%;
+  margin-left: 30px;
+  margin-right: 30px;
+  margin-bottom: 30px;
+  float: right;
+}
+// 表格 div
+.content {
+  width: 100%;
+  margin-left: 30px;
+  margin-right: 30px;
+}

src/pages/system/marketingActivities/addActivities/index.vue

@@ -0,0 +1,200 @@
+<template>
+  <div class="subPage">
+    <div class="content">
+      <div class="input-div">
+        <div style="float: left; font-size: 20px;">
+          活动名称:
+        </div>
+        <div style="float: left; margin-left: 30px;">
+          <template>
+            <el-input v-model="activityName" placeholder="请输入内容" style="width: 300px;"></el-input>
+          </template>
+        </div>
+      </div>
+      <div class="input-div">
+        <div style="float: left; font-size: 20px;">
+          活动类型:
+        </div>
+        <div style="float: left; margin-left: 30px;">
+          <template>
+            <el-select v-model="regValue" placeholder="请选择" style="width: 300px;">
+              <el-option
+                v-for="item in regOptions"
+                :key="item.regValue"
+                :label="item.label"
+                :value="item.regValue">
+              </el-option>
+            </el-select>
+          </template>
+        </div>
+      </div>
+      <div class="input-div">
+        <div style="float: left; font-size: 20px;">
+          赠券卡券:
+        </div>
+        <div style="float: left; margin-left: 30px;">
+          <template>
+            <el-select v-model="giftValue" placeholder="请选择" style="width: 300px;">
+              <el-option
+                v-for="item in giftOptions"
+                :key="item.giftValue"
+                :label="item.label"
+                :value="item.giftValue">
+              </el-option>
+            </el-select>
+          </template>
+        </div>
+      </div>
+      <div class="input-div">
+        <div style="float: left; font-size: 20px;">
+           赠券数量:
+        </div>
+        <div style="float: left; margin-left: 30px;">
+          <template>
+            <el-input v-model="giftNum" placeholder="请输入内容" style="width: 300px;"></el-input>
+          </template>
+        </div>
+      </div>
+      <div class="input-div">
+        <div style="float: left; font-size: 20px;">
+          活动描述:
+        </div>
+        <div style="float: left; margin-left: 30px;">
+          <template>
+            <el-input
+              type="textarea"
+              :rows="10"
+              placeholder="请输入内容"
+              v-model="desc" style="width: 300px; height: 200px;">
+            </el-input>
+          </template>
+        </div>
+      </div>
+      <div class="input-div">
+        <el-row>
+          <el-button type="warning" style="float: right;" @click="redirection('activitiesList')">返回</el-button>
+          <el-button type="primary" style="float: right; margin-right: 10px;" @click="submitData">提交</el-button>
+        </el-row>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  data () {
+    return {
+      msg: '添加活动',
+      postData: {
+        TableId: '', // 桌位id
+        AreaId: '', // 区域id
+        CaseId: '', // 案场id
+        OrgId: '', // 机构id
+        TableNo: '', // 桌位编号
+        Order: '', // 排序
+      },
+      regOptions: [{
+        regValue: '1',
+        label: '注册类型'
+      }],
+      regValue: '',
+      giftOptions: [], // [{giftValue: '1',label: '饮品通用券'}, {giftValue: '2',label: '课程通用券'}, {giftValue: '3',label: '小小外交官体验券'}]
+      giftValue: '',
+      giftLabel: '',
+      activityName: '', // 活动名称
+      activityType: this.regValue, // 活动类型
+      resourceDesc: '', // 存储JSON (赠券类型,赠送数量,活动描述)
+      giftNum: 0, // 赠送数量
+      desc: '', // 活动描述
+      giftList: [] // 赠券卡券数据体
+    }
+  },
+  mounted () {
+    this.getCouponList()
+  },
+  computed: {
+    ...mapState({
+      defaultCaseId: x => x.app.cases.default,
+    }),
+    giftData: {
+      get () {
+        let jsonData = this.$data.giftList
+        console.log('请求到的:' + this.$data.giftList)
+        let data = []
+        for (let i = 0; i < jsonData.length; i++) {
+          let tempData = []
+          tempData.giftValue = jsonData[i].CouponId
+          tempData.label = jsonData[i].CouponName
+          console.log('卡券编号:' + tempData.giftValue + ' ' + tempData.label)
+          data.push(tempData)
+        }
+        console.log('giftData 数据:')
+        return data
+      }
+    }
+  },
+  methods: {
+    redirection (pathName) { // 重定向
+      this.$router.push({ name: pathName })
+    },
+    submitData () { // 提交数据
+      // 判断是否提交成功
+      // 提交成功,跳转页面
+      // let subData = []
+      // subData.activityName = this.$data.activityName
+      // subData.activityType = this.$data.regValue
+      // let obj = []
+      // obj.giftValue = this.$data.giftValue
+      // obj.giftNum = this.$data.giftNum
+      // obj.desc = this.$data.desc
+      // subData.resourceDesc = obj
+
+      // console.log(subData)
+
+      // let obj = []
+      // obj.giftValue = this.$data.giftValue
+      // obj.giftNum = this.$data.giftNum
+      // obj.desc = this.$data.desc
+
+      let tempGiftOptions = this.$data.giftOptions
+      let tempGiftValue = this.$data.giftValue
+      for (let i = 0; i < tempGiftOptions.length; i++) {
+        if (tempGiftOptions[i].giftValue === tempGiftValue) {
+          this.$data.giftLabel = tempGiftOptions[i].label
+          break
+        }
+      }
+      let jsonString = '{"giftValue":"' + this.$data.giftValue + '","giftLabel":"' + this.$data.giftLabel + '","giftNum":"' + this.$data.giftNum + '","desc":"' + this.$data.desc + '"}'
+
+      this.$ajax(this.$api.marketingActivities.addMarketing.url, {
+        method: this.$api.marketingActivities.addMarketing.method,
+        queryData: {activityName: this.$data.activityName, activityType: this.$data.regValue, resourceDesc: jsonString, CaseId: this.defaultCaseId}
+      }).then(res => {
+        // console.log(res)
+        this.$message({
+          type: 'success',
+          message: '操作成功'
+        })
+        // 跳转路由
+        this.redirection('activitiesList')
+      })
+    },
+    getCouponList () {
+      this.$ajax(this.$api.marketingActivities.getCouponList.url, {
+        method: this.$api.marketingActivities.getCouponList.method,
+        queryData: {}
+      }).then(res => {
+        // console.log(res)
+        this.giftList = res.list
+        this.giftOptions = this.giftData
+      })
+    },
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+@import "page.scss";
+</style>

src/pages/system/marketingActivities/addActivities/page.scss

@@ -0,0 +1,39 @@
+
+.content {
+  margin-left: auto;
+  margin-right: auto;
+  width: 800px;
+  height: 100%;
+  position: relative;
+}
+
+.input-div {
+  position: absolute;
+  margin-top: 20px;
+  width: 490px;
+}
+
+.input-div:nth-child(1) {
+  margin-top: 20px;
+}
+
+.input-div:nth-child(2) {
+  margin-top: 80px;
+}
+
+.input-div:nth-child(3) {
+  margin-top: 140px;
+}
+
+.input-div:nth-child(4) {
+  margin-top: 200px;
+}
+
+.input-div:nth-child(5) {
+  margin-top: 260px;
+}
+
+.input-div:nth-child(6) {
+  margin-top: 560px;
+  margin-left: -80px;
+}

src/pages/system/marketingActivities/index.vue

@@ -0,0 +1,19 @@
+<template>
+  <div class="mainPage">
+    <router-view></router-view>
+  </div>
+</template>
+
+<script>
+export default {
+  name: '',
+  data () {
+    return {}
+  },
+  components: {}
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+</style>

src/pages/system/page.js

@@ -92,6 +92,8 @@ import cardList from './cardAndCouponManager/cardManager/index' // 卡列表
 import editCard from './cardAndCouponManager/cardManager/edit' // 编辑卡
 import couponList from './cardAndCouponManager/couponManager/index' // 券列表
 import editCoupon from './cardAndCouponManager/couponManager/edit' // 编辑券
+import bodyBuildingCardManager from './cardAndCouponManager/bodyBuildingCardManager/index' // 健身卡列表
+import editBodyBuildingCard from './cardAndCouponManager/bodyBuildingCardManager/edit' // 健身卡编辑
 import givingRecords from './cardAndCouponManager/givingRecords' // 赠送记录
 import vipList from './cardAndCouponManager/vipManager/index' // vip列表
 import editVip from './cardAndCouponManager/vipManager/edit' // 编辑vip
@@ -99,6 +101,10 @@ import activateVip from './cardAndCouponManager/vipManager/activateVip' // 激
 
 import caseRecord from './newOrder/caseRecord/index' // 月记录
 
+import marketingActivities from './marketingActivities/index' // 营销活动
+import activitiesList from './marketingActivities/activitiesList/index' // 活动列表
+import addActivities from './marketingActivities/addActivities/index' // 添加活动
+
 export default {
   router: [
     {
@@ -514,6 +520,16 @@ export default {
             component: editCoupon,
             children: []
           }]
+        }, { // 健身卡列表
+          path: 'bodyBuildingCardManager',
+          name: 'bodyBuildingCardManager',
+          component: bodyBuildingCardManager,
+          children: [{ // 编辑健身卡
+            path: 'editBodyBuildingCard',
+            name: 'editBodyBuildingCard',
+            component: editBodyBuildingCard,
+            children: []
+          }]
         }, { // 赠送记录
           path: 'givingRecords',
           name: 'givingRecords',
@@ -534,6 +550,21 @@ export default {
             component: activateVip,
             children: []
           }]
+        }, { // 营销活动
+          path: 'marketingActivities',
+          name: 'marketingActivities',
+          component: marketingActivities,
+          children: [{
+            path: 'activitiesList',
+            name: 'activitiesList',
+            component: activitiesList,
+            children: [{ // 添加活动
+              path: 'addActivities',
+              name: 'addActivities',
+              component: addActivities,
+              children: []
+            }]
+          }]
         }]
       }]
     },

src/pages/system/systemSet/userManager/add.vue

@@ -14,6 +14,14 @@
             </div>
           </div>
         </li>
+        <li class="flex-h" style="padding: 0;margin: 0;">
+          <span></span>
+          <div class="flex-item">
+            <div style="min-height: 0;">
+              <span style="font-size:10px;color:#bbb;">默认密码：123456</span>
+            </div>
+          </div>
+        </li>
         <li class="flex-h">
           <span>用户头像：</span>
           <div class="flex-item">
@@ -216,6 +224,25 @@ export default {
           message: '手机号不能为空'
         })
         return false
+      } else {
+        var myreg = /^[1][3,4,5,6,7,8][0-9]{9}$/
+        if (!myreg.test(this.postData.Phone)) {
+          this.$message({
+            type: 'error',
+            message: '请输入正确的手机号！'
+          })
+          return false
+        }
+      }
+      if (this.postData.Email !== '') {
+        var emailreg = new RegExp('^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$')
+        if (!emailreg.test(this.postData.Email)) {
+          this.$message({
+            type: 'error',
+            message: '邮箱格式不正确！'
+          })
+          return false
+        }
       }
       if (this.postData.BelongCaseId === '') this.postData.BelongCaseId = this.CaseId
       this.$ajax(this.$api.systemSet.addUser.url, {

src/pages/system/systemSet/userManager/edit.vue

@@ -14,6 +14,14 @@
             </div>
           </div>
         </li>
+        <li class="flex-h" style="padding: 0;margin: 0;">
+          <span></span>
+          <div class="flex-item">
+            <div style="min-height: 0;">
+              <span style="font-size:10px;color:#bbb;">默认密码：123456</span>
+            </div>
+          </div>
+        </li>
         <li class="flex-h">
           <span>用户头像：</span>
           <div class="flex-item">
@@ -234,6 +242,25 @@ export default {
           message: '手机号不能为空'
         })
         return false
+      } else {
+        var myreg = /^[1][3,4,5,6,7,8][0-9]{9}$/
+        if (!myreg.test(this.postData.Phone)) {
+          this.$message({
+            type: 'error',
+            message: '请输入正确的手机号！'
+          })
+          return false
+        }
+      }
+      if (this.postData.Email !== '') {
+        var emailreg = new RegExp('^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$')
+        if (!emailreg.test(this.postData.Email)) {
+          this.$message({
+            type: 'error',
+            message: '邮箱格式不正确！'
+          })
+          return false
+        }
       }
       if (this.postData.BelongCaseId === '') this.postData.BelongCaseId = this.BelongCaseId
       if (this.postData.TagIds === '') this.postData.TagIds = this.TagIds.join(',')

src/pages/system/systemSet/userManager/index.vue

@@ -76,12 +76,12 @@
         <el-table-column
           prop="WorkNo"
           label="工号"
-          width="200">
+          width="150">
         </el-table-column>
         <el-table-column
           prop="Phone"
           label="手机号"
-          width="150">
+          width="200">
         </el-table-column>
         <el-table-column
           prop="UserTypeNames"
@@ -231,7 +231,7 @@ export default {
       })
     },
     resetPasswd (index, row) { // 重置密码
-      this.$confirm('确认重置此用户密码?', '提示', {
+      this.$confirm('确认重置此用户密码为：123456?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

src/store/app.js

@@ -56,7 +56,8 @@ export default {
       default: '',
     },
     roles: [],
-    user: {}
+    user: {},
+    clientUrl: '',
   },
   mutations: {
     init (state, data) { // 这里的state对应着上面这个state
@@ -64,7 +65,7 @@ export default {
       state.roles = data.roles
       state.user = data.user
       state.menus = packChildren(data.menus)
-
+      state.clientUrl = data.clienturl
       let defaultCase = ''
       for (let i = 0; i < data.cases.length; i++) {
         if (data.cases[i].IsBelong === 1) {

src/store/card/card.js

@@ -0,0 +1,81 @@
+import ajax from '../../util/ajax'
+import api from '../../util/api'
+
+export default {
+  namespaced: true,
+  state: {
+    cardList: [],
+  },
+  mutations: {
+    updateList (state, payload) {
+      state.cardList = payload || []
+    },
+  },
+  actions: {
+    GetCardList ({ commit }, payload) { // 获取卡列表
+      return new Promise((resolve, reject) => {
+        ajax(api.cardManager.cardList.url, {
+          method: api.cardManager.cardList.method,
+          queryData: {
+            ...payload,
+          }
+        }).then(res => {
+          commit('updateList', res)
+          resolve(res)
+        }).catch(reject)
+      })
+    },
+    addCard ({ commit }, payload) { // 新增卡
+      return new Promise((resolve, reject) => {
+        ajax(api.cardManager.addCard.url, {
+          method: api.cardManager.addCard.method,
+          data: {
+            info: JSON.stringify(payload)
+          }
+        }).then(res => {
+          resolve(res)
+        }).catch(reject)
+      })
+    },
+    getCardById ({ commit }, { id }) { // 获取卡详情
+      return new Promise((resolve, reject) => {
+        ajax(api.cardManager.getCardById.url, {
+          method: api.cardManager.getCardById.method,
+          urlData: {
+            id,
+          }
+        }).then(res => {
+          resolve(res)
+        }).catch(reject)
+      })
+    },
+    editCard ({ commit }, payload) { // 编辑更新卡
+      return new Promise((resolve, reject) => {
+        ajax(api.cardManager.editCard.url, {
+          method: api.cardManager.editCard.method,
+          data: {
+            info: JSON.stringify(payload)
+          },
+          urlData: {
+            id: payload.CardId
+          },
+        }).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/channel/channel.js

@@ -0,0 +1,29 @@
+import ajax from '../../util/ajax'
+import api from '../../util/api'
+
+export default {
+  namespaced: true,
+  state: {
+    channelList: [],
+  },
+  mutations: {
+    updateList (state, payload) {
+      state.channelList = payload || []
+    },
+  },
+  actions: {
+    GetChannelListList ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        ajax(api.channelManager.getChannelList.url, {
+          method: api.channelManager.getChannelList.method,
+          queryData: {
+            ...payload,
+          }
+        }).then(res => {
+          commit('updateList', res.list)
+          resolve(res)
+        }).catch(reject)
+      })
+    },
+  }
+}

src/store/coupon/coupon.js

@@ -0,0 +1,81 @@
+import ajax from '../../util/ajax'
+import api from '../../util/api'
+
+export default {
+  namespaced: true,
+  state: {
+    couponList: [],
+  },
+  mutations: {
+    updateList (state, payload) {
+      state.couponList = payload || []
+    },
+  },
+  actions: {
+    GetCouponList ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        ajax(api.couponManager.couponList.url, {
+          method: api.couponManager.couponList.method,
+          queryData: {
+            ...payload,
+          }
+        }).then(res => {
+          commit('updateList', res)
+          resolve(res)
+        }).catch(reject)
+      })
+    },
+    addCoupon ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        ajax(api.couponManager.addCoupon.url, {
+          method: api.couponManager.addCoupon.method,
+          data: {
+            info: JSON.stringify(payload)
+          }
+        }).then(res => {
+          resolve(res)
+        }).catch(reject)
+      })
+    },
+    getCouponById ({ commit }, { id }) {
+      return new Promise((resolve, reject) => {
+        ajax(api.couponManager.getCouponById.url, {
+          method: api.couponManager.getCouponById.method,
+          urlData: {
+            id,
+          }
+        }).then(res => {
+          resolve(res)
+        }).catch(reject)
+      })
+    },
+    editCoupon ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        ajax(api.couponManager.editCoupon.url, {
+          method: api.couponManager.editCoupon.method,
+          data: {
+            info: JSON.stringify(payload)
+          },
+          urlData: {
+            id: payload.CouponId
+          },
+        }).then(res => {
+          resolve(res)
+        }).catch(reject)
+      })
+    },
+    GiveCoupon ({ commit }, { id, users }) {
+      return new Promise((resolve, reject) => {
+        ajax(api.couponManager.giveCoupon.url, {
+          method: api.couponManager.giveCoupon.method,
+          urlData: {
+            id,
+            users
+          },
+        }).then(res => {
+          resolve(res)
+        }).catch(reject)
+      })
+    }
+  }
+}

src/store/course/course.js

@@ -21,16 +21,19 @@ export default {
   },
   actions: {
     GetCourseList ({ commit }, payload) {
-      ajax(api.course.list.url, {
-        method: api.course.list.method,
-        queryData: {
-          ...payload,
-        }
-      }).then(res => {
-        commit('updateList', res)
-        if (payload.callback) {
-          payload.callback()
-        }
+      return new Promise((resolve, reject) => {
+        ajax(api.course.list.url, {
+          method: api.course.list.method,
+          queryData: {
+            ...payload,
+          }
+        }).then(res => {
+          commit('updateList', res)
+          resolve(res)
+          if (payload.callback) {
+            payload.callback()
+          }
+        }).catch(reject)
       })
     },
     GetCourseByID ({ commit }, { id }) {

src/store/customer/customer.js

@@ -5,11 +5,15 @@ export default {
   namespaced: true,
   state: {
     customer: {},
+    customers: {},
   },
   mutations: {
     updateInfo (state, payload) {
       state.customer = payload || {}
     },
+    updateList (state, payload) {
+      state.customers = payload || {}
+    }
   },
   actions: {
     GetCustomerByTel ({ commit }, { tel }) {
@@ -25,6 +29,22 @@ export default {
         }).catch(reject)
       })
     },
+    GetCustomerList ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        ajax(api.customerManager.getCustomerList.url, {
+          method: api.customerManager.getCustomerList.method,
+          queryData: {
+            ...payload
+          }
+        }).then(res => {
+          commit('updateList', res)
+          resolve(res)
+        }).catch(reject)
+      })
+    },
+    SetCustomerListNull ({ commit }) {
+      commit('updateList', {})
+    },
     SetCustomerInfoNull ({ commit }) {
       commit('updateInfo', {})
     }

src/store/goods/goods.js

@@ -25,23 +25,29 @@ export default {
   },
   actions: {
     GetGoodsList ({ commit }, payload) {
-      ajax(api.goodsManager.getGoodsList.url, {
-        method: api.goodsManager.getGoodsList.method,
-        queryData: {
-          ...payload,
-        }
-      }).then(res => {
-        commit('updateList', res)
+      return new Promise((resolve, reject) => {
+        ajax(api.goodsManager.getGoodsList.url, {
+          method: api.goodsManager.getGoodsList.method,
+          queryData: {
+            ...payload,
+          }
+        }).then(res => {
+          commit('updateList', res)
+          resolve(res)
+        }).catch(reject)
       })
     },
     GetGoodTypes ({ commit }, payload) {
-      ajax(api.goodsManager.getGoodsTypeList.url, {
-        method: api.goodsManager.getGoodsTypeList.method,
-        queryData: {
-          ...payload,
-        }
-      }).then(res => {
-        commit('updateTypes', res)
+      return new Promise((resolve, reject) => {
+        ajax(api.goodsManager.getGoodsTypeList.url, {
+          method: api.goodsManager.getGoodsTypeList.method,
+          queryData: {
+            ...payload,
+          }
+        }).then(res => {
+          commit('updateTypes', res)
+          resolve(res)
+        }).catch(reject)
       })
     },
     GetGoodSpecs ({ commit }, payload) {

src/store/index.js

@@ -26,6 +26,9 @@ export const modules = {
   cmscase: () => require('./cms/case').default,
   caserecord: () => require('./case/record').default,
   vip: () => require('./card/vip').default,
+  card: () => require('./card/card').default,
+  coupon: () => require('./coupon/coupon').default,
+  channel: () => require('./channel/channel').default,
   customer: () => require('./customer/customer').default,
   user: () => require('./system/user').default,
 }

src/util/api.js

@@ -588,13 +588,85 @@ const $api = {
     vipbycode: {
       method: 'get',
       url: `${baseUrl}${common}/vipcard/:code`
-    }
+    },
+    cardList: {
+      method: 'get',
+      url: `${baseUrl}${common}/card`
+    },
+    addCard: {
+      method: 'post',
+      url: `${baseUrl}${common}/card`
+    },
+    editCard: {
+      method: 'put',
+      url: `${baseUrl}${common}/card/:id`
+    },
+    getCardById: {
+      method: 'get',
+      url: `${baseUrl}${common}/card/:id`
+    },
+    giveCard: {
+      method: 'post',
+      url: `${baseUrl}${common}/card/:id/to/:users`
+    },
+  },
+  couponManager: {
+    couponList: {
+      method: 'get',
+      url: `${baseUrl}${common}/coupon`
+    },
+    addCoupon: {
+      method: 'post',
+      url: `${baseUrl}${common}/coupon`
+    },
+    editCoupon: {
+      method: 'put',
+      url: `${baseUrl}${common}/coupon/:id`
+    },
+    getCouponById: {
+      method: 'get',
+      url: `${baseUrl}${common}/coupon/:id`
+    },
+    giveCoupon: {
+      method: 'post',
+      url: `${baseUrl}${common}/coupon/:id/to/:users`
+    },
   },
   customerManager: {
     getByTel: {
       method: 'get',
       url: `${baseUrl}${common}/customer/tel/:tel`
+    },
+    getCustomerList: { // 获取会员列表
+      method: 'get',
+      url: `${baseUrl}${common}/customer`
     }
   },
+  marketingActivities: { // 营销活动
+    getMarketingList: { // 查询所有
+      method: 'get',
+      url: `${baseUrl}${common}/marketing/list`
+    },
+    addMarketing: { // 添加
+      method: 'post',
+      url: `${baseUrl}${common}/marketing`
+    },
+    delMarketing: { // 删除
+      method: 'delete',
+      url: `${baseUrl}${common}/marketing/:activityId`
+    },
+    delMarketingNormal: { // 启用
+      method: 'put',
+      url: `${baseUrl}${common}/marketing/normal/:activityId`
+    },
+    delMarketingDisable: { // 停用
+      method: 'put',
+      url: `${baseUrl}${common}/marketing/disable/:activityId`
+    },
+    getCouponList: { // 获取赠券卡券类型
+      method: 'get',
+      url: `${baseUrl}${common}/coupon`
+    }
+  }
 }
 export default $api