Merge remote-tracking branch 'origin/master'

src/pages/order/order.vue

@@ -289,7 +289,6 @@ onShow(() => {
 onPullDownRefresh(() => {
   initDataList().then(() => {
     getList();
-    xma.stopPullDownRefresh();
   });
 });
 
@@ -332,6 +331,7 @@ const getList = async () => {
     mask: true,
   });
   const res = await getOrderList(catalog);
+  xma.stopPullDownRefresh();
   if (res.data.records.length < catalog.size) {
     isEnd.value = true;
   }
@@ -601,9 +601,15 @@ const handleAfterSales = (item) => {
 };
 
 /**
- * 申请退款
+ * 申请退款 商品类型，0-普通商品，5-团购，6-套餐，7-预售，8-售券 9-景点，10-旅游路线
  */
 const handleRefund = (item) => {
+  if (item.prodType === 7) {
+    xma.navigateTo({
+      url: `/pages/assistingAgriculture/order/refund?orderNumber=${item.orderNumber}`,
+    });
+    return;
+  }
   xma.navigateTo({
     url: `/pages/order/refund?orderNumber=${item.orderNumber}`,
   });
@@ -709,6 +715,7 @@ page {
   padding: 0 30rpx;
   gap: 14rpx;
 }
+
 .searchBoxs {
   width: 420rpx;
   height: 66rpx;