roose 4 年 前
コミット
9c869aed94

+ 15 - 5
pages/collectInfo/collectInfo.js

@@ -2583,9 +2583,10 @@ Page({
     return data;
   },
   huixian(id, name) {
-    console.log(id);
-    console.log(name);
     if (id) {
+      wx.showLoading({
+        title: '加载中',
+      })
       this.setData({
         showBj: false,
         showBj1: false,
@@ -2594,6 +2595,9 @@ Page({
         familyFid: id,
         color: 'transparent',
       })
+      console.log(this.data.showBj , "关闭提示添加");
+      
+      
       var that = this;
       wx.request({
         url: util.globalData.publicUrl + '/wxinfo/listByFid',
@@ -2605,6 +2609,7 @@ Page({
           appletsId: wx.getStorageSync('openId')
         },
         success: (res) => {
+          wx.hideLoading()
           console.log(res.data.data, "单查赋值锕")
           that.setData({
             oldInfo: res.data.data
@@ -3293,6 +3298,8 @@ Page({
         }
       })
     } else {
+      console.log("我是没有fid的");
+
       let oldInfo = [{
         name: '',
         oldSex: [{
@@ -3564,7 +3571,7 @@ Page({
         regularsInfos: regularsInfos,
       })
       console.log(this.data.regularsInfos);
-
+      console.log(this.data.showBj);
     }
 
   },
@@ -3677,11 +3684,9 @@ Page({
       return;
     };
     this.setData({
-      showBj: true,
       addOldname: '',
       currentIndex: 0
     })
-
     const app = getApp()
     console.log(app.globalData.id, "传参的一户的值");
     this.huixian(app.globalData.id, app.globalData.name);
@@ -3690,6 +3695,11 @@ Page({
     const app = getApp()
     app.globalData.id = ''
     app.globalData.name = ''
+    this.setData({
+      showBj: false
+    })
+    console.log(this.data.showBj , "我关闭页面隐藏属性");
+    
   },
   //获取位置
   getSelfLocation: function (varSendOrgId) {

+ 6 - 5
pages/collectInfo/collectInfo.wxml

@@ -1,10 +1,11 @@
 <wxs module="urls" src="../../utils/photoUrl.wxs"></wxs>
 <view class="container1">
-	<view class="writeOldmanName" wx:if="{{showBj}}">
-		<view class="OldmanName_box">
+<!--  wx:if="{{showBj}}" -->
+	<view class="{{showBj ? 'writeOldmanName':'none'}} ">
+		<view class="   OldmanName_box">
 			<view class="oldmanname">请输入老人姓名1111111111</view>
 			<!--   -->
-			<input  style="margin-left:50rpx;margin-top:30rpx;border:1px solid #279bff" placeholder-style="color: {{color}}"  bindblur="addOldName" value="{{addOldname}}" placeholder="请填写老人姓名" />
+			<input style="margin-left:50rpx;margin-top:30rpx;border:1px solid #279bff" placeholder-style="color: {{color}}" bindinput="addOldName" value="{{addOldname}}" placeholder="请填写老人姓名" />
 			<view class="btn_box">
 				<view class="sure" bindtap="sure">确定</view>
 				<view class="esc" bindtap="qx">取消</view>
@@ -14,7 +15,7 @@
 	<view class="writeOldmanName" wx:if="{{showBj1}}">
 		<view class="OldmanName_box">
 			<view class="oldmanname">请输入老人姓名</view>
-			<input auto-focus style="margin-left:50rpx;margin-top:30rpx;border:1px solid #279bff" bindblur="addOldName1" value="{{addOldname1}}" placeholder="请填写老人姓名" />
+			<input style="margin-left:50rpx;margin-top:30rpx;border:1px solid #279bff" bindinput="addOldName1" value="{{addOldname1}}" placeholder="请填写老人姓名" />
 			<view class="btn_box">
 				<view class="sure" bindtap="sure1">确定</view>
 				<view class="esc" bindtap="qx1">取消</view>
@@ -432,7 +433,7 @@
 				</view>
 			</view>
 			<!-- 第四个tab寻访联系人信息 -->
-		<view wx:if="{{currentIndex==3}}">
+			<view wx:if="{{currentIndex==3}}">
 				<view class="block">
 					<view class="name"><text class="red">*</text>巡访方式</view>
 					<checkbox-group bindchange="tab4Change1">

+ 7 - 2
pages/collectInfo/collectInfo.wxss

@@ -9,6 +9,11 @@ page {
   position: absolute;
   top: 0;
   z-index: 99;
+  display: block;
+}
+
+.none {
+  display: none;
 }
 
 .OldmanName_box {
@@ -311,11 +316,11 @@ input {
   border: 1px solid #e3e5eb;
   border-radius: 10rpx;
   text-indent: 20rpx;
- 
+
 }
 
 .huiColor {
-  background-color: #F5F7FA!important;
+  background-color: #F5F7FA !important;
 }
 
 .block {

+ 7 - 7
pages/finishInfo/finishInfo.js

@@ -239,26 +239,26 @@ Page({
     };
     const messages = {
       userName: {
-        required: '姓名不能为空',
+        required: '请输入您的姓名',
       },
       sex: {
-        required: '性别不能为空',
+        required: '请输入您的性别',
       },
       idCardNumber: {
-        required: '身份证号不能为空',
+        required: '请输入您的身份证号',
         idcard: '身份证号格式错误 ',
       },
       age: {
-        required: '年龄不能为空',
+        required: '请输入您的年龄',
       },
       job: {
-        required: '职务不能为空',
+        required: '请输入您的职务',
       },
       income: {
-        required: '收入不能为空',
+        required: '请输入您的收入',
       },
       education: {
-        required: '学历不能为空',
+        required: '请输入您的学历',
       },
     };
     // 创建实例对象