自然人演示版本修改完成

@@ -2,6 +2,9 @@
   "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",

@@ -509,7 +509,7 @@ Page({
         newdata.taxperson_relative = this.data.taxperson_relativeData.selected
         break;
       case '4':
-      console.log('TITLE',this.data.title)
+        console.log('TITLE', this.data.title)
         if (!formdata.lover_name || formdata.lover_name.length < 1) {
           this.showToast('请填写配偶姓名')
           return
@@ -548,7 +548,7 @@ Page({
             this.showToast('请选择贷款期限')
             return
           }
-          newdata.house_location = this.data.houseLocateInfo.address_value[0] + this.data.houseLocateInfo.address_value[1] + this.data.houseLocateInfo.address_value[2] 
+          newdata.house_location = this.data.houseLocateInfo.address_value[0] + this.data.houseLocateInfo.address_value[1] + this.data.houseLocateInfo.address_value[2]
           newdata.identify_type = this.data.identifytypeData.selected
           newdata.loan_type = this.data.loantypeData.selected
           newdata.payback_date = this.data.firstpaybackDate.selected
@@ -576,12 +576,12 @@ Page({
             this.showToast('请选择日期')
             return
           }
-          newdata.house_location = this.data.houseLocateInfo.address_value[0] + this.data.houseLocateInfo.address_value[1] + this.data.houseLocateInfo.address_value[2] 
+          newdata.house_location = this.data.houseLocateInfo.address_value[0] + this.data.houseLocateInfo.address_value[1] + this.data.houseLocateInfo.address_value[2]
           newdata.lease_type = this.data.leasetypeData.selected
           newdata.identify_type = this.data.identifytypeData.selected
           newdata.lease_startdate = this.data.leasestartDate.selected
           newdata.lease_enddate = this.data.leaseendDate.selected
-          Console.log('houseLocateInfo',this.data.houseLocateInfo)
+          Console.log('houseLocateInfo', this.data.houseLocateInfo)
         }
         newdata.lover_cardtype = this.data.lovercardtypeData.selected
         newdata.lover_birthdate = this.data.loverbirthDate.selected
@@ -773,6 +773,12 @@ Page({
         console.log('house_locate', e)
         var house_address = this.data.houseLocateInfo;
         house_address.address_value = e.detail.value
+        if (e.detail.value[0] == e.detail.value[1]) {
+          house_address.selected = e.detail.value[1] + e.detail.value[2]
+        } else {
+          house_address.selected = e.detail.value[0] + e.detail.value[1] + e.detail.value[2]
+
+        }
         this.setData({
           houseLocateInfo: house_address
         })

@@ -65,6 +65,12 @@ Page({
     })
   },
 
+  gochat: function () {
+    wx.navigateTo({
+      url: '../smartchat/chat',
+    })
+  },
+
   /**
    * 生命周期函数--监听页面隐藏
    */

 <!--pages/main/guide/guide.wxml-->
 
-<scroll-view class='page'>
-  <view class="bg_wrap">
-    <image class='bgimg' src='/images/guide_bg.jpg'></image>
-
-    <view class='card_rectangle_bg_row' style='margin-top:280rpx;padding:30rpx' bindtap='gotaxPerson'>
-      <image class="icon_wrap" src="/images/tax_person.png"></image>
-      <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
-      <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>
-        <text style='font-size: 36rpx;color: #000;font-weight:bold;text-align: left;'>自然人信息采集</text>
-        <text style='font-size:28rpx;color: #999;text-align: left;margin-top:6rpx'>采集本人和家庭成员的基本信息</text>
-      </view>
-      <image class='arrow_wrap' src='/images/arrow_right.png'></image>
-    </view>
+<view class='page'>
+  <scroll-view>
+    <view class="bg_wrap">
 
-    <view class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='goAdditionalDiduction'>
-      <image class="icon_wrap" src="/images/additional_deduction.png"></image>
-      <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
-      <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>
-        <text style='font-size: 36rpx;color: #000;font-weight:bold;'>专项附加扣除</text>
-        <text style='font-size:28rpx;color: #999;margin-top:6rpx'>上传可抵扣的专项附加扣除费用票据</text>
+      <image class='bgimg' src='/images/guide_bg.jpg'></image>
+
+      <view class='card_rectangle_bg_row' style='margin-top:280rpx;padding:30rpx' bindtap='gotaxPerson'>
+        <image class="icon_wrap" src="/images/tax_person.png"></image>
+        <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
+        <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>
+          <text style='font-size: 36rpx;color: #000;font-weight:bold;text-align: left;'>自然人信息采集</text>
+          <text style='font-size:28rpx;color: #999;text-align: left;margin-top:6rpx'>采集本人和家庭成员的基本信息</text>
+        </view>
+        <image class='arrow_wrap' src='/images/arrow_right.png'></image>
       </view>
-      <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
-    </view>
 
-    <view class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='goAdvancePayment'>
-      <image class="icon_wrap" src="/images/advance_payment.png"></image>
-      <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
-      <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>
-        <text style='font-size: 36rpx;color: #000;font-weight:bold;'>预扣预缴</text>
-        <text style='font-size:28rpx;color: #999;margin-top:6rpx'>查看本人的个税扣缴明细</text>
+      <view class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='goAdditionalDiduction'>
+        <image class="icon_wrap" src="/images/additional_deduction.png"></image>
+        <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
+        <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>
+          <text style='font-size: 36rpx;color: #000;font-weight:bold;'>专项附加扣除</text>
+          <text style='font-size:28rpx;color: #999;margin-top:6rpx'>上传可抵扣的专项附加扣除费用票据</text>
+        </view>
+        <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
       </view>
-      <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
-    </view>
 
-    <view class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='goFinalPayment'>
-      <image class="icon_wrap" src="/images/final_payment.png"></image>
-      <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
-      <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>
-        <text style='font-size: 36rpx;color: #000;font-weight:bold;'>汇算清缴</text>
-        <text style='font-size:28rpx;color: #999;margin-top:6rpx'>查看个人年度税收信息，年度汇算清缴</text>
+      <view class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='goAdvancePayment'>
+        <image class="icon_wrap" src="/images/advance_payment.png"></image>
+        <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
+        <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>
+          <text style='font-size: 36rpx;color: #000;font-weight:bold;'>预扣预缴</text>
+          <text style='font-size:28rpx;color: #999;margin-top:6rpx'>查看本人的个税扣缴明细</text>
+        </view>
+        <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
       </view>
-      <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
-    </view>
 
-    <!-- <view class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='gotaxCalculate'>
-      <image class="icon_wrap" src="/images/tax_calculate.png"></image>
-      <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
-      <view style='display:flex;flex-direction: column;width:432rpx;margin-left:30rpx;align-self:center;'>
-        <text style='font-size: 36rpx;color: #666;'>个税计算器</text>
-        <text style='font-size:28rpx;color: #999;margin-top:6rpx'>正在开发中</text>
+      <view class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='goFinalPayment'>
+        <image class="icon_wrap" src="/images/final_payment.png"></image>
+        <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
+        <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>
+          <text style='font-size: 36rpx;color: #000;font-weight:bold;'>汇算清缴</text>
+          <text style='font-size:28rpx;color: #999;margin-top:6rpx'>查看个人年度税收信息，年度汇算清缴</text>
+        </view>
+        <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
       </view>
-      <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
-    </view> -->
-  </view>
 
-</scroll-view>
\ No newline at end of file
+      <!-- <view class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='gotaxCalculate'>
+        <image class="icon_wrap" src="/images/tax_calculate.png"></image>
+        <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
+        <view style='display:flex;flex-direction: column;width:432rpx;margin-left:30rpx;align-self:center;'>
+          <text style='font-size: 36rpx;color: #666;'>个税计算器</text>
+          <text style='font-size:28rpx;color: #999;margin-top:6rpx'>正在开发中</text>
+        </view>
+        <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
+      </view> -->
+    </view>
+  </scroll-view>
+  
+  <!-- <image class='chat-img' bindtap='gochat' src='/images/selected02.png'></image> -->
+
+</view>
\ No newline at end of file

@@ -56,3 +56,11 @@ text-align: left;
   height: 60rpx;
   align-self: center
 }
+
+.chat-img{
+  width: 66rpx;
+  height: 66rpx;
+  position: fixed; 
+  right: 40rpx;
+  bottom: 60rpx;
+}

+// pages/main/smartchat/chat.js
+Page({
+
+  /**
+   * Page initial data
+   */
+  data: {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page load
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page is initially rendered
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page show
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page hide
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page unload
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * Page event handler function--Called when user drop down
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * Called when page reach bottom
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * Called when user click on the top right corner to share
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file

+{
+  "navigationBarTitleText": "智能助手"
+}
\ No newline at end of file

+<!--pages/main/smartchat/chat.wxml-->
+<view>
+  <scroll-view>
+    <view wx:for="{{datas}}">
+      <view >666</view>
+    </view>
+  </scroll-view>
+  <view style='  width: 100%;height: 50rpx;position: fixed; bottom: 0rpx;text-align:center'>
+    <text>发送</text>
+  </view>
+</view>
\ No newline at end of file

+/* pages/main/smartchat/chat.wxss */
\ No newline at end of file