fix: 修改奖励

b0082c9c · 无尘 · f9c5d1c7 · b0082c9c · b0082c9c · b0082c9c
Commit b0082c9c authored Dec 06, 2019 by 无尘
13 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.a86194244abfbf6fe420fabe9149f889.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 type=text/javascript src=./static/js/manifest.d0348b7a1c7cc9208b8e.js></script><script type=text/javascript src=./static/js/vendor.8455def81090347f10ce.js></script><script type=text/javascript src=./static/js/app.e7c85c59cd94b7abeca3.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.ffeb11bbc8a6f2a70ab5f0c853d31dc4.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.14.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 type=text/javascript src=./static/js/manifest.234022e1fbbdd7c7cbc4.js></script><script type=text/javascript src=./static/js/vendor.8455def81090347f10ce.js></script><script type=text/javascript src=./static/js/app.e7c85c59cd94b7abeca3.js></script></body></html>
\ No newline at end of file
--- a/dist/static/css/app.a86194244abfbf6fe420fabe9149f889.css
+++ b/dist/static/css/app.a86194244abfbf6fe420fabe9149f889.css
--- a/dist/static/js/2.3c5196f831edec01dd17.js
+++ b/dist/static/js/2.3c5196f831edec01dd17.js
--- a/dist/static/js/2.493f9f5d43a0fb72336b.js
+++ b/dist/static/js/2.493f9f5d43a0fb72336b.js
--- a/dist/static/js/manifest.d0348b7a1c7cc9208b8e.js
+++ b/dist/static/js/manifest.d0348b7a1c7cc9208b8e.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:"8a732b49262f7df9b526",1:"5b546fa38466a0b05e37",2:"493f9f5d43a0fb72336b",3:"b45331471e8656c5cb89",4:"c9baf4695a3666998280",5:"e5f29637bed979a22d84",6:"f11d902de0350ef6b333",7:"b0fd74564cc799593b8f",8:"fe9ec49f63ecd8e527ba",9:"522a01ff8d619d2bf030",10:"e16b73d2d4b922255e52",11:"c11d02c33702d00b2e2e",12:"cb13b689aaa548c4bc33"}[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:"8a732b49262f7df9b526",1:"5b546fa38466a0b05e37",2:"3c5196f831edec01dd17",3:"b45331471e8656c5cb89",4:"c9baf4695a3666998280",5:"e5f29637bed979a22d84",6:"f11d902de0350ef6b333",7:"b0fd74564cc799593b8f",8:"fe9ec49f63ecd8e527ba",9:"522a01ff8d619d2bf030",10:"e16b73d2d4b922255e52",11:"c11d02c33702d00b2e2e",12:"cb13b689aaa548c4bc33"}[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/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2019-11-12 10:18:30
 * @LastEditors: 无尘
- * @LastEditTime: 2019-12-03 19:07:08
+ * @LastEditTime: 2019-12-06 09:58:01
 -->
 <!DOCTYPE html>
 <html>
@@ -34,7 +34,7 @@
  <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/store-card.2.0.14.js"></script>
  <script src="//web-1251519181.file.myqcloud.com/components/people.2.0.38.js"></script>
  <!-- <script src="//web-1251519181.file.myqcloud.com/components/datepicker.2.0.00.js"></script> -->
  <script src="//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.11.js"></script>

--- a/src/components/active-config/card-config.vue
+++ b/src/components/active-config/card-config.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2019-11-18 10:37:02
 * @LastEditors: 无尘
- * @LastEditTime: 2019-12-05 11:34:51
+ * @LastEditTime: 2019-12-06 09:55:30
 -->
 <!--
 <card-config @submitBack="submitBack" @submitNext="submitNext"></card-config>
@@ -37,7 +37,7 @@ import cardConfig from '@/components/active-config/card-config.vue';
        >
          <limitInput
            :inputWidth="503"
-            :disflag="$route.query.interfaceId ? true : false"
+            :disflag="$route.query.editFalg ? true : false"
            :inputValue.sync="activeInfoData.appletTitle"
            :holder="'请输入页面标题'"
            :getByType="'word'"

--- 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-12-03 14:29:25
+ * @LastEditTime: 2019-12-06 09:35:15
 -->
 <!--
 <consume-config></consume-config>
@@ -71,7 +71,7 @@ import consumeConfig from '@/components/active-config/configs/consume-config.vue
          <div class="store-select-body">
            <vue-gic-store-card
              :readonly="$route.query.editFlag ? true : false"
-              :uuid.sync="uuid"
+              :uuid.sync="consumeAction.uuid"
              ref="storeCard"
            ></vue-gic-store-card>
          </div>
@@ -272,6 +272,7 @@ export default {
     */
    submitForm() {
      const that = this;
+      console.log(that.consumeAction)
      that.consumeAction.storeList = that.consumeAction.consumeStoreControlFlag == 0 ? [] : that.$refs.storeCard.rightList;
      return new Promise(function(resolve, reject) {
        that.$refs['consumeForm'].validate(valid => {

--- 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-05 11:30:52
+ * @LastEditTime: 2019-12-06 09:57:39
 -->
 <!--
 <fraud-control></fraud-control>
@@ -66,6 +66,7 @@ import fraudControl from '@/components/active-config/configs/fraud-control.vue';
          <div class="store-select-title">
            <span class="font-14 color-606266">限制额度：</span>
            <el-input-number
+              :disabled="$route.query.editFlag"
              v-model="pointFreeze.amountLimitAmount"
              controls-position="right"
              :min="1"
@@ -121,6 +122,7 @@ import fraudControl from '@/components/active-config/configs/fraud-control.vue';
          <div class="store-select-title">
            <span class="font-14 color-606266">延时时长：</span>
            <el-input-number
+              :disabled="$route.query.editFlag"
              v-model="pointFreeze.pointControlDay"
              controls-position="right"
              :min="1"
@@ -136,6 +138,7 @@ import fraudControl from '@/components/active-config/configs/fraud-control.vue';
          <div class="store-select-title">
            <span class="font-14 color-606266">冻结时长：</span>
            <el-input-number
+              :disabled="$route.query.editFlag"
              v-model="pointFreeze.pointControlDay"
              controls-position="right"
              :min="1"

--- 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-05 11:01:09
+ * @LastEditTime: 2019-12-06 09:54:33
 -->
 <!--
 <invitee-reward></invitee-reward>
@@ -40,6 +40,7 @@ import inviteeReward from '@/components/active-config/configs/invitee-reward.vue
            <div class="point-cell-name font-14 color-303133 font-w-600">积分奖励</div>
            <div class="point-cell-switch">
              <el-switch
+                :disabled="$route.query.editFlag"
                v-model="invitedAward.pointSettingFlag"
                active-text=""
                inactive-text=""
@@ -64,7 +65,10 @@ import inviteeReward from '@/components/active-config/configs/invitee-reward.vue
                class="el-form-item__content"
                style="margin-left: 85px;"
              >
-                <el-radio-group v-model="invitedAward.pointAwardMode">
+                <el-radio-group
+                  v-model="invitedAward.pointAwardMode"
+                  :disabled="$route.query.editFlag"
+                >
                  <el-radio :label="1">定额奖励</el-radio>
                  <el-radio
                    v-if="basePath.map(ele => ele.transName).includes('消费') && invitedAward.stepType == 6"
@@ -84,6 +88,7 @@ import inviteeReward from '@/components/active-config/configs/invitee-reward.vue
              <div class="store-select-title">
                <span class="font-14 color-606266">奖励额度：</span>
                <el-input-number
+                  :disabled="$route.query.editFlag"
                  v-model="invitedAward.pointAwardPoint"
                  controls-position="right"
                  :min="1"
@@ -107,6 +112,7 @@ import inviteeReward from '@/components/active-config/configs/invitee-reward.vue
                        <div>
                          <span class="font-14 color-606266 p-r-10">满</span>
                          <el-input-number
+                            :disabled="$route.query.editFlag"
                            v-model="scope.row.amount"
                            controls-position="right"
                            :min="1"
@@ -121,12 +127,14 @@ import inviteeReward from '@/components/active-config/configs/invitee-reward.vue
                    <template slot-scope="scope">
                      <div class="cell">
                        <el-input-number
+                          :disabled="$route.query.editFlag"
                          v-model="scope.row.point"
                          controls-position="right"
                          :min="1"
                          :max="999999"
                        > </el-input-number>
                        <el-button
+                          :disabled="$route.query.editFlag"
                          v-if="scope.$index != 0"
                          class="m-l-16"
                          @click.stop="deleteRow(scope.$index, invitedAward.pointAwardStepParam)"
@@ -153,6 +161,7 @@ import inviteeReward from '@/components/active-config/configs/invitee-reward.vue
                <span class="font-14 color-606266">奖励额度：</span>
                <span class="font-14 color-606266">每消费</span>
                <el-input-number
+                  :disabled="$route.query.editFlag"
                  v-model="invitedAward.pointAwardPerAmount"
                  controls-position="right"
                  :min="1"
@@ -160,6 +169,7 @@ import inviteeReward from '@/components/active-config/configs/invitee-reward.vue
                > </el-input-number>
                <span class="font-14 color-606266 p-l-3 p-r-10">元 奖励 </span>
                <el-input-number
+                  :disabled="$route.query.editFlag"
                  v-model="invitedAward.pointAwardPerPoint"
                  controls-position="right"
                  :min="1"
@@ -181,6 +191,7 @@ import inviteeReward from '@/components/active-config/configs/invitee-reward.vue
            <div class="point-cell-name font-14 color-303133 font-w-600">卡券奖励</div>
            <div class="point-cell-switch">
              <el-switch
+                :disabled="$route.query.editFlag"
                v-model="invitedAward.cardSettingFlag"
                active-text=""
                inactive-text=""
@@ -206,7 +217,10 @@ import inviteeReward from '@/components/active-config/configs/invitee-reward.vue
                class="el-form-item__content"
                style="margin-left: 85px;"
              >
-                <el-radio-group v-model="invitedAward.cardAwardMode">
+                <el-radio-group
+                  v-model="invitedAward.cardAwardMode"
+                  :disabled="$route.query.editFlag"
+                >
                  <el-radio :label="1">固定奖励</el-radio>
                  <el-radio
                    v-if="basePath.map(ele => ele.transName).includes('消费') && invitedAward.stepType == 6"
@@ -223,6 +237,7 @@ import inviteeReward from '@/components/active-config/configs/invitee-reward.vue
              <div class="store-select-title">
                <span class="font-14 color-606266">选择卡券：</span>
                <el-select
+                  :disabled="$route.query.editFlag"
                  class="w-240"
                  v-model="invitedAward.cardId"
                  placeholder="请选择"
@@ -252,6 +267,7 @@ import inviteeReward from '@/components/active-config/configs/invitee-reward.vue
                      <div>
                        <span class="font-14 color-606266 p-r-10">满</span>
                        <el-input-number
+                          :disabled="$route.query.editFlag"
                          v-model="scope.row.amount"
                          controls-position="right"
                          :min="1"
@@ -266,6 +282,7 @@ import inviteeReward from '@/components/active-config/configs/invitee-reward.vue
                  <template slot-scope="scope">
                    <div class="cell">
                      <el-select
+                        :disabled="$route.query.editFlag"
                        class="w-240"
                        v-model="scope.row.cardId"
                        placeholder="请选择"
@@ -281,6 +298,7 @@ import inviteeReward from '@/components/active-config/configs/invitee-reward.vue
                      <el-button
                        v-if="scope.$index != 0"
                        class="m-l-16"
+                        :disabled="$route.query.editFlag"
                        @click.stop="deleteRow(scope.$index, invitedAward.cardAwardStepParam)"
                        type="text"
                        size="small"
@@ -461,7 +479,10 @@ export default {
     * 删除：
     */
    deleteRow(index, arr) {
-      // const that = this;
+      const that = this;
+      if (that.$route.query.hasOwnProperty('editFlag')) {
+        return false;
+      }
      arr.splice(index, 1);
    },
    /**
@@ -469,6 +490,9 @@ export default {
     */
    addPointItem() {
      const that = this;
+      if (that.$route.query.hasOwnProperty('editFlag')) {
+        return false;
+      }
      that.invitedAward.pointAwardStepParam.push({
        amount: 1,
        point: 1
@@ -476,6 +500,9 @@ export default {
    },
    addCardItem() {
      const that = this;
+      if (that.$route.query.hasOwnProperty('editFlag')) {
+        return false;
+      }
      that.invitedAward.cardAwardStepParam.push({
        amount: 1,
        cardId: '',

--- 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-05 15:35:08
+ * @LastEditTime: 2019-12-06 09:59:15
 -->
 <!--
 <spot-award></spot-award>
@@ -79,6 +79,7 @@ import spotAward from '@/components/active-config/configs/spot-award.vue';
          <div class="store-select-title">
            <span class="font-14 color-606266">定额奖励额度</span>
            <el-input-number
+              :disabled="$route.query.editFlag"
              v-model="instanceAward.instancePoint"
              controls-position="right"
              :min="1"
@@ -107,6 +108,7 @@ import spotAward from '@/components/active-config/configs/spot-award.vue';
                    <div v-if="scope.$index == 0">
                      <span class="font-14 color-606266 p-r-10">前</span>
                      <el-input-number
+                        :disabled="$route.query.editFlag"
                        v-model="scope.row.end"
                        controls-position="right"
                        :min="1"
@@ -117,6 +119,7 @@ import spotAward from '@/components/active-config/configs/spot-award.vue';
                    <div v-if="scope.$index != 0 && scope.$index != instanceAward.instanceContent.length - 1">
                      <span class="font-14 color-606266 p-r-10">第</span>
                      <el-input-number
+                        :disabled="$route.query.editFlag"
                        v-model="scope.row.start"
                        controls-position="right"
                        :min="1"
@@ -124,6 +127,7 @@ import spotAward from '@/components/active-config/configs/spot-award.vue';
                      > </el-input-number>
                      <span class="font-14 color-606266 p-l-10 p-r-10">人 至</span>
                      <el-input-number
+                        :disabled="$route.query.editFlag"
                        v-model="scope.row.end"
                        controls-position="right"
                        :min="1"
@@ -134,6 +138,7 @@ import spotAward from '@/components/active-config/configs/spot-award.vue';
                    <div v-if="scope.$index != 0 && scope.$index == instanceAward.instanceContent.length - 1">
                      <span class="font-14 color-606266 p-r-10">第</span>
                      <el-input-number
+                        :disabled="$route.query.editFlag"
                        v-model="scope.row.start"
                        controls-position="right"
                        :min="1"
@@ -144,6 +149,7 @@ import spotAward from '@/components/active-config/configs/spot-award.vue';
                        class="font-14 color-606266 p-l-10 p-r-10"
                      >人 至</span>
                      <el-input-number
+                        :disabled="$route.query.editFlag"
                        v-if="!scope.row.infinity"
                        v-model="scope.row.end"
                        controls-position="right"
@@ -151,6 +157,7 @@ import spotAward from '@/components/active-config/configs/spot-award.vue';
                        :max="999999"
                      > </el-input-number>
                      <el-checkbox
+                        :disabled="$route.query.editFlag"
                        v-if="scope.$index == instanceAward.instanceContent.length - 1"
                        class="m-l-10"
                        v-model="scope.row.infinity"
@@ -164,12 +171,14 @@ import spotAward from '@/components/active-config/configs/spot-award.vue';
                <template slot-scope="scope">
                  <div class="cell">
                    <el-input-number
+                      :disabled="$route.query.editFlag"
                      v-model="scope.row.point"
                      controls-position="right"
                      :min="1"
                      :max="999999"
                    > </el-input-number>
                    <el-button
+                      :disabled="$route.query.editFlag"
                      v-if="scope.$index != 0"
                      class="m-l-16"
                      @click.stop="deleteRow(scope.$index, instanceAward.instanceContent)"
@@ -426,6 +435,9 @@ export default {
     */
    selectStore(item) {
      const that = this;
+      if (that.$route.query.hasOwnProperty('editFlag')) {
+        return false;
+      }
      that.instanceAward.instanceMade = item.goalId;
    },
    /**
@@ -433,6 +445,9 @@ export default {
     */
    selectMoney(item) {
      const that = this;
+      if (that.$route.query.hasOwnProperty('editFlag')) {
+        return false;
+      }
      that.instanceAward.awardLimitType = item.goalId;
    },
    /**

--- a/src/components/active-config/poster-config.vue
+++ b/src/components/active-config/poster-config.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2019-11-18 10:37:02
 * @LastEditors: 无尘
- * @LastEditTime: 2019-12-05 11:37:08
+ * @LastEditTime: 2019-12-06 09:56:05
 -->
 <!--
 <poster-config @submitBack="submitBack" @submitNext="submitNext"></poster-config>
@@ -124,13 +124,16 @@ import posterConfig from '@/components/active-config/poster-config.vue';
            <div class="flex">
              <span class="color-wrap flex flex-pack-center flex-space-between border-box">前景色<el-color-picker
                  v-model="activeInfoData.qrcodeFrontColor"
+                  :disabled="$route.query.editFlag"
                  @change="changeFront"
                ></el-color-picker></span><span class="color-wrap flex flex-space-between flex-pack-center border-box">背景色<el-color-picker
                  v-model="activeInfoData.qrcodeBackColor"
+                  :disabled="$route.query.editFlag"
                  @change="changeBg"
                ></el-color-picker></span>
              <span class="font-14 color-606266 p-l-20">内边距</span>
              <el-input-number
+                :disabled="$route.query.editFlag"
                class="w-90 m-l-20"
                v-model="activeInfoData.qrcodePadding"
                controls-position="right"

--- 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-05 18:40:11
+ * @LastEditTime: 2019-12-06 09:57:10
 -->
 <!--
 <reward-config @submitBack="submitBack" @submitNext="submitNext"></reward-config>
@@ -178,7 +178,7 @@ import rewardConfig from '@/components/active-config/reward-config.vue';
                </div>
                <div class="active-title-right flex flex-align-center">
                  <el-switch
-                    :disabled="ind == ProgressiveData.length-1"
+                    :disabled="ind == ProgressiveData.length-1 || $route.query.editFlag"
                    v-model="parentItem.switchFlag"
                    active-text=""
                    inactive-text=""
@@ -1268,6 +1268,9 @@ export default {
    },
    selectModeType(item, pItem) {
      const that = this;
+      if (that.$route.query.hasOwnProperty('editFlag')) {
+        return false;
+      }
      pItem[item.key] = pItem[item.key] ? 0 : 1;
      // 修改tab
      const type = that.stepObj[that.basePath[that.basePath.length-1].transName];
@@ -1769,10 +1772,10 @@ export default {
              that.activeInfoData.awardMode = resData.result.awardMode;
              that.ProgressiveData =  resData.result.awardItems;
              that.ProgressiveData.forEach(ele => {
-                if (that.basePath.map(ele => ele.transName).includes('消费')) {
+                if (ele.stepType == 6) {
                  ele.activeName = 'first';
                }else {
-                  ele.activeName = 'second';
+                  ele.activeName = ele.instanceAward? 'second' : 'four';
                }
                that.consumeAction.stepType = ele.stepType;
                that.instanceAward.stepType = ele.stepType;