From a6f33524dc8d392a31ab18df9cdb21f0560f0c2e Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Sat, 9 Mar 2024 17:11:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/admin/cancellate_result/index.vue | 2 +-
pages/index/index.vue | 25 ++++++++--
pages/margin/margin.vue | 49 +++++++++++---------
pages/nongKe/statistics/index.vue | 49 ++++----------------
pages/order_details/index.vue | 4 +-
pages/order_pay_status/index.vue | 8 ++--
pages/users/order_list/index.vue | 61 +++++++++++++------------
7 files changed, 97 insertions(+), 101 deletions(-)
diff --git a/pages/admin/cancellate_result/index.vue b/pages/admin/cancellate_result/index.vue
index 2614b9e..2b099ac 100644
--- a/pages/admin/cancellate_result/index.vue
+++ b/pages/admin/cancellate_result/index.vue
@@ -162,7 +162,7 @@
uni.navigateBack({
delta:1
});
- },500)
+ },1500)
})
},
// 商品递减
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 9b83316..770eff6 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -12,12 +12,17 @@
-
-
- {{userInfoData.mer_info.mer_name?userInfoData.mer_info.mer_name:'暂无信息'}}
+
+
+
+ {{userInfoData.mer_info.mer_name?userInfoData.mer_info.mer_name:'暂无信息'}}
+
+
+
+
-
-
+
+ {{userInfoData.mer_info.type_name}}
@@ -2185,6 +2190,16 @@
}
}
+ .content-mer-type{
+ font-size: 22rpx;
+ padding: 0 10rpx;
+ text{
+ background-color: $theme-color;
+ padding: 2rpx 8rpx 0 8rpx;
+ color: #fff;
+ border-radius: 8rpx;
+ }
+ }
}
.content-middle {
diff --git a/pages/margin/margin.vue b/pages/margin/margin.vue
index 014756e..d4493df 100644
--- a/pages/margin/margin.vue
+++ b/pages/margin/margin.vue
@@ -23,7 +23,7 @@
{{merchant_Data.margin}}元
-
+
+ {{goods.cart_info.product.store_name}}
发货时间：
-
+
@@ -186,8 +187,9 @@
- 预售{{goods.cart_info.product.store_name}}
+
+ {{goods.cart_info.product.store_name}}
发货时间：
-
+ 申请开票
- 查看详情
+ 查看详情
发布种草
-->
- 去评价
+ 去评价
@@ -343,6 +345,7 @@
import {
HTTP_REQUEST_URL
} from '@/config/app';
+ import { Toast } from '../../../libs/uniApi';
export default {
components: {
payment,
@@ -500,7 +503,8 @@
getOrderData: function() {
let that = this;
orderData({
- product_type: 0
+ product_type: 0,
+ source: 103
}).then(res => {
that.$set(that, 'orderData', res.data);
})
@@ -564,10 +568,10 @@
/**
* 去订单详情
*/
- goOrderDetails: function(order_id) {
+ goOrderDetails: function(order_id, item) {
let self = this
-
+
if (!order_id) return that.$util.Tips({
title: '缺少订单号无法查看订单详情'
});
@@ -575,16 +579,13 @@
uni.showLoading({
title: '正在加载',
})
-
openOrderSubscribe().then(() => {
-
uni.hideLoading();
- if (self.orderStatus == 0) {
+ if (self.orderStatus == 0 || (item&&item.order_status==1)) {
uni.navigateTo({
url: '/pages/order_details/stay?order_id=' + order_id
})
} else if (self.orderStatus == 1) {
-
uni.navigateTo({
url: `/pages/order_details/stay?order_id=${order_id}&orderStatus=${self.orderStatus}`
})
@@ -598,9 +599,9 @@
})
// #endif
// #ifndef MP
- if (self.orderStatus == 0) {
+ if (self.orderStatus == 0||(item&&item.order_status==1)) {
uni.navigateTo({
- url: '/pages/order_details/stay?order_id=' + order_id
+ url: '/pages/order_details/stay?order_id=' + item.group_order_id
})
} else if (self.orderStatus == 1) {
// uni.navigateTo({
@@ -619,30 +620,32 @@
/**
* 点击去评价
*/
- goOrderDetails_Evaluation: function(order_id) {
+ goOrderDetails_Evaluation: function(item) {
let self = this
- if (!order_id) return that.$util.Tips({
+ if (!item.order_id) return that.$util.Tips({
title: '缺少订单号无法查看订单详情和评价'
});
// #ifdef MP
if (self.orderStatus == 0) {
uni.navigateTo({
- url: '/pages/order_details/stay?order_id=' + order_id
+ url: '/pages/order_details/stay?order_id=' + item.order_id
})
} else {
+ if(!item.orderProduct[0]?.order_product_id) return Toast('无法评价该商品')
uni.navigateTo({
- url: '/pages/order_details/index?order_id=' + order_id
+ url: `/pages/users/goods_comment_con/index?uni=${item.orderProduct[0].order_product_id}&order_id=${item.order_id}`
})
}
// #endif
// #ifndef MP
if (self.orderStatus == 0) {
uni.navigateTo({
- url: '/pages/order_details/stay?order_id=' + order_id
+ url: '/pages/order_details/stay?order_id=' + item.order_id
})
} else {
+ if(!item.orderProduct[0]?.order_product_id) return Toast('无法评价该商品')
uni.navigateTo({
- url: '/pages/order_details/index?order_id=' + order_id
+ url: `/pages/users/goods_comment_con/index?uni=${item.orderProduct[0].order_product_id}&order_id=${item.order_id}`
})
}
// #endif
@@ -652,7 +655,6 @@
*/
statusClick: function(status) {
if (status == this.orderStatus) return;
-
this.orderStatus = status;
this.loadend = false;
this.loading = false;
@@ -675,7 +677,8 @@
groupOrderList({
page: that.page,
limit: that.limit,
- product_type: 0
+ product_type: 0,
+ source: 103
}).then(res => {
that.isReady = true;
let list = res.data.list || [];
@@ -702,7 +705,8 @@
status: arr,
page: that.page,
limit: that.limit,
- product_type: 0
+ product_type: 0,
+ source: 103
}).then(res => {
let list = res.data.list || [];
let loadend = list.length < that.limit;
@@ -731,6 +735,7 @@
status: 10,
page: 1,
limit: 1,
+ source: 103
}).then(res => {
let list = res.data.list || [];
that.presellOrderCount = res.data.count;