feat:订单管理

shop/commodity/components/fillLogisticsInfo.vue

@@ -18,26 +18,43 @@
 				物流公司
 			</view>
 			<view class="form_item--right">
-				<view class="upop">
-					<view class="title xcv">请选择物流公司</view>
+				<view class="upop" @click="handleSelect">
+					<view class="title xcv">{{logistics}}</view>
 					<image src="/static/images/new_ui/arrow-right.png" mode=""></image>
 				</view>
 			</view>
 			</view>
 		 </view>
+		 <popupSelectVue ref="popup" :value.sync="logisticsValue" @tabs="handleClick"/>
 	</view>
 </template>
 
 <script>
+	import popupSelectVue from './popupSelect.vue';
 	export default {
+		components:{popupSelectVue},
 		data() {
 			return {
-				
+				logisticsValue:"",//物流
+				logisticsLabel:""
 			}
 		},
 		methods: {
 			handleQrcode(){
 				console.log("")
+			},
+			handleSelect(){
+				this.$refs.popup.open()
+			},
+			handleClick({selected,item,index}){
+				this.logisticsValue = selected
+				this.logisticsLabel = item.text
+				console.log(selected,item,index)
+			}
+		},
+		computed:{
+			logistics(){
+				return this.logisticsLabel || "请选择物流公司"
 			}
 		}
 	}

shop/commodity/components/orderDetailSendCard.vue

@@ -108,6 +108,7 @@
      }
 	 .detail-send-order-content-middle{
 		 height: 100%;
+		 flex: 1;
 		 &-top{
 		 	width: 100%;
 		 	font-weight: 400;

shop/commodity/components/orderList/orderListCard.vue

@@ -261,7 +261,7 @@
 		}
 	.order-list-content-middle{
 		height: 100%;
-		width: calc(100% - 158rpx - 23.6%);
+		flex: 1;
 		
 		&-top{
 			// width:100%;
@@ -271,13 +271,15 @@
 			font-size: 28rpx;
 			color: #333333;
 			text-align: left;
-			overflow: hidden;
-            white-space: nowrap;
-			text-overflow: ellipsis;
-			line-height: 28rpx;
-			padding-bottom: 10rpx;
+		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;

shop/commodity/components/popupSelect.vue

@@ -0,0 +1,183 @@
+<template>
+  <uni-popup ref="popup" type="center" :animation="true" :mask-click="false">
+    <view class="popup_data">
+      <view class="popup_data__headers">
+        <view class="popup_data__headers--title">{{ title }}</view>
+        <uni-icons
+          type="closeempty"
+          class="custom_icons"
+          size="30"
+          @click="handleClose"
+        ></uni-icons>
+      </view>
+
+      <view class="popup_data__content">
+        <view
+          v-for="(item, index) in selectData"
+          :key="index + '_index_'"
+          class="popup_data__content--list"
+          @click="handleTabs(item, index)"
+        >
+          <view class="popup_data__content--item">
+            <uni-icons
+              type="checkmarkempty"
+			  :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>
+          </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 [
+  { 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 {
+      selectId: ""
+    };
+  },
+  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)
+		console.log(this.selectId,"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.popup.open(type);
+    },
+    close() {
+      this.$refs.popup.close();
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.popup_data {
+  padding: 26rpx 30rpx;
+  min-height: 550rpx;
+  max-height: 650rpx;
+  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: 540rpx;
+    overflow-y: auto;
+    &--list {
+      user-select: none;
+	  border-bottom: 2rpx solid #e5e5e5;
+	  &:last-child{
+	  		  border-bottom:none;
+	  }
+    }
+    &--item {
+      display: flex;
+      gap: 20rpx;
+      padding: 20rpx 0;
+     
+      ._select_icons {
+        color: #eee !important;
+      }
+      &__title {
+      }
+    }
+    .isActive {
+      color: #007aff !important;
+    }
+  }
+}
+</style>

shop/commodity/components/search/search.vue

@@ -42,15 +42,15 @@
 		  width: 32rpx;
 		  height: 32rpx;
 		  left:40rpx;
-		  top:28rpx;
+		  top:18rpx;
 	}
 	.search__input{
 		border:2rpx solid #000;
 		flex:1;
-		height: 80rpx;
+		height: 60rpx;
 		margin-left:26rpx;
 		padding: 0 120rpx 0 55rpx;
-		border-radius: 40rpx 0 0 40rpx;
+		border-radius: 30rpx;
 		margin-right: 20rpx;
 		border: none;
 			background: #F8F8F8;
@@ -74,12 +74,13 @@
 		position: absolute;
 		right:20rpx;
 		width: 108rpx;
+		height: 60rpx;
+		white-space: nowrap;
 		 background-color: rgba(31, 124, 255, 1);
-		  border-radius: 30px;
-		   overflow-wrap: break-word;
+		border-radius: 30rpx;
 		   text-align: center;
 		    font-size: 28rpx;
-			 line-height: 40px;
+			 line-height:60rpx;
 			 color: rgba(255, 255, 255, 1);
 			 
 	}

shop/commodity/components/shipmentGoodsCard.vue

@@ -5,6 +5,7 @@
 	   <view class="card-wrapper__address">
 		   北京市通州区经开壹中心14号楼9层北京市通州区经开壹中心14号楼9层
 	   </view>
+	   
 	   <view class="card-wrapper__user">
 		   <view class="card-wrapper__user--info">
 		   	<view class="">

shop/commodity/order.vue

@@ -253,19 +253,19 @@
 			left: 0;
 			z-index: 111;
 			width: 100%;
-			height: 176rpx;
+			// height: 176rpx;
 			background: #FFFFFF;
 			display: flex;
-			// justify-content: center;
 			padding-left:20rpx;
-
+            white-space: nowrap;
 			.order-header-text {
 				width: 686rpx;
 				font-size: 36rpx;
 				font-weight: 500;
 				color: #333333;
 				display: flex;
-				margin-top: 107rpx;
+				// margin-top: 107rpx;
+				padding:30rpx 0 20rpx;
 				align-items: center;
 
 				.order-header-text-neishi {
@@ -296,7 +296,7 @@
 			align-items: center;
 		}
 		.order-list-filter-wrapper{
-			margin: 176rpx 0rpx 0rpx;
+			margin: 96rpx 0rpx 0rpx;
 			width: 100%;
 			position: fixed;
 			top:0rpx;
@@ -320,7 +320,7 @@
 			display: flex;
 			flex-direction: column;
 			align-items: center;
-			margin-top: 415rpx;
+			margin-top: 340rpx;
             .order-list__card{
 				width: calc(100% - 40rpx);
 				margin:0 20rpx 26rpx;

shop/commodity/sendoutgoods.vue

@@ -16,7 +16,7 @@
 		<view class="order-send-out-goods__content">
 			<shipmentGoodsCardVue />
 			<orderDetailSendCardVue class="custom_class"/>
-			<fillLogisticsInfoVue class="custom_class"/>
+			<fillLogisticsInfoVue class="custom_class" />
 			<view class="btn-box">
 			  <button type="primary" class="send-goods">发货</button>
 			</view>
@@ -71,19 +71,20 @@
 			left: 0;
 			z-index: 111;
 			width: 100%;
-			height: 176rpx;
+			// height: 176rpx;
 			background: #FFFFFF;
 			display: flex;
 			// justify-content: center;
-			padding-left:20rpx;
-		
+			// padding-left:20rpx;
+		    white-space: nowrap;
 			&-text {
 				width: 686rpx;
 				font-size: 36rpx;
 				font-weight: 500;
 				color: #333333;
 				display: flex;
-				margin-top: 107rpx;
+				// margin-top: 107rpx;
+				padding:30rpx 0 20rpx;
 				align-items: center;
 		
 				&-neishi {
@@ -108,7 +109,7 @@
 	
 	&__content{
 		width: 100%;
-		margin: 190rpx 0 50rpx;
+		margin: 130rpx 0 50rpx;
 		.btn-box{
 			width: 100%;
 			position: fixed;