fix: 修改奖励配置

dcd3623a · 无尘 · 09d580d6 · dcd3623a · dcd3623a · dcd3623a
Commit dcd3623a authored Dec 03, 2019 by 无尘
16 changed files
--- a/dist/index.html
+++ b/dist/index.html
-<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>分享有礼</title><link href=./static/css/app.0f365e2cf210c93e2567e1a1c4d8e530.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.33.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.29.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.38.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.1.91.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.12.js></script><script type=text/javascript src=./static/js/manifest.d4b27dc84f85f33d96c6.js></script><script type=text/javascript src=./static/js/vendor.6e29ed0b437a6bb669b1.js></script><script type=text/javascript src=./static/js/app.680a6cd41b8032942b82.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>分享有礼</title><link href=./static/css/app.6e0b9469e82ac7f4f44dd026940c1ee1.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.33.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.29.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.38.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.1.91.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.12.js></script><script type=text/javascript src=./static/js/manifest.826645ad282409a7382f.js></script><script type=text/javascript src=./static/js/vendor.6e29ed0b437a6bb669b1.js></script><script type=text/javascript src=./static/js/app.8bec0e24b642f35fd04c.js></script></body></html>
\ No newline at end of file
--- a/dist/static/css/app.0f365e2cf210c93e2567e1a1c4d8e530.css
+++ b/dist/static/css/app.0f365e2cf210c93e2567e1a1c4d8e530.css
--- a/dist/static/js/2.57f1ec62a5f466d7d076.js
+++ b/dist/static/js/2.57f1ec62a5f466d7d076.js
--- a/dist/static/js/2.b07b0ce865296329407d.js
+++ b/dist/static/js/2.b07b0ce865296329407d.js
--- a/dist/static/js/app.680a6cd41b8032942b82.js
+++ b/dist/static/js/app.680a6cd41b8032942b82.js
--- a/dist/static/js/app.8bec0e24b642f35fd04c.js
+++ b/dist/static/js/app.8bec0e24b642f35fd04c.js
--- a/dist/static/js/manifest.d4b27dc84f85f33d96c6.js
+++ b/dist/static/js/manifest.d4b27dc84f85f33d96c6.js
-!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var f,i,u,d=0,b=[];d<r.length;d++)i=r[d],t[i]&&b.push(t[i][0]),t[i]=0;for(f in c)Object.prototype.hasOwnProperty.call(c,f)&&(e[f]=c[f]);for(n&&n(r,c,a);b.length;)b.shift()();if(a)for(d=0;d<a.length;d++)u=o(o.s=a[d]);return u};var r={},t={15:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"b1c6d8cabf2459ac5a8a",1:"5b546fa38466a0b05e37",2:"b07b0ce865296329407d",3:"6910fc54772239762497",4:"e42560cdcc9ef2f1fe8a",5:"8ecd133bf1cda0bdffb4",6:"2342d9cea2c3b9db329d",7:"b0fd74564cc799593b8f",8:"fe9ec49f63ecd8e527ba",9:"522a01ff8d619d2bf030",10:"e16b73d2d4b922255e52",11:"c11d02c33702d00b2e2e",12:"b96af0829c134b12bfbb"}[e]+".js";var f=setTimeout(i,12e4);function i(){a.onerror=a.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=i,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var f,i,u,d=0,b=[];d<r.length;d++)i=r[d],t[i]&&b.push(t[i][0]),t[i]=0;for(f in c)Object.prototype.hasOwnProperty.call(c,f)&&(e[f]=c[f]);for(n&&n(r,c,a);b.length;)b.shift()();if(a)for(d=0;d<a.length;d++)u=o(o.s=a[d]);return u};var r={},t={15:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"b1c6d8cabf2459ac5a8a",1:"5b546fa38466a0b05e37",2:"57f1ec62a5f466d7d076",3:"6910fc54772239762497",4:"e42560cdcc9ef2f1fe8a",5:"8ecd133bf1cda0bdffb4",6:"2342d9cea2c3b9db329d",7:"b0fd74564cc799593b8f",8:"fe9ec49f63ecd8e527ba",9:"522a01ff8d619d2bf030",10:"e16b73d2d4b922255e52",11:"c11d02c33702d00b2e2e",12:"b96af0829c134b12bfbb"}[e]+".js";var f=setTimeout(i,12e4);function i(){a.onerror=a.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=i,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/src/components/active-config/configs/competition-award.vue
+++ b/src/components/active-config/configs/competition-award.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2019-11-21 16:37:02
 * @LastEditors: 无尘
- * @LastEditTime: 2019-12-02 14:16:40
+ * @LastEditTime: 2019-12-03 14:31:16
 -->
 <!--
 <competition-award></competition-award>
@@ -79,147 +79,147 @@ import competitionAward from '@/components/active-config/configs/competition-awa
        label="成交人数闯关奖项："
        prop=""
      >
-      <div class="w-1019">
+        <div class="w-1019">
-        <el-table
+          <el-table
-          :data="compitionAward.dealNumberSettingParam"
+            :data="compitionAward.dealNumberSettingParam"
-          style="width: 100%"
+            style="width: 100%"
-        >
-          <el-table-column
-            label="奖项名称"
-            width="307"
-          >
-            <template slot-scope="scope">
-              <div class="cell">
-                <limitInput
-                  :inputWidth="275"
-                  :disflag="$route.query.editFlag ? true : false"
-                  :inputValue.sync="scope.row.awardName"
-                  :holder="'请输入奖项名称'"
-                  :getByType="'char'"
-                  :maxLength="20"
-                > </limitInput>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="排名"
-            width="405"
          >
-            <template slot-scope="scope">
+            <el-table-column
-              <div class="cell">
+              label="奖项名称"
-                <div v-if="scope.$index == 0">
+              width="307"
-                  <span class="font-14 color-606266 p-r-10">前</span>
+            >
-                  <el-input-number
+              <template slot-scope="scope">
-                    class="w-90"
+                <div class="cell">
-                    v-model="scope.row.end"
+                  <limitInput
-                    controls-position="right"
+                    :inputWidth="275"
-                    :min="1"
+                    :disflag="$route.query.editFlag ? true : false"
-                    :max="9999999999"
+                    :inputValue.sync="scope.row.awardName"
-                  > </el-input-number>
+                    :holder="'请输入奖项名称'"
-                  <span class="font-14 color-606266 p-l-10">名</span>
+                    :getByType="'char'"
-                </div>
+                    :maxLength="20"
-                <div v-if="scope.$index != 0 && scope.$index != compitionAward.dealNumberSettingParam.length - 1">
+                  > </limitInput>
-                  <span class="font-14 color-606266 p-r-10">第</span>
-                  <el-input-number
-                    class="w-90"
-                    v-model="scope.row.start"
-                    controls-position="right"
-                    :min="1"
-                    :max="9999999999"
-                  > </el-input-number>
-                  <span class="font-14 color-606266 p-l-10 p-r-10">名 至</span>
-                  <el-input-number
-                    class="w-90"
-                    v-model="scope.row.end"
-                    controls-position="right"
-                    :min="1"
-                    :max="9999999999"
-                  > </el-input-number>
-                  <span class="font-14 color-606266 p-l-10">名</span>
-                </div>
-                <div v-if="scope.$index != 0 && scope.$index == compitionAward.dealNumberSettingParam.length - 1">
-                  <span class="font-14 color-606266 p-r-10">前</span>
-                  <el-input-number
-                    class="w-90"
-                    v-model="scope.row.start"
-                    controls-position="right"
-                    :min="1"
-                    :max="9999999999"
-                  > </el-input-number>
-                  <span
-                    v-if="!scope.row.infinity"
-                    class="font-14 color-606266 p-l-10 p-r-10"
-                  >人 至</span>
-                  <el-input-number
-                    v-if="!scope.row.infinity"
-                    class="w-90"
-                    v-model="scope.row.end"
-                    controls-position="right"
-                    :min="1"
-                    :max="9999999999"
-                  > </el-input-number>
-                  <el-checkbox
-                    v-if="scope.$index == compitionAward.dealNumberSettingParam.length - 1"
-                    class="m-l-10"
-                    v-model="scope.row.infinity"
-                    @change="changeEnd($event, scope.row)"
-                  >无穷大</el-checkbox>
                </div>
-              </div>
+              </template>
-            </template>
+            </el-table-column>
-          </el-table-column>
+            <el-table-column
-          <el-table-column
+              label="排名"
-            label="奖品"
+              width="405"
-            width="300"
+            >
-          >
+              <template slot-scope="scope">
-            <template slot-scope="scope">
+                <div class="cell">
-              <div class="cell flex flex-align-center">
+                  <div v-if="scope.$index == 0">
-                <div>
+                    <span class="font-14 color-606266 p-r-10">前</span>
-                  <div>
-                    <el-checkbox v-model="scope.row.pointCheck">积分</el-checkbox>
                    <el-input-number
-                      class="w-146"
+                      class="w-90"
-                      v-model="scope.row.point"
+                      v-model="scope.row.end"
                      controls-position="right"
                      :min="1"
-                      :max="999999"
+                      :max="9999999999"
                    > </el-input-number>
+                    <span class="font-14 color-606266 p-l-10">名</span>
                  </div>
-                  <div class="m-t-10">
+                  <div v-if="scope.$index != 0 && scope.$index != compitionAward.dealNumberSettingParam.length - 1">
-                    <el-checkbox v-model="scope.row.cardCheck">卡券</el-checkbox>
+                    <span class="font-14 color-606266 p-r-10">第</span>
-                    <el-select
+                    <el-input-number
-                      class="w-146"
+                      class="w-90"
-                      v-model="scope.row.cardId"
+                      v-model="scope.row.start"
-                      placeholder="请选择"
+                      controls-position="right"
-                      @change="changeCard($event, scope.row)"
+                      :min="1"
-                    >
+                      :max="9999999999"
-                      <el-option
+                    > </el-input-number>
-                        v-for="item in cardList"
+                    <span class="font-14 color-606266 p-l-10 p-r-10">名 至</span>
-                        :key="item.coupCardId"
+                    <el-input-number
-                        :label="item.cardName"
+                      class="w-90"
-                        :value="item.coupCardId"
+                      v-model="scope.row.end"
-                      > </el-option>
+                      controls-position="right"
-                    </el-select>
+                      :min="1"
+                      :max="9999999999"
+                    > </el-input-number>
+                    <span class="font-14 color-606266 p-l-10">名</span>
+                  </div>
+                  <div v-if="scope.$index != 0 && scope.$index == compitionAward.dealNumberSettingParam.length - 1">
+                    <span class="font-14 color-606266 p-r-10">前</span>
+                    <el-input-number
+                      class="w-90"
+                      v-model="scope.row.start"
+                      controls-position="right"
+                      :min="1"
+                      :max="9999999999"
+                    > </el-input-number>
+                    <span
+                      v-if="!scope.row.infinity"
+                      class="font-14 color-606266 p-l-10 p-r-10"
+                    >人 至</span>
+                    <el-input-number
+                      v-if="!scope.row.infinity"
+                      class="w-90"
+                      v-model="scope.row.end"
+                      controls-position="right"
+                      :min="1"
+                      :max="9999999999"
+                    > </el-input-number>
+                    <el-checkbox
+                      v-if="scope.$index == compitionAward.dealNumberSettingParam.length - 1"
+                      class="m-l-10"
+                      v-model="scope.row.infinity"
+                      @change="changeEnd($event, scope.row)"
+                    >无穷大</el-checkbox>
                  </div>
                </div>
-                <el-button
+              </template>
-                  v-if="scope.$index != 0"
+            </el-table-column>
-                  class="m-l-16"
+            <el-table-column
-                  @click.stop="deleteRow(scope.$index, compitionAward.dealNumberSettingParam)"
+              label="奖品"
-                  type="text"
+              width="300"
-                  size="small"
+            >
-                >
+              <template slot-scope="scope">
-                  删除
+                <div class="cell flex flex-align-center">
-                </el-button>
+                  <div>
-              </div>
+                    <div>
-            </template>
+                      <el-checkbox v-model="scope.row.pointCheck">积分</el-checkbox>
-          </el-table-column>
+                      <el-input-number
-        </el-table>
+                        class="w-146"
-        <div
+                        v-model="scope.row.point"
-          class="add-line text-center cursor-pointer"
+                        controls-position="right"
-          @click="addPeopleItem"
+                        :min="1"
-        ><i class="el-icon-plus color-1890ff"></i><span class="color-1890ff font-14 p-l-10">添加奖项</span></div>
+                        :max="999999"
-      </div>
+                      > </el-input-number>
+                    </div>
+                    <div class="m-t-10">
+                      <el-checkbox v-model="scope.row.cardCheck">卡券</el-checkbox>
+                      <el-select
+                        class="w-146"
+                        v-model="scope.row.cardId"
+                        placeholder="请选择"
+                        @change="changeCard($event, scope.row)"
+                      >
+                        <el-option
+                          v-for="item in cardList"
+                          :key="item.coupCardId"
+                          :label="item.cardName"
+                          :value="item.coupCardId"
+                        > </el-option>
+                      </el-select>
+                    </div>
+                  </div>
+                  <el-button
+                    v-if="scope.$index != 0"
+                    class="m-l-16"
+                    @click.stop="deleteRow(scope.$index, compitionAward.dealNumberSettingParam)"
+                    type="text"
+                    size="small"
+                  >
+                    删除
+                  </el-button>
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
+          <div
+            class="add-line text-center cursor-pointer"
+            @click="addPeopleItem"
+          ><i class="el-icon-plus color-1890ff"></i><span class="color-1890ff font-14 p-l-10">添加奖项</span></div>
+        </div>
      </el-form-item>
      <el-form-item
        v-if="compitionAward.dealAmountFlag == 1"
@@ -403,7 +403,8 @@ export default {
              cardName: '',
              cardCheck: false
            }
-          ] //成交额奖项 成交额奖项json
+          ], //成交额奖项 成交额奖项json
+          "stepType": 1 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        };
      }
    }
@@ -624,7 +625,7 @@ export default {
  width: 146px;
 }
 .w-1019 {
-  width:1019px;
+  width: 1019px;
 }
 .competition-award {
  width: 100%;

--- a/src/components/active-config/configs/consume-config.vue
+++ b/src/components/active-config/configs/consume-config.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2019-11-21 16:37:02
 * @LastEditors: 无尘
- * @LastEditTime: 2019-11-25 10:53:44
+ * @LastEditTime: 2019-12-03 14:29:25
 -->
 <!--
 <consume-config></consume-config>
@@ -14,11 +14,23 @@ import consumeConfig from '@/components/active-config/configs/consume-config.vue
 <template>
  <div class="consume-config border-box">
-    <el-form label-width="154px" :model="consumeAction" ref="consumeForm" :rules="rules">
+    <el-form
-      <el-form-item label="消费门店控制：" prop="">
+      label-width="154px"
+      :model="consumeAction"
+      ref="consumeForm"
+      :rules="rules"
+    >
+      <el-form-item
+        label="消费门店控制："
+        prop=""
+      >
        <ul class="flex ">
          <template v-for="(item, index) in consumeStoreData">
-            <li :class="['li-cell li-second-cell flex-1 ', consumeAction.consumeStoreControlFlag == item.goalId ? 'li-second-active' : '']" :key="index + 'first'" @click="selectStore(item)">
+            <li
+              :class="['li-cell li-second-cell flex-1 ', consumeAction.consumeStoreControlFlag == item.goalId ? 'li-second-active' : '']"
+              :key="index + 'first'"
+              @click="selectStore(item)"
+            >
              <div class="li-cell-inner">
                <div class="li-cell-bottom border-box">
                  <div class="li-cell-scene">
@@ -37,24 +49,46 @@ import consumeConfig from '@/components/active-config/configs/consume-config.vue
            </li>
          </template>
        </ul>
-        <div v-if="consumeAction.consumeStoreControlFlag == 1" class="store-select-wrap">
+        <div
+          v-if="consumeAction.consumeStoreControlFlag == 1"
+          class="store-select-wrap"
+        >
          <div class="store-select-title">
            <el-tooltip placement="top">
              <div slot="content">该文案将显示在消费奖励规则中，<br />向活动参与者说明消费门店的条件要求，<br />请尽量用简洁易懂的描述。</div>
              <span class="font-12 color-606266 cursor-pointer store-title-name">门店条件文案：</span>
            </el-tooltip>
-            <limitInput :inputWidth="385" :disflag="$route.query.editFlag ? true : false" :inputValue.sync="consumeAction.consumeStoreName" :holder="'请输入门店条件文案'" :getByType="'char'" :maxLength="30"> </limitInput>
+            <limitInput
+              :inputWidth="385"
+              :disflag="$route.query.editFlag ? true : false"
+              :inputValue.sync="consumeAction.consumeStoreName"
+              :holder="'请输入门店条件文案'"
+              :getByType="'char'"
+              :maxLength="30"
+            > </limitInput>
          </div>
          <div class="store-select-body">
-            <vue-gic-store-card :readonly="$route.query.editFlag ? true : false" :uuid.sync="uuid" ref="storeCard"></vue-gic-store-card>
+            <vue-gic-store-card
+              :readonly="$route.query.editFlag ? true : false"
+              :uuid.sync="uuid"
+              ref="storeCard"
+            ></vue-gic-store-card>
          </div>
        </div>
      </el-form-item>
-      <el-form-item class="m-t-20" label="成交额控制：" prop="">
+      <el-form-item
+        class="m-t-20"
+        label="成交额控制："
+        prop=""
+      >
        <ul class="flex  ">
          <template v-for="(item, index) in dealAmountData">
-            <li :class="['li-cell li-second-cell flex-1 ', consumeAction.dealAmountControlFlag == item.goalId ? 'li-second-active' : '']" :key="index + 'first'" @click="selectMoney(item)">
+            <li
+              :class="['li-cell li-second-cell flex-1 ', consumeAction.dealAmountControlFlag == item.goalId ? 'li-second-active' : '']"
+              :key="index + 'first'"
+              @click="selectMoney(item)"
+            >
              <div class="li-cell-inner">
                <div class="li-cell-bottom border-box">
                  <div class="li-cell-scene">
@@ -73,20 +107,41 @@ import consumeConfig from '@/components/active-config/configs/consume-config.vue
            </li>
          </template>
        </ul>
-        <div v-if="consumeAction.dealAmountControlFlag == 1" class="store-select-wrap child-select-wrap">
+        <div
+          v-if="consumeAction.dealAmountControlFlag == 1"
+          class="store-select-wrap child-select-wrap"
+        >
          <div class="store-select-title">
            <span class="font-14 color-606266">控制区间：</span>
-            <el-input-number v-model="consumeAction.dealAmountControlMin" controls-position="right" :min="1" :max="999999"> </el-input-number>
+            <el-input-number
+              v-model="consumeAction.dealAmountControlMin"
+              controls-position="right"
+              :min="1"
+              :max="999999"
+            > </el-input-number>
            <span class="font-14 color-606266 p-l-3 p-r-10">元 - </span>
-            <el-input-number v-model="consumeAction.dealAmountControlMax" controls-position="right" :min="1" :max="999999"> </el-input-number>
+            <el-input-number
+              v-model="consumeAction.dealAmountControlMax"
+              controls-position="right"
+              :min="1"
+              :max="999999"
+            > </el-input-number>
            <span class="font-14 color-606266">元 </span>
          </div>
        </div>
      </el-form-item>
-      <el-form-item class="m-t-20" label="单笔成交件数控制：" prop="">
+      <el-form-item
+        class="m-t-20"
+        label="单笔成交件数控制："
+        prop=""
+      >
        <ul class="flex">
          <template v-for="(item, index) in singleDealData">
-            <li :class="['li-cell li-second-cell flex-1 ', consumeAction.singleDealNumberControlFlag == item.goalId ? 'li-second-active' : '']" :key="index + 'first'" @click="selectNumber(item)">
+            <li
+              :class="['li-cell li-second-cell flex-1 ', consumeAction.singleDealNumberControlFlag == item.goalId ? 'li-second-active' : '']"
+              :key="index + 'first'"
+              @click="selectNumber(item)"
+            >
              <div class="li-cell-inner">
                <div class="li-cell-bottom border-box">
                  <div class="li-cell-scene">
@@ -105,12 +160,25 @@ import consumeConfig from '@/components/active-config/configs/consume-config.vue
            </li>
          </template>
        </ul>
-        <div v-if="consumeAction.singleDealNumberControlFlag == 1" class="store-select-wrap child-select-wrap">
+        <div
+          v-if="consumeAction.singleDealNumberControlFlag == 1"
+          class="store-select-wrap child-select-wrap"
+        >
          <div class="store-select-title">
            <span class="font-14 color-606266">控制区间：</span>
-            <el-input-number v-model="consumeAction.singleDealNumberControlMin" controls-position="right" :min="1" :max="99"> </el-input-number>
+            <el-input-number
+              v-model="consumeAction.singleDealNumberControlMin"
+              controls-position="right"
+              :min="1"
+              :max="99"
+            > </el-input-number>
            <span class="font-14 color-606266 p-l-3 p-r-10">件 - </span>
-            <el-input-number v-model="consumeAction.singleDealNumberControlMax" controls-position="right" :min="1" :max="99"> </el-input-number>
+            <el-input-number
+              v-model="consumeAction.singleDealNumberControlMax"
+              controls-position="right"
+              :min="1"
+              :max="99"
+            > </el-input-number>
            <span class="font-14 color-606266">件 </span>
          </div>
        </div>
@@ -136,7 +204,8 @@ export default {
          singleDealNumberControlMin: 1, //单笔成交件数最小值
          singleDealNumberControlMax: 1, //单笔成交件数最大值
          uuid: '',
-          storeList: []
+          storeList: [],
+          "stepType": 1 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        };
      }
    }
@@ -156,7 +225,8 @@ export default {
        singleDealNumberControlMin: 1, //单笔成交件数最小值
        singleDealNumberControlMax: 1, //单笔成交件数最大值
        uuid: '',
-        storeList: []
+        storeList: [],
+        "stepType": 1 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
      },
      consumeStoreData: [
        {

--- a/src/components/active-config/configs/entry-award.vue
+++ b/src/components/active-config/configs/entry-award.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2019-11-21 16:37:02
 * @LastEditors: 无尘
- * @LastEditTime: 2019-11-29 10:34:27
+ * @LastEditTime: 2019-12-03 14:30:58
 -->
 <!--
 <entry-award></entry-award>
@@ -14,11 +14,24 @@ import entryAward from '@/components/active-config/configs/entry-award.vue';
 <template>
  <div class="entry-award border-box">
-    <el-form label-width="154px" :model="passAward" ref="rewardForm" :rules="rules">
+    <el-form
-      <el-form-item label="闯关指标（多选）：" prop="">
+      label-width="154px"
+      :model="passAward"
+      ref="rewardForm"
+      :rules="rules"
+    >
+      <el-form-item
+        label="闯关指标（多选）："
+        prop=""
+      >
        <ul class="flex ">
          <template v-for="(item, index) in modeData">
-            <li v-if="index == 0" :class="['li-cell li-second-cell flex-1 ', passAward.dealNumberFlag == 1 ? 'li-second-active' : '']" :key="index + 'first'" @click="selectStore(item)">
+            <li
+              v-if="index == 0"
+              :class="['li-cell li-second-cell flex-1 ', passAward.dealNumberFlag == 1 ? 'li-second-active' : '']"
+              :key="index + 'first'"
+              @click="selectStore(item)"
+            >
              <div class="li-cell-inner">
                <div class="li-cell-bottom border-box">
                  <div class="li-cell-scene">
@@ -35,7 +48,12 @@ import entryAward from '@/components/active-config/configs/entry-award.vue';
                </div>
              </div>
            </li>
-            <li v-if="index == 1 && basePath.map(ele => ele.transName).includes('消费')" :class="['li-cell li-second-cell flex-1 ', passAward.dealAmountFlag == 1 ? 'li-second-active' : '']" :key="index + 'first'" @click="selectStore(item)">
+            <li
+              v-if="index == 1 && basePath.map(ele => ele.transName).includes('消费')"
+              :class="['li-cell li-second-cell flex-1 ', passAward.dealAmountFlag == 1 ? 'li-second-active' : '']"
+              :key="index + 'first'"
+              @click="selectStore(item)"
+            >
              <div class="li-cell-inner">
                <div class="li-cell-bottom border-box">
                  <div class="li-cell-scene">
@@ -55,14 +73,28 @@ import entryAward from '@/components/active-config/configs/entry-award.vue';
          </template>
        </ul>
      </el-form-item>
-      <el-form-item v-if="passAward.dealNumberFlag == 1" class="m-t-20" label="成交人数闯关奖项：" prop="">
+      <el-form-item
-        <el-table :data="passAward.dealNumberSettingParam" style="width: 100%">
+        v-if="passAward.dealNumberFlag == 1"
+        class="m-t-20"
+        label="成交人数闯关奖项："
+        prop=""
+      >
+        <el-table
+          :data="passAward.dealNumberSettingParam"
+          style="width: 100%"
+        >
          <el-table-column label="排名">
            <template slot-scope="scope">
              <div class="cell">
                <div>
                  <span class="font-14 color-606266 p-r-10">满</span>
-                  <el-input-number class="w-90" v-model="scope.row.achieve" controls-position="right" :min="1" :max="999999"> </el-input-number>
+                  <el-input-number
+                    class="w-90"
+                    v-model="scope.row.achieve"
+                    controls-position="right"
+                    :min="1"
+                    :max="999999"
+                  > </el-input-number>
                  <span class="font-14 color-606266 p-l-10">人</span>
                </div>
              </div>
@@ -74,32 +106,71 @@ import entryAward from '@/components/active-config/configs/entry-award.vue';
                <div>
                  <div>
                    <el-checkbox v-model="scope.row.pointCheck">积分</el-checkbox>
-                    <el-input-number class="w-146" v-model="scope.row.point" controls-position="right" :min="1" :max="999999"> </el-input-number>
+                    <el-input-number
+                      class="w-146"
+                      v-model="scope.row.point"
+                      controls-position="right"
+                      :min="1"
+                      :max="999999"
+                    > </el-input-number>
                  </div>
                  <div class="m-t-10">
                    <el-checkbox v-model="scope.row.cardCheck">卡券</el-checkbox>
-                    <el-select class="w-146" v-model="scope.row.cardId" placeholder="请选择" @change="changeCard($event, scope.row)">
+                    <el-select
-                      <el-option v-for="item in cardList" :key="item.coupCardId" :label="item.cardName" :value="item.coupCardId"> </el-option>
+                      class="w-146"
+                      v-model="scope.row.cardId"
+                      placeholder="请选择"
+                      @change="changeCard($event, scope.row)"
+                    >
+                      <el-option
+                        v-for="item in cardList"
+                        :key="item.coupCardId"
+                        :label="item.cardName"
+                        :value="item.coupCardId"
+                      > </el-option>
                    </el-select>
                  </div>
                </div>
-                <el-button v-if="scope.$index != 0" class="m-l-16" @click.stop="deleteRow(scope.$index, passAward.dealNumberSettingParam)" type="text" size="small">
+                <el-button
+                  v-if="scope.$index != 0"
+                  class="m-l-16"
+                  @click.stop="deleteRow(scope.$index, passAward.dealNumberSettingParam)"
+                  type="text"
+                  size="small"
+                >
                  删除
                </el-button>
              </div>
            </template>
          </el-table-column>
        </el-table>
-        <div class="add-line text-center cursor-pointer" @click="addPeopleItem"><i class="el-icon-plus color-1890ff"></i><span class="color-1890ff font-14 p-l-10">添加奖项</span></div>
+        <div
+          class="add-line text-center cursor-pointer"
+          @click="addPeopleItem"
+        ><i class="el-icon-plus color-1890ff"></i><span class="color-1890ff font-14 p-l-10">添加奖项</span></div>
      </el-form-item>
-      <el-form-item v-if="passAward.dealAmountFlag == 1" class="m-t-20" label="成交额闯关奖项: " prop="">
+      <el-form-item
-        <el-table :data="passAward.dealAmountSettingParam" style="width: 100%">
+        v-if="passAward.dealAmountFlag == 1"
+        class="m-t-20"
+        label="成交额闯关奖项: "
+        prop=""
+      >
+        <el-table
+          :data="passAward.dealAmountSettingParam"
+          style="width: 100%"
+        >
          <el-table-column label="排名">
            <template slot-scope="scope">
              <div class="cell">
                <div>
                  <span class="font-14 color-606266 p-r-10">满</span>
-                  <el-input-number class="w-90" v-model="scope.row.achieve" controls-position="right" :min="1" :max="999999"> </el-input-number>
+                  <el-input-number
+                    class="w-90"
+                    v-model="scope.row.achieve"
+                    controls-position="right"
+                    :min="1"
+                    :max="999999"
+                  > </el-input-number>
                  <span class="font-14 color-606266 p-l-10">元</span>
                </div>
              </div>
@@ -111,23 +182,48 @@ import entryAward from '@/components/active-config/configs/entry-award.vue';
                <div>
                  <div>
                    <el-checkbox v-model="scope.row.pointCheck">积分</el-checkbox>
-                    <el-input-number class="w-146" v-model="scope.row.point" controls-position="right" :min="1" :max="999999"> </el-input-number>
+                    <el-input-number
+                      class="w-146"
+                      v-model="scope.row.point"
+                      controls-position="right"
+                      :min="1"
+                      :max="999999"
+                    > </el-input-number>
                  </div>
                  <div class="m-t-10">
                    <el-checkbox v-model="scope.row.cardCheck">卡券</el-checkbox>
-                    <el-select class="w-146" v-model="scope.row.cardId" placeholder="请选择" @change="changeCard($event, scope.row)">
+                    <el-select
-                      <el-option v-for="item in cardList" :key="item.coupCardId" :label="item.cardName" :value="item.coupCardId"> </el-option>
+                      class="w-146"
+                      v-model="scope.row.cardId"
+                      placeholder="请选择"
+                      @change="changeCard($event, scope.row)"
+                    >
+                      <el-option
+                        v-for="item in cardList"
+                        :key="item.coupCardId"
+                        :label="item.cardName"
+                        :value="item.coupCardId"
+                      > </el-option>
                    </el-select>
                  </div>
                </div>
-                <el-button v-if="scope.$index != 0" class="m-l-16" @click.stop="deleteRow(scope.$index, passAward.dealAmountSettingParam)" type="text" size="small">
+                <el-button
+                  v-if="scope.$index != 0"
+                  class="m-l-16"
+                  @click.stop="deleteRow(scope.$index, passAward.dealAmountSettingParam)"
+                  type="text"
+                  size="small"
+                >
                  删除
                </el-button>
              </div>
            </template>
          </el-table-column>
        </el-table>
-        <div class="add-line text-center cursor-pointer" @click="addMoneyItem"><i class="el-icon-plus color-1890ff"></i><span class="color-1890ff font-14 p-l-10">添加奖项</span></div>
+        <div
+          class="add-line text-center cursor-pointer"
+          @click="addMoneyItem"
+        ><i class="el-icon-plus color-1890ff"></i><span class="color-1890ff font-14 p-l-10">添加奖项</span></div>
      </el-form-item>
    </el-form>
  </div>
@@ -163,7 +259,8 @@ export default {
              cardName: '',
              cardCheck: false
            }
-          ] //成交额奖项 成交额奖项json
+          ], //成交额奖项 成交额奖项json
+          "stepType": 1 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        };
      }
    }

--- a/src/components/active-config/configs/fraud-control.vue
+++ b/src/components/active-config/configs/fraud-control.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2019-11-21 16:37:02
 * @LastEditors: 无尘
- * @LastEditTime: 2019-12-03 10:09:14
+ * @LastEditTime: 2019-12-03 14:30:35
 -->
 <!--
 <fraud-control></fraud-control>
@@ -160,6 +160,7 @@ export default {
          amountLimitAmount: 1,
          pointProgram: 1, //0、不限制，1、延时发放（推荐），2积分冻结
          pointControlDay: 1, //限制延时
+          "stepType": 1 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        };
      }
    }
@@ -172,7 +173,6 @@ export default {
        amountLimitAmount: 1,
        pointProgram: 1, //0、不限制，1、延时发放（推荐），2积分冻结
        pointControlDay: 1, //限制延时
        stepType: 1 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
      },
      modeData: [

--- a/src/components/active-config/configs/invitee-reward.vue
+++ b/src/components/active-config/configs/invitee-reward.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2019-11-21 16:37:02
 * @LastEditors: 无尘
- * @LastEditTime: 2019-12-02 10:36:49
+ * @LastEditTime: 2019-12-03 14:30:11
 -->
 <!--
 <invitee-reward></invitee-reward>
@@ -333,7 +333,8 @@ export default {
              cardId: '',
              cardName: ''
            }
-          ]
+          ],
+          "stepType": 1 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        };
      }
    }

--- a/src/components/active-config/configs/spot-award.vue
+++ b/src/components/active-config/configs/spot-award.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2019-11-21 16:37:02
 * @LastEditors: 无尘
- * @LastEditTime: 2019-12-02 14:06:55
+ * @LastEditTime: 2019-12-03 14:29:41
 -->
 <!--
 <spot-award></spot-award>
@@ -303,7 +303,8 @@ export default {
          ], //即时奖励内容（阶梯内容） 奖励内容json字符串
          awardLimitType: 1, //奖励限制类型 1、不限制奖励（推荐），2、限制奖励次数，3、限制奖励额度
          awardLimitNumber: 1, //限制奖励次数
-          awardLimitPoint: 1 //限制奖励额度
+          awardLimitPoint: 1, //限制奖励额度
+          "stepType": 1 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        };
      }
    }

--- a/src/components/active-config/reward-config.vue
+++ b/src/components/active-config/reward-config.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2019-11-18 10:37:02
 * @LastEditors: 无尘
- * @LastEditTime: 2019-12-03 10:09:34
+ * @LastEditTime: 2019-12-03 15:00:23
 -->
 <!--
 <reward-config @submitBack="submitBack" @submitNext="submitNext"></reward-config>
@@ -366,6 +366,7 @@ export default {
        enjoyGameFlag: 0, // 参与游戏开关
        receiveCardFlag: 0, // 领取卡券开关
        consumeAwardFlag: 0, // 消费奖开关
+        stepType: 1,
        // 消费行为控制
        consumeAction: {
          consumeStoreControlFlag: 0, //消费门店控制开关 1控制，0不控制
@@ -377,7 +378,8 @@ export default {
          singleDealNumberControlMin: 1, //单笔成交件数最小值
          singleDealNumberControlMax: 1, //单笔成交件数最大值
          uuid: '',
-          storeList: []
+          storeList: [],
+          "stepType": 1 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        },
        // 即时奖励
        instanceAward: {
@@ -442,7 +444,8 @@ export default {
              cardId: '',
              cardName: ''
            }
-          ]
+          ],
+          "stepType": 1 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        },
        // 防欺诈
        pointFreeze: {
@@ -450,6 +453,7 @@ export default {
          amountLimitAmount: 1,
          pointProgram: 1, //0、不限制，1、延时发放（推荐），2积分冻结
          pointControlDay: 1, //限制延时
+          "stepType": 1 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        }
      },
      rules: {
@@ -507,6 +511,7 @@ export default {
        receiveCardFlag: false, // 领取卡券开关
        consumeAwardFlag: false, // 消费奖开关
        switchFlag: false, //通用开关
+        "stepType": 1,
        title: '服务号关注奖励',
        subTitle: '当受邀人成功关注了服务号之后触发的奖励，开启后可配置相关奖励内容，若该行为无奖励则保持关闭状态即可。',
        instantAwardFlag: 1, // 即时
@@ -523,7 +528,8 @@ export default {
          singleDealNumberControlMin: 1, //单笔成交件数最小值
          singleDealNumberControlMax: 1, //单笔成交件数最大值
          uuid: '',
-          storeList: []
+          storeList: [],
+          "stepType": 1
        },
        // 即时奖励
        instanceAward: {
@@ -563,7 +569,7 @@ export default {
          dealAmountFlag: 0, //成交额开关 1开启
          dealNumberSettingParam: [], //成交人数奖项 成交人数奖项json
          dealAmountSettingParam: [], //成交额奖项 成交额奖项json
-          stepType: 1 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
+          stepType: 2 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        },
        // 受邀人奖励
        invitedAward: {
@@ -588,7 +594,8 @@ export default {
              cardId: '',
              cardName: ''
            }
-          ]
+          ],
+          "stepType": 1 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        },
        // 防欺诈
        pointFreeze: {
@@ -596,6 +603,7 @@ export default {
          amountLimitAmount: 1,
          pointProgram: 1, //0、不限制，1、延时发放（推荐），2积分冻结
          pointControlDay: 1, //限制延时
+          "stepType": 1 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        }
      },
      entryActivityFlag: {
@@ -607,6 +615,7 @@ export default {
        receiveCardFlag: false, // 领取卡券开关
        consumeAwardFlag: false, // 消费奖开关
        switchFlag: false, //通用开关
+        "stepType": 2,
        title: '活动营销页访问奖励',
        subTitle: '当受邀人成功访问了指定活动营销页之后触发的奖励，开启后可配置相关奖励内容，若该行为无奖励则保持关闭状态即可。',
        instantAwardFlag: 1, // 即时
@@ -623,7 +632,8 @@ export default {
          singleDealNumberControlMin: 1, //单笔成交件数最小值
          singleDealNumberControlMax: 1, //单笔成交件数最大值
          uuid: '',
-          storeList: []
+          storeList: [],
+          "stepType": 2
        },
        // 即时奖励
        instanceAward: {
@@ -647,7 +657,7 @@ export default {
          awardLimitType: 1, //奖励限制类型 1、不限制奖励（推荐），2、限制奖励次数，3、限制奖励额度
          awardLimitNumber: 1, //限制奖励次数
          awardLimitPoint: 1, //限制奖励额度
-          stepType: 1 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
+          stepType: 2 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        },
        // 闯关奖励
        passAward: {
@@ -655,7 +665,7 @@ export default {
          dealAmountFlag: 0, //成交额开关 1开启
          dealNumberSettingParam: [], //成交人数奖项 成交人数奖项json
          dealAmountSettingParam: [], //成交额奖项 成交额奖项json
-          stepType: 1 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
+          stepType: 2 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        },
        // 竞赛奖励
        compitionAward: {
@@ -663,7 +673,7 @@ export default {
          dealAmountFlag: 0, //成交额开关 1开启
          dealNumberSettingParam: [], //成交人数奖项 成交人数奖项json
          dealAmountSettingParam: [], //成交额奖项 成交额奖项json
-          stepType: 1 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
+          stepType: 2 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        },
        // 受邀人奖励
        invitedAward: {
@@ -688,7 +698,8 @@ export default {
              cardId: '',
              cardName: ''
            }
-          ]
+          ],
+          "stepType": 2//步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        },
        // 防欺诈
        pointFreeze: {
@@ -696,6 +707,7 @@ export default {
          amountLimitAmount: 1,
          pointProgram: 1, //0、不限制，1、延时发放（推荐），2积分冻结
          pointControlDay: 1, //限制延时
+          "stepType": 2 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        }
      },
      authorizeOpenCardFlag: {
@@ -707,6 +719,7 @@ export default {
        receiveCardFlag: false, // 领取卡券开关
        consumeAwardFlag: false, // 消费奖开关
        switchFlag: false, //通用开关
+        "stepType": 3,
        title: '会员认证奖励',
        subTitle: '当受邀人完成了会员认证之后触发的奖励，开启后可配置相关奖励内容，若该行为无奖励则保持关闭状态即可。',
        instantAwardFlag: 1, // 即时
@@ -723,7 +736,8 @@ export default {
          singleDealNumberControlMin: 1, //单笔成交件数最小值
          singleDealNumberControlMax: 1, //单笔成交件数最大值
          uuid: '',
-          storeList: []
+          storeList: [],
+          "stepType": 3
        },
        // 即时奖励
        instanceAward: {
@@ -747,7 +761,7 @@ export default {
          awardLimitType: 1, //奖励限制类型 1、不限制奖励（推荐），2、限制奖励次数，3、限制奖励额度
          awardLimitNumber: 1, //限制奖励次数
          awardLimitPoint: 1, //限制奖励额度
-          stepType: 1 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
+          stepType: 3 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        },
        // 闯关奖励
        passAward: {
@@ -773,7 +787,7 @@ export default {
              cardCheck: false
            }
          ], //成交额奖项 成交额奖项json
-          stepType: 1 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
+          stepType: 3 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        },
        // 竞赛奖励
        compitionAward: {
@@ -781,7 +795,7 @@ export default {
          dealAmountFlag: 0, //成交额开关 1开启
          dealNumberSettingParam: [], //成交人数奖项 成交人数奖项json
          dealAmountSettingParam: [], //成交额奖项 成交额奖项json
-          stepType: 1 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
+          stepType: 3 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        },
        // 受邀人奖励
        invitedAward: {
@@ -806,7 +820,8 @@ export default {
              cardId: '',
              cardName: ''
            }
-          ]
+          ],
+          "stepType": 3 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        },
        // 防欺诈
        pointFreeze: {
@@ -814,6 +829,7 @@ export default {
          amountLimitAmount: 1,
          pointProgram: 1, //0、不限制，1、延时发放（推荐），2积分冻结
          pointControlDay: 1, //限制延时
+          "stepType": 3 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        }
      },
      enjoyGameFlag: {
@@ -825,6 +841,7 @@ export default {
        receiveCardFlag: false, // 领取卡券开关
        consumeAwardFlag: false, // 消费奖开关
        switchFlag: false, //通用开关
+        "stepType": 4,
        title: '游戏参与奖励',
        subTitle: '当受邀人成功参与了指定游戏之后触发的奖励，开启后可配置相关奖励内容，若该行为无奖励则保持关闭状态即可。',
        instantAwardFlag: 1, // 即时
@@ -841,7 +858,8 @@ export default {
          singleDealNumberControlMin: 1, //单笔成交件数最小值
          singleDealNumberControlMax: 1, //单笔成交件数最大值
          uuid: '',
-          storeList: []
+          storeList: [],
+          "stepType": 4
        },
        // 即时奖励
        instanceAward: {
@@ -865,7 +883,7 @@ export default {
          awardLimitType: 1, //奖励限制类型 1、不限制奖励（推荐），2、限制奖励次数，3、限制奖励额度
          awardLimitNumber: 1, //限制奖励次数
          awardLimitPoint: 1, //限制奖励额度
-          stepType: 1 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
+          stepType: 4 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        },
        // 闯关奖励
        passAward: {
@@ -873,7 +891,7 @@ export default {
          dealAmountFlag: 0, //成交额开关 1开启
          dealNumberSettingParam: [], //成交人数奖项 成交人数奖项json
          dealAmountSettingParam: [], //成交额奖项 成交额奖项json
-          stepType: 1 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
+          stepType: 4 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        },
        // 竞赛奖励
        compitionAward: {
@@ -881,7 +899,7 @@ export default {
          dealAmountFlag: 0, //成交额开关 1开启
          dealNumberSettingParam: [], //成交人数奖项 成交人数奖项json
          dealAmountSettingParam: [], //成交额奖项 成交额奖项json
-          stepType: 1 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
+          stepType: 4 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        },
        // 受邀人奖励
        invitedAward: {
@@ -906,7 +924,8 @@ export default {
              cardId: '',
              cardName: ''
            }
-          ]
+          ],
+          "stepType": 4 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        },
        // 防欺诈
        pointFreeze: {
@@ -914,6 +933,7 @@ export default {
          amountLimitAmount: 1,
          pointProgram: 1, //0、不限制，1、延时发放（推荐），2积分冻结
          pointControlDay: 1, //限制延时
+          "stepType": 4 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        }
      },
      receiveCardFlag: {
@@ -925,6 +945,7 @@ export default {
        receiveCardFlag: false, // 领取卡券开关
        consumeAwardFlag: false, // 消费奖开关
        switchFlag: false, //通用开关
+        "stepType": 5,
        title: '卡券领取奖励',
        subTitle: '当受邀人成功领取了指定卡券之后触发的奖励，开启后可配置相关奖励内容，若该行为无奖励则保持关闭状态即可。',
        instantAwardFlag: 1, // 即时
@@ -941,7 +962,8 @@ export default {
          singleDealNumberControlMin: 1, //单笔成交件数最小值
          singleDealNumberControlMax: 1, //单笔成交件数最大值
          uuid: '',
-          storeList: []
+          storeList: [],
+          "stepType": 5 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        },
        // 即时奖励
        instanceAward: {
@@ -965,7 +987,7 @@ export default {
          awardLimitType: 1, //奖励限制类型 1、不限制奖励（推荐），2、限制奖励次数，3、限制奖励额度
          awardLimitNumber: 1, //限制奖励次数
          awardLimitPoint: 1, //限制奖励额度
-          stepType: 1 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
+          stepType: 5 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        },
        // 闯关奖励
        passAward: {
@@ -973,7 +995,7 @@ export default {
          dealAmountFlag: 0, //成交额开关 1开启
          dealNumberSettingParam: [], //成交人数奖项 成交人数奖项json
          dealAmountSettingParam: [], //成交额奖项 成交额奖项json
-          stepType: 1 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
+          stepType: 5 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        },
        // 竞赛奖励
        compitionAward: {
@@ -981,7 +1003,7 @@ export default {
          dealAmountFlag: 0, //成交额开关 1开启
          dealNumberSettingParam: [], //成交人数奖项 成交人数奖项json
          dealAmountSettingParam: [], //成交额奖项 成交额奖项json
-          stepType: 1 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
+          stepType: 5 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        },
        // 受邀人奖励
        invitedAward: {
@@ -1006,7 +1028,8 @@ export default {
              cardId: '',
              cardName: ''
            }
-          ]
+          ],
+          "stepType": 5 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        },
        // 防欺诈
        pointFreeze: {
@@ -1014,6 +1037,7 @@ export default {
          amountLimitAmount: 1,
          pointProgram: 1, //0、不限制，1、延时发放（推荐），2积分冻结
          pointControlDay: 1, //限制延时
+          "stepType": 5 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        }
      },
      consumeAwardFlag: {
@@ -1025,6 +1049,7 @@ export default {
        receiveCardFlag: false, // 领取卡券开关
        consumeAwardFlag: false, // 消费奖开关
        switchFlag: false, //通用开关
+        "stepType": 6,
        title: '消费奖励',
        subTitle: '当受邀人进行了消费之后触发的奖励，开启后可配置相关奖励内容，若该行为无奖励则保持关闭状态即可。',
        instantAwardFlag: 1, // 即时
@@ -1041,7 +1066,8 @@ export default {
          singleDealNumberControlMin: 1, //单笔成交件数最小值
          singleDealNumberControlMax: 1, //单笔成交件数最大值
          uuid: '',
-          storeList: []
+          storeList: [],
+          "stepType": 6 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        },
        // 即时奖励
        instanceAward: {
@@ -1065,7 +1091,7 @@ export default {
          awardLimitType: 1, //奖励限制类型 1、不限制奖励（推荐），2、限制奖励次数，3、限制奖励额度
          awardLimitNumber: 1, //限制奖励次数
          awardLimitPoint: 1, //限制奖励额度
-          stepType: 1 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
+          stepType: 6 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        },
        // 闯关奖励
        passAward: {
@@ -1073,7 +1099,7 @@ export default {
          dealAmountFlag: 0, //成交额开关 1开启
          dealNumberSettingParam: [], //成交人数奖项 成交人数奖项json
          dealAmountSettingParam: [], //成交额奖项 成交额奖项json
-          stepType: 1 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
+          stepType: 6 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        },
        // 竞赛奖励
        compitionAward: {
@@ -1081,7 +1107,7 @@ export default {
          dealAmountFlag: 0, //成交额开关 1开启
          dealNumberSettingParam: [], //成交人数奖项 成交人数奖项json
          dealAmountSettingParam: [], //成交额奖项 成交额奖项json
-          stepType: 1 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
+          stepType: 6 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        },
        // 受邀人奖励
        invitedAward: {
@@ -1106,7 +1132,8 @@ export default {
              cardId: '',
              cardName: ''
            }
-          ]
+          ],
+          "stepType": 6 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        },
        // 防欺诈
        pointFreeze: {
@@ -1114,6 +1141,7 @@ export default {
          amountLimitAmount: 1,
          pointProgram: 1, //0、不限制，1、延时发放（推荐），2积分冻结
          pointControlDay: 1, //限制延时
+          "stepType": 6 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
        }
      },
      ProgressiveData: [] //根据路径添加
@@ -1172,7 +1200,12 @@ export default {
     */
    submitBack() {
      const that = this;
-      that.$store.dispatch('saveRewardInfo', that.activeInfoData);
+      if (that.activeInfoData.awardMode == 1) {
+        that.$store.dispatch('saveRewardInfo', that.activeInfoData);
+      }else {
+        that.$store.dispatch('saveRewardInfo', that.activeInfoData);
+        that.$store.dispatch('saveMultRewardInfo', that.ProgressiveData);
+      }
      that.$emit('submitBack');
    },
    /**
@@ -1432,6 +1465,9 @@ export default {
    if (Object.keys(that.$store.state.rewardInfo).length) {
      that.$nextTick(() => {
        that.activeInfoData = JSON.parse(JSON.stringify(that.$store.state.rewardInfo));
+        if (that.activeInfoData.awardMode == 2) {
+          that.ProgressiveData = JSON.parse(JSON.stringify(that.$store.state.multRewardInfo));
+        }
      });
    }
  }

--- a/src/components/single-upload.vue
+++ b/src/components/single-upload.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2019-11-20 13:44:22
 * @LastEditors: 无尘
- * @LastEditTime: 2019-12-03 14:09:26
+ * @LastEditTime: 2019-12-03 15:06:08
 -->
 <!--
  单个上传组件
@@ -158,7 +158,7 @@ export default {
                that.$message.error(`图片宽度必须≥${that.width}px,宽高比≤${that.limitRate}!`);
                reject();
              }
-              if (that.limitFlag == 3 && (width < that.width || width/height != that.limitRate) ){
+              if (that.limitFlag == 3 && (width < that.width || width/height != 5/4) ){
                that.$message.error(`图片宽度必须≥${that.width}px,宽高比≤5/4!`);
                reject();
              }

--- a/src/store/store.js
+++ b/src/store/store.js
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2019-11-12 10:18:30
 * @LastEditors: 无尘
- * @LastEditTime: 2019-11-26 15:25:57
+ * @LastEditTime: 2019-12-03 14:57:56
 */
 import Vuex from 'vuex';
 import Vue from 'vue';
@@ -25,6 +25,7 @@ export default new Vuex.Store({
    cardInfo: {}, // 小程序卡片配置
    posterInfo: {}, // 海报配置
    rewardInfo: {}, // 奖励配置
+    multRewardInfo: {}, // 渐进式奖励配置
    tempBackData: [] // 后端判断禁用数据
  },
  mutations: {
@@ -66,12 +67,16 @@ export default new Vuex.Store({
    saveReward: (state, data) => {
      state.rewardInfo = data;
    },
+    saveMultReward: (state, data) => {
+      state.multRewardInfo = data;
+    },
    clearData: state => {
      state.baseInfo = {};
      state.centerInfo = {};
      state.cardInfo = {};
      state.posterInfo = {};
      state.rewardInfo = {};
+      state.multRewardInfo = {};
    },
    clearIndex: state => {
      state.activeInfo = {};
@@ -96,6 +101,9 @@ export default new Vuex.Store({
    saveRewardInfo(context, data) {
      context.commit('saveReward', data);
    },
+    saveMultRewardInfo(context, data) {
+      context.commit('saveMultReward', data);
+    },
    clearActiveData(context, data) {
      context.commit('clearData');
    },