Merge branch 'dev' of https://gitea.anxinyun.cn/free-sun/Highways4Good into dev

weapp/src/packages/patrol/index.jsx

@@ -913,7 +913,7 @@ const Index = () => {
             }
           </View>
       }
-      {/* {
+      {
         videoShow ? '' :
           <view>
             {
@@ -938,7 +938,7 @@ const Index = () => {
             }
 
           </view>
-      } */}
+      }
       {
         isView ?
           isSuperAdmin &&

weapp/src/packages/patrolView/index.jsx

@@ -187,7 +187,7 @@ function Index() {
             <Image className='filter-img' src={chevronDown} />
           </Picker>
         </View>
-        {/* {
+        {
           kind == 'anomaly' ? <View style={{ display: 'flex', lineHeight: '98rpx', marginRight: '20rpx' }}>
             <View style={{ color: '#333' }}>状态：</View>
             <Picker range={typeSearchList} onChange={setType}>
@@ -195,7 +195,7 @@ function Index() {
               <Image style={{ display: 'block', width: '14rpx', height: '8rpx', float: 'left', marginTop: '44rpx', marginLeft: '10rpx' }} src={chevronDown} />
             </Picker>
           </View> : ''
-        } */}
+        }
         <View class='head-search'>
           <Image className='search-img' src={searchIcon} />
           <Input class='heard-search-input' value={filterText} placeholder={