社区讲坛报名按钮修改

epdc-resident-mp-yushan/subpages/education/components/activity/activity.wxml

@@ -29,10 +29,10 @@
       </view>
     </view>
   </view>
-  <image class="signed-logo" data-id="{{item.id}}" 
+  <view class="unavailableBtn" data-id="{{item.id}}" 
-        bindtap="toClassDetail" wx:if="{{item.signUpFlag=='1' && showJoin}}" src="../../images/signed.png" />
+        bindtap="toClassDetail" wx:if="{{item.signUpFlag!='1'}}">{{item.signUpFlagStr}}</view>
-  <image class="signed-logo" data-id="{{item.id}}" 
+  <view class="availableBtn" data-id="{{item.id}}" 
-        bindtap="toClassDetail" wx:if="{{item.signUpFlag=='0' && showJoin && !(item.actQuota === signUpNum && item.actQuotaFlag !=0)}}" src="../../images/bm.png" />
+        bindtap="toClassDetail" wx:if="{{item.signUpFlag=='1'}}">报名</view>
 </view>
 <!-- <view hidden="{{nomore}}" class="loadmore">上滑加载更多</view>
 <view hidden="{{!nomore}}" class="loadmore">没有更多了~</view> -->

epdc-resident-mp-yushan/subpages/education/components/activity/activity.wxss

@@ -73,7 +73,38 @@
   position: absolute;
   z-index: 9999;
 }
-
+.unavailableBtn {
+  width: 130rpx;
+  height: 50rpx;
+  right: 20rpx;
+  margin-top: -75rpx;
+  background-color:#d7d7d7;
+  /* object-fit: cover; *//* right: 0;
+  top: 20rpx; */
+  position: absolute;
+  z-index: 9999;
+  text-align: center;
+  color: #fff;
+  border-radius: 20px;
+  line-height: 50rpx;
+  font-size: 24rpx;
+}
+.availableBtn {
+  width: 130rpx;
+  height: 50rpx;
+  right: 20rpx;
+  margin-top: -75rpx;
+  background-color:#f9a404 ;
+  /* object-fit: cover; *//* right: 0;
+  top: 20rpx; */
+  position: absolute;
+  z-index: 9999;
+  text-align: center;
+  color: #fff;
+  border-radius: 20px;
+  line-height: 50rpx;
+  font-size: 24rpx;
+}
 .infos {
   display: table-cell;
   padding: 20rpx 20rpx 10rpx 0rpx;

epdc-resident-mp-yushan/subpages/education/components/completeInfoDialog/completeInfoDialog.js

@@ -0,0 +1,34 @@
+Component({
+  data: {
+    visible: false
+  },
+  properties: {
+    completeInfoDialogVisible: {
+      type: Boolean,
+      value: false,
+      observer (value) {
+        this.setData({
+          visible: !this.data.visible
+        })
+      }
+    }
+  },
+  methods: {
+    navigateToComplete () {
+      wx.navigateTo({
+        url: '/pages/complete/complete'
+      })
+      this.setData({
+        visible: false
+      })
+    },
+    closeDialog () {
+      this.setData({
+        visible: false
+      })
+    },
+    catchmove () {
+      
+    }
+  }
+})

epdc-resident-mp-yushan/subpages/education/components/completeInfoDialog/completeInfoDialog.json

@@ -0,0 +1,3 @@
+{
+  "component": true
+}

epdc-resident-mp-yushan/subpages/education/components/completeInfoDialog/completeInfoDialog.wxml

@@ -0,0 +1,13 @@
+<view class="complete-info-dialog" wx:if="{{visible}}" catchtouchmove="catchmove">
+  <view class="content">
+    <view class="close-dialog">
+      <image bindtap="closeDialog" src="../../images/association/IC_guanbi@2x.png" />
+    </view>
+    <view class="title">提示</view>
+    <view class="tip">请先完善用户信息</view>
+    <view class="operation">
+      <view class="cancel" bindtap="closeDialog">下次再说</view>
+      <view class="confirm" bindtap="navigateToComplete">立即完善</view>
+    </view>
+  </view>
+</view>

epdc-resident-mp-yushan/subpages/education/components/completeInfoDialog/completeInfoDialog.wxss

@@ -0,0 +1,75 @@
+.complete-info-dialog {
+  width: 100%;
+  height:100vh;
+  position: fixed;
+  left: 0rpx;
+  top: 0rpx;
+  background: rgba(0,0,0, 0.6);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 1000;
+}
+.complete-info-dialog .content {
+  width: 530rpx;
+  border-radius: 16rpx;
+  background: #fff;
+  box-sizing: border-box;
+  padding: 0 20rpx;
+}
+.complete-info-dialog .content .close-dialog {
+  width: 100%;
+  height: 60rpx;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+}
+.complete-info-dialog .content .close-dialog image {
+  width:24rpx;
+  height:24rpx;
+}
+.complete-info-dialog .content .title {
+  font-size: 36rpx;
+  color: #333;
+  width:100%;
+  line-height: 60rpx;
+  height: 60rpx;
+  text-align: center;
+  margin-bottom: 27rpx;
+}
+.complete-info-dialog .content .tip {
+  font-size: 32rpx;
+  color: #666;
+  line-height: 50rpx;
+  text-align:center;
+  margin-bottom: 36rpx;
+}
+.complete-info-dialog .content .operation {
+  width: 100%;
+  height: 105rpx;
+  box-sizing: border-box;
+  padding: 15rpx 0;
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  border-top: 1rpx solid #eaeaea;
+}
+.complete-info-dialog .content .operation .cancel {
+  width: 100%;
+  height:100%;
+  text-align: center;
+  line-height: 75rpx;
+  font-size: 36rpx;
+  color: #666;
+}
+.complete-info-dialog .content .operation .cancel + .confirm {
+  border-left: 1rpx solid #eaeaea;
+}
+.complete-info-dialog .content .operation .confirm {
+  width: 100%;
+  height:100%;
+  text-align: center;
+  line-height: 75rpx;
+  font-size: 36rpx;
+  color: #04BCA0;
+}

epdc-resident-mp-yushan/subpages/education/pages/class/class.js

@@ -120,7 +120,7 @@ Page({
     }
   },
   navigateToDetail(e){
-    let url = '/subpages/education/pages/classDetail/classDetail?id='+e.detail.id+"&showJoin="+(this.data.currentTabIndex===0?'1':"0")
+    let url = '/subpages/education/pages/classDetail/classDetail?id='+e.detail.id
     wx.navigateTo({
       url: url,
     })

epdc-resident-mp-yushan/subpages/education/pages/classDetail/classDetail.js

@@ -25,7 +25,6 @@ Page({
     cancelSignupVisible: false,
     cancelSignupTipValue: '',
     cancelSignupTipVisible: false,
-    showJoin:"0"
   },
   onLoad: function(options) {
     if (options.scene) {
@@ -42,7 +41,6 @@ Page({
     }
     this.setData({
       id: options.id,
-      showJoin:options.showJoin
     })
     // this.getDetail();//活动详情
     // this.clockList();//打卡列表

epdc-resident-mp-yushan/subpages/education/pages/classDetail/classDetail.wxml

@@ -129,14 +129,14 @@
 			</view>
 		</view>
 
-		<view class="bottom" wx:if="{{showJoin==='1'}}">
+		<view class="bottom">
 			<block>
 				<view class="button-left">
 					已报名 {{detail.signUpNum}}人
 				</view>
 			</block>
 
-			<block wx:if="{{((detail.signUpNum!==detail.actQuota && detail.actQuotaFlag ==='1') || detail.actQuotaFlag === '0')&&detail.signUpFlag=='0'}}">
+			<block wx:if="{{detail.signUpFlag=='1'}}">
 				<!-- 0-我要报名 -->
 				<view class="button-right" bindtap="signUp">
 					<view class="button-right3">
@@ -147,20 +147,20 @@
 					</view>
 				</view>
 			</block>
-			<block wx:elif="{{detail.signUpFlag == '1'}}">
+			<block wx:elif="{{detail.signUpFlag != '1'}}">
 				<!-- 2-已报名 -->
 				<view class="button-right">
 					<view class="button-right3">
 						<view class="button1">
 							<image class='header-bg' src="../../images/yuanjiao-gray.png"></image>
-							<view class="font"> 已报名 </view>
+							<view class="font"> {{detail.signUpFlagStr}} </view>
 						</view>
 					</view>
 				</view>
 			</block>
-			<block wx:elif="{{detail.signUpNum===detail.actQuota && detail.actQuotaFlag === '1'}}">
+			<!-- <block wx:elif="{{detail.signUpNum===detail.actQuota && detail.actQuotaFlag === '1'}}"> -->
 				<!-- 2-已报满 -->
-				<view class="button-right">
+				<!-- <view class="button-right">
 					<view class="button-right3">
 						<view class="button1">
 							<image class='header-bg' src="../../images/yuanjiao-gray.png"></image>
@@ -170,23 +170,23 @@
 				</view>
 			</block>
 
-			<block wx:elif="{{detail.currentUserStatus == 3}}">
+			<block wx:elif="{{detail.currentUserStatus == 3}}"> -->
 				<!-- 3-未开始 -->
-				<view class="button-right">
+				<!-- <view class="button-right"> -->
 					<!-- <view class="button-right3">
           <view class="button1" bindtap="prompt">
             <image class='header-bg' src="../../images/yuanjiao-orange.png"></image>
             <view class="font"> 取消报名 </view>
           </view>
         </view> -->
-					<view class="button-right3">
+					<!-- <view class="button-right3">
 						<view class="button1">
 							<image class='header-bg' src="../../images/yuanjiao-gray.png"></image>
 							<view class="font"> 未开始 </view>
 						</view>
 					</view>
 				</view>
-			</block>
+			</block> -->
 		</view>
 	</view>
 </view>