Skip to content

S
shareConfig
Commit 132ebb57 by 无尘
Options

fix：修改奖励

parent eab364cc
Showing with 19 additions and 18 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.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> <!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>分享有礼</title><link href=./static/css/app.24c481a12fcb40e91553049847f9155f.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.50a0881d6e3db62c26d8.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/css/app.24c481a12fcb40e91553049847f9155f.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.57020b88428f8821ed79cfdbc6f213e4.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/2.304677d4659361ef94b8.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/2.72b1e918218155b75133.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.2134ba06ada62e7aaafe.js → dist/static/js/manifest.50a0881d6e3db62c26d8.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:"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}}([]); !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:"72b1e918218155b75133",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:46:58 * @LastEditTime: 2019-12-12 14:05:10
--> -->
<!-- <!--
<competition-award></competition-award> <competition-award></competition-award>
...@@ -486,7 +486,7 @@ export default { ...@@ -486,7 +486,7 @@ export default {
if (that.compitionAward.dealNumberFlag == 1 && that.compitionAward.dealNumberSettingParam.length) { if (that.compitionAward.dealNumberFlag == 1 && that.compitionAward.dealNumberSettingParam.length) {
let flag = true; let flag = true;
that.compitionAward.dealNumberSettingParam.forEach(ele => { that.compitionAward.dealNumberSettingParam.forEach(ele => {
if (!ele.awardName ||(ele.cardCheck && !ele.cardId) || (!ele.pointCheck && !ele.cardCheck) || ele.awardName=='' ) { if (!ele.awardName ||(ele.cardCheck && !ele.cardId) || (!ele.pointCheck && !ele.cardCheck) ) {
flag = false; flag = false;
} }
}); });
...@@ -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.start != 0) || (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.start != 0) || (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/entry-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:19:59 * @LastEditTime: 2019-12-12 14:08:57
--> -->
<!-- <!--
<entry-award></entry-award> <entry-award></entry-award>
...@@ -89,7 +89,7 @@ import entryAward from '@/components/active-config/configs/entry-award.vue'; ...@@ -89,7 +89,7 @@ import entryAward from '@/components/active-config/configs/entry-award.vue';
<div> <div>
<span class="font-14 color-606266 p-r-10">满</span> <span class="font-14 color-606266 p-r-10">满</span>
<el-input-number <el-input-number
class="w-90" class="w-116"
:disabled="$route.query.editFlag || scope.row.oldData" :disabled="$route.query.editFlag || scope.row.oldData"
v-model="scope.row.achieve" v-model="scope.row.achieve"
controls-position="right" controls-position="right"
...@@ -175,7 +175,7 @@ import entryAward from '@/components/active-config/configs/entry-award.vue'; ...@@ -175,7 +175,7 @@ import entryAward from '@/components/active-config/configs/entry-award.vue';
<div> <div>
<span class="font-14 color-606266 p-r-10">满</span> <span class="font-14 color-606266 p-r-10">满</span>
<el-input-number <el-input-number
class="w-90" class="w-116"
:disabled="$route.query.editFlag || scope.row.oldData" :disabled="$route.query.editFlag || scope.row.oldData"
v-model="scope.row.achieve" v-model="scope.row.achieve"
controls-position="right" controls-position="right"
...@@ -334,7 +334,7 @@ export default { ...@@ -334,7 +334,7 @@ export default {
if (that.passAward.dealNumberFlag == 1 && that.passAward.dealNumberSettingParam.length) { if (that.passAward.dealNumberFlag == 1 && that.passAward.dealNumberSettingParam.length) {
let flag = true; let flag = true;
that.passAward.dealNumberSettingParam.forEach(ele => { that.passAward.dealNumberSettingParam.forEach(ele => {
if ((ele.cardCheck && !ele.cardId) || (!ele.pointCheck && !ele.cardCheck) || ele.achieve=='') { if ((ele.cardCheck && !ele.cardId) || (!ele.pointCheck && !ele.cardCheck) || !ele.achieve) {
flag = false; flag = false;
} }
}); });
...@@ -372,7 +372,7 @@ export default { ...@@ -372,7 +372,7 @@ export default {
if (that.passAward.dealAmountFlag == 1 && that.passAward.dealAmountSettingParam.length) { if (that.passAward.dealAmountFlag == 1 && that.passAward.dealAmountSettingParam.length) {
let flag = true; let flag = true;
that.passAward.dealAmountSettingParam.forEach(ele => { that.passAward.dealAmountSettingParam.forEach(ele => {
if ((ele.cardCheck && !ele.cardId) || (!ele.pointCheck && !ele.cardCheck) || ele.achieve=='') { if ((ele.cardCheck && !ele.cardId) || (!ele.pointCheck && !ele.cardCheck) || !ele.achieve) {
flag = false; flag = false;
} }
}); });
...@@ -541,8 +541,8 @@ export default { ...@@ -541,8 +541,8 @@ export default {
.m-t-10 { .m-t-10 {
margin-top: 10px; margin-top: 10px;
} }
.w-90 { .w-116 {
width: 90px; width: 116px;
} }
.w-146 { .w-146 {
width: 146px; width: 146px;
......
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:44:35 * @LastEditTime: 2019-12-12 14:02:23
--> -->
<!-- <!--
<spot-award></spot-award> <spot-award></spot-award>
...@@ -433,10 +433,11 @@ export default { ...@@ -433,10 +433,11 @@ 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.start!=0) || (ele.end == ''&& ele.end != -1) || ele.point=='') { if ((!ele.start && ele.start!=0) || (!ele.end && ele.end != -1) || !ele.point) {
flag = false; flag = false;
} }
}) })
console.log(flag)
if (!flag) { if (!flag) {
resolve(false); resolve(false);
} }
...@@ -446,7 +447,7 @@ export default { ...@@ -446,7 +447,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.start!=0) || (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);
......
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