Joe 3 年之前
父節點
當前提交
edb4f937ab
共有 2 個文件被更改,包括 1 次插入4 次删除
  1. 0 3
      src/views/coupon/Coupon_Statistics/index.vue
  2. 1 1
      src/views/dzk/Dzk_Rule.vue

+ 0 - 3
src/views/coupon/Coupon_Statistics/index.vue

@@ -9,15 +9,12 @@
     <el-tabs v-model="activeName">
     <el-tabs v-model="activeName">
       <el-tab-pane label="实时发放" name="realTime" :key="'info'">
       <el-tab-pane label="实时发放" name="realTime" :key="'info'">
         <child1></child1>
         <child1></child1>
-        
       </el-tab-pane>
       </el-tab-pane>
       <el-tab-pane label="按发放方式" name="issue" :key="'issue'">
       <el-tab-pane label="按发放方式" name="issue" :key="'issue'">
         <child2></child2>
         <child2></child2>
-        
       </el-tab-pane>
       </el-tab-pane>
       <el-tab-pane label="按优惠券类" name="model" :key="'pay'">
       <el-tab-pane label="按优惠券类" name="model" :key="'pay'">
          <child3></child3>
          <child3></child3>
-        
       </el-tab-pane>
       </el-tab-pane>
     </el-tabs>
     </el-tabs>
   </div>
   </div>

+ 1 - 1
src/views/dzk/Dzk_Rule.vue

@@ -189,7 +189,7 @@
 
 
         <el-form-item
         <el-form-item
           prop="isMarket"
           prop="isMarket"
-          label="是否叠加营销方案"
+          label="是否叠加优惠方案"
           :required="settingForm.cardEnabledFlag == 1"
           :required="settingForm.cardEnabledFlag == 1"
         >
         >
           <el-radio-group v-model="settingForm.isMarket">
           <el-radio-group v-model="settingForm.isMarket">