From 71a82839d95bb43654cd6de244514adadaea1847 Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 10 Feb 2022 16:34:36 +0800 Subject: [PATCH] bug --- src/main.js | 2 +- src/saas/AppBackUserList/Add.vue | 2 +- src/saas/AppGridManagement/Map.vue | 3 ++- src/saas/AppGridManagement/SelectGird.vue | 21 ++++++++++++--- src/saas/AppMailList/AppMailList.vue | 19 ++++++++++++++ src/saas/AppMailList/img/add-icon.png | Bin 0 -> 5875 bytes src/saas/AppResidentDocument/Add.vue | 8 +++--- .../AppResidentDocument.vue | 24 +++++++++++++++++- 8 files changed, 67 insertions(+), 12 deletions(-) create mode 100644 src/saas/AppMailList/img/add-icon.png diff --git a/src/main.js b/src/main.js index 4aa0a85f..08917e88 100644 --- a/src/main.js +++ b/src/main.js @@ -25,7 +25,7 @@ Vue.prototype.$http = axios; Vue.prototype.$cdn = 'https://cdn.cunwuyun.cn/dvcp/h5/'; Object.keys(utils).map((e) => (Vue.prototype['$' + e] = utils[e])); App.mpType = 'app'; -process.env.NODE_ENV == 'development' && new VConsole(); +// process.env.NODE_ENV == 'development' && new VConsole(); const app = new Vue({ store, ...App diff --git a/src/saas/AppBackUserList/Add.vue b/src/saas/AppBackUserList/Add.vue index ae87a3fb..86d37a49 100644 --- a/src/saas/AppBackUserList/Add.vue +++ b/src/saas/AppBackUserList/Add.vue @@ -173,9 +173,9 @@ class="ai-area" :value="form.arriveAreaId" :fullName.sync="form.arriveAreaName" - :areaId="areaId" mode="custom" @select="(v) => (form.arriveAreaId = v)" + all >
{{ diff --git a/src/saas/AppGridManagement/Map.vue b/src/saas/AppGridManagement/Map.vue index bd9ebae4..255af9b6 100644 --- a/src/saas/AppGridManagement/Map.vue +++ b/src/saas/AppGridManagement/Map.vue @@ -4,7 +4,7 @@ 网格选择
{{ form.girdName || '请选择' }} - +
@@ -156,6 +156,7 @@ export default { }, renderGridMap(paths, count = 0) { + console.log(paths) let {map, lib: TMap, $refs: {AiTMap: {fitBounds}}} = this if (TMap) { const colors = ["#A194F4", "#7CBDF3", "#F3A57D", "#62D063", "#58DBDA", "#F7D151"] diff --git a/src/saas/AppGridManagement/SelectGird.vue b/src/saas/AppGridManagement/SelectGird.vue index 556e48e3..98c05ca6 100644 --- a/src/saas/AppGridManagement/SelectGird.vue +++ b/src/saas/AppGridManagement/SelectGird.vue @@ -8,7 +8,11 @@
- + + + + + @@ -25,7 +29,12 @@
-
+
+
+
确定选择
+
+
+
确定选择
@@ -44,10 +53,14 @@ export default { userGird: {}, userList: [], girdLevel: 0, - parentGirdId: '' + parentGirdId: '', + isFormMap: 0, //1为网格地图 一级不允许选中 } }, - onLoad() { + onLoad(option) { + if(option.isFormMap) { + this.isFormMap = option.isFormMap + } this.isGirdUser() }, methods: { diff --git a/src/saas/AppMailList/AppMailList.vue b/src/saas/AppMailList/AppMailList.vue index 5176031a..1caa05cc 100644 --- a/src/saas/AppMailList/AppMailList.vue +++ b/src/saas/AppMailList/AppMailList.vue @@ -24,6 +24,9 @@
+ +
+
@@ -79,6 +82,9 @@ export default { // }) uni.navigateTo({url: `./myAddList`}) }, + gotoAdd() { + uni.navigateTo({ url: './add' }) + } }, onPageScroll(e) { this.scrollTop = e.scrollTop; @@ -178,5 +184,18 @@ export default { ::v-deep .u-search{ margin-bottom: 0!important; } + .addBtn { + width: 96px; + height: 96px; + flex-shrink: 0; + background: $uni-color-primary; + box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.2); + font-size: 48px; + color: #fff; + border-radius: 50%; + justify-content: center; + align-items: center; + display: flex; + } } \ No newline at end of file diff --git a/src/saas/AppMailList/img/add-icon.png b/src/saas/AppMailList/img/add-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..57c0eeb8c9faef128a3f53cf354a3782f97fd346 GIT binary patch literal 5875 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 literal 0 HcmV?d00001 diff --git a/src/saas/AppResidentDocument/Add.vue b/src/saas/AppResidentDocument/Add.vue index a2e1ab30..7337dd39 100644 --- a/src/saas/AppResidentDocument/Add.vue +++ b/src/saas/AppResidentDocument/Add.vue @@ -36,7 +36,7 @@
姓名 - +
@@ -45,7 +45,7 @@
身份证号 - +
@@ -84,7 +84,7 @@
现住址 - +
{{ form.currentAreaName }} 请选择 @@ -108,7 +108,7 @@
户籍地址 - +
{{ form.householdAreaName }} 请选择 diff --git a/src/saas/AppResidentDocument/AppResidentDocument.vue b/src/saas/AppResidentDocument/AppResidentDocument.vue index 92beb2a8..c2f4d2c7 100644 --- a/src/saas/AppResidentDocument/AppResidentDocument.vue +++ b/src/saas/AppResidentDocument/AppResidentDocument.vue @@ -43,7 +43,11 @@
- + +
+ +

暂无居民信息
点击新增按钮新增居民信息,也可在管理系统批量导入

+
新增居民
@@ -291,5 +295,23 @@ uni-page-body { ::v-deep .u-tab-bar{ margin-bottom: -6px; } + .empty{ + height: 100%; + img{ + width: 282px; + height: 306px; + margin: 168px 0 0 234px; + } + p{ + text-align: center; + font-size: 28px; + font-family: PingFangSC-Regular, PingFang SC; + color: #999; + line-height: 44px; + span{ + color: #467DFE; + } + } + } }