22

app.json

@@ -1,19 +1,21 @@
 {
   "pages": [
     "pages/index/index",
-    "pages/zbDetails/zbDetails",
+    "pages/myInteractions/myInteractions",
+    "pages/myMission/myMission",
     
+    "pages/exhibitionList/exhibitionList",
+    "pages/startClass/startClass",
+    "pages/demandCourses/demandCourses",
+    "pages/onlineClass/onlineClass",
+    "pages/zbDetails/zbDetails",
     "pages/personInfo/personInfo",
-    "pages/myMission/myMission",
     "pages/dbDetails/dbDetails",
     "pages/myClass/myClass",
     "pages/testAnswer/testAnswer",
-    "pages/demandCourses/demandCourses",
-    "pages/onlineClass/onlineClass",
-    "pages/exhibitionList/exhibitionList",
     "pages/dbVideo/dbVideo",
     "pages/myInteractionsDetais/myInteractionsDetais",
-    "pages/myInteractions/myInteractions",
+    
     "pages/myPoints/myPoints",
     "pages/evaluationCourse/evaluationCourse",
     "pages/Identity/Identity",
@@ -21,9 +23,7 @@
     "pages/agoClass/agoClass",
     "pages/feedBack/feedBack",
     "pages/studentRegistration/studentRegistration",
-    "pages/startClass/startClass",
     "pages/grade/grade",
-    
     "pages/answerAfterclass/answerAfterclass"
   ],
   "window": {
@@ -33,42 +33,42 @@
     "navigationBarTitleText": "自定义导航栏"
   },
   "usingComponents": {
-    "van-button": "../../miniprogram_npm/vant-weapp/button/index",
-    "van-row": "../../miniprogram_npm/vant-weapp/row/index",
-    "van-col": "../../miniprogram_npm/vant-weapp/col/index",
-    "van-datetime-picker": "../../miniprogram_npm/vant-weapp/datetime-picker/index",
-    "van-picker": "../../miniprogram_npm/vant-weapp/picker/index",
-    "van-popup": "../../miniprogram_npm/vant-weapp/popup/index",
-    "van-radio": "../../miniprogram_npm/vant-weapp/radio/index",
-    "van-radio-group": "../../miniprogram_npm/vant-weapp/radio-group/index",
-    "van-action-sheet": "../../miniprogram_npm/vant-weapp/action-sheet/index",
-    "van-search": "../../miniprogram_npm/vant-weapp/search/index",
-    "van-tree-select": "../../miniprogram_npm/vant-weapp/tree-select/index",
-    "van-overlay": "../../miniprogram_npm/vant-weapp/overlay/index",
-    "van-dialog": "../../miniprogram_npm/vant-weapp/dialog/index",
-    "van-tab": "../../miniprogram_npm/vant-weapp/tab/index",
-    "van-tabs": "../../miniprogram_npm/vant-weapp/tabs/index",
-    "van-stepper": "../../miniprogram_npm/vant-weapp/stepper/index",
-    "van-collapse": "../../miniprogram_npm/vant-weapp/collapse/index",
-    "van-collapse-item": "../../miniprogram_npm/vant-weapp/collapse-item/index",
-    "van-cell": "../../miniprogram_npm/vant-weapp/cell/index",
-    "van-cell-group": "../../miniprogram_npm/vant-weapp/cell-group/index",
-    "van-toast": "../../miniprogram_npm/vant-weapp/toast/index",
-    "van-field": "../../miniprogram_npm/vant-weapp/field/index",
-    "van-checkbox": "../../miniprogram_npm/vant-weapp/checkbox/index",
-    "van-checkbox-group": "../../miniprogram_npm/vant-weapp/checkbox-group/index",
-    "van-loading": "../../miniprogram_npm/vant-weapp/loading/index",
-    "van-icon": "../../miniprogram_npm/vant-weapp/icon/index",
-    "van-nav-bar": "../../miniprogram_npm/vant-weapp/nav-bar/index",
-    "van-tabbar": "../../miniprogram_npm/vant-weapp/tabbar/index",
-    "van-tabbar-item": "../../miniprogram_npm/vant-weapp/tabbar-item/index",
-    "van-rate": "../../miniprogram_npm/vant-weapp/rate/index",
-    "van-image": "../../miniprogram_npm/vant-weapp/image/index",
-    "van-divider": "../../miniprogram_npm/vant-weapp/divider/index",
-    "van-grid": "../../miniprogram_npm/vant-weapp/grid/index",
-    "van-grid-item": "../../miniprogram_npm/vant-weapp/grid-item/index",
-    "van-notice-bar": "../../miniprogram_npm/vant-weapp/notice-bar/index",
-    "van-uploader": "../../miniprogram_npm/vant-weapp/uploader/index"
+    "van-button": "/miniprogram_npm/vant-weapp/button/index",
+    "van-row": "/miniprogram_npm/vant-weapp/row/index",
+    "van-col": "/miniprogram_npm/vant-weapp/col/index",
+    "van-datetime-picker": "/miniprogram_npm/vant-weapp/datetime-picker/index",
+    "van-picker": "/miniprogram_npm/vant-weapp/picker/index",
+    "van-popup": "/miniprogram_npm/vant-weapp/popup/index",
+    "van-radio": "/miniprogram_npm/vant-weapp/radio/index",
+    "van-radio-group": "/miniprogram_npm/vant-weapp/radio-group/index",
+    "van-action-sheet": "/miniprogram_npm/vant-weapp/action-sheet/index",
+    "van-search": "/miniprogram_npm/vant-weapp/search/index",
+    "van-tree-select": "/miniprogram_npm/vant-weapp/tree-select/index",
+    "van-overlay": "/miniprogram_npm/vant-weapp/overlay/index",
+    "van-dialog": "/miniprogram_npm/vant-weapp/dialog/index",
+    "van-tab": "/miniprogram_npm/vant-weapp/tab/index",
+    "van-tabs": "/miniprogram_npm/vant-weapp/tabs/index",
+    "van-stepper": "/miniprogram_npm/vant-weapp/stepper/index",
+    "van-collapse": "/miniprogram_npm/vant-weapp/collapse/index",
+    "van-collapse-item": "/miniprogram_npm/vant-weapp/collapse-item/index",
+    "van-cell": "/miniprogram_npm/vant-weapp/cell/index",
+    "van-cell-group": "/miniprogram_npm/vant-weapp/cell-group/index",
+    "van-toast": "/miniprogram_npm/vant-weapp/toast/index",
+    "van-field": "/miniprogram_npm/vant-weapp/field/index",
+    "van-checkbox": "/miniprogram_npm/vant-weapp/checkbox/index",
+    "van-checkbox-group": "/miniprogram_npm/vant-weapp/checkbox-group/index",
+    "van-loading": "/miniprogram_npm/vant-weapp/loading/index",
+    "van-icon": "/miniprogram_npm/vant-weapp/icon/index",
+    "van-nav-bar": "/miniprogram_npm/vant-weapp/nav-bar/index",
+    "van-tabbar": "/miniprogram_npm/vant-weapp/tabbar/index",
+    "van-tabbar-item": "/miniprogram_npm/vant-weapp/tabbar-item/index",
+    "van-rate": "/miniprogram_npm/vant-weapp/rate/index",
+    "van-image": "/miniprogram_npm/vant-weapp/image/index",
+    "van-divider": "/miniprogram_npm/vant-weapp/divider/index",
+    "van-grid": "/miniprogram_npm/vant-weapp/grid/index",
+    "van-grid-item": "/miniprogram_npm/vant-weapp/grid-item/index",
+    "van-notice-bar": "/miniprogram_npm/vant-weapp/notice-bar/index",
+    "van-uploader": "/miniprogram_npm/vant-weapp/uploader/index"
   },
   "tabBar": {
     "color": "#a9b7b7",

pages/Identity/Identity.json

@@ -1,4 +1,4 @@
 {
-  "navigationBarTitleText":"身份验证",
+  "navigationBarTitleText":"身份认证",
   "usingComponents": {}
 }

pages/Identity/Identity.wxml

@@ -17,6 +17,6 @@
 			<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>
 		</view>
-		<button class="qrrz" formType="submit">确认验证</button>
+		<button class="qrrz" formType="submit">前往认证</button>
 	</form>
 </view>

pages/agoClass/agoClass.wxml

@@ -3,8 +3,8 @@
 <image src="{{item.clasImg}}" mode='aspectFill' class="scimg"></image>
 <view class="sctext">
 <view class="t1">{{item.clasName}}</view>
-<view class="t2">{{item.remark}}</view>
-<view class="t2">{{item.clasBegin}}</view>
+<view class="t2">主办单位：{{item.remark}}</view>
+<view class="t2">开始单位：{{item.clasBegin}}</view>
 </view>
 </view>
 </view>

pages/agoClass/agoClass.wxss

@@ -1,29 +1,43 @@
+page {
+  background-color: #f2f2f2;
+}
+
 .class_box {
   width: 710rpx;
   margin-left: 20rpx;
-  height: 145rpx;
+  height: 200rpx;
   /* border: 1px solid red; */
-  margin-top: 30rpx;
+  margin-top: 20rpx;
+  background-color: #fff;
+  border-radius: 5rpx;
+  box-shadow: inset;
 }
 
 .scimg {
   width: 150rpx;
   height: 141rpx;
   float: left;
+  margin-top: 30rpx;
+  margin-left: 20rpx;
+  border-radius: 5rpx;
 }
-.sctext{
-float: right;
-height: 141rpx;
-width: 530rpx;
-/* border: 1px solid red;   */
+
+.sctext {
+  float: right;
+  height: 141rpx;
+  width: 530rpx;
+  margin-top: 30rpx;
+  /* border: 1px solid red;   */
 }
-.t1{
+
+.t1 {
   color: #eb3f33;
   font-size: 30rpx;
   margin-top: 10rpx;
   font-weight: 700;
 }
-.t2{
+
+.t2 {
   color: #999999;
   font-size: 24rpx;
   margin-top: 10rpx;

pages/dbDetails/dbDetails.json

@@ -1,4 +1,4 @@
 {
   "usingComponents": {},
-  "navigationBarTitleText":"录播详情"
+  "navigationBarTitleText":"在线录播"
 }

pages/demandCourses/demandCourses.js

@@ -15,18 +15,17 @@ Page({
     wx.request({
       url: app.globalData.publicUrl + '/wx/course/selectRecordBySessionKey',
       method: "post",
-      data:{
-        sessionKey:sessionKey
+      data: {
+        sessionKey: sessionKey
       },
       success: function (res) {
+        _this.setData({
+          lbArr: res.data.list
+        })
         if (res.data.list.length == 0) {
           _this.setData({
             showNull: true
           })
-        } else {
-          _this.setData({
-            lbArr: res.data.list
-          })
         }
       }
     })

pages/demandCourses/demandCourses.wxml

@@ -1,13 +1,23 @@
 <view class="container">
-	<view class="video_box">
+	<!-- <view class="video_box">
 		<view class="video" wx:for="{{lbArr}}" wx:for-index="idx" wx:for-item="item" wx:key="idx">
 			<image src='{{item.courseImg}}' mode='aspectFill' class="spbj"></image>
 			<view class="text1">{{item.courseName}}</view>
 			<view class="text2">
 				<image src='../../images/onlinenum.png' mode='aspectFill' class="onlinenumicon"></image>{{item.playTimes}}人看过
 			</view>
-			<view>
-				<button class="{{item.videoId==null?'getinroom':'nogetinroom'}}" bindtap="goIn" data-item="{{item}}">进入课堂</button>
+			<view class="getinroom" bindtap="goIn" data-item="{{item}}">进入课堂
+			</view>
+		</view>
+	</view> -->
+	<view class="video_box">
+		<view class="video" wx:for="{{lbArr}}" wx:for-index="idx" wx:for-item="item" bindtap="turnDetails" id="{{idx}}" wx:key="idx" bindtap="goIn" data-item="{{item}}">
+			<image src='{{item.courseImg}}' mode='aspectFill' class="spbj"></image>
+			<view class="grayblock">
+				<view class="show_text">{{item.courseName}}</view>
+				<image src='/images/clock.png' mode='aspectFill' class="qb"></image>
+				<view style="color:#e82315;font-size:25rpx;font-weight:500;float:left">{{item.courseTime/1000/60}}分钟</view>
+				<view style="color:#848585;font-size:22rpx;float:right;margin-right:20rpx">{{item.playTimes}}人看过</view>
 			</view>
 		</view>
 	</view>

pages/demandCourses/demandCourses.wxss

@@ -1,87 +1,7 @@
-/* .xczs {
-  width: 720rpx;
-  margin-left: 20rpx; */
-  /* height: 250rpx; */
-  /* border: 1px solid yellow; */
-  /* margin-top: 20rpx;
-  margin-bottom: 20rpx;
-  display: flex;
-  display: block;
-}
-
-.zb1 {
-  width: 338rpx;
-  height: 403rpx;
-  margin-right: 20rpx;
-  margin-bottom: 10rpx;
-  border-radius: 10rpx;
-  overflow: hidden;
-  float: left;
-  position: relative;
-} */
-/* 
-.show1 {
-  width: 338rpx;
-  height: 283rpx;
-} */
-
-/* .show_text {
-  font-size: 22rpx;
-  margin-top: 10rpx;
-}
-
-.grayblock {
-  width: 100%;
-  height: 80rpx;
-  background-color: rgba(255, 255, 255, 0.7);
-  position: absolute;
-  bottom: 0;
-  text-indent: 10rpx;
+page {
+  background-color: #f2f2f2;
 }
 
-.qb {
-  width: 23rpx;
-  height: 25rpx;
-  margin-left: 10rpx;
-  margin-top: 5rpx;
-  float: left;
-}
-.btn{
-  width:  128rpx;
-} */
-/* .getinroom { */
-  /* margin: 0 auto; */
-  /* width: 10%; */
-  /* width: 128rpx;
-  height: 40rpx;
-  border: 1px solid red;
-  color: #d72c1a;
-  margin-left: 100rpx; */
-  /* border: 1px solid #f2b09d; */
-  /* text-align: center; */
-  /* border-radius: 20rpx; */
-  /* width: 20%; */
-  /* margin-left: 25%; */
-  /* margin-top: 15rpx; */
-  /* height: 50rpx; */
-  /* line-height: 50rpx; */
-  /* font-size: 24rpx; */
-/* } */
-/* button{
-  margin-top: 30rpx;
-  margin-bottom: 30rpx;
-} */
-/* .nogetinroom {
-  color: #999999;
-  border: 1px solid #999999;
-  text-align: center;
-  border-radius: 20rpx;
-  width: 50%;
-  margin-left: 25%;
-  margin-top: 15rpx;
-  height: 50rpx;
-  font-size: 24rpx;
-} */
 .video_box {
   display: flex;
   width: 750rpx;
@@ -90,118 +10,39 @@
 
 .video {
   width: 340rpx;
-  height: 470rpx;
+  height: 286rpx;
   margin-left: 20rpx;
   position: relative;
+  border-radius: 20rpx;
+  margin-top: 20rpx;
 }
 
 .spbj {
   width: 100%;
-  height: 250rpx;
-  border-radius: 20rpx 20rpx 0 0;
-}
-
-.onlinenumicon {
-  width: 30rpx;
-  height: 30rpx;
-}
-
-.text1 {
-  color: #373737;
-  font-size: 25rpx;
-  margin-top: 10rpx;
-  margin-left: 10rpx;
-}
-
-.text2 {
-  color: #e40000;
-  font-size: 25rpx;
-  margin-top: 10rpx;
-  margin-left: 10rpx;
-}
-
-.text3 {
-  color: #9b9b9b;
-  font-size: 25rpx;
-  margin-top: 10rpx;
-  margin-left: 10rpx;
+  height: 286rpx;
+  border-radius: 20rpx;
+  position: relative;
 }
 
-.zbz {
-  display: flex;
-  border-radius: 0 0 10rpx 10rpx;
-  height: 40rpx;
-  background-color: #ba5047;
+.grayblock {
+  width: 100%;
+  height: 80rpx;
+  background-color: rgba(255, 255, 255, 0.7);
   position: absolute;
-  left: 20rpx;
-  padding-right: 10rpx;
+  bottom: 0rpx;
+  border-radius: 0 0 20rpx 20rpx;
+  text-indent: 10rpx;
 }
 
-.dzb {
-  display: flex;
-  border-radius: 0 0 10rpx 10rpx;
-  height: 40rpx;
-  background-color: #5d6a69;
-  position: absolute;
-  left: 20rpx;
-  padding-right: 10rpx;
+.show_text {
+  font-size: 22rpx;
+  margin-top: 10rpx;
 }
 
-.onlineimg {
-  width: 25rpx;
+.qb {
+  width: 23rpx;
   height: 25rpx;
   margin-left: 10rpx;
-  margin-top: 8rpx;
-}
-
-.onlinetext {
-  font-size: 20rpx;
-  color: white;
-  margin-left: 10rpx;
-  line-height: 40rpx;
-}
-
-.getinroom {
-  color: #d72c1a;
-  border: 1px solid #f2b09d;
-  text-align: center;
-  width: 100%;
-  /* border-radius: 20rpx; */
-  /* width: 20%; */
-  /* margin-left: 25%; */
-  /* margin-top: 15rpx; */
-  /* height: 50rpx; */
-  /* line-height: 50rpx; */
-  font-size: 20rpx;
-  /* margin: 0 auto; */
-  /* width: 60%; */
-  /* border: 1px solid red; */
-}
-
-.nogetinroom {
-  color: #999999;
-  border: 1px solid #999999;
-  text-align: center;
-  border-radius: 20rpx;
-  width: 20%;
-  /* width: 50%;
-  margin-left: 25%;
-  margin-top: 15rpx; */
-  /* height: 50rpx; */
-  /* line-height: 50rpx; */
-  font-size: 24rpx;
-}
-.nodata {
-  position: absolute;
-  top: 285rpx;
-  left: 205rpx;
-  width: 340rpx;
-  height: 262rpx;
-}
-.nodata_text{
-  position: absolute;
-  top: 550rpx;
-  left: 310rpx;
-  font-size: 30rpx;
-  color: #666666;
+  margin-top: 5rpx;
+  float: left;
 }

pages/index/index.js

@@ -183,6 +183,58 @@ Page({
         kjShow: false
       })
     }, 4000)
+    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.getBanner(sessionKey);
+                  _this.getfour();
+                }
+              })
+            }
+          })
+        } else {
+          _this.getBanner(sessionKey);
+          _this.getfour();
+        }
+      },
+      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.getBanner(sessionKey);
+                this.getfour();
+              }
+            })
+          }
+        })
+      }
+    })
   },
   onShow: function () {
     var _this = this;
@@ -204,19 +256,19 @@ Page({
                 success: function (res) {
                   sessionKey = res.data.sessionKey;
                   wx.setStorageSync('sessionKey', res.data.sessionKey);
-                  _this.getBanner(sessionKey);
+                  // _this.getBanner(sessionKey);
                   _this.getjjLength(sessionKey);
                   _this.getwqLength(sessionKey);
-                  _this.getfour();
+                  // _this.getfour();
                 }
               })
             }
           })
         } else {
-          _this.getBanner(sessionKey);
+          // _this.getBanner(sessionKey);
           _this.getjjLength(sessionKey);
           _this.getwqLength(sessionKey);
-          _this.getfour();
+          // _this.getfour();
         }
       },
       fail() {
@@ -234,10 +286,10 @@ Page({
               success: function (res) {
                 wx.setStorageSync('sessionKey', res.data.sessionKey);
                 var sessionKey = res.data.sessionKey
-                this.getBanner(sessionKey);
+                // this.getBanner(sessionKey);
                 this.getjjLength(sessionKey);
                 this.getwqLength(sessionKey);
-                this.getfour();
+                // this.getfour();
               }
             })
           }

pages/index/index.wxml

@@ -1,5 +1,6 @@
 <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>
+	<!-- <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">
@@ -25,12 +26,14 @@
 			<view class="text5">往期开班：{{wqdataArr}}个</view>
 		</view>
 	</view>
+	<view style="height:15rpx;width:750rpx;background-color:#F2F2F2"></view>
 	<van-grid class="gridbox">
 		<van-grid-item use-slot wx:for="{{gridArr}}" wx:for-index="idx" wx:for-item="item" wx:key="idx" bindtap="goGrid" data-id="{{idx}}">
 			<image style="width: 103rpx; height: 94rpx;" src="{{item.url}}" />
 			<text class="grid_text">{{item.name}}</text>
 		</van-grid-item>
 	</van-grid>
+		<view style="height:15rpx;width:750rpx;background-color:#F2F2F2"></view>
 	<view class="qy_title">
 		<view class="redk"></view>宣传展示
 		<view class="more" bindtap="xczsMore">查看全部></view>

pages/index/index.wxss

@@ -90,7 +90,6 @@
   height: 200rpx;
   width: 710rpx;
   margin-left: 20rpx;
-  /* border: 1px solid red; */
 }
 
 .grid_text {

pages/myClass/myClass.js

@@ -97,14 +97,14 @@ Page({
     })
   },
   goMyPoints() {
-    wx.showModal({
-      showCancel: false,
-      content: "敬请期待",
-      success(res) {}
-    })
-    // wx.navigateTo({
-    //   url: '../myPoints/myPoints'
+    // wx.showModal({
+    //   showCancel: false,
+    //   content: "敬请期待",
+    //   success(res) {}
     // })
+    wx.navigateTo({
+      url: '../myPoints/myPoints'
+    })
   },
   goactiveDetails() {
     wx.navigateTo({
@@ -112,34 +112,34 @@ Page({
     })
   },
   lq() {
-    wx.showModal({
-      showCancel: false,
-      content: "敬请期待",
-      success(res) {}
-    })
-    // wx.showToast({
-    //   title: '领取成功'
+    // wx.showModal({
+    //   showCancel: false,
+    //   content: "敬请期待",
+    //   success(res) {}
     // })
+    wx.showToast({
+      title: '领取成功'
+    })
   },
   goWrite() {
-    wx.showModal({
-      showCancel: false,
-      content: "敬请期待",
-      success(res) {}
-    })
-    // wx.navigateTo({
-    //   url: '../studentRegistration/studentRegistration'
+    // wx.showModal({
+    //   showCancel: false,
+    //   content: "敬请期待",
+    //   success(res) {}
     // })
+    wx.navigateTo({
+      url: '../studentRegistration/studentRegistration'
+    })
   },
   goWrite2() {
-    wx.showModal({
-      showCancel: false,
-      content: "敬请期待",
-      success(res) {}
-    })
-    // wx.navigateTo({
-    //   url: '../feedBack/feedBack'
+    // wx.showModal({
+    //   showCancel: false,
+    //   content: "敬请期待",
+    //   success(res) {}
     // })
+    wx.navigateTo({
+      url: '../feedBack/feedBack'
+    })
   },
   // 跳转直播点播页面
   goStudy(e) {

pages/myClass/myClass.wxml

@@ -7,15 +7,12 @@
 			<view class="agree_btn" bindtap="hidePopup">同意协议并进入我的班级</view>
 			<view class="thinking">我再想想</view>
 		</view>
-		<!-- <image src='/images/cloud.png' mode='aspectFill' class="cloudimg"></image> -->
 	</van-popup>
 	<view class="layout">
 		<van-notice-bar left-icon="/images/tzicon.png" text="{{notice}}" wrapable scrollable="false" />
 	</view>
 	<van-divider contentPosition="center" customStyle="color: #eb3f33; border-color: #eb3f33; font-size: 30rpx;font-weight:900;position:relative">
-		<!-- <view style="height:30rpx;width:8rpx;background-color:#eb3f33;position:absolute;left:0"></view> -->
 		<image src='/images/banjihz.png' mode='aspectFill' class="banjihz"></image><text>{{className}}</text>
-		<!-- <view style="height:30rpx;width:8rpx;background-color:#eb3f33"></view> -->
 	</van-divider>
 	<view class="layout" bindtap="goWrite">
 		<image src='/images/xydj_bj.png' mode='aspectFill' class="bgimg1"></image>
@@ -27,7 +24,6 @@
 			<image src='{{item.courseImg}}' mode='aspectFill' class="spfm"></image>
 			<image src='{{item.isDone==0?"/images/unfinish.png":"/images/finish.png"}}' mode='aspectFill' class="isfinish"></image>
 			<view class="sp_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>
@@ -42,7 +38,6 @@
 						<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>
 		</view>
 		<block wx:if="{{kcArr.length>3}}">
@@ -57,6 +52,9 @@
 			</view>
 		</block>
 	</view>
+	<view class="layout" style="margin-top:30rpx">
+		<image src='/images/finallytest.png' mode='aspectFill' class="bgimg1"></image>
+	</view>
 	<view class="layout" style="margin-top:40rpx" bindtap="goWrite2">
 		<image src='/images/zhfk_bj.png' mode='aspectFill' class="bgimg1"></image>
 		<view class="layout_text1">综合反馈表</view>

pages/myClass/myClass.wxss

@@ -1,6 +1,3 @@
-/* .popup{
-  position: relative;
-} */
 .nr_box {
   width: 670rpx;
   height: 90vh;
@@ -17,11 +14,13 @@
   margin-bottom: 80rpx;
 
 }
-.banjihz{
+
+.banjihz {
   width: 57rpx;
   height: 57rpx;
   margin-right: 30rpx;
 }
+
 .zw {
   padding-left: 50rpx;
   padding-right: 50rpx;
@@ -29,7 +28,6 @@
   font-size: 30rpx;
   line-height: 50rpx;
   height: 50vh;
-  /* border: 1px solid red; */
 }
 
 /* .cloudimg{
@@ -42,12 +40,14 @@
   margin-left: 28rpx;
   position: relative;
 }
+
 .bgimg1 {
   width: 693rpx;
   height: 74rpx;
   /* float: left; */
 }
-.layout_text1{
+
+.layout_text1 {
   position: absolute;
   color: #fff;
   font-size: 30rpx;
@@ -55,7 +55,8 @@
   top: 20rpx;
   left: 50rpx;
 }
-.layout_text2{
+
+.layout_text2 {
   position: absolute;
   color: #df7e33;
   font-size: 25rpx;
@@ -69,7 +70,8 @@
   border-radius: 20rpx;
   height: 40rpx;
 }
-.layout_text3{
+
+.layout_text3 {
   position: absolute;
   color: #3a7dcd;
   font-size: 25rpx;
@@ -83,12 +85,6 @@
   border-radius: 20rpx;
   height: 40rpx;
 }
-/* .bgimg2 {
-  width: 350rpx;
-  height: 125rpx;
-  float: right;
-} */
-
 .bg {
   margin-top: 10rpx;
 }
@@ -97,21 +93,26 @@
   width: 680rpx;
   margin-left: 35rpx;
   /* border: 1px solid red; */
-  height: 128rpx;
+  height: 180rpx;
   margin-top: 20rpx;
   position: relative;
   margin-bottom: 20rpx;
+  background-color: #fff;
+  box-shadow: rgba(0,0,0,.3) 0px 0px 10rpx;
+  border-radius: 5rpx;
 }
+
 .hiddenmore .none {
-  display: none!important;
+  display: none !important;
 }
-
-
 .spfm {
   width: 128rpx;
   height: 128rpx;
   /* margin-top: 20rpx; */
   float: left;
+  margin-top: 25rpx;
+  margin-left: 20rpx;
+  border-radius: 10rpx;
 }
 
 .isfinish {
@@ -122,23 +123,22 @@
   right: 0;
 }
 
-.iszb {
-  width: 30rpx;
-  height: 10rpx;
-}
-
 .sp_text {
-  width: 530rpx;
+  width: 510rpx;
   height: 100%;
   /* border: 1px solid red; */
   float: right;
+  margin-left: 10rpx;
 }
 
 .dbimg {
   width: 144rpx;
   height: 35rpx;
   /* margin-top: 10rpx; */
+  /* margin-left: 10rpx; */
   margin-right: 20rpx;
+  margin-top: 30rpx;
+  border-radius: 5rpx;
 }
 
 .an {
@@ -157,11 +157,13 @@
 
 .name {
   font-size: 25rpx;
+  margin-top: 30rpx;
 }
+
 .start_text {
   font-size: 25rpx;
   color: #999999;
-  margin-top: 15rpx;
+  margin-top: 10rpx;
 }
 
 .time {
@@ -263,8 +265,8 @@
   font-size: 29rpx;
   font-weight: 600;
   color: #fff;
-  background: -webkit-linear-gradient(left,#d7301d,#f99c30);
-  box-shadow: 5px 5px 5px #eea390; 
+  background: -webkit-linear-gradient(left, #d7301d, #f99c30);
+  box-shadow: 5px 5px 5px #eea390;
   margin-bottom: 20rpx;
 }
 

pages/myInteractions/myInteractions.js

@@ -9,7 +9,7 @@ Page({
     isshow1: false,
     isshow2: true,
     activebg: "#ffeae9",
-    unactivebg: "#fff",
+    unactivebg: "#f2f2f2",
     mytip: "",
     listArr: []
   },
@@ -22,7 +22,7 @@ Page({
       isshow1: false,
       isshow2: true,
       activebg: "#ffeae9",
-      unactivebg: "#fff"
+      unactivebg: "#f2f2f2"
     })
   },
   tab2Show() {
@@ -30,7 +30,7 @@ Page({
     _this.setData({
       isshow1: true,
       isshow2: false,
-      activebg: "#fff",
+      activebg: "#f2f2f2",
       unactivebg: "#ffeae9"
     })
     wx.checkSession({
@@ -120,11 +120,20 @@ Page({
     })
   },
   gojjDetails(e) {
-    console.log(e.currentTarget.dataset.item.id, "我是带过来的值")
-    var id = e.currentTarget.dataset.item.id
-    wx.navigateTo({
-      url: '/pages/myInteractionsDetais/myInteractionsDetais?id=' + id,
-    })
+    console.log(e.currentTarget.dataset.item, "我是带过来的值")
+    let id = e.currentTarget.dataset.item.id
+    if (e.currentTarget.dataset.item.replyContent == "" || e.currentTarget.dataset.item.replyContent == null) {
+      wx.showModal({
+        showCancel: false,
+        content: "您还没收到回复哦",
+        success(res) {}
+      })
+    } else {
+      wx.navigateTo({
+        url: '/pages/myInteractionsDetais/myInteractionsDetais?id=' + id,
+      })
+    }
+
   },
   bindFormSubmit: function (e) {
     // var _this = this;
@@ -150,7 +159,7 @@ Page({
               sessionKey: sessionKey
             },
             success: function (res) {
-              if (res.cede == 0) {
+              if (res.data.code == 0) {
                 wx.showModal({
                   showCancel: false,
                   content: "提交成功",
@@ -162,18 +171,11 @@ Page({
                     }
                   }
                 })
-              }else{
+              } else {
                 wx.showModal({
                   showCancel: false,
-                  content: "提交失败",
-                  success(res) {
-                    if (res.confirm) {
-                      console.log("失败了")
-                      // wx.switchTab({
-                      //   url: '../index/index'
-                      // })
-                    }
-                  }
+                  content: res.data.msg,
+                  success(res) {}
                 })
               }
             }

pages/myInteractions/myInteractions.wxml

@@ -11,14 +11,14 @@
 	</view>
 	<view class="textarea_box" hidden="{{isshow1}}">
 		<form bindsubmit="bindFormSubmit">
-			<textarea value="{{mytip}}" name="textarea" placeholder="请详细填写你的问题，老师会及时给你的提问做出解答!" auto-focus maxlength="-1" style="height:700rpx" />
+			<textarea value="{{mytip}}" name="textarea" placeholder="请详细填写你的问题，老师会及时给你的提问做出解答!" auto-focus maxlength="-1" style="height:700rpx;width:630rpx;background-color:#f2f2f2;border-radius:20rpx;padding:30rpx" />
 			<button form-type="submit" type="button" class="submit_btn"> 提交 </button>
     </form>
     </view> 
     <view class="myanswer_box" hidden="{{isshow2}}">
       <view class="tip" bindtap="gojjDetails" wx:for="{{listArr}}" wx:for-index="idx" wx:for-item="item"  wx:key="idx" bindtap="gojjDetails" data-item="{{item}}">
       <image src="/images/file.png" mode='aspectFill' class="file_img"></image>
-      <view class="tp">{{item.content}}<view class="wjj">{{item.replyContent==null?"未解答":"已解答"}}</view></view>
+      <view class="tp">{{item.content}}<view class="{{item.replyContent==null?'wjj':'yjd'}}">{{item.replyContent==null?"未解答":"已解答"}}</view></view>
       </view>
     </view> 
 </view>

pages/myInteractions/myInteractions.wxss

@@ -30,25 +30,20 @@
 }
 
 .textarea_box {
-  /* border: 1px solid red; */
   width: 670rpx;
   height: 700rpx;
   margin-left: 5%;
   margin-top: 50rpx;
   font-size: 28rpx;
 }
-
 .submit_btn {
-  width: 559rpx;
-  height: 77rpx;
-  /* line-height: 77rpx; */
-  margin-left: 75rpx;
   border-radius: 40rpx;
   font-size: 29rpx;
   font-weight: 600;
   color: #fff;
   background: -webkit-linear-gradient(left,#d7301d,#f99c30);
   box-shadow: 5px 5px 5px #eea390; 
+  margin-top: 40rpx;
   margin-bottom: 20rpx;
   text-align: center;
 }
@@ -72,6 +67,7 @@
   width: 670rpx;
   height: 100rpx;
   margin-top: 30rpx;
+  border-bottom: 1px solid #f2f2f2;
 }
 
 .tp {
@@ -93,4 +89,11 @@
   width: 120rpx;
   text-align: center;
   margin-top: 10rpx;
+}
+.yjd{
+  color: rgba(98,194,92);
+  background-color: rgba(239,255,199);
+  width: 120rpx;
+  text-align: center;
+  margin-top: 10rpx;
 }

pages/myMission/myMission.js

@@ -8,7 +8,12 @@ Page({
     showewm: false,
     showzs: false,
     kcArr: [],
-    ewmurl:''
+    ewmurl: '',
+    istask1: false,
+    istask2: false,
+    istask3: false,
+    istask4: false,
+    istask5: false
   },
   selectBtn0() {
     this.setData({
@@ -36,38 +41,47 @@ Page({
     })
   },
   goWrite() {
-    wx.showModal({
-      showCancel: false,
-      content: "敬请期待",
-      success(res) {}
-    })
-    // wx.navigateTo({
-    //   url: '../studentRegistration/studentRegistration'
+    // wx.showModal({
+    //   showCancel: false,
+    //   content: "敬请期待",
+    //   success(res) {}
     // })
+    wx.navigateTo({
+      url: '../studentRegistration/studentRegistration'
+    })
   },
   goWrite2() {
-    wx.showModal({
-      showCancel: false,
-      content: "敬请期待",
-      success(res) {}
-    })
-    // wx.navigateTo({
-    //   url: '../feedBack/feedBack'
+    // wx.showModal({
+    //   showCancel: false,
+    //   content: "敬请期待",
+    //   success(res) {}
     // })
+    wx.navigateTo({
+      url: '../feedBack/feedBack'
+    })
   },
   lq() {
-    wx.showModal({
-      showCancel: false,
-      content: "敬请期待",
-      success(res) {}
+    wx.showToast({
+      title: '领取成功'
     })
     // this.setData({
     //   showzs: true
     // });
   },
-  /**
-   * 生命周期函数--监听页面加载
-   */
+  // 跳转直播点播页面
+  goStudy(e) {
+    // console.log(e.currentTarget.dataset.item.id)
+    let id = e.currentTarget.dataset.item.id
+    if (e.currentTarget.dataset.item.isLive == 1) {
+      wx.navigateTo({
+        url: '../zbDetails/zbDetails?id=' + id
+      })
+    } else {
+      wx.navigateTo({
+        url: '../dbDetails/dbDetails?id=' + id
+      })
+    }
+  },
   getMycourse(sessionKey) {
     var _this = this;
     wx.request({
@@ -84,8 +98,28 @@ Page({
       }
     })
   },
-  isClass(sessionKey) {
+  // 学员身份认证
+  checkTaskList(sessionKey) {
     var _this = this;
+    wx.request({
+      url: app.globalData.publicUrl2 + '/wx/student/selStudentSessionKey',
+      method: "post",
+      data: {
+        sessionKey: sessionKey
+      },
+      success: function (res) {
+        console.log(res.data, "wwwwww")
+        if (res.data.code == 0) {
+          if (res.data.data.remark == 1) {
+            _this.setData({
+              istask1: true
+            })
+          }
+        }
+      }
+    })
+  },
+  isClass(sessionKey) {
     wx.request({
       url: app.globalData.publicUrl2 + '/wx/student/selAllClas',
       method: "post",
@@ -94,7 +128,7 @@ Page({
       },
       success: function (res) {
         console.log(res.data, "我是返回的班级列表")
-        var filterArr = res.data.data.claList.filter(o => o.isActive == 5)
+        let filterArr = res.data.data.claList.filter(o => o.isActive == 5)
         console.log(filterArr, "我是筛选出来的数组")
         if (filterArr.length == 0) {
           wx.showModal({
@@ -117,61 +151,9 @@ Page({
       }
     })
   },
-  // onShow: function () {
-  //   var _this = this;
-  //   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);
-
-  //               }
-  //             })
-  //           }
-  //         })
-  //       } else {
-  //         _this.getMycourse(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.getMycourse(sessionKey);
-  //             }
-  //           })
-  //         }
-  //       })
-  //     }
-  //   })
-  // },
   // 记录二维码已经点击
-  ewmClick(sessionKey){
-    let _this=this;
+  ewmClick(sessionKey) {
+    let _this = this;
     wx.request({
       url: app.globalData.publicUrl2 + '/wx/student/wxGroup',
       method: "post",
@@ -186,7 +168,7 @@ Page({
       }
     })
   },
-  ewmGet(sessionKey){
+  ewmGet(sessionKey) {
     let _this = this;
     wx.request({
       url: app.globalData.publicUrl2 + '/wx/student/selAllClas',
@@ -197,7 +179,7 @@ Page({
       success: function (res) {
         console.log(res.data.data, "22222222")
         var filterArr = res.data.data.claList.filter(o => o.isActive == 5)
-        console.log(filterArr,"111111111111")
+        console.log(filterArr, "111111111111")
         if (filterArr.length !== 0) {
           _this.setData({
             ewmurl: filterArr[0].codeImg
@@ -234,31 +216,13 @@ Page({
                 wx.setStorageSync('sessionKey', res.data.sessionKey);
                 _this.ewmClick(sessionKey)
                 _this.ewmGet(sessionKey)
-                // wx.request({
-                //   url: app.globalData.publicUrl2 + '/wx/student/wxGroup',
-                //   method: "post",
-                //   data: {
-                //     sessionKey: sessionKey
-                //   },
-                //   success: function (res) {
-                //     console.log(res)
-                //     _this.setData({
-                //       showewm: true
-                //     })
-                //   }
-                // })
               }
             })
           }
         })
       }
     })
-    // this.setData({
-    //   showewm: true
-    // });
   },
-  // showzs(){
-  // },
   onShow() {
     var _this = this;
     wx.checkSession({
@@ -280,6 +244,7 @@ Page({
                 success: function (res) {
                   sessionKey = res.data.sessionKey;
                   wx.setStorageSync('sessionKey', res.data.sessionKey);
+                  _this.checkTaskList(sessionKey)
                   _this.isClass(sessionKey);
                   _this.getMycourse(sessionKey);
                 }
@@ -287,6 +252,7 @@ Page({
             }
           })
         } else {
+          _this.checkTaskList(sessionKey)
           _this.isClass(sessionKey);
           _this.getMycourse(sessionKey);
         }
@@ -306,6 +272,7 @@ Page({
               success: function (res) {
                 wx.setStorageSync('sessionKey', res.data.sessionKey);
                 var sessionKey = res.data.sessionKey;
+                _this.checkTaskList(sessionKey)
                 _this.isClass(sessionKey);
                 _this.getMycourse(sessionKey);
               }
@@ -330,6 +297,8 @@ Page({
    * 生命周期函数--监听页面初次渲染完成
    */
   saveImg() {
+    let _this = this;
+    console.log(_this.data.ewmurl)
     wx.getSetting({
       success(res) {
         if (!res.authSetting['scope.writePhotosAlbum']) {
@@ -340,7 +309,7 @@ Page({
               wx.showLoading({
                 title: '保存中...'
               })
-              var imgSrc = "http://yijiao.oss-cn-qingdao.aliyuncs.com/images/http://tmp/wx1b4e5e756cd48af1.o6zAJsws4grEQvYrWTjBigy-6QaU.0llhudiKSF2V955a1c48350d9328ef064b4d36d12746.jpg"
+              var imgSrc = _this.data.ewmurl;
               wx.downloadFile({
                 url: imgSrc,
                 success: function (res) {
@@ -384,7 +353,7 @@ Page({
             }
           })
         } else {
-          var imgSrc = "http://yijiao.oss-cn-qingdao.aliyuncs.com/images/http://tmp/wx1b4e5e756cd48af1.o6zAJsws4grEQvYrWTjBigy-6QaU.0llhudiKSF2V955a1c48350d9328ef064b4d36d12746.jpg"
+          var imgSrc = _this.data.ewmurl
           wx.downloadFile({
             url: imgSrc,
             success: function (res) {

pages/myMission/myMission.wxml

@@ -1,9 +1,11 @@
 <view class="container">
 	<view class="step" style="margin-top:20rpx">
-		<image src='/images/step_finish.png' mode='aspectFill' class="finish_img"></image>
-		<text class="join_classtext">加入班级群</text>
-		<image src='/images/ewm.png' mode='aspectFill' class="ewm_icon"></image>
-		<view class="join_btn" bindtap="showEwm">加入按钮确认</view>
+		<image src='{{istask1==false?"/images/step_unfinish.png":"/images/step_finish.png"}}' mode='aspectFill' class="finish_img"></image>
+		<view class="whitebj">
+			<text class="join_classtext">加入班级群</text>
+			<image src='/images/ewm.png' mode='aspectFill' class="ewm_icon"></image>
+			<view class="join_btn" bindtap="showEwm">加入按钮确认</view>
+		</view>
 	</view>
 	<van-popup show="{{ showewm }}" bind:close="onClose">
 		<view style="position:relative">
@@ -11,12 +13,13 @@
 			<image src='/images/ewmbj.png' mode='aspectFill' class="ewmbj"></image>
 			<view class="bjq_text">城市社区培训班班级群</view>
 			<view class="sm_text">扫码进群与老师沟通</view>
-			<image src='{{ewmurl}}' mode='aspectFill' class="bjewm"></image>
-			<view class="save_btn" bindtap="saveImg">保存二维码</view>
+			<image src='{{ewmurl}}' mode='aspectFill' class="bjewm" wx:if='{{ewmurl!==""}}'></image>
+			<view class="save_btn" bindtap="saveImg" wx:if='{{ewmurl!==""}}'>保存二维码</view>
+			<view class="unloadewm_text" wx:if='{{ewmurl==""}}'>您的老师还未上传班级二维码哦</view>
 		</view>
 	</van-popup>
 	<view class="step" bindtap="goWrite">
-		<image src='/images/step_unfinish.png' mode='aspectFill' class="finish_img"></image>
+		<image src='{{istask2==false?"/images/step_unfinish.png":"/images/step_finish.png"}}' mode='aspectFill' class="finish_img"></image>
 		<view class="layout">
 			<image src='/images/xydj_bj.png' mode='aspectFill' class="bgimg1"></image>
 			<view class="layout_text1">学员登记表</view>
@@ -24,12 +27,11 @@
 		</view>
 	</view>
 	<view class="step" style="height:500rpx;">
-		<image src='/images/step_finish.png' mode='aspectFill' class="finish_img"></image>
+		<image src='{{istask3==false?"/images/step_unfinish.png":"/images/step_finish.png"}}' mode='aspectFill' class="finish_img"></image>
 		<view class="sp_bigbox">
 			<view class="sp" wx:for="{{kcArr}}" wx:for-index="idx" wx:for-item="item">
-			<image src='{{item.isDone==0?"/images/unfinish.png":"/images/finish.png"}}' mode='aspectFill' class="isfinish"></image>
-			<view class="sp_text">
-				<view>
+				<image src='{{item.isDone==0?"/images/unfinish.png":"/images/finish.png"}}' mode='aspectFill' class="isfinish"></image>
+				<view class="sp_text">
 					<view class="fisrt_set">
 						<!-- <image src='{{item.isLive==1?"/images/zb.png":"/images/db.png"}}' mode='aspectFill' class="dbimg"></image> -->
 						<image src='/images/db.png' mode='aspectFill' class="dbimg" wx:if='{{item.isLive==-1}}'></image>
@@ -39,20 +41,19 @@
 						<text class="name">{{item.courseName}}</text>
 					</view>
 					<!-- <view class="start_text">开始时间：{{item.courseStart}}</view> -->
-						<view class="start_text" wx:if='{{item.isLive==1}}'>开始时间：{{item.courseStart}}</view>
+					<view class="start_text" wx:if='{{item.isLive==1}}'>开始时间：{{item.courseStart}}</view>
 					<view class="start_text" wx:if='{{item.isLive==-1}}'>视频时长: {{item.courseTime/1000/60}}分钟</view>
 					<view>
-						<image src='/images/startstudy.png' mode='aspectFill' class="an"></image>
+						<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>
-			</view>
 		</view>
 	</view>
 	<view class="step" style="padding-top:30rpx" bindtap="goWrite2">
-		<image src='/images/step_finish.png' mode='aspectFill' class="finish_img"></image>
+		<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>
 			<view class="layout_text1">综合反馈表</view>
@@ -60,7 +61,7 @@
 		</view>
 	</view>
 	<view class="step">
-		<image src='/images/step_finish.png' mode='aspectFill' class="finish_img"></image>
+		<image src='{{istask5==false?"/images/step_unfinish.png":"/images/step_finish.png"}}' mode='aspectFill' class="finish_img"></image>
 		<view class="lq_btn" bindtap="lq">领取结业证</view>
 		<!-- <image src='/images/lqxy.png' mode='aspectFill' class="lqxyimg" bindtap="lq"></image> -->
 	</view>

pages/myMission/myMission.wxss

@@ -11,7 +11,7 @@
   height: 53rpx;
   position: absolute;
   top: 0;
-  left: -25rpx;
+  left: -30rpx;
 }
 
 .ewm_icon {
@@ -72,6 +72,38 @@
   border-radius: 50rpx;
 }
 
+.unloadewm_text {
+  font-size: 30rpx;
+  font-weight: 900;
+  position: absolute;
+  top: 390rpx;
+  left: 110rpx;
+}
+
+.whitebj {
+  height: 70rpx;
+  width: 605rpx;
+  background-color: #fff;
+  /* border: 1px solid red; */
+  box-shadow: #f2f2f2 0px 0px 15rpx;
+  float: right;
+  margin-right: 30rpx;
+}
+
+.join_classtext {
+  font-size: 28rpx;
+  margin-left: 20rpx;
+  line-height: 70rpx;
+  font-weight: 900;
+  float: left;
+}
+
+.ewm_icon {
+  margin-left: 20rpx;
+  float: left;
+  margin-top: 20rpx;
+}
+
 .join_btn {
   border: 1px solid #da2c15;
   border-radius: 20rpx;
@@ -82,47 +114,61 @@
   font-size: 28rpx;
   font-weight: 900;
   line-height: 45rpx;
-  margin-right: 30rpx;
+  margin-top: 10rpx;
 }
 
-.join_classtext {
-  font-size: 28rpx;
+.layout {
+  width: 610rpx;
   margin-left: 50rpx;
-  font-weight: 900;
-  float: left;
+  /* margin-left: 28rpx; */
+  position: relative;
+  /* border: 1px solid red; */
+  height: 74rpx;
 }
 
-.ewm_icon {
-  margin-left: 20rpx;
-  float: left;
+.bgimg1 {
+  width: 610rpx;
+  height: 74rpx;
+  border-radius: 10rpx;
 }
 
-/* .bgimg1 {
-  width: 291rpx;
-  height: 124rpx;
-  float: left;
-  margin-left: 70rpx;
-} */
+.layout_text1 {
+  position: absolute;
+  color: #fff;
+  font-size: 30rpx;
+  font-weight: 900;
+  top: 20rpx;
+  left: 50rpx;
+}
+
+.layout_text2 {
+  position: absolute;
+  color: #df7e33;
+  font-size: 25rpx;
+  line-height: 40rpx;
+  font-weight: 900;
+  top: 20rpx;
+  right: 50rpx;
+  background-color: #fff;
+  text-align: center;
+  width: 140rpx;
+  border-radius: 20rpx;
+  height: 40rpx;
+}
 
-/* .bgimg2 {
-  width: 291rpx;
-  height: 124rpx;
-  float: right;
-} */
 .sp_bigbox {
   width: 620rpx;
   height: 550rpx;
-  /* border: 1px solid red; */
   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;
@@ -130,7 +176,6 @@
   -moz-border-radius: 10rpx;
   border-radius: 10rpx;
 }
-
 .sp_bigbox::-webkit-scrollbar-thumb {
   background-color: #eb3f33;
   transition: background-color 0.3s;
@@ -140,11 +185,13 @@
 }
 
 .sp {
-  width: 620rpx;
-  height: 128rpx;
-  margin-top: 50rpx;
+  width: 580rpx;
+  margin-left: 20rpx;
+  height: 158rpx;
+  margin-top: 20rpx;
   position: relative;
-  margin-bottom: 20rpx;
+  /* border: 1px solid red; */
+  box-shadow: #f2f2f2 0px 0px 15rpx;
 }
 
 .isfinish {
@@ -152,27 +199,24 @@
   height: 36rpx;
   position: absolute;
   top: 0;
-  right: 20rpx;
+  right: 0rpx;
 }
-
-.iszb {
-  width: 30rpx;
-  height: 10rpx;
+.dbimg {
+  width: 144rpx;
+  height: 35rpx;
+  margin-right: 20rpx;
+  margin-top: 30rpx;
+}
+.name {
+  font-size: 25rpx;
+  margin-top: 30rpx;
 }
-
 .sp_text {
   width: 620rpx;
   height: 100%;
   float: left;
+  margin-left: 10rpx;
 }
-
-.dbimg {
-  width: 144rpx;
-  height: 35rpx;
-  /* margin-top: 10rpx; */
-  margin-right: 20rpx;
-}
-
 .an {
   width: 144rpx;
   height: 35rpx;
@@ -186,11 +230,6 @@
   align-items: center;
   justify-content: left;
 }
-
-.name {
-  font-size: 25rpx;
-}
-
 .start_text {
   font-size: 25rpx;
   color: #999999;
@@ -216,44 +255,7 @@
   text-align: center;
 }
 
-.layout {
-  width: 610rpx;
-  margin-left: 50rpx;
-  /* margin-left: 28rpx; */
-  position: relative;
-  /* border: 1px solid red; */
-  height: 74rpx;
-}
-
-.bgimg1 {
-  width: 610rpx;
-  height: 74rpx;
-  /* float: left; */
-}
 
-.layout_text1 {
-  position: absolute;
-  color: #fff;
-  font-size: 30rpx;
-  font-weight: 900;
-  top: 20rpx;
-  left: 50rpx;
-}
-
-.layout_text2 {
-  position: absolute;
-  color: #df7e33;
-  font-size: 25rpx;
-  line-height: 40rpx;
-  font-weight: 900;
-  top: 20rpx;
-  right: 50rpx;
-  background-color: #fff;
-  text-align: center;
-  width: 140rpx;
-  border-radius: 20rpx;
-  height: 40rpx;
-}
 
 .layout_text3 {
   position: absolute;

pages/myPoints/myPoints.wxml

@@ -1,7 +1,7 @@
 <view class="container">
 	<view class="show_box">
 		<image src="/images/redcloud.png" mode='aspectFill' class="cloud_img"></image>
-		<view class="jfnum">25</view>
+		<view class="jfnum">0</view>
 		<view class="jftext">当前可用积分</view>
 	</view>
 	<view class="prize_box">
@@ -9,8 +9,8 @@
 		<view class="prize_textbox">
 			<view class="text1">2020新款电脑</view>
 			<view class="text2">限量500份</view>
-			<view class="text3">500人已领</view>
-			<view><text class="text4">9876积分</text><text class="text5">立即兑换</text></view>
+			<view class="text3">0人已领</view>
+			<view><text class="text4">100积分</text><text class="text5">立即兑换</text></view>
 		</view>
 	</view>
 		<view class="prize_box">
@@ -18,8 +18,8 @@
 		<view class="prize_textbox">
 			<view class="text1">2020新款电脑</view>
 			<view class="text2">限量500份</view>
-			<view class="text3">500人已领</view>
-			<view><text class="text4">9876积分</text><text class="text5">立即兑换</text></view>
+			<view class="text3">0人已领</view>
+			<view><text class="text4">500积分</text><text class="text5">立即兑换</text></view>
 		</view>
 	</view>
 		<view class="prize_box">
@@ -27,8 +27,8 @@
 		<view class="prize_textbox">
 			<view class="text1">2020新款电脑</view>
 			<view class="text2">限量500份</view>
-			<view class="text3">500人已领</view>
-			<view><text class="text4">9876积分</text><text class="text5">立即兑换</text></view>
+			<view class="text3">0人已领</view>
+			<view><text class="text4">500积分</text><text class="text5">立即兑换</text></view>
 		</view>
 	</view>
 </view>

pages/myPoints/myPoints.wxss

@@ -54,7 +54,7 @@
   margin-top: 15rpx;
 }
 .text3{
-  font-size: 20rpx;
+  font-size: 25rpx;
   color: #cccccc;
   margin-top: 15rpx;
 }

pages/myTraining/myTraining.wxml

@@ -1,13 +1,12 @@
 <view class="container">
-<view class="class_box" wx:for="{{dataArr}}" wx:for-index="idx" wx:for-item="item">
-<image src="{{item.clasImg}}" mode='aspectFill' class="scimg"></image>
-<view class="sctext">
-<view class="t1">{{item.clasName}}</view>
-<view class="t2">主办单位：{{item.remark}}</view>
-<!-- <view class="t2" id="isActive">培训状态：{{item.isActive==0?"已结束":"正在开班"}}</view> -->
-<rich-text class='t2' wx:if='{{item.isActive==0}}'>状态：待开始</rich-text>
-<rich-text class='t2' wx:elif='{{item.isActive==1}}'>状态：正在开班</rich-text>
-<rich-text class='t2' wx:elif='{{item.isActive==2}}'>状态：已结束</rich-text>
-</view>
-</view>
+	<view class="class_box" wx:for="{{dataArr}}" wx:for-index="idx" wx:for-item="item">
+		<image src="{{item.clasImg}}" mode='aspectFill' class="scimg"></image>
+		<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>
+	</view>
 </view>

pages/myTraining/myTraining.wxss

@@ -1,30 +1,34 @@
 .class_box {
   width: 710rpx;
   margin-left: 20rpx;
-  height: 145rpx;
+  height: 200rpx;
   /* border: 1px solid red; */
   margin-top: 30rpx;
+  box-shadow: #f2f2f2 0px 0px 20rpx;
 }
 
 .scimg {
   width: 150rpx;
   height: 141rpx;
   float: left;
+  margin-top: 30rpx;
+  margin-left: 20rpx;
 }
 .sctext{
 float: right;
 height: 141rpx;
-width: 530rpx;
+width: 510rpx;
+margin-top: 30rpx;
+margin-left: 20rpx;
 /* border: 1px solid red;   */
 }
 .t1{
   color: #eb3f33;
   font-size: 30rpx;
-  margin-top: 10rpx;
   font-weight: 700;
 }
 .t2{
   color: #999999;
   font-size: 24rpx;
-  margin-top: 10rpx;
+  margin-top: 20rpx;
 }

pages/onlineClass/onlineClass.js

@@ -36,15 +36,14 @@ Page({
         sessionKey: sessionKey
       },
       success: function (res) {
-        console.log(res, "woshi")
+        console.log(res)
+        _this.setData({
+          zbArr: res.data.list
+        })
         if (res.data.list.length == 0) {
           _this.setData({
             showNull: true
           })
-        } else {
-          _this.setData({
-            zbArr: res.data.list
-          })
         }
       }
     })

pages/onlineClass/onlineClass.json

@@ -1,4 +1,5 @@
 {
   "navigationBarTitleText": "在线直播",
-  "usingComponents": {}
+  "usingComponents": {},
+  "backgroundColor": "#f2f2f2"
 }

pages/onlineClass/onlineClass.wxml

@@ -9,12 +9,15 @@
 			</view>
 			<image src='{{item.courseImg}}' mode='aspectFill' class="spbj"></image>
 			<view class="text1">{{item.courseName}}</view>
-			<view class="text2">开始时间：{{item.courseStart}}</view>
-			<!-- <view class="text2">
+			<!-- <view class="text2">开始时间：{{item.courseStart}}</view> -->
+			<view class="text2">
 				<image src='../../images/onlinenum.png' mode='aspectFill' class="onlinenumicon"></image>{{item.playTimes}}人在线观看
-			</view> -->
+			</view>
 			<view class="text3">{{item.courseInfo}}</view>
-			<button class="{{item.isActive==1?'getinroom':'nogetinroom'}}" bindtap="goIn" data-item="{{item}}">进入课堂</button>
+			<view class="{{item.isActive==1?'getinroom':'nogetinroom'}}"  bindtap="goIn" data-item="{{item}}">进入课堂
+			<!-- <button bindtap="goIn" data-item="{{item}}" style="width:100%;" plain="true">进入课堂</button> -->
+			</view>
+
 		</view>
 	</view>
 	<view wx:if="{{showNull}}">

pages/onlineClass/onlineClass.wxss

@@ -1,9 +1,11 @@
+page {
+  background-color: #f2f2f2;
+}
 .video_box {
   display: flex;
   width: 750rpx;
   flex-wrap: wrap;
 }
-
 .nodata {
   position: absolute;
   top: 285rpx;
@@ -20,9 +22,11 @@
 }
 .video {
   width: 340rpx;
-  height: 470rpx;
+  /* height: 470rpx; */
   margin-left: 20rpx;
   position: relative;
+  background-color: #fff;
+  border-radius: 20rpx;
 }
 
 .spbj {
@@ -34,6 +38,7 @@
 .onlinenumicon {
   width: 30rpx;
   height: 30rpx;
+  margin-right: 10rpx;
 }
 
 .text1 {
@@ -96,12 +101,13 @@
   border: 1px solid #f2b09d;
   text-align: center;
   border-radius: 20rpx;
-  /* width: 100rpx; */
-  margin-left: 25%;
-  margin-top: 15rpx;
-  /* height: 50rpx; */
-  /* line-height: 50rpx; */
   font-size: 24rpx;
+  width: 150rpx;
+  height: 40rpx;
+  line-height: 40rpx;
+  margin-left: 95rpx;
+  margin-top: 20rpx;
+  margin-bottom: 20rpx;
 }
 
 .nogetinroom {
@@ -109,10 +115,11 @@
   border: 1px solid #999999;
   text-align: center;
   border-radius: 20rpx;
-  width: 50%;
-  margin-left: 25%;
-  margin-top: 15rpx;
-  height: 50rpx;
-  /* line-height: 50rpx; */
   font-size: 24rpx;
+  width: 150rpx;
+  height: 40rpx;
+  line-height: 40rpx;
+  margin-left: 95rpx;
+  margin-top: 20rpx;
+  margin-bottom: 20rpx;
 }

pages/personInfo/personInfo.js

@@ -23,7 +23,14 @@ Page({
       url: '/pages/myInteractions/myInteractions',
     })
   },
+  hqgz() {
+    wx.showModal({
+      showCancel: false,
+      content: "此功能暂时还未开放哦",
+      success(res) {}
+    })
+  },
   onLoad: function () {
- 
+
   }
 })

pages/personInfo/personInfo.wxml

@@ -32,7 +32,7 @@
 					<view class="small-title">随时发布问题</view>
 				</view>
 			</view>
-			<view class="content">
+			<view class="content" bindtap="hqgz">
 				<view>
 					<van-image fit="cover" width="76rpx" height="76rpx" src="/images/person4.png" />
 				</view>

pages/personInfo/personInfo.wxss

@@ -1,8 +1,14 @@
+page {
+  background-color: #f2f2f2;
+}
 .personxx {
   width: 710rpx;
   margin-left: 20rpx;
-  height: 200rpx;
+  margin-top: 20rpx;
+  height: 210rpx;
   display: flex;
+  background-color: #fff;
+  border-radius: 20rpx;
 }
 .tx {
   width: 180rpx;
@@ -10,6 +16,7 @@
   border-radius: 90rpx;
   overflow: hidden;
   margin-left: 50rpx;
+  margin-top: 15rpx;
 }
 .nc{
   margin-top: 100rpx;
@@ -20,13 +27,15 @@
 .top-content {
   width: 710rpx;
   margin-left: 20rpx;
-  margin-top: 30rpx;
+  margin-top: 20rpx;
+  background-color: #fff;
+  border-radius: 20rpx;
 }
 .content {
   display: flex;
   margin: 40rpx;
   border-bottom: 1rpx solid rgba(221,221,221,1);
-  padding-bottom: 10rpx;
+  padding-bottom: 20rpx;
 }
 /* .content:last-child {
   border-bottom: unset

pages/startClass/startClass.wxml

@@ -1,10 +1,10 @@
 <view class="container">
-<view class="class_box" wx:for="{{dataArr}}" wx:for-index="idx" wx:for-item="item">
-<image src="{{item.clasImg}}" mode='aspectFill' class="scimg"></image>
-<view class="sctext">
-<view class="t1">{{item.clasName}}</view>
-<view class="t2">{{item.remark}}</view>
-<view class="t2">{{item.clasBegin}}</view>
-</view>
-</view>
+	<view class="class_box" wx:for="{{dataArr}}" wx:for-index="idx" wx:for-item="item">
+		<image src="{{item.clasImg}}" mode='aspectFill' class="scimg"></image>
+		<view class="sctext">
+			<view class="t1">{{item.clasName}}</view>
+			<view class="t2">主办单位：{{item.remark}}</view>
+			<view class="t2">开始时间：{{item.clasBegin}}</view>
+		</view>
+	</view>
 </view>

pages/startClass/startClass.wxss

@@ -1,29 +1,43 @@
+page {
+  background-color: #f2f2f2;
+}
+
 .class_box {
   width: 710rpx;
   margin-left: 20rpx;
-  height: 145rpx;
+  height: 200rpx;
   /* border: 1px solid red; */
-  margin-top: 30rpx;
+  margin-top: 20rpx;
+  background-color: #fff;
+  border-radius: 5rpx;
+  box-shadow: inset;
 }
 
 .scimg {
   width: 150rpx;
   height: 141rpx;
   float: left;
+  margin-top: 30rpx;
+  margin-left: 20rpx;
+  border-radius: 5rpx;
 }
-.sctext{
-float: right;
-height: 141rpx;
-width: 530rpx;
-/* border: 1px solid red;   */
+
+.sctext {
+  float: right;
+  height: 141rpx;
+  width: 530rpx;
+  margin-top: 30rpx;
+  /* border: 1px solid red;   */
 }
-.t1{
+
+.t1 {
   color: #eb3f33;
   font-size: 30rpx;
   margin-top: 10rpx;
   font-weight: 700;
 }
-.t2{
+
+.t2 {
   color: #999999;
   font-size: 24rpx;
   margin-top: 10rpx;

pages/zbDetails/zbDetails.json

@@ -1,4 +1,4 @@
 {
   "usingComponents": {},
-  "navigationBarTitleText":"直播详情"
+  "navigationBarTitleText":"在线直播"
 }

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.9.28:8090', //zxq
+  // publicUrl3: 'http://10.16.4.22:8090', //zxq
 };
 module.exports = {
   globalData: globalData