Merge branch 'zdsz3.0' of http://192.168.10.18:3000/wangtong/zd_wechatApp into zdsz3.0

pages/statistics/statistics.vue

@@ -934,8 +934,8 @@
 							</view>
 							<view class="font-twenty-eight gray" v-for="(state,stateIndex) in item.nodeReViewStateList"
 								:key="stateIndex" v-if="state.Type!='开栓'">
-								{{state.Type}}-{{state.state == 1 ? '审核通过': (state.content == '暂未审核' ? '暂未审核':'审核未通过')}}
-								<view v-if="state.content != '暂未审核'">原因：{{state.content}}</view>
+								{{state.Type}}-{{state.state == 1 ? '审核通过': state.state == 0 ? '审核未通过': state.state == 3 ? '前后照片不一致' : '暂未审核'}}
+								<view v-if="state.state != 1">原因：{{state.content}}</view>
 							</view>
 						</view>
 						<view v-if="EngineeringValue=='开栓'">

utils/request.js

@@ -4,7 +4,7 @@ import { getToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
 import { toast, showConfirm, tansParams } from '@/utils/common'
 
-let timeout = 10000
+let timeout = 60000
 const baseUrl = config.baseUrl
 
 const request = config => {