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 00000000..57c0eeb8 Binary files /dev/null and b/src/saas/AppMailList/img/add-icon.png differ 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; + } + } + } }