11

app.json

@@ -1,8 +1,11 @@
 {
   "pages": [
-    "pages/welcome/welcome",
     "pages/index/index",
+    "pages/dbDetails/dbDetails",
+    "pages/dbVideo/dbVideo",
     "pages/zbDetails/zbDetails",
+    "pages/myNotice/myNotice",
+    "pages/myClass/myClass",
     "pages/myInteractions/myInteractions",
     "pages/myMission/myMission",
     "pages/exhibitionList/exhibitionList",
@@ -10,10 +13,7 @@
     "pages/demandCourses/demandCourses",
     "pages/onlineClass/onlineClass",
     "pages/personInfo/personInfo",
-    "pages/dbDetails/dbDetails",
-    "pages/myClass/myClass",
     "pages/testAnswer/testAnswer",
-    "pages/dbVideo/dbVideo",
     "pages/myInteractionsDetais/myInteractionsDetais",
     "pages/myPoints/myPoints",
     "pages/evaluationCourse/evaluationCourse",
@@ -24,8 +24,8 @@
     "pages/studentRegistration/studentRegistration",
     "pages/grade/grade",
     "pages/answerAfterclass/answerAfterclass",
-    "pages/myNotice/myNotice"
-    
+    "pages/outpage/outpage",
+    "pages/welcome/welcome"
   ],
   "window": {
     "backgroundTextStyle": "light",

pages/Identity/Identity.js

@@ -6,7 +6,9 @@ Page({
     userName: "",
     phone: "",
     card: "",
-    isInput: false
+    isInput1: false,
+    isInput2: false,
+    isInput3: false
   },
   showModal(error) {
     wx.showModal({
@@ -117,6 +119,7 @@ Page({
         }
       })
     } else {
+      wx.hideLoading()
       wx.showModal({
         showCancel: false,
         content: "您已经认证过了"
@@ -139,7 +142,7 @@ Page({
               userName: res.data.data.miniName,
               phone: res.data.data.miniPhone,
               card: res.data.data.studentCard,
-              isInput: true
+              isInput3: true
             })
           } else {
             console.log("我没认证，需要认证")

pages/Identity/Identity.wxml

@@ -2,11 +2,11 @@
 	<form bindsubmit="formSubmit">
 		<view class="form_item">
 			<image src='/images/shenfen1.png' mode="aspectFit" class="icon1"></image>
-			<input style='display:inline-block;height:60%;' disabled="{{isInput}}" placeholder-style='font-size:30rpx;' placeholder='请输入姓名' name='userName' value="{{userName}}"></input>
+			<input style='display:inline-block;height:60%;' disabled="{{isInput1}}" placeholder-style='font-size:30rpx;' placeholder='请输入姓名' name='userName' value="{{userName}}"></input>
 		</view>
 		<view class="form_item">
 			<image src='/images/shenfen2.png' mode="aspectFit" class="icon1"></image>
-			<input style='display:inline-block;height:60%;' disabled="{{isInput}}" placeholder-style='font-size:30rpx;' placeholder='请输入手机号' name='phone' type='number' value="{{phone}}"></input>
+			<input style='display:inline-block;height:60%;' disabled="{{isInput2}}" placeholder-style='font-size:30rpx;' placeholder='请输入手机号' name='phone' type='number' value="{{phone}}"></input>
 			<!-- <view class="getyzm">获取验证码</view> -->
 		</view>
 		<!-- <view class="form_item">
@@ -15,7 +15,7 @@
 		</view> -->
 		<view class="form_item">
 			<image src='/images/shenfen4.png' mode="aspectFit" class="icon1"></image>
-			<input style='width:80%;display:inline-block;height:60%;' disabled="{{isInput}}" placeholder-style='font-size:30rpx;' placeholder='请输入身份证号' name="card" value="{{card}}"></input>
+			<input style='width:80%;display:inline-block;height:60%;' disabled="{{isInput3}}" placeholder-style='font-size:30rpx;' placeholder='请输入身份证号' name="card" value="{{card}}"></input>
 		</view>
 		<button class="qrrz" formType="submit">前往认证</button>
 	</form>

pages/dbDetails/dbDetails.js

@@ -51,10 +51,16 @@ Page({
       },
       success: (e) => {
         console.log(e, "22222222222222")
-        _this.setData({
-          studyLog: e.data.studyLog,
-          startPlayTime: e.data.studyLog.studyTime
-        })
+        if (e.data.studyLog.isDone == 1) {
+          _this.setData({
+            studyLog: e.data.studyLog
+          })
+        } else {
+          _this.setData({
+            studyLog: e.data.studyLog,
+            startPlayTime: e.data.studyLog.studyTime
+          })
+        }
       }
     })
   },

pages/dbDetails/dbDetails.wxml

@@ -1,5 +1,5 @@
 <view class="home">
-	<video id="myVideo" src="{{url}}" show-progress="{{false}}" initial-time="{{startPlayTime}}" binderror="videoErrorCallback" bindtimeupdate="timeUpdate" show-play-btn="ture" show-mute-btn="true" controls bindended="chechEndStatus">
+	<video id="myVideo" enable-auto-rotation="true" src="{{url}}" show-progress="{{false}}" initial-time="{{startPlayTime}}" binderror="videoErrorCallback" bindtimeupdate="timeUpdate" show-play-btn="ture" show-mute-btn="true" controls bindended="chechEndStatus">
 	</video>
 	<view class="text_box">
 		<view class="title">{{title}}</view>

pages/dbVideo/dbVideo.js

@@ -19,13 +19,13 @@ Page({
       method: "POST",
       url: app.globalData.publicUrl + '/wx/course/queryById?id=' + _this.data.id,
       success: (e) => {
-        // console.log(e,"11111111111111111")
+        // if(e.data.list)
         this.setData({
           url: e.data.url,
           show: false,
           title:e.data.list.courseInfo,
           message: e.data.list.courseName,
-          playTimes: e.data.list.playTimes
+          // playTimes: e.data.list.playTimes
         })
       }
     })

pages/demandCourses/demandCourses.wxss

@@ -37,6 +37,9 @@ page {
 .show_text {
   font-size: 22rpx;
   margin-top: 10rpx;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
 .qb {
@@ -46,6 +49,7 @@ page {
   margin-top: 5rpx;
   float: left;
 }
+
 .nodata {
   position: absolute;
   top: 285rpx;
@@ -53,7 +57,8 @@ page {
   width: 340rpx;
   height: 262rpx;
 }
-.nodata_text{
+
+.nodata_text {
   position: absolute;
   top: 550rpx;
   left: 310rpx;

pages/exhibitionList/exhibitionList.wxml

@@ -15,7 +15,7 @@
 				</view>
 			</view>
 		</van-tab>
-		<van-tab title="学院宣传" title-style="font-size:25rpx">
+		<van-tab title="我的学院" title-style="font-size:25rpx">
 			<view class="xczs">
 				<view class="zb1" wx:for="{{xcpArr}}" wx:for-index="idx" wx:for-item="item" wx:key="idx" bindtap="goSeevideo" data-item="{{item}}">
 					<image src='{{item.courseImg}}' mode='aspectFill' class="show1"></image>
@@ -23,7 +23,7 @@
 						<view class="show_text">{{item.courseName}}</view>
 						<view class="viedoxx">
 							<image src='/images/qb.png' mode='aspectFill' class="qb"></image>
-							<view style="color:#e82315;font-size:25rpx;font-weight:500;float:left">学院宣传</view>
+							<view style="color:#e82315;font-size:25rpx;font-weight:500;float:left">我的学院</view>
 							<view style="color:#848585;font-size:22rpx;float:right;margin-right:20rpx">{{item.playTimes}}人看过</view>
 						</view>
 					</view>
@@ -45,7 +45,7 @@
 				</view>
 			</view>
 		</van-tab>
-		<van-tab title="精细管理" title-style="font-size:25rpx">
+		<van-tab title="特色管理" title-style="font-size:25rpx">
 			<view class="xczs">
 				<view class="zb1" wx:for="{{xcpArr}}" wx:for-index="idx" wx:for-item="item" wx:key="idx" bindtap="goSeevideo" data-item="{{item}}">
 					<image src='{{item.courseImg}}' mode='aspectFill' class="show1"></image>
@@ -53,7 +53,7 @@
 						<view class="show_text">{{item.courseName}}</view>
 						<view class="viedoxx">
 							<image src='/images/qb.png' mode='aspectFill' class="qb"></image>
-							<view style="color:#e82315;font-size:25rpx;font-weight:500;float:left">精细管理</view>
+							<view style="color:#e82315;font-size:25rpx;font-weight:500;float:left">特色管理</view>
 							<view style="color:#848585;font-size:22rpx;float:right;margin-right:20rpx">{{item.playTimes}}人看过</view>
 						</view>
 					</view>

pages/exhibitionList/exhibitionList.wxss

@@ -29,6 +29,9 @@
 .show_text {
   font-size: 22rpx;
   margin-top: 10rpx;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
 .grayblock {

pages/index/index.wxml

@@ -10,7 +10,7 @@
 					<image src='/images/mb.png' class='uimg' mode='aspectFill'></image>
 					<view class="text text1">{{item.clasName}}</view>
 					<view class="text text2">主办：{{item.remark}}</view>
-					<view class="text text3">开班时间：{{item.clasBegin}}-{{item.clasEnd}}</view>
+					<view class="text text3">开班时间：{{item.beginDate}} 至 {{item.endDate}}</view>
 					<image src='/images/goclass.png' mode='aspectFill' class="gozbbtn" wx:if='{{item.isActive==5}}'></image>
 				</swiper-item>
 			</block>

pages/index/index.wxss

@@ -18,7 +18,8 @@
   width: 100%;
   height: inherit;
 }
-.uimg{
+
+.uimg {
   position: absolute;
   width: 100%;
   height: 240rpx;
@@ -26,15 +27,17 @@
   left: 0;
   z-index: 1;
 }
+
 .text {
   color: #fff;
   position: absolute;
   left: 50rpx;
   z-index: 99;
+  font-weight: 900;
 }
 
 .text1 {
-  font-size: 35rpx;
+  font-size: 30rpx;
   /* font-weight: 900; */
   top: 25rpx;
 }
@@ -64,22 +67,26 @@
   margin-left: 20rpx;
   margin-top: 15rpx;
   /* border: 1px solid red; */
-  
+
 }
+
 .sec_item {
   float: left;
   position: relative;
 }
+
 .sec_item1 {
   float: right;
   position: relative;
 }
+
 .secimg {
   width: 350rpx;
   height: 110rpx;
   border-radius: 10rpx;
   overflow: hidden;
 }
+
 .text4 {
   color: #fff;
   font-size: 30rpx;
@@ -88,6 +95,7 @@
   top: 10rpx;
   left: 115rpx;
 }
+
 .text5 {
   color: #fff;
   font-size: 25rpx;
@@ -95,6 +103,7 @@
   top: 60rpx;
   left: 90rpx;
 }
+
 .gridbox {
   height: 200rpx;
   width: 710rpx;
@@ -162,6 +171,9 @@
 .show_text {
   font-size: 22rpx;
   margin-top: 10rpx;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
 .grayblock {

pages/myClass/myClass.js

@@ -5,8 +5,9 @@ Page({
     showzs: false,
     show: false,
     SessionKey: "",
-    notice: "暂无通知",
+    notice: "暂无未读通知",
     className: '',
+    logoImg: '',
     kcArr: [],
     sfmArr: []
   },
@@ -174,7 +175,8 @@ Page({
         console.log(res, "我是返回是否有班级")
         if (res.data.code == 0) {
           _this.setData({
-            className: res.data.data.clasName
+            className: res.data.data.clasName,
+            logoImg: res.data.data.logoImg
           })
         } else {
           wx.showModal({
@@ -227,18 +229,26 @@ Page({
       data: {
         sessionKey: sessionKey,
         isSee: 1,
-        isPublish: 0,
         isNotice: 0
       },
       success: function (res) {
         console.log(res, "333333333")
-        if (res.data.list && res.data.list.length !== 0)
-          _this.setData({
-            notice: res.data.list[0].noticeContent
-          });
+        if (res.data.code == 0) {
+          if (res.data.list && res.data.list.length !== 0)
+            _this.setData({
+              notice: res.data.list[0].noticeContent
+            });
+        }
       }
     })
   },
+  gomyNotice() {
+    // if (this.data.notice !== "暂无未读通知") {
+    wx.navigateTo({
+      url: '../myNotice/myNotice'
+    })
+    // }
+  },
   // // 我的课程
   getMycourse(sessionKey) {
     var _this = this;

pages/myClass/myClass.wxml

@@ -8,11 +8,17 @@
 			<view class="thinking">我再想想</view>
 		</view>
 	</van-popup>
-	<view class="layout">
-		<van-notice-bar left-icon="/images/tzicon.png" text="{{notice}}" wrapable scrollable="false" />
+	<view class="notice" bindtap="gomyNotice">
+		<van-row>
+			<van-col span="2">
+				<image src='/images/wdtz.png' mode='aspectFill' class="ding"></image>
+			</van-col>
+			<van-col span="20">{{notice}}</van-col>
+			<van-col span="2">></van-col>
+		</van-row>
 	</view>
 	<van-divider contentPosition="center" customStyle="color: #eb3f33; border-color: #eb3f33; font-size: 30rpx;font-weight:900;position:relative">
-		<image src='/images/banjihz.png' mode='aspectFill' class="banjihz"></image><text>{{className}}</text>
+		<image src='{{logoImg}}' mode='aspectFill' class="banjihz"></image><text>{{className}}</text>
 	</van-divider>
 	<view class="layout" bindtap="goWrite">
 		<image src='/images/xydj_bj.png' mode='aspectFill' class="bgimg1"></image>
@@ -70,7 +76,7 @@
 		<view class="lq_btn" bindtap="lq">领取结业证</view>
 		<view class="pz">注：领取结业证需完成所有课程</view>
 	</view>
-		<van-popup show="{{ showzs }}" bind:close="onClose1">
+	<van-popup show="{{ showzs }}" bind:close="onClose1">
 		<view style="position:relative">
 			<!-- <image src='/images/ewm_closebtn.png' mode='aspectFill' class="ewm_close" bindtap="onClose1"></image> -->
 			<image src='/images/zsbj.jpg' mode='aspectFill' class="zsbj"></image>

pages/myClass/myClass.wxss

@@ -41,6 +41,21 @@
   position: relative;
 }
 
+.notice {
+  background-color: rgba(255, 247, 231);
+  color: rgba(233, 109, 21);
+  font-size: 25rpx;
+  border-radius: 10rpx;
+  padding: 20rpx;
+  width: 670rpx;
+  margin-left: 20rpx;
+}
+
+.ding {
+  width: 24rpx;
+  height: 29rpx;
+}
+
 .bgimg1 {
   width: 693rpx;
   height: 74rpx;
@@ -85,6 +100,7 @@
   border-radius: 20rpx;
   height: 40rpx;
 }
+
 .bg {
   margin-top: 10rpx;
 }
@@ -93,24 +109,25 @@
   width: 680rpx;
   margin-left: 35rpx;
   /* border: 1px solid red; */
-  height: 180rpx;
+  height: 200rpx;
   margin-top: 20rpx;
   position: relative;
   margin-bottom: 20rpx;
   background-color: #fff;
-  box-shadow: rgba(0,0,0,.3) 0px 0px 10rpx;
+  box-shadow: rgba(0, 0, 0, .3) 0px 0px 10rpx;
   border-radius: 5rpx;
 }
 
 .hiddenmore .none {
   display: none !important;
 }
+
 .spfm {
   width: 128rpx;
   height: 128rpx;
   /* margin-top: 20rpx; */
   float: left;
-  margin-top: 25rpx;
+  margin-top: 35rpx;
   margin-left: 20rpx;
   border-radius: 10rpx;
 }
@@ -137,7 +154,7 @@
   /* margin-top: 10rpx; */
   /* margin-left: 10rpx; */
   margin-right: 20rpx;
-  margin-top: 30rpx;
+  margin-top: 40rpx;
   border-radius: 5rpx;
 }
 
@@ -158,12 +175,15 @@
 .name {
   font-size: 25rpx;
   margin-top: 15rpx;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
 .start_text {
   font-size: 23rpx;
   color: #999999;
-  margin-top: 30rpx;
+  margin-top: 35rpx;
 }
 
 .time {
@@ -301,6 +321,7 @@
   font-size: 24rpx;
   margin-top: 30rpx;
 }
+
 .zsbj {
   width: 657rpx;
   height: 891rpx;

pages/myInteractions/myInteractions.js

@@ -27,12 +27,6 @@ Page({
   },
   tab2Show() {
     var _this = this;
-    _this.setData({
-      isshow1: true,
-      isshow2: false,
-      activebg: "#f2f2f2",
-      unactivebg: "#ffeae9"
-    })
     wx.checkSession({
       success: () => {
         console.log("我有缓存")
@@ -58,10 +52,28 @@ Page({
                       sessionKey: sessionKey
                     },
                     success: function (res) {
-                      console.log(res.data.list, "我是查到的列表")
-                      _this.setData({
-                        listArr: res.data.list
-                      })
+                      console.log(res, "我是查到的列表")
+                      if (res.data.code == 0) {
+                        if (res.data.list.length == 0) {
+                          wx.showModal({
+                            showCancel: false,
+                            content: "您还没有提问哦"
+                          })
+                        } else {
+                          _this.setData({
+                            listArr: res.data.list,
+                            isshow1: true,
+                            isshow2: false,
+                            activebg: "#f2f2f2",
+                            unactivebg: "#ffeae9"
+                          })
+                        }
+                      } else {
+                        wx.showModal({
+                          showCancel: false,
+                          content: "您还没有提问哦"
+                        })
+                      }
                     }
                   })
                 }
@@ -76,10 +88,27 @@ Page({
               sessionKey: sessionKey
             },
             success: function (res) {
-              console.log(res.data.list, "我是查到的列表")
-              _this.setData({
-                listArr: res.data.list
-              })
+              if (res.data.code == 0) {
+                if (res.data.list.length == 0) {
+                  wx.showModal({
+                    showCancel: false,
+                    content: "您还没有提问哦"
+                  })
+                } else {
+                  _this.setData({
+                    listArr: res.data.list,
+                    isshow1: true,
+                    isshow2: false,
+                    activebg: "#f2f2f2",
+                    unactivebg: "#ffeae9"
+                  })
+                }
+              } else {
+                wx.showModal({
+                  showCancel: false,
+                  content: "您还没有提问哦"
+                })
+              }
             }
           })
         }
@@ -106,10 +135,28 @@ Page({
                     sessionKey: sessionKey
                   },
                   success: function (res) {
-                    console.log(res.data.list, "我是查到的列表")
-                    _this.setData({
-                      listArr: res.data.list
-                    })
+                    console.log(res,"66666")
+                    if (res.data.code == 0) {
+                      if (res.data.list.length == 0) {
+                        wx.showModal({
+                          showCancel: false,
+                          content: "您还没有提问哦"
+                        })
+                      } else {
+                        _this.setData({
+                          listArr: res.data.list,
+                          isshow1: true,
+                          isshow2: false,
+                          activebg: "#f2f2f2",
+                          unactivebg: "#ffeae9"
+                        })
+                      }
+                    } else {
+                      wx.showModal({
+                        showCancel: false,
+                        content: "您还没有提问哦"
+                      })
+                    }
                   }
                 })
               }

pages/myMission/myMission.js

@@ -185,7 +185,8 @@ Page({
         console.log(res, "我是返回是否有班级")
         if (res.data.code == 0) {
           _this.setData({
-            className: res.data.data.clasName
+            className: res.data.data.clasName,
+            ewmurl: res.data.data.codeImg
           })
         } else {
           wx.showModal({
@@ -222,26 +223,26 @@ Page({
       }
     })
   },
-  ewmGet(sessionKey) {
-    let _this = this;
-    wx.request({
-      url: app.globalData.publicUrl2 + '/wx/student/selAllClas',
-      method: "post",
-      data: {
-        sessionKey: sessionKey
-      },
-      success: function (res) {
-        console.log(res.data.data, "22222222")
-        var filterArr = res.data.data.claList.filter(o => o.isActive == 5)
-        console.log(filterArr, "111111111111")
-        if (filterArr.length !== 0) {
-          _this.setData({
-            ewmurl: filterArr[0].codeImg
-          })
-        }
-      }
-    })
-  },
+  // ewmGet(sessionKey) {
+  //   let _this = this;
+  //   wx.request({
+  //     url: app.globalData.publicUrl2 + '/wx/student/selAllClas',
+  //     method: "post",
+  //     data: {
+  //       sessionKey: sessionKey
+  //     },
+  //     success: function (res) {
+  //       console.log(res.data.data, "22222222")
+  //       var filterArr = res.data.data.claList.filter(o => o.isActive == 5)
+  //       console.log(filterArr, "111111111111")
+  //       if (filterArr.length !== 0) {
+  //         _this.setData({
+  //           ewmurl: filterArr[0].codeImg
+  //         })
+  //       }
+  //     }
+  //   })
+  // },
   showEwm() {
     var sessionKey = "";
     var _this = this;
@@ -251,7 +252,7 @@ Page({
         sessionKey = wx.getStorageSync('sessionKey');
         // console.log(sessionKey)
         _this.ewmClick(sessionKey)
-        _this.ewmGet(sessionKey)
+        // _this.ewmGet(sessionKey)
       },
       fail() {
         console.log("我没有缓存并去登录请求")
@@ -269,7 +270,7 @@ Page({
                 sessionKey = res.data.sessionKey;
                 wx.setStorageSync('sessionKey', res.data.sessionKey);
                 _this.ewmClick(sessionKey)
-                _this.ewmGet(sessionKey)
+                // _this.ewmGet(sessionKey)
               }
             })
           }

pages/myMission/myMission.wxml

@@ -50,7 +50,7 @@
 			</view>
 		</view>
 	</view>
-	<view class="step" style="padding-top:30rpx" bindtap="goWrite2">
+	<view class="step" bindtap="goWrite2">
 		<image src='{{istask4==false?"/images/step_unfinish.png":"/images/step_finish.png"}}' mode='aspectFill' class="finish_img"></image>
 		<view class="layout">
 			<image src='/images/zhfk_bj.png' mode='aspectFill' class="bgimg1"></image>

pages/myMission/myMission.wxss

@@ -46,15 +46,17 @@
   position: absolute;
   top: 90rpx;
   left: 200rpx;
+  padding-right:40rpx
 }
 
 .sm_text {
   font-size: 28rpx;
   color: #999999;
+  /* margin-top: 20rpx; */
   /* font-weight: 900; */
-  position: absolute;
-  top: 140rpx;
-  left: 200rpx;
+  /* position: absolute; */
+  /* top: 140rpx; */
+  /* left: 200rpx; */
 }
 
 .save_btn {
@@ -158,17 +160,20 @@
 
 .sp_bigbox {
   width: 620rpx;
-  /* height: 550rpx; */
+  height: 590rpx;
+  overflow-y: auto;
   margin-left: 50rpx;
   overflow-y: auto;
   overflow-x: hidden;
   background-color: #fff;
   box-shadow: #f2f2f2 0px 0px 15rpx;
 }
+
 .sp_bigbox::-webkit-scrollbar {
   background-color: #e5e5e5;
   width: 8rpx;
 }
+
 .sp_bigbox::-webkit-scrollbar-track {
   opacity: 0;
   transition: opacity 0.12s ease-out;
@@ -176,6 +181,7 @@
   -moz-border-radius: 10rpx;
   border-radius: 10rpx;
 }
+
 .sp_bigbox::-webkit-scrollbar-thumb {
   background-color: #eb3f33;
   transition: background-color 0.3s;
@@ -187,7 +193,7 @@
 .sp {
   width: 580rpx;
   margin-left: 20rpx;
-  height: 158rpx;
+  height: 180rpx;
   margin-top: 20rpx;
   margin-bottom: 20rpx;
   position: relative;
@@ -202,22 +208,29 @@
   top: 0;
   right: 0rpx;
 }
+
 .dbimg {
   width: 144rpx;
   height: 35rpx;
   margin-right: 20rpx;
-  margin-top: 30rpx;
+  margin-top: 40rpx;
 }
+
 .name {
   font-size: 25rpx;
   margin-top: 15rpx;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
+
 .sp_text {
   width: 620rpx;
   height: 100%;
   float: left;
   margin-left: 10rpx;
 }
+
 .an {
   width: 144rpx;
   height: 35rpx;
@@ -231,10 +244,11 @@
   align-items: center;
   justify-content: left;
 }
+
 .start_text {
   font-size: 25rpx;
   color: #999999;
-  margin-top: 25rpx;
+  margin-top: 35rpx;
 }
 
 .time {

pages/myNotice/myNotice.js

@@ -1,66 +1,324 @@
-// pages/myNotice/myNotice.js
+const app = require('../../utils/util.js');
+// import WxValidate from '../../utils/WxValidate';
 Page({
-
-  /**
-   * 页面的初始数据
-   */
   data: {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
+    active: 0,
+    wdArr: [],
+    ydArr: [],
+    showNull: false,
+    showNull1: false
   },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
+  getArr(sessionKey) {
+    let _this = this;
+    wx.request({
+      url: app.globalData.publicUrl3 + '/wx/eduNoticeSee/list',
+      method: "post",
+      data: {
+        sessionKey: sessionKey,
+        isSee: 1,
+        isNotice: 0
+      },
+      success: function (res) {
+        if (res.data.code == 0) {
+          if (res.data.list.length !== 0) {
+            _this.setData({
+              showNull: false,
+              wdArr: res.data.list
+            })
+          } else {
+            _this.setData({
+              wdArr: res.data.list,
+              showNull: true
+            })
+          }
+        } else {
+          _this.setData({
+            showNull: true
+          })
+        }
+      },
+      fail: function () {
+        _this.setData({
+          showNull: true
+        })
+      }
+    })
   },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
+  getArr1(sessionKey) {
+    let _this = this;
+    wx.request({
+      url: app.globalData.publicUrl3 + '/wx/eduNoticeSee/list',
+      method: "post",
+      data: {
+        sessionKey: sessionKey,
+        isSee: 0,
+        isNotice: 0
+      },
+      success: function (res) {
+        if (res.data.code == 0) {
+          if (res.data.list.length !== 0) {
+            _this.setData({
+              showNull1: false,
+              ydArr: res.data.list
+            })
+          } else {
+            _this.setData({
+              ydArr: res.data.list,
+              showNull1: true
+            })
+          }
+        } else {
+          _this.setData({
+            showNull1: true
+          })
+        }
+      },
+      fail: function () {
+        _this.setData({
+          showNull1: true
+        })
+      }
+    })
   },
+  onChange(event) {
+    var _this = this;
+    if (event.detail.index == 1) {
+      wx.checkSession({
+        success: () => {
+          console.log("我有缓存")
+          var sessionKey = wx.getStorageSync('sessionKey');
+          console.log(sessionKey)
+          if (sessionKey == "") {
+            wx.login({
+              success(res) {
+                console.log(res);
+                var code = res.code
+                wx.request({
+                  url: app.globalData.publicUrl2 + '/wx/user/wx7e7a46e129d6cd0f/login',
+                  method: "get",
+                  data: {
+                    code
+                  },
+                  success: function (res) {
+                    sessionKey = res.data.sessionKey;
+                    wx.setStorageSync('sessionKey', res.data.sessionKey);
+                    _this.getArr1(sessionKey);
+                  }
+                })
+              }
+            })
+          } else {
+            _this.getArr1(sessionKey);
+          }
+        },
+        fail() {
+          console.log("我没有缓存并去登录请求")
+          wx.login({
+            success(res) {
+              console.log(res);
+              var code = res.code
+              wx.request({
+                url: app.globalData.publicUrl2 + '/wx/user/wx7e7a46e129d6cd0f/login',
+                method: "get",
+                data: {
+                  code
+                },
+                success: function (res) {
+                  wx.setStorageSync('sessionKey', res.data.sessionKey);
+                  var sessionKey = res.data.sessionKey;
+                  _this.getArr1(sessionKey);
+                  // _this.socketConnect(sessionKey);
+                }
+              })
+            }
+          })
+        }
+      })
+    } else {
+      wx.checkSession({
+        success: () => {
+          console.log("我有缓存")
+          var sessionKey = wx.getStorageSync('sessionKey');
+          console.log(sessionKey)
+          if (sessionKey == "") {
+            wx.login({
+              success(res) {
+                console.log(res);
+                var code = res.code
+                wx.request({
+                  url: app.globalData.publicUrl2 + '/wx/user/wx7e7a46e129d6cd0f/login',
+                  method: "get",
+                  data: {
+                    code
+                  },
+                  success: function (res) {
+                    sessionKey = res.data.sessionKey;
+                    wx.setStorageSync('sessionKey', res.data.sessionKey);
+                    _this.getArr(sessionKey);
+                  }
+                })
+              }
+            })
+          } else {
+            _this.getArr(sessionKey);
+          }
 
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
+        },
+        fail() {
+          console.log("我没有缓存并去登录请求")
+          wx.login({
+            success(res) {
+              console.log(res);
+              var code = res.code
+              wx.request({
+                url: app.globalData.publicUrl2 + '/wx/user/wx7e7a46e129d6cd0f/login',
+                method: "get",
+                data: {
+                  code
+                },
+                success: function (res) {
+                  wx.setStorageSync('sessionKey', res.data.sessionKey);
+                  var sessionKey = res.data.sessionKey;
+                  _this.getArr(sessionKey);
+                  // _this.socketConnect(sessionKey);
+                }
+              })
+            }
+          })
+        }
+      })
+    }
 
+    // wx.showToast({
+    //   title: `切换到标签 ${event.detail.name}`,
+    //   icon: 'none',
+    // });
   },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
+  meRead(sessionKey, noticeId) {
+    var _this = this;
+    wx.request({
+      url: app.globalData.publicUrl3 + '/wx/eduNoticeSee/edit',
+      method: "post",
+      data: {
+        sessionKey: sessionKey,
+        isSee: 0,
+        noticeId: noticeId
+      },
+      success: function (res) {
+        _this.getArr(sessionKey)
+      }
+    })
   },
+  btn(e) {
+    console.log(e.currentTarget.dataset.item.noticeId, "99999")
+    let noticeId = e.currentTarget.dataset.item.noticeId;
+    var _this = this;
+    wx.checkSession({
+      success: () => {
+        console.log("我有缓存")
+        var sessionKey = wx.getStorageSync('sessionKey');
+        console.log(sessionKey)
+        if (sessionKey == "") {
+          wx.login({
+            success(res) {
+              console.log(res);
+              var code = res.code
+              wx.request({
+                url: app.globalData.publicUrl2 + '/wx/user/wx7e7a46e129d6cd0f/login',
+                method: "get",
+                data: {
+                  code
+                },
+                success: function (res) {
+                  sessionKey = res.data.sessionKey;
+                  wx.setStorageSync('sessionKey', res.data.sessionKey);
+                  _this.meRead(sessionKey, noticeId);
+                }
+              })
+            }
+          })
+        } else {
+          _this.meRead(sessionKey, noticeId);
+        }
 
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
+      },
+      fail() {
+        console.log("我没有缓存并去登录请求")
+        wx.login({
+          success(res) {
+            console.log(res);
+            var code = res.code
+            wx.request({
+              url: app.globalData.publicUrl2 + '/wx/user/wx7e7a46e129d6cd0f/login',
+              method: "get",
+              data: {
+                code
+              },
+              success: function (res) {
+                wx.setStorageSync('sessionKey', res.data.sessionKey);
+                var sessionKey = res.data.sessionKey;
+                _this.meRead(sessionKey, noticeId);
+                // _this.socketConnect(sessionKey);
+              }
+            })
+          }
+        })
+      }
+    })
   },
+  onLoad: function () {
+    var _this = this;
+    wx.checkSession({
+      success: () => {
+        console.log("我有缓存")
+        var sessionKey = wx.getStorageSync('sessionKey');
+        console.log(sessionKey)
+        if (sessionKey == "") {
+          wx.login({
+            success(res) {
+              console.log(res);
+              var code = res.code
+              wx.request({
+                url: app.globalData.publicUrl2 + '/wx/user/wx7e7a46e129d6cd0f/login',
+                method: "get",
+                data: {
+                  code
+                },
+                success: function (res) {
+                  sessionKey = res.data.sessionKey;
+                  wx.setStorageSync('sessionKey', res.data.sessionKey);
+                  _this.getArr(sessionKey);
+                }
+              })
+            }
+          })
+        } else {
+          _this.getArr(sessionKey);
+        }
 
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
+      },
+      fail() {
+        console.log("我没有缓存并去登录请求")
+        wx.login({
+          success(res) {
+            console.log(res);
+            var code = res.code
+            wx.request({
+              url: app.globalData.publicUrl2 + '/wx/user/wx7e7a46e129d6cd0f/login',
+              method: "get",
+              data: {
+                code
+              },
+              success: function (res) {
+                wx.setStorageSync('sessionKey', res.data.sessionKey);
+                var sessionKey = res.data.sessionKey;
+                _this.getArr(sessionKey);
+                // _this.socketConnect(sessionKey);
+              }
+            })
+          }
+        })
+      }
+    })
   }
 })

pages/myNotice/myNotice.json

@@ -1,3 +1,4 @@
 {
+  "navigationBarTitleText":"通知列表",
   "usingComponents": {}
 }

pages/myNotice/myNotice.wxml

@@ -1,2 +1,50 @@
-<!--pages/myNotice/myNotice.wxml-->
-<text>pages/myNotice/myNotice.wxml</text>
+<van-tabs active="{{ active }}" bind:change="onChange">
+	<van-tab title="未读">
+		<view class="box">
+			<!-- <view class="box1 box2" wx:for="{{wdArr}}">
+				<image src="/images/wdtz.png" style="height: 32rpx; width: 32rpx;" mode="aspectFit"></image>
+				<view class="content content1">
+					<view>{{item.noticeContent}}</view>
+					<view class="btn" data-item="{{item}}" bindtap="btn">我知道了</view>
+				</view>
+			</view> -->
+			<view wx:for="{{wdArr}}">
+				<view class="box1">
+					<van-row>
+						<van-col span="2">
+							<image src="/images/wdtz.png" style="height: 32rpx; width: 32rpx;" mode="aspectFit"></image>
+						</van-col>
+						<van-col span="22">{{item.noticeContent}}</van-col>
+					</van-row>
+					<view class="btn" data-item="{{item}}" bindtap="btn">我知道了</view>
+				</view>
+			</view>
+			<view wx:if="{{showNull}}">
+				<image src='/images/nodata.png' mode='aspectFill' class="nodata"></image>
+				<view class="nodata_text">暂无数据</view>
+			</view>
+		</view>
+	</van-tab>
+	<van-tab title="已读">
+		<view class="box">
+			<view wx:for="{{ydArr}}">
+				<view class="box2">
+					<van-row>
+						<van-col span="2">
+							<image src="/images/ydtz.png" style="height: 32rpx; width: 32rpx;" mode="aspectFit"></image>
+						</van-col>
+						<van-col span="22">{{item.noticeContent}}</van-col>
+					</van-row>
+					<!-- <image src="/images/ydtz.png" style="height: 32rpx; width: 32rpx;" mode="aspectFit"></image>
+				<view class="content">
+					<view>{{item.noticeContent}}</view>
+				</view> -->
+				</view>
+			</view>
+			<view wx:if="{{showNull1}}">
+				<image src='/images/nodata.png' mode='aspectFill' class="nodata"></image>
+				<view class="nodata_text">暂无数据</view>
+			</view>
+		</view>
+	</van-tab>
+</van-tabs>

pages/myNotice/myNotice.wxss

@@ -1 +1,61 @@
-/* pages/myNotice/myNotice.wxss */
+.box {
+  width: 88%;
+  margin: 0 auto;
+  position: relative;
+}
+.box1 {
+  /* display: flex; */
+  border-radius: 20rpx;
+  margin-top: 20rpx;
+  background: #FBF3E3;
+  padding: 30rpx;
+  color: #E55800;
+  font-size: 25rpx;
+}
+.box2 {
+  border-radius: 20rpx;
+  margin-top: 20rpx;
+  background: rgba(244,244,244);
+  padding: 30rpx;
+  color: rgba(102,102,102);
+  font-size: 25rpx;
+}
+/* .box2 {
+  background: #FBF3E3;
+} */
+/* .content {
+  margin-left: 30rpx;
+  font-size: 25rpx;
+}
+.content1 {
+  color: #E55800;
+} */
+.btn {
+  /* padding: 10rpx 10rpx; */
+  background: white;
+  width: 160rpx;
+  height: 50rpx;
+  line-height: 50rpx;
+  border-radius: 50rpx;
+  margin-top: 20rpx;
+  margin-left: 200rpx;
+  text-align: center;
+}
+.van-tab--active .van-ellipsis {
+  color: #EE0A24;
+  font-weight: bold;
+}
+.nodata {
+  /* position: absolute; */
+  margin-top: 285rpx;
+  margin-left: 165rpx;
+  width: 340rpx;
+  height: 262rpx;
+}
+.nodata_text{
+  /* position: absolute; */
+  margin-top: 20rpx;
+  margin-left: 280rpx;
+  font-size: 30rpx;
+  color: #666666;
+}

pages/myTraining/myTraining.js

@@ -21,7 +21,7 @@ Page({
       },
       success: function (res) {
         console.log(res.data.data, "22222")
-        if (res.code == 0) {
+        if (res.data.code == 0) {
           _this.setData({
             dataArr: res.data.data
           })

pages/myTraining/myTraining.wxml

@@ -4,9 +4,9 @@
 		<view class="sctext">
 			<view class="t1">{{item.clasName}}</view>
 			<view class="t2">主办单位：{{item.remark}}</view>
-			<view class='t2' wx:if='{{item.isActive==0}}'>状态：待开始</view>
-			<view class='t2' wx:elif='{{item.isActive==1}}'>状态：正在开班</view>
-			<view class='t2' wx:elif='{{item.isActive==2}}'>状态：已结束</view>
+			<view class='t3' wx:if='{{item.isActive==0}}'>状态：待开始</view>
+			<view class='t3' wx:elif='{{item.isActive==1}}'>状态：正在开班</view>
+			<view class='t3' wx:elif='{{item.isActive==2}}'>状态：已结束</view>
 		</view>
 	</view>
 		<view wx:if="{{showNull}}">

pages/myTraining/myTraining.wxss

@@ -1,7 +1,7 @@
 .class_box {
   width: 710rpx;
   margin-left: 20rpx;
-  height: 200rpx;
+  /* height: 200rpx; */
   /* border: 1px solid red; */
   margin-top: 30rpx;
   box-shadow: #f2f2f2 0px 0px 20rpx;
@@ -14,24 +14,35 @@
   margin-top: 30rpx;
   margin-left: 20rpx;
 }
-.sctext{
-float: right;
-height: 141rpx;
-width: 510rpx;
-margin-top: 30rpx;
-margin-left: 20rpx;
-/* border: 1px solid red;   */
+
+.sctext {
+  float: right;
+  /* height: 141rpx; */
+  width: 510rpx;
+  margin-top: 30rpx;
+  margin-left: 20rpx;
+  /* border: 1px solid red;   */
 }
-.t1{
+
+.t1 {
   color: #eb3f33;
   font-size: 30rpx;
   font-weight: 700;
 }
-.t2{
+.t2 {
   color: #999999;
   font-size: 24rpx;
-  margin-top: 20rpx;
+  margin-top: 10rpx;
+  /* padding-bottom: 50rpx; */
 }
+.t3 {
+  color: #999999;
+  font-size: 24rpx;
+  margin-top: 10rpx;
+  padding-bottom: 20rpx;
+  /* padding-bottom: 50rpx; */
+}
+
 .nodata {
   position: absolute;
   top: 285rpx;
@@ -39,7 +50,8 @@ margin-left: 20rpx;
   width: 340rpx;
   height: 262rpx;
 }
-.nodata_text{
+
+.nodata_text {
   position: absolute;
   top: 550rpx;
   left: 310rpx;

pages/onlineClass/onlineClass.wxss

@@ -46,6 +46,9 @@ page {
   font-size: 25rpx;
   margin-top: 10rpx;
   margin-left: 10rpx;
+  white-space:nowrap;
+overflow:hidden;
+text-overflow:ellipsis;
 }
 
 .text2 {

pages/outpage/outpage.js

@@ -0,0 +1,66 @@
+// pages/outpage/outpage.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/outpage/outpage.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/outpage/outpage.wxml

@@ -0,0 +1,3 @@
+<!--pages/outpage/outpage.wxml-->
+	
+<web-view src="https://www.baidu.com/"></web-view>

pages/outpage/outpage.wxss

@@ -0,0 +1 @@
+/* pages/outpage/outpage.wxss */

pages/zbDetails/zbDetails.js

@@ -14,32 +14,31 @@ Page({
     bottom: "",
     pushUrl: '',
     videoContext: '',
-    isPush: true
-  },
-  startBf: function () {
-    //pullUrl: `rtmp://hnb.spaceships.cn/education/live56?auth_key=1593654178-0-0-30f7fa190656ddb994151d23cf30d3b7`
-    this.setData({
-      pushUrl: `rtmp://live.spaceships.cn/education/live56?auth_key=1593654164-0-0-cd12fbad7bd0cf3d94f56645875a180a`,
-      isPush:false
-    })
-    this.data.videoContext.start();
-  },
-  stopBf: function () {
-    // console.log("start 111");
-    //pullUrl: `rtmp://hnb.spaceships.cn/education/live56?auth_key=1593654178-0-0-30f7fa190656ddb994151d23cf30d3b7`
-    this.setData({
-      pushUrl: ``,
-      isPush:true
-    })
-    this.data.videoContext.stop()
+    fullScreenFlag: false,
+    livectx: "",
+    spfx: "vertical",
+    spfx1: "vertical",
+    isHands: false
   },
+  // startBf: function () {
+  //   //pullUrl: `rtmp://hnb.spaceships.cn/education/live56?auth_key=1593654178-0-0-30f7fa190656ddb994151d23cf30d3b7`
+  //   var _this = this;
+  //   _this.setData({
+  //     pushUrl: _this.data.pushUrl,
+  //     // isPush: false
+  //   })
+  //   _this.data.videoContext.start();
+  // },
+  // stopBf: function () {
+  //   this.setData({
+  //     pushUrl: ``,
+  //     // isPush: true
+  //   })
+  //   this.data.videoContext.stop()
+  // },
   statechange: function (e) {
     console.log(e)
   },
-  // videoErrorCallback: function (e) {
-  //   console.log('视频错误信息:')
-  //   console.log(e.detail.errMsg)
-  // },
   scrollToTop() {
     this.setAction({
       scrollTop: 0
@@ -62,6 +61,49 @@ Page({
       inputValue: ''
     })
   },
+
+  fullScreen: function () {
+    var that = this;
+    //全屏
+    // var vidoHeight = wx.getSystemInfoSync().windowHeight;
+    var fullScreenFlag = that.data.fullScreenFlag;
+    if (fullScreenFlag) {
+      fullScreenFlag = false;
+    } else {
+      fullScreenFlag = true;
+    }
+    if (fullScreenFlag) {
+      //全屏
+      that.data.livectx.requestFullScreen({
+        success: res => {
+          that.setData({
+            fullScreenFlag: fullScreenFlag,
+            spfx: "horizontal",
+            spfx1: "horizontal"
+          });
+          console.log('我要全屏执行了');
+        },
+        fail: res => {
+          console.log('我要全屏执行失败了');
+        }
+      });
+    } else {
+      //缩小
+      that.data.livectx.exitFullScreen({
+        success: res => {
+          console.log('fullscreen success');
+          that.setData({
+            fullScreenFlag: fullScreenFlag,
+            spfx: "vertical",
+            spfx1: "vertical"
+          });
+        },
+        fail: res => {
+          console.log('exit fullscreen success');
+        }
+      });
+    }
+  },
   getZbArr(sessionKey) {
     var _this = this;
     wx.request({
@@ -108,10 +150,12 @@ Page({
     wx.onSocketMessage(function (data) {
       let res = JSON.parse(data.data);
       console.log(res)
-      _this.setData({
-        chatContent: _this.data.chatContent.concat(res),
-        bottom: 'scrollBottom'
-      })
+      if (res.messageType == "message" || res.messageType == "system") {
+        _this.setData({
+          chatContent: _this.data.chatContent.concat(res),
+          bottom: 'scrollBottom'
+        })
+      }
       if (res.msg == "socketLiveEnd") {
         _this.setData({
           url: ""
@@ -128,6 +172,20 @@ Page({
           }
         })
       }
+      if (res.messageType == "studentPushStream") {
+        console.log(res.pushUrl, "我收到了举手的推流")
+        _this.setData({
+          isHands: true,
+          pushUrl: res.pushUrl
+        })
+      }
+      if (res.messageType == "stopStudentPushStream") {
+        console.log(res.pushUrl, "不推了")
+        _this.setData({
+          isHands: false,
+          pushUrl: ""
+        })
+      }
     })
   },
   sendSocketMessage(msg) {
@@ -200,11 +258,15 @@ Page({
       wx.closeSocket()
     }
   },
+  // onReady() {
+
+  // },
   onLoad: function (options) {
     var _this = this;
     _this.setData({
       id: options.id,
-      videoContext: wx.createLivePusherContext("video-livePusher")
+      videoContext: wx.createLivePusherContext("video-livePusher"),
+      livectx: wx.createLivePlayerContext('livectx')
     })
     wx.checkSession({
       success: () => {

pages/zbDetails/zbDetails.wxml

@@ -1,11 +1,25 @@
 <view class="home">
-	<live-player src="{{url}}" mode="live" autoplay bindstatechange="statechange" binderror="error" style="width:100%" contain/>
+	<view style="width:100%;height:500rpx;">
+		<live-player src="{{url}}" id="livectx" orientation="{{spfx}}" mode="live" autoplay bindstatechange="statechange" binderror="error" controls style="width:100%;height:100%">
+			<!-- <cover-view class="exit-full-img">
+				<cover-view wx:if="{{fullScreenFlag}}" bindtap="fullScreen">
+					<button plain="false" style="color:#fff">退出全屏</button>
+				</cover-view>
+				<cover-view wx:else bindtap="fullScreen">
+					<button plain="false" style="color:#fff">全屏</button>
+				</cover-view>
+			</cover-view> -->
+		</live-player>
+		<view class="{{fullScreenFlag==false?'push_box':'push_box'}}" wx:if="{{isHands}}">
+			<live-pusher orientation="{{spfx1}}" id="video-livePusher" mirror="false" mode="RTC" autopush url="{{pushUrl}}" bindstatechange="statechange" style="width:100%;height:100%"></live-pusher>
+		</view>
+	</view>
 	<view class="text_box">
 		<view class="title">{{title}}</view>
 		<view class="zw">{{message}}
 		</view>
 	</view>
-	<view class="chatbox" wx:if="{{isPush}}">
+	<view class="chatbox">
 		<scroll-view scroll-y="true" style="height: 400rpx;" bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" scroll-into-view="{{bottom}}" scroll-top="{{scrollTop}}">
 			<view style="padding:30rpx">
 				<view wx:for="{{chatContent}}" wx:for-index="idx" wx:for-item="item" wx:key="idx" class="chat_text">
@@ -16,14 +30,11 @@
 		</scroll-view>
 	</view>
 	<view class="puthands_box">
-		<image src='/images/puthands.png' mode='aspectFill' class="handimg"></image>
-		<view style="font-size:30rpx;color:#eb3f33;float:left;line-height:60rpx;margin-right:20rpx" bindtap="hands">举手</view>
-		<input class="weui-input" bindinput="bindKeyInput" placeholder="请输入你的问题" style="height:60rpx" value="{{inputValue}}"/>
+		<view bindtap="hands">
+			<image src='/images/puthands.png' mode='aspectFill' class="handimg"></image>
+			<view style="font-size:30rpx;color:#eb3f33;float:left;line-height:60rpx;margin-right:20rpx">举手</view>
+		</view>
+		<input class="weui-input" bindinput="bindKeyInput" placeholder="请输入你的问题" style="height:60rpx" value="{{inputValue}}" />
 		<view class="send" bindtap="submit">发送</view>
 	</view>
-	<view class="push_box" wx:if="{{!isPush}}">
-		<button bindtap="startBf">开始播放</button>
-		<button bindtap="stopBf">停止播放</button>
-		<live-pusher id="video-livePusher" mirror="false" mode="RTC" autopush url="{{pushUrl}}" bindstatechange="statechange" style="width: 750rpx; height: 225px;"></live-pusher>
-	</view>
 </view>

pages/zbDetails/zbDetails.wxss

@@ -1,5 +1,6 @@
-#myVideo {
+.home {
   width: 100%;
+  /* border: 1px solid red; */
 }
 
 .text_box {
@@ -45,16 +46,20 @@
   margin-bottom: 20rpx;
   /* border-bottom: 1px solid #dbdbdb; */
 }
+
 .puthands_box {
   margin-top: 20rpx;
+  margin-bottom: 50rpx;
   margin-left: 35rpx;
   width: 680rpx;
   height: 60rpx;
   /* border: 1px solid red; */
 }
-.chat_text{
+
+.chat_text {
   margin-bottom: 10rpx;
 }
+
 .handimg {
   width: 60rpx;
   height: 60rpx;
@@ -86,4 +91,24 @@
   text-align: center;
   line-height: 60rpx;
   margin-left: 20rpx;
+}
+
+.push_box {
+  width: 200rpx;
+  height: 200rpx;
+  position: absolute;
+  right: 0;
+  top: 300rpx;
+  /* border: 1px solid red; */
+  z-index: 99999;
+}
+
+.allpush_box {
+  width: 200rpx;
+  height: 200rpx;
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  /* border: 1px solid red; */
+  z-index: 99999;
 }

utils/util.js

@@ -6,7 +6,7 @@ const globalData = {
   // publicSocketUrl: 'ws://10.16.10.139:8090',
   // publicUrl: 'http://10.16.10.139:8090', //luyu
   // publicUrl2: 'http://10.16.4.19:8090', //huyubo
-  // publicUrl3: 'http://10.16.4.22:8090', //zxq
+  // publicUrl3: 'http://10.16.4.22:8090' //zxq
 };
 module.exports = {
   globalData: globalData,