xcx

config/index.js

@@ -12,10 +12,10 @@ 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://127.0.0.1:8080', 
         // target: 'http://192.168.0.11:8080', //ys
-        // target: 'http://192.168.0.125:8080', //hyq
+        target: 'http://192.168.0.102:8080', //hyq
         // target: 'http://dev.ycjcjy.com', //frp
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
         // pathRewrite: {

src/pages/system/marketingActivities/snapUpList/edit.vue

@@ -1,6 +1,8 @@
 <template>
   <div class="subPage flex-h">
-    <div class="img"></div>
+    <div class="img">
+      <img v-if="templateList.length" :src="templateList[templateActiveIndex].ModelImgUrl" width="100%" alt="">
+    </div>
     <div class="flex-item">
       <h1>基本信息</h1>
       <form class="mainForm">
@@ -27,7 +29,7 @@
                   <div style="width:50%">
                     <el-input
                       placeholder="请输入活动名称"
-                      v-model="postData.title"
+                      v-model="postData.FlashBuyName"
                       clearable>
                     </el-input>
                   </div>
@@ -39,7 +41,7 @@
                   <div style="width:50%">
                     <el-input
                       placeholder="请输入活动名额"
-                      v-model="postData.title"
+                      v-model="postData.FlashBuyMaxAttendant"
                       clearable>
                     </el-input>
                   </div>
@@ -49,6 +51,11 @@
                 <span>活动模板：<em>*</em></span>
                 <div class="flex-item">
                   <div>
+                    <div class="templateItem" v-for="(item,index) in templateList" :key="index">
+                      <a :class="{'active': templateActiveIndex === index}" @click="cutTemplate(index)">
+                        <img :src="item.ModelImgUrl" style="width:100%;height:100%;object-fit: contain;">
+                      </a>
+                    </div>
                   </div>
                 </div>
               </li>
@@ -57,12 +64,14 @@
                 <div class="flex-item">
                   <div>
                     <el-date-picker
+                      value-format="yyyy-MM-ddT00:00:00+08:00"
                       v-model="postData.StartDate"
                       type="date"
                       placeholder="选择开始日期">
                     </el-date-picker>
                     <span>至</span>
                     <el-date-picker
+                      value-format="yyyy-MM-ddT00:00:00+08:00"
                       v-model="postData.EndDate"
                       type="date"
                       placeholder="选择截止日期">
@@ -74,7 +83,7 @@
                 <span>活动说明：</span>
                 <div class="flex-item">
                   <div>
-                    <quill-editor v-model="postData.editContent"
+                    <quill-editor v-model="postData.FlashBuyInfo"
                       ref="myQuillEditor"
                       :options="editorOption">
                     </quill-editor>
@@ -85,8 +94,8 @@
                 <span>参与类型：<em>*</em></span>
                 <div class="flex-item">
                   <div>
-                    <el-radio v-model="postData.joinType" label="1">不限</el-radio>
-                    <el-radio v-model="postData.joinType" label="2">新用户</el-radio>
+                    <el-radio v-model="postData.AttendantType" label="no">不限</el-radio>
+                    <el-radio v-model="postData.AttendantType" label="newuser">新用户</el-radio>
                   </div>
                 </div>
               </li>
@@ -94,25 +103,33 @@
                 <span>核销时间：<em>*</em></span>
                 <div class="flex-item">
                   <div class="flex-h" style="width: 100%;align-item: center;">
-                    <el-radio v-model="postData.verificationType" label="1" style="margin-right: 5px;"><em style="color: transparent;display:none;">1</em></el-radio>
+                    <el-radio v-model="postData.ValidateType" label="days" style="margin-right: 5px;"><em style="color: transparent;display:none;">1</em></el-radio>
                     <span>领取后</span>
                     <div style="width: 100px;display: inline-block;">
                       <el-input
                         placeholder=""
-                        v-model="postData.validity"
+                        v-model="postData.ValidateDays"
                         clearable>
                       </el-input>
                     </div>
                     <span>天内有效</span>
                   </div>
                   <div class="flex-h" style="width: 100%;align-item: center;margin-top: 10px;">
-                    <el-radio v-model="postData.verificationType" label="2" style="margin-right: 5px;"><em style="color: transparent;display:none;">2</em></el-radio>
+                    <el-radio v-model="postData.ValidateType" label="date" style="margin-right: 5px;"><em style="color: transparent;display:none;">2</em></el-radio>
                     <span>有效期</span>
                     <div style="display: inline-block;">
                       <el-date-picker
-                        v-model="postData.validityDate"
+                        value-format="yyyy-MM-ddT00:00:00+08:00"
+                        v-model="postData.ValidateStart"
                         type="date"
-                        placeholder="选择日期">
+                        placeholder="选择开始日期">
+                      </el-date-picker>
+                      <span>至</span>
+                      <el-date-picker
+                        value-format="yyyy-MM-ddT00:00:00+08:00"
+                        v-model="postData.ValidateEnd"
+                        type="date"
+                        placeholder="选择截止日期">
                       </el-date-picker>
                     </div>
                   </div>
@@ -121,7 +138,8 @@
               <li>
                 <el-button
                   size="mini"
-                  type="primary">保存</el-button>
+                  type="primary"
+                  @click="submitFlashbuy">保存</el-button>
                 <el-button
                   size="mini"
                   type="danger" @click="reback">取消</el-button>
@@ -139,35 +157,24 @@ const { mapActions: mapActivityFlashbuyActions } = createNamespacedHelpers('acti
 export default {
   data () {
     return {
+      templateActiveIndex: 0, // 当前选择模板索引值
+      templateList: [], // 模板列表
       postData: {
-        caseid: '', // 案场id
-        title: '', // 活动标题
-        StartDate: '', // 开始日期
-        EndDate: '', // 截止日期
-        editContent: '', // 编辑内容
-        tableData: [], // 奖品数据
-        joinOff: true, // 参与人数开关
-        joinNum: '', // 参与人数
-        joinType: '1', // 参与类型
-        lotteryNumType: 'fixedNum', // 抽奖次数类型
-        lotteryTimeUnit: 'day', // 抽奖周期单位
-        lotteryNum: '', // 抽奖次数
-        shareType: 'newUser', // 分享设置
-        addLotteryNum: '', // 新增抽奖次数
-        systemUserLottery: true, // 系统用户抽奖
-        prizeDefault: true, // 奖品内定
-        prizeTableData: [], // 奖品内定表格数据
-        verificationType: '1', // 核销类型
-        validity: '', // 领取后有效天数
-        validityDate: '', // 有效期
+        CaseId: '', // 案场id
+        FlashBuyName: '', // 活动名称
+        FlashBuyMaxAttendant: '', // 活动名额
+        ModelId: '', // 模板id
+        StartDate: '', // 活动开始日期
+        EndDate: '', // 活动截止日期
+        FlashBuyInfo: '', // 活动说明
+        AttendantType: 'no', // 参与类型
+        ValidateDays: '', // 领取后有效天数
+        ValidateStart: '', // 有效期开始时间
+        ValidateEnd: '', // 有效期截止时间
+        ValidateType: 'days', // 核销类型
+        FlashBuyStatus: 'active', // 活动状态
       },
       editorOption: {
-        modules: {
-          toolbar: [
-            ['bold', 'italic', 'underline', 'strike', { 'color': [] }, { 'font': [] }, { 'header': 1 }, { 'header': 2 }, { 'indent': '-1' }, { 'indent': '+1' }, { 'list': 'ordered' }, { 'list': 'bullet' }, 'align', { 'direction': 'rtl' }, 'clean'], // toggled buttons
-            ['blockquote', 'code-block']
-          ]
-        }
       },
     }
   },
@@ -181,24 +188,142 @@ export default {
     }),
     CaseId: {
       get () {
-        return this.postData.caseid || this.defaultCaseId
+        return this.postData.CaseId || this.defaultCaseId
       },
       set (val) {
-        this.postData.caseid = val
+        this.postData.CaseId = val
       }
     }
   },
   created () {
     this.getFlashbuyTemplateList().then((res) => {
-      console.log(JSON.stringify(res))
+      // console.log(JSON.stringify(res))
+      for (var n = 0; n < res.length; n++) {
+        res[n].currentImg = ''
+      }
+      this.templateList = res
+      if (this.$route.query.id) {
+        this.getFlashbuyById(this.$route.query.id).then((resr) => {
+          // console.log(JSON.stringify(resr))
+          this.postData = resr
+          for (var n = 0; n < this.templateList.length; n++) {
+            if (this.templateList[n].ModelId === this.postData.ModelId) {
+              this.templateActiveIndex = n
+            }
+          }
+          if (this.postData.ValidateType === 'date') {
+            this.postData.ValidateDays = ''
+          } else {
+            this.postData.ValidateStart = ''
+            this.postData.ValidateEnd = ''
+          }
+        })
+      }
     })
   },
   methods: {
     ...mapActivityFlashbuyActions([
       'getFlashbuyTemplateList',
+      'addFlashbuy',
+      'getFlashbuyById',
+      'editFlashbuy',
     ]),
+    submitFlashbuy () { // 提交抢购数据
+      if (!this.checkData()) {
+        return false
+      }
+      this.postData.FlashBuyMaxAttendant = this.postData.FlashBuyMaxAttendant - 0
+      this.postData.ModelId = this.templateList[this.templateActiveIndex].ModelId
+      if (this.$route.query.id) {
+        this.editFlashbuy(this.postData).then((res) => {
+          this.$message({
+            message: '操作成功',
+            type: 'success'
+          })
+          this.$router.push({ name: 'snapUpList' })
+        })
+      } else {
+        this.addFlashbuy(this.postData).then((res) => {
+          this.$message({
+            message: '操作成功',
+            type: 'success'
+          })
+          this.$router.push({ name: 'snapUpList' })
+        })
+      }
+    },
+    checkData () { // 校验数据格式
+      if (this.postData.CaseId === '') {
+        this.$message({
+          type: 'error',
+          message: '请选择案场'
+        })
+        return false
+      }
+      if (this.postData.FlashBuyName === '') {
+        this.$message({
+          type: 'error',
+          message: '活动名称不能为空'
+        })
+        return false
+      }
+      if (this.postData.FlashBuyMaxAttendant === '') {
+        this.$message({
+          type: 'error',
+          message: '活动名额不能为空'
+        })
+        return false
+      }
+      if (this.postData.StartDate === '') {
+        this.$message({
+          type: 'error',
+          message: '活动开始时间不能为空'
+        })
+        return false
+      }
+      if (this.postData.EndDate === '') {
+        this.$message({
+          type: 'error',
+          message: '活动截止时间不能为空'
+        })
+        return false
+      }
+      if (this.postData.ValidateType === 'days') {
+        if (this.postData.ValidateDays - 0 <= 0 || (this.postData.ValidateDays - 0) % 1 !== 0) {
+          this.$message({
+            type: 'error',
+            message: '领取后有效天数须为大于0正整数'
+          })
+          return false
+        }
+        this.postData.ValidateDays = this.postData.ValidateDays - 0
+        delete this.postData.ValidateStart
+        delete this.postData.ValidateEnd
+      } else {
+        if (this.postData.ValidateStart === '') {
+          this.$message({
+            type: 'error',
+            message: '有效期开始时间不能为空'
+          })
+          return false
+        }
+        if (this.postData.ValidateEnd === '') {
+          this.$message({
+            type: 'error',
+            message: '有效期截止时间不能为空'
+          })
+          return false
+        }
+        delete this.postData.ValidateDays
+      }
+      return true
+    },
+    cutTemplate (index) { // 切换模板
+      this.templateActiveIndex = index
+      this.postData.ModelId = this.templateList[index].ModelId
+    },
     reback () {
-      this.$router.push({name: 'snapUpList'})
+      this.$router.push({ name: 'snapUpList' })
     },
   },
 }
@@ -241,5 +366,26 @@ h1 {
     border: 1px solid #eee;
     border-bottom: none;
   }
+  .templateItem {
+    width: 120px;
+    display: inline-block;
+    margin: 0 20px 20px 0;
+    position: relative;
+    overflow: hidden;
+    text-align: center;
+    vertical-align: top;
+    & > a {
+      width: 100%;
+      height: 120px;
+      display: inline-block;
+      position: relative;
+      overflow: hidden;
+      border: 1px dashed #ccc;
+      box-sizing: border-box;
+      &.active {
+        border-color: #409eff;
+      }
+    }
+  }
 }
 </style>

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

@@ -22,12 +22,12 @@
             </el-select>
           </li>
           <li>
-            <el-select v-model="postData.state" placeholder="请选择状态">
+            <el-select v-model="postData.flashbuystatus" placeholder="请选择状态">
               <el-option
-                v-for="item in cases"
-                :key="item.CaseId"
-                :label="item.CaseName"
-                :value="item.CaseId">
+                v-for="item in statusList"
+                :key="item.id"
+                :label="item.value"
+                :value="item.id">
               </el-option>
             </el-select>
           </li>
@@ -41,7 +41,8 @@
         </ul>
         <el-button
           size="mini"
-          type="primary">搜索</el-button>
+          type="primary"
+          @click="getList">搜索</el-button>
       </div>
       <div class="moreFilter"></div>
     </div>
@@ -55,16 +56,15 @@
             width="180">
           </el-table-column>
           <el-table-column
-            prop="ActivityName"
+            prop="FlashBuyName"
             label="活动名称">
           </el-table-column>
           <el-table-column
-            prop="Status"
+            prop="FlashBuyStatus"
             label="状态">
-          </el-table-column>
-          <el-table-column
-            prop="url"
-            label="活动链接">
+            <template slot-scope="scope">
+              {{scope.row.FlashBuyStatus === 'active' ? '已启用' : scope.row.FlashBuyStatus === 'inactive' ? '已停用' : '已结束'}}
+            </template>
           </el-table-column>
           <el-table-column
             prop="address"
@@ -72,12 +72,19 @@
             width="200">
             <template slot-scope="scope">
               <el-button
+                v-if="scope.row.FlashBuyStatus !== 'active'"
                 size="mini"
                 type="danger">删除</el-button>
               <el-button
+                v-if="scope.row.FlashBuyStatus === 'active'"
                 size="mini"
                 type="warning">停用</el-button>
               <el-button
+                size="mini"
+                type="success"
+                @click="editFlashbuy(scope.row.FlashBuyId)">编辑</el-button>
+              <el-button
+                v-if="scope.row.FlashBuyStatus === 'inactive'"
                 size="mini"
                 type="success">启用</el-button>
               <el-button
@@ -102,13 +109,26 @@ const { mapActions: mapActivityFlashbuyActions } = createNamespacedHelpers('acti
 export default {
   data () {
     return {
+      statusList: [{ // 状态列表
+        id: '',
+        value: '不限状态'
+      }, {
+        id: 'active',
+        value: '已启用'
+      }, {
+        id: 'inactive',
+        value: '已停用'
+      }, {
+        id: 'over',
+        value: '已结束'
+      }],
       tableData: [],
       postData: { // 表格搜索条件
         caseid: '', // 案场id
         page: 1, // 当前页码
-        pageSize: 10, // 请求数据量
+        pagesize: 10, // 请求数据量
         name: '', // 活动名称
-        state: '', // 状态
+        flashbuystatus: '', // 状态
       },
       total: 0 // 数据条数
     }
@@ -127,13 +147,24 @@ export default {
       }
     }
   },
-  mounted () {
+  created () {
     this.getList()
   },
   methods: {
     ...mapActivityFlashbuyActions([
-      'getFlashbuyTemplateList',
+      'getFlashbuyList',
     ]),
+    editFlashbuy (id) {
+      this.$router.push({ name: 'editSnapUpList', query: { id } })
+    },
+    toGetFlashbuyList () {
+      this.getFlashbuyList(this.postData).then((res) => {
+        // console.log(JSON.stringify(res))
+        this.postData.page = res.page
+        this.total = res.pagenum
+        this.tableData = res.list
+      })
+    },
     handleCurrentChange (val) {
       this.$data.postData.page = val
       this.getList()
@@ -142,6 +173,9 @@ export default {
       this.$router.push({ name: pathName })
     },
     getList () { // 获取数据列表
+      this.postData.page = 1
+      this.total = 1
+      this.toGetFlashbuyList()
     },
     addSnapUpList () {
       this.$router.push({ name: 'addSnapUpList' })
@@ -153,4 +187,9 @@ export default {
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style lang="scss" scoped>
 @import "page.scss";
+table {
+  button {
+    margin-bottom: 10px;
+  }
+}
 </style>

src/store/activityManager/flashbuy.js

@@ -16,5 +16,59 @@ export default {
         }).catch(reject)
       })
     },
+    getFlashbuyList ({ commit }, payload) { // 获取抢购活动列表
+      return new Promise((resolve, reject) => {
+        ajax(api.activityManager.getFlashbuyList.url, {
+          method: api.activityManager.getFlashbuyList.method,
+          queryData: { ...payload }
+        }).then(res => {
+          resolve(res)
+        }).catch(reject)
+      })
+    },
+    addFlashbuy ({ commit }, payload) { // 新增抢购活动
+      return new Promise((resolve, reject) => {
+        ajax(api.activityManager.addFlashbuy.url, {
+          method: api.activityManager.addFlashbuy.method,
+          data: { info: JSON.stringify(payload) }
+        }).then(res => {
+          resolve(res)
+        }).catch(reject)
+      })
+    },
+    getFlashbuyById ({ commit }, id) { // 获取抢购信息
+      return new Promise((resolve, reject) => {
+        ajax(api.activityManager.getFlashbuyById.url, {
+          method: api.activityManager.getFlashbuyById.method,
+          urlData: {
+            id,
+          },
+        }).then(res => {
+          resolve(res)
+        }).catch(reject)
+      })
+    },
+    editFlashbuy ({ commit }, payload) { // 更新抢购活动
+      return new Promise((resolve, reject) => {
+        ajax(api.activityManager.editFlashbuy.url, {
+          method: api.activityManager.editFlashbuy.method,
+          data: { info: JSON.stringify(payload) }
+        }).then(res => {
+          resolve(res)
+        }).catch(reject)
+      })
+    },
+    deleteFlashbuy ({ commit }, id) { // 删除抢购活动
+      return new Promise((resolve, reject) => {
+        ajax(api.activityManager.deleteFlashbuy.url, {
+          method: api.activityManager.deleteFlashbuy.method,
+          urlData: {
+            id,
+          },
+        }).then(res => {
+          resolve(res)
+        }).catch(reject)
+      })
+    },
   }
 }

src/util/api.js

@@ -873,6 +873,26 @@ const $api = {
       method: 'get',
       url: `${baseUrl}${common}/flashbuy/model`
     },
+    addFlashbuy: { // 营销活动-新增抢购活动
+      method: 'post',
+      url: `${baseUrl}${common}/flashbuy`
+    },
+    getFlashbuyList: { // 营销活动-获取抢购活动列表
+      method: 'get',
+      url: `${baseUrl}${common}/flashbuy`
+    },
+    getFlashbuyById: { // 营销活动-获取抢购活动信息
+      method: 'get',
+      url: `${baseUrl}${common}/flashbuy/:id`
+    },
+    editFlashbuy: { // 营销活动-更新抢购活动
+      method: 'put',
+      url: `${baseUrl}${common}/flashbuy/edit`
+    },
+    deleteFlashbuy: { // 营销活动-删除抢购活动
+      method: 'delete',
+      url: `${baseUrl}${common}/flashbuy/:id`
+    },
   },
   record: {
     getRecordList: {