lyb 4 lat temu
rodzic
commit
3446d2415b

+ 1 - 1
components/alert/verificationCodeAlert.vue

@@ -4,7 +4,7 @@
 			<view class="code-alert-container">
 			<view class="code-alert-container">
 				<view class="title">投票验证</view>
 				<view class="title">投票验证</view>
 				<view class="code-input">
 				<view class="code-input">
-					<u-input placeholder="请输入验证码" maxlength="4" v-model="codevalue"></u-input>
+					<u-input placeholder="请输入验证码" v-model="codevalue"></u-input>
 					<image style="width: 160rpx; height: 80rpx;" :src="codeImg" @click="handleRefreshCode"></imague>
 					<image style="width: 160rpx; height: 80rpx;" :src="codeImg" @click="handleRefreshCode"></imague>
 				</view>
 				</view>
 				<view style="color: #EF9944; margin-bottom: 30rpx;">* 为了保证投票的公平性,防止刷票行为,请先完成验证</view>
 				<view style="color: #EF9944; margin-bottom: 30rpx;">* 为了保证投票的公平性,防止刷票行为,请先完成验证</view>

+ 12 - 9
components/alert/votePopup.vue

@@ -156,18 +156,21 @@
 					userId: this.vuex_userId,
 					userId: this.vuex_userId,
 				}
 				}
 				const res = await this.$api.activity.getGiftList(data);
 				const res = await this.$api.activity.getGiftList(data);
-				console.log("config.baseURL",config.baseURL)
-				if(config.baseURL === 'http://vote-back.guosen-fumao.cn/api'){
-					this.gitfs = [];
-					//测试环境,过滤掉现金道具
-					for(let i = 0; i < res.data.data.length; i++){
-						if(res.data.data[i].payType === 'POINT_EXCHANGE_GOODS'){
-							this.gitfs.push(res.data.data[i])
+				if(this.$isNotEmpty(res.data.data)){
+					if(config.baseURL === 'http://vote-back.guosen-fumao.cn/api'){
+						this.gitfs = [];
+						//测试环境,过滤掉现金道具
+						for(let i = 0; i < res.data.data.length; i++){
+							if(res.data.data[i].payType === 'POINT_EXCHANGE_GOODS'){
+								this.gitfs.push(res.data.data[i])
+							}
 						}
 						}
+					}else{
+						//正式环境,返回所有道具(包括现金道具)
+						this.gitfs = res.data.data;
 					}
 					}
 				}else{
 				}else{
-					//正式环境,返回所有道具(包括现金道具)
-					this.gitfs = res.data.data;
+					this.$dialog.showModal('暂无助力道具',false,this.vuex_theme.bgColor)
 				}
 				}
 			},
 			},
 			hideVote() {
 			hideVote() {

+ 13 - 1
pages/apply/apply.vue

@@ -29,6 +29,13 @@
 					<u-input placeholder="请输入标题内容" v-model="applyInfo.title"></u-input>
 					<u-input placeholder="请输入标题内容" v-model="applyInfo.title"></u-input>
 				</view>
 				</view>
 			</view>
 			</view>
+			
+			<view style="margin-bottom: 64rpx;">
+				<text style="color: #010101; font-size: 28rpx; font-weight: bold;"><text style="color: #f00;">*</text> 参赛者</text>
+				<view style="padding: 32rpx 0 0; border-bottom: 1rpx solid #E3E3E3;">
+					<u-input placeholder="请输入参赛者名称" v-model="applyInfo.player"></u-input>
+				</view>
+			</view>
 
 
 			<view style="margin-bottom: 64rpx;">
 			<view style="margin-bottom: 64rpx;">
 				<text style="color: #010101; font-size: 28rpx; font-weight: bold;"><text style="color: #f00;">*</text> 详细介绍</text>
 				<text style="color: #010101; font-size: 28rpx; font-weight: bold;"><text style="color: #f00;">*</text> 详细介绍</text>
@@ -117,6 +124,7 @@
 					imgUrl: "",
 					imgUrl: "",
 					videoUrl: "",
 					videoUrl: "",
 					content: "",
 					content: "",
+					player: "",
 				}
 				}
 			},
 			},
 			/**
 			/**
@@ -293,8 +301,12 @@
 					this.$refs.toast.warn('请输入标题内容')
 					this.$refs.toast.warn('请输入标题内容')
 					return
 					return
 				}
 				}
+				if (this.$isEmpty(this.applyInfo.player)) {
+					this.$refs.toast.warn('请输入参赛者名称')
+					return
+				}
 				if (this.$isEmpty(this.applyInfo.content)) {
 				if (this.$isEmpty(this.applyInfo.content)) {
-					this.$refs.toast.warn('请上传作品封面')
+					this.$refs.toast.warn('请输入详细介绍')
 					return
 					return
 				}
 				}
 				if (this.$isEmpty(this.applyInfo.phone)) {
 				if (this.$isEmpty(this.applyInfo.phone)) {