shuhao 修改bug

miniprogram/pages/classroom/classroom.wxss

@@ -26,6 +26,13 @@ page {
     width: 100%;
 }
 
+.student-bottom2 {
+    bottom: 0;
+    position: relative;
+    width: 100%;
+    height: 160rpx;
+}
+
 .garten-name {
     width: 6em;
 }

miniprogram/pages/createGarten/createGarten.ts

@@ -145,14 +145,14 @@ CommonPage({
         if (garten.id) {
           data.organId = garten.id
         }
-        data.day = this.data.days[e.detail.value].replace('天', '')
+        data.day = this.data.days[e.detail.value].replace('天', '').replace('学期版', '180')
         Mgr.http.request({
           url: HttpUrl.activateApply,
           method: 'POST',
           data,
-          success: () => {
+          success: (res: any) => {
             this.setData({ loading: false })
-            WxUtils.toast('激活成功', 'success')
+            WxUtils.toast(res.msg, 'success')
             this.requestOgranData()
           },
           fail: () => {
@@ -196,7 +196,8 @@ CommonPage({
   },
   onShow() {
     this.setData({ stepValue: this.data.garten.classes.length })
-    let tempArr = Data.user.managerType == MANAGER_TYPE.best ? activeAllDayArr : activeDayArr
+    //let tempArr = Data.user.managerType == MANAGER_TYPE.best ? activeAllDayArr : activeDayArr
+    let tempArr = activeAllDayArr
     let days: string[] = []
     tempArr.forEach((item) => {
       if (item != 180) {

miniprogram/pages/main/main.ts

@@ -275,6 +275,7 @@ CommonPage({
         let testContent1 = getScore(data.testContent1)
         let testContent2 = getScore(data.testContent2)
         this.setData({
+          roleName: data.roleName,
           newLesson: data.newLesson.powerName,
           unfinish,
           testContent1,
@@ -282,6 +283,7 @@ CommonPage({
         })
       } else if (this.data.curUser.role == ROLE_TYPE.teacher) {
         this.setData({
+          roleName: data.roleName,
           newLesson: data.newLesson.powerName,
           unfinishedPeople: data.unfinishedPeople,
         })
@@ -289,6 +291,7 @@ CommonPage({
         let rate = data.apply / data.people
         if (data.people == 0) rate = 0
         this.setData({
+          roleName: data.roleName,
           people: data.people,
           applyNum: data.apply,
           appKey: data.appKey,
@@ -298,6 +301,7 @@ CommonPage({
         })
       } else if (this.data.curUser.role == ROLE_TYPE.manager) {
         this.setData({
+          roleName: data.roleName,
           team: data.company,
           applyList: data.deviceApplyActivateList
         })

miniprogram/pages/main/main.wxml

@@ -5,7 +5,7 @@
     <image src='/images/bgtop.png' mode='widthFix' style='width:100%;height:486rpx'></image>
     <view class="cu-bar bg-white padding-tb">
         <view class="action">
-            <text class="text-black text-bold text-name padding-lef">{{curUser.nickname}}({{curUser.roleName}})</text>
+            <text class="text-black text-bold text-name padding-lef">{{curUser.nickname}}({{roleName}})</text>
         </view>
         <view class="action">
             <button class="cu-btn bg-blue shadow" bindtap="onShowAccountChangeClick">切换</button>

miniprogram/script/config/HttpConfig.ts

@@ -1,5 +1,5 @@
-const base = 'https://dev.zhi-edu.com/'
-//const base = 'https://api.zhi-edu.com/'
+//const base = 'https://dev.zhi-edu.com/'
+const base = 'https://api.zhi-edu.com/'
 
 /**
  * 请求方法