Skip to content

S
shareConfig
Commit 248a71c7 by 无尘
Options

fix: 修改奖励

parent 3e18b84a
Showing with 46 additions and 20 deletions
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.2cddaffa43c32c0d1988330fae42d6d0.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.84b84dad51ee9cd0f138.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
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>分享有礼</title><link href=./static/css/app.3f411ed964c4978220a6ef7b68b1aab8.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.a9551b300161cc79e80d.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
dist/static/css/app.2cddaffa43c32c0d1988330fae42d6d0.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.3f411ed964c4978220a6ef7b68b1aab8.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/2.047b01d1a853d7574618.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/2.7d9bc4d4eca777ffe45d.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.84b84dad51ee9cd0f138.js → dist/static/js/manifest.a9551b300161cc79e80d.js
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var f,i,u,d=0,s=[];d<r.length;d++)i=r[d],t[i]&&s.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);s.length;)s.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:"047b01d1a853d7574618",3:"35d0dca21b47e8e820e0",4:"c9baf4695a3666998280",5:"e5020e10cc9f40ceacc5",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
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var f,i,u,d=0,s=[];d<r.length;d++)i=r[d],t[i]&&s.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);s.length;)s.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:"7d9bc4d4eca777ffe45d",3:"35d0dca21b47e8e820e0",4:"c9baf4695a3666998280",5:"e5020e10cc9f40ceacc5",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
src/components/active-config/base-config.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-18 10:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-05 11:33:33
* @LastEditTime: 2019-12-06 13:42:32
-->
<!--
<base-config @submitNext="submitNext"></base-config>
......@@ -56,7 +56,7 @@ import baseConfig from '@/components/active-config/base-config.vue';
:disflag="$route.query.editFlag ? true : false"
:inputValue.sync="activeInfoData.activityName"
:holder="'请输入活动名称'"
:getByType="'word'"
:getByType="'char'"
:maxLength="30"
> </limitInput>
</el-form-item>
......
src/components/active-config/card-config.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-18 10:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-06 09:55:30
* @LastEditTime: 2019-12-06 13:47:10
-->
<!--
<card-config @submitBack="submitBack" @submitNext="submitNext"></card-config>
......@@ -37,10 +37,10 @@ import cardConfig from '@/components/active-config/card-config.vue';
>
<limitInput
:inputWidth="503"
:disflag="$route.query.editFalg ? true : false"
:disflag="$route.query.editFlag"
:inputValue.sync="activeInfoData.appletTitle"
:holder="'请输入页面标题'"
:getByType="'word'"
:getByType="'char'"
:maxLength="40"
> </limitInput>
</el-form-item>
......@@ -50,6 +50,7 @@ import cardConfig from '@/components/active-config/card-config.vue';
>
<single-upload
:width="600"
:disabled="$route.query.editFlag"
:limitRate="'5/4'"
:limitFlag="3"
v-model="activeInfoData.playBillUrl"
......@@ -263,6 +264,9 @@ export default {
color: rgba(48, 49, 51, 1);
line-height: 22px;
margin-bottom: 8px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.form-preview-img {
width: 298px;
......
src/components/active-config/center-config.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-18 10:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-05 10:36:10
* @LastEditTime: 2019-12-06 13:43:24
-->
<!--
<center-config @submitBack="submitBack" @submitNext="submitNext"></center-config>
......@@ -36,6 +36,7 @@ import centerConfig from '@/components/active-config/center-config.vue';
prop="headUrl"
>
<single-upload
:disabled="$route.query.hasOwnProperty('editFlag') ? true: false"
:width="750"
v-model="activeInfoData.headUrl"
> </single-upload>
......@@ -63,7 +64,7 @@ import centerConfig from '@/components/active-config/center-config.vue';
:disflag="$route.query.editFlag ? true : false"
:inputValue.sync="activeInfoData.shareButtonFont"
:holder="'请输入分享按钮文案'"
:getByType="'word'"
:getByType="'char'"
:maxLength="20"
> </limitInput>
</el-form-item>
......
src/components/active-config/configs/fraud-control.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-21 16:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-06 10:26:48
* @LastEditTime: 2019-12-06 14:06:30
-->
<!--
<fraud-control></fraud-control>
......@@ -66,7 +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"
:disabled="$route.query.editFlag || !notEdit"
v-model="pointFreeze.amountLimitAmount"
controls-position="right"
:min="1"
......@@ -167,6 +167,10 @@ export default {
"stepType": 1 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
};
}
},
notEdit: {
type: Boolean,
default: false
}
},
components: {},
......@@ -232,7 +236,7 @@ export default {
*/
selectStore(item) {
const that = this;
if (that.$route.query.hasOwnProperty('activityId')) {
if (that.$route.query.hasOwnProperty('activityId') && !that.notEdit) {
showMsg.showmsg('成交额上限控制禁止修改', 'warning');
return false;
}
......
src/components/active-config/poster-config.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-18 10:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-06 09:56:05
* @LastEditTime: 2019-12-06 11:26:58
-->
<!--
<poster-config @submitBack="submitBack" @submitNext="submitNext"></poster-config>
......@@ -110,6 +110,7 @@ import posterConfig from '@/components/active-config/poster-config.vue';
prop="playBillUrl"
>
<post-upload
:disabled="$route.query.editFlag"
v-model="activeInfoData.playBillUrl"
:limitFlag="2"
:width="750"
......
src/components/active-config/reward-config.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-18 10:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-06 11:16:01
* @LastEditTime: 2019-12-06 13:49:19
-->
<!--
<reward-config @submitBack="submitBack" @submitNext="submitNext"></reward-config>
......@@ -156,6 +156,7 @@ import rewardConfig from '@/components/active-config/reward-config.vue';
<!-- 防欺诈风险控制 -->
<fraud-control
ref="singleFreeze"
:notEdit="notEdit"
v-model="activeInfoData.pointFreeze"
></fraud-control>
</el-tab-pane>
......@@ -296,6 +297,7 @@ import rewardConfig from '@/components/active-config/reward-config.vue';
>
<!-- 防欺诈风险控制 -->
<fraud-control
:notEdit="notEdit"
ref="multFreeze"
v-model="parentItem.pointFreeze"
></fraud-control>
......@@ -1248,7 +1250,8 @@ export default {
"stepType": 6 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
}
},
ProgressiveData: [] //根据路径添加
ProgressiveData: [], //根据路径添加
notEdit: false, //判断未开始的未进入这一步的时候，是不禁止修改的
};
},
methods: {
......@@ -1257,7 +1260,7 @@ export default {
*/
selectMode(item) {
const that = this;
if (that.$route.query.hasOwnProperty('activityId')) {
if (that.$route.query.hasOwnProperty('activityId') && !that.notEdit) {
showMsg.showmsg('奖励模式禁止修改', 'warning');
return false;
}
......@@ -1752,8 +1755,10 @@ export default {
let resData = res.data;
if (resData.errorCode == 1) {
if (!resData.result) {
that.notEdit = true; // 判断未开始的未进入这一步的时候，是不禁止修改的
return false;
}
that.notEdit = false; // 判断未开始的未进入这一步的时候，是不禁止修改的
if (resData.result.awardMode == 1) {
that.consumeAction.stepType = resData.result.stepType;
that.instanceAward.stepType = resData.result.stepType;
......
src/components/post-upload.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-20 13:44:22
* @LastEditors: 无尘
* @LastEditTime: 2019-12-04 18:04:32
* @LastEditTime: 2019-12-06 11:27:25
-->
<!--
单个上传组件
......@@ -21,6 +21,7 @@
<div class="single-upload-wrap">
<el-upload
class="avatar-uploader"
:disabled="disabled"
:action="uploadUrl()"
:show-file-list="false"
:on-success="handleAvatarSuccess"
......@@ -83,6 +84,10 @@ export default {
height: {
type: Number,
default: 300
},
disabled: {
type: Boolean,
default: false
}
},
data() {
......
src/components/single-upload.vue
......@@ -4,11 +4,12 @@
* @Author: 无尘
* @Date: 2019-11-20 13:44:22
* @LastEditors: 无尘
* @LastEditTime: 2019-12-03 15:06:08
* @LastEditTime: 2019-12-06 11:21:16
-->
<!--
单个上传组件
<single-upload
:disabled="disabled"
:uploadLimit="uploadLimit"
:limitFlag="limitFlag"
:width="width"
......@@ -21,6 +22,7 @@
<div class="single-upload-wrap">
<el-upload
class="avatar-uploader"
:disabled="disabled"
:action="uploadUrl()"
:show-file-list="false"
:on-success="handleAvatarSuccess"
......@@ -82,6 +84,10 @@ export default {
type: Number,
default: 300
},
disabled: {
type: Boolean,
default: false
}
},
data() {
return {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment