feat：订单模块对接接口

commit/order.js

@@ -1,37 +1,39 @@
-import { 
- myRequest 
+import {
+    myRequest
 } from './request.js'
 // 正向订单状态数
-export function getOrderStstusAmount(data) { 
- return myRequest({ 
-  url: 'order_service/orderService/getOrderStstusAmount', 
-  method: 'post', 
-  data 
- }) 
-} 
+export function getOrderStstusAmount(data) {
+    return myRequest({
+        url: 'order_service/orderService/getOrderStstusAmount',
+        method: 'post',
+        data
+    })
+}
 // 正向订单列表
-export function orderList(data) { 
- return myRequest({ 
-  url: 'order_service/orderService/orderList', 
-  method: 'post', 
-  data 
- }) 
-} 
+export function orderList(data) {
+    return myRequest({
+        url: 'order_service/orderService/orderList',
+        method: 'post',
+        data
+    })
+}
 // 订单详情页面
-export function getOrderDetails(data) { 
- return myRequest({ 
-  url: 'order_service/orderService/getOrderDetails', 
-  method: 'post', 
-  data 
- }) 
-} 
-const pre = "api/"
+export function getOrderDetails(data) {
+    return myRequest({
+        url: 'order_service/orderService/getOrderDetails',
+        method: 'post',
+        data
+    })
+}
+const pre = ""
+const apiType = "php"
 // 订单状态数
 export function getOrderStatusNumber(data) {
     return myRequest({
         url: `${pre}mer/store/order/chart`,
         method: 'GET',
-         data
+        data,
+        apiType
     })
 }
 
@@ -40,15 +42,130 @@ export function getOrderList(data) {
     return myRequest({
         url: `${pre}mer/store/order/lst`,
         method: 'GET',
-         data
+        data,
+        apiType
+    })
+}
+// 订单列表产品
+export function getOrderListProduct(order_sn) {
+    const data = {
+        order_sn: order_sn,
+        order_type: -1,
+        distribution_mode: -1,
+        keywords: order_sn,
+        status: "",
+        date: "",
+        page: 1,
+        limit: 20,
+        type: 1,
+        username: "",
+        pay_type: -1,
+        ylj_status: "",
+        paid: "",
+    }
+    return myRequest({
+        url: `${pre}mer/store/order/lst`,
+        method: 'GET',
+        data,
+        apiType
     })
 }
-
 // filtter
 export function getOrderListFiltter(data) {
     return myRequest({
         url: `${pre}mer/store/order/filtter`,
         method: 'GET',
-         data
+        data,
+        apiType
+    })
+}
+
+/**
+ * @description 订单 -- 发货规则
+ */
+
+export function orderDeliveryRuleApi(id) {
+    return myRequest({
+        url: `${pre}mer/store/order/delivery/${id}/form`,
+        method: 'GET',
+        apiType
+    })
+}
+/**
+ * @description 订单 -- 发货
+ */
+
+export function orderDeliveryApi(id, data) {
+    return myRequest({
+        url: `${pre}/mer/store/order/delivery/${id}.html`,
+        method: 'POST',
+        data,
+        apiType
+    })
+}
+
+
+/**
+ * @description 订单 -- 详情
+ */
+
+export function orderDetailApi(id) {
+    return myRequest({
+        url: `${pre}mer/store/order/detail/${id}`,
+        method: 'GET',
+        apiType
+    })
+}
+/**
+ * @description 获取物流信息
+ */
+export function getExpress(id) {
+    return myRequest({
+        url: `${pre}mer/store/order/express/${id}`,
+        method: 'GET',
+        apiType
+    })
+}
+
+/**售后列表 */
+
+export function getAfterSaleList(data) {
+    return myRequest({
+        url: `${pre}mer/store/refundorder/lst`,
+        method: 'GET',
+        data,
+        apiType
+    })
+}
+/**
+ * @description 退款单获取物流信息
+ */
+export function refundorderExpressApi(id) {
+    return myRequest({
+        url: `${pre}mer/store/refundorder/express/${id}`,
+        method: 'GET',
+        apiType
+    })
+}
+/**
+ * @description 自提
+ */
+export function takeProductApi(id, data) {
+    return myRequest({
+        url: `${pre}mer/store/order/carry/${id}`,
+        method: 'GET',
+        data,
+        apiType
+    })
+}
+
+/**
+ * @description 退款订单 -- 详情
+ */
+export function refundorderDetailApi(id) {
+    return myRequest({
+        url: `${pre}mer/store/refundorder/detail/${id}`,
+        method: 'GET',
+        apiType
     })
 }

commit/request.js

@@ -4,9 +4,8 @@ var baseURL = 'https://api.hxxfb.com/gateway/' // API访问的地址
 	  baseURL = 'https://api.hxxfb.com/gateway/';//测试环境
  }else if(is==2){
 	 // baseURL = 'https://api.hebeiyhc.com/gateway/'; //生产环境
-	 // baseURL = 'https://api.hebeiyhc.com/gateway/'; //生产环境
-	 baseURL = '/gateway/'; //生产环境
-	//  baseURL = '/gateway/'; //生产环境
+	 baseURL = 'https://api.hebeiyhc.com/gateway/'; //生产环境
+	
  }else{
 	  baseURL = 'https://api.hxxfb.com/gateway/'; //预生产环境
  }
@@ -28,16 +27,20 @@ let bas = Base64.encode(jmi + "," + Fzitem)
  
 export const myRequest = (options) => {
 	return new Promise((resolve, reject) => {
-		console.log( baseURL + options.url," baseURL + options.url baseURL + options.url")
+		 if(options.apiType === 'php'){
+			baseURL = 'http://shop.hxxfb.com/'
+			// baseURL = '/'
+			// console.log('url = ',baseURL + options.url,"PHP")
+		 }
 		uni.request({
 			url: baseURL + options.url, //接口地址：前缀+方法中传入的地址 
 			method: options.method || 'GET', //请求方法：传入的方法或者默认是“GET” 
 			data: options.data || {}, //传递参数：传入的参数或者默认传递空集合 
 			header: {
 				// 'Content-Type': 'application/x-www-form-urlencoded',
-				// 'X-token': uni.getStorageSync('authorization'), //请求头信息
-				'X-token':'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJhcGkuaHh4ZmIuY29tIiwiYXVkIjoiYXBpLmh4eGZiLmNvbSIsImlhdCI6MTczOTk2NDIxMiwibmJmIjoxNzM5OTY0MjEyLCJleHAiOjE3NTA3NjQyMTIsImp0aSI6WzM1OSwibWVyIl19.IX8wt8Fc05VgshXbUFTusGag4KD__teryi13L-QrJQM',
-				'volunteerdes': bas // DES+B64加密 
+				'X-token': uni.getStorageSync('authorization'), //请求头信息
+				// 'X-token':'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJhcGkuaHh4ZmIuY29tIiwiYXVkIjoiYXBpLmh4eGZiLmNvbSIsImlhdCI6MTczOTk2NDIxMiwibmJmIjoxNzM5OTY0MjEyLCJleHAiOjE3NTA3NjQyMTIsImp0aSI6WzM1OSwibWVyIl19.IX8wt8Fc05VgshXbUFTusGag4KD__teryi13L-QrJQM',
+				// 'volunteerdes': bas // DES+B64加密 
 			},
 
 			success: (res) => {

emChat/emChatContainer/emInputBarContainer/recordAudioContainer/index.vue

@@ -103,35 +103,35 @@ export default {
     //web平台采集音频录音
     //#ifdef WEB
     executeWebAudioRecord() {
-      import('../../../../recorderCore/src/recorder-core').then((Recorder) => {
-        require('../../../../recorderCore/src/engine/mp3');
-        require('../../../../recorderCore/src/engine/mp3-engine');
-        this.initStartRecord();
-        this.webRecorderManager = new Recorder.default({
-          type: 'mp3',
-        });
-        this.webRecorderManager.open(
-          () => {
-            console.log('>>>>>>web 录音开始执行');
-            this.recording = true;
-            this.saveRecordTime();
-            this.webRecorderManager.start();
-          },
-          (msg, isUserNotAllow) => {
-            if (isUserNotAllow) {
-              uni.showToast({
-                title: '鉴权失败，请重试',
-                icon: 'none',
-              });
-            } else {
-              uni.showToast({
-                title: `开启失败，请重试`,
-                icon: 'none',
-              });
-            }
-          }
-        );
-      });
+      // import('../../../../recorderCore/src/recorder-core').then((Recorder) => {
+      //   require('../../../../recorderCore/src/engine/mp3');
+      //   require('../../../../recorderCore/src/engine/mp3-engine');
+      //   this.initStartRecord();
+      //   this.webRecorderManager = new Recorder.default({
+      //     type: 'mp3',
+      //   });
+      //   this.webRecorderManager.open(
+      //     () => {
+      //       console.log('>>>>>>web 录音开始执行');
+      //       this.recording = true;
+      //       this.saveRecordTime();
+      //       this.webRecorderManager.start();
+      //     },
+      //     (msg, isUserNotAllow) => {
+      //       if (isUserNotAllow) {
+      //         uni.showToast({
+      //           title: '鉴权失败，请重试',
+      //           icon: 'none',
+      //         });
+      //       } else {
+      //         uni.showToast({
+      //           title: `开启失败，请重试`,
+      //           icon: 'none',
+      //         });
+      //       }
+      //     }
+      //   );
+      // });
     },
     // #endif
     requestMiniProgramAuthorization() {

manifest.json

@@ -105,14 +105,14 @@
               // }
               // 自行修改下方的 /api
               "/api": {
-                "target": "https://api.hxxfb.com",
+                "target": "https://api.hxxfb.com/",
                 "pathRewirte": {
                   //路径重写
                   "^/api": "/"
                 }
               },
               "/gateway/api": {
-                "target": "https://api.hxxfb.com",
+                "target": "https://api.hxxfb.com/",
                 "pathRewirte": {
                   //路径重写
                   "^/api": "/"

package.json

@@ -1,5 +1,6 @@
 {
   "dependencies": {
+    "@dcloudio/uni-ui": "^1.5.7",
     "base-64": "^1.0.0",
     "crypto-js": "^4.1.1",
     "easemob-websdk": "^4.6.0",

pages.json

@@ -305,33 +305,33 @@
 		            }
 		        }
 		    ]
+		},
+		{
+		    "root" : "emChat",
+		    "pages" : [
+		       {
+		         "path": "emChatContainer/index",
+		         "style": {
+		           "navigationStyle": "custom",
+		           "navigationBarTextStyle": "white",
+		           "app-plus": {
+		             "bounce": "none"
+		           }
+		         }
+		       }
+		    ]
+		},
+		{
+		    "root" : "chatIndex",
+		    "pages" : [
+		       {
+				   "path" : "storemanagement/index",
+				   "style" : {
+					   "navigationStyle": "custom"
+				   }
+			   }
+		    ]
 		}
-		// {
-		//     "root" : "emChat",
-		//     "pages" : [
-		//        {
-		//          "path": "emChatContainer/index",
-		//          "style": {
-		//            "navigationStyle": "custom",
-		//            "navigationBarTextStyle": "white",
-		//            "app-plus": {
-		//              "bounce": "none"
-		//            }
-		//          }
-		//        }
-		//     ]
-		// },
-		// {
-		//     "root" : "chatIndex",
-		//     "pages" : [
-		//        {
-		// 		   "path" : "storemanagement/index",
-		// 		   "style" : {
-		// 			   "navigationStyle": "custom"
-		// 		   }
-		// 	   }
-		//     ]
-		// }
 		
     ],
     "globalStyle" : {
@@ -381,5 +381,12 @@
 			}
            
         ]
+    },
+    "easycom": {
+    	"autoscan": true,
+		"custom":{
+			"^uni-(.*)": "@dcloudio/uni-ui/lib/uni-$1/uni-$1.vue"
+		}
     }
+
 }

pages/ordermanagement/index.vue

@@ -5,19 +5,19 @@
       <view class="ordermanagement-list">
         <view class="ordermanagement-list-yi">
           <view class="ordermanagement-list-yi-top">
-            {{ num.orderPayment == undefined ? 0 : num.orderPayment }}
+            {{ orderSta.orderPayment == undefined ? 0 : orderSta.orderPayment }}
           </view>
           <view class="ordermanagement-list-yi-bottom"> 已支付订单数 </view>
         </view>
         <view class="ordermanagement-list-yi">
           <view class="ordermanagement-list-yi-top">
-            {{ num.payPrice == undefined ? 0 : num.payPrice }}
+            {{ orderSta.payPrice == undefined ? 0 : orderSta.payPrice }}
           </view>
           <view class="ordermanagement-list-yi-bottom"> 实际支付金额 </view>
         </view>
         <view class="ordermanagement-list-yi">
           <view class="ordermanagement-list-yi-top">
-            {{ num.refundPrice == undefined ? 0 : num.refundPrice }}
+            {{ orderSta.refundPrice == undefined ? 0 : orderSta.refundPrice }}
           </view>
           <view class="ordermanagement-list-yi-bottom"> 已退款金额 </view>
         </view>
@@ -38,12 +38,12 @@
         <view
           class="ordermanagement-yisdf"
           v-for="(item, index) in dingdan"
-          :key="index+'__index__'"
+          :key="index + '__index__'"
           @click="jiru(item.status, index + 1)"
         >
           <view class="ordermanagement-img">
             <image :src="item.img" mode="widthFix"></image>
-            <view class="ordermanagement-img-biao" v-if="item.num != 0">
+            <view class="ordermanagement-img-biao" v-if="item.num > 0">
               {{ item.num }}
             </view>
           </view>
@@ -55,9 +55,6 @@
     </view>
 
     <view class="ordermanagement-dingsss">
-      <!-- <view class="ordermanagement-ding-text">
-				售后管理
-			</view> -->
       <view class="view-wrapper">
         <view class="ordermanagement-ding-text"> 售后管理 </view>
         <view class="view-all" @click="afterSalesClick('all', 0)">
@@ -72,11 +69,14 @@
         <view
           class="ordermanagement-yisdf"
           v-for="(item, index) in dingdansss"
-          :key="index+'pp'+'__index__'"
-		  @click="afterSalesClick(item, index )"
+          :key="index + 'pp' + '__index__'"
+          @click="afterSalesClick(item.status, index+1)"
         >
           <view class="ordermanagement-img">
             <image :src="item.img" mode="widthFix"></image>
+             <view class="ordermanagement-img-biao" v-if="item.num > 0">
+              {{ item.num }}
+            </view>
           </view>
           <view class="">
             {{ item.name }}
@@ -84,20 +84,29 @@
         </view>
       </view>
     </view>
-	
+
     <!-- <quickPickUpVue class="custom_pick-up"></quickPickUpVue> -->
   </view>
 </template>
 
 <script>
-import { getOrderStstusAmount,getOrderStatusNumber,getOrderList } from "@/commit/order.js";
+import {
+  getOrderStatusNumber,
+  getOrderList,
+  getAfterSaleList,
+} from "@/commit/order.js";
 import quickPickUpVue from "./components/quickPickUp/quickPickUp.vue";
-import {toQueryString} from "@/utils/index.js"
+import { toQueryString } from "@/utils/index.js";
 export default {
   components: { quickPickUpVue },
   data() {
     return {
-      num: [], //正向订单状态数
+      orderSta: {
+        orderPayment: "0",
+        payPrice: "0",
+        refundPrice: "0",
+      },
+      num: {}, //正向订单状态数
       mer_id: 264,
       dingdan: [
         {
@@ -120,7 +129,6 @@ export default {
           name: "待评价",
           status: 4,
         },
-        // ,
         // {
         // 	img: 'https://cdn.bjtdba.com/vod/image/2022-08-12/20220812154847886.png',
         // 	name: '已退款',
@@ -128,86 +136,100 @@ export default {
         // }
       ],
       dingdansss: [
-		//  {
-        //   img: "https://cdn.bjtdba.com/vod/image/2022-08-12/20220812154904247.png",
-        //   name: "全部",
-        // },
         {
           img: "https://cdn.bjtdba.com/vod/image/2022-08-12/20220812154932244.png",
           name: "审核中",
+          status:0,
+          num:0,
         },
         {
           img: "https://cdn.bjtdba.com/vod/image/2022-08-12/20220812154949118.png",
           name: "处理中",
+          num:0,
+           status:2,
         },
         {
           img: "https://cdn.bjtdba.com/vod/image/2022-08-12/20220812155008586.png",
           name: "已完成",
+          num:0,
+           status:3,
         },
-        // {
-        //   img: "https://cdn.bjtdba.com/vod/image/2022-08-12/20220812154904247.png",
-        //   name: "待审核",
-        // },
-        // {
-        //   img: "https://cdn.bjtdba.com/vod/image/2022-08-12/20220812154932244.png",
-        //   name: "未通过",
-        // },
-        // {
-        //   img: "https://cdn.bjtdba.com/vod/image/2022-08-12/20220812154949118.png",
-        //   name: "已通过",
-        // },
-        // {
-        //   img: "https://cdn.bjtdba.com/vod/image/2022-08-12/20220812154918922.png",
-        //   name: "待收货",
-        // },
-        // {
-        //   img: "https://cdn.bjtdba.com/vod/image/2022-08-12/20220812155008586.png",
-        //   name: "已完成",
-        // },
       ],
     };
   },
   onLoad() {},
-  onShow() {
-      uni.showLoading({
-    	title: '加载中',
+  async onShow() {
+    uni.showLoading({
+      title: "加载中",
     });
     let selectmerchant = uni.getStorageSync("selectmerchant");
     this.mer_id = selectmerchant.merId;
-    this.getOrderStatusNumberData()
+    await this.getOrderListData();
+    await this.getOrderStatusNumberData();
+    await this.getAfterSaleListData()
   },
   methods: {
-//售后管理
-afterSalesClick(item,index){
-   const params = {
-	   tabIndex:index,
-	   mer_id:this.mer_id
-   }
-   uni.redirectTo({
-	   url: `../../shop/afterSalesManagement/index?${toQueryString(params)}`
-   })
-},
-
-
+    //售后管理
+    afterSalesClick(status, index) {
+      const params = {
+        tabIndex: index,
+        mer_id: this.mer_id,
+        status: status,
+      };
+      uni.redirectTo({
+        url: `../../shop/afterSalesManagement/index?${toQueryString(params)}`,
+      });
+    },
+    // 订单金额
+    async getOrderListData() {
+      try {
+        const res = await getOrderList({
+          order_sn: "",
+          order_type: -1,
+          distribution_mode: -1,
+          keywords: "",
+          status: "",
+          date: "",
+          page: 1,
+          limit: 20,
+          type: 1,
+          username: "",
+          pay_type: -1,
+          ylj_status: "",
+          paid: "",
+        });
+        console.log(res, "resresresresres");
+        if (res.data.status === 200) {
+          const data = res.data.data.stat || [];
 
+          let obj = {
+            已支付订单数量: "orderPayment",
+            实际支付金额: "payPrice",
+            已退款金额: "refundPrice",
+          };
+          data.forEach((item) => {
+            this.orderSta[obj[item.name]] = item.count || undefined;
+          });
+        }
+      } catch (error) {}
+    },
 
     // 正向订单状态数
     getOrderStatusNumberData() {
       getOrderStatusNumber({
-        // mer_id: this.mer_id,
-        order_sn:"",
-        order_type:'-1',
-        distribution_mode:'-1',
-        keywords:"",
-        status:"",
-        date:'',
-        page:1,
-        limit:10,
-        type:1,
-        username:'',
-        pay_type:-1,
-        ylj_status:'',
-        paid:''
+        order_sn: "",
+        order_type: "-1",
+        distribution_mode: "-1",
+        keywords: "",
+        status: "",
+        date: "",
+        page: 1,
+        limit: 10,
+        type: 1,
+        username: "",
+        pay_type: -1,
+        ylj_status: "",
+        paid: "",
       }).then(
         (res) => {
           if (res.data.status == 200) {
@@ -216,26 +238,26 @@ afterSalesClick(item,index){
               {
                 img: "https://cdn.bjtdba.com/vod/image/2022-08-12/20220812154736170.png",
                 name: "待付款",
-                num: this.num.orderPrepPayment,
-                status: 5,
+                num: this.num.unpaid || 0,
+                status: 1,
               },
               {
                 img: "https://cdn.bjtdba.com/vod/image/2022-08-12/20220812154723185.png",
                 name: "待发货",
-                num: this.num.orderForDelivery,
-                status: 0,
+                num: this.num.unshipped || 0,
+                status: 2,
               },
               {
                 img: "https://cdn.bjtdba.com/vod/image/2022-08-12/20220812154804269.png",
                 name: "待收货",
-                num: this.num.orderForReceived,
-                status: 1,
+                num: this.num.untake || 0,
+                status: 3,
               },
               {
                 img: "https://cdn.bjtdba.com/vod/image/2022-08-12/20220812154750259.png",
                 name: "待评价",
-                num: this.num.orderForSpeech,
-                status: 2,
+                num: this.num.unevaluate || 0,
+                status: 4,
               },
             ];
             uni.hideLoading();
@@ -246,6 +268,34 @@ afterSalesClick(item,index){
         }
       );
     },
+    //售后
+    async getAfterSaleListData() {
+      try {
+        const res = await getAfterSaleList({
+          refund_order_sn: "",
+          status: "",
+          date: "",
+          page: 1,
+          limit: 20,
+          order_sn: "",
+          refund_type: "",
+        });
+       
+        if(res.data.status == 200){
+          const data = res.data.data.stat
+           var num = data.refuse;
+          var num1 = data.end;
+          var num2 =data.agree;
+
+
+       let finishOrder = num + num1 + num2;
+          this.dingdansss[0].num =data.audit || 0
+          this.dingdansss[1].num = data.backgood || 0
+          this.dingdansss[2].num = finishOrder || 0
+        }
+        uni.hideLoading();
+      } catch (error) {}
+    },
     jiru(e, i) {
       let authorization = uni.getStorageSync("authorization");
       let userinfo = uni.getStorageSync("userinfo");
@@ -429,7 +479,11 @@ page {
         font-weight: 400;
         color: #5f6060;
 
-        .ordermanagement-img {
+      
+      }
+    }
+  }
+  .ordermanagement-img {
           width: 48rpx;
           height: 48rpx;
           position: relative;
@@ -455,12 +509,8 @@ page {
             align-items: center;
           }
         }
-      }
-    }
-  }
-
   .ordermanagement-dingsss {
-    width:calc(100% - 52rpx);
+    width: calc(100% - 52rpx);
     height: 216rpx;
     display: flex;
     flex-direction: column;

shop/afterSalesManagement/afterCardDetail.vue

@@ -1,42 +1,44 @@
 <template>
   <view class="details-xiangqing">
     <view class="details-xiangqing-top">
-      <view class="details-xiangqing-top-let">
-        <image :src="orderProduct.mer_avatar" mode="widthFix"></image>
+      <view class="details-xiangqing-top-let" v-if="storeRefundItem.mer">
+        <image :src="storeRefundItem.mer_avatar" v-if="storeRefundItem.mer.mer_avatar" mode="widthFix"></image>
       </view>
-      <view class="details-xiangqing-top-in">
-        {{ orderProduct.mer_name }}
+      <view class="details-xiangqing-top-in" v-if="storeRefundItem.mer"> 
+        {{ storeRefundItem.mer.yhc_about_name}}
       </view>
       <!-- <view class="details-xiangqing-top-rigt">
     
       </view> -->
-      <view class="details-xiangqingt-yi-top-right"> 退款中 </view>
+      <view class="details-xiangqingt-yi-top-right">
+        {{ formatDataValue("status") }}
+      </view>
     </view>
     <view class="details-xiangqing-niri">
       <view
         class="order-list-yi-in-neibu"
-        v-for="(item, index) in orderProduct.procductList"
+        v-for="(item, index) in list"
         :key="index"
       >
         <view class="order-list-yi-in-neibu-left">
-          <view class="order-list-yi-in-neibu-left-img">
-            <image :src="item.image" mode="widthFix"></image>
+          <view class="order-list-yi-in-neibu-left-img" v-if="item.product">
+            <image :src="item.product.cart_info.product.image" mode="widthFix" v-if="item.product.cart_info"></image>
           </view>
           <view class="order-list-yi-in-neibu-left-url">
-            <view class="order-list-yi-in-neibu-left-url-top">
-              {{ item.store_name }}
+            <view class="order-list-yi-in-neibu-left-url-top" v-if="item.product.cart_info">
+              {{ item.product.cart_info.product.store_name || '' }}
             </view>
-            <view class="order-list-yi-in-neibu-left-url-bottom">
-              8盒/箱，30ML*8袋/盒
+            <view class="order-list-yi-in-neibu-left-url-bottom" v-if="item.product.cart_info" >
+              {{item.product.cart_info.productAttr.sku}}
             </view>
           </view>
         </view>
         <view class="order-list-yi-in-neibu-right">
-          <view class="order-list-yi-in-neibu-right-im">
-            ¥{{ item.pay_price }}
+          <view class="order-list-yi-in-neibu-right-im" v-if="item.product">
+            ¥{{ item.product.cart_info.productAttr.price }}
           </view>
           <view class="order-list-yi-in-neibu-right-in">
-            共{{ item.cart_num }}件
+            共{{ item.product.product_num || 0 }}件
           </view>
         </view>
       </view>
@@ -48,48 +50,16 @@
           >
             <view class="label-box"> {{ orItem.name }} </view>
             <view class="value-box">
-              {{ detaulData[orItem.props] || "--" }}
+              {{ formatDataValue(orItem.props) || "--" }}
             </view>
           </view>
           <view class="tips-mdex" v-if="orItem.isTips"
-            >含邮费 ¥0.00，买家实收退款 ¥99含邮费 ¥0.00，买家实收退款 ¥99</view
+            >含邮费 ¥{{ items.total_postage || "0.00" }}，买家实收退款 ¥{{
+              items.total_price - items.total_postage || "0.00"
+            }}</view
           >
         </template>
-        <!-- <view class="details-xiangqing-shujussss-yis">
-          <view class=""> 售后原因 </view>
-          <view class=""> 拍多了备份 </view>
-        </view>
-        <view class="details-xiangqing-shujussss-yis">
-          <view class=""> 售后件数 </view>
-          <view class=""> 3件 </view>
-        </view>
-        <view class="details-xiangqing-shujussss-yis">
-          <view class=""> 买家应退 </view>
-          <view class=""> 3件 </view>
-        </view>
-        <view class="details-xiangqing-shujussss-yis">
-          <view class="">
-            退款金额
-            <view class="tips-mdex">含邮费 ¥0.00，买家实收退款 ¥99</view>
-          </view>
-          <view class=""> ¥999.00 </view>
-        </view>
-        <view class="details-xiangqing-shujussss-yis">
-          <view class=""> 售后地址 </view>
-          <view class=""> 此处显示商家的售后地址家的售后地址家的售 </view>
-        </view>
-        <view class="details-xiangqing-shujussss-yis">
-          <view class=""> 申请时间 </view>
-          <view class=""> 2023-10-31 11:11:11 </view>
-        </view>
-        <view class="details-xiangqing-shujussss-yis">
-          <view class=""> 订单编号 </view>
-          <view class=""> WX345678876543456787 </view>
-        </view>
-        <view class="details-xiangqing-shujussss-yis">
-          <view class=""> 售后编号 </view>
-          <view class=""> rwx23456789098765434 </view>
-        </view> -->
+        
       </view>
     </view>
   </view>
@@ -98,96 +68,171 @@
 <script>
 //订单详情 卡片详细信息
 import { copy } from "@/utils/index.js";
+import {
+  orderRefundFilterText,
+  orderRefundText,
+  orderRefundFilter,
+} from "../commodity/orderUtil.js";
+import { getAfterSaleList,refundorderDetailApi } from "@/commit/order.js";
 export default {
+  props: {
+    items: {
+      type: Object,
+      default: () => ({}),
+    },
+    storeRefundItem: {
+      type: Object,
+      default: () => {},
+    },
+  },
   data() {
     return {
       cardListData: [
         {
           name: "售后类型",
-          props: "type",
+          props: "refund_type",
           isTips: false,
         },
         {
           name: "售后原因",
-          props: "resonse",
-          isTips: false,
-        },
-        {
-          name: "售后类型",
-          props: "type1",
+          props: "mark",
           isTips: false,
         },
         {
           name: "售后件数",
-          props: "unit",
+          props: "refund_num",
           isTips: false,
         },
         {
-          name: "买家应退",
-          props: "yingtui",
+          name: "退款金额",
+          props: "refund_price",
           isTips: false,
         },
         {
-          name: "退款金额",
-          props: "jine",
+          name: "退款商品总额",
+          props: "price",
           isTips: true,
         },
         {
           name: "售后地址",
-          props: "address",
+          props: "user_address",
           isTips: false,
         },
         {
           name: "申请时间",
-          props: "time",
+          props: "create_time",
           isTips: false,
         },
         {
           name: "订单编号",
-          props: "order_id",
+          props: "order_sn",
           isTips: false,
         },
         {
           name: "售后编号",
-          props: "order_sn",
+          props: "refund_order_sn",
           isTips: false,
         },
       ],
-      detaulData: {
-        type: "退货退款",
-        resonse: "拍多了备份",
-        type1: "3件",
-        unit: "3件",
-        yingtui: "3件",
-        jine: "¥999.00",
-        address: "此处显示商家的售后地址家的售后地址家的售",
-        time: "2023-10-31 11:11:11",
-        order_id: "WX345678876543456787",
-        order_sn: " rwx23456789098765434",
-      },
-      orderProduct: {
-        pay_type: "特殊商户积分",
-        mer_name: "北京众兴未来咨询管理有限公司",
-        mer_avatar:
-          "https://cdn.bjtdba.com/chuxubao/images/2025-02-10/8198d202502101042344757.png",
-        pay_time: "2022-05-01 14:00",
-        order_id: "3645657575757483757",
-        pay_price: "999.00",
-        status: "3",
-        procductList: [
-          {
-            pay_price: "88888",
-            cart_num: "10",
-            image:
-              "https://cdn.bjtdba.com/chuxubao/images/2025-02-10/8198d202502101042344757.png",
-            store_name: "三个苹果 纯天然浓缩果蔬汁清汁苹果汁…",
-          },
-        ],
-      },
+
+      detaulData: {},
+      orderProduct: {},
+      status: "",
+      refund_order_id: "", //售后编号
+      list: [],
     };
   },
-
+  mounted() {
+    console.log(this.$route.query.indexs, "f4gsdfgsd3fgdsfgsrdf");
+    // 0全部  1审核中  2处理中  3已完成
+    let currentActive = this.$route.query["indexs"];
+    this.refund_order_id = this.$route.query["refund_order_id"]; //售后编号
+//  console.log(this.refund_order_sn,"refund_order_sn",currentActive)
+    if (currentActive == 0) {
+      //全部
+      this.status = "";
+    } else if (currentActive == 1) {
+      //审核中 0
+      this.status = 0;
+    } else if (currentActive == 2) {
+      //2处理中 2
+      this.status = 2;
+    } else if (currentActive == 3) {
+      //3已完成
+      this.status = 3;
+    } else {
+      this.status = "";
+    }
+   
+    if (this.refund_order_id) {
+      this.getAfterSaleListData(this.refund_order_id);
+    }
+  },
   methods: {
+    formatDataValue(type) {
+      if (type == "status") {
+        return orderRefundFilter(this.storeRefundItem[type]) || "";
+      } else if (type == "refund_type") {
+        return this.storeRefundItem["refund_type"] == 1
+          ? "仅退款"
+          : this.storeRefundItem["refund_type"] == 2
+          ? "退货退款"
+          : "";
+      } else if (type === "price") {
+         return this.getTotal() || "0.00"
+      } else if (type === "refund_order_sn") {
+        return this.storeRefundItem["refund_order_sn"] || "--";
+      } else if (type === "user_address") {
+        return this.items["user_address"] || "--";
+      } else if (type === "order_sn") {
+        return this.items["order_sn"] || "--";
+      } else if (type === "refund_num") {
+        return this.storeRefundItem["refund_num"] || "--";
+      } else if (type === "mark") {
+        return this.storeRefundItem["mark"] || "--";
+      } else if (type === "nickname") {
+        return (
+          (this.items && this.items.user && this.items.user["nickname"]) || "--"
+        );
+      } else if (type === "create_time") {
+        return this.storeRefundItem["create_time"] || "--";
+      } else if (type === "refund_price") {
+        return this.storeRefundItem["refund_price"] || "--";
+      }
+    },
+    getTotal() {
+      let sum = 0;
+      let row = this.list || []
+      for (let i = 0; i < row.length; i++) {
+        sum += row[i].product.cart_info.productAttr.price * row[i].refund_num;
+      }
+      return sum.toFixed(2);
+    },
+
+    async getAfterSaleListData(refund_order_sn, order_sn) {
+      const params = {
+        refund_order_sn: refund_order_sn,
+        status: this.status,
+        date: "",
+        page: 1,
+        limit: 20,
+        order_sn: order_sn,
+        refund_type: "",
+      };
+    // console.log(params,"getAfterSaleListData")
+      try {
+        // const res = await getAfterSaleList(params);
+        const res = await refundorderDetailApi(refund_order_sn);
+        if (res.data.status == 200) {
+          // console.log(res.data.data.list, "res.data.data.list");
+          const productData= res.data.data&&res.data.data.refundProduct || []
+          this.list = productData;
+        }
+      } catch (error) {
+      } finally {
+        uni.hideLoading();
+      }
+    },
     handleCopy(val) {
       copy(val);
     },

shop/afterSalesManagement/afterCardListInfo.vue

@@ -1,11 +1,11 @@
 <template>
   <view class="details-xiangqing">
     <view class="details-xiangqing-top">
-      <view class="details-xiangqing-top-let">
-        <image :src="orderProduct.mer_avatar" mode="widthFix"></image>
+      <view class="details-xiangqing-top-let" v-if="detailItem.order">
+        <image :src="detailItem.order.mer_avatar" mode="widthFix" v-if="detailItem.order.mer_avatar"></image>
       </view>
-      <view class="details-xiangqing-top-in">
-        {{ orderProduct.mer_name }}
+      <view class="details-xiangqing-top-in" v-if="detailItem.order">
+        {{ detailItem.order.order_sn }}
       </view>
       <view class="details-xiangqing-top-rigt">
         <uni-icons
@@ -15,40 +15,41 @@
           class="arrow_right_log"
         ></uni-icons>
       </view>
-      <view class="details-xiangqingt-yi-top-right"> 退款中 </view>
+      <view class="details-xiangqingt-yi-top-right"> {{formatDataValue(detailItem,'status')}} </view>
     </view>
     <view class="details-xiangqing-niri">
       <view
         class="order-list-yi-in-neibu"
-        v-for="(item, index) in orderProduct.procductList"
-        :key="index"
+        v-for="(item, index) in detailItem.refundProduct"
+        :key="index+'_index'+item.order_product_id"
       >
+      <!-- item.product.cart_info.product -->
         <view class="order-list-yi-in-neibu-left">
-          <view class="order-list-yi-in-neibu-left-img">
-            <image :src="item.image" mode="widthFix"></image>
+          <view class="order-list-yi-in-neibu-left-img" v-if="item.product">
+            <image :src="item.product.cart_info.product.image" mode="widthFix" v-if="item.product.cart_info"></image>
           </view>
           <view class="order-list-yi-in-neibu-left-url">
-            <view class="order-list-yi-in-neibu-left-url-top">
-              {{ item.store_name }}
+            <view class="order-list-yi-in-neibu-left-url-top" v-if="item.product">
+              {{ item.product.cart_info.product.store_name || '' }}
             </view>
-            <view class="order-list-yi-in-neibu-left-url-top">
-              {{ item.store_name }}
+            <view class="order-list-yi-in-neibu-left-url-top" v-if="item.product">
+              {{ item.product.cart_info.productAttr.sku }}
             </view>
           </view>
         </view>
         <view class="order-list-yi-in-neibu-right">
-          <view class="order-list-yi-in-neibu-right-im">
-            ¥{{ item.pay_price }}
+          <view class="order-list-yi-in-neibu-right-im" v-if="item.product">
+            ¥{{ item.product.cart_info.productAttr.price || "0.00" }}
           </view>
           <view class="order-list-yi-in-neibu-right-in">
-            共{{ item.cart_num }}件
+            共{{ item.product.product_num || 0 }}件
           </view>
         </view>
       </view>
 
       <view class="brn-ligd">
-        <view class="btn-cls" @click="viewWuLiu('xxx')"> 查看物流 </view>
-        <view class="btn-cls" @click="viewDetail('xxx')"> 查看详情 </view>
+        <view class="btn-cls" @click="viewWuLiu(detailItem)"> 查看物流 </view>
+        <view class="btn-cls" @click="viewDetail(detailItem)"> 查看详情 </view>
       </view>
 
     </view>
@@ -58,32 +59,30 @@
 <script>
 //订单详情 卡片详细信息
 import { copy } from "@/utils/index.js";
+import {orderRefundFilter} from "../commodity/orderUtil.js"
 export default {
+  props:{
+    detailItem:{
+      type:Object,
+      default:()=>{}
+
+    },
+    index:{
+      type:Number,
+      default:0
+    }
+  },
   data() {
     return {
-      orderProduct: {
-        pay_type: "特殊商户积分",
-        mer_name: "北京众兴未来咨询管理有限公司",
-        mer_avatar:
-          "https://cdn.bjtdba.com/chuxubao/images/2025-02-10/8198d202502101042344757.png",
-        pay_time: "2022-05-01 14:00",
-        order_id: "3645657575757483757",
-        pay_price: "999.00",
-        status: "3",
-        procductList: [
-          {
-            pay_price: "88888",
-            cart_num: "10",
-            image:
-              "https://cdn.bjtdba.com/chuxubao/images/2025-02-10/8198d202502101042344757.png",
-            store_name: "三个苹果 纯天然浓缩果蔬汁清汁苹果汁…",
-          },
-        ],
-      },
     };
   },
 
   methods: {
+    formatDataValue(data,type){
+      if(type === 'status'){
+        return orderRefundFilter(data[type]) || ''
+      }
+    },
     handleCopy(val) {
       copy(val);
     },
@@ -151,7 +150,7 @@ export default {
     }
 
     .details-xiangqing-top-in {
-      width: 364rpx;
+      max-width: 364rpx;
       font-size: 28rpx;
       font-weight: 600;
       overflow: hidden;
@@ -164,6 +163,7 @@ export default {
       flex: 1;
       font-weight: 400;
       color: #1f7cff;
+      white-space: nowrap;
     }
     .details-xiangqing-top-rigt {
       //   width: 36rpx;

shop/afterSalesManagement/afterSalesDetail.vue

@@ -4,10 +4,20 @@
     <view class="after-contents">
       <!-- 退货信息卡片 -->
       <view class="afterdetails-tuihuo mb-26">
-        <view class="afterdetails-tuihuo-top">
-          <view class="tuihuo-title">退货审核中</view>
+        <view class="afterdetails-tuihuo-top" @click="handleDetailInfo">
+          <view class="tuihuo-title">{{ formatDataValue("status") }}</view>
           <!-- 退货审核中 退货中 -->
-          <view class="tuihuo-tab">未发货仅退款</view>
+          <view
+            class="tuihuo-tab"
+            v-if="storeRefundOrder && storeRefundOrder.refund_type"
+            >{{
+              storeRefundOrder.refund_type == 1
+                ? "仅退款"
+                : storeRefundOrder.refund_type == 2
+                ? "退货退款"
+                : ""
+            }}</view
+          >
         </view>
         <view class="afterdetails-tuihuo-bottom">
           <!-- 退货退款成功 、退货退款失败 退货审核中 已发货仅退款成功 字体颜色 color: #1F7CFF; -->
@@ -21,9 +31,27 @@
 			  6、退货退款失败：退货退款失败，请查看失败原因
 			  7、退货退款成功：退货退款已完成，查看具体退款金额
 			  -->
-          <view class="no-cs-tuihuo ">已发货仅退款成功，查看具体退款金额</view>
+          <!-- {{
+            refundorderDetail.refund_type == 1
+              ? "仅退款"
+              : refundorderDetail.refund_type == 2
+              ? "退货退款"
+              : ""
+          }} -->
+          <view
+            class="no-cs-tuihuo"
+            :class="[
+              storeRefundOrder && storeRefundOrder.status == 2
+                ? 'colorTav'
+                : '',
+            ]"
+            >{{ formatDataValue1("status") }}</view
+          >
           <!-- 退货退款成功 已发货仅退款成功-->
-          <view class="content--tuihuo-icon">
+          <view
+            class="content--tuihuo-icon"
+            v-if="storeRefundOrder && storeRefundOrder.status != 0"
+          >
             <uni-icons
               type="right"
               size="26"
@@ -34,16 +62,24 @@
         </view>
       </view>
       <!-- 物流信息卡片  1、退货退款成功   2、退货退款失败 3、退货中 -->
-      <view class="afterdetails-back mb-26" @click="handleWUliu">
+      <view
+        class="afterdetails-back mb-26"
+        @click="handleWUliu"
+        v-if="!storeRefundOrder && storeRefundOrder.delivery_id"
+      >
         <view class="back-tile">买家退货物流</view>
         <view class="back-bttom">
           <view class="image-box">
             <image src="/static/images/new_ui/kuaidi.png" mode="scaleToFill"
           /></view>
           <view class="content-back">
-            <view class="content-back-title">圆通快递</view>
+            <view class="content-back-title">{{
+              storeRefundOrder && storeRefundOrder.delivery_type
+            }}</view>
             <view class="content-back-text">
-              <view class="no-cs">ZT3456789098765</view>
+              <view class="no-cs">{{
+                storeRefundOrder && storeRefundOrder.delivery_id
+              }}</view>
               <view class="content-icon">
                 <uni-icons
                   type="right"
@@ -57,9 +93,13 @@
         </view>
       </view>
       <view class="afterdetails-card">
-        <afterCardDetail class="mb-26"></afterCardDetail>
+        <afterCardDetail
+          class="mb-26"
+          :items="refundorderDetail"
+          :storeRefundItem="storeRefundOrder"
+        ></afterCardDetail>
       </view>
-      <view class="record-content">
+      <!-- <view class="record-content">
         <view class="record-title">协商记录</view>
         <view class="record-icon">
           <uni-icons
@@ -69,13 +109,61 @@
             class="arrow_right_log"
           ></uni-icons>
         </view>
-      </view>
+      </view> -->
     </view>
     <!-- 1、未发货仅退款  3、退货退款【退货中、退货审核中】 -->
-    <view class="btn-list" v-if="true">
-      <view class="btn quxiao"> 拒绝退款 </view>
-      <view class="btn primary"> 同意退款 </view>
+    <!-- `status`  '状态 0:待审核 -1:审核未通过 1:待退货 2:待收货 3:已退款', -->
+    <!-- {{
+                scope.row.status == 3 ||
+                scope.row.status == -1 ||
+                scope.row.order.douhuomall == 1
+                  ? "售后进度"
+                  : "审核"
+              }} -->
+    <view class="btn-list" v-if="getBtnAuth">
+      <view
+        class="btn quxiao"
+        @click="onHandleclick(storeRefundOrder, 'reject')"
+      >
+        拒绝退款
+      </view>
+      <view
+        class="btn primary"
+        @click="onHandleclick(storeRefundOrder, 'agree')"
+      >
+        同意退款
+      </view>
+      <view
+        class="btn primary1"
+        @click="onHandleclick(storeRefundOrder, 'partAgree')"
+      >
+        部分退款并完成售后
+      </view>
     </view>
+    <uni-popup
+      ref="popup"
+      type="center"
+      :animation="true"
+      :is-mask-click="false"
+    >
+      <view class="popup_data">
+        <view class="popup_data__headers">
+          <view class="popup_data__headers--title">{{ popUpTitle }}</view>
+          <uni-icons
+            type="closeempty"
+            class="custom_icons"
+            size="30"
+            @click="handleClose"
+          ></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>
+      </view>
+    </uni-popup>
   </view>
 </template>
 
@@ -83,6 +171,11 @@
 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 {
+  orderRefundFilterText,
+  orderRefundText,
+} from "../commodity/orderUtil.js";
 export default {
   components: {
     headersVue,
@@ -92,13 +185,111 @@ export default {
     return {
       indexs: 0,
       order_id: "",
+      refundorderDetail: {},
+      storeRefundOrder: {},
+      refund_order_id: "",
+      auditType: "",
+      refundData: {
+        status: 1, // 1.同意 -1.拒绝 2.部分退款
+        fail_message: "",
+        part_refund_price: "",
+        part_refund_message: "",
+        mer_refund_user: "",
+        mer_refund_address: "",
+        set_phone: "",
+      },
+      douhuomall: "",
+      popUpTitle: "拒绝退款",
     };
   },
-  onLoad(options) {
+  async onLoad(options) {
     this.indexs = options.indexs;
     this.order_id = options.order_id;
+    this.refund_order_id = options.refund_order_id;
+    await this.getRefundOrderDetails();
+    if (this.refund_order_id) {
+      await this.getAfterSaleListData(this.refund_order_id);
+    }
   },
   methods: {
+    open(type = "bottom") {
+      this.$refs.popup.open(type);
+    },
+    handleClose() {
+      this.close();
+    },
+    close() {
+      this.refundData = {
+        status: 1, // 1.同意 -1.拒绝 2.部分退款
+        fail_message: "",
+        part_refund_price: "",
+        part_refund_message: "",
+        mer_refund_user: "",
+        mer_refund_address: "",
+        set_phone: "",
+      };
+      this.popUpTitle = "";
+      this.$refs.popup.close();
+    },
+    //提交
+    handleConfirm() {},
+    formatDataValue(type) {
+      const data = this.storeRefundOrder || {};
+      return orderRefundFilterText(data[type]) || "";
+    },
+    formatDataValue1(type) {
+      const data = this.storeRefundOrder || {};
+      return orderRefundText(data[type]) || "";
+    },
+    // 订单退单详情页面
+    async getRefundOrderDetails() {
+      uni.showLoading({
+        title: "加载中...",
+        mask: true,
+      });
+      try {
+        const res = await orderDetailApi(this.order_id);
+        if (res.data.status == 200) {
+          this.refundorderDetail = {
+            ...res.data.data,
+          };
+          // this.storeRefundOrder =
+          //   (this.refundorderDetail &&
+          //     this.refundorderDetail.StoreRefundOrder) ||
+          //   {};
+        }
+      } catch (error) {
+        if (error.message == "没有权限访问") {
+          this.refundorderDetail = {};
+        }
+      } finally {
+        uni.hideLoading();
+      }
+    },
+
+    async getAfterSaleListData(refund_order_id) {
+      try {
+        const res = await refundorderDetailApi(refund_order_id);
+        if (res.data.status == 200) {
+          const productData = res.data.data || {};
+          this.storeRefundOrder = productData;
+        }
+      } catch (error) {
+      } finally {
+        uni.hideLoading();
+      }
+    },
+    handleDetailInfo() {
+      uni.showModal({
+        content: "该功能正在升级中",
+
+        title: "温馨提示",
+        success: (result) => {},
+        fail: (res) => {},
+        complete: (res) => {},
+      });
+    },
+
     headerJump() {
       const params = {
         indexs: this.indexs,
@@ -106,18 +297,54 @@ export default {
       const urlParams = toQueryString(params);
       uni.redirectTo({ url: "./index?" + urlParams });
     },
-	handleWUliu(item){
-		const params = {
+    handleWUliu(item) {
+      const params = {
         status: 0,
         indexs: this.indexs,
         formType: "shouhouDetail",
-        order_id: this.order_id  || "1212",
+        order_id: this.order_id,
+        refund_order_id: item.refund_order_id,
       };
+
       const urlParams = toQueryString(params);
+      if (!this.refundorderDetail.delivery_id) return;
       uni.redirectTo({
         url: `../commodity/logisticsInformationDetail?${urlParams}`,
       });
-	}
+    },
+    onHandleclick(item, type) {
+      this.auditType = type;
+      // 1.同意 -1.拒绝 2.部分退款
+      this.open();
+      if (type == "reject") {
+        //拒绝
+        this.refundData.status = -1;
+        this.popUpTitle = "拒绝退款";
+      } else if (type == "agree") {
+        //通过
+        this.refundData.status = 1;
+        this.popUpTitle = "同意退款";
+      } else if (type == "partAgree") {
+        //部分退款并完成售后
+        this.refundData.status = 2;
+        this.popUpTitle = "部分退款并完成售后";
+      }
+    },
+  },
+  computed: {
+    getBtnAuth() {
+      if (
+        (this.storeRefundOrder.refund_type == 2 &&
+          (this.storeRefundOrder.status == 1 ||
+            this.storeRefundOrder.status == 2)) ||
+        (this.storeRefundOrder.status == 0 &&
+          this.storeRefundOrder.refund_type == 1)
+      ) {
+        return true;
+      } else {
+        return false;
+      }
+    },
   },
 };
 </script>
@@ -210,7 +437,7 @@ page {
         padding: 0 10rpx;
         color: #999999;
         border: 2rpx solid #999999;
-		border-radius: 4rpx;
+        border-radius: 4rpx;
       }
     }
     .afterdetails-tuihuo-bottom {
@@ -222,9 +449,9 @@ page {
         font-weight: 400;
         font-size: 28rpx;
         color: #1f7cff;
-		&.colorTav{
-			color: #999999;
-		}
+        &.colorTav {
+          color: #999999;
+        }
       }
       .content--tuihuo-icon {
         width: 30rpx;
@@ -272,13 +499,18 @@ page {
   .quxiao {
     border: 1rpx solid #999999;
     color: #333333;
-    width: 45%;
+    width: 25%;
     margin-left: 26rpx;
   }
   .primary {
     color: #ffffff;
     background: #1f7cff;
-    width: 45%;
+    width: 25%;
+  }
+  .primary1 {
+    color: #ffffff;
+    background: #1f7cff;
+    width: 37%;
   }
 }
 .record-content {
@@ -296,4 +528,50 @@ page {
     color: #333333;
   }
 }
+.popup_data {
+  padding: 26rpx 30rpx;
+  min-height: 700rpx;
+  max-height: 750rpx;
+  box-sizing: border-box;
+  overflow: hidden;
+  background: linear-gradient(180deg, #e5edff 0%, #ffffff 100%);
+  border-radius: 24rpx 24rpx 0 0;
+  &__headers {
+    // height: 40rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    border-bottom: 2rpx solid #e5e5e5;
+    padding-bottom: 15rpx;
+    &--title {
+      flex: 1;
+      display: -webkit-box;
+      -webkit-box-orient: vertical;
+      -webkit-line-clamp: 1;
+      overflow: hidden;
+      justify-content: space-between;
+      padding-right: 60rpx;
+      font-size: 32rpx;
+      font-weight: 600;
+    }
+    .custom_icons {
+      flex-shrink: 0;
+    }
+  }
+  &__content {
+    max-height: 620rpx;
+    overflow-y: auto;
+  }
+}
+.send-goods {
+  height: 78rpx;
+  // margin: 0 32rpx;
+  font-weight: 400;
+  font-size: 30rpx;
+  color: #ffffff;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 32rpx;
+}
 </style>

shop/afterSalesManagement/components/search/search.vue

@@ -10,7 +10,7 @@
         class="search__input"
         v-model="searchValue"
         type="text"
-        placeholder="输入商品名称/商品ID"
+        :placeholder="placeholder"
       />
       <button class="search__btn" @click="haandleSearch">搜索</button>
     </view>
@@ -19,6 +19,12 @@
 
 <script>
 export default {
+  props: {
+    placeholder: {
+      type: String,
+      default: "请输入搜索内容"
+    }
+  },
   data() {
     return {
       searchValue: ""

shop/afterSalesManagement/components/tablist.vue

@@ -19,9 +19,9 @@
           >
             <view class="tile-box">
               <text class="name-box">{{ item.name }}</text>
-              <!-- <text class="count">
-                {{ item.count || 0 }}
-              </text> -->
+              <text class="count" v-if="item.count>0">
+               ({{ item.count || 0 }})
+              </text>
             </view>
           </view>
         </view>
@@ -156,12 +156,12 @@ export default {
           .tile-box {
             display: flex;
             align-items: center;
-            flex-direction: column;
+            // flex-direction: column;
             .name-box {
               padding-bottom: 13rpx;
             }
             .count {
-              padding-bottom: 13rpx;
+              padding: 0 0rpx 12rpx;
             }
           }
         }
@@ -188,7 +188,7 @@ export default {
 .active::after {
   content: "";
   position: absolute;
-  width: 50rpx;
+  width: 80rpx;
   height: 8rpx;
   background-color: #1f7cff;
   left: 0px;

shop/afterSalesManagement/index.vue

@@ -3,28 +3,40 @@
     <headersVue headerTitle="售后管理" @headerJump="headerJump"></headersVue>
     <view class="afterSalesManagement-content">
       <view class="afterSalesManagement-content--top">
+        <!-- placeholder="订单号/退货快递单号/收货人姓名、手机号" -->
         <searchVue
           @search="search"
           class="search-box"
-          placeholder="订单号/退货快递单号/收货人姓名、手机号"
+          placeholder="请输入订单号"
         ></searchVue>
       </view>
       <view class="afterSalesManagement-content--tab">
-        <tabsVue :category="dataList" :currentActive="currentActive" @tabs="tabsHandleClick" />
+        <tabsVue
+          :category="dataList"
+          :currentActive="currentActive"
+          @tabs="tabsHandleClick"
+        />
       </view>
     </view>
     <view class="afterSalesManagement-list">
-      <template v-for="item in 10">
+      <template v-if="list.length > 0">
         <afterCardListInfo
-          :key="item"
+          v-for="(item, index) in list"
+          :key="item.mer_id + '_index_' + index"
           class="afterSalesManagement-list__card"
+          :detailItem="item"
+          :index="index"
           @viewWuLiu="viewWuLiu"
-		  @viewDetail="viewDetail"
+          @viewDetail="viewDetail"
         ></afterCardListInfo>
       </template>
+      <template v-else>
+        <emptyDataVue />
+      </template>
     </view>
     <view
       class=""
+      v-if="tihsi == 0 && list.length > 0"
       style="margin: 60rpx 0 30rpx 0; color: #999999; font-size: 26rpx"
     >
       —— 已经到最底部了哦 ——
@@ -38,77 +50,193 @@ import tabsVue from "./components/tablist.vue";
 import searchVue from "./components/search/search.vue";
 import afterCardListInfo from "./afterCardListInfo.vue";
 import { toQueryString } from "@/utils/index.js";
-
+import { getAfterSaleList } from "@/commit/order.js";
+import emptyDataVue from "../components/emptyData/emptyData.vue";
 export default {
   components: {
     headersVue,
     tabsVue,
     searchVue,
     afterCardListInfo,
+    emptyDataVue,
   },
   data() {
     return {
       tihsi: 0,
       currentActive: 0,
+      indexs: 0,
+      refund_order_sn: "",
+      date: "",
+      page: 1,
+      limit: 10,
+      order_sn: "",
+      refund_type: "",
+      list: [],
+      tihsi: "",
+      is_panudn: true,
+      status: "",
       dataList: [
         {
-          img: "https://cdn.bjtdba.com/vod/image/2022-08-12/20220812154904247.png",
           name: "全部",
+          count: 0,
         },
         {
-          img: "https://cdn.bjtdba.com/vod/image/2022-08-12/20220812154932244.png",
           name: "审核中",
+          count: 0,
         },
         {
-          img: "https://cdn.bjtdba.com/vod/image/2022-08-12/20220812154949118.png",
           name: "处理中",
+          count: 0,
         },
         {
-          img: "https://cdn.bjtdba.com/vod/image/2022-08-12/20220812155008586.png",
           name: "已完成",
+          count: 0,
         },
       ],
     };
   },
-  onPullDownRefresh() {},
+  onPullDownRefresh() {
+    uni.showLoading({
+      title: "加载中",
+    });
+    this.page = 1;
+    this.is_panudn = true;
+    this.list = [];
+    this.getAfterSaleListData();
+  },
   onReachBottom() {
-    console.log("onReachBottom");
+    if (this.is_panudn == true) {
+      this.page++;
+      this.getAfterSaleListData();
+    } else {
+      return;
+    }
   },
 
-  onLoad(options) {
-	// console.log(options,"tabsHandleClicktabsHandleClicktabsHandleClicktabsHandleClick");
-    this.currentActive = options.tabIndex ||  options.index || "0";
+  async onLoad(options) {
+    // console.log(options,"tabsHandleClicktabsHandleClicktabsHandleClicktabsHandleClick");
+    const tabIndex = options.tabIndex || options.indexs || options.index || "0";
+    this.indexs = tabIndex;
+    this.currentActive = tabIndex;
+    // 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();
   },
   methods: {
     headerJump() {
       uni.switchTab({ url: "/pages/ordermanagement/index" });
     },
-    search(val) {},
+  async  search(val) {
+      this.order_sn = val;
+        await this.orderList();
+    },
+
+    async getAfterSaleListData() {
+      const params = {
+        refund_order_sn: this.refund_order_sn,
+        status: this.status,
+        date: this.date,
+        page: this.page,
+        limit: this.limit,
+        order_sn: this.order_sn,
+        refund_type: this.refund_type,
+      };
+       uni.showLoading({
+      title: "加载中",
+    });
+      try {
+        const res = await getAfterSaleList(params);
+        uni.stopPullDownRefresh();
+        if (res.data.status == 200) {
+          this.tihsi = res.data.data.count || 0;
+          if (res.data.data.count > 0) {
+            if (this.page == 1) {
+              this.list = res.data.data.list;
+            } else {
+              this.list = this.list.concat(res.data.data.list);
+            }
+          } else {
+            if (this.page == 1) {
+              this.list = [];
+            }
+            this.is_panudn = false;
+          }
+          const stat = res.data.data.stat || {};
+          this.dataList[0].count = stat.all || 0; //全部
+          this.dataList[1].count = stat.audit || 0; //审核中
+          this.dataList[2].count = stat.backgood || 0; //处理中
+          var num = stat.refuse || 0;
+          var num1 = stat.end || 0;
+          var num2 = stat.agree || 0;
+          this.dataList[3].count = num + num1 + num2 || 0; //已完成
+        }
+      } catch (error) {
+      } finally {
+        uni.hideLoading();
+      }
+    },
+
     viewWuLiu(item) {
       const params = {
         status: 0,
         indexs: this.currentActive,
         formType: "shouhou",
-        order_id: item.order_id || "1212",
+        order_id: item.order_id || "",
+           refund_order_id:item .refund_order_id,
       };
       const urlParams = toQueryString(params);
       uni.redirectTo({
         url: `../commodity/logisticsInformationDetail?${urlParams}`,
       });
     },
-	viewDetail(item){
-		  const params = {
+    viewDetail(item) {
+      // console.log(item)
+      const params = {
         indexs: this.currentActive,
-        order_id: item.order_id || "1212",
+        order_id: item.order_id ,
+        refund_order_id:item .refund_order_id,
       };
+      // console.log(params,"paramsparamsparamsparamsparamsparams")
       const urlParams = toQueryString(params);
-	   uni.redirectTo({
+      uni.redirectTo({
         url: `./afterSalesDetail?${urlParams}`,
       });
-	},
-	tabsHandleClick(obj){
-		this.currentActive = obj.index;
-	}
+    },
+  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();
+    },
   },
 };
 </script>

shop/commodity/components/changeDetailInfo/ItemsInsidePackage.vue

@@ -17,39 +17,48 @@
       </view>
 
       <view class="popup_data__package__content">
-          <view class="detail-send-order-product">
-            <view class="detail-send-order-product__wrapper">
-              <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">
-                    <image
-                      v-if="items.image"
-                      :src="items.image"
-                      mode="widthFix"
-                    ></image>
-                    <text v-else>暂无照片</text>
-                  </view>
+        <view class="detail-send-order-product">
+          <view class="detail-send-order-product__wrapper">
+            <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.cart_info"
+                >
+                  <image
+                    v-if="items.cart_info.product.image"
+                    :src="items.cart_info.product.image"
+                    mode="widthFix"
+                  ></image>
+                  <text v-else>暂无照片</text>
                 </view>
-                <view class="detail-send-order-content-middle">
-                  <view class="detail-send-order-content-middle-top">
-                    三个苹果 纯天然浓缩果蔬汁清汁苹果
-                  </view>
-                  	<view class="detail-send-order-content-middle-top-bot" >
-					12sdf
-				</view>
+              </view>
+              <view class="detail-send-order-content-middle">
+                <view
+                  class="detail-send-order-content-middle-top"
+                  v-if="items.cart_info"
+                >
+                  {{ items.cart_info.product.store_name }}
+                </view>
+                <view
+                  class="detail-send-order-content-middle-top-bot"
+                  v-if="items.cart_info"
+                >
+                  {{ items.cart_info.productAttr.sku || "" }}
                 </view>
-                <view class="detail-send-order-content-right">
-                  <view class="detail-send-order-yi-in-neibu-right-in">
-                   ×5
-                  </view>
+              </view>
+              <view class="detail-send-order-content-right">
+                <view class="detail-send-order-yi-in-neibu-right-in">
+                  ×{{ items.product_num || 0 }}
                 </view>
               </view>
             </view>
           </view>
+        </view>
       </view>
     </view>
   </uni-popup>
@@ -61,48 +70,48 @@ export default {
   props: {
     title: {
       type: String,
-      default: "包裹内商品"
+      default: "包裹内商品",
     },
     value: {
       type: [String, Number],
-      default: ""
+      default: "",
     },
     defaultProps: {
       type: Object,
       default: () => {
         return {
           props: "text",
-          value: "value"
+          value: "value",
         };
-      }
+      },
     },
-    selectData: {
+    orderProduct: {
       type: Array,
       default: () => {
         return [];
-      }
-    }
+      },
+    },
   },
   data() {
     return {
       selectId: "",
-      orderProduct: [
-        {
-          image:
-            "https://cdn.bjtdba.com/chuxubao/images/2025-02-10/8198d202502101042344757.png"
-        },
-		{
-		  image:
-		    "https://cdn.bjtdba.com/chuxubao/images/2025-02-10/8198d202502101042344757.png"
-		},
-		{
-		  image:
-		    "https://cdn.bjtdba.com/chuxubao/images/2025-02-10/8198d202502101042344757.png"
-		}, {
-          image:
-            "https://cdn.bjtdba.com/chuxubao/images/2025-02-10/8198d202502101042344757.png"
-        }
-      ]
+      //   orderProduct: [
+      //     {
+      //       image:
+      //         "https://cdn.bjtdba.com/chuxubao/images/2025-02-10/8198d202502101042344757.png"
+      //     },
+      // {
+      //   image:
+      //     "https://cdn.bjtdba.com/chuxubao/images/2025-02-10/8198d202502101042344757.png"
+      // },
+      // {
+      //   image:
+      //     "https://cdn.bjtdba.com/chuxubao/images/2025-02-10/8198d202502101042344757.png"
+      // }, {
+      //       image:
+      //         "https://cdn.bjtdba.com/chuxubao/images/2025-02-10/8198d202502101042344757.png"
+      //     }
+      //   ]
     };
   },
   watch: {
@@ -110,8 +119,8 @@ export default {
       handler(val) {
         this.selectId = val;
       },
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     this.selectId = this.value;
@@ -137,8 +146,8 @@ export default {
     },
     close() {
       this.$refs.popupRefs.close();
-    }
-  }
+    },
+  },
 };
 </script>
 
@@ -158,7 +167,7 @@ export default {
     justify-content: space-between;
     align-items: center;
     // border-bottom: 2rpx solid #e5e5e5;
-	 // background: linear-gradient(180deg, #e5edff 0%, #ffffff 100%);
+    // background: linear-gradient(180deg, #e5edff 0%, #ffffff 100%);
     padding-bottom: 15rpx;
     &--title {
       flex: 1;
@@ -179,78 +188,76 @@ export default {
     // border: 2rpx solid #f00;
     max-height: 690rpx;
     overflow-y: auto;
-	margin-bottom: 0rpx;
-	.detail-send-order-product{
-		width: calc(100% - 54rpx);
-		margin:0 26rpx 30rpx;
-		&__wrapper{
-			
-			display: flex;
-			flex-direction: column;
-			justify-content: space-between;
-			align-items: flex-end;
-			.detail-send-order-content{
-				width:100%;
-				display: flex;
-				align-items: center;
-				padding: 26rpx  0;
-				gap:20rpx;
-				border-bottom:2rpx solid #e5e5e5;
-				&:last-child{
-					border-bottom: 0;
-				}
-				.detail-send-order-content-left{
-					height: 100%;
-					display: flex;
-					align-items: flex-start;
-					justify-content: space-between;
-					&-img{
-						width: 158rpx;
-						height: 158rpx;
-						background-color: #eee;
-						overflow: hidden;
-						border-radius: 10rpx;
-						flex-shrink: 0;
-						image {
-							width: 100%;
-							height: auto;
-						}
-					}
-				}
-	}
-	     }
-		 .detail-send-order-content-middle-top-bot{
-			 font-weight: 400;
-			 font-size: 22rpx;
-			 color: #666666;
-		 }
-		 .detail-send-order-content-middle{
-			 height: 100%;
-			 flex: 1;
-			 &-top{
-			 	width: 100%;
-			 	font-weight: 400;
-			 	color: #333333;
-			 	font-size: 28rpx;
-			 	display: -webkit-box;
-			 	-webkit-box-orient: vertical;
-			 	-webkit-line-clamp: 1;
-			 	overflow: hidden;
-			 	justify-content: space-between;
-			 }
-		 }
-	  
-	  .detail-send-order-content-right{
+    margin-bottom: 0rpx;
+    .detail-send-order-product {
+      width: calc(100% - 54rpx);
+      margin: 0 26rpx 30rpx;
+      &__wrapper {
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+        align-items: flex-end;
+        .detail-send-order-content {
+          width: 100%;
+          display: flex;
+          align-items: center;
+          padding: 26rpx 0;
+          gap: 20rpx;
+          border-bottom: 2rpx solid #e5e5e5;
+          &:last-child {
+            border-bottom: 0;
+          }
+          .detail-send-order-content-left {
+            height: 100%;
+            display: flex;
+            align-items: flex-start;
+            justify-content: space-between;
+            &-img {
+              width: 158rpx;
+              height: 158rpx;
+              background-color: #eee;
+              overflow: hidden;
+              border-radius: 10rpx;
+              flex-shrink: 0;
+              image {
+                width: 100%;
+                height: auto;
+              }
+            }
+          }
+        }
+      }
+      .detail-send-order-content-middle-top-bot {
+        font-weight: 400;
+        font-size: 22rpx;
+        color: #666666;
+      }
+      .detail-send-order-content-middle {
+        height: 100%;
+        flex: 1;
+        &-top {
+          width: 100%;
+          font-weight: 400;
+          color: #333333;
+          font-size: 28rpx;
+          display: -webkit-box;
+          -webkit-box-orient: vertical;
+          -webkit-line-clamp: 1;
+          overflow: hidden;
+          justify-content: space-between;
+        }
+      }
 
-		  .detail-send-order-yi-in-neibu-right-in{
-			  font-weight: 400;
-			  font-size: 24rpx;
-			  color: #666666;
-			  text-align: center;
-			  padding-top:5rpx;                                                               
-		  }
-	  }
-	   }
+      .detail-send-order-content-right {
+        .detail-send-order-yi-in-neibu-right-in {
+          font-weight: 400;
+          font-size: 24rpx;
+          color: #666666;
+          text-align: center;
+          padding-top: 5rpx;
+        }
+      }
+    }
   }
 }
 </style>

shop/commodity/components/changeDetailInfo/changeLogisticsInformation.vue

@@ -30,7 +30,7 @@
     </view>
     <view class="card-info-bottom">
       <view class="card-top">
-        <view class="card-title">变更送货人信息</view>
+        <view class="card-title">变更物流信息</view>
       </view>
       <view class="card-content">
         <fillLogisticsInfoVue

shop/commodity/components/fillLogisticsInfo.vue

@@ -17,7 +17,7 @@
           @click="handleQrcode"
         ></image>
       </reInputItemVue>
-      <popupSelectItemVue @click-tabs="handleClick"></popupSelectItemVue>
+      <popupSelectItemVue @click-tabs="handleClick" :selectData="ruleOptions"></popupSelectItemVue>
     </view>
   </view>
 </template>
@@ -35,17 +35,30 @@ export default {
     isShowTitle: {
       type: Boolean,
       default: true
+    },
+    ruleOptions:{
+      type: Array,
+      default: () => []
     }
   },
+
   data() {
-    return {};
+    return {
+      formData: {
+        delivery_id:"",//快递单号
+        delivery_name:"",//快递公司value
+        delivery_type:1,//发货类型
+      }
+    };
   },
   methods: {
+
+    //TODO 扫码识别
     handleQrcode() {
       console.log("handleQrcode");
       uni.showModal({
         title: "提示",
-        content: "扫码功能快马加鞭开发中....",
+        content: "正在升级中...",
         success(res) {
           if (res.confirm) {
             console.log("用户点击了确定");
@@ -56,15 +69,28 @@ export default {
       });
     },
     changeInput(val) {
-      console.log(val, "物流单号");
+      this.formData.delivery_id = val;
+       this.chageValue({
+       delivery_id: this.formData.delivery_id
+      })
     },
     handleSelect() {
       this.$refs.popup.open();
     },
     handleClick({ selected, item, index }) {
       this.logisticsValue = selected;
-      this.logisticsLabel = item.text;
-      console.log(selected, item, index);
+      this.logisticsLabel = item.text || item.label  ;
+      this.formData.delivery_name = item.value;
+      // console.log(selected, item, index,this.logisticsLabel);
+      // this.$emit("click-tabs-", { selected, item, index });
+      this.chageValue({
+        delivery_name: this.formData.delivery_name 
+      })
+    },
+    chageValue(val){
+      // console.log(this.formData)
+      this.$emit("changeHandle",this.formData)
+
     }
   },
   computed: {

shop/commodity/components/orderDetail/logisticInfocardJianjie.vue

@@ -1,19 +1,19 @@
 <template>
   <view class="details-back-url-card" @click="goToLogistic">
-    <view class="order-list-yi-bot-xiangxi custom_top" v-if="true">
+    <view class="order-list-yi-bot-xiangxi custom_top" v-if="![5].includes(detail.status)">
       <view class="order-list-yi-bot-xiangxier custom_center">
         <view class="dot-line"></view>
       </view>
-      <view class="order-list-yi-bot-xadasrfe">
-        <view class="order-list-yi-bot-xadasrfe-top"> 运输中 </view>
-		<view class="order-list-yi-bot-xadasrfe-bot custom-txt">
-		  <view class=""> 圆通快递 </view>
+      <view class="order-list-yi-bot-xadasrfe" >
+        <view class="order-list-yi-bot-xadasrfe-top"> {{!detail.delivery_id?"待发货":logisticText}} </view>
+		<view class="order-list-yi-bot-xadasrfe-bot custom-txt" v-if="detail.delivery_id">
+		  <view class=""> {{detail.delivery_name}} </view>
 		  <view class="" style="margin-left: 32rpx">
-		  YT1234567890987 
+		  {{detail.delivery_id}}
 		  </view>
 		</view>
       </view>
-	  <uni-icons type="right" size="20" color="#333333" class="arrow_right_log"></uni-icons>
+	  <uni-icons type="right" size="20" color="#333333" class="arrow_right_log" v-show="this.detail.delivery_id"></uni-icons>
     </view>
     <view class="order-list-yi-bot-xiangxi">
       <view class="order-list-yi-bot-xiangxier">
@@ -25,10 +25,10 @@
       </view>
       <view class="order-list-yi-bot-xadasrfe">
         <view class="order-list-yi-bot-xadasrfe-top">
-          北京市通州区经开壹中心14号楼9层北京市通州区经开壹中心14号楼9层
+          {{detail.user_address}}
         </view>
         <view class="order-list-yi-bot-xadasrfe-bot">
-          <view class=""> 郭郭备份 </view>
+          <view class=""> {{detail.real_name}} </view>
           <view class="" style="margin-left: 32rpx">
             {{ phone_user }}
           </view>
@@ -42,24 +42,31 @@
 //订单详情物流简洁卡片user_phone
 import { MaskRules } from "@/utils/index.js";
 export default {
+  props:{
+    detail:{
+      type:Object,
+      default:()=>{}
+    },
+    logisticText:{
+      type:String,
+      default:""
+    }
+  },
   data() {
     return {
-      user_phone: "18533332222"
+      
     };
   },
   methods:{
 	  goToLogistic(){
-		  console.log("去往物流信息")
+      if(!this.detail.delivery_id)return;
 		  this.$emit("goToLogistic")
-		  // uni.redirectTo({
-		  // 	url: './order?status=' + this.status + '&index=' + this.indexs
-		  // 	// url: './order'
-		  // });
 	  }
   },
   computed: {
     phone_user() {
-      return MaskRules.mobile(this.user_phone);
+      const user_phone = this.detail.user_phone || ""
+      return MaskRules.mobile(user_phone);
     }
   }
 };
@@ -81,7 +88,7 @@ export default {
     display: flex;
     align-items: flex-start;
 	&.custom_top{
-		padding-bottom:32rpx;
+		padding-bottom:15rpx;
 	}
     .arrow_right_log{
 		position: absolute;

shop/commodity/components/orderDetail/orderCardDetailInfo.vue

@@ -1,126 +1,224 @@
 <template>
-		<view class="details-xiangqing">
-			<view class="details-xiangqing-top">
-					<view class="details-xiangqing-top-let">
-						<image :src="orderProduct.mer_avatar" mode="widthFix"></image>
-					</view>
-					<view class="details-xiangqing-top-in">
-						{{orderProduct.mer_name}}
-					</view>
-					<view class="details-xiangqing-top-rigt">
-						  <uni-icons type="right" size="26" color="#999999" class="arrow_right_log"></uni-icons>
-						</image>
-					</view>
-				</view>
-							<view class="details-xiangqing-niri">
-				<view class="order-list-yi-in-neibu"  v-for="(item,index) in orderProduct.procductList" :key="index">
-					<view class="order-list-yi-in-neibu-left">
-						<view class="order-list-yi-in-neibu-left-img">
-							<image :src="item.image" mode="widthFix"></image>
-						</view>
-						<view class="order-list-yi-in-neibu-left-url">
-							<view class="order-list-yi-in-neibu-left-url-top">
-								{{item.store_name}}
-							</view>
-						</view>
-					</view>
-					<view class="order-list-yi-in-neibu-right">
-						<view class="order-list-yi-in-neibu-right-im">
-							¥{{item.pay_price}}
-						</view>
-						<view class="order-list-yi-in-neibu-right-in">
-							共{{item.cart_num}}件
-						</view>
-					</view>
-				</view>
-				
-				<view v-if="orderProduct.status=='0'" class="btn-cls" @click="sendGoods">
-					立即发货
-				</view>
-				<view class="details-xiangqing-shujussss">
-					<view class="details-xiangqing-shujussss-yis">
-						<view class="">
-							商品总额
-						</view>
-						<view class="">
-							+¥{{orderProduct.pay_price}}
-						</view>
-					</view>
-					<view class="details-xiangqing-shujussss-yis">
-						<view class="">
-							优惠金额
-						</view>
-						<view class="">
-							-¥0.00
-						</view>
-					</view>
-					<view class="details-xiangqing-shujussss-yis">
-						<view class="">
-							订单编号
-						</view>
-						<view class="" @click="handleCopy(orderProduct.order_id)">
-							{{orderProduct.order_id}} | 复制
-						</view>
-					</view>
-					<view class="details-xiangqing-shujussss-yis">
-						<view class="">
-							下单时间
-						</view>
-						<view class="">
-							{{orderProduct.pay_time}}
-						</view>
-					</view>
-					<view class="details-xiangqing-shujussss-yis">
-						<view class="">
-							支付方式
-						</view>
-						<view class="">
-							{{orderProduct.pay_type}}
-						</view>
-					</view>
-				</view>
-			</view>
-			</view>
+  <view class="details-xiangqing">
+    <view class="details-xiangqing-top">
+      <view
+        class="details-xiangqing-top-let"
+        v-if="detail.user && detail.user.avatar"
+      >
+        <!-- TODO:头像 -->
+        <image :src="detail.user.avatar" mode="widthFix"></image>
+      </view>
+      <view class="details-xiangqing-top-in">
+        {{ detail.user && detail.user.nickname }}
+      </view>
+      <view class="details-xiangqing-top-rigt">
+        <!-- <uni-icons type="right" size="26" color="#999999" class="arrow_right_log"></uni-icons> -->
+      </view>
+    </view>
+    <view class="details-xiangqing-niri">
+      <view
+        class="order-list-yi-in-neibu"
+        v-for="(items, index) in detail.customProductInfo"
+        :key="index"
+      >
+        <view class="order-list-yi-in-neibu-left">
+          <view class="order-list-yi-in-neibu-left-img" v-if="items.cart_info">
+            <image
+              v-if="items.cart_info.product.image"
+              :src="items.cart_info.product.image"
+              mode="widthFix"
+            ></image>
+          </view>
+          <view class="order-list-yi-in-neibu-left-url">
+            <view
+              class="order-list-yi-in-neibu-left-url-top"
+              v-if="items.cart_info"
+            >
+              {{ items.cart_info.product.store_name }}
+            </view>
+          </view>
+        </view>
+        <view class="order-list-yi-in-neibu-right">
+          <view class="order-list-yi-in-neibu-right-im">
+            ¥{{ items.cart_info.productAttr.price || "0.00" }}
+          </view>
+          <view class="order-list-yi-in-neibu-right-in">
+            共 {{ items.product_num || 0 }} 件
+          </view>
+        </view>
+      </view>
+
+      <view v-if="detail.status == '0'" class="btn-lixt">
+        <view class="btn-cls" @click="sendGoods"> 立即发货 </view>
+      </view>
+      <view class="details-xiangqing-shujussss">
+        <view class="details-xiangqing-shujussss-yis">
+          <view class=""> 商品总额 </view>
+          <view class=""> +¥{{ detail.total_price || "0.00" }} </view>
+        </view>
+        <view class="details-xiangqing-shujussss-yis">
+          <view class=""> 优惠金额 </view>
+          <view class=""> -¥{{ detail.coupon_price || "0.00" }} </view>
+        </view>
+        <view class="details-xiangqing-shujussss-yis">
+          <view class=""> 订单编号 </view>
+          <view class="" @click="handleCopy(detail.order_sn)">
+            {{ detail.order_sn }} | 复制
+          </view>
+        </view>
+        <view class="details-xiangqing-shujussss-yis">
+          <view class=""> 下单时间 </view>
+          <view class="">
+            {{ detail.create_time }}
+          </view>
+        </view>
+        <view class="details-xiangqing-shujussss-yis">
+          <view class=""> 支付方式 </view>
+          <view class="">
+            {{ formatData(detail, "pay_type") }}
+          </view>
+        </view>
+      </view>
+    </view>
+    <uni-popup
+      ref="popup"
+      type="center"
+      :animation="true"
+      :is-mask-click="false"
+    >
+      <view class="popup_data">
+        <view class="popup_data__headers">
+          <view class="popup_data__headers--title"></view>
+          <uni-icons
+            type="closeempty"
+            class="custom_icons"
+            size="30"
+            @click="handleClose"
+          ></uni-icons>
+        </view>
+        <view class="popup_data__content">
+          <fillLogisticsInfoVue
+            class="custom_class"
+            :ruleOptions="ruleOptions"
+            @changeHandle="changeHandle"
+          />
+        </view>
+        <button type="primary" class="send-goods" @click="handleOpen">发货</button>
+      </view>
+    </uni-popup>
+  </view>
 </template>
 
 <script>
 //订单详情 卡片详细信息
 import { copy } from "@/utils/index.js";
+import { orderDeliveryApi, orderDeliveryRuleApi } from "@/commit/order.js";
+import { getUserPayType } from "../../../commodity/orderUtil.js";
+import fillLogisticsInfoVue from "../../../commodity/components/fillLogisticsInfo.vue";
 export default {
+  components: {
+    fillLogisticsInfoVue,
+  },
+  props: {
+    detail: {
+      type: Object,
+      default: () => {},
+    },
+     ruleOptions: {
+      type: Array,
+      default: () => [],
+    },
+  },
   data() {
     return {
-      orderProduct: {
-        pay_type: "特殊商户积分",
-        mer_name: "北京众兴未来咨询管理有限公司",
-        mer_avatar:
-          "https://cdn.bjtdba.com/chuxubao/images/2025-02-10/8198d202502101042344757.png",
-        pay_time: "2022-05-01 14:00",
-        order_id: "3645657575757483757",
-        pay_price: "999.00",
-        status: "3",
-        procductList: [
-          {
-            pay_price: "88888",
-            cart_num: "10",
-            image:
-              "https://cdn.bjtdba.com/chuxubao/images/2025-02-10/8198d202502101042344757.png",
-            store_name: "三个苹果 纯天然浓缩果蔬汁清汁苹果汁…",
-          },
-        ],
-      },
+      orderDeliveryParam: {},
     };
   },
 
   methods: {
+ 
+    //填写物流信息
+    changeHandle(val) {
+      // console.log("changeHandle",val)
+      this.orderDeliveryParam = val;
+    },
     handleCopy(val) {
       copy(val);
     },
-    sendGoods() {},
+    formatData(val, type = "pay_type") {
+      if (type == "pay_type") {
+        // console.log(val["pay_type"], "val");
+        return getUserPayType(val["paid"], val["pay_type"]);
+      } else if (["total_price", "coupon_price", "price"].includes(type)) {
+        return val[type] || "0.00";
+      } else {
+        return val[type] || "";
+      }
+    },
+    async handleOpen() {
+      // console.log("changeHandle",this.orderDeliveryParam)
+      if (!this.orderDeliveryParam.delivery_id) {
+        uni.showToast({
+          title: "请填写快递单号",
+          icon: "none",
+        });
+        return;
+      }
+      if (!this.orderDeliveryParam.delivery_name) {
+        uni.showToast({
+          title: "请选择物流公司",
+          icon: "none",
+        });
+        return;
+      }
+      // console.log("changeHandle",this.orderDeliveryParam)
+      // this.$refs.refsPackage.open();
+      uni.showLoading({
+        title: "正在发货中...",
+        mask: true,
+      });
+      const _this = this;
+      try {
+        const res = await orderDeliveryApi(
+          this.detail.order_id,
+          this.orderDeliveryParam
+        );
+        if (res.data.status == 200) {
+          uni.showToast({
+            title: "发货成功",
+            icon: "none",
+          });
+          _this.$emit("onSendGoodsHandle", this.detail);
+          _this. handleClose()
+        }
+      } catch (error) {
+      } finally {
+        uni.hideLoading();
+      }
+    },
+    sendGoods() {
+      this.open();
+    },
+    open(type = "bottom") {
+      this.$refs.popup.open(type);
+    },
+    handleClose() {
+      this.close();
+    },
+    close() {
+      this.orderDeliveryParam = {}
+      this.$refs.popup.close();
+    },
   },
 };
 </script>
 
 <style lang="scss" scoped>
+.btn-lixt {
+  width: 100%;
+  display: flex;
+  justify-content: flex-end;
+}
 .btn-cls {
   margin-top: 26rpx;
   width: 142rpx;
@@ -258,7 +356,7 @@ export default {
         flex-direction: column;
         justify-content: space-between;
         align-items: flex-end;
-
+        flex-shrink: 0;
         .order-list-yi-in-neibu-right-im {
           font-size: 28rpx;
           font-weight: 500;
@@ -293,4 +391,50 @@ export default {
     }
   }
 }
+.popup_data {
+  padding: 26rpx 30rpx;
+  min-height: 700rpx;
+  max-height: 750rpx;
+  box-sizing: border-box;
+  overflow: hidden;
+  background: linear-gradient(180deg, #e5edff 0%, #ffffff 100%);
+  border-radius: 24rpx 24rpx 0 0;
+  &__headers {
+    // height: 40rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    border-bottom: 2rpx solid #e5e5e5;
+    padding-bottom: 15rpx;
+    &--title {
+      flex: 1;
+      display: -webkit-box;
+      -webkit-box-orient: vertical;
+      -webkit-line-clamp: 1;
+      overflow: hidden;
+      justify-content: space-between;
+      padding-right: 60rpx;
+      font-size: 32rpx;
+      font-weight: 600;
+    }
+    .custom_icons {
+      flex-shrink: 0;
+    }
+  }
+  &__content {
+    max-height: 620rpx;
+    overflow-y: auto;
+  }
+}
+.send-goods {
+  height: 78rpx;
+  // margin: 0 32rpx;
+  font-weight: 400;
+  font-size: 30rpx;
+  color: #ffffff;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 26rpx;
+}
 </style>

shop/commodity/components/orderDetailSendCard.vue

@@ -2,32 +2,32 @@
 	<view class="detail-send-order">
 		<view class="detail-send-order-top">
 			<view class="detail-send-order-top-left">
-				订单编号：425676547654
+				订单编号：{{items.order_sn || '--'}}
 			</view>
 		</view>
 	<view class="detail-send-order-product">
-	 <view class="detail-send-order-product__wrapper">
-	 	<view class="detail-send-order-content" v-for="(items,indexs) in orderProduct" :key="indexs">
+	 <view class="detail-send-order-product__wrapper" v-if="items.orderProduct">
+	 	<view class="detail-send-order-content" v-for="(itemData,indexs) in items.orderProduct" :key="indexs">
 	 		<view class="detail-send-order-content-left">
 	 			<view class="detail-send-order-content-left-img">
-					<image v-if="items.image" :src="items.image" mode="widthFix"></image>
+					<image v-if="itemData.cart_info" :src="itemData.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" >
-					三个苹果 纯天然浓缩果蔬汁清汁苹果
+				<view class="detail-send-order-content-middle-top" v-if="itemData.cart_info">
+					{{itemData.cart_info.product.store_name || ""}}
+				</view>
+				<view class="detail-send-order-content-middle-top-bot" v-if="itemData.cart_info">
+					{{itemData.cart_info.productAttr.sku || ''}}
 				</view>
-			<!-- 	<view class="detail-send-order-content-middle-top-bot" v-if="items.cart_info">
-					{{items.cart_info.product.sku}}
-				</view> -->
 			</view>
 	 		<view class="detail-send-order-content-right">
 	 			<view class="detail-send-order-yi-in-neibu-right-im">
-	 				¥1855555
+	 				¥{{items.pay_price || 0}}
 	 			</view>
 	 			<view class="detail-send-order-yi-in-neibu-right-in">
-	 				共10件
+	 				共 {{items.total_num || 0}} 件
 	 			</view>
 	 		</view>
 	 	</view>
@@ -40,11 +40,15 @@
 
 <script>
 	export default {
+		props:{
+			items:{
+				type:Object,
+				default:()=>{}
+			}
+		},
 		data() {
 			return {
-				orderProduct:[{
-					image:"https://cdn.bjtdba.com/chuxubao/images/2025-02-10/8198d202502101042344757.png"
-				}]
+				
 				
 			};
 		}

shop/commodity/components/orderList/orderListCard.vue

@@ -1,429 +1,454 @@
 <template>
-	<view class="order-list-card-wrapper" :class="[itemProduct.status==0?downP:incrseP]">
-		<view class="order-list-yi-top">
-			<view class="order-list-yi-top-left">
-				订单编号：{{itemProduct.order_sn}}
-			</view>
-			<view class="order-list-yi-top-right">
-			{{formatStatusValue(itemProduct.status)}}
-			</view>
-		</view>
-		<view class="order-list-address">
-			 <view class="order-list-address__container">
-				 <view class="order-list-address__remdk">
-				 		 <image src="https://cdn.bjtdba.com/vod/image/2022-08-13/20220813164638215.png"
-				 		 	mode="widthFix"></image>
-							<view class="order-list-address__content">
-								{{item.user_address || "暂无地址信息"}}
-							</view>
-				 </view>
-				 <view class="order-list-address__xadasrfe" >
-				 		<template v-if="item.real_name && item.user_phone">
-							<view class="">
-								{{item.real_name }}
-							</view>
-								 <text class="user_phone" >
-								 	{{item.user_phone.substr(0, 3) + '****' + item.user_phone.substr(7)}}
-								 </text>
-						</template>
-						<template v-else>
-							<view class="">
-								{{item.real_name || "暂无用户名" }}
-							</view>
-								 <text class="user_phone"v-if="item.user_phone" >
-								 	{{item.user_phone.substr(0, 3) + '****' + item.user_phone.substr(7)}}
-								 </text>
-								 <text class="user_phone"v-else >
-								 	暂无用户手机号码
-								 </text>
-						</template>
-				 </view>
-			 </view>
-		</view>
-		<view class="order-list-product">
-		 <view class="order-list-product__wrapper">
-		 	<view class="order-list-content" v-for="(items,indexs) in itemProduct.orderProduct" :key="indexs">
-		 		<view class="order-list-content-left">
-		 			<view class="order-list-content-left-img">
-						<template v-if="items.cart_info">
-							<image v-if="items.cart_info.product.image" :src="items.cart_info.product.image" mode="widthFix"></image>
-				      	<text  v-else>暂无照片</text>
-						</template>
-						<template v-else>
-							<text>暂无照片</text>
-						</template>
-		 				
-		 			</view>
-		 		</view>
-				<view class="order-list-content-middle">
-					<view class="order-list-content-middle-top" v-if="items.cart_info">
-						{{items.cart_info.product.store_name}}
-					</view>
-					<view class="order-list-content-middle-top-bot" v-if="items.cart_info">
-						{{items.cart_info.product.sku}}
-					</view>
-				</view>
-		 		<view class="order-list-content-right">
-		 			<view class="order-list-yi-in-neibu-right-im">
-		 				¥{{items.product_price}}
-		 			</view>
-		 			<view class="order-list-yi-in-neibu-right-in">
-		 				共10件
-		 			</view>
-		 		</view>
-		 	</view>
-		 	
-		 
-		 </view>
-		</view>
-	   <view class="order-list-btn">
-		<view v-if="itemProduct.status=='0'" class="btn-list" @click="handleSendOutGoods(itemProduct,'sendGoods')">
-	    	立即发货
-	    </view>
-		<view  class="btn-list" @click="handleSendOutGoods(itemProduct,'delivered')">
-			已送达
-		</view>
-		<view  class="btn-list" @click="handleSendOutGoods(itemProduct,'logistics')">
-			查看物流
-		</view>
-		<view  class="btn-list" @click="handleSendOutGoods(itemProduct,'pickup')">
-			立即自提
-		</view>
-		<view  class="btn-list" @click="handleSendOutGoods(itemProduct,'detail')">
-			详情
-		</view>
-		</view>
-	</view>
+  <view
+    class="order-list-card-wrapper"
+  >
+    <view class="order-list-yi-top">
+      <view class="order-list-yi-top-left">
+        订单编号：{{ itemProduct.order_sn }}
+      </view>
+      <view class="order-list-yi-top-right">
+        {{ formatPropsValue(itemProduct,'status') }}
+      </view>
+    </view>
+    <view class="order-list-address">
+      <view class="order-list-address__container">
+        <view class="order-list-address__remdk">
+          <image
+            src="https://cdn.bjtdba.com/vod/image/2022-08-13/20220813164638215.png"
+            mode="widthFix"
+          ></image>
+          <view class="order-list-address__content">
+            {{ item.user_address || "暂无地址信息" }}
+          </view>
+        </view>
+        <view class="order-list-address__xadasrfe">
+          <template >
+            <view class="">
+              {{ item.real_name }}
+            </view>
+            <text class="user_phone">
+              {{
+               formatPropsValue(item, "user_phone")	
+              }}
+            </text>
+          </template>
+        </view>
+      </view>
+    </view>
+    <view class="order-list-product">
+      <view class="order-list-product__wrapper">
+        <view
+          class="order-list-content"
+          v-for="(items, indexs) in itemProduct.orderProduct"
+          :key="indexs"
+        >
+          <view class="order-list-content-left">
+            <view class="order-list-content-left-img">
+              <template v-if="items.cart_info">
+                <image
+                  v-if="items.cart_info.product.image"
+                  :src="items.cart_info.product.image"
+                  mode="widthFix"
+                ></image>
+                <text v-else>暂无照片</text>
+              </template>
+              <template v-else>
+                <text>暂无照片</text>
+              </template>
+            </view>
+          </view>
+          <view class="order-list-content-middle">
+            <view class="order-list-content-middle-top" v-if="items.cart_info">
+              {{ items.cart_info.product.store_name }}
+            </view>
+            <view
+              class="order-list-content-middle-top-bot"
+              v-if="items.cart_info"
+            >
+			<view v-if="items.cart_info.productAttr.sku"> {{ items.cart_info.productAttr.sku }}</view>
+             <view class="isms" v-else style="height: 30rpx;"></view>
+            </view>
+          </view>
+          <view class="order-list-content-right">
+            <view class="order-list-yi-in-neibu-right-im">
+              ¥{{ items.cart_info.productAttr.price || 0 }}
+            </view>
+            <view class="order-list-yi-in-neibu-right-in"> 共 {{items.product_num || 0}} 件 </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="order-list-btn">
+      <view
+        v-if="getBtnAuth(itemProduct,'sendGoods')"
+        class="btn-list"
+        @click="handleSendOutGoods(itemProduct, 'sendGoods')"
+      >
+        立即发货
+      </view>
+      <view
+	   v-if="getBtnAuth(itemProduct,'delivered')"
+        class="btn-list"
+        @click="handleSendOutGoods(itemProduct, 'delivered')"
+      >
+        已送达
+      </view>
+      <view
+        class="btn-list"
+		 v-if="getBtnAuth(itemProduct,'logistics')"
+        @click="handleSendOutGoods(itemProduct, 'logistics')"
+      >
+        查看物流
+      </view>
+      <view 
+	  class="btn-list"
+	   v-if="getBtnAuth(itemProduct,'pickup')"
+	   @click="handleSendOutGoods(itemProduct, 'pickup')">
+        立即自提
+      </view>
+      <view
+	   class="btn-list"
+	     v-if="getBtnAuth(itemProduct,'detail')"
+	   @click="handleSendOutGoods(itemProduct, 'detail')">
+        订单详情
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
-	export default {
-		props:{
-			item:{
-				type:Object,
-				default:()=>{}
-			}
-		},
-		
-		data() {
-			return {
-				incrseP: 'order-list-yi',
-				downP: 'order-list-yissss',//待发货
-				itemProduct:{}
-			};
-		},
-		mounted() {
-			this.itemProduct  =this.item
-		},
-		watch:{
-			item:{
-				handler(value){
-					this.$set(this,"itemProduct",value)
-				},
-				deep:true
-			}
-		},
-		methods:{
-			handleSendOutGoods(item,type){
-				this.$emit("handleSendOutGoods",item,type)
-			},
-			getDataFormatValue(data,type){
-				console.log(this.item,"item======item")
-			},
-			formatStatusValue(status){
-				let obj = {
-					"6":'已取消',
-					"0":'待发货',
-					"1":'待收货',
-					"2":'待评价',
-					"3":'已完成',
-					"4":'已申请退款',
-					"-1":'已退款',
-					"5":'待付款',
-				}
-				return obj[status] || "--"
-			}
+import {getOrderListStatus} from "../../orderUtil"
+import {MaskRules} from "@/utils/index.js"
+export default {
+  props: {
+    item: {
+      type: Object,
+      default: () => {},
+    },
+    index: {
+      type: Number,
+      default: 0,
+    },
+  },
+
+  data() {
+    return {
+      itemProduct: {},
+    };
+  },
+  mounted() {
+    this.itemProduct = this.item;
+  },
+  watch: {
+    item: {
+      handler(value) {
+        this.$set(this, "itemProduct", value);
+      },
+      deep: true,
+    },
+  },
+  methods: {
+    getBtnAuth(item,btnType) {
+		if(btnType === "sendGoods"){//发送货
+		// @click="send(scope.row.order_id)"
+		return (item.order_type ==0 && item.status == 0 && item.paid == 1 && item.distribution_mode == 1)
+		}else if(btnType === "logistics"){//查看物流 已支付并不等于 待付款
+         return item.paid == 1  && item.status != 5 && item.delivery_id
+		}else if(btnType === "delivered"){//已送达
+		  return false
+		}else if(btnType === "pickup"){//自提
+			// take(scope.row.order_id)
+			return item.order_type == 0 && item.status == 0 && item.paid == 1 && item.distribution_mode == 2
+		}else{
+			return true
+		}
+    },
+    handleSendOutGoods(item, type) {
+      this.$emit("handleSendOutGoods", item, type);
+    },
+    formatPropsValue(data, type) {
+		if(type=="user_phone"){
+			if(!data[type]) return "暂无用户手机号码"
+			return MaskRules.mobile(data[type])
+		}else if(type == "status") {
+			return getOrderListStatus(data[type])
+		}else {
+			return data[type] || "--"
 		}
-	}
+	},
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-.order-list-card-wrapper{
-	width: 100%;
-	min-height: 450rpx;
-	background: #FFFFFF;
-	border-radius: 16rpx;
-	// border:2rpx solid #f00;
-	.order-list-yi-top {
-		width: 100%;
-		padding: 32rpx 0 32rpx 0;
-		border-bottom: 1rpx solid #E5E5E5;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		font-size: 26rpx;
-		.order-list-yi-top-left {
-			font-weight: 500;
-			color: #333333;
-			margin-left: 26rpx;
-		}
-		.order-list-yi-top-right {
-			font-weight: 400;
-			color: #1F7CFF;
-			margin-right: 26rpx;
-		}
-		}
-	&.order-list-yi{
-		margin-bottom: 20rpx;
-		display: flex;
-		flex-direction: column;
-		justify-content: flex-start;
-		align-items: center;
-		
-	}
-	.order-list-address{
-		width: calc(100% - 54rpx);
-		margin: 26rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		background: #F8F8F8;
-		border-radius: 16rpx;
-		&__container{
-			width: 100%;
-			padding:20rpx 20rpx 9rpx 16rpx;
-			.order-list-address__remdk{
-				display: flex;
-				align-items: center;
-				image {
-				width: 38rpx;
-				height: 38rpx;
-				flex-shrink: 0;
-				margin-right: 10rpx;
-				}
-				.order-list-address__content{
-					width: 100%;
-					font-size: 26rpx;
-					font-weight: 400;
-					color: #333333;
-					display: -webkit-box;
-					-webkit-box-orient: vertical;
-					-webkit-line-clamp: 2;
-					overflow: hidden;
-				}
-			}
-			.order-list-address__xadasrfe{
-				width:100%;
-				padding:10rpx ;
-				font-size: 28rpx;
-				font-weight: 400;
-				color: #999999;
-				display: flex;
-				align-items: center;
-				word-break: break-all;
-				box-sizing: border-box;
-				min-height:28rpx;
-				gap:32rpx;
-				.user_phone{
-					padding-top:6rpx;
-				}
-			}
-		}
+.order-list-card-wrapper {
+  width: 100%;
+  min-height: 450rpx;
+  background: #ffffff;
+  border-radius: 16rpx;
+  // border:2rpx solid #f00;
+  .order-list-yi-top {
+    width: 100%;
+    padding: 32rpx 0 32rpx 0;
+    border-bottom: 1rpx solid #e5e5e5;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 26rpx;
+    .order-list-yi-top-left {
+      font-weight: 500;
+      color: #333333;
+      margin-left: 26rpx;
+    }
+    .order-list-yi-top-right {
+      font-weight: 400;
+      color: #1f7cff;
+      margin-right: 26rpx;
+    }
+  }
+  &.order-list-yi {
+    margin-bottom: 20rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-start;
+    align-items: center;
+  }
+  .order-list-address {
+    width: calc(100% - 54rpx);
+    margin: 26rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: #f8f8f8;
+    border-radius: 16rpx;
+    &__container {
+      width: 100%;
+      padding: 20rpx 20rpx 9rpx 16rpx;
+      .order-list-address__remdk {
+        display: flex;
+        align-items: center;
+        image {
+          width: 38rpx;
+          height: 38rpx;
+          flex-shrink: 0;
+          margin-right: 10rpx;
+        }
+        .order-list-address__content {
+          width: 100%;
+          font-size: 26rpx;
+          font-weight: 400;
+          color: #333333;
+          display: -webkit-box;
+          -webkit-box-orient: vertical;
+          -webkit-line-clamp: 2;
+          overflow: hidden;
+        }
+      }
+      .order-list-address__xadasrfe {
+        width: 100%;
+        padding: 10rpx;
+        font-size: 28rpx;
+        font-weight: 400;
+        color: #999999;
+        display: flex;
+        align-items: center;
+        word-break: break-all;
+        box-sizing: border-box;
+        min-height: 28rpx;
+        gap: 32rpx;
+        .user_phone {
+          padding-top: 6rpx;
+        }
+      }
+    }
+  }
+  .order-list-product {
+    // border: 2rpx solid #F00;
+    width: calc(100% - 54rpx);
+    margin: 0 26rpx;
+    &__wrapper {
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+      align-items: flex-end;
+      .order-list-content {
+        width: 100%;
+        display: flex;
+        align-items: center;
+        padding: 10rpx 0 15rpx 0;
+        gap: 20rpx;
+        .order-list-content-left {
+          height: 100%;
+          display: flex;
+          align-items: flex-start;
+          justify-content: space-between;
+          &-img {
+            width: 158rpx;
+            height: 158rpx;
+            background-color: #eee;
+            overflow: hidden;
+            border-radius: 10rpx;
+            flex-shrink: 0;
+            image {
+              width: 100%;
+              height: auto;
+            }
+          }
+        }
+      }
+      .order-list-content-middle {
+        height: 100%;
+        flex: 1;
 
-	}
-.order-list-product{
-	// border: 2rpx solid #F00;
-	width: calc(100% - 54rpx);
-	margin:0 26rpx;
-	&__wrapper{
-		
-		display: flex;
-		flex-direction: column;
-		justify-content: space-between;
-		align-items: flex-end;
-		.order-list-content{
-			width:100%;
-			display: flex;
-			align-items: center;
-			padding: 10rpx 0 15rpx 0;
-			gap:20rpx;
-			.order-list-content-left{
-				height: 100%;
-				display: flex;
-				align-items: flex-start;
-				justify-content: space-between;
-				&-img{
-					width: 158rpx;
-					height: 158rpx;
-					background-color: #eee;
-					overflow: hidden;
-					border-radius: 10rpx;
-					flex-shrink: 0;
-					image {
-						width: 100%;
-						height: auto;
-					}
-				}
-			}
-		}
-	.order-list-content-middle{
-		height: 100%;
-		flex: 1;
-		
-		&-top{
-			// width:100%;
-			
-			font-family: PingFangSC, PingFang SC;
-			font-weight: 400;
-			font-size: 28rpx;
-			color: #333333;
-			text-align: left;
-		display: -webkit-box;
-		-webkit-box-orient: vertical;
-		-webkit-line-clamp: 1;
-		overflow: hidden;
-			line-height: 80rpx;
-			
-		}
-		&-top-bot{
-			padding-top: 10rpx;
-			font-family: PingFangSC, PingFang SC;
-			font-weight: 400;
-			font-size: 22rpx;
-			color: #666666;
-			text-align: left;
-		}
-	}
-	.order-list-content-right{
-		height: 73rpx;
-		flex-shrink: 0;
-		font-size: 28rpx;
-		font-weight: 500;
-		color: #333333;
-		display: flex;
-		flex-direction: column;
-		justify-content: space-between;
-		align-items: flex-end;
-	}
-	}
-	.osjdhujfhueihfg {
-		// width: 634rpx;
-		// height: 272rpx;
-	
-		display: flex;
-		flex-direction: column;
-		justify-content: space-between;
-		align-items: flex-end;
-	
-	
-		.order-list-yi-in-neibu {
-			width: 634rpx;
-			// height: 158rpx;
-			// background-color: #1F7CFF;
-			display: flex;
-			justify-content: space-between;
-			align-items: flex-start;
-			padding: 10rpx 0 10rpx 0;
-	
-			.order-list-yi-in-neibu-left {
-				width: 474rpx;
-				height: 100%;
-				display: flex;
-				align-items: flex-start;
-				justify-content: space-between;
-	
-				.order-list-yi-in-neibu-left-img {
-					width: 158rpx;
-					height: 158rpx;
-					// background-color: #1F7CFF;
-					overflow: hidden;
-	
-					image {
-						width: 100%;
-						height: auto;
-					}
-				}
-	
-				.order-list-yi-in-neibu-left-url {
-					width: 290rpx;
-					height: 70rpx;
-					display: flex;
-					flex-direction: column;
-					justify-content: space-between;
-	
-					.order-list-yi-in-neibu-left-url-top {
-						width: 100%;
-						font-weight: 400;
-						color: #333333;
-						font-size: 28rpx;
-						display: inline-block;
-						overflow: hidden;
-						text-overflow: ellipsis;
-						white-space: nowrap;
-					}
-	
-					.order-list-yi-in-neibu-left-url-top-bot {
-						width: 100%;
-						font-size: 24rpx;
-						font-weight: 400;
-						color: #666666;
-						display: inline-block;
-						overflow: hidden;
-						text-overflow: ellipsis;
-						white-space: nowrap;
-					}
-				}
-			}
-	
-			.order-list-yi-in-neibu-right {
-				height: 73rpx;
-				font-size: 28rpx;
-				font-weight: 500;
-				color: #333333;
-				display: flex;
-				flex-direction: column;
-				justify-content: space-between;
-				align-items: flex-end;
-	
-				.order-list-yi-in-neibu-right-im {
-					font-size: 28rpx;
-					font-weight: 500;
-					color: #333333;
-				}
-	
-				.order-list-yi-in-neibu-right-in {
-					font-size: 24rpx;
-					font-weight: 400;
-					color: #666666;
-				}
-			}
-		}
-	}
-}
+        &-top {
+          // width:100%;
 
-.order-list-btn{
-	display: flex;
-	align-items: center;
-	justify-content: flex-end;
-	flex-wrap: wrap;
-	padding: 10rpx 26rpx 26rpx;
-	gap:10rpx;
-	.btn-list{
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		width: 142rpx;
-		border-radius: 40rpx;
-		border: 1rpx solid #999999;
-		font-size: 24rpx;
-		font-weight: 400;
-		color: #333333;
-		text-align: center;
-		padding: 15rpx 10rpx;
-		// 
-	}
-}
+          font-family: PingFangSC, PingFang SC;
+          font-weight: 400;
+          font-size: 28rpx;
+          color: #333333;
+          text-align: left;
+          display: -webkit-box;
+          -webkit-box-orient: vertical;
+          -webkit-line-clamp: 1;
+          overflow: hidden;
+          line-height: 80rpx;
+        }
+        &-top-bot {
+          font-family: PingFangSC, PingFang SC;
+          font-weight: 400;
+          font-size: 22rpx;
+          color: #666666;
+          text-align: left;
+        }
+      }
+      .order-list-content-right {
+        height: 73rpx;
+        flex-shrink: 0;
+        font-size: 28rpx;
+        font-weight: 500;
+        color: #333333;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+        align-items: flex-end;
+      }
+    }
+    .osjdhujfhueihfg {
+      // width: 634rpx;
+      // height: 272rpx;
+
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+      align-items: flex-end;
+
+      .order-list-yi-in-neibu {
+        width: 634rpx;
+        // height: 158rpx;
+        // background-color: #1F7CFF;
+        display: flex;
+        justify-content: space-between;
+        align-items: flex-start;
+        padding: 10rpx 0 10rpx 0;
+
+        .order-list-yi-in-neibu-left {
+          width: 474rpx;
+          height: 100%;
+          display: flex;
+          align-items: flex-start;
+          justify-content: space-between;
+
+          .order-list-yi-in-neibu-left-img {
+            width: 158rpx;
+            height: 158rpx;
+            // background-color: #1F7CFF;
+            overflow: hidden;
+
+            image {
+              width: 100%;
+              height: auto;
+            }
+          }
+
+          .order-list-yi-in-neibu-left-url {
+            width: 290rpx;
+            height: 70rpx;
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
+
+            .order-list-yi-in-neibu-left-url-top {
+              width: 100%;
+              font-weight: 400;
+              color: #333333;
+              font-size: 28rpx;
+              display: inline-block;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              white-space: nowrap;
+            }
+
+            .order-list-yi-in-neibu-left-url-top-bot {
+              width: 100%;
+              font-size: 24rpx;
+              font-weight: 400;
+              color: #666666;
+              display: inline-block;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              white-space: nowrap;
+            }
+          }
+        }
+
+        .order-list-yi-in-neibu-right {
+          height: 73rpx;
+          font-size: 28rpx;
+          font-weight: 500;
+          color: #333333;
+          display: flex;
+          flex-direction: column;
+          justify-content: space-between;
+          align-items: flex-end;
+
+          .order-list-yi-in-neibu-right-im {
+            font-size: 28rpx;
+            font-weight: 500;
+            color: #333333;
+          }
 
+          .order-list-yi-in-neibu-right-in {
+            font-size: 24rpx;
+            font-weight: 400;
+            color: #666666;
+          }
+        }
+      }
+    }
+  }
 
+  .order-list-btn {
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    flex-wrap: wrap;
+    padding: 10rpx 26rpx 26rpx;
+    gap: 10rpx;
+    .btn-list {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 142rpx;
+      border-radius: 40rpx;
+      border: 1rpx solid #999999;
+      font-size: 24rpx;
+      font-weight: 400;
+      color: #333333;
+      text-align: center;
+      padding: 15rpx 10rpx;
+      //
+    }
+  }
 }
 </style>

shop/commodity/components/popupSelect.vue

@@ -33,7 +33,7 @@
                 index === selectId || selectId === item.value ? 'isActive' : ''
               ]"
             >
-              {{ item.text }}
+              {{ item.text || item.label }}
             </view>
           </view>
         </view>

shop/commodity/components/popupSelectItem/popupSelectItem.vue

@@ -45,25 +45,41 @@ export default {
       type: [String, Number],
       default: ""
     },
+    isDisabledAll:{
+      type:Boolean,
+      default:false
+    },
+     isDisabledInput:{
+      type:Boolean,
+      default:false
+    },
+       isDisabledSelect:{
+      type:Boolean,
+      default:false
+    },
+    selectValue: {
+      type: [String, Number],
+      default: ""
+    },
     selectData: {
       type: Array,
       default: () => {
         return [
-          { value: 0, text: "顺丰速运", code: "SF" },
-          { value: 1, text: "中通快递", code: "ZTO" },
-          { value: 2, text: "韵达快递", code: "YUNDA" },
-          { value: 3, text: "申通快递", code: "STO" },
-          { value: 4, text: "EMS邮政", code: "EMS" },
-          { value: 5, text: "圆通速递", code: "YTO" },
-          { value: 6, text: "DHL国际", code: "DHL" },
-          { value: 7, text: "京东物流", code: "JD" },
-          { value: 8, text: "FedEx联邦", code: "FDX" },
-          { value: 9, text: "UPS联合包裹", code: "UPS" },
-          { value: 10, text: "德邦快递", code: "DEPPON" },
-          { value: 11, text: "百世快递", code: "BEST" },
-          { value: 12, text: "极兔速递", code: "J&T" },
-          { value: 13, text: "TNT快递", code: "TNT" },
-          { value: 14, text: "跨越速运", code: "KYE" }
+          // { value: 0, text: "顺丰速运", code: "SF" },
+          // { value: 1, text: "中通快递", code: "ZTO" },
+          // { value: 2, text: "韵达快递", code: "YUNDA" },
+          // { value: 3, text: "申通快递", code: "STO" },
+          // { value: 4, text: "EMS邮政", code: "EMS" },
+          // { value: 5, text: "圆通速递", code: "YTO" },
+          // { value: 6, text: "DHL国际", code: "DHL" },
+          // { value: 7, text: "京东物流", code: "JD" },
+          // { value: 8, text: "FedEx联邦", code: "FDX" },
+          // { value: 9, text: "UPS联合包裹", code: "UPS" },
+          // { value: 10, text: "德邦快递", code: "DEPPON" },
+          // { value: 11, text: "百世快递", code: "BEST" },
+          // { value: 12, text: "极兔速递", code: "J&T" },
+          // { value: 13, text: "TNT快递", code: "TNT" },
+          // { value: 14, text: "跨越速运", code: "KYE" }
         ];
       }
     }
@@ -77,16 +93,17 @@ export default {
   methods: {
     handleClick({ selected, item, index }) {
       this.logisticsValue = selected;
-      this.logisticsLabel = item.text;
+      this.logisticsLabel = item.text || item.label;
       this.$emit("click-tabs", { selected, item, index });
     },
     handleSelect() {
+      if(this.isDisabledAll || this.isDisabledSelect) return;
       this.$refs.popup.open();
     }
   },
   computed: {
     logistics() {
-      return this.logisticsLabel || this.defaultLabel;
+      return this.logisticsLabel || this.defaultLabel || this.selectValue;
     }
   }
 };

shop/commodity/components/shipmentGoodsCard.vue

@@ -1,129 +1,140 @@
 <template>
-	
-	<view class="card-wrapper">
-	   <view class="card-wrapper__text">{{title}}</view>
-	   <view class="card-wrapper__address">
-		   {{address}}
-	   </view>
-	   
-	   <view class="card-wrapper__user">
-		   <view class="card-wrapper__user--info">
-		   	<view class="">
-		   		{{userInfo}}
-		   	</view>
-		   		 <text class="user_phone" >
-		   		 	{{phone_user}}
-		   		 </text>
-		   </view>
-		   <view class="card-wrapper__user--btn" @click="handleLooks">
-		    <!-- <image src="/static/images/new_ui/look.png" ></image> -->
-			<uni-icons :type="!showPhone?'eye-slash':'eye-slash-filled'" size="30" :color="showPhone?'#007aff':'#333'"></uni-icons>
+  <view class="card-wrapper">
+    <view class="card-wrapper__text">{{ title }}</view>
+    <view class="card-wrapper__address">
+      {{ address }}
+    </view>
 
-			</view>
-	   </view>
-	</view>
+    <view class="card-wrapper__user">
+      <view class="card-wrapper__user--info">
+        <view class="">
+          {{ userInfo }}
+        </view>
+        <text class="user_phone">
+          {{ phone_user }}
+        </text>
+      </view>
+      <view class="card-wrapper__user--btn" @click="handleLooks">
+        <!-- <image src="/static/images/new_ui/look.png" ></image> -->
+        <uni-icons
+          :type="!showPhone ? 'eye-slash' : 'eye-slash-filled'"
+          size="30"
+          :color="showPhone ? '#007aff' : '#333'"
+        ></uni-icons>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
-	import {MaskRules} from "@/utils/index.js"
-	export default {
-		props:{
-			title:{
-				type:String,
-				default:"发货商品"
-			},
-			phone:{
-				type:String,
-				default:"18533332222"
-			},
-			userInfo:{
-				type:String,
-				default:"郭郭备份"
-			},
-			address:{
-				type:String,
-				default:"北京市通州区经开壹中心14号楼9层北京市通州区经开壹中心14号楼9层"
-			}
-		},
-		data() {
-			return {
-				showPhone:false,
-			};
-		},
-		methods:{
-			handleLooks(){
-				this.showPhone = !this.showPhone
-			}
-			
-		},
-	  computed: {
-	  	phone_user() {
-			if(this.showPhone){
-				return this.phone
-			}else{
-				return MaskRules.mobile(this.phone)
-			}
-			
-	  	}
-	  },
-		
-	}
+import { MaskRules } from "@/utils/index.js";
+export default {
+  props: {
+    title: {
+      type: String,
+      default: "发货商品",
+    },
+    items: {
+      type: Object,
+      default: () => {
+        return {
+          user_phone: "",
+          user_address: "",
+          real_name: "",
+        };
+      },
+    },
+  },
+  watch: {
+    items: {
+      handler(newVal, oldVal) {
+        if (newVal) {
+          this.items = newVal;
+        }
+      },
+    },
+  },
+  data() {
+    return {
+      showPhone: false,
+    };
+  },
+  methods: {
+    handleLooks() {
+      this.showPhone = !this.showPhone;
+    },
+  },
+  computed: {
+    phone_user() {
+      if (this.showPhone) {
+        return this.phone;
+      } else {
+        return MaskRules.mobile(this.phone);
+      }
+    },
+    phone() {
+      return this.items.user_phone || "";
+    },
+    userInfo() {
+      return this.items.real_name || "";
+    },
+    address() {
+      return this.items.user_address || "";
+    },
+  },
+};
 </script>
 
 <style lang="scss">
-.card-wrapper{
+.card-wrapper {
+  background: #ffffff;
+  border-radius: 16rpx;
+  padding: 26rpx 21rpx 10rpx 32rpx;
+  display: flex;
+  flex-direction: column;
+  &__text {
+    font-size: 36rpx;
+    font-weight: bold;
+    color: #333;
+    margin: 0 0 26rpx;
+  }
+  &__address {
+    font-weight: 400;
+    font-size: 26rpx;
+    color: #333333;
+    line-height: 37rpx;
+    text-align: left;
+  }
 
-	background: #FFFFFF;
-	 border-radius: 16rpx;
-	 padding: 26rpx 21rpx 10rpx 32rpx;
-	  display: flex;
-	  flex-direction: column;
-	&__text{
-	  font-size: 36rpx;
-	  font-weight: bold;
-	  color: #333;
-	  margin: 0 0 26rpx;
-	}
- &__address{
-	font-weight: 400;
-	font-size: 26rpx;
-	color: #333333;
-	line-height: 37rpx;
-	text-align: left;
- }
-		
-	.card-wrapper__user{
-		display: flex;
-		justify-content: space-around;
-		align-items: center;
-		&--info{
-			width:100%;
-			padding:10rpx 10rpx 10rpx 0 ;
-			font-size: 28rpx;
-			font-weight: 400;
-			color: #999999;
-			display: flex;
-			align-items: center;
-			word-break: break-all;
-			box-sizing: border-box;
-			min-height:28rpx;
-			gap:32rpx;
-			flex:1;
-			.user_phone{
-				padding-top:6rpx;
-			}
-		}
-		&--btn{
-			width:45rpx;
-			flex-shrink: 0;
-			image{
-				width:41rpx;
-				height: 27rpx;
-			}
-		}
-	}
+  .card-wrapper__user {
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+    &--info {
+      width: 100%;
+      padding: 10rpx 10rpx 10rpx 0;
+      font-size: 28rpx;
+      font-weight: 400;
+      color: #999999;
+      display: flex;
+      align-items: center;
+      word-break: break-all;
+      box-sizing: border-box;
+      min-height: 28rpx;
+      gap: 32rpx;
+      flex: 1;
+      .user_phone {
+        padding-top: 6rpx;
+      }
+    }
+    &--btn {
+      width: 45rpx;
+      flex-shrink: 0;
+      image {
+        width: 41rpx;
+        height: 27rpx;
+      }
+    }
+  }
 }
-
-
-
 </style>

shop/commodity/details.vue

@@ -8,45 +8,59 @@
       ></image>
       <view class="details-back-biaohsi">
         <view class="details-back-biaohsi-kuan">
-          <image
-            src="https://cdn.bjtdba.com/vod/image/2022-08-15/20220815143421834.png"
-            mode="widthFix"
-          >
+          <image :src="formDataItem(orderData, 'image')" mode="widthFix">
           </image>
         </view>
         <view class="details-back-biaohsi-zhuanbgtia">
-          <view class="details-back-biaohsi-zhuanbgtia-top"> 待发货 </view>
+          <view class="details-back-biaohsi-zhuanbgtia-top">
+            {{ formDataItem(orderData, "status") }}
+          </view>
           <view class="details-back-biaohsi-zhuanbgtia-bot">
-            等待卖家付款
+            {{ formDataItem(orderData, "text") }}
           </view>
         </view>
       </view>
       <logisticInfocardJianjieVue
         @goToLogistic="goToLogistic"
         class="logistic--wrapper"
+        :detail="orderData"
+        :logisticText="logisticText"
       />
     </view>
 
-    <view class="order-detail-card">
-      <orderCardDetailInfoVue />
-     <deliverCardItemVue
+    <view
+      class="order-detail-card"
+      :style="{ 'margin-top': orderData.status == 5 ? '140rpx' : '160rpx' }"
+    >
+      <orderCardDetailInfoVue :detail="orderData" :ruleOptions="ruleOptions" @onSendGoodsHandle="onSendGoodsHandle"/>
+      <!-- <deliverCardItemVue
        class="inputInfo"
        :isBottomMessage="true"
        leftTitle="物流信息有误？"
        rightTitle="更改物流信息"
-     />
+     /> -->
     </view>
   </view>
 </template>
 
 <script>
-import { getOrderDetails } from "@/commit/order.js";
+import {
+  orderDetailApi,
+  getExpress,
+  getOrderList,
+  orderDeliveryRuleApi,
+  getOrderListProduct
+} from "@/commit/order.js";
 import headersVue from "../components/headers/headers.vue";
 import logisticInfocardJianjieVue from "./components/orderDetail/logisticInfocardJianjie.vue";
 import { orderStatus } from "../commodity/orderUtil.js";
 import { toQueryString } from "@/utils/index.js";
 import deliverCardItemVue from "./components/changeDetailInfo/pendingReceiptGoodsModules/deliverCardItem.vue";
 import orderCardDetailInfoVue from "./components/orderDetail/orderCardDetailInfo.vue";
+import {
+  getOrderListStatus,
+  getOrderDetailStatus,
+} from "../commodity/orderUtil.js";
 export default {
   components: {
     headersVue,
@@ -54,7 +68,7 @@ export default {
     logisticInfocardJianjieVue,
     //产品信息
     orderCardDetailInfoVue,
-	deliverCardItemVue
+    deliverCardItemVue,
   },
   data() {
     return {
@@ -62,57 +76,146 @@ export default {
       is_limin: true,
       orderList: [],
       indexs: "",
-      status: ""
+      status: "",
+      orderData: {},
+      logisticText: "运输中",
+      listDetailPro: {},
+      ruleOptions:[]
     };
   },
   onLoad(e) {
     this.order_id = e.order_id;
     this.indexs = e.indexs;
     this.status = e.status;
-    // this.getOrderDetails()
+    this.getOrderDetails();
+    if (e && e.detailInfo) {
+      this.listDetailPro = JSON.parse(e.detailInfo);
+    }
   },
   methods: {
+        async getOrderListSigleData(order_sn) {
+       try {
+         const res = await getOrderListProduct(order_sn)
+         if (res.data.status == 200) {
+           let detailDa = res.data.data.list[0] && res.data.data.list[0].orderProduct || [];
+           this.orderData = { ...this.orderData, customProductInfo: detailDa };
+         }
+       } catch (error) {
+        
+       }
+    },
+   async onSendGoodsHandle(){
+    await this.getOrderDetails();
+   },
+    async getLogisticData(id) {
+      if (!id) return;
+      try {
+        const res = await getExpress(id);
+        if (res.data.status == 200) {
+          const data = res.data.data || [];
+          console.log("物流信息", data.length > 0);
+          if (data.length > 0) {
+            data.forEach((item) => {
+              if (["派送中"].includes(item.status)) {
+                this.logisticText = "派送中";
+              } else if (["已揽收"].includes(item.status)) {
+                this.logisticText = "已揽收";
+              } else if (["已发货"].includes(item.status)) {
+                this.logisticText = "已发货";
+              } else if (["运输中"].includes(item.status)) {
+                this.logisticText = "运输中";
+              } else if (["已签收"].includes(item.status)) {
+                this.logisticText = "已签收";
+              } else if (["待签收"].includes(item.status)) {
+                this.logisticText = "待签收";
+              } else {
+                this.logisticText = "运输中";
+              }
+            });
+          } else {
+            this.logisticText = "待出货中";
+          }
+        }
+      } catch (error) {}
+      // /mer/store/order/express/5881
+    },
     goToLogistic() {
-      const obj = {
+    const obj = {
         status: this.status,
         index: this.indexs,
+        indexs: this.indexs,
         formType: "detail",
-        order_id: this.order_id
+        order_id: this.order_id,
       };
       const urlParams = toQueryString(obj);
       uni.redirectTo({
-        url: `./logisticsInformationDetail?${urlParams}`
+        url: `./logisticsInformationDetail?${urlParams}`,
       });
     },
     formDataItem(val, type = "status") {
       if (type === "status") {
-        return orderStatus(val["status"]);
+        return getOrderListStatus(val["status"]);
+      } else if (type === "image") {
+        return getOrderDetailStatus(val, "image");
+      } else if (type === "text") {
+        return getOrderDetailStatus(val, "text");
       } else {
         return val[type] || "";
       }
     },
     // 订单详情页面
-    getOrderDetails() {
-      getOrderDetails({
-        order_id: this.order_id
-      }).then(
-        (res) => {
-          if (res.data.status == 200) {
-            this.orderList = res.data.data.order;
+    async getOrderDetails() {
+      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 (this.orderData.status == 0) {
+            await this.getOrderDeliveryRule();
           }
-        },
-        (fail) => {
-          console.log(fail);
+            this.getOrderListSigleData(this.orderData.order_sn);
+          // this.getOrderListSigleData(this.orderData.order_sn)
         }
-      );
+      } catch (error) {
+      } finally {
+        uni.hideLoading();
+      }
+    },
+       // 获取发货规则
+    async getOrderDeliveryRule() {
+      try {
+        const res = await orderDeliveryRuleApi(this.orderData.order_id);
+        if (res.data.status == 200) {
+          let data = res.data.data.rule;
+          data.forEach((item) => {
+            let ruleData =
+              (item.control[0] &&
+                item.control[0].rule[0] &&
+                item.control[0].rule[0].options) ||
+              [];
+            this.ruleOptions = ruleData;
+          });
+          // console.log("发货规则", this.ruleOptions);
+        }
+      } catch (error) {
+      } finally {
+      }
     },
     topgi() {
       uni.redirectTo({
-        url: "./order?status=" + this.status + "&index=" + this.indexs
+        url: "./order?status=" + this.status + "&index=" + this.indexs,
         // url: './order'
       });
-    }
-  }
+    },
+  },
 };
 </script>
 
@@ -187,14 +290,14 @@ page {
     top: 190rpx;
   }
   .order-detail-card {
-	  width:calc(100% - 54rpx);
+    width: calc(100% - 54rpx);
     height: calc(100% - 260rpx);
     margin-top: 220rpx;
     margin-bottom: 50rpx;
   }
 }
-.inputInfo{
-	padding:0 25rpx;
-	margin: 26rpx 0 0 ;
+.inputInfo {
+  padding: 0 25rpx;
+  margin: 26rpx 0 0;
 }
 </style>

shop/commodity/logisticsInformationDetail.vue

@@ -8,11 +8,11 @@
             <view class="image-scroll_box__image">
               <view
                 v-for="(item, index) in procductList"
-                :key="item.cart_num + '_index_' + index"
+                :key="item.cart_id + '_index_' + index"
                 class="cmsd-ocm"
               >
-                <image :src="item.image" />
-                <view class="tip-num">{{ 10 }}件</view>
+                <image :src="item.cart_info.product.image" v-if="item.cart_info"/>
+                <view class="tip-num">{{ item.product_num || 0 }}件</view>
               </view>
             </view>
           </view>
@@ -22,20 +22,20 @@
         </view>
       </view>
       <view class="logistics-info-card-headers__logicistics">
-        <view class="image-company__image">
+        <view class="image-company__image"   v-if="orderData.delivery_image">
           <image
-            src="https://cdn.bjtdba.com/chuxubao/images/2025-02-10/8198d202502101042344757.png"
+            :src="orderData.delivery_image"
           />
         </view>
         <view class="image-company__content">
           <view class="image-company__content-title">
-            <text>中通快递： </text>
-            <text>98765432345678</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')">复制</view>
-          <view class="tel-btn btn" @click="handleGiop('tel')">电话</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 +49,16 @@
               </view>
               <view class="order-list-yi-bot-xadasrfe">
                 <view class="order-list-yi-bot-xadasrfe-top">
-                  <text
-                    >北京市北京市朝阳区北京市北京市朝阳区北京市北京市朝阳</text
+                  <view
+                    >{{orderData.user_address}}</view
                   >
-                  <text> 郭女士</text>
-                  <text>185****4736</text>
+                  <text> {{orderData.real_name}}</text>
+                 <text> {{formatData(orderData,"user_phone")}}</text>
                 </view>
               </view>
             </view>
           </view>
-          <view class="logicistis">
+          <view class="logicistis" v-if="logisticsData.length>0">
             <view
               class="logicistis-bot-xiangxi"
               v-for="(items, index) in logisticsData"
@@ -78,20 +78,29 @@
               </view>
             </view>
           </view>
+          <template v-else>
+            <emptyData title="暂无物流信息" style="top:45%;left:25%;width:auto"></emptyData>
+          </template>
         </view>
       </view>
     </template>
     <emptyData v-else></emptyData>
-    <ItemsInsidePackageVue ref="refsPackage" />
+    <ItemsInsidePackageVue ref="refsPackage" :orderProduct="procductList"/>
   </view>
 </template>
 
 <script>
 import headersVue from "../components/headers/headers.vue";
-import { toQueryString, copy } 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
+} from "@/commit/order.js";
 export default {
   components: { headersVue, ItemsInsidePackageVue, emptyData },
   data() {
@@ -101,66 +110,89 @@ export default {
       order_id: "", //订单ID
       formType: "",
       logisticsData: [],
-      procductList: [
-        {
-          pay_price: "88888",
-          cart_num: "10",
-          image:
-            "https://cdn.bjtdba.com/chuxubao/images/2025-02-10/8198d202502101042344757.png",
-          store_name: "三个苹果 纯天然浓缩果蔬汁清汁苹果汁…",
-        },
-        {
-          pay_price: "88888",
-          cart_num: "10",
-          image:
-            "https://cdn.bjtdba.com/chuxubao/images/2025-02-10/8198d202502101042344757.png",
-          store_name: "三个苹果 纯天然浓缩果蔬汁清汁苹果汁…",
-        },
-        {
-          pay_price: "88888",
-          cart_num: "10",
-          image:
-            "https://cdn.bjtdba.com/chuxubao/images/2025-02-10/8198d202502101042344757.png",
-          store_name: "三个苹果 纯天然浓缩果蔬汁清汁苹果汁…",
-        },
-        {
-          pay_price: "88888",
-          cart_num: "10",
-          image:
-            "https://cdn.bjtdba.com/chuxubao/images/2025-02-10/8198d202502101042344757.png",
-          store_name: "三个苹果 纯天然浓缩果蔬汁清汁苹果汁…",
-        },
-        {
-          pay_price: "88888",
-          cart_num: "10",
-          image:
-            "https://cdn.bjtdba.com/chuxubao/images/2025-02-10/8198d202502101042344757.png",
-          store_name: "三个苹果 纯天然浓缩果蔬汁清汁苹果汁…",
-        },
-      ],
+      orderData: {},
+      procductList: [],
+      isShouHou: false,
     };
   },
-  onLoad(e) {
+  async onLoad(e) {
     this.order_id = e.order_id;
     this.indexs = e.indexs;
     this.status = e.status;
     this.formType = e.formType || "";
-    // this.getOrderDetails()
-    this.logisticsData = mockDataLogistics || [];
+    this.isShouHou = e.shouhou==0?true:false;
+    await this.getOrderDetails();
   },
   methods: {
-    handleGiop(type) {
+    handleGiop(type,value) {
       if (type === "copy") {
-        copy("98765432345678");
+        copy(value);
       } else {
+        if(!value){
+          uni.showToast({
+            title: "暂无电话",
+            icon: "none",
+          })
+          return
+        }
         uni.makePhoneCall({
-          phoneNumber: "98765432345678",
+          phoneNumber: value,
         });
       }
     },
+    formatData(data,type){
+      if(type==='user_phone'){
+        if(!data[type]) return ""
+        return MaskRules.mobile(data[type]);
+      }else{
+        return data[type] || "--";
+      }
+    },
     handlePopup() {
       this.$refs.refsPackage.open();
     },
+    async getOrderListSigleData(order_sn) {
+      try {
+        const res = await getOrderListProduct(order_sn);
+        if (res.data.status == 200) {
+          let detailDa =
+            (res.data.data.list[0] && res.data.data.list[0].orderProduct) || [];
+          this.procductList = detailDa || [];
+          console.log(this.procductList,"this.procductList")
+        }
+      } catch (error) {}
+    },
+    async getOrderDetails() {
+      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);
+          }
+          this.getOrderListSigleData(this.orderData.order_sn);
+        }
+      } catch (error) {
+      } finally {
+        uni.hideLoading();
+      }
+    },
+    async getLogisticData(id) {
+      if (!id) return;
+      try {
+        const res = await getExpress(id);
+        if (res.data.status == 200) {
+          const data = res.data.data || [];
+          this.logisticsData = data;
+        }
+      } catch (error) {}
+    },
     topgi() {
       let obj = {
         // status: this.status,
@@ -171,14 +203,17 @@ export default {
       if (["oldInfo", "shouhou"].includes(this.formType)) {
         obj = {
           status: this.status,
+          indexs: this.indexs,
           index: this.indexs,
+          
         };
       } else {
         obj = {
           status: this.status,
-          index: this.indexs,
+          indexs: this.indexs,
           formType: this.formType,
           order_id: this.order_id,
+           index: this.indexs,
         };
       }
       const params = toQueryString(obj);

shop/commodity/order.vue

@@ -1,41 +1,57 @@
 <template>
-	<view class="order">
-		<headersVue @headerJump="topgi" headerTitle="订单列表"/>
-		<view class="order-list-filter-wrapper">
-			<view class="order-search_customs">
-				<searchVue @search="search"></searchVue>
-			</view>
-			<view class="order-nbeirong_customs">
-				<tabsVue :category="num" :curruntActive="indexs" @tabs="tabsHandleClick"/>
-			</view>
-		</view>
-		
-		 <view class="order-list">
-			
-			<template v-if="listMock.length>0">
-				<template v-for="(item,index) in listMock" >
-					 <orderListCardVue class="order-list__card" :key="index+'index'" @handleSendOutGoods="handleSendOutGoods" :item="item" />
-				</template>
-			</template>
-			<template v-else>
-				<emptyDataVue/>
-			</template>
-			 </view>
-			
-			<view class="" v-if="tihsi==0&&listMock.length>0" style="margin: 60rpx 0 30rpx 0; color: #999999; font-size: 26rpx;">
-				—— 已经到最底部了哦 ——
-			</view>
-	</view>
+  <view class="order">
+    <headersVue @headerJump="topgi" headerTitle="订单列表" />
+    <view class="order-list-filter-wrapper">
+      <view class="order-search_customs">
+        <searchVue @search="search"></searchVue>
+      </view>
+      <view class="order-nbeirong_customs">
+        <tabsVue
+          :category="num"
+          :curruntActive="indexs"
+          @tabs="tabsHandleClick"
+        />
+      </view>
+    </view>
+
+    <view class="order-list">
+      <template v-if="list.length > 0">
+        <template v-for="(item, index) in list">
+          <orderListCardVue
+            class="order-list__card"
+            :key="index + 'index'"
+            @handleSendOutGoods="handleSendOutGoods"
+            :item="item"
+            :index="index"
+          />
+        </template>
+      </template>
+      <template v-else>
+        <emptyDataVue />
+      </template>
+    </view>
+
+    <view
+      class=""
+      v-if="tihsi == 0 && list.length > 0"
+      style="margin: 60rpx 0 30rpx 0; color: #999999; font-size: 26rpx"
+    >
+      —— 已经到最底部了哦 ——
+    </view>
+  </view>
 </template>
 
 <script>
-import { orderList } from "@/commit/order.js";
+import {
+  getOrderStatusNumber,
+  getOrderList,
+  getAfterSaleList,
+} from "@/commit/order.js";
 import emptyDataVue from "../components/emptyData/emptyData.vue";
 import tabsVue from "../components/tabs/tabs/tabs.vue";
 import orderListCardVue from "./components/orderList/orderListCard.vue";
 import searchVue from "./components/search/search.vue";
 import headersVue from "../components/headers/headers.vue";
-import { listData } from "./mockData.js";
 import { toQueryString } from "@/utils/index.js";
 export default {
   components: {
@@ -47,7 +63,6 @@ export default {
   },
   data() {
     return {
-      listMock: [],
       page: 1,
       limit: 10,
       tihsi: "",
@@ -58,6 +73,7 @@ export default {
       indexs: 0,
       // sty: true,
       list: [],
+      keywords: "",
       num: [
         {
           name: "全部",
@@ -108,36 +124,23 @@ export default {
           show: true,
         },
       ],
-      // num: [{
-      // 		name: "待付款",
-      // 		status: 5
-      // 	},
-      // 	{
-      // 		name: "待发货",
-      // 		status: 0
-      // 	},
-      // 	{
-      // 		name: "待收货",
-      // 		status: 1
-      // 	},
-      // 	{
-      // 		name: "待评价",
-      // 		status: 2
-      // 	},
-      // 	// {
-      // 	// 	name: "已完成"
-      // 	// }
-      // ]
     };
   },
   onLoad(e) {
     let selectmerchant = uni.getStorageSync("selectmerchant");
     this.mer_id = selectmerchant.merId;
-    this.status = e.status; //进入状态
-    this.indexs = e.index == null ? 0 : e.index;
-    this.listMock = listData || [];
-    // this.orderList()
+    
+    let tabIndex = e.index == null ? 0 : e.index;
+    this.indexs = tabIndex;
+    if (e.index !=  e.status) {
+      this.status = tabIndex;
+    } else {
+      this.status = e.status; //进入状态
+    }
+    this.orderList();
+    this.getOrderStatusNumberData();
   },
+
   onPullDownRefresh() {
     uni.showLoading({
       title: "加载中",
@@ -145,7 +148,7 @@ export default {
     this.page = 1;
     this.is_panudn = true;
     this.list = [];
-    // this.orderList();
+    this.orderList();
   },
   onReachBottom() {
     if (this.is_panudn == true) {
@@ -156,56 +159,128 @@ export default {
     }
   },
   methods: {
-    search(val) {
-      console.log(val, "搜索");
+    async getOrderStatusNumberData() {
+      try {
+        const res = await getOrderStatusNumber({
+          order_sn: "",
+          order_type: "-1",
+          distribution_mode: "-1",
+          keywords: "",
+          status: "",
+          date: "",
+          page: 1,
+          limit: 10,
+          type: 1,
+          username: "",
+          pay_type: -1,
+          ylj_status: "",
+          paid: "",
+        });
+        if (res.data.status == 200) {
+          this.num[0].totalNum = res.data.data.all || 0; //全部
+          this.num[1].totalNum = res.data.data.unpaid || 0; //待付款
+          this.num[2].totalNum = res.data.data.unshipped || 0; //待发货
+          this.num[3].totalNum = res.data.data.untake || 0; //待收货
+          this.num[4].totalNum = res.data.data.unevaluate || 0; //待评价
+          this.num[5].totalNum = res.data.data.complete || 0; //已完成
+          this.num[6].totalNum = res.data.data.refund || 0; //已退款
+          this.num[7].totalNum = res.data.data.del || 0; //已删除
+        }
+      } catch (error) {
+      } finally {
+        uni.hideLoading();
+      }
+    },
+    async search(val) {
+      this.keywords = val;
+      await this.orderList();
     },
+    getStatus(val) {
+      if (val == undefined || val === "all" || val === null) {
+        return "";
+      } else {
+        return val;
+      }
+    },
+
     handleSendOutGoods(v, type) {
-      console.log("發貨", v, this.indexs);
-      const urlParams = {
+      console.log(v, "v");
+      let urlParams = {
         order_id: v.order_id,
         status: v.status,
         indexs: this.indexs,
-        goodsCustomType: type === "delivered" ? "deliverGoods" : type,
+        goodsCustomType: type,
         formType: "oldInfo",
       };
-      console.log(urlParams, "urlParams");
       let url = toQueryString(urlParams);
-      const newUrl = {
-        sendGoods: `./sendoutgoods?${url}`, //立即发货
-        delivered: `./sendoutgoods?${url}`, //已送达
-        logistics: `./logisticsInformationDetail?${url}`, //查看物流
-        deliverGoods: `./sendoutgoods?${url}`, //送貨
-        pickup: `./sendoutgoods?${url}`, //立即自提
-        detail: `./details?${url}`,
-      };
-      let redirectToUrl = newUrl[type] || newUrl["logistics"];
-      console.log(redirectToUrl, "redirectToUrl");
-      console.log(type, "type");
+      let redirectToUrl = "";
+      if (type === "detail") {
+        redirectToUrl = `./details?${url}&detailInfo=${encodeURIComponent(JSON.stringify(v.orderProduct))}`;
+      } else if (type === "logistics") {
+          redirectToUrl = `./logisticsInformationDetail?${url}`;                           
+      } else if (type === "sendGoods") {
+        //发货
+        redirectToUrl = `./sendoutgoods?${url}`;
+      } else if (type === "delivered") {
+        //立即发货
+      } else if (type === "deliverGoods") {
+        //送貨
+      } else if (type === "pickup") {
+        //立即自提
+      }
+      if (!redirectToUrl) {
+        return;
+      }
       uni.redirectTo({
         url: redirectToUrl,
       });
+      // const newUrl = {
+      //   sendGoods: `./sendoutgoods?${url}`, //立即发货
+      //   delivered: `./sendoutgoods?${url}`, //已送达
+      //   logistics: `./logisticsInformationDetail?${url}`, //查看物流
+      //   deliverGoods: `./sendoutgoods?${url}`, //送貨
+      //   pickup: `./sendoutgoods?${url}`, //立即自提
+      //   detail: `./details?${url}`,
+      // };
+      // let redirectToUrl = newUrl[type] || newUrl["logistics"];
+      // console.log(redirectToUrl, "redirectToUrl");
+      // console.log(type, "type");
+      // uni.redirectTo({
+      //   url: redirectToUrl,
+      // });
     },
     // 正向订单列表
     orderList() {
-      return false;
       uni.showLoading({
         title: "加载中",
       });
-      orderList({
-        pageNum: this.page,
-        pageSize: this.limit,
+
+      getOrderList({
         mer_id: this.mer_id,
         status: this.status,
+        order_sn: "",
+        order_type: -1,
+        distribution_mode: -1,
+        keywords: this.keywords,
+        status: this.getStatus(this.status),
+        date: "",
+        page: this.page,
+        limit: this.limit,
+        type: 1,
+        username: "",
+        pay_type: -1,
+        ylj_status: "",
+        paid: "",
       }).then(
         (res) => {
           uni.stopPullDownRefresh();
           if (res.data.status == 200) {
-            this.tihsi = res.data.data.pageInfo.list.length;
-            if (res.data.data.pageInfo.list.length > 0) {
+            this.tihsi = res.data.data.count || 0;
+            if (res.data.data.count > 0) {
               if (this.page == 1) {
-                this.list = res.data.data.pageInfo.list;
+                this.list = res.data.data.list;
               } else {
-                this.list = this.list.concat(res.data.data.pageInfo.list);
+                this.list = this.list.concat(res.data.data.list);
               }
             } else {
               if (this.page == 1) {
@@ -238,14 +313,12 @@ export default {
       this.ysne(index, item.status);
     },
     ysne(index, status) {
-      this.status = status;
+      // console.log(index, status, "---tabsHandleClick")
+      this.status = index == 0 ? null : status;
       this.indexs = index;
       this.page = 1;
       this.is_panudn = true;
-
-      console.log(index, this.indexs, "---tabsHandleClick");
-      console.log(status, this.status, "---tabsHandleClickitem");
-      // this.orderList()
+      this.orderList();
     },
     topgi() {
       uni.switchTab({

shop/commodity/orderUtil.js

@@ -10,9 +10,168 @@ export const orderStatus = {
 }
 
 export const logisticStatus = {
-	"1":"已发货",
-	"2":"已揽收",
-	"3":"运输中",
-	"4":"配送中",
-	"5":"已签收"
-}
+    "1": "已发货",
+    "2": "已揽收",
+    "3": "运输中",
+    "4": "配送中",
+    "5": "已签收"
+}
+/**
+ * 
+ * @param {*} paid 支付类型paid == 1   paid == 0 支付状态
+ * @param {*} pay_type 
+ * @returns 
+ */
+export function getUserPayType(paid, pay_type) {
+    if (paid == 1) { //支付类型paid == 1
+        // console.log(paid,pay_type, "pay_typepay_typepay_typepay_type")
+        return { //pay_type
+            0: '虚拟支付',
+            1: '微信支付',
+            2: '小程序支付',
+            3: '银行卡支付',
+            4: '支付宝支付',
+            5: '红积分兑换'
+        } [pay_type] || "--"
+
+    } else if (paid == 0) { //支付状态
+        return paid == 0 ? "未支付" : "已支付"
+    } else {
+        return "--"
+    }
+}
+
+
+export function getOrderListStatus(status) {
+    return {
+        "5": '待付款',
+        "0": '待发货',
+        "1": '待收货',
+        "2": '待评价',
+        "3": '已完成',
+        "4": '已申请退款',
+        "-1": '已退款',
+        "6": '已取消',
+    } [status] || ""
+}
+
+export function getOrderDetailStatus(item, type = "image") {
+    const textMap = {
+        "5": '等待买家付款',//待付款
+        "0": '等待卖家发货',
+        "1": '等待买家收货',
+        "2": '等待买家评价',
+        "3": '订单已完成',
+        "4": '买家已申请退款',
+        "-1": '卖家已退款',
+        "6": '买家已取消订单',
+    }
+    const imageMap = {
+        "0": '/static/images/new_ui/daifahuo.png',
+        "1": '/static/images/new_ui/daishouhuo.png',
+        "2": '/static/images/new_ui/daipingjia.png',
+        "5": '/static/images/new_ui/daifukuan.png',
+        "3": '/static/images/new_ui/yiwancheng.png',
+        "4": '/static/images/new_ui/yishenqinftuikuan.png',
+        "-1": '/static/images/new_ui/yituikuan.png',
+        "6": '/static/images/new_ui/yiquxiao.png',
+    }
+    if (item.paid == 0) { //未付款
+        if (item.status == 0) { //待付款
+            return type == "image" ? imageMap['5'] : textMap['5']
+        }else{
+             return type == "image" ? imageMap[item.status] : textMap[item.status]
+        }
+    } else if (item.paid == 1) { //已付款
+        return type == "image" ? imageMap[item.status] : textMap[item.status]
+    }
+
+
+
+
+
+}
+
+
+/**
+ * @description 退款单状态 售后状态
+ */
+export function orderRefundFilter(status) {
+    const statusMap = {
+        '0': '审核中',
+        '-1': '审核未通过',
+        '1': '待退货',
+        '2': '退货中',
+        '3': '退款完成',
+        '4': '退款失败',
+        '5': '部分退款',
+        '6': '申请已取消'
+    }
+    return statusMap[status]
+}
+/**
+ * @description 退款单状态 售后状态
+ */
+export function orderRefundFilterText(status) {
+    const statusMap = {
+        '0': '退货审核中',
+        '-1': '退货审核未通过',
+        '1': '待退货',
+        '2': '退货中',
+        '3': '退款完成',
+        '4': '退款失败',
+        '5': '部分退款',
+        '6': '申请已取消'
+    }
+    return statusMap[status]
+}
+
+
+
+/**
+ * @description 
+ */
+export function orderRefundText(status) {
+    const statusMap = {
+        '0': '48小时未审核，系统将自动通过该申请',
+        '-1': '退货审核未通过',
+        '1': '待退货',
+        '2': '买家已寄出',
+        '3': '退货退款已完成，查看具体退款金额',
+        '4': '退货退款失败，请查看失败原因',
+        '5': '退货退款已完成，查看具体退款金额',
+        '6': '申请已取消'
+    }
+    return statusMap[status]
+}
+
+
+
+/**
+ * @description 自提订单状态
+ */
+export function takeOrderStatusFilter(status) {
+    const statusMap = {
+        '0': '待提货',
+        '1': '待提货',
+        '2': '待评价',
+        '3': '已完成',
+        '-1': '已退款'
+    }
+    return statusMap[status]
+}
+
+
+// < el - table - column label = "养老金状态"
+// min - width = "100" >
+//     <
+//     template slot - scope = "scope" >
+//     <
+//     span v -
+//     if = "scope.row.is_red_ylj=='0'" > 未结算 < /span> <
+//     span v -
+//     if = "scope.row.is_red_ylj=='2'" > 已失效 < /span> <
+//     span v -
+//     if = "scope.row.is_red_ylj=='1'" > 已结算 < /span> <
+//     /template> <
+//     /el-table-column>

shop/commodity/sendoutgoods.vue

@@ -2,11 +2,13 @@
   <view class="order-send-out-goods">
     <headersVue @headerJump="topgi" :header-title="headerTitle"></headersVue>
     <view class="order-send-out-goods__content">
-      <shipmentGoodsCardVue :title="shipmentGoodsTitle" />
-      <orderDetailSendCardVue class="custom_class" />
+      <shipmentGoodsCardVue :title="shipmentGoodsTitle" :items="detailData" />
+      <orderDetailSendCardVue class="custom_class" :items="detailData" />
       <fillLogisticsInfoVue
         class="custom_class"
         v-if="goodsCustomType === 'sendGoods'"
+        :ruleOptions="ruleOptions"
+        @changeHandle="changeHandle"
       />
       <reInputItemVue
         v-if="goodsCustomType === 'pickup'"
@@ -17,7 +19,7 @@
 	    class="inputInfo"
 	  ></reInputItemVue> -->
       <popupSelectItemVue
-        v-if="goodsCustomType === 'deliverGoods'"
+        v-if="goodsCustomType === 'deliverGoods' || detailData.delivery_type===2"
         class="inputInfo"
         defaultLabel="请选择送货人员"
         name="送货人员信息"
@@ -26,30 +28,38 @@
         @click-tabs="clickTabs"
       >
         <view class="upop" slot="right" @click="selectUserInfo">
-          <view class="title xcv">{{ deliveryMan }}</view>
+          <view class="title xcv">{{ detailData.delivery_name }}{{detailData.delivery_id}}</view>
           <image src="/static/images/new_ui/arrow-right.png" mode=""></image>
         </view>
       </popupSelectItemVue>
+      <!-- delivery_type===2 配送信息
+      送货人姓名：{{ orderDatalist.delivery_name }}
+      送货人电话：{{ orderDatalist.delivery_id }}
+
+       -->
       <!-- //收货码 -->
-      <deliverFillInfoCardVue class="inputInfo" />
+      <!-- <deliverFillInfoCardVue class="inputInfo" /> -->
       <!-- 送货信息有误 -->
-      <deliverCardItemVue class="inputInfo" />
-      <deliverCardItemVue
+      <!-- <deliverCardItemVue class="inputInfo" /> -->
+      <!-- <deliverCardItemVue
         class="inputInfo"
         :isBottomMessage="true"
         leftTitle="物流信息有误？"
         rightTitle="更改物流信息"
-      />
+      /> -->
       <!-- // 变更送货人信息 -->
-      <changeDeliveryPersonInfoVue style="margin-top: 20rpx" />
+      <!-- <changeDeliveryPersonInfoVue style="margin-top: 20rpx" /> -->
       <!-- 变更物流信息  -->
-      <changeLogisticsInformation style="margin-top: 20rpx" />
-      <view class="btn-box" v-if="['sendGoods','pickup','deliverGoods'].includes(goodsCustomType)">
+      <!-- <changeLogisticsInformation style="margin-top: 20rpx" /> -->
+      <view
+        class="btn-box"
+        v-if="['sendGoods', 'pickup', 'deliverGoods'].includes(goodsCustomType)"
+      >
         <button
           type="primary"
           class="send-goods"
           v-if="goodsCustomType === 'sendGoods'"
-		  @click="handleOpen"
+          @click="handleOpen"
         >
           发货
         </button>
@@ -63,16 +73,10 @@
         >
           自提
         </button>
-         <button
-          v-else
-          type="primary"
-          class="send-goods"
-        >
-          提交
-        </button>
+        <button v-else type="primary" class="send-goods">提交</button>
       </view>
     </view>
-	<ItemsInsidePackageVue ref="refsPackage"/>
+    <ItemsInsidePackageVue ref="refsPackage" />
   </view>
 </template>
 
@@ -89,6 +93,12 @@ import deliverCardItemVue from "./components/changeDetailInfo/pendingReceiptGood
 import changeDeliveryPersonInfoVue from "./components/changeDetailInfo/changeDeliveryPersonInfo.vue";
 import changeLogisticsInformation from "./components/changeDetailInfo/changeLogisticsInformation.vue";
 import ItemsInsidePackageVue from "./components/changeDetailInfo/ItemsInsidePackage.vue";
+import {
+  orderDetailApi,
+  orderDeliveryApi,
+  orderDeliveryRuleApi,
+  getOrderListProduct
+} from "@/commit/order.js";
 export default {
   components: {
     shipmentGoodsCardVue,
@@ -144,20 +154,117 @@ export default {
         pickup: "自提商品",
       },
       deliveryMan: "请选择送货人员",
+      detailData: {},
+      listFromData: [],
+      ruleOptions:[],
+      orderDeliveryParam:{},//物流
     };
   },
-  onLoad(e) {
+  async onLoad(e) {
     this.order_id = e.order_id;
     this.indexs = e.indexs;
     this.status = e.status;
     this.goodsCustomType = e.goodsCustomType;
     this.headerTitle = this.headerTitleMap[this.goodsCustomType];
     this.shipmentGoodsTitle = this.shipmentGoodsTitleMap[this.goodsCustomType];
+
+    await this.getOrderDetailsInfo();
+       if (this.goodsCustomType === "sendGoods") {
+      //获取发货规则信息
+      await this.getOrderDeliveryRule()
+    }
   },
   methods: {
-	  handleOpen(){
-		  this.$refs.refsPackage.open()
-	  },
+    async getOrderListSigleData(order_sn) {
+       try {
+         const res = await getOrderListProduct(order_sn)
+         if (res.data.status == 200) {
+           let detailDa = res.data.data.list[0] && res.data.data.list[0].orderProduct || [];
+           this.detailData = { ...this.detailData, orderProduct: detailDa };
+         }
+       } catch (error) {
+        
+       }
+    },
+    async getOrderDetailsInfo() {
+      uni.showLoading({
+        title: "加载中",
+        mask: true,
+      });
+      try {
+        const res = await orderDetailApi(this.order_id);
+        if (res.data.status == 200) {
+          let detailDa = res.data.data || {};
+          this.detailData = { ...detailDa };
+          this.getOrderListSigleData(this.detailData.order_sn);
+          // console.log("订单详情", this.detailData);
+        }
+      } catch (error) {
+      } finally {
+        uni.hideLoading();
+      }
+    },
+    // 获取发货规则
+    async getOrderDeliveryRule() {
+      try {
+        const res = await orderDeliveryRuleApi(this.order_id);
+        if (res.data.status == 200) {
+          let data = res.data.data.rule;
+           data.forEach(item=>{
+            let ruleData = item.control[0]&&item.control[0].rule[0] && item.control[0].rule[0].options || []
+           this.ruleOptions = ruleData
+          });
+          // console.log("发货规则", this.ruleOptions);
+        }
+      } catch (error) {
+      } finally {
+      }
+    },
+    //填写物流信息
+    changeHandle(val){
+      // console.log("changeHandle",val)
+      this.orderDeliveryParam = val
+    },
+   async handleOpen() {
+      // console.log("changeHandle",this.orderDeliveryParam)
+      if(!this.orderDeliveryParam.delivery_id){
+        uni.showToast({
+          title: "请填写快递单号",
+          icon: "none",
+        });
+        return
+      }
+       if(!this.orderDeliveryParam.delivery_name){
+        uni.showToast({
+          title: "请选择物流公司",
+          icon: "none",
+        });
+        return
+      }
+      // console.log("changeHandle",this.orderDeliveryParam)
+      // this.$refs.refsPackage.open();
+      uni.showLoading({
+        title: "正在发货中...",
+        mask: true,
+      });
+      const _this =this
+      try {
+        const res = await orderDeliveryApi(this.order_id, this.orderDeliveryParam);
+          if(res.data.status == 200){
+             uni.showToast({
+              title: "发货成功",
+              icon: "none",
+            });
+            setTimeout(() => {
+              _this.topgi()
+            },1000)
+          }
+      } catch (error) {
+        
+      }finally{
+        uni.hideLoading();
+      }
+    },
     copyHandle(val) {
       copy(val);
     },
@@ -173,6 +280,7 @@ export default {
     },
     selectUserInfo() {
       console.log("选择用户信息");
+      return;
       const urlParams = {
         status: this.status,
         index: this.indexs,
@@ -211,10 +319,10 @@ page {
     .btn-box {
       width: 100%;
       position: fixed;
-      background: #FFFFFF;
-	  height: 125rpx;
+      background: #ffffff;
+      height: 125rpx;
       bottom: 0rpx;
-	  padding-top: 15rpx;
+      padding-top: 15rpx;
       .send-goods {
         height: 78rpx;
         margin: 0 32rpx;

shop/components/tabs/tabs/tabs.vue

@@ -1,8 +1,8 @@
 <template>
-	<view class="content">
+	<view class="content" @touchmove.prevent>
 		<view class="nav">
 			<!-- 选项卡水平方向滑动，scroll-with-animation是滑动到下一个选项时，有一个延时效果 -->
-			<scroll-view class="tab-scroll" scroll-x="true" scroll-with-animation :scroll-left="scrollLeft">
+			<scroll-view @touchmove.stop class="tab-scroll" scroll-x="true" scroll-with-animation :scroll-left="scrollLeft">
 				<view class="tab-scroll_box">
 					<!-- 选项卡类别列表 -->
 					<view class="tab-scroll_item" v-for=" (item,index) in category"