yudao
/
mall-uniapp
mirror of https://gitee.com/yudaocode/yudao-mall-uniapp.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

pull/8/head
kele 2023-03-14 11:29:30 +08:00
parent e355ded91a 908094e43c
commit c2111da4e9
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pages/user/address/list.vue
View File

@ -49,18 +49,12 @@
loading: true, loading: true,
}); });
// 选择收货地址， 有h5端需返回两次的bug // 选择收货地址
const onSelect = (addressInfo) => { 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', { uni.$emit('SELECT_ADDRESS', {
addressInfo, addressInfo,
}); });
sheep.$router.back(); sheep.$router.back();
// }
}; };
// 导入微信地址 // 导入微信地址

7
sheep/router/index.js
View File

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