Merge branch 'dev2.0' into dev_py

 //app.js
 const appId = 'wxe91c67adba6ac02d';
+
 App({
   onLaunch: function() {
     var that = this;
@@ -143,7 +144,7 @@ App({
     appId: appId,
     com_id: "",
     onshow_count: 0,
-    refresh_complete:false,
+    refresh_complete: false,
     // baseUrl: "http://47.99.47.16:20000/",
     // baseUrl: "http://47.96.75.229:20000/",
     // baseUrl: "http://192.144.144.220:20000/",

@@ -81,9 +81,9 @@ Page({
         console.log("fail ", res.data)
       },
       complete:function (res){
-        wx.reLaunch({
-          url: '../main/guide/guide'
-        })
+        // wx.reLaunch({
+        //   url: '../main/guide/guide'
+        // })
       }
     })
   },

@@ -286,15 +286,15 @@ Page({
             newdata[i].sec_loan_start = this.formatDate(newdata[i].sec_loan_start)
           }
 
-          if (newdata[i].children_id_card_no) {
-            newdata[i].children_id_card_no = this.formatIdNum(newdata[i].children_id_card_no)
-          }
-          if (newdata[i].spouse_id_card_no) {
-            newdata[i].spouse_id_card_no = this.formatIdNum(newdata[i].spouse_id_card_no)
-          }
-          if (newdata[i].id_card_no) {
-            newdata[i].id_card_no = this.formatIdNum(newdata[i].id_card_no)
-          }
+          // if (newdata[i].children_id_card_no) {
+          //   newdata[i].children_id_card_no = this.formatIdNum(newdata[i].children_id_card_no)
+          // }
+          // if (newdata[i].spouse_id_card_no) {
+          //   newdata[i].spouse_id_card_no = this.formatIdNum(newdata[i].spouse_id_card_no)
+          // }
+          // if (newdata[i].id_card_no) {
+          //   newdata[i].id_card_no = this.formatIdNum(newdata[i].id_card_no)
+          // }
 
           if (newdata[i].house_address) {
             if (newdata[i].house_address.province == newdata[i].house_address.city) {
@@ -306,16 +306,7 @@ Page({
 
           if (newdata[i].work_city) {
             newdata[i].work_city_new = newdata[i].work_city.province + newdata[i].work_city.city
-          }
-
-          if (newdata[i].co_supporters && newdata[i].co_supporters.length > 0) {
-            for (var j = 0; j < newdata[i].co_supporters.length; j++) {
-              if (newdata[i].co_supporters[j].birthday) {
-                newdata[i].co_supporters[j].birthday = this.formatDate(newdata[i].co_supporters[j].birthday)
-              }
-              newdata[i].co_supporters[j].id_card_no = this.formatIdNum(newdata[i].co_supporters[j].id_card_no)
-            }
-          }
+          } 
         }
 
         var housetype_new = this.data.house_type
@@ -325,6 +316,8 @@ Page({
         console.log("housetype_new", housetype_new)
         if (housetype_new !="house_fund_loan"){
           btn_show = true
+        }else{
+          btn_show = false
         }
         this.setData({
           house_type: housetype_new,

@@ -6,7 +6,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-
+    isshow: false
   },
 
   /**
@@ -43,8 +43,12 @@ Page({
         },
         success: function(res) {
           console.log("taxconfirm", res)
-          if (res.data && (res.data.status == '1' || res.data.status == '2')) { //未完善
+          if (res.statusCode == 200 && !that.data.isshow && res.data.status != '0' ) { //未完善
             that.showModal(res.data)
+          } else {
+            that.setData({
+              isshow: false
+            })
           }
         }
       })
@@ -53,6 +57,9 @@ Page({
 
   showModal: function(data) {
     var that = this
+    that.setData({
+      isshow: true
+    })
     wx.showModal({
       title: '温馨提示',
       content: '您的自然人基础信息尚未完善，请先完善基础信息',
@@ -60,7 +67,11 @@ Page({
       showCancel: false,
       confirmColor: '#357aeb',
       success(res) {
+        console.log("showModal", res)
         if (res.confirm) {
+          that.setData({
+            isshow: false
+          })
           that.gotaxPerson()
         }
       }

@@ -2,7 +2,7 @@
 var app = getApp();
 var baseUrl = app.globalData.baseUrl;
 Page({
-  self_id:null,
+  self_id: null,
   /**
    * 页面的初始数据
    */
@@ -15,7 +15,7 @@ Page({
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function (options) {
+  onLoad: function(options) {
     console.log('onLoad')
     if (app.globalData.OSSUrl.length == 0) {
       app.configOssUrl()
@@ -26,20 +26,20 @@ Page({
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
-  onReady: function () {
+  onReady: function() {
 
   },
 
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow: function () {
+  onShow: function() {
 
     console.log('onShow')
     this.getTaxList()
   },
 
-  getTaxList: function () {
+  getTaxList: function() {
     var that = this;
     wx.showLoading({
       title: '加载中',
@@ -59,7 +59,7 @@ Page({
       data: {
         'all': true
       },
-      success: function (res) {
+      success: function(res) {
         console.log('succ', res)
         if (res.statusCode == 200) {
           that.handleData(res.data);
@@ -93,7 +93,7 @@ Page({
     })
   },
 
-  handleData: function (data) {
+  handleData: function(data) {
     if (data.items && data.items.length > 0) {
       var datalist = []
 
@@ -101,17 +101,17 @@ Page({
         data.items[i].newmobile = this.formatMobile(data.items[i].mobile)
         data.items[i].newidnum = this.formatIdNum(data.items[i].id_card_no)
         data.items[i].relative = data.items[i].family_ties
-        if (data.items[i].family_ties=="本人"){
+        if (data.items[i].family_ties == "本人") {
           this.self_id = data.items[i].id
-          if (data.items[i].status!='0'){//0已完善 1未完善
-            this.setData({
-              text_tip: '自然人信息不完善，立即完善'
-            })
-          }else{
-            this.setData({
-              text_tip: '去查看'
-            })
-          }
+          // if (data.items[i].status!='0'){//0已完善 1未完善
+          //   this.setData({
+          //     text_tip: '自然人信息不完善，立即完善'
+          //   })
+          // }else{
+          //   this.setData({
+          //     text_tip: '去查看'
+          //   })
+          // }
           app.globalData.hostInfo = data.items[i]
         }
         datalist.push(data.items[i])
@@ -123,7 +123,7 @@ Page({
     console.log('handleData', this.data.taxlist)
   },
 
-  formatMobile: function (mobile) {
+  formatMobile: function(mobile) {
     if (mobile && mobile > 7) {
       return mobile.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');
     } else {
@@ -131,7 +131,7 @@ Page({
     }
   },
 
-  formatIdNum: function (idnum) {
+  formatIdNum: function(idnum) {
     if (idnum && idnum.length >= 6 && idnum.length < 10) {
       return idnum.substring(0, 2) + '****' + idnum.substring(idnum.length - 2, idnum.length);
     } else if (idnum.length >= 10) {
@@ -141,20 +141,20 @@ Page({
     }
   },
 
-  goadd: function (e) {
+  goadd: function(e) {
     console.log(e)
     wx.navigateTo({
       url: 'addinfo/addinfo',
     })
   },
 
-  goedit: function (e) {
+  goedit: function(e) {
     console.log(e)
-    if (this.self_id != e.currentTarget.id){
+    if (this.self_id != e.currentTarget.id) {
       wx.navigateTo({
         url: 'addinfo/addinfo?id=' + e.currentTarget.id,
       })
-    }else {
+    } else {
       wx.navigateTo({
         url: 'editinfo/editinfo?id=' + e.currentTarget.id,
       })
@@ -164,35 +164,35 @@ Page({
   /**
    * 生命周期函数--监听页面隐藏
    */
-  onHide: function () {
+  onHide: function() {
 
   },
 
   /**
    * 生命周期函数--监听页面卸载
    */
-  onUnload: function () {
+  onUnload: function() {
 
   },
 
   /**
    * 页面相关事件处理函数--监听用户下拉动作
    */
-  onPullDownRefresh: function () {
+  onPullDownRefresh: function() {
 
   },
 
   /**
    * 页面上拉触底事件的处理函数
    */
-  onReachBottom: function () {
+  onReachBottom: function() {
 
   },
 
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+  onShareAppMessage: function() {
 
   }
-})
+})
\ No newline at end of file

@@ -36,7 +36,8 @@
         <view class='rectangle_solid_bg'>
           <view style='padding: 0 15px '>
             <image class='arrow_wrap' src='/images/arrow_right.png'> </image>
-            <text class='text_999_28'>{{text_tip}}</text>
+            <text wx:if="{{item.family_ties=='本人'&&item.status!='0'}}" class='text_999_28'>自然人信息不完善，立即完善</text>
+            <text wx:else class='text_999_28'>去查看</text>
           </view>
         </view>
       </view>

 {
-	"description": "项目配置文件。",
+	"description": "项目配置文件",
 	"packOptions": {
 		"ignore": []
 	},
@@ -11,9 +11,9 @@
 		"newFeature": true
 	},
 	"compileType": "miniprogram",
-	"libVersion": "2.2.2",
-	"appid": "wxe91c67adba6ac02d",
-	"projectname": "%E8%87%AA%E7%84%B6%E4%BA%BA%E7%A8%8E%E6%94%B6",
+  "libVersion": "2.2.2",
+  "appid": "wxe91c67adba6ac02d",
+  "projectname": "%E8%87%AA%E7%84%B6%E4%BA%BA%E7%A8%8E%E6%94%B6",
 	"isGameTourist": false,
 	"condition": {
 		"search": {