fix:新增和修复选择bug

pages.json

@@ -197,6 +197,13 @@
                 	"style" : {
                 		 "navigationStyle" : "custom"
                 	}
+                },
+                {
+                	"path" : "commodity/logisticsInformation",
+                	"style" : 
+                	{
+                		 "navigationStyle" : "custom"
+                	}
                 }
             ]
         },

shop/commodity/components/fillLogisticsInfo.vue

@@ -31,6 +31,17 @@ export default {
   methods: {
     handleQrcode() {
       console.log("handleQrcode");
+      uni.showModal({
+        title: "提示",
+        content: "扫码功能快马加鞭开发中....",
+        success(res) {
+          if (res.confirm) {
+            console.log("用户点击了确定");
+          } else if (res.cancel) {
+            console.log("用户点击了取消");
+          }
+        },
+      });
     },
     changeInput(val) {
       console.log(val, "物流单号");
@@ -56,7 +67,7 @@ export default {
 .logistics-information {
   background: #ffffff;
   border-radius: 16rpx;
-  padding: 26rpx 21rpx 10rpx 32rpx;
+  padding: 26rpx 21rpx 0rpx 32rpx;
   display: flex;
   flex-direction: column;
   &__text {

shop/commodity/components/popupSelect.vue

@@ -104,8 +104,7 @@ export default {
 			this.selectId = item.value || index
 		}
 		this.$emit("update:value",this.selectId)
-		console.log(this.selectId,"this.selectId")
-		const itemObj = this.selectId?item:{}
+		const itemObj = this.selectId !==''?item:{}
 		this.$emit("tabs",{selected:this.selectId,item:itemObj,index})
 		this.handleClose()
 		

shop/commodity/components/popupSelectItem/popupSelectItem.vue

@@ -2,7 +2,10 @@
       <view class="form_item">
         <view class="form_item--left"> {{name}} </view>
         <view class="form_item--right">
-          <view class="upop" @click="handleSelect">
+		<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>

shop/commodity/components/shipmentGoodsCard.vue

@@ -3,46 +3,70 @@
 	<view class="card-wrapper">
 	   <view class="card-wrapper__text">{{title}}</view>
 	   <view class="card-wrapper__address">
-		   北京市通州区经开壹中心14号楼9层北京市通州区经开壹中心14号楼9层
+		   {{address}}
 	   </view>
 	   
 	   <view class="card-wrapper__user">
 		   <view class="card-wrapper__user--info">
 		   	<view class="">
-		   		郭郭备份
+		   		{{userInfo}}
 		   	</view>
 		   		 <text class="user_phone" >
-		   		 	{{user_phone.substr(0, 3) + '****' + user_phone.substr(7)}}
+		   		 	{{phone_user}}
 		   		 </text>
 		   </view>
-		   <view class="card-wrapper__user--btn">
-		    <image src="/static/images/new_ui/look.png" ></image>
+		   <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 {
-				showDetailInfo:false,
-				user_phone:"18533332222"
+				showPhone:false,
 			};
 		},
 		methods:{
+			handleLooks(){
+				this.showPhone = !this.showPhone
+			}
 			
-			changeDetailInfo(){
-				this.showDetailInfo = !this.showDetailInfo
+		},
+	  computed: {
+	  	phone_user() {
+			if(this.showPhone){
+				return this.phone
+			}else{
+				return MaskRules.mobile(this.phone)
 			}
 			
-		}
+	  	}
+	  },
+		
 	}
 </script>
 
@@ -99,4 +123,7 @@
 		}
 	}
 }
+
+
+
 </style>

shop/commodity/logisticsInformation.vue

@@ -0,0 +1,19 @@
+<template>
+	<view>
+		物流信息详情
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

shop/commodity/sendoutgoods.vue

@@ -12,10 +12,10 @@
         v-if="goodsCustomType === 'pickup'"
         class="inputInfo"
       ></reInputItemVue>
-	  <reInputItemVue
+<!-- 	  <reInputItemVue
 	    v-if="goodsCustomType === 'pickup'"
 	    class="inputInfo"
-	  ></reInputItemVue>
+	  ></reInputItemVue> -->
 	  <popupSelectItemVue  
 	  v-if="goodsCustomType === 'deliverGoods'"
 	    class="inputInfo"
@@ -24,7 +24,12 @@
 		title="送货人员信息"
 		:selectData="selectData"
 		@click-tabs="clickTabs"
-		></popupSelectItemVue>
+		>
+		<view class="upop" slot="right">
+			<view class="title xcv">{{ deliveryMan }}</view>
+			<image src="/static/images/new_ui/arrow-right.png" mode=""></image>
+		</view>
+		</popupSelectItemVue>
       <view class="btn-box">
         <button
           type="primary"
@@ -37,6 +42,7 @@
           type="primary"
           class="send-goods"
           v-if="goodsCustomType === 'pickup'"
+		  @click="copyHandle('请选择送货人员请选择送货人员请选择送货人员121212copy')"
         >
           自提
         </button>
@@ -52,6 +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"
 export default {
   components: {
     shipmentGoodsCardVue,
@@ -96,6 +103,7 @@ export default {
         sendGoods: "发货商品",
         pickup: "自提商品",
       },
+	  deliveryMan:"请选择送货人员"
     };
   },
   onLoad(e) {
@@ -107,6 +115,9 @@ export default {
     this.shipmentGoodsTitle = this.shipmentGoodsTitleMap[this.goodsCustomType];
   },
   methods: {
+	  copyHandle(val){
+		  copy(val)
+	  },
     topgi() {
       uni.redirectTo({
         url: "./order?status=" + this.status + "&index=" + this.indexs,
@@ -154,4 +165,28 @@ page {
   margin-top: 26rpx;
   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;
+	}
 </style>

utils/index.js

@@ -0,0 +1,115 @@
+/**
+ * 复制文本到剪贴板
+ * @param {string} text 需要复制的文本
+ * @returns {Promise<boolean>} 是否复制成功
+ */
+function copyToClipboard(text) {
+	// 现代浏览器方案 (推荐)
+	if (navigator.clipboard && window.isSecureContext) {
+		return navigator.clipboard.writeText(text)
+			.then(() => true)
+			.catch(() => false);
+	}
+
+	// 传统浏览器兼容方案
+	return new Promise((resolve) => {
+		try {
+			// 创建临时文本域
+			const textarea = document.createElement('textarea');
+			textarea.value = text;
+			textarea.style.position = 'fixed'; // 防止滚动
+			textarea.style.opacity = '0'; // 透明化
+			document.body.appendChild(textarea);
+
+			// 选中内容 (兼容iOS)
+			if (navigator.userAgent.match(/ipad|ipod|iphone/i)) {
+				const range = document.createRange();
+				range.selectNodeContents(textarea);
+				const selection = window.getSelection();
+				selection.removeAllRanges();
+				selection.addRange(range);
+				textarea.setSelectionRange(0, 999999);
+			} else {
+				textarea.select();
+			}
+
+			// 执行复制命令
+			const success = document.execCommand('copy');
+			document.body.removeChild(textarea);
+			resolve(success);
+		} catch (err) {
+			resolve(false);
+		}
+	});
+}
+
+export async function copy(value) {
+	const success = await copyToClipboard(value);
+	if (success) {
+		uni.showToast({ //提示
+			title: '复制成功'
+		})
+	} else {
+		uni.showToast({ //提示
+			title: '复制失败',
+
+		})
+	}
+}
+
+
+/**
+ * 通用数据脱敏函数
+ * @param {string} str 原始字符串
+ * @param {number} start 脱敏起始位置(从0开始)
+ * @param {number} end 脱敏结束位置(不包含)
+ * @param {string} mask 替换字符(默认*)
+ * @returns {string} 脱敏后的字符串
+ */
+export function dataMasking(str, start = 0, end = 0, mask = '*') {
+	if (!str || typeof str !== 'string') return str
+	if (start >= end) return str
+
+	const head = str.slice(0, start)
+	const tail = str.slice(end)
+	const masked = mask.repeat(end - start)
+	return head + masked + tail
+}
+
+// 常用预定义规则
+export const MaskRules = {
+	// 手机号脱敏(显示前3后4)
+	mobile: (str) => dataMasking(str, 3, 7),
+
+	// 身份证号脱敏(显示前6后4)
+	idCard: (str) => {
+		if (str.length === 18) return dataMasking(str, 6, 14)
+		if (str.length === 15) return dataMasking(str, 6, 12)
+		return str
+	},
+
+	// 银行卡号脱敏(显示前6后4)
+	bankCard: (str) => dataMasking(str, 6, str.length - 4),
+
+	// 姓名脱敏(张三 → 张*，欧阳修 → 欧**)
+	name: (str) => {
+		if (str.length <= 1) return str
+		return dataMasking(str, 1, str.length - 1)
+	}
+}
+
+// 使用示例
+const sensitiveData = {
+	mobile: '13812345678',
+	idCard: '110101199003077654',
+	bankCard: '6225880136745321',
+	name: '张三丰'
+}
+
+// 脱敏处理
+const maskedData = {
+	mobile: MaskRules.mobile(sensitiveData.mobile), // 138****5678
+	idCard: MaskRules.idCard(sensitiveData.idCard), // 110101********7654
+	bankCard: MaskRules.bankCard(sensitiveData.bankCard), // 622588******5321
+	name: MaskRules.name(sensitiveData.name) // 张*丰
+}