Merge branch 'feature/goods' into 'master'

Feature/goods See merge request !12

Merge branch 'feature/goods' into 'master'
Feature/goods See merge request !12
c6c2512e · 郝聪敏 · 78ade07f · 469873dd · c6c2512e · c6c2512e
Commit c6c2512e authored Jul 23, 2020 by 郝聪敏
15 changed files
--- a/public/index.html
+++ b/public/index.html
@@ -3,9 +3,30 @@
  <head>
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1 ,user-scalable=no">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0,user-scalable=no">
    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
    <title><%= htmlWebpackPlugin.options.title %></title>
+    <script>
+      (function() {
+          if (typeof WeixinJSBridge == "object" && typeof WeixinJSBridge.invoke == "function") {
+              handleFontSize();
+          } else {
+              if (document.addEventListener) {
+                  document.addEventListener("WeixinJSBridgeReady", handleFontSize, false);
+              } else if (document.attachEvent) {
+                  document.attachEvent("WeixinJSBridgeReady", handleFontSize);
+                  document.attachEvent("onWeixinJSBridgeReady", handleFontSize);  }
+          }
+          function handleFontSize() {
+              // 设置网页字体为默认大小
+              WeixinJSBridge.invoke('setFontSizeCallback', { 'fontSize' : 0 });
+              // 重写设置网页字体大小的事件
+              WeixinJSBridge.on('menu:setfont', function() {
+                  WeixinJSBridge.invoke('setFontSizeCallback', { 'fontSize' : 0 });
+              });
+          }
+      })();
+  </script>
  </head>
  <body>
    <noscript>

--- a/src/components/Card.vue
+++ b/src/components/Card.vue
@@ -66,7 +66,7 @@ export default {
 };
 </script>
-<style lang="less">
+<style lang="less" scoped>
 @import "../style/var.less";
 .card {
  padding: 20px;

--- a/src/components/Copyright.vue
+++ b/src/components/Copyright.vue
@@ -15,7 +15,7 @@ export default {
 };
 </script>
-<style lang="less">
+<style lang="less" scoped>
 @import "../style/var.less";
 .copyright {
  margin: 16px 0;

--- a/src/components/GoodAction.vue
+++ b/src/components/GoodAction.vue
@@ -51,7 +51,7 @@ export default {
 };
 </script>
-<style lang="less">
+<style lang="less" scoped>
 @import "../style/var.less";
 .good-action {
  position: fixed;

--- a/src/style/reset.less
+++ b/src/style/reset.less
@@ -129,6 +129,8 @@ li {
  list-style: none;
 }
 body {
-  -webkit-text-size-adjust: none;
+  -webkit-text-size-adjust: 100% !important;
+  text-size-adjust: 100% !important;
+  -moz-text-size-adjust: 100% !important;
  -webkit-tap-highlight-color: rgba(0,0,0,0);
 }
--- a/src/views/Goods/detail.less
+++ b/src/views/Goods/detail.less
@@ -14,12 +14,12 @@
  line-height: @line-height-sm;
  margin-top: 14px;
  .svg-icon {
-    margin-right: 3px;
+    margin-right: 1px;
    width: 12px;
    height: 12px;
  }
  &_offset {
-    margin-right: 4px;
+    margin-right: 2px;
  }
 }
@@ -53,7 +53,7 @@
    background-color: @white !important;
    padding: 10px 0;
    overflow: initial;
-    align-items: baseline;
+    align-items: baseline !important;
    margin-bottom: 0 !important;
    @{deep} .cr-cell {
      &__title {
@@ -104,20 +104,19 @@
      font-size: @font-size-11;
      color: @gray-4;
      margin-left: 5px;
-      // line-height: @line-height-lg;
    }
    &-link {
      margin-top: -3.5px;
+      display: flex;
+      padding-top: 3px;
+      align-items: center;
      a {
        font-size: @font-size-11;
-        vertical-align: middle;
      }
      i {
-        display: inline-block;
        width: 0;
        height: 12px;
        border-right: 1px @blue solid;
-        vertical-align: middle;
        margin: 0 3px;
      }
    }

--- a/src/views/Goods/detail.vue
+++ b/src/views/Goods/detail.vue
@@ -207,11 +207,11 @@ export default {
          url: "http://mangguo-contract.qthbx.com/fu-wu-xie-yi-v1/"
        },
        { title: "保险计划" },
-        { title: "保险计划" },
+        { title: "理赔信息" },
        { title: "完整费率" },
        {
          title: "自动续保服务协议",
-          url: "http://pages.xyqb.com/p/d3c0c8d6-ddea-4335-8aaf-f09dafc580e9/"
+          url: "http://mangguo-contract.qthbx.com/zi-dong-xu-bao-fu-wu-xie-yi-v1/"
        }
      ],
      formData: {
@@ -234,7 +234,7 @@ export default {
      let _data = [
        { title: "100种重大疾病医疗保险金", value: "30万" },
        { title: "40种轻症保险金", value: "6万" },
-        { title: "投保年龄", value: "30天~60周岁" },
+        { title: "投保年龄", value: "30天~50周岁" },
        { title: "保险期限", value: "1年" }
      ];
      switch (planValue) {
@@ -242,7 +242,7 @@ export default {
          _data = [
            { title: "100种重大疾病医疗保险金", value: "30万" },
            { title: "40种轻症保险金", value: "6万" },
-            { title: "投保年龄", value: "30天~60周岁" },
+            { title: "投保年龄", value: "30天~50周岁" },
            { title: "保险期限", value: "1年" }
          ];
          break;
@@ -258,7 +258,7 @@ export default {
          _data = [
            { title: "100种重大疾病医疗保险金", value: "10万" },
            { title: "40种轻症保险金", value: "2万" },
-            { title: "投保年龄", value: "30天~50周岁" },
+            { title: "投保年龄", value: "30天~60周岁" },
            { title: "保险期限", value: "1年" }
          ];
          break;

--- a/src/views/Goods/modules/AiTestTip.vue
+++ b/src/views/Goods/modules/AiTestTip.vue
@@ -30,7 +30,7 @@ export default {
  }
 };
 </script>
-<style lang="less">
+<style lang="less" scoped>
 @import "../../../style/var.less";
 @import "../../../style/mixins.less";

--- a/src/views/Goods/modules/CompactCellGroup.vue
+++ b/src/views/Goods/modules/CompactCellGroup.vue
@@ -53,7 +53,7 @@ export default {
  }
 };
 </script>
-<style lang="less">
+<style lang="less" scoped>
 @import "../../../style/var.less";
 .sub-text-mixins {
  font-size: @font-size-12;

--- a/src/views/Goods/modules/CpsDemo.vue
+++ b/src/views/Goods/modules/CpsDemo.vue
@@ -57,7 +57,7 @@ export default {
 };
 </script>
-<style lang="less">
+<style lang="less" scoped>
 @import "../../../style/var.less";
 .cps-demo {
  &-title_np {
@@ -110,7 +110,7 @@ export default {
        font-size: @font-size-16;
        font-weight: @font-weight-bold;
        color: @black;
-        width: 32px;
+        width: 34px;
        line-height: @line-height-md;
      }
      &-content {
@@ -133,13 +133,13 @@ export default {
          width: 12px;
          background-color: #d8d8d8;
          border-radius: @border-radius-max;
-          left: 20px;
+          left: 18px;
        }
        &::after {
          width: 0;
          height: calc(100% + 20px);
          border-left: 1px solid #d8d8d8;
-          left: 26px;
+          left: 24px;
        }
      }
      &:last-child {

--- a/src/views/Goods/modules/CpsQA.vue
+++ b/src/views/Goods/modules/CpsQA.vue
 <template>
-  <card title="Q&A" class="collapse-header" id="collapse">
+  <card title="Q&A" class="collapse-header">
    <div class="collapse">
      <div
        class="collapse-item"
@@ -23,7 +23,7 @@
      </div>
    </div>
    <div class="collapse-more" :class="{ active: more }" v-if="moreBtn">
-      <a href="#collapse" @click="showMore">
+      <a href="javascript:;" @click="showMore">
        <span>查看更多</span>
        <span>隐藏</span>
        <svg-icon icon-class="arrow-down" />
@@ -83,7 +83,7 @@ export default {
 };
 </script>
-<style lang="less">
+<style lang="less" scoped>
 @import "../../../style/var.less";
 .collapse {
  &-header {

--- a/src/views/Goods/modules/DetailFooter.vue
+++ b/src/views/Goods/modules/DetailFooter.vue
@@ -20,7 +20,7 @@ export default {
  }
 };
 </script>
-<style lang="less">
+<style lang="less" scoped>
 @import "../../../style/var.less";
 .det-footer {
  padding: 25px 36px;

--- a/src/views/Goods/modules/DetailHeader.vue
+++ b/src/views/Goods/modules/DetailHeader.vue
@@ -40,7 +40,7 @@ export default {
  }
 };
 </script>
-<style lang="less">
+<style lang="less" scoped>
 @import "../../../style/var.less";
 .sub-text-mixins {
  font-size: @font-size-12;
@@ -93,7 +93,7 @@ export default {
    background-position: bottom right;
    background-size: 19%;
    &-title {
-      font-size: 34px;
+      font-size: 32px;
      font-weight: @font-weight-bold;
      color: @black;
      line-height: @line-height-lg * 2;

--- a/src/views/Goods/modules/ProtocolIframe.vue
+++ b/src/views/Goods/modules/ProtocolIframe.vue
@@ -7,14 +7,18 @@
    position="bottom"
    class="protocol"
  >
-    <div class="protocol-title">{{ title }}</div>
+    <div class="protocol-head">
-    <cr-divider :hairline="false" :style="{ color: '#F4F4F4', margin: 0 }" />
+      <div class="protocol-title">{{ title }}</div>
+      <cr-divider :hairline="false" :style="{ color: '#F4F4F4', margin: 0 }" />
+    </div>
    <div
      class="protocol-content"
      v-if="content && scrollRefresh && !$slots.default"
      v-html="content"
    ></div>
-    <iframe v-if="url && scrollRefresh" class="protocol-frame" :src="url" frameborder="0"></iframe>
+    <div class="protocol-frame-wrap" v-if="url && scrollRefresh">
+      <iframe class="protocol-frame" :src="url" frameborder="0" height="100%"></iframe>
+    </div>
    <div class="protocol-wrap" v-if="!content && scrollRefresh && $slots.default">
      <slot></slot>
    </div>
@@ -65,21 +69,31 @@ export default {
 };
 </script>
-<style lang="less">
+<style lang="less" scoped>
 @import "../../../style/var.less";
 .body-wrap-mixin {
  overflow-x: hidden;
  overflow-y: auto;
-  max-height: 480px;
+  height: 75vh;
  padding: @padding-lg;
 }
 .protocol {
  z-index: 200;
+  height: 75vh;
+  padding-top: 48px;
+  overflow: hidden;
  @{deep} .cr-icon {
    color: #d0cfcf;
    font-size: @font-size-18;
    top: 16px;
    right: 14px;
+    z-index: 201;
+  }
+  &-head {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
  }
  &-title {
    font-weight: @font-weight-bold;
@@ -90,8 +104,22 @@ export default {
    text-align: center;
  }
  &-frame {
-    height: 520px;
+    height: 100%;
-    width: 100vw;
+    min-width: 100%;
+    *width: 100%;
+    width: 1px;
+    overflow: scroll;
+    -webkit-overflow-scrolling: touch;
+    &-wrap {
+      position: fixed;
+      bottom: 0;
+      left: 0;
+      z-index: 201;
+      height: 75vh;
+      overflow: scroll;
+      width: 100vw;
+      -webkit-overflow-scrolling: touch;
+    }
  }
  &-wrap {
    .body-wrap-mixin();

--- a/src/views/Goods/process.less
+++ b/src/views/Goods/process.less
@@ -2,6 +2,7 @@
 @import "../../style/mixins.less";
 .cps-process {
  &-list {
+    margin-bottom: 50px;
    &-item {
      position: relative;
      display: flex;