From c18120fe7f0d79335c00d8ce9cd809f21f70c052 Mon Sep 17 00:00:00 2001
From: lancer <1905818361@qq.com>
Date: Sat, 20 Nov 2021 14:55:55 +0800
Subject: [PATCH] init
---
src/page/check/chose.vue | 6 +++---
src/views/Customer/CompanyRecord.vue | 2 +-
src/views/admin/user/index.vue | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/page/check/chose.vue b/src/page/check/chose.vue
index 1e94102..4fbc8f1 100644
--- a/src/page/check/chose.vue
+++ b/src/page/check/chose.vue
@@ -42,7 +42,7 @@
>{{ item.residueTime > 0 ? "服务中" : "已过期" }}
-
{{ item.address|| "暂无" }}
+ {{ item.provinceName+'-'+item.cityName|| "暂无" }}
@@ -107,7 +107,7 @@
>{{ item.residueTime > 0 ? "服务中" : "已过期" }}
-->
- 区域位置:{{ item.address || "暂无" }}
+ 区域位置:{{ item.provinceName+'-'+item.cityName || "暂无" }}
@@ -172,7 +172,7 @@
>{{ item.residueTime > 0 ? "服务中" : "已过期" }}
- {{ item.address|| "暂无" }}
+ {{ item.provinceName+'-'+item.cityName|| "暂无" }}
diff --git a/src/views/Customer/CompanyRecord.vue b/src/views/Customer/CompanyRecord.vue
index 02a789b..b573690 100644
--- a/src/views/Customer/CompanyRecord.vue
+++ b/src/views/Customer/CompanyRecord.vue
@@ -683,7 +683,7 @@ export default {
});
},
toDisable(row){
- this.$confirm(`确定${row.lockFlag==0?'禁用':'启用'}此代理商么?`, '提示', {
+ this.$confirm(`确定${row.lockFlag==0?'禁用':'启用'}此公司么?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
diff --git a/src/views/admin/user/index.vue b/src/views/admin/user/index.vue
index 1bbe0bf..05f6756 100644
--- a/src/views/admin/user/index.vue
+++ b/src/views/admin/user/index.vue
@@ -1,10 +1,10 @@