Skip to content

C
clique-web
Commit 079803b8 by zhu_yu_dan
Options

fix:集团会员等级新增首个策略报错

parent 21f6d8f0
Showing with 13 additions and 23 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.7bff646d25bec0ec9d859f44b33325a7.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.03.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.f1ce5b42d706f0295bd8.js></script><script type=text/javascript src=./static/js/vendor.1e64e812438b0a3af88f.js></script><script type=text/javascript src=./static/js/main.3bb0734a53c55fb7b933.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/main.c5b3b5a17eccad6268a7e2af4d334161.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.03.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.f73a065fb671a72ed217.js></script><script type=text/javascript src=./static/js/vendor.1e64e812438b0a3af88f.js></script><script type=text/javascript src=./static/js/main.703432dfe00195aaa39b.js></script></body></html>
\ No newline at end of file
dist/static/js/11.9db402f79d970a255cb6.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/11.a6800fdb0c0b1c69c00c.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/12.668c99115fcb37fe30a1.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/12.6e300eab360077fb158b.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/18.654ff40237f97dbbd53d.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/19.0f382a583054f3167b3c.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/21.1e46fdf5628c2ea199ac.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/21.b91a8c0dff9e6cc40a6f.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/4.a47b4ff243923d484d85.js → dist/static/js/4.81f876a57a398cadcbdb.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.f1ce5b42d706f0295bd8.js deleted 100644 → 0
!function(e){var f=window.webpackJsonp;window.webpackJsonp=function(a,r,t){for(var o,b,d,i=0,u=[];i<a.length;i++)b=a[i],c[b]&&u.push(c[b][0]),c[b]=0;for(o in r)Object.prototype.hasOwnProperty.call(r,o)&&(e[o]=r[o]);for(f&&f(a,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)d=n(n.s=t[i]);return d};var a={},c={40:0};function n(f){if(a[f])return a[f].exports;var c=a[f]={i:f,l:!1,exports:{}};return e[f].call(c.exports,c,c.exports,n),c.l=!0,c.exports}n.e=function(e){var f=c[e];if(0===f)return new Promise(function(e){e()});if(f)return f[2];var a=new Promise(function(a,n){f=c[e]=[a,n]});f[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:"08fb0d5f0434f8bf1a3e",1:"7022ec098f28856d54d4",2:"06984e75209b3ac2131d",3:"2ad9744fc945a86b15c6",4:"a47b4ff243923d484d85",5:"299374ef57c52933e3fe",6:"fa0b3cbce6811a485ff8",7:"c354e8bfd88ef0c36381",8:"c76d676116c351be2a01",9:"5999e2286ab73a7f96a9",10:"169e4ad17e4ff631e4de",11:"9db402f79d970a255cb6",12:"6e300eab360077fb158b",13:"2950f61f6ae59d5a0b15",14:"9d7866da23eae6beb141",15:"b2c8d912367a079fd91e",16:"c1df2785431a76a02b5a",17:"1a8636077b786a984423",18:"654ff40237f97dbbd53d",19:"c78602e5db28aebf9e8b",20:"6caf4733f6235b86c902",21:"b91a8c0dff9e6cc40a6f",22:"4dcc7f42a2940d2cfaaa",23:"9b9915c61ee9b5dc37ec",24:"2007b52ae4ed232d464a",25:"2757e7d76d8f6fef6fd2",26:"9f6788921b154bb28665",27:"05b1f553520b490c6be4",28:"9899b74c2257c5425799",29:"e6574cd5ad31292b8181",30:"29fc655ef81ad3f4b9fe",31:"b926440f7ff1a6ba734e",32:"835da4bf347c0097cd5e",33:"f47b6f21dc79fae887cf",34:"b78ea9446b213201043b",35:"b9f00764b65c553a53f8",36:"6c49aba9959f62a4a729",37:"a3f757e35216656052bd"}[e]+".js";var o=setTimeout(b,12e4);function b(){t.onerror=t.onload=null,clearTimeout(o);var f=c[e];0!==f&&(f&&f[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return t.onerror=t.onload=b,r.appendChild(t),a},n.m=e,n.c=a,n.d=function(e,f,a){n.o(e,f)||Object.defineProperty(e,f,{configurable:!1,enumerable:!0,get:a})},n.n=function(e){var f=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(f,"a",f),f},n.o=function(e,f){return Object.prototype.hasOwnProperty.call(e,f)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.f1ce5b42d706f0295bd8.js.map
\ No newline at end of file
dist/static/js/manifest.f73a065fb671a72ed217.js 0 → 100644
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(f,r,t){for(var o,d,b,i=0,u=[];i<f.length;i++)d=f[i],c[d]&&u.push(c[d][0]),c[d]=0;for(o in r)Object.prototype.hasOwnProperty.call(r,o)&&(e[o]=r[o]);for(a&&a(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={},c={40:0};function n(a){if(f[a])return f[a].exports;var c=f[a]={i:a,l:!1,exports:{}};return e[a].call(c.exports,c,c.exports,n),c.l=!0,c.exports}n.e=function(e){var a=c[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var f=new Promise(function(f,n){a=c[e]=[f,n]});a[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:"81f876a57a398cadcbdb",5:"299374ef57c52933e3fe",6:"fa0b3cbce6811a485ff8",7:"c354e8bfd88ef0c36381",8:"c76d676116c351be2a01",9:"5999e2286ab73a7f96a9",10:"169e4ad17e4ff631e4de",11:"a6800fdb0c0b1c69c00c",12:"668c99115fcb37fe30a1",13:"2950f61f6ae59d5a0b15",14:"9d7866da23eae6beb141",15:"b2c8d912367a079fd91e",16:"c1df2785431a76a02b5a",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:"b926440f7ff1a6ba734e",32:"835da4bf347c0097cd5e",33:"f47b6f21dc79fae887cf",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 a=c[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return t.onerror=t.onload=d,r.appendChild(t),f},n.m=e,n.c=f,n.d=function(e,a,f){n.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:f})},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.f73a065fb671a72ed217.js.map
\ No newline at end of file
src/view/companyGroup/membershipSystem/addGroupCate.vue
......@@ -16,7 +16,7 @@
<div class="form-child margin-20 ">
<el-form-item label="选择商户">
<el-select v-model="ruleForm.cliqueEnterpriseIds" placeholder="请选择" multiple>
<el-option v-for="item in mechantOption" :key="item.value" :label="item.label" :value="item.value"> </el-option>
<el-option v-for="item in mechantOption" :key="item.enterpriseId" :label="item.brandName" :value="item.enterpriseId"> </el-option>
</el-select>
</el-form-item>
<el-form-item label="适用商品" class="padding-0">
......@@ -302,8 +302,9 @@ export default {
if (resData.errorCode == 0) {
// 向本地暂存添加一条
let data = [];
let strategy = JSON.parse(sessionStorage.getItem('strategy'));
if (!!strategy && strategy != 'undefined' && strategy != '') {
let strategyOld = sessionStorage.getItem('strategy');
if (!!strategyOld && strategyOld != 'undefined' && strategyOld != '') {
let strategy = JSON.parse(sessionStorage.getItem('strategy'));
data = strategy;
}
data.push(resData.result);
......@@ -316,10 +317,6 @@ export default {
})
.catch(function(error) {
log(error);
that.$message.error({
duration: 1000,
message: error.message
});
});
},
......
src/view/companyGroup/membershipSystem/addGroupGrade.vue
......@@ -745,8 +745,6 @@ export default {
}
},
beforeRouteLeave(to, from, next) {
// 导航离开该组件的对应路由时调用
// 可以访问组件实例 `this`
let that = this;
log(to, from, next);
// 存储已经填写的数据
......
src/view/companyGroup/membershipSystem/editGroupCate.vue
......@@ -16,7 +16,7 @@
<div class="form-child margin-20">
<el-form-item label="选择商户">
<el-select v-model="ruleForm.cliqueEnterpriseIds" placeholder="请选择" multiple>
<el-option v-for="item in mechantOption" :key="item.value" :label="item.label" :value="item.value"> </el-option>
<el-option v-for="item in mechantOption" :key="item.enterpriseId" :label="item.brandName" :value="item.enterpriseId"> </el-option>
</el-select>
</el-form-item>
<el-form-item label="适用商品" class="padding-0">
......@@ -405,7 +405,7 @@ export default {
let prise = resData.result.enterpriseList;
if (prise) {
prise.forEach(function(ele, index) {
ele.label = ele.enterpriseName;
ele.label = ele.brandName;
ele.value = ele.enterpriseId;
});
that.mechantOption = prise;
......
src/view/companyGroup/membershipSystem/editGroupGrade.vue
......@@ -799,12 +799,7 @@ export default {
}
},
beforeRouteLeave(to, from, next) {
// 导航离开该组件的对应路由时调用
// 可以访问组件实例 `this`
let that = this;
log(to, from, next);
// 存储已经填写的数据
log(that.ruleForm);
let d = to;
if (d.path == '/editGroupCate' || d.path == '/addGroupCate') {
sessionStorage.setItem('localForm', JSON.stringify(that.ruleForm));
......
src/view/companyGroup/membershipSystem/memberCardSet.vue
......@@ -100,8 +100,8 @@
<!-- 主门店配置 -->
<div class="member-cell">
<div class="title-group">
<h3 class="open-card-title">主门店配置</h3>
<p class="open-card-descript">设置会员的主门店规则</p>
<h3 class="open-card-title">服务门店配置</h3>
<p class="open-card-descript">设置会员的服务门店规则</p>
</div>
<div class="cell-body">
<el-form :model="mainStoreForm" ref="mainStoreForm" label-width="120px" class="demo-ruleForm">
......
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