Merge branch '海峡' into dev_wy

 //app.js
-const appId = 'wxe91c67adba6ac02d';
+const appId = 'wx04262fa98a7de5b6';
 App({
   onLaunch: function() {
     var that = this;
@@ -143,14 +143,13 @@ App({
     appId: appId,
     com_id: "",
     onshow_count: 0,
-    refresh_complete:false,
     // baseUrl: "http://47.99.47.16:20000/",
     // baseUrl: "http://47.96.75.229:20000/",
     // baseUrl: "http://192.144.144.220:20000/",
     // baseUrl: "http://154.8.229.55:20000/",
     // baseUrl: "http://47.110.250.177:20000/",
     // baseUrl: "http://47.110.158.110:20000/",
-    baseUrl: "https://api.workai.com.cn/",
+    baseUrl: "https://api.fjhxrl.com/",
     OSSUrl: "", //"https://oss.workai.com.cn/",
     userInfo: null,
     hostInfo:null,

 {
-  "navigationBarTitleText": "自然人税收",
+  "navigationBarTitleText": "海峡易税",
   "disableScroll" : true,
   "navigationBarBackgroundColor": "#4478e3"
       

 {
-  "navigationBarTitleText": "自然人税收",
+  "navigationBarTitleText": "海峡易税",
   "disableScroll": true,
   "navigationBarBackgroundColor": "#4478e3"
 }
\ No newline at end of file

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

 {
-  "navigationBarTitleText": "自然人税收",
+  "navigationBarTitleText": "海峡易税",
   "navigationBarTextStyle": "black",
   "navigationBarBackgroundColor": "#FFFFFF"
 }
\ No newline at end of file

@@ -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,7 +101,7 @@ 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({
@@ -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

 {
-  "navigationBarTitleText": "自然人税收"
+  "navigationBarTitleText": "海峡易税"
 }
\ No newline at end of file

 {
-	"description": "项目配置文件。",
+	"description": "项目配置文件",
 	"packOptions": {
 		"ignore": []
 	},
 	"setting": {
-		"urlCheck": false,
+		"urlCheck": true,
 		"es6": true,
 		"postcss": true,
 		"minified": true,
 		"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.4.2",
+	"appid": "wx04262fa98a7de5b6",
+	"projectname": "%E6%B5%B7%E5%B3%A1%E8%87%AA%E7%84%B6%E4%BA%BA",
+	"debugOptions": {
+		"hidedInDevtools": []
+	},
 	"isGameTourist": false,
 	"condition": {
 		"search": {