From 3d917ba8ceae67ce6a2c670c8a08ad34a3d8cad7 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 07 八月 2024 14:08:13 +0800
Subject: [PATCH] 1
---
sub_pages/customer/trade/list.vue | 47 +++++++++++++++++++++++++++++++++++------------
1 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/sub_pages/customer/trade/list.vue b/sub_pages/customer/trade/list.vue
index 8b14f74..6b961df 100644
--- a/sub_pages/customer/trade/list.vue
+++ b/sub_pages/customer/trade/list.vue
@@ -104,8 +104,7 @@
</view>
- <view class="icon-shop" v-if="list&&list.length>0"
- @click="goto('/sub_pages/customer/shopping/shopping',true)">
+ <view class="icon-shop" v-if="list&&list.length>0" @click="toShopping">
<!-- 购物图标 -->
<!-- 如果有购买的东西，就要附带数字了 -->
<view v-if="shoptotal>0" class="number">
@@ -213,11 +212,14 @@
name: '',
category: '',
zoneId: '',
+
+
+ params: [],
+ supplierName: '',
+ columnStr: '',
+ column: '',
levelStr: '',
level: '',
- column: '',
- params: [],
- columnStr: '',
},
categoryInfo: {},
params: [],
@@ -238,10 +240,10 @@
// #ifdef PUB_CUSTOMER
onShareAppMessage() {
let that = this;
- var name = that.currentInfo.customerDTO && currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
- currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && currentInfo.partnerDTO.name || ''
+ var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
+ that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || ''
var url =
- `/sub_pages/customer/trade/list?category=${this.query.category}&zoneId=${this.query.zoneId}&name=${this.query.name}&shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
+ `/sub_pages/customer/trade/list?categoryId=${this.query.category}&zoneId=${this.query.zoneId}&name=${this.query.name}&supplierName=${this.query.supplierName}&shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
return {
title: "花满芫-商品列表",
path: url,
@@ -249,10 +251,10 @@
},
onShareTimeline() {
let that = this;
- var name = that.currentInfo.customerDTO && currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
- currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && currentInfo.partnerDTO.name || ''
+ var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
+ that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || ''
var url =
- `/sub_pages/customer/trade/list?category=${this.query.category}&zoneId=${this.query.zoneId}&name=${this.query.name}&shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
+ `/sub_pages/customer/trade/list?categoryId=${this.query.category}&zoneId=${this.query.zoneId}&name=${this.query.name}&supplierName=${this.query.supplierName}&shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
return {
title: "花满芫-商品列表",
path: url,
@@ -262,12 +264,20 @@
async onLoad(options) {
// this.list = [{},{}]
console.log('options', options)
- this.query.category = options.categoryId || ''
+ this.query.category = options.categoryId || options.category || ''
this.query.zoneId = options.zoneId || ''
this.query.name = options.name || ''
+ this.query.supplierName = options.supplierName || ''
+
+
if (this.query.name) {
uni.setNavigationBarTitle({
title: '商品列表-' + this.query.name
+ })
+ }
+ if (this.query.supplierName) {
+ uni.setNavigationBarTitle({
+ title: '商品列表-' + this.query.supplierName
})
}
this.listApi = '/api/customer/flower/list'
@@ -412,6 +422,19 @@
this.refreshList('post')
},
+ toShopping() {
+ if (!this.currentInfo.id) {
+ // await this.$message.confirm('请前往登录')
+ uni.navigateTo({
+ url: '/pages/login/supplier-login?source=jump'
+ })
+ return
+ }
+ //直接强制购物车
+ uni.reLaunch({
+ url: '/sub_pages/customer/shopping/shopping'
+ })
+ },
toDetail(item) {
uni.navigateTo({
url: `/sub_pages/customer/trade/detail?id=${item.id}`
--
Gitblit v1.9.3