xcx

config/index.js

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

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/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

@@ -101,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: [
     {
@@ -546,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/util/ajax.js

@@ -3,6 +3,7 @@ import qs from 'qs'
 import router from '../router'
 import { Message } from 'element-ui'
 
+var JWT = localStorage.getItem('JWT')
 const Axios = axios.create({
   timeout: 60000,
   responseType: 'json',
@@ -10,7 +11,8 @@ const Axios = axios.create({
   queryData: {},
   urlData: {},
   headers: {
-    'Content-Type': 'multipart/form-data'
+    'Content-Type': 'multipart/form-data',
+    'authorization': JWT
   }
 })
 
@@ -68,8 +70,11 @@ Axios.interceptors.request.use((config) => {
 
 const ajax = (...args) => {
   return new Promise((resolve, reject) => {
-    Axios(...args).then(({ data }) => {
-      // console.log(111)
+    Axios(...args).then(({ data, headers }) => {
+      if (headers.authorization) {
+        localStorage.setItem('JWT', headers.authorization)
+        JWT = headers.authorization
+      }
       const { code, message, result } = data
       if (code === 200) {
         resolve(result)

src/util/api.js

@@ -660,5 +660,31 @@ const $api = {
       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