Skip to content

M
member
Commit bc0f4fa0 by caoyanzhi
Options

Merge branch 'bugfix/会员标签异常' into test

parents 33996edb c0699304
Showing with 9 additions and 4 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><style href=//at.alicdn.com/t/font_2996579_ubjq74uy5wj.css></style><script src=//at.alicdn.com/t/font_2859043_ckil7xvsqi.js></script><script src=//web-1251519181.file.myqcloud.com/lib/lodash.min.js></script><title></title><link rel="shortcut icon" href=./favicon.ico><link href=./css/app.c1291324ec58d4ad07db907608a5d5ba.css rel=stylesheet></head><body><div id=app><div class=el-loading-spinner style="width: 98%;"><svg viewBox="25 25 50 50" class=circular><circle cx=50 cy=50 r=20 fill=none class=path></circle></svg></div></div><script>(function() {
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><style href=//at.alicdn.com/t/font_2996579_ubjq74uy5wj.css></style><script src=//at.alicdn.com/t/font_2859043_ckil7xvsqi.js></script><script src=//web-1251519181.file.myqcloud.com/lib/lodash.min.js></script><title></title><link rel="shortcut icon" href=./favicon.ico><link href=./css/app.aa2f9813257d94d71851f63d6940f9b0.css rel=stylesheet></head><body><div id=app><div class=el-loading-spinner style="width: 98%;"><svg viewBox="25 25 50 50" class=circular><circle cx=50 cy=50 r=20 fill=none class=path></circle></svg></div></div><script>(function() {
var src = '/component/static/import-component.js?timestrap='+ new Date().getTime();
var host = window.location.host;
host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'gicdev.demogic.com' : host;
......
src/components/allCustomers/components/customerlabelDialog.vue
......@@ -192,7 +192,7 @@ export default {
if (list.isCheck) {
if (item.isMultiple) checkBox.push(list.tagsName);
else {
checkBox = item.tagsId;
checkBox = list.tagsId;
}
}
}
......
src/components/allCustomers/customerDetail.less
......@@ -390,7 +390,7 @@
.order-item {
margin: 0 6px 4px 0;
padding: 4px 4px 8px;
width: 114px;
width: 113px;
border-radius: 4px;
cursor: pointer;
&:nth-child(3n + 1) {
......
src/components/allCustomers/index.js
......@@ -72,9 +72,10 @@ export default {
cliqueMemberGrade: [], // 集团等级列表
selectTreeOptions: {
selectOptions: {
collapseTags: false,
allCheckText: '全部客户',
placeholder: '全部客户',
width: 220
width: 260
},
treeOptions: {
data: [
......
src/components/memberlist/memberReturn.js
......@@ -697,6 +697,10 @@ export default {
this.storeName = "";
},
successImport(taskId) {
// 修改一个会员的服务门店或者协管门店，不跳转到任务中心
if (this.selectObj.multipleList.length == 1) {
return;
}
// this.dialogImportVisible = false;
this.$confirm(
"任务发起成功，请去【企业管理】-【任务中心】查看处理结果和执行进度",
......
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