Merge branch 'develop' of http://git.tbd.yanzuoguang.com/panyongping/uni-pdtravel into develop

pages/album/getPortrait.vue

 <template>
-	<view class="big-box" :style="{'padding-top': statusBarHeight + 'px'}">
+	<view class="big-box" :style="{'padding-top': statusBarHeight + 'px'}" v-if="statusBarHeight">
 		<view class="nav-bar" :style="{'height': navHeight + 'px'}"></view>
 		<text class="title">扫脸获取您的照片</text>
 		<view class="scan">

pages/vlog/vlogface/vlogface.vue

@@ -3,7 +3,8 @@
 		<view class="bg">
 			<image src="../../../static/img/vlog/icon/camera.png"></image>
 		</view>
-		<camera class="camera" device-position="front" flash="off" @error="error" @initdone="initdone"></camera>
+		<camera class="camera" device-position="front" flash="off" @error="error"></camera>
+		<!-- <camera class="camera" device-position="front" flash="off" @error="error" @initdone="initdone"></camera> -->
 		<view class="surface" v-show="show">
 			<view>请正对镜头</view>
 			<text>{{text}}</text>
@@ -47,6 +48,7 @@ export default {
     }
   },
   onLoad() { //代替 vue 里面的 created
+    this.initdone()
   },
   onReady() { //代替 vue 里面的 mounted
   },