傅豪杰 11 months ago
parent
commit
ee59c6c0ff

File diff suppressed because it is too large
+ 609 - 20985
package-lock.json


+ 1 - 0
package.json

@@ -19,6 +19,7 @@
     "jquery": "^3.6.0",
     "sass-loader": "^10.1.1",
     "vant": "^2.12.11",
+    "vconsole": "^3.15.1",
     "vue": "^2.5.2",
     "vue-jsonp": "^2.0.0",
     "vue-resource": "^1.5.2",

+ 26 - 0
src/App.vue

@@ -20,6 +20,32 @@
 		
 		created () {
 		    window.localStorage.setItem('scanUrl',location.href.split('#')[0])
+			this.$http.post(this.$store.state.host + "/weixin/getWxConfig", {
+				url: window.location.href.split('#')[0]
+			}, {
+				emulateJSON: true
+			})
+				.then(res => {
+					//发送成功
+					var timestamp = res.body.wxConfig.timestamp;
+					var noncestr = res.body.wxConfig.nonceStr;
+					var signature = res.body.wxConfig.signature;
+					var appId = res.body.wxConfig.appId;
+					wx.config({
+						debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来,若要查看传入的参数,可以在pc端打开,参数信息会通过log打出,仅在pc端时才会打印。
+						// debug : true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来,若要查看传入的参数,可以在pc端打开,参数信息会通过log打出,仅在pc端时才会打印。
+						appId: appId, // 必填,公众号的唯一标识
+						timestamp: timestamp, // 必填,生成签名的时间戳
+						nonceStr: noncestr, // 必填,生成签名的随机串
+						signature: signature, // 必填,签名,见附录1
+						jsApiList: [
+							"scanQRCode",
+						] // 必填,需要使用的JS接口列表,所有JS接口列表见附录2
+					});
+				}, res => {
+					//发送失败
+					Toast("网络错误!")
+				})
 		},
 		methods: {
 			reload() {

+ 3 - 0
src/main.js

@@ -16,6 +16,9 @@ import backIndex from './components/backindex.vue'
 import Vant from 'vant'
 import 'vant/lib/index.css'
 import request from "@/utils/request" 
+import VConsole from 'vconsole';
+
+const vconsole = new VConsole()
 Vue.prototype.$axios = request
 // Vue.use(request)
 Vue.component('tabbar', tabbar)

+ 16 - 16
src/pages/addper.vue

@@ -6,12 +6,12 @@
 		  <van-field v-model="name" class="m" name="中文名" label="中文名" placeholder="请填写中文名"/>
 		  <van-field v-model="englishName" type="" name="英文名" label="英文名" placeholder="请填写英文名"/>
 		  <van-field v-model="email" class="m" type="" name="邮箱地址" label="邮箱地址" placeholder="请填写邮箱地址"/>
-		  <van-field v-model="phone" class="m" type="number" name="手机号" label="手机号" placeholder="请填写手机号"/>
-      <van-field v-model="phoneOne"  type="number" name="备用手机号1" label="备用手机号1" placeholder="请填写备用手机号1"/>
-      <van-field v-model="phoneTwo"  type="number" name="备用手机号2" label="备用手机号2" placeholder="请填写备用手机号2"/>
-      <van-field v-model="phoneThree"  type="number" name="备用手机号2" label="备用手机号3" placeholder="请填写备用手机号3"/>
-      <van-field v-model="telephone"  type="number" name="座机号" label="座机号" placeholder="请填写座机号"/>
-      <van-field v-model="telephone2"  type="number" name="座机-分机号" label="座机-分机号" placeholder="请填写座机-分机号"/>
+		  <van-field v-model="phone" class="m" type="number" name="手机号" label="手机号" placeholder="请填写手机号"/>
+      <van-field v-model="phoneOne"  type="number" name="备用手机号1" label="备用手机号1" placeholder="请填写备用手机号1"/>
+      <van-field v-model="phoneTwo"  type="number" name="备用手机号2" label="备用手机号2" placeholder="请填写备用手机号2"/>
+      <van-field v-model="phoneThree"  type="number" name="备用手机号2" label="备用手机号3" placeholder="请填写备用手机号3"/>
+      <van-field v-model="telephone"  type="number" name="座机号" label="座机号" placeholder="请填写座机号"/>
+      <van-field v-model="telephone2"  type="number" name="座机-分机号" label="座机-分机号" placeholder="请填写座机-分机号"/>
 
 		  <van-field v-model="stationNum" type="" name="工号" label="工号" placeholder="请填写工号"/>
 
@@ -68,11 +68,11 @@
 				name:"",
 				englishName:"",
 				email:"",
-				phone:"",
-        phoneOne:"",
-        phoneTwo:"",
-        phoneThree:"",
-        telephone:"",
+				phone:"",
+        phoneOne:"",
+        phoneTwo:"",
+        phoneThree:"",
+        telephone:"",
         telephone2:"",
 				stationNum:"",
 				build:"",
@@ -93,7 +93,7 @@
 			}
 		},
 		created:function(){
-			this.isLogin();
+			
 			this.openid = this.$store.state.openId;
 			this.getData();
 		},
@@ -169,11 +169,11 @@
 					englishName:this.englishName,//英文名
 					email:this.email,
 					//sex
-					phone:this.phone,
-          phoneOne:this.phoneOne,
-          phoneTwo:this.phoneTwo,
+					phone:this.phone,
+          phoneOne:this.phoneOne,
+          phoneTwo:this.phoneTwo,
           phoneThree:this.phoneThree,
-					telephone:this.telephone,
+					telephone:this.telephone,
           telephone2:this.telephone2,
 					stationNum:this.stationNum,//工号
 					company:this.company,//所属公司

+ 1 - 1
src/pages/box.vue

@@ -110,7 +110,7 @@
 			}
 		},
 		created:function(){
-			this.isLogin();
+			
 		},
 		methods:{
 			// tab切换

+ 19 - 81
src/pages/components/HomePage.vue

@@ -3,7 +3,7 @@
 		<div class="content">
 			<div class="sm">
 				<van-search v-model="value" @search="onSearch" placeholder="点击搜索单号" />
-				<img @click="wxScanCodeA()" src="@/assets/user/u4.png" alt="">
+				<img @click="wxScanCode()" src="@/assets/user/u4.png" alt="">
 			</div>
 			<!-- 显示 -->
 			<div class="echarts1">
@@ -83,8 +83,6 @@ export default {
 		}
 	},
 	created: function () {
-		this.isLogin();
-		this.getData()
 		this.getUser()
 	},
 	async mounted() {
@@ -120,7 +118,6 @@ export default {
 
 		// 页面加载完成唤醒微信扫一扫
 		//本地 注释  服务器 放开
-		this.wxScanCode();
 		setTimeout(() => {
 			let myChart = this.$echarts.init(document.getElementById('myChart1'))
 			var option = {
@@ -267,51 +264,23 @@ export default {
 				'url': purl
 			}
 			//alert(url)
-			this.$http.post(this.$store.state.host + "/weixin/getWxConfig", {
-				url: window.location.href.split('#')[0]
-			}, {
-				emulateJSON: true
-			})
-				.then(res => {
-					//发送成功
-					var timestamp = res.body.wxConfig.timestamp;
-					var noncestr = res.body.wxConfig.nonceStr;
-					var signature = res.body.wxConfig.signature;
-					var appId = res.body.wxConfig.appId;
-					wx.config({
-						debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来,若要查看传入的参数,可以在pc端打开,参数信息会通过log打出,仅在pc端时才会打印。
-						// debug : true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来,若要查看传入的参数,可以在pc端打开,参数信息会通过log打出,仅在pc端时才会打印。
-						appId: appId, // 必填,公众号的唯一标识
-						timestamp: timestamp, // 必填,生成签名的时间戳
-						nonceStr: noncestr, // 必填,生成签名的随机串
-						signature: signature, // 必填,签名,见附录1
-						jsApiList: [
-							"scanQRCode",
-						] // 必填,需要使用的JS接口列表,所有JS接口列表见附录2
-					});
-					wx.ready(() => {
-						wx.scanQRCode({
-							needResult: 1, // 默认为0,扫描结果由微信处理,1则直接返回扫描结果,
-							scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是一维码,默认二者都有
-							success: (res) => {
-								//alert(res)
-								var result = res.resultStr; // 当needResult 为 1 时,扫码返回的结果
-								if (result.indexOf(",") != -1) {
-									let result1 = res.resultStr.split(",");
-									result = result1[result1.length - 1];
-								}
-								this.onSearch(result)
-							},
-							error: function (res) {
-								console.log(res);
-							}
-						});
-
-					});
-				}, res => {
-					//发送失败
-					Toast("网络错误!")
-				})
+			wx.scanQRCode({
+				needResult: 1, // 默认为0,扫描结果由微信处理,1则直接返回扫描结果,
+				scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是一维码,默认二者都有
+				success: (res) => {
+					//alert(res)
+					var result = res.resultStr; // 当needResult 为 1 时,扫码返回的结果
+					if (result.indexOf(",") != -1) {
+						let result1 = res.resultStr.split(",");
+						result = result1[result1.length - 1];
+					}
+					this.onSearch(result)
+				},
+				error: function (res) {
+					console.log(res);
+				}
+			});
+			
 
 		},
 
@@ -338,38 +307,7 @@ export default {
 				}
 			})
 		},
-		//后端获取数据
-		getData() {
-			Toast.loading({
-				message: '加载中...',
-				forbidClick: true,
-				duration: 0
-			});
-
-			this.$http.post(this.$store.state.host + "/solic/solicHomePage.do", {
-				mailRoomId: localStorage.getItem('roomId')
-			}, {
-				emulateJSON: true
-			})
-				.then(res => {
-					//发送成功
-					if (res.body.msg == 'success') {
-						console.log(this.expressMap, 'this.expressMap')
-						this.expressMap = res.body.expressMap
-						this.data[0].value = this.expressMap.successNum
-						this.data[1].value = this.expressMap.waitNum
-						this.data[2].value = this.expressMap.problemNum
-						this.mailMap = res.body.mailMap
-						console.log(this.mailMap, '=======================mailMap')
-						console.log(this.expressMap, '=======================expressMap')
-						//this.echart1(this.data)
-					}
-				}, res => {
-					//发送失败
-					Toast("网络错误!")
-				})
-			Toast.clear()
-		},
+	
 
 		echart1(obj) {
 			console.log("图表数据:" + JSON.stringify(obj))

+ 1 - 1
src/pages/forgetpassword.vue

@@ -44,7 +44,7 @@ export default {
 		}
 	},
 	created: function () {
-		this.isLogin();
+		
 		this.userId = localStorage.getItem('userId');
 	},
 	methods: {

+ 1 - 1
src/pages/jjsearch.vue

@@ -150,7 +150,7 @@
 			}
 		},
 		created: function() {
-			this.isLogin();
+			
 			this.expressNo = this.$route.query.expressNo;
 			this.type = this.$route.query.type;
 			if(this.type == undefined || this.type == ''){

+ 221 - 221
src/pages/kjsearch.vue

@@ -1,23 +1,23 @@
-<template>
-	<div>
-		<back :title="titlename"></back>
-		<div class="content">
-			<div class="sm">
-				<van-search v-model="value" @search="onSearch" placeholder="点击搜索单号" />
-				<img src="../assets/user/sm.png" alt="" @click="wxScanCode()" >
-			</div>
+<template>
+	<div>
+		<back :title="titlename"></back>
+		<div class="content">
+			<div class="sm">
+				<van-search v-model="value" @search="onSearch" placeholder="点击搜索单号" />
+				<img src="../assets/user/sm.png" alt="" @click="wxScanCode()" >
+			</div>
 			<!-- 快件查询列表 -->
       <van-checkbox-group v-model="result">
-      <van-cell-group>
-			<div class="jjlist" v-for="item in resultList">
-				<div class="listinfo">
+      <van-cell-group>
+			<div class="jjlist" v-for="item in resultList">
+				<div class="listinfo">
 					<!-- <div class="list_top" @click="goInfo(item.expressNo)"> -->
           <div class="list_top">
 
             <div class="checked">
             	<van-checkbox :disabled="item.signinStatus == 0" checked-color="#00c4b8" :name="item.expressNo" ref="checkboxes" />
             </div>
-
+
 						<div class="list_top_left" @click="goInfo(item.expressNo)">
 							<!-- <img src="../assets/images/ad_icon1.png" alt=""> -->
 							<div>
@@ -31,16 +31,16 @@
               <van-icon name="cross" @click="deleteInfo(item)"/>
             </div>
 
-
-					</div>
-				</div>
+
+					</div>
+				</div>
 			</div>
       </van-cell-group>
       </van-checkbox-group>
-      <div style="margin-top: 16px;">
-				<van-field readonly clickable name="picker" :value="phone" label="收件人手机" placeholder="输入手机号后四位查询" @click="addshow1=true"/>
-				<van-field readonly type="text" v-model="recipient" label="收件人" />
-				<van-button style="margin-top: 16px;" color="#00c4b8" block type="info" @click="signSave">合并签收</van-button>
+      <div style="margin-top: 16px;">
+				<van-field readonly clickable name="picker" :value="phone" label="收件人手机" placeholder="输入手机号后四位查询" @click="addshow1=true"/>
+				<van-field readonly type="text" v-model="recipient" label="收件人" />
+				<van-button style="margin-top: 16px;" color="#00c4b8" block type="info" @click="signSave">合并签收</van-button>
 			</div>
 
       <!-- 填写手机号码 -->
@@ -62,22 +62,22 @@
       		</van-form>
       	</div>
       </van-popup>
-
-		</div>
-	</div>
-</template>
-
+
+		</div>
+	</div>
+</template>
+
 <script>
-  import {Toast,Dialog,Checkbox,CheckboxGroup} from 'vant'
-  import Swiper from 'swiper'
+  import {Toast,Dialog,Checkbox,CheckboxGroup} from 'vant'
+  import Swiper from 'swiper'
 	export default{
-    inject: ['reload'],
-		data(){
+    inject: ['reload'],
+		data(){
 			return{
-        result:[],
-				titlename:"快件查询",
-				value:"",
-				expressNo:"",//快递单号
+        result:[],
+				titlename:"快件查询",
+				value:"",
+				expressNo:"",//快递单号
 				resultList:[],
         addshow1:false,
         name:"",
@@ -86,97 +86,97 @@
         recipient:'',//收件人
         employeeList:[],//收件人列表
         index:'-1',
-        searchType:"2"//1.搜索全部 2.搜索快件 3.搜索寄件
-			}
-		},
-		created:function(){
-			//this.isLogin();
-		},
-		methods:{
-			//微信扫码
-			wxScanCode() {
-				this.$http.post(this.$store.state.host + "/weixin/getWxConfig", {
-						url: window.location.href.split("#")[0]
-					}, {
-						emulateJSON: true
-					})
-					.then(res => {
-						//发送成功
-						var timestamp = res.body.wxConfig.timestamp;
-						var noncestr = res.body.wxConfig.nonceStr;
-						var signature = res.body.wxConfig.signature;
-						var appId = res.body.wxConfig.appId;
-						wx.config({
-							debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来,若要查看传入的参数,可以在pc端打开,参数信息会通过log打出,仅在pc端时才会打印。
-							//                                debug : true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来,若要查看传入的参数,可以在pc端打开,参数信息会通过log打出,仅在pc端时才会打印。
-							appId: appId, // 必填,公众号的唯一标识
-							timestamp: timestamp, // 必填,生成签名的时间戳
-							nonceStr: noncestr, // 必填,生成签名的随机串
-							signature: signature, // 必填,签名,见附录1
-							jsApiList: [
-								"scanQRCode",
-							] // 必填,需要使用的JS接口列表,所有JS接口列表见附录2
-						});
-						wx.ready(()=> {
-							wx.scanQRCode({
-								needResult: 1, // 默认为0,扫描结果由微信处理,1则直接返回扫描结果,
-								scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是一维码,默认二者都有
-								success:(res)=> {
-									var result = res.resultStr; // 当needResult 为 1 时,扫码返回的结果
-									if(result.indexOf(",") != -1){
-										let result1 = res.resultStr.split(",");
-										this.value = result1[result1.length-1];
-									}
-									this.onSearch(this.value)
-									// this.getData()
-								},
-								error: function(res) {
-									console.log(res);
-								}
-							});
-						});
-					}, res => {
-						//发送失败
-						Toast("网络错误!")
-					})
-
-			},
-      //选择员工
-			choose(val,item){
-				this.index = val
-				this.recipient = item.name
-				this.phone = item.phone
-			},
-			//手机号后四位搜索
-			searchList(){
+        searchType:"2"//1.搜索全部 2.搜索快件 3.搜索寄件
+			}
+		},
+		created:function(){
+			//
+		},
+		methods:{
+			//微信扫码
+			wxScanCode() {
+				this.$http.post(this.$store.state.host + "/weixin/getWxConfig", {
+						url: window.location.href.split("#")[0]
+					}, {
+						emulateJSON: true
+					})
+					.then(res => {
+						//发送成功
+						var timestamp = res.body.wxConfig.timestamp;
+						var noncestr = res.body.wxConfig.nonceStr;
+						var signature = res.body.wxConfig.signature;
+						var appId = res.body.wxConfig.appId;
+						wx.config({
+							debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来,若要查看传入的参数,可以在pc端打开,参数信息会通过log打出,仅在pc端时才会打印。
+							//                                debug : true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来,若要查看传入的参数,可以在pc端打开,参数信息会通过log打出,仅在pc端时才会打印。
+							appId: appId, // 必填,公众号的唯一标识
+							timestamp: timestamp, // 必填,生成签名的时间戳
+							nonceStr: noncestr, // 必填,生成签名的随机串
+							signature: signature, // 必填,签名,见附录1
+							jsApiList: [
+								"scanQRCode",
+							] // 必填,需要使用的JS接口列表,所有JS接口列表见附录2
+						});
+						wx.ready(()=> {
+							wx.scanQRCode({
+								needResult: 1, // 默认为0,扫描结果由微信处理,1则直接返回扫描结果,
+								scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是一维码,默认二者都有
+								success:(res)=> {
+									var result = res.resultStr; // 当needResult 为 1 时,扫码返回的结果
+									if(result.indexOf(",") != -1){
+										let result1 = res.resultStr.split(",");
+										this.value = result1[result1.length-1];
+									}
+									this.onSearch(this.value)
+									// this.getData()
+								},
+								error: function(res) {
+									console.log(res);
+								}
+							});
+						});
+					}, res => {
+						//发送失败
+						Toast("网络错误!")
+					})
+
+			},
+      //选择员工
+			choose(val,item){
+				this.index = val
+				this.recipient = item.name
+				this.phone = item.phone
+			},
+			//手机号后四位搜索
+			searchList(){
 				this.$http.post(this.$store.state.host+"/solic/getEmployeeInfoByPhone",{
           phone:this.phone,
           },{
             emulateJSON:true,
-            })
-					.then(res=>{
-						//发送成功
-						if(res.body.msg=='success'){
-							this.employeeList = res.body.employeeList
-						}
-				},res=>{
-						//发送失败
-					Toast("网络错误!")
-				})
-			},
-			//跳转详情
+            })
+					.then(res=>{
+						//发送成功
+						if(res.body.msg=='success'){
+							this.employeeList = res.body.employeeList
+						}
+				},res=>{
+						//发送失败
+					Toast("网络错误!")
+				})
+			},
+			//跳转详情
 			goInfo(expressNo){
-        //收件查询
-					this.$router.push({path:'/Kjsearchinfo',query:{expressNo:expressNo,type:1}})
+        //收件查询
+					this.$router.push({path:'/Kjsearchinfo',query:{expressNo:expressNo,type:1}})
 			},
       deleteInfo(e){
         console.log("E:" + JSON.stringify(e))
           this.resultList.splice(this.resultList.indexOf(e), 1) // ['b']
-      },
-			//搜索
-			onSearch(val){
-				this.expressNo = val
-				this.getData()
+      },
+			//搜索
+			onSearch(val){
+				this.expressNo = val
+				this.getData()
 			},
       toggle(index) {
           this.$refs.checkboxes[index].toggle();
@@ -194,22 +194,22 @@
       	//this.name = ''
       	//this.department = ''
       	this.index = ''
-      },
-			//后端获取数据
+      },
+			//后端获取数据
 			getData(){
-        localStorage.getItem("userId")
-				Toast.loading({
-				    message: '加载中...',
-				    forbidClick: true,
-				    duration:0
+        localStorage.getItem("userId")
+				Toast.loading({
+				    message: '加载中...',
+				    forbidClick: true,
+				    duration:0
 				});
-        console.log("后端获取数据:expressNo = " + this.expressNo);
+        console.log("后端获取数据:expressNo = " + this.expressNo);
 				this.$http.post(this.$store.state.host+"/solic/getExpressListByNo",{
           expressNo:this.expressNo,
           searchType:"2",
           mailRoomId:localStorage.getItem('roomId'),
           userId:localStorage.getItem('userId'),
-          },{emulateJSON:true})
+          },{emulateJSON:true})
 					.then(res=>{
             if(res.body.msg == "success"){
               var list = res.body.resultList;
@@ -234,12 +234,12 @@
             }
             }else if(res.body.msg == "查无此单号"){
               Toast("查无此快递单号!")
-            }
-				},res=>{
-						//发送失败
-					Toast("网络错误!")
-				})
-				Toast.clear()
+            }
+				},res=>{
+						//发送失败
+					Toast("网络错误!")
+				})
+				Toast.clear()
 			},
       //合并签收
       			signSave(){
@@ -296,42 +296,42 @@
       						//发送失败
       					Toast("网络错误!")
       				})
-      			},
-
-		},
-		mounted:function(){
-
-		}
-	}
-</script>
-
-<style scoped lang="less">
-	.content{
-		padding: 0.25rem .37rem;
-		.sm{
-			display: flex;
-			margin-bottom: .2rem;
-			justify-content: space-between;
-			/deep/.van-search{
-				width: 6.2rem;
-				height: .76rem;
-				border-radius: 25px;
-				overflow: hidden;
-				padding: 0rem;
-				background-color: white;
-				.van-search__content{
-					background-color: white;
-				}
-				input{
-					background-color: white;
-				}
-			}
-			img{
-				width:.4rem;
-				height: .4rem;
-				position: relative;
-				top: .18rem;
-			}
+      			},
+
+		},
+		mounted:function(){
+
+		}
+	}
+</script>
+
+<style scoped lang="less">
+	.content{
+		padding: 0.25rem .37rem;
+		.sm{
+			display: flex;
+			margin-bottom: .2rem;
+			justify-content: space-between;
+			/deep/.van-search{
+				width: 6.2rem;
+				height: .76rem;
+				border-radius: 25px;
+				overflow: hidden;
+				padding: 0rem;
+				background-color: white;
+				.van-search__content{
+					background-color: white;
+				}
+				input{
+					background-color: white;
+				}
+			}
+			img{
+				width:.4rem;
+				height: .4rem;
+				position: relative;
+				top: .18rem;
+			}
 		}
 
     .whrite_add2{
@@ -372,19 +372,19 @@
       .van-cell-group{
         background-color: unset;
       }
-    }
-		.jjlist {
-			font-size: .3rem;
-			color: #999999;
-
-			.listinfo {
-				background: white;
-				padding: .3rem .3rem .3rem;
-				border-radius: .05rem;
-				margin-bottom: .2rem;
-				position: relative;
-				.list_top {
-					display: flex;
+    }
+		.jjlist {
+			font-size: .3rem;
+			color: #999999;
+
+			.listinfo {
+				background: white;
+				padding: .3rem .3rem .3rem;
+				border-radius: .05rem;
+				margin-bottom: .2rem;
+				position: relative;
+				.list_top {
+					display: flex;
 					justify-content: space-between;
           align-items: center;
           position: relative;
@@ -399,46 +399,46 @@
               color: white;
               padding: 0.03rem;
             }
-          }
-					.list_top_left {
-						img {
-							display: inline-block;
-							width: .87rem;
-							height: .87rem;
-							position: relative;
-						}
-
-						div {
-							width: 4rem;
-							margin-left: .2rem;
-							display: inline-block;
-							line-height: 150%;
-							position: relative;
-							top: -.1rem;
-							p:nth-of-type(1) {
-								font-size: .28rem;
-								color: #333;
-								font-weight: bold;
-							}
-							p:nth-of-type(2) {
-								font-size: .22rem;
-							}
-						}
-					}
-					>p {
-						font-size: .23rem;
-						font-weight: bold;
-						display: flex;
-						align-items: center;
-					}
-					.staus1{
-						color: #f5693d;
-					}
-					.staus2{
-						color: #3d82f5;
-					}
-				}
-			}
-		}
-	}
-</style>
+          }
+					.list_top_left {
+						img {
+							display: inline-block;
+							width: .87rem;
+							height: .87rem;
+							position: relative;
+						}
+
+						div {
+							width: 4rem;
+							margin-left: .2rem;
+							display: inline-block;
+							line-height: 150%;
+							position: relative;
+							top: -.1rem;
+							p:nth-of-type(1) {
+								font-size: .28rem;
+								color: #333;
+								font-weight: bold;
+							}
+							p:nth-of-type(2) {
+								font-size: .22rem;
+							}
+						}
+					}
+					>p {
+						font-size: .23rem;
+						font-weight: bold;
+						display: flex;
+						align-items: center;
+					}
+					.staus1{
+						color: #f5693d;
+					}
+					.staus2{
+						color: #3d82f5;
+					}
+				}
+			}
+		}
+	}
+</style>

+ 151 - 151
src/pages/kjsearchinfo.vue

@@ -13,16 +13,16 @@
 								<p>2021-09-12 10:31</p>
 							</div>
 						</div>
-						<p class="staus1">
-              <template v-if="expressInfo.signinStatus == 0">待签收</template>
-              <template v-if="expressInfo.signinStatus == 1">已签收</template>
-              <template v-if="expressInfo.signinStatus == 2">已代收</template>
-              <template v-if="expressInfo.signinStatus == 3">拒收</template>
-              <template v-if="expressInfo.signinStatus == 4">滞留件</template>
-              <template v-if="expressInfo.signinStatus == 5">问题件</template>
-              <!-- <template v-if="expressInfo.signinStatus == 7">转寄</template>
-              <template v-if="expressInfo.signinStatus == 8">重新分拣</template>
-              <template v-if="expressInfo.signinStatus == 9">已转寄</template> -->
+						<p class="staus1">
+              <template v-if="expressInfo.signinStatus == 0">待签收</template>
+              <template v-if="expressInfo.signinStatus == 1">已签收</template>
+              <template v-if="expressInfo.signinStatus == 2">已代收</template>
+              <template v-if="expressInfo.signinStatus == 3">拒收</template>
+              <template v-if="expressInfo.signinStatus == 4">滞留件</template>
+              <template v-if="expressInfo.signinStatus == 5">问题件</template>
+              <!-- <template v-if="expressInfo.signinStatus == 7">转寄</template>
+              <template v-if="expressInfo.signinStatus == 8">重新分拣</template>
+              <template v-if="expressInfo.signinStatus == 9">已转寄</template> -->
             </p>
 					</div>
 				</div>
@@ -31,19 +31,19 @@
 				<p>收件人:{{expressInfo.recipient}}</p>
 				<p>公司:{{expressInfo.company}}</p>
 				<p>座位:{{expressInfo.sendSeat}}</p>
-				<p>手机:{{expressInfo.phone}}</p>
-
-        <template v-show="expressInfo.phoneOne != '' || expressInfo.phoneOne != NULL">
-          <p>备用手机1:{{expressInfo.phoneOne}}</p>
-        </template>
-
-        <template v-show="expressInfo.phoneTwo != '' || expressInfo.phoneTwo != NULL">
-          <p>备用手机2:{{expressInfo.phoneTwo}}</p>
-        </template>
-
-        <template v-show="expressInfo.phoneThree != '' || expressInfo.phoneThree != NULL">
-          <p>备用手机3:{{expressInfo.phoneThree}}</p>
-        </template>
+				<p>手机:{{expressInfo.phone}}</p>
+
+        <template v-show="expressInfo.phoneOne != '' || expressInfo.phoneOne != NULL">
+          <p>备用手机1:{{expressInfo.phoneOne}}</p>
+        </template>
+
+        <template v-show="expressInfo.phoneTwo != '' || expressInfo.phoneTwo != NULL">
+          <p>备用手机2:{{expressInfo.phoneTwo}}</p>
+        </template>
+
+        <template v-show="expressInfo.phoneThree != '' || expressInfo.phoneThree != NULL">
+          <p>备用手机3:{{expressInfo.phoneThree}}</p>
+        </template>
 
 				<p>智能柜:{{expressInfo.cabinet}}</p>
 				<p>快件类型:{{expressInfo.expressType}}</p>
@@ -57,28 +57,28 @@
 				<!-- <div class="pjinfo">
 					<p>3-27 17:27  派件中,收派员【杨柳青】</p>
 				</div> -->
-			</div>
-      <template v-if="expressInfo.signinStatus == 0">
+			</div>
+      <template v-if="expressInfo.signinStatus == 0">
       <!--签收-->
 			<button :disabled="buttonDis" @click="showYesPopup()" style="width: 45%;background: rgb(0, 196, 184);font-size: 0.3rem;border: none;padding: 0.2rem 0rem;margin-top: 0.5rem;color: white;">签收</button>
-      <van-popup v-model="showYes" position="bottom">
-        <van-picker title="签收原因" show-toolbar :columns="yeslist" @confirm="onConfirmYes" @cancel="showYes=false"/>
-      </van-popup>
-      <!--拒收-->
-      <button :disabled="buttonDis" @click="showNoPopup()" style="width: 45%;background: rgb(255, 0, 0);font-size: 0.3rem;border: none;padding: 0.2rem 0rem;margin-top: 0.5rem;color: white;margin-left: 29px;">拒签</button>
-      <van-popup v-model="showNo" position="bottom">
-        <van-picker title="拒收原因" show-toolbar :columns="nolist" @confirm="onConfirmNo" @cancel="showNo=false"/>
-      </van-popup>
-      <!--底部备注弹窗-->
-      <van-popup round v-model="remarkShow" position="bottom" closeable>
-        <div class="tcshow">
-         <p>备注</p >
-         <textarea name="" v-model="sendRemark" id="sendRemark" placeholder="请输入原因"></textarea>
-         <van-button type="primary" size="large" @click="save()">确定</van-button>
-        </div>
-      </van-popup>
-
-      </template>
+      <van-popup v-model="showYes" position="bottom">
+        <van-picker title="签收原因" show-toolbar :columns="yeslist" @confirm="onConfirmYes" @cancel="showYes=false"/>
+      </van-popup>
+      <!--拒收-->
+      <button :disabled="buttonDis" @click="showNoPopup()" style="width: 45%;background: rgb(255, 0, 0);font-size: 0.3rem;border: none;padding: 0.2rem 0rem;margin-top: 0.5rem;color: white;margin-left: 29px;">拒签</button>
+      <van-popup v-model="showNo" position="bottom">
+        <van-picker title="拒收原因" show-toolbar :columns="nolist" @confirm="onConfirmNo" @cancel="showNo=false"/>
+      </van-popup>
+      <!--底部备注弹窗-->
+      <van-popup round v-model="remarkShow" position="bottom" closeable>
+        <div class="tcshow">
+         <p>备注</p >
+         <textarea name="" v-model="sendRemark" id="sendRemark" placeholder="请输入原因"></textarea>
+         <van-button type="primary" size="large" @click="save()">确定</van-button>
+        </div>
+      </van-popup>
+
+      </template>
     </div>
 	</div>
 </template>
@@ -89,103 +89,103 @@
 		data(){
 			return{
 				titlename:"收件查询",
-				expressNo:'',//快递单号
+				expressNo:'',//快递单号
         signinStatus:'',//签收状态:0-待签收 1-已签收、2-已代收、3-拒收、4-延迟
 				type:'',//寄件/收件
 				expressInfo:{},
-				buttonDis: false,
-        yeslist:["本人签收","他人代收"],
-        showYes: false,
-        nolist:["拒收","滞留件","问题件"],
-        showNo: false,
-        remarkShow: false,
-        sendRemark:"",
-        why:"",//拒收原因
-        //noPeoplelist:["号码错误","位置更换"],
-        // showNoPeople: false,
-        //noPlacelist:["转寄","重新分拣"],
+				buttonDis: false,
+        yeslist:["本人签收","他人代收"],
+        showYes: false,
+        nolist:["拒收","滞留件","问题件"],
+        showNo: false,
+        remarkShow: false,
+        sendRemark:"",
+        why:"",//拒收原因
+        //noPeoplelist:["号码错误","位置更换"],
+        // showNoPeople: false,
+        //noPlacelist:["转寄","重新分拣"],
         // showNoPlace: false
 			}
 		},
 		created:function(){
-			this.isLogin();
+			
 			this.expressNo = this.$route.query.expressNo
 			this.type = this.$route.query.type
 			this.getData()
 		},
-		methods:{
-      save(){
-        console.log(this.why);
-       if(this.why == "拒收"){
-         this.sign(3)
-       }else if(this.why == "滞留件"){
-         this.sign(4)
-       }else if(this.why == "问题件"){
-         this.sign(5)
-       }
-      },
-      //拒收原因
-      onConfirmNo(e){
-      	if(e == "拒收"){
-          this.remarkShow = true;
-          this.why = e;
-        }else if(e == "滞留件"){
-          this.remarkShow = true;
-          this.why = e;
-        }else if(e == "问题件"){
-          this.remarkShow = true;
-          this.why = e;
-        }
-      	this.showNo = false;
-      },
-      //签收人员
-      onConfirmYes(e){
-      	if(e == "本人签收"){
-          this.sign(1)
-        }else{
-          this.sign(2)
-        }
-      	this.showYes = false;
-      },
-      // //无人签收
-      // onConfirmNoPeople(e){
-      // 	if(e == "号码错误"){
-      //     this.sign(5)
-      //   }else{
-      //     this.sign(6)
-      //   }
-      // 	this.showNoPeople = false;
-      // },
-      // //分拣错误转寄
-      // onConfirmNoPlace(e){
-      // 	if(e == "转寄"){
-      //     this.sign(7)
-      //   }else{
-      //     this.sign(8)
-      //   }
-      // 	this.showNoPlace = false;
-      // },
-
-
-
-      //显示拒收弹窗
-      showNoPopup(){
-        this.showNo = true;
-      },
-      //显示签收弹窗
-      showYesPopup(){
-        this.showYes = true;
-      },
-      //显示无人签收弹窗
-      showNoPeoplePopup(){
-        this.showNoPeople = true;
-      },
-      //显示分拣错误转寄弹窗
-      showNoPlacePopup(){
-        this.showNoPlace = true;
-      },
-
-
+		methods:{
+      save(){
+        console.log(this.why);
+       if(this.why == "拒收"){
+         this.sign(3)
+       }else if(this.why == "滞留件"){
+         this.sign(4)
+       }else if(this.why == "问题件"){
+         this.sign(5)
+       }
+      },
+      //拒收原因
+      onConfirmNo(e){
+      	if(e == "拒收"){
+          this.remarkShow = true;
+          this.why = e;
+        }else if(e == "滞留件"){
+          this.remarkShow = true;
+          this.why = e;
+        }else if(e == "问题件"){
+          this.remarkShow = true;
+          this.why = e;
+        }
+      	this.showNo = false;
+      },
+      //签收人员
+      onConfirmYes(e){
+      	if(e == "本人签收"){
+          this.sign(1)
+        }else{
+          this.sign(2)
+        }
+      	this.showYes = false;
+      },
+      // //无人签收
+      // onConfirmNoPeople(e){
+      // 	if(e == "号码错误"){
+      //     this.sign(5)
+      //   }else{
+      //     this.sign(6)
+      //   }
+      // 	this.showNoPeople = false;
+      // },
+      // //分拣错误转寄
+      // onConfirmNoPlace(e){
+      // 	if(e == "转寄"){
+      //     this.sign(7)
+      //   }else{
+      //     this.sign(8)
+      //   }
+      // 	this.showNoPlace = false;
+      // },
+
+
+
+      //显示拒收弹窗
+      showNoPopup(){
+        this.showNo = true;
+      },
+      //显示签收弹窗
+      showYesPopup(){
+        this.showYes = true;
+      },
+      //显示无人签收弹窗
+      showNoPeoplePopup(){
+        this.showNoPeople = true;
+      },
+      //显示分拣错误转寄弹窗
+      showNoPlacePopup(){
+        this.showNoPlace = true;
+      },
+
+
 
 			//签收
 			sign(e){
@@ -222,8 +222,8 @@
 
 				this.$http.post(this.$store.state.host+"/solic/getExpressDetail",{expressNo:this.expressNo,type:this.type},{emulateJSON:true})
 					.then(res=>{
-						//发送成功
-            console.log(res.body.msg);
+						//发送成功
+            console.log(res.body.msg);
             console.log(res.body.expressInfo);
 						if(res.body.msg=='success'){
 							this.expressInfo = res.body.expressInfo
@@ -241,26 +241,26 @@
 	}
 </script>
 
-<style scoped lang="less">
-  .tcshow{
-    padding: .3rem;
-    font-size: .26rem;
-    textarea{
-     width: 95%;
-     padding: 2.5%;
-     border:1px solid #dedede;
-     border-radius: .1rem;
-     margin: .3rem 0rem;
-     min-height: 1.5rem;
-    }
-    button{
-     background: #00c4b8;
-     border: none;
-     font-size: .26rem;
-     height: .8rem;
-     line-height: .8rem;
-     border-radius: .1rem;
-    }
+<style scoped lang="less">
+  .tcshow{
+    padding: .3rem;
+    font-size: .26rem;
+    textarea{
+     width: 95%;
+     padding: 2.5%;
+     border:1px solid #dedede;
+     border-radius: .1rem;
+     margin: .3rem 0rem;
+     min-height: 1.5rem;
+    }
+    button{
+     background: #00c4b8;
+     border: none;
+     font-size: .26rem;
+     height: .8rem;
+     line-height: .8rem;
+     border-radius: .1rem;
+    }
    }
 	.content{
 		padding: 0.25rem .37rem;

+ 1 - 1
src/pages/my.vue

@@ -46,7 +46,7 @@ export default {
 		};
 	},
 	created: function () {
-		this.isLogin();
+		
 		this.userId = localStorage.getItem("userId");
 		console.log('userId:' + this.userId);
 		// this.getUser();

+ 20 - 20
src/pages/pjpc.vue

@@ -17,11 +17,11 @@
 				    </div>
 
 				    <!-- 如果需要翻页按钮 -->
-				    <div class="swiper-button-prev">
-              <!-- <van-icon name="arrow-left" /> -->
+				    <div class="swiper-button-prev">
+              <!-- <van-icon name="arrow-left" /> -->
             </div>
-				    <div class="swiper-button-next">
-              <!-- <van-icon name="arrow" /> -->
+				    <div class="swiper-button-next">
+              <!-- <van-icon name="arrow" /> -->
             </div>
 				</div>
 				<div id="mychart"></div>
@@ -45,7 +45,7 @@
 							<p class="staus1" v-if="item.signinStatus == 1">本人签收</p>
 							<p class="staus2" v-if="item.signinStatus == 2">他人代收</p>
 							<p class="staus2" v-if="item.signinStatus == 3">拒收</p>
-							<p class="staus2" v-if="item.signinStatus == 4">滞留件</p>
+							<p class="staus2" v-if="item.signinStatus == 4">滞留件</p>
               <p class="staus2" v-if="item.signinStatus == 5">问题件</p>
 						</div>
 					</div>
@@ -59,7 +59,7 @@
 				<van-field readonly clickable name="picker" :value="phone" label="收件人手机" placeholder="输入手机号后四位查询" @click="addshow1=true"/>
 				<van-field readonly type="text" v-model="recipient" label="收件人" />
 				<van-button color="#00c4b8" block type="info" @click="signSave">合并签收</van-button>
-			</div> -->
+			</div> -->
 
 			<!-- 填写手机号码 -->
 			<!-- <van-popup round v-model="addshow1" class="whrite_add2" closeable @closed="close" :close-on-click-overlay="false">
@@ -159,7 +159,7 @@
 
 		},
 		created:function(){
-			this.isLogin();
+			
 		},
 		methods:{
 			// //合并签收
@@ -202,10 +202,10 @@
 			// },
 			// //手机号后四位搜索
 			// searchList(){
-			// 	this.$http.post(this.$store.state.host+"/solic/getEmployeeInfoByPhone",{
-   //        phone:this.phone,
-   //        },{
-   //          emulateJSON:true,
+			// 	this.$http.post(this.$store.state.host+"/solic/getEmployeeInfoByPhone",{
+   //        phone:this.phone,
+   //        },{
+   //          emulateJSON:true,
    //          })
 			// 		.then(res=>{
 			// 			//发送成功
@@ -216,13 +216,13 @@
 			// 			//发送失败
 			// 		Toast("网络错误!")
 			// 	})
-			// },
-
-      //跳转详情
-      goInfo(expressNo){
-        //收件查询
-      	this.$router.push({path:'/Kjsearchinfo',query:{expressNo:expressNo,type:1}})
-
+			// },
+
+      //跳转详情
+      goInfo(expressNo){
+        //收件查询
+      	this.$router.push({path:'/Kjsearchinfo',query:{expressNo:expressNo,type:1}})
+
       },
 			// onSubmit(){
 			// 	if(this.recipient == ''){
@@ -258,8 +258,8 @@
 							this.yiPaiSong = res.body.yiPaiSong;
 							this.total = res.body.total;
 							this.echart();
-						}else if(res.body.msg=='未获取到批次'){
-              Toast(res.body.msg)
+						}else if(res.body.msg=='未获取到批次'){
+              Toast(res.body.msg)
             }
 				},res=>{
 						//发送失败

+ 99 - 99
src/pages/sign.vue

@@ -2,27 +2,27 @@
 	<!-- 手写签名组件 -->
 	<div class="page sign-page">
 		<div class="content">
-			<!-- <p class="title">签收</p> -->
-
-      <div class="sm">
-        <p class="title" style="text-align: center;">签收</p>
-        <!-- <img src="../assets/images/phone.jpg" alt="" @click="chooseImage()"/> -->
-        <van-uploader  :after-read="afterRead">
-          <img src="../assets/images/phone.jpg"/>
-        </van-uploader>
-      </div>
+			<!-- <p class="title">签收</p> -->
+
+      <div class="sm">
+        <p class="title" style="text-align: center;">签收</p>
+        <!-- <img src="../assets/images/phone.jpg" alt="" @click="chooseImage()"/> -->
+        <van-uploader  :after-read="afterRead">
+          <img src="../assets/images/phone.jpg"/>
+        </van-uploader>
+      </div>
 
 			<div class="whrite-content">
-				<p>快递单号:{{expressNo}}</p>
+				<p>快递单号:{{expressNo}}</p>
 
 				<div class="sign-wrap" id="signWrap" v-if="isOrNo == 0">
 					<canvas id="myCanvas" width="400px" height="100%"></canvas>
-				</div>
-
-        <div class="sign-wrap"  style="display: flex; align-items: center;" v-else>
-        	<img style="width: 100%;" :src="phoneImage"/>
-        </div>
-
+				</div>
+
+        <div class="sign-wrap"  style="display: flex; align-items: center;" v-else>
+        	<img style="width: 100%;" :src="phoneImage"/>
+        </div>
+
         <van-field type="text" v-model="remark" label="快递备注" placeholder="输入快递备注" />
 				<div class="con-btn">
 					<span class="staging-btn size14" @click="clearArea()">清除</span>
@@ -39,27 +39,27 @@
 	import {
 		Toast,
 		Dialog
-	} from 'vant'
+	} from 'vant'
   import wx from "weixin-jsapi"
 	export default {
 		name: "signature",
 		data() {
 			return {
-				image: "",
+				image: "",
         phoneImage:"",
 				mousePressed: false,
 				c: "",
 				ctx: "",
 				lastX: 0,
-				lastY: 0,
+				lastY: 0,
         isOrNo: 0,
-				expressNo: '',
-        remark: '', //快递备注
+				expressNo: '',
+        remark: '', //快递备注
         File:'',
 			};
 		},
 		created() {
-			this.isLogin();
+			
 			this.expressNo = this.$route.query.expressNo
 		},
 		mounted() {
@@ -74,16 +74,16 @@
 			// 监听touchstart事件,touchmove事件,touchend事件等事件
 			this.InitThis();
 		},
-		methods: {
-      //限制
-      onOversize(file){
-      	Toast('文件大小不能超过 50M');
-      },
-      //图片上传
-      afterRead(file){
-        this.isOrNo = 1
-        this.phoneImage = file.content
-        this.File = file.file
+		methods: {
+      //限制
+      onOversize(file){
+      	Toast('文件大小不能超过 50M');
+      },
+      //图片上传
+      afterRead(file){
+        this.isOrNo = 1
+        this.phoneImage = file.content
+        this.File = file.file
       },
 			InitThis() {
 				// 触摸屏
@@ -172,60 +172,60 @@
 				this.lastY = y;
 			},
 			// 清空画板
-			clearArea() {
-        if(this.isOrNo == 0){//画板
-          this.ctx.setTransform(1, 0, 0, 1, 0, 0);
-          this.ctx.clearRect(0, 0, this.ctx.canvas.width, this.ctx.canvas.height);
-        }else{
-          this.phoneImage = ''
-          this.isOrNo = 0;
-          setTimeout(() => {
-          	this.image = "";
-          	this.mousePressed = false;
-          	var lastX, lastY;
-          	this.ctx = document.getElementById("myCanvas").getContext("2d");
-          	this.c = document.getElementById("myCanvas");
-          	var signWrap = document.getElementById("signWrap");
-          	this.c.width = signWrap.clientWidth; // 设置宽度
-          	this.c.height = signWrap.clientHeight; // 设置高度
-          	// 监听touchstart事件,touchmove事件,touchend事件等事件
-          	this.InitThis();
-          }, 300)
+			clearArea() {
+        if(this.isOrNo == 0){//画板
+          this.ctx.setTransform(1, 0, 0, 1, 0, 0);
+          this.ctx.clearRect(0, 0, this.ctx.canvas.width, this.ctx.canvas.height);
+        }else{
+          this.phoneImage = ''
+          this.isOrNo = 0;
+          setTimeout(() => {
+          	this.image = "";
+          	this.mousePressed = false;
+          	var lastX, lastY;
+          	this.ctx = document.getElementById("myCanvas").getContext("2d");
+          	this.c = document.getElementById("myCanvas");
+          	var signWrap = document.getElementById("signWrap");
+          	this.c.width = signWrap.clientWidth; // 设置宽度
+          	this.c.height = signWrap.clientHeight; // 设置高度
+          	// 监听touchstart事件,touchmove事件,touchend事件等事件
+          	this.InitThis();
+          }, 300)
         }
 
 			},
 			// 提交签名
-			saveSign() {
-        if(this.isOrNo == 0){
-          this.checkEmpty(); // 调用 表单非空验证
-        }else{
-          console.log("拍照上传文件:" + this.File)
-
-          Toast.loading({duration: 0,forbidClick: true, message: "上传中..." });
-               	let fd=new FormData()
-               	let signType = '2';
-               	fd.append("file",this.File)
-               	fd.append("expressNo", this.expressNo);
-               	fd.append("signType", signType);
-               	fd.append("remark",this.remark);
-               	this.$http.post(this.$store.state.host + "/solic/uploadpict", fd,{ emulateJSON: true })
-               	.then(res => {
-               	   //发送成功
-               	   if (res.body.msg == 'success') {
-               	   	//签收成功
-               	   	Toast.success('签收成功')
-                    setTimeout(() => {
-                    	this.$router.push({
-                    		path: '/',
-                    		query: {}
-                    	});
-                    }, 2000)
-               	   } else {
-               	   	Toast.fail('签收失败')
-               	   }
-               	},res=>{
-
-               	});
+			saveSign() {
+        if(this.isOrNo == 0){
+          this.checkEmpty(); // 调用 表单非空验证
+        }else{
+          console.log("拍照上传文件:" + this.File)
+
+          Toast.loading({duration: 0,forbidClick: true, message: "上传中..." });
+               	let fd=new FormData()
+               	let signType = '2';
+               	fd.append("file",this.File)
+               	fd.append("expressNo", this.expressNo);
+               	fd.append("signType", signType);
+               	fd.append("remark",this.remark);
+               	this.$http.post(this.$store.state.host + "/solic/uploadpict", fd,{ emulateJSON: true })
+               	.then(res => {
+               	   //发送成功
+               	   if (res.body.msg == 'success') {
+               	   	//签收成功
+               	   	Toast.success('签收成功')
+                    setTimeout(() => {
+                    	this.$router.push({
+                    		path: '/',
+                    		query: {}
+                    	});
+                    }, 2000)
+               	   } else {
+               	   	Toast.fail('签收失败')
+               	   }
+               	},res=>{
+
+               	});
         }
 
 			},
@@ -243,10 +243,10 @@
 					let signType = '2';
 					var file = this.dataURLtoFile(image, this.expressNo + signType +".jpg");
 					let fd = new FormData();
-					fd.append("files", file);
+					fd.append("files", file);
           console.log("签字上传文件:" + file)
 					fd.append("expressNo", this.expressNo);
-					fd.append("signType", signType);
+					fd.append("signType", signType);
           fd.append("remark",this.remark);
 					this.$http.post(this.$store.state.host + "/solic/saveEnclosureImg.do", fd)
 						.then(res => {
@@ -310,8 +310,8 @@
 				return new File([u8arr], filename, {
 					type: mime
 				});
-			},
-
+			},
+
       //=======================结束======================
 		},
 	};
@@ -324,19 +324,19 @@
 
 		.content {
 			text-align: center;
-			padding: 0rem .37rem;
-      .sm {
-        display: flex;
-        margin-bottom: .2rem;
-        justify-content: space-between;
-        align-items: center;
-
-        img {
-          width: .4rem;
-          height: .4rem;
-
-        }
-      }
+			padding: 0rem .37rem;
+      .sm {
+        display: flex;
+        margin-bottom: .2rem;
+        justify-content: space-between;
+        align-items: center;
+
+        img {
+          width: .4rem;
+          height: .4rem;
+
+        }
+      }
 
 			.title {
 				font-size: .36rem;

+ 95 - 95
src/pages/sign2.vue

@@ -1,26 +1,26 @@
 <template>
 	<!-- 手写签名组件 -->
 	<div class="page sign-page">
-		<div class="content">
+		<div class="content">
 
-			<div class="sm">
-			  <p class="title" style="text-align: center;">签收</p>
-			  <!-- <img src="../assets/images/phone.jpg" alt="" @click="chooseImage()"/> -->
-			  <van-uploader  :after-read="afterRead">
-			    <img src="../assets/images/phone.jpg"/>
-			  </van-uploader>
-			</div>
+			<div class="sm">
+			  <p class="title" style="text-align: center;">签收</p>
+			  <!-- <img src="../assets/images/phone.jpg" alt="" @click="chooseImage()"/> -->
+			  <van-uploader  :after-read="afterRead">
+			    <img src="../assets/images/phone.jpg"/>
+			  </van-uploader>
+			</div>
 
 			<div class="whrite-content">
 				<p>快递单号:{{expressNoList}}</p>
-				<div class="sign-wrap" id="signWrap" v-if="isOrNo == 0">
-					<canvas id="myCanvas" width="400px" height="100%"></canvas>
-				</div>
-
-        <div class="sign-wrap"  style="display: flex; align-items: center;" v-else>
-        	<img style="width: 100%;" :src="phoneImage"/>
-        </div>
-
+				<div class="sign-wrap" id="signWrap" v-if="isOrNo == 0">
+					<canvas id="myCanvas" width="400px" height="100%"></canvas>
+				</div>
+
+        <div class="sign-wrap"  style="display: flex; align-items: center;" v-else>
+        	<img style="width: 100%;" :src="phoneImage"/>
+        </div>
+
         <van-field type="text" v-model="remark" label="快递备注" placeholder="输入快递备注" />
 				<div class="con-btn">
 					<span class="staging-btn size14" @click="clearArea()">清除签名</span>
@@ -48,15 +48,15 @@
 				ctx: "",
 				lastX: 0,
 				lastY: 0,
-				expressNoList: '',
-        phoneImage:"",
-        isOrNo: 0,
-        File:'',
+				expressNoList: '',
+        phoneImage:"",
+        isOrNo: 0,
+        File:'',
         remark: '', //快递备注
 			};
 		},
 		created() {
-			this.isLogin();
+			
 			this.expressNoList = this.$route.query.expressNoList
 		},
 		mounted() {
@@ -71,16 +71,16 @@
 			// 监听touchstart事件,touchmove事件,touchend事件等事件
 			this.InitThis();
 		},
-		methods: {
-      //限制
-      onOversize(file){
-      	Toast('文件大小不能超过 50M');
-      },
-      //图片上传
-      afterRead(file){
-        this.isOrNo = 1
-        this.phoneImage = file.content
-        this.File = file.file
+		methods: {
+      //限制
+      onOversize(file){
+      	Toast('文件大小不能超过 50M');
+      },
+      //图片上传
+      afterRead(file){
+        this.isOrNo = 1
+        this.phoneImage = file.content
+        this.File = file.file
       },
 			InitThis() {
 				// 触摸屏
@@ -170,59 +170,59 @@
 			},
 			// 清空画板
 			clearArea() {
-				if(this.isOrNo == 0){//画板
-				  this.ctx.setTransform(1, 0, 0, 1, 0, 0);
-				  this.ctx.clearRect(0, 0, this.ctx.canvas.width, this.ctx.canvas.height);
-				}else{
-				  this.phoneImage = ''
-				  this.isOrNo = 0;
-				  setTimeout(() => {
-				  	this.image = "";
-				  	this.mousePressed = false;
-				  	var lastX, lastY;
-				  	this.ctx = document.getElementById("myCanvas").getContext("2d");
-				  	this.c = document.getElementById("myCanvas");
-				  	var signWrap = document.getElementById("signWrap");
-				  	this.c.width = signWrap.clientWidth; // 设置宽度
-				  	this.c.height = signWrap.clientHeight; // 设置高度
-				  	// 监听touchstart事件,touchmove事件,touchend事件等事件
-				  	this.InitThis();
-				  }, 300)
-				}
+				if(this.isOrNo == 0){//画板
+				  this.ctx.setTransform(1, 0, 0, 1, 0, 0);
+				  this.ctx.clearRect(0, 0, this.ctx.canvas.width, this.ctx.canvas.height);
+				}else{
+				  this.phoneImage = ''
+				  this.isOrNo = 0;
+				  setTimeout(() => {
+				  	this.image = "";
+				  	this.mousePressed = false;
+				  	var lastX, lastY;
+				  	this.ctx = document.getElementById("myCanvas").getContext("2d");
+				  	this.c = document.getElementById("myCanvas");
+				  	var signWrap = document.getElementById("signWrap");
+				  	this.c.width = signWrap.clientWidth; // 设置宽度
+				  	this.c.height = signWrap.clientHeight; // 设置高度
+				  	// 监听touchstart事件,touchmove事件,touchend事件等事件
+				  	this.InitThis();
+				  }, 300)
+				}
 
 			},
 			// 提交签名
 			saveSign() {
-				if(this.isOrNo == 0){
-				  this.checkEmpty(); // 调用 表单非空验证
-				}else{
-				  console.log("拍照上传文件:" + this.File)
-
-				  Toast.loading({duration: 0,forbidClick: true, message: "上传中..." });
-				       	let fd=new FormData()
-				       	let signType = '2';
-				       	fd.append("file",this.File)
-				       	fd.append("expressNoList", this.expressNoList);
-				       	fd.append("signType", signType);
-				       	fd.append("remark",this.remark);
-				       	this.$http.post(this.$store.state.host + "/solic/uploadpict2", fd,{ emulateJSON: true })
-				       	.then(res => {
-				       	   //发送成功
-				       	   if (res.body.msg == 'success') {
-				       	   	//签收成功
-				       	   	Toast.success('签收成功')
-				            setTimeout(() => {
-				            	this.$router.push({
-				            		path: '/',
-				            		query: {}
-				            	});
-				            }, 2000)
-				       	   } else {
-				       	   	Toast.fail('签收失败')
-				       	   }
-				       	},res=>{
-
-				       	});
+				if(this.isOrNo == 0){
+				  this.checkEmpty(); // 调用 表单非空验证
+				}else{
+				  console.log("拍照上传文件:" + this.File)
+
+				  Toast.loading({duration: 0,forbidClick: true, message: "上传中..." });
+				       	let fd=new FormData()
+				       	let signType = '2';
+				       	fd.append("file",this.File)
+				       	fd.append("expressNoList", this.expressNoList);
+				       	fd.append("signType", signType);
+				       	fd.append("remark",this.remark);
+				       	this.$http.post(this.$store.state.host + "/solic/uploadpict2", fd,{ emulateJSON: true })
+				       	.then(res => {
+				       	   //发送成功
+				       	   if (res.body.msg == 'success') {
+				       	   	//签收成功
+				       	   	Toast.success('签收成功')
+				            setTimeout(() => {
+				            	this.$router.push({
+				            		path: '/',
+				            		query: {}
+				            	});
+				            }, 2000)
+				       	   } else {
+				       	   	Toast.fail('签收失败')
+				       	   }
+				       	},res=>{
+
+				       	});
 				}
 			},
 			checkEmpty() {
@@ -241,7 +241,7 @@
 					let fd = new FormData();
 					fd.append("files", file);
 					fd.append("expressNoList", this.expressNoList);
-					fd.append("signType", signType);
+					fd.append("signType", signType);
           fd.append("remark",this.remark);
 					this.$http.post(this.$store.state.host + "/solic/saveEnclosureImg2.do", fd)
 						.then(res => {
@@ -317,20 +317,20 @@
 
 		.content {
 			text-align: center;
-			padding: 0rem .37rem;
-
-      .sm {
-        display: flex;
-        margin-bottom: .2rem;
-        justify-content: space-between;
-        align-items: center;
-
-        img {
-          width: .4rem;
-          height: .4rem;
-
-        }
-      }
+			padding: 0rem .37rem;
+
+      .sm {
+        display: flex;
+        margin-bottom: .2rem;
+        justify-content: space-between;
+        align-items: center;
+
+        img {
+          width: .4rem;
+          height: .4rem;
+
+        }
+      }
 
 			.title {
 				font-size: .36rem;

+ 1 - 1
src/pages/sjdj.vue

@@ -163,7 +163,7 @@
       }
     },
     created: function() {
-      this.isLogin();
+      
       this.isPayOnDelivery= '否'; //是否到付件
       this.isIncludeChldren='否'; //是否包含子件
       this.expressType='文件'; //快件类型

+ 21 - 21
src/pages/sysearch.vue

@@ -17,15 +17,15 @@
 								<p>{{item.recordDate}}</p>
 							</div>
 						</div>
-						<!-- 收件 -->
+						<!-- 收件 -->
             <template v-if="item.type == 1">
 							<p v-if="item.status == 0" class="staus1">待签收</p>
 							<p v-if="item.status == 1" class="staus1">已签收</p>
 							<p v-if="item.status == 2" class="staus1">已代收</p>
 							<p v-if="item.status == 3" class="staus1">拒收</p>
-							<p v-if="item.status == 4" class="staus1">延迟派送</p>
-              <p v-if="item.status == 5" class="staus1">无人收件</p>
-              <p v-if="item.status == 6" class="staus1">重新分拣</p>
+							<p v-if="item.status == 4" class="staus1">延迟派送</p>
+              <p v-if="item.status == 5" class="staus1">无人收件</p>
+              <p v-if="item.status == 6" class="staus1">重新分拣</p>
             </template>
 						<!-- 寄件 -->
 						<template v-if="item.type == 2">
@@ -53,13 +53,13 @@
 				titlename:"首页查询",
 				value:"",
 				expressNo:"",//快递单号
-				resultList:[],
+				resultList:[],
         searchType:""//1.搜索全部 2.搜索快件 3.搜索寄件
 			}
 		},
 		created:function(){
-			this.isLogin();
-			this.expressNo = this.$route.query.expressNo
+			
+			this.expressNo = this.$route.query.expressNo
       this.searchType = this.$route.query.searchType
 			this.value = this.expressNo
 		},
@@ -121,7 +121,7 @@
 			},
 
 			//跳转详情
-			goInfo(expressNo,type){
+			goInfo(expressNo,type){
         //收件查询
 				if(type == 1){
 					this.$router.push({path:'/Kjsearchinfo',query:{expressNo:expressNo,type:type}})
@@ -137,26 +137,26 @@
 				this.getData()
 			},
 			//后端获取数据
-			getData(){
+			getData(){
         localStorage.getItem("userId")
 				Toast.loading({
 				    message: '加载中...',
 				    forbidClick: true,
 				    duration:0
-				});
+				});
         console.log("后端获取数据:expressNo = " + this.expressNo);
-				this.$http.post(this.$store.state.host+"/solic/getExpressListByNo",{
-          expressNo:this.expressNo,
-          searchType:this.searchType,
-          mailRoomId:localStorage.getItem('roomId'),
-          userId:localStorage.getItem('userId'),
+				this.$http.post(this.$store.state.host+"/solic/getExpressListByNo",{
+          expressNo:this.expressNo,
+          searchType:this.searchType,
+          mailRoomId:localStorage.getItem('roomId'),
+          userId:localStorage.getItem('userId'),
           },{emulateJSON:true})
-					.then(res=>{
-            if(res.body.msg == "success"){
-            	//发送成功
-            	this.resultList = res.body.resultList
-            }else if(res.body.msg == "查无此单号"){
-              Toast("查无此快递单号!")
+					.then(res=>{
+            if(res.body.msg == "success"){
+            	//发送成功
+            	this.resultList = res.body.resultList
+            }else if(res.body.msg == "查无此单号"){
+              Toast("查无此快递单号!")
             }
 				},res=>{
 						//发送失败

+ 0 - 18
src/script/common.js

@@ -96,24 +96,6 @@ export default {
 					//发送失败
 				})
 		}
-
-		//登录判断
-		Vue.prototype.isLogin = function () {
-			this.$http.post(this.$store.state.host + "/appSysUser/isLogin.do", {
-			}, { emulateJSON: true })
-				.then(res => {
-					console.log(res.body)
-					//发送成功
-					if (res.body.msg == 'success') {
-						console.log("isLogin=Y")
-					} else {
-						//本地 注释  服务器 放开
-						//localStorage.clear();
-					}
-				}, res => {
-					//发送失败
-				})
-		}
 	}