22

app.js

@@ -1,3 +1,15 @@
 App({
-  globalData: {}
+  globalData: {},
+  onLaunch(options) {
+    // Do something initial when launch.
+  },
+  onShow(options) {
+    // Do something when show.
+  },
+  onHide() {
+    // Do something when hide.
+  },
+  onError(msg) {
+    console.log(msg)
+  },
 })

pages/Identity/Identity.js

@@ -2,9 +2,11 @@ const app = require('../../utils/util.js');
 import WxValidate from '../../utils/WxValidate';
 Page({
   data: {
+    isRz: 0,
     userName: "",
     phone: "",
-    card: ""
+    card: "",
+    isInput: false
   },
   showModal(error) {
     wx.showModal({
@@ -48,13 +50,104 @@ Page({
     })
   },
   formSubmit: function (e) {
-    const params = e.detail.value
     let _this = this;
-    if (!this.WxValidate.checkForm(params)) {
-      const error = this.WxValidate.errorList[0]
-      this.showModal(error)
-      return false
+    if (_this.data.isRz == 0) {
+      const params = e.detail.value
+      let _this = this;
+      if (!this.WxValidate.checkForm(params)) {
+        const error = this.WxValidate.errorList[0]
+        this.showModal(error)
+        return false
+      }
+      wx.checkSession({
+        success: () => {
+          console.log("我有缓存")
+          var sessionKey = wx.getStorageSync('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.tj(sessionKey, params);
+                  }
+                })
+              }
+            })
+          } else {
+            _this.tj(sessionKey, params);
+          }
+        },
+        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.tj(sessionKey, params);
+                }
+              })
+            }
+          })
+        }
+      })
+    } else {
+      wx.showModal({
+        showCancel: false,
+        content: "您已经认证过了"
+      })
     }
+  },
+  getXx(sessionKey) {
+    let _this = this;
+    wx.request({
+      url: app.globalData.publicUrl2 + '/wx/student/selStudentSessionKeyEcho',
+      method: "post",
+      data: {
+        sessionKey: sessionKey
+      },
+      success: function (res) {
+        if (res.data.code == 0) {
+          if (res.data.data !== null || res.data.data !== "") {
+            _this.setData({
+              isRz: 1,
+              userName: res.data.data.miniName,
+              phone: res.data.data.miniPhone,
+              card: res.data.data.studentCard,
+              isInput: true
+            })
+          } else {
+            console.log("我没认证，需要认证")
+          }
+        } else {
+          console.log("报错额")
+        }
+        console.log(res)
+        // sessionKey = res.data.sessionKey;
+        // wx.setStorageSync('sessionKey', res.data.sessionKey);
+        // _this.getXx(sessionKey);
+      }
+    })
+  },
+  onLoad: function () {
+    var _this = this;
     wx.checkSession({
       success: () => {
         console.log("我有缓存")
@@ -73,14 +166,17 @@ Page({
                 success: function (res) {
                   sessionKey = res.data.sessionKey;
                   wx.setStorageSync('sessionKey', res.data.sessionKey);
-                  _this.tj(sessionKey, params);
+                  _this.getXx(sessionKey);
+                  _this.initValidate();
                 }
               })
             }
           })
         } else {
-          _this.tj(sessionKey, params);
+          _this.getXx(sessionKey);
+          _this.initValidate();
         }
+
       },
       fail() {
         console.log("我没有缓存并去登录请求")
@@ -96,8 +192,9 @@ Page({
               },
               success: function (res) {
                 wx.setStorageSync('sessionKey', res.data.sessionKey);
-                var sessionKey = res.data.sessionKey;
-                _this.tj(sessionKey, params);
+                var sessionKey = res.data.sessionKey
+                _this.getXx(sessionKey);
+                _this.initValidate();
               }
             })
           }
@@ -105,28 +202,28 @@ Page({
       }
     })
   },
-  onLoad: function () {
-    this.initValidate();
-    // 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) {
-    //         console.log(res,"我是测试")
-    //         // wx.setStorageSync('sessionKey', res.data.sessionKey);
-    //         // var sessionKey = res.data.sessionKey;
-    //         // _this.tj(sessionKey, params);
-    //       }
-    //     })
-    //   }
-    // })
-  },
+  // onLoad: function () {
+  // this.initValidate();
+  // 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) {
+  //         console.log(res,"我是测试")
+  //         // wx.setStorageSync('sessionKey', res.data.sessionKey);
+  //         // var sessionKey = res.data.sessionKey;
+  //         // _this.tj(sessionKey, params);
+  //       }
+  //     })
+  //   }
+  // })
+  // },
   initValidate() {
     // 验证字段的规则
     const rules = {

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%;' placeholder-style='font-size:30rpx;' placeholder='请输入姓名' name='userName'></input>
+			<input style='display:inline-block;height:60%;' disabled="{{isInput}}" 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%;' placeholder-style='font-size:30rpx;' placeholder='请输入手机号' name='phone' type='number'></input>
+			<input style='display:inline-block;height:60%;' disabled="{{isInput}}" 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%;' placeholder-style='font-size:30rpx;' placeholder='请输入身份证号' name="card"></input>
+			<input style='width:80%;display:inline-block;height:60%;' disabled="{{isInput}}" placeholder-style='font-size:30rpx;' placeholder='请输入身份证号' name="card" value="{{card}}"></input>
 		</view>
 		<button class="qrrz" formType="submit">前往认证</button>
 	</form>

pages/feedBack/feedBack.wxml

@@ -7,11 +7,10 @@
 				</view>
 				<view class="xingbie">姓名</view>
 				<view class='weui-input'>
-					<input class="" name="username" value="{{ username }}" placeholder="请输入姓名"   />
+					<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>
@@ -20,7 +19,7 @@
 				<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;"  >{{classText}}</text>
+							{{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="请输入姓名" />

pages/feedBack/feedBack.wxss

@@ -89,6 +89,10 @@ button:not([size='mini']) {
   width: 474rpx;
 }
 
+.weui-input input {
+  height: 60rpx;
+}
+
 .van-icon-circle {
   color: #EE0A24;
 

pages/index/index.js

@@ -234,10 +234,10 @@ Page({
               success: function (res) {
                 wx.setStorageSync('sessionKey', res.data.sessionKey);
                 var sessionKey = res.data.sessionKey
-                this.getBanner(sessionKey);
-                this.getjjLength(sessionKey);
-                this.getwqLength(sessionKey);
-                this.getfour();
+                _this.getBanner(sessionKey);
+                _this.getjjLength(sessionKey);
+                _this.getwqLength(sessionKey);
+                _this.getfour();
               }
             })
           }

pages/index/index.wxml

@@ -36,7 +36,7 @@
 		<view style="height:15rpx;width:750rpx;background-color:#F2F2F2"></view>
 	<view class="qy_title">
 		<view class="redk"></view>我们的学院
-		<view class="more" bindtap="xczsMore">查看全部></view>
+		<view class="more" bindtap="xczsMore">查看全部 ></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">

pages/index/index.wxss

@@ -112,6 +112,7 @@
   background-color: #eb3f33;
   border-radius: 5rpx;
   margin-right: 10rpx;
+  margin-top: 3rpx;
   float: left;
 }
 

pages/myClass/myClass.js

@@ -2,6 +2,7 @@ const app = require('../../utils/util.js');
 Page({
   data: {
     showMore: false, //更多
+    showzs: false,
     show: false,
     SessionKey: "",
     notice: "暂无通知",
@@ -98,14 +99,19 @@ Page({
     })
   },
   lq() {
-    wx.showModal({
-      showCancel: false,
-      content: "此功能暂时还未开放哦",
-      success(res) {}
-    })
-    // wx.showToast({
-    //   title: '领取成功'
+    // wx.showModal({
+    //   showCancel: false,
+    //   content: "此功能暂时还未开放哦",
+    //   success(res) {}
     // })
+    this.setData({
+      showzs: true
+    });
+  },
+  onClose1() {
+    this.setData({
+      showzs: false
+    });
   },
   goQmks() {
     wx.showModal({

pages/myClass/myClass.wxml

@@ -24,20 +24,22 @@
 			<image src='{{item.courseImg}}' mode='aspectFill' class="spfm"></image>
 			<image src='{{item.isDone==0||item.isDone==null?"/images/unfinish.png":"/images/finish.png"}}' mode='aspectFill' class="isfinish"></image>
 			<view class="sp_text">
-					<view class="fisrt_set">
-						<image src='/images/db.png' mode='aspectFill' class="dbimg" wx:if='{{item.isLive==-1}}'></image>
-						<image src='/images/zb.png' mode='aspectFill' class="dbimg" wx:if='{{item.isLive == 1 && item.isActive==1}}'></image>
-						<image src='/images/dzb.png' mode='aspectFill' class="dbimg" wx:if='{{item.isLive==1 && item.isActive==null}}'></image>
-						<image src='/images/zbjs.png' mode='aspectFill' class="dbimg" wx:if='{{item.isLive==1 && item.isActive==-1}}'></image>
-						<text class="name">{{item.courseName}}</text>
-					</view>
+				<view class="fisrt_set">
+					<image src='/images/db.png' mode='aspectFill' class="dbimg" wx:if='{{item.isLive==-1}}'></image>
+					<image src='/images/zb.png' mode='aspectFill' class="dbimg" wx:if='{{item.isLive == 1 && item.isActive==1}}'></image>
+					<image src='/images/dzb.png' mode='aspectFill' class="dbimg" wx:if='{{item.isLive==1 && item.isActive==null}}'></image>
+					<image src='/images/zbjs.png' mode='aspectFill' class="dbimg" wx:if='{{item.isLive==1 && item.isActive==-1}}'></image>
 					<view class="start_text" wx:if='{{item.isLive==1}}'>开始时间：{{item.courseStart}}</view>
 					<view class="start_text" wx:if='{{item.isLive==-1}}'>视频时长: {{sfmArr[idx].courseTime}}</view>
-					<view>
-						<image src='/images/startstudy.png' mode='aspectFill' class="an" data-item="{{item}}" bindtap="goStudy"></image>
-						<image src='/images/dtxs.png' mode='aspectFill' class="an" bindtap="gokhAnswer"></image>
-						<image src='/images/pjkc.png' mode='aspectFill' class="an" bindtap="gopjClass"></image>
-					</view>
+				</view>
+				<view class="name">{{item.courseName}}</view>
+				<!-- <view class="start_text" wx:if='{{item.isLive==1}}'>开始时间：{{item.courseStart}}</view>
+					<view class="start_text" wx:if='{{item.isLive==-1}}'>视频时长: {{sfmArr[idx].courseTime}}</view> -->
+				<view>
+					<image src='/images/startstudy.png' mode='aspectFill' class="an" data-item="{{item}}" bindtap="goStudy"></image>
+					<image src='/images/dtxs.png' mode='aspectFill' class="an" bindtap="gokhAnswer"></image>
+					<image src='/images/pjkc.png' mode='aspectFill' class="an" bindtap="gopjClass"></image>
+				</view>
 			</view>
 		</view>
 		<block wx:if="{{kcArr.length>3}}">
@@ -68,4 +70,14 @@
 		<view class="lq_btn" bindtap="lq">领取结业证</view>
 		<view class="pz">注：领取结业证需完成所有课程</view>
 	</view>
+		<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>
+			<view class="byzc"> xxx,xxx 班期培训结束，成绩优异，兹授予结业证书，特此证明！</view>
+			<view class="zsdw_text">授予证书单位：XXXXXXXXXXXX</view>
+			<!--<view class="save_btn" bindtap="saveImg">保存二维码</view> -->
+		</view>
+		<!-- <image src='/images/close.png' mode='aspectFill' class="zscloseimg"></image> -->
+	</van-popup>
 </view>

pages/myClass/myClass.wxss

@@ -124,11 +124,11 @@
 }
 
 .sp_text {
-  width: 510rpx;
+  width: 520rpx;
   height: 100%;
   /* border: 1px solid red; */
   float: right;
-  margin-left: 10rpx;
+  /* margin-left: rpx; */
 }
 
 .dbimg {
@@ -157,13 +157,13 @@
 
 .name {
   font-size: 25rpx;
-  margin-top: 30rpx;
+  margin-top: 15rpx;
 }
 
 .start_text {
-  font-size: 25rpx;
+  font-size: 23rpx;
   color: #999999;
-  margin-top: 10rpx;
+  margin-top: 30rpx;
 }
 
 .time {
@@ -301,6 +301,38 @@
   font-size: 24rpx;
   margin-top: 30rpx;
 }
+.zsbj {
+  width: 657rpx;
+  height: 891rpx;
+}
+
+.byzc {
+  width: 400rpx;
+  /* border: 1px solid red; */
+  font-size: 30rpx;
+  color: #000;
+  font-weight: 900;
+  position: absolute;
+  top: 340rpx;
+  left: 130rpx;
+  text-indent: 60rpx;
+  letter-spacing: 5rpx;
+  line-height: 70rpx;
+}
+
+.zsdw_text {
+  width: 500rpx;
+  /* border: 1px solid red; */
+  font-size: 30rpx;
+  color: #000;
+  font-weight: 900;
+  position: absolute;
+  top: 680rpx;
+  left: 80rpx;
+  /* text-indent: 60rpx; */
+  /* letter-spacing: 5rpx; */
+  /* line-height: 70rpx; */
+}
 
 /* .van-divider--center： after,
 .van-divider--left： after,

pages/myMission/myMission.js

@@ -10,6 +10,7 @@ Page({
     kcArr: [],
     ewmurl: '',
     sfmArr: [],
+    className:'',
     istask1: false,
     istask2: false,
     istask3: false,
@@ -62,14 +63,14 @@ Page({
     })
   },
   lq() {
-    wx.showModal({
-      showCancel: false,
-      content: "此功能暂时还未开放哦",
-      success(res) {}
-    })
-    // this.setData({
-    //   showzs: true
-    // });
+    // wx.showModal({
+    //   showCancel: false,
+    //   content: "此功能暂时还未开放哦",
+    //   success(res) {}
+    // })
+    this.setData({
+      showzs: true
+    });
   },
   // 跳转直播点播页面
   goStudy(e) {
@@ -143,7 +144,7 @@ Page({
     const hoursValue = hours % 60; //小时
     return `${hoursValue}时${minutesValue}分${secondValue}秒`;
   },
-  // 学员身份认证
+  // 学员身份认证 检查第一个任务
   checkTaskList(sessionKey) {
     var _this = this;
     wx.request({
@@ -164,6 +165,7 @@ Page({
       }
     })
   },
+    // 查询我是否有班&&班级名字
   isClass(sessionKey) {
     var _this = this;
     wx.request({
@@ -228,7 +230,8 @@ Page({
       success: function (res) {
         console.log(res)
         _this.setData({
-          showewm: true
+          showewm: true,
+          istask1: true
         })
       }
     })

pages/myMission/myMission.wxml

@@ -11,7 +11,7 @@
 		<view style="position:relative">
 			<image src='/images/ewm_closebtn.png' mode='aspectFill' class="ewm_close" bindtap="onClose"></image>
 			<image src='/images/ewmbj.png' mode='aspectFill' class="ewmbj"></image>
-			<view class="bjq_text">城市社区培训班班级群</view>
+			<view class="bjq_text">{{className}}</view>
 			<view class="sm_text">扫码进群与老师沟通</view>
 			<image src='{{ewmurl}}' mode='aspectFill' class="bjewm" wx:if='{{ewmurl!==""}}'></image>
 			<view class="save_btn" bindtap="saveImg" wx:if='{{ewmurl!==""}}'>保存二维码</view>
@@ -37,10 +37,10 @@
 						<image src='/images/zb.png' mode='aspectFill' class="dbimg" wx:if='{{item.isLive == 1 && item.isActive==1}}'></image>
 						<image src='/images/dzb.png' mode='aspectFill' class="dbimg" wx:if='{{item.isLive==1 && item.isActive==null}}'></image>
 						<image src='/images/zbjs.png' mode='aspectFill' class="dbimg" wx:if='{{item.isLive==1 && item.isActive==-1}}'></image>
-						<text class="name">{{item.courseName}}</text>
+						<view class="start_text" wx:if='{{item.isLive==1}}'>开始时间：{{item.courseStart}}</view>
+						<view class="start_text" wx:if='{{item.isLive==-1}}'>视频时长: {{sfmArr[idx].courseTime}}</view>
 					</view>
-					<view class="start_text" wx:if='{{item.isLive==1}}'>开始时间：{{item.courseStart}}</view>
-					<view class="start_text" wx:if='{{item.isLive==-1}}'>视频时长: {{sfmArr[idx].courseTime}}</view>
+					<view class="name">{{item.courseName}}</view>
 					<view>
 						<image src='/images/startstudy.png' mode='aspectFill' class="an" data-item="{{item}}" bindtap="goStudy"></image>
 						<image src='/images/dtxs.png' mode='aspectFill' class="an" bindtap="gokhAnswer"></image>

pages/myMission/myMission.wxss

@@ -189,6 +189,7 @@
   margin-left: 20rpx;
   height: 158rpx;
   margin-top: 20rpx;
+  margin-bottom: 20rpx;
   position: relative;
   /* border: 1px solid red; */
   box-shadow: #f2f2f2 0px 0px 15rpx;
@@ -209,7 +210,7 @@
 }
 .name {
   font-size: 25rpx;
-  margin-top: 30rpx;
+  margin-top: 15rpx;
 }
 .sp_text {
   width: 620rpx;
@@ -233,7 +234,7 @@
 .start_text {
   font-size: 25rpx;
   color: #999999;
-  margin-top: 15rpx;
+  margin-top: 25rpx;
 }
 
 .time {

pages/personInfo/personInfo.js

@@ -30,8 +30,5 @@ Page({
       content: "此功能暂时还未开放哦",
       success(res) {}
     })
-  },
-  onLoad: function () {
-
   }
 })

pages/studentRegistration/studentRegistration.wxml

@@ -8,11 +8,10 @@
 				</view>
 				<view class="xingbie">姓名</view>
 				<view class='weui-input'>
-					<input class="" name="username" value="{{ username }}" placeholder="请输入姓名"/>
+					<input name="username" value="{{ username }}" placeholder="请输入姓名" placeholder-style="font-size:25rpx" />
 					<view class="{{nameIsTrue?'error':'noerror'}}">请输入姓名</view>
 				</view>
 			</view>
-
 			<!-- <van-field
     value="{{ password }}"
     label="密码"
@@ -48,7 +47,7 @@
 				</view>
 				<view class="xingbie">工作单位</view>
 				<view class='weui-input'>
-					<input class="" name="work" value="{{ work }}" placeholder="请输入工作单位"/>
+					<input class="" name="work" value="{{ work }}" placeholder="请输入工作单位" placeholder-style="font-size:25rpx"/>
 					<view class="{{workIsTrue?'error':'noerror'}}">请输入工作单位</view>
 				</view>
 			</view>
@@ -59,7 +58,7 @@
 				</view>
 				<view class="xingbie">文化程度</view>
 				<view class='weui-input'>
-					<input class="" name="culture" value="{{culture }}" placeholder="请输入文化程度"/>
+					<input class="" name="culture" value="{{culture }}" placeholder="请输入文化程度" placeholder-style="font-size:25rpx"/>
 					<view class="{{ cultureIsTrue?'error':'noerror'}}">请输入文化程度</view>
 				</view>
 			</view>
@@ -70,7 +69,7 @@
 				</view>
 				<view class="xingbie">毕业学校</view>
 				<view class='weui-input'>
-					<input class="" name="graduation" value="{{ graduation }}" placeholder="请输入毕业学校"/>
+					<input class="" name="graduation" value="{{ graduation }}" placeholder="请输入毕业学校" placeholder-style="font-size:25rpx"/>
 					<view class="{{graduationIsTrue?'error':'noerror'}}">请输入毕业学校</view>
 				</view>
 			</view>
@@ -81,7 +80,7 @@
 				</view>
 				<view class="xingbie">所学专业</view>
 				<view class='weui-input'>
-					<input class="" name="major" value="{{ major }}" placeholder="请输入所学专业"/>
+					<input class="" name="major" value="{{ major }}" placeholder="请输入所学专业" placeholder-style="font-size:25rpx"/>
 					<view class="{{majorIsTrue?'error':'noerror'}}">请输入所学专业</view>
 				</view>
 			</view>
@@ -93,17 +92,17 @@
 				</view>
 				<view class="xingbie">现任职务</view>
 				<view class='weui-input'>
-					<input class="" name="post" value="{{ post }}" placeholder="请输入现任职务" />
+					<input class="" name="post" value="{{ post }}" placeholder="请输入现任职务" placeholder-style="font-size:25rpx"/>
 					<view class="{{postIsTrue?'error':'noerror'}}">请输入现任职务</view>
 				</view>
 			</view>
 			<view class='fwb'>
 				<view class="red-image">
-					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+					<image src="/images/quan.png" style="width:20rpx;height:20rpx;"> </image>
 				</view>
 				<view class="xingbie">任职时间</view>
 				<view class='weui-input' catchtap="share1">
-					{{zaizhiTime}}<view style="color:#808080;display: inline-block;" >{{headmasterText}}</view>
+					{{zaizhiTime}}<view style="color:#808080;display: inline-block;height:60rpx;line-height:60rpx;font-size:25rpx" >{{headmasterText}}</view>
 					<view class="{{renzhishijianIsTrue?'error':'noerror'}}">请输入任职时间</view>
 				</view>
 				<van-popup show="{{ postshow }}" position="bottom" custom-style="height: 50%;">
@@ -116,7 +115,7 @@
 				</view>
 				<view class="xingbie">联系电话</view>
 				<view class='weui-input'>
-					<input class="" name="phone" value="{{ phone }}" placeholder="请输入联系电话" />
+					<input class="" name="phone" value="{{ phone }}" placeholder="请输入联系电话" placeholder-style="font-size:25rpx"/>
 					<view class="{{phoneIsTrue?'error':'noerror'}}">请输入联系电话</view>
 				</view>
 			</view>
@@ -126,7 +125,7 @@
 				</view>
 				<view class="xingbie">培训时间</view>
 				<view class='weui-input' catchtap="share">
-					{{peixunTime}}<view  style="color:#808080;display: inline-block;">{{peixunText}}</view>
+					{{peixunTime}}<view  style="color:#808080;display: inline-block;height:60rpx;line-height:60rpx;font-size:25rpx">{{peixunText}}</view>
 					<view class="{{peixunshijianTrue?'error':'noerror'}}">请选择培训时间</view>
 				</view>
 				<van-popup show="{{ postshow1 }}" position="bottom" custom-style="height: 50%;">
@@ -147,7 +146,7 @@
 
 
 		<!-- <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>
 

pages/studentRegistration/studentRegistration.wxss

@@ -6,7 +6,7 @@
 van-button {
   color: white;
   text-align: center;
-  margin: 0 80rpx;
+  margin: 0 60rpx;
 }
 
 .van-button--default {
@@ -21,8 +21,6 @@ van-button {
 
 button:not([size='mini']) {
   width: 550rpx !important;
-  margin-left: auto;
-  margin-right: auto;
 }
 
 .van-radio__icon--round {
@@ -92,18 +90,23 @@ button:not([size='mini']) {
   width: 474rpx;
   
 }
-
+.weui-input input{
+  height: 60rpx;
+}
 .van-icon-circle {
   color: #EE0A24;
+  /* margin-top: 30rpx; */
 
 }
 
 .xingbie {
   margin-left: 10rpx;
   width: 130rpx;
+  line-height: 60rpx;
 }
 .red-image {
   vertical-align: text-bottom;
+  margin-top: 10rpx;
 }
 input {
   height: 40rpx; 

pages/zbDetails/zbDetails.js

@@ -83,7 +83,7 @@ Page({
       let res = JSON.parse(data.data);
       console.log(res)
       _this.setData({
-        chatContent: _this.data.chatContent.concat(res.msg),
+        chatContent: _this.data.chatContent.concat(res),
         bottom: 'scrollBottom'
       })
       if (res.messageType == "system" && res.mag == "socketLiveEnd") {

pages/zbDetails/zbDetails.wxml

@@ -14,16 +14,18 @@
 	</view> -->
 	<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 wx:for="{{chatContent}}" wx:for-index="idx" wx:for-item="item" wx:key="idx" class="chat_text">
-				{{item}}
+			<view style="padding:30rpx">
+				<view wx:for="{{chatContent}}" wx:for-index="idx" wx:for-item="item" wx:key="idx" class="chat_text">
+					<text wx:if='{{item.messageType!=="system"}}'>{{item.fromUserId}}:</text>{{item.msg}}
+				</view>
 			</view>
-			<view id="scrollBottom" style="height:50rpx"></view>
+			<view id="scrollBottom" style="height:10rpx"></view>
 		</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="请输入你的问题" />
+		<input class="weui-input" bindinput="bindKeyInput" placeholder="请输入你的问题" style="height:60rpx" />
 		<view class="send" bindtap="submit">发送</view>
 	</view>
 </view>

pages/zbDetails/zbDetails.wxss

@@ -45,9 +45,6 @@
   margin-bottom: 20rpx;
   /* border-bottom: 1px solid #dbdbdb; */
 }
-.chat_text{
-  padding:30rpx 30rpx 10rpx 30rpx;
-}
 .puthands_box {
   margin-top: 20rpx;
   margin-left: 35rpx;
@@ -55,7 +52,9 @@
   height: 60rpx;
   /* border: 1px solid red; */
 }
-
+.chat_text{
+  margin-bottom: 10rpx;
+}
 .handimg {
   width: 60rpx;
   height: 60rpx;
@@ -77,7 +76,7 @@
 
 .send {
   width: 90rpx;
-  height: 40rpx;
+  height: 60rpx;
   margin-top: 10rpx;
   background-color: #eb3f33;
   border-radius: 20rpx;
@@ -85,6 +84,6 @@
   font-size: 25rpx;
   color: #fff;
   text-align: center;
-  line-height: 40rpx;
+  line-height: 60rpx;
   margin-left: 20rpx;
 }

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 = {