Merge branch 'master' of 120.27.44.69:dev/pingan-life-index-pro

# Conflicts:
#	src/pages/custom-service/components/policy-change-contact.js

@@ -101,5 +101,7 @@ module.exports = {
 	// 保单联系方式更改
 	// 保单联系方式更改
 	policyContactApi:"/pingan_hklife_webapi/policy/updatePolicyContacts",
 	policyContactApi:"/pingan_hklife_webapi/policy/updatePolicyContacts",
 	// 上传excel
 	// 上传excel
-	policyContactUploadExcelApi:"/pingan_hklife_webapi/policy/upload/excel"
+	policyContactUploadExcelApi:"/pingan_hklife_webapi/policy/upload/excel",
+	//保单联系方式查询
+	policyContactDetailApi:"/pingan_hklife_webapi/policy/policyContacts/detail"
 }
 }

@@ -243,6 +243,7 @@ export default {
 			}
 			}
 		},
 		},
 		updatePolicyContact() {
 		updatePolicyContact() {
+<<<<<<< HEAD
 			let param = {
 			let param = {
 				policyContactCode: "",
 				policyContactCode: "",
 				policyId: "4655100",
 				policyId: "4655100",
@@ -259,6 +260,25 @@ export default {
 				fileSize: 123,
 				fileSize: 123,
 				fileContentType: "mp4/"
 				fileContentType: "mp4/"
 			};
 			};
+=======
+			let param={
+				"policyContactCode":"",
+				"policies":[{
+					"policyId":"4655100",
+					"policyCode":"P000200000000009"}],
+				"mobileAreaCode":"0668",
+				"mobile":"13727826666",
+				"countryId":"156",
+				"provinceId":"1",
+				"cityId":"304",
+				"address":"上海迪士尼乐园123213123",
+				"acceptMessage":1,
+				"iobsKey":"a",
+				"fileFormat":"xlsx",
+				"fileSize":123,
+				"fileContentType":"mp4/"
+			}
+>>>>>>> 1af854e069546774dda5b13dbb28fa154cacd45d
 			httpPost({
 			httpPost({
 				url: api.policyContactApi,
 				url: api.policyContactApi,
 				data: param,
 				data: param,
@@ -269,7 +289,25 @@ export default {
 				})
 				})
 				.catch(res => {});
 				.catch(res => {});
 		},
 		},
+<<<<<<< HEAD
 		uploadExcel() {}
 		uploadExcel() {}
+=======
+		uploadExcel(){
+
+		},
+		queryPolicyContact(){
+			let param ={policyId:'4655100',policyCode:'P000200000000009'}
+			httpPost({
+				url: api.policyContactDetailApi,
+				data: param,
+				sid: true
+			}).then(response => {
+				console.log("response:", response)
+			}).catch(res => {
+
+			});
+		}
+>>>>>>> 1af854e069546774dda5b13dbb28fa154cacd45d
 	},
 	},
 	watch: {
 	watch: {
 		"data.mobileAreaCode": function() {
 		"data.mobileAreaCode": function() {

@@ -123,6 +123,7 @@
         </div>
         </div>
 
 
       </div>
       </div>
+			<div style="width: 20px;height: 20px;background-color: #3a8ee6" @click="updatePolicyContact"></div>
     </template>
     </template>
   </div>
   </div>
 </template>
 </template>