fix:井道完成

common/global.css

@@ -15,11 +15,24 @@ uni-page-head .uni-btn-icon {
 }
 
 
-.uni-nav-bar-right-text{
+.uni-nav-bar-right-text {
 	font-size: 14px !important;
 }
 
-.uni-navbar-btn-text>text{
+.uni-nav-bar-text {
+	height: 28.8px;
+	width: 28.8px;
+	background: #ffffff;
+	border: 0.32px solid rgba(224, 224, 224, 1);
+	border-radius: 14.4px;
+	color: #333;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	text-align: center;
+}
+
+.uni-navbar-btn-text>text {
 	font-size: 14px !important;
 }
 
@@ -45,7 +58,7 @@ uni-page-head .uni-btn-icon {
 }
 
 .uni-navbar__header {
-	padding: 0 32px !important;
+	padding: 0 25.6px !important;
 	/* padding-right: 18px !important; */
 }
 

components/jackyq-signature/jackyq-signature.vue

+<template>
+	<view>
+		<view class="canvas-container">
+			<canvas canvas-id="canvas" id="canvas" :disable-scroll="true" style="width: 100%; height: 200px;background-color: #FFFFFF;"
+				@touchstart="handleTouchStart($event)" @touchmove="handleTouchMove($event)" @touchend="handleTouchEnd($event)"
+				@touchcancel="handleEnd($event)"></canvas>
+		</view>
+		<view class="btn-container">
+			<button class="cu-btn lg bg-blue" @click="handleConfirm()">确定</button>
+			<button class="cu-btn lg line-gray" @click="reset()">重置</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	var context = null
+	export default {
+		props: {
+			dialogVisiable: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				canvasData: []
+			};
+		},
+		watch: {
+			dialogVisiable() {
+				if (this.dialogVisiable === true) {
+					context = uni.createCanvasContext('canvas')
+					context.setLineWidth(3)
+					context.setStrokeStyle("#000000")
+					this.reset()
+				}
+			},
+			canvasData() {
+				context.moveTo(this.canvasData[0].x, this.canvasData[0].y)
+				for (let i = 0; i < this.canvasData.length; i++) {
+					context.lineTo(this.canvasData[i].x, this.canvasData[i].y)
+				}
+				context.stroke()
+				context.draw(true)
+			}
+		},
+		methods: {
+			reset() {
+				context.draw()
+			},
+			hideModal() {
+				this.$emit('update:dialogVisiable', false)
+			},
+			handleTouchStart(e) {
+				this.canvasData = []
+				const a = e.changedTouches[0]
+				this.canvasData.push({
+					x: a.x,
+					y: a.y
+				})
+			},
+			handleTouchMove(e) {
+				const a = e.changedTouches[0]
+				this.canvasData.push({
+					x: a.x,
+					y: a.y
+				})
+			},
+			handleTouchEnd(e) {
+				const a = e.changedTouches[0]
+				this.canvasData.push({
+					x: a.x,
+					y: a.y
+				})
+			},
+			handleEnd() {
+				context.stroke()
+				context.draw(true)
+			},
+			handleConfirm() {
+				uni.canvasToTempFilePath({
+					canvasId: 'canvas',
+					success: res => {
+						this.$emit('success', res.tempFilePath)
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.canvas-container {
+		width: 400px;
+	}
+	.btn-container {
+		padding-bottom: 20rpx;
+		display: flex;
+		justify-content: space-around;
+	}
+</style>

index.js

+import Signature from './components/jackyq-signature.vue'
+export default Signature
\ No newline at end of file

pages/listingManagement/index.vue

@@ -325,19 +325,21 @@ export default {
 </script>
 <style lang="less" scoped>
 .uni-nav-bar-text {
-  height: 28.8px;
-  width: 28.8px;
-  background: #ffffff;
-  border: 0.32px solid rgba(224, 224, 224, 1);
-  border-radius: 14.4px;
-  border-radius: 50%;
-  color: #333;
-  text-align: center;
-
-  .iconfont {
-    font-size: 16px;
-    line-height: 28.8px;
-  }
+	height: 28.8px;
+	width: 28.8px;
+	background: #ffffff;
+	border: 0.32px solid rgba(224, 224, 224, 1);
+	border-radius: 14.4px;
+	color: #333;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	text-align: center;
+
+	.iconfont {
+		font-size: 16px;
+		line-height: 28.8px;
+	}
 }
 
 .nav-right {

pages/shaftInspection/shaftInspectionList.vue

@@ -280,21 +280,6 @@ export default {
 
 <style lang="less" scoped>
 /* 导航栏样式 */
-.uni-nav-bar-text {
-  height: 28.8px;
-  width: 28.8px;
-  background: #ffffff;
-  border: 0.32px solid rgba(224, 224, 224, 1);
-  border-radius: 14.4px;
-  border-radius: 50%;
-  color: #333;
-  text-align: center;
-
-  .iconfont {
-    font-size: 16px;
-    line-height: 28.8px;
-  }
-}
 
 .nav-right {
   width: 192px;

uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue

 <template>
 	<view class="uni-navbar" :class="{'uni-dark':dark, 'uni-nvue-fixed': fixed}">
-		<view class="uni-navbar__content" :class="{ 'uni-navbar--fixed': fixed, 'uni-navbar--shadow': shadow, 'uni-navbar--border': border }"
-			:style="{ 'background-color': themeBgColor }" >
+		<view class="uni-navbar__content"
+			:class="{ 'uni-navbar--fixed': fixed, 'uni-navbar--shadow': shadow, 'uni-navbar--border': border }"
+			:style="{ 'background-color': themeBgColor }">
 			<status-bar v-if="statusBar" />
-			<view :style="{ color: themeColor,backgroundColor: themeBgColor ,height:navbarHeight}"
-				class="uni-navbar__header">
+			<view :style="{ color: themeColor,backgroundColor: themeBgColor ,height:navbarHeight}" class="uni-navbar__header">
 				<view @tap="onClickLeft" class="uni-navbar__header-btns uni-navbar__header-btns-left"
 					:style="{width:leftIconWidth}">
 					<slot name="left">
@@ -20,8 +20,7 @@
 				<view class="uni-navbar__header-container " @tap="onClickTitle">
 					<slot>
 						<view class="uni-navbar__header-container-inner" v-if="title.length>0">
-							<text class="uni-nav-bar-text uni-ellipsis-1"
-								:style="{color: themeColor }">{{ title }}</text>
+							<text class="uni-nav-bar-text uni-ellipsis-1" :style="{color: themeColor }">{{ title }}</text>
 						</view>
 					</slot>
 				</view>
@@ -205,11 +204,16 @@
 		position: sticky;
 		/* #endif */
 	}
+
 	.uni-navbar {
 		// box-sizing: border-box;
 	}
 
 	.uni-nav-bar-text {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		text-align: center;
 		/* #ifdef APP-PLUS */
 		font-size: 34rpx;
 		/* #endif */
@@ -354,4 +358,4 @@
 
 	// 暗主题配置
 	.uni-dark {}
-</style>
+</style>
\ No newline at end of file