92629e08 by simon

默认提交

1 parent be3dcffb
...@@ -41,6 +41,7 @@ Page({ ...@@ -41,6 +41,7 @@ Page({
41 41
42 // 加入房间 42 // 加入房间
43 joinRoomDialogVisible: false, 43 joinRoomDialogVisible: false,
44 // joinRoomDialogVisibleUnAuth: false,
44 isJoin: false, // 是否能加入状态 45 isJoin: false, // 是否能加入状态
45 joined: false, // 是否已加入 46 joined: false, // 是否已加入
46 47
...@@ -205,8 +206,17 @@ Page({ ...@@ -205,8 +206,17 @@ Page({
205 if (detailData.customMade == 1 && detailData.type == 1 && ownerMember.mySelf == 0 && options.t == "join" && !joined) { 206 if (detailData.customMade == 1 && detailData.type == 1 && ownerMember.mySelf == 0 && options.t == "join" && !joined) {
206 this.setData({ 207 this.setData({
207 joinRoomDialogVisible: true, 208 joinRoomDialogVisible: true,
208 isJoin: true 209 isJoin: true,
209 }) 210 });
211 // if (detailData.isAuth == 1) {
212 // this.setData({
213 // joinRoomDialogVisible: true,
214 // })
215 // } else {
216 // this.setData({
217 // joinRoomDialogVisibleUnAuth: true,
218 // })
219 // }
210 } 220 }
211 }); 221 });
212 console.log("memberCode:", app.store.getItem("memberCode")); 222 console.log("memberCode:", app.store.getItem("memberCode"));
...@@ -981,7 +991,6 @@ Page({ ...@@ -981,7 +991,6 @@ Page({
981 } 991 }
982 }, 992 },
983 993
984
985 /** 994 /**
986 * 隐藏蒙层 995 * 隐藏蒙层
987 */ 996 */
......
...@@ -235,6 +235,15 @@ ...@@ -235,6 +235,15 @@
235 <view class="t1">邀请你一起加入组队送祝福!</view> 235 <view class="t1">邀请你一起加入组队送祝福!</view>
236 </view> 236 </view>
237 </van-dialog> 237 </van-dialog>
238 <!-- <van-dialog close-on-click-overlay use-slot confirm-button-text="点击加入" show="{{ joinRoomDialogVisibleUnAuth }}" confirm-button-open-type="getUserInfo" bind:getuserinfo="getUserInfo">
239 <view class="dialog dialog2">
240 <view class="portrait">
241 <image class="portrait-inner" mode="scaleToFill" src="{{ownerMember.memberHead}}" />
242 </view>
243 <view class="nickname">{{ownerMember.memberName}}</view>
244 <view class="t1">邀请你一起加入组队送祝福!</view>
245 </view>
246 </van-dialog> -->
238 <van-popup class="poster-popup" show="{{ authorizeVisible }}"> 247 <van-popup class="poster-popup" show="{{ authorizeVisible }}">
239 <authorize-comp evttype="{{evttype}}" bind:evtcomp="evtcomp"></authorize-comp> 248 <authorize-comp evttype="{{evttype}}" bind:evtcomp="evtcomp"></authorize-comp>
240 </van-popup> 249 </van-popup>
......