Commit ab639e7a authored by 郭志伟's avatar 郭志伟

fix: 顾问修改;样式调整

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

4.18 KB | W: | H:

src/assets/images/goods/goods-01.png

3.17 KB | W: | H:

src/assets/images/goods/goods-01.png
src/assets/images/goods/goods-01.png
src/assets/images/goods/goods-01.png
src/assets/images/goods/goods-01.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/images/goods/goods-02.png

2.11 KB | W: | H:

src/assets/images/goods/goods-02.png

3.88 KB | W: | H:

src/assets/images/goods/goods-02.png
src/assets/images/goods/goods-02.png
src/assets/images/goods/goods-02.png
src/assets/images/goods/goods-02.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/images/goods/goods-03.png

4.36 KB | W: | H:

src/assets/images/goods/goods-03.png

4.56 KB | W: | H:

src/assets/images/goods/goods-03.png
src/assets/images/goods/goods-03.png
src/assets/images/goods/goods-03.png
src/assets/images/goods/goods-03.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/images/goods/goods-04.png

7.99 KB | W: | H:

src/assets/images/goods/goods-04.png

6.79 KB | W: | H:

src/assets/images/goods/goods-04.png
src/assets/images/goods/goods-04.png
src/assets/images/goods/goods-04.png
src/assets/images/goods/goods-04.png
  • 2-up
  • Swipe
  • Onion skin
@import "../../style/var.less"; @import "../../style/var.less";
@import "../../style/mixins.less"; @import "../../style/mixins.less";
.goods-list { .goods-list {
background-color: @white;
padding: 18px 20px;
.cell-title-mixin(); .cell-title-mixin();
&-head { &-head {
margin-bottom: 15px; background-color: @white;
padding: 15px 20px 0;
:first-child {
padding-top: 8px;
}
.svg-icon { .svg-icon {
width: 16px; width: 16px;
height: 16px; height: 16px;
vertical-align: -0.3em; vertical-align: -0.3em;
} }
} }
// &-children {} &-children {
background-color: @white;
padding: 0 20px;
margin-bottom: 10px;
}
&-item { &-item {
margin: 16px 0 20px; padding: 16px 0 20px;
border-radius: 14px; flex-wrap: wrap;
overflow: hidden; // overflow: hidden;
.cr-divider {
margin-bottom: 0;
}
&.not-allow { &.not-allow {
border-radius: 14px;
position: relative; position: relative;
pointer-events: none; pointer-events: none;
&::before, &::before,
...@@ -60,6 +70,7 @@ ...@@ -60,6 +70,7 @@
z-index: 90; z-index: 90;
width: 72px; width: 72px;
height: 72px; height: 72px;
border-radius: 14px;
} }
} }
&-glory { &-glory {
......
...@@ -36,8 +36,10 @@ ...@@ -36,8 +36,10 @@
}}</span> }}</span>
</div> </div>
</cr-col> </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-row>
<cr-divider :hairline="false" :style="{ color: '#e3e5e8' }" />
</div> </div>
</template> </template>
</div> </div>
...@@ -54,7 +56,7 @@ ...@@ -54,7 +56,7 @@
<cr-tag type="warning" shape="round" class="goods-list-item-glory" v-if="it.glory"> <cr-tag type="warning" shape="round" class="goods-list-item-glory" v-if="it.glory">
{{ it.glory }} {{ it.glory }}
</cr-tag> </cr-tag>
<img :src="it.img" /> <img :src="it.img" :style="{ 'box-shadow': `0px 8px 14px 0px ${it.shadowColor}` }" />
</cr-col> </cr-col>
<cr-col span="17" class="goods-list-item-info"> <cr-col span="17" class="goods-list-item-info">
<h5>{{ it.title || "-" }}</h5> <h5>{{ it.title || "-" }}</h5>
...@@ -66,6 +68,9 @@ ...@@ -66,6 +68,9 @@
}}</span> }}</span>
</div> </div>
</cr-col> </cr-col>
<cr-col span="24" v-if="idx !== list.length - 1">
<cr-divider :hairline="false" :style="{ color: '#e3e5e8' }" />
</cr-col>
</cr-row> </cr-row>
</div> </div>
</div> </div>
...@@ -76,6 +81,8 @@ ...@@ -76,6 +81,8 @@
* @param {type} * @param {type}
* @return: * @return:
*/ */
import { mapActions } from "vuex";
export default { export default {
name: "GoodsList", name: "GoodsList",
props: { props: {
...@@ -93,10 +100,15 @@ export default { ...@@ -93,10 +100,15 @@ export default {
} }
}, },
methods: { methods: {
...mapActions(["setIsShowLogin"]),
clickItem(item) { clickItem(item) {
if (!item.allow) { if (!item.allow) {
return; return;
} }
if (item.id === "" && !item.url) {
this.setIsShowLogin();
return;
}
if (item.url) { if (item.url) {
window.location.href = item.url; window.location.href = item.url;
} else { } else {
......
...@@ -109,6 +109,7 @@ export default { ...@@ -109,6 +109,7 @@ export default {
remain: 0, remain: 0,
price: [0.99, 199], price: [0.99, 199],
consultantOrderNo: "", consultantOrderNo: "",
openId: localStorage.get("openId"),
tradeType: isXyqb ? "MWEB" : "JSAPI", tradeType: isXyqb ? "MWEB" : "JSAPI",
serviceList: [ serviceList: [
{ icon: "team", title: "资深", sub: "保险精算团队" }, { icon: "team", title: "资深", sub: "保险精算团队" },
...@@ -248,13 +249,19 @@ export default { ...@@ -248,13 +249,19 @@ export default {
} }
}, },
async goPay() { async goPay() {
const res = await goPay({ tradeType: this.tradeType }); try {
if (res) { const res = await goPay({ tradeType: this.tradeType, openId: this.openId });
payByWay(this.tradeType, res.payInfo).then(() => { if (res) {
setTimeout(() => { payByWay(this.tradeType, res.payInfo).then(() => {
this.$parent.getOrderInfo(); setTimeout(() => {
}, 1000); this.$parent.getOrderInfo();
}); }, 1000);
});
}
} catch (error) {
setTimeout(() => {
this.$parent.getOrderInfo();
}, 1000);
} }
} }
} }
......
...@@ -157,7 +157,7 @@ import { subYears, format as dateFormat } from "date-fns"; ...@@ -157,7 +157,7 @@ import { subYears, format as dateFormat } from "date-fns";
import CrRadioBtn from "@/components/CrRadioBtn"; import CrRadioBtn from "@/components/CrRadioBtn";
import Card from "@/components/Card"; import Card from "@/components/Card";
import localStorage from "@/service/localStorage"; 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"; import { subCulQus } from "@/api/consultant";
export default { export default {
......
...@@ -17,15 +17,17 @@ ...@@ -17,15 +17,17 @@
z-index: 100; z-index: 100;
} }
@{deep} .cr-tabbar { @{deep} .cr-tabbar {
background-color: #f5f5f5; background-color: @white;
font-size: @font-size-16; font-size: @font-size-16;
padding: @padding-lg+1 0; padding: @padding-md + 0.5 0;
border-bottom: 1px solid #e9e9e9;
&-item { &-item {
position: relative; position: relative;
color: @gray-5;
&::after { &::after {
position: absolute; position: absolute;
left: 0; left: -5px;
top: 26px; bottom: -16px;
// transition: width .2s linear; // transition: width .2s linear;
content: " "; content: " ";
display: block; display: block;
...@@ -35,9 +37,10 @@ ...@@ -35,9 +37,10 @@
border-radius: @border-radius-lx; border-radius: @border-radius-lx;
} }
&--active { &--active {
font-weight: 600; color: @black;
font-weight: @font-weight-bold;
&::after { &::after {
width: 32px; width: 40px;
} }
} }
} }
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<script> <script>
import goodsList from "@/api/goodsList.mock"; import goodsList from "@/api/goodsList.mock";
import { list, getLink } from "@/api/product"; import { list, getLink } from "@/api/product";
import localStorage from "@/service/localStorage";
import AiTestTip from "./modules/AiTestTip"; import AiTestTip from "./modules/AiTestTip";
import GoodList from "@/components/GoodList/index"; import GoodList from "@/components/GoodList/index";
import Tabbar from "@/components/Tabbar"; import Tabbar from "@/components/Tabbar";
...@@ -113,6 +113,7 @@ export default { ...@@ -113,6 +113,7 @@ export default {
} }
}, },
async getGoodsLink() { async getGoodsLink() {
if (!localStorage.get("mongoToken")) return;
const res = await getLink(); const res = await getLink();
if (res) { if (res) {
this.goodsLink = res.url; this.goodsLink = res.url;
......
...@@ -32,6 +32,7 @@ export default { ...@@ -32,6 +32,7 @@ export default {
.ai-test { .ai-test {
padding: 20px 16px 25.5px; padding: 20px 16px 25.5px;
background-color: @white;
&-tip { &-tip {
text-align: center; text-align: center;
.cell-title-mixin(); .cell-title-mixin();
...@@ -42,6 +43,7 @@ export default { ...@@ -42,6 +43,7 @@ export default {
border-radius: @border-radius-md; border-radius: @border-radius-md;
padding: 0 0 0 @padding-xs; padding: 0 0 0 @padding-xs;
height: 72px; height: 72px;
box-shadow: 0px 5px 25px 0px rgba(0, 0, 0, 0.07);
&-image { &-image {
align-self: flex-end; align-self: flex-end;
.cr-image { .cr-image {
......
...@@ -112,11 +112,10 @@ ...@@ -112,11 +112,10 @@
} }
&-goods { &-goods {
padding: 0; padding: 15px 0 0;
@{deep} .goods-list-item { @{deep} .goods-list-item {
position: relative; position: relative;
margin: 32px 0; padding: 17px 0 0;
} }
} }
} }
......
...@@ -162,6 +162,7 @@ export default { ...@@ -162,6 +162,7 @@ export default {
} }
}, },
async getGoodsLink() { async getGoodsLink() {
if (!localStorage.get("mongoToken")) return;
const res = await getLink(); const res = await getLink();
if (res) { if (res) {
this.goodsList[3].url = res.url; this.goodsList[3].url = res.url;
......
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