优化

wangyu
app.js
app.json
images/tax_calculate.png
images/tax_person.png
pages/getPhone/getPhone.js
pages/login/login.js
pages/main/editinfo/editinfo.js
pages/main/guide/guide.js
pages/main/guide/guide.json
pages/main/guide/guide.wxml
pages/main/guide/guide.wxss
pages/main/home/home.js
pages/main/idinfo/idinfo.js
--- a/app.js
查看文件 @8bbeca1
+++ b/app.js
查看文件 @8bbeca1
@@ -61,12 +61,12 @@ App({
           })
         } else if (user && user.type == "1") {//注册用户
           if (relaunch) {
-            wx.reLaunch({ //重新加载
-              url: '../home/home'
-            })
-            // wx.redirectTo({
-            //   url: '../../getPhone/getPhone'
+            // wx.reLaunch({ //重新加载
+            //   url: '../home/home'
             // })
+            wx.reLaunch({
+              url: '../guide/guide'
+            })
           }
         }
       },
--- a/app.json
查看文件 @8bbeca1
+++ b/app.json
查看文件 @8bbeca1
 {
   "pages": [
+    "pages/main/guide/guide",
     "pages/main/home/home",
-        
     "pages/getPhone/getPhone",
     "pages/main/editinfo/editinfo",
     "pages/main/addinfo/addinfo",
--- a/images/tax_calculate.png 0 → 100644
查看文件 @8bbeca1
+++ b/images/tax_calculate.png 0 → 100644
查看文件 @8bbeca1
--- a/images/tax_person.png 0 → 100644
查看文件 @8bbeca1
+++ b/images/tax_person.png 0 → 100644
查看文件 @8bbeca1
--- a/pages/getPhone/getPhone.js
查看文件 @8bbeca1
+++ b/pages/getPhone/getPhone.js
查看文件 @8bbeca1
@@ -66,7 +66,7 @@ Page({
           app.globalData.wx_open_id = user.wx_open_id;
           wx.reLaunch({
-            url: '../main/home/home'
+            url: '../main/guide/guide'
           })
         } else {
@@ -81,7 +81,7 @@ Page({
       },
       complete:function (res){
         wx.reLaunch({
-          url: '../main/home/home'
+          url: '../main/guide/guide'
         })
       }
     })
--- a/pages/login/login.js
查看文件 @8bbeca1
+++ b/pages/login/login.js
查看文件 @8bbeca1
@@ -119,7 +119,7 @@ Page({
           app.globalData.wx_open_id = user.wx_open_id;
           wx.reLaunch({
-            url: '../main/home/home'
+            url: '../main/guide/guide'
           })
         } else {
           wx.showToast({
@@ -133,7 +133,7 @@ Page({
       },
        complete: function (res) {
         wx.reLaunch({
-          url: '../main/home/home'
+          url: '../main/guide/guide'
         })
       }
     })
--- a/pages/main/editinfo/editinfo.js
查看文件 @8bbeca1
+++ b/pages/main/editinfo/editinfo.js
查看文件 @8bbeca1
@@ -3,7 +3,7 @@ var format = require('../../../utils/util.js');
 var app = getApp();
 var baseUrl = app.globalData.baseUrl;
 Page({
-  
+
   /**
    * 页面的初始数据
    */
@@ -22,7 +22,7 @@ Page({
     mobile: '',
     birthday: '',
     id_error: false,
-    curAddress_haschanged:false,
+    curAddress_haschanged: false,
     birthAddress_haschanged: false,
     contactAddress_haschanged: false,
     card_number: '',
@@ -166,7 +166,7 @@ Page({
       selected: '',
       mode: "date",
       fields: "day",
-      start:'1949-01-01',
+      start: '1949-01-01',
       onChange: 'birthdayChange',
     },
     startDate: {
@@ -270,21 +270,21 @@ Page({
   },
   //对各参数初始赋值
-  handleDatas: function() { 
+  handleDatas: function() {
     //todo
     var curdate = format.curDateTime()
-    console.log('curdate', curdate) 
+    console.log('curdate', curdate)
     var tax_info = this.data.taxInfo
     this.data.name = tax_info.name
-    if(this.data.isself){
+    if (this.data.isself) {
       this.data.relativeData.disabled = true
       this.data.relativeData.placeholder = tax_info.family_ties
-    }else{
+    } else {
       this.data.relativeData.disabled = false
       this.data.relativeData.selected = tax_info.family_ties
     }
-    
+
     this.data.personstatusData.selected = tax_info.taxpayer_status
     this.data.cardtypeData.selected = tax_info.id_card_type
@@ -294,7 +294,7 @@ Page({
     this.data.specificIndustryInfo.selected = tax_info.is_specific_profession
     //非必填
     this.data.genderData.selected = tax_info.gender
-    if (tax_info.birth_date>1000){
+    if (tax_info.birth_date > 1000) {
       this.data.birthDate.selected = format.yearFormString(tax_info.birth_date) + '-' + format.monthFormString(tax_info.birth_date) + '-' + format.dayFormString(tax_info.birth_date)
     }
     if (tax_info.join_date > 1000) {
@@ -303,9 +303,9 @@ Page({
     if (tax_info.separate_date > 1000) {
       this.data.endDate.selected = format.yearFormString(tax_info.separate_date) + '-' + format.monthFormString(tax_info.separate_date) + '-' + format.dayFormString(tax_info.separate_date)
     }
-    
+
     this.data.professionData.selected = tax_info.profession.three_level_name
-    
+
     this.data.birthDate.end = curdate
     this.data.startDate.end = curdate
     this.data.endDate.end = curdate
@@ -501,13 +501,14 @@ Page({
           gender_Data.selected = id_info.gender
           that.data.birthDate.selected = birth_day
+          console.log('name***card_number', that.data.name + '***' + that.data.card_number)
           if (that.data.name.length > 0 && id_info.name != that.data.name) {
             that.showtoast("姓名冲突")
             id_error = true
             return
           }
-          if (that.data.card_number.length > 0 && id_info.card_number != that.data.id_card_no) {
+          if (that.data.card_number.length > 0 && id_info.card_number != that.data.card_number) {
             that.showtoast("证照号码冲突")
             id_error = true
             return
@@ -711,7 +712,7 @@ Page({
     contact_address.address_value = e.detail.value
     contact_address.address_code = e.detail.code
     this.setData({
-      contactAddress_haschanged:true,
+      contactAddress_haschanged: true,
       contactaddressInfo: contact_address
     })
     console.log('contactaddressInfo', this.data.contactaddressInfo)
@@ -724,7 +725,7 @@ Page({
     current_address.address_value = e.detail.value
     current_address.address_code = e.detail.code
     this.setData({
-      curAddress_haschanged:true,
+      curAddress_haschanged: true,
       currentaddressInfo: current_address
     })
   },
@@ -769,12 +770,10 @@ Page({
     } else if (!regname.test(formdata.name)) {
       this.showtoast('请输入正确姓名');
       return
-    } 
-    else if (!this.data.isself && this.data.relativeData.placeholder.length < 1) {
+    } else if (!this.data.isself && this.data.relativeData.placeholder.length < 1) {
       this.showtoast('有必填项未填写');
       return
-    }
-     else if (this.data.personstatusData.selected.length < 1) {
+    } else if (this.data.personstatusData.selected.length < 1) {
       this.showtoast('有必填项未填写');
       return
     } else if (this.data.cardtypeData.selected.length < 1) {
@@ -789,7 +788,7 @@ Page({
     } else if (!this.data.isIdCard && (!formdata.id_card_no || formdata.id_card_no.length < 1)) {
       this.showtoast('有必填项未填写');
       return
-    }  else if (formdata.mobile.length < 1) {
+    } else if (formdata.mobile.length < 1) {
       this.showtoast('有必填项未填写');
       return
     } else if (this.data.investInfo.selected.length < 1) {
@@ -834,11 +833,11 @@ Page({
       url: baseUrl + 'persontax/v1/personal-taxes/' + that.data.cur_id,
       method: "PUT",
       data: {
-        "name": formdata.name.length > 0 ? formdata.name:that.data.name ,
+        "name": formdata.name.length > 0 ? formdata.name : that.data.name,
         "family_ties": that.data.relativeData.selected,
         "native": "中国",
         "id_card_type": that.data.cardtypeData.selected,
-        "id_card_no": formdata.id_card_no ?formdata.id_card_no:that.data.card_number,
+        "id_card_no": formdata.id_card_no ? formdata.id_card_no : that.data.card_number,
         "gender": that.data.genderData.selected,
         "birth_date": that.data.long_birth_date,
         "profession": request_profession,
@@ -966,7 +965,7 @@ Page({
     wx.showToast({
       title: str,
       duration: 2000,
-      image:'/images/error.png'
+      image: '/images/error.png'
     })
   },
--- a/pages/main/guide/guide.js 0 → 100644
查看文件 @8bbeca1
+++ b/pages/main/guide/guide.js 0 → 100644
查看文件 @8bbeca1
+// pages/main/guide/guide.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+  
+  },
+
+  gotaxPerson:function(){
+      wx.navigateTo({
+        url: '../home/home',
+      })
+  },
+
+  gotaxCalculate: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+  
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+  
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+  
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+  
+  }
+})
--- a/pages/main/guide/guide.json 0 → 100644
查看文件 @8bbeca1
+++ b/pages/main/guide/guide.json 0 → 100644
查看文件 @8bbeca1
+{
+  "navigationBarTitleText": "自然人税收"
+}
--- a/pages/main/guide/guide.wxml 0 → 100644
查看文件 @8bbeca1
+++ b/pages/main/guide/guide.wxml 0 → 100644
查看文件 @8bbeca1
+<!--pages/main/guide/guide.wxml-->
+
+<view class='page'>
+  <image src='/images/tax_person.png' style='height:460rpx;width:690rpx;margin:30rpx ;align-items:center' bindtap='gotaxPerson'>
+  </image>
+  <image src='/images/tax_calculate.png' style='height:460rpx;width:690rpx;margin:0 30rpx ;align-items:center' bindtap='gotaxCalculate'>
+  </image>
+  <!-- <image class='img_wrap' src='/images/tax_calculate.png' style='margin-top:30rpx'></image> -->
+</view>
--- a/pages/main/guide/guide.wxss 0 → 100644
查看文件 @8bbeca1
+++ b/pages/main/guide/guide.wxss 0 → 100644
查看文件 @8bbeca1
+/* pages/main/guide/guide.wxss */
+
+img_wrap {
+  width: 100%;
+  height: 460rpx;
+  align-items: center;
+  margin-left: 30rpx;
+  margin-right: 30rpx;
+  border-radius: 8rpx;
+}
+
+.text_wrap1 {
+  position: relative;
+  font-family: PingFangSC-Semibold;
+  font-size: 30px;
+  color: #fff;
+  letter-spacing: 0;
+  margin-left: 90rpx;
+  margin-top: 20rpx
+}
+
+text_wrap2{
+  font-family: PingFang-SC-Medium;
+font-size: 16px;
+color: #FFFFFF;
+letter-spacing: 0;
+}
--- a/pages/main/home/home.js
查看文件 @8bbeca1
+++ b/pages/main/home/home.js
查看文件 @8bbeca1
@@ -8,7 +8,7 @@ Page({
    */
   data: {
     load_finish: false,
-    text_tip: "去完善",
+    text_tip: "自然人信息不完善，立即完善",
     taxlist: ['']
   },
@@ -133,7 +133,7 @@ Page({
       })
     } else {
       this.setData({
-        text_tip: ' 尚未录入个人信息，立即完善'
+        text_tip: '自然人信息不完善，立即完善'
       })
     }
   },
--- a/pages/main/idinfo/idinfo.js
查看文件 @8bbeca1
+++ b/pages/main/idinfo/idinfo.js
查看文件 @8bbeca1
@@ -8,6 +8,7 @@ Page({
    */
   data: {
     facepath: '',
+    already_getdata:false,
     front_card_info: {},
     backpath: '',
     back_card_info: {},
@@ -64,7 +65,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function() {
-
+    console.log('onShow')
   },
   chooseImage: function(e) {
@@ -72,7 +73,7 @@ Page({
     var that = this
     wx.chooseImage({
       sourceType: ['camera', 'album'],
-      sizeType: ['original'],
+      // sizeType: ['original'],
       count: 1,
       success: function(res) {
         console.log('success', res)
@@ -102,7 +103,7 @@ Page({
       filePath: path,
       name: 'file',
       formData: {
-        'key': 'imagepath_' + path.substring(path.length - 10, path.length)+".png",
+        'key': 'imagepath_' + path.substring(path.length - 15, path.length),
         'OSSAccessKeyId': OSSInit.access_key_id,
         'policy': OSSInit.policy,
         'signature': OSSInit.signature,
@@ -186,13 +187,15 @@ Page({
       },
       success: function(res) {
         console.log('suc', res)
-        if (res.statusCode == 300) {
+        if (res.statusCode == 200) {
           that.setData({
+            already_getdata:true,
             idInfo: res.data.item
           })
           console.log('suc', that.data.idInfo)
         } else {
           wx.showModal({
+            showCancel: false,
             title: '',
             content: res.data.message ? res.data.message : "数据错误",
           })
@@ -209,13 +212,22 @@ Page({
   },
   savedata: function() {
-    wx.setStorage({
-      key: 'id_info',
-      data: JSON.stringify(this.data.idInfo),
-    })
-    wx.navigateBack({
-      delta: 1
-    })
+    if (this.data.already_getdata){
+      wx.setStorage({
+        key: 'id_info',
+        data: JSON.stringify(this.data.idInfo),
+      })
+      wx.navigateBack({
+        delta: 1
+      })
+    }else{
+      wx.showModal({
+        showCancel:false,
+        title: '',
+        content: "未能获取到信息,不能保存",
+      })
+    }
+    
   },
   /**
@@ -229,6 +241,7 @@ Page({
    * 生命周期函数--监听页面卸载
    */
   onUnload: function() {
+    console.log('onUnload')
     // wx.showModal({
     //   title: '',
     //   content: '\n您的信息还未保存是否确认返回？\n',