Forráskód Böngészése

Signed-off-by: liuboyan <632697560@qq.com>
bug

liuboyan 4 éve
szülő
commit
8063c4a306
1 módosított fájl, 30 hozzáadás és 22 törlés
  1. 30 22
      pagesMain/openMember.vue

+ 30 - 22
pagesMain/openMember.vue

@@ -12,16 +12,16 @@
 			<u-cell-item title="实际金额" :value="'¥' + memberInfo.realPayAmount" :arrow="false"></u-cell-item>
 			<u-cell-item title="乙方签字" :arrow="false" :title-style="{width: '100%'}" required>
 				<view class="canvas-container" slot="label">
-					<canvas canvas-id="canvas" id="canvas" :disable-scroll="true" style="width: 100%; height: 200px;background-color: #FFFFFF;"
+					<canvas canvas-id="canvas" id="canvas" :disable-scroll="true" v-show="!couponShow && !studentShow" style="width: 100%; height: 200px;background-color: #FFFFFF;"
 					 @touchstart="handleTouchStart($event)" @touchmove="handleTouchMove($event)" @touchend="handleTouchEnd($event)"
 					 @touchcancel="handleEnd($event)"></canvas>
 				</view>
 			</u-cell-item>
 		</u-cell-group>
-		<u-popup v-model="couponShow" mode="bottom" border-radius="30" closeable @click.native.stop="">
+		<u-popup v-model="couponShow" mode="bottom" border-radius="30" closeable>
 			<scroll-view scroll-y style="height:300px;margin: 30px 0 15px 0;">
 				<u-card :show-head="false" :show-foot="false" padding="0px" margin="0px 30px 20px 30px" borderRadius="40" v-for="(item, index) in couponList"
-				 :key="index" class="class-card" @click.stop="selectCoupon(item)">
+				 :key="index" class="class-card" @click="selectCoupon(item)">
 					<view class="class-content" slot="body">
 						<view class="class-info-img">
 							<u-image width="60px" height="60px" :src="item.url" shape="circle"></u-image>
@@ -39,10 +39,10 @@
 			<text class="contract-link" @click="checkContract()">点击查看合同协议</text>
 			<u-button type="warning" shape="circle" :ripple="true" :custom-style="customStyle" @click="submitContract()">确定支付¥{{memberInfo.realPayAmount}}</u-button>
 		</view>
-		<u-popup v-model="studentShow" mode="bottom" border-radius="30" @click.native.stop="">
+		<u-popup v-model="studentShow" mode="bottom" border-radius="30">
 			<scroll-view scroll-y class="student-box">
 				<u-card :title="item.studentName" title-size="32" :head-style="cardStyle" :head-border-bottom="false" :show-foot="false"
-				 margin="10px" borderRadius="20" v-for="(item, index) in studentList" :key="index" @click.stop="selectStudent(item)">
+				 margin="10px" borderRadius="20" v-for="(item, index) in studentList" :key="index" @click="selectStudent(item)">
 					<view class="student-card" slot="body">
 						<view class="class-info-text">性别:{{item.sex}}&nbsp;&nbsp;年龄:{{item.age}}</view>
 					</view>
@@ -204,32 +204,40 @@
 			},
 			//  签字版触屏开始
 			handleTouchStart(e) {
+				if (!this.studentShow && !this.couponShow) {
+					const a = e.changedTouches[0]
+					this.canvasData.push({
+						x: a.x,
+						y: a.y
+					})
+				}
 				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
-				})
+				if (!this.studentShow && !this.couponShow) {
+					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
-				})
+				if (!this.studentShow && !this.couponShow) {
+					const a = e.changedTouches[0]
+					this.canvasData.push({
+						x: a.x,
+						y: a.y
+					})
+				}
 			},
 			handleEnd() {
-				context.stroke()
-				context.draw(true)
+				if (!this.studentShow && !this.couponShow) {
+					context.stroke()
+					context.draw(true)
+				}
 			},
 			//  提交签字
 			submitContract() {