xiangshan
/
yxxh5
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新

This commit is contained in:
lnn19986213 2023-09-15 15:46:32 +08:00
parent db413baf43
commit 55d4ccb7d8
12 changed files with 471 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/manifest.json
View File

@ -96,7 +96,7 @@
// 与vue中的proxyTable配置大致上一致,此处我同时代理了两个
"/pre" : {
// 预发布
"target" : "http://192.168.1.20:8080/h5/api", // 目标接口域名
"target" : "http://192.168.1.4:8080/h5/api", // 目标接口域名
// "target" : "https://yxx.ydool.net/h5/api", // 目标接口域名
"changeOrigin" : true, // 是否跨域

7
src/pages.json
View File

@ -608,6 +608,13 @@
"enablePullDownRefresh": false
}
},
{
"path": "jgsz/detail",
"style": {
"navigationBarTitleText": "人员详情",
"enablePullDownRefresh": false
}
},
// 文艺下乡
{
"path": "wyxx/index",

2
src/pagesB/ArtRace/ArtRace.vue
View File

@ -11,7 +11,7 @@
<image style="width: 100%; height: 296rpx;" :src="v.file" mode=""></image>
<view class="art_race_bot">
<text class="art_title">{{v.name}}</text>
<view class="art_race_con u-line-2">{{v.content}}</view>
<!-- <view class="art_race_con u-line-2">{{v.content}}</view> -->
<view class="art_race_con">
截止时间：{{v.endTime}}
</view>

8
src/pagesB/ArtRace/ArtRaceDetail.vue
View File

@ -23,7 +23,7 @@
<view class="text1">比赛内容</view>
</view>
<view class="text2">
{{data.content}}
<u-parse :content="data.content"></u-parse>
</view>
</view>
</view>
@ -288,9 +288,9 @@
}
.text2 {
font-size: 28rpx;
color: #32333C;
line-height: 48rpx;
// font-size: 28rpx;
// color: #32333C;
// line-height: 48rpx;
}
}

6
src/pagesB/PersonalCenter/PersonalCenter.vue
View File

@ -127,8 +127,7 @@
<u-icon name="arrow-right"></u-icon>
</view>
</view>
<!-- <view class="person_itm_sign" @click="goChangeInfo('艺术成就',JSON.parse(userInfoObj.artAtt))"> -->
<view class="person_itm_sign" @click="goChangeInfo('艺术成就',JSON.parse(userInfoObj.artAtt))">
<!-- <view class="person_itm_sign" @click="goChangeInfo('艺术成就',JSON.parse(userInfoObj.artAtt))">
<text class="person_itm_sign_tit">艺术成就</text>
<view class="person_itm_sign_right">
@ -143,12 +142,11 @@
</view>
</view>
<view class="person_itm_sign" @click="goChangeInfo('代表作',JSON.parse(userInfoObj.opus))">
<!-- <view class="person_itm_sign" @click="goChangeInfo('代表作',JSON.parse('[null]'))"> -->
<text class="person_itm_sign_tit">代表作</text>
<view class="person_itm_sign_right">
<u-icon name="arrow-right"></u-icon>
</view>
</view>
</view> -->
</view>
</view>
</template>

14
src/pagesB/improveData/improveData.vue
View File

@ -44,7 +44,7 @@
<text class="label_t"><text style="color: #99241B;">*</text>学历</text>
<u--input class="p32" placeholder="请选择学历" v-model="model1.userInfo.education" readonly inputAlign="right"
border="none">
<!-- <u-icon slot="suffix" name="arrow-right"></u-icon> -->
<u-icon slot="suffix" name="arrow-right"></u-icon>
</u--input>
</u-form-item>
@ -136,7 +136,7 @@
</u--input>
</u-form-item>
</view>
<view class="data_itm_box">
<!-- <view class="data_itm_box">
<u-form-item ref="item1" label='艺术成就' class="data_itm te">
<view class="chen_itm" v-for="(v,i) in artlist" :key="i">
<input type="text" v-model.trim="artlist[i]" placeholder="请输入艺术成就" class="chengjiu" />
@ -197,7 +197,7 @@
</view>
</view>
</u-form-item>
</view>
</view> -->
</view>
<view class="operation">
<button type="default" class="next" @click="submit">登录</button>
@ -745,21 +745,21 @@
let that = this.model1.userInfo
let data = {
// "phone": that.phoneNum,
artAtt: yishucj,
artAtt: '',
associationId: this.xiehuiId,
base: this.jiguan,
birthDay: that.birthday,
dateBirth: that.dateBirth,
cfPhoto: fl4,
comeTime: that.jionTime,
greats: rongyujx,
greats: '',
idCard: that.idCOde,
images: fl3,
info: that.serverInstrutor,
isAssociation: this.isJioned,
nation: this.zuValue,
// "nickName": "",
opus: opsArr,
opus: [],
password: that.pasw,
photo: fl1,
politics: this.zhengzhiValue,
@ -785,12 +785,10 @@
if (!data.userName || !data.sex || !data.dateBirth || !data.images || !data.password || !data.education || !
data.mailAddress || !data.politics) {
this.upLoadReady = false
console.log(zyz)
}
if (this.pageTypeId == 'wyrc') {
if (!data.member || !data.unitName || !data.officeTel || !data.associationId) {
this.upLoadReady = false
console.log(wyrc)
}
}
if (this.upLoadReady) {

2
src/pagesC/Login/Login.vue
View File

@ -48,7 +48,7 @@
<u-button text="登录" size="large" throttleTime=1000 color="#99241B" @click="login()">
</u-button>
<u-gap height="12"></u-gap>
<u-button v-if="isWx" text="微信一键登录" size="large" throttleTime=1000 color="#99241B" open-type="getPhoneNumber"
<u-button v-if="isWx" text="手机号快捷登录" size="large" throttleTime=1000 color="#99241B" open-type="getPhoneNumber"
@getphonenumber="getPhoneNumber" :plain="true">
</u-button>
<view class="other_op">

45
src/pagesC/famousArts/famousArts.vue
View File

@ -23,8 +23,7 @@
</view>
</view>
<!-- tabs -->
<!-- <u-tabs @click="clickTab" :scrollable="false" :list="list1"
:lineColor="`url(${lineBg}) 100% 100%`"
<u-tabs @click="clickTab" :scrollable="false" :list="list1" :lineColor="`url(${lineBg}) 100% 100%`"
:activeStyle="{
color: '#251B1D',
fontWeight: 'bold',
@ -33,21 +32,19 @@
color: '#AFADB0 ',
transform: 'scale(1)'
}" itemStyle=" height: 50px; ">
</u-tabs> -->
</u-tabs>
<!-- tabs ed -->
</view>
<view class="famous_bot">
<u-empty v-if="achievement.length == 0 && honor.length == 0 && represe.length == 0" mode="data" icon="../../static/orderE.png" marginTop="120">
<view class="famous_bot" v-show="id=='1'">
<u-parse v-if="achievement" :content="achievement"></u-parse>
<u-empty v-else mode="data" icon="../../static/orderE.png" marginTop="120">
</u-empty>
<view class="famous_bot_itm" v-for="(v,i) in achievement" :key="i">
<view class="ico">
<image src="../../static/FamousArts/redStart.png"></image>
</view>
<view class="con">
{{v}}
</view>
</view>
<view class="famous_bot" v-show="id=='2'">
<u-empty v-if="honor.length == 0" mode="data" icon="../../static/orderE.png" marginTop="120">
</u-empty>
<view class="famous_bot_itm" v-for="(v,i) in honor" :key="i">
<view class="ico" style="padding-right: 8rpx;">
<image style="width: 32rpx; height: 32rpx; vertical-align: bottom;"
@ -57,6 +54,11 @@
{{v}}
</view>
</view>
</view>
<view class="famous_bot" v-show="id=='3'">
<u-empty v-if="represe.length == 0" mode="data" icon="../../static/orderE.png" marginTop="120">
</u-empty>
<view class="famous_bot_itm" style="display: block;" v-for="(v,i) in represe" :key="i">
<view class="works" v-for="(a,b) in v.value" :key="b">
<image :src="a" mode=""></image>
@ -79,7 +81,7 @@
id: "1",
userId: '',
list1: [{
name: '艺术成就',
name: '简介',
id: '1'
}, {
name: '荣誉奖项',
@ -105,7 +107,9 @@
methods: {
getArtist() {
let _this = this
this.http.request('/indexImage/artistsDetails', {id:this.userId}, "GET").then(res => {
this.http.request('/indexImage/artistsDetails', {
id: this.userId
}, "GET").then(res => {
if (res.code == 200) {
if (res.data.images) {
// let img = JSON.parse(res.data.images)
@ -113,15 +117,9 @@
} else {
_this.userImg = '../../static/txIcon.png'
}
//成就
if (res.data.artAtt) {
let art = JSON.parse(res.data.artAtt)
_this.achievement = art
}else{
_this.achievement = []
}
_this.achievement = res.data.artAtt
//荣誉
if (res.data.greats) {
if (res.data.greats && res.data.greats != 'null') {
let great = JSON.parse(res.data.greats)
_this.honor = great
} else {
@ -149,7 +147,8 @@
},
goTalk() {
uni.navigateTo({
url:"/pagesA/msg/chat/chat?name=" + this.userName + '&linkId=' + '' + '&toUser=' + this.userId + '&toUserImg=' + this.userImg
url: "/pagesA/msg/chat/chat?name=" + this.userName + '&linkId=' + '' + '&toUser=' + this
.userId + '&toUserImg=' + this.userImg
})
// uni.showToast({
// title:"发起聊天"

308
src/pagesD/jgsz/detail.vue Normal file
View File

@ -0,0 +1,308 @@
<template>
<view class="">
<view class="">
<u-loading-page :loading="load"></u-loading-page>
</view>
<view class="page" v-if="load == false">
<view class="main">
<!-- <view class="mainTitle">{{ data.title }}</view> -->
<view class="textList">
<view class="type">
<view class="text1" style="margin-right: 12rpx">{{ data.userName }}
</view>
<view class="text2 text3">{{ data.identity }}</view>
</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.officePhone }}
</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.phone }}
</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">
<u-parse :content="data.introduce"></u-parse>
</view>
</view>
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
load: true,
id: "",
data: {},
list: [],
currentNum: 0,
isCheck: 0,
};
},
onLoad(op) {
this.id = op.id
},
onShow() {
this.getData()
},
methods: {
getData() {
let _this = this
this.http.request('/organPerson/details', {
id: this.id,
}, "GET").then(res => {
if (res.code == 200) {
this.data = res.data
this.load = false
}
}).catch(e => {
uni.showToast({
title: e.data.message,
icon: "none",
});
})
},
},
};
</script>
<style lang="scss" scoped>
image {
height: 100%;
width: 100%;
}
.page {
.return {
position: fixed;
left: 24rpx;
top: 110rpx;
z-index: 10;
image {
width: 48rpx;
height: 48rpx;
}
}
.pageImg {
height: 440rpx;
.img {
width: 100%;
height: 100%;
}
}
.main {
padding: 32rpx;
.mainTitle {
font-size: 36rpx;
font-weight: 600;
color: #251b1d;
margin-bottom: 28rpx;
}
.textList {
margin-bottom: 24rpx;
.type {
display: flex;
height: 48rpx;
line-height: 48rpx;
.textImg {
width: 32rpx;
height: 32rpx;
margin-top: 10rpx;
margin-right: 16rpx;
}
.text1 {
font-size: 32rpx;
font-weight: 600;
color: #32333c;
}
}
.text2 {
font-size: 28rpx;
color: #32333c;
line-height: 40rpx;
}
.text3 {
color: #99241b;
border-radius: 50rpx;
padding: 4rpx 20rpx;
background-color: #eeeeee;
}
}
.file_box {
width: 92%;
height: 64px;
margin: 10px 4%;
font-family: PingFangSC-Semibold, PingFang SC;
font-weight: 600;
color: #251b1d;
background: #f4f5f7;
border-radius: 6px;
overflow: hidden;
.file_box_left {
width: 40px;
height: 40px;
margin-top: 12px;
margin-left: 12px;
float: left;
.file_box_left_img {
width: 40px;
height: 40px;
}
}
.file_box_right {
margin-left: 20px;
float: left;
.file_box_name {
height: 64px;
line-height: 64px;
font-size: 16px;
font-weight: 600;
color: #251b1d;
}
}
}
}
.line {
height: 16rpx;
background: #f4f5f7;
}
.activityDetails {
.item_ul {
.title {
font-size: 32rpx;
font-weight: bold;
padding: 24rpx;
display: flex;
background: #f4f5f7;
.icon {
width: 40rpx;
height: 40rpx;
margin-right: 10rpx;
// display: none;
}
}
.item_li {
padding: 16rpx 32rpx 32rpx;
margin: 16rpx 0;
border-bottom: 2rpx solid #f1f1f1;
display: flex;
// justify-content: space-between;
align-items: center;
font-weight: 600;
.standard {
display: flex;
align-items: center;
margin-right: 10rpx;
.icon {
width: 32rpx;
height: 32rpx;
// display: none;
}
text {
color: #251b1d;
// color: $gray;
margin-left: 8rpx;
}
}
}
}
}
.orderBtn {
width: 100%;
background-color: #fff;
padding-bottom: 20rpx;
.btn {
width: calc(100% - 64rpx);
height: 96rpx;
line-height: 96rpx;
text-align: center;
background: #99241b;
border-radius: 8rpx;
font-size: 32rpx;
font-weight: 600;
color: #ffffff;
margin: 0 auto;
}
.btnQ {
width: calc(100% - 64rpx);
height: 96rpx;
line-height: 96rpx;
text-align: center;
background: #f9f2f2;
border-radius: 8rpx;
font-size: 32rpx;
font-weight: 600;
color: #99241b;
margin: 0 auto;
}
}
.bao_title {
width: 686rpx;
margin: 20rpx 32rpx;
font-size: 28rpx;
font-weight: 500;
color: #32333c;
}
.per_line {
width: 686rpx;
margin: 10rpx 32rpx;
display: flex;
align-items: center;
.oer_image {
width: 88rpx;
height: 88rpx;
border-radius: 50%;
margin-left: 30rpx;
}
}
}
</style>

28
src/pagesD/jgsz/index.vue
View File

@ -1,6 +1,10 @@
<template>
<!-- 文艺下乡 -->
<view class="wyxx" :style="{backgroundImage: 'url('+background+')'}">
<view class="">
<view class="" v-if="load">
<u-loading-page :loading="load"></u-loading-page>
</view>
<view v-if="!load" class="wyxx" :style="{backgroundImage: 'url('+background+')'}">
<view class="tabTitle">
<view :class="tabC == '2' ? 'tabsC' : 'tabs'" @click="toTab('2')">
<view> 发展历程 </view>
@ -20,7 +24,7 @@
</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">
<view class="teamBox" v-for="item in list" :key="item.id" @click="toDetail(item.id)">
<view class="teamBox-right">
<view class="item-image">
{{ item.userName }}
@ -33,7 +37,10 @@
<view class="street">{{ item.identity }}</view>
</view>
<view class="teamMinbox-bottom">
{{ item.introduce }}
办电：{{ item.officePhone }}
</view>
<view class="teamMinbox-bottom">
手机：{{ item.phone }}
</view>
</view>
</view>
@ -55,6 +62,7 @@
</p>
</view>
</view>
</view>
</template>
<script>
@ -64,7 +72,8 @@
tabC: "0",
list: [],
background:'',
zzjg: ''
zzjg: '',
load: true,
};
},
onShow() {
@ -73,7 +82,8 @@
methods: {
get() {
this.http
.request("/organPerson/list", {}, "GET")
.request("/organPerson/list", {page: 1,
size: 100,}, "GET")
.then((res) => {
if (res.code == 200) {
this.list = res.data.records;
@ -111,6 +121,7 @@
if (res.code == 200) {
this.zzjg = res.data[0].imagePath
this.background = res.data[1].imagePath
this.load = false
}
}).catch(e => {
uni.showToast({
@ -119,6 +130,11 @@
});
})
},
toDetail(id) {
uni.navigateTo({
url: `/pagesD/jgsz/detail?id=${id}`,
});
}
},
};
</script>
@ -233,7 +249,7 @@
color: #a02521;
margin-left: 18rpx;
padding: 2rpx 20rpx;
max-width: 120rpx;
max-width: 320rpx;
overflow: hidden;
/* 超出一行文字自动隐藏 */
text-overflow: ellipsis;

78
src/pagesD/xskz/index.vue
View File

@ -1,7 +1,10 @@
<template>
<view class="wyxx">
<view class="forms">
<view class="teamBox" v-for="item in list" :key="item.id">
<view class="teamBox" v-for="(item,index) in list" :key="item.id">
<view class="teamBox-title">
{{ item.name }}
</view>
<view class="teamBox-top" @click="toDetail(item.id)">
<image :src="item.cover" mode="" style="width: 100%; height: 100%;"></image>
</view>
@ -12,7 +15,7 @@
</view>
<view class="interactive">
<image src="../../static/workDetail/heart2.png" class="bot_img" v-if="item.isGreat"
@click="clickHeart()">
@click="clickHeart(item.isGreat, item.id)">
</image>
<image src="../../static/workDetail/heart1.png" class="bot_img" v-else
@click="clickHeart(item.isGreat, item.id)">
@ -23,7 +26,7 @@
</view>
<view class="interactive">
<image src="../../static/workDetail/star2.png" class="bot_img" v-if="item.isColl"
@click="clickStar()"></image>
@click="clickStar(item.isColl, item.id)"></image>
<image src="../../static/workDetail/star1.png" class="bot_img" v-else
@click="clickStar(item.isColl, item.id)">
</image>
@ -47,8 +50,10 @@
size: 10,
};
},
onShow() {
onLoad() {
// this.getData();
// this.list = []
// this.pages = 1
this.get();
},
onPullDownRefresh() {
@ -79,6 +84,8 @@
if (val0) {
this.http.request('/worksGreat/delGreat?type=3&workId=' + val1, "POST").then(res => {
if (res.code == 200) {
this.pages = 1
this.list = []
this.get()
}
}).catch(e => {
@ -90,6 +97,8 @@
} else {
this.http.request('/worksGreat/addGreat?type=3&workId=' + val1, "POST").then(res => {
if (res.code == 200) {
this.pages = 1
this.list = []
this.get()
}
}).catch(e => {
@ -105,6 +114,8 @@
if (val0) {
this.http.request('/worksCollection/delCollection?workId=' + val1 + '&type=3', "POST").then(res => {
if (res.code == 200) {
this.pages = 1
this.list = []
this.get()
}
}).catch(e => {
@ -116,6 +127,8 @@
} else {
this.http.request('/worksCollection/addCollection?workId=' + val1 + '&type=3', "POST").then(res => {
if (res.code == 200) {
this.pages = 1
this.list = []
this.get()
}
}).catch(e => {
@ -229,61 +242,22 @@
padding-top: 40rpx;
.teamBox {
.teamBox-title{
font-size: 32rpx;
width: 686rpx;
margin: 0 32rpx 10rpx;
font-weight: bold
}
.teamBox-top {
position: relative;
width: 100%;
width: 686rpx;
margin: 0 32rpx 10rpx;
height: 400rpx;
.content {
position: relative;
z-index: 4;
.content-title {
position: absolute;
z-index: 10;
padding: 18rpx;
text {
color: #fff;
max-width: 500rpx;
overflow: hidden;
/* 超出一行文字自动隐藏 */
text-overflow: ellipsis;
/*文字隐藏后添加省略号*/
white-space: nowrap;
}
}
.team-image {
width: 100%;
height: 400rpx;
}
}
.mask {
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
z-index: 12;
display: flex;
align-items: center;
justify-content: center;
.mask-play {
image {
width: 60rpx;
height: 60rpx;
}
}
}
}
.teamBox-bottom {
display: flex;
justify-content: space-between;
padding: 15rpx 32rpx;
padding: 15rpx 32rpx 50rpx;
background-color: #fff;
box-sizing: border-box;

2
src/request/interface.js
View File

@ -5,7 +5,7 @@
export default {
config: {
// baseUrl: "http://192.168.1.20:8080/h5/api", //俞燕红-小程序不能配跨域
// baseUrl: "http://192.168.1.4:8080/h5/api", //俞燕红-小程序不能配跨域
// baseUrl: "/pre", //俞燕红-跨域
baseUrl: "https://yxx.ydool.net/h5/api", //线上
// baseUrl: "/h5/api", //h5