From f36767f1e16d2f453a2fa49ddd5d4947c641a365 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Fri, 8 Mar 2024 17:28:45 +0800
Subject: [PATCH 1/2] 1
---
pages/nongKe/statistics/index.vue | 147 +++++++-----------------------
pages/users/embody/embody.vue | 18 ++--
2 files changed, 43 insertions(+), 122 deletions(-)
diff --git a/pages/nongKe/statistics/index.vue b/pages/nongKe/statistics/index.vue
index 4949413..9dffa27 100644
--- a/pages/nongKe/statistics/index.vue
+++ b/pages/nongKe/statistics/index.vue
@@ -1,6 +1,5 @@
-
@@ -101,7 +100,6 @@
:isGoIndex="false">
-
@@ -114,9 +112,6 @@
-
@@ -254,9 +214,7 @@
import authorize from '@/components/Authorize';
import ordertime from '../../index/component/timelist.vue'
import retuntop from '@/components/content-top/index.vue';
- import activePopup from '@/components/activePopup.vue';
import {
-
setAdminOrderRemark
} from "@/api/admin";
import {
@@ -274,7 +232,6 @@
orderStatistics,
otherOrderStatistics,
getOrderList
-
} from "@/api/admin";
import {
ENV
@@ -288,7 +245,6 @@
authorize,
ordertime,
retuntop,
- activePopup
},
data() {
return {
@@ -906,6 +862,7 @@
url: '/pages/users/login/login_copy'
})
},
+
//获取协议内容
list1() {
business({
@@ -914,6 +871,7 @@
this.detail = res.data
})
},
+
//跳转
shopp() {
if (this.userInfoData.mer_info.type_id == 12) {
@@ -924,7 +882,6 @@
uni.navigateTo({
url: `/pages/store/home/index?id=` + this.userInfoData.service.mer_id + `&type=7`
})
-
}
},
//界面跳转
@@ -939,32 +896,26 @@
const data = {
product_type: this.where1.product_type
}
- orderStatistics(this.userInfoData.service.mer_id, data).then(
- res => {
- this.order[0].value = res.data.order.unpaid
- this.order[1].value = res.data.order.unshipped
- this.order[2].value = res.data.order.untake
- this.order[3].value = res.data.order.unevaluate
- this.order[4].value = res.data.order.refund
- this.list[2].value = res.data.data.month.orderNum
- },
- err => {
- that.$util.Tips({
- title: err.msg
- })
- }
- );
- otherOrderStatistics(this.userInfoData.service.mer_id, data).then(
- res => {
- this.other_order[0].value = res.data.order.unshipped
- this.other_order[1].value = res.data.order.untake
- },
- err => {
- that.$util.Tips({
- title: err.msg
- })
- }
- );
+ orderStatistics(this.userInfoData.service.mer_id, data).then(res => {
+ this.order[0].value = res.data.order.unpaid
+ this.order[1].value = res.data.order.unshipped
+ this.order[2].value = res.data.order.untake
+ this.order[3].value = res.data.order.unevaluate
+ this.order[4].value = res.data.order.refund
+ this.list[2].value = res.data.data.month.orderNum
+ }, err => {
+ that.$util.Tips({
+ title: err.msg
+ })
+ });
+ otherOrderStatistics(this.userInfoData.service.mer_id, data).then(res => {
+ this.other_order[0].value = res.data.order.unshipped
+ this.other_order[1].value = res.data.order.untake
+ }, err => {
+ that.$util.Tips({
+ title: err.msg
+ })
+ });
},
open() {
this.isshow = !this.isshow
@@ -1050,23 +1001,20 @@
}
setAdminOrderRemark(that.userInfoData.service.mer_id, that.refundInfo.order_id, {
remark: that.refundInfo.remark
- }).then(
- res => {
- this.refundMark = false;
+ }).then(res => {
+ this.refundMark = false;
- this.$util.Tips({
- title: res.message,
- icon: 'success'
- })
- that.getGoods(true);
- },
- err => {
+ this.$util.Tips({
+ title: res.message,
+ icon: 'success'
+ })
+ that.getGoods(true);
+ }, err => {
- that.$util.Tips({
- title: err
- });
- }
- );
+ that.$util.Tips({
+ title: err
+ });
+ });
},
// 授权关闭
authColse: function(e) {
@@ -1264,7 +1212,6 @@