From 767ca1416d96ff1d2f8d346c0a1bdd36bc6557f5 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期二, 12 十一月 2024 13:18:32 +0800
Subject: [PATCH] 1.增加类别和花名搜索

---
 pages/order/order.vue |   29 +++++++++++++++++++++--------
 1 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/pages/order/order.vue b/pages/order/order.vue
index 1a11356..2ad53ae 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -166,6 +166,12 @@
 					url: '/pages/order/order-detail?id=' + item.id
 				})
 			},
+			
+			commentButtonClick(item){
+				uni.navigateTo({
+					url: '/pages/order/comment/order-comment?id='+item.id
+				})
+			},
 
 			async copyOrder(item) {
 				console.log(item)
@@ -294,6 +300,9 @@
 							this.$message.hideLoading()
 							if (code === 0) {
 								this.refreshList()
+								//刷新积分
+								this.$store.dispatch('getCurrentInfo')
+								this.$message.showToast('收货成功')
 							}
 						}
 
@@ -486,22 +495,23 @@
 				<view class="flower-info m-b-5 m-t-8 br-4" v-for="(item,j) of dto.items" :key="j">
 					<!-- <view class="line-gray"></view> -->
 
-					<view class="supplier-name " @click.stop="openbrand(item)">
+					<view class="supplier-name w-fit m-l-0 m-r-a" @click.stop="openbrand(item)">
 						<image class="icon-dp br-4" src="/static/common/icon-dp.png"></image>
-						{{ item.supplierName }}
+						{{ item.supplierName|| '' }} > 
 					</view>
 					<view class="flex m-t-12 flex-wrap-normal">
+						<!-- @click="previewImg(item.flowerCover)" -->
 						<image class="flower-img img100 m-r-6" :src="item.flowerCover"
-							@click="previewImg(item.flowerCover)">
+							@click.stop="toDetail(dto)" >
 						</image>
 						<!-- <view class="flex1" @click.stop="toFlowerDetail(item)"> -->
-						<view class="flex1" @click.stop="toDetail(dto)">
+						<view class="flex1" >
 
 							<view class=" flex">
 								<view class="title flex flex1">
 									<!-- <span class="level">{{ item.flowerCategory }}</span> -->
-									<span class="m-r-10">{{ item.flowerName }}</span>
-									<span class="level">{{ item.flowerLevelStr }}</span>
+									<span class="m-r-10" @click.stop="toDetail(dto)">{{ item.flowerName }}</span>
+									<span class="level" @click.stop="toDetail(dto)">{{ item.flowerLevelStr }}</span>
 									<view class="m-l-a m-r-10 flex">
 										<view class="m-r-10 button-icon" @click="toOrderItemDetail(item,'lack','缺货')"
 											v-if="item.lackNum">
@@ -514,7 +524,7 @@
 									</view>
 								</view>
 							</view>
-							<view class="each-list">
+							<view class="each-list" @click.stop="toDetail(dto)">
 								<view class="each-item">
 									<view class="label">颜色</view>
 									<view class="value">{{ item.flowerColor || '-' }}</view>
@@ -578,8 +588,11 @@
 					<!-- 		<view class="button button-1 m-l-a m-r-15" @click="toDetailSale(dto)"
 						v-if="dto.statusBackend === 'RECEIVE'"> 申请售后
 					</view> -->
-					<view class="button button-0 m-l-a m-r-15" @click="buttonClick(dto,'evaluate')"
+					<!-- <view class="button button-0 m-l-a m-r-15" @click="buttonClick(dto,'evaluate')"
 						v-if="dto.statusBackend === 'EVALUATE'"> 评价
+					</view> -->
+					<view class="button button-0 m-l-a m-r-15" @click="commentButtonClick(dto)"
+							v-if="dto.statusBackend === 'EVALUATE'"> 评价
 					</view>
 
 

--
Gitblit v1.9.3