From f3fbf923a46e76947ad2f2344e50143f5b5d8705 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Fri, 22 Mar 2024 16:27:54 +0800
Subject: [PATCH] 更新
---
subPackage/workbench/views/test.vue | 159 ++++++++++
subPackage/reside/edit.vue | 40 ++
manifest.json | 492 ++++++++++++++++----------------
pages/home/index.vue | 27 +
pages.json | 5
subPackage/bs/views/rentDetail.vue | 100 ++++++
subPackage/workbench/views/cscj.vue | 10
common/setting.js | 2
api/house/household.js | 10
components/caption/caption.vue | 4
pages/home/index.scss | 13
11 files changed, 595 insertions(+), 267 deletions(-)
diff --git a/api/house/household.js b/api/house/household.js
index 4e97a35..ec54bf1 100644
--- a/api/house/household.js
+++ b/api/house/household.js
@@ -67,4 +67,14 @@
method: 'GET',
params: params
})
+}
+
+
+// 获取住户列表
+export const getHouseholdLists = (params) => {
+ return http.request({
+ url: 'blade-household/household/list',
+ method: 'GET',
+ params: params
+ })
}
\ No newline at end of file
diff --git a/common/setting.js b/common/setting.js
index d12e0ca..5e8032d 100644
--- a/common/setting.js
+++ b/common/setting.js
@@ -11,7 +11,7 @@
// 开发环境接口Url
// devUrl: 'http://z4042833u6.wicp.vip',
// devUrl: 'https://srgdjczzxtpt.com:2080/api',
- devUrl: 'http://192.168.2.140:9528',
+ devUrl: 'http://192.168.2.111:9528',
// devUrl: 'https://kt39592615.goho.co',
minioBaseUrl: "https://srgdjczzxtpt.com:2080/gminio/jczz/",
// minioBaseUrl: "http://192.168.0.101:9528/",
diff --git a/components/caption/caption.vue b/components/caption/caption.vue
index 6aceefa..e5a5c39 100644
--- a/components/caption/caption.vue
+++ b/components/caption/caption.vue
@@ -24,11 +24,11 @@
url: String, //点击后跳转的URL地址
fontSize: {
type: String,
- value: '32rpx'
+ default: '32rpx'
},
bgColor: {
type: String,
- value: '#017BFC'
+ default: '#017BFC'
}
},
methods: {
diff --git a/manifest.json b/manifest.json
index 3cab955..b1fe88e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,244 +1,250 @@
{
- "name" : "饶城格格通",
- "appid" : "__UNI__EE88272",
- "description" : "",
- "versionName" : "1.0.10",
- "versionCode" : 104,
- "transformPx" : false,
- /* 5+App特有相关 */
- "app-plus" : {
- "compatible" : {
- "ignoreVersion" : true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持
- },
- "safearea" : {
- "bottom" : {
- "offset" : "none"
- }
- },
- "usingComponents" : true,
- "nvueCompiler" : "uni-app",
- "compilerVersion" : 3,
- "splashscreen" : {
- "alwaysShowBeforeRender" : false,
- "waiting" : false,
- "autoclose" : false,
- "delay" : 0
- },
- /* 模块配置 */
- "modules" : {
- "VideoPlayer" : {},
- "Camera" : {},
- "Geolocation" : {},
- "Push" : {},
- "Maps" : {}
- },
- /* 应用发布信息 */
- "distribute" : {
- /* android打包配置 */
- "android" : {
- "permissions" : [
- "<uses-feature android:name=\"android.hardware.camera\"/>",
- "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
- "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
- "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
- "<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
- "<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
- "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
- "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
- "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
- "<uses-permission android:name=\"android.permission.CAMERA\"/>",
- "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
- "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
- "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
- "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
- "<uses-permission android:name=\"android.permission.INTERNET\"/>",
- "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
- "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
- "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
- "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
- "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
- "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>",
- "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
- "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
- "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
- "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
- "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
- ],
- "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ]
- },
- /* ios打包配置 */
- "ios" : {
- "dSYMs" : false,
- "UIBackgroundModes" : "",
- "idfa" : false
- },
- /* SDK配置 */
- "sdkConfigs" : {
- "ad" : {},
- "maps" : {
- "amap" : {
- "appkey_ios" : "4bcdf5434597cc9160c9e0168c4a7bc7",
- "appkey_android" : "c21be9bc7343573c28112c4fe272cb41"
- }
- },
- "geolocation" : {
- "amap" : {
- "__platform__" : [ "ios", "android" ],
- "appkey_ios" : "4bcdf5434597cc9160c9e0168c4a7bc7",
- "appkey_android" : "c21be9bc7343573c28112c4fe272cb41"
- },
- "system" : {
- "__platform__" : [ "ios", "android" ]
- }
- },
- "push" : {
- "unipush" : {
- "offline" : true
- }
- }
- },
- "icons" : {
- "android" : {
- "hdpi" : "D:/Desktop/hbsl/app/应用图标/72.png",
- "xhdpi" : "D:/Desktop/hbsl/app/应用图标/96.png",
- "xxhdpi" : "D:/Desktop/hbsl/app/应用图标/144.png",
- "xxxhdpi" : "D:/Desktop/hbsl/app/应用图标/192.png"
- },
- "ios" : {
- "appstore" : "D:/Desktop/icon/1024x1024bb.png",
- "iphone" : {
- "app@2x" : "D:/Desktop/icon/120.png",
- "app@3x" : "D:/Desktop/icon/180.png",
- "spotlight@2x" : "D:/Desktop/icon/80.png",
- "spotlight@3x" : "D:/Desktop/icon/120.png",
- "settings@2x" : "D:/Desktop/icon/58.png",
- "settings@3x" : "D:/Desktop/icon/87.png",
- "notification@2x" : "D:/Desktop/icon/40.png",
- "notification@3x" : "D:/Desktop/icon/60.png"
- },
- "ipad" : {
- "app" : "",
- "app@2x" : "",
- "proapp@2x" : "",
- "spotlight" : "",
- "spotlight@2x" : "",
- "settings" : "",
- "settings@2x" : "",
- "notification" : "",
- "notification@2x" : ""
- }
- }
- },
- "splashscreen" : {
- "useOriginalMsgbox" : true
- }
- },
- "uniStatistics" : {
- "enable" : false
- },
- "nativePlugins" : {}
- },
- /* 快应用特有相关 */
- "quickapp" : {},
- /* 小程序特有相关 */
- "mp-weixin" : {
- "appid" : "wx41aa8a5d2e565a05",
- "setting" : {
- "urlCheck" : false,
- "minified" : true,
- "postcss" : true,
- "es6" : true
- },
- "usingComponents" : true,
- "optimization" : {
- "subPackages" : true
- },
- "uniStatistics" : {
- "enable" : false
- },
- "requiredPrivateInfos" : [
- "getLocation",
- "chooseLocation",
- "onLocationChange",
- "startLocationUpdateBackground"
- ],
- "requiredBackgroundModes" : [ "location" ], //必填
- "permission" : {
- "scope.userLocation" : {
- "desc" : "定位"
- }
- }
- },
- "mp-alipay" : {
- "usingComponents" : true,
- "uniStatistics" : {
- "enable" : false
- }
- },
- "mp-baidu" : {
- "usingComponents" : true,
- "uniStatistics" : {
- "enable" : false
- }
- },
- "mp-toutiao" : {
- "usingComponents" : true,
- "setting" : {
- "es6" : true,
- "minified" : true,
- "postcss" : true,
- "urlCheck" : false
- },
- "uniStatistics" : {
- "enable" : false
- }
- },
- "h5" : {
- "template" : "template.h5.html",
- "router" : {
- "mode" : "hash",
- "base" : "/app"
- },
- "optimization" : {
- "treeShaking" : {
- "enable" : true
- }
- },
- "devServer" : {
- "proxy" : {
- "/api" : {
- "target" : "http://127.0.0.1",
- //"target" : "https://rider.bladex.vip/api",
- "pathRewrite" : {
- "^/api" : "/"
- }
- }
- },
- "port" : "",
- "https" : false
- },
- "uniStatistics" : {
- "enable" : false
- },
- "sdkConfigs" : {
- "maps" : {
- "amap" : {
- "key" : "7fa69abe1defd5888bb85bc736cda874",
- "securityJsCode" : "8ac9e5f522c62ed6e3a5800a87b0d140",
- "serviceHost" : ""
- }
- }
- },
- "unipush" : {
- "enable" : false
- }
- },
- "uniStatistics" : {
- "enable" : false
- },
- "mp-qq" : {
- "uniStatistics" : {
- "enable" : false
- }
- }
-}
+ "name": "饶城格格通",
+ "appid": "__UNI__EE88272",
+ "description": "",
+ "versionName": "1.0.10",
+ "versionCode": 104,
+ "transformPx": false,
+ /* 5+App特有相关 */
+ "app-plus": {
+ "compatible": {
+ "ignoreVersion": true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持
+ },
+ "safearea": {
+ "bottom": {
+ "offset": "none"
+ }
+ },
+ "usingComponents": true,
+ "nvueCompiler": "uni-app",
+ "compilerVersion": 3,
+ "splashscreen": {
+ "alwaysShowBeforeRender": false,
+ "waiting": false,
+ "autoclose": false,
+ "delay": 0
+ },
+ /* 模块配置 */
+ "modules": {
+ "VideoPlayer": {},
+ "Camera": {},
+ "Geolocation": {},
+ "Push": {},
+ "Maps": {}
+ },
+ /* 应用发布信息 */
+ "distribute": {
+ /* android打包配置 */
+ "android": {
+ "permissions": [
+ "<uses-feature android:name=\"android.hardware.camera\"/>",
+ "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+ "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+ "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+ "<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
+ "<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
+ "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+ "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+ "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+ "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+ "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+ "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+ "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+ "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+ "<uses-permission android:name=\"android.permission.INTERNET\"/>",
+ "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+ "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+ "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+ "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+ "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+ "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>",
+ "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+ "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+ "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+ "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
+ "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+ ],
+ "abiFilters": ["armeabi-v7a", "arm64-v8a"]
+ },
+ /* ios打包配置 */
+ "ios": {
+ "dSYMs": false,
+ "UIBackgroundModes": "",
+ "idfa": false
+ },
+ /* SDK配置 */
+ "sdkConfigs": {
+ "ad": {},
+ "maps": {
+ "amap": {
+ "appkey_ios": "4bcdf5434597cc9160c9e0168c4a7bc7",
+ "appkey_android": "c21be9bc7343573c28112c4fe272cb41"
+ }
+ },
+ "geolocation": {
+ "amap": {
+ "__platform__": ["ios", "android"],
+ "appkey_ios": "4bcdf5434597cc9160c9e0168c4a7bc7",
+ "appkey_android": "c21be9bc7343573c28112c4fe272cb41"
+ },
+ "system": {
+ "__platform__": ["ios", "android"]
+ }
+ },
+ "push": {
+ "unipush": {
+ "offline": true
+ }
+ }
+ },
+ "icons": {
+ "android": {
+ "hdpi": "D:/Desktop/hbsl/app/应用图标/72.png",
+ "xhdpi": "D:/Desktop/hbsl/app/应用图标/96.png",
+ "xxhdpi": "D:/Desktop/hbsl/app/应用图标/144.png",
+ "xxxhdpi": "D:/Desktop/hbsl/app/应用图标/192.png"
+ },
+ "ios": {
+ "appstore": "D:/Desktop/icon/1024x1024bb.png",
+ "iphone": {
+ "app@2x": "D:/Desktop/icon/120.png",
+ "app@3x": "D:/Desktop/icon/180.png",
+ "spotlight@2x": "D:/Desktop/icon/80.png",
+ "spotlight@3x": "D:/Desktop/icon/120.png",
+ "settings@2x": "D:/Desktop/icon/58.png",
+ "settings@3x": "D:/Desktop/icon/87.png",
+ "notification@2x": "D:/Desktop/icon/40.png",
+ "notification@3x": "D:/Desktop/icon/60.png"
+ },
+ "ipad": {
+ "app": "",
+ "app@2x": "",
+ "proapp@2x": "",
+ "spotlight": "",
+ "spotlight@2x": "",
+ "settings": "",
+ "settings@2x": "",
+ "notification": "",
+ "notification@2x": ""
+ }
+ }
+ },
+ "splashscreen": {
+ "useOriginalMsgbox": true
+ }
+ },
+ "uniStatistics": {
+ "enable": false
+ },
+ "nativePlugins": {}
+ },
+ /* 快应用特有相关 */
+ "quickapp": {},
+ /* 小程序特有相关 */
+ "mp-weixin": {
+ "appid": "wx41aa8a5d2e565a05",
+ "setting": {
+ "urlCheck": false,
+ "minified": true,
+ "postcss": true,
+ "es6": true
+ },
+ "usingComponents": true,
+ "plugins": {
+ "ocr-plugin": {
+ "version": "3.1.3",
+ "provider": "wx4418e3e031e551be"
+ }
+ },
+ "optimization": {
+ "subPackages": true
+ },
+ "uniStatistics": {
+ "enable": false
+ },
+ "requiredPrivateInfos": [
+ "getLocation",
+ "chooseLocation",
+ "onLocationChange",
+ "startLocationUpdateBackground"
+ ],
+ "requiredBackgroundModes": ["location"], //必填
+ "permission": {
+ "scope.userLocation": {
+ "desc": "定位"
+ }
+ }
+ },
+ "mp-alipay": {
+ "usingComponents": true,
+ "uniStatistics": {
+ "enable": false
+ }
+ },
+ "mp-baidu": {
+ "usingComponents": true,
+ "uniStatistics": {
+ "enable": false
+ }
+ },
+ "mp-toutiao": {
+ "usingComponents": true,
+ "setting": {
+ "es6": true,
+ "minified": true,
+ "postcss": true,
+ "urlCheck": false
+ },
+ "uniStatistics": {
+ "enable": false
+ }
+ },
+ "h5": {
+ "template": "template.h5.html",
+ "router": {
+ "mode": "hash",
+ "base": "/app"
+ },
+ "optimization": {
+ "treeShaking": {
+ "enable": true
+ }
+ },
+ "devServer": {
+ "proxy": {
+ "/api": {
+ "target": "http://127.0.0.1",
+ //"target" : "https://rider.bladex.vip/api",
+ "pathRewrite": {
+ "^/api": "/"
+ }
+ }
+ },
+ "port": "",
+ "https": false
+ },
+ "uniStatistics": {
+ "enable": false
+ },
+ "sdkConfigs": {
+ "maps": {
+ "amap": {
+ "key": "7fa69abe1defd5888bb85bc736cda874",
+ "securityJsCode": "8ac9e5f522c62ed6e3a5800a87b0d140",
+ "serviceHost": ""
+ }
+ }
+ },
+ "unipush": {
+ "enable": false
+ }
+ },
+ "uniStatistics": {
+ "enable": false
+ },
+ "mp-qq": {
+ "uniStatistics": {
+ "enable": false
+ }
+ }
+}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 6bc75bd..36e8ae7 100644
--- a/pages.json
+++ b/pages.json
@@ -717,7 +717,10 @@
"navigationBarTitleText": "租户详情",
"navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle": "black",
- "enablePullDownRefresh": false
+ "enablePullDownRefresh": false,
+ "usingComponents": {
+ "ocr-navigator": "plugin://ocr-plugin/ocr-navigator"
+ }
}
},
{
diff --git a/pages/home/index.scss b/pages/home/index.scss
index d0bbc7d..917daf3 100644
--- a/pages/home/index.scss
+++ b/pages/home/index.scss
@@ -45,6 +45,7 @@
padding: 10rpx 0;
margin-bottom: 20rpx;
border-radius: 0 0 10rpx 10rpx;
+ margin:30rpx 0 20rpx 0;
.nav-item {
padding: 10rpx 0;
@@ -59,6 +60,7 @@
.section {
+ margin-bottom: 30rpx;
.section-item {
width: 216rpx;
height: 120rpx;
@@ -230,13 +232,20 @@
box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(107,134,159,0.2);
margin-bottom:30rpx;
}
-
+ .nav,.notice{
+ box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(107,134,159,0.2);
+ border-radius:10rpx;
+
+ }
+ .notice{
+ padding:0 20rpx;
+ }
.menu-tabs {
padding: 20rpx 0;
}
.menu {
- border-radius: 0 0 10rpx 10rpx;
+ border-radius: 10rpx;
box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(107,134,159,0.2);
}
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 4c638c0..e8688f8 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -9,11 +9,11 @@
</view>
</u-navbar>
<view class="swiper" :style="{background:background.banner}">
- <u-swiper :list="bannerList" height="320rpx" radius="10"></u-swiper>
+ <u-swiper :list="bannerList" height="320rpx" radius="10" @click="navToArticle"></u-swiper>
</view>
<view class="content bgc-ff">
<view class="">
- <view class="section flex j-c-s-a a-i-c mb-20" v-if="isShowContact && curSelectSite.addressType == 1">
+ <view class="section flex j-c-s-a a-i-c" v-if="isShowContact && curSelectSite.addressType == 1">
<view class="section-item" v-for="(i,k) in contactList" :key="k" v-if="i.name"
@click="navigatorPage(`${i.path}?id=${i.id}`)">
<image class="section-item-bg" :src="i.bgImg" mode="aspectFill"></image>
@@ -257,9 +257,11 @@
</u-grid>
</view> -->
- <view class="p-20 bgc-ff mb-20" v-if="isShowNotice">
- <caption-row title="通知公告" font="34rpx" :is-link="true" url="/subPackage/article/list" />
- <notice-list :data="notice" />
+ <view class="bgc-ff mb-20 notice" v-if="isShowNotice">
+ <caption-row title="通知公告" font-size="34rpx" :is-link="true" url="/subPackage/article/list" />
+ <view class="mt-20">
+ <notice-list :data="notice" />
+ </view>
</view>
<u-picker :title="roleTypeName" :defaultIndex="selectSiteIndex" :closeOnClickOverlay="true"
@@ -612,7 +614,7 @@
isBailer(newVal, oldVal) {
- if (newVal) {
+ if (newVal == true) {
this.tabs.splice(1, 0, {
name: '警务服务',
list: [{
@@ -962,7 +964,7 @@
if (arr.length) {
let index3 = arr.findIndex(item => item.name.trim() == "取保候审")
- if (index != -1) {
+ if (index3 != -1) {
this.isBailer = true;
// this.tabs.splice(1, 0, {
@@ -1296,6 +1298,17 @@
})
console.log('********************location****************************************', location)
},
+
+
+ navToArticle(index) {
+ if (index == 0 && this.roleType == 2) {
+ uni.navigateTo({
+ url: `/subPackage/article/detail?id=4293&type=4`
+ })
+ }
+
+ }
+
}
}
</script>
diff --git a/subPackage/bs/views/rentDetail.vue b/subPackage/bs/views/rentDetail.vue
index b4e307a..3e3bca9 100644
--- a/subPackage/bs/views/rentDetail.vue
+++ b/subPackage/bs/views/rentDetail.vue
@@ -44,9 +44,18 @@
<view class="rent-info">
<view v-for="(item, index) in rentFormNum" :key="item" class="rent-box">
<view class="box-title">
- <view class="l">
- <view class="line"></view>
- <view class="title">{{ '租客信息-#' + (index + 1) }}</view>
+ <view class="flex a-i-c" style="width:100%;">
+ <view class="l">
+ <view class="line"></view>
+ <view class="title">{{ '租客信息-#' + (index + 1) }}</view>
+ </view>
+ <ocr-navigator @onSuccess="recognizeSuccess($event,index)" certificateType="idCard"
+ :opposite="false">
+ <view class="recognize-btn flex a-i-c">
+ <u-icon name="scan" color="#fff" size="24"></u-icon>
+ <text class="f-26 c-ff" style="margin-left: 10rpx;">身份证信息识别</text>
+ </view>
+ </ocr-navigator>
</view>
<view class="r" v-if="(index+1) > 1">
<u-icon name="trash-fill" color="#ff0000" size="20" @click="decRentForm(index)"></u-icon>
@@ -113,6 +122,9 @@
import {
minioBaseUrl
} from '@/common/setting'
+ import {
+ bizDictionary
+ } from '@/api/system/dict.js'
export default {
mixins: [uploadMixin],
components: {
@@ -227,7 +239,19 @@
rentalUse: 0,
relation: 0,
houseType: 0
- }
+ },
+
+ genderList: [{ //性别
+ value: 1,
+ name: '男',
+ },
+ {
+ value: 0,
+ name: '女',
+ }
+ ],
+
+ nationList: [] //民族
}
},
onLoad(option) {
@@ -240,10 +264,32 @@
// 使用id来判断是不是修改
if (id !== void 0) {
this.rentId = id
+ this.getAllBizDict()
this.getCurrentRentInfo()
}
},
methods: {
+
+ async getAllBizDict() {
+ // 获取民族
+ await this.getBizDict('nationType', this.nationList);
+ },
+
+ // 获取业务字典
+ async getBizDict(code, list) {
+ const param = {
+ code: code
+ }
+ const res = await bizDictionary(param)
+ res.data.forEach(e => {
+ list.push({
+ name: e.dictValue,
+ value: Number(e.dictKey)
+ })
+ })
+ },
+
+
showSelectBus(data, title, model, key) {
this.selectBusList = data
this.selectBusTitle = title
@@ -580,6 +626,42 @@
}
})
},
+
+ //识别成功
+ recognizeSuccess(e, index) {
+ console.log("e==>", e);
+ let {
+ detail: {
+ name,
+ id,
+ address,
+ gender,
+ nationality
+ }
+ } = e;
+
+ this.$refs.rentform[index].form.name = name.text; //姓名
+ this.$refs.rentform[index].form.hukouRegistration = address.text; //地址
+ this.$refs.rentform[index].form.idCard = id.text; //身份证号
+ this.$refs.rentform[index].genderValue = gender.text; //性别
+ this.$refs.rentform[index].nationValue = nationality.text; //民族
+ this.$refs.rentform[index].form.gender = this.getValue(this.genderList, gender.text).value;
+ this.$refs.rentform[index].form.ethnicity = this.getValue(this.nationList, nationality.text).value;
+ this.$refs.rentform[index].gender = [this.getValue(genderList, gender.text).index];
+ this.$refs.rentform[index].nationTypeIndex = [this.getValue(this.nationList, nationality.text).index];
+ },
+
+ getValue(arr, name) {
+ for (let i = 0, ii = arr.length; i < ii; i++) {
+ if (arr[i].name == name) {
+ return {
+ index: i,
+ value: arr[i].value
+ }
+ }
+ }
+ }
+
}
}
</script>
@@ -641,7 +723,8 @@
.line {
width: 6rpx;
- height: 60%;
+ // height: 60%;
+ height: 28rpx;
margin-right: 10rpx;
background-color: #017BFC;
}
@@ -696,4 +779,11 @@
padding: 5rpx 20rpx;
border-bottom: 1px solid #eff1f3;
}
+
+ .recognize-btn {
+ padding: 12rpx;
+ border-radius: 6rpx;
+ background-color: #3c9cff;
+ margin-left: 30rpx;
+ }
</style>
\ No newline at end of file
diff --git a/subPackage/reside/edit.vue b/subPackage/reside/edit.vue
index 51421e1..cb804c0 100644
--- a/subPackage/reside/edit.vue
+++ b/subPackage/reside/edit.vue
@@ -46,6 +46,12 @@
getResideApplyDetail,
updateResideApply
} from "@/api/reside/reside.js"
+
+ import {
+ getHouseholdDetail,
+ getHouseholdLists
+ } from "@/api/house/household.js"
+
export default {
data() {
return {
@@ -113,6 +119,10 @@
} else {
this.$set(this.info, "houseCode", uni.getStorageSync("siteInfo").houseCode)
}
+ this.getHouseholdList();
+ this.getHouseholdInfo()
+
+
},
onReady() {
@@ -133,9 +143,37 @@
})
},
+ getHouseholdList() {
+ getHouseholdLists({
+ houseCode: this.info.houseCode,
+ relationship: 1
+ }).then(res => {
+ console.log(res)
+ })
+ },
+
+
+
+ //获取业主信息
+ getHouseholdInfo() {
+ getHouseholdDetail({
+ houseCode: this.info.houseCode,
+ associatedUserId: uni.getStorageSync("userInfo").user_id
+ }).then(res => {
+ console.log(res)
+ })
+
+
+ },
+
+
+
+
+
+
sumitInfo() {
this.$refs.form.validate().then(valid => {
- if (this.id) {
+ if (this.isEdit) {
this.updateInfoRequest();
} else {
this.addInfoRequst();
diff --git a/subPackage/workbench/views/cscj.vue b/subPackage/workbench/views/cscj.vue
index 09aa3ca..b898264 100644
--- a/subPackage/workbench/views/cscj.vue
+++ b/subPackage/workbench/views/cscj.vue
@@ -145,7 +145,7 @@
</view>
- <view class="item">
+ <view class="item" v-if="isLegalSame != 1 && !currentId">
<view class="box-title">
<box-title title="法人信息"></box-title>
</view>
@@ -167,7 +167,7 @@
</u-form-item>
</view>
- <view class="item" v-if="isLegalSame != 1 && !currentId">
+ <view class="item">
<view class="box-title">
<box-title title="负责人信息"></box-title>
</view>
@@ -1092,9 +1092,9 @@
}
if (this.isLegalSame == 1) {
- this.form.principal = this.form.placeExtEntity.legalPerson;
- this.form.principalPhone = this.form.placeExtEntity.legalTel;
- this.form.principalIdCard = this.form.placeExtEntity.legalIdCard;
+ this.form.placeExtEntity.legalPerson = this.form.principal;
+ this.form.placeExtEntity.legalTel = this.form.principalPhone;
+ this.form.placeExtEntity.legalIdCard = this.form.principalIdCard;
}
add(this.form).then(res => {
diff --git a/subPackage/workbench/views/test.vue b/subPackage/workbench/views/test.vue
new file mode 100644
index 0000000..029a423
--- /dev/null
+++ b/subPackage/workbench/views/test.vue
@@ -0,0 +1,159 @@
+<template>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+
+ obj: {
+ "type": 0,
+ "name": {
+ "text": "张三",
+ "pos": {
+ "left_top": {
+ "x": 98.7780914307,
+ "y": 40.9823074341
+ },
+ "right_top": {
+ "x": 172.311325073,
+ "y": 41.2864379883
+ },
+ "right_bottom": {
+ "x": 172.190856934,
+ "y": 64.9047088623
+ },
+ "left_bottom": {
+ "x": 98.6072158813,
+ "y": 64.5630187988
+ }
+ },
+ "label": []
+ },
+ "gender": {
+ "text": "男",
+ "pos": {
+ "left_top": {
+ "x": 101.035919189,
+ "y": 80.7537384033
+ },
+ "right_top": {
+ "x": 121.421043396,
+ "y": 80.7818603516
+ },
+ "right_bottom": {
+ "x": 121.264938354,
+ "y": 101.272567749
+ },
+ "left_bottom": {
+ "x": 100.882026672,
+ "y": 101.244766235
+ }
+ },
+ "label": []
+ },
+ "nationality": {
+ "text": "汉",
+ "pos": {
+ "left_top": {
+ "x": 201.881393433,
+ "y": 81.7225189209
+ },
+ "right_top": {
+ "x": 222.004470825,
+ "y": 81.6959762573
+ },
+ "right_bottom": {
+ "x": 221.899169922,
+ "y": 101.255821228
+ },
+ "left_bottom": {
+ "x": 201.765304565,
+ "y": 101.291915894
+ }
+ },
+ "label": []
+ },
+ "address": {
+ "text": "广州市天河区五山路483号xxxxxxxxx",
+ "pos": {
+ "left_top": {
+ "x": 95.5787811279,
+ "y": 150.794250488
+ },
+ "right_top": {
+ "x": 310.358947754,
+ "y": 151.617507935
+ },
+ "right_bottom": {
+ "x": 310.004699707,
+ "y": 220.222885132
+ },
+ "left_bottom": {
+ "x": 95.1295013428,
+ "y": 219.552230835
+ }
+ },
+ "label": []
+ },
+ "id": {
+ "text": "4452xxxxxxxxxxxx",
+ "pos": {
+ "left_top": {
+ "x": 176.158676147,
+ "y": 244.072860718
+ },
+ "right_top": {
+ "x": 453.888336182,
+ "y": 244.978515625
+ },
+ "right_bottom": {
+ "x": 453.874603271,
+ "y": 266.313659668
+ },
+ "left_bottom": {
+ "x": 176.066543579,
+ "y": 265.342407227
+ }
+ },
+ "label": []
+ },
+ "card_position": {
+ "pos": {
+ "left_top": {
+ "x": 1085.625,
+ "y": 621.75
+ },
+ "right_top": {
+ "x": 338.125,
+ "y": 594.75
+ },
+ "right_bottom": {
+ "x": 303.625,
+ "y": 99.75
+ },
+ "left_bottom": {
+ "x": 1189.125,
+ "y": 126.75
+ }
+ },
+ "label": []
+ },
+ "image_width": 1280,
+ "image_height": 960,
+ "image_path": "http://tmp/wx4418e3e031e551be.o6zAJs-yC5ByIjnyyy09jKDZquXk.dlrc7P7WlhnGb4aca86b078fc2acb5b08e7a0f438943.jpg"
+ }
+
+
+ }
+ },
+
+
+ methods: {
+
+ }
+ }
+</script>
+
+<style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.3