Commit 5fd8de46 authored by 郭志伟's avatar 郭志伟

Merge branch 'fix/policy_fix' into 'master'

build: 1.2.1

See merge request !55
parents 11a63104 5b71e910
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
}, },
"dependencies": { "dependencies": {
"@better-scroll/core": "^2.0.0-beta.6", "@better-scroll/core": "^2.0.0-beta.6",
"@qg/cherry-ui": "^1.2.1", "@qg/cherry-ui": "=1.2.1",
"@qg/qg-scroll": "^1.4.2", "@qg/qg-scroll": "^1.4.2",
"amfe-flexible": "^2.2.1", "amfe-flexible": "^2.2.1",
"axios": "^0.19.2", "axios": "^0.19.2",
......
...@@ -97,6 +97,7 @@ import NavTab from "./modules/NavTab"; ...@@ -97,6 +97,7 @@ import NavTab from "./modules/NavTab";
import detailPayMixin from "./modules/detailPay.mixin"; import detailPayMixin from "./modules/detailPay.mixin";
import detailLoginMixin from "./modules/detailLogin.mixin"; import detailLoginMixin from "./modules/detailLogin.mixin";
import localStorage from "@/service/localStorage";
import Detail from "@/api/detail.zhongan.yiwai"; import Detail from "@/api/detail.zhongan.yiwai";
import { trail, list } from "@/api/product"; import { trail, list } from "@/api/product";
import { isIdNo } from "@/service/validation"; import { isIdNo } from "@/service/validation";
...@@ -319,6 +320,7 @@ export default { ...@@ -319,6 +320,7 @@ export default {
const res = await trail(_param); const res = await trail(_param);
if (res) { if (res) {
price[0] = res.downPayPrice; price[0] = res.downPayPrice;
price[1] = "元/年";
this.goodActionInfo = { this.goodActionInfo = {
title: price title: price
}; };
......
...@@ -94,6 +94,7 @@ import ProtocolRead from "./modules/ProtocolRead"; ...@@ -94,6 +94,7 @@ import ProtocolRead from "./modules/ProtocolRead";
import NavTab from "./modules/NavTab"; import NavTab from "./modules/NavTab";
import detailLoginMixin from "./modules/detailLogin.mixin"; import detailLoginMixin from "./modules/detailLogin.mixin";
import localStorage from "@/service/localStorage";
import Detail from "@/api/detail.huatai.zhongjixian"; import Detail from "@/api/detail.huatai.zhongjixian";
import { trail, list } from "@/api/product"; import { trail, list } from "@/api/product";
import { isIdNo } from "@/service/validation"; import { isIdNo } from "@/service/validation";
......
...@@ -324,13 +324,17 @@ export default { ...@@ -324,13 +324,17 @@ export default {
if (res) { if (res) {
price[0] = res.downPayPrice; price[0] = res.downPayPrice;
subPrice[0] = res.regularPrice; subPrice[0] = res.regularPrice;
subPrice[1] = "元/月";
this.goodActionInfo = { this.goodActionInfo = {
title: price, title: price,
sub: subPrice sub: subPrice[0] ? subPrice : ""
}; };
this.goodBuyModalInfo = [ this.goodBuyModalInfo = [
{ title: `${price[2]}保费`, value: `${price[0]}${price[1]}` }, { title: `${price[2]}保费`, value: `${price[0]}${price[1]}` },
{ title: `${subPrice[2]}保费`, value: `${subPrice[0]}${subPrice[1]}${subPrice[3]}` } {
title: `${subPrice[2]}保费`,
value: subPrice[0] ? `${subPrice[0]}${subPrice[1]}${subPrice[3]}` : ""
}
]; ];
} }
} }
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<h5 class="det-hd-insured-price" v-if="props.det.price"> <h5 class="det-hd-insured-price" v-if="props.det.price">
<!-- eslint-disable-next-line prettier/prettier --> <!-- eslint-disable-next-line prettier/prettier -->
{{ props.det.price[2] || "" }}<strong>{{ props.det.price[0] || "" }}</strong>{{ props.det.price[1] || "" }} {{ props.det.price[2] || "" }}<strong>{{ props.det.price[0] || "" }}</strong>{{ props.det.price[1] || "" }}
<small v-if="props.det.subPrice"> <small v-if="props.det.subPrice && props.det.subPrice[0]">
<!-- eslint-disable-next-line prettier/prettier --> <!-- eslint-disable-next-line prettier/prettier -->
{{ props.det.subPrice[2] || "" }}{{ props.det.subPrice[0] || "" }}{{ props.det.subPrice[1] || "" }} {{ props.det.subPrice[2] || "" }}{{ props.det.subPrice[0] || "" }}{{ props.det.subPrice[1] || "" }}
</small> </small>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment