Commit d1c69a57 by 无尘

fix: 更新loading

parent 31c99e47
...@@ -211,7 +211,7 @@ export default { ...@@ -211,7 +211,7 @@ export default {
} }
}) })
.catch(function(error) { .catch(function(error) {
that.$message.error({ that.$message.warning({
duration: 1000, duration: 1000,
message: error.message message: error.message
}); });
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2020-08-20 14:36:37 * @Date: 2020-08-20 14:36:37
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2020-12-16 11:28:49 * @LastEditTime: 2020-12-21 10:17:13
--> -->
<template> <template>
<div class="customer-assign-wrap"> <div class="customer-assign-wrap">
...@@ -473,7 +473,7 @@ export default { ...@@ -473,7 +473,7 @@ export default {
const that = this; const that = this;
const flag = await that.assignStatus(); const flag = await that.assignStatus();
if (flag) { if (flag) {
that.$message.error({ that.$message.warning({
duration: 1000, duration: 1000,
message: '会员正在分配中,请稍后再试' message: '会员正在分配中,请稍后再试'
}); });
...@@ -495,14 +495,14 @@ export default { ...@@ -495,14 +495,14 @@ export default {
that.editRow = {}; that.editRow = {};
const flag = await that.assignStatus(); const flag = await that.assignStatus();
if (flag) { if (flag) {
that.$message.error({ that.$message.warning({
duration: 1000, duration: 1000,
message: '会员正在分配中,请稍后再试' message: '会员正在分配中,请稍后再试'
}); });
return false; return false;
} }
if (!that.multipleSelection.length) { if (!that.multipleSelection.length) {
that.$message.error({ that.$message.warning({
duration: 1000, duration: 1000,
message: '请选择会员' message: '请选择会员'
}); });
......
...@@ -292,7 +292,7 @@ export default { ...@@ -292,7 +292,7 @@ export default {
} }
}); });
if (!flagTip) { if (!flagTip) {
that.$message.error(`每日的${that.$route.query.performanceSubType == 1 ? '权重' : '指标'}不能为空`); that.$message.warning(`每日的${that.$route.query.performanceSubType == 1 ? '权重' : '指标'}不能为空`);
return false; return false;
} }
that.loading = true; that.loading = true;
......
...@@ -177,7 +177,7 @@ export default { ...@@ -177,7 +177,7 @@ export default {
} }
/* 非空验证 */ /* 非空验证 */
if (that.clerkObj.storePerformance == '') { if (that.clerkObj.storePerformance == '') {
that.$message.error({ that.$message.warning({
duration: 1000, duration: 1000,
message: '请输入门店月指标' message: '请输入门店月指标'
}); });
...@@ -206,7 +206,7 @@ export default { ...@@ -206,7 +206,7 @@ export default {
that.$router.push(`/target-store?applicationId=${applicationId}&tab=${tab}&performanceYm=${performanceYm}`); that.$router.push(`/target-store?applicationId=${applicationId}&tab=${tab}&performanceYm=${performanceYm}`);
return; return;
} }
that.$message.error(res.message || '接口异常'); that.$message.warning(res.message || '接口异常');
}) })
.catch(function(error) { .catch(function(error) {
that.loadSave = false; that.loadSave = false;
......
...@@ -192,7 +192,7 @@ export default { ...@@ -192,7 +192,7 @@ export default {
*/ */
onDelAdmin(adminData) { onDelAdmin(adminData) {
const { staffName, staffId } = adminData; const { staffName, staffId } = adminData;
this.$confirm(`确定删除【 ${staffName} 】吗?`, '提示', { type: 'warning' }).then(() => { this.$confirm(`确定删除【 ${staffName} 】吗?`, '', { type: 'warning', showClose: false }).then(() => {
const params = { staffId, roleId: this.activeRoleId }; const params = { staffId, roleId: this.activeRoleId };
delAdmin(params).then(res => { delAdmin(params).then(res => {
if (res.code == '0000') { if (res.code == '0000') {
......
...@@ -4,13 +4,13 @@ ...@@ -4,13 +4,13 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-03-20 14:36:37 * @Date: 2019-03-20 14:36:37
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2020-09-25 14:29:44 * @LastEditTime: 2020-12-21 10:12:53
--> -->
<template> <template>
<div class="daily-set-wrap "> <div class="daily-set-wrap ">
<div class="company-set-content border-box"> <div class="company-set-content border-box" v-loading="loadRefesh">
<div class="company-title m-b-20 flex flex-space-between"> <div class="company-title m-b-20 flex flex-space-between">
<div class="line-h-32"><span class="color-303133 font-14 font-w-600">企业微信基本信息</span><el-button class="m-l-20" type="text" :loading="loadRefesh" @click="refeshData">同步刷新 </el-button></div> <div class="line-h-32"><span class="color-303133 font-14 font-w-600">企业微信基本信息</span><el-button class="m-l-20" type="text" @click="refeshData">同步刷新 </el-button></div>
</div> </div>
<div class="company-info-body"> <div class="company-info-body">
<el-form ref="form" :model="form" label-width="105px"> <el-form ref="form" :model="form" label-width="105px">
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<div class="self-app-item secret-name flex flex-space-between"> <div class="self-app-item secret-name flex flex-space-between">
<div><span class="font-14 color-303133 font-w-600 secret-name-span">{{ item.secretName || '--'}}</span><span class="font-12 color-606266 p-l-15">编辑时间:{{ item.updateTime | formatTimeStamp}}</span></div> <div><span class="font-14 color-303133 font-w-600 secret-name-span">{{ item.secretName || '--'}}</span><span class="font-12 color-606266 p-l-15">编辑时间:{{ item.updateTime | formatTimeStamp}}</span></div>
<div> <div>
<el-button type="text" :loading="loadApp" @click ="refreshApp(item)">同步刷新</el-button> <el-button type="text" @click="toEdit(item)">编辑</el-button><el-button type="text" @click="toDel(item)">删除</el-button> <el-button type="text" @click ="refreshApp(item)">同步刷新</el-button> <el-button type="text" @click="toEdit(item)">编辑</el-button><el-button type="text" @click="toDel(item)">删除</el-button>
</div> </div>
</div> </div>
<div class="m-t-10"> <div class="m-t-10">
...@@ -100,8 +100,7 @@ export default { ...@@ -100,8 +100,7 @@ export default {
loadRefesh: false, loadRefesh: false,
tableData: [], tableData: [],
addShow: false, addShow: false,
editRow: {}, editRow: {}
loadApp: false
}; };
}, },
mounted() { mounted() {
...@@ -152,13 +151,13 @@ export default { ...@@ -152,13 +151,13 @@ export default {
*/ */
refreshApp(row) { refreshApp(row) {
const that = this; const that = this;
that.loadApp = true; that.loadRefesh = true;
let para = { let para = {
secretId: row.secretId secretId: row.secretId
}; };
refreshSelfApp(para) refreshSelfApp(para)
.then(res => { .then(res => {
that.loadApp = false; that.loadRefesh = false;
if (res.code == '0000') { if (res.code == '0000') {
showMsg.showmsg('刷新成功', 'success'); showMsg.showmsg('刷新成功', 'success');
that.getApp(); that.getApp();
...@@ -168,7 +167,7 @@ export default { ...@@ -168,7 +167,7 @@ export default {
} }
}) })
.catch(function(error) { .catch(function(error) {
that.loadApp = false; that.loadRefesh = false;
}); });
}, },
/** /**
...@@ -179,10 +178,11 @@ export default { ...@@ -179,10 +178,11 @@ export default {
toDel(row) { toDel(row) {
const that = this; const that = this;
that that
.$confirm('确定删除当前自建应用?', '提示', { .$confirm('确定删除当前自建应用?', '', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning',
showClose: false
}) })
.then(() => { .then(() => {
that.postDel( row); that.postDel( row);
...@@ -261,15 +261,17 @@ export default { ...@@ -261,15 +261,17 @@ export default {
*/ */
getData() { getData() {
const that = this; const that = this;
that.loadRefesh = true;
let para = { let para = {
wxEnterpriseId: that.wxEnterpriseId wxEnterpriseId: that.wxEnterpriseId
}; };
wxEnterpriseDetail(para) wxEnterpriseDetail(para)
.then(res => { .then(res => {
that.loadRefesh = false;
that.companyObj = res.result || {}; that.companyObj = res.result || {};
}) })
.catch(function(error) { .catch(function(error) {
that.loadRefesh = false;
}); });
} }
} }
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2020-10-30 10:51:04 * @Date: 2020-10-30 10:51:04
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2020-12-02 13:50:25 * @LastEditTime: 2020-12-21 10:14:14
--> -->
<template> <template>
<div class="audit-group-list" v-loading="loading"> <div class="audit-group-list" v-loading="loading">
...@@ -59,7 +59,7 @@ export default { ...@@ -59,7 +59,7 @@ export default {
}, },
onDelGroup(groupData) { onDelGroup(groupData) {
const { auditGroupName, auditGroupId } = groupData; const { auditGroupName, auditGroupId } = groupData;
this.$confirm(`确定删除【 ${auditGroupName} 】吗?`, '提示', { type: 'warning' }).then(() => { this.$confirm(`确定删除【 ${auditGroupName} 】吗?`, '', { type: 'warning', showClose: false }).then(() => {
delAuditGroup({ auditGroupId }).then(res => { delAuditGroup({ auditGroupId }).then(res => {
this.$message.success('删除成功!'); this.$message.success('删除成功!');
this.getGroupList(); this.getGroupList();
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2020-10-30 10:51:04 * @Date: 2020-10-30 10:51:04
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2020-12-02 13:51:36 * @LastEditTime: 2020-12-21 10:14:24
--> -->
<template> <template>
<div class="audit-item-list" v-loading="loading"> <div class="audit-item-list" v-loading="loading">
...@@ -65,7 +65,7 @@ export default { ...@@ -65,7 +65,7 @@ export default {
}, },
onDelItem(itemData) { onDelItem(itemData) {
const { auditGroupName, auditItemId } = itemData; const { auditGroupName, auditItemId } = itemData;
this.$confirm(`确定删除【 ${auditGroupName} 】吗?`, '提示', { type: 'warning' }).then(() => { this.$confirm(`确定删除【 ${auditGroupName} 】吗?`, '', { type: 'warning', showClose: false }).then(() => {
delAuditItem({ auditItemId }).then(res => { delAuditItem({ auditItemId }).then(res => {
this.$message.success('删除成功!'); this.$message.success('删除成功!');
this.getAuditItemList(); this.getAuditItemList();
......
...@@ -518,7 +518,7 @@ export default { ...@@ -518,7 +518,7 @@ export default {
} }
}) })
.catch(function(error) { .catch(function(error) {
that.$message.error({ that.$message.warning({
duration: 1000, duration: 1000,
message: error.message message: error.message
}); });
......
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