解决merge的bug

wangyu
app.json
pages/main/addtionalreduce/home.js
pages/main/addtionalreduce/home.wxml
pages/main/guide/guide.js
pages/main/taxperson/home.js
--- a/app.json
查看文件 @b121699
+++ b/app.json
查看文件 @b121699
@@ -2,23 +2,18 @@
   "pages": [
     "pages/main/guide/guide",
     "pages/getPhone/getPhone",
-
     "pages/main/smartchat/chat",
-
     "pages/main/taxperson/home",
     "pages/main/taxperson/editinfo/editinfo",
     "pages/main/taxperson/addinfo/addinfo",
     "pages/main/taxperson/idinfo/idinfo",
-
     "pages/main/addtionalreduce/home",
     "pages/main/addtionalreduce/godeclare/godeclare",
     "pages/main/addtionalreduce/godetail/godetail",
     "pages/main/addtionalreduce/lookandupdate/lookandupdate",
     "pages/main/addtionalreduce/addextrainfo/addextrainfo",
     "pages/main/addtionalreduce/additiondetail/additiondetail",
-
     "pages/main/advancepayment/home",
-
     "pages/main/finalpayment/home",
     "pages/main/finalpayment/inputinfo/inputinfo",
     "pages/main/finalpayment/historylist/historylist",
--- a/pages/main/addtionalreduce/home.js
查看文件 @b121699
+++ b/pages/main/addtionalreduce/home.js
查看文件 @b121699
@@ -7,9 +7,9 @@ Page({
    * Page initial data
    */
   data: {
-    datas: ["",""],
+    datas: ["", ""],
     is_declared: false,
-    additionlist:[],
+    additionlist: [],
     declareStatus: {
       "to_declare ": "待申报",
       "declaring": "申报中",
@@ -22,23 +22,23 @@ Page({
   /**
    * Lifecycle function--Called when page load
    */
-  onLoad: function(options) {
+  onLoad: function (options) {
     console.log("onLoad");
   },
-  godeclare: function() {
+  godeclare: function () {
     wx.navigateTo({
       url: 'godeclare/godeclare',
     })
   },
-  godetail: function() {
+  godetail: function () {
     wx.navigateTo({
       url: 'godetail/godetail',
     })
   },
-  lookandadd: function(e) {
+  lookandadd: function (e) {
     console.log("lookandadd", e);
     wx.navigateTo({
       url: 'lookandupdate/lookandupdate?index=' + e.currentTarget.id,
@@ -48,20 +48,20 @@ Page({
   /**
    * Lifecycle function--Called when page is initially rendered
    */
-  onReady: function() {
+  onReady: function () {
     console.log("onReady");
   },
   /**
    * Lifecycle function--Called when page show
    */
-  onShow: function() {
+  onShow: function () {
     console.log("onShow");
     var that = this
     this.getAdditionList()
   },
-  getAdditionList: function() {
+  getAdditionList: function () {
     var that = this;
     var Authorization = getApp().globalData.Authorization;
     wx.request({
@@ -74,12 +74,12 @@ Page({
         'content-type': 'application/json',
         "Authorization": Authorization
       },
-      success: function(res) {
-        if(res&&res.data){
-          console.log("res",res)
+      success: function (res) {
+        if (res && res.data) {
+          console.log("res", res)
           that.setData({
-            additionlist:res.data.items
-        })
+            additionlist: res.data.items
+          })
         }
       }
     })
@@ -88,35 +88,35 @@ Page({
   /**
    * Lifecycle function--Called when page hide
    */
-  onHide: function() {
+  onHide: function () {
   },
   /**
    * Lifecycle function--Called when page unload
    */
-  onUnload: function() {
+  onUnload: function () {
   },
   /**
    * Page event handler function--Called when user drop down
    */
-  onPullDownRefresh: function() {
+  onPullDownRefresh: function () {
   },
   /**
    * Called when page reach bottom
    */
-  onReachBottom: function() {
+  onReachBottom: function () {
   },
   /**
    * Called when user click on the top right corner to share
    */
-  onShareAppMessage: function() {
+  onShareAppMessage: function () {
   }
-})
+})
--- a/pages/main/addtionalreduce/home.wxml
查看文件 @b121699
+++ b/pages/main/addtionalreduce/home.wxml
查看文件 @b121699
@@ -49,4 +49,4 @@
   </view>
-</view>
+</view>
--- a/pages/main/guide/guide.js
查看文件 @b121699
+++ b/pages/main/guide/guide.js
查看文件 @b121699
@@ -12,25 +12,25 @@ Page({
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function(options) {
-    
+  onLoad: function (options) {
+
   },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
-  onReady: function() {
+  onReady: function () {
   },
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow: function() {
+  onShow: function () {
     this.taxconfirm();
   },
-  taxconfirm: function() {
+  taxconfirm: function () {
     var that = this;
     var Authorization = getApp().globalData.Authorization;
     console.log("Authorization", Authorization)
@@ -41,17 +41,17 @@ Page({
           'content-type': 'application/json',
           "Authorization": Authorization
         },
-        success: function(res) {
+        success: function (res) {
           console.log("taxconfirm", res)
           if (res.data && (res.data.status == '1' || res.data.status == '2')) { //未完善
-            that.showModal(res.data)
+            // that.showModal(res.data)
           }
         }
       })
     }
   },
-  showModal: function(data) {
+  showModal: function (data) {
     wx.showModal({
       title: '温馨提示',
       content: '您的自然人基础信息尚未完善，请先完善基础信息',
@@ -59,7 +59,7 @@ Page({
       showCancel: false,
       confirmColor: '#357aeb',
       success(res) {
-        if(res.confirm){
+        if (res.confirm) {
           if (data.status == '1' && data.id) {
             wx.navigateTo({
               url: '../taxperson/editinfo/editinfo?id=' + data.id,
@@ -77,7 +77,7 @@ Page({
   /**
    * 自然人信息采集
    */
-  gotaxPerson: function() {
+  gotaxPerson: function () {
     wx.navigateTo({
       url: '../taxperson/home',
     })
@@ -86,7 +86,7 @@ Page({
   /**
    * 专项附加扣除
    */
-  goAdditionalDiduction: function() {
+  goAdditionalDiduction: function () {
     wx.navigateTo({
       url: '../addtionalreduce/home',
     })
@@ -95,7 +95,7 @@ Page({
   /**
    * 预扣预缴
    */
-  goAdvancePayment: function() {
+  goAdvancePayment: function () {
     wx.navigateTo({
       url: '../advancepayment/home',
     })
@@ -104,13 +104,13 @@ Page({
   /**
    * 汇算清缴
    */
-  goFinalPayment: function() {
+  goFinalPayment: function () {
     wx.navigateTo({
       url: '../finalpayment/home',
     })
   },
-  gochat: function() {
+  gochat: function () {
     wx.navigateTo({
       url: '../smartchat/chat',
     })
@@ -119,35 +119,35 @@ Page({
   /**
    * 生命周期函数--监听页面隐藏
    */
-  onHide: function() {
+  onHide: function () {
   },
   /**
    * 生命周期函数--监听页面卸载
    */
-  onUnload: function() {
+  onUnload: function () {
   },
   /**
    * 页面相关事件处理函数--监听用户下拉动作
    */
-  onPullDownRefresh: function() {
+  onPullDownRefresh: function () {
   },
   /**
    * 页面上拉触底事件的处理函数
    */
-  onReachBottom: function() {
+  onReachBottom: function () {
   },
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function() {
+  onShareAppMessage: function () {
   }
-})
+})
--- a/pages/main/taxperson/home.js
查看文件 @b121699
+++ b/pages/main/taxperson/home.js
查看文件 @b121699
@@ -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,21 +59,21 @@ Page({
       data: {
         'all': true
       },
-      success: function(res) {
-        console.log('succ',res)
-        if(res.statusCode ==200){
+      success: function (res) {
+        console.log('succ', res)
+        if (res.statusCode == 200) {
           that.handleData(res.data);
-        }else{
+        } else {
           wx.showModal({
             title: res.data.message,
             content: '',
-            showCancel:false,
+            showCancel: false,
             success: function (res) {
               if (res.confirm) {
                 console.log('用户点击确定')
                 wx.redirectTo({
                   url: '../../getPhone/getPhone',
-            })
+                })
               } else if (res.cancel) {
                 console.log('用户点击取消')
               }
@@ -93,16 +93,16 @@ Page({
     })
   },
-  handleData: function(data) {
+  handleData: function (data) {
     if (data.items && data.items.length > 0) {
       var datalist = []
       for (var i = 0; i < data.items.length; i++) {
         data.items[i].newmobile = this.formatMobile(data.items[i].mobile)
         data.items[i].newidnum = this.formatIdNum(data.items[i].id_card_no)
-        if (i==0){
+        if (i == 0) {
           data.items[i].relative = "本人"
-        }else{
+        } else {
           data.items[i].relative = data.items[i].family_ties
         }
         datalist.push(data.items[i])
@@ -115,7 +115,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 {
@@ -123,7 +123,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) {
@@ -133,7 +133,7 @@ Page({
     }
   },
-  getStatus: function(data) {
+  getStatus: function (data) {
     console.log('data', data)
     if (data[0].family_ties.length < 1 && data[0].name.length > 0 && data[0].taxpayer_status.length > 0 && data[0].id_card_type.length > 0 && data[0].id_card_no.length > 0 && data[0].mobile.length > 0 && data[0].is_investor.length > 0 && data[0].is_specific_profession.length > 0) {
       this.setData({
@@ -146,14 +146,14 @@ Page({
     }
   },
-  goadd: function(e) {
+  goadd: function (e) {
     console.log(e)
     wx.navigateTo({
       url: 'addinfo/addinfo',
     })
   },
-  goedit: function(e) {
+  goedit: function (e) {
     console.log(e)
     wx.navigateTo({
       url: 'editinfo/editinfo?id=' + e.currentTarget.id,
@@ -163,35 +163,35 @@ Page({
   /**
    * 生命周期函数--监听页面隐藏
    */
-  onHide: function() {
+  onHide: function () {
   },
   /**
    * 生命周期函数--监听页面卸载
    */
-  onUnload: function() {
+  onUnload: function () {
   },
   /**
    * 页面相关事件处理函数--监听用户下拉动作
    */
-  onPullDownRefresh: function() {
+  onPullDownRefresh: function () {
   },
   /**
    * 页面上拉触底事件的处理函数
    */
-  onReachBottom: function() {
+  onReachBottom: function () {
   },
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function() {
+  onShareAppMessage: function () {
   }
-})
+})