Merge branch 'master' into 'feature/goods'

# Conflicts:
#   src/main.js

src/components/Tabbar.vue

@@ -59,7 +59,7 @@ export default {
     ...mapMutations(["setActiveIdx"]),
     oninput(idx) {
       this.setActiveIdx(idx);
-      this.$router.push(route[idx]);
+      this.$router.replace(route[idx]);
     }
   }
 };

src/main.js

@@ -4,7 +4,7 @@ import router from "./router";
 import store from "./store";
 import "./style/index.less";
 import "amfe-flexible";
-import vConsole from "vconsole";
+// import vConsole from "vconsole";
 import "@/assets/icons/index";
 import "@/service/load";
 import "@/service/cherry-ui";
@@ -16,4 +16,6 @@ new Vue({
   render: h => h(App)
 }).$mount("#app");
 
-new vConsole();
+// if (process.env.NODE_ENV !== "development") {
+//   new vConsole();
+// }

src/views/Goods/inform.vue

@@ -30,7 +30,7 @@
       <cr-button @click="$router.back()">不符合</cr-button>
       <cr-button type="warning" @click="conform">符合，立即投保</cr-button>
     </div>
-    <record-layer v-model="showLayer" desc="敬请期待"></record-layer>
+    <record-layer v-model="showLayer" desc="不能支付,敬请期待"></record-layer>
   </div>
 </template>
 

src/views/Introduction/modules/BusinessQuali.vue

@@ -70,11 +70,11 @@
         查询地址：http://icid.iachina.cn/选择“互联网保险信息披露＞中介类信息披露＞全天候保险代理股份有限公司”即可查看。
       </div>
       <div class="itd-quali-item-extra">
-        <cr-image width="295px" height="166px" fit="cover" src="" />
+        <cr-image height="200px" fit="contain" :src="angencyLicense" />
         <p class="itd-quali-item-extra-desc">经营保险代理业务许可证</p>
       </div>
       <div class="itd-quali-item-extra">
-        <cr-image width="295px" height="166px" fit="cover" src="" />
+        <cr-image height="400px" fit="contain" :src="businessLicence" />
         <p class="itd-quali-item-extra-desc">营业执照</p>
       </div>
     </div>
@@ -82,13 +82,15 @@
 </template>
 <script>
 import "../index.less";
-import avatar from "@/assets/images/user/avatar@2x.png";
+import businessLicence from "@/assets/images/user/business-licence.jpeg";
+import angencyLicense from "@/assets/images/user/angency-license.jpeg";
 
 export default {
   name: "BusinessQuali",
   data() {
     return {
-      avatar
+      businessLicence,
+      angencyLicense
     };
   }
 };

src/views/Policy/Detail/index.less

@@ -175,27 +175,46 @@
 		  }
 	  	}
 	  }
-	  &-service {
-	  	margin: 0 16px 10px;
-		padding: 20px;
-		background: #FFFFFF;
-		border-radius: 14px;
-	  	.Pdsc-service-head {
-		  .card-head
-	  	}
-	  	.Pdsc-service-body {
-		  .card-body
-	  	}
-	  	.Pdsc-service-question {
-	  	  margin-top: 24px;
-	  	  .card-head
-	  	}
-	  	.Pdsc-service-divider {
-	  	  &:before {
-	  	  	height: 1px;
-	  	  	border-color: #EBEBEB;
-	  	  }
-	  	}
+	}
+	.Pdb-service {
+	  margin: 0 16px 16px;
+	  padding: 20px 20px 11px;
+	  background: #FFFFFF;
+	  border-radius: 14px;
+  	  &-head {
+	    .card-head
+      }
+  	  &-body {
+	    .card-body
+  	  }
+  	  &-question {
+  	    margin: 24px 0 12px;
+  	    .card-head
+  	  }
+  	  &-divider {
+  	    margin: 0 0 12px 0;
+  	    &:before {
+  	  	  height: 1px;
+  	  	  border-color: #EBEBEB;
+  	    }
+  	  }
+  	  &-agreement {
+  	    display: flex;
+        justify-content: space-between;
+	    font-size: 0;
+	    span {
+		  font-size: 12px;
+		  font-weight: 400;
+		  color: #333333;
+		  line-height: 24px;
+	    }
+  	  }
+	}
+	.Pdb-operation {
+	  
+	  &-item {
+	  	display: flex;
+	    justify-content: space-around;
 	  }
 	}
   }

src/views/Policy/Detail/index.vue

@@ -71,32 +71,47 @@
           </div>
         </div>
       </div>
-      <div class="Pdb-content-service">
-        <div class="Pdsc-service-head">
+      <div class="Pdb-service">
+        <div class="Pdb-service-head">
           <span>增值服务</span>
           <span>查看详情</span>
         </div>
-        <div class="Pdsc-service-body">
+        <div class="Pdb-service-body">
           <div>
             <span>重疾快速就医</span>
+            <span></span>
           </div>
           <div>
             <span>住院押金垫付</span>
+            <span></span>
           </div>
         </div>
-        <div class="Pdsc-service-question">
+        <div class="Pdb-service-question">
           <span>常见问题</span>
           <svg-icon icon-class="arrow" />
         </div>
-        <cr-divider class="Pdsc-service-divider" :hairline="false" />
-        <div class="Pdsc-service-agreement">
+        <cr-divider class="Pdb-service-divider" :hairline="false" />
+        <div class="Pdb-service-agreement">
           <span>保险条款</span>
+          <span>|</span>
           <span>健康告知</span>
+          <span>|</span>
           <span>投保须知与声明</span>
+          <span>|</span>
           <span>服务协议</span>
         </div>
-        <insurance-recommend />
       </div>
+      <div class="Pdb-operation">
+        <div class="Pdb-operation-item">
+          <svg-icon class-name="Pdbo-item-svg" icon-class="customer-service-concat" />
+          <span class="Pdbo-item-text">联系客服</span>
+        </div>
+        <div class="Pdb-operation-item">
+          <svg-icon class-name="Pdbo-item-svg" icon-class="go-home" />
+          <span class="Pdbo-item-text">返回首页</span>
+        </div>
+      </div>
+      <insurance-recommend />
     </div>
   </div>
 </template>

src/views/User/index.less

@@ -154,7 +154,7 @@
 	      justify-content: space-between;
 	      box-sizing: border-box;
 		  margin: 0 10px 0 8px;
-		  padding: 3px 0;
+		  padding: 6px 0 0px 0;
 		  width: 169px;
 		  .Ufii-middle-main {
 		  	margin-bottom: 6px;

src/views/User/index.vue

@@ -49,7 +49,7 @@
 </template>
 <script>
 import "./index.less";
-import customerService from "@/assets/images/user/customer-service@1x.png";
+import customerService from "@/assets/images/user/customer-service@2x.png";
 import help from "@/assets/images/user/help@2x.png";
 import avatar from "@/assets/images/user/avatar@2x.png";
 import UserFamily from "./modules/UserFamily";

vue.config.js

@@ -4,6 +4,10 @@ const IS_PROD = process.env.NODE_ENV === "production";
 
 module.exports = {
   chainWebpack: config => {
+    config.plugin("html").tap(args => {
+      args[0].title = "芒果保险";
+      return args;
+    });
     // 修复HMR
     config.resolve.symlinks(true);