From 65571790c547af1de4a9b5f93d418a5fb2760271 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期二, 24 九月 2024 15:35:40 +0800
Subject: [PATCH] 1.订单-点击订单商品跳转到订单详情 2.订单-点击商铺跳转到商铺详情 3.订单-订单详情-点击商品跳转到商品详情 4.订单-订单详情-点击商铺跳转到商铺详情
---
pages/order/order-detail.vue | 47 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index 2ee8c07..0f1af96 100644
--- a/pages/order/order-detail.vue
+++ b/pages/order/order-detail.vue
@@ -111,6 +111,49 @@
},
methods: {
+
+ openbrand(item) {
+ //也要判断一下是否重复进入
+ //判断堆栈，如果是店铺，就直接返回
+ //或者是：从商铺到列表再到详情，再到商铺，这种也不行
+ 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=' + (item.supplierId || '')
+ })
+ } else {
+ uni.navigateTo({
+ url: '/sub_pages/customer/shop/shop?id=' + (item.supplierId || '')
+ })
+ }
+
+ },
+
+ toFlowerDetail(item) {
+ console.log(item)
+ uni.navigateTo({
+ url: `/sub_pages/customer/trade/detail?id=${item.flowerId}`
+ })
+ },
salesTypeChange(e) {
this.submitForm.salesType = e.value
},
@@ -493,7 +536,7 @@
<view v-for="(item,index) of list" :key="index">
<view class="flower-info m-b-20 m-t-12 br-4"
v-if="!showSales||showSales&&(submitForm.orderItemId == item.id)">
- <view class="supplier-name ">
+ <view class="supplier-name " @click.stop="openbrand(item)">
<image class="icon-dp" src="/static/common/icon-dp.png"></image>
{{ item.supplierName || ''}}
</view>
@@ -507,7 +550,7 @@
<image class="flower-img img100 br-4 m-r-6" :src="item.flowerCover"
@click="previewImg(item.flowerCover)">
</image>
- <view class="flex1">
+ <view class="flex1" @click.stop="toFlowerDetail(item)">
<view class=" flex">
<view class="title"><span class="level">{{ item.flowerCategory || ''}}</span><span
class="level">{{ item.flowerLevelStr || ''}}</span>{{ item.flowerName || ''}}
--
Gitblit v1.9.3