Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/commonPage/payURL.vue

@@ -58,6 +58,7 @@
 				isDesc: false,
 				descMin: 0,
 				descSecond: 0,
+				descHour:0,
 				fylxList: [],
 				isShowId:-1,
 				checkValue: '',
@@ -176,7 +177,6 @@
 					OrderSource: 8
 				}, res => {
 					if(res.data.resultCode == 1) {
-						console.log(res.data.data)
 						if(Object.keys(res.data.data).length == 0) {
 							if(Type == 2) {
 								this.getCodeUrl(obj)
@@ -295,12 +295,16 @@
 				sec = sec > 9 ? sec : '0' + sec
 				// 控制台打印
 				if(this.chaTime>0){
-				this.descMin = min
-				this.descSecond = sec
+				if(hr>0){
+					this.descHour = hr;
+				}
+				this.descMin = min+this.descHour*60;
+				this.descSecond = sec;
 				}else{
 					this.isShowPic=false
 					this.descMin = 0
 					this.descSecond = 0
+					this.descHour = 0
 					clearInterval(this.timer)	
 				}
 				this.chaTime-=1000