优惠券配置，优惠券领取记录表增加优惠券促销金额

src/api/system/pack.js

@@ -9,10 +9,11 @@ export function listPack(query) {
   })
 }
 
-export function query() {
+export function query(query) {
   return request({
     url: '/system/pack/query',
     method: 'get',
+    params: query
   })
 }
 

src/views/system/consumerCoupon/index.vue

@@ -200,7 +200,7 @@
       <el-table-column label="时长" align="center" prop="duration"/>
       <el-table-column label="优惠金额" align="center" prop="subPrice"/>
       <el-table-column align="center" label="优惠售卖金额" prop="couponPayPrice"/>
-
+      <el-table-column align="center" label="优惠促销金额" prop="promotionPrice"/>
       <el-table-column label="优惠券来源" align="center" prop="sourceType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.consumer_coupon_source_type" :value="scope.row.sourceType"/>

src/views/system/coupon/durationIndex.vue

@@ -118,6 +118,8 @@
       </el-table-column>
       <el-table-column align="center" label="优惠券原始金额" prop="subPrice"/>
       <el-table-column align="center" label="优惠券售卖金额" prop="couponPayPrice"/>
+      <el-table-column align="center" label="优惠券促销金额" prop="promotionPrice"/>
+
       <el-table-column label="时长" align="center" prop="duration"/>
       <el-table-column label="门槛时长" align="center" prop="minDuration"/>
       <el-table-column label="平台类型" align="center" prop="platformType">
@@ -224,6 +226,9 @@
         <el-form-item label="优惠券售卖金额" prop="couponPayPrice">
           <el-input v-model="form.couponPayPrice" placeholder="请输入优惠券售卖金额"/>
         </el-form-item>
+        <el-form-item label="优惠券促销金额" prop="promotionPrice">
+          <el-input v-model="form.promotionPrice" placeholder="请输入优惠券促销金额"/>
+        </el-form-item>
         <el-form-item label="时长" prop="duration">
           <el-input-number v-model="form.duration" :max="24" :min="0.5" :step="0.5" placeholder="请输入时长"/>
         </el-form-item>

src/views/system/coupon/index.vue

@@ -118,6 +118,7 @@
       </el-table-column>
       <el-table-column label="优惠券原始金额" align="center" prop="subPrice"/>
       <el-table-column align="center" label="优惠券售卖金额" prop="couponPayPrice"/>
+      <el-table-column align="center" label="优惠券促销金额" prop="promotionPrice"/>
 
       <el-table-column align="center" label="时长" prop="duration"/>
       <el-table-column label="平台类型" align="center" prop="platformType">
@@ -214,6 +215,9 @@
         <el-form-item label="时长" prop="duration">
           <el-input-number v-model="form.duration" :max="24" :min="0" placeholder="请输入时长"/>
         </el-form-item>
+        <el-form-item label="优惠券促销金额" prop="promotionPrice">
+          <el-input-number v-model="form.promotionPrice" :max="24" :min="0" placeholder="请输入优惠券促销金额"/>
+        </el-form-item>
         <el-form-item label="平台类型" prop="platformType">
           <!--输入框 显示美团 值为2-->
           <el-select v-model="form.platformType" placeholder="请选择平台类型" clearable disabled>
@@ -227,6 +231,7 @@
         <el-form-item label="美团团购id" prop="dealgroupId">
           <el-input @focus="openShopDeal()" v-model="form.dealgroupId" placeholder="请输入美团团购id"/>
         </el-form-item>
+
         <el-form-item label="订单类型" prop="orderType">
           <el-select v-model="form.orderType" placeholder="请选择订单类型" clearable>
             <el-option

src/views/system/coupon/tiktokindex.vue

@@ -118,6 +118,7 @@
       </el-table-column>
       <el-table-column label="优惠券原始金额" align="center" prop="subPrice"/>
       <el-table-column align="center" label="优惠券售卖金额" prop="couponPayPrice"/>
+      <el-table-column align="center" label="优惠券促销金额" prop="promotionPrice"/>
       <el-table-column align="center" label="时长" prop="duration"/>
       <el-table-column label="平台类型" align="center" prop="platformType">
         <template slot-scope="scope">
@@ -213,6 +214,9 @@
         <el-form-item label="时长" prop="duration">
           <el-input-number v-model="form.duration" :max="24" :min="0" placeholder="请输入时长"/>
         </el-form-item>
+        <el-form-item label="优惠券促销金额" prop="promotionPrice">
+          <el-input-number v-model="form.promotionPrice" :max="24" :min="0" placeholder="请输入优惠券促销金额"/>
+        </el-form-item>
         <el-form-item label="平台类型" prop="platformType">
           <!--输入框 显示美团 值为2-->
           <el-select v-model="form.platformType" placeholder="请选择平台类型" clearable disabled>

src/views/system/room/index.vue

@@ -365,6 +365,9 @@ export default {
       // 表单参数
       form: {},
       packForm: {},
+      packParams: {
+        type: 1,
+      },
       // 表单校验
       rules: {
         storeId: [
@@ -408,7 +411,7 @@ export default {
       })
     },
     onPackList(){
-      query().then(res => {
+      query(this.packParams).then(res => {
         this.packList = res.data.map(obj=>{
           return  {
             ...obj,

src/views/system/room/roomLabel.vue

@@ -36,6 +36,7 @@
         </template>
       </el-table-column>
       <el-table-column align="center" label="套餐名称" prop="packName"/>
+      <el-table-column align="center" label="套餐金额" prop="packPrice"/>
       <el-table-column align="center" label="促销时长" prop="promotionDuration"/>
       <el-table-column align="center" label="促销金额" prop="promotionAmount"/>
       <el-table-column align="center" label="创建时间" prop="createTime" width="180">
@@ -160,6 +161,9 @@ export default {
         promotionDuration: null,
         promotionAmount: null,
       },
+      packParams: {
+        type: 0,
+      },
       // 表单参数
       form: {},
       // 表单校验
@@ -208,7 +212,7 @@ export default {
       })
     },
     onPackList() {
-      query().then(res => {
+      query(this.packParams).then(res => {
         this.packList = res.data
       })
     },

src/views/system/roomLabel/index.vue

@@ -116,7 +116,13 @@
       <el-table-column align="center" label="门店名称" prop="storeName"/>
       <el-table-column align="center" label="房间名称" prop="roomName"/>
       <el-table-column align="center" label="标签名称" prop="labelName"/>
+      <el-table-column align="center" label="标签类型" prop="labelType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.label_type" :value="scope.row.labelType"/>
+        </template>
+      </el-table-column>
       <el-table-column align="center" label="套餐名称" prop="packName"/>
+      <el-table-column align="center" label="套餐金额" prop="packPrice"/>
       <el-table-column align="center" label="促销时长" prop="promotionDuration"/>
       <el-table-column align="center" label="促销金额" prop="promotionAmount"/>
       <el-table-column align="center" label="创建时间" prop="createTime" width="180">
@@ -196,6 +202,7 @@ import {queryList} from "@/api/system/label";
 
 export default {
   name: "RoomLabel",
+  dicts: ['label_type'],
   data() {
     return {
       // 遮罩层