From 667563d6ae12c2da2a16bf68be67a008d5bc6138 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 06 八月 2024 20:48:41 +0800
Subject: [PATCH] update
---
sub_pages/customer/trade/detail.vue | 73 ++++++++++++++++++++++++++++++------
1 files changed, 60 insertions(+), 13 deletions(-)
diff --git a/sub_pages/customer/trade/detail.vue b/sub_pages/customer/trade/detail.vue
index e409541..c050b1c 100644
--- a/sub_pages/customer/trade/detail.vue
+++ b/sub_pages/customer/trade/detail.vue
@@ -161,9 +161,9 @@
// #ifdef PUB_CUSTOMER
if (options.partnerUserId) {
+ let tmp = this
tmp.sharePartnerUserId = options.partnerUserId
//合伙人绑定的，判断当前用户，是否有登录,登录没绑定，没登录先缓存合伙人id，等注册和登录时候再弄
- let tmp = this
setTimeout(() => {
if (tmp.currentInfo.id) {
tmp.bindPartnerUser(tmp.currentInfo.id, '')
@@ -368,19 +368,18 @@
}
},
async getDetail() {
- var sharePartnerUserId = undefined
+ var params = {
+ id: this.id,
+ }
if (this.sharePartnerUserId && !isNaN(parseInt(this.sharePartnerUserId))) {
- sharePartnerUserId = parseInt(this.sharePartnerUserId)
+ params.partnerId = parseInt(this.sharePartnerUserId)
}
this.$message.showLoading()
const {
code,
data
} = await this.$http.request('get', '/api/customer/flower/list/view', {
- params: {
- id: this.id,
- partnerId: sharePartnerUserId
- }
+ params: params
})
if (code === 0) {
this.dto = {
@@ -399,14 +398,62 @@
})
return
}
- uni.navigateTo({
- url: '/sub_pages/customer/shopping/shopping'
- })
+ //判断堆栈，如果是购物车，就直接返回
+ const pages = getCurrentPages();
+ //如果上一层就是购物车，那么就返回，而不是跳转
+ // console.log('toShopping',pages)
+ if (pages && pages.length >= 2) {
+ if (pages[pages.length - 2].route === "sub_pages/customer/shopping/shopping") {
+ uni.navigateBack()
+ return
+ }
+ }
+ if (pages.length >= 10) {
+ //直接强制购物车
+ uni.reLaunch({
+ url: '/sub_pages/customer/shopping/shopping'
+ })
+ } else {
+ uni.navigateTo({
+ url: '/sub_pages/customer/shopping/shopping'
+ })
+ }
+
},
openbrand() {
- uni.navigateTo({
- url: '/sub_pages/customer/shop/shop?id=' + (this.dto.id || '')
- })
+ //也要判断一下是否重复进入
+ //判断堆栈，如果是店铺，就直接返回
+ //或者是：从商铺到列表再到详情，再到商铺，这种也不行
+ const pages = getCurrentPages();
+ console.log('toShopping', pages)
+ if (pages && pages.length >= 2) {
+ if (pages[pages.length - 2].route === "sub_pages/customer/shop/shop") {
+ uni.navigateBack()
+ return
+ }
+ }
+ if (pages && pages.length >= 3) {
+ if (pages[pages.length - 3].route === "sub_pages/customer/shop/shop" &&
+ pages[pages.length - 2].route === "sub_pages/customer/trade/list"
+ ) {
+ uni.navigateBack({
+ delta: 2
+ })
+ return
+ }
+ }
+
+ if (pages.length >= 10) {
+ //直接强制购物车
+ uni.reLaunch({
+ url: '/sub_pages/customer/shop/shop?id=' + (this.dto.supplierId || '')
+ })
+ } else {
+ uni.navigateTo({
+ url: '/sub_pages/customer/shop/shop?id=' + (this.dto.supplierId || '')
+ })
+ }
+
}
}
}
--
Gitblit v1.9.3