Merge branch 'fix/goods' into 'master'

fix: 顾问修改；样式调整

See merge request !86

src/api/goodsList.mock.js

@@ -23,6 +23,7 @@ export default [
     price: "1",
     unit: "首月",
     allow: true,
+    shadowColor: "rgba(255, 234, 183, 0.8)",
     termType: "short",
     icon_closed: medical_closed,
     icon: medical,
@@ -48,6 +49,7 @@ export default [
     price: "3",
     unit: "首月",
     allow: true,
+    shadowColor: "rgba(255, 216, 191, 0.8)",
     termType: "short",
     icon_closed: illness_closed,
     icon: illness,
@@ -73,6 +75,7 @@ export default [
     price: "145",
     unit: "年起",
     allow: true,
+    shadowColor: "rgba(133, 138, 255, 0.5)",
     termType: "short",
     icon_closed: casualty_closed,
     icon: casualty,
@@ -96,6 +99,7 @@ export default [
     price: "256",
     unit: "年起",
     allow: true,
+    shadowColor: "rgba(255, 216, 191, 0.8)",
     termType: "long",
     icon_closed: illness_closed,
     icon: illness,
@@ -119,6 +123,7 @@ export default [
     sub: "最高350万保额，顶梁柱必备",
     glory: "顶梁柱必备",
     price: "15.5",
+    shadowColor: "rgba(221, 185, 132, 0.39)",
     unit: "年起",
     allow: true,
     termType: "long",

src/components/GoodList/index.less

 @import "../../style/var.less";
 @import "../../style/mixins.less";
 .goods-list {
-  background-color: @white;
-  padding: 18px 20px;
   .cell-title-mixin();
   &-head {
-    margin-bottom: 15px;
+    background-color: @white;
+    padding: 15px 20px 0;
+    :first-child {
+      padding-top: 8px;
+    }
     .svg-icon {
       width: 16px;
       height: 16px;
       vertical-align: -0.3em;
     }
   }
-  // &-children {}
+  &-children {
+  background-color: @white;
+    padding: 0 20px;
+    margin-bottom: 10px;
+  }
   &-item {
-    margin: 16px 0 20px;
-    border-radius: 14px;
-    overflow: hidden;
+    padding: 16px 0 20px;
+    flex-wrap: wrap;
+    // overflow: hidden;
+    .cr-divider {
+      margin-bottom: 0;
+    }
     &.not-allow {
+      border-radius: 14px;
       position: relative;
       pointer-events: none;
       &::before,
@@ -60,6 +70,7 @@
         z-index: 90;
         width: 72px;
         height: 72px;
+        border-radius: 14px;
       }
     }
     &-glory {

src/components/GoodList/index.vue

@@ -36,8 +36,10 @@
                 }}</span>
               </div>
             </cr-col>
+            <cr-col span="24" v-if="idx !== item.children.length - 1">
+              <cr-divider :hairline="false" :style="{ color: '#e3e5e8' }" />
+            </cr-col>
           </cr-row>
-          <cr-divider :hairline="false" :style="{ color: '#e3e5e8' }" />
         </div>
       </template>
     </div>
@@ -54,7 +56,7 @@
           <cr-tag type="warning" shape="round" class="goods-list-item-glory" v-if="it.glory">
             {{ it.glory }}
           </cr-tag>
-          <img :src="it.img" />
+          <img :src="it.img" :style="{ 'box-shadow': `0px 8px 14px 0px ${it.shadowColor}` }" />
         </cr-col>
         <cr-col span="17" class="goods-list-item-info">
           <h5>{{ it.title || "-" }}</h5>
@@ -66,6 +68,9 @@
             }}</span>
           </div>
         </cr-col>
+        <cr-col span="24" v-if="idx !== list.length - 1">
+          <cr-divider :hairline="false" :style="{ color: '#e3e5e8' }" />
+        </cr-col>
       </cr-row>
     </div>
   </div>
@@ -76,6 +81,8 @@
  * @param {type}
  * @return:
  */
+import { mapActions } from "vuex";
+
 export default {
   name: "GoodsList",
   props: {
@@ -93,10 +100,15 @@ export default {
     }
   },
   methods: {
+    ...mapActions(["setIsShowLogin"]),
     clickItem(item) {
       if (!item.allow) {
         return;
       }
+      if (item.id === "" && !item.url) {
+        this.setIsShowLogin();
+        return;
+      }
       if (item.url) {
         window.location.href = item.url;
       } else {

src/views/Consultant/Buy/index.vue

@@ -109,6 +109,7 @@ export default {
       remain: 0,
       price: [0.99, 199],
       consultantOrderNo: "",
+      openId: localStorage.get("openId"),
       tradeType: isXyqb ? "MWEB" : "JSAPI",
       serviceList: [
         { icon: "team", title: "资深", sub: "保险精算团队" },
@@ -248,13 +249,19 @@ export default {
       }
     },
     async goPay() {
-      const res = await goPay({ tradeType: this.tradeType });
-      if (res) {
-        payByWay(this.tradeType, res.payInfo).then(() => {
-          setTimeout(() => {
-            this.$parent.getOrderInfo();
-          }, 1000);
-        });
+      try {
+        const res = await goPay({ tradeType: this.tradeType, openId: this.openId });
+        if (res) {
+          payByWay(this.tradeType, res.payInfo).then(() => {
+            setTimeout(() => {
+              this.$parent.getOrderInfo();
+            }, 1000);
+          });
+        }
+      } catch (error) {
+        setTimeout(() => {
+          this.$parent.getOrderInfo();
+        }, 1000);
       }
     }
   }

src/views/Consultant/Question/index.vue

@@ -157,7 +157,7 @@ import { subYears, format as dateFormat } from "date-fns";
 import CrRadioBtn from "@/components/CrRadioBtn";
 import Card from "@/components/Card";
 import localStorage from "@/service/localStorage";
-import areaList from "@qg/cherry-ui/src/area/demo/china";
+import areaList from "@/api/china";
 import { subCulQus } from "@/api/consultant";
 
 export default {

src/views/Goods/index.less

@@ -17,15 +17,17 @@
     z-index: 100;
   }
   @{deep} .cr-tabbar {
-    background-color: #f5f5f5;
+    background-color: @white;
     font-size: @font-size-16;
-    padding: @padding-lg+1 0;
+    padding: @padding-md + 0.5 0;
+    border-bottom: 1px solid #e9e9e9;
     &-item {
       position: relative;
+      color: @gray-5;
       &::after {
         position: absolute;
-        left: 0;
-        top: 26px;
+        left: -5px;
+        bottom: -16px;
         // transition: width .2s linear;
         content: " ";
         display: block;
@@ -35,9 +37,10 @@
         border-radius: @border-radius-lx;
       }
       &--active {
-        font-weight: 600;
+        color: @black;
+        font-weight: @font-weight-bold;
         &::after {
-          width: 32px;
+          width: 40px;
         }
       }
     }

src/views/Goods/index.vue

@@ -18,7 +18,7 @@
 <script>
 import goodsList from "@/api/goodsList.mock";
 import { list, getLink } from "@/api/product";
-
+import localStorage from "@/service/localStorage";
 import AiTestTip from "./modules/AiTestTip";
 import GoodList from "@/components/GoodList/index";
 import Tabbar from "@/components/Tabbar";
@@ -113,6 +113,7 @@ export default {
       }
     },
     async getGoodsLink() {
+      if (!localStorage.get("mongoToken")) return;
       const res = await getLink();
       if (res) {
         this.goodsLink = res.url;

src/views/Goods/modules/AiTestTip.vue

@@ -32,6 +32,7 @@ export default {
 
 .ai-test {
   padding: 20px 16px 25.5px;
+  background-color: @white;
   &-tip {
     text-align: center;
     .cell-title-mixin();
@@ -42,6 +43,7 @@ export default {
     border-radius: @border-radius-md;
     padding: 0 0 0 @padding-xs;
     height: 72px;
+    box-shadow: 0px 5px 25px 0px rgba(0, 0, 0, 0.07);
     &-image {
       align-self: flex-end;
       .cr-image {

src/views/Home/index.less

@@ -112,11 +112,10 @@
     }
 
     &-goods {
-      padding: 0;
-
+      padding: 15px 0 0;
       @{deep} .goods-list-item {
         position: relative;
-        margin: 32px 0;
+        padding: 17px 0 0;
       }
     }
   }

src/views/Home/index.vue

@@ -162,6 +162,7 @@ export default {
       }
     },
     async getGoodsLink() {
+      if (!localStorage.get("mongoToken")) return;
       const res = await getLink();
       if (res) {
         this.goodsList[3].url = res.url;