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 | 100 +++++++++++++++++++++++++++++++------------------
1 files changed, 63 insertions(+), 37 deletions(-)
diff --git a/pages/order/order.vue b/pages/order/order.vue
index 7e8fabb..2ad53ae 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -93,8 +93,8 @@
uni.stopPullDownRefresh()
},
methods: {
-
-
+
+
openbrand(item) {
console.log(item)
//也要判断一下是否重复进入
@@ -118,7 +118,7 @@
return
}
}
-
+
if (pages.length >= 10) {
//直接强制购物车
uni.reLaunch({
@@ -129,7 +129,7 @@
url: '/sub_pages/customer/shop/shop?id=' + (item.supplierId || '')
})
}
-
+
},
toFlowerDetail(item) {
uni.navigateTo({
@@ -167,7 +167,13 @@
})
},
- async copyOrder(item){
+ commentButtonClick(item){
+ uni.navigateTo({
+ url: '/pages/order/comment/order-comment?id='+item.id
+ })
+ },
+
+ async copyOrder(item) {
console.log(item)
await this.$message.confirm('是否确定再来一单')
// 发送请求
@@ -184,13 +190,13 @@
this.$message.hideLoading()
if (code === 0) {
//微信接口
- if(msg&&msg!=""){
+ if (msg && msg != "") {
this.$message.showToast(msg)
}
-
+
}
},
-
+
toDetailSaleInfo(dto, flower) {
console.log('flower', dto, flower)
uni.navigateTo({
@@ -234,34 +240,47 @@
extraData: {
// merchant_id: '1230000109',
// merchant_trade_no: '1234323JKHDFE1243252',
+ // merchant_id: '1661512517',
+ // merchant_trade_no: item.orderId || item.id || '',
transaction_id: item.paymentTrId
},
- async success() {
+ async success(info) {
+ console.log('确认收货 info success', info)
//dosomething
- // 发送请求
- tmp.$message.showLoading()
- const {
- code
- } = await tmp.$http.request('get',
- '/api/customer/order/receive/confirm', {
- params: {
- id: item.id,
- }
- })
- tmp.$message.hideLoading()
- if (code === 0) {
- tmp.refreshList()
- //刷新积分
- tmp.$store.dispatch('getCurrentInfo')
+ if (info.extraData && info.extraData.status === 'fail') {
+ tmp.$message.showToast('支付和确认收货需要是同一微信号，请联系实际支付人登录确认')
+ } else if (info.extraData && info.extraData.status === 'cancel') {
+
+ } else {
+
+
+ // 发送请求
+ tmp.$message.showLoading()
+ const {
+ code
+ } = await tmp.$http.request('get',
+ '/api/customer/order/receive/confirm', {
+ params: {
+ id: item.id,
+ }
+ })
+ tmp.$message.hideLoading()
+ if (code === 0) {
+ tmp.refreshList()
+ //刷新积分
+ tmp.$store.dispatch('getCurrentInfo')
+ tmp.$message.showToast('收货成功')
+ }
}
},
fail(e) {
- //dosomething
- console.log('error fail', e)
+ console.log('确认收货 info error', e)
+ // console.log('error fail', e)
tmp.$message.showToast('收货失败')
},
- complete() {
+ complete(info) {
//dosomething
+ console.log('确认收货 info complete', info)
}
});
}
@@ -281,6 +300,9 @@
this.$message.hideLoading()
if (code === 0) {
this.refreshList()
+ //刷新积分
+ this.$store.dispatch('getCurrentInfo')
+ this.$message.showToast('收货成功')
}
}
@@ -473,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" >
+ <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">
@@ -501,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>
@@ -565,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