xcx

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

@@ -11,7 +11,7 @@
     &+.flex-item{
       margin: 20px;
       position: relative;
-      overflow: hidden;
+      overflow-y: auto;
     }
   }
   nav{

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

@@ -12,7 +12,7 @@
                 <span>案场：<em>*</em></span>
                 <div class="flex-item">
                   <div style="width:50%">
-                    <el-select v-model="CaseId" placeholder="请选择案场">
+                    <el-select :disabled="editOff" v-model="CaseId" placeholder="请选择案场">
                       <el-option
                         v-for="item in cases"
                         :key="item.CaseId"
@@ -40,6 +40,7 @@
                 <div class="flex-item">
                   <div style="width:50%">
                     <el-input
+                      :disabled="editOff"
                       placeholder="请输入活动名额"
                       v-model="postData.FlashBuyMaxAttendant"
                       clearable>
@@ -64,6 +65,7 @@
                 <div class="flex-item">
                   <div>
                     <el-date-picker
+                      :disabled="editOff"
                       value-format="yyyy-MM-ddT00:00:00+08:00"
                       v-model="postData.StartDate"
                       type="date"
@@ -71,6 +73,7 @@
                     </el-date-picker>
                     <span>至</span>
                     <el-date-picker
+                      :disabled="editOff"
                       value-format="yyyy-MM-ddT00:00:00+08:00"
                       v-model="postData.EndDate"
                       type="date"
@@ -94,8 +97,8 @@
                 <span>参与类型：<em>*</em></span>
                 <div class="flex-item">
                   <div>
-                    <el-radio v-model="postData.AttendantType" label="no">不限</el-radio>
-                    <el-radio v-model="postData.AttendantType" label="newuser">新用户</el-radio>
+                    <el-radio :disabled="editOff" v-model="postData.AttendantType" label="no">不限</el-radio>
+                    <el-radio :disabled="editOff" v-model="postData.AttendantType" label="newuser">新用户</el-radio>
                   </div>
                 </div>
               </li>
@@ -103,10 +106,11 @@
                 <span>核销时间：<em>*</em></span>
                 <div class="flex-item">
                   <div class="flex-h" style="width: 100%;align-item: center;">
-                    <el-radio v-model="postData.ValidateType" label="days" style="margin-right: 5px;"><em style="color: transparent;display:none;">1</em></el-radio>
+                    <el-radio :disabled="editOff" 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
+                        :disabled="editOff"
                         placeholder=""
                         v-model="postData.ValidateDays"
                         clearable>
@@ -115,10 +119,11 @@
                     <span>天内有效</span>
                   </div>
                   <div class="flex-h" style="width: 100%;align-item: center;margin-top: 10px;">
-                    <el-radio v-model="postData.ValidateType" label="date" style="margin-right: 5px;"><em style="color: transparent;display:none;">2</em></el-radio>
+                    <el-radio :disabled="editOff" 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
+                        :disabled="editOff"
                         value-format="yyyy-MM-ddT00:00:00+08:00"
                         v-model="postData.ValidateStart"
                         type="date"
@@ -126,6 +131,7 @@
                       </el-date-picker>
                       <span>至</span>
                       <el-date-picker
+                        :disabled="editOff"
                         value-format="yyyy-MM-ddT00:00:00+08:00"
                         v-model="postData.ValidateEnd"
                         type="date"
@@ -157,6 +163,7 @@ const { mapActions: mapActivityFlashbuyActions } = createNamespacedHelpers('acti
 export default {
   data () {
     return {
+      editOff: false,
       templateActiveIndex: 0, // 当前选择模板索引值
       templateList: [], // 模板列表
       postData: {
@@ -196,6 +203,9 @@ export default {
     }
   },
   created () {
+    if (this.$route.query.id) {
+      this.editOff = true
+    }
     this.getFlashbuyTemplateList().then((res) => {
       // console.log(JSON.stringify(res))
       for (var n = 0; n < res.length; n++) {
@@ -319,8 +329,10 @@ export default {
       return true
     },
     cutTemplate (index) { // 切换模板
-      this.templateActiveIndex = index
-      this.postData.ModelId = this.templateList[index].ModelId
+      if (!this.editOff) {
+        this.templateActiveIndex = index
+        this.postData.ModelId = this.templateList[index].ModelId
+      }
     },
     reback () {
       this.$router.push({ name: 'snapUpList' })

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

@@ -34,7 +34,7 @@
           <li>
             <el-input
               placeholder="请输入活动名称"
-              v-model="postData.name"
+              v-model="postData.flashbuyname"
               clearable>
             </el-input>
           </li>
@@ -74,11 +74,13 @@
               <el-button
                 v-if="scope.row.FlashBuyStatus !== 'active'"
                 size="mini"
-                type="danger">删除</el-button>
+                type="danger"
+                @click="deleteFlashbuyItem(scope.row.FlashBuyId)">删除</el-button>
               <el-button
                 v-if="scope.row.FlashBuyStatus === 'active'"
                 size="mini"
-                type="warning">停用</el-button>
+                type="warning"
+                @click="stopFlashBuy(scope.row.FlashBuyId)">停用</el-button>
               <el-button
                 size="mini"
                 type="success"
@@ -86,10 +88,12 @@
               <el-button
                 v-if="scope.row.FlashBuyStatus === 'inactive'"
                 size="mini"
-                type="success">启用</el-button>
+                type="success"
+                @click="openFlashBuy(scope.row.FlashBuyId)">启用</el-button>
               <el-button
                 size="mini"
-                type="success">获取记录</el-button>
+                type="success"
+                @click="getRecords(scope.row.FlashBuyId)">抢购记录</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -101,6 +105,75 @@
       layout="prev, pager, next, jumper"
       :total="total">
     </el-pagination>
+    <el-dialog
+      title="抢购记录"
+      :visible.sync="showFlashbuyRecordsList"
+      width="1000px"
+      @closed="emptyFlashbuyRecordsList"
+      center>
+      <div class="popupSearch">
+        <div style="width:200px;">
+          <el-input
+            placeholder="请输入手机号"
+            v-model="flashbuyPostData.phone"
+            clearable>
+          </el-input>
+        </div>
+        <el-button
+          type="primary"
+          @click="searchRecordList">搜索</el-button>
+      </div>
+      <div style="border:1px solid #eee;border-bottom:none;margin-top:20px;">
+        <el-table
+          :data="flashbuyRecordsList"
+          style="width: 100%">
+          <el-table-column
+            prop="CaseName"
+            label="案场">
+          </el-table-column>
+          <el-table-column
+            prop="CustomerName"
+            label="姓名">
+          </el-table-column>
+          <el-table-column
+            prop="Phone"
+            label="手机号">
+          </el-table-column>
+          <el-table-column
+            prop="CreateDate"
+            label="获取时间">
+            <template slot-scope="scope">
+              <span v-if="scope.row.CreateDate !== '0001-01-01T00:00:00Z'">{{toolClass.dateFormat(scope.row.CreateDate, 'yyyy-MM-dd')}}</span>
+              <span v-else>-</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="VerifyDate"
+            label="核销时间">
+            <template slot-scope="scope">
+              <span v-if="scope.row.VerifyDate !== '0001-01-01T00:00:00Z'">{{toolClass.dateFormat(scope.row.VerifyDate, 'yyyy-MM-dd')}}</span>
+              <span v-else>-</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="VerifyStatus"
+            label="核销状态">
+            <template slot-scope="scope">
+              {{scope.row.Status === 'useable' ? '未核销' : '已核销'}}
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div style="padding-bottom:20px;">
+        <el-pagination
+          @current-change="cutFlashbuyPage"
+          :current-page.sync="flashbuyPostData.page"
+          :page-size="flashbuyPostData.pagesize"
+          layout="prev, pager, next, jumper"
+          :total="flashbuyTotal">
+        </el-pagination>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -109,6 +182,8 @@ const { mapActions: mapActivityFlashbuyActions } = createNamespacedHelpers('acti
 export default {
   data () {
     return {
+      currentFlashbuyId: '',
+      showFlashbuyRecordsList: false,
       statusList: [{ // 状态列表
         id: '',
         value: '不限状态'
@@ -127,10 +202,17 @@ export default {
         caseid: '', // 案场id
         page: 1, // 当前页码
         pagesize: 10, // 请求数据量
-        name: '', // 活动名称
+        flashbuyname: '', // 活动名称
         flashbuystatus: '', // 状态
       },
-      total: 0 // 数据条数
+      total: 0, // 数据条数
+      flashbuyPostData: {
+        page: 1, // 当前页码
+        pagesize: 5, // 请求数据量
+        phone: '', // 手机号
+      },
+      flashbuyTotal: 0,
+      flashbuyRecordsList: [], // 抢购记录列表
     }
   },
   computed: {
@@ -153,7 +235,78 @@ export default {
   methods: {
     ...mapActivityFlashbuyActions([
       'getFlashbuyList',
+      'getFlashbuyRecordsById',
+      'deleteFlashbuy',
+      'updateFlashbuyStatus',
     ]),
+    openFlashBuy (id) { // 启用
+      this.updateFlashbuyStatus({
+        id,
+        status: 'active'
+      }).then(() => {
+        this.getList()
+      })
+    },
+    stopFlashBuy (id) { // 停用
+      this.updateFlashbuyStatus({
+        id,
+        status: 'inactive'
+      }).then(() => {
+        this.getList()
+      })
+    },
+    deleteFlashbuyItem (id) { // 删除抢购活动
+      this.$confirm('确认删除此活动?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.deleteFlashbuy(id).then(() => {
+          this.getList()
+          this.$message({
+            type: 'success',
+            message: '删除成功!'
+          })
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    getRecords (id) { // 获取记录
+      this.currentFlashbuyId = id
+      this.showFlashbuyRecordsList = true
+      this.toGetFlashbuyRecordsList()
+    },
+    cutFlashbuyPage (val) {
+      this.$data.flashbuyPostData.page = val
+      this.toGetFlashbuyRecordsList()
+    },
+    emptyFlashbuyRecordsList () { // 清空搜索数据
+      this.flashbuyPostData.page = 1
+      this.flashbuyPostData.phone = ''
+      this.flashbuyTotal = 1
+      this.flashbuyRecordsList = []
+    },
+    toGetFlashbuyRecordsList () { // 获取抢购记录列表
+      this.getFlashbuyRecordsById({
+        id: this.currentFlashbuyId,
+        info: this.flashbuyPostData
+      }).then((res) => {
+        // console.log(JSON.stringify(res))
+        res.list = res.list || []
+        this.flashbuyRecordsList = res.list
+        this.flashbuyPostData.page = res.page
+        this.flashbuyTotal = res.pagenum
+      })
+    },
+    searchRecordList () { // 搜索抢购记录
+      this.flashbuyPostData.page = 1
+      this.flashbuyTotal = 1
+      this.toGetFlashbuyRecordsList()
+    },
     editFlashbuy (id) {
       this.$router.push({ name: 'editSnapUpList', query: { id } })
     },
@@ -192,4 +345,13 @@ table {
     margin-bottom: 10px;
   }
 }
+.popupSearch {
+  width: 100%;
+  text-align: right;
+  font-size: 0;
+  & > * {
+    display: inline-block;
+    margin-left: 10px;
+  }
+}
 </style>

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

@@ -11,7 +11,7 @@
     &+.flex-item{
       margin: 20px;
       position: relative;
-      overflow: hidden;
+      overflow-y: auto;
     }
   }
 }

src/store/activityManager/flashbuy.js

@@ -70,5 +70,28 @@ export default {
         }).catch(reject)
       })
     },
+    getFlashbuyRecordsById ({ commit }, payload) { // 获取抢购活动记录列表
+      return new Promise((resolve, reject) => {
+        ajax(api.activityManager.getFlashbuyRecordsById.url, {
+          method: api.activityManager.getFlashbuyRecordsById.method,
+          urlData: {
+            id: payload.id
+          },
+          queryData: { ...payload.info }
+        }).then(res => {
+          resolve(res)
+        }).catch(reject)
+      })
+    },
+    updateFlashbuyStatus ({ commit }, payload) { // 更新抢购活动状态
+      return new Promise((resolve, reject) => {
+        ajax(api.activityManager.updateFlashbuyStatus.url, {
+          method: api.activityManager.updateFlashbuyStatus.method,
+          urlData: {...payload},
+        }).then(res => {
+          resolve(res)
+        }).catch(reject)
+      })
+    },
   }
 }

src/util/api.js

@@ -893,6 +893,14 @@ const $api = {
       method: 'delete',
       url: `${baseUrl}${common}/flashbuy/:id`
     },
+    getFlashbuyRecordsById: { // 营销活动-获取抢购活动记录
+      method: 'get',
+      url: `${baseUrl}${common}/flashbuy/customer/:id`
+    },
+    updateFlashbuyStatus: { // 营销活动-更新抢购活动状态
+      method: 'put',
+      url: `${baseUrl}${common}/flashbuy/:id/:status`
+    },
   },
   record: {
     getRecordList: {