返回的时候刷新列表

pages/album/myPhotoAlbum/myPhotoAlbum.vue

@@ -180,7 +180,11 @@ export default {
     this.openid = uni.getStorageSync('openid') //获取openid
     //this.openid = 'oroHZ5B455jLw_BqDmVpr7W13NLY' //获取openid
     this.faceIds = JSON.parse(option.faceIds)
-    this.location = JSON.parse(uni.getStorageSync('location'))
+    var locationData = {
+      latitude:'',
+      longitude:'',
+    }
+    this.location = JSON.parse(uni.getStorageSync('location'))||locationData
     this.merchantId = option.merchantId||'z0015605022691a5945bbe463141668c'// 'z0015605022691a5945bbe463141668c'
     this.obtainProvince()//获取省市区
     this.inquireMerchant()//查询所有商户

pages/my/order/orderList/orderList.vue

@@ -445,6 +445,9 @@ export default {
     this.ifyukuaiCode = option.ifyukuaiCode||''
     this.getData(1)
   },
+  onShow(){
+    this.getData(1)
+  },
   methods: { 
     screenChange(i){//顶部导航切换
       this.orderStatus = i
@@ -501,7 +504,7 @@ export default {
           // uni.navigateTo({
           //   url: '/pages/my/order/productList/productList'
           // })
-					this.pageIndex = 1
+          this.pageIndex = 1
           this.getData(1)
         }else{
           this.$refs.uToast.show({