ytj

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

@@ -0,0 +1,39 @@
+<template>
+  <div class="subPage">
+    1
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  name: '',
+  data () {
+    return {}
+  },
+  mounted () {
+    this.$nextTick(function () {})
+  },
+  computed: {
+    ...mapState({
+      cases: x => x.app.cases.list,
+      defaultCaseId: x => x.app.cases.default
+    }),
+    CaseId: {
+      get () {
+        return this.postData.caseid || this.defaultCaseId
+      },
+      set (val) {
+        this.postData.caseid = val
+      }
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+</style>

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

@@ -0,0 +1,155 @@
+<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='addChannel'>新增渠道</el-button>
+        </div>
+        <ul>
+          <li>
+            <!-- <span>选择案场：</span> -->
+            <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="currentList"
+        stripe
+        style="width: 100%">
+        <el-table-column
+          prop="CaseName"
+          label="案场">
+        </el-table-column>
+        <el-table-column
+          prop="ChannelName"
+          label="渠道名称">
+        </el-table-column>
+        <el-table-column label="操作">
+          <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="handleDelete(scope.$index, scope.row)">删除</el-button>
+          </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>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  name: '',
+  data () {
+    return {
+      total: 0,
+      postData: { // 表格搜索条件
+        caseid: '', // 案场id
+        page: 1, // 当前页码
+        pagesize: 10, // 请求数据量
+      },
+      currentList: []
+    }
+  },
+  mounted () {
+    this.$nextTick(function () {
+      this.getList()
+    })
+  },
+  computed: {
+    ...mapState({
+      cases: x => x.app.cases.list,
+      defaultCaseId: x => x.app.cases.default
+    }),
+    CaseId: {
+      get () {
+        return this.postData.caseid || this.defaultCaseId
+      },
+      set (val) {
+        this.postData.caseid = val
+      }
+    }
+  },
+  methods: {
+    search () { // 搜索
+      this.postData.page = 1
+      this.currentList = []
+      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.total = res.pagenum
+      })
+    },
+    handleCurrentChange (val) { // 跳转到分页
+      this.getList()
+    },
+    handleEdit (index, row) { // 编辑
+      this.$router.push({ name: 'editChannel', query: { id: row.ChannelId } })
+    },
+    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: '已取消删除'
+        })
+      })
+    },
+    addChannel () {
+      this.$router.push({ name: 'addChannel' })
+    }
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+@import "page.scss";
+</style>

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

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

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

@@ -0,0 +1,39 @@
+<template>
+  <div class="subPage">
+    1
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  name: '',
+  data () {
+    return {}
+  },
+  mounted () {
+    this.$nextTick(function () {})
+  },
+  computed: {
+    ...mapState({
+      cases: x => x.app.cases.list,
+      defaultCaseId: x => x.app.cases.default
+    }),
+    CaseId: {
+      get () {
+        return this.postData.caseid || this.defaultCaseId
+      },
+      set (val) {
+        this.postData.caseid = val
+      }
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+</style>

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

@@ -0,0 +1,156 @@
+<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='addChannel'>新增饮品优惠券</el-button>
+          <el-button size="mini" type="success" @click='addChannel'>新增课程优惠券</el-button>
+        </div>
+        <ul>
+          <li>
+            <!-- <span>选择案场：</span> -->
+            <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="currentList"
+        stripe
+        style="width: 100%">
+        <el-table-column
+          prop="CaseName"
+          label="案场">
+        </el-table-column>
+        <el-table-column
+          prop="ChannelName"
+          label="渠道名称">
+        </el-table-column>
+        <el-table-column label="操作">
+          <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="handleDelete(scope.$index, scope.row)">删除</el-button>
+          </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>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  name: '',
+  data () {
+    return {
+      total: 0,
+      postData: { // 表格搜索条件
+        caseid: '', // 案场id
+        page: 1, // 当前页码
+        pagesize: 10, // 请求数据量
+      },
+      currentList: []
+    }
+  },
+  mounted () {
+    this.$nextTick(function () {
+      this.getList()
+    })
+  },
+  computed: {
+    ...mapState({
+      cases: x => x.app.cases.list,
+      defaultCaseId: x => x.app.cases.default
+    }),
+    CaseId: {
+      get () {
+        return this.postData.caseid || this.defaultCaseId
+      },
+      set (val) {
+        this.postData.caseid = val
+      }
+    }
+  },
+  methods: {
+    search () { // 搜索
+      this.postData.page = 1
+      this.currentList = []
+      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.total = res.pagenum
+      })
+    },
+    handleCurrentChange (val) { // 跳转到分页
+      this.getList()
+    },
+    handleEdit (index, row) { // 编辑
+      this.$router.push({ name: 'editChannel', query: { id: row.ChannelId } })
+    },
+    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: '已取消删除'
+        })
+      })
+    },
+    addChannel () {
+      this.$router.push({ name: 'addChannel' })
+    }
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+@import "page.scss";
+</style>

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

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

src/pages/system/cardAndCouponManager/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/cardAndCouponManager/vipManager/activateVip.vue

@@ -0,0 +1,165 @@
+<template>
+  <div class="subPage">
+    <div class="inputCardNo flex-h">
+      <div class="flex-item">
+        <div>
+          <el-input
+            placeholder="请输入VIP卡号"
+            v-model="postData.CardNo"
+            clearable>
+          </el-input>
+        </div>
+      </div>
+      <el-button type="success" @click='activateVip'>激活</el-button>
+    </div>
+    <el-dialog
+      title="VIP卡激活"
+      :visible.sync="centerDialogVisible"
+      width="30%"
+      center>
+      <div>
+        <ul class="activateList">
+          <li class="flex-h">
+            <span>卡号：</span>
+            <div class="flex-item">
+              <div>
+                <span>{{activateData.CardNo}}</span>
+              </div>
+            </div>
+          </li>
+          <li class="flex-h">
+            <span>金额：</span>
+            <div class="flex-item">
+              <div>
+                <span>{{activateData.Price}}</span>
+              </div>
+            </div>
+          </li>
+          <li class="flex-h">
+            <span>销售：</span>
+            <div class="flex-item" style="margin-right:10px;">
+              <div>
+                <el-input
+                  placeholder="请输入销售手机号"
+                  v-model="sellerPhone"
+                  clearable>
+                </el-input>
+              </div>
+            </div>
+            <el-button type="success" @click='searchSeller'>查询</el-button>
+          </li>
+          <li class="flex-h">
+            <span>销售姓名：</span>
+            <div class="flex-item">
+              <div>
+                <span>{{activateData.SellerName}}</span>
+              </div>
+            </div>
+          </li>
+          <li class="flex-h">
+            <span>绑定用户：</span>
+            <div class="flex-item">
+              <div>
+                <el-input
+                  placeholder="请输入手机号"
+                  v-model="activateData.UserPhone"
+                  clearable>
+                </el-input>
+              </div>
+            </div>
+          </li>
+          <li class="flex-h">
+            <span>用户姓名：</span>
+            <div class="flex-item">
+              <div>
+                <el-input
+                  placeholder="请输入真实姓名"
+                  v-model="activateData.UserName"
+                  clearable>
+                </el-input>
+              </div>
+            </div>
+          </li>
+        </ul>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="centerDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="centerDialogVisible = false">激 活</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+export default {
+  name: '',
+  data () {
+    return {
+      centerDialogVisible: true,
+      postData: {
+        CardNo: '', // 卡号
+      },
+      activateData: {
+        CardNo: '111111111', // 卡号
+        Price: '1000', // 金额
+        SellerName: '', // 销售姓名
+        CaseName: 'xxx', // 案场名称
+        UserPhone: '', // 用户手机号
+        UserName: '', // 用户姓名
+      },
+      sellerPhone: '', // 销售手机号
+    }
+  },
+  computed: {
+    ...mapState({
+      cases: x => x.app.cases.list,
+      defaultCaseId: x => x.app.cases.default,
+      OrgId: x => x.app.user.OrgId,
+    }),
+    CaseId: {
+      get () {
+        return this.postData.CaseId === '' ? this.defaultCaseId || '' : this.postData.CaseId
+      },
+      set (val) {
+        this.postData.CaseId = val
+      }
+    }
+  },
+  created () { },
+  components: {},
+  methods: {
+    searchSeller () { // 查询销售
+    },
+    activateVip () { // 激活vip
+      this.centerDialogVisible = true
+    },
+  },
+  mounted () { }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+.subPage {
+  .inputCardNo {
+    width: 400px;
+    margin: 40px auto 0;
+    white-space: nowrap;
+    > div {
+      margin-right: 20px;
+    }
+  }
+  .activateList {
+    > li {
+      padding: 10px 0;
+      span {
+        line-height: 40px;
+      }
+      > span {
+        min-width: 80px;
+      }
+    }
+  }
+}
+</style>

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

@@ -0,0 +1,106 @@
+<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="CaseId" placeholder="请选择">
+                <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>VIP卡数量：</span>
+          <div class="flex-item">
+            <div style="width:50%">
+              <el-input
+                placeholder="请输入VIP卡数量"
+                v-model="postData.CardNum"
+                clearable>
+              </el-input>
+            </div>
+          </div>
+        </li>
+        <li class="flex-h">
+          <span>价格：</span>
+          <div class="flex-item">
+            <div style="width:50%">
+              <el-input
+                placeholder="请输入价格"
+                v-model="postData.Price"
+                clearable>
+              </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 } from 'vuex'
+export default {
+  name: '',
+  data () {
+    return {
+      postData: {
+        CardNum: '', // 卡数量
+        Price: '', // 价格
+        CaseId: '', // 案场id
+      }
+    }
+  },
+  computed: {
+    ...mapState({
+      cases: x => x.app.cases.list,
+      defaultCaseId: x => x.app.cases.default,
+      OrgId: x => x.app.user.OrgId,
+    }),
+    CaseId: {
+      get () {
+        return this.postData.CaseId === '' ? this.defaultCaseId || '' : this.postData.CaseId
+      },
+      set (val) {
+        this.postData.CaseId = val
+      }
+    }
+  },
+  created () {
+    this.initData()
+  },
+  components: {},
+  methods: {
+    initData () { // 数据初始化
+      // this.$ajax(this.$api.channelManager.getChannelInfo.url, {
+      //   method: this.$api.channelManager.getChannelInfo.method,
+      //   urlData: { channelId: this.$route.query.id }
+      // }).then(res => {
+      //   this.postData = res
+      // })
+    },
+    submit () { // 提交数据
+    },
+    cancel () {
+      this.$router.push({ name: 'vipList' })
+    }
+  },
+  mounted () { }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+</style>

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

@@ -0,0 +1,174 @@
+<template>
+  <div class="subPage">
+    <div class="system-table-search">
+      <div class="flex-h">
+        <div class="flex-item"></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>
+          <li>
+            <!-- <span>VIP卡号：</span> -->
+            <el-input
+              placeholder="请输入VIP卡号"
+              v-model="postData.cardNo"
+              clearable>
+            </el-input>
+          </li>
+          <li>
+            <!-- <span>销售：</span> -->
+            <el-input
+              placeholder="请输入销售姓名"
+              v-model="postData.sellerName"
+              clearable>
+            </el-input>
+          </li>
+          <li>
+            <!-- <span>用户：</span> -->
+            <el-input
+              placeholder="请输入用户姓名"
+              v-model="postData.userName"
+              clearable>
+            </el-input>
+          </li>
+        </ul>
+        <el-button
+          size="mini"
+          type="primary" @click="search">搜索</el-button>
+      </div>
+      <div class="moreFilter"></div>
+      <div class="flex-h">
+        <div class="flex-item flex-h" style="margin-top: 20px;">
+          <el-button size="mini" type="success" @click='addVIP'>新增VIP</el-button>
+          <el-button size="mini" type="success" @click='activateVip'>激活VIP</el-button>
+        </div>
+      </div>
+    </div>
+    <div class="system-table-box">
+      <el-table
+        :data="currentList"
+        stripe
+        style="width: 100%">
+        <el-table-column
+          prop="CardNo"
+          label="卡号">
+        </el-table-column>
+        <el-table-column
+          prop="Price"
+          label="价格">
+        </el-table-column>
+        <el-table-column
+          prop="Status"
+          label="状态">
+        </el-table-column>
+        <el-table-column
+          prop="SellerName"
+          label="销售">
+        </el-table-column>
+        <el-table-column
+          prop="CaseName"
+          label="案场">
+        </el-table-column>
+        <el-table-column
+          prop="UserName"
+          label="用户">
+        </el-table-column>
+        <el-table-column
+          prop="ActivationTime"
+          label="激活时间">
+        </el-table-column>
+        <el-table-column
+          prop="CreatTime"
+          label="创建时间">
+        </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>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  name: '',
+  data () {
+    return {
+      total: 0,
+      postData: { // 表格搜索条件
+        caseid: '', // 案场id
+        page: 1, // 当前页码
+        pagesize: 10, // 请求数据量
+        cardNo: '', // vip卡号
+        sellerName: '', // 销售姓名
+        userName: '', // 用户名
+      },
+      currentList: [{
+        CardNo: 'xxx',
+        Price: 'xxx',
+        Status: 'xxx',
+        SellerName: 'xxx',
+        CaseName: 'xxx',
+        UserName: 'xxx',
+        ActivationTime: 'xxx',
+        CreatTime: 'xxx',
+      }]
+    }
+  },
+  mounted () {
+    this.$nextTick(function () {
+      this.getList()
+    })
+  },
+  computed: {
+    ...mapState({
+      cases: x => x.app.cases.list,
+      defaultCaseId: x => x.app.cases.default
+    }),
+    CaseId: {
+      get () {
+        return this.postData.caseid || this.defaultCaseId
+      },
+      set (val) {
+        this.postData.caseid = val
+      }
+    }
+  },
+  methods: {
+    search () { // 搜索
+      this.postData.page = 1
+      this.currentList = []
+      this.getList()
+    },
+    getList () { // 获取列表
+    },
+    handleCurrentChange (val) { // 跳转到分页
+      this.getList()
+    },
+    addVIP () {
+      this.$router.push({ name: 'editVip' })
+    },
+    activateVip () {
+      this.$router.push({ name: 'activateVip' })
+    },
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+@import "page.scss";
+</style>

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

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

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

@@ -11,7 +11,7 @@
             </div>
           </div>
         </li>
-        <li class="flex-h">
+        <li class="flex-h" v-if="postData.ForwardType==='1'">
           <span>链接：</span>
           <div class="flex-item">
             <div style="width:50%">
@@ -23,6 +23,21 @@
             </div>
           </div>
         </li>
+        <li class="flex-h" v-else>
+          <span>课程：</span>
+          <div class="flex-item">
+            <div style="width:50%">
+              <el-select v-model="postData.ForwardResourceId" placeholder="请选择课程">
+                <el-option
+                  v-for="item in courses.list"
+                  :key="item.CourseId"
+                  :label="item.CourseName"
+                  :value="item.CourseId">
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+        </li>
         <li class="flex-h">
           <span>是否发布：</span>
           <div class="flex-item">
@@ -103,7 +118,10 @@
 
 <script>
 import { mapState, createNamespacedHelpers, mapActions } from 'vuex'
+
 const { mapActions: mapCmsActions } = createNamespacedHelpers('cms')
+const { mapState: mapCourseState, mapActions: mapCourseActions } = createNamespacedHelpers('course')
+
 export default {
   name: '',
   data () {
@@ -117,7 +135,7 @@ export default {
         ImageUrl: '',
         Title: '',
         OrgId: '',
-        CaseId: ''
+        CaseId: '',
       },
       dialogVisible: false,
       imgs: '',
@@ -127,6 +145,7 @@ export default {
   },
   components: {},
   created () {
+    this.GetCourseList({page: 1, pagesize: 100})
     this.updateLocationInfo()
     this.updateSystemInfo().then(() => {
       this.postData.CaseId = this.defaultCaseId
@@ -138,13 +157,20 @@ export default {
       OrgId: x => x.app.user.OrgId,
       defaultCaseId: x => x.app.cases.default,
       caseList: x => x.app.cases.list
+    }),
+    ...mapCourseState({
+      courses: x => x.courseList,
     })
   },
   methods: {
+    ...mapCourseActions([
+      'GetCourseList',
+    ]),
     ...mapCmsActions(['updateLocationInfo']),
     ...mapActions(['updateSystemInfo']),
     submit () {
       if (this.postData.ForwardType === '1') {
+        this.postData.ForwardResourceId = ''
         if (this.postData.ForwardUrl === '') {
           this.$message({
             message: '链接地址不能为空',
@@ -161,6 +187,8 @@ export default {
             return false
           }
         }
+      } else {
+        this.postData.ForwardUrl = ''
       }
       this.postData.OrgId = this.OrgId
       this.postData.ForwardType === '1' ? this.postData.ForwardType = 'url' : this.postData.ForwardType = 'course'

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

@@ -11,7 +11,7 @@
             </div>
           </div>
         </li>
-        <li class="flex-h">
+        <li class="flex-h" v-if="postData.ForwardType==='1'">
           <span>链接：</span>
           <div class="flex-item">
             <div style="width:50%">
@@ -23,6 +23,21 @@
             </div>
           </div>
         </li>
+        <li class="flex-h" v-else>
+          <span>课程：</span>
+          <div class="flex-item">
+            <div style="width:50%">
+              <el-select v-model="postData.ForwardResourceId" placeholder="请选择课程">
+                <el-option
+                  v-for="item in courses.list"
+                  :key="item.CourseId"
+                  :label="item.CourseName"
+                  :value="item.CourseId">
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+        </li>
         <li class="flex-h">
           <span>是否发布：</span>
           <div class="flex-item">
@@ -104,6 +119,8 @@
 <script>
 import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapActions: mapCmsActions } = createNamespacedHelpers('cms')
+const { mapState: mapCourseState, mapActions: mapCourseActions } = createNamespacedHelpers('course')
+
 export default {
   name: '',
   data () {
@@ -117,7 +134,7 @@ export default {
         ImageUrl: '',
         Title: '',
         OrgId: '',
-        CaseId: ''
+        CaseId: '',
       },
       dialogVisible: false,
       imgs: '',
@@ -127,20 +144,27 @@ export default {
   },
   components: {},
   created () {
+    this.GetCourseList({page: 1, pagesize: 100, callback: this.getDetail})
     this.updateLocationInfo()
-    this.getDetail()
   },
   computed: {
     ...mapState({
       positionList: x => x.cms.location,
       OrgId: x => x.app.user.OrgId,
       caseList: x => x.app.cases.list
+    }),
+    ...mapCourseState({
+      courses: x => x.courseList,
     })
   },
   methods: {
+    ...mapCourseActions([
+      'GetCourseList',
+    ]),
     ...mapCmsActions(['updateLocationInfo']),
     submit () {
       if (this.postData.ForwardType === '1') {
+        this.postData.ForwardResourceId = ''
         if (this.postData.ForwardUrl === '') {
           this.$message({
             message: '链接地址不能为空',
@@ -157,6 +181,8 @@ export default {
             return false
           }
         }
+      } else {
+        this.postData.ForwardUrl = ''
       }
       this.postData.OrgId = this.OrgId
       this.postData.CaseId = this.CaseId

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

@@ -1,212 +0,0 @@
-<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="postData.CaseId" placeholder="请选择">
-                <el-option
-                  v-for="item in caseList"
-                  :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 style="width:50%">
-              <el-input
-                placeholder="请输入名称"
-                v-model="postData.Name"
-                clearable>
-              </el-input>
-            </div>
-          </div>
-        </li>
-        <li class="flex-h">
-          <span>标题：</span>
-          <div class="flex-item">
-            <div style="width:50%">
-              <el-input
-                placeholder="请输入标题"
-                v-model="postData.Title"
-                clearable>
-              </el-input>
-            </div>
-          </div>
-        </li>
-        <li class="flex-h">
-          <span>图片：</span>
-          <div class="flex-item">
-            <el-upload
-              :action="$api.file.image.url"
-              list-type="picture-card"
-              :limit='limit'
-              :on-success="handlePictureCardPreview"
-              :file-list='imgsArr'
-              :on-remove="handleRemove"
-              :on-exceed="exceed">
-              <i class="el-icon-plus"></i>
-            </el-upload>
-            <el-dialog :visible.sync="dialogVisible">
-              <img width="100%" :src="imgs" alt="">
-            </el-dialog>
-          </div>
-        </li>
-        <li class="flex-h">
-          <span>详细图片：</span>
-          <div class="flex-item">
-            <el-upload
-              :action='$api.file.image.url'
-              list-type="picture-card"
-              :limit='limit'
-              :file-list='detailimgsArr'
-              :on-success="handlePictureCardPreviewDetail"
-              :on-remove="handleRemoveDetail"
-              :on-exceed="exceed">
-              <i class="el-icon-plus"></i>
-            </el-upload>
-            <el-dialog :visible.sync="dialogVisibleDetail">
-              <img width="100%" :src="detailimgs" alt="">
-            </el-dialog>
-          </div>
-        </li>
-        <li class="flex-h">
-          <span>专题简介：</span>
-          <div class="flex-item">
-            <div style="width:50%">
-              <el-input
-                placeholder="请输入专题简介"
-                v-model="postData.DetailContent"
-                type='textarea'
-                :autosize="{ minRows: 3, maxRows: 5}"
-                clearable>
-              </el-input>
-            </div>
-          </div>
-        </li>
-        <li class="flex-h">
-          <span>是否前台展示：</span>
-          <div class="flex-item">
-            <div style="width:50%" class="radio">
-              <el-radio v-model="postData.Status" label='1' >是</el-radio>
-              <el-radio v-model="postData.Status" label='0' >否</el-radio>
-            </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, mapActions } from 'vuex'
-export default {
-  name: '',
-  data () {
-    return {
-      postData: {
-        CaseId: '',
-        Name: '',
-        Title: '',
-        DetailContent: '',
-        Status: '1',
-        imgs: '',
-        detailimgs: '',
-        courseids: ''
-      },
-      limit: 1,
-      dialogVisible: false,
-      dialogVisibleDetail: false,
-      imgs: '',
-      detailimgs: '',
-      imgsArr: [],
-      detailimgsArr: []
-    }
-  },
-  components: {},
-  computed: {
-    ...mapState({
-      caseList: x => x.app.cases.list,
-      defaultCaseId: x => x.app.cases.default,
-      OrgId: x => x.app.user.OrgId
-    })
-  },
-  methods: {
-    ...mapActions(['updateSystemInfo']),
-    submit () {
-      this.postData.OrgId = this.OrgId
-      this.postData.imgs = ''
-      this.postData.detailimgs = ''
-      for (let i = 0; i < this.imgsArr.length; i++) {
-        this.postData.imgs += this.imgsArr[i].response.result.url + ','
-      }
-      this.postData.imgs = this.postData.imgs.substr(0, this.postData.imgs.length - 1)
-      for (let i = 0; i < this.detailimgsArr.length; i++) {
-        this.postData.detailimgs += this.detailimgsArr[i].response.result.url + ','
-      }
-      this.postData.detailimgs = this.postData.detailimgs.substr(0, this.postData.detailimgs.length - 1)
-      this.$ajax(this.$api.cms.addCase.url, {
-        method: this.$api.cms.addCase.method,
-        data: this.postData
-      }).then(res => {
-        this.$message({
-          message: '添加成功',
-          type: 'success',
-          duration: 1000
-        })
-        setTimeout(() => {
-          this.$router.push({ name: 'indexCase' })
-        }, 1000)
-      }).catch(msg => {
-
-      })
-    },
-    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
-    },
-    handlePictureCardPreviewDetail (res, file, fileList) {
-      this.detailimgs = res.result.url
-      this.dialogVisibleDetail = false
-      this.detailimgsArr = fileList
-    },
-    handleRemoveDetail (file, fileList) {
-      this.detailimgsArr = fileList
-    },
-    exceed () {
-      this.$message({
-        message: '超过可传的图片上限',
-        type: 'info',
-        duration: 1000
-      })
-    }
-  },
-  created () {
-    this.updateSystemInfo().then(() => {
-      this.postData.CaseId = this.defaultCaseId
-    })
-  }
-}
-</script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style lang="scss" scoped>
-</style>

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

@@ -6,7 +6,7 @@
           <span>对应案场：</span>
           <div class="flex-item">
             <div style="width:50%">
-              <el-select v-model="postData.CaseId" placeholder="请选择">
+              <el-select v-model="CaseId" placeholder="请选择">
                 <el-option
                   v-for="item in caseList"
                   :key="item.CaseId"
@@ -23,7 +23,7 @@
             <div style="width:50%">
               <el-input
                 placeholder="请输入名称"
-                v-model="postData.Name"
+                v-model="detail.Name"
                 clearable>
               </el-input>
             </div>
@@ -35,7 +35,7 @@
             <div style="width:50%">
               <el-input
                 placeholder="请输入标题"
-                v-model="postData.Title"
+                v-model="detail.Title"
                 clearable>
               </el-input>
             </div>
@@ -54,9 +54,6 @@
               :on-exceed="exceed">
               <i class="el-icon-plus"></i>
             </el-upload>
-            <el-dialog :visible.sync="dialogVisible">
-              <img width="100%" :src="imgs" alt="">
-            </el-dialog>
           </div>
         </li>
         <li class="flex-h">
@@ -72,9 +69,6 @@
               :on-exceed="exceed">
               <i class="el-icon-plus"></i>
             </el-upload>
-            <el-dialog :visible.sync="dialogVisibleDetail">
-              <img width="100%" :src="detailimgs" alt="">
-            </el-dialog>
           </div>
         </li>
         <li class="flex-h">
@@ -83,7 +77,7 @@
             <div style="width:50%">
               <el-input
                 placeholder="请输入专题简介"
-                v-model="postData.DetailContent"
+                v-model="detail.DetailContent"
                 type='textarea'
                 :autosize="{ minRows: 3, maxRows: 5}"
                 clearable>
@@ -91,12 +85,55 @@
             </div>
           </div>
         </li>
+        <li class="flex-h">
+          <span>展示课程：</span>
+          <div class="flex-item">
+            <div style="width:50%" class="radio">
+              <el-radio v-model="detail.IsAllCourse" :label='1' >全部课程</el-radio>
+              <el-radio v-model="detail.IsAllCourse" :label='0' >指定课程</el-radio>
+            </div>
+          </div>
+        </li>
+        <li class="flex-h" v-if="detail.IsAllCourse === 0">
+          <el-table
+            :data="detail.Courses"
+            stripe
+            style="width: 100%">
+            <el-table-column
+              prop="CourseName"
+              label="课程名称">
+            </el-table-column>
+            <el-table-column
+              prop="BeginDate"
+              label="课程开始时间">
+              <template slot-scope="scope">
+                <label>{{toolClass.dateFormat(scope.row.BeginDate,'yyyy-MM-dd')}}</label>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="EndDate"
+              label="课程结束时间">
+              <template slot-scope="scope">
+                <label>{{toolClass.dateFormat(scope.row.EndDate,'yyyy-MM-dd')}}</label>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="450">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  type="danger"
+                  @click="deleteItem(scope.row)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+            <el-button type="primary" size="mini" @click="coursesShow">新增</el-button>
+        </li>
         <li class="flex-h">
           <span>是否前台展示：</span>
           <div class="flex-item">
             <div style="width:50%" class="radio">
-              <el-radio v-model="postData.Status" label='1' >是</el-radio>
-              <el-radio v-model="postData.Status" label='0' >否</el-radio>
+              <el-radio v-model="detail.Status" :label='1' >是</el-radio>
+              <el-radio v-model="detail.Status" :label='0' >否</el-radio>
             </div>
           </div>
         </li>
@@ -106,32 +143,67 @@
         </li>
       </ul>
     </form>
+    <el-dialog
+      title="选择课程"
+      :visible.sync="selCourseVisible"
+      width="500px"
+      center>
+      <div>
+        <el-table
+          ref="courseTable"
+          :data="coursesList"
+          tooltip-effect="dark"
+          stripe
+          @selection-change="handleSelectionChange"
+          style="width: 100%">
+          <el-table-column
+            type="selection"
+            width="55">
+          </el-table-column>
+          <el-table-column
+            prop="CourseName"
+            label="课程名称">
+          </el-table-column>
+          <el-table-column
+            prop="BeginDate"
+            label="课程开始时间">
+            <template slot-scope="scope">
+              <label>{{toolClass.dateFormat(scope.row.BeginDate,'yyyy-MM-dd')}}</label>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="EndDate"
+            label="课程结束时间">
+            <template slot-scope="scope">
+              <label>{{toolClass.dateFormat(scope.row.EndDate,'yyyy-MM-dd')}}</label>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="selCourseVisible = false">取 消</el-button>
+        <el-button type="primary" @click="addCourseOk">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { createNamespacedHelpers, mapState } from 'vuex'
+
+const { mapState: mapCaseState, mapActions: mapCaseActions } = createNamespacedHelpers('cmscase')
+const { mapState: mapCourseState, mapActions: mapCourseActions } = createNamespacedHelpers('course')
+
 export default {
   name: '',
   data () {
     return {
-      postData: {
-        CaseId: '',
-        Name: '',
-        Title: '',
-        DetailContent: '',
-        Status: '1',
-        imgs: '',
-        detailimgs: '',
-        courseids: ''
-      },
+      id: '',
       limit: 1,
-      dialogVisible: false,
-      dialogVisibleDetail: false,
-      imgs: '',
-      detailimgs: '',
-      imgsArr: [],
-      detailimgsArr: []
+      imgs: null,
+      detailimgs: null,
+      selCourseVisible: false,
+      selCourseList: [],
     }
   },
   components: {},
@@ -140,105 +212,131 @@ export default {
       caseList: x => x.app.cases.list,
       defaultCaseId: x => x.app.cases.default,
       OrgId: x => x.app.user.OrgId
-    })
-  },
-  methods: {
-    submit () {
-      this.postData.OrgId = this.OrgId
-      this.postData.imgs = ''
-      this.postData.detailimgs = ''
-      for (let i = 0; i < this.imgsArr.length; i++) {
-        this.postData.imgs += this.imgsArr[i].response.result.url + ','
-      }
-      if (this.postData.imgs) {
-        this.postData.imgs = this.postData.imgs.substr(0, this.postData.imgs.length - 1)
+    }),
+    ...mapCaseState({
+      detail: x => x.caseInfo,
+    }),
+    ...mapCourseState({
+      courses: x => x.courseList,
+    }),
+    CaseId: {
+      get () {
+        return this.detail.CaseId || this.caseid
+      },
+      set (val) {
+        this.UpdateInfo({...this.detail, CaseId: val})
+        this.getCourse()
       }
-      for (let i = 0; i < this.detailimgsArr.length; i++) {
-        this.postData.detailimgs += this.detailimgsArr[i].response.result.url + ','
+    },
+    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
       }
-      if (this.postData.detailimgs) {
-        this.postData.detailimgs = this.postData.detailimgs.substr(0, this.postData.detailimgs.length - 1)
+    },
+    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
       }
-      console.log(this.postData)
-      this.$ajax(this.$api.cms.editCase.url, {
-        method: this.$api.cms.editCase.method,
-        urlData: {
-          id: this.$route.query.id
-        },
-        data: this.postData
-      }).then(res => {
-        this.$message({
-          message: '编辑成功',
-          type: 'success',
-          duration: 1000
+    },
+    coursesList () {
+      return (this.courses.list || []).map(x => {
+        return {
+          CourseId: x.CourseId,
+          CourseName: x.CourseName,
+          BeginDate: x.BeginDate,
+          EndDate: x.BeginDate
+        }
+      })
+    },
+  },
+  methods: {
+    ...mapCaseActions([
+      'GetCaseInfo',
+      'AddCaseInfo',
+      'SetNull',
+      'UpdateInfo',
+    ]),
+    ...mapCourseActions([
+      '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 courseids = this.detail.Courses.map(x => x.CourseId).join(',')
+      if (this.id === '') {
+        this.detail.OrgId = this.OrgId
+        this.AddCaseInfo({...this.detail, imgs, detailimgs, courseids}).then(res => {
+          this.afterSave()
         })
-        setTimeout(() => {
-          this.$router.push({ name: 'indexCase' })
-        }, 1000)
-      }).catch(msg => {
-
+      } else {
+        this.AddCaseInfo({...this.detail, imgs, detailimgs, courseids}).then(res => {
+          this.afterSave()
+        })
+      }
+    },
+    afterSave () {
+      this.$message({
+        message: '保存成功',
+        type: 'success',
+        duration: 1000
       })
+      setTimeout(() => {
+        this.$router.push({ name: 'indexCase' })
+      }, 1000)
     },
     cancel () {
       this.$router.go(-1)
     },
     handlePictureCardPreview (res, file, fileList) {
-      this.imgs = res.result.url
-      this.dialogVisible = false
       this.imgsArr = fileList
-      console.log(this.imgsArr)
     },
     handleRemove (file, fileList) {
       this.imgsArr = fileList
     },
     handlePictureCardPreviewDetail (res, file, fileList) {
-      this.detailimgs = res.result.url
-      this.dialogVisibleDetail = false
       this.detailimgsArr = fileList
     },
     handleRemoveDetail (file, fileList) {
       this.detailimgsArr = fileList
     },
     getDetail () {
-      this.$ajax(this.$api.cms.caseDetail.url, {
-        method: this.$api.cms.caseDetail.method,
-        urlData: {
-          id: this.$route.query.id
-        }
-      }).then(res => {
-        console.log(res)
-        res.Status += ''
-        let imgsArr = []
-        let detailimgsArr = []
-        for (let i = 0; i < res.CmsCaseImgs.length; i++) {
-          if (res.CmsCaseImgs[i].ImageType === 'cover') {
-            let item = {
-              url: res.CmsCaseImgs[i].CaseImageUrl,
-              response: {
-                result: {
-                  url: res.CmsCaseImgs[i].CaseImageUrl
-                }
-              }
-            }
-            imgsArr.push(item)
-          } else if (res.CmsCaseImgs[i].ImageType === 'detail') {
-            let item = {
-              url: res.CmsCaseImgs[i].CaseImageUrl,
-              response: {
-                result: {
-                  url: res.CmsCaseImgs[i].CaseImageUrl
-                }
-              }
-            }
-            detailimgsArr.push(item)
-          }
-        }
-        this.imgsArr = imgsArr
-        this.detailimgsArr = detailimgsArr
-        this.postData = res
-      }).catch(msg => {
-
-      })
+      this.GetCaseInfo({id: this.id})
+    },
+    getCourse () {
+      this.GetCourseList({caseid: this.CaseId, page: 1, pagesize: 100})
+    },
+    toggleSelection (rows) {
+      if (rows) {
+        rows.forEach(row => {
+          this.$refs.courseTable.toggleRowSelection(row)
+        })
+      } else {
+        this.$refs.courseTable.clearSelection()
+      }
     },
     exceed () {
       this.$message({
@@ -246,10 +344,38 @@ export default {
         type: 'info',
         duration: 1000
       })
+    },
+    addCourse () {
+      this.GetCourseList({caseid: this.CaseId, page: 1, pagesize: 100, callback: this.coursesShow})
+    },
+    coursesShow () {
+      this.selCourseList = this.detail.Courses || []
+      this.selCourseVisible = true
+      setTimeout(() => {
+        this.toggleSelection(this.coursesList.filter(x => (this.selCourseList || []).filter(y => y.CourseId === x.CourseId).length > 0))
+      }, 30)
+    },
+    handleSelectionChange (val) {
+      this.selCourseList = val
+      // this.UpdateInfo({...this.detail, Courses: val})
+    },
+    addCourseOk () {
+      this.UpdateInfo({...this.detail, Courses: this.selCourseList})
+      this.selCourseVisible = false
+    },
+    deleteItem (row) {
+      this.UpdateInfo({...this.detail, Courses: this.detail.Courses.filter(x => x.CourseId !== row.CourseId)})
     }
   },
-  created () {
-    this.getDetail()
+  mounted () {
+    this.getCourse()
+    const { id } = this.$route.query
+    this.id = id
+    if (id && id !== '') {
+      this.getDetail()
+    } else {
+      this.SetNull()
+    }
   }
 }
 </script>

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

@@ -122,8 +122,23 @@ export default {
       this.postData.currentPage = val
       this.getList()
     },
-    showItem (index, row) { // 前台显示
-      this.editIsAllCourse(row)
+    showItem (index, data) { // 前台显示
+      let api = data.Status === 1 ? this.$api.cms.caseHide : this.$api.cms.caseShow
+      this.$ajax(api.url, {
+        method: api.method,
+        urlData: {
+          id: data.CmsCaseId
+        }
+      }).then(res => {
+        this.$message({
+          message: '编辑成功',
+          type: 'success',
+          duration: 1000
+        })
+        this.getList()
+      }).catch(msg => {
+
+      })
     },
     editItem (index, row) { // 编辑
       console.log(index, row)
@@ -190,25 +205,6 @@ export default {
         this.getList()
       }).catch(msg => {
 
-      })
-    },
-    editIsAllCourse (data) {
-      console.log(data)
-      let api = data.Status === 1 ? this.$api.cms.caseHide : this.$api.cms.caseShow
-      this.$ajax(api.url, {
-        method: api.method,
-        urlData: {
-          id: data.CmsCaseId
-        }
-      }).then(res => {
-        this.$message({
-          message: '编辑成功',
-          type: 'success',
-          duration: 1000
-        })
-        this.getList()
-      }).catch(msg => {
-
       })
     },
   }

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

@@ -9,13 +9,27 @@
               <el-input
                 placeholder="请输入商品种类"
                 v-model="postData.TypeName"
+                maxlength="10"
                 clearable>
               </el-input>
             </div>
           </div>
         </li>
         <li class="flex-h">
-          <!-- <span>选择案场：</span> -->
+          <span>种类英文：</span>
+          <div class="flex-item">
+            <div style="width:50%">
+              <el-input
+                placeholder="请输入种类英文"
+                v-model="postData.EnglishName"
+                maxlength="10"
+                clearable>
+              </el-input>
+            </div>
+          </div>
+        </li>
+        <li class="flex-h">
+          <span>选择案场：</span>
           <div class="flex-item">
             <div style="width:50%">
               <el-select v-model="CaseId" placeholder="请选择">
@@ -52,6 +66,7 @@ export default {
         CreatUser: '', // 创建者（传空值）
         CreatTime: '', // 创建时间（传空值）
         Status: '', // 状态（传空值）
+        EnglishName: '',
       },
       caseAreaList: [
         {

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

@@ -9,13 +9,27 @@
               <el-input
                 placeholder="请输入商品种类"
                 v-model="postData.TypeName"
+                maxlength="10"
                 clearable>
               </el-input>
             </div>
           </div>
         </li>
         <li class="flex-h">
-          <!-- <span>选择案场：</span> -->
+          <span>种类英文：</span>
+          <div class="flex-item">
+            <div style="width:50%">
+              <el-input
+                placeholder="请输入种类英文"
+                v-model="postData.EnglishName"
+                maxlength="10"
+                clearable>
+              </el-input>
+            </div>
+          </div>
+        </li>
+        <li class="flex-h">
+          <span>选择案场：</span>
           <div class="flex-item">
             <div style="width:50%">
               <el-select v-model="CaseId" placeholder="请选择">
@@ -49,7 +63,8 @@ export default {
         TypeName: '',
         Status: '',
         OrgId: '',
-        CaseId: ''
+        CaseId: '',
+        EnglishName: '',
       },
     }
   },

src/pages/system/newOrder/caseRecord/index.vue

@@ -0,0 +1,177 @@
+<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='addRecord'>新增</el-button>
+        </div>
+        <ul>
+          <li>
+            <!-- <span>选择案场：</span> -->
+            <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="records.list" stripe style="width: 100%">
+        <el-table-column prop="CaseId" label="案场">
+          <template slot-scope="scope">
+            {{getCaseName(scope.row.CaseId)}}
+          </template>
+        </el-table-column>
+        <el-table-column prop="Month" label="月份">
+        </el-table-column>
+        <el-table-column prop="Num" label="规定次数">
+        </el-table-column>
+        <el-table-column prop="ActrualNum" label="实际次数">
+        </el-table-column>
+        <el-table-column prop="OverNum" label="超出次数">
+        </el-table-column>
+        <el-table-column prop="LeftNum" label="剩余次数">
+        </el-table-column>
+        <el-table-column fixed='right' label="操作" width="300">
+          <template slot-scope="scope">
+            <el-button size="mini" type="warning" @click="handleReport(scope.$index, scope.row)">导出Excel</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        @current-change="handleCurrentChange"
+        :current-page.sync="postData.page"
+        :page-size="postData.pagesize"
+        layout="prev, pager, next, jumper"
+        :total="records.pagenum">
+      </el-pagination>
+    </div>
+    <el-dialog
+      title="新增月记录"
+      :visible.sync="addVisible"
+      width="500px"
+      center>
+      <div>
+        <form class="mainForm">
+          <ul>
+            <li class="flex-h">
+              <span>对应案场：</span>
+              <div class="flex-item">
+                <div style="width:50%">
+                  <el-select v-model="detail.CaseId" placeholder="请选择">
+                    <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 style="width:50%">
+                  <el-date-picker
+                    v-model="detail.Month"
+                    type="month"
+                    placeholder="选择月">
+                  </el-date-picker>
+                </div>
+              </div>
+            </li>
+            <li class="flex-h">
+              <span>规定次数：</span>
+              <div class="flex-item">
+                <div style="width:50%">
+                  <el-input v-model="detail.Num" placeholder="请输入规定次数"></el-input>
+                </div>
+              </div>
+            </li>
+          </ul>
+        </form>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="addVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submit">保 存</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { createNamespacedHelpers, mapState } from 'vuex'
+
+const { mapState: mapRecordState, mapActions: mapRecordActions } = createNamespacedHelpers('caserecord')
+
+export default {
+  name: '',
+  data () {
+    return {
+      addVisible: false,
+      detail: {
+        CaseId: '',
+      },
+      postData: {
+        caseid: '',
+        page: 1,
+        pagesize: 10,
+      }
+    }
+  },
+  computed: {
+    ...mapState({
+      cases: x => x.app.cases.list,
+      defaultCaseId: x => x.app.cases.default
+    }),
+    ...mapRecordState({
+      records: x => x.recordList,
+    }),
+    CaseId: {
+      get () {
+        return this.caseid || this.defaultCaseId
+      },
+      set (val) {
+        this.caseid = val
+      }
+    }
+  },
+  methods: {
+    ...mapRecordActions([
+      'GetRecordList',
+    ]),
+    getCaseName (caseid) {
+      return ((this.cases.filter(x => x.CaseId === caseid) || [])[0] || {}).CaseName
+    },
+    addRecord () {
+      this.addVisible = true
+    },
+    search () {
+      this.getList()
+    },
+    submit () {
+    },
+    getList () {
+      this.GetRecordList(this.postData)
+    },
+    handleCurrentChange (val) { // 跳转到分页
+      this.postData.page = val
+      this.getList()
+    },
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+</style>

src/pages/system/newOrder/newOrderList/index.vue

@@ -66,7 +66,12 @@
 </template>
 
 <script>
+import { createNamespacedHelpers, mapState } from 'vuex'
+
 import { getLodop } from '@/util/LodopFuncs'
+
+const { mapState: mapOrderState, mapActions: mapOrderActions } = createNamespacedHelpers('goodsorder')
+
 const baseUrl = process.env.NODE_ENV === 'development' ? 'ws://192.168.0.148:8078/admin' : 'ws://cdkj.ycjcjy.com/admin' // 'ws://cdkj.ycjcjy.com/admin'
 var LODOP
 export default {
@@ -84,11 +89,21 @@ export default {
     }
   },
   components: {
+    ...mapOrderState({
+      orders: x => x.ordersList
+    }),
+    ...mapState({
+      cases: x => x.app.cases.list,
+      defaultCaseId: x => x.app.cases.default
+    })
   },
   mounted () {
-
+    this.GetOrdersList()
   },
   methods: {
+    ...mapOrderActions([
+      'GetOrdersList',
+    ]),
     submit (cl) {
       this.$confirm('确定完成此饮品?', '提示', {
         confirmButtonText: '确定',

src/pages/system/page.js

@@ -45,7 +45,6 @@ import bannerManager from './cmsManager/bannerManager/index' // 轮播图管理
 import addBanner from './cmsManager/bannerManager/add' // 添加轮播图
 import editBanner from './cmsManager/bannerManager/edit' // 编辑轮播图
 import indexCase from './cmsManager/majorProjects/index' // 售楼处项目专题
-import addIndexCase from './cmsManager/majorProjects/add' // 新增售楼处项目专题
 import editIndexCase from './cmsManager/majorProjects/edit' // 编辑售楼处项目专题
 import indexMsg from './cmsManager/indexMsg/index' // 首页消息
 import addIndexMsg from './cmsManager/indexMsg/add' // 新增首页消息
@@ -82,6 +81,17 @@ import newOrder from './newOrder/index' // 商品订单系统
 import newOrderList from './newOrder/newOrderList/index' // 新订单列表
 import monthOrder from './newOrder/monthOrder/index' // 月订单列表
 
+import cardAndCouponManager from './cardAndCouponManager/index' // 卡券管理
+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 vipList from './cardAndCouponManager/vipManager/index' // vip列表
+import editVip from './cardAndCouponManager/vipManager/edit' // 编辑vip
+import activateVip from './cardAndCouponManager/vipManager/activateVip' // 激活vip
+
+import caseRecord from './newOrder/caseRecord/index' // 月记录
+
 export default {
   router: [
     {
@@ -286,12 +296,7 @@ export default {
           path: 'indexCase',
           name: 'indexCase',
           component: indexCase,
-          children: [{ // 新增售楼处项目专题
-            path: 'addIndexCase',
-            name: 'addIndexCase',
-            component: addIndexCase,
-            children: []
-          }, { // 编辑售楼处项目专题
+          children: [{ // 编辑售楼处项目专题
             path: 'editIndexCase',
             name: 'editIndexCase',
             component: editIndexCase,
@@ -427,10 +432,10 @@ export default {
           name: 'newOrderList',
           component: newOrderList,
           children: []
-        }, { // 月订单列表
-          path: 'monthOrder',
-          name: 'monthOrder',
-          component: monthOrder,
+        }, { // 月记录
+          path: 'caseRecord',
+          name: 'caseRecord',
+          component: caseRecord,
           children: []
         }]
       }, { // 数据统计
@@ -443,6 +448,46 @@ export default {
           component: frontEndUserList,
           children: []
         }]
+      }, { // 卡券管理
+        path: 'cardAndCouponManager',
+        name: 'cardAndCouponManager',
+        component: cardAndCouponManager,
+        children: [{ // 卡列表
+          path: 'cardList',
+          name: 'cardList',
+          component: cardList,
+          children: [{ // 编辑卡
+            path: 'editCard',
+            name: 'editCard',
+            component: editCard,
+            children: []
+          }]
+        }, { // 券列表
+          path: 'couponList',
+          name: 'couponList',
+          component: couponList,
+          children: [{ // 编辑券
+            path: 'editCoupon',
+            name: 'editCoupon',
+            component: editCoupon,
+            children: []
+          }]
+        }, { // vip列表
+          path: 'vipList',
+          name: 'vipList',
+          component: vipList,
+          children: [{ // 编辑vip
+            path: 'editVip',
+            name: 'editVip',
+            component: editVip,
+            children: []
+          }, { // 激活vip
+            path: 'activateVip',
+            name: 'activateVip',
+            component: activateVip,
+            children: []
+          }]
+        }]
       }]
     },
   ],

src/store/case/record.js

@@ -0,0 +1,29 @@
+import ajax from '../../util/ajax'
+import api from '../../util/api'
+
+export default {
+  namespaced: true,
+  state: {
+    recordList: [],
+  },
+  mutations: {
+    updateList (state, payload) {
+      state.recordList = payload || []
+    },
+  },
+  actions: {
+    GetRecordList ({ commit }, payload) {
+      ajax(api.case.getRecordList.url, {
+        method: api.case.getRecordList.method,
+        queryData: {
+          ...payload,
+        }
+      }).then(res => {
+        commit('updateList', res)
+        if (payload.callback) {
+          payload.callback()
+        }
+      })
+    },
+  }
+}

src/store/cms/case.js

@@ -0,0 +1,56 @@
+
+export default {
+  namespaced: true,
+  state: {
+    caseInfo: {},
+  },
+  mutations: {
+    init (state, data) {
+      state.caseInfo = data
+    }
+  },
+  actions: {
+    GetCaseInfo ({ commit }, payload) {
+      return new Promise((resolve) => {
+        this.$ajax(this.$api.cms.caseDetail.url, {
+          method: this.$api.cms.caseDetail.method,
+          urlData: {
+            id: payload.id
+          }
+        }).then(res => {
+          commit('init', res)
+          resolve()
+        })
+      })
+    },
+    AddCaseInfo ({ commit }, payload) {
+      return new Promise((resolve) => {
+        this.$ajax(this.$api.cms.addCase.url, {
+          method: this.$api.cms.addCase.method,
+          data: payload
+        }).then(res => {
+          resolve()
+        })
+      })
+    },
+    UpdateCaseInfo ({ commit }, payload) {
+      return new Promise((resolve) => {
+        this.$ajax(this.$api.cms.editCase.url, {
+          method: this.$api.cms.editCase.method,
+          urlData: {
+            id: payload.id
+          },
+          data: payload
+        }).then(res => {
+          resolve()
+        })
+      })
+    },
+    SetNull ({ commit }) {
+      commit('init', {})
+    },
+    UpdateInfo ({ commit }, payload) {
+      commit('init', payload)
+    }
+  }
+}

src/store/course/course.js

@@ -28,6 +28,9 @@ export default {
         }
       }).then(res => {
         commit('updateList', res)
+        if (payload.callback) {
+          payload.callback()
+        }
       })
     },
     GetCourseByID ({ commit }, { id }) {

src/store/goods/order.js

@@ -0,0 +1,26 @@
+import ajax from '../../util/ajax'
+import api from '../../util/api'
+
+export default {
+  namespaced: true,
+  state: {
+    ordersList: [],
+  },
+  mutations: {
+    updateList (state, payload) {
+      state.ordersList = payload || []
+    },
+  },
+  actions: {
+    GetOrdersList ({ commit }, payload) {
+      ajax(api.goodsOrder.getOnlineOrder.url, {
+        method: api.goodsOrder.getOnlineOrder.method,
+        queryData: {
+          ...payload,
+        }
+      }).then(res => {
+        commit('updateList', res)
+      })
+    },
+  }
+}

src/store/index.js

@@ -22,6 +22,9 @@ export const modules = {
   coursetag: () => require('./course/tag').default,
   schedule: () => require('./course/schedule').default,
   verification: () => require('./verification/verification').default,
+  goodsorder: () => require('./goods/order').default,
+  cmscase: () => require('./cms/case').default,
+  caserecord: () => require('./case/record').default,
 }
 
 Object.keys(modules).forEach((modKey) => {

src/util/api.js

@@ -196,6 +196,14 @@ const $api = {
       method: 'get',
       url: `${baseUrl}${common}/usertype`
     },
+    getRecordList: {
+      method: 'get',
+      url: `${baseUrl}${common}/case/record`
+    },
+    addRecord: {
+      method: 'post',
+      url: `${baseUrl}${common}/case/record`
+    },
   },
   goodsManager: {
     getGoodsSpecList: { // 商品规格列表
@@ -525,5 +533,11 @@ const $api = {
       url: `${baseUrl}${common}/verify/course/:id`
     },
   },
+  goodsOrder: {
+    getOnlineOrder: {
+      method: 'get',
+      url: `${baseUrl}${common}/order/online/goods`
+    },
+  },
 }
 export default $api