Merge branch 'master' into minus

mallApp/src/pages/login/account.vue

@@ -41,9 +41,14 @@ export default {
       }
     };
   },
+  onLoad(){
+    //返回上一页时刷新
+    let pages = getCurrentPages();
+    let prevPage = pages[ pages.length - 2 ];
+    prevPage.$vm.pageAction = {refresh:1}
+  },
   methods: {
     init(){
-
     },
     confirmFn() {
       let that = this