优化

@@ -68,13 +68,30 @@ Page({
    * Lifecycle function--Called when page load
    */
   onLoad: function (options) {
+    var that = this
     console.log("options", options);
     this.setData({
       cur_index: options.index
     })
-    wx.setNavigationBarTitle({
-      title: this.data.title_arr[this.data.cur_index]
+    wx.getStorage({
+      key: 'selectitems',
+      success: function (res) {
+        console.log("selectitems", res.data)
+        var new_title = '添加'+res.data[options.index].message
+        if (new_title == '添加住房') {
+          new_title = '添加'+res.data[options.index].extra_message
+        }
+        wx.setNavigationBarTitle({
+          title: new_title,
+        })
+        that.setData({
+          title: new_title,
+          datas02: res.data
+        })
+      },
     })
+
+
     this.initOSS()
   },
 
@@ -124,6 +141,10 @@ Page({
   },
 
   gosave:function(){
+    wx.setStorage({
+      key: 'image',
+      data: this.data.img_path,
+    })
     wx.navigateBack({
       delta: 1
     })

@@ -9,21 +9,25 @@ Page({
     flag_housing02: false,
     selectIndex: [{
       message: '子女教育',
+      disable_change: '',
       sureid: false
     }, {
-        message: '继续教育',
+      message: '继续教育',
+      disable_change: '',
       sureid: false
     }, {
       message: '赡养老人',
+      disable_change: '',
       sureid: false
     }, {
-        message: '大病医疗',
+      message: '大病医疗',
+      disable_change: '',
       sureid: false
     }, {
       message: '住房',
       sureid: false,
-      housing01:false,
-      extra_message :''
+      disable_change: '',
+      extra_message: ''
     }, ],
     unitData: {
       label: '选择申报单位',
@@ -44,12 +48,12 @@ Page({
     // wx.clearStorage()
     wx.getStorage({
       key: 'selectitems',
-      success: function (res) {
+      success: function(res) {
         console.log("selectitems", res.data)
         that.setData({
           selectIndex: res.data,
-          flag_housing01: res.data[res.data.length - 1].housing01,
-          flag_housing02: !res.data[res.data.length - 1].housing01
+          flag_housing01: res.data[res.data.length - 1].extra_message == '住房贷款利息',
+          flag_housing02: res.data[res.data.length - 1].extra_message == '住房租金'
         })
       },
     })
@@ -79,8 +83,14 @@ Page({
   },
 
   selectRep: function(e) {
-    let index = e.currentTarget.dataset.selectindex; //当前点击元素的自定义数据，这个很关键 
+    let index = e.currentTarget.dataset.selectindex;
     let selectIndex = this.data.selectIndex; //取到data里的selectIndex 
+    if (selectIndex[index].disable_change) {
+      wx.showToast({
+        title: '该选项不可修改',
+      })
+      return;
+    }
     selectIndex[index].sureid = !selectIndex[index].sureid; //点击就赋相反的值 
     this.setData({
       selectIndex: selectIndex //将已改变属性的json数组更新 
@@ -88,6 +98,13 @@ Page({
   },
 
   housing01: function(e) {
+    let selectIndex = this.data.selectIndex;
+    if (selectIndex[selectIndex.length - 1].disable_change) {
+      wx.showToast({
+        title: '该选项不可修改',
+      })
+      return;
+    }
     this.setData({
       flag_housing01: !this.data.flag_housing01
     })
@@ -99,6 +116,13 @@ Page({
   },
 
   housing02: function(e) {
+    let selectIndex = this.data.selectIndex;
+    if (selectIndex[selectIndex.length - 1].disable_change) {
+      wx.showToast({
+        title: '该选项不可修改',
+      })
+      return;
+    }
     this.setData({
       flag_housing02: !this.data.flag_housing02
     })
@@ -110,38 +134,39 @@ Page({
   },
 
   gocommit: function() {
-    if (!this.data.unitData.selected || !this.data.unitData.selected.length>0){
+    if (!this.data.unitData.selected || !this.data.unitData.selected.length > 0) {
       wx.showToast({
         title: '请选择申报单位',
       })
       return;
     }
-    var selectjson = new Array();
-    for (var i = 0; i < this.data.selectIndex.length; i++) {
+    var selectjson = this.data.selectIndex
+    var flag_count = 0
+    for (var i = 0; i < selectjson.length; i++) {
       if (this.data.selectIndex[i].sureid) {
-        selectjson.push(this.data.selectIndex[i]);
+        selectjson[i].disable_change = true
+        flag_count++
       }
     }
-    console.log("selectjson01",selectjson)
-    if (selectjson.length<1) {
+    console.log("selectjson01", selectjson)
+    if (flag_count < 1) {
       wx.showToast({
         title: '请选择专项附加扣除',
       })
       return;
     } else {
-      if (selectjson[selectjson.length - 1].sureid ) {
-        if(this.data.flag_housing01 || this.data.flag_housing02){
-          selectjson[selectjson.length - 1].housing01 = true;
-          selectjson[selectjson.length - 1].extra_message = this.data.flag_housing01 ? "住房贷款利息" :"住房租金" ;
+      if (selectjson[selectjson.length - 1].sureid) {
+        if (this.data.flag_housing01 || this.data.flag_housing02) {
+          selectjson[selectjson.length - 1].extra_message = this.data.flag_housing01 ? "住房贷款利息" : "住房租金";
           this.setData({
-            selectIndex: selectjson 
+            selectIndex: selectjson
+          })
+        } else {
+          wx.showToast({
+            title: '请选择住房类型',
           })
+          return;
         }
-      } else {
-        wx.showToast({
-          title: '请选择住房类型',
-        })
-        return;
       }
     }
     wx.setStorage({

@@ -3,13 +3,14 @@
   <view class='text_gray_30' style='padding:30rpx'>您在“北京小爱科技”申报的专项附加扣除项已添加完成，请完善各项的具体申报内容。</view>
   <view style='padding-left:30rpx;padding-right:30rpx'>
     <image class='icon_wrap' src="/images/rectangle_icon.png"></image>
-    <text style='padding-left:20rpx' class='text_gray_32'>北京小爱科技公司</text>
+    <text style='padding-left:20rpx' class='text_gray_32'>北京小爱智能科技</text>
     <view class='divide_line_f5f5f5' style='margin-top:30rpx' ></view>
   </view>
   <view wx:if="true">
     <view wx:for="{{datas02}}">
-      <view class='card_rectangle_bg_column' style='padding:30rpx;margin-top:30rpx'>
-        <text class='text_black_32'>{{datas02[index].message}}</text>
+      <view hidden='{{!datas02[index].sureid}}' class='card_rectangle_bg_column' style='padding:30rpx;margin-top:30rpx'>
+        <text class='text_black_32' wx:if="{{datas02[index].message!='住房'}}">{{datas02[index].message}}</text>
+        <text class='text_black_32' wx:if="{{datas02[index].message=='住房'}}">{{datas02[index].extra_message}}</text>
         <view style='margin:20rpx 0'>
                 <text class='text_gray_22 float_left'>已抵扣额度：4890.00</text>
                 <text class='text_gray_22 float_right'>剩余可抵扣额度：12810.00</text>

@@ -31,7 +31,8 @@
               <view class='divide_line'></view>
               <view style='padding:44rpx 30rpx;display:flex;flex-direction:column'>
                 <view>
-                  <text class='text_666_30 float_left'>{{datas02[index].message}}</text>
+                  <text class='text_666_30 float_left' wx:if="datas02[index].message!='住房'">{{datas02[index].message}}</text>
+                  <text class='text_666_30 float_left' wx:if="datas02[index].message=='住房'">{{datas02[index].extra_message}}</text>
                   <text class='text_blue_28 float_right' bindtap='lookandadd' id='{{index}}'>查看并调整</text>
                 </view>
                 <view style='margin-top:20rpx'>

@@ -23,11 +23,15 @@ Page({
       key: 'selectitems',
       success: function (res) {
         console.log("selectitems", res.data)
+        var new_title = res.data[options.index].message
+        if (new_title=='住房'){
+          new_title = res.data[options.index].extra_message
+        }
         wx.setNavigationBarTitle({
-          title: res.data[options.index].message,
+          title: new_title,
         })
         that.setData({
-          title: res.data[options.index].message,
+          title: new_title,
           datas02: res.data
         }) 
       },

@@ -25,7 +25,7 @@
     <view class='divide_line_f5f5f5'></view>
     <view style='margin:30rpx;' class='card_rectangle_bg_column'>
       <!-- 子女教育 -->
-      <view wx:if="{{title=='子女教育'}}" style='display:flex;flex-direction:column;padding:30rpx;'>
+      <view wx:if="{{title=='子女教育'}}" style='display:flex;flex-direction:column;padding: 30rpx 30rpx 0 30rpx;'>
         <view style='height:40rpx'>
           <text class='text_999_28 float_left'>子女姓名</text>
           <text class='text_333_28 float_right'>纳兰嫣然</text>
@@ -57,7 +57,7 @@
       </view>
 
       <!-- 继续教育 -->
-      <view wx:if="{{title=='继续教育'}}" style='display:flex;flex-direction:column;padding:30rpx;'>
+      <view wx:if="{{title=='继续教育'}}" style='display:flex;flex-direction:column;padding:30rpx 30rpx 0 30rpx;'>
         <view style='height:40rpx'>
           <text class='text_999_28 float_left'>教育类型</text>
           <text class='text_333_28 float_right'>消防工程师</text>
@@ -73,7 +73,7 @@
       </view>
 
       <!-- 赡养老人 -->
-      <view wx:if="{{title=='赡养老人'}}" style='display:flex;flex-direction:column;padding:30rpx;'>
+      <view wx:if="{{title=='赡养老人'}}" style='display:flex;flex-direction:column;padding:30rpx 30rpx 0 30rpx;'>
         <view style='height:40rpx'>
           <text class='text_999_28 float_left'>老人姓名</text>
           <text class='text_333_28 float_right'>任我行</text>
@@ -97,7 +97,7 @@
       </view>
 
       <!-- 大病医疗 -->
-      <view wx:if="{{title=='大病医疗'}}" style='display:flex;flex-direction:column;padding:30rpx;'>
+      <view wx:if="{{title=='大病医疗'}}" style='display:flex;flex-direction:column;padding:30rpx 30rpx 0 30rpx;'>
         <view style='height:40rpx'>
           <text class='text_999_28 float_left'>扣除金额</text>
           <text class='text_333_28 float_right'>42895</text>
@@ -105,7 +105,7 @@
       </view>
 
       <!-- 住房 -->
-      <view wx:if="{{title=='住房贷款利息'||title=='住房租金'}}" style='display:flex;flex-direction:column;padding:30rpx;'>
+      <view wx:if="{{title=='住房贷款利息'||title=='住房租金'}}" style='display:flex;flex-direction:column;padding:30rpx 30rpx 0 30rpx;'>
         <view style='height:40rpx'>
           <text class='text_999_28 float_left'>配偶姓名</text>
           <text class='text_333_28 float_right'>刘顺丰</text>
@@ -115,7 +115,7 @@
           <text class='text_333_28 float_right'>42902384023855252</text>
         </view>
       </view>
-      <view style='height:40rpx;padding:0 30rpx;'>
+      <view style='height:40rpx;padding:0 30rpx 30rpx 30rpx;'>
         <text class='text_999_28 float_left'>扣除时间</text>
         <text class='text_333_28 float_right'>2019年10月</text>
       </view>
@@ -126,7 +126,7 @@
 
     <view class='rectangle_dashed_bg' bindtap='goadd'>
       <view class='text_blue_28' style='line-height:90rpx'>
-        十 {{add_text_arr[cur_index]}}
+        十 添加{{title}}
       </view>
     </view>
   </view>