Merge branch 'develop' of http://192.168.0.204/panyongping/uni-pdtravel into develop

pages/my/order/electronicTicket/electronicTicket.vue

@@ -650,21 +650,21 @@ export default {
 		  })
   },
   onHide: function () {
-		if(this.timer1) {
+    if(this.timer1) {
 		  clearTimeout(this.timer1)
 		  this.timer1 = null
-		}  
-		if(this.timer2) {
+    }  
+    if(this.timer2) {
 		  clearTimeout(this.timer2)
 		  this.timer2 = null
-		} 
-		if(this.timer3) {
+    } 
+    if(this.timer3) {
 		  clearTimeout(this.timer3)
 		  this.timer3 = null
-		} 
-		uni.setScreenBrightness({// 恢复之前屏幕亮度
-			value: this.Brightness
-		})
+    } 
+    uni.setScreenBrightness({// 恢复之前屏幕亮度
+      value: this.Brightness
+    })
   },
   onLoad(option) {
     if(option.orderId!=undefined){

pages/my/order/orderList/orderList.vue

@@ -728,6 +728,14 @@ export default {
     } 
 	  //隐藏加载框
    uni.hideLoading()
   },
+  onHide: function () {
+	  if(this.timerOutClear) {
+	    clearTimeout(this.timerOutClear)
+	    this.timerOutClear = null
+	  } 
+	  //隐藏加载框
+	  uni.hideLoading()
+  },
 }
 </script>