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

This commit is contained in:
闫世杰 2023-08-03 15:57:33 +08:00
commit f2f99eb13f
4 changed files with 59 additions and 196 deletions

View File

@ -611,6 +611,13 @@
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },
{
"path": "wyxx/detail",
"style": {
"navigationBarTitleText": "文艺下乡详情",
"enablePullDownRefresh": false
}
},
// : // :
{ {
"path": "wyxx/addindex", "path": "wyxx/addindex",
@ -634,27 +641,16 @@
"navigationBarTitleText": "线上看展", "navigationBarTitleText": "线上看展",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},
// 线-
{
"path": "xskz/details",
"style": {
"navigationBarTitleText": "线上看展-详情",
"enablePullDownRefresh": false
// "usingComponents": {
// "player-component": "plugin://player/video"
// }
}
} }
// 线- // 线-
// { // {
// "path": "xskz/details", // "path": "xskz/details",
// "style": { // "style": {
// "navigationBarTitleText": "线上看展-详情", // "navigationBarTitleText": "线上看展-详情",
// "enablePullDownRefresh": false, // "enablePullDownRefresh": false
// "usingComponents": { // // "usingComponents": {
// "player-component": "plugin://player/video" // // "player-component": "plugin://player/video"
// } // // }
// } // }
// } // }
] ]

View File

@ -134,6 +134,7 @@ export default {
this.showType = false this.showType = false
this.showTime = false this.showTime = false
this.showUser = false this.showUser = false
this.showTypes = false
}, },
selectForm1 (form) { selectForm1 (form) {
let _this = this let _this = this

View File

@ -1,119 +1,47 @@
<template> <template>
<view class=""> <view class="box">
<view class=""> <view class="">
<u-loading-page :loading="load"></u-loading-page> <u-loading-page :loading="load"></u-loading-page>
</view> </view>
<view class="page" v-if="load == false"> <view class="page" v-if="load == false">
<view class="return" @click="back">
<image src="../../static/orderLeftArrow.png" mode="scaleToFill"></image>
</view>
<view class="pageImg">
<u-swiper v-if="list.length > 0" :list="list" :autoplay="true" @change="e => currentNum = e.current"
indicatorStyle="right: 20px" height='440rpx'>
<view slot="indicator" class="indicator-num">
<text class="indicator-num__text">{{ currentNum + 1 }}/{{ list.length }}</text>
</view>
</u-swiper>
</view>
<view class="main">
<view class="mainTitle">{{ data.title }}</view>
<view class="textList">
<view class="type">
<img class='textImg' src="../../static/detailIcon/icon10.png" alt="">
<view class="text1">需求清单</view>
</view>
<view class="text2">{{ data.demand }}</view>
</view>
<view class="textList">
<view class="type">
<img class='textImg' src="../../static/detailIcon/icon10.png" alt="">
<view class="text1">具体内容</view>
</view>
<view class="text2">
{{ data.content }}
</view>
</view>
<view class="file_box" v-for="(item, index) in list2" :key="index" @click="downLoad(item.url)">
<view class="file_box_left">
<image :src="item.img" class="file_box_left_img"></image>
</view>
<view class="file_box_right">
<view class="file_box_name">
{{ item.name }}
</view>
</view>
</view>
</view>
<view class="line"></view>
<view class="activityDetails"> <view class="activityDetails">
<view class="item_ul"> <view class="item_ul">
<view class="title">
<image class="icon" src="../../static/detailIcon/icon0.png" mode="scaleToFill"></image>
<text>需求详情</text>
</view>
<view class="item_li"> <view class="item_li">
<view class="standard"> <view class="standard">
<image class="icon" src="../../static/detailIcon/icon5.png" mode="scaleToFill"></image> <text>标题:</text>
<text>类型:</text>
</view> </view>
<view class="content">{{ data.typeName }}</view> <view class="content">{{ data.title
}}</view>
</view> </view>
<!-- <view class="item_li">
<view class="standard">
<image class="icon" src="../../static/detailIcon/icon8.png" mode="scaleToFill"></image>
<text>可接单用户类型:</text>
</view>
<view class="content"> {{data.rclx}} </view>
</view> -->
<view class="item_li"> <view class="item_li">
<view class="standard"> <view class="standard">
<image class="icon" src="../../static/detailIcon/icon6.png" mode="scaleToFill"></image> <text> 节目:</text>
<text> 可接单人数:</text>
</view> </view>
<view class="content"><text style=" color: #99241B;"> {{ data.jdrs }}</text>/{{ data.quantity }} </view> <view class="content"><text> {{ data.teamName }}</text></view>
</view>
<view class="item_li">
<view class="standard">
<text> 团队:</text>
</view>
<view class="content"><text> {{ data.showName }}</text></view>
</view>
<view class="item_li">
<view class="standard">
<text> 地址:</text>
</view>
<view class="content"><text> {{ data.villageName }}</text></view>
</view>
<view class="item_li">
<view class="standard">
<text>开始时间:</text>
</view>
<view class="content"> {{ data.startTime }}</view>
</view> </view>
<view class="item_li"> <view class="item_li">
<view class="standard"> <view class="standard">
<image class="icon" src="../../static/detailIcon/icon7.png" mode="scaleToFill"></image>
<text>截止时间:</text> <text>截止时间:</text>
</view> </view>
<view class="content"> {{ data.deadline }}</view> <view class="content"> {{ data.endTime }} </view>
</view>
<view class="item_li">
<view class="standard">
<image class="icon" src="../../static/detailIcon/icon4.png" mode="scaleToFill"></image>
<text>活动时间:</text>
</view>
<view class="content"> {{ data.activityTime }} </view>
</view>
</view>
</view>
<view v-if="isCheck == 0">
<view class="" v-if="data.hallState == 1">
<view class="orderBtn" v-if="data.isBaoming">
<view class="btnQ" @click="baoQ">取消接单</view>
</view>
<view class="orderBtn" v-else>
<view class="btn" @click="bao">申请接单</view>
</view>
</view>
<view class="" v-else>
<view class="orderBtn">
<view class="btnQ">已无法接单</view>
</view>
</view>
</view>
<view v-else-if="isCheck == 1">
<view class="bao_title">
已接单用户
</view>
<view class="per_line" v-for="(v, i) in userList" :key="i">
<view class="oer_image">
<image :src="v.userTx[0]"></image>
</view>
<view>
{{ v.userName }}
</view> </view>
</view> </view>
</view> </view>
@ -137,100 +65,44 @@ export default {
}, },
onLoad (op) { onLoad (op) {
this.id = op.id this.id = op.id
if (op.isCheck) {
this.isCheck = op.isCheck
}
}, },
onShow () { onShow () {
this.getData() this.getData()
}, },
methods: { methods: {
getData () { getData () {
let _this = this this.load = true
this.http.request('/hall/details', { this.http.request(`/artCountryside/details?id=${this.id}`, {}, 'GET').then(res => {
id: this.id,
}, "GET").then(res => {
if (res.code == 200) { if (res.code == 200) {
//
if (res.data.enclosure) {
let fileArr = res.data.enclosure.split(',')
fileArr.forEach(function (item) {
let gs = item.substr(item.lastIndexOf(".") + 1)
if (gs == 'jpg' || gs == 'jpeg' || gs == 'png' || gs == 'bmp' || gs ==
'gif' || gs == 'tif' || gs == 'tiff') {
_this.list.push(item)
} else if (gs == 'pdf') {
_this.list2.push({
name: res.data.name + '.' + gs,
img: '../../static/fileImg/pdfS.png',
url: item,
})
}
})
}
this.data = res.data this.data = res.data
this.data.rclx = this.data.yhsf.join(',')
this.userList = res.data.users
this.userList.forEach(function (el) {
let img = JSON.stringify(el.userTx)
el.userTx = img
})
this.load = false this.load = false
} else {
this.load = false
uni.showToast({
title: res.message,
icon: "error",
});
} }
}).catch(e => { }).catch(err => {
uni.showToast({ this.load = false
title: e.data.message,
icon: "none",
});
}) })
}, },
back () { back () {
uni.navigateBack() uni.navigateBack()
}, },
// //
downLoad (val) {
this.contractUrl = val
uni.navigateTo({
url: "/pagesB/ArtWorks/webView?url=" + this.contractUrl
})
},
bao () {
this.http.request('/hallUser/singUp?hallId=' + this.id, {}, "POST").then(res => {
if (res.code == 200) {
this.getData()
this.load = true
this.list = []
this.list2 = []
}
}).catch(e => {
uni.showToast({
title: e.data.message,
icon: "none",
});
})
},
baoQ () {
this.http.request('/hallUser/qxSingUp?hallId=' + this.id, {}, "POST").then(res => {
if (res.code == 200) {
this.getData()
this.load = true
this.list = []
this.list2 = []
}
}).catch(e => {
uni.showToast({
title: e.data.message,
icon: "none",
});
})
}
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.box {
width: 100%;
position: relative;
}
image { image {
height: 100%; // height: 100%;
width: 100%; width: 100%;
} }

View File

@ -166,21 +166,12 @@ export default {
}) })
}, },
toDetail (value) { toDetail (value) {
this.http.request(`/artCountryside/details?id=${value}`, {}, 'GET').then(res => { uni.navigateTo({
if (res.code == 200) { url: `/pagesD/wyxx/detail?id=${value}`
console.log(res);
} else {
uni.showToast({
title: res.message,
icon: "error",
});
}
}).catch(err => {
}) })
} }
}, },
async mounted () { async onShow () {
await this.teamandprogram() await this.teamandprogram()
await this.RuralDevelopmentPlanlist() await this.RuralDevelopmentPlanlist()
}, },
@ -234,6 +225,9 @@ export default {
// height: 40rpx; // height: 40rpx;
// background-color: skyblue; // background-color: skyblue;
margin: 20rpx auto; margin: 20rpx auto;
// max-height: calc(100vh - 106px);
// border: 1px solid #333333;
// overflow-y: auto;
.teamBox { .teamBox {
height: 140rpx; height: 140rpx;