修改测试bug

pagesMain/contractInfo.vue

@@ -1,14 +1,16 @@
 <template>
 	<view class="content">
 		<rich-text v-for="(item,index) in contractInfo" :key="index" :nodes="item.url" class="web-view"></rich-text>
-		<u-cell-group style="width: 100%; float: left;">
+		<u-cell-group style="width: 100%; float: left;padding:0;position: relative;">
 			<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" style="width: 100%; height: 260px;background-color: #FFFFFF;border:1px solid #aaa;border-radius: 5px;"
 					 @touchstart="handleTouchStart($event)" @touchmove="handleTouchMove($event)" @touchend="handleTouchEnd($event)"
 					 @touchcancel="handleEnd($event)"></canvas>
 				</view>
 			</u-cell-item>
+			<view style="width:80px;height:30px;text-align: center;line-height: 30px;background-color: #ff6e3e;color:#fff;border-radius: 5px;position: absolute;right:0;z-index:5;" @click="reset">重新签名</view>
+			<view style="width:80px;height:30px;"></view>
 		</u-cell-group>
 		<view class="handle-fix-box" style="height:100px">
 			<u-button style="margin-bottom: 10px;display: block;" type="warning" shape="circle" :ripple="true" :disabled="!ifSign" :custom-style="customStyle" @click="submitContract0()">其他方式支付</u-button>

pagesMain/orderList.vue

@@ -141,6 +141,7 @@
 			},
 			//  查看合同
 			handleContractShowClick(item) {
+				console.log(item);
 				uni.downloadFile({
 					url: item.url,
 					success: (res) => {
@@ -252,5 +253,6 @@
 		border-radius: 10px;
 		background-color: #ff6e3e;
 		margin-bottom: 8px;
+		color: #fff;
 	}
 </style>

pagesMain/subscribeInfo.vue

@@ -34,9 +34,11 @@
 		<!-- 性别 -->
 		<!-- <u-action-sheet :list="sexList" v-model="sexShow" @click="setSex"></u-action-sheet> -->
 		<!-- 班级 -->
-		<u-action-sheet :list="classList" v-model="classShow" @click="HandleChooseClassClick"></u-action-sheet>
+		<!-- <u-action-sheet :list="classList" v-model="classShow" @click="HandleChooseClassClick"></u-action-sheet> -->
+		<u-picker v-model="classShow" mode="selector" :range="classList" range-key="text" @confirm="HandleChooseClassClick"></u-picker>
 		<!-- 教练 -->
-		<u-action-sheet :list="coachList" v-model="coachShow" @click="HandleChooseCoachClick"></u-action-sheet>
+		<!-- <u-action-sheet :list="coachList" v-model="coachShow" @click="HandleChooseCoachClick"></u-action-sheet> -->
+		<u-picker v-model="coachShow" mode="selector" :range="coachList" range-key="text" @confirm="HandleChooseCoachClick"></u-picker>
 		<!-- 学生生日 -->
 		<u-picker v-model="birthdayShow" mode="time" :params="params" @confirm="setBirthday"></u-picker>
 		<!-- 体验日期 -->
@@ -105,8 +107,8 @@
 		},
 		onLoad(options) {
 			const item = JSON.parse(decodeURIComponent(options.item));
-			this.venueId = options.venueId
-			this.subscribelForm = { ...item, id: item.classId, sex:item.sex == 1 ? '男' : '女', coachName: item.coachId != -1 ? item.coachName : ''}
+			this.venueId = item.venueId
+			this.subscribelForm = { ...item, classId: item.classId, sex:item.sex == 1 ? '男' : '女', coachName: item.coachId != -1 ? item.coachName : ''}
 		},
 		onReady() {
 			this.$refs.subscribelForm.setRules(this.rules);
@@ -115,11 +117,12 @@
 			//  显示班级列表
 			handleClassInfoShow() {
 				this.classShow = true
-				this.getClassFromVenue(this.venueId)
+				this.getClassFromVenue()
+				console.log(this.venueId);
 			},
 			//  获取班级列表
-			getClassFromVenue(id) {
-				NET.request(API.getClassListByVenueId, {id}, 'POST').then(res => {
+			getClassFromVenue() {
+				NET.request(API.getClassListByVenueId, { id:this.venueId }, 'POST').then(res => {
 					if(res.status === 10000) {
 						this.classList = res.data.map( item => { return { id: item.id, text: item.name } })
 						this.subscribelForm.coachId = ''
@@ -139,9 +142,10 @@
 			},
 			//  显示教练列表
 			handleCoachListShow() {
+				this.coachList = []
 				this.coachShow = true
 				//  教练列表
-				NET.request(API.getCoachList, {venueId: this.venueId, classId: this.subscribelForm.id }, 'POST').then(res=> {
+				NET.request(API.getCoachList, {venueId: this.venueId, classId: this.subscribelForm.classId }, 'POST').then(res=> {
 					if(res.status == 10000) {
 						this.coachList = res.data.map( item => { return { id: item.coachId, text: item.nickname }})
 					} else {

pagesMember/leaveForm.vue

@@ -139,19 +139,19 @@
 				// 今天0点的时间戳
 				const nowTimeStamp = (new Date(new Date().toLocaleDateString()).getTime()) / 1000
 				// 今天后3天的时间戳
-				const nextThreeDayTimeStamp = nowTimeStamp + 86400 * 3
+				const nextThreeDayTimeStamp = nowTimeStamp + 86400
 				let date = object.year + '-' + object.month + '-' + object.day
 				// 当天是否可请假
 				if (this.availableList.filter(site => site == date).length) {
 					// 是否为病假
-					if(this.form.type === '病假') {
+					if(this.form.type === '事假') {
 						// 病假需提前3天请
 						if(this.dateFormatTimeStamp(date) > nextThreeDayTimeStamp) {
 							this.form.leaveTime = date
 						} else {
 							this.form.leaveTime = ''
 							this.$refs.uTips.show({
-								title: '病假需提前3天请',
+								title: '事假需提前1天请',
 								type: 'error',
 							})
 						}

pagesMember/subscribelForm.vue

@@ -20,19 +20,19 @@
 				<u-input v-model="subscribelForm.studentCardName" placeholder="请选择身份类型" type="select" @click="handletypeShowclick(1)" />
 			</u-form-item>
 			<u-form-item :label="subscribelForm.studentCardName || '身份证号'" prop="studentCardNumber">
-				<u-input v-model="subscribelForm.studentCardNumber" type="number" placeholder="请输入证件号" @click="handleWriteCardClick(1)" />
+				<u-input v-model="subscribelForm.studentCardNumber" placeholder="请输入证件号" @click="handleWriteCardClick(1)" />
 			</u-form-item>
 			<u-form-item label="家长姓名" prop="fatherName" required>
-				<u-input v-model="subscribelForm.fatherName" type="number" placeholder="请输入家长姓名" />
+				<u-input v-model="subscribelForm.fatherName" placeholder="请输入家长姓名" />
 			</u-form-item>
 			<u-form-item label="关系" prop="relation" required>
-				<u-input v-model="subscribelForm.relation" type="number" placeholder="请输入关系" />
+				<u-input v-model="subscribelForm.relation" placeholder="请输入关系" />
 			</u-form-item>
 			<u-form-item label="身份类型" prop="parentCardName" required>
 				<u-input v-model="subscribelForm.parentCardName" placeholder="请选择身份类型" type="select" @click="handletypeShowclick(2)"  />
 			</u-form-item>
 			<u-form-item :label="subscribelForm.parentCardName || '身份证号'" prop="parentCardNumber" required>
-				<u-input v-model="subscribelForm.parentCardNumber" type="number" placeholder="请输入证件号" @click="handleWriteCardClick(2)" />
+				<u-input v-model="subscribelForm.parentCardNumber" placeholder="请输入证件号" @click="handleWriteCardClick(2)" />
 			</u-form-item>
 			<u-form-item label="手机号码" prop="phone" required>
 				<u-input v-model="subscribelForm.phone" type="number" placeholder="请输入手机号码" />