合并分支 'Branch_zhu' 到 'master'

Branch zhu

保单修改

查看合并请求 !2

@@ -165,7 +165,11 @@ Page({
             for (let i in tempProjectlist) {
             for (let i in tempProjectlist) {
               for (let j in tempMain_list) {
               for (let j in tempMain_list) {
                 if (tempProjectlist[i].id == tempMain_list[j].id) {
                 if (tempProjectlist[i].id == tempMain_list[j].id) {
-              tempProjectlist[i] = tempMain_list[j]
+                  tempProjectlist[i].choose_status = true
+                  for (let g in tempProjectlist[i].title) {
+                    tempProjectlist[i].title[g].t_id == tempMain_list[j].t_id ? tempProjectlist[i].title[g].label_state = true : ''
+                   
+                  }
                 }
                 }
               }
               }
             }
             }
@@ -175,7 +179,11 @@ Page({
               for (let i in tempProjectlist) {
               for (let i in tempProjectlist) {
                 for (let j in tempRist) {
                 for (let j in tempRist) {
                   if (tempProjectlist[i].id == tempRist[j].id) {
                   if (tempProjectlist[i].id == tempRist[j].id) {
-              tempProjectlist[i] = tempRist[j]
+                    tempProjectlist[i].choose_status = true
+                    for (let g in tempProjectlist[i].title) {
+                      console.log(tempProjectlist[i].title[g])
+                      tempProjectlist[i].title[g].t_id == tempMain_list[j].t_id ? tempProjectlist[i].title[g].label_state = true : ''
+                    }
                   }
                   }
                 }
                 }
               }
               }
@@ -192,7 +200,6 @@ Page({
             xulie: index,
             xulie: index,
             projectlist: tempProjectlist
             projectlist: tempProjectlist
           })
           })
-    // }
         },
         },
 
 
         // 调取保障项目接口
         // 调取保障项目接口
@@ -1092,27 +1099,27 @@ Page({
                       duration: 2000,
                       duration: 2000,
                     })
                     })
                     this.setData({
                     this.setData({
-              in_num:'',
-              firm:'',
-              applicant_name:'',
-              recognizee_name:'',
+                      in_num: '',
+                      firm: '',
+                      applicant_name: '',
+                      recognizee_name: '',
                       // beneficiary_list: [{
                       // beneficiary_list: [{
                       //   name_array: [],
                       //   name_array: [],
                       //   unit: ''
                       //   unit: ''
                       // }],
                       // }],
-              main_risks:'',
-              main_array:'',
-              year_money:'',
-              compact_time:'',
-              warranty_two:'',
-              long_money:'',
-              bank:'',
-              bank_num:'',
-              impletion_time:'',
-              warranty_one:'',
+                      main_risks: '',
+                      main_array: '',
+                      year_money: '',
+                      compact_time: '',
+                      warranty_two: '',
+                      long_money: '',
+                      bank: '',
+                      bank_num: '',
+                      impletion_time: '',
+                      warranty_one: '',
                       // risk_list:'',
                       // risk_list:'',
-              imgs:'',
-              unit:'',
+                      imgs: '',
+                      unit: '',
                       unit2: '',
                       unit2: '',
                       unit3: '',
                       unit3: '',
                       unit4: '',
                       unit4: '',
@@ -1293,4 +1300,4 @@ Page({
           onShareAppMessage: function() {
           onShareAppMessage: function() {
 
 
           }
           }
-})
+      })