Skip to content

T
techbook
Commit e3d27eca authored by zhangyanni's avatar zhangyanni
Browse files
Options

Merge remote-tracking branch 'origin/dev5.0.1' into dev5.0.1

parents bfea9a8f 0c820129
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 133 additions and 39 deletions
.env
View file @ e3d27eca
NODE_ENV="production"
VUE_APP_URL="prod"
API_ROOT="/"
VUE_APP_UPDATED="5.0.01"
VUE_APP_UPDATED="5.3.01"
VUE_APP_UPLOAD_IMG="/base/upload/uploadPicture"
VUE_APP_UPLOAD_FILE="/base/upload/uploadFile"
VUE_APP_UPLOAD_LOGO="/base/upload/uploadLogo"
.env.dev
View file @ e3d27eca
NODE_ENV="production"
VUE_APP_URL="dev"
API_ROOT="/"
VUE_APP_UPDATED="5.0.01"
VUE_APP_UPDATED="5.3.01"
VUE_APP_UPLOAD_IMG="/base/upload/uploadPicture"
VUE_APP_UPLOAD_FILE="/base/upload/uploadFile"
VUE_APP_UPLOAD_LOGO="/base/upload/uploadLogo"
public/css/phone.scss
View file @ e3d27eca
......@@ -2807,4 +2807,20 @@ i, em {
}
}
.errorDialogWrap{
.el-dialog{
min-height: 200px !important;
}
.el-dialog__header{
height: 0;
padding: 0;
}
.el-dialog__footer{
position: absolute;
bottom: 0;
left: 0;
width: 100%;
}
}
}
\ No newline at end of file
public/version.json
View file @ e3d27eca
{
"version":"5.0.01"
"version":"5.3.01"
}
\ No newline at end of file
src/App.vue
View file @ e3d27eca
......@@ -108,7 +108,7 @@
}
});
var version = this.version; //版本号（每次上线前需要更新下版本号）
var vvv ="5.0.01"
var vvv ="5.3.01"
if(vvv!=version){
this.version=vvv;
location.reload();
......
src/assets/js/public.js
View file @ e3d27eca
......@@ -779,7 +779,7 @@ export default {
//获取是否有openId ,如果没有就去授权
isHasOpendIdFunc(id) {
var hrefUrl = document.location.href.indexOf("?from=singlemessage") != -1?(document.location.href.replace("?from=singlemessage", "")).split("#/")[0]:document.location.href.indexOf("?from=groupmessage") != -1?(document.location.href.replace("?from=groupmessage", "")).split("#/")[0]:document.location.href.split("#/")[0];
var hrefUrl = document.location.href.indexOf("?from=singlemessage") != -1?(document.location.href.replace("?from=singlemessage", "")).split("#/")[0]:document.location.href.indexOf("?from=groupmessage") != -1?(document.location.href.replace("?from=groupmessage", "")).split("#/")[0]:document.location.href.indexOf("?from=timeline") != -1?(document.location.href.replace("?from=timeline", "")).split("#/")[0]:document.location.href.split("#/")[0];
var userInfo = this.getCookie("userInfo") ? JSON.parse(require('js-base64').Base64.decode(this.getCookie("userInfo"))) : null;
this.setUserInfoCookie("currentChannelId", id);
if(userInfo==null){
......
src/common/lang/en.js
View file @ e3d27eca
......@@ -1818,6 +1818,7 @@ module.exports = {
coverupload:'Upload cover',
proposal:'The recommended size is 750 * 420px; only supports PNG, JPG, JPEG, the maximum does not exceed 2M',
ismp4:'The uploaded file can only be in mp4 format',
isVideoSize:"Upload file size cannot exceed ",
video200m:'The size of the video you uploaded exceeds the limit. Please ensure that the video size is within 200M. After the video is processed, upload it again. Thank you for your cooperation!',
limitvideo:'The size of the video you uploaded exceeds the limit, you can use the compression tool to compress it before uploading!',
download:'Download',
......@@ -1922,9 +1923,11 @@ module.exports = {
errorAnswer4:"You can invite friends to participate in the red envelope collection.",
rules:"Rule",
htmlScan:"Save the QR code picture below, scan it with WeChat to participate in the activity",
viewCount:"Views"
viewCount:"Views",
videoForh5Title:"Video:If you have a project promotion video, please register on the PC",
resetAnswer:"Re-answer",
timeoutTitle1:"Time is up, you still have ",
timeoutTitle2:" a chance to continue to answer."
},
......@@ -2127,7 +2130,8 @@ module.exports = {
directscan:'Direct scan',
statistics:'Statistics',
participated:'Participated',
maximumlimit:'Maximum file size',
maximumlimit:'Maximum file size'
},
//直播
......
src/common/lang/zh.js
View file @ e3d27eca
......@@ -1916,6 +1916,7 @@ module.exports = {
coverupload:'上传封面',
proposal:'建议尺寸750*420px；仅支持PNG，JPG，JPEG，最大不超过2M',
ismp4:'上传文件只能是mp4格式',
isVideoSize:"上传文件大小不能超过",
video200m:'您上传的视频大小超出了限制范围，请保证视频大小在200M以内，视频处理一下再上传，谢谢您的配合！',
limitvideo:'您上传的视频大小超出了限制范围，可以通过压缩工具来压缩后再上传！',
download:'下载',
......@@ -2020,7 +2021,11 @@ module.exports = {
errorAnswer4:"您可邀请好友来参与领取红包",
rules:"规则",
htmlScan:"保存下面的二维码图片，用微信扫一扫参与活动",
viewCount:"浏览"
viewCount:"浏览",
videoForh5Title:"视频：如果您有项目宣传视频，请在PC端报名",
resetAnswer:"重新答题",
timeoutTitle1:"您答题超时，失去一次机会，你还有",
timeoutTitle2:"次机会。"
......@@ -2223,7 +2228,7 @@ module.exports = {
directscan:'直接扫描',
statistics:'统计',
participated:'已参与',
maximumlimit:'最大限制',
maximumlimit:'最大限制'
},
//直播
......
src/main.js
View file @ e3d27eca
......@@ -149,7 +149,7 @@ var getCookie = (function(){
})();
import { Loading,MessageBox } from 'element-ui';
import {Toast} from 'mint-ui';
var vvv ="5.0.01"
var vvv ="5.3.01"
if(vvv!=process.env.VUE_APP_UPDATED){
location.reload();
}
......
src/views/findeventpage/signupbar.vue
View file @ e3d27eca
This diff is collapsed.
src/views/index.vue
View file @ e3d27eca
......@@ -105,7 +105,7 @@
},
},
created(){
this.getDocumentFunc();
// this.getDocumentFunc();
if(this.indexwe==0||this.indexwe>2||this.indexwe==-2) {
this.isShow = true;
if(this.indexwe>2){
......@@ -123,7 +123,7 @@
})
},
activated(){
this.getDocumentFunc();
// this.getDocumentFunc();
if(this.indexwe==0||this.indexwe>2||this.indexwe==-2) {
this.isShow = true;
if(this.indexwe>2){
......
src/views/mobile/activityApply/answerCmpt.vue
View file @ e3d27eca
......@@ -7,6 +7,9 @@
</div>
</div>
<div class="changeWrap">
<div>
<span>答题倒计时：{{count}}s</span>
</div>
<div @click="handleChange">
<i class="iconfont icon-zhongbo-m"></i>
<span>{{$t("activityInfo.changeReturn")}}</span>
......@@ -50,7 +53,9 @@
questionList:[]
},
itemArr:null,
flag:0
flag:0,
timer:null,
count:'',
}
},
methods: {
......@@ -64,6 +69,9 @@
this.$forceUpdate();
this.getInitTopicListData();
this.submitData.questionList = [];
clearInterval(this.timer);
this.timer = null;
this.timeoutFunc();
},
......@@ -178,6 +186,7 @@
}
})
this.tableData = res.result;
this.timeoutFunc();
}else{
this.$toast(res.msg);
}
......@@ -193,6 +202,7 @@
this.submitData.questionList = this.itemArr;
if(this.flag==0){
this.flag++;
this.clearTimeout();
this.$emit("postFlagVal",this.submitData);
setTimeout(function(){
that.flag = 0;
......@@ -205,13 +215,36 @@
},1000);
}
},
//倒计时
timeoutFunc(){
const TIME_COUNT = 45;
if (!this.timer) {
this.count = TIME_COUNT;
this.timer = setInterval(() => {
if (this.count > 0 && this.count <= TIME_COUNT) {
this.count--;
} else {
clearInterval(this.timer);
this.timer = null;
this.submitData.questionList = [];
this.$emit("postFlagVal",this.submitData,1);
}
}, 1000)
}
},
clearTimeout(){
clearInterval(this.timer);
this.timer = null;
}
},
mounted() {
if(this.$route.query.flag==1) this.getInitTopicListData();
}
},
}
</script>
......@@ -248,7 +281,7 @@
.changeWrap {
display: flex;
justify-content: flex-end;
justify-content: space-between;
color: #fff;
align-items: center;
margin-bottom: .3rem;
......
src/views/mobile/activityApply/hasAfterCmpt.vue
View file @ e3d27eca
......@@ -17,13 +17,13 @@
</div>
<div class="submitAfterWrapper" v-if="$route.query.flag==5&&lang==1">
<p>提交成功，审核通过后领取红包，</p>
<p>红包将于24小时之内发放到您的微信服务通知里！</p>
<p>红包将于72小时之内发放到您的微信服务通知里！</p>
<p>可分享给好友，可得随机红包，</p>
<p><span class="moneytitle">幸运的用户</span>最高金额可达&nbsp;<span class="moneytitle">55 </span>&nbsp;元</p>
</div>
<div class="submitAfterWrapper" v-if="$route.query.flag==5&&lang==2">
<p>The submission is successful, and the red envelope will be received after the review is passed.</p>
<p>The red envelope will be issued to your WeChat service notification within 24 hours!</p>
<p>The red envelope will be issued to your WeChat service notification within 72 hours!</p>
<p>Can be shared with friends, get random red envelopes,</p>
<p><span class="moneytitle">Lucky users</span> can have up to &nbsp;<span class="moneytitle">55</span>&nbsp; yuan</p>
</div>
......
src/views/mobile/activityApply/list.vue
View file @ e3d27eca
......@@ -29,7 +29,7 @@
:class="item.activityState==2?'applying':item.activityState==3?'applyend':item.activityState==5?'activityEnd':''"
v-if="item.channelType!=5&&item.activityState!=1&&item.activityState!=4">{{item.activityState==2?$t("activityInfo.applying"):item.activityState==3?$t("activityInfo.applyEnd"):item.activityState==5?$t("activityInfo.activityEnd"):""}}</span>
<span class="activityStatusTip"
:class="item.activityState==2?'applying':item.activityState==3?'applyend':item.activityState==5?'activityEnd':''"
:class="item.activityState==2?'applying':item.activityState==3?'activityEnd':item.activityState==5?'activityEnd':''"
v-if="item.channelType==5&&item.activityState!=1&&item.activityState!=4">{{item.activityState==2?$t("pubactivities.conduct"):item.activityState==5?$t("activityInfo.activityEnd"):""}}</span>
<p class="readCount" v-if="item.readCountStr&&item.readCountStr!=0"><span>{{item.readCountStr}}&nbsp;&nbsp;{{$t("activityInfo.viewCount")}}</span></p>
......
src/views/mobile/activityApply/myjoin.vue
View file @ e3d27eca
......@@ -21,7 +21,7 @@
<div class="leftInfo">
<img :src="item.channelPic" alt="">
<span class="activityStatusTip" :class="item.activityState==2?'applying':item.activityState==3?'applyend':item.activityState==5?'activityEnd':''" v-if="item.channelType!=5&&item.activityState!=1&&item.activityState!=4">{{item.activityState==2?$t("activityInfo.applying"):item.activityState==3?$t("activityInfo.applyEnd"):item.activityState==5?$t("activityInfo.activityEnd"):""}}</span>
<span class="activityStatusTip" :class="item.activityState==2?'applying':item.activityState==3?'applyend':item.activityState==5?'activityEnd':''" v-if="item.channelType==5&&item.activityState!=1&&item.activityState!=4">{{item.activityState==2?$t("pubactivities.conduct"):item.activityState==5?$t("activityInfo.activityEnd"):""}}</span>
<span class="activityStatusTip" :class="item.activityState==2?'applying':item.activityState==3?'activityEnd':item.activityState==5?'activityEnd':''" v-if="item.channelType==5&&item.activityState!=1&&item.activityState!=4">{{item.activityState==2?$t("pubactivities.conduct"):item.activityState==5?$t("activityInfo.activityEnd"):""}}</span>
<p class="readCount" v-if="item.readCountStr&&item.readCountStr!=0"><span>{{item.readCountStr}}&nbsp;&nbsp;{{$t("activityInfo.viewCount")}}</span></p>
</div>
......
src/views/mobile/activityApply/redEnvelopeDetail.vue
View file @ e3d27eca
......@@ -8,7 +8,7 @@
</div>
</div>
<div class="detailWrapper">
<answerCmpt :id="$route.query.id" v-if="$route.query.flag==1" :detailInfo="detailInfo.baseChannelLucky" @postFlagVal="getUserAnswerFunc"></answerCmpt>
<answerCmpt ref="answerCmpt" :id="$route.query.id" v-if="$route.query.flag==1" :detailInfo="detailInfo.baseChannelLucky" @postFlagVal="getUserAnswerFunc"></answerCmpt>
<errorAnswerCmpt :answerInfo="answerInfo" :id="$route.query.id" v-if="$route.query.flag==2" :detailInfo="detailInfo.baseChannelLucky" @postAnswer="postAnswer"></errorAnswerCmpt>
<applyRegisterCmpt @postScrollTop="postScrollTop" :answerInfo="answerInfo" :id="$route.query.id" v-if="$route.query.flag==3" :detailInfo="detailInfo.baseChannelLucky" @applySuccess="applySuccess"></applyRegisterCmpt>
<hasAfterCmpt :id="$route.query.id" :detailInfo="detailInfo"
......@@ -21,6 +21,15 @@
</div>
<ruleDialog @isShowLoginDialogFunc="isShowLoginDialogFunc" v-if="isShowRule"
:visible="isShowRule" :title="detailInfo.baseChannelLucky.luckyRule"></ruleDialog>
<el-dialog :close-on-press-escape="false" :show-close="false"
:visible.sync="errorTipsVisible" :append-to-body="true" :close-on-click-modal="false" :class="['applyElDialog','applyLoginDialog']" class="dialogWrap500 errorDialogWrap" width="90%"
v-if="errorTipsVisible">
<p style="margin: 0 .5rem;line-height: 30px;">{{$t('activityInfo.timeoutTitle1')+(detailInfo.baseChannelLucky.questionLimit - answerInfo.userHasCount)+$t('activityInfo.timeoutTitle2')}}</p>
<span slot="footer" class="dialog-footer applyLoginFooter">
<el-button type="primary" @click="handleConfirm">{{$t("activityInfo.resetAnswer")}}</el-button>
</span>
</el-dialog>
</div>
</template>
......@@ -59,7 +68,8 @@
dialogVisible:false,
userInfo: this.publicFun.getCookie("userInfo") ? JSON.parse(this.Base64.decode(this.publicFun.getCookie("userInfo"))) : null,
lang: this.publicFun.getCookie("language") == "zh-CN" ? 1 : 2,
isShowRule:false
isShowRule:false,
errorTipsVisible:false
}
},
......@@ -106,7 +116,7 @@
},
//接受用户答题答案
getUserAnswerFunc(data){
getUserAnswerFunc(data,flag){
data.account = this.accountInfo?this.accountInfo.account:null;
api.postAnswerAxios(data).then((res)=>{
if(res.code==0){
......@@ -116,8 +126,12 @@
this.$router.replace({path:"/redEnvelopeActJoin",query:{id:this.$route.query.id,flag:3,state:res.result.redPacketMoney}})
globalMsg.$emit("postFlagIsReturn",false);
}else{
this.$router.replace({path:"/redEnvelopeActJoin",query:{id:this.$route.query.id,flag:2,state:this.answerInfo.userHasCount}})
globalMsg.$emit("postFlagIsReturn",true);
if(flag&&this.detailInfo.baseChannelLucky.questionLimit - this.answerInfo.userHasCount>0){
this.errorTipsVisible = true;
}else{
this.$router.replace({path:"/redEnvelopeActJoin",query:{id:this.$route.query.id,flag:2,state:this.answerInfo.userHasCount}})
globalMsg.$emit("postFlagIsReturn",true);
}
}
}else{
......@@ -128,6 +142,13 @@
})
},
handleConfirm(){
this.$refs.overfolowWrapper.scrollTop = 0;
this.errorTipsVisible = false;
this.$router.replace({path:"/redEnvelopeActJoin",query:{id:this.$route.query.id,flag:1}})
this.$refs.answerCmpt.handleChange();
},
//答错再次参与
postAnswer(){
this.$router.replace({path:"/redEnvelopeActJoin",query:{id:this.$route.query.id,flag:1}})
......
src/views/mobile/index/index.vue
View file @ e3d27eca
......@@ -159,7 +159,7 @@
<span class="activityStatusTip" :class="item.contentDetail.activityState==2?'applying':item.contentDetail.activityState==3?'applyend':item.contentDetail.activityState==5?'activityEnd':''" v-if="item.contentDetail.activityState!=1&&item.contentDetail.activityState!=4">{{item.contentDetail.activityState==2?$t("activityInfo.applying"):item.contentDetail.activityState==3?$t("activityInfo.applyEnd"):item.contentDetail.activityState==5?$t("activityInfo.activityEnd"):""}}</span>
</div>
<div class="rightInfo" :style="{backgroundImage:'url('+item.contentDetail.channelPic+')'}" v-if="item.contentDetail.channelType==5">
<span class="activityStatusTip" :class="item.contentDetail.activityState==2?'applying':(item.contentDetail.activityState==3||item.contentDetail.activityState==5?'applyend':'')" v-if="item.contentDetail.activityState!=1&&item.contentDetail.activityState!=4">{{item.contentDetail.activityState==2?$t("pubactivities.conduct"):item.contentDetail.activityState==3||item.contentDetail.activityState==5?$t("activityInfo.activityEnd"):""}}</span>
<span class="activityStatusTip" :class="item.contentDetail.activityState==2?'applying':(item.contentDetail.activityState==3||item.contentDetail.activityState==5?'activityEnd':'')" v-if="item.contentDetail.activityState!=1&&item.contentDetail.activityState!=4">{{item.contentDetail.activityState==2?$t("pubactivities.conduct"):item.contentDetail.activityState==3||item.contentDetail.activityState==5?$t("activityInfo.activityEnd"):""}}</span>
</div>
</div>
<div class="buttonBottomLi activityButtonBottom">
......@@ -227,7 +227,7 @@
<span class="activityStatusTip" :class="item.activityState==2?'applying':item.activityState==3?'applyend':item.activityState==5?'activityEnd':''" v-if="item.activityState!=1&&item.activityState!=4">{{item.activityState==2?$t("activityInfo.applying"):item.activityState==3?$t("activityInfo.applyEnd"):item.activityState==5?$t("activityInfo.activityEnd"):""}}</span>
</div>
<div class="rightInfo" :style="{backgroundImage:'url('+item.channelPic+')'}" v-if="item.channelType==5">
<span class="activityStatusTip" :class="item.activityState==2?'applying':(item.activityState==3||item.activityState==5?'applyend':'')" v-if="item.activityState!=1&&item.activityState!=4">{{item.activityState==2?$t("pubactivities.conduct"):item.activityState==3||item.activityState==5?$t("activityInfo.activityEnd"):""}}</span>
<span class="activityStatusTip" :class="item.activityState==2?'applying':(item.activityState==3||item.activityState==5?'activityEnd':'')" v-if="item.activityState!=1&&item.activityState!=4">{{item.activityState==2?$t("pubactivities.conduct"):item.activityState==3||item.activityState==5?$t("activityInfo.activityEnd"):""}}</span>
</div>
</div>
<div class="buttonBottomLi activityButtonBottom">
......
src/views/mobile/search/search.vue
View file @ e3d27eca
......@@ -218,7 +218,7 @@
:class="item.activityState==2?'applying':item.activityState==3?'applyend':item.activityState==5?'activityEnd':''"
v-if="item.channelType!=5&&item.activityState!=1&&item.activityState!=4">{{item.activityState==2?$t("activityInfo.applying"):item.activityState==3?$t("activityInfo.applyEnd"):item.activityState==5?$t("activityInfo.activityEnd"):""}}</span>
<span class="activityStatusTip"
:class="item.activityState==2?'applying':item.activityState==3?'applyend':item.activityState==5?'activityEnd':''"
:class="item.activityState==2?'applying':item.activityState==3?'activityEnd':item.activityState==5?'activityEnd':''"
v-if="item.channelType==5&&item.activityState!=1&&item.activityState!=4">{{item.activityState==2?$t("pubactivities.conduct"):item.activityState==5?$t("activityInfo.activityEnd"):""}}</span>
</div>
......
src/views/mobile/topic/detail.vue
View file @ e3d27eca
......@@ -44,7 +44,7 @@
</div>
<div v-if="topicInfo.isOpenReward==1"
@click="$router.push('/reward?id='+$route.query.id)">
<span>话题激励>>></span></div>
<span>话题激励>></span></div>
</div>
</div>
</div>
......
src/views/mobile/topic/discussdetail.vue
View file @ e3d27eca
......@@ -166,7 +166,7 @@
<div class="dialogTips" v-if="dialogVisible" @click="dialogVisible = false">
<img src="../../../assets/jiantou.png" alt="">
</div>
<div>
<div v-if="imgList">
<viewBigPicCmpt :visible="showPicVisible" :imgList="imgList" :currentIndex="currentImgIndex" @isShowPicListFunc="isShowPicListFunc"></viewBigPicCmpt>
</div>
<!--<div class="fullScreenDiv" @click="handleHideOperat" v-if="currentData&&operateVisible"></div>-->
......
src/views/publishactivity/applydetail.vue
View file @ e3d27eca
......@@ -90,7 +90,10 @@
<el-form-item v-if="activityDetail.applyProject&&activityDetail.applyProject.fieldList" v-for="(item,index) in activityDetail.applyProject.fieldList" :key="index" :label="item.fieldName+'：'" style="width: 100%;">
<div v-if="$i18n.locale=='zh-CN'">
<el-button v-if="item.fieldType ==10" style="margin-left: 10px" type="primary" plain @click="handlePreview(item.fieldValue)">{{$t("listproject.bpdownload")}}</el-button>
<div v-else>
<div class="whole" v-if="item.fieldType ==11&&item.fieldValue" style="margin-top: 2rem;">
<video :src="item.fieldValue" controls="controls" style="width: 500px;height: 280px;"></video>
</div>
<div v-if="item.fieldType !=10&&item.fieldType !=11">
<span v-if="item.fieldValue&&item.fieldName!='公司LOGO'"> {{item.fieldValue}}</span>
<img v-if="item.fieldName=='公司LOGO'" :src="item.fieldValue" style="height: 150px">
</div>
......@@ -98,7 +101,10 @@
</div>
<div v-else>
<el-button v-if="item.fieldType ==10" style="margin-left: 10px" type="primary" plain @click="handlePreview(item.fieldValue)">{{$t("listproject.bpdownload")}}</el-button>
<div v-else>
<div class="whole" v-if="item.fieldType ==11&&item.fieldValue" style="margin-top: 2rem;">
<video :src="item.fieldValue" controls="controls" style="width: 500px;height: 280px;"></video>
</div>
<div v-if="item.fieldType !=10&&item.fieldType !=11">
<span v-if="item.fieldValue&&item.fieldName!='Company Logo'"> {{item.fieldValue}}</span>
<img v-if="item.fieldName=='Company Logo'" :src="item.fieldValue" style="height: 150px">
</div>
......
src/views/publishactivity/proactivity.vue
View file @ e3d27eca
......@@ -417,8 +417,8 @@
<el-dialog :title="editVisible?$t('pubactivities.editfield'):$t('pubactivities.newfield')" :visible.sync="addVisible" :append-to-body="true" :close-on-click-modal="false" @close="closeSensor" class="dialogWrap">
<el-form :inline="true" label-width="210px" :model="contactsform" :rules="rules" ref="contactsform">
<el-form-item :label="$t('pubactivities.fieldName')+'：'" prop="fieldName" ref="formfieldName">
<el-input @input="$forceUpdate()" :disabled="contactsform.fieldType == 10" style="width:370px;" maxlength="36" v-model="contactsform.fieldName" :placeholder="$t('pubactivities.plfieldName')"></el-input>
<el-checkbox :disabled="contactsform.fieldType == 9 || contactsform.fieldType == 10" style="margin-left: 15px" v-model="isCheck">{{$t('pubactivities.required')}}</el-checkbox>
<el-input @input="$forceUpdate()" :disabled="contactsform.fieldType == 10 || contactsform.fieldType == 11" style="width:370px;" maxlength="36" v-model="contactsform.fieldName" :placeholder="$t('pubactivities.plfieldName')"></el-input>
<el-checkbox :disabled="contactsform.fieldType == 9 || contactsform.fieldType == 10 || contactsform.fieldType == 11" style="margin-left: 15px" v-model="isCheck">{{$t('pubactivities.required')}}</el-checkbox>
</el-form-item>
<el-form-item :label="$t('pubactivities.fieldType')+'：'" prop="fieldType" style="width: 100%;">
<el-select style="width:370px;" v-model="contactsform.fieldType" @change="fieldTypechange" :placeholder="$t('pubactivities.plfieldType')">
......@@ -433,8 +433,8 @@
</div>
<el-button @click="addvalue" v-if="contactsform.fieldType == 0 || contactsform.fieldType == 1" type="primary" plain style="width: 100px;height: 40px;margin-top: 25px">{{$t('pubactivities.addone')}}</el-button>
</el-form-item>
<el-form-item v-if="contactsform.fieldType == 10" :label="$t('pubactivities.maximumlimit')+'：'" style="padding-bottom: 30px;">
<el-input @input="numberarr(4)" type="number" style="width:370px;" v-model="contactsform.fieldLength" :placeholder="$t('activityInfo.enterTitle')"></el-input>M
<el-form-item v-if="contactsform.fieldType == 10||contactsform.fieldType == 11" :label="$t('pubactivities.maximumlimit')+'：'" style="padding-bottom: 30px;">
<el-input @input="numberarr(contactsform.fieldType == 10?4:3)" type="number" style="width:370px;" v-model="contactsform.fieldLength" :placeholder="$t('activityInfo.enterTitle')"></el-input>M
</el-form-item>
</el-form>
<el-row style="padding-top: 20px;border-top: 1px solid #E4E6F2;text-align: center">
......@@ -990,8 +990,8 @@
fieldTypechange(val){
if(val == 0 || val == 1){
this.valuelist = [{},{}];
}else if(val == 10){
this.contactsform.fieldName = this.$t('releasejson.addbp');
}else if(val == 10 || val == 11){
this.contactsform.fieldName = val == 10?this.$t('releasejson.addbp'):this.$t('newprojecttext.uploadvideo');
var _this = this;
setTimeout(function () {
_this.$refs.formfieldName.clearValidate();
......@@ -1012,6 +1012,12 @@
return;
}
}
if(this.contactsform.fieldType == 11){
if(this.contactsform.fieldLength == '' || this.contactsform.fieldLength < 1 || this.contactsform.fieldLength > 200){
this.$message.error(this.$t('pubactivities.sizeincorrectly'));
return;
}
}
this.$refs.contactsform.validate((valid) => {
if(valid) {
let num = [];
......@@ -1428,6 +1434,7 @@
this.getTimeZoneList();
if(this.$route.query.type == 2){
this.contactslist.push({key:10,value:this.$t('releasejson.addbp')});
this.contactslist.push({key:11,value:this.$t('newprojecttext.uploadvideo')});
}
if(this.$route.query.channelId){
api.activityDetail(this.$route.query.channelId).then(response => {
......
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