diff --git a/java-mall-app-shop-admin/api/order.js b/java-mall-app-shop-admin/api/order.js
index 02e426b..3a3603f 100644
--- a/java-mall-app-shop-admin/api/order.js
+++ b/java-mall-app-shop-admin/api/order.js
@@ -72,7 +72,7 @@ export function GetSalesReturnOrderDetails(params) {
 }
 
 /**
- * 退货订单不通过
+ * 退货订单拒绝退款
  * @author Seven
  * @data 2025-3-28
  * @param {
@@ -93,7 +93,7 @@ export function GetSalesReturnOrderNoPass(params) {
 }
 
 /**
- * 退货订单不通过
+ * 退货订单同意退款
  * @author Seven
  * @data 2025-3-28
  * @param {
@@ -124,6 +124,26 @@ export function GetInitiativeOrderRefund(params) {
   });
 }
 
+/**
+ * 催单
+ * @author Seven
+ * @data 2025-3-28
+ * @param {
+ *  order_id : "DD-20241206-13"
+ *  }
+ * @returns {  }
+ * @see https://mall.gpxscs.cn/api/admin/shop/shop-order-info/picking/completed
+ */
+
+export function GetExpediteSFOrder(params) {
+  return http({
+    url: "/shop/sf-express/reminder-order",
+    method: "post",
+    params,
+    baseURL: config.apiMobile,
+  });
+}
+
 /**
  * 拣货完成
  * @author Seven
diff --git a/java-mall-app-shop-admin/components/tui-tabs.vue b/java-mall-app-shop-admin/components/tui-tabs.vue
index 11a4821..55c1af2 100644
--- a/java-mall-app-shop-admin/components/tui-tabs.vue
+++ b/java-mall-app-shop-admin/components/tui-tabs.vue
@@ -1,346 +1,382 @@
 <template>
-	<view class="tui-tabs-view"
-		:class="[isFixed ? 'tui-tabs-fixed' : 'tui-tabs-relative', unlined ? 'tui-unlined' : '']" :style="{
-			width: tabsWidth + 'px',
-			height: height + 'rpx',
-			padding: `0 ${padding}rpx`,
-			background: backgroundColor,
-			top: isFixed ? top + 'px' : 'auto',
-			zIndex: isFixed ? zIndex : 'auto'
-		}" v-if="tabsWidth>0">
-		<view v-for="(item, index) in tabs" :key="index" :class="['tui-tabs-item', { 'tui__tab_current':  currentTab==index}]"
-			:style="{ width: getItemWidth,height: height + 'rpx' }" @tap.stop="swichTabs(index)">
-			<view class="tui-tabs-title" :class="{'tui-tabs-disabled': item.disabled }" :style="{
-					color: currentTab == index ? getSelectedColor : color,
-					fontSize: size + 'rpx',
-					fontWeight: bold && currentTab == index ? 'bold' : 'normal',transform:`scale(${currentTab == index?scale:1})`
-				}">
-				{{ item[field] }}
-				<view :class="[item.isDot ? 'tui-badge__dot' : 'tui-tabs__badge']"
-					:style="{ color: badgeColor, backgroundColor: getBadgeBgColor }"
-					v-if="item[badgeField] || item.isDot">
-					{{ item.isDot ? '' : item[badgeField] }}
-				</view>
-			</view>
-		</view>
-		<view v-if="isSlider" class="tui-tabs-slider" :style="{
-				transform: 'translateX(' + scrollLeft + 'px)',
-				width: sliderWidth + 'rpx',
-				height: sliderHeight + 'rpx',
-				borderRadius: sliderRadius,
-				bottom: bottom,
-				background: getSliderBgColor,
-				marginBottom: bottom == '50%' ? '-' + sliderHeight / 2 + 'rpx' : 0
-			}"></view>
-	</view>
+  <view
+    class="tui-tabs-view"
+    :class="[
+      isFixed ? 'tui-tabs-fixed' : 'tui-tabs-relative',
+      unlined ? 'tui-unlined' : '',
+    ]"
+    :style="{
+      width: tabsWidth + 'px',
+      height: height + 'rpx',
+      padding: `0 ${padding}rpx`,
+      background: backgroundColor,
+      top: isFixed ? top + 'px' : 'auto',
+      zIndex: isFixed ? zIndex : 'auto',
+    }"
+    v-if="tabsWidth > 0"
+  >
+    <view
+      v-for="(item, index) in tabs"
+      :key="index"
+      :class="['tui-tabs-item', { tui__tab_current: currentTab == index }]"
+      :style="{ width: getItemWidth, height: height + 'rpx' }"
+      @tap.stop="swichTabs(index)"
+    >
+      <view
+        class="tui-tabs-title"
+        :class="{ 'tui-tabs-disabled': item.disabled }"
+        :style="{
+          color: currentTab == index ? getSelectedColor : color,
+          fontSize: size + 'rpx',
+          fontWeight: bold && currentTab == index ? 'bold' : 'normal',
+          transform: `scale(${currentTab == index ? scale : 1})`,
+        }"
+      >
+        {{ item[field] }}
+        <view
+          :class="[item.isDot ? 'tui-badge__dot' : 'tui-tabs__badge']"
+          :style="{ color: badgeColor, backgroundColor: getBadgeBgColor }"
+          v-if="item[badgeField] || item.isDot"
+        >
+          {{ item.isDot ? "" : item[badgeField] }}
+        </view>
+      </view>
+    </view>
+    <view
+      v-if="isSlider"
+      class="tui-tabs-slider"
+      :style="{
+        transform: 'translateX(' + scrollLeft + 'px)',
+        width: sliderWidth + 'rpx',
+        height: sliderHeight + 'rpx',
+        borderRadius: sliderRadius,
+        bottom: bottom,
+        background: getSliderBgColor,
+        marginBottom: bottom == '50%' ? '-' + sliderHeight / 2 + 'rpx' : 0,
+      }"
+    ></view>
+  </view>
 </template>
 
 <script>
-	export default {
-		name: 'tuiTabs',
-		emits: ['change'],
-		props: {
-			//标签页
-			tabs: {
-				type: Array,
-				default () {
-					return [];
-				}
-			},
-			//显示文本字段名称
-			field: {
-				type: String,
-				default: 'name'
-			},
-			badgeField: {
-				type: String,
-				default: 'num'
-			},
-			//tabs宽度，不传值则默认使用windowWidth，单位px
-			width: {
-				type: [Number, String],
-				default: 0
-			},
-			//rpx
-			height: {
-				type: Number,
-				default: 80
-			},
-			//rpx 只对左右padding起作用，上下为0
-			padding: {
-				type: Number,
-				default: 30
-			},
-			//背景色
-			backgroundColor: {
-				type: String,
-				default: '#FFFFFF'
-			},
-			//是否固定
-			isFixed: {
-				type: Boolean,
-				default: false
-			},
-			//px
-			top: {
-				type: Number,
-				// #ifndef H5
-				default: 0,
-				// #endif
-				// #ifdef H5
-				default: 44
-				// #endif
-			},
-			//是否去掉底部线条
-			unlined: {
-				type: Boolean,
-				default: false
-			},
-			//当前选项卡
-			currentTab: {
-				type: Number,
-				default: 0
-			},
-			isSlider: {
-				type: Boolean,
-				default: true
-			},
-			//滑块宽度
-			sliderWidth: {
-				type: Number,
-				default: 68
-			},
-			//滑块高度
-			sliderHeight: {
-				type: Number,
-				default: 6
-			},
-			//滑块背景颜色
-			sliderBgColor: {
-				type: String,
-				default: ''
-			},
-			sliderRadius: {
-				type: String,
-				default: '50rpx'
-			},
-			//滑块bottom
-			bottom: {
-				type: String,
-				default: '0'
-			},
-			//标签页宽度
-			itemWidth: {
-				type: String,
-				default: ''
-			},
-			//字体颜色
-			color: {
-				type: String,
-				default: '#666'
-			},
-			//选中后字体颜色
-			selectedColor: {
-				type: String,
-				default: ''
-			},
-			//字体大小
-			size: {
-				type: Number,
-				default: 28
-			},
-			//选中后 是否加粗 ，未选中则无效
-			bold: {
-				type: Boolean,
-				default: false
-			},
-			//2.3.0+
-			scale: {
-				type: [Number, String],
-				default: 1
-			},
-			//角标字体颜色
-			badgeColor: {
-				type: String,
-				default: '#fff'
-			},
-			//角标背景颜色
-			badgeBgColor: {
-				type: String,
-				default: ''
-			},
-			zIndex: {
-				type: [Number, String],
-				default: 996
-			}
-		},
-		watch: {
-			currentTab() {
-				this.checkCor();
-			},
-			tabs() {
-				this.checkCor();
-			},
-			width(val) {
-				this.tabsWidth = val;
-				this.checkCor();
-			}
-		},
-		computed: {
-			getItemWidth() {
-				let width = 100 / (this.tabs.length || 4) + '%'
-				return this.itemWidth ? this.itemWidth : width
-			},
-			getSliderBgColor() {
-				return this.sliderBgColor || (uni && uni.$tui && uni.$tui.color.primary) || '#5677fc';
-			},
-			getSelectedColor() {
-				return this.selectedColor || (uni && uni.$tui && uni.$tui.color.primary) || '#5677fc';
-			},
-			getBadgeBgColor() {
-				return this.badgeBgColor || (uni && uni.$tui && uni.$tui.color.pink) || '#f74d54';
-			}
-		},
-		created() {
-			// 高度自适应
-			setTimeout(() => {
-				uni.getSystemInfo({
-					success: res => {
-						this.winWidth = res.windowWidth;
-						this.tabsWidth = this.width == 0 ? this.winWidth : Number(this.width);
-						this.checkCor();
-					}
-				});
-			}, 0);
-		},
-		data() {
-			return {
-				winWidth: 0,
-				tabsWidth: 0,
-				scrollLeft: 0
-			};
-		},
-		methods: {
-			checkCor: function() {
-				let tabsNum = this.tabs.length;
-				let padding = uni.upx2px(Number(this.padding));
-				let width = this.tabsWidth - padding * 2;
-				let left = (width / tabsNum - uni.upx2px(Number(this.sliderWidth))) / 2 + padding;
-				let scrollLeft = left;
-				if (this.currentTab > 0) {
-					scrollLeft = scrollLeft + (width / tabsNum) * this.currentTab;
-				}
-				this.scrollLeft = scrollLeft;
-			},
-			// 点击标题切换当前页时改变样式
-			swichTabs: function(index) {
-				let item = this.tabs[index];
-				if (item && item.disabled) return;
-				if (this.currentTab == index) {
-					return false;
-				} else {
-					this.$emit('change', {
-						index: Number(index),
-						item: item
-					});
-				}
-			}
-		}
-	};
+export default {
+  name: "tuiTabs",
+  emits: ["change"],
+  props: {
+    //标签页
+    tabs: {
+      type: Array,
+      default() {
+        return [];
+      },
+    },
+    //显示文本字段名称
+    field: {
+      type: String,
+      default: "name",
+    },
+    badgeField: {
+      type: String,
+      default: "num",
+    },
+    //tabs宽度，不传值则默认使用windowWidth，单位px
+    width: {
+      type: [Number, String],
+      default: 0,
+    },
+    //rpx
+    height: {
+      type: Number,
+      default: 80,
+    },
+    //rpx 只对左右padding起作用，上下为0
+    padding: {
+      type: Number,
+      default: 30,
+    },
+    //背景色
+    backgroundColor: {
+      type: String,
+      default: "#FFFFFF",
+    },
+    //是否固定
+    isFixed: {
+      type: Boolean,
+      default: false,
+    },
+    //px
+    top: {
+      type: Number,
+      // #ifndef H5
+      default: 0,
+      // #endif
+      // #ifdef H5
+      default: 44,
+      // #endif
+    },
+    //是否去掉底部线条
+    unlined: {
+      type: Boolean,
+      default: false,
+    },
+    //当前选项卡
+    currentTab: {
+      type: Number,
+      default: 0,
+    },
+    isSlider: {
+      type: Boolean,
+      default: true,
+    },
+    //滑块宽度
+    sliderWidth: {
+      type: Number,
+      default: 68,
+    },
+    //滑块高度
+    sliderHeight: {
+      type: Number,
+      default: 6,
+    },
+    //滑块背景颜色
+    sliderBgColor: {
+      type: String,
+      default: "",
+    },
+    sliderRadius: {
+      type: String,
+      default: "50rpx",
+    },
+    //滑块bottom
+    bottom: {
+      type: String,
+      default: "0",
+    },
+    //标签页宽度
+    itemWidth: {
+      type: String,
+      default: "",
+    },
+    //字体颜色
+    color: {
+      type: String,
+      default: "#666",
+    },
+    //选中后字体颜色
+    selectedColor: {
+      type: String,
+      default: "",
+    },
+    //字体大小
+    size: {
+      type: Number,
+      default: 28,
+    },
+    //选中后 是否加粗 ，未选中则无效
+    bold: {
+      type: Boolean,
+      default: false,
+    },
+    //2.3.0+
+    scale: {
+      type: [Number, String],
+      default: 1,
+    },
+    //角标字体颜色
+    badgeColor: {
+      type: String,
+      default: "#fff",
+    },
+    //角标背景颜色
+    badgeBgColor: {
+      type: String,
+      default: "",
+    },
+    zIndex: {
+      type: [Number, String],
+      default: 996,
+    },
+  },
+  watch: {
+    currentTab() {
+      this.checkCor();
+    },
+    tabs() {
+      this.checkCor();
+    },
+    width(val) {
+      this.tabsWidth = val;
+      this.checkCor();
+    },
+  },
+  computed: {
+    getItemWidth() {
+      let width = 100 / (this.tabs.length || 4) + "%";
+      return this.itemWidth ? this.itemWidth : width;
+    },
+    getSliderBgColor() {
+      return (
+        this.sliderBgColor ||
+        (uni && uni.$tui && uni.$tui.color.primary) ||
+        "#5677fc"
+      );
+    },
+    getSelectedColor() {
+      return (
+        this.selectedColor ||
+        (uni && uni.$tui && uni.$tui.color.primary) ||
+        "#5677fc"
+      );
+    },
+    getBadgeBgColor() {
+      return (
+        this.badgeBgColor ||
+        (uni && uni.$tui && uni.$tui.color.pink) ||
+        "#f74d54"
+      );
+    },
+  },
+  created() {
+    // 高度自适应
+    setTimeout(() => {
+      uni.getSystemInfo({
+        success: (res) => {
+          this.winWidth = res.windowWidth;
+          this.tabsWidth = this.width == 0 ? this.winWidth : Number(this.width);
+          this.checkCor();
+        },
+      });
+    }, 0);
+  },
+  data() {
+    return {
+      winWidth: 0,
+      tabsWidth: 0,
+      scrollLeft: 0,
+    };
+  },
+  methods: {
+    checkCor: function () {
+      let tabsNum = this.tabs.length;
+      let padding = uni.upx2px(Number(this.padding));
+      let width = this.tabsWidth - padding * 2;
+      let left =
+        (width / tabsNum - uni.upx2px(Number(this.sliderWidth))) / 2 + padding;
+      let scrollLeft = left;
+      if (this.currentTab > 0) {
+        scrollLeft = scrollLeft + (width / tabsNum) * this.currentTab;
+      }
+      this.scrollLeft = scrollLeft;
+    },
+    // 点击标题切换当前页时改变样式
+    swichTabs: function (index) {
+      let item = this.tabs[index];
+      if (item && item.disabled) return;
+      if (this.currentTab == index) {
+        return false;
+      } else {
+        this.$emit("change", {
+          index: Number(index),
+          item: item,
+        });
+      }
+    },
+  },
+};
 </script>
 
 <style scoped>
-	.tui-tabs-view {
-		width: 100%;
-		box-sizing: border-box;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-	}
+.tui-tabs-view {
+  width: 100%;
+  box-sizing: border-box;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
 
-	.tui-tabs-relative {
-		position: relative;
-	}
+.tui-tabs-relative {
+  position: relative;
+}
 
-	.tui-tabs-fixed {
-		position: fixed;
-		left: 0;
-	}
+.tui-tabs-fixed {
+  position: fixed;
+  left: 0;
+}
 
-	.tui-tabs-fixed::before,
-	.tui-tabs-relative::before {
-		content: '';
-		position: absolute;
-		border-bottom: 1rpx solid #eaeef1;
-		-webkit-transform: scaleY(0.5) translateZ(0);
-		transform: scaleY(0.5) translateZ(0);
-		transform-origin: 0 100%;
-		bottom: 0;
-		right: 0;
-		left: 0;
-	}
+.tui-tabs-fixed::before,
+.tui-tabs-relative::before {
+  content: "";
+  position: absolute;
+  border-bottom: 1rpx solid #eaeef1;
+  -webkit-transform: scaleY(0.5) translateZ(0);
+  transform: scaleY(0.5) translateZ(0);
+  transform-origin: 0 100%;
+  bottom: 0;
+  right: 0;
+  left: 0;
+}
 
-	.tui-unlined::before {
-		border-bottom: 0 !important;
-	}
+.tui-unlined::before {
+  border-bottom: 0 !important;
+}
 
-	.tui-tabs-item {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		overflow: visible;
-		/* #ifdef H5 */
-		cursor: pointer;
-		/* #endif */
-	}
+.tui-tabs-item {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  overflow: visible;
+  /* #ifdef H5 */
+  cursor: pointer;
+  /* #endif */
+}
 
-	.tui-tabs-disabled {
-		opacity: 0.6;
-	}
+.tui-tabs-disabled {
+  opacity: 0.6;
+}
 
-	.tui-tabs-title {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		position: relative;
-		z-index: 3;
-		overflow: visible;
-		transition: all 0.15s ease-in-out;
-	}
+.tui-tabs-title {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  position: relative;
+  z-index: 3;
+  overflow: visible;
+  transition: all 0.15s ease-in-out;
+}
 
-	.tui-tabs-slider {
-		position: absolute;
-		left: 0;
-		transition: all 0.3s ease-in-out;
-		z-index: 1;
-		transform-style: preserve-3d;
-	}
+.tui-tabs-slider {
+  position: absolute;
+  left: 0;
+  transition: all 0.3s ease-in-out;
+  z-index: 1;
+  transform-style: preserve-3d;
+}
 
-	.tui-tabs__badge {
-		position: absolute;
-		font-size: 24rpx;
-		height: 32rpx;
-		min-width: 20rpx;
-		padding: 0 6rpx;
-		border-radius: 40rpx;
-		right: 0;
-		top: 0;
-		transform: translate(88%, -50%);
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		flex-shrink: 0;
-		z-index: 4;
-		font-weight: normal !important;
-	}
+.tui-tabs__badge {
+  position: absolute;
+  font-size: 24rpx;
+  height: 32rpx;
+  min-width: 20rpx;
+  padding: 0 6rpx;
+  border-radius: 40rpx;
+  right: 0;
+  top: 0;
+  transform: translate(88%, -50%);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-shrink: 0;
+  z-index: 4;
+  font-weight: normal !important;
+}
 
-	.tui-badge__dot {
-		position: absolute;
-		height: 16rpx;
-		width: 16rpx;
-		border-radius: 50%;
-		right: -10rpx;
-		top: -10rpx;
-		z-index: 4;
-	}
-</style>
\ No newline at end of file
+.tui-badge__dot {
+  position: absolute;
+  height: 16rpx;
+  width: 16rpx;
+  border-radius: 50%;
+  right: -10rpx;
+  top: -10rpx;
+  z-index: 4;
+}
+</style>
diff --git a/java-mall-app-shop-admin/pages/order/components/OrderItem.vue b/java-mall-app-shop-admin/pages/order/components/OrderItem.vue
index 318c582..7a5b73e 100644
--- a/java-mall-app-shop-admin/pages/order/components/OrderItem.vue
+++ b/java-mall-app-shop-admin/pages/order/components/OrderItem.vue
@@ -1,261 +1,757 @@
 <template>
   <view class="order_item">
-    <view class="expresser">
-      <view class="header">#<text>38</text></view>
+    <view class="expresser expresser-2">
+      <view class="header">
+        <text class="symbol">#</text>
+        <text>{{ orderItem.orderNum }}</text>
+      </view>
       <view class="body">
-        <view class="item info">
-          <view class="name"> 谭金宇 </view>
-          <view class="btn_call"> 催快递 </view>
+        <view class="item info" v-if="orderItem.sf_order_info.operator_name">
+          <view class="name">{{ orderItem.sf_order_info.operator_name }}</view>
+          <view class="btn_call" @click="handerExpedite">催快递</view>
         </view>
-        <view class="item time">立即送达/07-29 20:21前送达</view>
+        <view class="item time">
+          立即送达/{{
+            $u.timeFormat(orderItem.arrival_time, "mm-dd hh:MM")
+          }}前送达
+        </view>
+        <u-icon
+          class="icon"
+          name="arrow-right"
+          color="#000"
+          size="12"
+          @click="showSfFlowPopup = true"
+        ></u-icon>
       </view>
       <view class="footer">
-        <view class="status">已接单</view>
+        <view
+          :class="['status', `status-${orderItem.sf_order_info.order_status}`]"
+        >
+          {{ sfFormatStatus(orderItem.sf_order_info.order_status) }}
+        </view>
       </view>
     </view>
 
     <view class="user">
       <view class="header">
         <view class="info">
-          <view class="name">谢能坤</view>
-          <view class="mobile">13128997057</view>
+          <view class="name">{{ orderItem.buyer_info.da_name }}/</view>
+          <view class="mobile">{{ orderItem.buyer_info.da_mobile }}</view>
         </view>
         <view class="box">
-          <view class="btn_call">联系顾客</view>
+          <view
+            class="btn_call"
+            @click="makePhone(orderItem.buyer_info.da_mobile)"
+          >
+            联系顾客
+          </view>
         </view>
       </view>
       <view class="body">
         <view class="info">
-          广西壮族自治区贵港市桂平市中山南路中山医院斜对面烧鹅大厦 8楼801
+          {{
+            orderItem.buyer_info.da_province +
+            orderItem.buyer_info.da_city +
+            orderItem.buyer_info.da_county +
+            orderItem.buyer_info.da_address
+          }}
         </view>
-        <view class="box">
-          <view class="btn_map"></view>
+        <view class="box"></view>
+      </view>
+      <view class="order_picking_box" v-if="!isErrorOrder">
+        <view class="order_picking_text">
+          拣货中：
+          <text>{{ getRemainingTime(orderItem.arrival_time) }}</text>
         </view>
+        <u-button class="picking_btn" @click="handerShowOrderPickingPopup()">
+          拣货完成
+        </u-button>
       </view>
       <view class="footer">
-        <view class="info"><text>备注:</text>不需要筷子，小哥请送到驿站</view>
+        <view class="info" v-if="orderItem.buyer_info.order_message">
+          <text>备注:</text>
+          {{ orderItem.buyer_info.order_message }}
+        </view>
       </view>
     </view>
 
     <view class="goods">
-      <view class="single" v-if="isList">
+      <view class="single" v-if="!orderItem.showRefundOrderInfo">
         <view class="body">
           <view class="info">
-            <image src="111" mode="aspectFit" class="img" />
-            <image src="111" mode="aspectFit" class="img" />
-            <image src="111" mode="aspectFit" class="img" />
-            <view class="total">共10件商品</view>
+            <view class="img_box">
+              <image
+                v-for="(item, index) of orderItem.order_items.slice(0, 3)"
+                :src="item.order_item_image"
+                mode="aspectFit"
+                class="img"
+              />
+            </view>
+
+            <view class="total">
+              共{{ orderItem.order_items.length }}件商品
+            </view>
           </view>
         </view>
 
         <view class="footer">
           <view class="text">合计</view>
           <view class="prize_type">¥</view>
-          <view class="prize_num">289.45</view>
+          <view class="prize_num">{{ sumBigInts }}</view>
         </view>
       </view>
 
-      <view class="list">
-        <view class="item">
-          <image src="111" mode="aspectFit" class="img" />
+      <view class="list" v-if="orderItem.showRefundOrderInfo">
+        <view class="item" v-for="(group, index2) of orderItem.order_items">
+          <image :src="group.order_item_image" mode="aspectFit" class="img" />
           <view class="box">
-            <view class="tit">新鲜明虾 500g~550/份</view>
+            <view class="tit">{{ group.item_name }}</view>
             <view class="desc">
-              <view class="total">数量X1</view>
-              <view class="price">¥29.5/件</view>
+              <view class="total">数量X{{ group.order_item_quantity }}</view>
+              <view class="price">¥{{ group.order_item_amount }}</view>
             </view>
           </view>
           <view class="counter">
             <view class="text">小计</view>
             <view class="prize_type">¥</view>
-            <view class="prize_num">29.5</view>
-          </view>
-        </view>
-        <view class="item">
-          <image src="111" mode="aspectFit" class="img" />
-          <view class="box">
-            <view class="tit">新鲜明虾 500g~550/份</view>
-            <view class="desc">
-              <view class="total">数量X1</view>
-              <view class="price">¥29.5/件</view>
-            </view>
-          </view>
-          <view class="counter">
-            <view class="text">小计</view>
-            <view class="prize_type">¥</view>
-            <view class="prize_num">29.5</view>
-          </view>
-        </view>
-        <view class="item">
-          <image src="111" mode="aspectFit" class="img" />
-          <view class="box">
-            <view class="tit">新鲜明虾 500g~550/份</view>
-            <view class="desc">
-              <view class="total">数量X1</view>
-              <view class="price">¥29.5/件</view>
-            </view>
-          </view>
-          <view class="counter">
-            <view class="text">小计</view>
-            <view class="prize_type">¥</view>
-            <view class="prize_num">29.5</view>
-          </view>
-        </view>
-        <view class="item">
-          <image src="111" mode="aspectFit" class="img" />
-          <view class="box">
-            <view class="tit">新鲜明虾 500g~550/份</view>
-            <view class="desc">
-              <view class="total">数量X1</view>
-              <view class="price">¥29.5/件</view>
-            </view>
-          </view>
-          <view class="counter">
-            <view class="text">小计</view>
-            <view class="prize_type">¥</view>
-            <view class="prize_num">29.5</view>
-          </view>
-        </view>
-        <view class="item">
-          <image src="111" mode="aspectFit" class="img" />
-          <view class="box">
-            <view class="tit">新鲜明虾 500g~550/份</view>
-            <view class="desc">
-              <view class="total">数量X1</view>
-              <view class="price">¥29.5/件</view>
-            </view>
-          </view>
-          <view class="counter">
-            <view class="text">小计</view>
-            <view class="prize_type">¥</view>
-            <view class="prize_num">29.5</view>
-          </view>
-        </view>
-        <view class="item">
-          <image src="111" mode="aspectFit" class="img" />
-          <view class="box">
-            <view class="tit">新鲜明虾 500g~550/份</view>
-            <view class="desc">
-              <view class="total">数量X1</view>
-              <view class="price">¥29.5/件</view>
-            </view>
-          </view>
-          <view class="counter">
-            <view class="text">小计</view>
-            <view class="prize_type">¥</view>
-            <view class="prize_num">29.5</view>
-          </view>
-        </view>
-        <view class="item">
-          <image src="111" mode="aspectFit" class="img" />
-          <view class="box">
-            <view class="tit">新鲜明虾 500g~550/份</view>
-            <view class="desc">
-              <view class="total">数量X1</view>
-              <view class="price">¥29.5/件</view>
-            </view>
-          </view>
-          <view class="counter">
-            <view class="text">小计</view>
-            <view class="prize_type">¥</view>
-            <view class="prize_num">29.5</view>
-          </view>
-        </view>
-        <view class="item">
-          <image src="111" mode="aspectFit" class="img" />
-          <view class="box">
-            <view class="tit">新鲜明虾 500g~550/份</view>
-            <view class="desc">
-              <view class="total">数量X1</view>
-              <view class="price">¥29.5/件</view>
-            </view>
-          </view>
-          <view class="counter">
-            <view class="text">小计</view>
-            <view class="prize_type">¥</view>
-            <view class="prize_num">29.5</view>
+            <view class="prize_num">{{ orderItem.order_product_amount }}</view>
           </view>
         </view>
       </view>
     </view>
 
-    <view class="result">
+    <view
+      class="result"
+      style="border: none"
+      v-if="orderItem.showRefundOrderInfo"
+    >
       <view class="cell">
-        <view class="header"> 商品总额 </view>
-        <view class="body"> <text>¥</text><text class="total">295</text> </view>
+        <view class="header">商品总额</view>
+        <view class="body">
+          <text>¥</text>
+          <text class="total">{{ sumBigInts }}</text>
+        </view>
       </view>
       <view class="cell">
-        <view class="header"> 配送运费 </view>
-        <view class="body red"> - ¥5</view>
+        <view class="header">配送运费</view>
+        <view class="body red">- ¥{{ orderItem.order_shipping_fee }}</view>
       </view>
       <view class="cell">
-        <view class="header"> 平台佣金 </view>
-        <view class="body red"> - ¥0.5</view>
+        <view class="header">平台佣金</view>
+        <view class="body red">- ¥{{ orderItem.platform_fee }}</view>
       </view>
       <view class="cell">
-        <view class="header"> 活动减免 </view>
-        <view class="body red"> - ¥0.05</view>
+        <view class="header">活动减免</view>
+        <view class="body red">- ¥{{ orderItem.total_discount_amount }}</view>
       </view>
       <view class="cell">
-        <view class="header"> 合计实收 </view>
-        <view class="body"> ¥<text class="count">295</text> </view>
+        <view class="header">合计实收</view>
+        <view class="body">
+          ¥
+          <text class="count">{{ orderItem.order_income_amount }}</text>
+        </view>
       </view>
     </view>
 
-    <view class="result">
+    <view class="result" v-if="orderItem.showRefundOrderInfo">
       <view class="cell">
-        <view class="header"> 订单编号 </view>
+        <view class="header">订单编号</view>
         <view class="body">
-          <view class="order_num">3139803842281</view
-          ><view class="btn_copy">复制</view></view
-        >
+          <view class="order_num">{{ orderItem.order_id }}</view>
+          <view class="btn_copy" @click="copy(orderItem.order_id, 'order')">
+            复制
+          </view>
+        </view>
       </view>
       <view class="cell">
-        <view class="header"> 下单时间 </view>
-        <view class="body"> 2025/07/29 15:21</view>
+        <view class="header">下单时间</view>
+        <view class="body">{{ orderItem.order_time }}</view>
       </view>
       <view class="cell">
-        <view class="header"> 支付时间 </view>
-        <view class="body"> 2025/07/29 15:21</view>
+        <view class="header">支付时间</view>
+        <view class="body">{{ orderItem.payment_time }}</view>
       </view>
+
       <view class="cell">
-        <view class="header"> 配送方式 </view>
-        <view class="body"> 同城 </view>
-      </view>
-      <view class="cell">
-        <view class="header"> 配送单号 </view>
+        <view class="header">顺丰单号</view>
         <view class="body">
-          <view class="order_num">3139803842281</view
-          ><view class="btn_copy">复制</view></view
-        >
+          <view class="order_num">
+            {{ orderItem.sf_order_info.sf_order_id }}
+          </view>
+          <view
+            class="btn_copy"
+            @click="copy(orderItem.sf_order_info.sf_order_id, 'distribution')"
+          >
+            复制
+          </view>
+        </view>
       </view>
     </view>
 
     <view class="tool">
-      <view class="header">
-        <template v-if="isList">
-          更多订单信息<u-icon
-            name="arrow-down"
-            color="#666"
-            class="icon"
+      <view class="header" @click="showRefundOrderInfo">
+        <template>
+          {{ orderItem.showRefundOrderInfo ? "收起" : "更多订单信息" }}
+
+          <u-icon
+            style="display: inline-block; margin-left: 6rpx"
+            :name="orderItem.showRefundOrderInfo ? 'arrow-up' : 'arrow-down'"
+            size="8"
+            color="#cccccc"
           ></u-icon>
         </template>
       </view>
-      <view class="body">
-        <view class="btn btn_cancel">取消订单</view>
-        <view class="btn btn_refund">退款</view>
+      <view
+        class="body"
+        v-if="
+          !isErrorOrder &&
+          orderItem.order_state_id >= 2040 &&
+          orderItem.order_state_id <= 2070
+        "
+      >
+        <view class="btn btn_cancel" @click="handerShowCancelOrder">
+          取消订单
+        </view>
+        <view class="btn btn_refund" @click="handerShowPartOrderRefund">
+          部分退款
+        </view>
       </view>
     </view>
+    <u-popup
+      class="affirm-popup"
+      zIndex="10077"
+      :show="showCancelOrderPopup"
+      mode="center"
+      @close="showCancelOrderPopup = false"
+    >
+      <view class="affirm-popup-content">
+        <view class="affirm-popup-title">取消订单</view>
+        <view class="affirm-popup-tips">
+          取消订单后，金额将原路退回给用户，确定取消？
+        </view>
+        <view class="affirm-popup-form">
+          <u--form
+            labelPosition="left"
+            :model="form"
+            ref="uForm"
+            label-width="70"
+            :rules="rules"
+          >
+            <u-form-item
+              label="退款原因"
+              prop="reason"
+              class="form-item"
+              required
+            >
+              <u--textarea
+                class="u-textarea"
+                v-model="form.reason"
+                count
+                autoHeight
+                maxlength="100"
+                placeholder="请输入取消订单原因"
+              ></u--textarea>
+            </u-form-item>
+          </u--form>
+        </view>
+        <view class="popup-btn-list">
+          <u-button
+            class="btn-item"
+            :hairline="true"
+            :plain="true"
+            shape="circle"
+            @click="showCancelOrderPopup = false"
+          >
+            取消
+          </u-button>
+          <u-button
+            class="btn-item btn-item-2"
+            :hairline="true"
+            :plain="true"
+            shape="circle"
+            @click="getInitiativeOrderRefund"
+          >
+            确定
+          </u-button>
+        </view>
+      </view>
+    </u-popup>
+    <u-popup
+      class="part-order-refund-popup"
+      zIndex="10080"
+      :show="showPartOrderRefundPopup"
+      mode="bottom"
+      closeable
+      @close="showPartOrderRefundPopup = false"
+    >
+      <view class="part-order-refund-popup-content">
+        <view class="part-order-refund-popup-title">部分退款</view>
+        <scroll-view
+          scroll-y
+          class="specification-type-search-scroll"
+          :show-scrollbar="false"
+          :style="{
+            maxHeight: orderItem.order_items.length >= 5 ? '500px' : 'none',
+            overflowY: orderItem.order_items.length >= 5 ? 'auto' : 'visible',
+          }"
+        >
+          <view class="affirm-popup-form">
+            <u--form
+              labelPosition="left"
+              :model="form"
+              ref="uForm"
+              label-width="100"
+              :rules="rules"
+            >
+              <u-form-item
+                label="退款原因"
+                prop="reason"
+                class="form-item"
+                required
+              >
+                <u--textarea
+                  class="u-textarea"
+                  v-model="form.reason"
+                  count
+                  autoHeight
+                  maxlength="100"
+                  placeholder="请输入取消订单原因"
+                ></u--textarea>
+              </u-form-item>
+            </u--form>
+          </view>
+          <view class="radio-list" v-if="orderItem.order_items.length > 0">
+            <u-checkbox-group
+              v-model="commodityCheckBoxList"
+              placement="column"
+            >
+              <view
+                class="commodity-info-item"
+                v-for="(item, index) of orderItem.order_items"
+                :key="index"
+              >
+                <view class="commodity-info-box">
+                  <image
+                    class="commodity-info-img"
+                    :src="item.order_item_image"
+                  ></image>
+
+                  <view class="commodity-content">
+                    <view class="commodity-name">
+                      {{ item.item_name || 0 }}
+                    </view>
+
+                    <view style="padding-left: 8rpx">
+                      X{{ item.order_item_quantity || 0 }}
+                    </view>
+                    <view class="commodity-price">
+                      ￥{{
+                        item.order_item_quantity * item.item_unit_price || 0
+                      }}
+                    </view>
+                  </view>
+                </view>
+                <u-number-box
+                  :min="1"
+                  :max="item.order_item_quantity_2"
+                  v-model="item.order_item_quantity"
+                ></u-number-box>
+                <u-checkbox
+                  :customStyle="{ marginBottom: '8px' }"
+                  :key="index"
+                  :name="item.item_id"
+                ></u-checkbox>
+              </view>
+            </u-checkbox-group>
+          </view>
+        </scroll-view>
+        <view class="popup-btn-list">
+          <u-button
+            class="btn-item"
+            :hairline="true"
+            :plain="true"
+            shape="circle"
+            @click="showPartOrderRefundPopup = false"
+          >
+            取消
+          </u-button>
+          <u-button
+            class="btn-item btn-item-2"
+            :hairline="true"
+            :plain="true"
+            shape="circle"
+            @click="getInitiativeOrderRefund"
+          >
+            确认
+          </u-button>
+        </view>
+      </view>
+    </u-popup>
+    <u-popup
+      class="affirm-popup"
+      zIndex="10077"
+      :show="showOrderPickingPopup"
+      mode="center"
+      @close="showOrderPickingPopup = false"
+    >
+      <view class="affirm-popup-content">
+        <view class="affirm-popup-title">取消订单</view>
+        <view class="affirm-popup-tips">
+          确定将取货号“ {{ currOrderItem.order_pickup_num }} ”提前拣货完成？
+        </view>
+        <view class="popup-btn-list">
+          <u-button
+            class="btn-item"
+            :hairline="true"
+            :plain="true"
+            shape="circle"
+            @click="showOrderPickingPopup = false"
+          >
+            取消
+          </u-button>
+          <u-button
+            class="btn-item btn-item-2"
+            :hairline="true"
+            :plain="true"
+            shape="circle"
+            @click="getOrderPicking"
+          >
+            确定
+          </u-button>
+        </view>
+      </view>
+    </u-popup>
+    <u-popup
+      class="SfFlow-popup"
+      zIndex="10077"
+      :show="showSfFlowPopup"
+      mode="center"
+      closeable
+      @close="showSfFlowPopup = false"
+    >
+      <!-- <view class="SfFlow-popup-content">
+        <view class="SfFlow-popup-title">顺丰轨迹</view>
+        <view class="SfFlow-content">
+          <u-steps current="0" direction="column">
+            <u-steps-item
+              title="已下单"
+              desc="10:30"
+              v-for="(item, index) of sf_order_info.feed"
+            ></u-steps-item>
+            <u-steps-item title="" desc="10:35"></u-steps-item>
+            <u-steps-item title="运输中" desc="11:40"></u-steps-item>
+          </u-steps>
+        </view>
+      </view> -->
+    </u-popup>
+    <u-toast ref="uToast"></u-toast>
   </view>
 </template>
 
 <script>
+import {
+  GetExpediteSFOrder,
+  GetInitiativeOrderRefund,
+  GetOrderPicking,
+} from "@/api/order";
 export default {
   props: {
-    isList: {
+    orderItem: {
+      type: Object,
+      default: () => {},
+    },
+    isErrorOrder: {
       type: Boolean,
       default: false,
     },
+    orderItemIndex: {
+      type: Number,
+      default: 0,
+    },
+  },
+  data() {
+    return {
+      sfStatus: [
+        {
+          id: 1,
+          label: "已接单",
+        },
+        {
+          id: 2,
+          label: "订单取消",
+        },
+        {
+          id: 10,
+          label: "配送员接单",
+        },
+        {
+          id: 12,
+          label: "配送员到店",
+        },
+        {
+          id: 15,
+          label: "配送中",
+        },
+        {
+          id: 17,
+          label: "配送员妥投完单",
+        },
+        {
+          id: 22,
+          label: "配送员撤单",
+        },
+        {
+          id: 91,
+          label: "骑士上报异常",
+        },
+        {
+          id: 31,
+          label: "取消中",
+        },
+      ],
+      deliveryType: [
+        {
+          id: 5,
+          label: "自提",
+        },
+        {
+          id: 10,
+          label: "普通快递",
+        },
+        {
+          id: 16,
+          label: "同城配送",
+        },
+      ],
+      isCancelOrder: false,
+      showCancelOrderPopup: false,
+      showPartOrderRefundPopup: false,
+      form: {
+        reason: "",
+      },
+      rules: {
+        reason: [
+          {
+            required: true,
+            message: "请输入取消订单原因",
+            // 可以单个或者同时写两个触发验证方式
+            trigger: ["change", "blur"],
+          },
+        ],
+      },
+      commodityCheckBoxList: [],
+      refreshInterval: null, // 全局定时器
+      showOrderPickingPopup: false,
+      currOrderItem: {
+        order_items: [],
+      },
+      isRefreshing: false,
+      refreshInterval: null, // 全局定时器
+      showSfFlowPopup: false,
+    };
+  },
+  computed: {
+    sumBigInts() {
+      // 高精度累加
+      const sum =
+        this.orderItem.order_items.reduce((acc, item) => {
+          // 将数值转换为字符串以避免浮点数精度问题
+          const current =
+            typeof item.order_item_amount === "string"
+              ? parseFloat(item.order_item_amount)
+              : item.order_item_amount;
+          // 使用乘以100再除以100的方法来避免浮点数精度问题
+          return acc + Math.round(current * 100);
+        }, 0) / 100;
+
+      return sum;
+    },
+  },
+  created() {
+    this.currOrderItem = JSON.parse(JSON.stringify(this.orderItem));
+  },
+  mounted() {
+    // 每1秒刷新一次数据（触发界面更新）
+    this.refreshInterval = setInterval(() => {
+      this.$forceUpdate(); // 强制更新视图
+    }, 1000);
+  },
+  beforeDestroy() {
+    // 组件销毁时清除定时器
+    if (this.refreshInterval) {
+      clearInterval(this.refreshInterval);
+    }
+  },
+  methods: {
+    getRemainingTime(arrivalTime) {
+      if (!arrivalTime) return "时间未设定";
+
+      const now = Date.now();
+      const remainingMs = arrivalTime - now;
+
+      if (remainingMs <= 0) return "已超时";
+
+      // 计算分钟和秒
+      const minutes = Math.floor(remainingMs / (1000 * 60));
+      const seconds = Math.floor((remainingMs % (1000 * 60)) / 1000);
+
+      // 格式化为 MM:SS（补零）
+      return `${minutes}:${seconds.toString().padStart(2, "0")}`;
+    },
+    sfFormatStatus(id) {
+      let label = "";
+
+      this.sfStatus.forEach((item) => {
+        if (item.id == id) {
+          label = item.label;
+        }
+      });
+
+      return label;
+    },
+    deliveryTypeName(id) {
+      let label = "";
+      this.deliveryType.forEach((item) => {
+        if (item.id == id) {
+          label = item.label;
+        }
+      });
+
+      return label;
+    },
+    async handerExpedite() {
+      let params = {
+        order_id: this.item.order_id,
+      };
+
+      let res = await GetExpediteSFOrder(params);
+      if (res && res.status == 200) {
+        uni.$u.toast("催单成功");
+      }
+    },
+    showRefundOrderInfo() {
+      this.$emit(
+        "showRefundOrderInfo",
+        !this.orderItem.showRefundOrderInfo,
+        this.orderItemIndex
+      );
+    },
+    makePhone(phone) {
+      // #ifdef H5
+      uni.showToast({
+        title: "H5环境不支持",
+        icon: "none",
+      });
+      // #endif
+
+      // #ifdef APP-PLUS
+      uni.makePhoneCall({
+        phoneNumber: phone,
+        success: function () {
+          console.log("拨打电话成功");
+        },
+        fail: function () {
+          console.log("拨打电话失败");
+        },
+      });
+      // #endif
+    },
+    copy(num, type) {
+      uni.setClipboardData({
+        data: num,
+        success: function () {
+          uni.showToast({
+            title: `${type == "order" ? "订单编号" : "配送单号"}复制成功`,
+            icon: "none",
+          });
+        },
+      });
+    },
+    handerShowCancelOrder() {
+      this.showCancelOrderPopup = true;
+      this.isCancelOrder = true;
+    },
+    handerShowPartOrderRefund() {
+      let _item = JSON.parse(JSON.stringify(this.orderItem));
+
+      _item.order_items.forEach((group) => {
+        group.order_item_quantity_2 = group.order_item_quantity;
+      });
+
+      this.currOrderItem = _item;
+
+      this.showPartOrderRefundPopup = true;
+      this.isCancelOrder = false;
+    },
+    getInitiativeOrderRefund() {
+      var params = {
+        order_id: this.currOrderItem.order_id,
+        reason: this.form.reason,
+      };
+
+      if (!this.isCancelOrder) {
+        if (this.commodityCheckBoxList.length <= 0) {
+          this.$refs.uToast.show({
+            message: "请先选择你要退的商品",
+            type: "error",
+            duration: 1000,
+            zIndex: 12000,
+            position: "top",
+          });
+          return;
+        }
+        const matchedItems = this.currOrderItem.order_items.filter((item) =>
+          this.commodityCheckBoxList.includes(item.item_id)
+        );
+
+        params.order_return_vo = {
+          order_id: this.currOrderItem.order_id,
+          return_items: matchedItems.map((item) => {
+            return {
+              order_item_id: item.item_id,
+              return_item_num: item.order_item_quantity,
+              return_refund_amount:
+                item.order_item_quantity * item.item_unit_price,
+            };
+          }),
+        };
+      }
+
+      this.$refs.uForm.validate().then(async (valid) => {
+        let res = await GetInitiativeOrderRefund(params);
+        if (res && res.status == 200) {
+          this.showCancelOrderPopup = false;
+          this.showPartOrderRefundPopup = false;
+          if (!this.isCancelOrder) {
+            uni.$u.toast("部分订单退款成功");
+          } else {
+            uni.$u.toast("取消订单成功");
+          }
+          this.form.reason = "";
+
+          this.commodityCheckBoxList = [];
+          this.$emit("cancelOrder");
+        }
+        this.showCancelOrderPopup = false;
+        this.showPartOrderRefundPopup = false;
+      });
+    },
+    handerShowOrderPickingPopup() {
+      this.showOrderPickingPopup = true;
+    },
+    async getOrderPicking() {
+      let params = {
+        order_id: this.currOrderItem.order_id,
+        store_id: this.currOrderItem.store_info.store_id,
+      };
+
+      let res = await GetOrderPicking(params);
+      if (res && res.status == 200) {
+        this.showOrderPickingPopup = false;
+        uni.$u.toast("操作成功");
+      }
+      this.showOrderPickingPopup = false;
+    },
   },
 };
 </script>
@@ -265,7 +761,8 @@ export default {
 
 .order_item {
   padding: 24rpx;
-  border-radius: 10rpx;
+  margin-bottom: 24rpx;
+  border-radius: 12rpx;
   background: #fff;
   font-size: 24rpx;
   color: #222;
@@ -299,6 +796,12 @@ export default {
         opacity: 0.2;
       }
 
+      .icon {
+        position: absolute;
+        right: 20rpx;
+        top: 32%;
+      }
+
       .item {
         display: flex;
         align-items: center;
@@ -346,6 +849,28 @@ export default {
         text-align: center;
         font-size: 28rpx;
         font-weight: bold;
+        color: rgba(0, 182, 142, 1);
+      }
+
+      .status-2,
+      .status-22,
+      .status-31,
+      .status-91 {
+        color: red;
+      }
+    }
+  }
+
+  .expresser-2 {
+    color: #000;
+
+    .header {
+      display: flex;
+      align-items: center;
+
+      .symbol {
+        margin-right: 4rpx;
+        font-size: 24rpx;
       }
     }
   }
@@ -383,6 +908,8 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
+      margin-bottom: 20rpx;
+
       .btn_map {
         width: 36rpx;
         height: 36rpx;
@@ -394,6 +921,11 @@ export default {
       .box {
         padding-left: 40rpx;
       }
+
+      .info {
+        text-align: left;
+        color: rgba(34, 34, 34, 0.75);
+      }
     }
 
     .footer {
@@ -433,12 +965,17 @@ export default {
           display: flex;
           align-items: center;
         }
+        .img_box {
+          width: 96rpx;
+          height: 96rpx;
+          border-radius: 10rpx;
+          margin-right: 12rpx;
+          overflow: hidden;
+        }
         .img {
           width: 96rpx;
           height: 96rpx;
-          margin-right: 12rpx;
-          border-radius: 10rpx;
-          background: #666;
+          // background: #666;
         }
       }
       .footer {
@@ -515,9 +1052,9 @@ export default {
       align-items: center;
       margin-bottom: 24rpx;
 
-      .body{
-      display: flex;
-      align-items: center;
+      .body {
+        display: flex;
+        align-items: center;
       }
 
       .red {
@@ -537,7 +1074,7 @@ export default {
       }
       .order_num {
         display: flex;
-      align-items: center;
+        align-items: center;
         &::after {
           display: block;
           content: " ";
@@ -581,5 +1118,183 @@ export default {
       }
     }
   }
+
+  .part-order-refund-popup {
+    ::v-deep.u-popup__content {
+      border-top-left-radius: 16rpx;
+      border-top-right-radius: 16rpx;
+    }
+
+    ::v-deep.u-fade-enter-to {
+      z-index: 10079 !important;
+    }
+
+    .part-order-refund-popup-content {
+      .part-order-refund-popup-title {
+        font-size: 32rpx;
+        padding: 40rpx;
+        text-align: center;
+        font-weight: bold;
+      }
+
+      .affirm-popup-form {
+        padding: 20rpx 60rpx;
+      }
+
+      .radio-list {
+        .commodity-info-item {
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          padding: 0 28rpx;
+
+          .commodity-info-box {
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+
+            .commodity-info-img {
+              margin-right: 20rpx;
+              width: 120rpx;
+              height: 120rpx;
+            }
+          }
+        }
+      }
+    }
+
+    .popup-btn-list {
+      display: flex;
+      margin: 50rpx;
+
+      .btn-item {
+        width: 46%;
+        height: 64rpx;
+        border-color: #909193;
+
+        &::after {
+          border: none;
+        }
+      }
+
+      .btn-item-2 {
+        background: $base-color;
+        color: #fff;
+        border: none;
+      }
+    }
+  }
+
+  .SfFlow-popup {
+    ::v-deep.u-popup__content {
+      border-radius: 16rpx;
+    }
+
+    ::v-deep.u-fade-enter-to {
+      z-index: 10076 !important;
+    }
+
+    .SfFlow-popup-content {
+      width: 600rpx;
+
+      .SfFlow-popup-title {
+        padding: 30rpx 0 20rpx;
+        text-align: center;
+        font-size: 28rpx;
+        font-weight: bold;
+      }
+
+      .SfFlow-content {
+        margin: 40rpx;
+      }
+    }
+  }
+
+  .affirm-popup {
+    ::v-deep.u-popup__content {
+      border-radius: 16rpx;
+    }
+
+    ::v-deep.u-fade-enter-to {
+      z-index: 10076 !important;
+    }
+
+    .affirm-popup-content {
+      width: 600rpx;
+
+      .affirm-popup-title {
+        padding: 60rpx 0 20rpx;
+        text-align: center;
+        font-size: 28rpx;
+        font-weight: bold;
+      }
+
+      .affirm-popup-tips {
+        padding: 0 32rpx;
+        font-size: 28rpx;
+        text-align: center;
+      }
+
+      .u-form {
+        padding: 0 60rpx;
+      }
+
+      .popup-btn-list {
+        display: flex;
+        margin: 50rpx;
+
+        .btn-item {
+          width: 46%;
+          height: 64rpx;
+          border-color: #909193;
+
+          &::after {
+            border: none;
+          }
+        }
+
+        .btn-item-2 {
+          background: $base-color;
+          color: #fff;
+          border: none;
+        }
+      }
+    }
+  }
+
+  .order_picking_box {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 16rpx 0;
+    margin: 0 8rpx;
+    border-bottom: 1px solid #f7f7f7;
+
+    .order_picking_text {
+      font-size: 26rpx;
+      color: #7f7f7f;
+      font-weight: 500;
+      flex: 1;
+
+      text {
+        color: red;
+      }
+    }
+
+    .picking_btn {
+      width: 34%;
+      height: 60rpx;
+      font-size: 24rpx;
+
+      color: #666666;
+      border-color: #666666;
+    }
+  }
+
+  ::v-deep.u-toast {
+    .u-transition {
+      z-index: 12000;
+    }
+  }
 }
 </style>
diff --git a/java-mall-app-shop-admin/pages/order/components/retrunOrderItem.vue b/java-mall-app-shop-admin/pages/order/components/retrunOrderItem.vue
new file mode 100644
index 0000000..6318c9c
--- /dev/null
+++ b/java-mall-app-shop-admin/pages/order/components/retrunOrderItem.vue
@@ -0,0 +1,1128 @@
+<template>
+  <view class="order_item">
+    <view class="expresser expresser-2">
+      <view class="header">
+        <text class="symbol">#</text>
+        <text>{{ currOrderItem.orderNum }}</text>
+      </view>
+      <view class="footer">
+        <view class="status">{{ currOrderItem.return_state_name }}</view>
+      </view>
+    </view>
+
+    <view class="user">
+      <view class="header">
+        <view class="info">
+          <view class="name">{{ currOrderItem.da_name }}/</view>
+          <view class="mobile">{{ currOrderItem.da_mobile }}</view>
+        </view>
+        <view class="box">
+          <view class="btn_call" @click="makePhone(currOrderItem.da_mobile)">
+            联系顾客
+          </view>
+        </view>
+      </view>
+      <view class="body">
+        <view class="info">
+          {{
+            currOrderItem.da_province +
+            currOrderItem.da_city +
+            currOrderItem.da_county +
+            currOrderItem.da_address
+          }}
+        </view>
+        <view class="box">
+          <!-- <view class="btn_map"></view> -->
+        </view>
+      </view>
+      <view class="footer">
+        <view class="info">
+          <text>退货理由:</text>
+          {{ currOrderItem.return_buyer_message }}
+        </view>
+        <view
+          class="info info_proof"
+          v-if="
+            currOrderItem.detailsInfo &&
+            currOrderItem.detailsInfo.items[0].return_item_image.length > 0
+          "
+        >
+          <text>退货凭据</text>
+          <view class="img_content">
+            <u--image
+              class="proof_img"
+              v-for="(imgItem, imgIndex) of currOrderItem.detailsInfo.items[0]
+                .return_item_image"
+              :key="imgIndex"
+              :showLoading="true"
+              :src="imgItem"
+              width="80px"
+              height="80px"
+              @click="
+                handlerShowImg(
+                  currOrderItem.detailsInfo.items[0].return_item_image
+                )
+              "
+            >
+              {{ imgItem }}
+            </u--image>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <view class="goods">
+      <view class="single" v-if="!currOrderItem.showRefundOrderInfo">
+        <view class="body">
+          <view class="info">
+            <image
+              v-for="(item, index) of currOrderItem.items.slice(0, 3)"
+              :src="item.order_item_image"
+              mode="aspectFit"
+              class="img"
+            />
+
+            <view class="total">共{{ currOrderItem.items.length }}件商品</view>
+          </view>
+        </view>
+
+        <view class="footer">
+          <view class="text">合计</view>
+          <view class="prize_type">¥</view>
+          <view class="prize_num">{{ sumBigInts }}</view>
+        </view>
+      </view>
+
+      <view class="list" v-if="currOrderItem.showRefundOrderInfo">
+        <view class="item" v-for="(group, index2) of currOrderItem.items">
+          <image :src="group.order_item_image" mode="aspectFit" class="img" />
+          <view class="box">
+            <view class="tit">{{ group.product_name }}</view>
+            <view class="desc">
+              <view class="total">数量X{{ group.return_item_num }}</view>
+              <view class="price">¥{{ group.return_item_subtotal }}</view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <view
+      class="result"
+      style="border: none"
+      v-if="currOrderItem.showRefundOrderInfo"
+    >
+      <view class="cell">
+        <view class="header">商品总额</view>
+        <view class="body">
+          <text>¥</text>
+          <text class="total">{{ sumBigInts }}</text>
+        </view>
+      </view>
+
+      <view class="cell">
+        <view class="header">实际退款总额</view>
+        <view class="body">
+          ¥
+          <text class="count">{{ currOrderItem.return_refund_amount }}</text>
+        </view>
+      </view>
+    </view>
+
+    <view class="result" v-if="currOrderItem.showRefundOrderInfo">
+      <view class="cell">
+        <view class="header">订单编号</view>
+        <view class="body">
+          <view class="order_num">{{ currOrderItem.order_id }}</view>
+          <view class="btn_copy" @click="copy(currOrderItem.order_id, 'order')">
+            复制
+          </view>
+        </view>
+      </view>
+      <view class="cell">
+        <view class="header">申请时间</view>
+        <view class="body">{{ currOrderItem.return_add_time }}</view>
+      </view>
+      <view class="cell" v-if="currOrderItem.da_time">
+        <view class="header">下单时间</view>
+        <view class="body">{{ currOrderItem.da_time }}</view>
+      </view>
+      <view class="cell">
+        <view class="header">配送方式</view>
+        <view class="body">
+          同城
+          <!-- {{ deliveryTypeName(currOrderItem.delivery_type_id) }} -->
+        </view>
+      </view>
+      <view class="cell">
+        <view class="header">退货单号</view>
+        <view class="body">
+          <view class="order_num">
+            {{ currOrderItem.return_id }}
+          </view>
+          <view
+            class="btn_copy"
+            @click="copy(currOrderItem.return_id, 'retrunId')"
+          >
+            复制
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <view class="tool">
+      <view class="header" @click="handerShowRefundOrderInfo">
+        <template>
+          {{ currOrderItem.showRefundOrderInfo ? "收起" : "更多订单信息" }}
+
+          <u-icon
+            style="display: inline-block; margin-left: 6rpx"
+            :name="
+              currOrderItem.showRefundOrderInfo ? 'arrow-up' : 'arrow-down'
+            "
+            size="8"
+            color="#cccccc"
+          ></u-icon>
+        </template>
+      </view>
+      <view class="body" v-if="currOrderItem.return_state_id == 3105">
+        <view
+          class="btn btn_cancel"
+          @click="handelOpenReturnOrderPopup('noPass')"
+        >
+          拒绝退款
+        </view>
+        <view
+          class="btn btn_refund"
+          @click="handelOpenReturnOrderPopup('pass')"
+        >
+          同意退款
+        </view>
+      </view>
+    </view>
+    <u-popup
+      class="return-order-popup"
+      :show="showReturnOrderPopup"
+      mode="center"
+      round="12"
+      @close="showReturnOrderPopup = false"
+    >
+      <view class="return-order-popup-content">
+        <view class="title">
+          {{ returnOrderType == "pass" ? "同意退款" : "拒绝退款" }}
+        </view>
+        <view class="radio-content" v-if="returnOrderType == 'pass'">
+          <view class="radio-type-name">退货类型：</view>
+          <view class="radio-list">
+            <tui-radio-group class="radio-group" @change="handelRaddio">
+              <view v-for="(item, index) in radioItems" :key="index">
+                <tui-radio
+                  :checked="item.checked"
+                  :value="item.value"
+                  color="#07c160"
+                  borderColor="#999"
+                ></tui-radio>
+                <text class="radio-name">{{ item.name }}</text>
+              </view>
+            </tui-radio-group>
+          </view>
+        </view>
+        <view class="popup-textarea">
+          <u--textarea
+            class="textarea"
+            v-model="retrunOrderMsg"
+            placeholder="请输入原因"
+            :border="'surround'"
+            count
+            :maxlength="40"
+            :height="100"
+          ></u--textarea>
+        </view>
+        <view class="popup-btn-list">
+          <u-button
+            class="btn-item"
+            :hairline="true"
+            :plain="true"
+            shape="circle"
+            @click="showReturnOrderPopup = false"
+          >
+            取消
+          </u-button>
+          <u-button
+            v-if="dashboardInfo.store_info.store_biz_state == 1"
+            class="btn-item btn-item-2"
+            :hairline="true"
+            :plain="true"
+            shape="circle"
+            @click="handerRetrunOrder()"
+          >
+            确认
+          </u-button>
+        </view>
+      </view>
+    </u-popup>
+    <tui-gallery
+      :urls="showImgList"
+      :show="showImg"
+      @hide="hideImg"
+    ></tui-gallery>
+    <u-toast ref="uToast"></u-toast>
+  </view>
+</template>
+
+<script>
+import {
+  GetExpediteSFOrder,
+  GetInitiativeOrderRefund,
+  GetSalesReturnOrderDetails,
+  GetOrderPicking,
+  GetSalesReturnOrderNoPass,
+  GetSalesReturnOrderPass,
+} from "@/api/order";
+import tuiRadio from "@/components/tui-radio/tui-radio.vue";
+import tuiRadioGroup from "@/components/tui-radio-group/tui-radio-group.vue";
+export default {
+  props: {
+    orderItem: {
+      type: Object,
+      default: () => {},
+    },
+    isErrorOrder: {
+      type: Boolean,
+      default: false,
+    },
+    orderItemIndex: {
+      type: Number,
+      default: 0,
+    },
+    dashboardInfo: {
+      type: Object,
+      default: () => {},
+    },
+    salesReturnBtnSearchAcitve: {
+      type: Number,
+      default: 3105,
+    },
+  },
+  components: {
+    tuiRadio,
+    tuiRadioGroup,
+  },
+  data() {
+    return {
+      sfStatus: [
+        {
+          id: 1,
+          label: "已接单",
+        },
+        {
+          id: 2,
+          label: "订单取消",
+        },
+        {
+          id: 10,
+          label: "配送员接单",
+        },
+        {
+          id: 12,
+          label: "配送员到店",
+        },
+        {
+          id: 15,
+          label: "配送中",
+        },
+        {
+          id: 17,
+          label: "配送员妥投完单",
+        },
+        {
+          id: 22,
+          label: "配送员撤单",
+        },
+        {
+          id: 91,
+          label: "骑士上报异常",
+        },
+        {
+          id: 31,
+          label: "取消中",
+        },
+      ],
+      deliveryType: [
+        {
+          id: 5,
+          label: "自提",
+        },
+        {
+          id: 10,
+          label: "普通快递",
+        },
+        {
+          id: 16,
+          label: "同城配送",
+        },
+      ],
+      commodityCheckBoxList: [],
+      refreshInterval: null, // 全局定时器
+      showOrderPickingPopup: false,
+      currOrderItem: {
+        items: [],
+      },
+      isRefreshing: false,
+      showImgList: [],
+      showImg: false,
+      returnOrderType: "",
+      radioOrderType: "",
+      radioItems: [
+        {
+          name: "需要退货",
+          value: "1",
+          checked: true,
+        },
+        {
+          name: "不用退货",
+          value: "0",
+          checked: false,
+        },
+      ],
+      retrunOrderMsg: "",
+      showReturnOrderPopup: false,
+    };
+  },
+  computed: {
+    sumBigInts() {
+      // 高精度累加
+      const sum =
+        this.currOrderItem.items.reduce((acc, item) => {
+          // 将数值转换为字符串以避免浮点数精度问题
+          const current =
+            typeof item.return_item_subtotal === "string"
+              ? parseFloat(item.return_item_subtotal)
+              : item.return_item_subtotal;
+          // 使用乘以100再除以100的方法来避免浮点数精度问题
+          return acc + Math.round(current * 100);
+        }, 0) / 100;
+
+      return sum;
+    },
+  },
+  created() {
+    this.currOrderItem = JSON.parse(JSON.stringify(this.orderItem));
+  },
+  methods: {
+    sfFormatStatus(id) {
+      let label = "";
+
+      this.sfStatus.forEach((item) => {
+        if (item.id == id) {
+          label = item.label;
+        }
+      });
+
+      return label;
+    },
+    deliveryTypeName(id) {
+      let label = "";
+      this.deliveryType.forEach((item) => {
+        if (item.id == id) {
+          label = item.label;
+        }
+      });
+
+      return label;
+    },
+    async handerExpedite() {
+      let params = {
+        order_id: this.item.order_id,
+      };
+
+      let res = await GetExpediteSFOrder(params);
+      if (res && res.status == 200) {
+        uni.$u.toast("催单成功");
+      }
+    },
+    handerShowRefundOrderInfo() {
+      if (!this.currOrderItem.showRefundOrderInfo) {
+        this.getSalesReturnOrderDetails();
+      }
+
+      this.currOrderItem.showRefundOrderInfo =
+        !this.currOrderItem.showRefundOrderInfo;
+    },
+    async getSalesReturnOrderDetails() {
+      let params = {
+        return_id: this.currOrderItem.return_id,
+      };
+
+      let res = await GetSalesReturnOrderDetails(params);
+      if (res && res.status == 200) {
+        this.currOrderItem = {
+          ...this.currOrderItem,
+          detailsInfo: res.data,
+        };
+
+        console.log("currOrderItem", this.currOrderItem);
+      }
+    },
+    handelOpenReturnOrderPopup(type) {
+      this.showReturnOrderPopup = true;
+      this.returnOrderType = type;
+    },
+    makePhone(phone) {
+      // #ifdef H5
+      uni.showToast({
+        title: "H5环境不支持",
+        icon: "none",
+      });
+      // #endif
+
+      // #ifdef APP-PLUS
+      uni.makePhoneCall({
+        phoneNumber: phone,
+        success: function () {
+          console.log("拨打电话成功");
+        },
+        fail: function () {
+          console.log("拨打电话失败");
+        },
+      });
+      // #endif
+    },
+    copy(num, type) {
+      uni.setClipboardData({
+        data: num,
+        success: function () {
+          uni.showToast({
+            title: `${type == "order" ? "订单编号" : "退货单号"}复制成功`,
+            icon: "none",
+          });
+        },
+      });
+    },
+    handelRaddio(e) {
+      this.radioOrderType = e.detail.value;
+    },
+    handerShowCancelOrder() {
+      this.showCancelOrderPopup = true;
+      this.isCancelOrder = true;
+    },
+    handerShowPartOrderRefund() {
+      let _item = JSON.parse(JSON.stringify(this.currOrderItem));
+
+      _item.order_items.forEach((group) => {
+        group.order_item_quantity_2 = group.order_item_quantity;
+      });
+
+      this.currOrderItem = _item;
+
+      this.showPartOrderRefundPopup = true;
+      this.isCancelOrder = false;
+    },
+    handlerShowImg(imgList) {
+      this.showImg = true;
+      const _imgList = imgList.map((item) => {
+        return {
+          src: item,
+          desc: "",
+        };
+      });
+
+      this.showImgList = _imgList;
+      console.log(this.showImgList);
+    },
+    hideImg() {
+      this.showImg = false;
+    },
+    async handerRetrunOrder() {
+      if (this.returnOrderType == "noPass") {
+        let params = {
+          return_id: this.currOrderItem.return_id,
+          return_store_message: this.retrunOrderMsg,
+        };
+
+        let res = await GetSalesReturnOrderNoPass(params);
+        if (res && res.status == 200) {
+          this.showReturnOrderPopup = false;
+          this.$refs.uToast.show({
+            message: "拒绝退款成功",
+            type: "success",
+            duration: 1000,
+            zIndex: 12000,
+          });
+          this.$emit("handerRefreshSalesReturnOrderList");
+        }
+      } else {
+        let params = {
+          return_flag: this.radioOrderType,
+          return_id: this.currOrderItem.return_id,
+          return_store_message: this.retrunOrderMsg,
+        };
+
+        if (this.radioOrderType == 1) {
+          params.receiving_address = 2;
+        }
+
+        let res = await GetSalesReturnOrderPass(params);
+        if (res && res.status == 200) {
+          this.showReturnOrderPopup = false;
+          this.$refs.uToast.show({
+            message: "同意退款成功",
+            type: "success",
+            duration: 1000,
+            zIndex: 12000,
+          });
+          this.$emit("handerRefreshSalesReturnOrderList");
+        }
+      }
+
+      this.showReturnOrderPopup = false;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "@/styles/variables.scss";
+
+.order_item {
+  padding: 24rpx;
+  margin-bottom: 24rpx;
+  border-radius: 12rpx;
+  background: #fff;
+  font-size: 24rpx;
+  color: #222;
+
+  .expresser {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 24rpx;
+
+    .header {
+      text {
+        font-size: 48rpx;
+      }
+    }
+    .body {
+      flex: 1;
+      padding-left: 24rpx;
+      position: relative;
+
+      &::after {
+        position: absolute;
+        right: 0;
+        top: 0;
+        height: 100%;
+        display: block;
+        content: " ";
+        width: 1px;
+        background-image: linear-gradient(to bottom, #000 80%, transparent 20%);
+        background-size: 100% 16rpx;
+        opacity: 0.2;
+      }
+
+      .item {
+        display: flex;
+        align-items: center;
+
+        &.info {
+          margin-bottom: 8rpx;
+        }
+        .time {
+          color: rgba(34, 34, 34, 0.9);
+        }
+        .name {
+          font-weight: bold;
+          display: flex;
+          align-items: center;
+          &::before {
+            display: block;
+            content: " ";
+            width: 36rpx;
+            height: 36rpx;
+            border: 1px solid rgba(0, 0, 0, 0.2);
+            border-radius: 6rpx;
+            margin-right: 12rpx;
+            background: url("@/static/icon_mt.png") no-repeat 50% 50%;
+            background-size: 28rpx 28rpx;
+          }
+        }
+        .btn_call {
+          display: flex;
+          align-items: center;
+          margin-left: 24rpx;
+          &::before {
+            display: block;
+            content: " ";
+            width: 32rpx;
+            height: 32rpx;
+            background: url("@/static/icon_phone.png") no-repeat;
+            background-size: 100%;
+          }
+        }
+      }
+    }
+    .footer {
+      width: 228rpx;
+      .status {
+        text-align: center;
+        font-size: 28rpx;
+        font-weight: bold;
+        color: red;
+      }
+    }
+  }
+
+  .expresser-2 {
+    .header {
+      display: flex;
+      align-items: center;
+
+      .symbol {
+        margin-right: 4rpx;
+        font-size: 24rpx;
+      }
+    }
+  }
+
+  .user {
+    margin-bottom: 24rpx;
+    .header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin-bottom: 12rpx;
+      .info {
+        display: flex;
+        align-items: center;
+        .name {
+          font-size: 28rpx;
+          font-weight: bold;
+        }
+      }
+      .btn_call {
+        display: flex;
+        align-items: center;
+        &::before {
+          display: block;
+          content: " ";
+          width: 32rpx;
+          height: 32rpx;
+          background: url("@/static/icon_phone.png") no-repeat;
+          background-size: 100%;
+        }
+      }
+    }
+
+    .body {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      .btn_map {
+        width: 36rpx;
+        height: 36rpx;
+        border: 1px solid rgba(0, 0, 0, 0.2);
+        border-radius: 6rpx;
+        background: url("@/static/icon_map.png") no-repeat 50% 50%;
+        background-size: 28rpx 28rpx;
+      }
+      .box {
+        padding-left: 40rpx;
+      }
+
+      .info {
+        text-align: left;
+        color: rgba(34, 34, 34, 0.75);
+      }
+    }
+
+    .footer {
+      .info {
+        margin: 16rpx 0 24rpx;
+        background: rgba(254, 247, 234, 0.5);
+        padding: 12rpx 24rpx;
+        border-radius: 8rpx;
+        text {
+          color: #ff801f;
+          display: inline-block;
+          margin-right: 12rpx;
+        }
+      }
+
+      .info_proof {
+        .img_content {
+          display: flex;
+          flex-wrap: wrap;
+          justify-content: left;
+
+          .proof_img {
+            margin: 20rpx;
+          }
+        }
+      }
+
+      &::after {
+        display: block;
+        content: " ";
+        height: 1px;
+        background-image: linear-gradient(to right, #000 50%, transparent 20%);
+        background-size: 16rpx 100%;
+        opacity: 0.2;
+      }
+    }
+  }
+
+  .goods {
+    margin-bottom: 24rpx;
+    .single {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      .body {
+        display: flex;
+        align-items: center;
+        .info {
+          display: flex;
+          align-items: center;
+        }
+        .img {
+          width: 96rpx;
+          height: 96rpx;
+          margin-right: 12rpx;
+          border-radius: 10rpx;
+          background: #666;
+        }
+      }
+      .footer {
+        display: flex;
+        align-items: baseline;
+        line-height: 36rpx;
+        .text {
+          color: #666;
+        }
+        .prize_type {
+          margin-left: 14rpx;
+        }
+        .prize_num {
+          font-size: 28rpx;
+        }
+      }
+    }
+
+    .list {
+      margin-bottom: 24rpx;
+      .item {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-bottom: 20rpx;
+        &:last-child {
+          margin-bottom: 0;
+        }
+        .img {
+          width: 96rpx;
+          height: 96rpx;
+          border-radius: 10rpx;
+          background: #666;
+        }
+        .box {
+          flex: 1;
+          padding: 0 24rpx;
+          .desc {
+            display: flex;
+            color: #666;
+            padding-top: 8rpx;
+            .total {
+              margin-right: 24rpx;
+            }
+          }
+        }
+
+        .counter {
+          display: flex;
+          justify-content: flex-end;
+          align-items: baseline;
+          min-width: 156rpx;
+          .prize_type {
+            font-weight: bold;
+            padding-left: 12rpx;
+          }
+          .prize_num {
+            font-size: 28rpx;
+            font-weight: bold;
+          }
+        }
+      }
+    }
+  }
+
+  .result {
+    border-top: 1px solid rgba(0, 0, 0, 0.1);
+    padding-top: 24rpx;
+
+    .cell {
+      color: #666666;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin-bottom: 24rpx;
+
+      .body {
+        display: flex;
+        align-items: center;
+      }
+
+      .red {
+        color: #fe411b;
+      }
+
+      text {
+        color: #222;
+      }
+      .total {
+        font-size: 28rpx;
+        font-weight: bold;
+      }
+      .count {
+        font-size: 36rpx;
+        font-weight: bold;
+      }
+      .order_num {
+        display: flex;
+        align-items: center;
+        &::after {
+          display: block;
+          content: " ";
+          width: 1px;
+          height: 24rpx;
+          margin: 0 12rpx;
+          background: #ccc;
+        }
+      }
+    }
+  }
+
+  .tool {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .header {
+      color: #666;
+      display: flex;
+      align-items: center;
+      .icon {
+        margin-left: 8rpx;
+      }
+    }
+    .body {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      .btn {
+        width: 132rpx;
+        height: 48rpx;
+        line-height: 48rpx;
+        text-align: center;
+        border: 1px solid #666;
+        border-radius: 8rpx;
+        margin-left: 24rpx;
+      }
+      .btn_refund {
+        border-color: $base-color;
+        color: $base-color;
+      }
+    }
+  }
+
+  .part-order-refund-popup {
+    ::v-deep.u-popup__content {
+      border-top-left-radius: 16rpx;
+      border-top-right-radius: 16rpx;
+    }
+
+    ::v-deep.u-fade-enter-to {
+      z-index: 10079 !important;
+    }
+
+    .part-order-refund-popup-content {
+      .part-order-refund-popup-title {
+        font-size: 32rpx;
+        padding: 40rpx;
+        text-align: center;
+        font-weight: bold;
+      }
+
+      .affirm-popup-form {
+        padding: 20rpx 60rpx;
+      }
+
+      .radio-list {
+        .commodity-info-item {
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          padding: 0 28rpx;
+
+          .commodity-info-box {
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+
+            .commodity-info-img {
+              margin-right: 20rpx;
+              width: 120rpx;
+              height: 120rpx;
+            }
+          }
+        }
+      }
+    }
+
+    .popup-btn-list {
+      display: flex;
+      margin: 50rpx;
+
+      .btn-item {
+        width: 46%;
+        height: 64rpx;
+        border-color: #909193;
+
+        &::after {
+          border: none;
+        }
+      }
+
+      .btn-item-2 {
+        background: $base-color;
+        color: #fff;
+        border: none;
+      }
+    }
+  }
+
+  .affirm-popup {
+    ::v-deep.u-popup__content {
+      border-radius: 16rpx;
+    }
+
+    ::v-deep.u-fade-enter-to {
+      z-index: 10076 !important;
+    }
+
+    .affirm-popup-content {
+      width: 600rpx;
+
+      .affirm-popup-title {
+        padding: 60rpx 0 20rpx;
+        text-align: center;
+        font-size: 28rpx;
+        font-weight: bold;
+      }
+
+      .affirm-popup-tips {
+        padding: 0 32rpx;
+        font-size: 28rpx;
+        text-align: center;
+      }
+
+      .u-form {
+        padding: 0 60rpx;
+      }
+
+      .popup-btn-list {
+        display: flex;
+        margin: 50rpx;
+
+        .btn-item {
+          width: 46%;
+          height: 64rpx;
+          border-color: #909193;
+
+          &::after {
+            border: none;
+          }
+        }
+
+        .btn-item-2 {
+          background: $base-color;
+          color: #fff;
+          border: none;
+        }
+      }
+    }
+  }
+
+  ::v-deep.u-toast {
+    .u-transition {
+      z-index: 12000;
+    }
+  }
+
+  .return-order-popup {
+    .return-order-popup-content {
+      width: 600rpx;
+      min-height: 600rpx;
+
+      .title {
+        margin: 36rpx;
+        text-align: center;
+        font-weight: bold;
+        font-size: 36rpx;
+      }
+
+      .radio-content {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin: 60rpx 40rpx 40rpx;
+
+        .radio-type-name {
+          font-weight: 500;
+        }
+
+        .radio-list {
+          flex: 1;
+          .radio-group {
+            display: flex;
+            align-items: center;
+            justify-content: space-around;
+            line-height: 40rpx;
+
+            .radio-name {
+              margin-left: 8rpx;
+            }
+          }
+        }
+      }
+
+      .popup-textarea {
+        margin: 28rpx;
+        .textarea {
+          border: 1px solid #eeeff3;
+        }
+      }
+
+      .popup-btn-list {
+        display: flex;
+        margin: 50rpx;
+
+        .btn-item {
+          width: 46%;
+          height: 80rpx;
+          border-color: #909193;
+
+          &::after {
+            border: none;
+          }
+        }
+
+        .btn-item-2 {
+          background: $base-color;
+          color: #fff;
+          border: none;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/java-mall-app-shop-admin/pages/order/order.vue b/java-mall-app-shop-admin/pages/order/order.vue
index 25dd3db..da051f4 100644
--- a/java-mall-app-shop-admin/pages/order/order.vue
+++ b/java-mall-app-shop-admin/pages/order/order.vue
@@ -6,18 +6,33 @@
         class="shop-logo-img"
         :style="{ backgroundImage: `url(${logoUrl})` }"
       ></view>
-      <view class="shop-name">{{ shopNmae }}</view>
+      <u-search
+        class="search"
+        placeholder="请输入订单号搜索"
+        :showAction="false"
+        bgColor="#fff"
+        v-model="keyword"
+        @input="searchOrder()"
+      ></u-search>
+      <u-icon
+        @click="toServices"
+        class="icon-shezhi"
+        custom-prefix="custom-icon-kefu custom-icon"
+        size="24"
+        color="#000"
+      ></u-icon>
     </view>
     <view class="tab-content">
       <tui-tabs
         :tabs="tabs"
         :currentTab="currentTab"
-        backgroundColor="#fff"
+        backgroundColor="#f9f9f9"
         :height="88"
         color="#333"
-        :size="32"
+        :size="36"
         selectedColor="#FE411B"
         sliderBgColor="#FE411B"
+        :sliderHeight="4"
         :width="width"
         unlined
         @change="handleTab"
@@ -27,31 +42,37 @@
       <tui-tabs
         :class="['tabs-2', `tab_item_${currentTab2}`]"
         :tabs="tabs2"
-        :width="300"
+        :width="320"
         :currentTab="currentTab2"
         @change="handleTab2"
-        backgroundColor="#fff"
+        backgroundColor="#f9f9f9"
         :height="60"
         :size="28"
         unlined
-        :sliderWidth="150"
-        :sliderHeight="48"
+        :sliderWidth="166"
+        :sliderHeight="64"
         sliderRadius="4rpx"
         bottom="50%"
         color="#888"
-        selectedColor="#fff"
+        selectedColor="#f9f9f9"
         sliderBgColor="#FE411B"
       ></tui-tabs>
+      <view
+        class="screen-content"
+        v-show="currentTab2 == 2"
+        @click="showScreenPopup = true"
+      >
+        <u-icon
+          class="icon-shezhi"
+          custom-prefix="custom-icon-a-Frame3 custom-icon"
+          size="16"
+          color="#fe411b"
+        ></u-icon>
+        筛选
+      </view>
     </view>
-    <view class="search-contetn" v-if="currentTab2 != 2">
-      <u-search
-        placeholder="请输入订单号搜索"
-        :showAction="false"
-        bgColor="#fff"
-        v-model="keyword"
-        @input="searchOrder()"
-      ></u-search>
-      <!-- <view class="btn-content" @click="handleShowDropDown">
+    <!-- <view class="search-contetn" v-if="currentTab2 != 2">
+      <view class="btn-content" @click="handleShowDropDown">
         <tui-dropdown-list :show="showDropdown" :top="94" :height="400">
           <template v-slot:selectionbox>
             <view class="btn-down">
@@ -75,23 +96,8 @@
             </view>
           </template>
         </tui-dropdown-list>
-      </view> -->
-    </view>
-    <view class="sales-retrun-btn-list" v-if="currentTab2 == 2">
-      <u-button
-        :class="[
-          'sales-retrun-btn-item',
-          { active: salesReturnBtnSearchAcitve == item.value },
-        ]"
-        size=""
-        @click="handelSalesReturnSearch(item)"
-        :style="{ width: item.width }"
-        v-for="(item, index) of salesReturnBtnSearchList"
-        :key="index"
-      >
-        {{ item.label }}
-      </u-button>
-    </view>
+      </view>
+    </view> -->
 
     <view class="order-info-content" v-if="currentTab2 == 0">
       <favorite-loading
@@ -101,6 +107,7 @@
         text=""
         animation="spinner15"
       ></favorite-loading>
+
       <scroll-view
         class="uni-swiper-list"
         scroll-y
@@ -108,238 +115,35 @@
         enhanced
         :show-scrollbar="false"
         @scrolltolower="scrolltolower"
-        v-if="orderInfo.order_page_list.records.length > 0"
+        refresher-enabled
+        :refresher-triggered="isRefreshing"
+        @refresherrefresh="handleRefresh"
       >
-        <view
-          :class="[
-            'order-info-block',
-            { 'order-info-oepn': item.showRefundOrderInfo },
-          ]"
+        <OrderItem
+          v-if="
+            orderInfo.order_page_list.records.length > 0 && !showOrderLoading
+          "
           v-for="(item, index) of orderInfo.order_page_list.records"
-          :key="index"
+          :orderItem="item"
+          :orderItemIndex="index"
+          :isErrorOrder="false"
+          @cancelOrder="handerCancelOrder"
+          @showRefundOrderInfo="handerShowRefundOrderInfo"
+        ></OrderItem>
+        <view
+          class="no-data"
+          v-if="
+            orderInfo.order_page_list.records.length <= 0 &&
+            isNoOnlineOrder &&
+            !showOrderLoading
+          "
         >
-          <view class="order-info-hander">
-            <view class="order-num-block">
-              <view class="order-serial-num">
-                #
-                <block
-                  style="
-                    font-size: 46rpx;
-                    padding-left: 4rpx;
-                    font-weight: bold;
-                  "
-                >
-                  {{ item.orderNum }}
-                </block>
-              </view>
-              <view class="delivery-status">
-                {{ sfFormatStatus(item.order_state_id) }}
-              </view>
-            </view>
-            <view class="rider-info" v-if="item.arrival_time && item.order_id">
-              <view class="delivery-time">
-                预计送达{{ formatTime(item.arrival_time) }}前
-              </view>
-              <view class="order-num">订单号：{{ item.order_id }}</view>
-            </view>
-          </view>
-          <view class="" v-show="item.showRefundOrderInfo">
-            <view class="user-info-block">
-              <view class="user-info">
-                {{ item.buyer_info.da_name }} 手机尾号{{
-                  item.buyer_info.da_mobile.slice(-4)
-                }}
-              </view>
-              <view class="user-address">
-                收货地址：{{
-                  item.buyer_info.da_province +
-                  item.buyer_info.da_city +
-                  item.buyer_info.da_county +
-                  item.buyer_info.da_address
-                }}
-              </view>
-              <view class="distance">距离：{{ item.distance / 1000 }}km</view>
-            </view>
-            <view class="picking-info">
-              <view class="picking-status">
-                <view class="picking-name">拣货中</view>
-                <view class="picking-time">
-                  {{ getRemainingTime(item.arrival_time) }}
-                </view>
-              </view>
-              <u-button
-                class="picking-btn"
-                @click="handerShowOrderPickingPopup(item)"
-              >
-                拣货完成
-              </u-button>
-            </view>
-            <view class="delivery-status-info">
-              <view class="delivery-status">
-                {{ sfFormatStatus(item.order_state_id) }}
-              </view>
-              <view class="delivery-num">{{ item.order_pickup_num_str }}</view>
-            </view>
-            <view class="order-remark">
-              <block style="color: #fff; font-weight: bold">备注：</block>
-              <block style="color: #fff">
-                {{ item.buyer_info.order_message }}
-              </block>
-            </view>
-            <view class="commodity-info-block">
-              <view class="commodity-num">
-                <block style="font-size: 36rpx">
-                  {{ item.order_items.length || 0 }}
-                </block>
-                <block>件商品</block>
-              </view>
-              <view
-                class="commodity-info"
-                v-for="(group, index) of item.order_items"
-                :key="index"
-              >
-                <image
-                  class="commodity-info-img"
-                  :src="group.order_item_image"
-                ></image>
-                <view class="commodity-content">
-                  <view class="commodity-name">{{ group.item_name || 0 }}</view>
-                  <view class="commodity-barcode">
-                    条码
-                    <block style="padding-left: 8rpx">
-                      {{ group.item_barcode || 0 }}
-                    </block>
-                  </view>
-                  <view class="commodity-specification">
-                    规格
-                    <block style="padding-left: 8rpx">
-                      {{ group.specification || 0 }}
-                    </block>
-                  </view>
-                </view>
-                <view class="commodity-num">
-                  <view class="">
-                    X
-                    <text style="padding-left: 8rpx">
-                      {{ group.order_item_quantity || 0 }}
-                    </text>
-                  </view>
-                </view>
-                <view class="commodity-price">
-                  ￥{{ group.order_item_amount || 0 }}
-                </view>
-              </view>
-            </view>
-            <!-- <view class="baling-charges-block">
-              <view class="baling-charges-name">打包费</view>
-              <view class="baling charges-num">￥0.5</view>
-            </view> -->
-            <view class="cost-info-block">
-              <view class="cost-info-item cost-info-subtotal">
-                <view class="cost-info-title">小计</view>
-                <view class="cost-info-num">
-                  ￥{{ item.order_product_amount }}
-                </view>
-              </view>
-              <view class="cost-info-item cost-info-subtotal">
-                <view
-                  class="cost-info-title"
-                  style="color: #333333; font-weight: 700"
-                >
-                  商家活动支付
-                  <block>
-                    <u-icon
-                      style="display: inline-block; margin-left: 8rpx"
-                      name="question-circle"
-                      size="12"
-                      color="aaaaaa"
-                    ></u-icon>
-                  </block>
-                </view>
-                <view class="cost-info-num">
-                  ￥{{ item.order_discount_amount }}
-                </view>
-              </view>
-              <view class="cost-info-item cost-info-subtotal">
-                <view
-                  class="cost-info-title"
-                  style="color: #333333; font-weight: 700"
-                >
-                  平台服务费
-                  <block>
-                    <u-icon
-                      style="display: inline-block; margin-left: 8rpx"
-                      name="question-circle"
-                      size="12"
-                      color="#aaaaaa"
-                    ></u-icon>
-                  </block>
-                </view>
-                <view class="cost-info-num">￥{{ item.platform_fee }}</view>
-              </view>
-              <view class="cost-info-item cost-info-subtotal">
-                <view
-                  class="cost-info-title"
-                  style="color: #333333; font-weight: 700"
-                >
-                  配送费用
-                  <block>
-                    <u-icon
-                      style="display: inline-block; margin-left: 8rpx"
-                      name="question-circle"
-                      size="12"
-                      color="#aaaaaa"
-                    ></u-icon>
-                  </block>
-                </view>
-                <view class="cost-info-num">
-                  ￥{{ item.order_shipping_fee }}
-                </view>
-              </view>
-              <!-- <view class="cost-info-income">
-                <view class="predict-income">
-                  预计收入
-                  <block
-                    style="font-size: 40rpx; color: #333333; font-weight: 700"
-                  >
-                    ￥24.95
-                  </block>
-                </view>
-                <view class="customer-actual-payment">
-                  顾客实际支付 ￥30.50
-                </view>
-              </view> -->
-            </view>
-          </view>
-          <view class="order-btn-block">
-            <view class="btn-list">
-              <u-button class="btn-item" @click="handerShowCancelOrder(item)">
-                取消订单
-              </u-button>
-              <!-- <u-button class="btn-item">退差价</u-button> -->
-              <u-button
-                class="btn-item"
-                @click="handerShowPartOrderRefund(item)"
-              >
-                部分退款
-              </u-button>
-            </view>
-            <view class="arrow-item" @click="showRefundOrderInfo(item, index)">
-              {{ item.showRefundOrderInfo ? "收起订单" : "展开订单" }}
-              <u-icon
-                style="display: inline-block; margin-left: 6rpx"
-                :name="item.showRefundOrderInfo ? 'arrow-up' : 'arrow-down'"
-                color="#cccccc"
-                size="12"
-              ></u-icon>
-            </view>
-          </view>
+          <view class="no-data-bg"></view>
+          <view class="no-data-tips">暂无交易记录!</view>
         </view>
         <view
           class="m-loading-box"
-          v-if="
-            orderInfo.order_page_list.records.length > 0 && !isNoOnlineOrder
-          "
+          v-if="!showOrderLoading && !isNoOnlineOrder"
         >
           <block v-if="loadingDownOnlinData">
             <view class="u-loadmore">
@@ -354,13 +158,6 @@
           </block>
         </view>
       </scroll-view>
-      <view
-        class="no-data"
-        v-if="orderInfo.order_page_list.records.length <= 0 && isNoOnlineOrder"
-      >
-        <view class="no-data-bg"></view>
-        <view class="no-data-tips">暂无交易记录!</view>
-      </view>
     </view>
     <view class="order-info-content" v-if="currentTab2 == 1">
       <favorite-loading
@@ -377,220 +174,36 @@
         enhanced
         :show-scrollbar="false"
         @scrolltolower="scrolltolower"
-        v-if="orderInfo.order_page_list.records.length > 0"
+        refresher-enabled
+        :refresher-triggered="isRefreshing"
+        @refresherrefresh="handleRefresh"
       >
-        <view
-          :class="[
-            'order-info-block',
-            { 'order-info-oepn': item.showRefundOrderInfo },
-            { 'order-abnormal': currentTab2 == 1 && item.showRefundOrderInfo },
-          ]"
+        <OrderItem
+          v-show="
+            orderInfo.order_page_list.records.length > 0 && !showOrderLoading
+          "
           v-for="(item, index) of orderInfo.order_page_list.records"
-          :key="index"
+          :orderItem="item"
+          :orderItemIndex="index"
+          :isErrorOrder="true"
+          @cancelOrder="handerCancelOrder"
+          @showRefundOrderInfo="handerShowRefundOrderInfo"
+        ></OrderItem>
+        <view
+          class="no-data"
+          v-if="
+            orderInfo.order_page_list.records.length <= 0 &&
+            isNoOnlineOrder &&
+            !showOrderLoading
+          "
         >
-          <view class="order-info-hander">
-            <view class="order-num-block">
-              <view class="order-serial-num">
-                #
-                <text
-                  style="
-                    font-size: 46rpx;
-                    padding-left: 4rpx;
-                    font-weight: bold;
-                  "
-                >
-                  {{ item.order_pickup_num }}
-                </text>
-              </view>
-              <view class="delivery-status" style="color: red">
-                {{ sfFormatStatus(item.order_state_id) }}
-              </view>
-            </view>
-            <view class="rider-info" v-if="item.arrival_time && item.order_id">
-              <view class="delivery-time">
-                预计送达{{ formatTime(item.arrival_time) }}前
-              </view>
-              <view class="order-num">订单号：{{ item.order_id }}</view>
-            </view>
-          </view>
-          <view class="" v-show="item.showRefundOrderInfo">
-            <view class="user-info-block">
-              <view class="user-info">
-                <view class="user-info-block">
-                  {{ item.buyer_info.da_name }} 手机尾号{{
-                    item.buyer_info.da_mobile.slice(-4)
-                  }}
-                </view>
-                <view class="user-info-icon-block"></view>
-              </view>
-              <view class="user-address">
-                收货地址：{{
-                  item.buyer_info.da_province +
-                  item.buyer_info.da_city +
-                  item.buyer_info.da_county +
-                  item.buyer_info.da_address
-                }}
-              </view>
-              <view class="distance">距离：{{ item.distance / 1000 }}km</view>
-            </view>
-            <!-- <view class="picking-info">
-              <view class="picking-status">
-                <view class="picking-name">拣货中</view>
-                <view class="picking-time">已用时 03:54</view>
-              </view>
-              <u-button class="picking-btn">拣货完成</u-button>
-            </view> -->
-            <view class="delivery-status-info">
-              <!-- <view class="delivery-status">{{
-                sfFormatStatus(item.order_state_id)
-              }}</view> -->
-              <view class="delivery-num">{{ item.order_pickup_num_str }}</view>
-            </view>
-            <view class="order-remark">
-              <text style="font-weight: bold">备注：</text>
-              <text>{{ item.buyer_info.order_message }}</text>
-            </view>
-            <view class="commodity-info-block">
-              <view class="commodity-num">
-                <text style="font-size: 36rpx">
-                  {{ item.order_items.length || 0 }}
-                </text>
-                <text>件商品</text>
-              </view>
-              <view
-                class="commodity-info"
-                v-for="(group, index) of item.order_items"
-                :key="index"
-              >
-                <image
-                  class="commodity-info-img"
-                  :src="group.order_item_image"
-                ></image>
-                <view class="commodity-content">
-                  <view class="commodity-name">{{ group.item_name || 0 }}</view>
-                  <view class="commodity-barcode">
-                    条码
-                    <text style="padding-left: 8rpx">
-                      {{ group.item_barcode || 0 }}
-                    </text>
-                  </view>
-                  <view class="commodity-specification">
-                    规格
-                    <text style="padding-left: 8rpx">
-                      {{ item.specification || 0 }}
-                    </text>
-                  </view>
-                </view>
-                <view class="commodity-num">
-                  X
-                  <text style="padding-left: 8rpx">
-                    {{ item.order_item_quantity || 0 }}
-                  </text>
-                </view>
-                <view class="commodity-price">
-                  ￥{{ item.order_item_amount || 0 }}
-                </view>
-              </view>
-            </view>
-            <!-- <view class="baling-charges-block">
-              <view class="baling-charges-name">打包费</view>
-              <view class="baling charges-num">￥0.5</view>
-            </view> -->
-            <view class="cost-info-block">
-              <view class="cost-info-item cost-info-subtotal">
-                <view class="cost-info-title">小计</view>
-                <view class="cost-info-num">
-                  ￥{{ item.order_product_amount }}
-                </view>
-              </view>
-              <view class="cost-info-item cost-info-subtotal">
-                <view
-                  class="cost-info-title"
-                  style="color: #333333; font-weight: 700"
-                >
-                  商家活动支付
-                  <text>
-                    <u-icon
-                      style="display: inline-block; margin-left: 8rpx"
-                      name="question-circle"
-                      size="12"
-                      color="aaaaaa"
-                    ></u-icon>
-                  </text>
-                </view>
-                <view class="cost-info-num">
-                  ￥{{ item.order_discount_amount }}
-                </view>
-              </view>
-              <view class="cost-info-item cost-info-subtotal">
-                <view
-                  class="cost-info-title"
-                  style="color: #333333; font-weight: 700"
-                >
-                  平台服务费
-                  <text>
-                    <u-icon
-                      style="display: inline-block; margin-left: 8rpx"
-                      name="question-circle"
-                      size="12"
-                      color="#aaaaaa"
-                    ></u-icon>
-                  </text>
-                </view>
-                <view class="cost-info-num">￥{{ item.platform_fee }}</view>
-              </view>
-              <view class="cost-info-item cost-info-subtotal">
-                <view
-                  class="cost-info-title"
-                  style="color: #333333; font-weight: 700"
-                >
-                  配送费用
-                  <text>
-                    <u-icon
-                      style="display: inline-block; margin-left: 8rpx"
-                      name="question-circle"
-                      size="12"
-                      color="#aaaaaa"
-                    ></u-icon>
-                  </text>
-                </view>
-                <view class="cost-info-num">
-                  ￥{{ item.order_shipping_fee }}
-                </view>
-              </view>
-              <view class="cost-info-income">
-                <view class="predict-income">
-                  预计收入
-                  <text
-                    style="font-size: 40rpx; color: #333333; font-weight: 700"
-                  >
-                    ￥24.95
-                  </text>
-                </view>
-                <view class="customer-actual-payment">
-                  顾客实际支付 ￥30.50
-                </view>
-              </view>
-            </view>
-          </view>
-          <view class="order-btn-block">
-            <!-- <view class="btn-list">
-              <u-button class="btn-item">取消订单</u-button>
-              <u-button class="btn-item">退差价</u-button>
-              <u-button class="btn-item">部分退款</u-button>
-            </view> -->
-            <view class="arrow-item" @click="showRefundOrderInfo(item, index)">
-              {{ item.showRefundOrderInfo ? "收起订单" : "展开订单" }}
-              <u-icon
-                style="display: inline-block; margin-left: 6rpx"
-                :name="item.showRefundOrderInfo ? 'arrow-up' : 'arrow-down'"
-                size="12"
-                color="#cccccc"
-              ></u-icon>
-            </view>
-          </view>
+          <view class="no-data-bg"></view>
+          <view class="no-data-tips">暂无交易记录!</view>
         </view>
-        <view class="m-loading-box">
+        <view
+          class="m-loading-box"
+          v-if="!showOrderLoading && !isNoOnlineOrder"
+        >
           <block v-if="loadingDownOnlinData">
             <view class="u-loadmore">
               <view class="u-loading"></view>
@@ -604,13 +217,6 @@
           </block>
         </view>
       </scroll-view>
-      <view
-        class="no-data"
-        v-if="orderInfo.order_page_list.records.length <= 0 && isNoOnlineOrder"
-      >
-        <view class="no-data-bg"></view>
-        <view class="no-data-tips">暂无交易记录!</view>
-      </view>
     </view>
     <view class="order-info-content" v-if="currentTab2 == 2">
       <favorite-loading
@@ -627,259 +233,24 @@
         enhanced
         :show-scrollbar="false"
         @scrolltolower="scrollSalesReturnTolower"
-        v-if="salesReturnOrderList.length > 0"
+        refresher-enabled
+        :refresher-triggered="isRefreshing"
+        @refresherrefresh="handleRefresh"
       >
-        <view
-          :class="[
-            'order-info-block',
-            { 'order-info-oepn': item.showRefundOrderInfo },
-            { 'order-refund': currentTab2 == 2 },
-            {
-              'order-refund-open': currentTab2 == 2 && item.showRefundOrderInfo,
-            },
-          ]"
+        <retrunOrderItem
           v-for="(item, index) of salesReturnOrderList"
-          :key="index"
+          :orderItem="item"
+          :orderItemIndex="index"
+          :dashboardInfo="dashboardInfo"
+          :salesReturnBtnSearchAcitve="salesReturnBtnSearchAcitve"
+          @handerRefreshSalesReturnOrderList="handerRefreshSalesReturnOrderList"
+        ></retrunOrderItem>
+        <view
+          class="no-data"
+          v-if="salesReturnOrderList.length <= 0 && isNoSalesReturnOrderData"
         >
-          <view class="order-info-hander">
-            <view class="order-num-block">
-              <view class="order-serial-num">
-                #
-                <text
-                  style="
-                    font-size: 46rpx;
-                    padding-left: 4rpx;
-                    font-weight: bold;
-                  "
-                >
-                  {{ item.orderNum }}
-                </text>
-              </view>
-              <view class="order-num">退货单号：{{ item.return_id }}</view>
-            </view>
-            <view class="rider-info" v-if="item.order_state_id">
-              <view class="delivery-time"></view>
-              <view class="delivery-status">
-                {{ sfFormatStatus(item.order_state_id) }}
-              </view>
-            </view>
-            <!-- <view class="order-msg-tips">
-              取消原因：订单符合未发货秒退规则，平台已优先退款
-            </view> -->
-          </view>
-          <!-- <view class="steps-content" v-show="item.showRefundOrderInfo">
-            <view class="steps-title">
-              退款
-              <u-icon
-                style="display: inline-block; margin: 0 8rpx"
-                @click="handlePopup"
-                name="question-circle"
-                size="12"
-                color="aaaaaa"
-              ></u-icon>
-            </view>
-            <u-steps :current="0" direction="column" :dot="true">
-              <u-steps-item
-                class="steps-item-1"
-                title="系统自动退款"
-                desc="订单符合未发货秒退规则，平台已优先退款"
-              ></u-steps-item>
-              <u-steps-item
-                title="顾客申请全部退款"
-                desc="理由：商家联系我说没货了"
-              ></u-steps-item>
-            </u-steps>
-          </view> -->
-          <view
-            class=""
-            v-if="
-              item.showRefundOrderInfo &&
-              item.detailsInfo &&
-              Object.keys(item.detailsInfo).length > 0
-            "
-          >
-            <view class="user-info-block">
-              <view class="user-info">
-                {{ item.detailsInfo.da_name }}先生 手机尾号{{
-                  item.detailsInfo.da_mobile.slice(-4)
-                }}
-                <u-icon
-                  @click="makePhone(item.detailsInfo.da_mobile)"
-                  name="phone-fill"
-                  class="icon-phone-fill"
-                  size="40"
-                  color="#FE411B"
-                ></u-icon>
-              </view>
-              <view class="user-address">
-                收货地址：{{ item.detailsInfo.da_address }}
-              </view>
-            </view>
-            <view class="order-remark">
-              <text style="font-weight: bold">退货理由：</text>
-              <text>{{ item.return_buyer_message }}</text>
-            </view>
-            <view
-              class="sales-return-img-title"
-              v-if="item.detailsInfo.items[0].return_item_image.length > 0"
-            >
-              退货凭据
-            </view>
-            <view
-              class="sales-return-img-list"
-              v-if="item.detailsInfo.items[0].return_item_image.length > 0"
-            >
-              <u--image
-                v-for="(imgItem, imgIndex) of item.detailsInfo.items[0]
-                  .return_item_image"
-                :key="imgIndex"
-                :showLoading="true"
-                :src="imgItem"
-                width="80px"
-                height="80px"
-                @click="
-                  handlerShowImg(item.detailsInfo.items[0].return_item_image)
-                "
-              ></u--image>
-            </view>
-            <view class="commodity-info-block">
-              <view class="commodity-num">
-                <text style="font-size: 36rpx">
-                  {{ item.detailsInfo.items[0].return_item_num }}
-                </text>
-                <text>件商品</text>
-              </view>
-              <view
-                class="commodity-info"
-                v-for="(group, index2) of item.detailsInfo.items"
-                :key="index2"
-              >
-                <image
-                  class="commodity-info-img"
-                  :src="group.order_item_image"
-                ></image>
-                <view class="commodity-content">
-                  <view class="commodity-name">{{ group.product_name }}</view>
-                  <!-- <view class="commodity-barcode">
-                    条码
-                    <text style="padding-left: 8rpx">{{ item.barcode }}</text>
-                  </view> -->
-                  <!-- <view class="commodity-specification">
-                    规格
-                    <text style="padding-left: 8rpx">
-                      {{ item.specification }}
-                    </text>
-                  </view> -->
-                </view>
-                <view class="commodity-num">
-                  X
-                  <text style="padding-left: 8rpx">
-                    {{ group.return_item_num }}
-                  </text>
-                </view>
-                <view class="commodity-price">
-                  ￥{{ group.return_item_subtotal }}
-                </view>
-              </view>
-            </view>
-            <!-- <view class="baling-charges-block">
-              <view class="baling-charges-name">打包费</view>
-              <view class="baling charges-num">￥0.5</view>
-            </view> -->
-            <view class="cost-info-block">
-              <!-- <view class="cost-info-item cost-info-subtotal">
-                <view class="cost-info-title">小计</view>
-                <view class="cost-info-num">￥30.50</view>
-              </view>
-              <view class="cost-info-item cost-info-subtotal">
-                <view
-                  class="cost-info-title"
-                  style="color: #333333; font-weight: 700"
-                >
-                  商家活动支付
-                  <text>
-                    <u-icon
-                      style="display: inline-block; margin-left: 8rpx"
-                      name="question-circle"
-                      size="12"
-                      color="aaaaaa"
-                    ></u-icon>
-                  </text>
-                </view>
-                <view class="cost-info-num">￥30.50</view>
-              </view> -->
-              <!-- <view class="cost-info-item cost-info-subtotal">
-                <view
-                  class="cost-info-title"
-                  style="color: #333333; font-weight: 700"
-                >
-                  平台服务费
-                  <text>
-                    <u-icon
-                      style="display: inline-block; margin-left: 8rpx"
-                      name="question-circle"
-                      size="12"
-                      color="#aaaaaa"
-                    ></u-icon>
-                  </text>
-                </view>
-                <view class="cost-info-num">￥30.50</view>
-              </view> -->
-              <view class="cost-info-income">
-                <view class="predict-income">
-                  实际退款总额
-                  <text
-                    style="
-                      margin: 0 10rpx;
-                      font-size: 40rpx;
-                      color: #333333;
-                      font-weight: 700;
-                    "
-                  >
-                    {{ item.return_refund_amount }}
-                  </text>
-                  元
-                </view>
-                <!-- <view class="customer-actual-payment">
-                  顾客实际支付 ￥30.50
-                </view> -->
-              </view>
-            </view>
-          </view>
-          <view class="order-btn-block">
-            <view class="btn-list" v-if="item.return_state_id == 3105">
-              <u-button
-                class="btn-item"
-                @click="handelOpenReturnOrderPopup(item, 'noPass')"
-              >
-                拒绝退款
-              </u-button>
-              <u-button
-                class="btn-item"
-                @click="handelOpenReturnOrderPopup(item, 'pass')"
-              >
-                同意退款
-              </u-button>
-            </view>
-            <view class="btn-list retrun-state-name" v-else>
-              {{ item.return_state_name }}
-            </view>
-            <view
-              class="arrow-item arrow-item-2"
-              @click="showRefundOrderInfo(item, index)"
-            >
-              <view class="time">{{ item.return_add_time }}</view>
-              <view>
-                {{ item.showRefundOrderInfo ? "收起订单" : "展开订单" }}
-                <u-icon
-                  style="display: inline-block; margin-left: 6rpx"
-                  :name="item.showRefundOrderInfo ? 'arrow-up' : 'arrow-down'"
-                  size="12"
-                  color="#cccccc"
-                ></u-icon>
-              </view>
-            </view>
-          </view>
+          <view class="no-data-bg"></view>
+          <view class="no-data-tips">暂无交易记录!</view>
         </view>
         <view
           class="m-loading-box"
@@ -898,237 +269,40 @@
           </block>
         </view>
       </scroll-view>
-      <view
-        class="no-data"
-        v-if="salesReturnOrderList.length <= 0 && isNoSalesReturnOrderData"
-      >
-        <view class="no-data-bg"></view>
-        <view class="no-data-tips">暂无交易记录!</view>
-      </view>
     </view>
-    <tabbar tabbarName="order"></tabbar>
-    <tui-gallery
-      :urls="showImgList"
-      :show="showImg"
-      @hide="hideImg"
-    ></tui-gallery>
+
     <u-popup
-      class="return-order-popup"
-      :show="showReturnOrderPopup"
-      mode="center"
-      round="12"
-      @close="handerCloseReturnOrderPopup"
-    >
-      <view class="return-order-popup-content">
-        <view class="title">
-          {{ returnOrderType == "pass" ? "退货确认" : "拒绝退款" }}
-        </view>
-        <view class="radio-content" v-if="returnOrderType == 'pass'">
-          <view class="radio-type-name">退货类型：</view>
-          <view class="radio-list">
-            <tui-radio-group class="radio-group" @change="handelRaddio">
-              <view v-for="(item, index) in radioItems" :key="index">
-                <tui-radio
-                  :checked="item.checked"
-                  :value="item.value"
-                  color="#07c160"
-                  borderColor="#999"
-                ></tui-radio>
-                <text class="radio-name">{{ item.name }}</text>
-              </view>
-            </tui-radio-group>
-          </view>
-        </view>
-        <view class="popup-textarea">
-          <u--textarea
-            class="textarea"
-            v-model="retrunOrderMsg"
-            placeholder="请输入商家备注"
-            :border="'surround'"
-            count
-            :maxlength="40"
-            :height="100"
-          ></u--textarea>
-        </view>
-        <view class="popup-btn-list">
-          <u-button
-            class="btn-item"
-            :hairline="true"
-            :plain="true"
-            shape="circle"
-            @click="showReturnOrderPopup = false"
-          >
-            取消
-          </u-button>
-          <u-button
-            v-if="dashboardInfo.store_info.store_biz_state == 1"
-            class="btn-item btn-item-2"
-            :hairline="true"
-            :plain="true"
-            shape="circle"
-            @click="getInitiativeOrderRefund()"
-          >
-            确认
-          </u-button>
-        </view>
-      </view>
-    </u-popup>
-    <u-popup
-      class="affirm-popup"
-      zIndex="10077"
-      :show="showCancelOrderPopup"
-      mode="center"
-      @close="showCancelOrderPopup = false"
-    >
-      <view class="affirm-popup-content">
-        <view class="affirm-popup-title">取消订单</view>
-        <view class="affirm-popup-tips">
-          取消订单后，金额将原路退回给用户，确定取消？
-        </view>
-        <view class="affirm-popup-form">
-          <u--form
-            labelPosition="left"
-            :model="form"
-            ref="uForm"
-            label-width="100"
-            :rules="rules"
-          >
-            <u-form-item
-              label="退款原因"
-              prop="reason"
-              class="form-item"
-              required
-            >
-              <u--textarea
-                class="u-textarea"
-                v-model="form.reason"
-                count
-                autoHeight
-                maxlength="100"
-                placeholder="请输入取消订单原因"
-              ></u--textarea>
-            </u-form-item>
-          </u--form>
-        </view>
-        <view class="popup-btn-list">
-          <u-button
-            class="btn-item"
-            :hairline="true"
-            :plain="true"
-            shape="circle"
-            @click="showCancelOrderPopup = false"
-          >
-            取消
-          </u-button>
-          <u-button
-            class="btn-item btn-item-2"
-            :hairline="true"
-            :plain="true"
-            shape="circle"
-            @click="getInitiativeOrderRefund"
-          >
-            确定
-          </u-button>
-        </view>
-      </view>
-    </u-popup>
-    <u-popup
-      class="part-order-refund-popup"
+      class="screen-popup"
       zIndex="10080"
-      :show="showPartOrderRefundPopup"
+      :show="showScreenPopup"
       mode="bottom"
       closeable
-      @close="showPartOrderRefundPopup = false"
+      @close="showScreenPopup = false"
     >
-      <view class="part-order-refund-popup-content">
-        <view class="part-order-refund-popup-title">部分退款</view>
-        <scroll-view
-          scroll-y
-          class="specification-type-search-scroll"
-          :show-scrollbar="false"
-          :style="{
-            maxHeight: currOrderItem.order_items.length >= 5 ? '500px' : 'none',
-            overflowY:
-              currOrderItem.order_items.length >= 5 ? 'auto' : 'visible',
-          }"
-        >
-          <view class="affirm-popup-form">
-            <u--form
-              labelPosition="left"
-              :model="form"
-              ref="uForm"
-              label-width="100"
-              :rules="rules"
-            >
-              <u-form-item
-                label="退款原因"
-                prop="reason"
-                class="form-item"
-                required
-              >
-                <u--textarea
-                  class="u-textarea"
-                  v-model="form.reason"
-                  count
-                  autoHeight
-                  maxlength="100"
-                  placeholder="请输入取消订单原因"
-                ></u--textarea>
-              </u-form-item>
-            </u--form>
-          </view>
-          <view class="radio-list" v-if="currOrderItem.order_items.length > 0">
-            <u-checkbox-group
-              v-model="commodityCheckBoxList"
-              placement="column"
-            >
-              <view
-                class="commodity-info-item"
-                v-for="(item, index) of currOrderItem.order_items"
-                :key="index"
-              >
-                <view class="commodity-info-box">
-                  <image
-                    class="commodity-info-img"
-                    :src="item.order_item_image"
-                  ></image>
-
-                  <view class="commodity-content">
-                    <view class="commodity-name">
-                      {{ item.item_name || 0 }}
-                    </view>
-
-                    <view style="padding-left: 8rpx">
-                      X{{ item.order_item_quantity || 0 }}
-                    </view>
-                    <view class="commodity-price">
-                      ￥{{
-                        item.order_item_quantity * item.item_unit_price || 0
-                      }}
-                    </view>
-                  </view>
-                </view>
-                <u-number-box
-                  :min="1"
-                  :max="item.order_item_quantity_2"
-                  v-model="item.order_item_quantity"
-                ></u-number-box>
-                <u-checkbox
-                  :customStyle="{ marginBottom: '8px' }"
-                  :key="index"
-                  :name="item.item_id"
-                ></u-checkbox>
-              </view>
-            </u-checkbox-group>
-          </view>
-        </scroll-view>
+      <view class="screen-popup-content">
+        <view class="screen-popup-title">筛选</view>
+        <view class="sales-retrun-btn-list">
+          <u-button
+            :class="[
+              'sales-retrun-btn-item',
+              { active: salesReturnBtnSearchAcitve == item.value },
+            ]"
+            size=""
+            @click="handelSalesReturnSearch(item)"
+            :style="{ width: item.width }"
+            v-for="(item, index) of salesReturnBtnSearchList"
+            :key="index"
+          >
+            {{ item.label }}
+          </u-button>
+        </view>
         <view class="popup-btn-list">
           <u-button
             class="btn-item"
             :hairline="true"
             :plain="true"
             shape="circle"
-            @click="showPartOrderRefundPopup = false"
+            @click="showScreenPopup = false"
           >
             取消
           </u-button>
@@ -1137,50 +311,15 @@
             :hairline="true"
             :plain="true"
             shape="circle"
-            @click="getInitiativeOrderRefund"
+            @click="handerRetrunOrderScreen"
           >
             确认
           </u-button>
         </view>
       </view>
     </u-popup>
-    <u-popup
-      class="affirm-popup"
-      zIndex="10077"
-      :show="showOrderPickingPopup"
-      mode="center"
-      @close="showOrderPickingPopup = false"
-    >
-      <view class="affirm-popup-content">
-        <view class="affirm-popup-title">取消订单</view>
-        <view class="affirm-popup-tips">
-          确定将取货号“ {{ currOrderItem.order_pickup_num }} ”提前拣货完成？
-        </view>
-        <view class="popup-btn-list">
-          <u-button
-            class="btn-item"
-            :hairline="true"
-            :plain="true"
-            shape="circle"
-            @click="showOrderPickingPopup = false"
-          >
-            取消
-          </u-button>
-          <u-button
-            class="btn-item btn-item-2"
-            :hairline="true"
-            :plain="true"
-            shape="circle"
-            @click="getOrderPicking"
-          >
-            确定
-          </u-button>
-        </view>
-      </view>
-    </u-popup>
     <u-toast ref="uToast"></u-toast>
-
-    <OrderItem></OrderItem>
+    <tabbar tabbarName="order"></tabbar>
   </view>
 </template>
 
@@ -1208,6 +347,7 @@ import tuiRadioGroup from "@/components/tui-radio-group/tui-radio-group.vue";
 import tuiSelect from "@/components/tui-select/tui-select.vue";
 
 import OrderItem from "./components/OrderItem.vue";
+import retrunOrderItem from "./components/retrunOrderItem.vue";
 export default {
   components: {
     tuiTabs,
@@ -1219,7 +359,8 @@ export default {
     tuiRadio,
     tuiRadioGroup,
     tuiSelect,
-       OrderItem,
+    OrderItem,
+    retrunOrderItem,
   },
   data() {
     return {
@@ -1452,6 +593,8 @@ export default {
       commodityCheckBoxList: [],
       refreshInterval: null, // 全局定时器
       showOrderPickingPopup: false,
+      isRefreshing: false,
+      showScreenPopup: false,
     };
   },
   computed: {
@@ -1483,32 +626,9 @@ export default {
   },
   onPullDownRefresh() {
     this.pageNum = 1;
-    this.pageSize = 10;
     this.keyword = "";
     this.getOrderList();
   },
-  mounted() {
-    // 每1秒刷新一次数据（触发界面更新）
-    this.refreshInterval = setInterval(() => {
-      this.$forceUpdate(); // 强制更新视图
-    }, 1000);
-  },
-
-  beforeDestroy() {
-    // 组件销毁时清除定时器
-    if (this.refreshInterval) {
-      clearInterval(this.refreshInterval);
-    }
-  },
-  // onReachBottom() {
-  //   clearTimeout(this.time);
-  //   this.loadingDownOnlinData = true;
-  //   this.time = setTimeout(() => {
-  //     this.pageNum = this.pageNum + 1;
-  //     this.getOrderList();
-  //   }, 500);
-  // },
-
   methods: {
     async getOrderList() {
       let accountDashboard = uni.getStorageSync("accountDashboard");
@@ -1579,6 +699,7 @@ export default {
         if (res.data.order_page_list.records.length <= 0) {
           this.showOrderLoading = false;
           this.isNoOnlineOrder = true;
+          this.isRefreshing = false;
           return;
         }
 
@@ -1587,6 +708,21 @@ export default {
             if (item) {
               item.orderNum = index + 1;
               item.showRefundOrderInfo = false;
+              item.sf_order_info = {
+                sf_order_id: "",
+                operator_name: "",
+                operator_phone: "",
+                rider_lng: "",
+                rider_lat: "",
+                order_status: "",
+                status_desc: "",
+                cancel_code: "",
+                cancel_reason: "",
+                push_time: "",
+                h5_url: "",
+                feed: [],
+                ...item.sf_order_info,
+              };
             }
             return item;
           });
@@ -1594,8 +730,26 @@ export default {
 
       this.showOrderLoading = false;
       this.loadingDownOnlinData = false;
+      this.isRefreshing = false;
       // uni.stopPullDownRefresh();
     },
+    handleRefresh() {
+      this.isRefreshing = true;
+
+      this.pageNum = 1;
+      this.isNoOnlineOrder = false;
+      this.loadingDownOnlinData = false;
+      this.isDownNoOrderData = false;
+
+      this.isNoSalesReturnOrderData = false;
+      this.loadingDownSalesReturnData = false;
+      this.isDownNoSalesReturnData = false;
+      if (this.currentTab2 == 2) {
+        this.getSalesReturnOrderList();
+      } else {
+        this.getOrderList();
+      }
+    },
     getRemainingTime(arrivalTime) {
       if (!arrivalTime) return "时间未设定";
 
@@ -1613,14 +767,8 @@ export default {
     },
     handelSalesReturnSearch(item) {
       if (item.value == this.salesReturnBtnSearchAcitve) return;
-      this.pageNum = 1;
-      this.pageSize = 10;
-      this.salesReturnBtnSearchAcitve = item.value;
-      this.loadingDownSalesReturnData = false;
-      this.isNoSalesReturnOrderData = false;
-      this.isDownNoSalesReturnData = false;
 
-      this.getSalesReturnOrderList(item.value);
+      this.salesReturnBtnSearchAcitve = item.value;
     },
     async getSalesReturnOrderList(returnStateId = 3105) {
       if (this.loadingDownSalesReturnData) {
@@ -1629,9 +777,12 @@ export default {
         this.showOrderLoading = true;
       }
 
+      console.log(this.keyword);
+
       let params = {
         pageNum: this.pageNum,
         pageSize: this.pageSize,
+        order_id: this.keyword,
         return_state_id: returnStateId,
       };
 
@@ -1657,6 +808,7 @@ export default {
         if (res.data.items <= 0) {
           this.showOrderLoading = false;
           this.isNoSalesReturnOrderData = true;
+          this.isRefreshing = false;
           return;
         }
 
@@ -1673,6 +825,7 @@ export default {
       }
       this.showOrderLoading = false;
       this.loadingDownSalesReturnData = false;
+      this.isRefreshing = false;
     },
     async getSalesReturnOrderDetails(item, index) {
       let params = {
@@ -1692,22 +845,16 @@ export default {
       }
     },
 
-    showRefundOrderInfo(item, index) {
+    handerShowRefundOrderInfo(showRefundOrderInfo, index) {
       if (this.currentTab2 == 2) {
-        if (!item.showRefundOrderInfo) {
-          this.getSalesReturnOrderDetails(item, index);
-        }
-
         this.$set(this.salesReturnOrderList, index, {
-          ...item,
-          showRefundOrderInfo: !item.showRefundOrderInfo,
+          ...this.salesReturnOrderList[index],
+          showRefundOrderInfo: showRefundOrderInfo,
         });
-      }
-
-      if (this.currentTab2 != 2) {
+      } else {
         this.$set(this.orderInfo.order_page_list.records, index, {
-          ...item,
-          showRefundOrderInfo: !item.showRefundOrderInfo,
+          ...this.orderInfo.order_page_list.records[index],
+          showRefundOrderInfo: showRefundOrderInfo,
         });
       }
     },
@@ -1743,51 +890,7 @@ export default {
     handerCloseReturnOrderPopup() {
       this.showReturnOrderPopup = false;
     },
-    makePhone(phone) {
-      // #ifdef H5
-      uni.showToast({
-        title: "H5环境不支持",
-        icon: "none",
-      });
-      // #endif
 
-      // #ifdef APP-PLUS
-      uni.makePhoneCall({
-        phoneNumber: phone,
-        success: function () {
-          console.log("拨打电话成功");
-        },
-        fail: function () {
-          console.log("拨打电话失败");
-        },
-      });
-      // #endif
-    },
-    sfFormatStatus(id) {
-      let label = "";
-      this.sfStatus.forEach((item) => {
-        if (item.id == id) {
-          label = item.label;
-        }
-      });
-
-      return label;
-    },
-    handlerShowImg(imgList) {
-      this.showImg = true;
-      const _imgList = imgList.map((item) => {
-        return {
-          src: item,
-          desc: "",
-        };
-      });
-
-      this.showImgList = _imgList;
-      console.log(this.showImgList);
-    },
-    hideImg() {
-      this.showImg = false;
-    },
     formatTime(time) {
       let date = new Date(time);
       let hours = String(date.getHours()).padStart(2, "0");
@@ -1797,7 +900,6 @@ export default {
     handleTab(e) {
       this.currentTab = e.index;
       this.pageNum = 1;
-      this.pageSize = 10;
       this.keyword = "";
       this.isNoOnlineOrder = false;
       this.getOrderList();
@@ -1806,7 +908,6 @@ export default {
       this.currentTab2 = e.index;
 
       this.pageNum = 1;
-      this.pageSize = 10;
       this.keyword = "";
       this.isNoOnlineOrder = false;
       this.loadingDownOnlinData = false;
@@ -1824,10 +925,14 @@ export default {
     },
     searchOrder() {
       this.pageNum = 1;
-      this.pageSize = 10;
+      this.keyword = "";
 
       setTimeout(() => {
-        this.getOrderList();
+        if (this.currentTab2 == 2) {
+          this.getSalesReturnOrderList();
+        } else {
+          this.getOrderList();
+        }
       }, 600);
     },
     scrolltolower() {
@@ -1851,45 +956,9 @@ export default {
     handleShowDropDown() {
       this.showDropdown = !this.showDropdown;
     },
-    handelOpenReturnOrderPopup(item, type) {
-      this.showReturnOrderPopup = true;
-      this.returnOrderType = type;
-      this.currReturnId = item.return_id;
-    },
-    handelRaddio(e) {
-      this.radioOrderType = e.detail.value;
-    },
-    async handerRetrunOrder() {
-      if (this.returnOrderType == "noPass") {
-        let params = {
-          return_id: this.currReturnId,
-          return_store_message: this.retrunOrderMsg,
-        };
-
-        let res = await GetSalesReturnOrderNoPass(params);
-        if (res && res.status == 200) {
-          this.currReturnId = "";
-          this.retrunOrderMsg = "";
-          this.getSalesReturnOrderList();
-        }
-      } else {
-        let params = {
-          return_flag: this.radioOrderType,
-          return_id: this.currReturnId,
-          return_store_message: this.retrunOrderMsg,
-        };
-
-        if (this.radioOrderType == 1) {
-          params.receiving_address = 2;
-        }
-
-        let res = await GetSalesReturnOrderPass(params);
-        if (res && res.status == 200) {
-          this.currReturnId = "";
-          this.retrunOrderMsg = "";
-          this.getSalesReturnOrderList();
-        }
-      }
+    handerCancelOrder() {
+      this.pageNum = 1;
+      this.getOrderList();
     },
     handerShowCancelOrder(item) {
       this.currOrderItem = JSON.parse(JSON.stringify(item));
@@ -1908,62 +977,17 @@ export default {
       this.showPartOrderRefundPopup = true;
       this.isCancelOrder = false;
     },
-    getInitiativeOrderRefund() {
-      var params = {
-        order_id: this.currOrderItem.order_id,
-        reason: this.form.reason,
-      };
-
-      if (!this.isCancelOrder) {
-        if (this.commodityCheckBoxList.length <= 0) {
-          this.$refs.uToast.show({
-            message: "请先选择你要退的商品",
-            type: "error",
-            duration: 1000,
-            zIndex: 12000,
-            position: "top",
-          });
-          return;
-        }
-        const matchedItems = this.currOrderItem.order_items.filter((item) =>
-          this.commodityCheckBoxList.includes(item.item_id)
-        );
-
-        params.order_return_vo = {
-          order_id: this.currOrderItem.order_id,
-          return_items: matchedItems.map((item) => {
-            return {
-              order_item_id: item.item_id,
-              return_item_num: item.order_item_quantity,
-              return_refund_amount:
-                item.order_item_quantity * item.item_unit_price,
-            };
-          }),
-        };
-      }
-
-      this.$refs.uForm.validate().then(async (valid) => {
-        let res = await GetInitiativeOrderRefund(params);
-        if (res && res.status == 200) {
-          this.showCancelOrderPopup = false;
-          this.showPartOrderRefundPopup = false;
-          if (!this.isCancelOrder) {
-            uni.$u.toast("部分订单退款成功");
-          } else {
-            uni.$u.toast("取消订单成功");
-          }
-          this.form.reason = "";
-          this.pageNum = 1;
-          this.commodityCheckBoxList = [];
-          this.getOrderList();
-        }
-        this.showCancelOrderPopup = false;
-        this.showPartOrderRefundPopup = false;
-      });
+    handerRefreshSalesReturnOrderList() {
+      this.getSalesReturnOrderList();
     },
-    handerShowOrderPickingPopup(item) {
-      this.currOrderItem = item;
-      this.showOrderPickingPopup = true;
+
+    handerRetrunOrderScreen() {
+      this.pageNum = 1;
+      this.loadingDownSalesReturnData = false;
+      this.isNoSalesReturnOrderData = false;
+      this.isDownNoSalesReturnData = false;
+      this.getSalesReturnOrderList(this.salesReturnBtnSearchAcitve);
+      this.showScreenPopup = false;
     },
     async getOrderPicking(item) {
       let params = {
@@ -1978,6 +1002,33 @@ export default {
       }
       this.showOrderPickingPopup = false;
     },
+    toServices() {
+      let item = {
+        user_friend_id: 36,
+        user_id: 10001,
+        friend_id: 10001,
+        friend_note: "",
+        user_friend_addtime: "2025-05-09 10:03:33",
+        friend_state: 2,
+        friend_invite: 2,
+        username: "系统客服",
+        avatar:
+          "https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/media/media/plantform/20250307/c4cab676e06a49b282c2cbbe481f0fa1.png",
+        sign: "",
+        level_name: "v1",
+        user_nickname: "系统客服",
+        user_avatar:
+          "https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/media/media/plantform/20250307/c4cab676e06a49b282c2cbbe481f0fa1.png",
+        user_sign: "",
+        user_level_name: "v1",
+        rid: 2,
+        id: 776395489,
+      };
+
+      uni.navigateTo({
+        url: `/pages/IM/IMmsgContent?item=${JSON.stringify(item)}`,
+      });
+    },
   },
 };
 </script>
@@ -1986,22 +1037,33 @@ export default {
 @import "@/styles/variables.scss";
 .index-container {
   // overflow: hidden;
-  background: #eeeff3;
+  background: #f9f9f9;
   min-height: 100vh;
   .shop-info {
     display: flex;
     align-items: center;
-    padding: 40rpx;
-    padding-top: 20rpx;
-    background: #fff;
+    padding: 28rpx 32rpx;
 
     .shop-logo-img {
-      width: 90rpx;
-      height: 90rpx;
+      width: 64rpx;
+      height: 64rpx;
       background-image: url("../../static/logo.jpg");
       background-size: 100% 100%;
       border-radius: 50%;
     }
+
+    .search {
+      margin: 0 44rpx !important;
+
+      ::v-deep.u-search__content {
+        height: 38px !important;
+      }
+
+      ::v-deep.u-search__content__input {
+        font-size: 12px;
+      }
+    }
+
     .shop-name {
       margin-left: 20rpx;
       font-weight: bold;
@@ -2015,8 +1077,9 @@ export default {
   }
 
   .tab-content {
-    padding-bottom: 20rpx;
-    background: #fff;
+    padding: 0 20rpx;
+    padding-bottom: 16rpx;
+    border-bottom: 1px solid #eeeeee;
     // ::v-deep .tui-tabs-title {
     //   font-size: 36rpx !important;
     // }
@@ -2026,17 +1089,29 @@ export default {
   }
 
   .tab2-content {
-    background: #fff;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin: 30rpx 0;
+
     ::v-deep .tui-tabs-slider {
       background: #ffecf2 !important;
-      border: 2rpx solid #fe411b;
+      // border: 2rpx solid #fe411b;
       bottom: 48% !important;
     }
+
+    ::v-deep.tabs-2 {
+      left: -10px;
+    }
+
     ::v-deep .tui-tabs-item {
-      line-height: 60rpx;
+      margin: 0 10rpx;
+      height: 32px !important;
+      line-height: 32px !important;
+      background: #fff;
 
       .tui-tabs-title {
-        color: #333 !important;
+        color: rgba(34, 34, 34, 1) !important;
       }
       &.tui__tab_current {
         .tui-tabs-title {
@@ -2044,6 +1119,16 @@ export default {
         }
       }
     }
+
+    .screen-content {
+      display: flex;
+      flex-flow: column;
+      align-items: center;
+      font-size: 24rpx;
+      text-align: center;
+      margin-right: 32rpx;
+      color: $base-color;
+    }
   }
 
   .sales-return-img-title {
@@ -2093,19 +1178,24 @@ export default {
 
     .active {
       // background: $base-color;
-      color: #fe411b;
+      color: $base-color;
+
+      &::after {
+        border: 1px solid $base-color;
+      }
     }
   }
 
   .order-info-content {
+    margin: 28rpx 24rpx;
     border-radius: 8rpx;
 
     .uni-swiper-list {
-      height: calc(100vh - 320px);
+      height: calc(100vh - 250px);
     }
 
     .uni-swiper-return-list {
-      height: calc(100vh - 350px);
+      height: calc(100vh - 250px);
     }
 
     .order-msg-tips {
@@ -2425,9 +1515,43 @@ export default {
     font-size: 28rpx;
   }
 
+  .screen-popup {
+    .screen-popup-content {
+      width: 100%;
+
+      .screen-popup-title {
+        margin: 36rpx;
+        text-align: center;
+        font-weight: bold;
+        font-size: 36rpx;
+      }
+
+      .popup-btn-list {
+        display: flex;
+        margin: 50rpx;
+
+        .btn-item {
+          width: 46%;
+          height: 80rpx;
+          border-color: #909193;
+
+          &::after {
+            border: none;
+          }
+        }
+
+        .btn-item-2 {
+          background: $base-color;
+          color: #fff;
+          border: none;
+        }
+      }
+    }
+  }
+
   .no-data {
     .no-data-bg {
-      margin: auto;
+      margin: 23% auto;
       margin-bottom: 0;
       width: 480rpx;
       height: 480rpx;
@@ -2506,58 +1630,6 @@ export default {
     }
   }
 
-  .affirm-popup {
-    ::v-deep.u-popup__content {
-      border-radius: 16rpx;
-    }
-
-    ::v-deep.u-fade-enter-to {
-      z-index: 10076 !important;
-    }
-
-    .affirm-popup-content {
-      width: 600rpx;
-
-      .affirm-popup-title {
-        padding: 60rpx 0 20rpx;
-        text-align: center;
-        font-size: 28rpx;
-        font-weight: bold;
-      }
-
-      .affirm-popup-tips {
-        padding: 0 32rpx;
-        font-size: 28rpx;
-        text-align: center;
-      }
-
-      .u-form {
-        padding: 0 60rpx;
-      }
-
-      .popup-btn-list {
-        display: flex;
-        margin: 50rpx;
-
-        .btn-item {
-          width: 46%;
-          height: 64rpx;
-          border-color: #909193;
-
-          &::after {
-            border: none;
-          }
-        }
-
-        .btn-item-2 {
-          background: $base-color;
-          color: #fff;
-          border: none;
-        }
-      }
-    }
-  }
-
   .tui-animation {
     display: inline-block;
     transform: rotate(0deg);
@@ -2575,72 +1647,5 @@ export default {
   .retrun-state-name {
     color: $base-color;
   }
-
-  .return-order-popup {
-    .return-order-popup-content {
-      width: 600rpx;
-      min-height: 600rpx;
-
-      .title {
-        margin: 36rpx;
-        text-align: center;
-        font-weight: bold;
-        font-size: 36rpx;
-      }
-
-      .radio-content {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        margin: 60rpx 40rpx 40rpx;
-
-        .radio-type-name {
-          font-weight: 500;
-        }
-
-        .radio-list {
-          flex: 1;
-          .radio-group {
-            display: flex;
-            align-items: center;
-            justify-content: space-around;
-            line-height: 40rpx;
-
-            .radio-name {
-              margin-left: 8rpx;
-            }
-          }
-        }
-      }
-
-      .popup-textarea {
-        margin: 28rpx;
-        .textarea {
-          border: 1px solid #eeeff3;
-        }
-      }
-
-      .popup-btn-list {
-        display: flex;
-        margin: 50rpx;
-
-        .btn-item {
-          width: 46%;
-          height: 80rpx;
-          border-color: #909193;
-
-          &::after {
-            border: none;
-          }
-        }
-
-        .btn-item-2 {
-          background: $base-color;
-          color: #fff;
-          border: none;
-        }
-      }
-    }
-  }
 }
 </style>
diff --git a/java-mall-app-shop-admin/pages/warehouse/manage/addAndEditProduct.vue b/java-mall-app-shop-admin/pages/warehouse/manage/addAndEditProduct.vue
index 7caf3d3..2cdc5b9 100644
--- a/java-mall-app-shop-admin/pages/warehouse/manage/addAndEditProduct.vue
+++ b/java-mall-app-shop-admin/pages/warehouse/manage/addAndEditProduct.vue
@@ -234,7 +234,7 @@
         >
           <view class="total-content">
             <view class="total-name">
-              共{{ specificationInfoList.length }}个规格
+              共{{ specificationInfoList.length || 1 }}个规格
             </view>
             <u-icon name="arrow-right"></u-icon>
           </view>
@@ -748,6 +748,9 @@ export default {
             return item; // 如果没有匹配项，返回原 item
           });
 
+          if (this.specificationInfoList.length == 0) {
+            debugger;
+          }
           console.log(this.specificationInfoList);
         } catch (e) {
           console.error("解析productSpec失败:", e);
diff --git a/java-mall-app-shop-admin/pages/warehouse/manage/batchSearch.vue b/java-mall-app-shop-admin/pages/warehouse/manage/batchSearch.vue
index aadc1a8..753ebf4 100644
--- a/java-mall-app-shop-admin/pages/warehouse/manage/batchSearch.vue
+++ b/java-mall-app-shop-admin/pages/warehouse/manage/batchSearch.vue
@@ -359,7 +359,6 @@ export default {
       } else {
         this.loadingCommodityData = true;
       }
-
       if (this.isRefreshing) {
         this.pageNum = 1;
         this.isNoCommodityData = false;
diff --git a/java-mall-app-shop-admin/pages/warehouse/manage/productList.vue b/java-mall-app-shop-admin/pages/warehouse/manage/productList.vue
index 063e18a..f0d1e21 100644
--- a/java-mall-app-shop-admin/pages/warehouse/manage/productList.vue
+++ b/java-mall-app-shop-admin/pages/warehouse/manage/productList.vue
@@ -521,7 +521,7 @@ export default {
               item_quantity: item.itemQuantity,
               item_quantity_2: "",
               item_unit_price: item.product_unit_price,
-              item_quantity_2: "",
+              item_unit_price_2: "",
             },
           ];
         }
@@ -740,7 +740,7 @@ export default {
           item_id: item.item_id,
           product_id: item.product_id,
           item_quantity: item.item_quantity_2 || item.item_quantity,
-          item_unit_price: item.item_quantity_2 || item.item_unit_price,
+          item_unit_price: item.item_unit_price_2 || item.item_unit_price,
         };
       });
 
diff --git a/java-mall-app-shop-admin/pages/warehouse/manage/productListSearch.vue b/java-mall-app-shop-admin/pages/warehouse/manage/productListSearch.vue
index 72de1ea..29c5e8b 100644
--- a/java-mall-app-shop-admin/pages/warehouse/manage/productListSearch.vue
+++ b/java-mall-app-shop-admin/pages/warehouse/manage/productListSearch.vue
@@ -342,6 +342,7 @@ export default {
       productItem: {},
       isAdd: true,
       selectCommodisItems: [],
+      inputSearch: "",
     };
   },
   computed: {},
@@ -409,60 +410,71 @@ export default {
 
         // 1. 解析产品规格模板
         let productSpec = JSON.parse(JSON.stringify(item.product_spec));
-
-        productSpec = JSON.parse(productSpec);
-        if (!Array.isArray(productSpec)) {
-          productSpec = [productSpec]; // 确保是数组格式
-        }
-
-        const specItemMap = [];
-
-        productSpec.forEach((specGroup) => {
-          if (specGroup.item && Array.isArray(specGroup.item)) {
-            specGroup.item.forEach((item) => {
-              specItemMap.push(item.id);
-            });
+        if (productSpec.length > 0) {
+          productSpec = JSON.parse(productSpec);
+          if (!Array.isArray(productSpec)) {
+            productSpec = [productSpec]; // 确保是数组格式
           }
-        });
 
-        this.currSpecificationList = this.selectCommodisItems
-          .map((item) => {
-            try {
-              // 解析规格数据（兼容字符串和对象）
-              const itemSpec =
-                typeof item.item_spec === "string"
-                  ? JSON.parse(item.item_spec)
-                  : item.item_spec;
+          const specItemMap = [];
 
-              if (Array.isArray(itemSpec) && itemSpec.length > 0) {
-                const firstSpec = itemSpec[0];
+          productSpec.forEach((specGroup) => {
+            if (specGroup.item && Array.isArray(specGroup.item)) {
+              specGroup.item.forEach((item) => {
+                specItemMap.push(item.id);
+              });
+            }
+          });
 
-                // 匹配规格逻辑
-                if (firstSpec.item && firstSpec.item.id) {
-                  const matchedSpec = specItemMap.find(
-                    (id) => id == firstSpec.item.id
-                  );
+          this.currSpecificationList = this.selectCommodisItems
+            .map((item) => {
+              try {
+                // 解析规格数据（兼容字符串和对象）
+                const itemSpec =
+                  typeof item.item_spec === "string"
+                    ? JSON.parse(item.item_spec)
+                    : item.item_spec;
 
-                  if (matchedSpec) {
-                    return {
-                      ...item,
-                      spec_item_id: matchedSpec,
-                      item_is_default: Boolean(item.item_is_default),
-                      // 保留原始数据（调试用）
-                    };
+                if (Array.isArray(itemSpec) && itemSpec.length > 0) {
+                  const firstSpec = itemSpec[0];
+
+                  // 匹配规格逻辑
+                  if (firstSpec.item && firstSpec.item.id) {
+                    const matchedSpec = specItemMap.find(
+                      (id) => id == firstSpec.item.id
+                    );
+
+                    if (matchedSpec) {
+                      return {
+                        ...item,
+                        spec_item_id: matchedSpec,
+                        item_is_default: Boolean(item.item_is_default),
+                        // 保留原始数据（调试用）
+                      };
+                    }
                   }
                 }
+              } catch (e) {
+                console.error(`处理商品 ${item.item_id} 时出错:`, e);
               }
-            } catch (e) {
-              console.error(`处理商品 ${item.item_id} 时出错:`, e);
-            }
-          })
-          .filter((item) => item != undefined);
-        console.log(this.currSpecificationList);
+            })
+            .filter((item) => item != undefined);
+        } else {
+          this.currSpecificationList = [
+            {
+              ...item,
+              item_quantity: item.itemQuantity,
+              item_quantity_2: "",
+              item_unit_price: item.product_unit_price,
+              item_unit_price_2: "",
+            },
+          ];
+        }
         this.showBottomPopup = true;
+        console.log(this.currSpecificationList);
       }
     },
-    async getProductList(inputSearch) {
+    async getProductList() {
       if (this.loadingDownCommodityData) {
         this.loadingCommodityData = false;
       } else {
@@ -484,9 +496,9 @@ export default {
         openCount: true,
       };
 
-      if (inputSearch) {
+      if (this.inputSearch) {
         this.pageNum = 1;
-        params.product_name = inputSearch;
+        params.product_name = this.inputSearch;
       }
 
       let res = await GetProductList(params);
@@ -660,30 +672,26 @@ export default {
       });
     },
     async updateCommodityPriceAndQuantity(item) {
-      let params = {};
-
+      let params = this.currSpecificationList.map((item) => {
+        return {
+          item_id: item.item_id,
+          product_id: item.product_id,
+          item_quantity: item.item_quantity_2 || item.item_quantity,
+          item_unit_price: item.item_unit_price_2 || item.item_unit_price,
+        };
+      });
+      debugger;
       let res = await UpdateCommodityPriceAndQuantity(params);
       if (res && res.status) {
+        this.showBottomPopup = false;
+
         this.$refs.uToast.show({
           message: "修改成功",
           type: "succeed",
           duration: 1000,
         });
 
-        // 静默更新数组
-        let listParams = {
-          kind_id: "1201,1202,1203",
-          pageNum: 9999,
-          pageSize: this.pageSize,
-          product_state_id: this.currProductStateId,
-          category_id: this.currCategoryId,
-          openCount: true,
-        };
-
-        let result = await GetProductList(listParams);
-        if (result && result.status == 200) {
-          this.commodityList = res.data.items;
-        }
+        await this.getProductList();
       }
       this.showBottomPopup = false;
     },
diff --git a/java-mall-app-shop-admin/static/font/iconfont.css b/java-mall-app-shop-admin/static/font/iconfont.css
index 9334887..04f70fd 100644
--- a/java-mall-app-shop-admin/static/font/iconfont.css
+++ b/java-mall-app-shop-admin/static/font/iconfont.css
@@ -21,6 +21,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.custom-icon-a-Frame3:before {
+  content: "\e60c";
+}
+
 .custom-icon-jianhao_fangxing:before {
   content: "\e728";
 }
diff --git a/java-mall-app-shop-admin/static/font/iconfont.ttf b/java-mall-app-shop-admin/static/font/iconfont.ttf
index 64e537e..d1f5ec0 100644
Binary files a/java-mall-app-shop-admin/static/font/iconfont.ttf and b/java-mall-app-shop-admin/static/font/iconfont.ttf differ
diff --git a/java-mall-app-shop-admin/static/font/iconfont.woff b/java-mall-app-shop-admin/static/font/iconfont.woff
index 3f215d6..0b54de2 100644
Binary files a/java-mall-app-shop-admin/static/font/iconfont.woff and b/java-mall-app-shop-admin/static/font/iconfont.woff differ
diff --git a/java-mall-app-shop-admin/static/font/iconfont.woff2 b/java-mall-app-shop-admin/static/font/iconfont.woff2
index 1677501..cc2c0b0 100644
Binary files a/java-mall-app-shop-admin/static/font/iconfont.woff2 and b/java-mall-app-shop-admin/static/font/iconfont.woff2 differ
diff --git a/java-mall-app-shop-admin/utils/http.js b/java-mall-app-shop-admin/utils/http.js
index e2cf3dd..6f72125 100644
--- a/java-mall-app-shop-admin/utils/http.js
+++ b/java-mall-app-shop-admin/utils/http.js
@@ -52,8 +52,6 @@ service.interceptors.response.use(
       // });
     }
 
-    console.log(res);
-
     if (res && res.code == 30) {
       uni.$u.toast(`token已经过期需要重新登录`);