我的+派件签收

src/pages/components/HomePage.vue

@@ -37,7 +37,7 @@
 					</router-link>
 				</div>
 				<div class="icon-box">
-					<router-link to="Kjsearch">
+					<router-link to="SignA">
 						<div style="">
 							<img src="@/assets/user/u41.png" alt="">
 						</div>

src/pages/components/My.vue

@@ -1,5 +1,7 @@
 <template>
-    <div class="container">My</div>
+    <div class="container">
+        <div @click="qwe">123</div>
+    </div>
 </template>
 
 <script>
@@ -8,6 +10,11 @@ export default {
     data() {
         return {};
     },
+    methods:{
+        qwe() {
+            this.$router.push('My')
+        }
+    }
 
 };
 </script>

src/pages/components/Waitsent.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="container">
-        <van-search v-model="value" placeholder="请输入批次号" />
+        <van-search v-model="search" placeholder="请输入批次号" />
 
         <div class="batch">
             <div class="batch-top">
@@ -41,12 +41,13 @@
                     <van-field label="收件人" value="xxx" readonly />
                     <van-field label="楼层" value="xxx" readonly />
                     <van-field label="联系方式" value="xxx" readonly />
-                 
-                    <van-field readonly clickable name="picker" :value="value" label="签收类型" placeholder="点击签收类型"
-                        @click="showPicker = true" />
+
+                    <van-field readonly clickable name="picker" :value="selectedOption" label="签收类型"
+                        placeholder="点击签收类型" @click="showPicker = true" />
                     <van-popup v-model="showPicker" position="bottom">
-                        <van-picker show-toolbar :columns="columns" @confirm="onConfirm" @cancel="showPicker = false" />
+                        <van-picker show-toolbar  :columns="options" @confirm="onConfirm" @cancel="showPicker = false" />
                     </van-popup>
+                    <van-field v-if="wer == '他人签收'" v-model="qwe" label="代取手机号" placeholder="请输入代取手机号" />
                     <div style="margin: 16px;">
                         <van-button round block type="info" native-type="submit">签收完成</van-button>
                     </div>
@@ -64,29 +65,43 @@ export default {
     name: 'waitsent',
     data() {
         return {
-            value: '',
+            qwe:'',
+            search: '',
             receiving: false,//签收
             retention: false,//滞留
+            selectedOption: '', // 设置为空字符串，等待选择
             value: '',
-            columns: ['本人签收','他人签收'],
+            options: ['本人签收', '他人签收'],
             showPicker: false,
+            wer:'',
         };
     },
     methods: {
         // 签收
         onReceiving() {
             this.receiving = true;
+            this.selectedOption = this.options[0];
         },
         // 滞留
         onRetention() {
             this.retention = true;
         },
         onConfirm(value) {
-            this.value = value;
+            this.selectedOption = value;
             this.showPicker = false;
+            this.wer = value
+            console.log(value,'123')
         },
+        // 签收完成
+        onSubmit() {
+
+        }
     },
 
+    mounted() {
+        this.selectedOption = this.options[0]; // 默认选择第一个选项
+    }
+
 };
 </script>
 

src/pages/email.vue

@@ -2,7 +2,7 @@
 	<div>
 		<van-tabbar v-model="active">
 			<van-tabbar-item>首页</van-tabbar-item>
-			<van-tabbar-item>我的</van-tabbar-item>
+			<van-tabbar-item @click="my">我的</van-tabbar-item>
 		</van-tabbar>
 
 		<div v-if="this.active === 0">
@@ -29,6 +29,11 @@ export default {
 			active: 0,
 		}
 	},
+	methods: {
+		my() {
+			this.$router.push('My')
+		}
+	}
 }
 </script>
 

src/pages/my.vue

@@ -1,7 +1,6 @@
 <template>
 	<div class="body">
     <!-- 选择类型 -->
-    <back :title="titlename"></back>
     <div class="head">
 		<template v-if="headimgurl!=null&&headimgurl!=''">
 			<img :src="headimgurl" alt="">
@@ -9,7 +8,6 @@
 		<template v-else>
 			<img src="../assets/images/foot_icon1.png" alt="">
 		</template>
-
 		<div>
 			<p>姓名：{{user.NAME}}</p>
 			<p>{{user.PHONE}}</p>
@@ -20,34 +18,36 @@
       <router-link to="/Personinfomation">
         <img src="../assets/images/my_icon1.png" alt="">
         <span>账号信息</span>
-      </router-link>
-
-      <router-link to="/Forgetpassword">
-        <img src="../assets/images/my_icon6.png" alt="">
-        <span>修改密码</span>
       </router-link>
-    </div>
-
-    <div class="btn">
-    	<van-button color="#00c4b8" @click="loginout">退出登录</van-button>
+      <router-link to="/Forgetpassword">
+        <img src="../assets/images/my_icon6.png" alt="">
+        <span>修改密码</span>
+      </router-link>
     </div>
+    <div class="btn">
+    	<van-button color="#00c4b8" @click="loginout">退出登录</van-button>
+    </div>
+	<van-tabbar v-model="active">
+			<van-tabbar-item @click="my">首页</van-tabbar-item>
+			<van-tabbar-item >我的</van-tabbar-item>
+		</van-tabbar>
 	</div>
-
 </template>
 
 <script>
 export default {
     data() {
-      return {
+      return {
         titlename:"我的",
         userId:"",
         user:[],
-        headimgurl:''
+        headimgurl:'',
+		active: 1,
       };
     },
     created:function(){
 		this.isLogin();
-		this.userId = localStorage.getItem("userId");
+		this.userId = localStorage.getItem("userId");
     console.log('userId:'+ this.userId);
 		this.getUser();
 		this.headimgurl = localStorage.getItem('headimgurl');
@@ -58,7 +58,11 @@ export default {
 				localStorage.removeItem("userId");
 				localStorage.removeItem("openid");
 				window.location.href ='http://47.101.145.23/wuliu/ljy/';
-			}
+			},
+
+			my() {
+            this.$router.push('/')
+        }
     }
   };
 </script>
@@ -138,15 +142,15 @@ export default {
 		  position: absolute;
 		  right: .4rem;
 		  top: .4rem;
-	  }
+	  }
 
-    }
-    .btn{
-    	padding: 0px .37rem;
-    	button{
-    		width: 100%;
-    		color: white;
-    	}
+    }
+    .btn{
+    	padding: 0px .37rem;
+    	button{
+    		width: 100%;
+    		color: white;
+    	}
     }
   }
 </style>

src/pages/new/combine.vue

@@ -0,0 +1,61 @@
+<template>
+    <div class="container">
+        <div style="padding: 20px 0;">找到n个属于"xxx"&部门xxx&xxx的快件:</div>
+
+        <van-button style="margin-bottom: 10px;" type="info" size="mini" @click="toggleAll">{{ qwe === false ? '全选' :
+            '取消全选' }}</van-button>
+        <!-- <van-checkbox-group v-model="result" ref="checkboxGroup">
+            <van-checkbox name="a" shape="square">复选框 a</van-checkbox>
+        </van-checkbox-group> -->
+
+        <van-checkbox-group v-model="result" ref="checkboxGroup">
+
+            <van-checkbox style="margin-bottom: 10px;" name="a" shape="square">复选框 a</van-checkbox>
+            <van-checkbox style="margin-bottom: 10px;" name="b" shape="square">复选框 a</van-checkbox>
+            <van-checkbox style="margin-bottom: 10px;" name="c" shape="square">复选框 a</van-checkbox>
+            <van-checkbox style="margin-bottom: 10px;" name="b" shape="square">复选框 a</van-checkbox>
+            <van-checkbox style="margin-bottom: 10px;" name="d" shape="square">复选框 a</van-checkbox>
+        </van-checkbox-group>
+
+        <van-button style="height: 40px; width: 150px; border-radius: 8px; margin-right: 20px;" type="info" @click="sureSign">合并签收</van-button>
+        <van-button style="height: 40px; width: 150px; border-radius: 8px;" type="default" @click="back">返回上一级</van-button>
+
+
+    </div>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            result: [],
+            qwe: false
+        };
+    },
+    methods: {
+        toggleAll() {
+            this.$refs.checkboxGroup.toggleAll();
+            this.qwe = !this.qwe
+        },
+        // 返回
+        back() {
+            this.$router.push('SignA')
+        },
+        sureSign() {
+            this.$router.push('SureCombine')
+        }
+    },
+};
+</script>
+
+<style lang="less" scoped>
+* {
+    font-size: 16px;
+}
+
+.container {
+    margin: 20px 10px 0 10px;
+    background-color: #fff;
+    height: 640px;
+}
+</style>

src/pages/new/sign.vue

@@ -0,0 +1,45 @@
+<template>
+    <div class="container">
+        <van-search v-model="value" placeholder="请输入快件单号" />
+        <img @click="onImg" src="@/assets/user/u4.png" alt="">
+        <van-search v-model="phone" placeholder="请输入手机单号" />
+        <van-button style="width: 200px; border-radius: 6px; margin-left: 10px;" type="info" @click="check">查询</van-button>
+    </div>
+</template>
+
+<script>
+export default {
+    name: 'Sign',
+    data() {
+        return {
+            value: '',
+            phone:'',
+        };
+    },
+    methods: {
+        onImg() {
+            console.log('111')
+        },
+        // 查询
+        check() {
+            this.$router.push('Combine')
+        }
+    }
+
+};
+</script>
+
+<style lang="less" scoped>
+    .container {
+        margin: 20px 10px 0 10px;
+        background-color: #fff;
+        height: 640px;
+        img {
+            position: fixed;
+            height: 20px;
+            width: 20px;
+            right: 26px;
+            top: 38px;
+        }
+    }
+</style>

src/pages/new/sureCombine.vue

@@ -0,0 +1,52 @@
+<template>
+    <div class="container">
+        <div style="padding: 20px 0;">合并签收以下快件</div>
+        <van-checkbox-group v-model="result" ref="checkboxGroup">
+            <van-checkbox style="margin-bottom: 10px;" name="a" shape="square">复选框 a</van-checkbox>
+            <van-checkbox style="margin-bottom: 10px;" name="b" shape="square">复选框 a</van-checkbox>
+            <van-checkbox style="margin-bottom: 10px;" name="c" shape="square">复选框 a</van-checkbox>
+            <van-checkbox style="margin-bottom: 10px;" name="f" shape="square">复选框 a</van-checkbox>
+            <van-checkbox style="margin-bottom: 10px;" name="d" shape="square">复选框 a</van-checkbox>
+        </van-checkbox-group>
+        <div style="color: #169bd5; margin-bottom: 50px;">拍照或上传图片</div>
+
+        
+        <van-button style="height: 40px; width: 150px; border-radius: 8px; margin-right: 20px;" type="info" @click="sureSign">确定签收</van-button>
+        <van-button style="height: 40px; width: 150px; border-radius: 8px;" type="default" @click="back">返回上一级</van-button>
+
+    </div>
+</template>
+
+<script>
+export default {
+    name: 'sureCombine',
+    data() {
+        return {
+            result: [],
+        };
+    },
+    methods:{
+        sureSign() {
+            this.$router.push('SignA')
+        },
+        back() {
+            this.$router.push('Combine')
+        },
+    }
+
+};
+</script>
+
+
+
+<style lang="less" scoped>
+* {
+    font-size: 16px;
+}
+
+.container {
+    margin: 20px 10px 0 10px;
+    background-color: #fff;
+    height: 640px;
+}
+</style>

src/router/index.js

@@ -8,6 +8,9 @@ import Sjdj from '@/pages/sjdj'
 import Storage from '@/pages/new/storage'
 import Removal from '@/pages/new/removal'
 import DeliveryInquiry from '@/pages/new/deliveryInquiry'
+import SignA from '@/pages/new/sign'
+import Combine from '@/pages/new/combine'
+import SureCombine from '@/pages/new/sureCombine'
 import Addper from '@/pages/addper'
 import Box from '@/pages/box'
 import Pjpc from '@/pages/pjpc'
@@ -152,6 +155,30 @@ export default new Router({
 				needLogin: true //需要加校检判断的路由
 			}
 		},
+		{ //派件签收
+			path: '/SignA',
+			name: 'SignA',
+			component: SignA,
+			meta: {
+				needLogin: true //需要加校检判断的路由
+			}
+		},
+		{ //合并签收
+			path: '/Combine',
+			name: 'Combine',
+			component: Combine,
+			meta: {
+				needLogin: true //需要加校检判断的路由
+			}
+		},
+		{ //确认派件签收
+			path: '/SureCombine',
+			name: 'SureCombine',
+			component: SureCombine,
+			meta: {
+				needLogin: true //需要加校检判断的路由
+			}
+		},
 		{ //新增收件人
 			path: '/Addper',
 			name: 'Addper',