Merge branch 'master' of https://git.banshouhui.com/lijundan/self-support

src/pages/order/detail.vue

@@ -381,7 +381,10 @@
 					if (res.code == 200) {
 						self.order = res.data
 						this.getCurrentBtn()
-						self.timeOutChange(self.order.currentOverTime)
+						var nowTime = new Date();
+						if(nowTime.getTime() > this.order.currentOverTime){
+							this.btnClass='timeOut-btn'
+						}
 						if(self.order.isFirstOrder){
 							this.visibale = true
 						}