Bladeren bron

表单校验

ssfg 4 jaren geleden
bovenliggende
commit
3e340acdc5
9 gewijzigde bestanden met toevoegingen van 549 en 581 verwijderingen
  1. 48 48
      app.js
  2. 1 1
      app.json
  3. BIN
      images/userbook.png
  4. 453 459
      pages/collectInfo/collectInfo.js
  5. 31 34
      pages/collectInfo/collectInfo.wxml
  6. 5 36
      pages/collectInfo/collectInfo.wxss
  7. 7 0
      pages/personInfo/personInfo.wxml
  8. 2 2
      utils/photoUrl.wxs
  9. 2 1
      utils/util.js

+ 48 - 48
app.js

@@ -5,7 +5,7 @@ App({
     name: null,
   },
   onLaunch(options) {
-    console.log("onLaunchonLaunchonLaunchonLaunchonLaunchonLaunchonLaunchonLaunchonLaunchonLaunchonLaunchonLaunch");
+    console.log(options, "onLaunch");
     // if (wx.getStorageSync('openId')) {
     //   wx.request({
     //     url: 'http://info.windd.cn:8080/test/applet/isExist',
@@ -62,7 +62,7 @@ App({
     // });
 
   },
- 
+
   onShow(options) {
     // Do something when show.
   },
@@ -72,52 +72,52 @@ App({
   onError(msg) {
     console.log(msg)
   },
-  getAuthKey: function () {  
-    var that = this;  
-    return new Promise(function (resolve, reject) {  
-        // 调用登录接口  
-        wx.login({  
-          success: function (res) {  
-            if (res.code) {  
-              console.log("用户的code:" + res.code);
-              const appid = "wx1c015df104db7030"
-              const secret = "d1956c1b5d3601657c98b0dc80a006f7"
-              let url = 'https://api.weixin.qq.com/sns/jscode2session?appid=' + appid + '&secret=' + secret + '&js_code=' + res.code + '&grant_type=authorization_code';
-              wx.request({
-                // 自行补上自己的 APPID 和 SECRET
-                url: url,
-                success: res => {
-                  // 获取到用户的 openid
-                  console.log("用户的openid:" + res.data.openid);
-                  wx.setStorageSync('openId', res.data.openid)
-                  wx.request({
-                    url: 'http://info.windd.cn:8080/test/applet/isExist',
-                    method: "GET",
-                    data: {
-                      appletsId: wx.getStorageSync('openId')
-                    },
-                    success: (res) => {
-                      console.log(res, "apppppppppppppppppppppppppp");
-                      if (res.data.code == 0) {
-                        if(res.data.data){
-                          wx.setStorageSync('user', 'user');
-                        }
-                        resolve(res);  
+  getAuthKey: function () {
+    var that = this;
+    return new Promise(function (resolve, reject) {
+      // 调用登录接口  
+      wx.login({
+        success: function (res) {
+          if (res.code) {
+            console.log("用户的code:" + res.code);
+            const appid = "wx1c015df104db7030"
+            const secret = "d1956c1b5d3601657c98b0dc80a006f7"
+            let url = 'https://api.weixin.qq.com/sns/jscode2session?appid=' + appid + '&secret=' + secret + '&js_code=' + res.code + '&grant_type=authorization_code';
+            wx.request({
+              // 自行补上自己的 APPID 和 SECRET
+              url: url,
+              success: res => {
+                // 获取到用户的 openid
+                console.log("用户的openid:" + res.data.openid);
+                wx.setStorageSync('openId', res.data.openid)
+                wx.request({
+                  url: 'http://10.16.4.7:7001/applet/isExist',
+                  method: "GET",
+                  data: {
+                    appletsId: wx.getStorageSync('openId')
+                  },
+                  success: (res) => {
+                    console.log(res, "apppppppppppppppppppppppppp");
+                    if (res.data.code == 0) {
+                      if (res.data.data) {
+                        wx.setStorageSync('user', 'user');
                       }
+                      resolve(res);
                     }
-                  })
-                }
-              });
-            } else {  
-              console.log('获取用户登录态失败!' + res.errMsg);  
-              var res = {  
-                status: 300,  
-                data: '错误'  
-              }  
-              reject('error');  
-            }    
-          }  
-        })  
-    });  
-  },  
+                  }
+                })
+              }
+            });
+          } else {
+            console.log('获取用户登录态失败!' + res.errMsg);
+            var res = {
+              status: 300,
+              data: '错误'
+            }
+            reject('error');
+          }
+        }
+      })
+    });
+  },
 })

+ 1 - 1
app.json

@@ -77,7 +77,7 @@
       },
       {
         "pagePath": "pages/visitandinfo/visitandinfo",
-        "text": "巡访",
+        "text": "工作日志",
         "selectedIconPath": "./images/tabbar7.png",
         "iconPath": "./images/tabbar3.png"
       },

BIN
images/userbook.png


File diff suppressed because it is too large
+ 453 - 459
pages/collectInfo/collectInfo.js


+ 31 - 34
pages/collectInfo/collectInfo.wxml

@@ -3,7 +3,7 @@
 	<view class="{{showBj ? 'writeOldmanName':'none'}} " hidden="{{!showBj}}">
 		<view class="   OldmanName_box">
 			<view class="oldmanname">请输入老人姓名</view>
-			<input style="margin-left:50rpx;margin-top:30rpx;border:1px solid #279bff" placeholder-style="color: {{color}}" bindinput="addOldName" value="{{addOldname}}" placeholder="请填写老人姓名" />
+			<input style="margin-left:50rpx;margin-top:30rpx;border:1px solid #279bff" placeholder-style="color: {{color}}" bindinput="addOldName" value="{{addOldname}}" />
 			<view class="btn_box">
 				<view class="sure" bindtap="sure">确定</view>
 				<view class="esc" bindtap="qx">取消</view>
@@ -13,7 +13,7 @@
 	<view class="writeOldmanName" wx:if="{{showBj1}}">
 		<view class="OldmanName_box">
 			<view class="oldmanname">请输入老人姓名</view>
-			<input style="margin-left:50rpx;margin-top:30rpx;border:1px solid #279bff" bindinput="addOldName1" value="{{addOldname1}}" placeholder="请填写老人姓名" />
+			<input style="margin-left:50rpx;margin-top:30rpx;border:1px solid #279bff" bindinput="addOldName1" value="{{addOldname1}}" />
 			<view class="btn_box">
 				<view class="sure" bindtap="sure1">确定</view>
 				<view class="esc" bindtap="qx1">取消</view>
@@ -68,7 +68,7 @@
 					<van-icon name="photograph" color="#2087f7" size="30rpx" style="margin-left:20rpx" />
 					<text>可拍身份证照片上传基本信息</text>
 				</view>
-				<view class="block"><text class="red">*</text>姓名<input class="huiColor" disabled="true" placeholder="请填写老人姓名" value="{{oldInfo[activeIndex].name}}" /></view>
+				<view class="block"><text class="red">*</text>姓名<input class="huiColor" disabled="true" value="{{oldInfo[activeIndex].name}}" /></view>
 				<view class="block">
 					<view class="name"><text class="red">*</text>性别</view>
 					<radio-group bindchange="tab1Change2">
@@ -110,7 +110,7 @@
 							<textarea style="width:450rpx;height:auto" disabled="true" wx:else>{{oldInfo[activeIndex].chooseAdressArr1}}</textarea>
 						</view>
 					</picker>
-					<input disabled="{{nowAdress}}" bindblur="tab1Change7" placeholder="请填写补充现居地址" name="name" value="{{oldInfo[activeIndex].addressExt}}" />
+					<input disabled="{{nowAdress}}" bindblur="tab1Change7" placeholder="请填写补充现居地址" value="{{oldInfo[activeIndex].addressExt}}" />
 				</view>
 				<view class="block">
 					<view class="name"><text class="red">*</text>婚姻及配偶情况</view>
@@ -121,9 +121,9 @@
 					</radio-group>
 				</view>
 				<view wx:if="{{oldInfo[activeIndex].oldMarry[1].checked}}">
-					<view class="block"><text class="red">*</text>配偶姓名<input bindblur="tab1Change8_1" placeholder="请填写配偶姓名" value="{{oldInfo[activeIndex].partnerName}}" /></view>
+					<view class="block"><text class="red">*</text>配偶姓名<input bindblur="tab1Change8_1" value="{{oldInfo[activeIndex].partnerName}}" /></view>
 					<view wx:if="{{oldisMarryName}}" class="required">配偶姓名不能为空哦!</view>
-					<view class="block"><text class="red">*</text>配偶身份证号<input bindblur="tab1Change8_2" placeholder="请填写配偶联系电话" value="{{oldInfo[activeIndex].partnerIdNumber}}" /></view>
+					<view class="block"><text class="red">*</text>配偶身份证号<input bindblur="tab1Change8_2" value="{{oldInfo[activeIndex].partnerIdNumber}}" /></view>
 					<view wx:if="{{oldisMarryPhone}}" class="required">配偶身份证号不能为空哦!</view>
 					<view wx:if="{{oldisMarryPhoneGs}}" class="required">配偶身份证号格式不对哦!</view>
 				</view>
@@ -183,9 +183,8 @@
 					</checkbox-group>
 				</view>
 				<view wx:if="{{moneyFromOther}}" class="required">收入来源不能为空哦!</view>
-				<input wx:if="{{oldInfo[activeIndex].moneyFromAyy[4].checked}}" placeholder="请填写其它收入来源" value="{{oldInfo[activeIndex].sourceOfIncomeExt}}" bindblur="tab1Change14_1" name="name" class="otherinput" />
-				<view wx:if="{{moneyOtherQtnull}}" class="required">其它收入来源不能为空哦!</view>
-
+				<input wx:if="{{oldInfo[activeIndex].moneyFromAyy[4].checked}}" placeholder="请填写其它收入来源" value="{{oldInfo[activeIndex].sourceOfIncomeExt}}" bindblur="tab1Change14_1" class="otherinput" />
+				<view wx:if="{{oldInfo[activeIndex].moneyFromAyy[4].checked&&moneyOtherQtnull}}" class="required">其它收入来源不能为空哦!</view>
 				<view class="name"><text class="red">*</text>本人上年度可支配收入</view>
 				<picker bindchange="tab1Change15" value="{{oldInfo[activeIndex].income}}" range="{{payMoney}}">
 					<view class="picker">
@@ -203,7 +202,7 @@
 				<view wx:if="{{familyHelp}}" class="required">家庭救助帮扶情况不能为空哦!</view>
 				<view wx:if="{{oldInfo[activeIndex].familyHelpArr[6].checked}}">
 					<input value="{{oldInfo[activeIndex].rescueStateExt}}" placeholder="请填写其它救助情况" bindblur="tab1Change16_1" class="otherinput" />
-					<view wx:if="{{otherhelpQtnull}}" class="required">其它救助情况不能为空哦!</view>
+					<view wx:if="{{oldInfo[activeIndex].familyHelpArr[6].checked&&otherhelpQtnull}}" class="required">其它救助情况不能为空哦!</view>
 				</view>
 				<view class="block">
 					<view class="name"><text class="red">*</text>是否为失独家庭</view>
@@ -223,7 +222,7 @@
 				</view>
 				<view wx:if="{{isliveNull}}" class="required">陪伴居住情况不能为空哦!</view>
 				<input wx:if="{{oldInfo[activeIndex].liveStatus[4].checked}}" value="{{oldInfo[activeIndex].accompanyExt}}" placeholder="请填写其他陪伴居住情况" bindblur="tab1Change18_1" class="otherinput" />
-				<view wx:if="{{isliveQtNull}}" class="required">其他陪伴居住情况不能为空哦!</view>
+				<view wx:if="{{oldInfo[activeIndex].liveStatus[4].checked&&isliveQtNull}}" class="required">其他陪伴居住情况不能为空哦!</view>
 				<view class="block">
 					<view class="name"><text class="red">*</text>日常生活照料人</view>
 					<checkbox-group bindchange="tab1Change19">
@@ -235,10 +234,10 @@
 				<view wx:if="{{isoftenManNull}}" class="required">日常生活照料人不能为空哦!</view>
 				<view wx:if="{{oldInfo[activeIndex].oftenMan[5].checked}}">
 					<input value="{{oldInfo[activeIndex].lookAfterExt}}" bindblur="tab1Change20" placeholder="请填写人员关系" class="otherinput" />
-					<view wx:if="{{isoftenReaNull}}" class="required">人员关系不能为空哦!</view>
+					<view wx:if="{{oldInfo[activeIndex].oftenMan[5].checked&&isoftenReaNull}}" class="required">人员关系不能为空哦!</view>
 				</view>
 				<view wx:if="{{oldInfo[activeIndex].oftenMan[1].checked||oldInfo[activeIndex].oftenMan[2].checked||oldInfo[activeIndex].oftenMan[3].checked||oldInfo[activeIndex].oftenMan[4].checked||oldInfo[activeIndex].oftenMan[5].checked}}">
-					<view class="block"><text class="red">*</text>主要照料人姓名<input value="{{oldInfo[activeIndex].mainLookName}}" bindblur="tab1Change21" placeholder="请填写主要照料人姓名" /></view>
+					<view class="block"><text class="red">*</text>主要照料人姓名<input value="{{oldInfo[activeIndex].mainLookName}}" bindblur="tab1Change21" /></view>
 					<view class="required" wx:if="{{lookAfterName}}">主要照料人姓名不能为空哦!</view>
 					<view class="block">
 						<view class="name"><text class="red">*</text>主要照料人性别</view>
@@ -248,7 +247,7 @@
 							</label>
 						</radio-group>
 					</view>
-					<view class="block"><text class="red">*</text>主要照料人电话<input value="{{oldInfo[activeIndex].mainLookPhone}}" bindblur="tab1Change23" placeholder="请填写主要照料人电话" name="name" /></view>
+					<view class="block"><text class="red">*</text>主要照料人电话<input value="{{oldInfo[activeIndex].mainLookPhone}}" bindblur="tab1Change23"/></view>
 					<view class="required" wx:if="{{islookPhoneNull}}">主要照料人电话不能为空哦!</view>
 				</view>
 				<view class="block">
@@ -260,8 +259,8 @@
 					</checkbox-group>
 				</view>
 				<view wx:if="{{isloveNull}}" class="required">关爱服务需求不能为空哦!</view>
-				<input wx:if="{{oldInfo[activeIndex].loveRequire[8].checked}}" placeholder="请填写其它关爱服务需求" value="{{oldInfo[activeIndex].demandExt}}" bindblur="tab1Change25" name="name" class="otherinput" />
-				<view wx:if="{{isloveQtNull}}" class="required">其它关爱服务需求不能为空哦!</view>
+				<input wx:if="{{oldInfo[activeIndex].loveRequire[8].checked}}" placeholder="请填写其它关爱服务需求" value="{{oldInfo[activeIndex].demandExt}}" bindblur="tab1Change25" class="otherinput" />
+				<view wx:if="{{oldInfo[activeIndex].loveRequire[8].checked&&isloveQtNull}}" class="required">其它关爱服务需求不能为空哦!</view>
 				<view class="block">
 					<view class="name"><text class="red">*</text>老年人类别</view>
 					<checkbox-group bindchange="tab1Change26">
@@ -287,11 +286,10 @@
 						{{childInfo[activeIndex].childrenNum}}
 					</view>
 				</picker>
-				<!-- <view style="margin-top:30rpx;font-weight:900">第1个子女信息</view> -->
 				<view wx:for="{{childInfo[activeIndex].Info}}" wx:for-index="idx">
 					<van-divider contentPosition="center">第{{idx+1}}个子女信息</van-divider>
-					<view class="block"><text class="red">*</text>子女姓名<input data-index="{{idx}}" bindblur="tab2Change2" placeholder="子女姓名" value="{{childInfo[activeIndex].Info[idx].name}}" /></view>
-					<!-- <view class="required">子女姓名不能为空哦!</view> -->
+					<view class="block"><text class="red">*</text>子女姓名<input data-index="{{idx}}" bindblur="tab2Change2" value="{{childInfo[activeIndex].Info[idx].name}}" /></view>
+					<view wx:if="{{childNameNull[idx]}}" class="required">子女姓名不能为空哦!</view>
 					<view class="block">
 						<view class="name"><text class="red">*</text>子女性别</view>
 						<picker bindchange="tab2Change3" data-index="{{idx}}" value="{{childInfo[activeIndex].Info[idx].sex}}" range="{{childSexArr}}">
@@ -300,8 +298,8 @@
 							</view>
 						</picker>
 					</view>
-					<view class="block"><text class="red">*</text>子女联系电话<input data-index="{{idx}}" bindblur="tab2Change4" placeholder="请填写常用联系电话" value="{{childInfo[activeIndex].Info[idx].phone}}" /></view>
-					<view wx:if="{{ischildPhone[idx]}}" class="required">子女联系电话不能为空哦!</view>
+					<view class="block"><text class="red">*</text>子女联系电话<input data-index="{{idx}}" bindblur="tab2Change4" value="{{childInfo[activeIndex].Info[idx].phone}}" /></view>
+					<view wx:if="{{childPhoneNull[idx]}}" class="required">子女联系电话不能为空哦!</view>
 					<view class="name"><text class="red">*</text>是否外出</view>
 					<picker bindchange="tab2Change5" data-index="{{idx}}" value="{{childInfo[activeIndex].Info[idx].isHasGoOut}}" range="{{childIsout}}">
 						<view class="picker">
@@ -309,7 +307,7 @@
 						</view>
 					</picker>
 					<view wx:if="{{childInfo[activeIndex].Info[idx].isHasGoOut=='是'}}">
-						<view class="block"><text class="red">*</text>外出原因<input data-index="{{idx}}" bindblur="tab2Change6" placeholder="请填写外出原因" value="{{childInfo[activeIndex].Info[idx].outgoingCause}}" /></view>
+						<view class="block"><text class="red">*</text>外出原因<input data-index="{{idx}}" bindblur="tab2Change6" value="{{childInfo[activeIndex].Info[idx].outgoingCause}}" /></view>
 						<view wx:if="{{ischildOutReason[idx]}}" class="required">外出原因不能为空哦!</view>
 						<view class="block"><text class="red">*</text>外出地点
 							<picker mode="region" data-index="{{idx}}" bindchange="tab2Change7" value="{{childInfo[activeIndex].Info[idx].outgoingplace}}">
@@ -332,9 +330,9 @@
 							{{childInfo[activeIndex].Info[idx].isHasPartner}}
 						</view>
 					</picker>
-					<view wx:if="{{childInfo[activeIndex].Info[idx].isHasPartner=='是'}}" class="block"><text class="red">*</text>配偶姓名<input data-index="{{idx}}" bindblur="tab2Change10" placeholder="请填写配偶姓名" value="{{childInfo[activeIndex].Info[idx].name2}}" /></view>
+					<view wx:if="{{childInfo[activeIndex].Info[idx].isHasPartner=='是'}}" class="block"><text class="red">*</text>配偶姓名<input data-index="{{idx}}" bindblur="tab2Change10" value="{{childInfo[activeIndex].Info[idx].name2}}" /></view>
 					<view wx:if="{{ischildMarryName[idx]}}" class="required">配偶姓名不能为空哦!</view>
-					<view wx:if="{{childInfo[activeIndex].Info[idx].isHasPartner=='是'}}" class="block"><text class="red">*</text>配偶联系电话<input data-index="{{idx}}" bindblur="tab2Change11" placeholder="请填写配偶联系电话" value="{{childInfo[activeIndex].Info[idx].phone2}}" /></view>
+					<view wx:if="{{childInfo[activeIndex].Info[idx].isHasPartner=='是'}}" class="block"><text class="red">*</text>配偶联系电话<input data-index="{{idx}}" bindblur="tab2Change11" value="{{childInfo[activeIndex].Info[idx].phone2}}" /></view>
 					<view wx:if="{{ischildMarryPhone[idx]}}" class="required">配偶联系电话不能为空哦!</view>
 					<view class="name"><text class="red">*</text>平均一年探望次数</view>
 					<picker bindchange="tab2Change12" data-index="{{idx}}" value="{{childInfo[activeIndex].Info[idx].visit}}" range="{{childTfTimes}}">
@@ -353,7 +351,7 @@
 					</view>
 				</picker>
 				<view wx:if="{{otherInfo[activeIndex].isHasOther=='是'}}">
-					<view class="block"><text class="red">*</text>其他赡养人姓名<input bindblur="tab3Change2" placeholder="请填写其他赡养人姓名" value="{{otherInfo[activeIndex].Info.name}}" /></view>
+					<view class="block"><text class="red">*</text>其他赡养人姓名<input bindblur="tab3Change2" value="{{otherInfo[activeIndex].Info.name}}" /></view>
 					<view wx:if="{{isothersyrName}}" class="required">其他赡养人姓名不能为空哦!</view>
 					<view class="block">
 						<view class="name"><text class="red">*</text>其他赡养人性别</view>
@@ -363,7 +361,7 @@
 							</label>
 						</radio-group>
 					</view>
-					<view class="block"><text class="red">*</text>其他赡养人电话<input bindblur="tab3Change4" value="{{otherInfo[activeIndex].Info.phone}}" placeholder="请填写常用联系电话" name="name" /></view>
+					<view class="block"><text class="red">*</text>其他赡养人电话<input bindblur="tab3Change4" value="{{otherInfo[activeIndex].Info.phone}}"/></view>
 					<view wx:if="{{isothersyrPhone}}" class="required">其他赡养人电话不能为空哦!</view>
 					<view class="name"><text class="red">*</text>与被赡养人关系</view>
 					<picker bindchange="tab3Change5" value="{{otherInfo[activeIndex].Info.relation}}" range="{{othersyrRelation}}">
@@ -371,7 +369,7 @@
 							{{otherInfo[activeIndex].Info.relation}}
 						</view>
 					</picker>
-					<view class="block" wx:if="{{otherInfo[activeIndex].Info.relation  == '其他'}}"><text class="red">*</text>与被赡养人其他关系<input bindblur="tab3Change6" placeholder="请填写与被赡养人其他关系" value="{{otherInfo[activeIndex].Info.relationExt}}" name="name" /></view>
+					<view class="block" wx:if="{{otherInfo[activeIndex].Info.relation  == '其他'}}"><text class="red">*</text>与被赡养人其他关系<input bindblur="tab3Change6" value="{{otherInfo[activeIndex].Info.relationExt}}"/></view>
 					<view wx:if="{{isothersyRelation}}" class="required">与被赡养人其他关系不能为空哦!</view>
 					<view class="name"><text class="red">*</text>是否外出</view>
 					<picker bindchange="tab3Change7" value="{{otherInfo[activeIndex].Info.isHasGoOut}}" range="{{othersyrIsout}}">
@@ -380,7 +378,7 @@
 						</view>
 					</picker>
 					<view wx:if="{{otherInfo[activeIndex].Info.isHasGoOut=='是'}}">
-						<view class="block"><text class="red">*</text>外出原因<input bindblur="tab3Change8" placeholder="请填写外出原因" value="{{otherInfo[activeIndex].Info.outgoingCause}}" /></view>
+						<view class="block"><text class="red">*</text>外出原因<input bindblur="tab3Change8" value="{{otherInfo[activeIndex].Info.outgoingCause}}" /></view>
 						<view wx:if="{{isOutReason}}" class="required">外出原因不能为空哦!</view>
 						<view class="block"><text class="red">*</text>外出地点
 							<picker mode="region" bindchange="tab3Change9" value="{{otherInfo[activeIndex].Info.outgoingplace}}">
@@ -404,9 +402,9 @@
 						</view>
 					</picker>
 					<view wx:if="{{otherInfo[activeIndex].Info.isHasPartner=='是'}}">
-						<view class="block"><text class="red">*</text>配偶姓名<input bindblur="tab3Change12" placeholder="请填写配偶姓名" value="{{otherInfo[activeIndex].Info.name2}}" /></view>
+						<view class="block"><text class="red">*</text>配偶姓名<input bindblur="tab3Change12" value="{{otherInfo[activeIndex].Info.name2}}" /></view>
 						<view wx:if="{{isMarryName}}" class="required">配偶姓名不能为空哦!</view>
-						<view class="block"><text class="red">*</text>配偶联系电话<input bindblur="tab3Change13" placeholder="请填写配偶联系电话" value="{{otherInfo[activeIndex].Info.phone2}}" /></view>
+						<view class="block"><text class="red">*</text>配偶联系电话<input bindblur="tab3Change13" value="{{otherInfo[activeIndex].Info.phone2}}" /></view>
 						<view wx:if="{{isMarryPhone}}" class="required">配偶联系电话不能为空哦!</view>
 					</view>
 					<view class="name"><text class="red">*</text>平均一年探望次数</view>
@@ -429,7 +427,7 @@
 				</view>
 				<view wx:if="{{visitWaysFromOther}}" class="required">巡访方式不能为空哦!</view>
 				<input wx:if="{{regularsInfos[activeIndex].visitMode[2].checked}}" placeholder="请填写其它内容" value="{{regularsInfos[activeIndex].visitModeExt}}" bindblur="tab4Change2" class="otherinput" />
-				<view wx:if="{{isVisittimesnull}}" class="required">其它巡访方式不能为空哦!</view>
+				<view wx:if="{{regularsInfos[activeIndex].visitMode[2].checked&&isVisittimesnull}}" class="required">其它巡访方式不能为空哦!</view>
 				<view class="block">
 					<view class="name"><text class="red">*</text>巡访频次</view>
 					<radio-group bindchange="tab4Change3">
@@ -438,9 +436,8 @@
 						</label>
 					</radio-group>
 				</view>
-				<view wx:if="{{isnull2}}" class="required">巡访频次不能为空哦!</view>
-				<input wx:if="{{regularsInfos[activeIndex].visitCount[4].checked}}" value="{{regularsInfos[activeIndex].visitCountExt}}" placeholder="请填写其它内容" bindblur="tab4change4" name="name" class="otherinput" />
-				<view wx:if="{{isVisittimesnull}}" class="required">其它巡访频次不能为空哦!</view>
+				<input wx:if="{{regularsInfos[activeIndex].visitCount[4].checked}}" value="{{regularsInfos[activeIndex].visitCountExt}}" placeholder="请填写其它内容" bindblur="tab4change4" class="otherinput" />
+				<view wx:if="{{regularsInfos[activeIndex].visitCount[4].checked&&isVisittimesQtnull}}" class="required">其它巡访频次不能为空哦!</view>
 			</view>
 		</view>
 	</view>

+ 5 - 36
pages/collectInfo/collectInfo.wxss

@@ -298,8 +298,8 @@ page {
 }
 
 checkbox .wx-checkbox-input {
-  width: 22rpx;
-  height: 22rpx;
+  width: 30rpx;
+  height: 30rpx;
 }
 
 checkbox .wx-checkbox-input.wx-checkbox-input-checked {
@@ -377,7 +377,6 @@ radio-group label {
 .red {
   color: red;
 }
-
 .adress_box {
   width: 750rpx;
   height: 70vh;
@@ -388,24 +387,20 @@ radio-group label {
   z-index: 99;
   /* text-align: center; */
 }
-
 .choose_text {
   font-size: 30rpx;
   margin-top: 30rpx;
   text-align: center;
 }
-
 radio .wx-radio-input {
-  width: 22rpx;
-  height: 22rpx;
+  width: 25rpx;
+  height: 25rpx;
 }
-
 radio .wx-radio-input.wx-radio-input-checked::before {
   background-color: #2087f7;
   color: #fff;
-  border-radius: 22rpx;
+  border-radius: 25rpx;
 }
-
 .close_img {
   width: 30rpx;
   height: 30rpx;
@@ -413,32 +408,6 @@ radio .wx-radio-input.wx-radio-input-checked::before {
   top: 50rpx;
   right: 50rpx;
 }
-
-/* 
-radio .wx-radio-input.wx-radio-input-checked::before{
-  border-radius: 50%;
-  width: 18rpx; 
-  height: 18rpx; 
-  text-align: center;
-  font-size:0rpx; 
-  background-color: #00a0e9; 
-  
-}
-radio{
-  border-radius: 50%;
-  width: 22rpx;
-  height: 22rpx;
-  border: 2px solid #e7e9ee;
-  font-size: 0;
-  margin-bottom: 10rpx;
-  display: inline-block;
-}
-radio .wx-radio-input{
-   border-radius: 50%;
-   width: 22rpx;
-   height: 22rpx; 
-   border: none;
-} */
 .choosedAdress_box {
   width: 650rpx;
   margin-left: 50rpx;

+ 7 - 0
pages/personInfo/personInfo.wxml

@@ -32,6 +32,13 @@
 			<view class="small-zi">修改密码</view>
 		</view>
 		<view class="jiantou">></view>
+	</view>
+		<view class="title" bindtap="userBook">
+		<view class="small-title" >
+			<image src="/images/userbook.png" style="width: 80rpx; height: 80rpx;"></image>
+			<view class="small-zi">用户手册</view>
+		</view>
+		<view class="jiantou">></view>
 	</view>
 	<view class="title" bindtap="tuichu">
 		<view class="small-title" >

+ 2 - 2
utils/photoUrl.wxs

@@ -1,6 +1,6 @@
 var url = function (val) {
-  
-  return  'http://info.windd.cn:8080/test' + val
+  // http://10.16.4.7:7001
+  return  'http://10.16.4.7:7001' + val
 }
 
 module.exports = {

+ 2 - 1
utils/util.js

@@ -1,7 +1,8 @@
 const globalData = {
-  publicUrl: 'http://info.windd.cn:8080/test',
+  // publicUrl: 'http://info.windd.cn:8080/test',
   //publicUrl: 'http://10.16.4.12:7001',
   //publicUrl: 'http://10.16.4.8:7001',
+  publicUrl:'http://10.16.4.7:7001'//立秋
 };
 module.exports = {
   globalData: globalData,