Merge branch 'master' of https://gitee.com/sheepjs/shopro-uniapp

pages/user/address/list.vue

@@ -49,18 +49,12 @@
     loading: true,
   });
 
-  // 选择收货地址， 有h5端需返回两次的bug
+  // 选择收货地址
   const onSelect = (addressInfo) => {
-    // const pages = sheep.$router.getCur();
-    // const lastPage = pages[pages.length - 2];
-    // if (!_.isEmpty(lastPage) && lastPage.route === "pages/order/confirm") {
-    // sheep.$router.back();
-    // uni.navigateBack();
     uni.$emit('SELECT_ADDRESS', {
       addressInfo,
     });
     sheep.$router.back();
-    // }
   };
 
   // 导入微信地址

sheep/router/index.js

@@ -158,12 +158,6 @@ function getCurrentPage() {
   return pages[pages.length - 1];
 }
 
-function getCur() {
-  let a = getCurrentPages();
-  let pages = clone(a);
-  return pages;
-}
-
 function handleAction(path) {
   const action = path.split(':');
   switch (action[1]) {
@@ -187,6 +181,5 @@ export default {
   redirect,
   getCurrentPage,
   getCurrentRoute,
-  getCur,
   error,
 };