1

pages/collectInfo/collectInfo.js

@@ -826,7 +826,7 @@ Page({
                 })
               },
               fail: function () {
-             
+
               },
               complete: function () {
                 wx.hideLoading();
@@ -900,7 +900,7 @@ Page({
       [phone]: e.detail.value
     })
     this.formCheckPhone();
-    if (!this.data.oldPhoneNull) {
+    if (!this.data.oldPhoneNull && !this.data.oldPhoneNull1) {
       this.SubmitOldmanInfo({
         id: this.data.nameArr[this.data.activeIndex]._id,
         phone: e.detail.value
@@ -1250,6 +1250,7 @@ Page({
     }
   },
   pickEsc() {
+    wx.hideLoading()
     this.setData({
       showAdressBox: false
     })
@@ -1275,6 +1276,7 @@ Page({
     })
   },
   pickEsc1() {
+    wx.hideLoading()
     this.setData({
       showAdressBox1: false
     })
@@ -3837,7 +3839,7 @@ Page({
   },
   onHide() {
     const app = getApp()
-    console.log("初始",app.globalData.id)
+    console.log("初始", app.globalData.id)
     if (app.globalData.id != -1) {
       app.globalData.id = ''
       console.log("id不等于-1")
@@ -3848,7 +3850,7 @@ Page({
       showAdressBox: false,
       showAdressBox1: false
     })
-    console.log("最终隐藏id",app.globalData.id)
+    console.log("最终隐藏id", app.globalData.id)
   },
   //获取位置
   getSelfLocation: function () {
@@ -3966,13 +3968,19 @@ Page({
   // 表单校验老人联系电话
   formCheckPhone() {
     this.setData({
-      oldPhoneNull: false
+      oldPhoneNull: false,
+      oldPhoneNull1: false
     })
     if (!this.data.oldInfo[this.data.activeIndex].phone) {
       this.setData({
         oldPhoneNull: true
       })
     }
+    if (!(/^1[34578]\d{9}$/.test(this.data.oldInfo[this.data.activeIndex].phone))) {
+      this.setData({
+        oldPhoneNull1: true
+      })
+    }
   },
   // 表单校验配偶姓名
   formCheckPartnerName() {

pages/collectInfo/collectInfo.wxml

@@ -96,6 +96,7 @@
 				<view wx:if="{{oldCard60}}" class="required">不可采集低于60岁老人的信息哦</view>
 				<view class="block"><text class="red">*</text>联系电话<input bindblur="tab1Change5" value="{{oldInfo[activeIndex].phone}}" /></view>
 				<view wx:if="{{oldPhoneNull}}" class="required">老人联系电话不能为空哦！</view>
+				<view wx:if="{{oldPhoneNull1}}" class="required">老人联系电话格式不对哦！</view>
 				<view class="block"><text class="red">*</text>户籍地址
 					<view class="picker1">
 						<view wx:if="{{oldInfo[activeIndex].chooseAdressArr.length==0}}" bindtap="showAdressShow">点我选择户籍地址</view>

pages/index/index.wxml

@@ -58,7 +58,7 @@
 				<!-- <view class="top4-title">巡访信息</view>
 				<view class="top4-smalltitle">巡访信息</view> -->
 				<view class="top4-title">子女查询</view>
-				<view class="top4-smalltitle">巡访情况</view>
+				<view class="top4-smalltitle">一键绑定</view>
 			</view>
 		</view>
 	</view>
@@ -67,7 +67,7 @@
 			<image src="/images/indexicon6.png" style="width: 120rpx;height: 120rpx;margin-top: 10rpx;"></image>
 			<view class="top4-box1">
 				<view class="top4-title">我的排名</view>
-				<view class="top4-smalltitle">巡访员排名</view>
+				<view class="top4-smalltitle">积分排名</view>
 			</view>
 		</view>
 		<view class="top4-box" bindtap="goSaoMa">

pages/love/love.js

@@ -352,6 +352,9 @@ Page({
       visitMessage: {
         required: true,
       },
+      urgency:{
+        required: true,
+      }
     };
     const messages = {
       health: {
@@ -375,11 +378,13 @@ Page({
       demand: {
         required: '请输入老人需求',
       },
+      urgency:{
+        required: '请选择需求紧急程度',
+      }
     };
     // 创建实例对象
     this.WxValidate = new WxValidate(rules, messages)
   },
-
   onLoad: function (opotions) {
     console.log(opotions, "dayin");
     // 获得当前时间

pages/love/love.wxml

@@ -54,6 +54,12 @@
 		<textarea class="view_textarea" name="demand" bindblur="bindTextAreaBlur" placeholder="请填写一下老人需求" />
 		<view class="title">巡访备注说明</view>
 	<textarea class="view_textarea"  name="visitMessage" bindblur="bindTextAreaBlur" placeholder="请填写一下巡访备注说明" />
+	<view class="title">需求紧急程度</view>
+		<radio-group name="urgency">
+			<radio color='#009FE9' value='不紧急'>不紧急</radio>
+			<radio color='#009FE9' value='一般'>一般</radio>
+			<radio color='#009FE9' value='紧急'>紧急</radio>
+		</radio-group>
 	<view  class="title">现场含面部照片(正面照)</view>
 		<view  style=" border: 1rpx solid #5398C8; color: #fff;  padding-left: 10rpx;background-color: #429EFF; font-size: 26rpx;width: 220rpx;margin-top: 40rpx; margin-bottom: 40rpx;" bindtap="zhaopian" wx:if='{{isTrue}}'>请上传含面部照片</view>
 		<view style="  display: flex;">

pages/userBook/userBook.wxml

@@ -61,8 +61,9 @@
 	<view class="hd">⑤如添加同一家庭的老人，点击第一位老人姓名右方的加号然后继续填写所有信息。点击✖可删除当前老人。</view>
 	<view class="hd">⑥采集一个老人积分+5</view>
 	<view style="display:flex;margin-top: 20rpx;margin-bottom: 20rpx;">
+	<image src="../../images/user_info.png" class="img4"></image>
 		<image src="../../images/user_inputname.png" class="img4"></image>
-		<image src="../../images/user_info.png" class="img4"></image>
+		
 	</view>
 	<view class="block">
 		<view class="num">

project.config.json

@@ -22,7 +22,7 @@
 			"disablePlugins": [],
 			"outputPath": ""
 		},
-		"useCompilerModule": true,
+		"useCompilerModule": false,
 		"userConfirmedUseCompilerModuleSwitch": false
 	},
 	"compileType": "miniprogram",