Commit 875203a5 by 无尘

fix: 修改奖励

parent 48a7c993
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>分享有礼</title><link href=./static/css/app.60c380dc57a72222659baa12fc3f8161.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.0517dea1bcfc8a637f39.js></script><script type=text/javascript src=./static/js/vendor.8455def81090347f10ce.js></script><script type=text/javascript src=./static/js/app.2e2c5aaef69a6867e2bf.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.283d4b02ce158adfadbc81898083d53d.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.ff5de440337cf8812d8f.js></script><script type=text/javascript src=./static/js/vendor.8455def81090347f10ce.js></script><script type=text/javascript src=./static/js/app.2e2c5aaef69a6867e2bf.js></script></body></html>
\ No newline at end of file \ No newline at end of file
...@@ -956,7 +956,8 @@ select:-webkit-autofill { ...@@ -956,7 +956,8 @@ select:-webkit-autofill {
} }
#index .el-table__empty-block { #index .el-table__empty-block {
height: 256px; /* height: 256px; */
padding: 50px 0;
} }
.common-wrap__table .el-table__empty-text { .common-wrap__table .el-table__empty-text {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,f){for(var a,i,u,d=0,b=[];d<r.length;d++)i=r[d],t[i]&&b.push(t[i][0]),t[i]=0;for(a in c)Object.prototype.hasOwnProperty.call(c,a)&&(e[a]=c[a]);for(n&&n(r,c,f);b.length;)b.shift()();if(f)for(d=0;d<f.length;d++)u=o(o.s=f[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],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,o.nc&&f.setAttribute("nonce",o.nc),f.src=o.p+"static/js/"+e+"."+{0:"ec3f14ff9ffd8409d32e",1:"5b546fa38466a0b05e37",2:"8c459a234fb50728ae11",3:"b6b8a0f7bb10b6409bfc",4:"67ccecbc8d185b3f1c8c",5:"0c49c41eb27e8038adad",6:"f11d902de0350ef6b333",7:"b0fd74564cc799593b8f",8:"fe9ec49f63ecd8e527ba",9:"522a01ff8d619d2bf030",10:"e16b73d2d4b922255e52",11:"79c83b22c308f0e0e879",12:"3c0d12e65df907bcbcc5"}[e]+".js";var a=setTimeout(i,12e4);function i(){f.onerror=f.onload=null,clearTimeout(a);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return f.onerror=f.onload=i,c.appendChild(f),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,f){for(var a,i,u,d=0,b=[];d<r.length;d++)i=r[d],t[i]&&b.push(t[i][0]),t[i]=0;for(a in c)Object.prototype.hasOwnProperty.call(c,a)&&(e[a]=c[a]);for(n&&n(r,c,f);b.length;)b.shift()();if(f)for(d=0;d<f.length;d++)u=o(o.s=f[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],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,o.nc&&f.setAttribute("nonce",o.nc),f.src=o.p+"static/js/"+e+"."+{0:"ec3f14ff9ffd8409d32e",1:"5b546fa38466a0b05e37",2:"c7373a00403c0208752b",3:"b6b8a0f7bb10b6409bfc",4:"67ccecbc8d185b3f1c8c",5:"0c49c41eb27e8038adad",6:"f11d902de0350ef6b333",7:"b0fd74564cc799593b8f",8:"fe9ec49f63ecd8e527ba",9:"522a01ff8d619d2bf030",10:"e16b73d2d4b922255e52",11:"79c83b22c308f0e0e879",12:"3c0d12e65df907bcbcc5"}[e]+".js";var a=setTimeout(i,12e4);function i(){f.onerror=f.onload=null,clearTimeout(a);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return f.onerror=f.onload=i,c.appendChild(f),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 \ No newline at end of file
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-11-21 16:37:02 * @Date: 2019-11-21 16:37:02
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-12-17 21:12:39 * @LastEditTime: 2019-12-18 10:09:26
--> -->
<!-- <!--
<competition-award></competition-award> <competition-award></competition-award>
...@@ -552,6 +552,30 @@ export default { ...@@ -552,6 +552,30 @@ export default {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
that.$refs['rewardForm'].validate(async valid => { that.$refs['rewardForm'].validate(async valid => {
if (valid) { if (valid) {
/* if (that.compitionAward.dealNumberFlag == 1 && that.compitionAward.dealNumberSettingParam.length) {
that.compitionAward.dealNumberSettingParam.forEach(ele => {
if (!ele.cardCheck && ele.cardId){
ele.cardId = '';
ele.cardName = '';
}
if(!ele.pointCheck && ele.point) {
ele.point = '';
}
});
}
if (that.compitionAward.dealAmountFlag == 1 && that.compitionAward.dealAmountSettingParam.length) {
that.compitionAward.dealAmountSettingParam.forEach(ele => {
if (!ele.cardCheck && ele.cardId){
ele.cardId = '';
ele.cardName = '';
}
if(!ele.pointCheck && ele.point) {
ele.point = '';
}
});
} */
that.$emit('input', that.compitionAward); that.$emit('input', that.compitionAward);
if (that.compitionAward.dealNumberFlag == 1 && !that.compitionAward.dealNumberSettingParam.length) { if (that.compitionAward.dealNumberFlag == 1 && !that.compitionAward.dealNumberSettingParam.length) {
resolve({flag: false, msg: '请完善竞赛奖励中成交人数奖项'}); resolve({flag: false, msg: '请完善竞赛奖励中成交人数奖项'});
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-11-21 16:37:02 * @Date: 2019-11-21 16:37:02
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-12-17 18:30:29 * @LastEditTime: 2019-12-18 10:09:17
--> -->
<!-- <!--
<entry-award></entry-award> <entry-award></entry-award>
...@@ -332,6 +332,30 @@ export default { ...@@ -332,6 +332,30 @@ export default {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
that.$refs['rewardForm'].validate(valid => { that.$refs['rewardForm'].validate(valid => {
if (valid) { if (valid) {
/* if (that.passAward.dealNumberFlag == 1 && that.passAward.dealNumberSettingParam.length) {
that.passAward.dealNumberSettingParam.forEach(ele => {
if (!ele.cardCheck && ele.cardId){
ele.cardId = '';
ele.cardName = '';
}
if(!ele.pointCheck && ele.point) {
ele.point = '';
}
});
}
if (that.passAward.dealAmountFlag == 1 && that.passAward.dealAmountSettingParam.length) {
that.passAward.dealAmountSettingParam.forEach(ele => {
if (!ele.cardCheck && ele.cardId){
ele.cardId = '';
ele.cardName = '';
}
if(!ele.pointCheck && ele.point) {
ele.point = '';
}
});
} */
that.$emit('input', that.passAward); that.$emit('input', that.passAward);
if (that.passAward.dealNumberFlag == 0 && that.passAward.dealNumberFlag == 0) { if (that.passAward.dealNumberFlag == 0 && that.passAward.dealNumberFlag == 0) {
resolve({flag: false, msg: '请完善闯关奖励'}); resolve({flag: false, msg: '请完善闯关奖励'});
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-11-18 10:37:02 * @Date: 2019-11-18 10:37:02
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-12-18 09:32:15 * @LastEditTime: 2019-12-18 10:08:00
--> -->
<!-- <!--
<reward-config @submitBack="submitBack" @submitNext="submitNext"></reward-config> <reward-config @submitBack="submitBack" @submitNext="submitNext"></reward-config>
...@@ -1467,11 +1467,27 @@ export default { ...@@ -1467,11 +1467,27 @@ export default {
if (!!filterData.passAward && filterData.passAward.dealNumberFlag == 1) { if (!!filterData.passAward && filterData.passAward.dealNumberFlag == 1) {
filterData.passAward.dealNumberSettingParam.forEach(ele => { filterData.passAward.dealNumberSettingParam.forEach(ele => {
ele.oldData = true; ele.oldData = true;
if (!ele.cardCheck && ele.cardId){
ele.cardId = '';
ele.cardName = '';
}
if(!ele.pointCheck && ele.point) {
ele.point = '';
}
}); });
} }
if (!!filterData.passAward && filterData.passAward.dealAmountFlag == 1) { if (!!filterData.passAward && filterData.passAward.dealAmountFlag == 1) {
filterData.passAward.dealAmountSettingParam.forEach(ele => { filterData.passAward.dealAmountSettingParam.forEach(ele => {
ele.oldData = true; ele.oldData = true;
if (!ele.cardCheck && ele.cardId){
ele.cardId = '';
ele.cardName = '';
}
if(!ele.pointCheck && ele.point) {
ele.point = '';
}
}); });
} }
const postData = { const postData = {
...@@ -1684,11 +1700,27 @@ export default { ...@@ -1684,11 +1700,27 @@ export default {
if (!!ele.passAward && ele.passAward.dealNumberFlag == 1) { if (!!ele.passAward && ele.passAward.dealNumberFlag == 1) {
ele.passAward.dealNumberSettingParam.forEach(ele => { ele.passAward.dealNumberSettingParam.forEach(ele => {
ele.oldData = true; ele.oldData = true;
if (!ele.cardCheck && ele.cardId){
ele.cardId = '';
ele.cardName = '';
}
if(!ele.pointCheck && ele.point) {
ele.point = '';
}
}); });
} }
if (!!ele.passAward && ele.passAward.dealAmountFlag == 1) { if (!!ele.passAward && ele.passAward.dealAmountFlag == 1) {
ele.passAward.dealAmountSettingParam.forEach(ele => { ele.passAward.dealAmountSettingParam.forEach(ele => {
ele.oldData = true; ele.oldData = true;
if (!ele.cardCheck && ele.cardId){
ele.cardId = '';
ele.cardName = '';
}
if(!ele.pointCheck && ele.point) {
ele.point = '';
}
}); });
} }
}) })
......
...@@ -956,7 +956,8 @@ select:-webkit-autofill { ...@@ -956,7 +956,8 @@ select:-webkit-autofill {
} }
#index .el-table__empty-block { #index .el-table__empty-block {
height: 256px; /* height: 256px; */
padding: 50px 0;
} }
.common-wrap__table .el-table__empty-text { .common-wrap__table .el-table__empty-text {
......
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