0828修改

app.json

@@ -1,6 +1,8 @@
 {
   "pages": [
     "pages/welcome/welcome",
+    "pages/groupsList/groupsList",
+    
     "pages/answerAfterclass/answerAfterclass",
     "pages/zbDetails/zbDetails",
     "pages/answerAfterclasses/answerAfterclasses",
@@ -18,7 +20,7 @@
     "pages/studentList/studentList",
     "pages/pyip/pyip",
     "pages/userGuide/userGuide",
-    "pages/groupsList/groupsList",
+   
     "pages/schoolIntrouce/schoolIntrouce",
     "pages/InteractiveQA/InteractiveQA",
     "pages/last/last",

components/trtc-room/template/1v1/1v1.wxss

@@ -130,4 +130,137 @@
   justify-content: center;
   align-items: center;
   border-radius: 50%;
-}
+}
+
+.modol {
+  width: 455rpx;
+  height: 400rpx;
+  margin: 50rpx auto;
+  border: 1px solid red;
+  position: relative;
+  background-color: rgba(0, 0, 0, 0.3);
+  z-index: 100;
+}
+
+.modol1 {
+  width: 455rpx;
+  height: 400rpx;
+  margin: 30vh 150rpx;
+  /* border: 1px solid red; */
+  position: relative;
+  background-color: rgba(0, 0, 0, 0.3);
+  z-index: 100;
+  transform: rotate(90deg);
+}
+.lm {
+  width: 455rpx;
+  height: 400rpx;
+  position: absolute;
+  top: 0rpx;
+  left: 0rpx;
+}
+.t1 {
+  position: absolute;
+  top: 150rpx;
+  left: 100rpx;
+  color: #000;
+  font-size: 28rpx;
+  font-weight: 900;
+}
+.t2 {
+  position: absolute;
+  top: 180rpx;
+  left: 140rpx;
+  color: #999999;
+  font-size: 25rpx;
+  font-weight: 900;
+}
+.t3 {
+  color: #eb3f33;
+}
+.t4 {
+  height: 60rpx;
+  border-radius: 40rpx;
+  font-size: 29rpx;
+  font-weight: 600;
+  color: #fff;
+  background: #d7301d;
+  text-align: center;
+  position: absolute;
+  top: 230rpx;
+  left: 70rpx;
+  line-height: 60rpx;
+}
+.t5 {
+  height: 60rpx;
+  border-radius: 40rpx;
+  font-size: 29rpx;
+  font-weight: 600;
+  color: #666666;
+  background: #e0e1e3;
+  text-align: center;
+  position: absolute;
+  top: 300rpx;
+  left: 70rpx;
+  line-height: 60rpx;
+}
+/* .lm1 {
+  width: 455rpx;
+  height: 400rpx;
+  position: absolute;
+  top: 500rpx;
+  right: 150rpx;
+  transform:rotate(90deg);
+}
+.t11 {
+  top: 170rpx;
+  left: 250rpx;
+  color: #000;
+  font-size: 28rpx;
+  font-weight: 900;
+  transform:rotate(90deg);
+}
+
+.t21 {
+  position: absolute;
+  top: 210rpx;
+  left: 300rpx;
+  color: #999999;
+  font-size: 25rpx;
+  font-weight: 900;
+  transform:rotate(90deg);
+}
+
+.t31 {
+  color: #eb3f33;
+}
+
+.t41 {
+  height: 67rpx;
+  border-radius: 40rpx;
+  font-size: 29rpx;
+  font-weight: 600;
+  color: #fff;
+  background: #d7301d;
+  text-align: center;
+  position: absolute;
+  top: 270rpx;
+  left: 230rpx;
+  line-height: 67rpx;
+  transform:rotate(90deg);
+}
+
+.t51 {
+  height: 67rpx;
+  border-radius: 40rpx;
+  font-size: 29rpx;
+  font-weight: 600;
+  color: #666666;
+  background: #e0e1e3;
+  text-align: center;
+  position: absolute;
+  top: 350rpx;
+  left: 230rpx;
+  line-height: 67rpx;
+  transform:rotate(90deg);
+}  */

components/trtc-room/trtc-room.js

@@ -41,6 +41,9 @@ Component({
    * 组件的初始数据
    */
   data: {
+    timer: null,
+    second: 10,
+    showmodal: false,
     // orientation:'horizontal',
     fullScreenFlag: 0, //默认为0不全屏  全屏为1 
     pusher: null,
@@ -253,10 +256,10 @@ Component({
    */
   methods: {
     fullScreen() {
-      console.log(this.data.streamList,'我是全屏时player的数量');
+      console.log(this.data.streamList, '我是全屏时player的数量');
       for (let i = 0; i < this.data.streamList.length; i++) {
         console.log(this.data.streamList[i])
-        if(this.data.streamList[i].userID=="0"||this.data.streamList[i].userID=="share-userId"){
+        if (this.data.streamList[i].userID == "0" || this.data.streamList[i].userID == "share-userId") {
           let params = {
             userID: this.data.streamList[i].userID,
             streamType: this.data.streamList[i].streamType,
@@ -289,6 +292,46 @@ Component({
         this.setRemoteOrientation(params1)
       }
     },
+
+    // 显示老师向你连麦
+    showTeacherTalk() {
+      console.log("我进入到组件的方法了")
+      this.setData({
+        showmodal: true
+      })
+      this.countdown()
+    },
+    countdown() {
+      let second = this.data.second
+      if (second == 0) {
+        this.refuse1();
+        return;
+      }
+      this.setData({
+        timer: setTimeout(() => {
+          this.setData({
+            second: second - 1
+          });
+          this.countdown();
+        }, 1000)
+      })
+    },
+    answer1() {
+      this.setData({
+        showmodal: false,
+        second: 10
+      });
+      clearTimeout(this.data.timer);
+      this.triggerEvent('myevent1')
+    },
+    refuse1() {
+      this.setData({
+        showmodal: false,
+        second: 10
+      });
+      clearTimeout(this.data.timer);
+      this.triggerEvent('myevent')
+    },
     /**
      * 初始化各项参数和用户控制模块，在组件实例触发 attached 时调用，此时不建议对View进行变更渲染（调用setData方法）
      */
@@ -1083,7 +1126,7 @@ Component({
      * @returns {Promise}
      */
     _setPlayerConfig(params) {
-      console.log(params,"000000000000000");
+      console.log(params, "000000000000000");
       const userID = params.userID
       const streamType = params.streamType
       const config = params.config
@@ -2233,7 +2276,7 @@ Component({
      * @param {Object} event native 事件对象
      */
     _handleSubscribeRemoteVideo(event) {
-      console.log(event,"切换订阅远端视频状态");
+      console.log(event, "切换订阅远端视频状态");
       const userID = event.currentTarget.dataset.userID
       const streamType = event.currentTarget.dataset.streamType
       const stream = this.data.streamList.find((item) => {

components/trtc-room/trtc-room.wxml

@@ -1,68 +1,68 @@
-<import src='./template/1v1/1v1.wxml'/>
-<import src='./template/grid/grid.wxml'/>
-<import src='./template/custom/custom.wxml'/>
+<import src='./template/1v1/1v1.wxml' />
+<import src='./template/grid/grid.wxml' />
+<import src='./template/custom/custom.wxml' />
 <view class="trtc-room-container {{isFullscreenDevice?'fullscreen-device-fix':''}}">
-  <block wx:if="{{template === '1v1'}}">
-    <template is='1v1' data="{{pusher, streamList, debug, enableIM}}"></template>
-  </block>
-  <block wx:if="{{template === 'grid'}}">
-    <template is='grid' data="{{pusher, streamList, visibleStreamList, debug, enableIM, panelName, gridPagePlaceholderStreamList, gridPageCount, gridCurrentPage, gridPlayerPerPage, isShowMoreMenu, MICVolume, BGMVolume, BGMProgress, beautyStyle, beautyStyleArray, filterIndex, filterArray, audioReverbTypeArray}}"></template>
-  </block>
-  <block wx:if="{{template === 'custom'}}">
-    <template is='custom' data="{{pusher, streamList, debug}}"></template>
-  </block>
-  <view class="im-panel" wx:if="{{enableIM && showIMPanel}}">
-    <view class="message-panel-body">
-      <scroll-view scroll-y="true" class="message-scroll-container" scroll-into-view="message{{messageList.length-1}}" scroll-with-animation="{{true}}">
-        <view class="message-list">
-          <view class="message-item" wx:for="{{messageList}}" wx:key="index" id="message{{index}}">
-            <span class="user-name {{item.name == config.userID?'mine':''}}">{{item.name}}</span>
-            <span class="message-content">{{item.message}}</span>
-          </view>
-          <view id="message-bottom"></view>
-        </view>
-      </scroll-view>
-        
-    </view>
-    <view class="message-panel-bottom">
-      <view class="message-input-container">
-        <input class="message-input" type="text" value="{{messageContent}}" bindinput='_inputIMMessage' bindconfirm='_sendIMMessage' confirm-type="send" placeholder="请输入消息" maxlength="200" placeholder-style="color:#ffffff;opacity: 0.55;"/>
-      </view>
-      <view class="message-send-btn">
-        <button class="btn" bindtap="_sendIMMessage" hover-class="btn-hover">发送</button>
-      </view>
-    </view>
-    <view bindtap="_toggleIMPanel" class='close-btn'>X</view>
-  </view>
+	<block wx:if="{{template === '1v1'}}">
+		<template is='1v1' data="{{pusher, streamList, debug, enableIM,showmodal,timer,second}}"></template>
+	</block>
+	<block wx:if="{{template === 'grid'}}">
+		<template is='grid' data="{{pusher, streamList, visibleStreamList, debug, enableIM, panelName, gridPagePlaceholderStreamList, gridPageCount, gridCurrentPage, gridPlayerPerPage, isShowMoreMenu, MICVolume, BGMVolume, BGMProgress, beautyStyle, beautyStyleArray, filterIndex, filterArray, audioReverbTypeArray}}"></template>
+	</block>
+	<block wx:if="{{template === 'custom'}}">
+		<template is='custom' data="{{pusher, streamList, debug}}"></template>
+	</block>
+	<view class="im-panel" wx:if="{{enableIM && showIMPanel}}">
+		<view class="message-panel-body">
+			<scroll-view scroll-y="true" class="message-scroll-container" scroll-into-view="message{{messageList.length-1}}" scroll-with-animation="{{true}}">
+				<view class="message-list">
+					<view class="message-item" wx:for="{{messageList}}" wx:key="index" id="message{{index}}">
+						<span class="user-name {{item.name == config.userID?'mine':''}}">{{item.name}}</span>
+						<span class="message-content">{{item.message}}</span>
+					</view>
+					<view id="message-bottom"></view>
+				</view>
+			</scroll-view>
 
-  <view class="debug-info-btn {{debugMode && !debugPanel?'':'none'}}">
-    <button class="debug-btn" bindtap="_debugTogglePanel" hover-class="button-hover">Debug</button>
-  </view>
-  <view class="debug-info {{debugMode && debugPanel?'':'none'}}">
-    <view bindtap="_debugTogglePanel" class='close-btn'>X</view>
-    <view>appVersion: {{appVersion}}</view>
-    <view>libVersion: {{libVersion}}</view>
-    <view>template: {{template}}</view>
-    <view>debug: <button class="{{debug?'':'false'}} debug-btn" bindtap="_debugToggleVideoDebug" hover-class="button-hover">{{debug}}</button></view>
-    <view>userID: {{pusher.userID}}</view>
-    <view>roomID: {{pusher.roomID}}</view>
-    <view>camera: <button class="{{pusher.enableCamera?'':'false'}} debug-btn" bindtap="_toggleVideo" hover-class="button-hover">{{pusher.enableCamera}}</button></view>
-    <view>mic: <button class="{{pusher.enableMic?'':'false'}} debug-btn" bindtap="_toggleAudio" hover-class="button-hover">{{pusher.enableMic}}</button></view>
-    <view>switch camera: <button class="debug-btn" bindtap="switchCamera" hover-class="button-hover">{{cameraPosition||pusher.frontCamera}}</button></view>
-    <view>Room:
-      <button class="debug-btn" bindtap="_debugEnterRoom" hover-class="button-hover">Enter</button>
-      <button class="debug-btn" bindtap="_debugExitRoom" hover-class="button-hover">Exit</button>
-      <button class="debug-btn" bindtap="_debugGoBack" hover-class="button-hover">Go back</button>
-    </view>
-    <view>IM: <button class="debug-btn" bindtap="_debugSendRandomMessage" hover-class="button-hover">send</button></view>
-    <view>user count: {{userList.length}}</view>
-    <view wx:for="{{userList}}" wx:key="userID">{{item.userID}}|
-      mainV:<span class="text {{item.hasMainVideo? 'true' : 'false' }}">{{item.hasMainVideo||false}}</span>|
-      mainA:<span class="text {{item.hasMainAudio? 'true' : 'false' }}">{{item.hasMainAudio||false}}</span>|
-      auxV:<span class="text {{item.hasAuxVideo? 'true' : 'false' }}">{{item.hasAuxVideo||false}}</span></view>
-    <view>stream count: {{streamList.length}}</view>
-    <view wx:for="{{streamList}}" wx:key="streamID">{{item.userID}}|{{item.streamType}}|
-      SubV:<button class="{{!item.muteVideo?'':'false'}} debug-btn" bindtap="_debugToggleRemoteVideo" hover-class="button-hover" data-user-i-d="{{item.userID}}" data-stream-type="{{item.streamType}}">{{!item.muteVideo}}</button>|
-      SubA:<button class="{{!item.muteAudio?'':'false'}} debug-btn" bindtap="_debugToggleRemoteAudio" hover-class="button-hover" data-user-i-d="{{item.userID}}" data-stream-type="{{item.streamType}}">{{!item.muteAudio}}</button></view>
-  </view>
-</view>
+		</view>
+		<view class="message-panel-bottom">
+			<view class="message-input-container">
+				<input class="message-input" type="text" value="{{messageContent}}" bindinput='_inputIMMessage' bindconfirm='_sendIMMessage' confirm-type="send" placeholder="请输入消息" maxlength="200" placeholder-style="color:#ffffff;opacity: 0.55;" />
+			</view>
+			<view class="message-send-btn">
+				<button class="btn" bindtap="_sendIMMessage" hover-class="btn-hover">发送</button>
+			</view>
+		</view>
+		<view bindtap="_toggleIMPanel" class='close-btn'>X</view>
+	</view>
+
+	<view class="debug-info-btn {{debugMode && !debugPanel?'':'none'}}">
+		<button class="debug-btn" bindtap="_debugTogglePanel" hover-class="button-hover">Debug</button>
+	</view>
+	<view class="debug-info {{debugMode && debugPanel?'':'none'}}">
+		<view bindtap="_debugTogglePanel" class='close-btn'>X</view>
+		<view>appVersion: {{appVersion}}</view>
+		<view>libVersion: {{libVersion}}</view>
+		<view>template: {{template}}</view>
+		<view>debug: <button class="{{debug?'':'false'}} debug-btn" bindtap="_debugToggleVideoDebug" hover-class="button-hover">{{debug}}</button></view>
+		<view>userID: {{pusher.userID}}</view>
+		<view>roomID: {{pusher.roomID}}</view>
+		<view>camera: <button class="{{pusher.enableCamera?'':'false'}} debug-btn" bindtap="_toggleVideo" hover-class="button-hover">{{pusher.enableCamera}}</button></view>
+		<view>mic: <button class="{{pusher.enableMic?'':'false'}} debug-btn" bindtap="_toggleAudio" hover-class="button-hover">{{pusher.enableMic}}</button></view>
+		<view>switch camera: <button class="debug-btn" bindtap="switchCamera" hover-class="button-hover">{{cameraPosition||pusher.frontCamera}}</button></view>
+		<view>Room:
+			<button class="debug-btn" bindtap="_debugEnterRoom" hover-class="button-hover">Enter</button>
+			<button class="debug-btn" bindtap="_debugExitRoom" hover-class="button-hover">Exit</button>
+			<button class="debug-btn" bindtap="_debugGoBack" hover-class="button-hover">Go back</button>
+		</view>
+		<view>IM: <button class="debug-btn" bindtap="_debugSendRandomMessage" hover-class="button-hover">send</button></view>
+		<view>user count: {{userList.length}}</view>
+		<view wx:for="{{userList}}" wx:key="userID">{{item.userID}}|
+			mainV:<span class="text {{item.hasMainVideo? 'true' : 'false' }}">{{item.hasMainVideo||false}}</span>|
+			mainA:<span class="text {{item.hasMainAudio? 'true' : 'false' }}">{{item.hasMainAudio||false}}</span>|
+			auxV:<span class="text {{item.hasAuxVideo? 'true' : 'false' }}">{{item.hasAuxVideo||false}}</span></view>
+		<view>stream count: {{streamList.length}}</view>
+		<view wx:for="{{streamList}}" wx:key="streamID">{{item.userID}}|{{item.streamType}}|
+			SubV:<button class="{{!item.muteVideo?'':'false'}} debug-btn" bindtap="_debugToggleRemoteVideo" hover-class="button-hover" data-user-i-d="{{item.userID}}" data-stream-type="{{item.streamType}}">{{!item.muteVideo}}</button>|
+			SubA:<button class="{{!item.muteAudio?'':'false'}} debug-btn" bindtap="_debugToggleRemoteAudio" hover-class="button-hover" data-user-i-d="{{item.userID}}" data-stream-type="{{item.streamType}}">{{!item.muteAudio}}</button></view>
+	</view>
+</view>

pages/answerAfterclass/answerAfterclass.js

@@ -123,13 +123,13 @@ Page({
       const titleINDEX = wx.getStorageSync('titleINDEX' + wx.getStorageSync('answersId'));
       const chooseValue = wx.getStorageSync('chooseValue' + wx.getStorageSync('answersId'));
       console.log(wx.getStorageSync('questionList' + wx.getStorageSync('answersId')))
-      wx.hideLoading();
       this.setData({
         questionList: questionList,
         answersId: wx.getStorageSync('answersId'),
         chooseValue: chooseValue,
         index: titleINDEX
       })
+      wx.hideLoading();
     } else {
       this.allShi(options.id, options.paperId, sessionKey);
     }
@@ -188,18 +188,16 @@ Page({
             });
             json.QuestChoice = arrJson;
           }
-
           return json;
         })
-        wx.hideLoading();
         this.setData({
           questionList: jsonArr
         })
+        wx.hideLoading();
         console.log(this.data.questionList)
         wx.setStorageSync('titleINDEX' + wx.getStorageSync('answersId'), 0);
         wx.setStorageSync('chooseValue' + wx.getStorageSync('answersId'), []),
-          wx.setStorageSync('questionList' + wx.getStorageSync('answersId'), this.data.questionList);
-
+        wx.setStorageSync('questionList' + wx.getStorageSync('answersId'), this.data.questionList);
       },
       fail: () => {
         wx.hideLoading()
@@ -207,9 +205,6 @@ Page({
     })
   },
   submitAll(currentAnswerTemp) {
-    // if(currentAnswerTemp.length==0){
-    //   currentAnswerTemp
-    // }
     wx.showLoading({
       mask: true,
       title: '加载中',
@@ -296,8 +291,5 @@ Page({
         }
       })
     }
-
-
   }
-
 })

pages/answerAfterclasses/answerAfterclasses.js

@@ -92,7 +92,6 @@ Page({
     wx.setStorageSync('questionList' + wx.getStorageSync('answersId'), this.data.questionList);
     wx.setStorageSync('titleINDEX' + wx.getStorageSync('answersId'), this.data.index);
     wx.setStorageSync('chooseValue' + wx.getStorageSync('answersId'), this.data.chooseValue);
-
   },
   /*
    * 下一题/提交 按钮

pages/evaluationCourse/evaluationCourse.wxss

@@ -96,23 +96,26 @@ button:not([size='mini']) {
 }
 
 .my-choosebox {
-  color: rgba(51, 51, 51, 1);
+  /* color: rgba(51, 51, 51, 1);
   width: 200rpx;
   line-height: 80rpx;
   border: 2rpx solid rgba(211, 211, 211, 1);
   padding: 10rpx 30rpx;
   margin: 20rpx;
+  border-radius: 10rpx; */
+  color: rgba(51, 51, 51, 1);
+  width: 300rpx;
+  padding: 10rpx 20rpx;
+  background: #FFF0ED;
+  margin: 20rpx;
   border-radius: 10rpx;
-
+  display: block;
+  text-align: center;
 }
-
 .checkboxbox {
   background: linear-gradient(90deg, rgba(215, 47, 29, 1), rgba(249, 157, 48, 1)) !important;
   color: white !important;
-
 }
-
-
 textarea {
   background: rgba(244, 244, 244, 1);
   border-radius: 10px;

pages/groupsList/groupsList.js

@@ -25,6 +25,9 @@ Page({
     }]
   },
   async onLoad() {
+    wx.showLoading({
+      title: '加载中',
+    })
     const sessionKey = await tools.checkSessionAndLogin();
     wx.request({
       url: app.globalData.publicUrl + '/wx/student/getTeamPosition',
@@ -33,8 +36,23 @@ Page({
         sessionKey
       },
       success: (res) => {
-        console.log(res.data.clasResult);
-        console.log(res.data.studentClasResult);
+        this.setData({
+          secretary:res.data.data.secretary,
+          organization:res.data.data.organization,
+          propaganda:res.data.data.propaganda,
+          projectLeader:res.data.data.projectLeader,
+          deputyProjectLeader:res.data.data.deputyProjectLeader,
+          projectAssistant:res.data.data.projectAssistant,
+          projectSecretary:res.data.data.projectSecretary
+        })
+        wx.hideLoading()
+        console.log(res.data.data.secretary,'书记');
+        console.log(res.data.data.organization,'组织委员');
+        console.log(res.data.data.propaganda,'宣传委员');
+        console.log(res.data.data.projectLeader,'项目组长');
+        console.log(res.data.data.deputyProjectLeader,'项目副组长');
+        console.log(res.data.data.projectAssistant,'项目助理');
+        console.log(res.data.data.projectSecretary,'项目秘书');
       }
     })
   }

pages/groupsList/groupsList.wxml

@@ -1,11 +1,12 @@
 <view>
-	<view class="block" wx:for="{{Arr}}" wx:for-item="item" wx:key="index">
+	<image src="../../images/group1.png" class="img1"></image>
+	<view class="block" wx:for="{{projectLeader}}" wx:for-item="item" wx:key="index">
 		<view class="h1">
 			<view class="name">
 				{{item.name}}
 			</view>
 			<view class="zw">
-				{{item.zw}}
+				项目组长
 			</view>
 		</view>
 		<view class="h1">
@@ -15,4 +16,102 @@
 			</view>
 		</view>
 	</view>
+	<view class="block" wx:for="{{deputyProjectLeader}}" wx:for-item="item" wx:key="index">
+		<view class="h1">
+			<view class="name">
+				{{item.name}}
+			</view>
+			<view class="zw">
+				项目副组长
+			</view>
+		</view>
+		<view class="h1">
+			<view style="color:#eb3f33;font-weight:900">
+				<image src="../../images/phoneicon.png" style="width:33rpx;height:33rpx"></image>
+				{{item.phone}}
+			</view>
+		</view>
+	</view>
+	<view class="block" wx:for="{{projectAssistant}}" wx:for-item="item" wx:key="index">
+		<view class="h1">
+			<view class="name">
+				{{item.name}}
+			</view>
+			<view class="zw">
+				项目助理
+			</view>
+		</view>
+		<view class="h1">
+			<view style="color:#eb3f33;font-weight:900">
+				<image src="../../images/phoneicon.png" style="width:33rpx;height:33rpx"></image>
+				{{item.phone}}
+			</view>
+		</view>
+	</view>
+	<view class="block" wx:for="{{projectAssiprojectSecretarystant}}" wx:for-item="item" wx:key="index">
+		<view class="h1">
+			<view class="name">
+				{{item.name}}
+			</view>
+			<view class="zw">
+				项目秘书
+			</view>
+		</view>
+		<view class="h1">
+			<view style="color:#eb3f33;font-weight:900">
+				<image src="../../images/phoneicon.png" style="width:33rpx;height:33rpx"></image>
+				{{item.phone}}
+			</view>
+		</view>
+	</view>
+	<image src="../../images/group2.png" class="img1"></image>
+	<view class="block" wx:for="{{secretary}}" wx:for-item="item" wx:key="index">
+		<view class="h1">
+			<view class="name">
+				{{item.name}}
+			</view>
+			<view class="zw">
+				书记
+			</view>
+		</view>
+		<view class="h1">
+			<view style="color:#eb3f33;font-weight:900">
+				<image src="../../images/phoneicon.png" style="width:33rpx;height:33rpx"></image>
+				{{item.phone}}
+			</view>
+		</view>
+	</view>
+	<view class="block" wx:for="{{organization}}" wx:for-item="item" wx:key="index">
+		<view class="h1">
+			<view class="name">
+				{{item.name}}
+			</view>
+			<view class="zw">
+				组织委员
+			</view>
+		</view>
+		<view class="h1">
+			<view style="color:#eb3f33;font-weight:900">
+				<image src="../../images/phoneicon.png" style="width:33rpx;height:33rpx"></image>
+				{{item.phone}}
+			</view>
+		</view>
+	</view>
+	<view class="block" style="margin-bottom:50rpx" wx:for="{{propaganda}}" wx:for-item="item" wx:key="index">
+		<view class="h1">
+			<view class="name">
+				{{item.name}}
+			</view>
+			<view class="zw">
+				宣传委员
+			</view>
+		</view>
+		<view class="h1">
+			<view style="color:#eb3f33;font-weight:900">
+				<image src="../../images/phoneicon.png" style="width:33rpx;height:33rpx"></image>
+				{{item.phone}}
+			</view>
+		</view>
+	</view>
+
 </view>

pages/groupsList/groupsList.wxss

@@ -2,11 +2,12 @@
   width: 650rpx;
   height: 160rpx;
   margin-top: 30rpx;
-  margin-left:50rpx;
+  margin-left: 50rpx;
   background-color: #fff;
   box-shadow: rgba(235, 63, 51, 0.2) 0px 0px 10px;
   border-radius: 10rpx;
 }
+
 .h1 {
   width: 70%;
   height: 80rpx;
@@ -14,10 +15,19 @@
   line-height: 80rpx;
   font-size: 30rpx;
 }
+
 .name {
   float: left;
 }
+
 .zw {
   float: right;
   color: #858888;
+}
+
+.img1 {
+  width: 683rpx;
+  height: 49rpx;
+  margin-left: 34rpx;
+  margin-top: 50rpx;
 }

pages/studentList/studentList.wxss

@@ -23,4 +23,6 @@
 .text2 .van-col{
   margin-top: 20rpx;
   margin-bottom: 20rpx;
+  word-break:break-all;
+  word-wrap:break-word;
 }

pages/studentRegistration/studentRegistration.js

@@ -259,7 +259,9 @@ Page({
     }
     console.log(this.data.jobArr,this.data.jobIndex, "55555555")
     e.detail.value.culture = this.data.kaihuList[this.data.kaihuindex].name;
-    e.detail.value.studentDuty = this.data.jobtext;
+    const jIndex = this.data.jobArr.findIndex(o=> o.dictLabel==this.data.jobtext)
+    console.log(this.data.jobArr[jIndex].dictValue,"000000000000000000")
+    e.detail.value.studentDuty = this.data.jobArr[jIndex].dictValue;
     e.detail.value.tenure = this.data.tenure;
     e.detail.value.sessionKey = this.data.sessionKey;
     let aa = e.detail.value
@@ -325,7 +327,6 @@ Page({
       if (new RegExp("(" + k + ")").test(fmt))
         fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
     return fmt;
-
   },
   getjob(sessionKey) {
     wx.request({
@@ -335,10 +336,12 @@ Page({
         sessionKey
       },
       success: (res) => {
+        console.log(res,'我是获取到的数组')
         let Arr=[];
         res.data.data.forEach(item => {
           let newdata = {};
           newdata.dictLabel = item.dictLabel;
+          newdata.dictValue = item.dictValue;
           Arr.push(newdata);
         });
         this.setData({

pages/zbDetails/zbDetails.js

@@ -15,7 +15,7 @@ Page({
     currentGroup: null,
     chatContent: [],
     inputValue: '',
-    second: 5,
+    // second: 5,
     showmodal: false,
     bottom: "", //滑到底状态 防止弹出消息不跳到最后一条
     talkStatus: true, //初始值为true
@@ -113,7 +113,7 @@ Page({
         if (_this.data.chatContent.length > 0) { // 表示不是第一次填数据，可以使用push
           console.log("表示不是第一次填数据，可以使用push", _this.data.chatContent)
           const chatContent = _this.data.chatContent
-          event.data[0].currentTime=currentTime;
+          event.data[0].currentTime = currentTime;
           chatContent.push(event.data[0])
           // chatContent.push({
           //   currentTime: currentTime
@@ -128,13 +128,15 @@ Page({
           // let currentTime = util.formatTime(new Date());
           console.log("表示第一次填数据", _this.data.chatContent)
           // const chatContent = _this.data.chatContent
-          let Arr = [];
-          event.data.currentTime = currentTime
-          Arr.push(event.data)
-          console.log(event.data)
+          // let Arr = [];
+          event.data[0].currentTime = currentTime
+          let chatContent = []
+          chatContent.push(event.data[0])
+          // Arr.push(event.data)
+          // console.log(event.data)
           // Arr.push({currentTime:currentTime})
           _this.setData({
-            chatContent: Arr,
+            chatContent: chatContent,
             bottom: 'scrollBottom'
             // currentTime: currentTime
           })
@@ -162,10 +164,11 @@ Page({
         _this.trtcRoomContext.unpublishLocalAudio();
       }
       if (event.data[0].payload.data == "readyPutLocalStream") {
-        _this.setData({
-          showmodal: true
-        })
-        _this.countdown()
+        _this.trtcRoomContext.showTeacherTalk();
+        // _this.setData({
+        //   showmodal: true
+        // })
+        // _this.countdown()
       }
       if (event.data[0].payload.data == "stopTalk") {
         _this.setData({
@@ -206,11 +209,11 @@ Page({
     }
   },
   answer() {
-    this.setData({
-      showmodal: false,
-      second: 5
-    });
-    clearTimeout(this.data.timer);
+    // this.setData({
+    //   showmodal: false,
+    //   second: 5
+    // });
+    // clearTimeout(this.data.timer);
     let _this = this;
     let message = _this.data.tim.createCustomMessage({
       to: "teacher-" + _this.data.currentGroup.groupID,
@@ -227,11 +230,11 @@ Page({
     });
   },
   refuse() {
-    this.setData({
-      showmodal: false,
-      second: 5
-    });
-    clearTimeout(this.data.timer);
+    // this.setData({
+    //   showmodal: false,
+    //   second: 5
+    // });
+    // clearTimeout(this.data.timer);
     let _this = this;
     let message = _this.data.tim.createCustomMessage({
       to: "teacher-" + _this.data.currentGroup.groupID,
@@ -247,21 +250,21 @@ Page({
       console.warn('我给老师发消息说我不同意失败啦', imError);
     });
   },
-  countdown() {
-    var second = this.data.second
-    if (second == 0) {
-      this.refuse();
-      return;
-    }
-    this.setData({
-      timer: setTimeout(() => {
-        this.setData({
-          second: second - 1
-        });
-        this.countdown();
-      }, 1000)
-    })
-  },
+  // countdown() {
+  //   var second = this.data.second
+  //   if (second == 0) {
+  //     this.refuse();
+  //     return;
+  //   }
+  //   this.setData({
+  //     timer: setTimeout(() => {
+  //       this.setData({
+  //         second: second - 1
+  //       });
+  //       this.countdown();
+  //     }, 1000)
+  //   })
+  // },
   // 举手
   handsup() {
     console.log(this.data.currentGroup, "0000000000")

pages/zbDetails/zbDetails.wxml

@@ -1,6 +1,6 @@
 <view class="home">
 	<view class="big_box">
-		<trtc-room id="trtcroom" config="{{rtcConfig}}" scene="live" ></trtc-room>
+		<trtc-room id="trtcroom" config="{{rtcConfig}}" scene="live" bind:myevent='refuse' bind:myevent1='answer'></trtc-room>
 		<view class="area">
 			<view class="chatbox">
 				<scroll-view scroll-y="true" style="height: 490rpx;width:690rpx;" bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" scroll-into-view="{{bottom}}" scroll-top="{{scrollTop}}">
@@ -21,12 +21,12 @@
 				<view class="{{talkStatus?'send':'nosend'}}" bindtap="handsup">举手</view>
 			</view>
 		</view>
-		<view class="modol" wx:if="{{showmodal}}">
+		<!-- <view class="modol" wx:if="{{showmodal}}">
 			<image src="../../images/lmbj.png" class="lm"></image>
 			<view class="t1">老师向你发起连麦申请</view>
 			<view class="t2"><text class="t3">{{second}}</text>秒之后自动关闭</view>
 			<button class="t4" style="width:300rpx" bindtap="answer">接听</button>
 			<button class="t5" style="width:300rpx" bindtap="refuse">关闭</button>
-		</view>
+		</view> -->
 	</view>
 </view>