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

pages/album/getPortrait.vue

@@ -25,7 +25,7 @@
 			</view>
 		</view>
 		<text class="tip">获取照片需先在拍摄点摄影</text>
-		<u-mask :show="maskShow" @click="maskShow = false">
+		<u-mask :show="maskShow" @click="closeClick">
 			<view class="mask">
 				<text class="countdown" :class="{'hidden': maskCount <= 0}">{{maskCount}}s</text>
 				<view class="tip">
@@ -58,6 +58,7 @@ export default {
       queryData: {},//查询参数
       defaultBrightness: 0.5,//屏幕亮度
       options: {},//路由传参
+      loop: null//弹窗关闭倒计时
     }
   },
   methods: {
@@ -68,6 +69,11 @@ export default {
 			  delta: 1
       })
     },
+    closeClick() {
+      if(this.maskCount > 0) return
+      this.maskShow = false
+      this.takePhoto()
+    },
     recordDeviceInfo() {//---记录设备信息
       this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight // 状态栏高度
       this.capsule = uni.getMenuButtonBoundingClientRect() // 胶囊大小、位置数据
@@ -179,6 +185,7 @@ export default {
     },
     handleNotFound() {//---处理没有找到照片或返回错误的逻辑
       this.maskShow = true
+      this.maskCount = 3
       var loop = setInterval(() => {
 			  this.maskCount -= 1
 			  if(this.maskCount <= 0) {
@@ -274,11 +281,13 @@ export default {
 				width: 100%;
 				height: 100%;
 				border-radius: 50%;
+				overflow: hidden;
 			}
 			.circle {
 				border: 1px dashed #999;
 				box-sizing: border-box;
 				background-color: #fff;
+				-webkit-transform: rotate(0deg);
 				// z-index: 100;
 			}
 			.surface {