Commit 1209722f authored by Zhang Xiaojie's avatar Zhang Xiaojie

fix

parent 87a04f76
This diff is collapsed.
<template> <template>
<div class="mx-5"> <div class="mx-5">
<div class="wrap22 flex items-center" @click="$router.push({path: 'NewsDetail', query: { uuid: info?.uuid, type: 'news' }})"> <div class="wrap22 flex items-center" @click="$router.push({path: 'NewsDetail', query: { uuid: info?.uuid, type: 'news' }})">
<div class="box1 flex-col flex-grow"> <div class="box1 flex-col flex-grow justify-between">
<span class="info8">{{ info?.title }}</span> <span class="info8">{{ info?.title }}</span>
<div class="layer4 flex-row"> <div class="layer4 flex pr-20">
<span class="info9">{{ info?.writer }}</span> <span class="info9">{{ info?.writer }}</span>
<span class="word24">{{ $format(info?.created_at, 'YYYY-MM-DD') }}</span> <span class="word24">{{ $format(info?.created_at, 'YYYY-MM-DD') }}</span>
</div> </div>
...@@ -52,7 +52,6 @@ export default defineComponent({ ...@@ -52,7 +52,6 @@ export default defineComponent({
.info8 { .info8 {
z-index: 205; z-index: 205;
height: 50px;
display: block; display: block;
overflow-wrap: break-word; overflow-wrap: break-word;
color: rgba(27, 31, 55, 1); color: rgba(27, 31, 55, 1);
......
...@@ -14,11 +14,11 @@ ...@@ -14,11 +14,11 @@
</div> </div>
</div> </div>
</div> </div>
<div class="flex flex-col justify-center items-center mx-2.5"> <div class="flex flex-col justify-between items-center mx-2.5 py-5">
<p class="word18 overflow-ellipsis overflow-hidden"> <p class="word18">
知名财经专家现场精彩讲座 知名财经专家现场精彩讲座
</p> </p>
<p class="word19 overflow-ellipsis overflow-hidden"> <p class="word19">
建设银行财经专家分析 建设银行财经专家分析
</p> </p>
</div> </div>
...@@ -47,8 +47,6 @@ export default defineComponent({ components: { Icon } }); ...@@ -47,8 +47,6 @@ export default defineComponent({ components: { Icon } });
font-family: PingFangSC-Medium; font-family: PingFangSC-Medium;
line-height: 22px; line-height: 22px;
text-align: left; text-align: left;
overflow: hidden;
text-overflow: ellipsis;
} }
.word19 { .word19 {
...@@ -62,7 +60,6 @@ export default defineComponent({ components: { Icon } }); ...@@ -62,7 +60,6 @@ export default defineComponent({ components: { Icon } });
line-height: 17px; line-height: 17px;
text-align: center; text-align: center;
align-self: flex-start; align-self: flex-start;
margin-top: 10px;
} }
.outer3 { .outer3 {
......
...@@ -20,12 +20,12 @@ ...@@ -20,12 +20,12 @@
</div> </div>
<p <p
v-else v-else
class="bg-branch-bg text-branch-font text-sm px-2 rounded inline-block align-middle float-right" class="bg-branch-bg text-branch-font text-xs px-2 rounded inline-block align-middle float-right"
>网点</p> >网点</p>
</div> </div>
<div class="flex items-start w-full justify-between"> <div class="flex items-start w-full justify-between">
<div class="text-gray-400 text-sm">{{ location }}</div> <div class="text-gray-400 text-xs">{{ location }}</div>
<div class="text-gray-400 text-sm float-right ml-2">{{ filter.filterDistance(distance) }}</div> <div class="text-gray-400 text-xs float-right ml-2">{{ filter.filterDistance(distance) }}</div>
</div> </div>
</div> </div>
<div class="border border-gray-100"></div> <div class="border border-gray-100"></div>
...@@ -40,11 +40,11 @@ ...@@ -40,11 +40,11 @@
/> />
<span <span
v-if="isOpen" v-if="isOpen"
class="text-app-blue border border-app-blue bg-indigo-100 text-sm px-2 rounded" class="text-app-blue border border-app-blue bg-indigo-100 text-xs px-2 rounded"
>营业中</span> >营业中</span>
<span <span
v-else v-else
class="text-app-blue border border-app-blue bg-indigo-100 text-sm px-2 rounded" class="text-app-blue border border-app-blue bg-indigo-100 text-xs px-2 rounded"
>休息中</span> >休息中</span>
</template> </template>
<div class="text-right h-3"> <div class="text-right h-3">
......
<template> <template>
<div @click="$router.push({path: 'NewsDetail', query: { uuid: info.uuid, type: 'news' }})"> <div @click="$router.push({path: 'NewsDetail', query: { uuid: info.uuid, type: 'news' }})" class=" border-b border-gray-200 py-5">
<p class=" text-base text-gray-800 font-semibold pt-5">{{ info.title }}</p> <div class=" text-base text-gray-900 font-semibold">{{ info.title }}</div>
<p class=" text-xs text-gray-400 pt-5">{{ info.desc }}</p> <div class=" text-xs text-gray-800 pt-3">{{ info.desc }}</div>
<div <div
v-if="showImg" v-if="showImg"
class=" h-32 bg-app-blue mt-5 bg-cover bg-center bg-no-repeat" class=" h-32 bg-app-blue mt-2 bg-cover bg-center bg-no-repeat"
:style="{'background-image': `url('${url}')`}"></div> :style="{'background-image': `url('${url}')`}"></div>
<p class=" text-xs text-gray-400 py-5">发布时间:{{ $format(info.created_at, 'YYYY-MM-DD') }}</p> <div class=" text-xs text-gray-400 pt-4 tracking-wide">发布时间:{{ $format(info.created_at, 'YYYY-MM-DD') }}</div>
</div> </div>
</template> </template>
......
<template> <template>
<div> <div>
<nav-bar title="新闻动态" :style="{ 'background-color':'#F7F7FA'}" :showSearchIcon="true" :path="{path: '/Search', query: { type: 'news' }}"/> <nav-bar title="新闻动态" :style="{ 'background-color':'#F7F7FA'}" :showSearchIcon="true" :path="{path: '/Search', query: { type: 'news' }}"/>
<div class=" mx-5 pt-3 divide-y"> <div class=" mx-5 pt-3">
<van-pull-refresh v-model="loading" @refresh="onRefresh"> <van-pull-refresh v-model="loading" @refresh="onRefresh">
<van-list <van-list
v-model:loading="loading" v-model:loading="loading"
:finished="finished" :finished="finished"
finished-text="" finished-text=""
@load="onLoad"> @load="onLoad">
<news-list v-for="(item, n) in lists" :key="n" :info="item" /> <news-list v-for="(item, n) in lists" :key="n" :info="item"/>
</van-list> </van-list>
</van-pull-refresh> </van-pull-refresh>
</div> </div>
......
<template> <template>
<div <div
class="h-16 flex bg-app-blue items-center mx-2.5 overflow-hidden" class=" h-14 flex bg-tab-bar-bg items-center mx-2.5 overflow-hidden py-3"
style="border-radius: 19px" style="border-radius: 19px"
> >
<div class="flex-row flex justify-around w-full h-full"> <div class="flex-row flex justify-around w-full h-full">
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
</div>--> </div>-->
<group-title <group-title
class="mt-7" class="mt-7"
v-if="product_name"
title="热门贷款" title="热门贷款"
@click="$router.push({ name: 'Loan' })" @click="$router.push({ name: 'Loan' })"
/> />
...@@ -20,15 +21,14 @@ ...@@ -20,15 +21,14 @@
:features="features" :features="features"
:inst_name="inst_name" :inst_name="inst_name"
class="mt-5" class="mt-5"
@click=" @click="$router.push({ name: 'LoanDetail', params: { uuid: uuid } })"
$router.push({ name: 'LoanDetail', params: { uuid: uuid } })
"
/> />
</Skeleton> </Skeleton>
<group-title class="mt-7" title="精彩直播" /> <group-title class="mt-7" title="精彩直播" />
<LiveCard class="mt-4" /> <LiveCard class=" mt-4" />
<group-title <group-title
class="mt-7" class="mt-7"
v-if="src"
title="精彩活动" title="精彩活动"
@click="$router.push({ name: 'ActivityList' })" @click="$router.push({ name: 'ActivityList' })"
/> />
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
<img <img
class="mx-5 mt-5 rounded-lg" class="mx-5 mt-5 rounded-lg"
:src="src" :src="src"
alt
@click=" @click="
$router.push({ $router.push({
name: 'ActivityDetail', name: 'ActivityDetail',
...@@ -47,6 +46,7 @@ ...@@ -47,6 +46,7 @@
</Skeleton> </Skeleton>
<group-title <group-title
class="mt-7" class="mt-7"
v-if="hotNews"
title="热门资讯" title="热门资讯"
@click="$router.push('News')" @click="$router.push('News')"
/> />
...@@ -77,7 +77,7 @@ import { ...@@ -77,7 +77,7 @@ import {
queryLoanProductInfo, queryLoanProductInfo,
} from "@/service/LoanProductService"; } from "@/service/LoanProductService";
import { number } from "bitcoinjs-lib/types/script"; import { number } from "bitcoinjs-lib/types/script";
import { Skeleton } from "vant" import { Skeleton } from "vant";
export default defineComponent({ export default defineComponent({
components: { components: {
...@@ -90,12 +90,12 @@ export default defineComponent({ ...@@ -90,12 +90,12 @@ export default defineComponent({
LoanCard, LoanCard,
LiveCard, LiveCard,
HotNews, HotNews,
Skeleton Skeleton,
}, },
data() { data() {
return { return {
appList, appList,
skeLoading:false, skeLoading: false,
bannerList: [] as string[], bannerList: [] as string[],
notifyList: [] as any[], notifyList: [] as any[],
loopData0: [ loopData0: [
...@@ -161,16 +161,16 @@ export default defineComponent({ ...@@ -161,16 +161,16 @@ export default defineComponent({
} }
}, },
async fetchActivityList() { async fetchActivityList() {
this.skeLoading = true this.skeLoading = true;
const ret = await queryActivityList({ limit: 1, offset: 0 }); const ret = await queryActivityList({ limit: 1, offset: 0 });
if (ret.code === 200) { if (ret.code === 200) {
this.skeLoading = false this.skeLoading = false;
this.src = getImageSrcFromFileHash(ret.data.items[0]?.file_name); this.src = getImageSrcFromFileHash(ret.data.items[0]?.file_name);
this.uuid = ret.data.items[0]?.uuid; this.uuid = ret.data.items[0]?.uuid;
} }
}, },
async fetchLoanProductList() { async fetchLoanProductList() {
this.skeLoading = true this.skeLoading = true;
// 默认查询个人贷款的第一个贷款产品 // 默认查询个人贷款的第一个贷款产品
const ret = await queryLoanProductList({ const ret = await queryLoanProductList({
limit: 1, limit: 1,
...@@ -178,7 +178,7 @@ export default defineComponent({ ...@@ -178,7 +178,7 @@ export default defineComponent({
loan_type: 2, loan_type: 2,
}); });
if (ret.code === 200) { if (ret.code === 200) {
this.skeLoading = false this.skeLoading = false;
this.uuid = ret.data.uuid[0]; this.uuid = ret.data.uuid[0];
const uuid = this.uuid; const uuid = this.uuid;
queryLoanProductInfo({ uuid }).then((ret) => { queryLoanProductInfo({ uuid }).then((ret) => {
......
...@@ -67,9 +67,9 @@ ...@@ -67,9 +67,9 @@
.mod2 { .mod2 {
z-index: 35; z-index: 35;
height: 88px;
width: 375px; width: 375px;
justify-content: flex-end; justify-content: flex-end;
padding-top:49px;
padding-bottom: 17px; padding-bottom: 17px;
align-items: center; align-items: center;
} }
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
/> />
<!-- 当前网点 --> <!-- 当前网点 -->
<div class="px-4 bg-branch-deep-blue h-40 mb-28 bg-app-branch-deep-blue flow-root"> <div class="px-4 bg-branch-deep-blue h-40 mb-28 bg-app-branch-deep-blue flow-root">
<Skeleton :row="3" :loading="result.loading" class="mt-5"> <Skeleton :row="3" :loading="skele" class="mt-5">
<div class="detail text-white text-sm pl-1 pt-8">提前预约网点 可享优先办理</div> <div class="detail text-white text-sm pl-1 pt-8">提前预约网点 可享优先办理</div>
<branch <branch
:changeable="false" :changeable="false"
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<!-- 附近网点 --> <!-- 附近网点 -->
<Skeleton :row="3" :loading="result.loading" class="-mt-20 mb-10"></Skeleton> <Skeleton :row="3" :loading="result.loading" class="-mt-20 mb-10"></Skeleton>
<Skeleton :row="3" :loading="result.loading" class="mt-5"> <Skeleton :row="3" :loading="result.loading" class="mt-5">
<div class="px-4 overflow-scroll"> <div class="px-4 overflow-scroll -mt-10">
<p class="mt-8 mb-5 text-base font-semibold text-gray-800">附近的网点</p> <p class="mt-8 mb-5 text-base font-semibold text-gray-800">附近的网点</p>
<branch <branch
v-for="(item, index) in result.lists" v-for="(item, index) in result.lists"
...@@ -71,11 +71,12 @@ export default defineComponent({ ...@@ -71,11 +71,12 @@ export default defineComponent({
}) })
const getAddressList = () => { const getAddressList = () => {
result.loading = true; result.loading = true;
const ret = addressService.getNearby({ addressService.getNearby({
bank_code: Number(process.env.VUE_APP_BANK_CODE), bank_code: Number(process.env.VUE_APP_BANK_CODE),
number: 4, number: 4,
}) latitude: '120.156203',
ret && ret.then(res => { longitude: '30.285618',
}).then(res => {
result.loading = false; result.loading = false;
result.topItem = res.data[0] result.topItem = res.data[0]
result.lists = res.data.slice(1) result.lists = res.data.slice(1)
......
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
<div class="mine"> <div class="mine">
<!-- top --> <!-- top -->
<div class="top bg-center bg-no-repeat bg-cover"> <div class="top bg-center bg-no-repeat bg-cover">
<p class="w-full text-center text-white text-base pt-14">我的</p> <div class="w-full text-center text-white text-base pt-14">我的</div>
<div class="flex w-full pb-7 justify-between"> <div class="flex w-full pb-7 justify-between">
<div class="mt-8 ml-5"> <div class="mt-8 ml-5">
<img src="../../../assets/icons/avatar.png" class="w-12 h-12 inline-block" /> <img src="../../../assets/icons/avatar.png" class="w-12 h-12 inline-block" />
<p class="text-white ml-3 inline-block"> <div class="text-white ml-3 inline-block">
<span v-if="isLogin">{{ filter.filterPhone(userMsg?.userInfo.phone) }}</span> <span v-if="isLogin">{{ filter.filterPhone(userMsg?.userInfo.phone) }}</span>
<span v-else>未登录</span> <span v-else>未登录</span>
</p> </div>
</div> </div>
<div <div
class="flex h-8 bg-indigo-400 mr-0 mt-11 rounded-l-xl" class="flex h-8 bg-indigo-400 mr-0 mt-11 rounded-l-xl"
......
...@@ -58,6 +58,7 @@ module.exports = { ...@@ -58,6 +58,7 @@ module.exports = {
"branch-font": "#AD9781", "branch-font": "#AD9781",
"card-shadow": "#D6DBF8", "card-shadow": "#D6DBF8",
"app-txt": "#1B1F37", "app-txt": "#1B1F37",
"tab-bar-bg":"#4E61C9",
"app-btn-disabled": "#E7E7E7", "app-btn-disabled": "#E7E7E7",
"app-branch-deep-blue": "#2C3C92", "app-branch-deep-blue": "#2C3C92",
black: colors.black, black: colors.black,
......
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