Skip to content

C
clique-web
Commit 2e403208 by 无尘
Options

fix: 修改判断

parent 2c9b3f26
Showing with 45 additions and 35 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/app.5fcf978e7806e3ab974972585d1c6680.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.6d043752d43bba1848df.js></script><script type=text/javascript src=./static/js/vendor.f83a9f6b94c222475884.js></script><script type=text/javascript src=./static/js/app.d8f90423cf6827bc41cd.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>GIC-集团后台</title><link href=./static/css/app.b265040c62fffd1d173188b9199ea061.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.62cddfda6d30adb51df9.js></script><script type=text/javascript src=./static/js/vendor.f83a9f6b94c222475884.js></script><script type=text/javascript src=./static/js/app.89f50a4c71081cc5cd07.js></script></body></html>
\ No newline at end of file
dist/static/js/manifest.6d043752d43bba1848df.js → dist/static/js/manifest.62cddfda6d30adb51df9.js
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,t,d){for(var f,o,b,i=0,u=[];i<a.length;i++)o=a[i],n[o]&&u.push(n[o][0]),n[o]=0;for(f in t)Object.prototype.hasOwnProperty.call(t,f)&&(e[f]=t[f]);for(c&&c(a,t,d);u.length;)u.shift()();if(d)for(i=0;i<d.length;i++)b=r(r.s=d[i]);return b};var a={},n={33:0};function r(c){if(a[c])return a[c].exports;var n=a[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var c=n[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,r){c=n[e]=[a,r]});c[2]=a;var t=document.getElementsByTagName("head")[0],d=document.createElement("script");d.type="text/javascript",d.charset="utf-8",d.async=!0,d.timeout=12e4,r.nc&&d.setAttribute("nonce",r.nc),d.src=r.p+"static/js/"+e+"."+{0:"941b7928ac3ec125dffe",1:"d84116ddb7da8d636dae",2:"898e902c03247d4950cd",3:"c2dbaee2092c89d6bb92",4:"b4dcc6aadf91150f66db",5:"5b1afe039b0196c0894f",6:"914ec3c77116748ad66a",7:"295033805c10c71908db",8:"2663502f262c8e689d27",9:"4aedd9d9f32e5bd5b794",10:"3b6408b1d99252eda551",11:"f0b71dac5722ed6c4628",12:"b8af2fcb45c72480bdb0",13:"6cb641c54efc65fa2852",14:"b3cb63d509fb1a06a935",15:"d4d84253d926c74f4aa9",16:"1cea8478e2d112d99f48",17:"728fb3d97f415a2f53e6",18:"3ca57d90a69da2f58905",19:"11edc257a3e9cd128f45",20:"376df9f13415ea70b688",21:"5f3ac1a5c287fda64339",22:"a9067094fae506dd9383",23:"c3d64d2c7ba03967c4a8",24:"56f2057036ab22585e0e",25:"2133fdde82de7785cbc4",26:"30fb9f14c41e89141c15",27:"b9fd5f8677a43cab4a3f",28:"44deebcea6ccd096081f",29:"9339e8311b77c469e738",30:"ebb71c6a502890f047f8"}[e]+".js";var f=setTimeout(o,12e4);function o(){d.onerror=d.onload=null,clearTimeout(f);var c=n[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return d.onerror=d.onload=o,t.appendChild(d),a},r.m=e,r.c=a,r.d=function(e,c,a){r.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},r.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(c,"a",c),c},r.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},r.p="./",r.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.6d043752d43bba1848df.js.map
\ No newline at end of file
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,t,d){for(var f,o,b,i=0,u=[];i<a.length;i++)o=a[i],n[o]&&u.push(n[o][0]),n[o]=0;for(f in t)Object.prototype.hasOwnProperty.call(t,f)&&(e[f]=t[f]);for(c&&c(a,t,d);u.length;)u.shift()();if(d)for(i=0;i<d.length;i++)b=r(r.s=d[i]);return b};var a={},n={33:0};function r(c){if(a[c])return a[c].exports;var n=a[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var c=n[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,r){c=n[e]=[a,r]});c[2]=a;var t=document.getElementsByTagName("head")[0],d=document.createElement("script");d.type="text/javascript",d.charset="utf-8",d.async=!0,d.timeout=12e4,r.nc&&d.setAttribute("nonce",r.nc),d.src=r.p+"static/js/"+e+"."+{0:"941b7928ac3ec125dffe",1:"d84116ddb7da8d636dae",2:"898e902c03247d4950cd",3:"c2dbaee2092c89d6bb92",4:"b4dcc6aadf91150f66db",5:"5b1afe039b0196c0894f",6:"914ec3c77116748ad66a",7:"295033805c10c71908db",8:"a71c8fed1d70e4ce3ac1",9:"4aedd9d9f32e5bd5b794",10:"3b6408b1d99252eda551",11:"f0b71dac5722ed6c4628",12:"4fe2e80ea34320f3f211",13:"3ccc5038a3f17fdb5b86",14:"36b43ed8b85e74a58bc9",15:"8db5c72233d5b7826fae",16:"1d6f890210f392135e02",17:"087d9eba80f06731d941",18:"01ed9eeead5ff37b2cc7",19:"3e13643be735251ac875",20:"dc9cc69fcdf267760faa",21:"a26434a92147428f6136",22:"a9067094fae506dd9383",23:"c3d64d2c7ba03967c4a8",24:"56f2057036ab22585e0e",25:"2133fdde82de7785cbc4",26:"30fb9f14c41e89141c15",27:"b9fd5f8677a43cab4a3f",28:"44deebcea6ccd096081f",29:"9339e8311b77c469e738",30:"ebb71c6a502890f047f8"}[e]+".js";var f=setTimeout(o,12e4);function o(){d.onerror=d.onload=null,clearTimeout(f);var c=n[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return d.onerror=d.onload=o,t.appendChild(d),a},r.m=e,r.c=a,r.d=function(e,c,a){r.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},r.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(c,"a",c),c},r.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},r.p="./",r.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.62cddfda6d30adb51df9.js.map
\ No newline at end of file
src/view/companyGroup/membershipSystem/addPointSystem.vue
......@@ -631,24 +631,27 @@ export default {
flag : true,
text: ''
}
data.channelList.forEach(function(ele,index){
if (!!ele.openStatus && ele.integralUseDiscountControl == 2) {
if (!ele.integralUseDiscountControlUpper || !ele.integralUseDiscountControlLower) {
obj.flag = false
obj.text = '请填写折扣率'
if (!!data.channelList.length) {
data.channelList.forEach(function(ele,index){
if (!!ele.openStatus && ele.integralUseDiscountControl == 2) {
if (!ele.integralUseDiscountControlUpper || !ele.integralUseDiscountControlLower) {
obj.flag = false
obj.text = '请填写折扣率'
}
if (parseInt(ele.integralUseDiscountControlUpper)>10 || parseInt(ele.integralUseDiscountControlLower)>10 || Number(ele.integralUseDiscountControlUpper)<=Number(ele.integralUseDiscountControlLower)) {
obj.flag = false
obj.text = '折扣率格式有误'
}
}
if (parseInt(ele.integralUseDiscountControlUpper)>10 || parseInt(ele.integralUseDiscountControlLower)>10 || Number(ele.integralUseDiscountControlUpper)<=Number(ele.integralUseDiscountControlLower)) {
if (!!ele.openStatus && ele.channelType==1 && !ele.enterpriseRelationIdArr.length) {
obj.flag = false
obj.text = '折扣率格式有误'
obj.text = '请选择商户'
}
}
if (ele.channelType==1 && !ele.enterpriseRelationIdArr.length) {
obj.flag = false
obj.text = '请选择商户'
}
})
}
})
console.log(obj.flag)
return obj;
......
src/view/companyGroup/membershipSystem/editPointSystem.vue
......@@ -645,25 +645,26 @@ export default {
flag : true,
text: ''
}
data.channelList.forEach(function(ele,index){
if (!!ele.openStatus && ele.integralUseDiscountControl == 2) {
if (!ele.integralUseDiscountControlUpper||!ele.integralUseDiscountControlLower) {
obj.flag = false
obj.text = '请填写折扣率'
if (!!data.channelList.length) {
data.channelList.forEach(function(ele,index){
if (!!ele.openStatus && ele.integralUseDiscountControl == 2) {
if (!ele.integralUseDiscountControlUpper || !ele.integralUseDiscountControlLower) {
obj.flag = false
obj.text = '请填写折扣率'
}
if (parseInt(ele.integralUseDiscountControlUpper)>10 || parseInt(ele.integralUseDiscountControlLower)>10 || Number(ele.integralUseDiscountControlUpper)<=Number(ele.integralUseDiscountControlLower)) {
obj.flag = false
obj.text = '折扣率格式有误'
}
}
if (parseInt(ele.integralUseDiscountControlUpper)>10||parseInt(ele.integralUseDiscountControlLower)>10 || Number(ele.integralUseDiscountControlUpper)<=Number(ele.integralUseDiscountControlLower)) {
if (!!ele.openStatus && ele.channelType==1 && !ele.enterpriseRelationIdArr.length) {
obj.flag = false
obj.text = '折扣率格式有误'
obj.text = '请选择商户'
}
}
if (ele.channelType==1 && !ele.enterpriseRelationIdArr.length) {
obj.flag = false
obj.text = '请选择商户'
}
})
})
}
console.log(obj.flag)
return obj;
......@@ -689,7 +690,7 @@ export default {
return;
}
if (data.integralGetStatus == 1 && !Number(data.integralGetFreezeDays)) {
if (data.integralGetStatus == 1 && !Number(data.integralGetFreezeDays) && data.integralGetFreezeDays != '0') {
showMsg.showmsg('请填写积分冻结期','error')
return;
}
......@@ -1098,8 +1099,14 @@ export default {
item.integralGet = JSON.parse(item.integralGet);
// 获取规则需要除以 10
console.log(item.integralGet)
item.integralGet.fee = Number(item.integralGet.fee/10).toFixed(1)
item.integralGet.integral = Number(item.integralGet.integral/10).toFixed(1)
if (!!item.integralGet && !!item.integralGet.fee) {
item.integralGet.fee = Number(item.integralGet.fee/10).toFixed(1)
}
if (!!item.integralGet && !!item.integralGet.integral) {
item.integralGet.integral = Number(item.integralGet.integral/10).toFixed(1)
}
if (!!item.channelList.length) {
item.channelList.forEach(function(ele,index) {
ele.openStatus = ele.openStatus == 0? false: true;
......
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