ssfg преди 5 години
родител
ревизия
ea686b0bba

+ 1 - 1
app.js

@@ -3,7 +3,7 @@ App({
     showAnimation: true
   },
   onLaunch(options) {
-    // Do something initial when launch.
+    // console.log(this.globalData.showAnimation)
   },
   onShow(options) {
     // Do something when show.

+ 7 - 5
app.json

@@ -1,9 +1,8 @@
 {
   "pages": [
+    "pages/welcome/welcome",
     "pages/index/index",
     "pages/zbDetails/zbDetails",
-   
-   
     "pages/myInteractions/myInteractions",
     "pages/myMission/myMission",
     "pages/exhibitionList/exhibitionList",
@@ -24,7 +23,9 @@
     "pages/feedBack/feedBack",
     "pages/studentRegistration/studentRegistration",
     "pages/grade/grade",
-    "pages/answerAfterclass/answerAfterclass"
+    "pages/answerAfterclass/answerAfterclass",
+    "pages/myNotice/myNotice"
+    
   ],
   "window": {
     "backgroundTextStyle": "light",
@@ -74,7 +75,8 @@
     "color": "#a9b7b7",
     "selectedColor": "#eb3f33",
     "borderStyle": "black",
-    "list": [{
+    "list": [
+      {
         "pagePath": "pages/index/index",
         "text": "首页",
         "selectedIconPath": "./images/tabBar5.png",
@@ -94,7 +96,7 @@
       },
       {
         "pagePath": "pages/personInfo/personInfo",
-        "text": "我的",
+        "text": "个人中心",
         "selectedIconPath": "./images/tabBar8.png",
         "iconPath": "./images/tabBar4.png"
       }

BIN
images/mb.png


+ 1 - 1
pages/agoClass/agoClass.js

@@ -7,7 +7,7 @@ Page({
   getjj(sessionKey) {
     var _this = this;
     wx.request({
-      url: app.globalData.publicUrl2 + '/wx/student/selClas',
+      url: app.globalData.publicUrl2 + '/wx/student/selClasToo',
       method: "post",
       data: {
         sessionKey: sessionKey,

+ 1 - 1
pages/dbDetails/dbDetails.js

@@ -87,7 +87,7 @@ Page({
   },
   onUnload() {
     var _this = this;
-    if (_this.data.studyTime < _this.data.studyLog.studyTime) {
+    if (_this.data.startPlayTime < _this.data.studyLog.studyTime) {
       console.log(_this.data.studyLog)
       wx.request({
         method: "post",

+ 88 - 88
pages/feedBack/feedBack.wxml

@@ -1,114 +1,114 @@
 <view class="home">
 	<form bindsubmit="formSubmit">
 		<!-- <van-cell-group> -->
-			<view class='fwb'>
-				<view class="red-image">
-					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
-				</view>
-				<view class="xingbie">姓名</view>
-				<view class='weui-input'>
-					<input class="" name="username" value="{{ username }}" placeholder="请输入姓名"  placeholder-style="font-size:25rpx" />
-					<view class="{{nameIsTrue?'error':'noerror'}}">请输入姓名</view>
-				</view>
+		<view class='fwb'>
+			<view class="red-image">
+				<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
 			</view>
-			<view class='fwb'>
-				<view class="red-image">
-					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
-				</view>
-				<view class="xingbie">培训班次</view>
-				<view class='weui-input'>
-					<picker bindchange="classChange" name="ensure_id" value="{{classList[classIndex].id}}" range-key="{{'name'}}" range="{{classList}}">
-						<view class="picker">
-							{{classList[classIndex].name}} <text style="color:#808080;display: inline-block;height:60rpx;line-height;60rpx"  >{{classText}}</text>
-						</view>
-					</picker>
-					<!-- <input class="" name="username" value="{{ username }}" placeholder="请输入姓名" />
+			<view class="xingbie">姓名</view>
+			<view class='weui-input'>
+				<input class="" name="username" value="{{ username }}" placeholder="请输入姓名" placeholder-style="font-size:25rpx" />
+				<view class="{{nameIsTrue?'error':'noerror'}}">请输入姓名</view>
+			</view>
+		</view>
+		<view class='fwb'>
+			<view class="red-image">
+				<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+			</view>
+			<view class="xingbie">培训班次</view>
+			<view class='weui-input'>
+				<picker bindchange="classChange" name="ensure_id" value="{{classList[classIndex].id}}" range-key="{{'name'}}" range="{{classList}}">
+					<view class="picker">
+						{{classList[classIndex].name}} <text style="color:#808080;display: inline-block;height:60rpx;line-height:60rpx"  >{{classText}}</text>
+					</view>
+				</picker>
+				<!-- <input class="" name="username" value="{{ username }}" placeholder="请输入姓名" />
 					<view class="{{nameIsTrue?'error':'noerror'}}">请输入姓名</view> -->
-				</view>
-
 			</view>
 
-			<view class='fwb'>
-				<view class="red-image">
-					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
-				</view>
-				<view class="xingbie">班主任</view>
-				<view class='weui-input'>
-					<picker bindchange="headmasterChange" name="headmaster_id" value="{{headmasterList[classIndex].id}}" range-key="{{'name'}}" range="{{headmasterList}}">
-						<view class="picker">
-							{{headmasterList[headmasterIndex].name}} <text style="color:#808080;display: inline-block;" >{{headmasterText}}</text>
-						</view>
-					</picker>
-					<!-- <input class="" name="username" value="{{ username }}" placeholder="请输入姓名" />
-					<view class="{{nameIsTrue?'error':'noerror'}}">请输入姓名</view> -->
-				</view>
+		</view>
 
+		<view class='fwb'>
+			<view class="red-image">
+				<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+			</view>
+			<view class="xingbie">班主任</view>
+			<view class='weui-input'>
+				<picker bindchange="headmasterChange" name="headmaster_id" value="{{headmasterList[classIndex].id}}" range-key="{{'name'}}" range="{{headmasterList}}">
+					<view class="picker">
+						{{headmasterList[headmasterIndex].name}} <text style="color:#808080;display: inline-block;height:60rpx;line-height:60rpx" >{{headmasterText}}</text>
+					</view>
+				</picker>
+				<!-- <input class="" name="username" value="{{ username }}" placeholder="请输入姓名" />
+					<view class="{{nameIsTrue?'error':'noerror'}}">请输入姓名</view> -->
 			</view>
 
-			<view class='fwb'>
-				<view class="red-image">
-					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
-				</view>
-				<view class="xingbie">工作单位</view>
-				<view class='weui-input'>
-					<input class="" name="username" value="{{ username }}" placeholder="请输入工作单位"  />
-					<view class="{{nameIsTrue?'error':'noerror'}}">请输入工作单位</view>
-				</view>
+		</view>
+
+		<view class='fwb'>
+			<view class="red-image">
+				<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
 			</view>
+			<view class="xingbie">工作单位</view>
+			<view class='weui-input'>
+				<input class="" name="username" value="{{ username }}" placeholder="请输入工作单位" />
+				<view class="{{nameIsTrue?'error':'noerror'}}">请输入工作单位</view>
+			</view>
+		</view>
 
-			<view class='fwb'>
-				<view class="red-image">
-					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
-				</view>
-				<view class="xingbie">现职务</view>
-				<view class='weui-input'>
-					<input class="" name="username" value="{{ username }}" placeholder="请输入现职务"   />
-					<view class="{{nameIsTrue?'error':'noerror'}}">请输入现职务</view>
-				</view>
+		<view class='fwb'>
+			<view class="red-image">
+				<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+			</view>
+			<view class="xingbie">现职务</view>
+			<view class='weui-input'>
+				<input class="" name="username" value="{{ username }}" placeholder="请输入现职务" />
+				<view class="{{nameIsTrue?'error':'noerror'}}">请输入现职务</view>
 			</view>
+		</view>
 
-			<view class='fwb'>
-				<view class="red-image">
-					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
-				</view>
-				<view class="xingbie">现任职务</view>
-				<view class='weui-input'>
-					<input class="" name="username" value="{{ username }}" placeholder="请输入现任职务"   />
-					<view class="{{nameIsTrue?'error':'noerror'}}">请输入现任职务</view>
-				</view>
+		<view class='fwb'>
+			<view class="red-image">
+				<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
 			</view>
+			<view class="xingbie">现任职务</view>
+			<view class='weui-input'>
+				<input class="" name="username" value="{{ username }}" placeholder="请输入现任职务" />
+				<view class="{{nameIsTrue?'error':'noerror'}}">请输入现任职务</view>
+			</view>
+		</view>
 
-			<view class='fwb'>
-				<view class="red-image">
-					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
-				</view>
-				<view class="xingbie">原职务</view>
-				<view class='weui-input'>
-					<picker bindchange="oldPostChange" name="oldPost_id" value="{{oldPostList[oldPostIndex].id}}" range-key="{{'name'}}" range="{{oldPostList}}">
-						<view class="picker">
-							{{oldPostList[oldPostIndex].name}} <text  style="color:#808080;display: inline-block;" >{{oldPostText}}</text>
-						</view>
-					</picker>
-					<!-- <input class="" name="username" value="{{ username }}" placeholder="请输入姓名" />
+		<view class='fwb'>
+			<view class="red-image">
+				<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+			</view>
+			<view class="xingbie">原职务</view>
+			<view class='weui-input'>
+				<picker bindchange="oldPostChange" name="oldPost_id" value="{{oldPostList[oldPostIndex].id}}" range-key="{{'name'}}" range="{{oldPostList}}">
+					<view class="picker">
+						{{oldPostList[oldPostIndex].name}} <text  style="color:#808080;display: inline-block;height:60rpx;line-height:60rpx" >{{oldPostText}}</text>
+					</view>
+				</picker>
+				<!-- <input class="" name="username" value="{{ username }}" placeholder="请输入姓名" />
 					<view class="{{nameIsTrue?'error':'noerror'}}">请输入姓名</view> -->
-				</view>
-
 			</view>
 
+		</view>
 
-			<view class='fwt'>
-				<view class="red-image">
-					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
-				</view>
-				<view class=" xingbie moreTitle">您参加培训后工作职职务有变动吗?</view>
-				<!-- <view class='weui-input'>
+
+		<view class='fwt'>
+			<view class="red-image">
+				<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+			</view>
+			<view class=" xingbie moreTitle">您参加培训后工作职职务有变动吗?</view>
+			<!-- <view class='weui-input'>
 					<input class="" name="username" value="{{ username }}" placeholder="请输入姓名" />
 					<view class="{{nameIsTrue?'error':'noerror'}}">请输入姓名</view>
 				</view> -->
-			</view>
-			<textarea placeholder="请输入" maxlength='500' />
+		</view>
+		<textarea placeholder="请输入" maxlength='500' />
 
-			<view class='fwt'>
+		<view class='fwt'>
 				<view class="red-image">
 					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
 				</view>
@@ -234,7 +234,7 @@
 			<!-- </van-cell-group> -->
 
 		<!-- <button formType="submit">提交表单</button> -->
-		<view style="  margin-top: 100rpx;">
+		<view style="  margin-top: 100rpx;margin-bottom: 100rpx;">
 			<van-button round formType="submit">提交表单</van-button>
 		</view>
 

+ 3 - 3
pages/feedBack/feedBack.wxss

@@ -6,7 +6,7 @@
 van-button {
   color: white;
   text-align: center;
-  margin: 0 80rpx;
+  margin: 0 60rpx;
 }
 
 .van-button--default {
@@ -21,8 +21,8 @@ van-button {
 
 button:not([size='mini']) {
   width: 550rpx !important;
-  margin-left: auto;
-  margin-right: auto;
+  /* margin-left: auto;
+  margin-right: auto; */
 }
 
 .van-radio__icon--round {

+ 29 - 22
pages/index/index.js

@@ -4,7 +4,7 @@ Page({
   data: {
     wqdataArr: 0,
     jjdataArr: 0,
-    kjShow: true,
+    // kjShow: true,
     // 课程轮播
     "bnrUrl": [],
     gridArr: [{
@@ -23,12 +23,13 @@ Page({
     xczsArr: []
   },
   gomyClass(e) {
-    console.log(e.currentTarget.dataset.item.isActive, "我是测试跳转的")
-    if (e.currentTarget.dataset.item.isActive == 5) {
-      wx.switchTab({
-        url: '/pages/myClass/myClass',
-      })
-    }
+
+    // console.log(e.currentTarget.dataset.item.isActive, "我是测试跳转的")
+    // if (e.currentTarget.dataset.item.isActive == 5) {
+    //   wx.switchTab({
+    //     url: '/pages/myClass/myClass',
+    //   })
+    // }
   },
   // 即将开班
   gostartClass(e) {
@@ -123,7 +124,7 @@ Page({
   getjjLength(sessionKey) {
     var _this = this;
     wx.request({
-      url: app.globalData.publicUrl2 + '/wx/student/selClas',
+      url: app.globalData.publicUrl2 + '/wx/student/selClasToo',
       method: "post",
       data: {
         sessionKey: sessionKey,
@@ -142,7 +143,7 @@ Page({
   getwqLength(sessionKey) {
     var _this = this;
     wx.request({
-      url: app.globalData.publicUrl2 + '/wx/student/selClas',
+      url: app.globalData.publicUrl2 + '/wx/student/selClasToo',
       method: "post",
       data: {
         sessionKey: sessionKey,
@@ -176,19 +177,25 @@ Page({
     })
   },
   onReady: function () {},
-  onLoad() {
-    let _this = this;
-    if (app1.globalData.showAnimation == true) {
-      setTimeout(function () {
-        _this.setData({
-          kjShow: false,
-        })
-      }, 4000)
-    }
-  },
-  onUnload: function () {
-    app1.globalData.showAnimation = false;
-  },
+  // onLoad() {
+  //   let _this = this;
+  //   console.log(app1.globalData.showAnimation)
+  //   if (app1.globalData.showAnimation == true) {
+  //     setTimeout(function () {
+  //       _this.setData({
+  //         kjShow: false,
+  //       })
+  //     }, 4000)
+  //   }
+  // },
+  // onUnload: function () {
+  //   app1.globalData.showAnimation = false;
+  //   console.log(app1.globalData.showAnimation,"false")
+  // },
+  // onHide: function () {
+  //   app1.globalData.showAnimation = false;
+  //   console.log(app1.globalData.showAnimation,"false")
+  // },
   onShow: function () {
     var _this = this;
     wx.checkSession({

+ 7 - 5
pages/index/index.wxml

@@ -1,14 +1,16 @@
 <view class="container">
-	<image src='https://bkthnsz2.oss-cn-shenzhen.aliyuncs.com/20200629134722.gif' mode='aspectFill' style="width:750rpx;height:1334rpx" wx:if="{{kjShow}}"></image>
+<!-- <web-view src="https://www.baidu.com/"></web-view> -->
+	<!-- <image src='https://bkthnsz2.oss-cn-shenzhen.aliyuncs.com/20200629134722.gif' mode='aspectFill' style="width:750rpx;height:1334rpx" wx:if="{{kjShow}}"></image> -->
 	<!-- <live-pusher id="myLive" url="rtmp://live.spaceships.cn/wxedu/sntalk1?auth_key=1593483956-0-0-927e57bc397d22b01300f1b212e04da3" mode="RTC" autopush="true" enable-camera="true" style="width: 300px; height: 225px;border:1px solid red" /> -->
 	<view class="banner">
 		<swiper class='u-wrp-bnr' indicator-dots="true" interval='5000' duration='1000'>
 			<block wx:for="{{bnrUrl}}" wx:for-index="index" wx:key="idx">
 				<swiper-item bindtap="gomyClass" data-item="{{item}}">
 					<image src='{{item.clasImg}}' class='u-img-slide' mode='aspectFill'></image>
+					<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}}</view>
+					<view class="text text2">主办:{{item.remark}}</view>
+					<view class="text text3">开班时间:{{item.clasBegin}}-{{item.clasEnd}}</view>
 					<image src='/images/goclass.png' mode='aspectFill' class="gozbbtn" wx:if='{{item.isActive==5}}'></image>
 				</swiper-item>
 			</block>
@@ -34,10 +36,10 @@
 		</van-grid-item>
 	</van-grid>
 		<view style="height:15rpx;width:750rpx;background-color:#F2F2F2"></view>
-	<view class="qy_title">
+	<!-- <view class="qy_title">
 		<view class="redk"></view>我们的学院
 		<view class="more" bindtap="xczsMore">查看全部 ></view>
-	</view>
+	</view> -->
 	<view class="xczs">
 		<view class="zb1" wx:for="{{xczsArr}}" wx:for-index="idx" wx:for-item="item" bindtap="turnDetails" id="{{idx}}" wx:key="idx">
 			<image src='{{item.img}}' mode='aspectFill' class="show1"></image>

+ 10 - 1
pages/index/index.wxss

@@ -18,11 +18,19 @@
   width: 100%;
   height: inherit;
 }
-
+.uimg{
+  position: absolute;
+  width: 100%;
+  height: 240rpx;
+  top: 0;
+  left: 0;
+  z-index: 1;
+}
 .text {
   color: #fff;
   position: absolute;
   left: 50rpx;
+  z-index: 99;
 }
 
 .text1 {
@@ -47,6 +55,7 @@
   height: 61rpx;
   top: 165rpx;
   right: 20rpx;
+  z-index: 999;
 }
 
 .sec {

+ 4 - 19
pages/myClass/myClass.js

@@ -171,26 +171,11 @@ Page({
         sessionKey: sessionKey
       },
       success: function (res) {
-        console.log(res, "我是返回是否班级")
+        console.log(res, "我是返回是否班级")
         if (res.data.code == 0) {
-          if (res.data.data !== null || res.data.data !== "") {
-            _this.setData({
-              className: res.data.data.clasName
-            })
-          } else {
-            wx.showModal({
-              content: "您当前还没有开放的班级!",
-              showCancel: false,
-              success(res) {
-                if (res.confirm) {
-                  wx.switchTab({
-                    url: '../index/index'
-                  })
-                }
-              }
-            })
-            return false;
-          }
+          _this.setData({
+            className: res.data.data.clasName
+          })
         } else {
           wx.showModal({
             content: "您当前还没有开放的班级!",

+ 4 - 19
pages/myMission/myMission.js

@@ -182,26 +182,11 @@ Page({
         sessionKey: sessionKey
       },
       success: function (res) {
-        console.log(res, "我是返回是否班级")
+        console.log(res, "我是返回是否班级")
         if (res.data.code == 0) {
-          if (res.data.data !== null || res.data.data !== "") {
-            _this.setData({
-              className: res.data.data.clasName
-            })
-          } else {
-            wx.showModal({
-              content: "您当前还没有开放的班级!",
-              showCancel: false,
-              success(res) {
-                if (res.confirm) {
-                  wx.switchTab({
-                    url: '../index/index'
-                  })
-                }
-              }
-            })
-            return false;
-          }
+          _this.setData({
+            className: res.data.data.clasName
+          })
         } else {
           wx.showModal({
             content: "您当前还没有开放的班级!",

+ 66 - 0
pages/myNotice/myNotice.js

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

+ 3 - 0
pages/myNotice/myNotice.json

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

+ 2 - 0
pages/myNotice/myNotice.wxml

@@ -0,0 +1,2 @@
+<!--pages/myNotice/myNotice.wxml-->
+<text>pages/myNotice/myNotice.wxml</text>

+ 1 - 0
pages/myNotice/myNotice.wxss

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

+ 1 - 1
pages/personInfo/personInfo.json

@@ -1,4 +1,4 @@
 {
-  "navigationBarTitleText":"我的",
+  "navigationBarTitleText":"个人中心",
   "usingComponents": {}
 }

+ 1 - 1
pages/startClass/startClass.js

@@ -6,7 +6,7 @@ Page({
   getjj(sessionKey) {
     var _this = this;
     wx.request({
-      url: app.globalData.publicUrl2 + '/wx/student/selClas',
+      url: app.globalData.publicUrl2 + '/wx/student/selClasToo',
       method: "post",
       data: {
         sessionKey: sessionKey,

+ 70 - 0
pages/welcome/welcome.js

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

+ 4 - 0
pages/welcome/welcome.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText":"吉林长春社区干部学院"
+}

+ 3 - 0
pages/welcome/welcome.wxml

@@ -0,0 +1,3 @@
+<view>
+	<image src='https://bkthnsz2.oss-cn-shenzhen.aliyuncs.com/20200629134722.gif' mode='aspectFill' style="width:750rpx;height:1334rpx" wx:if="{{kjShow}}"></image>
+</view>

+ 1 - 0
pages/welcome/welcome.wxss

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

+ 4 - 4
pages/zbDetails/zbDetails.js

@@ -58,8 +58,8 @@ Page({
     let _this = this;
     let input_val = _this.data.inputValue;
     _this.sendSocketMessage(input_val)
-    _this.setData({
-      inputValue: ""
+    this.setData({
+      inputValue: ''
     })
   },
   getZbArr(sessionKey) {
@@ -112,8 +112,8 @@ Page({
         chatContent: _this.data.chatContent.concat(res),
         bottom: 'scrollBottom'
       })
-      if (res.messageType == "system" && res.mag == "socketLiveEnd") {
-        this.setData({
+      if (res.msg == "socketLiveEnd") {
+        _this.setData({
           url: ""
         })
         wx.showModal({

+ 1 - 1
pages/zbDetails/zbDetails.wxml

@@ -1,5 +1,5 @@
 <view class="home">
-	<live-player src="{{url}}" mode="live" autoplay bindstatechange="statechange" binderror="error" style="width:100%" />
+	<live-player src="{{url}}" mode="live" autoplay bindstatechange="statechange" binderror="error" style="width:100%" contain/>
 	<view class="text_box">
 		<view class="title">{{title}}</view>
 		<view class="zw">{{message}}

+ 2 - 2
utils/util.js

@@ -1,11 +1,11 @@
 const globalData = {
   publicUrl: 'https://sqdx.windd.cn',
-  // publicUrl2: 'https://sqdx.windd.cn',
+  publicUrl2: 'https://sqdx.windd.cn',
   publicUrl3: 'https://sqdx.windd.cn',
   publicSocketUrl: 'wss://sqdx.windd.cn',
   // publicSocketUrl: 'ws://10.16.10.139:8090',
   // publicUrl: 'http://10.16.10.139:8090', //luyu
-  publicUrl2: 'http://10.16.4.19:8090', //huyubo
+  // publicUrl2: 'http://10.16.4.19:8090', //huyubo
   // publicUrl3: 'http://10.16.4.22:8090', //zxq
 };
 module.exports = {