|
|
@@ -78,10 +78,31 @@
|
|
|
},
|
|
|
methods: {
|
|
|
selectAddress(item){
|
|
|
- uni.$emit('updateAddress',item);
|
|
|
- uni.navigateBack({
|
|
|
- delta: 1
|
|
|
- })
|
|
|
+
|
|
|
+ // uni.navigateBack({
|
|
|
+ // delta: 1
|
|
|
+ // })
|
|
|
+
|
|
|
+ // 获取当前所有页面栈
|
|
|
+ const pages = getCurrentPages();
|
|
|
+ if (pages.length >= 2) {
|
|
|
+ // 获取上一页
|
|
|
+ const prevPage = pages[pages.length - 2];
|
|
|
+
|
|
|
+ // 判断上一页的路径 是否是 订单页
|
|
|
+ if (prevPage.route === 'pages/shopping/confirmOrder') { // 👈 改成你真实的订单页路径
|
|
|
+ uni.$emit('updateAddress',item);
|
|
|
+ uni.navigateBack({ delta: 1 });
|
|
|
+ } else {
|
|
|
+ uni.navigateTo({
|
|
|
+ url: './addAddress?type=edit&id='+item.id
|
|
|
+ })
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ uni.navigateTo({
|
|
|
+ url: './addAddress?type=edit&id='+item.id
|
|
|
+ })
|
|
|
+ }
|
|
|
},
|
|
|
editAddress(item){
|
|
|
uni.navigateTo({
|
