修改活动报名

pagesActivity/activityDetail.vue

@@ -10,8 +10,7 @@
 			</view>
 			</view>
 			<view class="act-bottom">
-				<view v-if="activityDetail.isApplication == '1' && isApplication == false" class="act-button" @click="open">报名</view>
-        <view v-else-if="activityDetail.isApplication == '1' && isApplication == true" class="act-button" style="background: #999999;">已报名</view>
+				<view v-if="activityDetail.isApplication == '1'" class="act-button" @click="open">报名</view>
 			</view>
 		</view>
 		<!-- 报名弹窗 -->
@@ -54,8 +53,9 @@
 <!--					</view>-->
 <!--				</view>-->
 				<view class="all-price">
-					<view v-if="activityDetail.applicationCount != activityDetail.maxApplicationCount" class="all-button" @click="submitorder">确认报名</view>
-          <view v-else class="all-button" style="background: #999999;" >报名人数已满</view>
+          <view v-if="activityDetail.isApplication == '1' && isApplication == true" class="all-button" style="background: #999999;">已报名</view>
+					<view v-else-if="activityDetail.applicationCount != activityDetail.maxApplicationCount" class="all-button" @click="submitorder">确认报名</view>
+          <view v-else-if="activityDetail.applicationCount == activityDetail.maxApplicationCount" class="all-button" style="background: #999999;" >报名人数已满</view>
 				</view>
 			</view>
 		</u-popup>

pagesUser/userInfo.vue

@@ -94,7 +94,7 @@
 					<view class="safe-bottom">
 <!--            动态图片-->
 						<view class="card" style="height: auto;"
-							v-if="(articleUrl !== null && articleUrl.length) || userData.articleContent !== null">
+							v-if="(articleUrl !== null && articleUrl.length) || articleContent !== null">
 							<view class="content">
 								<view class="have_image_two">
                   <view class="have_image_title">
@@ -247,6 +247,7 @@
         likeUrl:'',
 				showAnima: false,
 				showArrowDown: true,
+        articleContent:'',
 				isInit: true,
 				showTabbar: true,
         tipMsg: '',
@@ -358,9 +359,11 @@
                       }
                     })
                   })
-                  this.userData.articleContent = list[0].content
                 }
               }
+              console.log('111111111111111',list[0].content)
+              this.userData.articleContent = list[0].content
+              console.log('222222222222',this.userData.articleContent)
             })
             //处理地址
             if (res.data.data.memResidenceProvince !== '' && res.data.data.memResidenceProvince !== null && res.data.data.memResidenceCity !== '' && res.data.data.memResidenceCity !== null){