Skip to content

tjty-app
tjty-app
Commit 228173ed authored by LiZongLin's avatar LiZongLin
Browse files
Options

Merge branch 'dev' of http://gitlab.91isoft.com:90/wyf/tjty-app into dev

parents 8928fe42 7c32ddc0
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 69 deletions
tjty-app/pages_activity/activity_detail/activity_detail.vue
View file @ 228173ed
......@@ -10,7 +10,7 @@
</view>
<view class="font-body">
<view class="activity_font">活动名称:<text>{{activityObject.activityName}}</text></view>
<view class="activity_font">报名截止:<text>{{activityObject.signupTime}}</text></view>
<view class="activity_font">报名截止:<text>{{!activityObject.signupTime ? '--' : activityObject.signupTime }}</text></view>
<view class="activity_font">活动时间:<text>{{activityObject.activityTime}}</text></view>
<view class="activity_font" style="padding-bottom: 10rpx;">活动地点:<text>{{activityObject.tjtActivityProjectVoList[0].matchAddress}}</text></view>
</view>
......
tjty-app/pages_new_media/tity_message_consult/tity_message_consult.vue
View file @ 228173ed
......@@ -6,8 +6,8 @@
<uni-forms-item name="consultContent">
<textarea class="content-textarea" v-model="personnel.consultContent" placeholder="请输入内容" />
</uni-forms-item>
<uni-forms-item label="姓名" :required="true" name="nickname">
<uni-easyinput :inputBorder="false" type="text" v-model="personnel.nickname" placeholder="请输入姓名"
<uni-forms-item label="姓名" :required="true" name="nickName">
<uni-easyinput :inputBorder="false" type="text" v-model="personnel.nickName" placeholder="请输入姓名"
placeholder-style="text-margin: left;" />
</uni-forms-item>
<uni-forms-item label="手机号" :required="true" name="phone">
......@@ -51,13 +51,13 @@
url: '',
personnel: {
consultContent: '',
nickname: '',
nickName: '',
phone: '',
wechatId: '',
},
rules: {
// 对name字段进行必填验证
nickname: {
nickName: {
rules: [{
required: true,
errorMessage: '请输入姓名',
......@@ -94,7 +94,7 @@
...mapState('m_user', ['userInfo'])
},
onLoad(options) {
this.wechatId = this.userInfo.wechatId
this.personnel.wechatId = this.userInfo.wechatId
console.log("this.userInfo:",this.userInfo)
this.url = options.url
},
......@@ -108,10 +108,9 @@
this.$refs.form.validate().then(res => {
console.log("数据：", this.personnel)
console.log("数据--->：", this.personnel)
submitConsultAxios(this.personnel).then(response => {
console.log("提交咨询：", response)
console.log("wechatId:", this.wechatId)
if (response.code == 200) {
// 打开弹窗
this.$refs.popup.open('center')
......
tjty-app/pages_new_media/tity_new_media/tity_new_media.vue
View file @ 228173ed
......@@ -98,7 +98,7 @@
this.isloading = true
listNewMediaAxios().then(res => {
console.log(res);
if (res.code == 200) {
if (res.code == 200 && res.rows.length !== 0) {
this.flag = 1
this.issue = res.rows[0]
this.issue.pushTime = this.issue.pushTime.substring(0, 16).replace('T', ' ')
......
tjty-app/pages_new_media/tity_upload_port/tity_upload_port.vue
View file @ 228173ed
<template>
<view>
<view>
<view class="upload-personnel">
<view>
1.请选择参赛人员
</view>
<view style="margin: 0 30rpx 0 0; width: 100%; overflow: hidden;">
<view style="width: 50%; float: left;margin-top: 40rpx;" v-model="item.signupId"
v-for="item in personnelList">
<view :class="item.signupId === uploadOpus.signupId ? 'but-personnel-hover' : 'but-personnel'"
@click="soutPersonnel(item.signupId)">{{item.name}}</view>
</view>
</view>
<view class="clear" style="width: 100%; margin-top: 60rpx;">
2.请输入作品简介
<noData v-if="flag == 0"></noData>
<view v-if="flag == 1">
<view>
<view class="upload-personnel">
<view>
<!-- <textarea class="content-textarea" v-model="uploadOpus.opusBrief" @blur="bindTextAreaBlur" placeholder="请输入内容"/> -->
<textarea class="content-textarea" v-model="uploadOpus.opusBrief" placeholder="请输入内容" />
1.请选择参赛人员
</view>
</view>
<view class="clear" style="width: 100%; margin-top: 60rpx;">
3.请选择需要上传的图片/视频
<view style="margin-top:40rpx; margin-left: 20rpx;overflow: hidden;">
<view class="example-body">
<!-- 上传视频或者图片 -->
<view class="up-page">
<!--图片-->
<view class="show-box" v-for="(item,index) in imageList" :key="index">
<view class="delect-icon" @tap="delect(index)">
<image class="full" :src="clearIcon" mode=""></image>
<!--图片或者视频上传成功了，点击右上角叉号-->
<view style="margin: 0 30rpx 0 0; width: 100%; overflow: hidden;">
<view style="width: 50%; float: left;margin-top: 40rpx;" v-model="item.signupId"
v-for="item in personnelList">
<view
:class="item.signupId === uploadOpus.signupId ? 'but-personnel-hover' : 'but-personnel'"
@click="soutPersonnel(item.signupId)">{{item.name}}</view>
</view>
</view>
<view class="clear" style="width: 100%; margin-top: 60rpx;">
2.请输入作品简介
<view>
<!-- <textarea class="content-textarea" v-model="uploadOpus.opusBrief" @blur="bindTextAreaBlur" placeholder="请输入内容"/> -->
<textarea class="content-textarea" v-model="uploadOpus.opusBrief" placeholder="请输入内容" />
</view>
</view>
<view class="clear" style="width: 100%; margin-top: 60rpx;">
3.请选择需要上传的图片/视频
<view style="margin-top:40rpx; margin-left: 20rpx;overflow: hidden;">
<view class="example-body">
<!-- 上传视频或者图片 -->
<view class="up-page">
<!--图片-->
<view class="show-box" v-for="(item,index) in imageList" :key="index">
<view class="delect-icon" @tap="delect(index)">
<image class="full" :src="clearIcon" mode=""></image>
<!--图片或者视频上传成功了，点击右上角叉号-->
</view>
<image class="full" :src="item" :data-src="image" @tap="previewImage(item)">
</image>
</view>
<image class="full" :src="item" :data-src="image" @tap="previewImage(item)">
</image>
</view>
<!--视频-->
<view class="show-box" v-for="(item1, index1) in videoList" :key="index1">
<video class="full" :src="item1"></video>
<view class="delect-icon" @tap="delectVideo(index1)">
<image class="full" :src="clearIcon" mode=""></image>
<!--视频-->
<view class="show-box" v-for="(item1, index1) in videoList" :key="index1">
<video class="full" :src="item1"></video>
<view class="delect-icon" @tap="delectVideo(index1)">
<image class="full" :src="clearIcon" mode=""></image>
</view>
</view>
<view v-if="VideoOfImagesShow" @tap="chooseVideoImage" class="box-mode">
<image class="full" :src="selectfile" mode=""></image>
</view>
</view>
<view v-if="VideoOfImagesShow" @tap="chooseVideoImage" class="box-mode">
<image class="full" :src="selectfile" mode=""></image>
</view>
</view>
</view>
</view>
</view>
<view
style="width: 560rpx; margin: 28rpx 20rpx 66rpx 20rpx; color: #F28723; font-size: 24rpx; line-height: 40rpx;">
上传说明：* 图片只能上传jpg、jpeg、png，大小不能超过1M；可以上传多张图片；2）视频只能上传mp4，大小不能超过20M
<view
style="width: 560rpx; margin: 28rpx 20rpx 66rpx 20rpx; color: #F28723; font-size: 24rpx; line-height: 40rpx;">
上传说明：* 图片只能上传jpg、jpeg、png，大小不能超过1M；可以上传多张图片；2）视频只能上传mp4，大小不能超过20M
</view>
</view>
</view>
</view>
<view class="but-submit-view">
<button class="but-submit" @click="submitUpload()">上传</button>
<view class="but-submit-view">
<button class="but-submit" @click="submitUpload()">上传</button>
</view>
</view>
</view>
</template>
......@@ -102,6 +96,7 @@
isloading: false,
colin: 0, //选中的某项
isSelected: true,
flag: '',
wechatId: '',
queryParams: {
pageNum: 1,
......@@ -136,7 +131,7 @@
maxCountVideo: 1,
}
},
computed: {
computed: {
...mapState('m_user', ['userInfo']),
...mapState('m_user', ['token'])
},
......@@ -155,7 +150,7 @@
return this.uploadOpus
},
getPersonnelList() {
uni.showLoading({
title: '加载中',
mask: true
......@@ -163,8 +158,10 @@
//打开节流阀
this.isloading = true
//后端获取正式数据
console.log("后端获取正式数据--->", this.wechatId, "-------", this.activityId )
getPersonnelListAxios(this.wechatId, this.activityId).then(response => {
if (response.code == 200) {
if (response.code == 200 && response.data.length !== 0) {
this.flag = 1
//关闭加载中
setTimeout(function() {
uni.hideLoading();
......@@ -176,6 +173,7 @@
// this.fileType = 2
console.log("this.customerList->", this.personnelList)
} else {
this.flag = 0
uni.showToast({
title: '加载数据失败',
duration: 1000,
......@@ -335,7 +333,7 @@
console.log("要上传的信息：", this.uploadOpus)
// 新建一个新的列表，用来接收图片或者视频数组
let opusList = []
if(this.uploadOpus.signupId == ''){
if (this.uploadOpus.signupId == '') {
uni.showToast({
title: '请选择需要上传作品的参赛人员',
icon: 'none'
......@@ -516,6 +514,7 @@
font-size: 36rpx;
border-radius: 32rpx;
}
/* 上传图片、视频的css */
/* 统一上传后显示的盒子宽高比 */
.box-mode {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment