ssfg 4 년 전
부모
커밋
4f8bcbfcba

+ 4 - 4
pages/bindOld/bindOld.js

@@ -27,10 +27,10 @@ Page({
             title: '加载中',
           })
           wx.request({
-            url: app.globalData.publicUrl + '/applet/appletVisitUnbind',
+            url: app.globalData.publicUrl + '/wxinfo/visitUnbind',
             method: "GET",
             data: {
-              appletId: id,
+              openId: id,
               fid: this.data.fid
             },
             success: res => {
@@ -69,10 +69,10 @@ Page({
       title: '加载中',
     })
     wx.request({
-      url: app.globalData.publicUrl + '/applet/appletVisitIsExist',
+      url: app.globalData.publicUrl + '/wxinfo/visitIsExist',
       method: "GET",
       data: {
-        appletId: id
+        openId: id
       },
       success: res => {
         if (res.data.code == 1) {

+ 63 - 4
pages/collectInfo/collectInfo.js

@@ -51,10 +51,69 @@ Page({
     // tab1老人信息
     oldInfo: [],
     villageOldChecked: false,
-    mzArr: ["汉族", "壮族", "满族", "回族", "苗族", "维吾尔族", "土家族", "彝族", "蒙古族", "藏族", "布依族", "侗族", "瑶族", "朝鲜族", "白族", "哈尼族",
-      "哈萨克族", "黎族", "傣族", "畲族", "傈僳族", "仡佬族", "东乡族", "高山族", "拉祜族", "水族", "佤族", "纳西族", "羌族", "土族", "仫佬族", "锡伯族",
-      "柯尔克孜族", "达斡尔族", "景颇族", "毛南族", "撒拉族", "布朗族", "塔吉克族", "阿昌族", "普米族", "鄂温克族", "怒族", "京族", "基诺族", "德昂族", "保安族",
-      "俄罗斯族", "裕固族", "乌孜别克族", "门巴族", "鄂伦春族", "独龙族", "塔塔尔族", "赫哲族", "珞巴族"
+    // mzArr: ["汉族", "壮族", "满族", "回族", "苗族", "维吾尔族", "土家族", "彝族", "蒙古族", "藏族", "布依族", "侗族", "瑶族", "朝鲜族", "白族", "哈尼族",
+    //   "哈萨克族", "黎族", "傣族", "畲族", "傈僳族", "仡佬族", "东乡族", "高山族", "拉祜族", "水族", "佤族", "纳西族", "羌族", "土族", "仫佬族", "锡伯族",
+    //   "柯尔克孜族", "达斡尔族", "景颇族", "毛南族", "撒拉族", "布朗族", "塔吉克族", "阿昌族", "普米族", "鄂温克族", "怒族", "京族", "基诺族", "德昂族", "保安族",
+    //   "俄罗斯族", "裕固族", "乌孜别克族", "门巴族", "鄂伦春族", "独龙族", "塔塔尔族", "赫哲族", "珞巴族"
+    // ],
+    mzArr: [
+      "汉族",
+      "满族",
+      "蒙古族",
+      "回族",
+      "藏族",
+      "维吾尔族",
+      "苗族",
+      "彝族",
+      "壮族",
+      "布依族",
+      "侗族",
+      "瑶族",
+      "白族",
+      "土家族",
+      "哈尼族",
+      "哈萨克族",
+      "傣族",
+      "黎族",
+      "傈僳族",
+      "佤族",
+      "畲族",
+      "高山族",
+      "拉祜族",
+      "水族",
+      "东乡族",
+      "纳西族",
+      "景颇族",
+      "柯尔克孜族",
+      "土族",
+      "达斡尔族",
+      "仫佬族",
+      "羌族",
+      "布朗族",
+      "撒拉族",
+      "毛南族",
+      "仡佬族",
+      "锡伯族",
+      "阿昌族",
+      "普米族",
+      "朝鲜族",
+      "塔吉克族",
+      "怒族",
+      "乌孜别克族",
+      "俄罗斯族",
+      "鄂温克族",
+      "德昂族",
+      "保安族",
+      "裕固族",
+      "京族",
+      "塔塔尔族",
+      "独龙族",
+      "鄂伦春族",
+      "赫哲族",
+      "门巴族",
+      "珞巴族",
+      "基诺族",
+      "其他"
     ],
     ableStatus: ["完全自理", "半失能(部分自理)", "失能"], //老年人能力情况
     chooseAdressArr: [],

+ 90 - 40
pages/collectInfo/collectInfo.wxml

@@ -87,20 +87,23 @@
 				<view class="name"><text class="red">*</text>民族</view>
 				<picker bindchange="tab1Change3" disabled="{{oldInfo[activeIndex].status == '3'}}" value="{{oldInfo[activeIndex].nation}}" range="{{mzArr}}">
 					<view class="picker {{oldInfo[activeIndex].status == '3' ? 'huiColor' : ''}} ">
-						{{oldInfo[activeIndex].nation}}
+						<view wx:if="{{oldInfo[activeIndex].nation}}">{{oldInfo[activeIndex].nation}}</view>
+						<view wx:else class="place_text">请选择</view>
+						<van-icon name="arrow-down" style="position:absolute;right:20rpx;top:10rpx;color:#bbbbbb" />
 					</view>
 				</picker>
-				<view class="block"><text class="red">*</text>身份证号<input class="{{oldInfo[activeIndex].status == '3' ? 'huiColor' : ''}}" bindblur="tab1Change4" disabled="{{oldInfo[activeIndex].status == '3'}}" value="{{oldInfo[activeIndex].idNumber}}" /></view>
+				<view class="block"><text class="red">*</text>身份证号<input  placeholder="请填写" placeholder-style='font-size:25rpx;color: #bbbbbb;' class="{{oldInfo[activeIndex].status == '3' ? 'huiColor' : ''}}" bindblur="tab1Change4" disabled="{{oldInfo[activeIndex].status == '3'}}" value="{{oldInfo[activeIndex].idNumber}}" /></view>
 				<view wx:if="{{oldCardNull}}" class="required">老人身份证号不能为空哦!</view>
 				<view wx:if="{{oldCardWrong}}" class="required">老人身份证号格式不对哦!</view>
 				<view wx:if="{{oldCard60}}" class="required">不可采集低于60岁老人的信息哦</view>
-				<view class="block"><text class="red">*</text>联系电话<input bindblur="tab1Change5" value="{{oldInfo[activeIndex].phone}}" /></view>
+				<view class="block"><text class="red">*</text>联系电话<input placeholder="请填写" placeholder-style='font-size:25rpx;color: #bbbbbb;' 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>
+						<view wx:if="{{oldInfo[activeIndex].chooseAdressArr.length==0}}" class="place_text" bindtap="showAdressShow">点我选择户籍地址</view>
 						<view style="width:450rpx;height:100rpx" wx:else bindtap="showAdressShow">{{oldInfo[activeIndex].chooseAdressArr}}</view>
+						<van-icon name="arrow-down" style="position:absolute;right:20rpx;top:10rpx;color:#bbbbbb" />
 					</view>
 					<view class="picker_container" wx:if='{{showAdressBox}}'>
 						<view style="height:50px;width:300px">
@@ -133,7 +136,7 @@
 							<textarea style="width:450rpx;height:auto" disabled="true" wx:else>{{oldInfo[activeIndex].chooseAdressArr}}</textarea>
 						</view>
 					</picker> -->
-					<input bindblur="tab1Change6" placeholder="请填写补充户籍地址" value="{{oldInfo[activeIndex].nativePlaceExt}}" />
+					<input bindblur="tab1Change6" placeholder="请填写补充户籍地址" placeholder-style='font-size:25rpx;color: #bbbbbb;' value="{{oldInfo[activeIndex].nativePlaceExt}}" />
 				</view>
 				 <checkbox-group bindchange="tab1change6_1">
 					<label wx:for="{{oldInfo[activeIndex].isSameWithAddress}}" wx:key="name">
@@ -148,8 +151,9 @@
 						</view>
 					</picker> -->
 					<view class="picker1">
-						<view wx:if="{{oldInfo[activeIndex].chooseAdressArr1.length==0}}" bindtap="showAdressShow1">点我选择现居地址</view>
+						<view wx:if="{{oldInfo[activeIndex].chooseAdressArr1.length==0}}" class="place_text" bindtap="showAdressShow1">点我选择现居地址</view>
 						<view style="width:450rpx;height:100rpx" wx:else bindtap="showAdressShow1">{{oldInfo[activeIndex].chooseAdressArr1}}</view>
+						<van-icon name="arrow-down" style="position:absolute;right:20rpx;top:10rpx;color:#bbbbbb" />
 						<!-- <textarea style="width:420rpx;height:100rpx" disabled="true" wx:else  bindtap="showAdressShow1" value="{{oldInfo[activeIndex].chooseAdressArr1}}"></textarea> -->
 					</view>
 					<view class="picker_container" wx:if='{{showAdressBox1}}'>
@@ -177,7 +181,7 @@
 							</picker-view>
 						</view>
 					</view>
-					<input disabled="{{nowAdress}}" bindblur="tab1Change7" placeholder="请填写补充现居地址" value="{{oldInfo[activeIndex].addressExt}}" />
+					<input disabled="{{nowAdress}}" bindblur="tab1Change7" placeholder="请填写补充现居地址" placeholder-style='font-size:25rpx;color: #bbbbbb;' value="{{oldInfo[activeIndex].addressExt}}" />
 				</view>
 				<view class="block">
 					<view class="name"><text class="red">*</text>婚姻及配偶情况</view>
@@ -232,13 +236,18 @@
 				<view class="name"><text class="red">*</text>老年人能力情况</view>
 				<picker bindchange="tab1Change12" value="{{oldInfo[activeIndex].ability}}" range="{{ableStatus}}">
 					<view class="picker">
-						{{oldInfo[activeIndex].ability}}
+						<view wx:if="{{oldInfo[activeIndex].ability}}"> {{oldInfo[activeIndex].ability}}</view>
+						<view wx:else class="place_text">请选择</view>
+						<van-icon name="arrow-down" style="position:absolute;right:20rpx;top:10rpx;color:#bbbbbb" />
 					</view>
 				</picker>
 				<view class="name"><text class="red">*</text>生活经济情况</view>
 				<picker bindchange="tab1Change13" value="{{oldInfo[activeIndex].livingCondition}}" range="{{moneyStatus}}">
 					<view class="picker">
-						{{oldInfo[activeIndex].livingCondition}}
+						<!-- {{oldInfo[activeIndex].livingCondition}} -->
+						<view wx:if="{{oldInfo[activeIndex].livingCondition}}"> {{oldInfo[activeIndex].livingCondition}}</view>
+						<view wx:else class="place_text">请选择</view>
+						<van-icon name="arrow-down" style="position:absolute;right:20rpx;top:10rpx;color:#bbbbbb" />
 					</view>
 				</picker>
 				<view class="block">
@@ -255,7 +264,10 @@
 				<view class="name"><text class="red">*</text>本人上年度可支配收入</view>
 				<picker bindchange="tab1Change15" value="{{oldInfo[activeIndex].income}}" range="{{payMoney}}">
 					<view class="picker">
-						{{oldInfo[activeIndex].income}}
+						<!-- {{oldInfo[activeIndex].income}} -->
+						<view wx:if="{{oldInfo[activeIndex].income}}"> {{oldInfo[activeIndex].income}}</view>
+						<view wx:else class="place_text">请选择</view>
+						<van-icon name="arrow-down" style="position:absolute;right:20rpx;top:10rpx;color:#bbbbbb" />
 					</view>
 				</picker>
 				<view class="block">
@@ -345,58 +357,69 @@
 					<image class="image" style="width:200rpx;height:200rpx" src="{{urls.url(oldInfo[activeIndex].imgPath)}}" mode='scaleToFill' bindtap="previewImg"></image>
 					<van-icon size='23' name="clear" class="close" data-index="{{index}}" bindtap="closeImage" data-activeIndex='{{activeIndex}}' />
 				</view>
-				<view class="name" style="display:flex"><text class="red">*</text>所处地理位置 
-				<!-- <view class="setting"><button bindtap="openSetting" hidden="{{setTrue}}">(点我授予位置权限)</button></view> -->
+				<!-- <view class="name" style="display:flex"><text class="red">*</text>所处地理位置 
 				</view>
-				<!-- <view class="setting"> -->
-					<!-- <button bindtap="openSetting">打开设置页</button></view> -->
-				<!-- hidden="{{setTrue}}" -->
 				<view class="{{oldInfo[activeIndex].photoAndLocation?'picker1':'picker11'}}">
 					{{oldInfo[activeIndex].photoAndLocation}}
-				</view>
+				</view> -->
 			</view>
 			<!-- 第二个tab子女信息 -->
 			<view wx:if="{{currentIndex==1}}">
 				<view class="name"><text class="red">*</text>子女个数</view>
 				<picker bindchange="tab2Change1" value="{{childInfo[activeIndex].childrenNum}}" range="{{childNumArr}}">
 					<view class="picker">
-						{{childInfo[activeIndex].childrenNum}}
+						<!-- {{childInfo[activeIndex].childrenNum}} -->
+						<view wx:if="{{oldInfo[activeIndex].childrenNum}}"> {{oldInfo[activeIndex].childrenNum}}</view>
+						<view wx:else class="place_text">请选择</view>
+						<van-icon name="arrow-down" style="position:absolute;right:20rpx;top:10rpx;color:#bbbbbb" />
 					</view>
 				</picker>
 				<view wx:for="{{childInfo[activeIndex].Info}}" wx:for-index="idx" wx:key="Info">
 					<van-divider contentPosition="center">第{{idx+1}}个子女信息</van-divider>
-					<view class="block"><text class="red">*</text>子女姓名<input data-index="{{idx}}" bindblur="tab2Change2" value="{{childInfo[activeIndex].Info[idx].name}}" /></view>
+					<view class="block"><text class="red">*</text>子女姓名<input placeholder="请填写" placeholder-style='font-size:25rpx;color: #bbbbbb;' 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}}">
 							<view class="picker">
-								{{childInfo[activeIndex].Info[idx].sex}}
+								<!-- {{childInfo[activeIndex].Info[idx].sex}} -->
+								<view wx:if="{{childInfo[activeIndex].Info[idx].sex}}"> {{childInfo[activeIndex].Info[idx].sex}}</view>
+								<view wx:else class="place_text">请选择</view>
+								<van-icon name="arrow-down" style="position:absolute;right:20rpx;top:10rpx;color:#bbbbbb" />
 							</view>
 						</picker>
 					</view>
-					<view class="block"><text class="red">*</text>子女联系电话<input data-index="{{idx}}" bindblur="tab2Change4" value="{{childInfo[activeIndex].Info[idx].phone}}" /></view>
+					<view class="block"><text class="red">*</text>子女联系电话<input placeholder="请填写" placeholder-style='font-size:25rpx;color: #bbbbbb;' 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">
-							{{childInfo[activeIndex].Info[idx].isHasGoOut}}
+							<!-- {{childInfo[activeIndex].Info[idx].isHasGoOut}} -->
+							<view wx:if="{{childInfo[activeIndex].Info[idx].isHasGoOut}}"> {{childInfo[activeIndex].Info[idx].isHasGoOut}}</view>
+							<view wx:else class="place_text">请选择</view>
+							<van-icon name="arrow-down" style="position:absolute;right:20rpx;top:10rpx;color:#bbbbbb" />
 						</view>
 					</picker>
 					<view wx:if="{{childInfo[activeIndex].Info[idx].isHasGoOut=='是'}}">
-						<view class="block"><text class="red">*</text>外出原因<input data-index="{{idx}}" bindblur="tab2Change6" value="{{childInfo[activeIndex].Info[idx].outgoingCause}}" /></view>
+						<view class="block"><text class="red">*</text>外出原因<input placeholder="请填写" placeholder-style='font-size:25rpx;color: #bbbbbb;' 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}}">
 								<view class="picker">
-									{{childInfo[activeIndex].Info[idx].outgoingplace}}
+									<!-- {{childInfo[activeIndex].Info[idx].outgoingplace}} -->
+									<view wx:if="{{childInfo[activeIndex].Info[idx].outgoingplace}}"> {{childInfo[activeIndex].Info[idx].outgoingplace}}</view>
+									<view wx:else class="place_text">请选择</view>
+									<van-icon name="arrow-down" style="position:absolute;right:20rpx;top:10rpx;color:#bbbbbb" />
 								</view>
 							</picker>
 						</view>
 						<view class="block"><text class="red">*</text>最后一次离家时间
 							<picker mode="date" data-index="{{idx}}" bindchange="tab2Change8" value="{{childInfo[activeIndex].Info[idx].outgoingTime}}" fields="month">
 								<view class="picker">
-									{{childInfo[activeIndex].Info[idx].outgoingTime}}
+									<!-- {{childInfo[activeIndex].Info[idx].outgoingTime}} -->
+									<view wx:if="{{childInfo[activeIndex].Info[idx].outgoingTime}}"> {{childInfo[activeIndex].Info[idx].outgoingTime}}</view>
+									<view wx:else class="place_text">请选择</view>
+									<van-icon name="arrow-down" style="position:absolute;right:20rpx;top:10rpx;color:#bbbbbb" />
 								</view>
 							</picker>
 						</view>
@@ -404,17 +427,23 @@
 					<view class="name"><text class="red">*</text>是否有配偶</view>
 					<picker bindchange="tab2Change9" data-index="{{idx}}" value="{{childInfo[activeIndex].Info[idx].isHasPartner}}" range="{{childIsMArry}}">
 						<view class="picker">
-							{{childInfo[activeIndex].Info[idx].isHasPartner}}
+							<!-- {{childInfo[activeIndex].Info[idx].isHasPartner}} -->
+							<view wx:if="{{childInfo[activeIndex].Info[idx].isHasPartner}}"> {{childInfo[activeIndex].Info[idx].isHasPartner}}</view>
+							<view wx:else class="place_text">请选择</view>
+							<van-icon name="arrow-down" style="position:absolute;right:20rpx;top:10rpx;color:#bbbbbb" />
 						</view>
 					</picker>
-					<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="{{childInfo[activeIndex].Info[idx].isHasPartner=='是'}}" class="block"><text class="red">*</text>配偶姓名<input placeholder="请填写" placeholder-style='font-size:25rpx;color: #bbbbbb;' 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" value="{{childInfo[activeIndex].Info[idx].phone2}}" /></view>
+					<view wx:if="{{childInfo[activeIndex].Info[idx].isHasPartner=='是'}}" class="block"><text class="red">*</text>配偶联系电话<input placeholder="请填写" placeholder-style='font-size:25rpx;color: #bbbbbb;' 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}}">
 						<view class="picker">
-							{{childInfo[activeIndex].Info[idx].visit}}
+							<view wx:if="{{childInfo[activeIndex].Info[idx].visit}}"> {{childInfo[activeIndex].Info[idx].visit}}</view>
+							<view wx:else class="place_text">请选择</view>
+							<van-icon name="arrow-down" style="position:absolute;right:20rpx;top:10rpx;color:#bbbbbb" />
+							<!-- {{childInfo[activeIndex].Info[idx].visit}} -->
 						</view>
 					</picker>
 				</view>
@@ -424,11 +453,14 @@
 				<view class="name"><text class="red">*</text>是否有其他赡养人</view>
 				<picker bindchange="tab3Change1" value="{{otherInfo[activeIndex].isHasOther}}" range="{{othersyrArr}}">
 					<view class="picker">
-						{{otherInfo[activeIndex].isHasOther}}
+						<!-- {{otherInfo[activeIndex].isHasOther}} -->
+						<view wx:if="{{otherInfo[activeIndex].isHasOther}}">{{otherInfo[activeIndex].isHasOther}}</view>
+						<view wx:else class="place_text">请选择</view>
+						<van-icon name="arrow-down" style="position:absolute;right:20rpx;top:10rpx;color:#bbbbbb" />
 					</view>
 				</picker>
 				<view wx:if="{{otherInfo[activeIndex].isHasOther=='是'}}">
-					<view class="block"><text class="red">*</text>其他赡养人姓名<input bindblur="tab3Change2" value="{{otherInfo[activeIndex].Info.name}}" /></view>
+					<view class="block"><text class="red">*</text>其他赡养人姓名<input placeholder="请填写" placeholder-style='font-size:25rpx;color: #bbbbbb;' 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>
@@ -438,12 +470,15 @@
 							</label>
 						</radio-group>
 					</view>
-					<view class="block"><text class="red">*</text>其他赡养人电话<input bindblur="tab3Change4" value="{{otherInfo[activeIndex].Info.phone}}" /></view>
+					<view class="block"><text class="red">*</text>其他赡养人电话<input placeholder="请填写" placeholder-style='font-size:25rpx;color: #bbbbbb;' 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}}">
 						<view class="picker">
-							{{otherInfo[activeIndex].Info.relation}}
+							<!-- {{otherInfo[activeIndex].Info.relation}} -->
+							<view wx:if="{{otherInfo[activeIndex].Info.relation}}">{{otherInfo[activeIndex].Info.relation}}</view>
+							<view wx:else class="place_text">请选择</view>
+							<van-icon name="arrow-down" style="position:absolute;right:20rpx;top:10rpx;color:#bbbbbb" />
 						</view>
 					</picker>
 					<view class="block" wx:if="{{otherInfo[activeIndex].Info.relation  == '其他'}}"><text class="red">*</text>与被赡养人其他关系<input bindblur="tab3Change6" value="{{otherInfo[activeIndex].Info.relationExt}}" /></view>
@@ -451,23 +486,32 @@
 					<view class="name"><text class="red">*</text>是否外出</view>
 					<picker bindchange="tab3Change7" value="{{otherInfo[activeIndex].Info.isHasGoOut}}" range="{{othersyrIsout}}">
 						<view class="picker">
-							{{otherInfo[activeIndex].Info.isHasGoOut}}
+							<!-- {{otherInfo[activeIndex].Info.isHasGoOut}} -->
+							<view wx:if="{{otherInfo[activeIndex].Info.isHasGoOut}}">{{otherInfo[activeIndex].Info.isHasGoOut}}</view>
+							<view wx:else class="place_text">请选择</view>
+							<van-icon name="arrow-down" style="position:absolute;right:20rpx;top:10rpx;color:#bbbbbb" />
 						</view>
 					</picker>
 					<view wx:if="{{otherInfo[activeIndex].Info.isHasGoOut=='是'}}">
-						<view class="block"><text class="red">*</text>外出原因<input bindblur="tab3Change8" value="{{otherInfo[activeIndex].Info.outgoingCause}}" /></view>
+						<view class="block"><text class="red">*</text>外出原因<input placeholder="请填写" placeholder-style='font-size:25rpx;color: #bbbbbb;' 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}}">
 								<view class="picker">
-									{{otherInfo[activeIndex].Info.outgoingplace}}
+									<!-- {{otherInfo[activeIndex].Info.outgoingplace}} -->
+									<view wx:if="{{otherInfo[activeIndex].Info.outgoingplace}}">{{otherInfo[activeIndex].Info.outgoingplace}}</view>
+									<view wx:else class="place_text">请选择</view>
+									<van-icon name="arrow-down" style="position:absolute;right:20rpx;top:10rpx;color:#bbbbbb" />
 								</view>
 							</picker>
 						</view>
 						<view class="block"><text class="red">*</text>最后一次离家时间
 							<picker mode="date" bindchange="tab3Change10" value="{{otherInfo[activeIndex].Info.outgoingTime}}" fields="month">
 								<view class="picker">
-									{{otherInfo[activeIndex].Info.outgoingTime}}
+									<!-- {{otherInfo[activeIndex].Info.outgoingTime}} -->
+									<view wx:if="{{otherInfo[activeIndex].Info.outgoingTime}}">{{otherInfo[activeIndex].Info.outgoingTime}}</view>
+									<view wx:else class="place_text">请选择</view>
+									<van-icon name="arrow-down" style="position:absolute;right:20rpx;top:10rpx;color:#bbbbbb" />
 								</view>
 							</picker>
 						</view>
@@ -475,19 +519,25 @@
 					<view class="name"><text class="red">*</text>是否有配偶</view>
 					<picker bindchange="tab3Change11" value="{{otherInfo[activeIndex].Info.isHasPartner}}" range="{{othersyrIsMarry}}">
 						<view class="picker">
-							{{otherInfo[activeIndex].Info.isHasPartner}}
+							<!-- {{otherInfo[activeIndex].Info.isHasPartner}} -->
+							<view wx:if="{{otherInfo[activeIndex].Info.isHasPartner}}">{{otherInfo[activeIndex].Info.isHasPartner}}</view>
+							<view wx:else class="place_text">请选择</view>
+							<van-icon name="arrow-down" style="position:absolute;right:20rpx;top:10rpx;color:#bbbbbb" />
 						</view>
 					</picker>
 					<view wx:if="{{otherInfo[activeIndex].Info.isHasPartner=='是'}}">
-						<view class="block"><text class="red">*</text>配偶姓名<input bindblur="tab3Change12" value="{{otherInfo[activeIndex].Info.name2}}" /></view>
+						<view class="block"><text class="red">*</text>配偶姓名<input placeholder="请填写" placeholder-style='font-size:25rpx;color: #bbbbbb;' 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" value="{{otherInfo[activeIndex].Info.phone2}}" /></view>
+						<view class="block"><text class="red">*</text>配偶联系电话<input placeholder="请填写" placeholder-style='font-size:25rpx;color: #bbbbbb;' bindblur="tab3Change13" value="{{otherInfo[activeIndex].Info.phone2}}" /></view>
 						<view wx:if="{{isMarryPhone}}" class="required">配偶联系电话不能为空哦!</view>
 					</view>
 					<view class="name"><text class="red">*</text>平均一年探望次数</view>
 					<picker bindchange="tab3Change14" value="{{otherInfo[activeIndex].Info.visit}}" range="{{othersyrTfTimes}}">
 						<view class="picker">
-							{{otherInfo[activeIndex].Info.visit}}
+							<!-- {{otherInfo[activeIndex].Info.visit}} -->
+							<view wx:if="{{otherInfo[activeIndex].Info.visit}}">{{otherInfo[activeIndex].Info.visit}}</view>
+							<view wx:else class="place_text">请选择</view>
+							<van-icon name="arrow-down" style="position:absolute;right:20rpx;top:10rpx;color:#bbbbbb" />
 						</view>
 					</picker>
 				</view>

+ 7 - 0
pages/collectInfo/collectInfo.wxss

@@ -380,6 +380,7 @@ radio-group label {
   text-indent: 20rpx;
   line-height: 50rpx;
   margin-top: 10rpx;
+  position: relative;
 }
 .picker1 {
   border: 1px solid #e3e5eb;
@@ -389,12 +390,14 @@ radio-group label {
   line-height: 50rpx;
   margin-top: 10rpx;
   height: auto;
+  position: relative;
 }
 .picker11{
   width: 450rpx;
   height: 50rpx;
   border: 1px solid #e3e5eb;
   border-radius: 10rpx;
+  position: relative;
 }
 .red {
   color: red;
@@ -530,4 +533,8 @@ radio .wx-radio-input.wx-radio-input-checked::before{
   color: #2087f7;
   width: 100%;
   /* width: 180rpx; */
+}
+.place_text{
+  font-size: 25rpx;
+  color: #bbbbbb;
 }

+ 3 - 2
pages/index/index.js

@@ -123,10 +123,11 @@ Page({
   isBInd() {
     let id = wx.getStorageSync('openId');
     wx.request({
-      url: app.globalData.publicUrl + '/applet/appletVisitIsExist',
+      url: app.globalData.publicUrl + '/wxinfo/visitIsExist',
       method: "GET",
       data: {
-        appletId: id
+        openId:id
+        // appletId: id
       },
       success: res => {
         if (res.data.code == 1) {

+ 2 - 2
pages/index/index.wxss

@@ -44,7 +44,6 @@
   margin-top: 20rpx;
   display: flex;
   align-items: center;
-
 }
 
 .shu {
@@ -59,6 +58,7 @@
   font-family: SourceHanSansCN;
   font-weight: bold;
   margin-left: 20rpx;
+  font-size: 28rpx;
 }
 
 .top3 {
@@ -125,7 +125,7 @@
 .top4-title {
   color: #333333;
   font-family: SourceHanSansCN;
-  font-weight: 400;
+  font-weight: 600;
   font-size: 30rpx;
 }
 

+ 6 - 5
pages/love/love.wxml

@@ -50,16 +50,17 @@
 			<radio color='#009FE9' value='一般'>一般</radio>
 			<radio color='#009FE9' value='较差'>较差</radio>
 		</radio-group>
-		<view class="title">老人需求说明</view>
-		<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>
+		<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>
+		<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>
 		<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;">

+ 2 - 2
pages/personInfo/personInfo.wxss

@@ -28,12 +28,12 @@
   height: 220rpx;
   border-radius: 50%;
   overflow: hidden;
-  margin-left: 46rpx;
+  /* margin-left: 46rpx; */
 }
 
 .nc {
   margin-top: 20rpx;
-  margin-left: 50rpx;
+  /* margin-left: 50rpx; */
   font-size: 28rpx;
 }
 

+ 2 - 2
pages/visitFind/visitFind.js

@@ -51,10 +51,10 @@ Page({
             title: '加载中',
           })
           wx.request({
-            url: app.globalData.publicUrl + '/applet/appletVisitBing',
+            url: app.globalData.publicUrl + '/wxinfo/visitBing',
             method: "GET",
             data: {
-              appletId: id,
+              openId: id,
               number: this.data.idNumber
             },
             success: res => {

+ 5 - 2
pages/visitListInfo/visitListInfo.wxml

@@ -59,7 +59,7 @@
 		<view style="border-bottom:1px solid #e5e5e5;line-height:50rpx;padding-bottom:20rpx;padding-top:20rpx;color:#666666;">
 			<van-row>
 				<van-col span="2">
-				<!-- <van-icon name="share" /> -->
+					<!-- <van-icon name="share" /> -->
 					<!-- <van-icon name="share" color="#2087f7" size='40rpx' /> -->
 					<image src="../../images/lat.png" style="width:30rpx;height:30rpx"></image>
 				</van-col>
@@ -70,7 +70,7 @@
 		<!-- <view style="display:flex;border-bottom:1px solid #e5e5e5;">
 			<van-icon name="edit" color="#2087f7" size='40rpx' style="margin-left:30rpx" /><text style="color:#666666;margin-left:20rpx;line-height:100rpx">纬度:{{arr.lat}}</text>
 		</view> -->
-				<view style="border-bottom:1px solid #e5e5e5;line-height:50rpx;padding-bottom:20rpx;padding-top:20rpx;color:#666666;">
+		<view style="border-bottom:1px solid #e5e5e5;line-height:50rpx;padding-bottom:20rpx;padding-top:20rpx;color:#666666;">
 			<van-row>
 				<van-col span="2">
 					<image src="../../images/lat.png" style="width:30rpx;height:30rpx"></image>
@@ -100,6 +100,9 @@
 		<view class="status_box"> <text style="margin-left:50rpx">居住环境:</text>
 			<view class="{{arr.live == '良好' ? 'green-marker' : arr.live == '一般' ? 'blue-marker' : arr.live == '较差' ? 'red-marker': 'marker'}}">{{arr.live}}</view>
 		</view>
+		<view class="status_box" wx:if="{{arr.urgency}}"> <text style="margin-left:15rpx">需求紧急程度:</text>
+			<view class="{{arr.urgency == '不紧急' ? 'green-marker' : arr.urgency == '一般' ? 'blue-marker' : arr.urgency == '紧急' ? 'red-marker': 'marker'}}">{{arr.urgency}}</view>
+		</view>
 	</view>
 	<view class="yellow"></view>
 	<view style="display:flex;color:#2087f7;font-size:30rpx;font-weight:800">

+ 30 - 18
pages/visitandinfo/visitandinfo.wxml

@@ -5,6 +5,8 @@
 	<wxs module="oldMind" src="../../utils/oldmind.wxs"></wxs>
 	<wxs module="oldHealth" src="../../utils/oldhealth.wxs"></wxs>
 	<wxs module="oldSecurity" src="../../utils/oldsecurity.wxs"></wxs>
+	<!-- oldUrgency -->
+	<wxs module="oldUrgency" src="../../utils/oldUrgency.wxs"></wxs>
 	<!-- wx:if='{{isTrue}}' -->
 	<view>
 		<view id='tabs'>
@@ -132,29 +134,39 @@
 											</view>
 										</view>
 									</view>
-									<view>居住环境:<van-tag size='large' plain type="{{oldMind.url(infos.live)}}">{{infos.live}}</van-tag>
-									</view>
-								</view>
-								<view style="font-size:30rpx;">
-									2.老人需求说明
-								</view>
-								<view class="wai-box" style="margin-bottom:25rpx"> {{infos.demand}}</view>
-								<view style="font-size:30rpx;"> 3.巡访备注说明</view>
-								<view class="wai-box" style="margin-bottom:25rpx">{{infos.visitMessage}}</view>
-								<view style="font-size:30rpx;"> 4.现场含面部照片</view>
-								<view class="pop-boxs">
-									<view wx:for='{{photos}}'>
-										<view class="tanfang">
-											照片{{index+1}}
+									<!-- <view>居住环境:<van-tag size='large' plain type="{{oldMind.url(infos.live)}}">{{infos.live}}</van-tag> -->
+									<view class="flex-box" style=" margin: 10rpx 0;">
+										<view>
+											<view>居住环境:<van-tag plain size='large' type="{{oldMind.url(infos.live)}}">{{infos.live}}</van-tag>
+											</view>
+										</view>
+										<view>
+											<view class="box-end">需求紧急程度:<van-tag plain size='large' type="{{oldUrgency.url(infos.urgency)}}">{{infos.urgency}}</van-tag>
+											</view>
 										</view>
-										<image src="{{urls.url(item)}}" style="width: 200rpx; height: 200rpx;margin-top: 4%" />
 									</view>
 								</view>
-							</scroll-view>
+						<!-- </view> -->
+						<view style="font-size:30rpx;">
+							2.老人需求说明
+						</view>
+						<view class="wai-box" style="margin-bottom:25rpx"> {{infos.demand}}</view>
+						<view style="font-size:30rpx;"> 3.巡访备注说明</view>
+						<view class="wai-box" style="margin-bottom:25rpx">{{infos.visitMessage}}</view>
+						<view style="font-size:30rpx;"> 4.现场含面部照片</view>
+						<view class="pop-boxs">
+							<view wx:for='{{photos}}'>
+								<view class="tanfang">
+									照片{{index+1}}
+								</view>
+								<image src="{{urls.url(item)}}" style="width: 200rpx; height: 200rpx;margin-top: 4%" />
+							</view>
 						</view>
-					</van-overlay>
+						</scroll-view>
 				</view>
-				<view wx:if='{{currentTabIndex != 1}}' hidden="{{!listData.length}}" class="delete-box" bindtap="deletes">删除</view>
+				</van-overlay>
 			</view>
+			<view wx:if='{{currentTabIndex != 1}}' hidden="{{!listData.length}}" class="delete-box" bindtap="deletes">删除</view>
 		</view>
+	</view>
 	</view>

+ 1 - 1
project.config.json

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

+ 13 - 0
utils/oldUrgency.wxs

@@ -0,0 +1,13 @@
+var url = function (val) {
+  if (val === "不紧急") {
+    return 'primary';
+  } else if (val === '一般') {
+    return 'warning';
+  } else {
+    return 'danger';
+  }
+}
+
+module.exports = {
+  url: url
+}

+ 1 - 1
utils/photoUrl.wxs

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