在职党员报到增加提示内容,新锋支部增加菜单权限

miniprogram/subpages/checkIn/pages/checkIn/register/register.js

@@ -73,7 +73,8 @@ Page({
         submitStatus: false,
         changeFlag: false,
         changeFlagC: false,
-        workTypeInput: false
+        workTypeInput: false,
+        tipData:{}
     },
 
     /**
@@ -268,7 +269,7 @@ Page({
             'form.couplingCommunity': ['1175270520603930625', this.data.multiIdsC[0].value, this.data.multiIdsC[1].value, this.data.multiIdsC[1].children[0].value],
             changeFlagC: true
         })
-        console.log(this.data.form.couplingCommunity);
+        console.log(this.data.form,'包联单位');
     },
 
     bindMultiPickerColumnChangeC(e) {
@@ -359,17 +360,15 @@ Page({
         if(this.data.form.shibei == '0'){
             this.setData({
                 'form.couplingCommunity': ['1175270520603930625', this.data.multiIds[0].value, this.data.multiIds[1].value, this.data.multiIds[1].children[0].value],
-                'form.allDeptIds':[],
                 changeFlag: true
             })
         }else{
             this.setData({
                 'form.allDeptIds': ['1175270520603930625', this.data.multiIds[0].value, this.data.multiIds[1].value, this.data.multiIds[1].children[0].value],
-                'form.couplingCommunity': [],
                 changeFlag: true
             })
         }
-        console.log(this.data.form);
+        console.log(this.data.form,'常住社区');
     },
     bindMultiPickerColumnChange(e) {
         let data = {
@@ -558,7 +557,8 @@ Page({
             // wx.hideLoading()
             if (res.code == '0') {
                 than.setData({
-                    submitStatus: true
+                    submitStatus: true,
+                    tipData:res.data
                 })
             }
         }).catch(err => {

miniprogram/subpages/checkIn/pages/checkIn/register/register.wxml

@@ -174,11 +174,25 @@
         <view class="bottom_box"></view>
     </view>
     <view wx:else class="tip">
-        <view class="box">
+        <view class="live" wx:if="{{form.shibei == 1}}">
-            <view class="title">提示</view>
+                <view class="item">您常住的社区{{tipData.liveStreetName?tipData.liveStreetName:'--'}} - {{tipData.liveCommunity?tipData.liveCommunity:'--'}}</view>
-            <view class="content-tip">您的信息我们已收到!</view>
+                <view class="item"><view>街道名称</view> <view>{{tipData.liveStreetName?tipData.liveStreetName:'--'}}</view></view>
-            <button bind:tap="handelClickTwo" type="warn" style="width: 200rpx;" size="mini"> 确定</button>
+                <view class="item"><view>社区名称</view> <view>{{tipData.liveCommunity?tipData.liveCommunity:'--'}}</view></view>
+                <view class="item"><view>办公地址</view> <view>{{tipData.liveAddress?tipData.liveAddress:'--'}}</view></view>
+                <view class="item"><view>办公电话</view> <view>{{tipData.liveTelephone?tipData.liveTelephone:'--'}}</view></view>
+                <view class="item"><view>书记主任</view> <view>{{tipData.liveSecretaryName?tipData.liveSecretaryName:'--'}}</view></view>
+                <view class="item"><view>手机</view> <view>{{tipData.liveMobile?tipData.liveMobile:'--'}}</view></view>
         </view>
+        <view class="coupling">
+                <view class="item">您单位包联的社区{{tipData.couplingStreetName?tipData.couplingStreetName:'--'}} - {{tipData.couplingCommunity?tipData.couplingCommunity:'--'}}</view>
+                <view class="item"><view>街道名称</view> <view>{{tipData.couplingStreetName?tipData.couplingStreetName:'--'}}</view></view>
+                <view class="item"><view>社区名称</view> <view>{{tipData.couplingCommunity?tipData.couplingCommunity:'--'}}</view></view>
+                <view class="item"><view>办公地址</view> <view>{{tipData.couplingAddress?tipData.couplingAddress:'--'}}</view></view>
+                <view class="item"><view>办公电话</view> <view>{{tipData.couplingelephone?tipData.couplingelephone:'--'}}</view></view>
+                <view class="item"><view>书记主任</view> <view>{{tipData.couplingSecretaryName?tipData.couplingSecretaryName:'--'}}</view></view>
+                <view class="item"><view>手机</view> <view>{{tipData.couplingMobile?tipData.couplingMobile:'--'}}</view></view>
+        </view>
+        <button type="warn"  class="tipBtn" bind:tap="handleBack">我知道了</button>
     </view>
     <view class="buttom_btn" wx:if="{{!submitStatus}}">
         <button type="warn" plain="true" class="back" bind:tap="handleBack">返回</button>

miniprogram/subpages/checkIn/pages/checkIn/register/register.wxss

@@ -109,25 +109,39 @@ page {
   }
   .tip{
     display: flex;
-    justify-content: center;
+    flex-direction: column;
-    align-items: center;
+    justify-content: space-between;
-    margin-top: 50%;
+    padding: 0 20rpx;
-   
+    box-sizing: border-box;
 }
-.tip .title{
+
-    text-align: center;
+.tip .live,
+.tip .coupling{
+    display: flex;
+    flex-direction: column;
+    height: calc(50% - 30rpx);
+    background-color: #fff;
+    padding: 0 20rpx;
+    box-sizing: border-box;
+    border-radius: 10rpx;
+    margin-top: 20rpx;
 }
-.tip .content-tip{
+.tip .coupling{
-    text-align: center;
+    margin-bottom: 50rpx;
-    margin: 50rpx;
 }
-.tip  .box{
+.tip .tipBtn{
-    padding: 40rpx;
+    position: fixed;
-    box-sizing: border-box;
+    bottom: 20rpx;
-    background-color: #fff;
+    left: 50%;
-    width: 500rpx;
+    width: 200rpx;
-    border-radius: 5rpx;
+    z-index: 2;
+    transform: translateX(-100rpx);
+}
+.tip .live .item,
+.tip .coupling .item{
     display: flex;
-    flex-direction: column;
     align-items: center;
+    justify-content: space-between;
+    border-bottom: 2rpx #f5f5f5 solid;
+    height: 90rpx;
 }

miniprogram/subpages/redSail/pages/redSail/redSail.js

@@ -8,13 +8,17 @@ Page({
     data: {
         statusHeight: app.globalData.deviceInfo.statusHeight, // 自定义头部状态栏高度
         navigationHeight: app.globalData.deviceInfo.navigationHeight,
+        partyFlag:''
     },
 
     /**
      * 生命周期函数--监听页面加载
      */
     onLoad(options) {
-
+        let {partyFlag} = JSON.parse(wx.getStorageSync('userInfo'))
+        this.setData({
+            partyFlag:partyFlag
+        })
     },
 
     /**

miniprogram/subpages/redSail/pages/redSail/redSail.wxml

@@ -19,7 +19,7 @@
                 <image src="../../images/right.png"  class="go"></image>
             </view>
         </navigator>
-        <navigator class="item " url="/subpages/redSail/pages/registerParty/registerParty">
+    <navigator class="item " url="/subpages/redSail/pages/registerParty/registerParty" wx:if="{{partyFlag != 1}}">
             <image src="../../images/02.png" class="icon"></image>
             <view class="vcenter flex1">
                 <view class="h1">我要入党</view>