Skip to content

S
shareConfig
Commit f2565e8c by 无尘
Options

fix：修改奖励显示

parent 7b3ab557
Showing with 29 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.cf54f9da8f35b99bb28dec1b88c8cad3.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.0cb034a1b5aad42a84de.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.c1652e80e980fc7582a63e46f298fec3.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.2f58e1dcf47a789378a2.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/js/2.688d5cd774c12136cbb0.js → dist/static/js/2.3939a553425f5e83fe54.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.0cb034a1b5aad42a84de.js deleted 100644 → 0
!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:"688d5cd774c12136cbb0",3:"12a1f435b25ad9b0e916",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
dist/static/js/manifest.2f58e1dcf47a789378a2.js 0 → 100644
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){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 a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,c);b.length;)b.shift()();if(c)for(d=0;d<c.length;d++)u=o(o.s=c[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 a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+e+"."+{0:"8a732b49262f7df9b526",1:"5b546fa38466a0b05e37",2:"3939a553425f5e83fe54",3:"12a1f435b25ad9b0e916",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(){c.onerror=c.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=i,a.appendChild(c),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/configs/competition-award.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-21 16:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-05 10:48:21
* @LastEditTime: 2019-12-05 11:16:39
-->
<!--
<competition-award></competition-award>
......@@ -76,7 +76,7 @@ import competitionAward from '@/components/active-config/configs/competition-awa
<el-form-item
v-if="compitionAward.dealNumberFlag == 1"
class="m-t-20"
label="成交人数闯关奖项："
label="成交人数竞赛奖项："
prop=""
>
<div class="w-1019">
......@@ -224,7 +224,7 @@ import competitionAward from '@/components/active-config/configs/competition-awa
<el-form-item
v-if="compitionAward.dealAmountFlag == 1"
class="m-t-20"
label="成交额闯关奖项: "
label="成交额竞赛奖项: "
prop=""
>
<div class="w-1019">
......@@ -590,9 +590,9 @@ export default {
*/
addPeopleItem() {
const that = this;
if(that.compitionAward.dealNumberSettingParam.length < 2) {
if(that.compitionAward.dealNumberSettingParam.length < 2 || !that.compitionAward.dealNumberSettingParam.map(ele=>ele.infinity).includes('true')) {
that.compitionAward.dealNumberSettingParam.push({
awardName: '第一',
awardName: '',
start: 1,
end: 5,
infinity: false,
......@@ -604,9 +604,9 @@ export default {
});
return false;
}
if(that.compitionAward.dealNumberSettingParam.length >= 2) {
if(that.compitionAward.dealNumberSettingParam.length >= 2 && that.compitionAward.dealNumberSettingParam.map(ele=>ele.infinity).includes('true')) {
that.compitionAward.dealNumberSettingParam.splice(-1, 0,{
awardName: '第一',
awardName: '',
start: 1,
end: 5,
infinity: false,
......@@ -620,9 +620,9 @@ export default {
},
addMoneyItem() {
const that = this; //成交额奖项 成交额奖项json
if(that.compitionAward.dealAmountSettingParam.length < 2) {
if(that.compitionAward.dealAmountSettingParam.length < 2 || that.compitionAward.dealAmountSettingParam.map(ele=>ele.infinity).includes('true')) {
that.compitionAward.dealAmountSettingParam.push({
awardName: '第一',
awardName: '',
start: 1,
end: 5,
infinity: false,
......@@ -634,9 +634,9 @@ export default {
});
return false;
}
if(that.compitionAward.dealAmountSettingParam.length >= 2) {
if(that.compitionAward.dealAmountSettingParam.length >= 2 && that.compitionAward.dealAmountSettingParam.map(ele=>ele.infinity).includes('true')) {
that.compitionAward.dealAmountSettingParam.splice(-1, 0,{
awardName: '第一',
awardName: '',
start: 1,
end: 5,
infinity: false,
......
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 20:29:11
* @LastEditTime: 2019-12-05 11:30:52
-->
<!--
<fraud-control></fraud-control>
......@@ -149,6 +149,7 @@ import fraudControl from '@/components/active-config/configs/fraud-control.vue';
</div>
</template>
<script>
import showMsg from '@/common/js/showmsg';
export default {
name: 'fraud-control',
props: {
......@@ -228,6 +229,10 @@ export default {
*/
selectStore(item) {
const that = this;
if (that.$route.query.hasOwnProperty('activityId')) {
showMsg.showmsg('成交额上限控制禁止修改', 'warning');
return false;
}
that.pointFreeze.amountLimitFlag = item.goalId;
},
/**
......
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 10:49:51
* @LastEditTime: 2019-12-05 11:18:33
-->
<!--
<spot-award></spot-award>
......@@ -446,7 +446,7 @@ export default {
*/
toAddItem() {
const that = this;
if(that.instanceAward.instanceContent.length < 2) {
if(that.instanceAward.instanceContent.length < 2 || !that.instanceAward.instanceContent.map(ele=>ele.infinity).includes('true')) {
that.instanceAward.instanceContent.push({
start: 10,
end: 20,
......@@ -455,7 +455,7 @@ export default {
});
return false;
}
if(that.instanceAward.instanceContent.length >= 2) {
if(that.instanceAward.instanceContent.length >= 2 && that.instanceAward.instanceContent.map(ele=>ele.infinity).includes('true')) {
that.instanceAward.instanceContent.splice(-1, 0, {
start: 10,
end: 20,
......
src/components/active-config/reward-config.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-18 10:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-05 10:52:31
* @LastEditTime: 2019-12-05 11:29:31
-->
<!--
<reward-config @submitBack="submitBack" @submitNext="submitNext"></reward-config>
......@@ -1169,6 +1169,10 @@ export default {
*/
selectMode(item) {
const that = this;
if (that.$route.query.hasOwnProperty('activityId')) {
showMsg.showmsg('奖励模式禁止修改', 'warning');
return false;
}
that.activeInfoData.awardMode = item.goalId;
if (item.goalId == 2 && !that.ProgressiveData.length) {
that.changeModeData();
......
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