Merge branch 'master' into newyun

env/cl.js

@@ -1,5 +1,5 @@
 const ENV_PATH = {
-	baseUrl: 'http://192.168.31.161:9999', // 长龙
+	baseUrl: 'http://192.168.31.160:9999', // 长龙
 }
 
 module.exports = ENV_PATH

pages/mine/equipmentLog.vue

@@ -30,7 +30,7 @@
 				<view class="items">
 					<text>录音开启用时</text>
 					<text class="font"
-						:style="{color: info.recording==1?'red':'#333'}">{{info.startActionTime || ''}}min</text>
+						:style="{color: info.recording==1?'red':'#333'}">{{info.startActionTime || 0}}min</text>
 				</view>
 				<view class="line"></view>
 				<view class="items">