1

src/pages/client/order/list.vue

@@ -9,7 +9,7 @@
           <view v-for="(data, index) in list" :key="data.order_id" :class="{ left: index % 2 === 0 }"
             class="flex-column-start news-item">
             <order-item :data="data" @disableScroll="disableScrollAction" @cancelOrder="cancelOrderAction"
-              @concactService="jumpToWeChat" @confirmSliver="confirmSliver" @remindSilver="remindSliver" @pay="pay"
+              @refund="refundAction" @concactService="jumpToWeChat" @confirmSliver="confirmSliver" @remindSilver="remindSliver" @pay="pay"
               @afterSale="afterSale" @checkSliver="checkSliver" @remark="remark" @remarkDetails="remarkDetails"
               @jumpToDetails="jumpToDetails" />
           </view>
@@ -74,7 +74,7 @@
       </view>
     </view>
 
-    <pop-up-modal v-if="showCancelModal" content="确定要取消该订单吗？" @confirm="orderCancel"
+    <pop-up-modal v-if="showCancelModal" :content="cancelModalContent" @confirm="orderCancel"
       @cancel="showCancelModal = false" />
 
 <contact-modal v-if="showConcact" @close="showConcact = false" />
@@ -149,6 +149,7 @@ export default {
       elasticLayer: false,
       disableScroll: false,
       showCancelModal: false,
+      cancelModalContent: "确定要取消该订单吗？",
       showConcact: false,
       showRemindSliver: false,
       showSliverModal: false,
@@ -175,17 +176,17 @@ export default {
           id: SHOP_ORDER_UNPAY,
         },
         {
-          name: "待发货",
+          name: "待预约",
           id: SHOP_ORDER_UNSLIVER,
         },
-        {
-          name: "待收货",
-          id: SHOP_ORDER_UNRECEIVE,
-        },
-        {
-          name: "待评价",
-          id: SHOP_ORDER_UNREMARK,
-        },
+        // {
+        //   name: "待收货",
+        //   id: SHOP_ORDER_UNRECEIVE,
+        // },
+        // {
+        //   name: "待评价",
+        //   id: SHOP_ORDER_UNREMARK,
+        // },
         {
           name: "已取消",
           id: SHOP_ORDER_CANCEL,
@@ -296,10 +297,46 @@ export default {
     },
     // 支付
     pay(data) {
+       uni.showLoading({
+          icon: "none",
+          title: "支付中",
+          mask: true,
+        });
+        payOrder({
+          type: 4,
+          total_fee: Number(data.actual_price),
+          order_id: data.order_id,
+          order_no: data.order_no
+        }).then((res) => {
+          tt.pay({
+							 orderInfo: { 
+                   order_id:res.data.orderInfo.order_id,
+                   order_token:res.data.orderInfo.order_token,
+                    },
+                    service:5,
+            success: (res) => {
+              uni.hideLoading();
+              uni.showToast({
+                title: "支付成功",
+                icon: "none",
+              });
+              this.additionalBom = false,
+                this.elasticLayer = false,
+                this.reloadData();
+            },
+            fail: (err) => {
+              uni.hideLoading();
+              uni.showToast({
+                title: err?.msg || "支付失败",
+                icon: "none",
+              });
+            },
+          });
+        });
 
-      this.additionalBom = true;
-      this.elasticLayer = true;
-      this.dataList = data;
+      // this.additionalBom = true;
+      // this.elasticLayer = true;
+      
     },
     async rechargeNow() {
       //  console.log(this.wallet, "???");
@@ -447,6 +484,13 @@ export default {
     // 取消订单
     cancelOrderAction(data) {
       this.showCancelModal = true;
+      this.cancelModalContent = "确定要取消该订单吗？";
+      this.orderInfo = data;
+    },
+    // 退款
+    refundAction(data) {
+      this.showCancelModal = true;
+      this.cancelModalContent = "确定要退款吗？";
       this.orderInfo = data;
     },
 // 联系客服按钮点击 - 使用自定义弹窗（与首页在线客服功能一致）