Merge branch 'permission_lvtz' of git.server:wangxuelai/wechatapp.shangjiadao.com into sj-dev-dev

business/components/permissionbox/index.js

@@ -30,8 +30,6 @@ Component({
         hidddenBtn: true
       })
     }
-    let ids=this.data.perMissionlist.map(item=>item.menu_id)
-    console.log(ids,this.properties.cinfigid,this.data.hidddenBtn,dakarole)
   },
   
   methods: {

business/pages/organizationalmgt/info.json

@@ -2,6 +2,7 @@
   "navigationBarTitleText": "完善信息",
   "usingComponents": {
     "expiredTip": "../../components/expiredTip",
-    "imagecropper": "../../../components/imagecropper"
+    "imagecropper": "../../../components/imagecropper",
+    "permission-box":"../../components/permissionbox"
   }
 }
\ No newline at end of file

business/pages/organizationalmgt/info.wxml

@@ -3,7 +3,7 @@
 
     <view class="box" wx:if="{{sid && sid!=0}}">
         <view class="box-title">
-            <view class="title">资料设置</view>
+            <view class="title">资料设置{{sid==0 || dakarole==1? 0: 7}}</view>
         </view>
         <view class="line-item">
             <view class="item-label">头像</view>
@@ -20,49 +20,50 @@
             </view>
         </view>
     </view>
-    <block wx:if="{{dakarole!=2 || sid==0}}">
-        <view class="box">
-            <view class="box-title">
-                <view class="title">完善机构信息</view>
-            </view>
+    <permission-box cinfigid="{{sid==0 || dakarole==1? 0: 700}}">
+        <view slot="menubtn">
+            <view class="box">
+                <view class="box-title">
+                    <view class="title">完善机构信息</view>
+                </view>
 
-            <view class="line-item">
-                <view class="item-label">机构LOGO <text>建议尺寸：120*120</text></view>
-                <view class="right" bindtap="proMainImgUpload" data-type="schoollogo">
-                    <image class="logo-upload-img" wx:if="{{params.logo != ''}}" src="{{filter.imagify(params.logo, 'image/resize,w_640/format,jpg/quality,q_50')}}"></image>
-                    <!-- <image class="logo-upload-img" wx:else src="{{imageRoot}}2c/pclogin/logo.png?{{imageVersion}}"></image> -->
-                    <image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
+                <view class="line-item">
+                    <view class="item-label">机构LOGO <text>建议尺寸：120*120</text></view>
+                    <view class="right" bindtap="proMainImgUpload" data-type="schoollogo">
+                        <image class="logo-upload-img" wx:if="{{params.logo != ''}}" src="{{filter.imagify(params.logo, 'image/resize,w_640/format,jpg/quality,q_50')}}"></image>
+                        <!-- <image class="logo-upload-img" wx:else src="{{imageRoot}}2c/pclogin/logo.png?{{imageVersion}}"></image> -->
+                        <image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
+                    </view>
                 </view>
-            </view>
 
-            <view class="line-item">
-                <view class="item-label">机构名称</view>
-                <view class="right">
-                    <input type="text" placeholder-class="placeholderclass" class="iteminput" maxlength="30" value="{{params.title}}" bindinput="titleInput" placeholder="输入机构名称"></input>
-                    <image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
+                <view class="line-item">
+                    <view class="item-label">机构名称</view>
+                    <view class="right">
+                        <input type="text" placeholder-class="placeholderclass" class="iteminput" maxlength="30" value="{{params.title}}" bindinput="titleInput" placeholder="输入机构名称"></input>
+                        <image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
+                    </view>
                 </view>
-            </view>
 
-            <view class="line-item line-item-subject">
-                <view class="item-label">机构类型</view>
-                <view class="right content-box">
-                    <view class="item-box" wx:for="{{allSubject}}" wx:for-index="idx" wx:for-item="item" wx:key="idx" data-active-item="{{item}}" bindtap="selectSubject" >
-                        <view class="{{selectedSubjectStyle[item.id]?'item-box-inner selectd-item-box-inner':'item-box-inner'}}">{{item.name}}</view>
+                <view class="line-item line-item-subject">
+                    <view class="item-label">机构类型</view>
+                    <view class="right content-box">
+                        <view class="item-box" wx:for="{{allSubject}}" wx:for-index="idx" wx:for-item="item" wx:key="idx" data-active-item="{{item}}" bindtap="selectSubject" >
+                            <view class="{{selectedSubjectStyle[item.id]?'item-box-inner selectd-item-box-inner':'item-box-inner'}}">{{item.name}}</view>
+                        </view>
                     </view>
                 </view>
-            </view>
 
-            <view class="line-item">
-                <view class="item-label">地址</view>
-                <view class="right" bindtap="addressSelect">
-                    <view class="iteminput">{{params.location_address ? params.location_address : '点击定位'}}</view>
-                    <image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
+                <view class="line-item">
+                    <view class="item-label">地址</view>
+                    <view class="right" bindtap="addressSelect">
+                        <view class="iteminput">{{params.location_address ? params.location_address : '点击定位'}}</view>
+                        <image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
+                    </view>
                 </view>
             </view>
+            <view class="submitbtn" bindtap="save">完成</view>
         </view>
-
-        <view class="submitbtn" bindtap="save">完成</view>
-    </block>
+    </permission-box>
 
     <!-- <view class="common-dialog" wx:if="{{showAuthSettingDia}}">
         <view class="dialog-box">