From e42f376bc2abe0c7d2c820cf279319a125ca3a9e Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 19 Aug 2023 16:04:25 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E3=80=91=201=E3=80=81=E5=AE=8C=E6=88=90=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E7=9A=84=E6=8E=A5=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/trade/afterSale.js             |  4 ++
 pages/user/index.vue               | 77 +++++++++++++-----------------
 pages/users/goods_return/index.vue |  1 -
 3 files changed, 38 insertions(+), 44 deletions(-)

diff --git a/api/trade/afterSale.js b/api/trade/afterSale.js
index 3b056c2f..88bb83ad 100644
--- a/api/trade/afterSale.js
+++ b/api/trade/afterSale.js
@@ -6,6 +6,10 @@ export function getAfterSale(id) {
   });
 }
 
+export function getApplyingAfterSaleCount() {
+  return request.get("app-api/trade/after-sale/get-applying-count");
+}
+
 export function getAfterSalePage(data) {
   return request.get("app-api/trade/after-sale/page", data);
 }
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 18501c47..6b31fc47 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -51,6 +51,8 @@
 						</view>
 						 <view class="sign" @click="goSignIn">签到</view>
 					</view>
+
+          <!-- 订单中心 -->
 					<view class="order-wrapper">
 						<view class="order-hd flex">
 							<view class="left">订单中心</view>
@@ -121,13 +123,13 @@
 	</view>
 </template>
 <script>
-	let sysHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
+  let sysHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
 	import Cache from '@/utils/cache';
 	import { BACK_URL } from '@/config/cache';
-	import { orderData } from '@/api/order.js';
 	import { toLogin } from '@/libs/login.js';
-	import { getCity } from '@/api/api.js';
 	import { mapGetters } from "vuex";
+  import * as TradeOrderApi from '@/api/trade/order.js';
+  import * as AfterSaleApi from '@/api/trade/afterSale.js';
   import * as DecorateApi from '@/api/promotion/decorate.js';
   const app = getApp();
 	export default {
@@ -172,10 +174,10 @@
         circular: true,
         interval: 3000,
         duration: 500,
+        autoplay: true,
         menus: [], // 用户菜单
-
-        orderStatusNum: {},
 				servicePic: '/static/images/customer.png',
+
 				sysHeight: sysHeight,
 				// #ifdef MP
 				pageHeight: '100%',
@@ -190,15 +192,13 @@
         // #ifdef H5
         toLogin()
         // #endif
+        return
       }
 
 			// #ifdef H5
 			this.$set(this, 'pageHeight', app.globalData.windowHeight);
 			// #endif
 			this.$set(this, 'menus', app.globalData.MyMenus);
-			if (!this.$Cache.has('cityList')) {
-        this.getCityList();
-      }
 		},
 		onShow: function() {
 			let that = this;
@@ -232,29 +232,32 @@
 				location.href = this.chatUrl;
 			},
 			getOrderData() {
-				let that = this;
-				orderData().then(res => {
-					that.orderMenu.forEach((item, index) => {
-						switch (item.title) {
-							case '待付款':
-								item.num = res.data.unPaidCount
-								break
-							case '待发货':
-								item.num = res.data.unShippedCount
-								break
-							case '待收货':
-								item.num = res.data.receivedCount
-								break
-							case '待评价':
-								item.num = res.data.evaluatedCount
-								break
-							case '售后/退款':
-								item.num = res.data.refundCount
-								break
-						}
-					})
-					that.$set(that, 'orderMenu', that.orderMenu);
-				})
+        TradeOrderApi.getOrderCount().then(res => {
+          this.orderMenu.forEach((item) => {
+            switch (item.title) {
+              case '待付款':
+                item.num = res.data.unpaidCount
+                break
+              case '待发货':
+                item.num = res.data.undeliveredCount
+                break
+              case '待收货':
+                item.num = res.data.deliveredCount
+                break
+              case '待评价':
+                item.num = res.data.uncommentedCount
+                break
+            }
+          })
+          this.$set(this, 'orderMenu', this.orderMenu);
+        })
+        AfterSaleApi.getApplyingAfterSaleCount().then(res => {
+          const afterSaleOrderMenu = this.orderMenu.filter(item => item.title === '售后/退款')
+          if (afterSaleOrderMenu) {
+            afterSaleOrderMenu[0].num = res.data
+            this.$set(this, 'orderMenu', this.orderMenu);
+          }
+        })
 			},
 			// 打开授权
 			openAuto() {
@@ -314,18 +317,6 @@
 					this.openAuto()
 					// #endif
 				}
-			},
-			// 获取地址数据
-			getCityList: function() {
-				let that = this;
-				getCity().then(res => {
-					let oneDay = 24 * 3600 * 1000;
-					this.$Cache.setItem({
-						name: 'cityList',
-						value: res.data,
-						expires: oneDay * 7
-					}); //设置七天过期时间
-				})
 			}
 		}
 	}
diff --git a/pages/users/goods_return/index.vue b/pages/users/goods_return/index.vue
index fcfd16cc..127973c8 100644
--- a/pages/users/goods_return/index.vue
+++ b/pages/users/goods_return/index.vue
@@ -79,7 +79,6 @@
 	import { mapGetters } from "vuex";
   import * as TradeOrderApi from '@/api/trade/order.js';
   import * as AfterSaleApi from '@/api/trade/afterSale.js';
-  import {createAfterSale} from "../../../api/trade/afterSale";
   export default {
 		data() {
 			return {