This commit is contained in:
lnn19986213 2023-08-28 14:03:06 +08:00
parent dd621898c1
commit 03005b7e0b
9 changed files with 676 additions and 618 deletions

View File

@ -96,7 +96,7 @@
// vueproxyTable,
"/pre" : {
//
"target" : "http://192.168.1.3:8080/h5/api", //
"target" : "http://192.168.1.31:8080/h5/api", //
// "target" : "https://yxx.ydool.net/h5/api", //
"changeOrigin" : true, //

View File

@ -82,11 +82,21 @@
<view class="btn" @click="throwWork">报名</view>
</view>
</view>
<view class="" v-else>
<view class="" v-else-if="data.status == 1">
<view class="orderBtn">
<view class="btnQ">报名已截止</view>
</view>
</view>
<view class="" v-else-if="data.status == 2">
<view class="orderBtn">
<view class="btnQ">活动已结束</view>
</view>
</view>
<view class="" v-else>
<view class="orderBtn">
<view class="btnQ">活动未开始</view>
</view>
</view>
</view>
<!-- 红色按钮ed -->
<view class="activityDetails">
@ -97,7 +107,7 @@
</view>
<view class="worksPart" v-if="workList.length > 0">
<view class="workItems" v-for="(v,i) in workList" :key="i" @click="goWorkDetail(v.id)">
<view class="sort" v-if="data.status != 0">
<view class="sort" v-if="data.status == 2">
<text>NO.<text style="font-size: 32rpx;">{{ i+1 }}</text></text>
<text>{{ v.averageScore }}</text>
</view>

View File

@ -29,18 +29,15 @@
<view class="textList" v-if="isExpert">
<view class="type">
<img class='textImg' src="../../static/detailIcon/icon10.png" alt="">
<view class="text1">您的评分<text class="redText" v-if="data.myScore">{{ data.myScore }}</text><text>暂无</text></view>
<view class="text1">您的评分<text class="redText" v-if="data.myScore">{{ data.myScore }}</text><text v-else>暂无</text></view>
</view>
</view>
</view>
<view class="line"></view>
<!-- 红色按钮 -->
<view>
<view class="" v-if="isExpert">
<view class="orderBtn" v-if="data.isScore">
<view class="btnQ">已评分</view>
</view>
<view class="orderBtn" v-else>
<view class="" v-if="isExpert && data.status != 2">
<view class="orderBtn" >
<view class="btn" @click="toScore">评分</view>
</view>
</view>

View File

@ -1,7 +1,11 @@
<template>
<!-- 文艺下乡 -->
<view class="wyxx">
<view class="wyxx" :style="{backgroundImage: 'url('+background+')'}">
<view class="tabTitle">
<view :class="tabC == '2' ? 'tabsC' : 'tabs'" @click="toTab('2')">
<view> 发展历程 </view>
<view class="line"></view>
</view>
<view :class="tabC == '0' ? 'tabsC' : 'tabs'" @click="toTab('0')">
<view> 组织架构 </view>
<view class="line"></view>
@ -10,36 +14,13 @@
<view> 人员信息 </view>
<view class="line"></view>
</view>
<view :class="tabC == '2' ? 'tabsC' : 'tabs'" @click="toTab('2')">
<view> 发展历程 </view>
<view class="line"></view>
</view>
</view>
<view class="forms" v-if="tabC == '0'">
<view class="teamBox" v-for="(item, index) in 2" :key="index">
<view class="teamBox-right">
<view class="item-image">
<image src="../../static/txIcon.png" mode=""></image>
</view>
</view>
<view class="teamBox-left">
<view class="teamMinbox-top">
<view class="title">xx团队</view>
<view class="street">丹东街道</view>
</view>
<view class="teamMinbox-bottom">
xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队
</view>
</view>
</view>
<image :src="zzjg" mode="widthFix" style="width: 100%;"></image>
</view>
<view class="forms" v-if="tabC == '1'">
<view
class="teamBox"
v-for="item in list"
:key="item.id"
@click="onInfo(item.id)"
>
<!-- <view class="teamBox" v-for="item in list" :key="item.id" @click="onInfo(item.id)"> -->
<view class="teamBox" v-for="item in list" :key="item.id">
<view class="teamBox-right">
<view class="item-image">
{{ item.userName }}
@ -57,23 +38,21 @@
</view>
</view>
</view>
<view class="forms" v-if="tabC == '2'">
<view class="teamBox" v-for="(item, index) in 3" :key="index">
<view class="teamBox-right">
<view class="item-image">
<image src="../../static/txIcon.png" mode=""></image>
</view>
</view>
<view class="teamBox-left">
<view class="teamMinbox-top">
<view class="title">xx团队</view>
<view class="street">丹东街道</view>
</view>
<view class="teamMinbox-bottom">
xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队
</view>
</view>
</view>
<view class="wljj" v-if="tabC == '2'">
<view class="wlTitle">象山县文联简介</view>
<p>
 象山县文学艺术界联合会简称象山县文联是党领导下由全县文艺家协会组成的人民团体是党和政府联系文艺工作者的桥梁和纽带县文联成立于1986年12月现有12个文艺家协会公安文联华翔文联和18个乡镇街道文联县级文艺家协会会员1200余人乡镇街道文联会员2300余人部门文联和企业文联会员190余人其中国家级会员74人机关内设创作研究室文艺家服务中心下辖青年画院联系德和根艺美术馆主办文学刊物象山港
</p>
<p>
近几年来县文联深入学习贯彻党的十九大精神和习近平总书记系列重要讲话精神紧紧围绕出作品出人才出影响出形象总体目标团结带领全县文艺工作者坚持以人民为中心的创作导向专心致志搞创作同心同德促繁荣各方面工作取得可喜成绩出版专著书刊50余部在国家级报刊上发表文章50余篇60余件作品获得专业性全国级奖项其中有中国民间文艺山花奖4
中国曲艺牡丹奖1 全国群星奖2 全国摄影艺术展奖4 省优秀文学作品奖2 五个一工程奖2并使我县先后获得中国民间艺术竹根雕之乡中国渔文化之乡等荣誉称号
</p>
<p>
 围绕中心服务大局精心组织了一系列重大文艺品牌活动文艺惠民活动深入人心送万福进万家送欢乐下基层文艺快闪等为代表的一批文艺活动形成品牌效应为团结引领各领域文艺人才提供强大保障
</p>
<p>
展望未来县文联将团结带领广大文艺工作者紧紧围绕县委县政府的中心工作开拓创新携手共进勇攀艺术高峰为加快建设海洋文化强县作出新的贡献
</p>
</view>
</view>
</template>
@ -84,6 +63,8 @@ export default {
return {
tabC: "0",
list: [],
background:'',
zzjg: ''
};
},
onShow() {
@ -96,6 +77,7 @@ export default {
.then((res) => {
if (res.code == 200) {
this.list = res.data.records;
this.getBackgroundImage()
}
})
.catch((err) => {
@ -110,10 +92,11 @@ export default {
},
onInfo(obj) {
this.http
.request("/organPerson/details", { id: obj }, "GET")
.request("/organPerson/details", {
id: obj
}, "GET")
.then((res) => {
if (res.code == 200) {
}
if (res.code == 200) {}
})
.catch((err) => {
uni.showToast({
@ -122,19 +105,36 @@ export default {
});
});
},
//
getBackgroundImage() {
this.http.request('/indexImage/wlBackgroundImage', {}, "GET").then(res => {
if (res.code == 200) {
this.zzjg = res.data[0].imagePath
this.background = res.data[1].imagePath
}
}).catch(e => {
uni.showToast({
title: e.data.message,
icon: "none",
});
})
},
},
};
</script>
<style lang="scss">
.wyxx {
width: 100%;
min-height: 100%;
background-color: #fefefe;
background-position: center top;
background-size: 100% 100%;
}
.tabTitle {
display: flex;
width: 100%;
background: #ffffff;
.tabs {
width: 33.3%;
@ -169,20 +169,23 @@ export default {
}
.forms {
width: 90%;
width: 686rpx;
// height: 40rpx;
// background-color: skyblue;
margin: 40rpx auto 0rpx;
padding: 40rpx 32rpx 0rpx;
.teamBox {
height: 140rpx;
padding: 18rpx 10rpx;
background-color: #fff;
margin-bottom: 20rpx;
display: flex;
.teamBox-right {
margin-right: 20rpx;
width: 159rpx;
height: 159rpx;
.item-image {
width: 159rpx;
height: 159rpx;
@ -195,6 +198,7 @@ export default {
font-weight: bolder;
border-radius: 50%;
overflow: hidden;
image {
width: 159rpx;
height: 159rpx;
@ -203,19 +207,25 @@ export default {
}
}
}
.teamBox-left {
// width: 400rpx;
.teamMinbox-top {
display: flex;
margin-bottom: 16rpx;
.title {
font-weight: 600;
font-size: 32rpx;
max-width: 160rpx;
overflow: hidden; /* 超出一行文字自动隐藏 */
text-overflow: ellipsis; /*文字隐藏后添加省略号*/
overflow: hidden;
/* 超出一行文字自动隐藏 */
text-overflow: ellipsis;
/*文字隐藏后添加省略号*/
white-space: nowrap;
}
.street {
height: 40rpx;
border-radius: 30rpx;
@ -224,11 +234,14 @@ export default {
margin-left: 18rpx;
padding: 2rpx 20rpx;
max-width: 120rpx;
overflow: hidden; /* 超出一行文字自动隐藏 */
text-overflow: ellipsis; /*文字隐藏后添加省略号*/
overflow: hidden;
/* 超出一行文字自动隐藏 */
text-overflow: ellipsis;
/*文字隐藏后添加省略号*/
white-space: nowrap;
}
}
.teamMinbox-bottom {
font-size: 28rpx;
overflow: hidden;
@ -240,4 +253,30 @@ export default {
}
}
}
.wljj {
padding: 40rpx 32rpx 60rpx;
width: 686rpx;
background-position: center top;
background-size: 100% auto;
.wlTitle {
width: 100%;
text-align: center;
font-size: 60rpx;
font-weight: bold;
color: #6F6053;
margin: 40rpx 0 60rpx;
}
p {
text-indent: 2em;
font-size: 30rpx;
font-family: Source Han Sans CN;
font-weight: 400;
color: #000000;
line-height: 62rpx;
}
}
</style>

View File

@ -5,7 +5,8 @@
标题
</view>
<view class="form_right">
<u--input placeholder="请输入名称" v-model="title" clearable border="none" inputAlign="right" style="color: #251B1D;">
<u--input placeholder="请输入名称" v-model="title" clearable border="none" inputAlign="right"
style="color: #251B1D;">
</u--input>
</view>
</view>
@ -20,14 +21,17 @@
</view>
</view>
<u-popup :show="showType" @close="close" closeOnClickOverlay :round="5" customStyle="padding: 16px;">
<scroll-view style='height: 500rpx;' scroll-y="true">
<u-radio-group @change="selectForm1" v-model="programs" :borderBottom="true" placement="column"
iconPlacement="right">
<u-radio :customStyle="{ marginBottom: '16px' }" v-for="(item, index) in program" :key="index" :label="item.name"
labelSize="28rpx" labelColor="#231F1C" :name="item.name" activeColor="#99241B ">
<u-radio :customStyle="{ marginBottom: '16px' }" v-for="(item, index) in program" :key="index"
:label="item.name" labelSize="28rpx" labelColor="#231F1C" :name="item.name"
activeColor="#99241B ">
</u-radio>
</u-radio-group>
</scroll-view>
<u-button class="custom-style" style="background-color:#99241B ; color: #FFFFFF; margin-top: 32rpx;"
type="default" @click="showType = false">确认</u-button>
</u-radio-group>
</u-popup>
<view class="form_line">
@ -41,13 +45,17 @@
</view>
</view>
<u-popup :show="showTypes" @close="close" closeOnClickOverlay :round="5" customStyle="padding: 16px;">
<u-radio-group @change="selectForm2" v-model="teams" :borderBottom="true" placement="column" iconPlacement="right">
<u-radio :customStyle="{ marginBottom: '16px' }" v-for="(item, index) in team" :key="index" :label="item.name"
labelSize="28rpx" labelColor="#231F1C" :name="item.name" activeColor="#99241B ">
<scroll-view style='height: 500rpx;' scroll-y="true">
<u-radio-group @change="selectForm2" v-model="teams" :borderBottom="true" placement="column"
iconPlacement="right">
<u-radio :customStyle="{ marginBottom: '16px' }" v-for="(item, index) in team" :key="index"
:label="item.name" labelSize="28rpx" labelColor="#231F1C" :name="item.name"
activeColor="#99241B ">
</u-radio>
</u-radio-group>
</scroll-view>
<u-button class="custom-style" style="background-color:#99241B ; color: #FFFFFF; margin-top: 32rpx;"
type="default" @click="showTypes = false">确认</u-button>
</u-radio-group>
</u-popup>
<view class="form_line">

View File

@ -52,24 +52,19 @@
</view>
<!-- 红色按钮 -->
<view v-if="data.isEvaluate">
<view class="" v-if="data.artCountrysideState == 1 && data.state == 0">
<view class="" v-if="data.artCountrysideState == 3 && data.state == 0">
<view class="orderBtn">
<view class="btn" @click="toDp">下乡点评</view>
</view>
</view>
<view class="" v-else-if="data.artCountrysideState == 1 && data.state == 1">
<view class="" v-else-if="data.artCountrysideState == 2 && data.state == 1">
<view class="orderBtn">
<view class="btnQ">已评价</view>
</view>
</view>
<view class="" v-else-if="data.artCountrysideState == 3">
<view class="orderBtn">
<view class="btnQ">已逾期</view>
</view>
</view>
</view>
<!-- 红色按钮ed -->
<view class="activityDetails">
<view class="activityDetails" v-if="data.artCountrysideState == 2">
<view class="item_ul">
<view class="title">
<image class="icon" src="../../static/detailIcon/icon0.png" mode="scaleToFill"></image>
@ -95,6 +90,7 @@
<view class="ppEva">
{{ data.evaluate }}
</view>
<image v-if="imgArr.length > 0" v-for="(v, i) in imgArr" class="imgSt" :src="v" mode="widthFix" :key="i"></image>
</view>
</view>
</view>
@ -112,6 +108,7 @@
list: [],
list2: [],
userList: [],
imgArr: [],
currentNum: 0,
isCheck: 0,
}
@ -128,6 +125,10 @@
this.http.request(`/artCountryside/details?id=${this.id}`, {}, 'GET').then(res => {
if (res.code == 200) {
this.data = res.data
if (res.data.photos) {
this.imgArr = res.data.photos.split(",")
}
console.log((this.imgArr))
this.load = false
} else {
this.load = false
@ -211,22 +212,32 @@
.pgPart {
padding: 24rpx;
.ppTop {
display: flex;
font-size: 32rpx;
.pptImg {
width: 88rpx;
height: 88rpx;
margin-right: 20rpx;
}
}
.ppTime {
font-size: 24rpx;
margin: 20rpx 0 0;
}
.ppEva {
padding: 20rpx 0;
}
.imgSt {
width: 100%;
overflow: hidden;
margin: 20rpx 0;
}
}
}
}

View File

@ -136,15 +136,9 @@
this.http
.request(`/artCountryside/list`, data, "GET")
.then((res) => {
if (res.code === 200) {
if (res.code == 200) {
this.mainList = res.data.records;
this.loadings = false;
} else {
this.loadings = false;
uni.showToast({
title: res.message,
icon: "error",
});
}
})
.catch((err) => {

View File

@ -19,10 +19,10 @@
<view class="title">
{{ item.title }}
</view>
<view class="tag_sta_end" v-if="item.state == '2'"> 已完成 </view>
<view class="tag_sta_fail" v-if="item.state == '3'">已逾期</view>
<view class="tag_sta_end" v-if="item.state == '1'"> 进行中 </view>
<view class="tag_sta_end" v-if="item.state == '0'">
<view class="tag_sta_end" v-if="item.artCountrysideState == '2'"> 已完成 </view>
<view class="tag_sta_fail" v-if="item.artCountrysideState == '3' && item.state == 0">待评价</view>
<view class="tag_sta_end" v-if="item.artCountrysideState == '1'"> 进行中 </view>
<view class="tag_sta_end" v-if="item.artCountrysideState == '0'">
未开始
</view>
</view>
@ -31,21 +31,21 @@
{{ onDate(item.endTime) }}
</view>
</view>
</view>
<view v-if="!(issueList.length > 0)">
<u-empty mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png">
</u-empty>
</view>
</view>
<view v-if="tabNum == 2">
<view class="art_act_itm" v-for="(item, i) in receivingList" :key="i">
<image @click="goActDeat(item.id)" :src="item.photos" mode=""></image>
<view class="bottom_part" style="padding: 0 12px">
<view class="ddd" style="display: flex;justify-content: space-between;align-items: center;">
<view class="tag_sta_end" v-if="item.state == '2'"> 已完成 </view>
<view class="tag_sta_fail" v-if="item.state == '3'">已逾期</view>
<view class="tag_sta_end" v-if="item.state == '1'"> 进行中 </view>
<view class="tag_sta_end" v-if="item.state == '0'">
<view class="tag_sta_end" v-if="item.artCountrysideState == '2'"> 已完成 </view>
<view class="tag_sta_fail" v-if="item.artCountrysideState == '3' && item.state == 0">待评价</view>
<view class="tag_sta_end" v-if="item.artCountrysideState == '1'"> 进行中 </view>
<view class="tag_sta_end" v-if="item.artCountrysideState == '0'">
未开始
</view>
</view>
@ -62,7 +62,6 @@
</view>
</view>
</view>
</view>
</template>
<script>
@ -97,7 +96,7 @@
id: "",
};
},
onShow() {
onLoad() {
this.isAdmin = uni.getStorageSync("isAdmin");
this.isVillageAdmin = uni.getStorageSync("isVillageAdmin");
this.tabNum = this.isAdmin ? 1 : this.isVillageAdmin ? 2 : null;

View File

@ -5,10 +5,10 @@
export default {
config: {
// baseUrl: "http://192.168.1.3:8080/h5/api", //俞燕红-小程序不能配跨域
// baseUrl: "http://192.168.1.31:8080/h5/api", //俞燕红-小程序不能配跨域
// baseUrl: "/pre", //俞燕红-跨域
baseUrl: "https://yxx.ydool.net/h5/api", //线上
// baseUrl: "/h5/api", //h5
// baseUrl: "https://yxx.ydool.net/h5/api", //线上
baseUrl: "/h5/api", //h5
header: {
'Content-Type': 'application/json;charset=UTF-8',
// 'Content-Type':'application/x-www-form-urlencoded'