Merge branch 'master' of http://git.lcpcp.cc/zpj/global-merchant-center

src/views/Forestage/Tourism/index.vue

@@ -234,7 +234,7 @@ export default {
 						console.log('res', res)
             setTimeout(()=>{
               this.getInfo()
-            },2000)
+            },5000)
 
             /* this.getInfo(); */
 					} else {

src/views/Forestage/Tourism/order-sett.vue

@@ -50,7 +50,7 @@ export default {
       //  调用订单详情接口
 
       if( this.dialogVisible){
-        this.time=3
+        this.time=5
         this.timeServe=setInterval(async ()=>{
           this.time--;
           this.text = this.time ;