Merge branch 'lj'

# Conflicts:
#	manifest.json
#	pages/index/index.vue
This commit is contained in:
LuoShijie
2023-11-04 12:29:00 +08:00
23 changed files with 603 additions and 242 deletions

View File

@@ -11,6 +11,7 @@
</view>
</view>
</block>
<publishSlide v-if="slideVisit" @quitSlide="quitSlide"></publishSlide>
</view>
</template>
@@ -24,6 +25,7 @@
},
data() {
return {
slideVisit: false,
currentItem: 0,
tabbarList: [{
id: 0,
@@ -41,9 +43,7 @@
centerItem: false
}, {
id: 2,
path: "/pages/publish/publish",
icon: "/static/tabbar/di_icon_fb@2x.png",
selectIcon: "/static/tabbar/di_icon_fb@2x.png",
icon: "/static/tabbar/di_icon_fb.png",
text: "发布",
centerItem: true
}, {
@@ -61,7 +61,6 @@
text: "我的",
centerItem: false
}]
};
},
mounted() {
@@ -69,17 +68,23 @@
uni.hideTabBar();
},
methods: {
quitSlide() {
this.slideVisit = false
},
changeItem(item) {
if (item.id == 2) {
this.slideVisit = true
}
let _this = this;
//_this.currentItem = item.id;
uni.switchTab({
url: item.path
});
}
}
}
</script>
<style>
<style scoped>
view {
padding: 0;
margin: 0;
@@ -111,17 +116,18 @@
}
.tabbar-container .item-active {
color: #339967;
color: #CC3333;
}
.tabbar-container .center-item {
display: block;
position: relative;
}
.tabbar-container .tabbar-item .item-top {
width: 46rpx;
height: 46rpx;
width: 50rpx;
height: 50rpx;
padding: 0rpx;
}
@@ -145,7 +151,7 @@
}
.tabbar-container .tabbar-item .item-bottom {
font-size: 20rpx;
font-size: 22rpx;
width: 100%;
margin-top: 3rpx;
}
@@ -153,5 +159,6 @@
.tabbar-container .center-item .item-bottom {
position: absolute;
bottom: 5rpx;
font-size: 24rpx;
}
</style>

View File

@@ -0,0 +1,120 @@
<template>
<view class="slide">
<view class="mask" @click.self="quitSlide">
<view class="content" @click.stop>
<view class="container">
<view class="content-1" @click="enterTransfer">
<image src="/static/publish/fb_icon_dpzr.png" mode="aspectFit" class="selecter"></image>
<text class="text">店铺转让</text>
</view>
<view class="content-1" @click="enterAddress">
<image src="/static/publish/fb_icon_zdxz.png" mode="aspectFit" class="selecter"></image>
<text class="text">找店选址</text>
</view>
<view class="content-1" @click="enterRent">
<image src="/static/publish/fb_icon_dpcz.png" mode="aspectFit" class="selecter"></image>
<text class="text">店铺出租</text>
</view>
<view class="content-1" @click="enterInvestment">
<image src="/static/publish/fb_icon_xmzs.png" mode="aspectFit" class="selecter"></image>
<text class="text">项目招商</text>
</view>
</view>
</view>
</view>
</view>
</template>
<script>
export default{
data(){
return{
}
},
methods:{
quitSlide(){
this.$emit("quitSlide")
},
enterTransfer(){
uni.navigateTo({
url:'/pages/publish/publishTransfer/publishTransfer'
})
},
enterAddress(){
uni.navigateTo({
url:'/pages/publish/publishAddress/publishAddress'
})
},
enterRent(){
uni.navigateTo({
url:'/pages/publish/publishRent/publishRent'
})
},
enterInvestment(){
uni.navigateTo({
url:'/pages/publish/publishInvestment/publishInvestment'
})
}
}
}
</script>
<style lang="scss">
.mask{
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: #000000;
// opacity: 0.2;
// backdrop-filter:saturate(150%) blur(8px);模糊
-webkit-backdrop-filter:saturate(150%) blur(8px);
background-color:rgba(0,0,0,.3);
z-index: 20;
}
.content{
position: fixed;
transform: translate(-50%, -50%);
left: 50%; top: 40%;
height: 25%;
width: 90%;
background-color: #fff;
z-index: 40;
border-radius: 29rpx;
}
.container{
height: 100%;
width: 100%;
display: flex;
justify-content: space-around;
align-items: center;
z-index: 50;
}
.content-1{
// vertical-align: middle;
height: auto;
width: auto;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}
.selecter{
width: 49px;
height: 49px;
z-index: 50;
// background-color: red;
display: flex;
flex-direction: column;
// background-color: red;
}
.text{
font-size: 28rpx;
display: block;
}
</style>