Merge branch 'master' of http://114.215.101.231:8099/liuxiaoyan/baoxian

@@ -9,7 +9,7 @@ App({
     var promise = new Promise((resolve, reject) => {
     var promise = new Promise((resolve, reject) => {
       let that = this;
       let that = this;
       let postData = data;
       let postData = data;
-      let baseUrl = 'http://insurance.w.bronet.cn/';
+      let baseUrl = 'https://insurance.w.broteam.cn/';
       wx.request({
       wx.request({
         url: baseUrl + url,
         url: baseUrl + url,
         data: postData,
         data: postData,

@@ -159,7 +159,6 @@ Page({
         console.log(tempRist)
         console.log(tempRist)
         // 已经添加的主险
         // 已经添加的主险
         let tempMain_list = Object.assign(this.data.main_array, {})
         let tempMain_list = Object.assign(this.data.main_array, {})
-    console.log(type)
         if (type == 'zhuxian') {
         if (type == 'zhuxian') {
           if (tempMain_list.length > 0) {
           if (tempMain_list.length > 0) {
             for (let i in tempProjectlist) {
             for (let i in tempProjectlist) {
@@ -168,6 +167,7 @@ Page({
                   tempProjectlist[i].choose_status = true
                   tempProjectlist[i].choose_status = true
                   for (let g in tempProjectlist[i].title) {
                   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 : ''
                     tempProjectlist[i].title[g].t_id == tempMain_list[j].t_id ? tempProjectlist[i].title[g].label_state = true : ''
+                   
                   }
                   }
                 }
                 }
               }
               }
@@ -181,7 +181,7 @@ Page({
                     tempProjectlist[i].choose_status = true
                     tempProjectlist[i].choose_status = true
                     for (let g in tempProjectlist[i].title) {
                     for (let g in tempProjectlist[i].title) {
                       console.log(tempProjectlist[i].title[g])
                       console.log(tempProjectlist[i].title[g])
-                tempProjectlist[i].title[g].t_id == tempMain_list[j].t_id ? tempProjectlist[i].title[g].label_state = true : ''
+                      tempProjectlist[i].title[g].t_id == tempRist[j].t_id ? tempProjectlist[i].title[g].label_state = true : ''
                     }
                     }
                   }
                   }
                 }
                 }
@@ -839,7 +839,7 @@ Page({
             var FamilyId = this.data.FamilyId
             var FamilyId = this.data.FamilyId
             let url = 'counselor/familyname'
             let url = 'counselor/familyname'
             let params = {
             let params = {
-      FamilyId: FamilyId || id,
+              FamilyId: FamilyId||id,
             }
             }
             app.post(url, params).then((res) => {
             app.post(url, params).then((res) => {
               // console.log(res)
               // console.log(res)
@@ -1149,12 +1149,9 @@ Page({
 
 
           //获取编辑保单接口
           //获取编辑保单接口
           getlistVerify(id) {
           getlistVerify(id) {
-    wx.setNavigationBarTitle({
-      title: '编辑保单',
-    })
             let url = 'counselor/infordef'
             let url = 'counselor/infordef'
             let params = {
             let params = {
-      InfoId: this.data.inforid || id,
+              InfoId: this.data.inforid||id,
             }
             }
             app.post(url, params).then((res) => {
             app.post(url, params).then((res) => {
               if (res.data.code == 200) {
               if (res.data.code == 200) {
@@ -1232,35 +1229,18 @@ Page({
             
             
             this.ensureProjectList()
             this.ensureProjectList()
             let that = this;
             let that = this;
-    // this.setData({
-    //   def_id: options.def_id,
-    //   inforid: options.inforid,
-    //   FamilyId: options.FamilyId,
-    //   recognizee_name: options.name
-    // })
-    // if (options.inforid == undefined) {
-    //   this.setData({
-    //     inforid: 0
-    //   })
-    // }
-    options.inforid ? (that.getlistVerify(options.inforid), that.setData({
+            options.inforid ? (that.getlistVerify(options.inforid),that.setData({
               inforid: options.inforid,
               inforid: options.inforid,
               edit_state: true
               edit_state: true
-    })) : ""
+            }),wx.setNavigationBarTitle({
+              title: '编辑保单',
+            })): ""
             options.def_id ? that.setData({
             options.def_id ? that.setData({
               def_id: options.def_id,
               def_id: options.def_id,
               }) : ""
               }) : ""
-    options.FamilyId ? (that.familyMember(options.FamilyId), that.setData({
+            options.FamilyId ? (that.familyMember(options.FamilyId),that.setData({
               FamilyId: options.FamilyId
               FamilyId: options.FamilyId
-    })) : '';
-
-    // if (options.FamilyId != '') {
-    //   this.familyMember()
-    // }
-    // if (options.inforid != undefined) {
-    //   this.getlistVerify()
-    // }
-
+            })):'';
             if (wx.getStorageSync('storge_state') && options.inforid == undefined) {
             if (wx.getStorageSync('storge_state') && options.inforid == undefined) {
               this.getStorage()
               this.getStorage()
             }
             }
@@ -1314,4 +1294,4 @@ Page({
           onShareAppMessage: function() {
           onShareAppMessage: function() {
 
 
           }
           }
-})
+      })

@@ -310,10 +310,12 @@ Page({
    * 生命周期函数--监听页面加载
    * 生命周期函数--监听页面加载
    */
    */
   onLoad: function(options) {
   onLoad: function(options) {
-    this.setData({
-      cid: options.cid, //顾问ID
-      mainid: options.mainid //户主ID
-    })
+    options.cid?(this.setData({
+      cid: options.cid,
+    })):''
+    options.mainid?this.setData({
+      mainid: options.id
+    }):''
     this.getData()
     this.getData()
 
 
     cellId = options.cellId;
     cellId = options.cellId;

@@ -4,11 +4,12 @@
 		"ignore": []
 		"ignore": []
 	},
 	},
 	"setting": {
 	"setting": {
-		"urlCheck": false,
+		"urlCheck": true,
 		"es6": true,
 		"es6": true,
 		"postcss": true,
 		"postcss": true,
 		"minified": true,
 		"minified": true,
-		"newFeature": true
+		"newFeature": true,
+		"autoAudits": false
 	},
 	},
 	"compileType": "miniprogram",
 	"compileType": "miniprogram",
 	"libVersion": "2.4.0",
 	"libVersion": "2.4.0",