Skip to content

S
shareConfig
Commit eab364cc by 无尘
Options

fix：修改奖励

parent f4db9bfb
Showing with 25 additions and 15 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.c297f1fafbe2240aa24a066de37f1370.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.71121751ec293cd58ced.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> <!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>分享有礼</title><link href=./static/css/app.57020b88428f8821ed79cfdbc6f213e4.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.2134ba06ada62e7aaafe.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 \ No newline at end of file
dist/static/js/2.304677d4659361ef94b8.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.bddc8d3414ead5967938.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.71121751ec293cd58ced.js → dist/static/js/manifest.2134ba06ada62e7aaafe.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:"bddc8d3414ead5967938",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}}([]); !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:"304677d4659361ef94b8",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 \ No newline at end of file
src/components/active-config/configs/competition-award.vue
...@@ -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-12 13:23:05 * @LastEditTime: 2019-12-12 13:46:58
--> -->
<!-- <!--
<competition-award></competition-award> <competition-award></competition-award>
...@@ -503,7 +503,7 @@ export default { ...@@ -503,7 +503,7 @@ export default {
let flag = true; let flag = true;
const arr = []; const arr = [];
that.compitionAward.dealNumberSettingParam.forEach(ele => { that.compitionAward.dealNumberSettingParam.forEach(ele => {
if (ele.start== '' || (ele.end == ''&& ele.end != -1) ) { if ((ele.start == '' && ele.start != 0) || (ele.end == ''&& ele.end != -1) ) {
flag = false; flag = false;
} }
arr.push(ele.start); arr.push(ele.start);
...@@ -551,7 +551,7 @@ export default { ...@@ -551,7 +551,7 @@ export default {
let flag = true; let flag = true;
const arr = []; const arr = [];
that.compitionAward.dealAmountSettingParam.forEach(ele => { that.compitionAward.dealAmountSettingParam.forEach(ele => {
if (ele.start== '' || (ele.end == ''&& ele.end != -1) ) { if ((ele.start == ''&& ele.start != 0) || (ele.end == ''&& ele.end != -1) ) {
flag = false; flag = false;
} }
arr.push(ele.start); arr.push(ele.start);
......
src/components/active-config/configs/fraud-control.vue
...@@ -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-11 11:48:21 * @LastEditTime: 2019-12-12 13:50:38
--> -->
<!-- <!--
<fraud-control></fraud-control> <fraud-control></fraud-control>
...@@ -224,6 +224,15 @@ export default { ...@@ -224,6 +224,15 @@ export default {
that.$refs['rewardForm'].validate(valid => { that.$refs['rewardForm'].validate(valid => {
if (valid) { if (valid) {
that.$emit('input', that.pointFreeze); that.$emit('input', that.pointFreeze);
if (that.pointFreeze.amountLimitFlag ==1 && !that.pointFreeze.amountLimitAmount) {
resolve(false);
}
if (that.pointFreeze.pointProgram ==1 && !that.pointFreeze.pointControlDay) {
resolve(false);
}
if (that.pointFreeze.pointProgram ==2 && !that.pointFreeze.pointControlDay) {
resolve(false);
}
resolve(that.pointFreeze); resolve(that.pointFreeze);
} else { } else {
resolve(false); resolve(false);
......
src/components/active-config/configs/invitee-reward.vue
...@@ -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-12 13:29:15 * @LastEditTime: 2019-12-12 13:40:13
--> -->
<!-- <!--
<invitee-reward></invitee-reward> <invitee-reward></invitee-reward>
......
src/components/active-config/configs/spot-award.vue
...@@ -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-12 13:21:29 * @LastEditTime: 2019-12-12 13:44:35
--> -->
<!-- <!--
<spot-award></spot-award> <spot-award></spot-award>
...@@ -415,6 +415,7 @@ export default { ...@@ -415,6 +415,7 @@ 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) {
console.log(that.instanceAward)
that.$emit('input', that.instanceAward); that.$emit('input', that.instanceAward);
if(that.instanceAward.instanceMade == 1 && !that.instanceAward.instancePoint){ if(that.instanceAward.instanceMade == 1 && !that.instanceAward.instancePoint){
resolve(false); resolve(false);
...@@ -432,7 +433,7 @@ export default { ...@@ -432,7 +433,7 @@ export default {
if(that.instanceAward.instanceMade == 2 && that.instanceAward.instanceContent.length){ if(that.instanceAward.instanceMade == 2 && that.instanceAward.instanceContent.length){
let flag = true; let flag = true;
that.instanceAward.instanceContent.forEach(ele => { that.instanceAward.instanceContent.forEach(ele => {
if (ele.start== '' || (ele.end == ''&& ele.end != -1) || ele.point=='') { if ((ele.start== ''&&ele.start!=0) || (ele.end == ''&& ele.end != -1) || ele.point=='') {
flag = false; flag = false;
} }
}) })
...@@ -445,7 +446,7 @@ export default { ...@@ -445,7 +446,7 @@ export default {
let flag = true; let flag = true;
const arr = []; const arr = [];
that.instanceAward.instanceContent.forEach(ele => { that.instanceAward.instanceContent.forEach(ele => {
if (ele.start== '' || (ele.end == ''&& ele.end != -1) || ele.point=='') { if ((ele.start== ''&&ele.start!=0) || (ele.end == ''&& ele.end != -1) || ele.point=='') {
flag = false; flag = false;
} }
arr.push(ele.start); arr.push(ele.start);
......
src/components/active-config/reward-config.vue
...@@ -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-11 11:46:58 * @LastEditTime: 2019-12-12 13:39:47
--> -->
<!-- <!--
<reward-config @submitBack="submitBack" @submitNext="submitNext"></reward-config> <reward-config @submitBack="submitBack" @submitNext="submitNext"></reward-config>
...@@ -1577,7 +1577,7 @@ export default { ...@@ -1577,7 +1577,7 @@ export default {
} }
// 受邀奖励 // 受邀奖励
if (filterData.invitedAward.pointSettingFlag == 0 ) { if (filterData.invitedAward.pointSettingFlag == 0 ) {
that.$set(filterData.invitedAward, 'pointAwardMode', '1'); that.$set(filterData.invitedAward, 'pointAwardMode', 1);
that.$set(filterData.invitedAward, 'pointAwardPoint', ''); that.$set(filterData.invitedAward, 'pointAwardPoint', '');
that.$set(filterData.invitedAward, 'pointAwardStepParam', []); that.$set(filterData.invitedAward, 'pointAwardStepParam', []);
that.$set(filterData.invitedAward, 'pointAwardPerAmount',''); that.$set(filterData.invitedAward, 'pointAwardPerAmount','');
...@@ -1598,7 +1598,7 @@ export default { ...@@ -1598,7 +1598,7 @@ export default {
that.$set(filterData.invitedAward, 'pointAwardStepParam',[]); that.$set(filterData.invitedAward, 'pointAwardStepParam',[]);
} }
if (filterData.invitedAward.cardSettingFlag == 0 ) { if (filterData.invitedAward.cardSettingFlag == 0 ) {
that.$set(filterData.invitedAward, 'cardAwardMode','1'); that.$set(filterData.invitedAward, 'cardAwardMode',1);
that.$set(filterData.invitedAward, 'cardId',''); that.$set(filterData.invitedAward, 'cardId','');
that.$set(filterData.invitedAward, 'cardName',''); that.$set(filterData.invitedAward, 'cardName','');
that.$set(filterData.invitedAward, 'cardAwardStepParam',[]); that.$set(filterData.invitedAward, 'cardAwardStepParam',[]);
......
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