feat：訂單模塊

commit/order.js

@@ -168,4 +168,27 @@ export function refundorderDetailApi(id) {
         method: 'GET',
         apiType
     })
+}
+
+/**
+ * @description 退款订单
+ */
+export function confirmRefundOrderApi(id, data) {
+     return myRequest({
+         url: `${pre}mer/store/refundorder/status/${id}`,
+         data,
+         method: 'POST',
+         apiType
+     })
+}
+/**
+ * @description 退款订单 -- 确认收货
+ */
+export function confirmReceiptApi(id, data) {
+     return myRequest({
+         url: `${pre}mer/store/refundorder/refund/${id}`,
+         data,
+         method: 'POST',
+         apiType
+     })
 }

shop/afterSalesManagement/afterCardListInfo.vue

@@ -1,11 +1,11 @@
 <template>
   <view class="details-xiangqing">
     <view class="details-xiangqing-top">
-      <view class="details-xiangqing-top-let" v-if="detailItem.order">
+      <view class="details-xiangqing-top-let" v-if="detailItem.order&&detailItem.order.mer_avatar">
         <image :src="detailItem.order.mer_avatar" mode="widthFix" v-if="detailItem.order.mer_avatar"></image>
       </view>
       <view class="details-xiangqing-top-in" v-if="detailItem.order">
-        {{ detailItem.order.order_sn }}
+        {{ detailItem.refund_order_sn }}
       </view>
       <view class="details-xiangqing-top-rigt">
         <uni-icons
@@ -48,7 +48,7 @@
       </view>
 
       <view class="brn-ligd">
-        <view class="btn-cls" @click="viewWuLiu(detailItem)"> 查看物流 </view>
+        <view class="btn-cls" @click="viewWuLiu(detailItem)" v-if="detailItem&&detailItem.delivery_id"> 查看物流 </view>
         <view class="btn-cls" @click="viewDetail(detailItem)"> 查看详情 </view>
       </view>
 

shop/afterSalesManagement/afterSalesDetail.vue

@@ -64,8 +64,8 @@
       <!-- 物流信息卡片  1、退货退款成功   2、退货退款失败 3、退货中 -->
       <view
         class="afterdetails-back mb-26"
-        @click="handleWUliu"
-        v-if="!storeRefundOrder && storeRefundOrder.delivery_id"
+        @click="handleWUliu(storeRefundOrder)"
+        v-if="storeRefundOrder && storeRefundOrder.delivery_id"
       >
         <view class="back-tile">买家退货物流</view>
         <view class="back-bttom">
@@ -157,11 +157,104 @@
           ></uni-icons>
         </view>
         <view class="popup_data__content">
-          <uni-easyinput type="textarea" autoHeight  placeholder="请输入拒绝原因,500字以内" v-model="refundData.fail_message" ></uni-easyinput>
-           </view>
-        <button type="primary" class="send-goods" @click="handleConfirm">
-          提交
-        </button>
+          <!-- 1.同意 -1.拒绝 2.部分退款 -->
+          <!-- 拒绝只用输入框  -1.拒绝-->
+          <uni-section
+            title="拒绝原因:"
+            type="line"
+            padding
+            v-if="refundData.status == -1"
+          >
+            <uni-easyinput
+              type="textarea"
+              autoHeight
+              :focus="true"
+              :maxlength="500"
+              placeholder="请输入拒绝原因,500字以内"
+              v-model="refundData.fail_message"
+            ></uni-easyinput>
+          </uni-section>
+
+          <!-- 1.同意 -->
+          <!-- refundData.status == 1 &&storeRefundOrder.refund_type == 2 &&storeRefundOrder.status == 0  -->
+          <template
+            v-if="
+              refundData.status == 1 &&
+              storeRefundOrder.refund_type == 2 &&
+              storeRefundOrder.status == 0
+            "
+          >
+            <!-- 收货人姓名 -->
+            <uni-section title="收货人姓名:" type="line" padding>
+              <uni-easyinput
+                v-model="refundData.mer_refund_user"
+                placeholder="请输入收货人姓名"
+              ></uni-easyinput>
+            </uni-section>
+            <!-- 收货人地址 -->
+            <uni-section title="收货人地址:" type="line" padding>
+              <uni-easyinput
+                v-model="refundData.mer_refund_address"
+                placeholder="请输入收货人地址"
+              ></uni-easyinput>
+            </uni-section>
+            <!-- 收货人电话 -->
+            <uni-section title="收货人电话:" type="line" padding>
+              <uni-easyinput
+                v-model="refundData.set_phone"
+                placeholder="请输入收货人电话"
+              ></uni-easyinput>
+            </uni-section>
+          </template>
+          <!-- 2.部分退款 -->
+          <!--退款金额 refundData.part_refund_price  refundData.status == 2   小于等于订单支付金额   tips:请确保已跟用户协商同意！-->
+          <!-- 商家备注 refundData.status == 2  refundData.part_refund_message   -->
+          <template v-if="refundData.status == 2">
+            <uni-section
+              title="退款金额:"
+              type="line"
+              padding
+              subTitle="请确保已跟用户协商同意!"
+            >
+              <uni-easyinput
+                errorMessage
+                v-model="refundData.part_refund_price"
+                focus
+                placeholder="小于等于订单支付金额"
+                type="digit"
+              ></uni-easyinput>
+            </uni-section>
+            <uni-section title="商家备注:" type="line" padding>
+              <uni-easyinput
+                type="textarea"
+                autoHeight
+                :focus="true"
+                :maxlength="500"
+                placeholder="请输入备注,500字以内"
+                v-model="refundData.part_refund_message"
+              ></uni-easyinput>
+            </uni-section>
+          </template>
+        </view>
+
+        <view class="btn-lixt">
+          <button
+            v-if="storeRefundOrder.status == 0 && douhuomall != 1"
+            type="primary"
+            class="send-goods"
+            @click="handleConfirm"
+          >
+            确 定
+          </button>
+          <button
+            v-if="storeRefundOrder.status == 2 && douhuomall != 1"
+            type="primary"
+            class="send-goods"
+            @click="handleconfirmReceipt(storeRefundOrder.refund_order_id)"
+          >
+            确 定
+          </button>
+        </view>
       </view>
     </uni-popup>
   </view>
@@ -171,7 +264,12 @@
 import headersVue from "../components/headers/headers.vue";
 import afterCardDetail from "./afterCardDetail.vue";
 import { toQueryString } from "@/utils/index.js";
-import { orderDetailApi, refundorderDetailApi } from "@/commit/order.js";
+import {
+  orderDetailApi,
+  refundorderDetailApi,
+  confirmRefundOrderApi,
+  confirmReceiptApi,
+} from "@/commit/order.js";
 import {
   orderRefundFilterText,
   orderRefundText,
@@ -212,6 +310,12 @@ export default {
     }
   },
   methods: {
+    async initData() {
+      await this.getRefundOrderDetails();
+      if (this.refund_order_id) {
+        await this.getAfterSaleListData(this.refund_order_id);
+      }
+    },
     open(type = "bottom") {
       this.$refs.popup.open(type);
     },
@@ -219,20 +323,151 @@ export default {
       this.close();
     },
     close() {
+      const data = this.storeRefundOrder.mer || {};
       this.refundData = {
         status: 1, // 1.同意 -1.拒绝 2.部分退款
         fail_message: "",
         part_refund_price: "",
         part_refund_message: "",
-        mer_refund_user: "",
-        mer_refund_address: "",
-        set_phone: "",
+        mer_refund_user: data.mer_refund_user,
+        mer_refund_address: data.mer_refund_address,
+        set_phone: data.set_phone,
       };
+
       this.popUpTitle = "";
       this.$refs.popup.close();
     },
     //提交
-    handleConfirm() {},
+    async handleConfirm() {
+      const type = this.auditType;
+      if (
+        this.refundData.part_refund_price.length == 0 &&
+        this.refundData.status == 2
+      ) {
+        uni.showToast({
+          title: "请输入金额",
+          icon: "none",
+        });
+        return;
+      }
+
+      if (
+        this.refundData.part_refund_message.length == 0 &&
+        this.refundData.status == 2
+      ) {
+        uni.showToast({
+          title: "请输入备注",
+          icon: "none",
+        });
+        return;
+      }
+      if (!this.refundData.fail_message && this.refundData.status == -1) {
+        uni.showToast({
+          title: "请输入拒绝原因",
+          icon: "none",
+        });
+        return;
+      }
+      uni.showLoading({
+        title: "提交中...",
+        mask: true,
+      });
+      try {
+        const res = await confirmRefundOrderApi(
+          this.storeRefundOrder.refund_order_id,
+          this.refundData
+        );
+        if (res.data.status == 200) {
+          uni.showToast({
+            title: res.message || res.data.message || "",
+            icon: "none",
+          });
+          this.handleClose();
+          await this.initData();
+        } else {
+          uni.showToast({
+            title: res.message || res.data.message || "",
+            icon: "none",
+          });
+        }
+      } catch (error) {
+        uni.showToast({
+          title: error.message || error.data.message || "",
+          icon: "none",
+        });
+      } finally {
+        uni.hideLoading();
+      }
+    },
+    handleconfirmReceipt(refund_order_id) {
+      //确定
+      if (
+        this.refundData.part_refund_price.length == 0 &&
+        this.refundData.status == 2
+      ) {
+        uni.showToast({
+          title: "请输入金额",
+          icon: "none",
+        });
+        return;
+      }
+
+      if (
+        this.refundData.part_refund_message.length == 0 &&
+        this.refundData.status == 2
+      ) {
+        uni.showToast({
+          title: "请输入备注",
+          icon: "none",
+        });
+        return;
+      }
+      if (!this.refundData.fail_message && this.refundData.status == -1) {
+        uni.showToast({
+          title: "请输入拒绝原因",
+          icon: "none",
+        });
+        return;
+      }
+      const _this = this;
+      console.log(this.refundData.part_refund_message);
+      uni.showModal({
+        title: "温馨提示",
+        content: "是否确认收货?",
+        success(res) {
+          if (res.confirm) {
+            _this.confirmReceiptData(refund_order_id);
+          } else if (res.cancel) {
+            uni.showToast({
+              title: "用户已取消",
+              icon: "none",
+            });
+          }
+        },
+      });
+    },
+    async confirmReceiptData(id) {
+      uni.showLoading({
+        title: "提交中...",
+        mask: true,
+      });
+      try {
+        const res = await confirmReceiptApi(id, this.refundData);
+        uni.showToast({
+          title: res.message || res.data.message || "",
+          icon: "none",
+        });
+        this.handleClose();
+        await this.initData();
+      } catch (error) {
+        uni.showToast({
+          title: error.message || error.data.message || "",
+          icon: "none",
+        });
+      } finally {
+        uni.hideLoading();
+      }
+    },
     formatDataValue(type) {
       const data = this.storeRefundOrder || {};
       return orderRefundFilterText(data[type]) || "";
@@ -273,6 +508,15 @@ export default {
         if (res.data.status == 200) {
           const productData = res.data.data || {};
           this.storeRefundOrder = productData;
+          this.refundData = {
+            status: 1, // 1.同意 -1.拒绝 2.部分退款
+            fail_message: "",
+            part_refund_price: "",
+            part_refund_message: "",
+            mer_refund_user: productData.mer.mer_refund_user,
+            mer_refund_address: productData.mer.mer_refund_address,
+            set_phone: productData.mer.set_phone,
+          };
         }
       } catch (error) {
       } finally {
@@ -303,7 +547,8 @@ export default {
         indexs: this.indexs,
         formType: "shouhouDetail",
         order_id: this.order_id,
-        refund_order_id: item.refund_order_id,
+        shouhou:0,
+        refund_order_id: item.refund_order_id || this.storeRefundOrder.refund_order_id || "",
       };
 
       const urlParams = toQueryString(params);
@@ -314,6 +559,8 @@ export default {
     },
     onHandleclick(item, type) {
       this.auditType = type;
+      console.log(this.refundorderDetail);
+      this.douhuomall = this.refundorderDetail.douhuomall;
       // 1.同意 -1.拒绝 2.部分退款
       this.open();
       if (type == "reject") {
@@ -530,8 +777,8 @@ page {
 }
 .popup_data {
   padding: 26rpx 30rpx;
-  min-height: 700rpx;
-  max-height: 750rpx;
+  min-height: 850rpx;
+  max-height: 900rpx;
   box-sizing: border-box;
   overflow: hidden;
   background: linear-gradient(180deg, #e5edff 0%, #ffffff 100%);
@@ -559,8 +806,15 @@ page {
     }
   }
   &__content {
-    max-height: 620rpx;
+    max-height: 500rpx;
+    padding-bottom: 50rpx;
     overflow-y: auto;
+    /deep/.uni-easyinput__placeholder-class {
+      font-size: 20rpx;
+    }
+  }
+  .btn-lixt {
+    height: 120rpx;
   }
 }
 .send-goods {
@@ -572,6 +826,6 @@ page {
   display: flex;
   justify-content: center;
   align-items: center;
-  margin-top: 32rpx;
+  margin-top: 20rpx;
 }
 </style>

shop/afterSalesManagement/components/search/search.vue

@@ -11,6 +11,7 @@
         v-model="searchValue"
         type="text"
         :placeholder="placeholder"
+        @input="haandleSearchInput"
       />
       <button class="search__btn" @click="haandleSearch">搜索</button>
     </view>
@@ -31,8 +32,14 @@ export default {
     };
   },
   methods: {
-    haandleSearch() {
+    haandleSearch(val) {
+
       this.$emit("search", this.searchValue);
+    },
+    haandleSearchInput(val){
+      if(val.detail.value==""){
+        this.$emit("search", this.searchValue);
+      }
     }
   }
 };

shop/afterSalesManagement/index.vue

@@ -140,9 +140,9 @@ export default {
     headerJump() {
       uni.switchTab({ url: "/pages/ordermanagement/index" });
     },
-  async  search(val) {
+    async search(val) {
       this.order_sn = val;
-        await this.orderList();
+      await this.getAfterSaleListData();
     },
 
     async getAfterSaleListData() {
@@ -155,9 +155,9 @@ export default {
         order_sn: this.order_sn,
         refund_type: this.refund_type,
       };
-       uni.showLoading({
-      title: "加载中",
-    });
+      uni.showLoading({
+        title: "加载中",
+      });
       try {
         const res = await getAfterSaleList(params);
         uni.stopPullDownRefresh();
@@ -195,8 +195,9 @@ export default {
         status: 0,
         indexs: this.currentActive,
         formType: "shouhou",
+        shouhou: 0,
         order_id: item.order_id || "",
-           refund_order_id:item .refund_order_id,
+        refund_order_id: item.refund_order_id,
       };
       const urlParams = toQueryString(params);
       uni.redirectTo({
@@ -207,8 +208,8 @@ export default {
       // console.log(item)
       const params = {
         indexs: this.currentActive,
-        order_id: item.order_id ,
-        refund_order_id:item .refund_order_id,
+        order_id: item.order_id,
+        refund_order_id: item.refund_order_id,
       };
       // console.log(params,"paramsparamsparamsparamsparamsparams")
       const urlParams = toQueryString(params);
@@ -216,26 +217,26 @@ export default {
         url: `./afterSalesDetail?${urlParams}`,
       });
     },
-  async  tabsHandleClick(obj) {
+    async tabsHandleClick(obj) {
       this.currentActive = obj.index;
       // console.log(obj, "tabsHandleClick");
-       // 0全部  1审核中  2处理中  3已完成
-    if (this.currentActive == 0) {
-      //全部
-      this.status = "";
-    } else if (this.currentActive == 1) {
-      //审核中 0
-      this.status = 0;
-    } else if (this.currentActive == 2) {
-      //2处理中 2
-      this.status = 2;
-    } else if (this.currentActive == 3) {
-      //3已完成
-      this.status = 3;
-    } else {
-      this.status = "";
-    }
-    await this.getAfterSaleListData();
+      // 0全部  1审核中  2处理中  3已完成
+      if (this.currentActive == 0) {
+        //全部
+        this.status = "";
+      } else if (this.currentActive == 1) {
+        //审核中 0
+        this.status = 0;
+      } else if (this.currentActive == 2) {
+        //2处理中 2
+        this.status = 2;
+      } else if (this.currentActive == 3) {
+        //3已完成
+        this.status = 3;
+      } else {
+        this.status = "";
+      }
+      await this.getAfterSaleListData();
     },
   },
 };

shop/commodity/components/changeDetailInfo/ItemsInsidePackage.vue

@@ -19,7 +19,49 @@
       <view class="popup_data__package__content">
         <view class="detail-send-order-product">
           <view class="detail-send-order-product__wrapper">
-            <view
+            <template v-if="isShouHou">
+               <view
+              class="detail-send-order-content"
+              v-for="(items, indexs) in orderProduct"
+              :key="indexs"
+            >
+              <view class="detail-send-order-content-left">
+                <view
+                  class="detail-send-order-content-left-img"
+                  v-if="items.product"
+                >
+                  <image
+                    v-if="items.product.cart_info.product.image"
+                    :src="items.product.cart_info.product.image"
+                    mode="widthFix"
+                  ></image>
+                  <text v-else>暂无照片</text>
+                </view>
+              </view>
+              <view class="detail-send-order-content-middle">
+                <view
+                  class="detail-send-order-content-middle-top"
+                  v-if="items.product"
+                >
+                  {{ items.product.cart_info.product.store_name }}
+                </view>
+                <view
+                  class="detail-send-order-content-middle-top-bot"
+                  v-if="items.product.cart_info"
+                >
+                  {{ items.product.cart_info.productAttr.sku || "" }}
+                </view>
+              </view>
+              <view class="detail-send-order-content-right">
+                <view class="detail-send-order-yi-in-neibu-right-in">
+                  ×{{ items.product.product_num || 0 }}
+                </view>
+              </view>
+            </view>
+            </template>
+           
+           <template v-else>
+             <view
               class="detail-send-order-content"
               v-for="(items, indexs) in orderProduct"
               :key="indexs"
@@ -57,6 +99,10 @@
                 </view>
               </view>
             </view>
+           </template>
+         
+         
+         
           </view>
         </view>
       </view>
@@ -85,6 +131,10 @@ export default {
         };
       },
     },
+    isShouHou:{
+      type:Boolean,
+      default:false
+    },
     orderProduct: {
       type: Array,
       default: () => {

shop/commodity/components/search/search.vue

@@ -6,7 +6,7 @@
 		          referrerpolicy="no-referrer"
 		          src="/static/images/new_ui/search_icon_blod.png"
 		        />
-				<input class="search__input" v-model="searchValue" type="text" placeholder="请输入订单号/收货人/联系方式/提货码" />
+				<input class="search__input" v-model="searchValue" @input="haandleSearchInput" type="text" placeholder="请输入订单号/收货人/联系方式/提货码" />
 		        <button class="search__btn" @click="haandleSearch">
 		          搜索
 		        </button>
@@ -24,7 +24,12 @@
 		methods:{
 			haandleSearch(){
 				this.$emit("search",this.searchValue)
-			}
+			},
+			    haandleSearchInput(val){
+      if(val.detail.value==""){
+        this.$emit("search", this.searchValue);
+      }
+    }
 		}
 	}
 </script>

shop/commodity/logisticsInformationDetail.vue

@@ -6,14 +6,34 @@
         <view class="image-list">
           <view class="image-scroll_box">
             <view class="image-scroll_box__image">
-              <view
-                v-for="(item, index) in procductList"
-                :key="item.cart_id + '_index_' + index"
-                class="cmsd-ocm"
-              >
-                <image :src="item.cart_info.product.image" v-if="item.cart_info"/>
-                <view class="tip-num">{{ item.product_num || 0 }}件</view>
-              </view>
+              <template v-if="isShouHou">
+                <view
+                  v-for="(item, index) in procductList"
+                  :key="item.cart_id + '_index_' + index"
+                  class="cmsd-ocm"
+                >
+                  <image
+                    :src="item.product.cart_info.product.image"
+                    v-if="item.product"
+                  />
+                  <view class="tip-num"
+                    >{{ item.product.product_num || 0 }}件</view
+                  >
+                </view>
+              </template>
+              <template v-else>
+                <view
+                  v-for="(item, index) in procductList"
+                  :key="item.cart_id + '_index_' + index"
+                  class="cmsd-ocm"
+                >
+                  <image
+                    :src="item.cart_info.product.image"
+                    v-if="item.cart_info"
+                  />
+                  <view class="tip-num">{{ item.product_num || 0 }}件</view>
+                </view>
+              </template>
             </view>
           </view>
         </view>
@@ -22,20 +42,26 @@
         </view>
       </view>
       <view class="logistics-info-card-headers__logicistics">
-        <view class="image-company__image"   v-if="orderData.delivery_image">
-          <image
-            :src="orderData.delivery_image"
-          />
+        <view class="image-company__image" v-if="orderData.delivery_image">
+          <image :src="orderData.delivery_image" />
         </view>
         <view class="image-company__content">
           <view class="image-company__content-title">
-            <text>{{orderData.delivery_name}}： </text>
-            <text>{{orderData.delivery_id}}</text>
+            <text>{{ orderData.delivery_name }}： </text>
+            <text>{{ orderData.delivery_id }}</text>
           </view>
         </view>
         <view class="image-company__btn">
-          <view class="copy-btn btn" @click="handleGiop('copy',orderData.delivery_id)">复制</view>
-          <view class="tel-btn btn" @click="handleGiop('tel',orderData.delivery_phone)">电话</view>
+          <view
+            class="copy-btn btn"
+            @click="handleGiop('copy', orderData.delivery_id)"
+            >复制</view
+          >
+          <view
+            class="tel-btn btn"
+            @click="handleGiop('tel', orderData.delivery_phone)"
+            >电话</view
+          >
         </view>
       </view>
     </view>
@@ -49,16 +75,14 @@
               </view>
               <view class="order-list-yi-bot-xadasrfe">
                 <view class="order-list-yi-bot-xadasrfe-top">
-                  <view
-                    >{{orderData.user_address}}</view
-                  >
-                  <text> {{orderData.real_name}}</text>
-                 <text> {{formatData(orderData,"user_phone")}}</text>
+                  <view>{{ orderData.user_address }}</view>
+                  <text> {{ orderData.real_name }}</text>
+                  <text> {{ formatData(orderData, "user_phone") }}</text>
                 </view>
               </view>
             </view>
           </view>
-          <view class="logicistis" v-if="logisticsData.length>0">
+          <view class="logicistis" v-if="logisticsData.length > 0">
             <view
               class="logicistis-bot-xiangxi"
               v-for="(items, index) in logisticsData"
@@ -79,27 +103,36 @@
             </view>
           </view>
           <template v-else>
-            <emptyData title="暂无物流信息" style="top:45%;left:25%;width:auto"></emptyData>
+            <emptyData
+              title="暂无物流信息"
+              style="top: 45%; left: 25%; width: auto"
+            ></emptyData>
           </template>
         </view>
       </view>
     </template>
     <emptyData v-else></emptyData>
-    <ItemsInsidePackageVue ref="refsPackage" :orderProduct="procductList"/>
+    <ItemsInsidePackageVue
+      ref="refsPackage"
+      :orderProduct="procductList"
+      :isShouHou="isShouHou"
+    />
   </view>
 </template>
 
 <script>
 import headersVue from "../components/headers/headers.vue";
-import { toQueryString, copy,MaskRules  } from "@/utils/index.js";
+import { toQueryString, copy, MaskRules } from "@/utils/index.js";
 import ItemsInsidePackageVue from "./components/changeDetailInfo/ItemsInsidePackage.vue";
 import { mockDataLogistics } from "./mockData.js";
 import emptyData from "../components/emptyData/emptyData.vue";
 import {
-
   getExpress,
   getOrderListProduct,
-  orderDetailApi
+  orderDetailApi,
+  // 退单
+  refundorderExpressApi,
+  refundorderDetailApi,
 } from "@/commit/order.js";
 export default {
   components: { headersVue, ItemsInsidePackageVue, emptyData },
@@ -120,37 +153,78 @@ export default {
     this.indexs = e.indexs;
     this.status = e.status;
     this.formType = e.formType || "";
-    this.isShouHou = e.shouhou==0?true:false;
-    await this.getOrderDetails();
+    this.isShouHou = e.shouhou == 0 ? true : false;
+    this.refund_order_id = e.refund_order_id;
+    if (e.shouhou == 0 || ["shouehuoDetail", "shouhou"].includes(e.formType)) {
+      await this.getRefundorderDetailData();
+      await this.getOrderDetails(false);
+    } else {
+      await this.getOrderDetails(true);
+    }
   },
   methods: {
-    handleGiop(type,value) {
+    handleGiop(type, value) {
       if (type === "copy") {
         copy(value);
       } else {
-        if(!value){
+        if (!value) {
           uni.showToast({
             title: "暂无电话",
             icon: "none",
-          })
-          return
+          });
+          return;
         }
         uni.makePhoneCall({
           phoneNumber: value,
         });
       }
     },
-    formatData(data,type){
-      if(type==='user_phone'){
-        if(!data[type]) return ""
+    formatData(data, type) {
+      if (type === "user_phone") {
+        if (!data[type]) return "";
         return MaskRules.mobile(data[type]);
-      }else{
+      } else {
         return data[type] || "--";
       }
     },
     handlePopup() {
       this.$refs.refsPackage.open();
     },
+    async getRefundorderDetailData() {
+      //
+      uni.showLoading({
+        title: "加载中...",
+        mask: true,
+      });
+      try {
+        const res = await refundorderDetailApi(this.refund_order_id);
+        if (res.data.status == 200) {
+          let data = res.data.data || {};
+          this.orderData = {
+            ...data,
+            delivery_name: data.delivery_type,
+          };
+          this.procductList = data.refundProduct || [];
+          if (this.orderData.delivery_id) {
+            await this.getRefundorderExpress(this.refund_order_id);
+          }
+        }
+      } catch (error) {
+      } finally {
+        uni.hideLoading();
+      }
+    },
+    async getRefundorderExpress(id) {
+      //
+      if (!id) return;
+      try {
+        const res = await refundorderExpressApi(id);
+        if (res.data.status == 200) {
+          const data = res.data.data || [];
+          this.logisticsData = data;
+        }
+      } catch (error) {}
+    },
     async getOrderListSigleData(order_sn) {
       try {
         const res = await getOrderListProduct(order_sn);
@@ -158,25 +232,35 @@ export default {
           let detailDa =
             (res.data.data.list[0] && res.data.data.list[0].orderProduct) || [];
           this.procductList = detailDa || [];
-          console.log(this.procductList,"this.procductList")
+          console.log(this.procductList, "this.procductList");
         }
       } catch (error) {}
     },
-    async getOrderDetails() {
-      uni.showLoading({
-        title: "加载中...",
-        mask: true,
-      });
+    async getOrderDetails(flag) {
+      if (flag) {
+        uni.showLoading({
+          title: "加载中...",
+          mask: true,
+        });
+      }
       try {
         const res = await orderDetailApi(this.order_id);
         if (res.data.status == 200) {
-          this.orderData = {
-            ...res.data.data,
-          };
-          if (this.orderData.delivery_id) {
-            await this.getLogisticData(this.order_id);
+          if (flag) {
+            this.orderData = {
+              ...res.data.data,
+            };
+            if (this.orderData.delivery_id) {
+              await this.getLogisticData(this.order_id);
+            }
+            this.getOrderListSigleData(this.orderData.order_sn);
+          }else {
+             this.orderData = {
+              
+              ...res.data.data,
+              ...this.orderData,
+            };
           }
-          this.getOrderListSigleData(this.orderData.order_sn);
         }
       } catch (error) {
       } finally {
@@ -205,7 +289,6 @@ export default {
           status: this.status,
           indexs: this.indexs,
           index: this.indexs,
-          
         };
       } else {
         obj = {
@@ -213,7 +296,8 @@ export default {
           indexs: this.indexs,
           formType: this.formType,
           order_id: this.order_id,
-           index: this.indexs,
+          index: this.indexs,
+          refund_order_id: this.refund_order_id,
         };
       }
       const params = toQueryString(obj);

shop/productManagementModule/components/search/search.vue

@@ -11,6 +11,7 @@
         v-model="searchValue"
         type="text"
         placeholder="输入商品名称/商品ID"
+        @input="haandleSearchInput"
       />
       <button class="search__btn" @click="haandleSearch">搜索</button>
     </view>
@@ -27,6 +28,11 @@ export default {
   methods: {
     haandleSearch() {
       this.$emit("search", this.searchValue);
+    },
+        haandleSearchInput(val){
+      if(val.detail.value==""){
+        this.$emit("search", this.searchValue);
+      }
     }
   }
 };