新增【订单模块】送货信息有误、物流信息有误、订单详情--收货码、变更送货人信息、变更物流信息、商品信息弹窗组件

pages/ordermanagement/components/quickPickUp/quickPickUp.vue

@@ -1,8 +1,8 @@
 <template>
 	<!-- .设置了自提模式的商户展示该模块，没有自提模式的不展示； -->
-	<view class="quick-pick-up-wrapper">
-	   <view class="quick-pick-up-wrapper__text">快速提货</view>
-	   <view class="quick-pick-up-wrapper__input">
+	<view class="card-list-wrapper">
+	   <view class="card-list-wrapper__text">快速提货</view>
+	   <view class="card-list-wrapper__input">
 		 <!-- 输入框 -->
 		    <input 
 		      class="input-box"
@@ -44,9 +44,8 @@
 	}
 </script>
 
-<style lang="scss">
-.quick-pick-up-wrapper{
-	width: 100%;
+<style lang="scss" scoped>
+.card-list-wrapper{
 	min-height: 222rpx;
 	background: #FFFFFF;
 	 border-radius: 16rpx;
@@ -90,6 +89,7 @@
 	  font-weight: 400;
 	  font-size: 28rpx;
 	  color: #FFFFFF;
+	  white-space: nowrap;
 	}
 		
 	}

shop/commodity/components/changeDetailInfo/ItemsInsidePackage.vue

@@ -0,0 +1,256 @@
+<template>
+  <uni-popup
+    ref="popupRefs"
+    type="center"
+    :animation="true"
+    :is-mask-click="true"
+  >
+    <view class="popup_data__package">
+      <view class="popup_data__package__headers">
+        <view class="popup_data__package__headers--title">{{ title }}</view>
+        <uni-icons
+          type="closeempty"
+          class="custom_icons"
+          size="30"
+          @click="handleClose"
+        ></uni-icons>
+      </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>
+                <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-right">
+                  <view class="detail-send-order-yi-in-neibu-right-in">
+                   ×5
+                  </view>
+                </view>
+              </view>
+            </view>
+          </view>
+      </view>
+    </view>
+  </uni-popup>
+</template>
+
+<script>
+//包裹内商品 弹窗 商品信息
+export default {
+  props: {
+    title: {
+      type: String,
+      default: "包裹内商品"
+    },
+    value: {
+      type: [String, Number],
+      default: ""
+    },
+    defaultProps: {
+      type: Object,
+      default: () => {
+        return {
+          props: "text",
+          value: "value"
+        };
+      }
+    },
+    selectData: {
+      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"
+        }
+      ]
+    };
+  },
+  watch: {
+    value: {
+      handler(val) {
+        this.selectId = val;
+      },
+      immediate: true
+    }
+  },
+  mounted() {
+    this.selectId = this.value;
+  },
+  methods: {
+    handleTabs(item, index) {
+      const data = item.value || index;
+      if (this.selectId === data) {
+        this.selectId = "";
+      } else {
+        this.selectId = item.value || index;
+      }
+      this.$emit("update:value", this.selectId);
+      const itemObj = this.selectId !== "" ? item : {};
+      this.$emit("tabs", { selected: this.selectId, item: itemObj, index });
+      this.handleClose();
+    },
+    handleClose() {
+      this.close();
+    },
+    open(type = "bottom") {
+      this.$refs.popupRefs.open(type);
+    },
+    close() {
+      this.$refs.popupRefs.close();
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.popup_data__package {
+  padding: 26rpx 30rpx;
+  min-height: 750rpx;
+  max-height: 850rpx;
+  box-sizing: border-box;
+  overflow: hidden;
+  background-color: #ffffff;
+  // 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;
+	 // background: linear-gradient(180deg, #e5edff 0%, #ffffff 100%);
+    padding-bottom: 15rpx;
+    &--title {
+      flex: 1;
+      display: -webkit-box;
+      -webkit-box-orient: vertical;
+      -webkit-line-clamp: 1;
+      overflow: hidden;
+      justify-content: space-between;
+      font-size: 32rpx;
+      font-weight: 600;
+      text-align: center;
+    }
+    .custom_icons {
+      flex-shrink: 0;
+    }
+  }
+  &__content {
+    // 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{
+
+		  .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/changeDeliveryPersonInfo.vue

@@ -0,0 +1,135 @@
+<template>
+  <view class="card-info-wrapper" :style="{ 'border-radius': borderRadius }">
+    <view class="card-info-top">
+      <view class="card-top">
+        <view class="card-title">变更送货人信息</view>
+      </view>
+      <view class="card-content">
+        <popupSelectItemVue
+          defaultLabel="请选择送货人员"
+          name="送货人员信息"
+          title="送货人员信息"
+          :styles="{ color: '#999999' }"
+        >
+          <view class="upop" slot="right">
+            <view class="select-item_txt">配送人姓名 15000000000</view>
+          </view>
+        </popupSelectItemVue>
+      </view>
+    </view>
+    <view class="card-info-bottom">
+      <view class="card-top">
+        <view class="card-title">变更送货人信息</view>
+      </view>
+      <view class="card-content">
+        <popupSelectItemVue
+          defaultLabel="重新选择送货人"
+          name="重新选择送货人"
+          title="重新选择送货人"
+        >
+          <view class="upop" slot="right" @click="selectUserInfo">
+            <view class="deliveryMan">{{ deliveryMan }}</view>
+            <image src="/static/images/new_ui/arrow-right.png" mode=""></image>
+          </view>
+        </popupSelectItemVue>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import { toQueryString } from "@/utils/index.js";
+import popupSelectItemVue from "../popupSelectItem/popupSelectItem.vue";
+//待收货---【送货】----变更送货人信息
+export default {
+  components: {
+    popupSelectItemVue
+  },
+  props: {
+    borderRadius: {
+      type: String,
+      default: "16rpx"
+    }
+  },
+  data() {
+    return {
+      deliveryMan: "请选择送货人信息",
+      indexs: "",
+      status: "",
+      order_id: "", //订单ID
+      goodsCustomType: "sendGoods"
+    };
+  },
+  onLoad(e) {
+    this.order_id = e.order_id;
+    this.indexs = e.indexs;
+    this.status = e.status;
+    this.goodsCustomType = e.goodsCustomType;
+  },
+  methods: {
+    selectUserInfo() {
+      console.log("选择用户信息");
+      const urlParams = {
+        status: this.status,
+        index: this.indexs,
+        goodsCustomType: this.goodsCustomType,
+        order_id: this.order_id
+      };
+      const url = toQueryString(urlParams);
+      console.log(url);
+      uni.redirectTo({
+        url: `./deliveryman?${url}`
+      });
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.card-info-wrapper {
+  //   min-height: 345rpx;
+  background: #ffffff;
+  padding: 32rpx 32rpx 5rpx;
+  .card-info-top {
+    color: #e5e5e5;
+    border-bottom: 2rpx solid #e5e5e5;
+    .card-top {
+      font-family: PingFangSC, PingFang SC;
+      font-weight: 500;
+      font-size: 30rpx;
+      color: #999999;
+    }
+  }
+  .upop {
+    display: flex;
+    width: 100%;
+    align-items: center;
+    justify-content: flex-end;
+    image {
+      width: 30rpx;
+      height: 30rpx;
+      margin-left: 5rpx;
+    }
+    .image-box {
+      width: 40rpx;
+      height: 38rpx;
+    }
+    .select-item_txt,
+    .deliveryMan {
+      flex: 1;
+      font-family: PingFangSC, PingFang SC;
+      font-weight: 400;
+      font-size: 28rpx;
+      color: #999999;
+    }
+  }
+  .card-info-bottom {
+    margin-top: 36rpx;
+    .card-title {
+      font-weight: 600;
+      font-size: 30rpx;
+      color: #333333;
+    }
+  }
+}
+</style>

shop/commodity/components/changeDetailInfo/changeLogisticsInformation.vue

@@ -0,0 +1,145 @@
+<template>
+  <view class="card-info-wrapper" :style="{ 'border-radius': borderRadius }">
+    <view class="card-info-top">
+      <view class="card-top">
+        <view class="card-title">原物流信息</view>
+      </view>
+      <view class="card-content">
+        <popupSelectItemVue
+          defaultLabel="物流单号"
+          name="物流单号"
+          title="物流单号"
+          :styles="{ color: '#999999' }"
+          :style="{ 'border-bottom': '2rpx solid #e5e5e5' }"
+        >
+          <view class="upop" slot="right">
+            <view class="select-item_txt">YT125678765432345678</view>
+          </view>
+        </popupSelectItemVue>
+        <popupSelectItemVue
+          defaultLabel="请选择物流公司"
+          name="物流公司"
+          title="物流公司"
+          :styles="{ color: '#999999' }"
+        >
+          <view class="upop" slot="right">
+            <view class="select-item_txt">圆通快递</view>
+          </view>
+        </popupSelectItemVue>
+      </view>
+    </view>
+    <view class="card-info-bottom">
+      <view class="card-top">
+        <view class="card-title">变更送货人信息</view>
+      </view>
+      <view class="card-content">
+        <fillLogisticsInfoVue
+          :isShowTitle="false"
+          class="custom_padding"
+        ></fillLogisticsInfoVue>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import { toQueryString } from "@/utils/index.js";
+import popupSelectItemVue from "../popupSelectItem/popupSelectItem.vue";
+import fillLogisticsInfoVue from "../fillLogisticsInfo.vue";
+//待收货---【送货】----变更物流信息
+export default {
+  components: {
+    popupSelectItemVue,
+    fillLogisticsInfoVue
+  },
+  props: {
+    borderRadius: {
+      type: String,
+      default: "16rpx"
+    }
+  },
+  data() {
+    return {
+      deliveryMan: "请选择送货人信息",
+      indexs: "",
+      status: "",
+      order_id: "", //订单ID
+      goodsCustomType: "sendGoods"
+    };
+  },
+  onLoad(e) {
+    this.order_id = e.order_id;
+    this.indexs = e.indexs;
+    this.status = e.status;
+    this.goodsCustomType = e.goodsCustomType;
+  },
+  methods: {
+    selectUserInfo() {
+      console.log("选择用户信息");
+      const urlParams = {
+        status: this.status,
+        index: this.indexs,
+        goodsCustomType: this.goodsCustomType,
+        order_id: this.order_id
+      };
+      const url = toQueryString(urlParams);
+      console.log(url);
+      uni.redirectTo({
+        url: `./deliveryman?${url}`
+      });
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.custom_padding {
+  padding: 0 !important;
+}
+.card-info-wrapper {
+  //   min-height: 345rpx;
+  background: #ffffff;
+  padding: 32rpx 32rpx 5rpx;
+  .card-info-top {
+    color: #e5e5e5;
+    border-bottom: 2rpx solid #e5e5e5;
+    .card-top {
+      font-family: PingFangSC, PingFang SC;
+      font-weight: 500;
+      font-size: 30rpx;
+      color: #999999;
+    }
+  }
+  .upop {
+    display: flex;
+    width: 100%;
+    align-items: center;
+    justify-content: flex-end;
+    image {
+      width: 30rpx;
+      height: 30rpx;
+      margin-left: 5rpx;
+    }
+    .image-box {
+      width: 40rpx;
+      height: 38rpx;
+    }
+    .select-item_txt,
+    .deliveryMan {
+      flex: 1;
+      font-family: PingFangSC, PingFang SC;
+      font-weight: 400;
+      font-size: 28rpx;
+      color: #999999;
+    }
+  }
+  .card-info-bottom {
+    margin-top: 36rpx;
+    .card-title {
+      font-weight: 600;
+      font-size: 30rpx;
+      color: #333333;
+    }
+  }
+}
+</style>

shop/commodity/components/changeDetailInfo/pendingReceiptGoodsModules/deliverCardItem.vue

@@ -0,0 +1,104 @@
+<template>
+  <view
+    class="delivery-card-item-wrapper"
+    :style="{ 'border-radius': borderRadius }"
+  >
+    <view class="delivery-card-item__top">
+      <view class="delivery-card-item__left">
+        {{ leftTitle }}
+      </view>
+      <view class="delivery-card-item__right">
+        <view class="btn" @click="btnHandle">{{ rightTitle }}</view>
+      </view>
+    </view>
+    <view class="delivery-card-item__bottom" v-if="isBottomMessage"> 
+      <uni-icons type="info-filled" size="25" color=" #D81E06"></uni-icons>
+      <text class="txt">{{tipsMessage}}</text>
+	</view>
+    <slot name="bottom"></slot>
+  </view>
+</template>
+
+<script>
+//待收货--【送货】--订单详情---送货信息有误？
+//待收货--【物流】--订单详情---物流信息有误？
+export default {
+  props: {
+    borderRadius: {
+      type: String,
+      default: "16rpx",
+    },
+    leftTitle: {
+      type: String,
+      default: "送货信息有误？",
+    },
+    rightTitle: {
+      type: String,
+      default: "更改送货信息",
+    },
+    isBottomMessage: {
+      type: Boolean,
+      default: false,
+    },
+	tipsMessage:{
+		type: String,
+		default: "物流信息有误时使用，请勿随意更改物流信息！",
+	}
+  },
+  data() {
+    return {};
+  },
+  methods: {
+	  btnHandle(){
+		  this.$emit("btn-click")
+	  }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.delivery-card-item-wrapper {
+  min-height: 104rpx;
+  background: #ffffff;
+  border-radius: 16rpx;
+  overflow: hidden;
+  user-select: none;
+  font-family: PingFangSC, PingFang SC;
+  .delivery-card-item__top {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    min-height: 104rpx;
+    .delivery-card-item__left {
+      flex: 1;
+      flex-shrink: 0;
+      font-weight: 600;
+      font-size: 28rpx;
+      color: #333333;
+    }
+    .delivery-card-item__right {
+      width: 200rpx;
+      flex-shrink: 0;
+      .btn {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 188rpx;
+        height: 58rpx;
+        border-radius: 30rpx;
+        font-weight: 400;
+        font-size: 24rpx;
+        color: #333333;
+        border: 1rpx solid #999999;
+      }
+    }
+  }
+
+  .delivery-card-item__bottom {
+	  display: flex;
+	  align-items: center;
+	  padding-bottom:35rpx ;
+	  gap:15rpx;
+  }
+}
+</style>

shop/commodity/components/changeDetailInfo/pendingReceiptGoodsModules/deliverFillInfoCard.vue

@@ -0,0 +1,116 @@
+<template>
+
+	<view class="quick-pick-up-wrapper">
+	   <view class="quick-pick-up-wrapper__text">{{tilteText}}</view>
+	   <view class="quick-pick-up-wrapper__input">
+		 <!-- 输入框 -->
+		    <input 
+		      class="input-box"
+		      type="text"
+		      :placeholder="placeholder"
+		      v-model="pickupCode"
+		    />
+		 <!-- 按钮 -->
+		    <button 
+			type="primary"
+		      class="query-btn"
+		      @click="handleQuery"
+		    >{{btnTitle}}</button>
+	   </view>
+	</view>
+</template>
+
+<script>
+		// 待收货---已送达--订单详情--收货码
+		
+	export default {
+		props:{
+			tilteText:{
+				type:String,
+				default:"收货码"
+			},
+			tipsMessge:{
+				type:String,
+				default:"收货码"
+			},
+			placeholder:{
+				type:String,
+				default:"请输入用户提供的收货码"
+			},
+			btnTitle:{
+				type:String,
+				default:"送达"
+			}
+		},
+		data() {
+			return {
+				pickupCode:""
+				
+			};
+		},
+		methods:{
+			handleQuery(){
+				if (!this.pickupCode){
+					uni.showToast({
+					  title: this.tipsMessge,
+					  icon: 'none'
+					})
+					return
+				}
+			  console.log(this.pickupCode)
+			}
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+.quick-pick-up-wrapper{
+	min-height: 222rpx;
+	background: #FFFFFF;
+	 border-radius: 16rpx;
+	  display: flex;
+	  flex-direction: column;
+	&__text{
+	  font-size: 36rpx;
+	  font-weight: bold;
+	  color: #333;
+	  margin: 32rpx 0rpx 26rpx 26rpx;
+	  user-select: none;
+	}
+	&__input{
+		display: flex;
+		flex-direction: row;
+		width: calc(100% - 0rpx);
+		height: 74rpx;
+		border-radius: 6rpx;
+		padding: 0 26rpx;
+		box-sizing: border-box;
+		.input-box {
+		  width: 85%;
+		  border-radius: 12rpx;
+		  padding: 0 20rpx;
+		  font-size: 32rpx;
+		  height: 74rpx;
+		  background: #F5F5F5;
+		  border-radius: 6rpx;
+		  box-sizing: border-box;
+		}
+	.query-btn {
+		user-select: none;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	  width: 150rpx;
+	  height: 74rpx;
+	background: #1F7CFF;
+	  border-radius: 6rpx;
+	  font-family: PingFangSC, PingFang SC;
+	  font-weight: 400;
+	  font-size: 28rpx;
+	  color: #FFFFFF;
+	}
+		
+	}
+}
+</style>

shop/commodity/components/fillLogisticsInfo.vue

@@ -1,6 +1,8 @@
 <template>
   <view class="logistics-information">
-    <view class="logistics-information__text">填写物流信息</view>
+    <view class="logistics-information__text" v-if="isShowTitle">{{
+      headersName
+    }}</view>
     <view class="logistics-information__form">
       <reInputItemVue
         placeholder="请手动输入或扫描二维码"
@@ -25,6 +27,16 @@ import reInputItemVue from "./reInputItem/reInputItem.vue";
 import popupSelectItemVue from "./popupSelectItem/popupSelectItem.vue";
 export default {
   components: { reInputItemVue, popupSelectItemVue },
+  props: {
+    headersName: {
+      type: String,
+      default: "填写物流信息"
+    },
+    isShowTitle: {
+      type: Boolean,
+      default: true
+    }
+  },
   data() {
     return {};
   },
@@ -40,7 +52,7 @@ export default {
           } else if (res.cancel) {
             console.log("用户点击了取消");
           }
-        },
+        }
       });
     },
     changeInput(val) {
@@ -53,13 +65,13 @@ export default {
       this.logisticsValue = selected;
       this.logisticsLabel = item.text;
       console.log(selected, item, index);
-    },
+    }
   },
   computed: {
     logistics() {
       return this.logisticsLabel || "请选择物流公司";
-    },
-  },
+    }
+  }
 };
 </script>
 

shop/commodity/components/popupSelect.vue

@@ -21,13 +21,19 @@
           <view class="popup_data__content--item">
             <uni-icons
               type="checkmarkempty"
-			  :class="['_select_icons',(index ===selectId || selectId === item.value) ?'isActive':'']"
+              :class="[
+                '_select_icons',
+                index === selectId || selectId === item.value ? 'isActive' : ''
+              ]"
               size="25"
             ></uni-icons>
-            <view  :class="['popup_data__content--item__title',(index === selectId || selectId === item.value) ?'isActive':'']">
-              {{
-                item.text
-              }}
+            <view
+              :class="[
+                'popup_data__content--item__title',
+                index === selectId || selectId === item.value ? 'isActive' : ''
+              ]"
+            >
+              {{ item.text }}
             </view>
           </view>
         </view>
@@ -41,43 +47,43 @@ export default {
   props: {
     title: {
       type: String,
-      default: "物流公司信息",
+      default: "物流公司信息"
     },
     value: {
       type: [String, Number],
-      default: "",
+      default: ""
     },
-	defaultProps:{
-		type:Object,
-		default:()=>{
-			return {
-				props:"text",
-				value:"value"
-			}
-		}
-	},
-	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" }
-]
-		}
-	}
+    defaultProps: {
+      type: Object,
+      default: () => {
+        return {
+          props: "text",
+          value: "value"
+        };
+      }
+    },
+    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" }
+        ];
+      }
+    }
   },
   data() {
     return {
@@ -89,26 +95,25 @@ export default {
       handler(val) {
         this.selectId = val;
       },
-	  immediate:true
-    },
+      immediate: true
+    }
   },
   mounted() {
     this.selectId = this.value;
   },
   methods: {
     handleTabs(item, index) {
-		const data = item.value || index
-		if(this.selectId === data){
-			this.selectId = ""
-		}else{
-			this.selectId = item.value || index
-		}
-		this.$emit("update:value",this.selectId)
-		const itemObj = this.selectId !==''?item:{}
-		this.$emit("tabs",{selected:this.selectId,item:itemObj,index})
-		this.handleClose()
-		
-	},
+      const data = item.value || index;
+      if (this.selectId === data) {
+        this.selectId = "";
+      } else {
+        this.selectId = item.value || index;
+      }
+      this.$emit("update:value", this.selectId);
+      const itemObj = this.selectId !== "" ? item : {};
+      this.$emit("tabs", { selected: this.selectId, item: itemObj, index });
+      this.handleClose();
+    },
     handleClose() {
       this.close();
     },
@@ -117,8 +122,8 @@ export default {
     },
     close() {
       this.$refs.popup.close();
-    },
-  },
+    }
+  }
 };
 </script>
 
@@ -158,16 +163,16 @@ export default {
     overflow-y: auto;
     &--list {
       user-select: none;
-	  border-bottom: 2rpx solid #e5e5e5;
-	  &:last-child{
-	  		  border-bottom:none;
-	  }
+      border-bottom: 2rpx solid #e5e5e5;
+      &:last-child {
+        border-bottom: none;
+      }
     }
     &--item {
       display: flex;
       gap: 20rpx;
       padding: 20rpx 0;
-     
+
       ._select_icons {
         color: #eee !important;
       }

shop/commodity/components/popupSelectItem/popupSelectItem.vue

@@ -1,93 +1,95 @@
 <template>
-      <view class="form_item">
-        <view class="form_item--left"> {{name}} </view>
-        <view class="form_item--right">
-		<template v-if="$slots.right">
-			<slot name="right"></slot>
-		</template>
-          <view class="upop" @click="handleSelect" v-else>
-            <view class="title xcv">{{ logistics }}</view>
-            <image src="/static/images/new_ui/arrow-right.png" mode=""></image>
-          </view>
-        </view>
-		<popupSelectVue
-		  ref="popup"
-		  :value.sync="logisticsValue"
-		  :selectData="selectData"
-		  @tabs="handleClick"
-		  :title="title"
-		  
-		/>
+  <view class="form_item">
+    <view class="form_item--left" :style="styles"> {{ name }} </view>
+    <view class="form_item--right">
+      <template v-if="$slots.right">
+        <slot name="right"></slot>
+      </template>
+      <view class="upop" @click="handleSelect" v-else>
+        <view class="title xcv">{{ logistics }}</view>
+        <image src="/static/images/new_ui/arrow-right.png" mode=""></image>
       </view>
+    </view>
+    <popupSelectVue
+      ref="popup"
+      :value.sync="logisticsValue"
+      :selectData="selectData"
+      @tabs="handleClick"
+      :title="title"
+    />
+  </view>
 </template>
 
 <script>
-	import popupSelectVue from '../popupSelect.vue';
-	export default {
-		components: { popupSelectVue },
-		props: {
-		  name: {
-		    type: String,
-		    default: "物流公司",
-		  },
-		  defaultLabel:{
-			  type: String,
-			  default: "请选择物流公司",
-		  },
-		  title: {
-		        type: String,
-		        default: "物流公司信息",
-		      },
-		      value: {
-		        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" }
-		  ]
-		  		}
-		  	}
-		},
-		data() {
-			return {
-				logisticsValue: "", //物流
-				logisticsLabel:""
-				
-			};
-		},
-		methods:{
-			handleClick({ selected, item, index }) {
-			  this.logisticsValue = selected;
-			  this.logisticsLabel = item.text;
-			  this.$emit("click-tabs",{ selected, item, index })
-			},
-			handleSelect() {
-			  this.$refs.popup.open();
-			},
-		},
-		computed: {
-		  logistics() {
-		    return this.logisticsLabel || this.defaultLabel;
-		  },
-		},
-	}
+import popupSelectVue from "../popupSelect.vue";
+export default {
+  components: { popupSelectVue },
+  props: {
+    name: {
+      type: String,
+      default: "物流公司"
+    },
+    defaultLabel: {
+      type: String,
+      default: "请选择物流公司"
+    },
+    styles: {
+      type: Object,
+      default: () => {}
+    },
+    title: {
+      type: String,
+      default: "物流公司信息"
+    },
+    value: {
+      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" }
+        ];
+      }
+    }
+  },
+  data() {
+    return {
+      logisticsValue: "", //物流
+      logisticsLabel: ""
+    };
+  },
+  methods: {
+    handleClick({ selected, item, index }) {
+      this.logisticsValue = selected;
+      this.logisticsLabel = item.text;
+      this.$emit("click-tabs", { selected, item, index });
+    },
+    handleSelect() {
+      this.$refs.popup.open();
+    }
+  },
+  computed: {
+    logistics() {
+      return this.logisticsLabel || this.defaultLabel;
+    }
+  }
+};
 </script>
 
 <style lang="scss" scoped>
@@ -99,7 +101,7 @@
   height: 100rpx;
   // border-bottom: 2rpx solid #e5e5e5;
   &--left {
-    max-width: 200rpx;
+    max-width: 230rpx;
     font-family: PingFangSC, PingFang SC;
     font-weight: 400;
     font-size: 30rpx;

shop/commodity/order.vue

@@ -39,6 +39,7 @@
 	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:{emptyDataVue,tabsVue,orderListCardVue,searchVue,headersVue},
 		data() {
@@ -157,14 +158,23 @@
 			},
 			handleSendOutGoods(v,type){
 				console.log("發貨",v)
-				const url = {
-					"sendGoods":`./sendoutgoods?order_id=${v.order_id}&status=${v.status}&indexs=${this.indexs}&goodsCustomType=${type}`,//立即发货
-					"delivered":`./sendoutgoods?order_id=${v.order_id}&status=${v.status}&indexs=${this.indexs}&goodsCustomType=deliverGoods`,//已送达
+				const urlParams = {
+					order_id:v.order_id,
+					status:v.status,
+					indexs:this.indexs,
+					goodsCustomType:type==='delivered'?'deliverGoods':type,
+					formType:'oldInfo'
+				}
+				console.log(urlParams,"urlParams")
+				let url = toQueryString(urlParams)
+				const newUrl = {
+					"sendGoods":`./sendoutgoods?${url}`,//立即发货
+					"delivered":`./sendoutgoods?${url}`,//已送达
 					"logistics":``,//查看物流
-					"deliverGoods":`./sendoutgoods?order_id=${v.order_id}&status=${v.status}&indexs=${this.indexs}&goodsCustomType=${type}`,//送貨
-					"pickup":`./sendoutgoods?order_id=${v.order_id}&status=${v.status}&indexs=${this.indexs}&goodsCustomType=${type}`,//立即自提
+					"deliverGoods":`./sendoutgoods?${url}`,//送貨
+					"pickup":`./sendoutgoods?${url}`,//立即自提
 				}
-				let redirectToUrl = url[type] || url["logistics"]
+				let redirectToUrl = newUrl[type] || newUrl["logistics"]
 				console.log(redirectToUrl,"redirectToUrl")
 				console.log(type,"type")
 				uni.redirectTo({

shop/commodity/sendoutgoods.vue

@@ -12,42 +12,67 @@
         v-if="goodsCustomType === 'pickup'"
         class="inputInfo"
       ></reInputItemVue>
-<!-- 	  <reInputItemVue
+      <!-- 	  <reInputItemVue
 	    v-if="goodsCustomType === 'pickup'"
 	    class="inputInfo"
 	  ></reInputItemVue> -->
-	  <popupSelectItemVue  
-	  v-if="goodsCustomType === 'deliverGoods'"
-	    class="inputInfo"
-		defaultLabel="请选择送货人员"
-		name="送货人员信息"
-		title="送货人员信息"
-		:selectData="selectData"
-		@click-tabs="clickTabs"
-		>
-		<view class="upop" slot="right" @click="selectUserInfo">
-			<view class="title xcv">{{ deliveryMan }}</view>
-			<image src="/static/images/new_ui/arrow-right.png" mode=""></image>
-		</view>
-		</popupSelectItemVue>
-      <view class="btn-box">
+      <popupSelectItemVue
+        v-if="goodsCustomType === 'deliverGoods'"
+        class="inputInfo"
+        defaultLabel="请选择送货人员"
+        name="送货人员信息"
+        title="送货人员信息"
+        :selectData="selectData"
+        @click-tabs="clickTabs"
+      >
+        <view class="upop" slot="right" @click="selectUserInfo">
+          <view class="title xcv">{{ deliveryMan }}</view>
+          <image src="/static/images/new_ui/arrow-right.png" mode=""></image>
+        </view>
+      </popupSelectItemVue>
+      <!-- //收货码 -->
+      <deliverFillInfoCardVue class="inputInfo" />
+      <!-- 送货信息有误 -->
+      <deliverCardItemVue class="inputInfo" />
+      <deliverCardItemVue
+        class="inputInfo"
+        :isBottomMessage="true"
+        leftTitle="物流信息有误？"
+        rightTitle="更改物流信息"
+      />
+      <!-- // 变更送货人信息 -->
+      <changeDeliveryPersonInfoVue style="margin-top: 20rpx" />
+      <!-- 变更物流信息  -->
+      <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"
         >
           发货
         </button>
         <button
           type="primary"
           class="send-goods"
-          v-if="goodsCustomType === 'pickup'"
-		  @click="copyHandle('请选择送货人员请选择送货人员请选择送货人员121212copy')"
+          v-else-if="goodsCustomType === 'pickup'"
+          @click="
+            copyHandle('请选择送货人员请选择送货人员请选择送货人员121212copy')
+          "
         >
           自提
         </button>
+         <button
+          v-else
+          type="primary"
+          class="send-goods"
+        >
+          提交
+        </button>
       </view>
     </view>
+	<ItemsInsidePackageVue ref="refsPackage"/>
   </view>
 </template>
 
@@ -58,7 +83,12 @@ import fillLogisticsInfoVue from "./components/fillLogisticsInfo.vue";
 import headersVue from "../components/headers/headers.vue";
 import reInputItemVue from "./components/reInputItem/reInputItem.vue";
 import popupSelectItemVue from "./components/popupSelectItem/popupSelectItem.vue";
-import {copy,toQueryString} from "@/utils/index.js"
+import { copy, toQueryString } from "@/utils/index.js";
+import deliverFillInfoCardVue from "./components/changeDetailInfo/pendingReceiptGoodsModules/deliverFillInfoCard.vue";
+import deliverCardItemVue from "./components/changeDetailInfo/pendingReceiptGoodsModules/deliverCardItem.vue";
+import changeDeliveryPersonInfoVue from "./components/changeDetailInfo/changeDeliveryPersonInfo.vue";
+import changeLogisticsInformation from "./components/changeDetailInfo/changeLogisticsInformation.vue";
+import ItemsInsidePackageVue from "./components/changeDetailInfo/ItemsInsidePackage.vue";
 export default {
   components: {
     shipmentGoodsCardVue,
@@ -66,27 +96,37 @@ export default {
     fillLogisticsInfoVue,
     headersVue,
     reInputItemVue,
-	popupSelectItemVue
+    popupSelectItemVue,
+    //收货码
+    deliverFillInfoCardVue,
+    //修改物流信息 、、、、、送货信息
+    deliverCardItemVue,
+    // 变更送货人信息
+    changeDeliveryPersonInfoVue,
+    // 变更物流信息
+    changeLogisticsInformation,
+    //商品详情弹窗
+    ItemsInsidePackageVue,
   },
   data() {
     return {
-		selectData:[
-  { value: 0, text: "张伟" },
-  { value: 1, text: "王芳" },
-  { value: 2, text: "李强" },
-  { value: 3, text: "刘洋" },
-  { value: 4, text: "陈静" },
-  { value: 5, text: "杨勇" },
-  { value: 6, text: "黄丽" },
-  { value: 7, text: "周杰" },
-  { value: 8, text: "徐敏" },
-  { value: 9, text: "吴涛" },
-  { value: 10, text: "孙莉" },
-  { value: 11, text: "马强" },
-  { value: 12, text: "胡月" },
-  { value: 13, text: "林浩" },
-  { value: 14, text: "何婷" }
-],
+      selectData: [
+        { value: 0, text: "张伟" },
+        { value: 1, text: "王芳" },
+        { value: 2, text: "李强" },
+        { value: 3, text: "刘洋" },
+        { value: 4, text: "陈静" },
+        { value: 5, text: "杨勇" },
+        { value: 6, text: "黄丽" },
+        { value: 7, text: "周杰" },
+        { value: 8, text: "徐敏" },
+        { value: 9, text: "吴涛" },
+        { value: 10, text: "孙莉" },
+        { value: 11, text: "马强" },
+        { value: 12, text: "胡月" },
+        { value: 13, text: "林浩" },
+        { value: 14, text: "何婷" },
+      ],
       indexs: "",
       status: "",
       order_id: "", //订单ID
@@ -103,7 +143,7 @@ export default {
         sendGoods: "发货商品",
         pickup: "自提商品",
       },
-	  deliveryMan:"请选择送货人员"
+      deliveryMan: "请选择送货人员",
     };
   },
   onLoad(e) {
@@ -115,42 +155,46 @@ export default {
     this.shipmentGoodsTitle = this.shipmentGoodsTitleMap[this.goodsCustomType];
   },
   methods: {
-	  copyHandle(val){
-		  copy(val)
+	  handleOpen(){
+		  this.$refs.refsPackage.open()
 	  },
+    copyHandle(val) {
+      copy(val);
+    },
     topgi() {
-		const url = toQueryString({
-			status:this.status,
-			index:this.indexs,
-			// goodsCustomType:this.goodsCustomType
-		})
+      const url = toQueryString({
+        status: this.status,
+        index: this.indexs,
+        // goodsCustomType:this.goodsCustomType
+      });
       uni.redirectTo({
-        url: `./order?${url}`
+        url: `./order?${url}`,
       });
     },
-	selectUserInfo(){
-		console.log("选择用户信息")
-		const urlParams = {
-			status:this.status,
-			index:this.indexs,
-			goodsCustomType:this.goodsCustomType,
-			order_id:this.order_id
-		}
-		const url = toQueryString(urlParams)
-		console.log(url)
-		uni.redirectTo({
-		  url:`./deliveryman?${url}`,
-		});
-	},
-	clickTabs({ selected, item, index }){
-		console.log("clickTabs", selected, item, index)
-	}
+    selectUserInfo() {
+      console.log("选择用户信息");
+      const urlParams = {
+        status: this.status,
+        index: this.indexs,
+        goodsCustomType: this.goodsCustomType,
+        order_id: this.order_id,
+      };
+      const url = toQueryString(urlParams);
+      console.log(url);
+      uni.redirectTo({
+        url: `./deliveryman?${url}`,
+      });
+    },
+    clickTabs({ selected, item, index }) {
+      console.log("clickTabs", selected, item, index);
+    },
   },
 };
 </script>
 <style>
 page {
   background-color: #f7f8fc;
+  /* height: 100%; */
 }
 </style>
 <style scoped lang="scss">
@@ -162,21 +206,24 @@ page {
   align-items: center;
   &__content {
     width: 100%;
-    margin: 130rpx 0 50rpx;
+    margin: 130rpx 0 180rpx;
+    overflow: auto;
     .btn-box {
       width: 100%;
       position: fixed;
-
-      bottom: 30rpx;
+      background: #FFFFFF;
+	  height: 125rpx;
+      bottom: 0rpx;
+	  padding-top: 15rpx;
       .send-goods {
-       height: 78rpx;
-       margin: 0 32rpx;
-       font-weight: 400;
-       font-size: 30rpx;
-       color: #FFFFFF;
-       display: flex;
-       justify-content: center;
-       align-items: center;
+        height: 78rpx;
+        margin: 0 32rpx;
+        font-weight: 400;
+        font-size: 30rpx;
+        color: #ffffff;
+        display: flex;
+        justify-content: center;
+        align-items: center;
       }
     }
   }
@@ -191,27 +238,27 @@ page {
   padding: 0 26rpx;
 }
 .title {
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 400;
-      font-size: 28rpx;
-      color: #999999;
-    }
-    .upop {
-      display: flex;
-      width: 100%;
-      align-items: center;
-      justify-content: flex-end;
-      image {
-        width: 30rpx;
-        height: 30rpx;
-        margin-left: 5rpx;
-      }
-      .image-box {
-        width: 40rpx;
-        height: 38rpx;
-      }
-    }
-	.xcv{
-		flex:1;
-	}
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  font-size: 28rpx;
+  color: #999999;
+}
+.upop {
+  display: flex;
+  width: 100%;
+  align-items: center;
+  justify-content: flex-end;
+  image {
+    width: 30rpx;
+    height: 30rpx;
+    margin-left: 5rpx;
+  }
+  .image-box {
+    width: 40rpx;
+    height: 38rpx;
+  }
+}
+.xcv {
+  flex: 1;
+}
 </style>

shop/components/headers/headers.vue

@@ -68,7 +68,7 @@ export default {
       &-icon {
         width: 36rpx;
         height: 36rpx;
-        margin-top: 2rpx;
+        margin-top: 5rpx;
 
         image {
           width: 100%;