Merge branch 'dev2' of http://61.184.202.72:3000/wsnet/PDA-App into dev2

pages.json

@@ -48,7 +48,10 @@
 		{
 			"path": "pages/shipWork/sign",
 			"style": {
-				"navigationBarTitleText": "单证签名"
+				"navigationBarTitleText": "单证签名",
+				"usingComponents": {
+					"van-button": "/wxcomponents/vant/dist/button/index"
+				}
 			}
 		},
 		{
@@ -251,7 +254,10 @@
 		{
 			"path": "pages/monitor/sign",
 			"style": {
-				"navigationBarTitleText": "签名"
+				"navigationBarTitleText": "签名",
+				"usingComponents": {
+					"van-button": "/wxcomponents/vant/dist/button/index"
+				}
 			}
 		},
 		{

pages/monitor/sign.vue

@@ -1,13 +1,6 @@
 <template>
 	<view class="container">
-		<view class="sigh-btns">
+
-			<van-button class="btn" type="default" @tap="handleCancel">取消</van-button>
-			<van-button class="btn" type="default" @tap="handleReset">重写</van-button>
-			<van-button class="btn" type="default" @tap="handleConfirm">确认</van-button>
-			<!-- <button class="btn" @tap="handleCancel">取消</button>
-			<button class="btn" @tap="handleReset">重写</button>
-			<button class="btn" @tap="handleConfirm">确认</button> -->
-		</view>
 		<view class="sign-box">
 			<canvas class="mycanvas" :style="{width:width +'px',height:height +'px'}" canvas-id="mycanvas"
 				@touchstart="touchstart" @touchmove="touchmove" @touchend="touchend"></canvas>
@@ -15,6 +8,11 @@
 			<canvas canvas-id="camCacnvs" :style="{width:height +'px',height:width +'px'}" class="canvsborder"></canvas>
 
 		</view>
+		<view class="sigh-btns">
+			<van-button class="btn" type="default" @tap="handleCancel">取消</van-button>
+			<van-button class="btn" type="default" @tap="handleReset">重写</van-button>
+			<van-button class="btn" type="default" @tap="handleConfirm">确认</van-button>
+		</view>
 	</view>
 
 </template>
@@ -175,10 +173,9 @@
 
 <style lang="scss" scoped>
 	.container {
-		display: flex;
+		height: calc(100vh - 44px);
-		flex-direction: row;
+		padding-bottom: 30px;
-		height: 100%;
+		background-color: #fff;
-		padding: 50px 0;
 	}
 
 	.sign-box {
@@ -195,20 +192,18 @@
 	}
 
 	.sigh-btns {
-		height: 100%;
-		margin: auto;
 		display: flex;
-		flex-direction: column;
+		justify-content: center;
-		justify-content: space-around;
 	}
 
 	.btn {
-		margin: 30px 0px;
+		margin: 30px 10px 0;
-		padding: 8rpx;
+	}
-		transform: rotate(90deg);
+
-		border: grey 1rpx solid;
+	/deep/.van-button {
 		width: 100px;
 		height: 50px;
+		background-color: #fff;
 	}
 
 	.mycanvas {

pages/shipWork/mixWork.vue

@@ -58,13 +58,14 @@
 			}
 		},
 		mounted() {
-			this.tabsType = this.$route.query.infoType
+			this.tabsType = uni.getStorageSync('tabsType')
 			if (this.tabsType != 0 && this.tabsType != 1) {
 				this.tabsType = 0
 				this.tabsIndex = 0
 			} else {
 				this.tabsIndex = this.tabsType
 			}
+			console.log(this.tabsType)
 			this.peopleInfo = uni.getStorageSync('addPeopleArr')
 			this.shiftInfo = uni.getStorageSync('addShiftArr')
 			this.shipInfo = uni.getStorageSync('shipInfo')
@@ -111,6 +112,10 @@
 					url: `/pages/shipWork/shiftDetails`
 				})
 			},
+		},
+		// 离开页面删除数据
+		destroyed() {
+			uni.removeStorageSync('tabsType')
 		}
 	}
 </script>

pages/shipWork/peopleAdd.vue

@@ -197,8 +197,9 @@
 			},
 			// 取消
 			cancel() {
+				uni.setStorageSync('tabsType', 0);
 				uni.navigateTo({
-					url: '/pages/shipWork/mixWork?infoType=0'
+					url: '/pages/shipWork/mixWork'
 				})
 			},
 			// 弹框删除
@@ -206,8 +207,9 @@
 				let addPeopleArr = uni.getStorageSync('addPeopleArr')
 				addPeopleArr.splice(this.peopleRowIndex, 1)
 				uni.setStorageSync('addPeopleArr', addPeopleArr);
+				uni.setStorageSync('tabsType', 0);
 				uni.navigateTo({
-					url: '/pages/shipWork/mixWork?infoType=0'
+					url: '/pages/shipWork/mixWork'
 				})
 			},
 			// 删除
@@ -246,9 +248,9 @@
 					}
 
 				}
-
+				uni.setStorageSync('tabsType', 0);
 				uni.navigateTo({
-					url: '/pages/shipWork/mixWork?infoType=0'
+					url: '/pages/shipWork/mixWork'
 				})
 			},
 			// 编辑

pages/shipWork/shiftAdd.vue

@@ -492,8 +492,9 @@
 
 			// 取消
 			cancel() {
+				uni.setStorageSync('tabsType', 1);
 				uni.navigateTo({
-					url: '/pages/shipWork/mixWork?infoType=1'
+					url: '/pages/shipWork/mixWork'
 				})
 			},
 			// 上一步
@@ -529,8 +530,9 @@
 					addShiftArr[this.shiftRowIndex] = addShiftObj;
 					uni.setStorageSync('addShiftArr', addShiftArr);
 				}
+				uni.setStorageSync('tabsType', 1);
 				uni.navigateTo({
-					url: '/pages/shipWork/mixWork?infoType=1'
+					url: '/pages/shipWork/mixWork'
 				})
 			},
 		}

pages/shipWork/shiftDetails.vue

@@ -177,8 +177,9 @@
 			},
 			// 取消
 			cancel() {
+				uni.setStorageSync('tabsType', 1);
 				uni.navigateTo({
-					url: '/pages/shipWork/mixWork?infoType=1'
+					url: '/pages/shipWork/mixWork'
 				})
 			},
 			// 弹框删除
@@ -186,8 +187,9 @@
 				let addShiftArr = uni.getStorageSync('addShiftArr')
 				addShiftArr.splice(this.shiftRowIndex, 1)
 				uni.setStorageSync('addShiftArr', addShiftArr);
+				uni.setStorageSync('tabsType', 1);
 				uni.navigateTo({
-					url: '/pages/shipWork/mixWork?infoType=1'
+					url: '/pages/shipWork/mixWork'
 				})
 			},
 			// 删除

pages/shipWork/sign.vue

@@ -1,13 +1,6 @@
 <template>
 	<view class="container">
-		<view class="sigh-btns">
+
-			<van-button class="btn" type="default" @tap="handleCancel">取消</van-button>
-			<van-button class="btn" type="default" @tap="handleReset">重写</van-button>
-			<van-button class="btn" type="default" @tap="handleConfirm">确认</van-button>
-			<!-- <button class="btn" @tap="handleCancel">取消</button>
-			<button class="btn" @tap="handleReset">重写</button>
-			<button class="btn" @tap="handleConfirm">确认</button> -->
-		</view>
 		<view class="sign-box">
 			<canvas class="mycanvas" :style="{width:width +'px',height:height +'px'}" canvas-id="mycanvas"
 				@touchstart="touchstart" @touchmove="touchmove" @touchend="touchend"></canvas>
@@ -15,6 +8,11 @@
 			<canvas canvas-id="camCacnvs" :style="{width:height +'px',height:width +'px'}" class="canvsborder"></canvas>
 
 		</view>
+		<view class="sigh-btns">
+			<van-button class="btn" type="default" @tap="handleCancel">取消</van-button>
+			<van-button class="btn" type="default" @tap="handleReset">重写</van-button>
+			<van-button class="btn" type="default" @tap="handleConfirm">确认</van-button>
+		</view>
 	</view>
 
 </template>
@@ -175,10 +173,9 @@
 
 <style lang="scss" scoped>
 	.container {
-		display: flex;
+		height: calc(100vh - 44px);
-		flex-direction: row;
+		padding-bottom: 30px;
-		height: 100%;
+		background-color: #fff;
-		padding: 50px 0;
 	}
 
 	.sign-box {
@@ -195,20 +192,18 @@
 	}
 
 	.sigh-btns {
-		height: 100%;
-		margin: auto;
 		display: flex;
-		flex-direction: column;
+		justify-content: center;
-		justify-content: space-around;
 	}
 
 	.btn {
-		margin: 30px 0px;
+		margin: 30px 10px 0;
-		padding: 8rpx;
+	}
-		transform: rotate(90deg);
+
-		border: grey 1rpx solid;
+	/deep/.van-button {
 		width: 100px;
 		height: 50px;
+		background-color: #fff;
 	}
 
 	.mycanvas {