Skip to content

C
clique-web
Commit e3f6a863 by zhu_yu_dan
Options

fix:太平鸟集团后台积分策略硬编码限定

parent e604c21b
Showing with 226 additions and 152 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.22334b87072e652200dce73b1be4ea5c.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.ed90ceecf5a7b42e7e71.js></script><script type=text/javascript src=./static/js/vendor.1e64e812438b0a3af88f.js></script><script type=text/javascript src=./static/js/main.ebf48f57e93e8e9c7cb7.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.5bd82012ce0acf56482ac840a2b0e27a.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.3fabd88fccd61ea18123.js></script><script type=text/javascript src=./static/js/vendor.1e64e812438b0a3af88f.js></script><script type=text/javascript src=./static/js/main.ebf48f57e93e8e9c7cb7.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/10.169e4ad17e4ff631e4de.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/10.780304d27afe459ee3f4.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/6.fa0b3cbce6811a485ff8.js → dist/static/js/6.757d0534ee41575596f2.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/6.757d0534ee41575596f2.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/6.fa0b3cbce6811a485ff8.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.4fec8739e76a3f34d874.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.4fec8739e76a3f34d874.js → dist/static/js/7.955b966d611ad2222aac.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/7.955b966d611ad2222aac.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.f253c806c0ae6effc39e.js → dist/static/js/8.b475bf47ec953d03b58c.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/8.b475bf47ec953d03b58c.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.f253c806c0ae6effc39e.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/9.5999e2286ab73a7f96a9.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/9.871513f8c9bc4e125cff.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.ed90ceecf5a7b42e7e71.js → dist/static/js/manifest.3fabd88fccd61ea18123.js
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(f,r,t){for(var o,d,b,i=0,u=[];i<f.length;i++)d=f[i],a[d]&&u.push(a[d][0]),a[d]=0;for(o in r)Object.prototype.hasOwnProperty.call(r,o)&&(e[o]=r[o]);for(c&&c(f,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=n(n.s=t[i]);return b};var f={},a={40:0};function n(c){if(f[c])return f[c].exports;var a=f[c]={i:c,l:!1,exports:{}};return e[c].call(a.exports,a,a.exports,n),a.l=!0,a.exports}n.e=function(e){var c=a[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var f=new Promise(function(f,n){c=a[e]=[f,n]});c[2]=f;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:"08fb0d5f0434f8bf1a3e",1:"7022ec098f28856d54d4",2:"06984e75209b3ac2131d",3:"2ad9744fc945a86b15c6",4:"6f32962990c4f47b6b8a",5:"299374ef57c52933e3fe",6:"fa0b3cbce6811a485ff8",7:"4fec8739e76a3f34d874",8:"f253c806c0ae6effc39e",9:"5999e2286ab73a7f96a9",10:"169e4ad17e4ff631e4de",11:"a6800fdb0c0b1c69c00c",12:"668c99115fcb37fe30a1",13:"f33b586c30e59c45c7cc",14:"9d7866da23eae6beb141",15:"b2c8d912367a079fd91e",16:"c07857a2765d09cef9bb",17:"1a8636077b786a984423",18:"28ef221553603ed7ddcf",19:"0f382a583054f3167b3c",20:"6caf4733f6235b86c902",21:"1e46fdf5628c2ea199ac",22:"4dcc7f42a2940d2cfaaa",23:"9b9915c61ee9b5dc37ec",24:"2007b52ae4ed232d464a",25:"2757e7d76d8f6fef6fd2",26:"9f6788921b154bb28665",27:"05b1f553520b490c6be4",28:"9899b74c2257c5425799",29:"e6574cd5ad31292b8181",30:"29fc655ef81ad3f4b9fe",31:"5b98389d3ccc9a0294b7",32:"d6f295c90effdc17795c",33:"b8088f86fd677aea9cdd",34:"b78ea9446b213201043b",35:"b9f00764b65c553a53f8",36:"6c49aba9959f62a4a729",37:"a3f757e35216656052bd"}[e]+".js";var o=setTimeout(d,12e4);function d(){t.onerror=t.onload=null,clearTimeout(o);var c=a[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return t.onerror=t.onload=d,r.appendChild(t),f},n.m=e,n.c=f,n.d=function(e,c,f){n.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:f})},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}}([]); !function(e){var c=window.webpackJsonp;window.webpackJsonp=function(f,r,t){for(var o,d,b,i=0,u=[];i<f.length;i++)d=f[i],a[d]&&u.push(a[d][0]),a[d]=0;for(o in r)Object.prototype.hasOwnProperty.call(r,o)&&(e[o]=r[o]);for(c&&c(f,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=n(n.s=t[i]);return b};var f={},a={40:0};function n(c){if(f[c])return f[c].exports;var a=f[c]={i:c,l:!1,exports:{}};return e[c].call(a.exports,a,a.exports,n),a.l=!0,a.exports}n.e=function(e){var c=a[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var f=new Promise(function(f,n){c=a[e]=[f,n]});c[2]=f;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:"08fb0d5f0434f8bf1a3e",1:"7022ec098f28856d54d4",2:"06984e75209b3ac2131d",3:"2ad9744fc945a86b15c6",4:"6f32962990c4f47b6b8a",5:"299374ef57c52933e3fe",6:"757d0534ee41575596f2",7:"955b966d611ad2222aac",8:"b475bf47ec953d03b58c",9:"871513f8c9bc4e125cff",10:"780304d27afe459ee3f4",11:"a6800fdb0c0b1c69c00c",12:"668c99115fcb37fe30a1",13:"f33b586c30e59c45c7cc",14:"9d7866da23eae6beb141",15:"b2c8d912367a079fd91e",16:"c07857a2765d09cef9bb",17:"1a8636077b786a984423",18:"28ef221553603ed7ddcf",19:"0f382a583054f3167b3c",20:"6caf4733f6235b86c902",21:"1e46fdf5628c2ea199ac",22:"4dcc7f42a2940d2cfaaa",23:"9b9915c61ee9b5dc37ec",24:"2007b52ae4ed232d464a",25:"2757e7d76d8f6fef6fd2",26:"9f6788921b154bb28665",27:"05b1f553520b490c6be4",28:"9899b74c2257c5425799",29:"e6574cd5ad31292b8181",30:"29fc655ef81ad3f4b9fe",31:"5b98389d3ccc9a0294b7",32:"d6f295c90effdc17795c",33:"b8088f86fd677aea9cdd",34:"b78ea9446b213201043b",35:"b9f00764b65c553a53f8",36:"6c49aba9959f62a4a729",37:"a3f757e35216656052bd"}[e]+".js";var o=setTimeout(d,12e4);function d(){t.onerror=t.onload=null,clearTimeout(o);var c=a[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return t.onerror=t.onload=d,r.appendChild(t),f},n.m=e,n.c=f,n.d=function(e,c,f){n.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:f})},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.ed90ceecf5a7b42e7e71.js.map //# sourceMappingURL=manifest.3fabd88fccd61ea18123.js.map
\ No newline at end of file \ No newline at end of file
src/view/companyGroup/membershipSystem/addPointSystem.vue
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
<el-form-item label="积分冻结期" v-if="ruleForm.integralGetStatus == 1"> <el-input v-model="ruleForm.integralGetFreezeDays" @keyup.native="formatInputNum($event)"></el-input><label>天</label> </el-form-item> <el-form-item label="积分冻结期" v-if="ruleForm.integralGetStatus == 1"> <el-input v-model="ruleForm.integralGetFreezeDays" @keyup.native="formatInputNum($event)"></el-input><label>天</label> </el-form-item>
<el-form-item label="积分有效期" v-if="ruleForm.integralGetStatus == 1"> <el-input v-model="ruleForm.integralGetEffectiveDays" @keyup.native="formatInputNum($event)"></el-input><label>天</label> </el-form-item> <el-form-item label="积分有效期" v-if="ruleForm.integralGetStatus == 1"> <el-input v-model="ruleForm.integralGetEffectiveDays" @keyup.native="formatInputNum($event)"></el-input><label>天</label> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="submitForm('ruleForm')">保 存</el-button> <el-button :disabled="tpnEditBool" type="primary" @click="submitForm('ruleForm')">保 存</el-button>
<el-button @click="goBack">返 回</el-button> <el-button @click="goBack">返 回</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -456,7 +456,10 @@ export default { ...@@ -456,7 +456,10 @@ export default {
searchParams: '', searchParams: '',
hasSearchData: '', // 当前页回显的数据(接口返回) hasSearchData: '', // 当前页回显的数据(接口返回)
toggleTag: false, toggleTag: false,
selectCount: 0 selectCount: 0,
// 太平鸟标识
tpnEditBool: false,
tpnEnterpriseId: 'ff808081671d3ceb01672adebf4e6149'
}; };
}, },
...@@ -527,80 +530,82 @@ export default { ...@@ -527,80 +530,82 @@ export default {
// 保存 // 保存
submitForm(formName) { submitForm(formName) {
let that = this; let that = this;
this.$refs[formName].validate(valid => { if (!that.tpnEditBool) {
if (valid) { this.$refs[formName].validate(valid => {
// 处理数据 if (valid) {
let data = JSON.parse(JSON.stringify(that.ruleForm)); // 处理数据
if (!data.strategyName) { let data = JSON.parse(JSON.stringify(that.ruleForm));
showMsg.showmsg('请填写策略名称', 'error'); if (!data.strategyName) {
return; showMsg.showmsg('请填写策略名称', 'error');
}
let flag = !data.integralGet.fee || String(data.integralGet.integral) == '';
if (data.integralGetStatus == 1 && flag) {
showMsg.showmsg('请填写获取规则', 'error');
return;
}
if (data.integralGetStatus == 1) {
if (!Number(data.integralGet.fee)) {
showMsg.showmsg('获取规则中的消费金额不能为0', 'error');
return; return;
} }
if (!Number(data.integralGet.integral)) { let flag = !data.integralGet.fee || String(data.integralGet.integral) == '';
showMsg.showmsg('获取规则中的获取积分不能为0', 'error'); if (data.integralGetStatus == 1 && flag) {
showMsg.showmsg('请填写获取规则', 'error');
return; return;
} }
} if (data.integralGetStatus == 1) {
if (data.integralGetStatus == 1 && !Number(data.integralGetFreezeDays) && data.integralGetFreezeDays != '0') { if (!Number(data.integralGet.fee)) {
showMsg.showmsg('请填写积分冻结期', 'error'); showMsg.showmsg('获取规则中的消费金额不能为0', 'error');
return; return;
} }
if (data.integralGetStatus == 1 && !Number(data.integralGetEffectiveDays)) { if (!Number(data.integralGet.integral)) {
showMsg.showmsg('请填写积分有效期', 'error'); showMsg.showmsg('获取规则中的获取积分不能为0', 'error');
return;
}
that.checkListValue(data).then(res => {
if (!res.flag) {
showMsg.showmsg(res.text, 'error');
return;
} else {
// 自定义人群
if (data.useCrowd == 2 && this.selectCount < 1) {
showMsg.showmsg('请选择人群定向', 'error');
return; return;
} }
// 设置开启状态 1-->true
data.channelList.forEach(function(ele, index) {
ele.openStatus = ele.openStatus == true ? 1 : 0;
if (ele.channelType == 1) {
ele.strategyGoodsRelationIdArr = ele.goodsRelationIdArr;
delete ele.goodsRelationIdArr;
}
if (!ele.enterpriseRelationIdArr || !ele.enterpriseRelationIdArr.length) {
ele.enterpriseRelationIdArr = [];
}
if (!ele.storeRelationIdArr || !ele.storeRelationIdArr.length) {
ele.storeRelationIdArr = [];
}
if (!ele.strategyGoodsRelationIdArr || !ele.strategyGoodsRelationIdArr.length) {
ele.strategyGoodsRelationIdArr = [];
}
if (ele.channelType == '3') {
ele.channelRelationStoreType = '1';
ele.channelStoreType = '-1';
ele.storeControlId = that.uuid;
}
});
data.integralGet.fee = parseInt(data.integralGet.fee * 10);
data.integralGet.integral = parseInt(data.integralGet.integral * 10);
data.integralGet = JSON.stringify(data.integralGet);
that.saveForm(data);
} }
}); if (data.integralGetStatus == 1 && !Number(data.integralGetFreezeDays) && data.integralGetFreezeDays != '0') {
} else { showMsg.showmsg('请填写积分冻结期', 'error');
log('error submit!!'); return;
return false; }
} if (data.integralGetStatus == 1 && !Number(data.integralGetEffectiveDays)) {
}); showMsg.showmsg('请填写积分有效期', 'error');
return;
}
that.checkListValue(data).then(res => {
if (!res.flag) {
showMsg.showmsg(res.text, 'error');
return;
} else {
// 自定义人群
if (data.useCrowd == 2 && this.selectCount < 1) {
showMsg.showmsg('请选择人群定向', 'error');
return;
}
// 设置开启状态 1-->true
data.channelList.forEach(function(ele, index) {
ele.openStatus = ele.openStatus == true ? 1 : 0;
if (ele.channelType == 1) {
ele.strategyGoodsRelationIdArr = ele.goodsRelationIdArr;
delete ele.goodsRelationIdArr;
}
if (!ele.enterpriseRelationIdArr || !ele.enterpriseRelationIdArr.length) {
ele.enterpriseRelationIdArr = [];
}
if (!ele.storeRelationIdArr || !ele.storeRelationIdArr.length) {
ele.storeRelationIdArr = [];
}
if (!ele.strategyGoodsRelationIdArr || !ele.strategyGoodsRelationIdArr.length) {
ele.strategyGoodsRelationIdArr = [];
}
if (ele.channelType == '3') {
ele.channelRelationStoreType = '1';
ele.channelStoreType = '-1';
ele.storeControlId = that.uuid;
}
});
data.integralGet.fee = parseInt(data.integralGet.fee * 10);
data.integralGet.integral = parseInt(data.integralGet.integral * 10);
data.integralGet = JSON.stringify(data.integralGet);
that.saveForm(data);
}
});
} else {
log('error submit!!');
return false;
}
});
}
}, },
// 保存数据 // 保存数据
...@@ -977,8 +982,27 @@ export default { ...@@ -977,8 +982,27 @@ export default {
.catch(err => { .catch(err => {
log(err); log(err);
}); });
} },
/* end */ /* end */
// 判断是否是太平鸟
getLoginInfo() {
let that = this;
let param = {};
postRequest('/api-auth/get-login-user-info', param)
.then(res => {
let resData = res.data;
if (resData.errorCode == 0) {
if (resData.result.enterpriseId == that.tpnEnterpriseId) {
that.tpnEditBool = true;
}
} else {
errMsg.errorMsg(resData);
}
})
.catch(function(error) {
log(error);
});
}
}, },
components: { components: {
topNavNew, topNavNew,
...@@ -999,6 +1023,7 @@ export default { ...@@ -999,6 +1023,7 @@ export default {
// 获取门店分组 // 获取门店分组
that.getStoreGroup(); that.getStoreGroup();
that.getLoginInfo();
} }
}; };
</script> </script>
......
src/view/companyGroup/membershipSystem/editPointSystem.vue
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
<el-form-item label="积分冻结期" v-if="ruleForm.integralGetStatus == 1"> <el-input v-model="ruleForm.integralGetFreezeDays" @keyup.native="formatInputNum($event)"></el-input><label>天</label> </el-form-item> <el-form-item label="积分冻结期" v-if="ruleForm.integralGetStatus == 1"> <el-input v-model="ruleForm.integralGetFreezeDays" @keyup.native="formatInputNum($event)"></el-input><label>天</label> </el-form-item>
<el-form-item label="积分有效期" v-if="ruleForm.integralGetStatus == 1"> <el-input v-model="ruleForm.integralGetEffectiveDays" @keyup.native="formatInputNum($event)"></el-input><label>天</label> </el-form-item> <el-form-item label="积分有效期" v-if="ruleForm.integralGetStatus == 1"> <el-input v-model="ruleForm.integralGetEffectiveDays" @keyup.native="formatInputNum($event)"></el-input><label>天</label> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click.stop="submitForm('ruleForm')">保 存</el-button> <el-button :disabled="tpnEditBool" type="primary" @click.stop="submitForm('ruleForm')">保 存</el-button>
<el-button @click="goBack">返 回</el-button> <el-button @click="goBack">返 回</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -436,7 +436,10 @@ export default { ...@@ -436,7 +436,10 @@ export default {
uuid: '', // 新增传空，编辑必传, uuid: '', // 新增传空，编辑必传,
options: [0, 1, 2, 3, 4, 5], // 0 全部 1 门店类型 2门店标签 3 门店区域 4 门店分组 5 部分门店 options: [0, 1, 2, 3, 4, 5], // 0 全部 1 门店类型 2门店标签 3 门店区域 4 门店分组 5 部分门店
isAdd: true, isAdd: true,
scencs: 'integral' scencs: 'integral',
// 太平鸟标识
tpnEditBool: false,
tpnEnterpriseId: 'ff808081671d3ceb01672adebf4e6149'
}; };
}, },
...@@ -520,78 +523,80 @@ export default { ...@@ -520,78 +523,80 @@ export default {
// 保存 // 保存
submitForm(formName) { submitForm(formName) {
let that = this; let that = this;
this.$refs[formName].validate(valid => { if (!that.tpnEditBool) {
if (valid) { this.$refs[formName].validate(valid => {
// 处理数据 if (valid) {
let data = JSON.parse(JSON.stringify(that.ruleForm)); // 处理数据
delete data.selectorParamsId; let data = JSON.parse(JSON.stringify(that.ruleForm));
if (!data.strategyName) { delete data.selectorParamsId;
showMsg.showmsg('请填写策略名称', 'error'); if (!data.strategyName) {
return; showMsg.showmsg('请填写策略名称', 'error');
}
let flag = !data.integralGet.fee || String(data.integralGet.integral) == '';
if (data.integralGetStatus == 1 && flag) {
showMsg.showmsg('请填写获取规则', 'error');
return;
}
if (data.integralGetStatus == 1) {
if (!Number(data.integralGet.fee)) {
showMsg.showmsg('获取规则中的消费金额不能为0', 'error');
return; return;
} }
if (!Number(data.integralGet.integral)) { let flag = !data.integralGet.fee || String(data.integralGet.integral) == '';
showMsg.showmsg('获取规则中的获取积分不能为0', 'error'); if (data.integralGetStatus == 1 && flag) {
showMsg.showmsg('请填写获取规则', 'error');
return; return;
} }
} if (data.integralGetStatus == 1) {
if (data.integralGetStatus == 1 && !Number(data.integralGetFreezeDays) && data.integralGetFreezeDays != '0') { if (!Number(data.integralGet.fee)) {
showMsg.showmsg('请填写积分冻结期', 'error'); showMsg.showmsg('获取规则中的消费金额不能为0', 'error');
return; return;
} }
if (data.integralGetStatus == 1 && !Number(data.integralGetEffectiveDays)) { if (!Number(data.integralGet.integral)) {
showMsg.showmsg('请填写积分有效期', 'error'); showMsg.showmsg('获取规则中的获取积分不能为0', 'error');
return; return;
} }
that.checkListValue(data).then(res => { }
if (!res.flag) { if (data.integralGetStatus == 1 && !Number(data.integralGetFreezeDays) && data.integralGetFreezeDays != '0') {
showMsg.showmsg(res.text, 'error'); showMsg.showmsg('请填写积分冻结期', 'error');
return; return;
} else {
data.channelList.forEach(function(ele, index) {
ele.openStatus = ele.openStatus == true ? 1 : 0;
delete ele.strategyGoodsRelationIds;
delete ele.enterpriseRelationIds;
delete ele.storeRelationIds;
if (ele.channelType == 1) {
ele.strategyGoodsRelationIdArr = ele.goodsRelationIdArr;
delete ele.goodsRelationIdArr;
}
if (!ele.enterpriseRelationIdArr || !ele.enterpriseRelationIdArr.length) {
ele.enterpriseRelationIdArr = [];
}
if (!ele.storeRelationIdArr || !ele.storeRelationIdArr.length) {
ele.storeRelationIdArr = [];
}
if (!ele.strategyGoodsRelationIdArr || !ele.strategyGoodsRelationIdArr.length) {
ele.strategyGoodsRelationIdArr = [];
}
if (ele.channelType == '3') {
ele.channelRelationStoreType = '1';
ele.channelStoreType = '-1';
ele.storeControlId = that.uuid;
}
});
data.integralGet.fee = parseInt(data.integralGet.fee * 10);
data.integralGet.integral = parseInt(data.integralGet.integral * 10);
data.integralGet = JSON.stringify(data.integralGet);
that.saveForm(data);
} }
}); if (data.integralGetStatus == 1 && !Number(data.integralGetEffectiveDays)) {
} else { showMsg.showmsg('请填写积分有效期', 'error');
log('error submit!!'); return;
return false; }
} that.checkListValue(data).then(res => {
}); if (!res.flag) {
showMsg.showmsg(res.text, 'error');
return;
} else {
data.channelList.forEach(function(ele, index) {
ele.openStatus = ele.openStatus == true ? 1 : 0;
delete ele.strategyGoodsRelationIds;
delete ele.enterpriseRelationIds;
delete ele.storeRelationIds;
if (ele.channelType == 1) {
ele.strategyGoodsRelationIdArr = ele.goodsRelationIdArr;
delete ele.goodsRelationIdArr;
}
if (!ele.enterpriseRelationIdArr || !ele.enterpriseRelationIdArr.length) {
ele.enterpriseRelationIdArr = [];
}
if (!ele.storeRelationIdArr || !ele.storeRelationIdArr.length) {
ele.storeRelationIdArr = [];
}
if (!ele.strategyGoodsRelationIdArr || !ele.strategyGoodsRelationIdArr.length) {
ele.strategyGoodsRelationIdArr = [];
}
if (ele.channelType == '3') {
ele.channelRelationStoreType = '1';
ele.channelStoreType = '-1';
ele.storeControlId = that.uuid;
}
});
data.integralGet.fee = parseInt(data.integralGet.fee * 10);
data.integralGet.integral = parseInt(data.integralGet.integral * 10);
data.integralGet = JSON.stringify(data.integralGet);
that.saveForm(data);
}
});
} else {
log('error submit!!');
return false;
}
});
}
}, },
// 保存数据 // 保存数据
...@@ -1116,8 +1121,27 @@ export default { ...@@ -1116,8 +1121,27 @@ export default {
.catch(err => { .catch(err => {
log(err); log(err);
}); });
} },
/* end */ /* end */
// 判断是否是太平鸟
getLoginInfo() {
let that = this;
let param = {};
postRequest('/api-auth/get-login-user-info', param)
.then(res => {
let resData = res.data;
if (resData.errorCode == 0) {
if (resData.result.enterpriseId == that.tpnEnterpriseId) {
that.tpnEditBool = true;
}
} else {
errMsg.errorMsg(resData);
}
})
.catch(function(error) {
log(error);
});
}
}, },
components: { components: {
topNavNew, topNavNew,
...@@ -1137,6 +1161,7 @@ export default { ...@@ -1137,6 +1161,7 @@ export default {
// 获取门店分组 // 获取门店分组
that.getStoreGroup(); that.getStoreGroup();
that.getLoginInfo();
} }
}; };
</script> </script>
......
src/view/companyGroup/membershipSystem/pointSystem.vue
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<div class="flex-lable">设置除通用积分获取规则以外的特殊策略</div> <div class="flex-lable">设置除通用积分获取规则以外的特殊策略</div>
</div> </div>
</div> </div>
<div class="fr btn-r-wrap"><el-button type="primary" @click="handleAdd('point')">新增策略</el-button></div> <div class="fr btn-r-wrap"><el-button :disabled="tpnEditBool" type="primary" @click="handleAdd('point')">新增策略</el-button></div>
<!-- table border--> <!-- table border-->
<div class="table-contain"> <div class="table-contain">
<el-table class="table-no-line-wrap" :data="achieveTableData" style="width: 100%"> <el-table class="table-no-line-wrap" :data="achieveTableData" style="width: 100%">
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
<div class="flex-lable">设置消费时使用积分抵现的规则（仅用于微信商城结算）</div> <div class="flex-lable">设置消费时使用积分抵现的规则（仅用于微信商城结算）</div>
</div> </div>
</div> </div>
<div class="fr btn-r-wrap"><el-button type="primary" @click="handleAdd('integ')">新增策略</el-button></div> <div class="fr btn-r-wrap"><el-button :disabled="tpnEditBool" type="primary" @click="handleAdd('integ')">新增策略</el-button></div>
<!-- table --> <!-- table -->
<div class="table-contain"> <div class="table-contain">
<el-table :data="exchangeTableData" style="width: 100%"> <el-table :data="exchangeTableData" style="width: 100%">
...@@ -170,11 +170,13 @@ export default { ...@@ -170,11 +170,13 @@ export default {
// form // form
pointInfo: {}, pointInfo: {},
bodyHtml: '', //富文本 tinymce 值 bodyHtml: '', //富文本 tinymce 值
// table 获取 // table 获取
achieveTableData: [], achieveTableData: [],
// table 抵现 // table 抵现
exchangeTableData: [] exchangeTableData: [],
// 太平鸟标识
tpnEditBool: false,
tpnEnterpriseId: 'ff808081671d3ceb01672adebf4e6149'
}; };
}, },
created() { created() {
...@@ -183,10 +185,12 @@ export default { ...@@ -183,10 +185,12 @@ export default {
methods: { methods: {
// 新增 // 新增
handleAdd(flag) { handleAdd(flag) {
if (flag == 'point') { if (!this.tpnEditBool) {
this.$router.push('/addPointSystem'); if (flag == 'point') {
} else { this.$router.push('/addPointSystem');
this.$router.push('/addIntegralSytem'); } else {
this.$router.push('/addIntegralSytem');
}
} }
}, },
// 删除 // 删除
...@@ -291,6 +295,25 @@ export default { ...@@ -291,6 +295,25 @@ export default {
integralStrategyId: row.integralStrategyId integralStrategyId: row.integralStrategyId
} }
}); });
},
// 判断是否是太平鸟
getLoginInfo() {
let that = this;
let param = {};
postRequest('/api-auth/get-login-user-info', param)
.then(res => {
let resData = res.data;
if (resData.errorCode == 0) {
if (resData.result.enterpriseId == that.tpnEnterpriseId) {
that.tpnEditBool = true;
}
} else {
errMsg.errorMsg(resData);
}
})
.catch(function(error) {
log(error);
});
} }
}, },
components: { components: {
...@@ -300,6 +323,7 @@ export default { ...@@ -300,6 +323,7 @@ export default {
mounted() { mounted() {
let that = this; let that = this;
that.getPointInfo(); that.getPointInfo();
that.getLoginInfo();
} }
}; };
</script> </script>
......
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