Merge branch 'master' of git.zdool.com:xs/yyx/h5

This commit is contained in:
duanxiaohai 2023-07-18 14:59:22 +08:00
commit e3090d50d9
4 changed files with 77 additions and 68 deletions

View File

@ -194,21 +194,16 @@
imgUrl: '../../static/moreFun/moreFun8.png',
title: '文艺之家'
},
// {
// id: 6,
// imgUrl: '../../static/icon7.png',
// title: ''
// },
{
id: 7,
imgUrl: '../../static/icon5.png',
title: '积分使用'
},
// {
// id: 8,
// imgUrl: '../../static/icon1.png',
// title: ''
// },
{
id: 8,
imgUrl: '../../static/icon1.png',
title: '更多功能'
},
],
enjoyList: [],
writerList: [],
@ -414,11 +409,11 @@
url: "/pagesB/MyPoints/MyPoints"
})
break;
// case 8:
// uni.navigateTo({
// url: "/pagesC/moreFun/moreFun"
// })
// break;
case 8:
uni.navigateTo({
url: "/pagesC/moreFun/moreFun"
})
break;
}
},
famouserDetaol(val) {

View File

@ -3,7 +3,7 @@
<view class="navbar" :style="{'opacity':opCalue}">
<view class="status_bar" :style="{'height':statusHeight+'px'}"></view>
<view class="apptitle" :style="{'height':titleHeight+'px'}">
<image src="../../static/blackArrow.png" mode="" class="backImg" @click="back"></image>
<image src="../../static/orderLeftArrow.png" mode="" class="backImg" @click="goBack()"></image>
<view class="barLabel">
{{pageTitle}}
</view>
@ -13,7 +13,7 @@
<view class="abnavbar">
<view class="status_bar" :style="{'height':statusHeight+'px'}"></view>
<view class="apptitle" :style="{'height':titleHeight+'px'}">
<image src="../../static/leftArrow.png" mode="" class="backImg" @click="back"></image>
<image src="../../static/orderLeftArrow.png" mode="" class="backImg" @click="goBack()"></image>
<view class="barLabel">
{{pageTitle}}
</view>
@ -103,7 +103,8 @@
// #endif
},
methods:{
back(){
goBack(){
console.log('back')
uni.navigateBack()
}
}
@ -132,6 +133,7 @@
width: 20px;
height: 20px;
// margin-right: 16px;
z-index: 2;
}
.barLabel {
@ -164,6 +166,7 @@
width: 20px;
height: 20px;
// margin-right: 16px;
z-index: 2;
}
.barLabel {

View File

@ -3,7 +3,7 @@
<view class="navbar" :style="{'opacity':opCalue}">
<view class="status_bar" :style="{'height':statusHeight+'px'}"></view>
<view class="apptitle" :style="{'height':titleHeight+'px'}">
<image src="../../static/blackArrow.png" mode="" class="backImg" @click="back"></image>
<image src="../../static/orderLeftArrow.png" mode="" class="backImg" @click="goBack()"></image>
<view class="barLabel">
{{pageTitle}}
</view>
@ -13,7 +13,7 @@
<view class="abnavbar">
<view class="status_bar" :style="{'height':statusHeight+'px'}"></view>
<view class="apptitle" :style="{'height':titleHeight+'px'}">
<image src="../../static/leftArrow.png" mode="" class="backImg" @click="back"></image>
<image src="../../static/orderLeftArrow.png" mode="" class="backImg" @click="goBack()"></image>
<view class="barLabel">
{{pageTitle}}
</view>
@ -73,7 +73,7 @@
// #endif
},
methods: {
back() {
goBack() {
uni.navigateBack()
}
}
@ -102,6 +102,7 @@
.backImg {
width: 20px;
height: 20px;
z-index: 2;
}
.barLabel {
@ -134,6 +135,7 @@
.backImg {
width: 20px;
height: 20px;
z-index: 2;
}
.barLabel {

View File

@ -16,28 +16,32 @@
return {
list: [
{
imgUrl: '../../static/moreFun/moreFun8.png',
label: '文艺之家'
imgUrl: '../../static/icon7.png',
label: '文艺援助'
},
{
imgUrl: '../../static/icon8.png',
label: '媒体宣传'
},
{
imgUrl: '../../static/moreFun/moreFun3.png',
label: '机构设置'
},
{
imgUrl: '../../static/moreFun/moreFun4.png',
label: '资料查找'
},
{
imgUrl: '../../static/moreFun/moreFun2.png',
label: '文艺下乡'
}, {
imgUrl: '../../static/icon13.png',
label: '文艺比赛'
},
{
imgUrl: '../../static/icon4.png',
label: '线上看展'
},
// {
// imgUrl: '../../static/icon8.png',
// label: ''
// },
// {
// imgUrl: '../../static/moreFun/moreFun3.png',
// label: ''
// },
// {
// imgUrl: '../../static/moreFun/moreFun4.png',
// label: ''
// },
// {
// imgUrl: '../../static/moreFun/moreFun2.png',
// label: ''
// }, {
// imgUrl: '../../static/icon13.png',
// label: ''
// },
]
};
},
@ -46,34 +50,39 @@
switch (id) {
case 0:
uni.navigateTo({
url: "/pagesB/literFamily/literFamily"
url: "/pagesC/literHelp/literHelp"
})
break;
case 1:
uni.navigateTo({
url: "/pagesC/mediaProp/mediaProp"
})
break;
case 2:
uni.navigateTo({
url: "/pagesD/jgsz/index"
})
break;
case 3:
uni.navigateTo({
url: "/pagesC/DataSearch/DataSearch"
})
break;
case 4:
uni.navigateTo({
url: "/pagesD/wyxx/index"
})
break;
case 5:
uni.navigateTo({
url: "/pagesB/ArtRace/ArtRace"
})
break;
case 6:
uni.navigateTo({
url: "/pagesD/xskz/index"
})
break;
// case 1:
// uni.navigateTo({
// url: "/pagesC/mediaProp/mediaProp"
// })
// break;
// case 2:
// uni.navigateTo({
// url: "/pagesC/moreFun/noWeb"
// })
// break;
// case 3:
// uni.navigateTo({
// url: "/pagesC/moreFun/noWeb"
// })
// break;
// case 4:
// uni.navigateTo({
// url: "/pagesC/moreFun/noWeb"
// })
// break;
// case 5:
// uni.navigateTo({
// url: "/pagesC/moreFun/noWeb"
// })
// break;
}
}
}