Skip to content

S
shareConfig
Commit 2304ebac by 无尘
Options

fix：修改奖励

parent c3b6b2c6
Showing with 136 additions and 43 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.a294002d6a7f8600c7f79b4e3daafa05.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.6450b2264ed2037af428.js></script><script type=text/javascript src=./static/js/vendor.8455def81090347f10ce.js></script><script type=text/javascript src=./static/js/app.1bf17e59b55846403e62.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.160dea7df00c9932f6bcb80938f54889.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.4bb7ffd5cddbe8613b48.js></script><script type=text/javascript src=./static/js/vendor.8455def81090347f10ce.js></script><script type=text/javascript src=./static/js/app.1bf17e59b55846403e62.js></script></body></html>
\ No newline at end of file
dist/static/js/2.6da453779d529935fe84.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/2.bfd600ab5ea6d9f5115c.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/manifest.6450b2264ed2037af428.js → dist/static/js/manifest.4bb7ffd5cddbe8613b48.js
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){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 a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,c);s.length;)s.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:"f0728605b4cabfe16cd5",1:"5b546fa38466a0b05e37",2:"bfd600ab5ea6d9f5115c",3:"a7a4434900aad7ad9616",4:"514ca49e10b89d0f4177",5:"c363a570a348c211247e",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
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){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 a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,c);s.length;)s.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:"f0728605b4cabfe16cd5",1:"5b546fa38466a0b05e37",2:"6da453779d529935fe84",3:"a7a4434900aad7ad9616",4:"514ca49e10b89d0f4177",5:"c363a570a348c211247e",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/entry-award.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-21 16:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-11 11:47:37
* @LastEditTime: 2019-12-12 13:19:59
-->
<!--
<entry-award></entry-award>
......@@ -83,7 +83,7 @@ import entryAward from '@/components/active-config/configs/entry-award.vue';
:data="passAward.dealNumberSettingParam"
style="width: 100%"
>
<el-table-column label="排名">
<el-table-column label="条件">
<template slot-scope="scope">
<div class="cell">
<div>
......@@ -169,7 +169,7 @@ import entryAward from '@/components/active-config/configs/entry-award.vue';
:data="passAward.dealAmountSettingParam"
style="width: 100%"
>
<el-table-column label="排名">
<el-table-column label="条件">
<template slot-scope="scope">
<div class="cell">
<div>
......@@ -334,7 +334,7 @@ export default {
if (that.passAward.dealNumberFlag == 1 && that.passAward.dealNumberSettingParam.length) {
let flag = true;
that.passAward.dealNumberSettingParam.forEach(ele => {
if ((ele.cardCheck && !ele.cardId) || (!ele.pointCheck && !ele.cardCheck)) {
if ((ele.cardCheck && !ele.cardId) || (!ele.pointCheck && !ele.cardCheck) || ele.achieve=='') {
flag = false;
}
});
......@@ -372,7 +372,7 @@ export default {
if (that.passAward.dealAmountFlag == 1 && that.passAward.dealAmountSettingParam.length) {
let flag = true;
that.passAward.dealAmountSettingParam.forEach(ele => {
if ((ele.cardCheck && !ele.cardId) || (!ele.pointCheck && !ele.cardCheck)) {
if ((ele.cardCheck && !ele.cardId) || (!ele.pointCheck && !ele.cardCheck) || ele.achieve=='') {
flag = false;
}
});
......
src/components/active-config/configs/invitee-reward.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-21 16:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-06 10:25:19
* @LastEditTime: 2019-12-12 13:29:15
-->
<!--
<invitee-reward></invitee-reward>
......@@ -405,9 +405,23 @@ export default {
if (that.invitedAward.pointSettingFlag && that.invitedAward.pointAwardMode == 1 && !that.invitedAward.pointAwardPoint) {
resolve(false);
}
if (that.invitedAward.pointSettingFlag && that.invitedAward.pointAwardMode == 3 && (!that.invitedAward.pointAwardPerAmount|| !that.invitedAward.pointAwardPerPoint)) {
resolve(false);
}
if (that.invitedAward.pointSettingFlag && that.invitedAward.pointAwardMode == 2 && !that.invitedAward.pointAwardStepParam.length) {
resolve(false);
}
if (that.invitedAward.pointSettingFlag && that.invitedAward.pointAwardMode == 2 && that.invitedAward.pointAwardStepParam.length) {
let flag = true;
that.invitedAward.pointAwardStepParam.forEach(ele => {
if (!ele.amount || !ele.point) {
flag = false;
}
});
if (!flag) {
resolve(false);
}
}
if (that.invitedAward.pointSettingFlag && that.invitedAward.pointAwardMode == 2 && that.invitedAward.pointAwardStepParam.length>1) {
let flag = true
const arr = [];
......@@ -439,7 +453,7 @@ export default {
if (that.invitedAward.cardSettingFlag && that.invitedAward.cardAwardMode == 2 && that.invitedAward.cardAwardStepParam.length) {
let flag = true;
that.invitedAward.cardAwardStepParam.forEach(ele => {
if (!ele.cardId) {
if (!ele.amount||!ele.cardId) {
flag = false;
}
});
......
src/components/active-config/configs/spot-award.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-21 16:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-12 11:47:08
* @LastEditTime: 2019-12-12 13:21:29
-->
<!--
<spot-award></spot-award>
......@@ -100,7 +100,7 @@ import spotAward from '@/components/active-config/configs/spot-award.vue';
:row-class-name="tableRowClassName"
>
<el-table-column
label="排名"
label="区间"
width="455"
>
<template slot-scope="scope">
......@@ -113,13 +113,14 @@ import spotAward from '@/components/active-config/configs/spot-award.vue';
controls-position="right"
:min="1"
:max="999999"
@change="changeEndNum($event,scope.$index,scope.row)"
> </el-input-number>
<span class="font-14 color-606266 p-l-10">人</span>
</div>
<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"
:disabled="true"
v-model="scope.row.start"
controls-position="right"
:min="1"
......@@ -132,13 +133,14 @@ import spotAward from '@/components/active-config/configs/spot-award.vue';
controls-position="right"
:min="1"
:max="999999"
@change="changeEndNum($event,scope.$index,scope.row)"
> </el-input-number>
<span class="font-14 color-606266 p-l-10">人</span>
</div>
<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"
:disabled="true"
v-model="scope.row.start"
controls-position="right"
:min="1"
......@@ -427,19 +429,31 @@ export default {
if(that.instanceAward.instanceMade == 2 && that.instanceAward.instanceContent.length>1&&!that.instanceAward.instanceContent[that.instanceAward.instanceContent.length-1].infinity) {
resolve(false);
}
if(that.instanceAward.instanceMade == 2 && that.instanceAward.instanceContent.length){
let flag = true;
that.instanceAward.instanceContent.forEach(ele => {
if (ele.start== '' || (ele.end == ''&& ele.end != -1) || ele.point=='') {
flag = false;
}
})
if (!flag) {
resolve(false);
}
}
// 阶梯奖励中顺序值判断
if(that.instanceAward.instanceMade == 2 && that.instanceAward.instanceContent.length>1){
let flag = true;
const arr = [];
that.instanceAward.instanceContent.forEach(ele => {
if (ele.start != 0) {
arr.push(ele.start);
if (ele.start== '' || (ele.end == ''&& ele.end != -1) || ele.point=='') {
flag = false;
}
arr.push(ele.start);
if(ele.end != -1) {
arr.push(ele.end);
}
});
let flag = true;
for(let i = 0; i<arr.length-1; i++) {
for(let j = i+1; j<arr.length; j++){
if(arr[i]>=arr[j]){
......@@ -451,8 +465,6 @@ export default {
break;
}
}
flag = await that.isContinuityNum(arr);
console.log(flag)
if (!flag) {
resolve(false);
}
......@@ -491,28 +503,38 @@ export default {
that.instanceAward.awardLimitType = item.goalId;
},
/**
* 阶梯奖励添加奖项：
* 阶梯奖励无穷大奖项：
*/
changeEnd(e, row) {
row.end = e ? -1 : '';
},
/**
* 阶梯奖励end奖项：
*/
changeEndNum(e, index, row) {
const that = this;
console.log(e, index, row,that.instanceAward.instanceContent.length)
if (index < that.instanceAward.instanceContent.length-1) {
that.instanceAward.instanceContent[index +1].start = e + 1;
}
},
/**
* 阶梯奖励添加奖项：
*/
toAddItem() {
const that = this;
if(that.instanceAward.instanceContent.length < 2 || !that.instanceAward.instanceContent.map(ele=>ele.infinity).includes('true')) {
if(that.instanceAward.instanceContent.length < 2 || !that.instanceAward.instanceContent.map(ele=>ele.infinity).includes(true)) {
that.instanceAward.instanceContent.push({
start: that.instanceAward.instanceContent.length == 0? 0 : 10,
start: that.instanceAward.instanceContent.length == 0? 0 : that.instanceAward.instanceContent[that.instanceAward.instanceContent.length-1].end +1,
end: 20,
point: 1,
infinity: false
});
return false;
}
if(that.instanceAward.instanceContent.length >= 2 && that.instanceAward.instanceContent.map(ele=>ele.infinity).includes('true')) {
if(that.instanceAward.instanceContent.length >= 2 && that.instanceAward.instanceContent.map(ele=>ele.infinity).includes(true)) {
that.instanceAward.instanceContent.splice(-1, 0, {
start: 10,
start: that.instanceAward.instanceContent[that.instanceAward.instanceContent.length-2].end + 1,
end: 20,
point: 1,
infinity: false
......
src/mixins/emitter.js
/*
* @Descripttion: 当前组件信息
* @version: 1.0.0
* @Author: 无尘
* @Date: 2019-11-12 10:18:30
* @LastEditors: 无尘
* @LastEditTime: 2019-12-12 12:16:55
*/
function broadcast(componentName, eventName, params) {
this.$children.forEach(child => {
var name = child.$options.componentName;
......@@ -28,6 +36,25 @@ export default {
},
broadcast(componentName, eventName, params) {
broadcast.call(this, componentName, eventName, params);
},
isContinuityNum(num) {
let array = [];
if (num instanceof Array) {
array = [...num];
} else {
array = Array.from(num.toString()) //转换为数组
}
let i = array[0];
let isContinuation = true;
for (let e in array) {
if (array[e] != i) {
isContinuation = false;
break;
}
i++;
}
return isContinuation;
}
}
};
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