添加条件编译，方便启动H5

linwe

2024-06-14 bd5fb8c26bcc00e80ac866cc0ce2daac9d5dc811

添加条件编译，方便启动H5

 manifest.json

@@ -152,10 +152,12 @@
        "usingComponents" : true,
        "plugins" : {
            "ocr-plugin" : {
                // #ifdef MP-WEIXIN
                "version" : "3.1.3",
                "provider" : "wx4418e3e031e551be"
            }
        },
        // #endif
        "optimization" : {
            "subPackages" : true
        },
@@ -200,10 +202,10 @@
        }
    },
    "h5" : {
        "template" : "template.h5.html",
        "template": "",
        "router" : {
            "mode" : "hash",
            "base" : "/app"
            "base": ""
        },
        "optimization" : {
            "treeShaking" : {
@@ -221,7 +223,7 @@
                }
            },
            "port" : "",
            "https" : true
            "https": false
        },
        "uniStatistics" : {
            "enable" : false
@@ -248,3 +250,5 @@
        }
    }
}
// #endif
//必填

 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": {

 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`
                    })
                }




 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

 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>


 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>

 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>



 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">

 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>

 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>






 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)" />

 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>