Skip to content

C
clique-web
Commit 21f6d8f0 by zhu_yu_dan
Options

add:新增集团会员等级中的策略

parent dccd596b
Showing with 36 additions and 25 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.f89ebade31c43f4ba4e6b6a9d39921d4.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.68b811dc167758249792.js></script><script type=text/javascript src=./static/js/vendor.1e64e812438b0a3af88f.js></script><script type=text/javascript src=./static/js/main.20481c1fc372e4e1e237.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.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 \ No newline at end of file
dist/static/css/main.7bff646d25bec0ec9d859f44b33325a7.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/main.7bff646d25bec0ec9d859f44b33325a7.css.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/main.f89ebade31c43f4ba4e6b6a9d39921d4.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/main.f89ebade31c43f4ba4e6b6a9d39921d4.css.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.169e4ad17e4ff631e4de.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/10.a920e924380d3e373c9c.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.691ba8811b9cf8d7aa85.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.9db402f79d970a255cb6.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 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/12.e1c0a01f13534f6e97be.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/16.c1df2785431a76a02b5a.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/16.c376ead9db60cf14da8f.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 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/21.4d882e30724654dcdd6f.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/28.9899b74c2257c5425799.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/29.e6574cd5ad31292b8181.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/35.b9f00764b65c553a53f8.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/4.25120bad468b0daf2426.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.25120bad468b0daf2426.js → dist/static/js/4.a47b4ff243923d484d85.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/4.a47b4ff243923d484d85.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/7.c354e8bfd88ef0c36381.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/8.c76d676116c351be2a01.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/9.281bd2633d967d2545cb.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 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.68b811dc167758249792.js deleted 100644 → 0
!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:"08fb0d5f0434f8bf1a3e",1:"7022ec098f28856d54d4",2:"06984e75209b3ac2131d",3:"2ad9744fc945a86b15c6",4:"25120bad468b0daf2426",5:"299374ef57c52933e3fe",6:"fa0b3cbce6811a485ff8",7:"c354e8bfd88ef0c36381",8:"c76d676116c351be2a01",9:"281bd2633d967d2545cb",10:"a920e924380d3e373c9c",11:"691ba8811b9cf8d7aa85",12:"e1c0a01f13534f6e97be",13:"2950f61f6ae59d5a0b15",14:"9d7866da23eae6beb141",15:"b2c8d912367a079fd91e",16:"c376ead9db60cf14da8f",17:"1a8636077b786a984423",18:"28ef221553603ed7ddcf",19:"7740434e58b774e904c0",20:"d570945a22a617f5114e",21:"4d882e30724654dcdd6f",22:"4dcc7f42a2940d2cfaaa",23:"9b9915c61ee9b5dc37ec",24:"2007b52ae4ed232d464a",25:"2757e7d76d8f6fef6fd2",26:"9f6788921b154bb28665",27:"05b1f553520b490c6be4",28:"9899b74c2257c5425799",29:"e6574cd5ad31292b8181",30:"29fc655ef81ad3f4b9fe",31:"b926440f7ff1a6ba734e",32:"7c1f3df7fdbc3a8b9813",33:"8be4754e19287c8e4a34",34:"b78ea9446b213201043b",35:"b9f00764b65c553a53f8",36:"6c49aba9959f62a4a729",37:"a3f757e35216656052bd"}[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.68b811dc167758249792.js.map
\ No newline at end of file
dist/static/js/manifest.f1ce5b42d706f0295bd8.js 0 → 100644
!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
src/common/js/validate.js
...@@ -17,12 +17,21 @@ export function isCommonCodeSpace(str) { ...@@ -17,12 +17,21 @@ export function isCommonCodeSpace(str) {
} }
// 不允许有特殊符号，只能是 数字 字母 下划线 汉字 - 下划线不在首位 // 不允许有特殊符号，只能是 数字 字母 下划线 汉字 - 下划线不在首位
export function isCommonCodeLine(str) { export function isCommonCodeMline(str) {
// const reg = /^(?!_)(?!.*?_$)[\w\u4e00-\u9fa5-]+$/; // 下划线不在首尾 // const reg = /^(?!_)(?!.*?_$)[\w\u4e00-\u9fa5-]+$/; // 下划线不在首尾
const reg = /^(?!_)[\w\u4e00-\u9fa5-]+$/; const reg = /^(?!_)[\w\u4e00-\u9fa5-]+$/;
return reg.test(str); return reg.test(str);
} }
// 不允许有特殊符号，只能是 数字 字母 下划线 汉字 下划线不在首位
export function isCommonCodeLine(str) {
const reg = /^(?!_)[a-zA-Z0-9\u4e00-\u9fa5_]+$/;
return reg.test(str);
}
// 只允许有字母、数字 、下划线 下划线不在首位
export function isNumCodeLine(str) {
const reg = /^(?!_)[a-zA-Z0-9_]/;
return reg.test(str);
}
// 只允许有字母和数字 // 只允许有字母和数字
export function isNumAndCode(str) { export function isNumAndCode(str) {
const reg = /^[a-zA-Z0-9]/; const reg = /^[a-zA-Z0-9]/;
......
src/view/companyGroup/integral/cliqueCard.vue
...@@ -114,15 +114,22 @@ ...@@ -114,15 +114,22 @@
</template> </template>
<script> <script>
import { postRequest } from '@/api/api'; import { postRequest } from '@/api/api';
import { isCommonCode, isCommonCodeLine } from '../../../common/js/validate'; import { isCommonCodeLine, isNumCodeLine } from '../../../common/js/validate';
var commonCodeLine = (rule, value, callback) => { let commonCodeLine = (rule, value, callback) => {
//定义一个全局的变量 不允许特殊字符 下划线不能在首位 //定义一个全局的变量 不允许特殊字符 下划线不能在首位
if (!value) { if (!value) {
callback(new Error('请输入结算归属名称')); callback(new Error('请输入结算归属名称'));
} else if (!isCommonCode(value)) {
callback(new Error('结算归属名称不允许有特殊符号'));
} else if (!isCommonCodeLine(value)) { } else if (!isCommonCodeLine(value)) {
callback(new Error('下划线不能放首位')); callback(new Error('结算归属名称只支持汉字、字母、数字和下划线（除首位外）'));
} else {
callback();
}
};
let numCodeLine = (rule, value, callback) => {
if (!value) {
callback(new Error('请输入结算归属code'));
} else if (!isNumCodeLine(value)) {
callback(new Error('结算归属名称只支持字母、数字和下划线（除首位外）'));
} else { } else {
callback(); callback();
} }
...@@ -157,7 +164,7 @@ export default { ...@@ -157,7 +164,7 @@ export default {
editTitle: '新增结算归属', editTitle: '新增结算归属',
rules: { rules: {
cliqueGroupName: [{ required: true, trigger: 'blur', validator: commonCodeLine }], cliqueGroupName: [{ required: true, trigger: 'blur', validator: commonCodeLine }],
cliqueGroupCode: [{ required: true, trigger: 'blur', validator: commonCodeLine }] cliqueGroupCode: [{ required: true, trigger: 'blur', validator: numCodeLine }]
}, },
loading: false, loading: false,
importTime: '', importTime: '',
...@@ -303,9 +310,9 @@ export default { ...@@ -303,9 +310,9 @@ export default {
}, },
// 导入 // 导入
beforeTextUpload(uploadFile) { beforeTextUpload(uploadFile) {
const isCSV = uploadFile.name.substr(uploadFile.name.length - 3) === 'csv'; const isXls = uploadFile.name.substr(uploadFile.name.length - 3) === 'xls';
if (!isCSV) { if (!isXls) {
this.$message.error('只能上传csv格式!'); this.$message.error('只能上传xls格式!');
return; return;
} }
let fd = new FormData(); let fd = new FormData();
...@@ -327,7 +334,7 @@ export default { ...@@ -327,7 +334,7 @@ export default {
} }
} }
}); });
return isCSV || true; return isXls || true;
}, },
// 下载模板 // 下载模板
downloadTpl() { downloadTpl() {
......
src/view/companyGroup/integral/settlementConfig.vue
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</div> </div>
</el-option> </el-option>
</el-select> </el-select>
<span class="enterprise-tip">有{{ enterpriseNum }}个商户未配置（点击左侧下拉列表选择未配置完成的商户，切换至列表样式筛选无归属门店即可定位）</span> <span v-show="enterpriseNum > 0" class="enterprise-tip">有{{ enterpriseNum }}个商户未配置（点击左侧下拉列表选择未配置完成的商户，切换至列表样式筛选无归属门店即可定位）</span>
</div> </div>
</div> </div>
<cliqueCard v-show="showStyle == 'card'" :enterpriseId="enterpriseId"></cliqueCard> <cliqueCard v-show="showStyle == 'card'" :enterpriseId="enterpriseId"></cliqueCard>
......
src/view/companyGroup/membershipSystem/addIntegralSytem.vue
...@@ -690,11 +690,6 @@ export default { ...@@ -690,11 +690,6 @@ export default {
}) })
.catch(function(error) { .catch(function(error) {
log(error); log(error);
that.$message.error({
duration: 1000,
message: error.message
});
}); });
} }
}, },
......
src/view/companyGroup/membershipSystem/memberCardSet.vue
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
</div> </div>
</div> </div>
<!-- 第三方电商账号选择开关 --> <!-- 第三方电商账号选择开关 -->
<div class="member-cell"> <!-- <div class="member-cell">
<div class="title-group"> <div class="title-group">
<h3 class="open-card-title">第三方电商账号选择开关</h3> <h3 class="open-card-title">第三方电商账号选择开关</h3>
<p class="open-card-descript">设置会员开卡流程中选择第三方平台账号</p> <p class="open-card-descript">设置会员开卡流程中选择第三方平台账号</p>
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
</div> </div> -->
<!-- 主门店配置 --> <!-- 主门店配置 -->
<div class="member-cell"> <div class="member-cell">
<div class="title-group"> <div class="title-group">
......
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