From 72907ea511c490ecfbd42b7d125f13d9edbbc53b Mon Sep 17 00:00:00 2001
From: Panzihang <819652404@qq.com>
Date: Thu, 24 Aug 2023 17:06:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B6=E9=83=A8=E5=AF=BC=E8=88=AA=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/head-view/head-view.vue | 14 ++++++++++++--
 pages/index/instructDetails.vue    |  2 ++
 pages/shipWork/abnormal.vue        |  2 +-
 pages/shipWork/abnormalAdd.vue     |  2 +-
 pages/shipWork/brandDetails.vue    |  2 +-
 pages/shipWork/carDetails.vue      |  2 +-
 pages/shipWork/documentList.vue    |  2 +-
 pages/shipWork/mafi.vue            |  2 +-
 pages/shipWork/mafiAdd.vue         |  2 +-
 pages/shipWork/mixWork.vue         |  2 +-
 pages/shipWork/notice.vue          |  2 +-
 pages/shipWork/noticeAdd.vue       |  2 +-
 pages/shipWork/opinion.vue         |  2 +-
 pages/shipWork/opinionAdd.vue      |  2 +-
 pages/shipWork/patrol.vue          |  2 +-
 pages/shipWork/patrolAdd.vue       |  2 +-
 pages/shipWork/peopleAdd.vue       |  2 +-
 pages/shipWork/shipInfo.vue        |  2 +-
 pages/shipWork/shipPlan.vue        |  2 +-
 pages/shipWork/sign.vue            |  1 -
 pages/shipWork/supply.vue          |  2 +-
 pages/shipWork/supplyAdd.vue       |  2 +-
 pages/shipWork/untieAdd.vue        |  2 +-
 pages/shipWork/untieCord.vue       |  2 +-
 pages/shipWork/workAssign.vue      |  2 +-
 pages/shipWork/workAssignAdd.vue   |  2 +-
 26 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/components/head-view/head-view.vue b/components/head-view/head-view.vue
index 08aa1cf..eac6f50 100644
--- a/components/head-view/head-view.vue
+++ b/components/head-view/head-view.vue
@@ -16,11 +16,21 @@
 			type: {
 				type: Boolean,
 				default: () => false
-			}
+			},
+			url: {
+				type: String,
+				default: () => ""
+			},
 		},
 		methods: {
 			toBack() {
-				uni.navigateBack('-1')
+				if (this.url != "") {
+					uni.navigateTo({
+						url: `${this.url}`
+					})
+				} else {
+					uni.navigateBack('-1')
+				}
 			}
 		}
 	}
diff --git a/pages/index/instructDetails.vue b/pages/index/instructDetails.vue
index 0e84253..ede28fb 100644
--- a/pages/index/instructDetails.vue
+++ b/pages/index/instructDetails.vue
@@ -1,5 +1,6 @@
 <template>
 	<view class="details">
+		<head-view :title="title"></head-view>
 		<view class="container">
 			<view class="liBox">
 				<view class="title">
@@ -287,6 +288,7 @@
 	export default {
 		data() {
 			return {
+				title: "货物详情",
 				id: 0
 			}
 		},
diff --git a/pages/shipWork/abnormal.vue b/pages/shipWork/abnormal.vue
index 7261bc4..7f384b7 100644
--- a/pages/shipWork/abnormal.vue
+++ b/pages/shipWork/abnormal.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="abnormal">
-		<head-view :title="title"></head-view>
+		<head-view :title="title" url="/pages/shipWork/documentList"></head-view>
 		<view class="container">
 			<view class="signBox">
 				<p class="sign" @click="sign">点击签名</p>
diff --git a/pages/shipWork/abnormalAdd.vue b/pages/shipWork/abnormalAdd.vue
index b216ec1..c33bf40 100644
--- a/pages/shipWork/abnormalAdd.vue
+++ b/pages/shipWork/abnormalAdd.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="abnormalAdd">
-		<head-view :title="title"></head-view>
+		<head-view :title="title" url="/pages/shipWork/abnormal"></head-view>
 		<view class="container">
 			<view class="ul">
 				<view class="li">
diff --git a/pages/shipWork/brandDetails.vue b/pages/shipWork/brandDetails.vue
index 0fb124f..ffa0d75 100644
--- a/pages/shipWork/brandDetails.vue
+++ b/pages/shipWork/brandDetails.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="brandDetails">
-		<head-view :title="title"></head-view>
+		<head-view :title="title" url="/pages/shipWork/documentList"></head-view>
 		<view class="container">
 			<view class="topBox">
 				<view class="searchBox">
diff --git a/pages/shipWork/carDetails.vue b/pages/shipWork/carDetails.vue
index b4f250d..465571e 100644
--- a/pages/shipWork/carDetails.vue
+++ b/pages/shipWork/carDetails.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="carDetails">
-		<head-view :title="title"></head-view>
+		<head-view :title="title" url="/pages/shipWork/brandDetails"></head-view>
 		<view class="container">
 			<view class="ul">
 				<view class="li">船名：{{testInfo.vslCnname}}</view>
diff --git a/pages/shipWork/documentList.vue b/pages/shipWork/documentList.vue
index e70242c..58ab749 100644
--- a/pages/shipWork/documentList.vue
+++ b/pages/shipWork/documentList.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="documentList">
-		<head-view :title="title" :type="true"></head-view>
+		<head-view :title="title" :type="true" url="/pages/shipWork/index"></head-view>
 		<uni-notice-bar show-icon single :text="noticeText" />
 		<view class="container">
 			<view class="workBox">
diff --git a/pages/shipWork/mafi.vue b/pages/shipWork/mafi.vue
index 6ae6db9..d3e72af 100644
--- a/pages/shipWork/mafi.vue
+++ b/pages/shipWork/mafi.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="mafi">
-		<head-view :title="title"></head-view>
+		<head-view :title="title" url="/pages/shipWork/documentList"></head-view>
 		<view class="container">
 			<view class="signBox">
 				<p class="sign" @click="sign">点击签名</p>
diff --git a/pages/shipWork/mafiAdd.vue b/pages/shipWork/mafiAdd.vue
index 82f3e6c..1cb8336 100644
--- a/pages/shipWork/mafiAdd.vue
+++ b/pages/shipWork/mafiAdd.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="mafiAdd">
-		<head-view :title="title"></head-view>
+		<head-view :title="title" url="/pages/shipWork/mafi"></head-view>
 		<view class="container">
 			<view class="ul">
 				<view class="li">
diff --git a/pages/shipWork/mixWork.vue b/pages/shipWork/mixWork.vue
index 0c1a365..a78dc76 100644
--- a/pages/shipWork/mixWork.vue
+++ b/pages/shipWork/mixWork.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="mixWork">
-		<head-view :title="title"></head-view>
+		<head-view :title="title" url="/pages/shipWork/documentList"></head-view>
 		<view class="container">
 			<view class="signBox">
 				<p class="sign" @click="sign">点击签名</p>
diff --git a/pages/shipWork/notice.vue b/pages/shipWork/notice.vue
index f47cc6d..fd70f8d 100644
--- a/pages/shipWork/notice.vue
+++ b/pages/shipWork/notice.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="notice">
-		<head-view :title="title"></head-view>
+		<head-view :title="title" url="/pages/shipWork/documentList"></head-view>
 		<view class="container">
 			<view class="signBox">
 				<p class="sign" @click="sign">点击签名</p>
diff --git a/pages/shipWork/noticeAdd.vue b/pages/shipWork/noticeAdd.vue
index a970ca4..55c127a 100644
--- a/pages/shipWork/noticeAdd.vue
+++ b/pages/shipWork/noticeAdd.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="noticeAdd">
-		<head-view :title="title"></head-view>
+		<head-view :title="title" url="/pages/shipWork/notice"></head-view>
 		<view class="container">
 			<view class="ul">
 				<view class="li">
diff --git a/pages/shipWork/opinion.vue b/pages/shipWork/opinion.vue
index 1b95a53..6acc46e 100644
--- a/pages/shipWork/opinion.vue
+++ b/pages/shipWork/opinion.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="opinion">
-		<head-view :title="title"></head-view>
+		<head-view :title="title" url="/pages/shipWork/documentList"></head-view>
 		<view class="container">
 			<view class="signBox">
 				<p class="sign" @click="sign">点击签名</p>
diff --git a/pages/shipWork/opinionAdd.vue b/pages/shipWork/opinionAdd.vue
index 6c051e7..7c7b1b1 100644
--- a/pages/shipWork/opinionAdd.vue
+++ b/pages/shipWork/opinionAdd.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="opinionAdd">
-		<head-view :title="title"></head-view>
+		<head-view :title="title" url="/pages/shipWork/opinion"></head-view>
 		<view class="container">
 			<view class="ul">
 				<view class="li">
diff --git a/pages/shipWork/patrol.vue b/pages/shipWork/patrol.vue
index 5155ebe..86e09bf 100644
--- a/pages/shipWork/patrol.vue
+++ b/pages/shipWork/patrol.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="patrol">
-		<head-view :title="title"></head-view>
+		<head-view :title="title" url="/pages/shipWork/documentList"></head-view>
 		<view class="container">
 			<template v-if="infoList.length > 0">
 				<view class="ul">
diff --git a/pages/shipWork/patrolAdd.vue b/pages/shipWork/patrolAdd.vue
index 3626273..7a8e6c0 100644
--- a/pages/shipWork/patrolAdd.vue
+++ b/pages/shipWork/patrolAdd.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="patrolAdd">
-		<head-view :title="title"></head-view>
+		<head-view :title="title" url="/pages/shipWork/patrol"></head-view>
 		<view class="container">
 			<view class="ul">
 				<view class="li">
diff --git a/pages/shipWork/peopleAdd.vue b/pages/shipWork/peopleAdd.vue
index c65a52a..44199af 100644
--- a/pages/shipWork/peopleAdd.vue
+++ b/pages/shipWork/peopleAdd.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="peopleAdd">
-		<head-view :title="title"></head-view>
+		<head-view :title="title" url="/pages/shipWork/mixWork"></head-view>
 		<view class="container">
 			<view class="ul">
 				<view class="li">
diff --git a/pages/shipWork/shipInfo.vue b/pages/shipWork/shipInfo.vue
index 9b33761..cf09812 100644
--- a/pages/shipWork/shipInfo.vue
+++ b/pages/shipWork/shipInfo.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="shipInfo">
-		<head-view :title="title"></head-view>
+		<head-view :title="title" url="/pages/shipWork/documentList"></head-view>
 		<view class="container">
 			<view class="ul">
 				<view class="li">船名：{{shipInfo.vslCnname}}</view>
diff --git a/pages/shipWork/shipPlan.vue b/pages/shipWork/shipPlan.vue
index 5523659..7006a97 100644
--- a/pages/shipWork/shipPlan.vue
+++ b/pages/shipWork/shipPlan.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="shipPlan">
-		<head-view :title="title"></head-view>
+		<head-view :title="title" url="/pages/shipWork/documentList"></head-view>
 		<view class="container">
 			<p class="title">基本信息</p>
 			<view class="ul">
diff --git a/pages/shipWork/sign.vue b/pages/shipWork/sign.vue
index 23ceaf2..e000120 100644
--- a/pages/shipWork/sign.vue
+++ b/pages/shipWork/sign.vue
@@ -50,7 +50,6 @@
 
 			uni.getSystemInfo({
 				success: function(res) {
-					console.log(res);
 					that.width = res.windowWidth * 0.8;
 					that.height = res.windowHeight * 0.85;
 				}
diff --git a/pages/shipWork/supply.vue b/pages/shipWork/supply.vue
index 16dc4b2..d406dde 100644
--- a/pages/shipWork/supply.vue
+++ b/pages/shipWork/supply.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="supply">
-		<head-view :title="title"></head-view>
+		<head-view :title="title" url="/pages/shipWork/documentList"></head-view>
 		<view class="container">
 			<view class="signBox">
 				<p class="sign" @click="sign">点击签名</p>
diff --git a/pages/shipWork/supplyAdd.vue b/pages/shipWork/supplyAdd.vue
index e20bfc2..aa3a2c3 100644
--- a/pages/shipWork/supplyAdd.vue
+++ b/pages/shipWork/supplyAdd.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="supplyAdd">
-		<head-view :title="title"></head-view>
+		<head-view :title="title" url="/pages/shipWork/supply"></head-view>
 		<view class="container">
 			<view class="ul">
 				<view class="li">
diff --git a/pages/shipWork/untieAdd.vue b/pages/shipWork/untieAdd.vue
index e2d9d31..81f673a 100644
--- a/pages/shipWork/untieAdd.vue
+++ b/pages/shipWork/untieAdd.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="untieAdd">
-		<head-view :title="title"></head-view>
+		<head-view :title="title" url="/pages/shipWork/untieCord"></head-view>
 		<view class="container">
 			<view class="ul">
 				<view class="li">
diff --git a/pages/shipWork/untieCord.vue b/pages/shipWork/untieCord.vue
index 2c3557f..31204f4 100644
--- a/pages/shipWork/untieCord.vue
+++ b/pages/shipWork/untieCord.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="untieCord">
-		<head-view :title="title"></head-view>
+		<head-view :title="title" url="/pages/shipWork/documentList"></head-view>
 		<view class="container">
 			<view class="signBox">
 				<p class="sign" @click="sign">点击签名</p>
diff --git a/pages/shipWork/workAssign.vue b/pages/shipWork/workAssign.vue
index 9033ce6..119346d 100644
--- a/pages/shipWork/workAssign.vue
+++ b/pages/shipWork/workAssign.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="workAssign">
-		<head-view :title="title"></head-view>
+		<head-view :title="title" url="/pages/shipWork/documentList"></head-view>
 		<view class="container">
 			<view class="signBox">
 				<p class="sign" @click="sign">点击签名</p>
diff --git a/pages/shipWork/workAssignAdd.vue b/pages/shipWork/workAssignAdd.vue
index 852818c..e979b2c 100644
--- a/pages/shipWork/workAssignAdd.vue
+++ b/pages/shipWork/workAssignAdd.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="workAssignAdd">
-		<head-view :title="title"></head-view>
+		<head-view :title="title" url="/pages/shipWork/workAssign"></head-view>
 		<view class="container">
 			<view class="ul">
 				<view class="li">