l

pages/collectInfo/collectInfo.js

@@ -4,9 +4,9 @@ var isonShow;
 var isTwoOnshow;
 Page({
   data: {
-    value:[0,0,0,0,0],
+    value: [0, 0, 0, 0, 0],
     focus: true,
-    shiBaiShow:false,
+    shiBaiShow: false,
     showAdressBox: false,
     showAdressBox1: false,
     provinceArr: [],
@@ -181,14 +181,14 @@ Page({
     // this.formCheckoftenPhoneNull();
     // this.formCheckloveQtNull();
   },
-  goShibai(){
+  goShibai() {
     this.setData({
-      shiBaiShow :true
+      shiBaiShow: true
     })
   },
-  shiBaiClose(){
+  shiBaiClose() {
     this.setData({
-      shiBaiShow :false
+      shiBaiShow: false
     })
   },
   sure() {
@@ -757,7 +757,7 @@ Page({
                             if (e.data.words_result['公民身份号码'].words.substring(10, 12) < month || e.data.words_result['公民身份号码'].words.substring(10, 12) == month && e.data.words_result['公民身份号码'].words.substring(12, 14) <= day) {
                               age++;
                             }
-                            if(age >= 60){
+                            if (age >= 60) {
                               let idNumber = 'oldInfo[' + _this.data.activeIndex + '].idNumber'
                               let name = 'oldInfo[' + _this.data.activeIndex + '].name'
                               let nation = 'oldInfo[' + _this.data.activeIndex + '].nation'
@@ -796,7 +796,7 @@ Page({
                                 id: _this.data.nameArr[_this.data.activeIndex]._id,
                                 sex: e.data.words_result['性别'].words
                               })
-                            }else {
+                            } else {
                               wx.showModal({
                                 showCancel: false,
                                 content: '当前老人不满60周岁'
@@ -949,13 +949,10 @@ Page({
         this.setData({
           provinceArr: newdata,
         })
-        if(this.data.provinceArr[this.data.multiIndex[1]]){
+        // if(!this.data.adressChangeStatus){
           this.chooseAdress2();
-        }
+        // }
       },
-      fail: () => {
-        wx.hideLoading()
-      }
     })
   },
   chooseAdress2(fid) {
@@ -967,7 +964,12 @@ Page({
     if (fid) {
       mid = fid
     } else {
-      mid = this.data.provinceArr[this.data.multiIndex[1]].CIVILREGIONALISMID
+      console.log(this.data.provinceArr[this.data.multiIndex[1]])
+      if(!this.data.provinceArr[this.data.multiIndex[1]]){
+        wx.hideLoading()
+      }else{
+        mid = this.data.provinceArr[this.data.multiIndex[1]].CIVILREGIONALISMID
+      }
     }
     let newdata = [];
     wx.request({
@@ -986,12 +988,9 @@ Page({
         this.setData({
           cityArr: newdata
         })
-        if (this.data.cityArr[this.data.multiIndex[2]]) {
+        // if(!this.data.adressChangeStatus){
           this.chooseAdress3();
-        }
-      },
-      fail: () => {
-        wx.hideLoading()
+        // }
       }
     })
   },
@@ -1005,7 +1004,11 @@ Page({
     if (fid) {
       mid = fid
     } else {
-      mid = this.data.cityArr[this.data.multiIndex[2]].CIVILREGIONALISMID
+      if(!this.data.cityArr[this.data.multiIndex[2]]){
+        wx.hideLoading()
+      }else{
+        mid = this.data.cityArr[this.data.multiIndex[2]].CIVILREGIONALISMID
+      }
     }
     let newdata = [];
     wx.request({
@@ -1041,12 +1044,11 @@ Page({
             townArr: [],
             villageArr: [],
           })
-        } else if (this.data.areaArr[this.data.multiIndex[3]]) {
-          this.chooseAdress4();
+        } else {
+          // if(!this.data.adressChangeStatus){
+            this.chooseAdress4();
+          // }
         }
-      },
-      fail: () => {
-        wx.hideLoading()
       }
     })
   },
@@ -1060,7 +1062,12 @@ Page({
     if (fid) {
       mid = fid
     } else {
-      mid = this.data.areaArr[this.data.multiIndex[3]].CIVILREGIONALISMID
+      console.log(this.data.areaArr[this.data.multiIndex[3]])
+      if(!this.data.areaArr[this.data.multiIndex[3]]){
+        wx.hideLoading();
+      }else{
+        mid = this.data.areaArr[this.data.multiIndex[3]].CIVILREGIONALISMID
+      }
     }
     let newdata = [];
     wx.request({
@@ -1080,7 +1087,7 @@ Page({
           townArr: newdata
         })
         if (newdata.length == 0) {
-          wx.hideLoading()
+          wx.hideLoading();
           this.setData({
             province: this.data.provinceArr[this.data.multiIndex[0]].CIVILREGIONALISMNAME,
             city: this.data.cityArr[this.data.multiIndex[1]].CIVILREGIONALISMNAME,
@@ -1095,21 +1102,29 @@ Page({
             townCode: '',
             villageCode: ''
           })
-        } else if (this.data.townArr[this.data.multiIndex[4]]) {
-          this.chooseAdress5();
+        } else {
+          // if(!this.data.adressChangeStatus){
+            this.chooseAdress5();
+          // }
         }
-      },
-      fail: () => {
-        wx.hideLoading()
       }
     })
   },
   chooseAdress5(fid) {
+    wx.showLoading({
+      title: '加载中',
+      mask: true
+    })
     let mid;
     if (fid) {
       mid = fid
     } else {
-      mid = this.data.townArr[this.data.multiIndex[4]].CIVILREGIONALISMID
+      console.log(this.data.townArr[this.data.multiIndex[4]])
+      if(!this.data.townArr[this.data.multiIndex[4]]){
+        wx.hideLoading()
+      }else{
+        mid = this.data.townArr[this.data.multiIndex[4]].CIVILREGIONALISMID
+      }
     }
     let newdata = [];
     wx.request({
@@ -1143,7 +1158,7 @@ Page({
             townCode: this.data.townArr[this.data.multiIndex[3]].CIVILREGIONALISMCODE,
             villageCode: ''
           })
-        } else if (this.data.villageArr[this.data.multiIndex[4]]) {
+        } else {
           wx.hideLoading()
           this.setData({
             province: this.data.provinceArr[this.data.multiIndex[0]].CIVILREGIONALISMNAME,
@@ -1158,52 +1173,43 @@ Page({
             villageCode: this.data.villageArr[this.data.multiIndex[4]].CIVILREGIONALISMCODE,
           })
         }
-       
       },
-      fail: () => {
-        wx.hideLoading()
-      }
     })
   },
   bindChange(e) {
-    console.log(e.detail.value)
-    wx.showLoading({
-      title: '加载中',
-      mask: true
-    })
-    if ((e.detail.value[0] != this.data.multiIndex[0]) && this.data.provinceArr[e.detail.value[0]] && this.data.provinceArr[e.detail.value[0]].CIVILREGIONALISMID) {
+    console.log(e.detail.value, '我改变开始了')
+    console.log('我改变开始了multiIndex值是', this.data.multiIndex)
+    if (e.detail.value[0] != this.data.multiIndex[0]) {
       this.chooseAdress2(this.data.provinceArr[e.detail.value[0]].CIVILREGIONALISMID);
-      let multiIndex=[];
-      multiIndex.push(e.detail.value[0],0,0,0,0)
+      let multiIndex = [];
+      multiIndex.push(e.detail.value[0], 0, 0, 0, 0)
       this.setData({
         value: multiIndex
       })
-    } else if ((e.detail.value[1] != this.data.multiIndex[1]) && this.data.cityArr[e.detail.value[1]] && this.data.cityArr[e.detail.value[1]].CIVILREGIONALISMID) {
+    } else if (e.detail.value[1] != this.data.multiIndex[1]) {
       this.chooseAdress3(this.data.cityArr[e.detail.value[1]].CIVILREGIONALISMID);
-      let multiIndex=[];
-      multiIndex.push(e.detail.value[0],e.detail.value[1],0,0,0)
+      let multiIndex = [];
+      multiIndex.push(e.detail.value[0], e.detail.value[1], 0, 0, 0)
       this.setData({
         value: multiIndex
       })
-    } else if ((e.detail.value[2] != this.data.multiIndex[2]) && this.data.areaArr[e.detail.value[2]] && this.data.areaArr[e.detail.value[2]].CIVILREGIONALISMID) {
+    } else if (e.detail.value[2] != this.data.multiIndex[2]) {
       this.chooseAdress4(this.data.areaArr[e.detail.value[2]].CIVILREGIONALISMID);
-      let multiIndex=[];
-      multiIndex.push(e.detail.value[0],e.detail.value[1],e.detail.value[2],0,0)
+      let multiIndex = [];
+      multiIndex.push(e.detail.value[0], e.detail.value[1], e.detail.value[2], 0, 0)
       this.setData({
         value: multiIndex
       })
-    } else if ((e.detail.value[3] != this.data.multiIndex[3]) && this.data.townArr[e.detail.value[3]] && this.data.townArr[e.detail.value[3]].CIVILREGIONALISMID) {
+    } else if (e.detail.value[3] != this.data.multiIndex[3]) {
       this.chooseAdress5(this.data.townArr[e.detail.value[3]].CIVILREGIONALISMID);
-      let multiIndex=[];
-      multiIndex.push(e.detail.value[0],e.detail.value[1],e.detail.value[2],e.detail.value[3],0)
+      let multiIndex = [];
+      multiIndex.push(e.detail.value[0], e.detail.value[1], e.detail.value[2], e.detail.value[3], 0)
       this.setData({
         value: multiIndex
       })
-    } else if ((e.detail.value[4] != this.data.multiIndex[4]) && this.data.villageArr[e.detail.value[4]] && this.data.villageArr[e.detail.value[4]].CIVILREGIONALISMID) {
-      this.setData({
-        value: e.detail.value
-      })
+    } else if (e.detail.value[4] != this.data.multiIndex[4]) {
       this.setData({
+        value: e.detail.value,
         village: this.data.villageArr[e.detail.value[4]].CIVILREGIONALISMNAME,
         villageCode: this.data.villageArr[e.detail.value[4]].CIVILREGIONALISMCODE
       })
@@ -1211,7 +1217,7 @@ Page({
     this.setData({
       multiIndex: e.detail.value
     })
-    wx.hideLoading()
+    console.log('我改变结束了multiIndex值是', this.data.multiIndex)
   },
   pickSure() {
     let arr = 'oldInfo[' + this.data.activeIndex + '].chooseAdressArr';
@@ -1276,13 +1282,16 @@ Page({
   },
   bindpickstart(e) {
     console.log(e, '滚动开始了')
-    // wx.showLoading({
-    //   title: '加载中',
-    //   mask: true
-    // })
+    wx.showLoading({
+      title: '加载中',
+      mask: true
+    })
+    setTimeout(function(){
+      wx.hideLoading()
+    },5000)
   },
   bindpickend(e) {
-    console.log(e, '滚动结束了')
+    // console.log(e, '滚动结束了')
     wx.hideLoading()
   },
   // 补充户籍地址
@@ -3821,12 +3830,14 @@ Page({
       app.globalData.id = ''
     }
     app.globalData.name = ''
-    // this.setData({
-    //   showBj: false,
-    // })
+    this.setData({
+      shiBaiShow: false,
+      showAdressBox: false,
+      showAdressBox1: false
+    })
   },
   //获取位置
-  getSelfLocation: function (varSendOrgId) {
+  getSelfLocation: function () {
     var qqmapsdk = new QQMapWX({
       key: 'B5DBZ-NGIHP-SQMD4-LHMG3-NJ72Z-7KFOV' //申请的开发者秘钥key
     });

pages/collectInfo/collectInfo.wxss

@@ -395,6 +395,12 @@ radio-group label {
   margin-top: 10rpx;
   height: auto;
 }
+.picker11{
+  width: 450rpx;
+  height: 50rpx;
+  border: 1px solid #e3e5eb;
+  border-radius: 10rpx;
+}
 .red {
   color: red;
 }
@@ -484,7 +490,7 @@ radio .wx-radio-input.wx-radio-input-checked::before {
   z-index: 999;
   bottom: 260px;
   right: 20px;
-  font-size: 28rpx;
+  font-size: 35rpx;
 }
 .pick_esc{
   color: #2087f7;
@@ -492,5 +498,5 @@ radio .wx-radio-input.wx-radio-input-checked::before {
   z-index: 999;
   bottom: 260px;
   left: 20px;
-  font-size: 28rpx;
+  font-size: 35rpx;
 }

pages/idCardDetail/idCardDetail.wxml

@@ -13,7 +13,7 @@
 			<view class="title1" >身份证号：</view>
 			<view class="title2">{{info.idCardNumber}}</view>
 		</view>
-		<view style="display:flex;margin-top:15rpx">
+		<view style="display:flex;margin-top:15rpx" wx:if='{{info.time}}'>
 			<view class="title1">认证时间：</view>
 			<view class="title2">{{times.formatDate(info.time)}}</view>
 		</view>

pages/userBook/userBook.wxml

@@ -39,7 +39,7 @@
 			生成身份卡
 		</view>
 	</view>
-	<view class="hd">①点击我的->身份卡，照片仅可上传一次，请上传真实本人照片，生成专属身份卡。</view>
+	<view class="hd">①点击我的->身份卡，照片仅可上传一次，请上传真实本人照片。建议先完善资料再生成身份卡，这样身份卡上的信息更全面。</view>
 	<view class="hd">②此卡可做为工作人员的身份认证，也可做为老人辨别来访人员的唯一标识</view>
 	<view style="display:flex;margin-top: 20rpx;margin-bottom: 20rpx;">
 		<image src="../../images/user_camrea.png" class="img3"></image>
@@ -63,7 +63,7 @@
 		<image src="../../images/user_info.png" class="img4"></image>
 	</view>
 	<view class="block">
-		<view class="num">
+		<view class="num"> 
 			Q6
 		</view>
 		<view class="question">

pages/visitandinfo/visitandinfo.js

@@ -70,7 +70,7 @@ Page({
   deletes() {
     console.log("ssss");
     let that = this;
-    wx.showModal({
+    wx.showModal({  
       content: '该操作会将所有选中数据删除", "是否删除？',
       success(res) {
         if (res.confirm) {

pages/visitandinfo/visitandinfo.json

@@ -1,4 +1,5 @@
 {
   "navigationBarTitleText":"工作日志",
-  "usingComponents": {}
+  "usingComponents": {},
+  "disableScroll":true
 }

utils/photoUrl.wxs

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

utils/util.js

@@ -1,9 +1,9 @@
 const globalData = {
-  // publicUrl: 'http://info.windd.cn:8080/test',//测试
+  publicUrl: 'http://info.windd.cn:8080/test',//测试
   //  publicUrl: 'https://info.windd.cn/collection',//正式
   //publicUrl: 'http://10.16.4.12:7001',
   //publicUrl: 'http://10.16.4.8:7001',
-  publicUrl:'http://10.16.4.7:7001'//立秋
+  // publicUrl:'http://10.16.4.7:7001'//立秋
 };
 module.exports = {
   globalData: globalData,