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

pages/my/order/electronicTicket/electronicTicket.vue

@@ -648,6 +648,8 @@ export default {
 					 }
       }
     })
+    this.getDetail()
+			
   },
   onHide: function () {
     if(this.timer1) {
@@ -680,7 +682,7 @@ export default {
     //this.id = "z00167956572219584dc15634b62cf75"
     this.openId = uni.getStorageSync('openid') //openid oroHZ5FaUQ_SOOC_uQQP92fJpBRE oh2UV1lyYABHMZ1rMlgjhVHyyYDQ
     //this.openId = 'oroHZ5FaUQ_SOOC_uQQP92fJpBRE'//'oh2UV1lyYABHMZ1rMlgjhVHyyYDQ'  oroHZ5FaUQ_SOOC_uQQP92fJpBRE
-    this.getDetail()
+    //this.getDetail()
   },
   onUnload() {
     if(this.timer1) {  

pages/my/order/orderList/orderList.vue

@@ -444,7 +444,7 @@ export default {
   },
   onLoad(option) {
     this.openId = uni.getStorageSync('openid')
-    // this.openId = 'oh2UV1lyYABHMZ1rMlgjhVHyyYDQ'//oh2UV1lyYABHMZ1rMlgjhVHyyYDQ  oroHZ5FaUQ_SOOC_uQQP92fJpBRE
+    //this.openId = 'oroHZ5FaUQ_SOOC_uQQP92fJpBRE'//oh2UV1lyYABHMZ1rMlgjhVHyyYDQ  oroHZ5FaUQ_SOOC_uQQP92fJpBRE
     this.orderStatus = option.orderStatus||''
     this.ifyukuaiCode = option.ifyukuaiCode||''
     this.getData(1)