新增useringo

shop/commodity/components/deliveryManModules/addSelectUser.vue

@@ -0,0 +1,272 @@
+<template>
+	<uni-popup ref="popup" type="center" :animation="true" :is-mask-click="false" class="popup-conter">
+	
+	
+	
+		<view class="popup_data__user">
+	
+	
+	
+			<view class="popup_data__user__headers">
+	
+	
+	
+				<image src="/static/images/new_ui/delivery_man_dialog.png" mode="" class="image-box"></image>
+	
+	
+	
+				<view class="title">
+	
+	
+	
+					{{ title }}
+	
+	
+	
+				</view>
+	
+	
+	
+			</view>
+	
+	
+	
+			<view class="popup_data__user__content">
+	
+	
+	
+				<view class="form-list">
+	
+	
+	
+					<view class="form-list__item">
+	
+	
+	
+						<view class="form-list__item--label">姓 名 </view>
+	
+	
+	
+						<view class="form-list__item--value">
+	
+	
+	
+							<input placeholder="请输入送货人姓名" :class="['input__custom',isUserName?'ishasValue':'']" v-model="user_name"></input>
+	
+	
+	
+						</view>
+	
+	
+	
+					</view>
+	
+	
+	
+					<view class="form-list__item">
+	
+	
+	
+						<view class="form-list__item--label">手机号</view>
+	
+	
+	
+						<view class="form-list__item--value">
+	
+	
+	
+							<input placeholder="请输入11位手机号" type="tel" :class="['input__custom',isPhoneValue?'ishasValue':'']" v-model="user_phone"></input>
+	
+	
+	
+						</view>
+	
+	
+	
+					</view>
+	
+	
+	
+					<view class="form-list__item" :class="[(isPhoneValue && isUserName) ?'isActiveBtn':'']">
+	
+						<view class="form-list__item--btn">提交</view>
+	
+					</view>
+	
+					<view class="form-list__item no-bg" @click="handleClose">
+	
+						<view class="form-list__item--text">取消</view>
+	
+					</view>
+	
+				</view>
+	
+	
+	
+			</view>
+	
+	
+	
+		</view>
+	
+	
+	
+	</uni-popup>
+</template>
+
+<script>
+export default {
+  props: {
+    title: {
+      type: String,
+      default: "添加送货人",
+    },
+  },
+  data() {
+    return {
+      user_name: "",
+      user_phone: "",
+    };
+  },
+  methods: {
+    handleClose() {
+      this.user_name = "";
+      this.user_phone = "";
+      this.close();
+    },
+    open(type = "center") {
+      this.$refs.popup.open(type);
+    },
+    close() {
+      this.$refs.popup.close();
+    },
+    setDataValue(val) {
+      this.user_name = val.user_name;
+      this.user_phone = val.user_phone;
+    },
+  },
+  computed: {
+    isPhoneValue() {
+      const phone = this.user_phone || "";
+      if (String(phone).trim()) {
+        return true;
+      }
+      return false;
+    },
+    isUserName() {
+      const phone = this.user_name || "";
+      if (String(phone).trim()) {
+        return true;
+      }
+
+      return false;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.popup-conter {
+  width: 100%;
+  /deep/.uni-popup__wrapper {
+    width: 100% !important;
+  }
+}
+
+.popup_data__user {
+  height: 598rpx; // width: 616rpx;
+  margin: 0 67rpx;
+  background: #ffffff;
+  border-radius: 16rpx;
+  &__headers {
+    position: relative;
+    width: 100%;
+    height: 136rpx;
+    .image-box {
+      width: 100%;
+      height: 100%;
+      border-radius: 16rpx 16rpx 0 0;
+    }
+    .title {
+      width: 100%;
+      height: 100%;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      position: absolute;
+      font-family: PingFangSC, PingFang SC;
+      font-weight: 600;
+      font-size: 32rpx;
+      top: 0;
+      left: 0;
+      color: #333333;
+    }
+  }
+  &__content {
+    padding: 24rpx 36rpx 35rpx 36rpx;
+    height: calc(100% - 210rpx);
+    .form-list {
+      &__item {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        width: 100%;
+        height: 86rpx;
+        background: #f5f7f9;
+        border-radius: 12rpx;
+        margin-bottom: 26rpx;
+        &.isActiveBtn {
+          background: #1f7cff !important;
+          transition: all 600ms;
+          .form-list__item--btn {
+            color: #ffffff !important;
+          }
+        }
+        &.no-bg {
+          background: none !important;
+          margin-bottom: 0 !important;
+        }
+        &--label {
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          width: 160rpx;
+          height: 100%;
+          font-weight: 400;
+          font-size: 30rpx;
+          color: #666666;
+        }
+        &--value {
+          flex: 1;
+          display: flex;
+          align-items: center;
+          height: 100%;
+          .input__custom {
+            height: 100%;
+            width: 100%;
+            font-weight: 400;
+            font-size: 30rpx;
+            color: #666666;
+            padding: 0 16rpx;
+          }
+          .ishasValue {
+            color: #333333;
+          }
+        }
+        &--btn,
+        &--text {
+          user-select: none;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          width: 100%;
+          height: 100%;
+          font-weight: 400;
+          font-size: 30rpx;
+          color: #333333;
+        }
+      }
+    }
+  }
+}
+</style>

shop/commodity/components/deliveryManModules/deliveryManEmpty.vue

@@ -0,0 +1,44 @@
+<template>
+  <view class="flex-col--empty">
+    <image class="image_wrapper" src="/static/images/new_ui/empty_user.png" />
+    <view class="text_tilte">{{ title }}</view>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    title: {
+      type: String,
+      default: "暂无送货人员",
+    },
+  },
+  data() {
+    return {};
+  },
+};
+</script>
+
+<style lang="scss">
+.flex-col--empty {
+  user-select: none;
+  text-align: center;
+  width: 100%;
+  position: absolute;
+  top: 30%;
+
+  .text_tilte {
+    font-family: PingFangSC, PingFang SC;
+    font-weight: 400;
+    font-size: 30rpx;
+    color: #333333;
+    line-height: 30rpx;
+    text-align: center;
+    font-style: normal;
+  }
+  .image_wrapper {
+    width: 327px;
+    height: 257px;
+  }
+}
+</style>

shop/commodity/components/popupSelect.vue

@@ -1,5 +1,5 @@
 <template>
-  <uni-popup ref="popup" type="center" :animation="true" :mask-click="false">
+  <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">{{ title }}</view>

shop/commodity/deliveryman.vue

@@ -1,19 +1,234 @@
 <template>
 	<view class="delivery-man">
-		选择送货人
+		 <headersVue @headerJump="topgi" header-title="选择送货人"></headersVue>
+	 <view class="delivery-man__content">
+		 <view class="delivery-man__list" v-if="userData.length===0">
+			 <view class="delivery-man__list--top">
+		    <template v-for="index in 5">
+				<view class="delivery-man__list--top-item">
+				<view class="delivery-man__list--top-item--left">
+					<label class="radio">
+					<radio value="1" checked="true" />
+					<text>配送人姓名1</text>
+					</label>
+				</view>
+				<view class="delivery-man__list--top-item--middle">
+					<view class="user-phone">
+						15000000000
+					</view>
+					</view>
+				
+				<view class="delivery-man__list--top-item--right">
+				 
+				  <view class="user-icon">
+				  	<uni-icons type="compose" size="28" @click="handleAddUser('edit',index)"></uni-icons>
+				  	<uni-icons type="trash" size="28"></uni-icons>
+
+				  </view>
+				</view>
+				</view>
+			</template>
+						
+			 </view>
+			 <view class="delivery-man__list--bottom">
+			 			<view class="btn-list">
+							<button
+							 @click="handleAddUser('add')"
+							  class="btn-default"
+							>
+							 添加送货人
+							</button>
+							<button
+							  type="primary"
+							  class="btn-primary"
+							  @click="handleConfirm"
+							>
+							确  认
+							</button>
+			 				
+			 			</view>
+			 </view>
+		 </view>
+		<view class="empty__info" v-else>
+			<deliveryManEmptyVue />
+			<view class="delivery-man_btn">
+				<button
+				  type="primary"
+				  class="elivery-man_btn-item"
+				  @click="handleAddUser('add')"
+				>
+				 添加送货人
+				</button>
+			</view>
+		</view>
+		</view>
+		<addSelectUserVue ref="addUserRefs"/>
 	</view>
 </template>
 
 <script>
+	import headersVue from "../components/headers/headers.vue";
+	import addSelectUserVue from "./components/deliveryManModules/addSelectUser.vue";
+	import deliveryManEmptyVue from "./components/deliveryManModules/deliveryManEmpty.vue";
+	import {copy,toQueryString} from "@/utils/index.js"
 	export default {
+		components:{headersVue,deliveryManEmptyVue,addSelectUserVue},
 		data() {
 			return {
-				
+				indexs: "",
+				status: "",
+				order_id: "", //订单ID
+				goodsCustomType:"",
+				userData:[]
 			};
+		},
+		onLoad(e) {
+		  this.order_id = e.order_id;
+		  this.indexs = e.indexs;
+		  this.status = e.status;
+		  this.goodsCustomType = e.goodsCustomType;
+		},
+		methods:{
+			handleConfirm(){
+				console.log("选择确定")
+			},
+			handleAddUser(type,index){
+				if(type === 'add'){
+					this.$refs.addUserRefs.open()
+				}else{//编辑
+				this.$refs.addUserRefs.setDataValue({
+					user_name:'佛系少年'+index,
+					user_phone:"99995231231313"
+				})
+					this.$refs.addUserRefs.open()
+				}
+				
+			},
+			topgi(){
+				const urlParams = {
+					status:this.status,
+					index:this.indexs,
+					goodsCustomType:this.goodsCustomType,
+					order_id:this.order_id
+				}
+				const url = toQueryString(urlParams)
+				uni.redirectTo({
+				  url:`./sendoutgoods?${url}`,
+				});
+			}
 		}
 	}
 </script>
-
+<style>
+page {
+  background-color: #f7f8fc;
+  height: 100%;
+}
+</style>
 <style lang="scss">
-
+.delivery-man{
+	width: 100%;
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	&__content {
+	  width: 100%;
+	   margin: 95rpx 0 0rpx;
+	   height: calc(100% - 0rpx);
+	   overflow:hidden;
+	   .delivery-man__list{
+		   box-sizing: border-box;
+		   background: #FFFFFF;
+		   height: calc(100% - 0rpx);
+		  
+		   display: flex;
+		   flex-direction: column;
+		    justify-content: space-between;
+		   &--top{
+			  overflow-y: auto;
+			   // border:2rpx solid #f00;
+			   flex-shrink: 0;
+			    flex:1;
+				padding:10rpx 32rpx 30rpx;
+				&-item{
+					padding: 26rpx 0;
+					border-bottom: 2rpx solid  #E5E5E5;
+					display: flex;
+					justify-content: flex-start;
+					&:last-child{
+						border-bottom: none;
+					}
+					&--left{
+						flex: 0 0 35%;
+					}
+					&--middle{
+						flex: 1;
+					display: flex;
+					align-items: center;
+					justify-content: flex-end;
+					flex-wrap: wrap;
+					padding:0 15rpx;
+						.user-phone{
+							word-break:break-all;
+							word-wrap: break-word;
+						}
+					}
+					&--right{
+						width: 90rpx;
+                        
+						.user-icon{
+							display: flex;
+							align-items: center;
+							justify-content: flex-end;
+						}
+					}
+				}
+		   }
+		   &--bottom{
+				 height: 120rpx;
+				 flex-shrink: 0;
+				 
+			   .btn-list{
+				   user-select: none;
+				   display: flex;
+				   padding: 10rpx 26rpx 0;
+				    gap:26rpx;
+				   
+			   }
+			 
+				.btn-default,.btn-primary{
+					height: 78rpx;
+					flex:1;
+					font-weight: 400;
+					font-size: 30rpx;
+					border-radius: 8rpx;
+				}
+				.btn-default{
+					color: #333333;
+				}
+				.btn-primary{
+					color: #FFFFFF;
+				}
+		   }
+	   }
+	  .delivery-man_btn {
+	    width: 100%;
+	    position: fixed;
+	    bottom: 0rpx;
+		height: 160rpx;
+		background: #FFFFFF;
+	    .elivery-man_btn-item{
+			height: 78rpx;
+			margin: 10rpx 32rpx 0;
+			font-weight: 400;
+			font-size: 30rpx;
+			color: #FFFFFF;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+	  }
+	}
+}
 </style>

shop/commodity/sendoutgoods.vue

@@ -25,7 +25,7 @@
 		:selectData="selectData"
 		@click-tabs="clickTabs"
 		>
-		<view class="upop" slot="right">
+		<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>
@@ -58,7 +58,7 @@ 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} from "@/utils/index.js"
+import {copy,toQueryString} from "@/utils/index.js"
 export default {
   components: {
     shipmentGoodsCardVue,
@@ -119,11 +119,29 @@ export default {
 		  copy(val)
 	  },
     topgi() {
+		const url = toQueryString({
+			status:this.status,
+			index:this.indexs,
+			// goodsCustomType:this.goodsCustomType
+		})
       uni.redirectTo({
-        url: "./order?status=" + this.status + "&index=" + this.indexs,
-        // url: './order'
+        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)
 	}
@@ -151,7 +169,14 @@ page {
 
       bottom: 30rpx;
       .send-goods {
-        margin: 0 32rpx;
+       height: 78rpx;
+       margin: 0 32rpx;
+       font-weight: 400;
+       font-size: 30rpx;
+       color: #FFFFFF;
+       display: flex;
+       justify-content: center;
+       align-items: center;
       }
     }
   }

shop/components/emptyData/emptyData.vue

@@ -4,7 +4,7 @@
 	        class="image_wrapper"
 	        src="/static/images/new_ui/empty_data.png"
 	      />
-	      <text class="text_tilte">{{title}}</text>
+	      <view class="text_tilte">{{title}}</view>
 	    </view>
 </template>
 
@@ -27,11 +27,10 @@
 <style lang="scss">
 .flex-col{
 	user-select: none;
+	text-align: center;
+	width:100%;
 	position: absolute;
-	top:50%;
-	margin-top: -30%;
-	display: flex;
-	flex-direction: column;
+	top:30%;
 	.text_tilte{
 		font-family: PingFangSC, PingFang SC;
 		font-weight: 400;

shop/components/headers/headers.vue

@@ -1,81 +1,82 @@
 <template>
-		<view class="common-header">
-			<view class="common-header-text">
-				<view class="common-header-text-neishi" @click="topgi">
-					<view class="common-header-text-neishi-icon">
-						<image src="https://cdn.bjtdba.com/vod/image/2022-08-11/20220811133828415.png" mode="widthFix">
-						</image>
-					</view>
-				</view>
-				<view class="common-header-text-title">
-					{{headerTitle}}
-				</view>
-			</view>
-		</view>
+  <view class="common-header">
+    <view class="common-header-text">
+      <view class="common-header-text-neishi" @click="topgi">
+        <view class="common-header-text-neishi-icon">
+          <image
+            src="https://cdn.bjtdba.com/vod/image/2022-08-11/20220811133828415.png"
+            mode="widthFix"
+          >
+          </image>
+        </view>
+      </view>
+      <view class="common-header-text-title">
+        {{ headerTitle }}
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
-	export default {
-		props:{
-			headerTitle:{
-				type:String,
-				default:"发货"
-			}
-		},
-		data() {
-			return {
-				
-			};
-		},
-		methods:{
-			topgi(){
-				this.$emit("headerJump")
-			}
-		}
-	}
+export default {
+  props: {
+    headerTitle: {
+      type: String,
+      default: "发货",
+    },
+  },
+  data() {
+    return {};
+  },
+  methods: {
+    topgi() {
+      this.$emit("headerJump");
+    },
+  },
+};
 </script>
 
 <style lang="scss">
-		// 头部 start 
-		.common-header {
-			position: fixed;
-			top: 0;
-			left: 0;
-			z-index: 111;
-			width: 100%;
-			// height: 176rpx;
-			background: #FFFFFF;
-			display: flex;
-			// justify-content: center;
-			padding-left:20rpx;
-		    white-space: nowrap;
-			&-text {
-				width: 686rpx;
-				font-size: 36rpx;
-				font-weight: 500;
-				color: #333333;
-				display: flex;
-				// margin-top: 107rpx;
-				padding:30rpx 0 20rpx;
-				align-items: center;
-		
-				&-neishi {
-					width: 45rpx;
-					height: 45rpx;
-					margin-right: 10rpx;
-		
-					&-icon {
-						width: 36rpx;
-						height: 36rpx;
-						margin-top: 2rpx;
-		
-						image {
-							width: 100%;
-							height: 100%;
-						}
-					}
-				}
-			}
-		}
-	   // 头部 end
+// 头部 start
+.common-header {
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 111;
+  width: 100%;
+  // height: 176rpx;
+  background: #ffffff;
+  display: flex;
+  // justify-content: center;
+  padding-left: 20rpx;
+  white-space: nowrap;
+  &-text {
+    width: 686rpx;
+    font-size: 36rpx;
+    font-weight: 500;
+    color: #333333;
+    display: flex;
+    // margin-top: 107rpx;
+    padding: 30rpx 0 20rpx;
+    align-items: center;
+
+    &-neishi {
+      width: 45rpx;
+      height: 45rpx;
+      margin-right: 10rpx;
+
+      &-icon {
+        width: 36rpx;
+        height: 36rpx;
+        margin-top: 2rpx;
+
+        image {
+          width: 100%;
+          height: 100%;
+        }
+      }
+    }
+  }
+}
+// 头部 end
 </style>

utils/index.js

@@ -112,4 +112,30 @@ const maskedData = {
 	idCard: MaskRules.idCard(sensitiveData.idCard), // 110101********7654
 	bankCard: MaskRules.bankCard(sensitiveData.bankCard), // 622588******5321
 	name: MaskRules.name(sensitiveData.name) // 张*丰
+}
+
+
+/**
+ * 对象转查询字符串
+ * @param {object} params - 输入对象
+ * @param {boolean} [encode=true] - 是否进行URL编码
+ * @returns {string} 转换后的字符串
+ */
+export  function toQueryString(params, encode = true) {
+  const processValue = (value) => {
+    if (value === null || value === undefined) return ''
+    if (Array.isArray(value)) return value.join(',')
+    if (typeof value === 'object') return JSON.stringify(value)
+    return String(value)
+  }
+
+  return Object.entries(params)
+    .filter(([_, value]) => value !== null && value !== undefined)
+    .map(([key, value]) => {
+      const processed = processValue(value)
+      return encode ? 
+        `${encodeURIComponent(key)}=${encodeURIComponent(processed)}` :
+        `${key}=${processed}`
+    })
+    .join('&')
 }