From 52a961ec0f00edb2f3b5a64db8d542405711ae1c Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 14 Oct 2024 18:33:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/myorder/myorder.vue |  7 ++++++-
 packages/order/order.vue     | 10 ++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/packages/myorder/myorder.vue b/packages/myorder/myorder.vue
index c7eb15f..92f6f35 100644
--- a/packages/myorder/myorder.vue
+++ b/packages/myorder/myorder.vue
@@ -51,7 +51,7 @@
 						<view class="ordertime" @click="toDetail(item)">
 							<text>预计发货时间</text>
 							<view>{{item.send_date?$moment(item.send_date).format("M月DD日"):''}}<text
-									class="orderweek">{{item.week?'['+item.week+']':''}}</text>
+									class="orderweek">{{item.send_date?'['+getWeek(item.send_date)+']':''}}</text>
 									<!-- {{item.hh?item.hh:''}} -->
 							</view>
 						</view>
@@ -115,6 +115,11 @@
 				uni.navigateTo({
 					url: '/packages/myorder/infoconfirm'
 				})
+			},
+			getWeek(date){
+				const weeks = ["周日", '周一', '周二', '周三', '周四', '周五', '周六', ]
+				let week = weeks[this.$moment(date).day()]
+				return week
 			},
 			getOrderList() {
 				if (this.status === '') {
diff --git a/packages/order/order.vue b/packages/order/order.vue
index 3ae510f..0495628 100644
--- a/packages/order/order.vue
+++ b/packages/order/order.vue
@@ -356,7 +356,8 @@
 					this.form = uni.getStorageSync("vuex_update_card") ? uni.getStorageSync("vuex_update_card") : {},
 						this.cardInfo = uni.getStorageSync("vuex_update_card") ? uni.getStorageSync("vuex_update_card") :
 						{},
-						this.form.ymd = this.momentDay(this.form.send_date).ymd
+						this.form.ymd = this.momentDay(this.form.send_date).ymd
+						this.form.week = this.getWeek(this.form.send_date)
 					uni.removeStorageSync("vuex_update_card")
 					uni.setNavigationBarTitle({
 						title: '修改订单',
@@ -389,7 +390,12 @@
 				// })
 			}
 		},
-		methods: {
+		methods: {
+			getWeek(date){
+				const weeks = ["周日", '周一', '周二', '周三', '周四', '周五', '周六', ]
+				let week = weeks[this.$moment(date).day()]
+				return week
+			},
 			async getAddress() {
 				const res = await this.$u.api.getUserAddress()
 				this.listAddress = res.address