From 8e239be3e8665a688882689c2770aafdad1bf57a Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期五, 27 九月 2024 16:58:29 +0800
Subject: [PATCH] update 一些样式问题
---
pages/order/order.vue | 136 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 110 insertions(+), 26 deletions(-)
diff --git a/pages/order/order.vue b/pages/order/order.vue
index d5b59ea..ecbd85d 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -93,6 +93,49 @@
uni.stopPullDownRefresh()
},
methods: {
+
+
+ openbrand(item) {
+ console.log(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) {
+ uni.navigateTo({
+ url: `/sub_pages/customer/trade/detail?id=${item.flowerId}`
+ })
+ },
getList_after() {
var nowdate = new Date().getTime() - 1000 * 60 * 5
var change = false
@@ -123,6 +166,31 @@
url: '/pages/order/order-detail?id=' + item.id
})
},
+
+ async copyOrder(item) {
+ console.log(item)
+ await this.$message.confirm('是否确定再来一单')
+ // 发送请求
+ this.$message.showLoading()
+ const {
+ code,
+ data,
+ msg
+ } = await this.$http.request('get', '/api/customer/order/copyOrder', {
+ params: {
+ id: item.id,
+ }
+ })
+ this.$message.hideLoading()
+ if (code === 0) {
+ //微信接口
+ if (msg && msg != "") {
+ this.$message.showToast(msg)
+ }
+
+ }
+ },
+
toDetailSaleInfo(dto, flower) {
console.log('flower', dto, flower)
uni.navigateTo({
@@ -166,34 +234,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)
}
});
}
@@ -405,20 +486,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 ">
+ <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 }}
</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">
+ <!-- <view class="flex1" @click.stop="toFlowerDetail(item)"> -->
+ <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">
@@ -431,7 +515,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>
@@ -500,7 +584,7 @@
</view>
-
+ <!-- <view class="button button-0 m-l-a m-r-15" @click="copyOrder(dto)">再来一单</view> -->
<view class="button button-1 m-l-a m-r-0" @click="toDetail(dto)">查看详情</view>
</view>
</view>
--
Gitblit v1.9.3