修复bug

pages.json

@@ -68,6 +68,18 @@
 					"bounce": "none"
 				}
 			}
+		},
+		{
+			"path": "pages/webview/index",
+			"style": {
+				"navigationBarTitleText": "网页",
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom", // 隐藏系统导航栏
+				"app-plus": {
+					"titleNView": false, //禁用原生导航栏 
+					"bounce": "none"
+				}
+			}
 		}
 	],
 	"subPackages": [{

pages/index/index.vue

@@ -7,7 +7,7 @@
 		</u-navbar>
 		<view class="swiper">
 			<swiper :indicator-dots="false" indicator-color="#fff" indicator-active-color="#007AFF" :style="{'height':swiperHeight+'rpx'}" @change="swiperChange" :interval="interval" :duration="duration"  :autoplay="autoplay" :circular="true">
-				<swiper-item v-for="(swiper,index) in list" :key="index">
+				<swiper-item v-for="(swiper,index) in list" :key="index" @click="swiperClick(swiper)">
 					<image @load="imageLoad" :src="$method.splitImgHost(swiper.adverUrl, true)" mode="widthFix"></image>
 				</swiper-item>
 			</swiper>
@@ -222,6 +222,42 @@ export default {
 				return '0.00'
 			}
 		},
+		/**
+		 * @param {Object} swiper 
+		 * 点击轮播图
+		 */
+		swiperClick(swiper) {
+			if(swiper.jumpType == 1) { //无跳转
+				return;
+			} else if(swiper.jumpType == 2) { //url
+				let url = encodeURIComponent(swiper.jumpUrl)
+				uni.navigateTo({
+					url:'/pages/webview/index?url='+swiper.jumpUrl
+				})
+			} else if(swiper.jumpType == 3) { //内部接口
+				uni.navigateTo({
+					url:swiper.jumpUrl
+				})
+			} else if(swiper.jumpType == 4) { //外部接口
+				uni.navigateToMiniProgram({
+				  appId: swiper.remarks,
+				  path: swiper.jumpUrl,
+				  extraData: {
+				    
+				  },
+				  success(res) {
+				    // 打开成功
+				  },
+				  fail(err) {
+					  console.log(err)
+					 //  uni.showToast({
+					 //  	title:'无效的appId，'+err.errMsg,
+						// icon:'none'
+					 //  })
+				  }
+				})
+			}
+		},
 		/**
 		 * banner图片加载完成
 		 */

pages2/verify/input.vue

@@ -1,278 +1,282 @@
 <template>
 	<view style="padding: 30rpx;">
-		<view class="topBox">
-			<view>
-				<u-icon name="error-circle-fill" color="#FF3B30" size="28"></u-icon>
-				<text style="color: #FF3B30;margin-left: 10rpx;">学习前请提交完整审核资料</text>
-			</view>
-			<view style="color: #007AFF;" @click="backPage">稍后再填</view>
-		</view>
-		<u-collapse v-if="remarkStatus" :item-style="itemStyle" event-type="close">
-			<u-collapse-item title="审核结果反馈">
-				<view style="padding-bottom: 30rpx;">
-					<text class="collapse-item">{{ remark }}</text>
+		
+		<view v-show="!agreementModal">
+			<view class="topBox">
+				<view>
+					<u-icon name="error-circle-fill" color="#FF3B30" size="28"></u-icon>
+					<text style="color: #FF3B30;margin-left: 10rpx;">学习前请提交完整审核资料</text>
 				</view>
-			</u-collapse-item>
-		</u-collapse>
-		<view class="bodyBox" style="margin-top: 30rpx;padding:0 20rpx;">
-			<u-form :model="form" ref="uForm">
-				<template v-for="(item,index) in listData" >
-					<u-form-item
-						:key="index"
-						v-if="item.fieldKey == 'name'"
-						:label="item.fieldName"
-						:required="item.required"
-						:label-width="auto"
-						:prop="item.required ? item.fieldKey : ''"
-					>
-						<u-input v-model="form.name" :placeholder="`请输入${item.fieldName}`" />
-					</u-form-item>
-					<u-form-item
-						:key="index"
-						v-if="item.fieldKey == 'idcard'"
-						:label="item.fieldName"
-						:required="item.required"
-						:label-width="auto"
-						:prop="item.required ? item.fieldKey : ''"
-					>
-						<u-input v-model="form.idcard" :placeholder="`请输入${item.fieldName}`" />
-					</u-form-item>
-					<u-form-item
-						:key="index"
-						v-if="item.fieldKey == 'telphone'"
-						:label="item.fieldName"
-						:required="item.required"
-						:label-width="auto"
-						:prop="item.required ? item.fieldKey : ''"
-					>
-						<u-input v-model="form.telphone" :placeholder="`请输入${item.fieldName}`" />
-					</u-form-item>
-					<u-form-item
-						:key="index"
-						v-if="item.fieldKey == 'school'"
-						:label="item.fieldName"
-						:required="item.required"
-						:label-width="auto"
-						:prop="item.required ? item.fieldKey : ''"
-					>
-						<u-input v-model="form.school" :placeholder="`请输入${item.fieldName}`" />
-					</u-form-item>
-					<u-form-item
-						:key="index"
-						v-if="item.fieldKey == 'work_unit'"
-						:label="item.fieldName"
-						:required="item.required"
-						:label-width="auto"
-						:prop="item.required ? item.fieldKey : ''"
-					>
-						<u-input v-model="form.work_unit" :placeholder="`请输入${item.fieldName}`" />
-					</u-form-item>
-					<u-form-item
-						:key="index"
-						v-if="item.fieldKey == 'unit_contact'"
-						:label="item.fieldName"
-						:required="item.required"
-						:label-width="auto"
-						:prop="item.required ? item.fieldKey : ''"
-					>
-						<u-input v-model="form.unit_contact" :placeholder="`请输入${item.fieldName}`" />
-					</u-form-item>
-					<u-form-item
-						:key="index"
-						v-if="item.fieldKey == 'unit_tel'"
-						:label="item.fieldName"
-						:required="item.required"
-						:label-width="auto"
-						:prop="item.required ? item.fieldKey : ''"
-					>
-						<u-input v-model="form.unit_tel" :placeholder="`请输入${item.fieldName}`" />
-					</u-form-item>
-					<u-form-item
-						:key="index"
-						v-if="item.fieldKey == 'apply_post'"
-						:label="item.fieldName"
-						:required="item.required"
-						:label-width="auto"
-						:prop="item.required ? item.fieldKey : ''"
-					>
-						<u-input v-model="form.apply_post" :placeholder="`请输入${item.fieldName}`" />
-					</u-form-item>
-					<u-form-item
-						:key="index"
-						v-if="item.fieldKey == 'major'"
-						:label="item.fieldName"
-						:required="item.required"
-						:label-width="auto"
-						:prop="item.required ? item.fieldKey : ''"
-					>
-						<u-input v-model="form.major" :placeholder="`请输入${item.fieldName}`" />
-					</u-form-item>
-					<u-form-item
-						:key="index"
-						v-if="item.inputType == 2"
-						:label="item.fieldName"
-						:label-width="auto"
-						:required="item.required"
-						:prop="item.required ? item.fieldKey : ''"
-					>
-						<picker @change="bindPickerChange(item.fieldKey, $event)" :value="form[item.fieldKey]" :range="getarrays(item.fieldKey)">
-							<view class="picker">
-								{{ returnName(item.fieldKey) }}
-								<image
-									src="@/static/icon/clears.png"
-									v-if="clearWatch(item.fieldKey)"
-									@click.stop="clearFun(item.fieldKey)"
-									mode=""
-									style="width:30rpx;height:30rpx;vertical-align: middle;margin-left:10rpx;"
-								></image>
-							</view>
-						</picker>
-					</u-form-item>
-					<u-form-item
-						:key="index"
-						v-if="item.inputType == 5"
-						:label="item.fieldName"
-						:label-width="auto"
-						:required="item.required"
-						:prop="item.required ? item.fieldKey : ''"
-					>
-						<picker mode="date" :value="form[item.fieldKey]" @change="bindDateChange(item.fieldKey, $event)">
-							<view class="picker">
-								{{ getTimes(item.fieldKey) }}
-								<image
-									src="@/static/icon/clears.png"
-									v-if="clearWatch(item.fieldKey)"
-									@click.stop="clearFun(item.fieldKey)"
-									mode=""
-									style="width:30rpx;height:30rpx;vertical-align: middle;margin-left:10rpx;"
-								></image>
-							</view>
-						</picker>
-					</u-form-item>
-					<u-form-item
-						:key="index"
-						v-if="item.inputType == 3 && item.fieldKey !== 'commitment_electr_signature'"
-						:label="item.fieldName"
-						:required="item.required"
-						:label-width="auto"
-						label-position="top"
-						:prop="item.required ? item.fieldKey : ''"
-					>
-						<text v-if="item.fieldKey === 'recent_photos'" style="color: #999999;position: absolute;top: 20rpx;left: 130rpx;">竖向证件照 文件大小≤2M</text>
-						<text
-							v-if="item.fieldKey === 'idcard_face_photo' || item.fieldKey === 'idcard_national_photo'"
-							style="color: #999999;position: absolute;top: 20rpx;left: 180rpx;"
+				<view style="color: #007AFF;" @click="backPage">稍后再填</view>
+			</view>
+			<u-collapse v-if="remarkStatus" :item-style="itemStyle" event-type="close">
+				<u-collapse-item title="审核结果反馈">
+					<view style="padding-bottom: 30rpx;">
+						<text class="collapse-item">{{ remark }}</text>
+					</view>
+				</u-collapse-item>
+			</u-collapse>
+			<view class="bodyBox" style="margin-top: 30rpx;padding:0 20rpx;">
+				<u-form :model="form" ref="uForm">
+					<template v-for="(item,index) in listData" >
+						<u-form-item
+							:key="index"
+							v-if="item.fieldKey == 'name'"
+							:label="item.fieldName"
+							:required="item.required"
+							:label-width="auto"
+							:prop="item.required ? item.fieldKey : ''"
 						>
-							文件大小≤2M
-						</text>
-						<u-upload
-							:show-progress="false"
-							:max-size="2097152"
-							@on-list-change="
-								item.fieldKey === 'recent_photos'
-									? changePhotoListHeader1($event)
-									: item.fieldKey === 'idcard_face_photo'
-									? changePhotoListHeader2($event)
-									: item.fieldKey === 'idcard_national_photo'
-									? changePhotoListHeader3($event)
-									: ''
-							"
-							:auto-upload="false"
-							custom-btn="true"
-							:action="action"
-							:file-list="
-								item.fieldKey === 'recent_photos'
-									? fileList1
-									: item.fieldKey === 'idcard_face_photo'
-									? fileList2
-									: item.fieldKey === 'idcard_national_photo'
-									? fileList3
-									: ''
-							"
-							width="120"
-							height="120"
-							size-type="['compressed']"
-							max-count="1"
+							<u-input v-model="form.name" :placeholder="`请输入${item.fieldName}`" />
+						</u-form-item>
+						<u-form-item
+							:key="index"
+							v-if="item.fieldKey == 'idcard'"
+							:label="item.fieldName"
+							:required="item.required"
+							:label-width="auto"
+							:prop="item.required ? item.fieldKey : ''"
 						>
-							<template v-slot:addBtn>
-								<image
-									:src="
-										item.fieldKey === 'recent_photos'
-											? '/static/info_1.png'
-											: item.fieldKey === 'idcard_face_photo'
-											? '/static/info_2.png'
-											: item.fieldKey === 'idcard_national_photo'
-											? '/static/info_3.png'
-											: ''
-									"
-									:style="
-										item.fieldKey === 'recent_photos'
-											? 'width: 120rpx; height: 169rpx;'
-											: item.fieldKey === 'idcard_face_photo'
-											? 'width: 120rpx; height: 82rpx;'
-											: item.fieldKey === 'idcard_national_photo'
-											? 'width: 120rpx; height: 82rpx;'
-											: ''
-									"
-								></image>
-							</template>
-						</u-upload>
-					</u-form-item>
-					<view :key="index" v-if="item.inputType == 3 && item.fieldKey === 'commitment_electr_signature'">
+							<u-input v-model="form.idcard" :placeholder="`请输入${item.fieldName}`" />
+						</u-form-item>
 						<u-form-item
-							v-if="item.inputType == 3 && item.fieldKey === 'commitment_electr_signature'"
-							label="承诺书"
+							:key="index"
+							v-if="item.fieldKey == 'telphone'"
+							:label="item.fieldName"
 							:required="item.required"
 							:label-width="auto"
-							label-position="top"
+							:prop="item.required ? item.fieldKey : ''"
 						>
-							<view style="line-height: 40rpx;text-indent:2em">
-								<text>
-									本人自愿做出如下承诺：本人己仔细阅读《广东省住房和城乡建设厅关于推进住房和城乡建设领域施工现场专业人员职业培训工作的通知》
-									全部内容并知晓和理解，本人的学历证书、身份证、工作年限、相片等所有资料完全真实、符合报名条件、资格审查要求和相关规定，本人在报名、审查、培训、测试等有关的事项中会严格道守相关规定和要求，如有虛假或与实际规定不符等情况造成的一切后果由本人承担。
-								</text>
-								<view style="line-height: 40rpx;text-indent:2em"><text>特此承诺！</text></view>
-							</view>
+							<u-input v-model="form.telphone" :placeholder="`请输入${item.fieldName}`" />
 						</u-form-item>
 						<u-form-item
-							v-if="item.inputType == 3 && item.fieldKey === 'commitment_electr_signature'"
-							label="签名板"
+							:key="index"
+							v-if="item.fieldKey == 'school'"
+							:label="item.fieldName"
+							:required="item.required"
+							:label-width="auto"
+							:prop="item.required ? item.fieldKey : ''"
+						>
+							<u-input v-model="form.school" :placeholder="`请输入${item.fieldName}`" />
+						</u-form-item>
+						<u-form-item
+							:key="index"
+							v-if="item.fieldKey == 'work_unit'"
+							:label="item.fieldName"
 							:required="item.required"
 							:label-width="auto"
-							label-position="top"
 							:prop="item.required ? item.fieldKey : ''"
 						>
-							<view class="dis_stys">
-								<text style="color: #999999;">请在下方签名区进行签名</text>
-								<text @click="retDraw" mode="">清空</text>
-							</view>
-							<view class="handCenter">
-								<canvas
-									v-if="!form[item.fieldKey]"
-									class="handWriting"
-									disable-scroll="true"
-									:catchtouchmove="true"
-									@touchstart="uploadScaleStart"
-									@touchmove="uploadScaleMove"
-									@touchend="uploadScaleEnd"
-									canvas-id="handWriting"
-								></canvas>
-								<view v-else style="width:100%;height: 100%;position: relative;">
-									<view class="ctoples">图片</view>
-									<image style="width:100%;height:100%;" :src="$method.splitImgHost(form[item.fieldKey])" mode=""></image>
+							<u-input v-model="form.work_unit" :placeholder="`请输入${item.fieldName}`" />
+						</u-form-item>
+						<u-form-item
+							:key="index"
+							v-if="item.fieldKey == 'unit_contact'"
+							:label="item.fieldName"
+							:required="item.required"
+							:label-width="auto"
+							:prop="item.required ? item.fieldKey : ''"
+						>
+							<u-input v-model="form.unit_contact" :placeholder="`请输入${item.fieldName}`" />
+						</u-form-item>
+						<u-form-item
+							:key="index"
+							v-if="item.fieldKey == 'unit_tel'"
+							:label="item.fieldName"
+							:required="item.required"
+							:label-width="auto"
+							:prop="item.required ? item.fieldKey : ''"
+						>
+							<u-input v-model="form.unit_tel" :placeholder="`请输入${item.fieldName}`" />
+						</u-form-item>
+						<u-form-item
+							:key="index"
+							v-if="item.fieldKey == 'apply_post'"
+							:label="item.fieldName"
+							:required="item.required"
+							:label-width="auto"
+							:prop="item.required ? item.fieldKey : ''"
+						>
+							<u-input v-model="form.apply_post" :placeholder="`请输入${item.fieldName}`" />
+						</u-form-item>
+						<u-form-item
+							:key="index"
+							v-if="item.fieldKey == 'major'"
+							:label="item.fieldName"
+							:required="item.required"
+							:label-width="auto"
+							:prop="item.required ? item.fieldKey : ''"
+						>
+							<u-input v-model="form.major" :placeholder="`请输入${item.fieldName}`" />
+						</u-form-item>
+						<u-form-item
+							:key="index"
+							v-if="item.inputType == 2"
+							:label="item.fieldName"
+							:label-width="auto"
+							:required="item.required"
+							:prop="item.required ? item.fieldKey : ''"
+						>
+							<picker @change="bindPickerChange(item.fieldKey, $event)" :value="form[item.fieldKey]" :range="getarrays(item.fieldKey)">
+								<view class="picker">
+									{{ returnName(item.fieldKey) }}
+									<image
+										src="@/static/icon/clears.png"
+										v-if="clearWatch(item.fieldKey)"
+										@click.stop="clearFun(item.fieldKey)"
+										mode=""
+										style="width:30rpx;height:30rpx;vertical-align: middle;margin-left:10rpx;"
+									></image>
 								</view>
-							</view>
+							</picker>
 						</u-form-item>
-					</view>
-				</template>
-			</u-form>
+						<u-form-item
+							:key="index"
+							v-if="item.inputType == 5"
+							:label="item.fieldName"
+							:label-width="auto"
+							:required="item.required"
+							:prop="item.required ? item.fieldKey : ''"
+						>
+							<picker mode="date" :value="form[item.fieldKey]" @change="bindDateChange(item.fieldKey, $event)">
+								<view class="picker">
+									{{ getTimes(item.fieldKey) }}
+									<image
+										src="@/static/icon/clears.png"
+										v-if="clearWatch(item.fieldKey)"
+										@click.stop="clearFun(item.fieldKey)"
+										mode=""
+										style="width:30rpx;height:30rpx;vertical-align: middle;margin-left:10rpx;"
+									></image>
+								</view>
+							</picker>
+						</u-form-item>
+						<u-form-item
+							:key="index"
+							v-if="item.inputType == 3 && item.fieldKey !== 'commitment_electr_signature'"
+							:label="item.fieldName"
+							:required="item.required"
+							:label-width="auto"
+							label-position="top"
+							:prop="item.required ? item.fieldKey : ''"
+						>
+							<text v-if="item.fieldKey === 'recent_photos'" style="color: #999999;position: absolute;top: 20rpx;left: 130rpx;">竖向证件照 文件大小≤2M</text>
+							<text
+								v-if="item.fieldKey === 'idcard_face_photo' || item.fieldKey === 'idcard_national_photo'"
+								style="color: #999999;position: absolute;top: 20rpx;left: 180rpx;"
+							>
+								文件大小≤2M
+							</text>
+							<u-upload
+								:show-progress="false"
+								:max-size="2097152"
+								@on-list-change="
+									item.fieldKey === 'recent_photos'
+										? changePhotoListHeader1($event)
+										: item.fieldKey === 'idcard_face_photo'
+										? changePhotoListHeader2($event)
+										: item.fieldKey === 'idcard_national_photo'
+										? changePhotoListHeader3($event)
+										: ''
+								"
+								:auto-upload="false"
+								custom-btn="true"
+								:action="action"
+								:file-list="
+									item.fieldKey === 'recent_photos'
+										? fileList1
+										: item.fieldKey === 'idcard_face_photo'
+										? fileList2
+										: item.fieldKey === 'idcard_national_photo'
+										? fileList3
+										: ''
+								"
+								width="120"
+								height="120"
+								size-type="['compressed']"
+								max-count="1"
+							>
+								<template v-slot:addBtn>
+									<image
+										:src="
+											item.fieldKey === 'recent_photos'
+												? '/static/info_1.png'
+												: item.fieldKey === 'idcard_face_photo'
+												? '/static/info_2.png'
+												: item.fieldKey === 'idcard_national_photo'
+												? '/static/info_3.png'
+												: ''
+										"
+										:style="
+											item.fieldKey === 'recent_photos'
+												? 'width: 120rpx; height: 169rpx;'
+												: item.fieldKey === 'idcard_face_photo'
+												? 'width: 120rpx; height: 82rpx;'
+												: item.fieldKey === 'idcard_national_photo'
+												? 'width: 120rpx; height: 82rpx;'
+												: ''
+										"
+									></image>
+								</template>
+							</u-upload>
+						</u-form-item>
+						<view :key="index" v-if="item.inputType == 3 && item.fieldKey === 'commitment_electr_signature'">
+							<u-form-item
+								v-if="item.inputType == 3 && item.fieldKey === 'commitment_electr_signature'"
+								label="承诺书"
+								:required="item.required"
+								:label-width="auto"
+								label-position="top"
+							>
+								<view style="line-height: 40rpx;text-indent:2em">
+									<text>
+										本人自愿做出如下承诺：本人己仔细阅读《广东省住房和城乡建设厅关于推进住房和城乡建设领域施工现场专业人员职业培训工作的通知》
+										全部内容并知晓和理解，本人的学历证书、身份证、工作年限、相片等所有资料完全真实、符合报名条件、资格审查要求和相关规定，本人在报名、审查、培训、测试等有关的事项中会严格道守相关规定和要求，如有虛假或与实际规定不符等情况造成的一切后果由本人承担。
+									</text>
+									<view style="line-height: 40rpx;text-indent:2em"><text>特此承诺！</text></view>
+								</view>
+							</u-form-item>
+							<u-form-item
+								v-if="item.inputType == 3 && item.fieldKey === 'commitment_electr_signature'"
+								label="签名板"
+								:required="item.required"
+								:label-width="auto"
+								label-position="top"
+								:prop="item.required ? item.fieldKey : ''"
+							>
+								<view class="dis_stys">
+									<text style="color: #999999;">请在下方签名区进行签名</text>
+									<text @click="retDraw" mode="">清空</text>
+								</view>
+								<view class="handCenter">
+									<canvas
+										v-if="!form[item.fieldKey]"
+										class="handWriting"
+										disable-scroll="true"
+										:catchtouchmove="true"
+										@touchstart="uploadScaleStart"
+										@touchmove="uploadScaleMove"
+										@touchend="uploadScaleEnd"
+										canvas-id="handWriting"
+									></canvas>
+									<view v-else style="width:100%;height: 100%;position: relative;">
+										<view class="ctoples">图片</view>
+										<image style="width:100%;height:100%;" :src="$method.splitImgHost(form[item.fieldKey])" mode=""></image>
+									</view>
+								</view>
+							</u-form-item>
+						</view>
+					</template>
+				</u-form>
+			</view>
+			<view @click="submits" class="submit_btn">提交资料</view>
 		</view>
-		<view @click="submits" class="submit_btn">提交资料</view>
 		
-		<u-popup class="modal" v-model="agreementModal" mode="center" border-radius="24" :mask-close-able="false">
+		
+		<u-popup class="modal" catchtouchmove='return' v-model="agreementModal" mode="center" border-radius="24" :mask-close-able="false">
 			<view class="agreement">
 				<view class="body">
-					<scroll-view scroll-y="true" style="height:600rpx">
+					<scroll-view scroll-y="true" style="height:600rpx;">
 						<view class="content">
 							<view>本产品（或服务）提供【{{goodsData.goodsName}}】课程的在线学习功能，为使用这些功能，我们需要使用您设备上的摄像头，并收集以下个人信息：
 								<text v-for="(item,listIndex) in listData" :key="listIndex">{{item.fieldName}}、</text>