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

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

business/pages/exchangebusiness/index.js

@@ -13,7 +13,8 @@ import {
   LocalStorage
 } from '../../../utilities/index.js';
 import {
-  formIdCreate
+  formIdCreate,
+  getAccountList
 } from '../../../service/common.js';
 import apis from '../../../constants/api.js';
 var app = getApp();
@@ -47,7 +48,7 @@ Page({
     wx.showLoading({
       title: '数据加载中'
     })
-    schoolList({
+    getAccountList({
       page: 1,
       perPage: 100
     }).then((res) => {
@@ -55,7 +56,7 @@ Page({
       if (res.code == 200) {
         this.setData({
           schoolList: res.data.list,
-          schoolTotal: res.data.total,
+          schoolTotal: res.data.list.length,
           nowDate: res.datetime
         })
       }
@@ -63,7 +64,6 @@ Page({
       wx.hideLoading();
     })
   },
-
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
@@ -118,11 +118,13 @@ Page({
   godeskcenter (e) {
     const {item} = e.currentTarget.dataset;
     app.globalData.accountExpired = false;
-    if(this.data.from == 1){
+    if(item.school_teacher.type==2){
+      LocalStorage.setItem('dakarole', 1);
       wx.navigateTo({
         url: `/business/pages/deskcenter/index?sid=${item.id}`,
       })
     }else {
+      LocalStorage.setItem('dakarole', 2);
       wx.navigateTo({
         url: `/business/pages/classservice/tindex?sid=${item.id}`,
       })
@@ -139,4 +141,21 @@ Page({
       formId
     })
   },
+  go2cindex(){
+    wx.redirectTo({
+      url: `/ucenter/index`
+    })
+  },
+  goLogin(){
+    wx.redirectTo({
+      url: `/business/pages/loginregistermgt/login`
+    })
+    LocalStorage.removeItem('dakarole');
+    LocalStorage.removeItem('user');
+  },
+  goShopedit(){
+    wx.navigateTo({
+      url: `/business/pages/shopeditor/index`
+    })
+  }
 })
\ No newline at end of file

business/pages/exchangebusiness/index.wxml

@@ -7,7 +7,11 @@
           <form report-submit="true" bindsubmit="formIdCreate" class="createidform">
               <button form-type="submit" class="createidbutton"></button>
             </form>
-            <view class="title">{{item.title}}</view>
+            <view class="title">
+              <view class="title-text">{{item.title}}</view>
+              <view class="title-flag1 " wx:if="{{item.school_teacher.type==2}}">管理员身份</view> 
+              <view class="title-flag2 " wx:if="{{item.school_teacher.type==1}}">老师身份</view> 
+            </view>
             <view class="time" wx:if="{{item.school_teacher.last_login_time}}">上次登录时间：{{item.school_teacher.last_login_time}}</view>
             <view class="deadline-time" wx:if="{{!item.expire_time}}">终身包</view>
             <view class="deadline-time" wx:if="{{item.expire_time && filter.dateTimeCompare(nowDate,item.expire_time)}}">
@@ -20,6 +24,11 @@
             </view>
       </view>
     </view>
+    <view class="add-school" bindtap="goShopedit"><image class="" src="{{localImageRoot}}2b/exchangebusiness/addschoolicon.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" />创建新校区</view>
+  </view>
+  <view class="footer">
+    <view class="left" bindtap="go2cindex">切换到学员界面</view>
+    <view class="right" bindtap="goLogin">退出当前账号</view> 
   </view>
   <expiredTip changebusiness="{{1}}"/>
 </view>
\ No newline at end of file

business/pages/exchangebusiness/index.wxss

@@ -3,6 +3,7 @@
   padding: 35rpx 24rpx;
   background:rgba(243,244,246,1);
   min-height: 100vh;
+  padding-bottom: 100rpx;
 }
 .exchangebusiness-container .content-item{
   width:100%;
@@ -14,12 +15,48 @@
   position: relative;
 }
 .exchangebusiness-container .content-item .title{
+  padding-bottom: 22rpx;
+  display: flex;
+  justify-content: space-between;
+}
+.exchangebusiness-container .content-item .title .title-text {
   font-size:26rpx;
   font-family:PingFang SC;
   font-weight:bold;
   color:rgba(0,0,0,1);
-  line-height: 1;
-  padding-bottom: 32rpx;
+  line-height: 36rpx;
+  width: 410rpx;
+  word-break: break-all;
+}
+.exchangebusiness-container .content-item .title .title-flag1{
+  width:127rpx;
+  height:43rpx;
+  background:rgba(101,184,244,0.05);
+  border:1px solid rgba(101,184,244,1);
+  border-radius:10rpx;
+  font-size:22rpx;
+  font-family:PingFang SC;
+  font-weight:400;
+  color:rgba(101,184,244,1);
+  line-height:1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.exchangebusiness-container .content-item .title .title-flag2{
+  width:127rpx;
+  height:43rpx;
+  background:rgba(255,185,122,0.05);
+  border:1px solid rgba(255,185,122,1);
+  border-radius:10rpx;
+  font-size:22rpx;
+  font-family:PingFang SC;
+  font-weight:400;
+  color:rgba(255,159,73,1);
+  line-height:1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 .exchangebusiness-container .content-item .time{
   line-height: 1;
@@ -42,4 +79,52 @@
   width:29rpx;
   height:29rpx;
   margin-right: 14rpx;
+}
+.add-school{
+  width:100%;
+  height:180rpx;
+  background:rgba(255,255,255,1);
+  border-radius:20rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size:28rpx;
+  font-family:PingFang SC;
+  font-weight:400;
+  color:rgba(151,151,151,1);
+}
+.add-school image{
+  width: 40rpx;
+  height: 40rpx;
+  margin-right: 18rpx;
+}
+.footer{
+  width:100%;
+  height:100rpx;
+  background:rgba(255,255,255,1);
+  display: flex;
+  position: fixed;
+  left: 0;
+  bottom: 0;
+}
+.footer .left{
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size:28rpx;
+  font-family:PingFang SC;
+  font-weight:400;
+  color:rgba(72,68,68,1);
+  border-right: 1px solid rgba(0,0,0,.05);
+}
+.footer .right{
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size:28rpx;
+  font-family:PingFang SC;
+  font-weight:400;
+  color:rgba(255,73,73,1);
 }
\ No newline at end of file

business/pages/loginregistermgt/login.js

@@ -314,7 +314,6 @@ Page({
             token: `bearer ${res2.data.token}`,
             mobile,
           })
-          LocalStorage.setItem('dakarole', 1);
           wx.showToast({
             title: '登录成功',
             mask: true,

business/pages/organizationalmgt/index.wxss

@@ -118,4 +118,7 @@ page{
 .line-box .line .right-icon{
   width:11rpx;
   height:20rpx;
+}
+.content-item{
+  
 }
\ No newline at end of file

service/common.js

@@ -370,6 +370,7 @@ function getVerifyCode(data) {
 // 账号面板（管理员 老师 被邀请...）
 function getAccountList(data){
 	return wxRequest({
+				role: '2b',
         url: apis.business.common.accountList,
         data,
         method: 'GET',