Skip to content

Z
zgyz
Commit 216dcaf2 authored by zhangsan's avatar zhangsan
Browse files
Options

1

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