From bd5fb8c26bcc00e80ac866cc0ce2daac9d5dc811 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 14 Jun 2024 19:44:35 +0800
Subject: [PATCH] 添加条件编译，方便启动H5
---
subPackage/counterfraud/add.vue | 2
subPackage/house/member/add.vue | 2
subPackage/workbench/views/editCscj.vue | 8
subPackage/workbench/views/editExamine.vue | 4
manifest.json | 500 +++++++++++++++++++++++++------------------------
pages/circle/index.vue | 7
pages.json | 34 +++
subPackage/bs/views/rentDetail.vue | 2
subPackage/house/member/index.vue | 8
subPackage/contradiction/edit.vue | 4
subPackage/workbench/views/cscj.vue | 8
pages/home/selectSite.vue | 3
12 files changed, 332 insertions(+), 250 deletions(-)
diff --git a/manifest.json b/manifest.json
index 2dde4bb..77ea5e4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,250 +1,254 @@
{
- "name" : "饶城格格通",
- "appid" : "__UNI__4C32D80",
- "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" : true
- },
- "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__4C32D80",
+ "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": {
+ // #ifdef MP-WEIXIN
+ "version": "3.1.3",
+ "provider": "wx4418e3e031e551be"
+ }
+ },
+ // #endif
+ "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": "",
+ "router": {
+ "mode": "hash",
+ "base": ""
+ },
+ "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
+ }
+ }
}
+// #endif
+//必填
\ No newline at end of file
diff --git a/pages.json b/pages.json
index d078cf9..a1f8fcb 100644
--- a/pages.json
+++ b/pages.json
@@ -441,7 +441,9 @@
"navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle": "black",
"usingComponents": {
+ // #ifdef MP-WEIXIN
"ocr-navigator": "plugin://ocr-plugin/ocr-navigator"
+ // #endif
}
}
},
@@ -453,7 +455,9 @@
"navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle": "black",
"usingComponents": {
+ // #ifdef MP-WEIXIN
"ocr-navigator": "plugin://ocr-plugin/ocr-navigator"
+ // #endif
}
}
},
@@ -533,7 +537,9 @@
"navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle": "black",
"usingComponents": {
+ // #ifdef MP-WEIXIN
"ocr-navigator": "plugin://ocr-plugin/ocr-navigator"
+ // #endif
}
}
},
@@ -756,7 +762,9 @@
"navigationBarTextStyle": "black",
"enablePullDownRefresh": false,
"usingComponents": {
+ // #ifdef MP-WEIXIN
"ocr-navigator": "plugin://ocr-plugin/ocr-navigator"
+ // #endif
}
}
},
@@ -855,7 +863,9 @@
"navigationBarTextStyle": "black",
"enablePullDownRefresh": false,
"usingComponents": {
+ // #ifdef MP-WEIXIN
"ocr-navigator": "plugin://ocr-plugin/ocr-navigator"
+ // #endif
}
}
},
@@ -876,7 +886,9 @@
"navigationBarTextStyle": "black",
"enablePullDownRefresh": false,
"usingComponents": {
+ // #ifdef MP-WEIXIN
"ocr-navigator": "plugin://ocr-plugin/ocr-navigator"
+ // #endif
}
}
},
@@ -1075,7 +1087,9 @@
"navigationBarTextStyle": "black",
"enablePullDownRefresh": false,
"usingComponents": {
+ // #ifdef MP-WEIXIN
"ocr-navigator": "plugin://ocr-plugin/ocr-navigator"
+ // #endif
}
}
@@ -1173,7 +1187,9 @@
"navigationBarTextStyle": "black",
"enablePullDownRefresh": false,
"usingComponents": {
+ // #ifdef MP-WEIXIN
"ocr-navigator": "plugin://ocr-plugin/ocr-navigator"
+ // #endif
}
}
}
@@ -1323,6 +1339,24 @@
}
}
]
+ },
+ {
+ "root": "subPackage/ecall",
+ "pages": [{
+ "path": "index",
+ "style": {
+ "navigationBarTitleText": "E呼即办",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "detail",
+ "style": {
+ "navigationBarTitleText": "E呼即办详情",
+ "enablePullDownRefresh": false
+ }
+ }
+ ]
}
],
"globalStyle": {
diff --git a/pages/circle/index.vue b/pages/circle/index.vue
index 574ee52..3910157 100644
--- a/pages/circle/index.vue
+++ b/pages/circle/index.vue
@@ -155,8 +155,10 @@
onShow() {
+ // #ifdef APP
let accountInfo = wx.getAccountInfoSync();
this.envVersion = accountInfo.miniProgram.envVersion;
+ // #endif
let role = uni.getStorageSync('activeRole')
if (role.roleName == "居民") {
this.tabList = getTabbarList(1);
@@ -325,6 +327,11 @@
url: `/subPackage/workbench/views/eCallReportDetail?id=${item.eventId}&from=circle`
})
}
+ if (item.evenType == 3) {
+ uni.navigateTo({
+ url: `/subPackage/ecall/detail?id=${item.eventId}&types=circle`
+ })
+ }
diff --git a/pages/home/selectSite.vue b/pages/home/selectSite.vue
index fbc0dfc..17fb85f 100644
--- a/pages/home/selectSite.vue
+++ b/pages/home/selectSite.vue
@@ -117,11 +117,14 @@
},
getList() {
+ // #ifdef MP-WEIXIN
this.$refs.uToast.show({
type: 'loading',
message: '正在加载',
duration: 9999999
})
+ // #endif
+
getFuncList(
this.roleType,
this.roleName
diff --git a/subPackage/bs/views/rentDetail.vue b/subPackage/bs/views/rentDetail.vue
index 9e94a59..71e2414 100644
--- a/subPackage/bs/views/rentDetail.vue
+++ b/subPackage/bs/views/rentDetail.vue
@@ -49,6 +49,7 @@
<view class="line"></view>
<view class="title">{{ '租客信息-#' + (index + 1) }}</view>
</view>
+ <!-- #ifdef MP-WEIXIN -->
<ocr-navigator @onSuccess="recognizeSuccess($event,index)" certificateType="idCard"
:opposite="false">
<view class="recognize-btn flex a-i-c">
@@ -56,6 +57,7 @@
<text class="f-26 c-ff" style="margin-left: 10rpx;">身份证信息识别</text>
</view>
</ocr-navigator>
+ <!-- #endif -->
</view>
<view class="r" v-if="(index+1) > 1">
<u-icon name="trash-fill" color="#ff0000" size="20" @click="decRentForm(index)"></u-icon>
diff --git a/subPackage/contradiction/edit.vue b/subPackage/contradiction/edit.vue
index a5c6dc5..fb31e99 100644
--- a/subPackage/contradiction/edit.vue
+++ b/subPackage/contradiction/edit.vue
@@ -7,6 +7,7 @@
<view class="form-caption flex j-c-s-b a-i-c">
<text class="f-32 fw">当事人1信息</text>
+ <!-- #ifdef MP-WEIXIN -->
<ocr-navigator @onSuccess="recognizeSuccess($event,'one')" certificateType="idCard"
:opposite="false">
<view class="recognize-btn flex a-i-c">
@@ -14,6 +15,7 @@
<text class="f-26 c-ff" style="margin-left: 10rpx;">身份证信息识别</text>
</view>
</ocr-navigator>
+ <!-- #endif -->
</view>
<u-form-item label="姓名" prop="nameOne" borderBottom required>
<u-input v-model="info.nameOne" border="none" placeholder="请输入当事人1姓名"
@@ -38,6 +40,7 @@
<view class="">
<view class="form-caption flex j-c-s-b a-i-c">
<text class="f-32 fw">当事人2信息</text>
+ <!-- #ifdef MP-WEIXIN -->
<ocr-navigator @onSuccess="recognizeSuccess($event,'two')" certificateType="idCard"
:opposite="false">
<view class="recognize-btn flex a-i-c">
@@ -45,6 +48,7 @@
<text class="f-26 c-ff" style="margin-left: 10rpx;">身份证信息识别</text>
</view>
</ocr-navigator>
+ <!-- #endif -->
</view>
<u-form-item label="姓名" prop="nameTwo" borderBottom required>
diff --git a/subPackage/counterfraud/add.vue b/subPackage/counterfraud/add.vue
index 40dd635..00e0689 100644
--- a/subPackage/counterfraud/add.vue
+++ b/subPackage/counterfraud/add.vue
@@ -133,6 +133,7 @@
<view class="flex a-i-c j-c-s-b" style="padding:20rpx;">
<view class="flex j-c-s-b a-i-c">
<view class="title fw" style="text-align:center; mr-20">人员信息-#{{ index*1 + 1 }}</view>
+ <!-- #ifdef MP-WEIXIN -->
<ocr-navigator @onSuccess="recognizePersonSuccess($event,index)" certificateType="idCard"
:opposite="false">
<view class="recognize-btn flex a-i-c">
@@ -140,6 +141,7 @@
<text class="f-26 c-ff" style="margin-left: 10rpx;">身份证信息识别</text>
</view>
</ocr-navigator>
+ <!-- #endif -->
</view>
diff --git a/subPackage/house/member/add.vue b/subPackage/house/member/add.vue
index a4ee60d..0e849ce 100644
--- a/subPackage/house/member/add.vue
+++ b/subPackage/house/member/add.vue
@@ -10,6 +10,7 @@
</view>
<!-- <u-icon name="arrow-right" size="20"></u-icon> -->
</view>
+ <!-- #ifdef MP-WEIXIN -->
<ocr-navigator @onSuccess="recognizeSuccess()" certificateType="idCard" :opposite="false"
style="width:48%;">
<view class="top-item flex j-c-s-b a-i-c bgc-ff" style="width:100%;">
@@ -20,6 +21,7 @@
<!-- <u-icon name="arrow-right" size="20"></u-icon> -->
</view>
</ocr-navigator>
+ <!-- #endif -->
</view>
<u-form labelWidth="70" :model="form" :rules="rules" ref="form">
diff --git a/subPackage/house/member/index.vue b/subPackage/house/member/index.vue
index abc23af..5dbeee7 100644
--- a/subPackage/house/member/index.vue
+++ b/subPackage/house/member/index.vue
@@ -4,6 +4,7 @@
<view class="content">
<view class="top" v-if="from != 'search'">
+ <!-- #ifdef MP-WEIXIN -->
<ocr-navigator @onSuccess="recognizeSuccess()" certificateType="idCard" :opposite="false">
<view class="top-item flex j-c-s-b a-i-c bgc-ff">
<view class="flex a-i-c">
@@ -13,6 +14,7 @@
<u-icon name="arrow-right" size="20"></u-icon>
</view>
</ocr-navigator>
+ <!-- #endif -->
</view>
@@ -318,7 +320,8 @@
<footer-btn v-if="(type == 1 && from == 'family') || !from" :text="addOrUpdateTitle" @click="submit" />
</block>
- <!-- <view class="footer flex j-c-s-b a-i-c bgc-ff" v-if="(type == 1 && from == 'family') || !from">
+ <view class="footer flex j-c-s-b a-i-c bgc-ff" v-if="(type == 1 && from == 'family') || !from">
+ <!-- #ifdef MP-WEIXIN -->
<ocr-navigator @onSuccess="recognizeSuccess()" certificateType="idCard" :opposite="false"
style="width:48%;">
<view class="recognize-btn c-main footer-btn flex j-c-c a-i-c" style="width:100%;">
@@ -326,8 +329,9 @@
<text class="f-26 " style="margin-left: 10rpx;">身份证信息识别</text>
</view>
</ocr-navigator>
+ <!-- #endif -->
<button class="save-btn footer-btn c-ff" @click="submit">{{addOrUpdateTitle}}</button>
- </view> -->
+ </view>
</view>
diff --git a/subPackage/workbench/views/cscj.vue b/subPackage/workbench/views/cscj.vue
index 496f0dd..11e67bd 100644
--- a/subPackage/workbench/views/cscj.vue
+++ b/subPackage/workbench/views/cscj.vue
@@ -160,6 +160,7 @@
<view class="box-title" style="width:50%;">
<box-title title="负责人信息"></box-title>
</view>
+ <!-- #ifdef MP-WEIXIN -->
<ocr-navigator v-if="!currentId" @onSuccess="recognizeSuccess($event,'principal')"
certificateType="idCard" :opposite="false">
<view class="recognize-btn flex a-i-c">
@@ -167,6 +168,7 @@
<text class="f-26 c-ff" style="margin-left: 10rpx;">身份证信息识别</text>
</view>
</ocr-navigator>
+ <!-- #endif-->
</view>
<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
label="场所负责人:" prop="principal">
@@ -191,6 +193,7 @@
<view class="box-title" style="width:50%;">
<box-title title="法人信息"></box-title>
</view>
+ <!-- #ifdef MP-WEIXIN -->
<ocr-navigator @onSuccess="recognizeSuccess($event,'legal')" certificateType="idCard"
:opposite="false">
<view class="recognize-btn flex a-i-c">
@@ -198,6 +201,7 @@
<text class="f-26 c-ff" style="margin-left: 10rpx;">身份证信息识别</text>
</view>
</ocr-navigator>
+ <!-- #endif-->
</view>
@@ -225,6 +229,7 @@
<view class="box-title" style="width:50%;">
<box-title title="房东信息"></box-title>
</view>
+ <!-- #ifdef MP-WEIXIN -->
<ocr-navigator v-if="!currentId" @onSuccess="recognizeSuccess($event)" certificateType="idCard"
:opposite="false">
<view class="recognize-btn flex a-i-c">
@@ -232,6 +237,7 @@
<text class="f-26 c-ff" style="margin-left: 10rpx;">身份证信息识别</text>
</view>
</ocr-navigator>
+ <!--#endif-->
</view>
<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
label="姓名:" prop="landlordName">
@@ -335,6 +341,7 @@
<view class="flex a-i-c j-c-s-b" style="padding:20rpx;">
<view class="flex j-c-s-b a-i-c">
<view class="title fw" style="text-align:center; mr-20">人员信息-#{{ index*1 + 1 }}</view>
+ <!-- #ifdef MP-WEIXIN -->
<ocr-navigator v-if="!currentId" @onSuccess="recognizePersonSuccess($event,index)"
certificateType="idCard" :opposite="false">
<view class="recognize-btn flex a-i-c">
@@ -342,6 +349,7 @@
<text class="f-26 c-ff" style="margin-left: 10rpx;">身份证信息识别</text>
</view>
</ocr-navigator>
+ <!-- #endif -->
</view>
diff --git a/subPackage/workbench/views/editCscj.vue b/subPackage/workbench/views/editCscj.vue
index 9efc7bc..98f6fbc 100644
--- a/subPackage/workbench/views/editCscj.vue
+++ b/subPackage/workbench/views/editCscj.vue
@@ -122,6 +122,7 @@
<view class="box-title" style="width:50%;">
<box-title title="负责人信息"></box-title>
</view>
+ <!-- #ifdef MP-WEIXIN -->
<ocr-navigator @onSuccess="recognizeSuccess($event,'principal')" certificateType="idCard"
:opposite="false">
<view class="recognize-btn flex a-i-c">
@@ -129,6 +130,7 @@
<text class="f-26 c-ff" style="margin-left: 10rpx;">身份证信息识别</text>
</view>
</ocr-navigator>
+ <!-- #endif -->
</view>
<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
label="场所负责人:" prop="principal">
@@ -153,6 +155,7 @@
<view class="box-title" style="width:50%;">
<box-title title="法人信息"></box-title>
</view>
+ <!-- #ifdef MP-WEIXIN -->
<ocr-navigator @onSuccess="recognizeSuccess($event,'legal')" certificateType="idCard"
:opposite="false">
<view class="recognize-btn flex a-i-c">
@@ -160,6 +163,7 @@
<text class="f-26 c-ff" style="margin-left: 10rpx;">身份证信息识别</text>
</view>
</ocr-navigator>
+ <!-- #endif -->
</view>
<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
label="姓名:" prop="legalPerson">
@@ -187,12 +191,14 @@
<view class="box-title" style="width:50%;">
<box-title title="房东信息"></box-title>
</view>
+ <!-- #ifdef MP-WEIXIN -->
<ocr-navigator @onSuccess="recognizeSuccess($event)" 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>
+ <!-- #endif -->
</view>
<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
label="姓名:" prop="landlordName">
@@ -295,6 +301,7 @@
<view class="flex a-i-c j-c-s-b" style="padding:20rpx;">
<view class="flex j-c-s-b a-i-c">
<view class="title fw" style="text-align:center; mr-20">人员信息-#{{ index*1 + 1 }}</view>
+ <!-- #ifdef MP-WEIXIN -->
<ocr-navigator @onSuccess="recognizePersonSuccess($event,index)" certificateType="idCard"
:opposite="false">
<view class="recognize-btn flex a-i-c">
@@ -302,6 +309,7 @@
<text class="f-26 c-ff" style="margin-left: 10rpx;">身份证信息识别</text>
</view>
</ocr-navigator>
+ <!-- #endif-->
</view>
<view>
<u-icon name="trash-fill" color="#ff0000" size="20" @click="deletePerson(index)" />
diff --git a/subPackage/workbench/views/editExamine.vue b/subPackage/workbench/views/editExamine.vue
index e77aab8..ba74d70 100644
--- a/subPackage/workbench/views/editExamine.vue
+++ b/subPackage/workbench/views/editExamine.vue
@@ -94,12 +94,14 @@
<view class="box-title" style="width:50%;">
<box-title title="房东信息"></box-title>
</view>
+ <!-- #ifdef MP-WEIXIN -->
<ocr-navigator @onSuccess="recognizeSuccess($event)" 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>
+ <!-- #endif -->
</view>
<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
label="姓名:" prop="landlordName">
@@ -207,6 +209,7 @@
<view class="flex j-c-s-b a-i-c">
<view class="title fw" style="text-align:center; mr-20">人员信息-#{{ index*1 + 1 }}</view>
+ <!-- #ifdef MP-WEIXIN -->
<ocr-navigator @onSuccess="recognizePersonSuccess($event,index)" certificateType="idCard"
:opposite="false">
<view class="recognize-btn flex a-i-c">
@@ -214,6 +217,7 @@
<text class="f-26 c-ff" style="margin-left: 10rpx;">身份证信息识别</text>
</view>
</ocr-navigator>
+ <!-- #endif -->
</view>
<view>
--
Gitblit v1.9.3