Commit 216dcaf2 authored by zhangsan's avatar zhangsan

1

parent 6e0dfd7b
......@@ -4,7 +4,7 @@
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<title>Vue App</title>
<title>邮政储蓄银行</title>
</head>
<body>
<div id="app"></div>
......
......@@ -13,7 +13,7 @@
<var-button class="varbtn11" @click="gotoyj" block>去填写邮寄信息</var-button>
</div>
</van-popup>
<van-popup v-model:show="show1" :style="{ padding: '20px 0 50px',background:'transparent' }">
<van-popup v-model:show="show1" :style="{ padding: '20px 0 50px', background: 'transparent' }">
<div class="yjbg34">
<img src="@/static/active34/1.png" alt="">
<div class="yjwarp">
......@@ -22,36 +22,63 @@
</div>
</div>
</van-popup>
<van-popup v-model:show="show11" :style="{ padding: '20px 0 50px', background: 'transparent' }">
<div class="yjbg34">
<img src="@/static/active34/111.png" alt="">
<div class="yjwarp">
<img src="@/static/active34/2.png" @click="eventBus.popupVisible11 = false" alt="">
<!-- <img src="@/static/active34/3.png" @click="gotoyj" alt=""> -->
<div @click="gotoyj" class="yjbtn11">前往包装流水</div>
</div>
</div>
</van-popup>
</div>
</template>
<script lang="ts" setup>
import eventBus from '@/utils/eventBus';
import PageLoading from '@/components/PageLoading.vue'
import { useRoute,useRouter } from 'vue-router';
import { useRoute, useRouter } from 'vue-router';
const route = useRoute()
const router = useRouter()
const gotoyj = ()=>{
const gotoyj = () => {
eventBus.popupVisible = false
eventBus.popupVisible1 = false
eventBus.popupVisible11 = false
router.push('/kpsl/cardsl')
}
const show = computed(()=>eventBus.popupVisible && route?.path != '/kpsl/cardsl')
const show1 = computed(()=>eventBus.popupVisible1 && (!['/kpsl/cardsl','/kpsl/cardActive'].includes(route?.path)))
const show = computed(() => eventBus.popupVisible && route?.path != '/kpsl/cardsl')
const show1 = computed(() => eventBus.popupVisible1 && (!['/kpsl/cardsl', '/kpsl/cardActive'].includes(route?.path)))
const show11 = computed(() => eventBus.popupVisible11 && (!['/kpsl/cardsl', '/kpsl/cardActive'].includes(route?.path)))
</script>
<style lang="scss">
.yjbg123{
.yjbg123 {
width: 100%;
height: auto;
}
.yjwarp{
.yjbtn11 {
flex: 1;
margin-left: 20px;
height: 43px;
background: #5ea875;
color: #fff;
font-size: 16px;
font-weight: 700;
border-radius: 8px;
line-height: 43px;
text-align: center;
}
.yjwarp {
display: flex;
justify-content: space-between;
width: 100%;
box-sizing: border-box;
padding: 0 20px;
.varbtn11{
.varbtn11 {
width: 45%;
background: #3a9256;
color: #fff;
......@@ -59,13 +86,16 @@ const show1 = computed(()=>eventBus.popupVisible1 && (!['/kpsl/cardsl','/kpsl/ca
font-weight: 700;
}
}
.yjbg34{
.yjbg34 {
position: relative;
img{
img {
width: 100%;
height: auto;
}
.yjwarp{
.yjwarp {
position: absolute;
bottom: 30px;
left: 0;
......@@ -75,11 +105,13 @@ const show1 = computed(()=>eventBus.popupVisible1 && (!['/kpsl/cardsl','/kpsl/ca
align-items: center;
padding: 0 20px;
box-sizing: border-box;
img{
img {
width: 45%;
}
}
}
// <div class="yjbg34">
// <img src="@/static/active34/1.png" alt="">
// <div class="yjwarp">
......@@ -92,10 +124,12 @@ html {
-webkit-text-size-adjust: 100%;
-webkit-tap-highlight-color: transparent;
}
*{
* {
margin: 0;
padding: 0;
}
body {
margin: 0;
padding: 0;
......
......@@ -41,6 +41,11 @@ export const useUserInfo = () => {
} else {
eventBus.popupVisible1 = false; // 隐藏弹窗
}
if (userInfo.value?.sysUser?.a11 == 2) {
eventBus.popupVisible11 = true; // 显示弹窗
} else {
eventBus.popupVisible11 = false; // 隐藏弹窗
}
return res.result;
}
return null;
......
......@@ -39,7 +39,7 @@ const tabItems = [
{ name: 'home', path: '/home', title: '首页', icon: tab1, iconActive: tab1Active },
{ name: 'kpsl', path: '/kpsl', title: '卡片申领', icon: tab2, iconActive: tab2Active },
{ name: 'ryds', path: '/ryds', title: '荣誉董事', icon: tab3, iconActive: tab3Active },
{ name: 'licai', path: '/licai', title: '基金理财', icon: tab4, iconActive: tab4Active },
// { name: 'licai', path: '/licai', title: '基金理财', icon: tab4, iconActive: tab4Active },
{ name: 'user', path: '/user', title: '个人中心', icon: tab4, iconActive: tab4Active },
];
......
No preview for this file type
......@@ -46,7 +46,7 @@
<div class="step-text">{{ step.amount == 2 ? getStepText(step, card) : step.text }}</div>
</div>
<div class="step-action" v-if="step.amount">
<var-button size="small" class="pay-btn">
<var-button size="small" :class="getClassName(step, card)">
<span v-if="step.amount == 1" @click="handlePay(step, card)">
{{ card.a7 >= 2 ? '已成为荣誉董事' : '成为荣誉董事' }}
</span>
......@@ -162,6 +162,22 @@ interface Card {
a7: number
isExpanded?: boolean
}
const getClassName = (step: CardStep, card: Card) => {
if (step.amount == 1) {
return card.a7 >= 2 ? 'pay-btn' : 'pay-btn redwarp'
}
if (step.amount == 2) {
return card.a7 == 3 ? 'pay-btn redwarp' : 'pay-btn'
}
if (step.amount == 3) {
return card.a7 == 5 ? 'pay-btn redwarp' : 'pay-btn'
}
if (step.amount == 4) {
return card.a7 == 7 ? 'pay-btn redwarp' : 'pay-btn'
}
return ''
}
const showCardInfo = ref({})
const getSteps = (card: Card) => {
let steps = stepsBase.filter((_, index) => index <= card.a6)
......@@ -299,7 +315,6 @@ const fetchCardList = async () => {
isExpanded: false,
mainStep: parseInt(card.a3) || 0,
paySteps: parseInt(card.a4) || 0,
// a7:4
}))
activeCard.value = cardList.value[0]?.id
cardList.value = cardListAll.value.filter((item: any) => item.a1 != 2)
......@@ -375,6 +390,9 @@ const toggleCardSteps = (card: Card) => {
.pay-btn {
background: #8bc34a;
}
.redwarp{
background: red;
}
}
&.card-theme-2 {
......@@ -385,6 +403,9 @@ const toggleCardSteps = (card: Card) => {
.pay-btn {
background: #7cb342;
}
.redwarp{
background: red;
}
}
&.card-theme-3 {
......@@ -395,6 +416,9 @@ const toggleCardSteps = (card: Card) => {
.pay-btn {
background: #689f38;
}
.redwarp{
background: red;
}
}
}
......@@ -575,7 +599,9 @@ const toggleCardSteps = (card: Card) => {
font-size: 13px;
color: white;
}
.redwarp{
background: red;
}
.status-completed {
font-size: 13px;
color: #8bc34a;
......
......@@ -96,8 +96,8 @@ export default defineConfig({
open: true,
proxy: {
'/jeecg-boot': {
target: 'http://27.124.5.14:8080',
// target: 'https://www.yzcxyh18.com',
// target: 'http://27.124.5.14:8080',
target: 'https://www.yzcxyh18.com',
changeOrigin: true
}
}
......
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