订单

src/pages/order/detail.vue

@@ -208,7 +208,7 @@
     </view>
 
     <view class="footer">
-      <view class="btn" @tap="comeAgain">再来一单</view>
+      <view class="btn" @tap="anotherOrder">再来一单</view>
     </view>
   </view>
 </template>
@@ -359,9 +359,9 @@ const handleRefund = (item) => {
   });
 };
 
-const comeAgain = () => {
+const anotherOrder = () => {
   xma.navigateTo({
-    url: `/pages/shop/confirmOrder`,
+    url: `/pages/shop/confirmOrder?prodId=${orderDetail.value.orderItems[0].prodId}&skuId=${orderDetail.value.orderItems[0].skuId}`,
   });
 };
 </script>

src/pages/order/order.vue

@@ -17,7 +17,7 @@
                     <wd-count-down
                       :time="item.countDown"
                       :format="format"
-                      @finish="onFinish"
+                      @finish="onFinish(item.orderNumber)"
                       v-if="item.status == 1"
                     />
                   </view>
@@ -67,7 +67,9 @@
                   >
                     申请退款
                   </view>
-                  <view class="btn-error" v-if="item.status == 5">再来一单</view>
+                  <view class="btn-error" v-if="item.status == 5" @tap="anotherOrder(item)">
+                    再来一单
+                  </view>
                   <view class="btn-error" v-if="item.status == 1" @tap="payNow(item.orderNumber)">
                     立即支付
                   </view>
@@ -211,15 +213,15 @@ function callShopPhone(phoneNumber) {
 
 /**
  * 删除订单
- * @param {*} ordrerNumber
+ * @param {*} orderNumber
  */
-const handleDelete = (ordrerNumber) => {
+const handleDelete = (orderNumber) => {
   uni.showModal({
     title: '提示',
     content: '确定要删除订单吗？',
     success: async (res) => {
       if (res.confirm) {
-        const res = await deleteOrderApi(ordrerNumber);
+        const res = await deleteOrderApi(orderNumber);
         if (res.code === 0) {
           uni.showToast({
             title: '删除成功',
@@ -239,15 +241,15 @@ const handleDelete = (ordrerNumber) => {
 
 /**
  * 取消订单
- * @param {*} ordrerNumber
+ * @param {*} orderNumber
  */
-const handleCancel = (ordrerNumber) => {
+const handleCancel = (orderNumber) => {
   uni.showModal({
     title: '提示',
     content: '确定要取消订单吗？',
     success: async (res) => {
       if (res.confirm) {
-        const res = await cancelOrderApi({ ordrerNumber });
+        const res = await cancelOrderApi({ orderNumber });
         if (res.code === 0) {
           uni.showToast({
             title: '取消成功',
@@ -267,7 +269,7 @@ const handleCancel = (ordrerNumber) => {
 
 /**
  * 立即支付
- * @param {*} ordrerNumber
+ * @param {*} orderNumber
  */
 const PaymentRef = ref(null);
 const payNow = (orderNumber) => {
@@ -283,7 +285,7 @@ const calculateCountdown = (item) => {
   const orderTime = new Date(item).getTime();
   const countdown = orderTime + 30 * 60 * 1000 - now;
   if (countdown <= 0) {
-    return '00:00';
+    return 0;
   }
   return countdown;
 };
@@ -291,10 +293,20 @@ const calculateCountdown = (item) => {
 /**
  * 倒计时结束触发
  */
-const onFinish = () => {
+const onFinish = async (orderNumber) => {
+  await cancelOrderApi({ orderNumber });
   initDataList();
 };
 
+/**
+ * 再来一单
+ */
+const anotherOrder = (item) => {
+  xma.navigateTo({
+    url: `/pages/shop/confirmOrder?prodId=${item.orderItems[0].prodId}&skuId=${item.orderItems[0].skuId}`,
+  });
+};
+
 const handleRemark = (item) => {
   xma.navigateTo({
     url: `/pages/order/remark?orderNumber=${item.orderNumber}&shopName=${item.shopName}`,