Skip to content

S
shareConfig
Commit d5dfd565 by 无尘
Options

fix：修改受邀人奖励

parent 2eb8938a
Showing with 40 additions and 34 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.94f90dfe887533ebbdfb25218dbdbff5.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.94d2f7b264eeae6949fe.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.5568f7aa1321159a88166932bf0b97cd.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.af56d51b69f3ecb07f1e.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.d2ddf87cac527de8347d.js → dist/static/js/2.7cf6dd1b8571d95be2bc.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.94d2f7b264eeae6949fe.js → dist/static/js/manifest.af56d51b69f3ecb07f1e.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:"f0728605b4cabfe16cd5",1:"5b546fa38466a0b05e37",2:"d2ddf87cac527de8347d",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(){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,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:"f0728605b4cabfe16cd5",1:"5b546fa38466a0b05e37",2:"7cf6dd1b8571d95be2bc",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(){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/configs/competition-award.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-21 16:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-12 14:52:37
* @LastEditTime: 2019-12-12 16:00:37
-->
<!--
<competition-award></competition-award>
......@@ -79,7 +79,7 @@ import competitionAward from '@/components/active-config/configs/competition-awa
label="成交人数竞赛奖项："
prop=""
>
<div class="w-872">
<div class="w-912">
<el-table
:data="compitionAward.dealNumberSettingParam"
style="width: 100%"
......@@ -103,7 +103,7 @@ import competitionAward from '@/components/active-config/configs/competition-awa
</el-table-column>
<el-table-column
label="排名"
width="265"
width="305"
>
<template slot-scope="scope">
<div class="cell">
......@@ -244,7 +244,7 @@ import competitionAward from '@/components/active-config/configs/competition-awa
label="成交额竞赛奖项: "
prop=""
>
<div class="w-872">
<div class="w-912">
<el-table
:data="compitionAward.dealAmountSettingParam"
style="width: 100%"
......@@ -268,7 +268,7 @@ import competitionAward from '@/components/active-config/configs/competition-awa
</el-table-column>
<el-table-column
label="排名"
width="265"
width="305"
>
<template slot-scope="scope">
<div class="cell">
......@@ -483,6 +483,16 @@ export default {
};
},
methods: {
isRepeat(arr) {
let hash = {};
for (let i in arr) {
if (hash[arr[i]]){
return true;
}
hash[arr[i]] = true;
}
return false;
},
/**
* 表单提交
*/
......@@ -497,11 +507,19 @@ export default {
}
if (that.compitionAward.dealNumberFlag == 1 && that.compitionAward.dealNumberSettingParam.length) {
let flag = true;
let names = [];
that.compitionAward.dealNumberSettingParam.forEach(ele => {
if (!ele.awardName ||(ele.cardCheck && !ele.cardId) || (!ele.pointCheck && !ele.cardCheck) ) {
if (!ele.awardName ||(ele.cardCheck && !ele.cardId)||(ele.pointCheck && !ele.point) || (!ele.pointCheck && !ele.cardCheck) ) {
flag = false;
}
names.push(ele.awardName);
});
let nameFlag = await that.isRepeat(names);
console.log(nameFlag,flag)
if(nameFlag){
resolve(false);
}
if (!flag) {
resolve(false);
}
......@@ -513,7 +531,7 @@ export default {
// 阶梯奖励中顺序值判断
if(that.compitionAward.dealNumberFlag == 1 && that.compitionAward.dealNumberSettingParam.length>1){
let flag = true;
const arr = [];
let arr = [];
that.compitionAward.dealNumberSettingParam.forEach(ele => {
if ((!ele.start && ele.start != 0) || (!ele.end && ele.end != -1) ) {
flag = false;
......@@ -535,6 +553,7 @@ export default {
break;
}
}
console.log(flag)
if (!flag) {
resolve(false);
}
......@@ -545,11 +564,18 @@ export default {
}
if (that.compitionAward.dealAmountFlag == 1 && that.compitionAward.dealAmountSettingParam.length) {
let flag = true;
let names = [];
that.compitionAward.dealAmountSettingParam.forEach(ele => {
if (!ele.awardName ||(ele.cardCheck && !ele.cardId) || (!ele.pointCheck && !ele.cardCheck) ) {
flag = false;
}
names.push(ele.awardName);
});
let nameFlag = await that.isRepeat(names);
console.log(nameFlag,flag)
if(nameFlag){
resolve(false);
}
if (!flag) {
resolve(false);
}
......@@ -582,7 +608,6 @@ export default {
break;
}
}
flag = await that.isContinuityNum(arr);
if (!flag) {
resolve(false);
}
......@@ -782,8 +807,8 @@ export default {
.w-146 {
width: 146px;
}
.w-872 {
width: 872px;
.w-912 {
width: 912px;
}
.l-h-40 {
line-height: 40px;
......
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 14:30:37
* @LastEditTime: 2019-12-12 16:00:56
-->
<!--
<spot-award></spot-award>
......@@ -389,25 +389,6 @@ export default {
};
},
methods: {
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