xiaohaizhao 2 gadi atpakaļ
vecāks
revīzija
dea4b8fb87

+ 5 - 5
pages/tabbar/mine/index.js

@@ -10,14 +10,14 @@ Page({
     onLoad(options) {
         this.queryUserMsg();
         //美大关闭团队管理
-        // let authlist = getApp().globalData.queryPer.query(wx.getStorageSync('userauth'), ['通用'], ['个人中心']);
-        /* let pathList = [{
+        let authlist = getApp().globalData.queryPer.query(wx.getStorageSync('userauth'), ['通用'], ['个人中心']);
+        let pathList = [{
             name: "修改登录密码",
             icon: "icon-a-wodeguanyuyingyong",
             color: "var(--warning)",
             path: `/pages/tabbar/mine/changePassword/index`
-        }] */
-        /* if (authlist[0].apps.some(v => v.name == "teamManagement")) {
+        }]
+        if (authlist[0].apps.some(v => v.name == "teamManagement")) {
             this.data.pathList.unshift({
                 name: "团队管理",
                 icon: "icon-a-wodetuanduiguanli",
@@ -27,7 +27,7 @@ Page({
             this.setData({
                 pathList: this.data.pathList
             })
-        } */
+        }
     },
     /* 选择代理人 */
     onSelectUset({

+ 5 - 0
pages/teams/addRole.js

@@ -44,6 +44,7 @@ Page({
             });
         };
         this.query_appselect();
+        /*    */
     },
     /* 查询应用列表 */
     query_appselect() {
@@ -63,6 +64,10 @@ Page({
                 roleid: this.data.roleid == -1 ? 0 : this.data.roleid,
                 appList: res.data
             })
+            /*  this.setData({
+                 roleid: this.data.roleid == -1 ? 0 : this.data.roleid,
+                 appList: wx.getStorageSync('userauth')
+             }) */
         })
     },
     /* 提交数据 */

+ 6 - 2
pages/teams/index.scss

@@ -17,7 +17,7 @@ page {
 
     .details {
         width: 507rpx;
-        height: 130rpx;
+        min-height: 130rpx;
         margin-left: 30rpx;
 
         .user-name {
@@ -54,12 +54,16 @@ page {
 
         .base-msg {
             margin-top: 10rpx;
-            height: 34rpx;
+            min-height: 34rpx;
             line-height: 34rpx;
             font-size: 24rpx;
             font-family: PingFang SC-Regular, PingFang SC;
             color: #666666;
 
+            .tag {
+                margin-right: 4rpx;
+            }
+
             .iconfont {
                 margin-left: 60rpx;
                 color: var(--assist);

+ 9 - 2
pages/teams/index.wxml

@@ -17,8 +17,15 @@
                         <text class="iconfont icon-a-wodetiaozhuan" />
                     </view>
                 </view>
-                <view class="base-msg line-1">
-                    <!-- {{item.remarks}} -->
+                <view class="base-msg" style="display: flex;flex-wrap: wrap;">
+                    <block wx:if="{{item.partitionname.length}}">
+                        <view class='tag' wx:for="{{item.partitionname}}" wx:for-item="it" wx:for-index="i" style="{{i>1?'margin-top:4rpx':''}}">
+                            <van-tag plain type="primary">{{it.partitionname}}{{it.enddate}}</van-tag>
+                        </view>
+                    </block>
+                    <block wx:else>
+                        <van-tag plain type="danger">未付费</van-tag>
+                    </block>
                 </view>
                 <view class="base-msg">账号:{{item.accountno}}<text class="iconfont icon-a-wodemendianxinxidianhua" />{{item.phonenumber}}</view>
             </view>