Merge branch 'master' of http://47.114.134.244:3000/chenkainan/tourist

static/js/CommonFunction.js

@@ -60,6 +60,11 @@ Vue.prototype.IsMail = code => {
 	return pattern.test(code);
 }
 
+// 判断数字
+Vue.prototype.IsNumber = num => {
+	return /^[0-9]+.?[0-9]*$/.test(num);
+}
+
 // 图片显示判断
 Vue.prototype.showImg = img => {
 	if(!img) return;

subPackages/user/infoFilling.vue

@@ -109,7 +109,8 @@
 			
 			
 			<view class="nickname-box" v-else>
-				<input v-model="inputValue" type="text" placeholder="请输入内容" />
+				<input v-model="inputValue" type="text" placeholder="请输入内容" v-show="!['duration'].includes(valueType)"/>
+				<input v-model="inputValue" type="number" placeholder="请输入内容" v-show="['duration'].includes(valueType)"/>
 			</view>
 			
 			<!-- 底部保存 -->

subPackages/user/register.vue

@@ -373,6 +373,10 @@
 					uni.showToast({title: "请输入工作年限",icon: 'none'})
 					return;
 				}
+				if (!this.IsNumber(this.info.duration)) {
+					uni.showToast({title: "请输入正确的工作年限",icon: 'none'})
+					return;
+				}
 				if (!this.info.lingo_ids || this.info.lingo_idsFileList.length<=0) {
 					uni.showToast({title: "请选择语言能力并上传证明材料",icon: 'none'})
 					return;