Skip to content

C
clique-web
Commit 572f9ef7 by zhu_yu_dan
Options

bug:积分制度中添加积分获取策略保存不成功

parent ac0d4d6f
Showing with 53 additions and 50 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-集团后台</title><link href=./static/css/main.229a54115a9fde73267be0b49ea98edc.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.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/group-people.2.0.08.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-group.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.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/input.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script type=text/javascript src=./static/js/manifest.e63733312564b42f5d31.js></script><script type=text/javascript src=./static/js/vendor.1e64e812438b0a3af88f.js></script><script type=text/javascript src=./static/js/main.6716008f119e87f86ec5.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-集团后台</title><link href=./static/css/main.75135c2a83b1c870e55f2a96283cc690.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.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/group-people.2.0.08.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-group.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.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/input.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script type=text/javascript src=./static/js/manifest.d566c05fa8fabe5e69a5.js></script><script type=text/javascript src=./static/js/vendor.1e64e812438b0a3af88f.js></script><script type=text/javascript src=./static/js/main.6716008f119e87f86ec5.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/7.4296aa0e6c7381ac4637.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/7.53979f125f70bb76b1c0.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/8.bc8e4938a458fc88b920.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/8.bc8e4938a458fc88b920.js → dist/static/js/8.eaffca018c4d38ca9e42.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/8.eaffca018c4d38ca9e42.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.d566c05fa8fabe5e69a5.js 0 → 100644
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,r,t){for(var d,o,b,i=0,u=[];i<c.length;i++)o=c[i],f[o]&&u.push(f[o][0]),f[o]=0;for(d in r)Object.prototype.hasOwnProperty.call(r,d)&&(e[d]=r[d]);for(a&&a(c,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=n(n.s=t[i]);return b};var c={},f={40:0};function n(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,n){a=f[e]=[c,n]});a[2]=c;var r=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"aaee7353b0f7c6cd7878",1:"4cf2a332af8b02d35d2a",2:"f3d50a0efb2c504384f6",3:"fce3dad356f29a129ba1",4:"ec261277f3b77c23d303",5:"702d425b8b9fa617b145",6:"ee6b1cdb0d3c99f5286c",7:"53979f125f70bb76b1c0",8:"eaffca018c4d38ca9e42",9:"e64fe180a9160ec8b676",10:"3b458f80443fff10d270",11:"8ae87a9cabc089995c29",12:"682c726e5b5c90c59316",13:"a3dffd76695218ae8d5b",14:"56722011d0e13e162cfd",15:"0b54430ab22f62363bb3",16:"51796661af49d85bd5fd",17:"ab34b0afec19e2d9c06a",18:"408e75cd00a7578f1f86",19:"95b1283d77bc0e40e9d4",20:"a3296f6958ad848717fc",21:"6bce9b7ef9df6d6b316a",22:"7885822386653cba036f",23:"0aca9e9c4dec5d6f5b44",24:"766262ba8639d147913f",25:"95459cc7db56daff85ce",26:"9979954e79b486ff36e3",27:"a3aa8e879feaec14a89f",28:"299704aeddfa9bd2f3e2",29:"8a7cca79e81306000ffc",30:"f76a94679eca01abf064",31:"48065db3dea1f7537219",32:"75acd8614f22c372802d",33:"7255a47a93069184f9b8",34:"cbef7edb18cd86fa8b91",35:"e3faaf97b0895fc02d99",36:"aea34db678ced642d3cb",37:"5647fde4ae1ccb493a6c"}[e]+".js";var d=setTimeout(o,12e4);function o(){t.onerror=t.onload=null,clearTimeout(d);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=o,r.appendChild(t),c},n.m=e,n.c=c,n.d=function(e,a,c){n.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},n.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(a,"a",a),a},n.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.d566c05fa8fabe5e69a5.js.map
\ No newline at end of file
dist/static/js/manifest.e63733312564b42f5d31.js deleted 100644 → 0
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,r,t){for(var d,o,b,i=0,u=[];i<a.length;i++)o=a[i],f[o]&&u.push(f[o][0]),f[o]=0;for(d in r)Object.prototype.hasOwnProperty.call(r,d)&&(e[d]=r[d]);for(c&&c(a,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=n(n.s=t[i]);return b};var a={},f={40:0};function n(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,n){c=f[e]=[a,n]});c[2]=a;var r=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"aaee7353b0f7c6cd7878",1:"4cf2a332af8b02d35d2a",2:"f3d50a0efb2c504384f6",3:"fce3dad356f29a129ba1",4:"ec261277f3b77c23d303",5:"702d425b8b9fa617b145",6:"ee6b1cdb0d3c99f5286c",7:"4296aa0e6c7381ac4637",8:"bc8e4938a458fc88b920",9:"e64fe180a9160ec8b676",10:"3b458f80443fff10d270",11:"8ae87a9cabc089995c29",12:"682c726e5b5c90c59316",13:"91ddc8e91812a93b56a9",14:"56722011d0e13e162cfd",15:"0b54430ab22f62363bb3",16:"51796661af49d85bd5fd",17:"ab34b0afec19e2d9c06a",18:"408e75cd00a7578f1f86",19:"95b1283d77bc0e40e9d4",20:"a3296f6958ad848717fc",21:"6bce9b7ef9df6d6b316a",22:"7885822386653cba036f",23:"0aca9e9c4dec5d6f5b44",24:"766262ba8639d147913f",25:"95459cc7db56daff85ce",26:"b0504a18a9369b9fb0dc",27:"ab1a6e261d3994425c6b",28:"299704aeddfa9bd2f3e2",29:"8a7cca79e81306000ffc",30:"f76a94679eca01abf064",31:"48065db3dea1f7537219",32:"75acd8614f22c372802d",33:"43fb4212defc2d87c39e",34:"cbef7edb18cd86fa8b91",35:"e3faaf97b0895fc02d99",36:"aea34db678ced642d3cb",37:"5647fde4ae1ccb493a6c"}[e]+".js";var d=setTimeout(o,12e4);function o(){t.onerror=t.onload=null,clearTimeout(d);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=o,r.appendChild(t),a},n.m=e,n.c=a,n.d=function(e,c,a){n.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},n.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(c,"a",c),c},n.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.e63733312564b42f5d31.js.map
\ No newline at end of file
src/view/companyGroup/membershipSystem/addPointSystem.vue
...@@ -495,31 +495,33 @@ export default { ...@@ -495,31 +495,33 @@ export default {
}; };
if (!!data.channelList.length) { if (!!data.channelList.length) {
for (let i = 0; i < data.channelList.length; i++) { for (let i = 0; i < data.channelList.length; i++) {
if (!!data.channelList[i].openStatus && data.channelList[i].integralUseDiscountControl == 2) { if (!!data.channelList[i].openStatus) {
if (!data.channelList[i].integralUseDiscountControlUpper || !data.channelList[i].integralUseDiscountControlLower) { if (!!data.channelList[i].openStatus && data.channelList[i].integralUseDiscountControl == 2) {
obj.flag = false; if (!data.channelList[i].integralUseDiscountControlUpper || !data.channelList[i].integralUseDiscountControlLower) {
obj.text = '请填写折扣'; obj.flag = false;
obj.text = '请填写折扣';
}
if (parseInt(data.channelList[i].integralUseDiscountControlUpper) > 10 || parseInt(data.channelList[i].integralUseDiscountControlLower) > 10 || Number(data.channelList[i].integralUseDiscountControlUpper) <= Number(data.channelList[i].integralUseDiscountControlLower)) {
obj.flag = false;
obj.text = '折扣格式有误';
}
} }
if (parseInt(data.channelList[i].integralUseDiscountControlUpper) > 10 || parseInt(data.channelList[i].integralUseDiscountControlLower) > 10 || Number(data.channelList[i].integralUseDiscountControlUpper) <= Number(data.channelList[i].integralUseDiscountControlLower)) { if (data.channelList[i].channelType == 1 && !data.channelList[i].enterpriseRelationIdArr.length) {
obj.flag = false; obj.flag = false;
obj.text = '折扣格式有误'; obj.text = '请选择商户';
}
}
if (!!data.channelList[i].openStatus && data.channelList[i].channelType == 1 && !data.channelList[i].enterpriseRelationIdArr.length) {
obj.flag = false;
obj.text = '请选择商户';
}
if (data.channelList[i].channelType == 3) {
const storeGroupDom = this.$refs.storeGroup;
let flag = null;
if (storeGroupDom instanceof Array) {
flag = await this.$refs.storeGroup[0].isStoreSave();
} else {
flag = await this.$refs.storeGroup.isStoreSave();
} }
if (!flag) { if (data.channelList[i].channelType == 3) {
obj.flag = false; const storeGroupDom = this.$refs.storeGroup;
obj.text = '请选择门店'; let flag = null;
if (storeGroupDom instanceof Array) {
flag = await this.$refs.storeGroup[0].isStoreSave();
} else {
flag = await this.$refs.storeGroup.isStoreSave();
}
if (!flag) {
obj.flag = false;
obj.text = '请选择门店';
}
} }
} }
} }
......
src/view/companyGroup/membershipSystem/editPointSystem.vue
...@@ -480,7 +480,6 @@ export default { ...@@ -480,7 +480,6 @@ export default {
that.ruleForm.integralGet.fee = Number(strLength.getCharVal(String(that.ruleForm.integralGet.fee).replace(/[^\.\d]/g, ''), 6)).toFixed(1); that.ruleForm.integralGet.fee = Number(strLength.getCharVal(String(that.ruleForm.integralGet.fee).replace(/[^\.\d]/g, ''), 6)).toFixed(1);
// that.ruleForm.integralGet.integral = Number(strLength.getCharVal(String(that.ruleForm.integralGet.integral).replace(/[^\.\d]/g,''),8)).toFixed(1) // that.ruleForm.integralGet.integral = Number(strLength.getCharVal(String(that.ruleForm.integralGet.integral).replace(/[^\.\d]/g,''),8)).toFixed(1)
}, },
async checkListValue(data) { async checkListValue(data) {
let obj = { let obj = {
flag: true, flag: true,
...@@ -488,31 +487,33 @@ export default { ...@@ -488,31 +487,33 @@ export default {
}; };
if (!!data.channelList.length) { if (!!data.channelList.length) {
for (let i = 0; i < data.channelList.length; i++) { for (let i = 0; i < data.channelList.length; i++) {
if (!!data.channelList[i].openStatus && data.channelList[i].integralUseDiscountControl == 2) { if (!!data.channelList[i].openStatus) {
if (!data.channelList[i].integralUseDiscountControlUpper || !data.channelList[i].integralUseDiscountControlLower) { if (data.channelList[i].integralUseDiscountControl == 2) {
obj.flag = false; if (!data.channelList[i].integralUseDiscountControlUpper || !data.channelList[i].integralUseDiscountControlLower) {
obj.text = '请填写折扣'; obj.flag = false;
obj.text = '请填写折扣';
}
if (parseInt(data.channelList[i].integralUseDiscountControlUpper) > 10 || parseInt(data.channelList[i].integralUseDiscountControlLower) > 10 || Number(data.channelList[i].integralUseDiscountControlUpper) <= Number(data.channelList[i].integralUseDiscountControlLower)) {
obj.flag = false;
obj.text = '折扣格式有误';
}
} }
if (parseInt(data.channelList[i].integralUseDiscountControlUpper) > 10 || parseInt(data.channelList[i].integralUseDiscountControlLower) > 10 || Number(data.channelList[i].integralUseDiscountControlUpper) <= Number(data.channelList[i].integralUseDiscountControlLower)) { if (data.channelList[i].channelType == 1 && !data.channelList[i].enterpriseRelationIdArr.length) {
obj.flag = false; obj.flag = false;
obj.text = '折扣格式有误'; obj.text = '请选择商户';
} }
} if (data.channelList[i].channelType == 3) {
if (!!data.channelList[i].openStatus && data.channelList[i].channelType == 1 && !data.channelList[i].enterpriseRelationIdArr.length) { const storeGroupDom = this.$refs.storeGroup;
obj.flag = false; let flag = null;
obj.text = '请选择商户'; if (storeGroupDom instanceof Array) {
} flag = await this.$refs.storeGroup[0].isStoreSave();
if (data.channelList[i].channelType == 3) { } else {
const storeGroupDom = this.$refs.storeGroup; flag = await this.$refs.storeGroup.isStoreSave();
let flag = null; }
if (storeGroupDom instanceof Array) { if (!flag) {
flag = await this.$refs.storeGroup[0].isStoreSave(); obj.flag = false;
} else { obj.text = '请选择门店';
flag = await this.$refs.storeGroup.isStoreSave(); }
}
if (!flag) {
obj.flag = false;
obj.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