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

# Conflicts:
#	src/common/lang/en.js
#	src/pages/infomation-improve/infomation-improve.js

 module.exports = {
   presets: [
     '@vue/app'
-  ]
+	],
+	sourceType: 'unambiguous'
 }

 {
-	"name": "vue-cli3-framework",
-	"version": "0.1.0",
-	"private": true,
-	"scripts": {
-		"serve": "vue-cli-service serve",
-		"dev": "vue-cli-service serve",
-		"build": "vue-cli-service build",
-		"sandbox": "vue-cli-service build --mode sandbox",
-		"prod": "vue-cli-service build --mode prod",
-		"lint": "vue-cli-service lint",
-		"oss": "node build/oss-released.js"
-	},
-	"dependencies": {
-		"ali-oss": "^6.1.1",
-		"amfe-flexible": "^2.2.1",
-		"axios": "^0.19.0",
-		"axios-mock-adapter": "^1.16.0",
-		"co": "^4.6.0",
-		"core-js": "^2.6.5",
-		"glob": "^7.1.4",
-		"mockjs": "^1.0.1-beta3",
-		"postcss-pxtorem": "^4.0.1",
-		"purecss": "^1.0.1",
-		"ua-device": "^0.1.10",
-		"vue": "^2.6.10",
-		"vue-awesome-swiper": "^3.1.3",
-		"vue-i18n": "^8.15.0",
-		"vue-router": "^3.0.3",
-		"vuex": "^3.0.1"
-	},
-	"devDependencies": {
-		"@vue/cli-plugin-babel": "^3.8.0",
-		"@vue/cli-plugin-eslint": "^3.8.0",
-		"@vue/cli-service": "^3.8.0",
-		"babel-eslint": "^10.0.1",
-		"babel-plugin-component": "^1.1.1",
-		"babel-polyfill": "^6.26.0",
-		"eslint": "^5.16.0",
-		"eslint-plugin-vue": "^5.0.0",
-		"node-sass": "^4.12.0",
-		"prerender-spa-plugin": "^3.4.0",
-		"sass-loader": "^7.1.0",
-		"vue-template-compiler": "^2.6.10"
-	}
+  "name": "vue-cli3-framework",
+  "version": "0.1.0",
+  "private": true,
+  "scripts": {
+    "serve": "vue-cli-service serve",
+    "dev": "vue-cli-service serve",
+    "build": "vue-cli-service build",
+    "sandbox": "vue-cli-service build --mode sandbox",
+    "prod": "vue-cli-service build --mode prod",
+    "lint": "vue-cli-service lint",
+    "oss": "node build/oss-released.js"
+  },
+  "dependencies": {
+    "ali-oss": "^6.1.1",
+    "amfe-flexible": "^2.2.1",
+    "axios": "^0.19.0",
+    "axios-mock-adapter": "^1.16.0",
+    "co": "^4.6.0",
+    "core-js": "^2.6.5",
+    "glob": "^7.1.4",
+    "mockjs": "^1.0.1-beta3",
+    "postcss-pxtorem": "^4.0.1",
+    "purecss": "^1.0.1",
+    "ua-device": "^0.1.10",
+    "vue": "^2.6.10",
+    "vue-awesome-swiper": "^3.1.3",
+    "vue-i18n": "^8.15.0",
+    "vue-router": "^3.0.3",
+    "vue-video-player": "^5.0.2",
+    "vuex": "^3.0.1"
+  },
+  "devDependencies": {
+    "@vue/cli-plugin-babel": "^3.8.0",
+    "@vue/cli-plugin-eslint": "^3.8.0",
+    "@vue/cli-service": "^3.8.0",
+    "babel-eslint": "^10.0.1",
+    "babel-plugin-component": "^1.1.1",
+    "babel-polyfill": "^6.26.0",
+    "eslint": "^5.16.0",
+    "eslint-plugin-vue": "^5.0.0",
+    "node-sass": "^4.12.0",
+    "prerender-spa-plugin": "^3.4.0",
+    "sass-loader": "^7.1.0",
+    "vue-template-compiler": "^2.6.10"
+  }
 }

@@ -9,7 +9,7 @@
 	<link rel="stylesheet" href="./css/pure-min.css">
 	<link rel="stylesheet" href="./css/grids-responsive-min.css">
 	<title>平安人寿保险官网</title>
-<link href="static/js/0.1574223183500.js" rel="prefetch"><link href="static/js/1.1574223183500.js" rel="prefetch"><link href="static/js/10.1574223183500.js" rel="prefetch"><link href="static/js/11.1574223183500.js" rel="prefetch"><link href="static/js/12.1574223183500.js" rel="prefetch"><link href="static/js/13.1574223183500.js" rel="prefetch"><link href="static/js/14.1574223183500.js" rel="prefetch"><link href="static/js/15.1574223183500.js" rel="prefetch"><link href="static/js/16.1574223183500.js" rel="prefetch"><link href="static/js/2.1574223183500.js" rel="prefetch"><link href="static/js/3.1574223183500.js" rel="prefetch"><link href="static/js/4.1574223183500.js" rel="prefetch"><link href="static/js/5.1574223183500.js" rel="prefetch"><link href="static/js/6.1574223183500.js" rel="prefetch"><link href="static/js/7.1574223183500.js" rel="prefetch"><link href="static/js/8.1574223183500.js" rel="prefetch"><link href="static/js/9.1574223183500.js" rel="prefetch"><link href="static/js/app.1574223183500.js" rel="preload" as="script"></head>
+<link href="static/js/0.1574431092750.js" rel="prefetch"><link href="static/js/1.1574431092750.js" rel="prefetch"><link href="static/js/10.1574431092750.js" rel="prefetch"><link href="static/js/11.1574431092750.js" rel="prefetch"><link href="static/js/12.1574431092750.js" rel="prefetch"><link href="static/js/13.1574431092750.js" rel="prefetch"><link href="static/js/14.1574431092750.js" rel="prefetch"><link href="static/js/15.1574431092750.js" rel="prefetch"><link href="static/js/16.1574431092750.js" rel="prefetch"><link href="static/js/2.1574431092750.js" rel="prefetch"><link href="static/js/3.1574431092750.js" rel="prefetch"><link href="static/js/4.1574431092750.js" rel="prefetch"><link href="static/js/5.1574431092750.js" rel="prefetch"><link href="static/js/6.1574431092750.js" rel="prefetch"><link href="static/js/7.1574431092750.js" rel="prefetch"><link href="static/js/8.1574431092750.js" rel="prefetch"><link href="static/js/9.1574431092750.js" rel="prefetch"><link href="static/js/app.1574431092750.js" rel="preload" as="script"></head>
 
 <body>
 	<noscript>
@@ -19,6 +19,6 @@
 	<div id="app"></div>
 	<!-- built files will be auto injected -->
 	<script src="./js/unionrsa.js"></script>
-<script type="text/javascript" src="static/js/app.1574223183500.js"></script></body>
+<script type="text/javascript" src="static/js/app.1574431092750.js"></script></body>
 
 </html>

 <template>
-  <div id="app">
-    <v-header></v-header>
-    <main ref="container" class="main-container">
-      <router-view />
-    </main>
-    <v-footer></v-footer>
-  </div>
+	<div id="app">
+		<v-header></v-header>
+		<main ref="container" class="main-container">
+			<router-view />
+		</main>
+		<v-footer></v-footer>
+	</div>
 </template>
 
 
@@ -59,7 +59,8 @@ html {
   word-spacing: 1px;
   word-break: break-word;
   text-rendering: optimizeLegibility;
-  color: #333;
+  // color: #333;
+  color: $cFontGray;
   background-color: #ffffff;
   // -ms-text-size-adjust: 100%;
   // -webkit-text-size-adjust: 100%;
@@ -68,6 +69,10 @@ html {
   box-sizing: border-box;
 }
 
+body {
+  font-size: $fontSize;
+}
+
 html,
 body {
   -webkit-text-size-adjust: none;
@@ -255,22 +260,18 @@ input::-webkit-search-cancel-button {
 // }
 
 ::-webkit-input-placeholder {
-  /* WebKit, Blink, Edge */
   color: $cGray;
   opacity: 1;
 }
 :-moz-placeholder {
-  /* Mozilla Firefox 4 to 18 */
   color: $cGray;
   opacity: 1;
 }
 ::-moz-placeholder {
-  /* Mozilla Firefox 19+ */
   color: $cGray;
   opacity: 1;
 }
 :-ms-input-placeholder {
-  /* Internet Explorer 10-11 */
   color: $cGray;
   opacity: 1;
 }
@@ -326,97 +327,81 @@ textarea {
 }
 
 .content {
-  max-width: 1024px;
+  // max-width: 1024px;
+  max-width: 1200px;
   width: 100%;
   margin: 0 auto;
 }
 
 .box-w {
   // max-width: 1024px;
-  max-width: 950px;
+  // max-width: 950px;
+  max-width: 1200px;
   width: 100%;
   margin: 0 auto;
 }
 
 .box {
-  max-width: 950px;
+  // max-width: 950px;
+  max-width: 1200px;
   width: 100%;
   margin: 0 auto;
 }
 
-.focus{
-  border: 1px solid $cOrange ;
+.focus {
+  border: 1px solid $cOrange;
 }
 
-.app__width {
-  width: 750px;
-}
-
-.app__width {
-  width: 750px;
-}
-
-.app__inner {
-  margin: 20px;
-}
-
-.app__title {
-  font-size: $fontSize;
-  line-height: $fontSize + 4px;
-  font-weight: bold;
-  padding-bottom: 10px;
-  margin-bottom: 20px;
-  border-bottom: 0.5px solid #eeeeee;
-}
-
-.app__desc {
-  font-size: $fontSizeSmaller;
-  line-height: $fontSizeSmaller + 2px;
-  margin-bottom: 20px;
-  color: $colorGray;
+.swiper-pagination-bullet {
+  width: 1rem !important;
+  height: 1rem !important;
 }
 
-.app__bgc {
-  position: fixed;
-  background-color: #ffffff;
-  width: 100%;
-  height: 100%;
+.swiper-pagination-bullet-active {
+  background: $cOrange !important;
 }
 
-.app__bg {
-  position: absolute;
-  width: 100%;
-  height: 100%;
+.ipt:focus {
+  border-color: $cOrange !important;
 }
 
-.app__top-shadow {
-  position: fixed;
-  width: 750px;
-  height: 1px;
-  box-shadow: 0px 4px 0.9px 0.1px rgba(6, 0, 1, 0.07);
-  background-color: #ffffff;
+.ipt.err {
+  border-color: $cOrange !important;
 }
 
-.app__content {
-  position: relative;
+.ipt-wrap {
+  .ipt {
+    @extend .bb;
+    width: 100%;
+    height: 4.5rem;
+    border-radius: 4.5rem;
+    border: solid 1px #dcdddd !important;
+    background-color: #ffffff;
+		padding: 0 2rem;
+		flex: 1;
+    letter-spacing: .1rem;
+  }
 }
 
-.swiper-pagination-bullet {
-  width: 1rem !important;
-  height: 1rem !important;
+// 视频
+.video-js {
+  background-color: transparent !important;
 }
 
-.swiper-pagination-bullet-active {
-  background: #f05a23 !important;
+.video-js .vjs-big-play-button {
+  top: 0 !important;
+  bottom: 0 !important;
+  left: 0 !important;
+  right: 0 !important;
+  margin: auto !important;
+  // display: none !important;
 }
 
-
-.ipt:focus {
-  border-color: $cOrange !important;
+.video-js .vjs-slider {
+  background-color: $cOrange !important;
 }
 
-.ipt.err {
-  border-color: $cOrange !important;
+.video-js .vjs-poster {
+  background-color: transparent !important;
 }
-
 </style>

@@ -11,95 +11,100 @@ module.exports = {
 	glbalTips: {
 		sessionLost: "为了更好的体验，需要您登录后再进行此操作"
 	},
+	form: {
+		datePicker: {
+			datePlaceholder: "please select date"
+		}
+	},
 	nav: {
 		loginData: {
 			name: "login",
 			path: "",
 			list: [{
-				name: "register",
-				path: "/register",
-				type: "noAuth",
-				value: ""
-			}, {
-				name: "login",
-				path: "/login",
-				type: "noAuth",
-				value: ""
-			},
-			{
-				name: "modify password",
-				path: "/password/reset",
-				type: "auth",
-				value: ""
-			},
-			{
-				name: "logout",
-				path: "",
-				type: "auth",
-				value: "logout"
-			},
+					name: "register",
+					path: "/register",
+					type: "noAuth",
+					value: ""
+				}, {
+					name: "login",
+					path: "/login",
+					type: "noAuth",
+					value: ""
+				},
+				{
+					name: "modify password",
+					path: "/password/reset",
+					type: "auth",
+					value: ""
+				},
+				{
+					name: "logout",
+					path: "",
+					type: "auth",
+					value: "logout"
+				},
 			]
 		},
 		navList: [{
-			name: "Product description",
-			path: "/product",
-			list: []
-		},
-		{
-			name: "Customer service",
-			path: "/custom/product",
-			list: [{
-				name: "Contact us",
-				path: "/custom/service?q=m1"
-			},
-			{
-				name: "Pay premium",
-				path: "/custom/service?q=m2"
-			},
-			{
-				name: "Query policy",
-				path: "/custom/service?q=m3"
-			},
-			{
-				name: "Change policy",
-				path: "/custom/service?q=m41"
-			},
-			{
-				name: "Claim report",
-				path: "/custom/service?q=m5"
+				name: "Product description",
+				path: "/product",
+				list: []
 			},
 			{
-				name: "Reservation service",
-				path: "/custom/service?q=m6"
+				name: "Customer service",
+				path: "/custom/product",
+				list: [{
+						name: "Contact us",
+						path: "/custom/service?q=m1"
+					},
+					{
+						name: "Pay premium",
+						path: "/custom/service?q=m2"
+					},
+					{
+						name: "Query policy",
+						path: "/custom/service?q=m3"
+					},
+					{
+						name: "Change policy",
+						path: "/custom/service?q=m41"
+					},
+					{
+						name: "Claim report",
+						path: "/custom/service?q=m5"
+					},
+					{
+						name: "Reservation service",
+						path: "/custom/service?q=m6"
+					},
+					{
+						name: "Suggestions",
+						path: "/custom/service?q=m7"
+					},
+					{
+						name: "Common form",
+						path: "/custom/service?q=m8"
+					},
+				]
 			},
 			{
-				name: "Suggestions",
-				path: "/custom/service?q=m7"
+				name: "News",
+				path: "/news/list",
+				list: []
 			},
 			{
-				name: "Common form",
-				path: "/custom/service?q=m8"
-			},
-			]
-		},
-		{
-			name: "News",
-			path: "/news/list",
-			list: []
-		},
-		{
-			name: "About",
-			path: "",
-			list: [{
-				name: "Company",
-				path: "/profile"
-			},
-			{
-				name: "Leaders",
-				path: ""
+				name: "About",
+				path: "",
+				list: [{
+						name: "Company",
+						path: "/profile"
+					},
+					{
+						name: "Leaders",
+						path: ""
+					},
+				]
 			},
-			]
-		},
 		]
 	},
 	footer: {
@@ -385,71 +390,71 @@ module.exports = {
 		head4: "附件",
 		download: "下載文檔",
 		form: [{
-			type: "繳費類",
-			list: [{
-				name: "「電子入賬服務」及銀行戶口<br>直接付款授權申請",
-				desc: "申請設立「 電子入賬服務」 及銀行戶口<br>直接付款授權時須提供",
-				download: "",
+				type: "繳費類",
+				list: [{
+						name: "「電子入賬服務」及銀行戶口<br>直接付款授權申請",
+						desc: "申請設立「 電子入賬服務」 及銀行戶口<br>直接付款授權時須提供",
+						download: "",
+					},
+					{
+						name: "信用卡戶口直接付款授權書",
+						desc: "申請信用卡戶口直接付款授權時須提供",
+						download: "",
+					}
+				]
 			},
 			{
-				name: "信用卡戶口直接付款授權書",
-				desc: "申請信用卡戶口直接付款授權時須提供",
-				download: "",
-			}
-			]
-		},
-		{
-			type: "保單變更類",
-			list: [{
-				name: "保險合同解除申請書",
-				desc: "退保、猶豫期退保業務適用",
-				download: "",
-			},
-			{
-				name: "保險合同變更申請書（ 保單貸款還款類）",
-				desc: "保單貸款、還款業務適用",
-				download: "",
+				type: "保單變更類",
+				list: [{
+						name: "保險合同解除申請書",
+						desc: "退保、猶豫期退保業務適用",
+						download: "",
+					},
+					{
+						name: "保險合同變更申請書（ 保單貸款還款類）",
+						desc: "保單貸款、還款業務適用",
+						download: "",
+					},
+					{
+						name: "保險合同變更申請書（ 保險合同計劃變更類）",
+						desc: "加保、減保、新增附險、復效等業務適用",
+						download: "",
+					},
+					{
+						name: "保險合同變更申請書（ 客戶信息變更類）",
+						desc: "基本信息變更業務適用",
+						download: "",
+					},
+					{
+						name: "保險合同變更申請書（ 客戶權益變更類）",
+						desc: "交費方式、自墊選擇權變更、補發等業務適用",
+						download: "",
+					},
+					{
+						name: "授權委托書",
+						desc: "委托他人代辦時須提供",
+						download: "",
+					},
+					{
+						name: "稅收聲明",
+						desc: "CRS要求",
+						download: "",
+					},
+					{
+						name: "健康告知",
+						desc: "須二次核保的業務須提供",
+						download: "",
+					}
+				]
 			},
 			{
-				name: "保險合同變更申請書（ 保險合同計劃變更類）",
-				desc: "加保、減保、新增附險、復效等業務適用",
-				download: "",
+				type: "理賠類",
+				list: [{
+					name: "理賠申請書",
+					desc: "紙質申請的應備文件",
+					download: "",
+				}]
 			},
-			{
-				name: "保險合同變更申請書（ 客戶信息變更類）",
-				desc: "基本信息變更業務適用",
-				download: "",
-			},
-			{
-				name: "保險合同變更申請書（ 客戶權益變更類）",
-				desc: "交費方式、自墊選擇權變更、補發等業務適用",
-				download: "",
-			},
-			{
-				name: "授權委托書",
-				desc: "委托他人代辦時須提供",
-				download: "",
-			},
-			{
-				name: "稅收聲明",
-				desc: "CRS要求",
-				download: "",
-			},
-			{
-				name: "健康告知",
-				desc: "須二次核保的業務須提供",
-				download: "",
-			}
-			]
-		},
-		{
-			type: "理賠類",
-			list: [{
-				name: "理賠申請書",
-				desc: "紙質申請的應備文件",
-				download: "",
-			}]
-		},
 		]
 	},
 	policyChangeGuide: {
@@ -461,100 +466,100 @@ module.exports = {
 		head5: "應備材料",
 		download: "下載文檔",
 		form: [{
-			project: "退保",
-			content: "在猶豫期後解除合同，公司將退還保單現金價值或未滿期凈保費。（待產品精算確認）",
-			applicant: "投保人",
-			receptionTime: "保單效力終止前",
-			materialList: [{
-				name: "保險單",
+				project: "退保",
+				content: "在猶豫期後解除合同，公司將退還保單現金價值或未滿期凈保費。（待產品精算確認）",
+				applicant: "投保人",
+				receptionTime: "保單效力終止前",
+				materialList: [{
+						name: "保險單",
+					},
+					{
+						name: "申請書",
+						type: 1,
+					},
+					{
+						name: "投保人有效身份證件",
+					},
+					{
+						name: "存折银行卡相关",
+					}
+				],
 			},
 			{
-				name: "申請書",
-				type: 1,
+				project: "猶豫期退保",
+				content: "在猶豫期內提出解除合同，公司會無息退還全部保費",
+				applicant: "投保人",
+				receptionTime: "猶豫期結束前",
+				materialList: [{
+						name: "保險單",
+					},
+					{
+						name: "申請書",
+						type: 1,
+					},
+					{
+						name: "投保人有效身份證件",
+					},
+					{
+						name: "存折银行卡相关",
+					},
+					{
+						name: "首期保費發票",
+					}
+				],
 			},
 			{
-				name: "投保人有效身份證件",
+				project: "客戶資料變更",
+				projectType: 1,
+				path: "/custom/service",
+				query: {
+					q: "m42"
+				},
+				content: "投保人、受保人、受益人的個人信息變更",
+				applicant: "投保人",
+				receptionTime: "不限",
+				materialList: [{
+						name: "申請書",
+						type: 1,
+					},
+					{
+						name: "必要的證明材料",
+					}
+				],
 			},
 			{
-				name: "存折银行卡相关",
-			}
-			],
-		},
-		{
-			project: "猶豫期退保",
-			content: "在猶豫期內提出解除合同，公司會無息退還全部保費",
-			applicant: "投保人",
-			receptionTime: "猶豫期結束前",
-			materialList: [{
-				name: "保險單",
-			},
-			{
-				name: "申請書",
-				type: 1,
+				project: "聯系方式變更",
+				projectType: 1,
+				path: "/custom/service",
+				query: {
+					q: "m43"
+				},
+				content: "地址、電話等信息的變更",
+				applicant: "投保人",
+				receptionTime: "不限",
+				materialList: [{
+						name: "申請書",
+						type: 1,
+					},
+					{
+						name: "投保人有效身份證件",
+					}
+				],
 			},
 			{
-				name: "投保人有效身份證件",
+				project: "交費方式變更",
+				content: "更改保單的續期交費方式或交費賬號",
+				applicant: "投保人",
+				receptionTime: "保單交費期滿前",
+				materialList: [{
+						name: "申請書",
+						type: 1,
+					},
+					{
+						name: "保險單",
+					}
+				],
 			},
-			{
-				name: "存折银行卡相关",
-			},
-			{
-				name: "首期保費發票",
-			}
-			],
-		},
-		{
-			project: "客戶資料變更",
-			projectType: 1,
-			path: "/custom/service",
-			query: {
-				q: "m42"
-			},
-			content: "投保人、受保人、受益人的個人信息變更",
-			applicant: "投保人",
-			receptionTime: "不限",
-			materialList: [{
-				name: "申請書",
-				type: 1,
-			},
-			{
-				name: "必要的證明材料",
-			}
-			],
-		},
-		{
-			project: "聯系方式變更",
-			projectType: 1,
-			path: "/custom/service",
-			query: {
-				q: "m43"
-			},
-			content: "地址、電話等信息的變更",
-			applicant: "投保人",
-			receptionTime: "不限",
-			materialList: [{
-				name: "申請書",
-				type: 1,
-			},
-			{
-				name: "投保人有效身份證件",
-			}
-			],
-		},
-		{
-			project: "交費方式變更",
-			content: "更改保單的續期交費方式或交費賬號",
-			applicant: "投保人",
-			receptionTime: "保單交費期滿前",
-			materialList: [{
-				name: "申請書",
-				type: 1,
-			},
-			{
-				name: "保險單",
-			}
-			],
-		},
 		]
 	},
 	policyChangeContact: {