0730定板

app.json

@@ -1,17 +1,19 @@
 {
   "pages": [
-    "pages/studentRegistration/studentRegistration",
     "pages/welcome/welcome",
-    "pages/zbDetails/zbDetails", 
-     "pages/testAnswer/testAnswer",
+    "pages/testAnswer/testAnswer",
+    "pages/InteractiveQA/InteractiveQA",
+    "pages/pyip/pyip",
+    "pages/demandCourses/demandCourses",
+    "pages/studentRegistration/studentRegistration",
+    "pages/zbDetails/zbDetails",
     "pages/myClass/myClass",
     "pages/last/last",
     "pages/index/index",
-    "pages/personInfo/personInfo", 
+    "pages/personInfo/personInfo",
     "pages/lastdetail/lastdetail",
     "pages/lastdetailDetail/lastdetailDetail",
     "pages/answerAfterclasses/answerAfterclasses",
-    
     "pages/evaluationCourse/evaluationCourse",
     "pages/feedBack/feedBack",
     "pages/answerAfterclass/answerAfterclass",
@@ -26,13 +28,13 @@
     "pages/myMission/myMission",
     "pages/exhibitionList/exhibitionList",
     "pages/startClass/startClass",
-    "pages/demandCourses/demandCourses",
     "pages/myInteractionsDetais/myInteractionsDetais",
     "pages/myPoints/myPoints",
     "pages/Identity/Identity",
     "pages/myTraining/myTraining",
     "pages/agoClass/agoClass",
-    "pages/grade/grade"
+    "pages/grade/grade",
+    "pages/study/study"
   ],
   "window": {
     "backgroundTextStyle": "light",
@@ -67,7 +69,8 @@
     "color": "#a9b7b7",
     "selectedColor": "#eb3f33",
     "borderStyle": "black",
-    "list": [{
+    "list": [
+      {
         "pagePath": "pages/index/index",
         "text": "首页",
         "selectedIconPath": "./images/tabBar5.png",

components/trtc-room/trtc-room.js

@@ -42,7 +42,7 @@ Component({
    */
   data: {
     // orientation:'horizontal',
-    fullScreenFlag: 0,//默认为0不全屏  全屏为1 
+    fullScreenFlag: 0, //默认为0不全屏  全屏为1 
     pusher: null,
     debugPanel: true, // 是否打开组件调试面板
     debug: false, // 是否打开player pusher 的调试信息
@@ -257,21 +257,23 @@ Component({
     fullScreen() {
       for (let i = 0; i < this.data.streamList.length; i++) {
         console.log(this.data.streamList[i])
-        let params = {
-          userID: this.data.streamList[i].userID,
-          streamType: this.data.streamList[i].streamType,
-          direction: 0
-        }
-        let params1 = {
-          userID: this.data.streamList[i].userID,
-          streamType: this.data.streamList[i].streamType,
-          orientation: 'horizontal'
+        if(this.data.streamList[i].userID=="0"||this.data.streamList[i].userID=="share-userId"){
+          let params = {
+            userID: this.data.streamList[i].userID,
+            streamType: this.data.streamList[i].streamType,
+            direction: 0
+          }
+          let params1 = {
+            userID: this.data.streamList[i].userID,
+            streamType: this.data.streamList[i].streamType,
+            orientation: 'horizontal'
+          }
+          this.enterFullscreen(params);
+          this.setRemoteOrientation(params1)
         }
-        this.enterFullscreen(params);
-        this.setRemoteOrientation(params1)
       }
     },
-    exitFullScreen(){
+    exitFullScreen() {
       for (let i = 0; i < this.data.streamList.length; i++) {
         console.log(this.data.streamList[i])
         let params = {

pages/Identity/Identity.js

@@ -1,6 +1,6 @@
 const app = require('../../utils/util.js');
-import WxValidate from '../../utils/WxValidate';
 const tools = require('../../utils/tools.js');
+import WxValidate from '../../utils/WxValidate';
 Page({
   data: {
     isRz: 0,
@@ -34,7 +34,7 @@ Page({
         if (res.data.code == 0) {
           wx.showModal({
             showCancel: false,
-            content: res.data.msg,
+            content: "提交成功啦",
             success(res) {
               if (res.confirm) {
                 wx.switchTab({
@@ -43,12 +43,13 @@ Page({
               }
             }
           })
-        } else {
-          wx.showModal({
-            showCancel: false,
-            content: res.data.msg
-          })
-        }
+        } 
+        // else {
+        //   wx.showModal({
+        //     showCancel: false,
+        //     content: res.data.msg
+        //   })
+        // }
       }
     })
   },
@@ -58,9 +59,7 @@ Page({
       mask: true,
       title: '加载中',
     })
-    // let _this = this;
     if (this.data.isRz == 0) {
-      // wx.hideLoading()
       const params = e.detail.value
       if (!this.WxValidate.checkForm(params)) {
         const error = this.WxValidate.errorList[0]
@@ -79,7 +78,7 @@ Page({
     }
   },
   // 如果有就把信息回显出来
-  getXx(sessionKey) {
+  getInformation(sessionKey) {
     // let _this = this;
     wx.request({
       url: app.globalData.publicUrl + '/wx/student/selStudentSessionKeyEcho',
@@ -97,18 +96,14 @@ Page({
               card: res.data.data.studentCard,
               isInput3: true
             })
-          } else {
-            console.log("我没认证，需要认证")
           }
-        } else {
-          console.log("报错额")
         }
       }
     })
   },
   async onLoad() {
     const sessionKey = await tools.checkSessionAndLogin();
-    this.getXx(sessionKey);
+    this.getInformation(sessionKey);
     this.initValidate();
   },
    // 验证字段的规则

pages/InteractiveQA/InteractiveQA.js

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

pages/InteractiveQA/InteractiveQA.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText":"互动答疑"
+}

pages/InteractiveQA/InteractiveQA.wxml

@@ -0,0 +1,14 @@
+<view>
+	<view class="block" bindtap="toPyip">
+		<image src="../../images/ic1.png" class="img1"></image>
+    <view>随手拍</view>
+	</view>
+  	<view class="block"  bindtap="toWyiw">
+		<image src="../../images/ic2.png" class="img2"></image>
+    <view>随时问</view>
+	</view>
+  	<view class="block" bindtap="toXyix">
+		<image src="../../images/ic3.png" class="img3"></image>
+    <view>随便学</view>
+	</view>
+</view>

pages/InteractiveQA/InteractiveQA.wxss

@@ -0,0 +1,30 @@
+/* pages/InteractiveQA/InteractiveQA.wxss */
+page {
+  background-color: #f2f2f2;
+}
+.block{
+  width: 650rpx;
+  height: 260rpx;
+  background-color: #fff;
+  border-radius: 20rpx;
+  margin-top: 40rpx;
+  margin-left: 50rpx;
+  display: flex;
+  justify-content:center;
+  align-items:center;
+}
+.img1{
+  width: 163rpx;
+  height:110rpx;
+  margin-right: 50rpx;
+}
+.img2{
+  width: 152rpx;
+  height:132rpx;
+  margin-right: 50rpx;
+}
+.img3{
+  width: 156rpx;
+  height:138rpx;
+  margin-right: 50rpx;
+}

pages/agoClass/agoClass.js

@@ -4,7 +4,7 @@ Page({
   data: {
     dataArr: []
   },
-  getjj(sessionKey) {
+  getList(sessionKey) {
     wx.request({
       url: app.globalData.publicUrl + '/wx/student/selClasToo',
       method: "post",
@@ -21,6 +21,6 @@ Page({
   },
   async onLoad() {
     const sessionKey = await tools.checkSessionAndLogin();
-    this.getjj(sessionKey);
+    this.getList(sessionKey);
   }
 })

pages/agoClass/agoClass.wxml

@@ -4,6 +4,7 @@
 		<view class="sctext">
 			<view class="t1">{{item.clasName}}</view>
 			<view class="t2">主办：{{item.remark}}</view>
+			<view class="t2">承办：{{item.organizer}}</view>
 			<view class="t2">开班时间：{{item.beginDate}} 至 {{item.endDate}}</view>
 		</view>
 	</view>

pages/answerAfterclass/answerAfterclass.js

@@ -54,7 +54,6 @@ Page({
    * 单选事件
    */
   radioChange: function (e) {
-    console.log('checkbox发生change事件，携带value值为：', e.detail.value)
     let json = {};
     json.currentAnswer = e.detail.value;
     json.id = e.currentTarget.dataset.idx;
@@ -64,8 +63,6 @@ Page({
     for (let i = 0, len = items.length; i < len; ++i) {
       items[i].checked = items[i].value === e.detail.value
     }
-    console.log( this.data.chooseValue,"尅额么");
-    console.log(this.data.questionList);
     this.setData({
       questionList: this.data.questionList
     })
@@ -78,7 +75,6 @@ Page({
    * 多选事件
    */
   checkboxChange: function (e) {
-    console.log('checkbox发生change事件，携带value值为：', e.detail.value)
     let json = {};
     let aa = e.detail.value.join("||")
     json.currentAnswer = aa;
@@ -99,20 +95,14 @@ Page({
     this.setData({
       questionList: this.data.questionList
     })
-    console.log(this.data.questionList, "7878787878");
-
     wx.setStorageSync('questionList' + wx.getStorageSync('answersId'), this.data.questionList);
     wx.setStorageSync('titleINDEX' + wx.getStorageSync('answersId'), this.data.index);
     wx.setStorageSync('chooseValue' + wx.getStorageSync('answersId'), this.data.chooseValue);
-
-
-
   },
   /*
    * 解答事件
    */
   bindTextAreaBlur(e) {
-    console.log(e.detail.value);
     let json = {};
     json.currentAnswer = e.detail.value;
     json.id = e.currentTarget.dataset.idx;
@@ -139,7 +129,6 @@ Page({
       })
       wx.setStorageSync('titleINDEX' + wx.getStorageSync('answersId'), this.data.index);
     } else {
-      console.log(this.data.chooseValue);
       if (wx.getStorageSync('chooseValue' + this.data.answersId)) {
         this.setData({
           chooseValue: wx.getStorageSync('chooseValue' + this.data.answersId)
@@ -153,116 +142,9 @@ Page({
       index: this.data.index - 1
     })
     wx.setStorageSync('titleINDEX' + wx.getStorageSync('answersId'), this.data.index);
-    console.log(this.data.chooseValue, "88888888888888888888888888");
-    console.log(this.data.chooseValue[this.data.index]);
-
-    //this.data.chooseValue[this.data.index].currentAnswer
-
   },
-  // onLoad: function (options) {
-  //   let a = [{
-  //       "QuestType": "3",
-  //       "QuestStem": "子类从父类那里继承什么方法和状态？",
-  //       "QuestAnswer": "",
-  //       "QuestChoice": "",
-  //       "Id": 39
-  //     },
-  //     {
-  //       "QuestType": "0",
-  //       "QuestStem": "MyObject 的什么方法会对if表达式的正确性产生影响\n     List l = new LinkedList();\n     l.add(new MyObject(\"A\"));\n    if(l.contains(new MyObject(\"A\"))){}",
-  //       "QuestAnswer": "equals ()",
-  //       "QuestChoice": "toString()||equals ()||hashCode()||clone()",
-  //       "Id": 36
-  //     },
-  //     {
-  //       "QuestType": "1",
-  //       "QuestStem": "MyObject 的什么方法会对if表达式的正确性产生影响（多选）   Map m = new HashMap;    m.add(new MyObject(\"A\"));    if(m.contains(new MyObject(\"A\"))){}",
-  //       "QuestAnswer": "equals ()||\nhashCode()||",
-  //       "QuestChoice": "toString()||\nequals ()||\nhashCode()||\nclone()||",
-  //       "Id": 38
-  //     },
-  //     {
-  //       "QuestType": "2",
-  //       "QuestStem": "1+1=2",
-  //       "QuestAnswer": "是",
-  //       "QuestChoice": "是||否",
-  //       "Id": 42
-  //     },
-
-  //   ];
-  //   let jsonArr = a.map(item => {
-  //     let json = {};
-  //     json.QuestType = item.QuestType;
-  //     json.id = item.Id;
-  //     json.QuestAnswer = item.QuestAnswer;
-  //     json.QuestStem = item.QuestStem;
-  //     if (item.QuestChoice) {
-  //       let arr = item.QuestChoice.split('||');
-  //       json.QuestChoice = arr;
-  //     }
-  //     return json;
-  //   })
-  //   this.setData({
-  //     questionList: jsonArr
-  //   })
-
-  // }
-  // onShow: function () {
-  //   console.log("show0000000000000000000000000000000000000000000000000000000000000000000000");
-  //   console.log(wx.getStorageSync('answersId'),"onshow  的 answeid");
-  //   // console.log(wx.getStorageSync('questionList'+((wx.getStorageSync('answersId'))),"78978978979877777");
-  //   if (wx.getStorageSync('questionList'+wx.getStorageSync('answersId'))) {
-  //     console.log("缓村了锕");
-  //     const questionList = wx.getStorageSync('questionList'+wx.getStorageSync('answersId'));
-  //     this.setData({
-  //       questionList: questionList,
-  //       index: wx.getStorageSync('titleINDEX'+wx.getStorageSync('answersId')),
-  //       answersId: wx.getStorageSync('answersId'+wx.getStorageSync('answersId')),
-  //       chooseValue:wx.getStorageSync('chooseValue'+wx.getStorageSync('answersId')),
-  //     })
-  //     console.log(this.data.questionList,"show 缓存的数据");
-  //   }else{
-  //     this.allShi(this.data.id, this.data.paperId, this.data.sessionKey);
-  //     console.log(this.data.questionList,"show 没有缓存");
-  //   }
-  // },
   async onLoad(options) {
-    // //const sessionKey = await tools.checkSessionAndLogin();
-    // console.log("onload..................................");
-    // wx.setStorageSync('answersId', options.answersId);
-    // console.log(options.answersId,"传值的缓冲answersId");
-    // console.log(wx.getStorageSync('answersId'),"1111111111111111111");
-
-    // const sessionKey = 'yoa0rZTt2bAiTVDsiRjysw==';
-    // this.setData({
-    //   sessionKey: sessionKey,
-    //   paperId:options.paperId,
-    //   answersId:options.answersId,
-    //   id:options.id,
-    // })
-    // console.log(wx.getStorageSync('answersId'),"onload中  的 answeid");
-
-    // //....................  
-    // console.log(wx.getStorageSync('questionList'+wx.getStorageSync('answersId')),"111111111111111111111");
-    // if (wx.getStorageSync('questionList'+wx.getStorageSync('answersId'))) {
-    //   this.setData({
-    //     questionList: wx.getStorageSync('questionList'+wx.getStorageSync('answersId')),
-    //     index: wx.getStorageSync('titleINDEX'+wx.getStorageSync('answersId')),
-    //     answersId: wx.getStorageSync('answersId'+wx.getStorageSync('answersId')),
-    //     chooseValue:wx.getStorageSync('chooseValue'+wx.getStorageSync('answersId')),
-    //   })
-    //   console.log("onload  有缓存");
-    //   console.log(this.data.questionList,"onload  有缓存的数据");
-    // } else {
-    //   console.log("onload  没有缓存");
-
-    //   this.allShi(options.id, options.paperId, sessionKey);
-    // }
-    // //....................
-
     const sessionKey = await tools.checkSessionAndLogin();
-    //const sessionKey = 'BqQROCKCxn7R2NXdQLud9Q==';
-    console.log("onloading.....................");
     wx.setStorageSync('answersId', options.answersId);
     this.setData({
       sessionKey: sessionKey,
@@ -270,32 +152,20 @@ Page({
       answersId: options.answersId,
       id: options.id,
     })
-    console.log(options.answersId, "00000000000000000000000000");
-    console.log(wx.getStorageSync('answersId'), "1111111111111");
     if (wx.getStorageSync('questionList' + wx.getStorageSync('answersId'))) {
-      console.log("缓村了锕");
       const questionList = wx.getStorageSync('questionList' + wx.getStorageSync('answersId'));
-      const titleINDEX  = wx.getStorageSync('titleINDEX' + wx.getStorageSync('answersId'));
-      const chooseValue  = wx.getStorageSync('chooseValue' + wx.getStorageSync('answersId'));
-      console.log(titleINDEX,"打印下看看");
-      console.log(chooseValue,"choosevalue");
+      const titleINDEX = wx.getStorageSync('titleINDEX' + wx.getStorageSync('answersId'));
+      const chooseValue = wx.getStorageSync('chooseValue' + wx.getStorageSync('answersId'));
       this.setData({
         questionList: questionList,
         answersId: wx.getStorageSync('answersId'),
-        chooseValue:chooseValue,
+        chooseValue: chooseValue,
         index: titleINDEX
       })
-      
-      console.log(this.data.questionList, "show 缓存的数据");
-      console.log(this.data.index, "indexindex");
     } else {
-      console.log("无缓存");
       this.allShi(options.id, options.paperId, sessionKey);
     }
-
-
   },
-
   allShi(id, paperId, sessionKey) {
     wx.request({
       url: app.globalData.publicUrl + '/wx/paper/detail',
@@ -352,19 +222,16 @@ Page({
 
           return json;
         })
-        console.log(jsonArr);
-        
         this.setData({
           questionList: jsonArr
         })
-        wx.setStorageSync('titleINDEX' + wx.getStorageSync('answersId'),0);
-        wx.setStorageSync('chooseValue' + wx.getStorageSync('answersId'),[]),
-        wx.setStorageSync('questionList' + wx.getStorageSync('answersId'), this.data.questionList);
+        wx.setStorageSync('titleINDEX' + wx.getStorageSync('answersId'), 0);
+        wx.setStorageSync('chooseValue' + wx.getStorageSync('answersId'), []),
+          wx.setStorageSync('questionList' + wx.getStorageSync('answersId'), this.data.questionList);
       }
     })
   },
   submitAll(currentAnswerTemp) {
-    console.log();
     wx.showLoading({
       mask: true,
       title: '加载中',
@@ -389,17 +256,18 @@ Page({
               })
             }
           })
-        } else {
-          wx.showModal({
-            showCancel: false,
-            content: res.data.msg,
-            success() {
-              wx.navigateBack({
-                delta: 1
-              })
-            }
-          })
-        }
+        } 
+        // else {
+        //   wx.showModal({
+        //     showCancel: false,
+        //     content: res.data.msg,
+        //     success() {
+        //       wx.navigateBack({
+        //         delta: 1
+        //       })
+        //     }
+        //   })
+        // }
       }
     })
   }

pages/answerAfterclasses/answerAfterclasses.js

@@ -4,46 +4,7 @@ Page({
   data: {
     index: 0, // 题目序列
     chooseValue: [], // 选择的答案序列
-    questionList: [
-      // {
-      //   id: 10,
-      //   "QuestStem": "以下属于传统协同办公应用开发的典型问题的是？",
-      //   'QuestChoice': [{
-      //       name: 'a',
-      //       value: 'aaaaaaa',
-      //       checked: false
-      //     },
-      //     {
-      //       name: 'aa',
-      //       value: 'sdsdsd',
-      //       checked: false
-      //     },
-      //     {
-      //       name: 'a3',
-      //       value: 'ewewewe',
-      //       checked: false
-      //     },
-      //   ],
-      //   "QuestType": 1,
-      //   "checked": false
-      // },
-      // {
-      //   id: 12,
-      //   "QuestStem": "企业微信建立开放办公应用生态的主要策略是000？",
-      //   "QuestChoice": ['A', 'B'],
-      //   "QuestType": 2,
-      //   "scores": 10,
-      //   "checked": false
-      // },
-
-      // {
-      //   id: 123,
-      //   "QuestStem": "企业微信建立开放办公应用生态的主要策略是？",
-      //   "QuestType": 3,
-      //   "scores": 10,
-      //   "checked": false
-      // },
-    ],
+    questionList: [],
     totalScore: 0,
     id: '', //考试主键id(可取list接口中id)
     paperId: '', //试卷id(可取list接口中paperId)
@@ -54,12 +15,10 @@ Page({
    * 单选事件
    */
   radioChange: function (e) {
-    console.log('checkbox发生change事件，携带value值为：', e.detail.value)
     let json = {};
     json.currentAnswer = e.detail.value;
     json.id = e.currentTarget.dataset.idx;
     json.questType = e.currentTarget.dataset.questtypes;
-    console.log("题目", this.data.questionList)
     this.data.chooseValue[this.data.index] = json;
     this.data.questionList[this.data.index].checked = e.detail.value;
 
@@ -71,8 +30,8 @@ Page({
     wx.setStorageSync('titleINDEX' + wx.getStorageSync('answersId'), this.data.index);
     wx.setStorageSync('chooseValue' + wx.getStorageSync('answersId'), this.data.chooseValue);
 
-  }, radioChange: function (e) {
-    console.log('checkbox发生change事件，携带value值为：', e.detail.value)
+  },
+  radioChange: function (e) {
     let json = {};
     json.currentAnswer = e.detail.value;
     json.id = e.currentTarget.dataset.idx;
@@ -82,21 +41,17 @@ Page({
     for (let i = 0, len = items.length; i < len; ++i) {
       items[i].checked = items[i].value === e.detail.value
     }
-    console.log( this.data.chooseValue,"尅额么");
-    console.log(this.data.questionList);
     this.setData({
       questionList: this.data.questionList
     })
     wx.setStorageSync('questionList' + wx.getStorageSync('answersId'), this.data.questionList);
     wx.setStorageSync('titleINDEX' + wx.getStorageSync('answersId'), this.data.index);
     wx.setStorageSync('chooseValue' + wx.getStorageSync('answersId'), this.data.chooseValue);
-
   },
   /*
    * 多选事件
    */
   checkboxChange: function (e) {
-    console.log('checkbox发生change事件，携带value值为：', e.detail.value)
     let json = {};
     let aa = e.detail.value.join("||")
     json.currentAnswer = aa;
@@ -117,20 +72,14 @@ Page({
     this.setData({
       questionList: this.data.questionList
     })
-    console.log(this.data.questionList, "7878787878");
-
     wx.setStorageSync('questionList' + wx.getStorageSync('answersId'), this.data.questionList);
     wx.setStorageSync('titleINDEX' + wx.getStorageSync('answersId'), this.data.index);
     wx.setStorageSync('chooseValue' + wx.getStorageSync('answersId'), this.data.chooseValue);
-
-
-
   },
   /*
    * 解答事件
    */
   bindTextAreaBlur(e) {
-    console.log(e.detail.value);
     let json = {};
     json.currentAnswer = e.detail.value;
     json.id = e.currentTarget.dataset.idx;
@@ -157,7 +106,6 @@ Page({
       })
       wx.setStorageSync('titleINDEX' + wx.getStorageSync('answersId'), this.data.index);
     } else {
-      console.log(this.data.chooseValue);
       if (wx.getStorageSync('chooseValue' + this.data.answersId)) {
         this.setData({
           chooseValue: wx.getStorageSync('chooseValue' + this.data.answersId)
@@ -171,116 +119,22 @@ Page({
       index: this.data.index - 1
     })
     wx.setStorageSync('titleINDEX' + wx.getStorageSync('answersId'), this.data.index);
-    console.log(this.data.chooseValue, "88888888888888888888888888");
-    console.log(this.data.chooseValue[this.data.index]);
-
-    //this.data.chooseValue[this.data.index].currentAnswer
-
   },
-  // onLoad: function (options) {
-  //   let a = [{
-  //       "QuestType": "3",
-  //       "QuestStem": "子类从父类那里继承什么方法和状态？",
-  //       "QuestAnswer": "",
-  //       "QuestChoice": "",
-  //       "Id": 39
-  //     },
-  //     {
-  //       "QuestType": "0",
-  //       "QuestStem": "MyObject 的什么方法会对if表达式的正确性产生影响\n     List l = new LinkedList();\n     l.add(new MyObject(\"A\"));\n    if(l.contains(new MyObject(\"A\"))){}",
-  //       "QuestAnswer": "equals ()",
-  //       "QuestChoice": "toString()||equals ()||hashCode()||clone()",
-  //       "Id": 36
-  //     },
-  //     {
-  //       "QuestType": "1",
-  //       "QuestStem": "MyObject 的什么方法会对if表达式的正确性产生影响（多选）   Map m = new HashMap;    m.add(new MyObject(\"A\"));    if(m.contains(new MyObject(\"A\"))){}",
-  //       "QuestAnswer": "equals ()||\nhashCode()||",
-  //       "QuestChoice": "toString()||\nequals ()||\nhashCode()||\nclone()||",
-  //       "Id": 38
-  //     },
-  //     {
-  //       "QuestType": "2",
-  //       "QuestStem": "1+1=2",
-  //       "QuestAnswer": "是",
-  //       "QuestChoice": "是||否",
-  //       "Id": 42
-  //     },
-
-  //   ];
-  //   let jsonArr = a.map(item => {
-  //     let json = {};
-  //     json.QuestType = item.QuestType;
-  //     json.id = item.Id;
-  //     json.QuestAnswer = item.QuestAnswer;
-  //     json.QuestStem = item.QuestStem;
-  //     if (item.QuestChoice) {
-  //       let arr = item.QuestChoice.split('||');
-  //       json.QuestChoice = arr;
-  //     }
-  //     return json;
-  //   })
-  //   this.setData({
-  //     questionList: jsonArr
-  //   })
-
-  // }
   onShow: function () {
-    console.log("show0000000000000000000000000000000000000000000000000000000000000000000000");
-    console.log(wx.getStorageSync('answersId'),"onshow  的 answeid");
-    // console.log(wx.getStorageSync('questionList'+((wx.getStorageSync('answersId'))),"78978978979877777");
-    if (wx.getStorageSync('questionList'+wx.getStorageSync('answersId'))) {
-      console.log("缓村了锕");
-      const questionList = wx.getStorageSync('questionList'+wx.getStorageSync('answersId'));
+    if (wx.getStorageSync('questionList' + wx.getStorageSync('answersId'))) {
+      const questionList = wx.getStorageSync('questionList' + wx.getStorageSync('answersId'));
       this.setData({
         questionList: questionList,
-        index: wx.getStorageSync('titleINDEX'+wx.getStorageSync('answersId')),
-        answersId: wx.getStorageSync('answersId'+wx.getStorageSync('answersId')),
-        chooseValue:wx.getStorageSync('chooseValue'+wx.getStorageSync('answersId')),
+        index: wx.getStorageSync('titleINDEX' + wx.getStorageSync('answersId')),
+        answersId: wx.getStorageSync('answersId' + wx.getStorageSync('answersId')),
+        chooseValue: wx.getStorageSync('chooseValue' + wx.getStorageSync('answersId')),
       })
-      console.log(this.data.questionList,"show 缓存的数据");
-    }else{
+    } else {
       this.allShi(this.data.id, this.data.paperId, this.data.sessionKey);
-      console.log(this.data.questionList,"show 没有缓存");
     }
   },
   async onLoad(options) {
-    // //const sessionKey = await tools.checkSessionAndLogin();
-    // console.log("onload..................................");
-    // wx.setStorageSync('answersId', options.answersId);
-    // console.log(options.answersId,"传值的缓冲answersId");
-    // console.log(wx.getStorageSync('answersId'),"1111111111111111111");
-
-    // const sessionKey = 'yoa0rZTt2bAiTVDsiRjysw==';
-    // this.setData({
-    //   sessionKey: sessionKey,
-    //   paperId:options.paperId,
-    //   answersId:options.answersId,
-    //   id:options.id,
-    // })
-    // console.log(wx.getStorageSync('answersId'),"onload中  的 answeid");
-
-    // //....................  
-    // console.log(wx.getStorageSync('questionList'+wx.getStorageSync('answersId')),"111111111111111111111");
-    // if (wx.getStorageSync('questionList'+wx.getStorageSync('answersId'))) {
-    //   this.setData({
-    //     questionList: wx.getStorageSync('questionList'+wx.getStorageSync('answersId')),
-    //     index: wx.getStorageSync('titleINDEX'+wx.getStorageSync('answersId')),
-    //     answersId: wx.getStorageSync('answersId'+wx.getStorageSync('answersId')),
-    //     chooseValue:wx.getStorageSync('chooseValue'+wx.getStorageSync('answersId')),
-    //   })
-    //   console.log("onload  有缓存");
-    //   console.log(this.data.questionList,"onload  有缓存的数据");
-    // } else {
-    //   console.log("onload  没有缓存");
-
-    //   this.allShi(options.id, options.paperId, sessionKey);
-    // }
-    // //....................
-
     const sessionKey = await tools.checkSessionAndLogin();
-    //const sessionKey = 'BqQROCKCxn7R2NXdQLud9Q==';
-    console.log("onloading.....................");
     wx.setStorageSync('answersId', options.answersId);
     this.setData({
       sessionKey: sessionKey,
@@ -288,32 +142,20 @@ Page({
       answersId: options.answersId,
       id: options.id,
     })
-    console.log(options.answersId, "00000000000000000000000000");
-    console.log(wx.getStorageSync('answersId'), "1111111111111");
     if (wx.getStorageSync('questionList' + wx.getStorageSync('answersId'))) {
-      console.log("缓村了锕");
       const questionList = wx.getStorageSync('questionList' + wx.getStorageSync('answersId'));
-      const titleINDEX  = wx.getStorageSync('titleINDEX' + wx.getStorageSync('answersId'));
-      const chooseValue  = wx.getStorageSync('chooseValue' + wx.getStorageSync('answersId'));
-      console.log(titleINDEX,"打印下看看");
-      console.log(chooseValue,"choosevalue");
+      const titleINDEX = wx.getStorageSync('titleINDEX' + wx.getStorageSync('answersId'));
+      const chooseValue = wx.getStorageSync('chooseValue' + wx.getStorageSync('answersId'));
       this.setData({
         questionList: questionList,
         answersId: wx.getStorageSync('answersId'),
-        chooseValue:chooseValue,
+        chooseValue: chooseValue,
         index: titleINDEX
       })
-      
-      console.log(this.data.questionList, "show 缓存的数据");
-      console.log(this.data.index, "indexindex");
     } else {
-      console.log("无缓存");
       this.allShi(options.id, options.paperId, sessionKey);
     }
-
-
   },
-
   allShi(id, paperId, sessionKey) {
     wx.request({
       url: app.globalData.publicUrl + '/wx/paper/detail',
@@ -372,14 +214,13 @@ Page({
         this.setData({
           questionList: jsonArr
         })
-        wx.setStorageSync('titleINDEX' + wx.getStorageSync('answersId'),0);
-        wx.setStorageSync('chooseValue' + wx.getStorageSync('answersId'),[]),
-        wx.setStorageSync('questionList' + wx.getStorageSync('answersId'), this.data.questionList);
+        wx.setStorageSync('titleINDEX' + wx.getStorageSync('answersId'), 0);
+        wx.setStorageSync('chooseValue' + wx.getStorageSync('answersId'), []),
+          wx.setStorageSync('questionList' + wx.getStorageSync('answersId'), this.data.questionList);
       }
     })
   },
   submitAll(currentAnswerTemp) {
-    console.log();
     wx.request({
       url: app.globalData.publicUrl + '/wx/paper/commit',
       method: "post",
@@ -389,20 +230,7 @@ Page({
         answersId: wx.getStorageSync('answersId')
       },
       success: (res) => {
-        console.log(res);
-        // if (res.data.msg == '请勿重复提交') {
-        //   wx.showModal({
-        //     showCancel: false,
-        //     content: '当前老师批阅中,' + res.data.msg,
-        //     success(res) {}
-        //   })
-        // } else {
         if (res.data.code == 0) {
-          console.log(res, "为我么我们微妙"); // 提交答案是后
-          // this.setData({
-          //   answersId: res.data.answersId
-          // })
-          // this.allShi(id, paperId, sessionKey);
           wx.showModal({
             showCancel: false,
             content: '恭喜您,提交答案成功，请耐心等待老师判卷',
@@ -412,23 +240,19 @@ Page({
               })
             }
           })
-          // wx.switchTab({
-          //   url: '/pages/testAnswer/testAnswer',
-          // })
-
-        } else {
-          wx.showModal({
-            showCancel: false,
-            content: res.data.msg,
-            success() {
-              wx.navigateBack({
-                delta: 1
-              })
-            }
-          })
         }
+        //  else {
+        //   wx.showModal({
+        //     showCancel: false,
+        //     content: res.data.msg,
+        //     success() {
+        //       wx.navigateBack({
+        //         delta: 1
+        //       })
+        //     }
+        //   })
+        // }
       }
     })
   }
-
 })

pages/dbDetails/dbDetails.js

@@ -34,18 +34,15 @@ Page({
         showCancel: false,
         content: "您还在吗,请点击确定继续观看视频哦",
         success(res) {
-          console.log(res, "22222222")
           if (res.confirm) {
             _this.data.videoContext.play()
           }
         }
       })
     }
-    console.log(_this.data.intervalTime, "我是正在加的数")
   },
   // 点击开始播放视频
   bindplay() {
-    console.log("我点击开始了")
     this.setData({
       videoContext: wx.createVideoContext('myVideo')
     })
@@ -58,7 +55,6 @@ Page({
   // 视频暂停
   bindpause() {
     clearInterval(this.data.intervalCtx)
-    console.log(this.data.intervalTime, "我是暂停时加的所有数")
   },
   // 得到录播列表
   getdbArr(sessionKey) {
@@ -71,12 +67,11 @@ Page({
         courseId: _this.data.id
       },
       success: (e) => {
-        console.log(e, "2222222222")
         this.setData({
           url: e.data.url,
           show: false,
-          title: e.data.course.courseInfo,
-          message: e.data.course.courseName,
+          title: e.data.course.courseName,
+          message: e.data.course.courseInfo,
           playTimes: e.data.course.playTimes
         })
       }
@@ -93,7 +88,6 @@ Page({
         courseId: _this.data.id
       },
       success: (e) => {
-        console.log(e, "22222222222222")
         if (e.data.studyLog.isDone == 1) {
           _this.setData({
             studyLog: e.data.studyLog
@@ -153,7 +147,7 @@ Page({
         studyLog: _this.data.studyLog
       },
       success: (e) => {
-        console.log(e, "我修改进度成功了aaaa")
+        console.log(e, "我修改进度成功了")
       }
     })
   },
@@ -161,7 +155,6 @@ Page({
     let _this = this;
     clearInterval(_this.data.intervalCtx)
     if (_this.data.startPlayTime < _this.data.studyLog.studyTime) {
-      console.log(_this.data.studyLog)
       wx.request({
         method: "post",
         url: app.globalData.publicUrl + '/wx/course/updateStudyLog',

pages/dbVideo/dbVideo.js

@@ -18,7 +18,6 @@ Page({
       method: "POST",
       url: app.globalData.publicUrl + '/wx/course/queryById?id=' + this.data.id,
       success: (e) => {
-        console.log(e)
         this.setData({
           url: e.data.url,
           show: false,

pages/demandCourses/demandCourses.js

@@ -13,7 +13,6 @@ Page({
     })
   },
   getArr(sessionKey) {
-    // let _this = this;
     wx.request({
       url: app.globalData.publicUrl + '/wx/course/selectRecordBySessionKey',
       method: "post",
@@ -21,9 +20,7 @@ Page({
         sessionKey: sessionKey
       },
       success: (res) => {
-        console.log(res, "lb")
         if (res.data.code == 0) {
-          console.log(res)
           this.setData({
             lbArr: res.data.list
           })
@@ -70,7 +67,6 @@ Page({
     })
   },
   handler(value) {
-    //换算为秒 进制1000
     const second = Math.floor(value / 1000); //判断是否够1秒
     if (second < 1) {
       return "0秒";

pages/demandCourses/demandCourses.wxml

@@ -1,19 +1,4 @@
 <view class="container">
-	<!-- <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">{{sfmArr[idx].courseTime}}</view>
-				<view style="color:#848585;font-size:22rpx;float:right;margin-right:20rpx">{{item.playTimes}}人看过</view>
-			</view>
-		</view>
-	</view>
-	<view wx:if="{{showNull}}">
-		<image src='/images/nodata.png' mode='aspectFill' class="nodata"></image>
-		<view class="nodata_text">暂无数据</view>
-	</view> -->
 	<view class="class_box" wx:for="{{lbArr}}" wx:for-index="idx" wx:for-item="item">
 		<view bindtap="goIn" data-item="{{item}}">
 			<image src="{{item.courseImg}}" mode='aspectFill' class="scimg"></image>

pages/demandCourses/demandCourses.wxss

@@ -1,75 +1,9 @@
 page {
   background-color: #f2f2f2;
 }
-
-/* .video_box {
-  display: flex;
-  width: 750rpx;
-  flex-wrap: wrap;
-}
-
-.video {
-  width: 340rpx;
-  height: 286rpx;
-  margin-left: 20rpx;
-  position: relative;
-  border-radius: 20rpx;
-  margin-top: 20rpx;
-}
-
-.spbj {
-  width: 100%;
-  height: 286rpx;
-  border-radius: 20rpx;
-  position: relative;
-}
-
-.grayblock {
-  width: 100%;
-  height: 80rpx;
-  background-color: rgba(255, 255, 255, 0.7);
-  position: absolute;
-  bottom: 0rpx;
-  border-radius: 0 0 20rpx 20rpx;
-  text-indent: 10rpx;
-}
-
-.show_text {
-  font-size: 22rpx;
-  margin-top: 10rpx;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.qb {
-  width: 23rpx;
-  height: 25rpx;
-  margin-left: 10rpx;
-  margin-top: 5rpx;
-  float: left;
-}
-
-.nodata {
-  position: absolute;
-  top: 285rpx;
-  left: 205rpx;
-  width: 340rpx;
-  height: 262rpx;
-}
-
-.nodata_text {
-  position: absolute;
-  top: 550rpx;
-  left: 310rpx;
-  font-size: 30rpx;
-  color: #666666;
-} */
 .class_box {
   width: 710rpx;
   margin-left: 20rpx;
-  height: 220rpx;
-  /* border: 1px solid red; */
   margin-top: 20rpx;
   background-color: #fff;
   border-radius: 5rpx;
@@ -80,16 +14,16 @@ page {
   height: 141rpx;
   float: left;
   margin-top: 40rpx;
+  padding-bottom: 20rpx;
   margin-left: 20rpx;
   border-radius: 5rpx;
 }
 .sctext {
   float: right;
-  height: 141rpx;
   width: 510rpx;
   margin-top: 20rpx;
   font-size: 25rpx;
-  /* border: 1px solid red;   */
+  padding-bottom: 20rpx;
 }
 .t1 {
   color: #eb3f33;

pages/evaluationCourse/evaluationCourse.js

@@ -211,7 +211,6 @@ Page({
     });
   },
   radioChange(e) {
-    console.log(e);
     const items = this.data.questionList[e.currentTarget.dataset.index].QuestChoice
     for (let i = 0, len = items.length; i < len; ++i) {
       items[i].checked = items[i].value === e.detail.value
@@ -226,7 +225,6 @@ Page({
     })
     wx.setStorageSync('questionList' + wx.getStorageSync('answersId'), this.data.questionList);
     wx.setStorageSync('chooseValue' + wx.getStorageSync('answersId'), this.data.chooseValue);
-    console.log(this.data.questionList);
   },
   checkboxChange(e) {
     const items = this.data.questionList[e.currentTarget.dataset.index].QuestChoice
@@ -253,8 +251,6 @@ Page({
     wx.setStorageSync('chooseValue' + wx.getStorageSync('answersId'), this.data.chooseValue);
   },
   bindTextAreaBlur(e) {
-    console.log(e, "hhhhh");
-    console.log(e.detail.value);
     let json = {};
     json.currentAnswer = e.detail.value;
     json.id = e.currentTarget.dataset.idx;
@@ -278,43 +274,32 @@ Page({
     });
   },
   onClose1() {
-    console.log("11111111111111");
     this.setData({
       postshow1: false
     });
   },
   onInput(event) {
-    console.log(event, "8888888");
-
-    console.log("点击了");
     this.setData({
       currentDate: event.detail,
     });
   },
   onInput1(event) {
-    console.log("000");
     this.setData({
       currentDate1: event.detail,
     });
   },
-
   formatDate(date) {
     date = new Date(date);
     return `${date.getFullYear()-1}/${date.getMonth() + 1}/${date.getDate()}`;
   },
 
   share1(e) {
-    console.log(e);
-    console.log(e.currentTarget.dataset.index);
-    console.log(e.currentTarget.dataset.names, "8520852085208520");
-    console.log(this.data.postshow[e.currentTarget.dataset.index]);
     this.data.postshow[e.currentTarget.dataset.index] = true;
     this.data.names[e.currentTarget.dataset.index] = e.currentTarget.dataset.names;
     this.setData({
       postshow: this.data.postshow,
       timeIndex: e.currentTarget.dataset.index
     })
-    console.log(this.data.postshow, "打印下锕啊啊啊啊锕锕锕");
   },
   share() {
     this.setData({
@@ -326,7 +311,6 @@ Page({
     return `${date.getFullYear()-1}/${date.getMonth() + 1}/${date.getDate()}`;
   },
   onConfirm(event) {
-    console.log(event, "1111111");
     let timeValue = this.timeFormat(new Date(event.detail), "yyyy-MM-dd");
     let json = {};
     json.currentAnswer = timeValue;
@@ -342,11 +326,8 @@ Page({
     });
     wx.setStorageSync('questionList' + wx.getStorageSync('answersId'), this.data.questionList);
     wx.setStorageSync('chooseValue' + wx.getStorageSync('answersId'), this.data.chooseValue);
-    console.log(this.data.chooseValue, "确定后的值锕");
-    console.log(this.data.questionList, "789789798789");
   },
   onConfirm1(event) {
-    console.log(event, "0000");
     let timeValue = this.timeFormat(new Date(event.detail), "yyyy-MM-dd");
     this.setData({
       peixunTime: timeValue,
@@ -369,46 +350,11 @@ Page({
       parameter: parameterList
     })
   },
-  // submitForm() {
-  //   //let arr1 = this.data.chooseValue.filter(d => d);
-  //   //console.log(arr1,"打印下提交");
-  //   console.log(this.data.chooseValue, "打印下提交");
-  //   let isTrue = false;
-  //   this.data.chooseValue.forEach(item => {
-  //     console.log(item, "123123");
-  //     if (item.currentAnswer) {
-  //       isTrue = true;
-
-  //     } else {
-  //       wx.showModal({
-  //         showCancel: false,
-  //         content: item.QuestStem + "不能为空",
-  //         success(res) {}
-  //       })
-  //     }
-  //   })
-  //   if (isTrue) {
-  //     console.log("提交了");
-  //     wx.request({
-  //       url: app.globalData.publicUrl + '/wx/paper/commit',
-  //       method: "post",
-  //       data: {
-  //         sessionKey: this.data.sessionKey,
-  //         currentAnswerTemp: this.data.chooseValue,
-  //         answersId: wx.getStorageSync('answersId')
-  //       },
-  //       success: (res) => {
-  //         console.log(res);
-  //       }
-  //     })
-  //   }
-  // },
   submitForm() {
     wx.showLoading({
       mask: true,
       title: '加载中',
     })
-    console.log(this.data.chooseValue, "打印下提交");
     wx.request({
       url: app.globalData.publicUrl + '/wx/paper/commit',
       method: "post",
@@ -419,17 +365,20 @@ Page({
       },
       success: (res) => {
         wx.hideLoading();
-        console.log(res);
-        if(res.data.msg == "请勿重复提交"){
+        if (res.data.code == 0) {
           wx.showModal({
             showCancel: false,
-            content: res.data.msg,
-            success(res) {}
+            content: '评价成功',
+            success() {
+              wx.navigateBack({
+                delta: 1
+              })
+            }
           })
-        }else{
+        } else {
           wx.showModal({
             showCancel: false,
-            content: '评价成功',
+            content: res.data.msg,
             success() {
               wx.navigateBack({
                 delta: 1
@@ -437,50 +386,29 @@ Page({
             }
           })
         }
+        // if (res.data.msg == "请勿重复提交") {
+        //   wx.showModal({
+        //     showCancel: false,
+        //     content: "不要重复提交哦",
+        //     success() {
+        //       wx.navigateBack({
+        //         delta: 1
+        //       })
+        //     }
+        //   })
+        // } else {
+        //   wx.showModal({
+        //     showCancel: false,
+        //     content: '评价成功',
+        //     success() {
+        //       wx.navigateBack({
+        //         delta: 1
+        //       })
+        //     }
+        //   })
+        // }
       }
     })
-    // let isTrue = false;
-    // this.data.chooseValue.forEach(item => {
-    //   console.log(item, "123123");
-    //   if (item.currentAnswer) {
-    //     isTrue = true;
-    //   } else {
-    //     wx.showModal({
-    //       showCancel: false,
-    //       content: item.QuestStem + "不能为空",
-    //       success(res) {}
-    //     })
-    //   }
-    // })
-    // if (isTrue) {
-    //   console.log("提交了");
-    //   wx.request({
-    //     url: app.globalData.publicUrl + '/wx/paper/commit',
-    //     method: "post",
-    //     data: {
-    //       sessionKey: this.data.sessionKey,
-    //       currentAnswerTemp: this.data.chooseValue,
-    //       answersId: wx.getStorageSync('answersId')
-    //     },
-    //     success: (res) => {
-    //       console.log(res);
-    //       if(res.data.msg == "请勿重复提交"){
-    //         wx.showModal({
-    //           showCancel: false,
-    //           content: res.data.msg,
-    //           success(res) {}
-    //         })
-    //       }else{
-    //         wx.navigateTo({
-    //           url: '/pages/myClass/myClass',
-    //         })
-    //       }
-        
-    //     }
-    //   })
-    // }
-
-
   },
   timeFormat(date, fmt) {
     let o = {
@@ -500,17 +428,9 @@ Page({
     return fmt;
 
   },
-  onReady: function () {},
-  async onLoad (options) {
-    //const sessionKey = 'BqQROCKCxn7R2NXdQLud9Q==';
-    console.log("onloading.....................");
-   
+  async onLoad(options) {
     const sessionKey = await tools.checkSessionAndLogin();
-    console.log(sessionKey,"对接下");
-    
     wx.setStorageSync('answersId', options.answersId);
-    console.log(options.answersId,"缓存answerid");
-    
     this.setData({
       sessionKey: sessionKey,
       paperId: options.paperId,
@@ -518,19 +438,15 @@ Page({
       id: options.id,
     })
     if (wx.getStorageSync('questionList' + wx.getStorageSync('answersId'))) {
-      console.log("缓村了锕");
       const questionList = wx.getStorageSync('questionList' + wx.getStorageSync('answersId'));
       this.setData({
         questionList: questionList,
         answersId: wx.getStorageSync('answersId' + wx.getStorageSync('answersId')),
         chooseValue: wx.getStorageSync('chooseValue' + wx.getStorageSync('answersId')),
       })
-      console.log(this.data.questionList, "show 缓存的数据");
     } else {
-      console.log("无缓存");
       this.allShi(this.data.id, this.data.paperId, this.data.sessionKey);
     }
-
   },
   allShi(id, paperId, sessionKey) {
     wx.request({
@@ -574,7 +490,6 @@ Page({
           questionList: jsonArr,
           chooseValue: chooceArr
         })
-        console.log(this.data.questionList, "00000");
         wx.setStorageSync('questionList' + wx.getStorageSync('answersId'), this.data.questionList);
         wx.setStorageSync('chooseValue' + wx.getStorageSync('answersId'), this.data.chooseValue);
       }

pages/evaluationCourseDetail/evaluationCourseDetail.js

@@ -4,44 +4,7 @@ const app = require('../../utils/util.js');
 const tools = require('../../utils/tools.js');
 Page({
   data: {
-    // 课程轮播
-    "bnrUrl": [{
-      "url": "/images/banner2.jpg",
-      "name": "二期素质教育培训",
-      "zbf": "xx委员会",
-      "starttime": "2020年6月"
-    }, {
-      "url": "/images/banner1.jpg",
-      "name": "三期素质教育培训",
-      "zbf": "xx委员会",
-      "starttime": "2020年6月"
-    }, {
-      "url": "/images/banner2.jpg",
-      "name": "四期素质教育培训",
-      "zbf": "xx委员会",
-      "starttime": "2020年6月"
-    }],
-    gridArr: [
-      // {
-      //   "num": "1",
-      //   "qusetion": "深入贯彻习近平总书记关于加大社会组织党建工作 力度的重要批示精神，坚决落实社会组织与社会组 织党组织“五个同步”，五个同步是以下哪一个？",
-      //   'daanTrue': 'Ｂ. 同培育、同孵化',
-      //   'daanFalse': 'A. 同培育、同孵化、同年检、同评估',
-      // },
-      // {
-      //   "num": "2",
-      //   "qusetion": "深入贯彻习近平总书记关于加大社会组织党建工作 力度的重要批示精神，坚决落实社会组织与社会组 织党组织“五个同步”，五个同步是以下哪一个？",
-      //   'daanTrue': 'Ｂ. 同培育、同孵化、同年检',
-      //   'daanFalse': 'A. 同培育、同孵化、同年检、同评估',
-      // },
-      // {
-      //   "num": "3",
-      //   "qusetion": "深入贯彻习近平总书记关于加大社会组织党建工作 力度的重要批示精神，坚决落实社会组织与社会组 织党组织“五个同步”，五个同步是以下哪一个？",
-      //   'daanTrue': 'Ｂ. 同培育、同孵化、同年检',
-      //   'daanFalse': 'A. 同培育、同孵化、同年检、同评估',
-      // },
-    ],
-
+    gridArr: [],
   },
   chengji(sessionKey, answersId) {
     wx.request({
@@ -53,24 +16,16 @@ Page({
       },
       success: (res) => {
         if (res.data.code == 0) {
-          console.log(res, "suoyoude");
           this.setData({
-            gridArr:res.data.list
+            gridArr: res.data.list
           })
-          console.log(this.data.gridArr);
         }
       }
     })
   },
-  onReady: function () {},
   async onLoad(options) {
-    console.log(options.answersId);
-    console.log("onload..................................");
     let answersId = options.answersId;
     const sessionKey = 'yoa0rZTt2bAiTVDsiRjysw==';
-    //const sessionKey = await tools.checkSessionAndLogin();  
     this.chengji(sessionKey, answersId);
-
-  },
-
+  }
 })

pages/evaluationCourseDetail/evaluationCourseDetail.wxml

@@ -9,15 +9,6 @@
 				<view style=" margin-right: 20rpx;">
 					{{item.questStem}} ：{{item.currentAnswer}}
 				</view>
-				<!-- <view class="daan">
-					正确答案: <view class="zhengquedaan">{{item.correctAnswer}}</view>
-				</view> -->
-				<!-- <view class="daan">
-					我的答案: <view class="wodedaan">{{item.currentAnswer}}</view>
-				</view>
-				<view class="daan">
-					分数: <view class="wodedaan">{{item.score}}</view>
-				</view> -->
 			</view>
 		</view>
 	</view>

pages/exhibitionList/exhibitionList.js

@@ -1,13 +1,8 @@
-//logs.js
-// const util = require('../../utils/util.js')
 const app = require('../../utils/util.js');
 Page({
   data: {
     active: 0,
     xcpArr: []
-  },
-  checkboxChange() {
-
   },
   goSeevideo(e) {
     let id = e.currentTarget.dataset.item.id
@@ -17,12 +12,10 @@ Page({
   },
   onChange(event) {
     let tag = event.detail.name + 1;
-    console.log(tag)
     wx.request({
       method: "POST",
       url: app.globalData.publicUrl + '/wx/course/listByCourseTag?tag=' + tag,
       success: (e) => {
-        console.log(e, "我是tab点击回来的数据")
         this.setData({
           xcpArr: e.data.list,
         })
@@ -34,14 +27,12 @@ Page({
     that.setData({
       active: Number(options.id)
     })
-    // console.log(that.data.active)
     let _active = that.data.active + 1
     wx.request({
       method: "post",
       url: app.globalData.publicUrl + '/wx/course/listByCourseTag?tag=' + _active,
       success: (e) => {
         that.data.xcpArr = [];
-        console.log(e.data.list)
         that.setData({
           xcpArr: e.data.list,
         })

pages/exhibitionList/exhibitionList.wxml

@@ -56,7 +56,6 @@
 					<view class="grayblock">
 						<view class="show_text">{{item.courseName}}</view>
 						<view class="viedoxx">
-
 							<!-- <view style="color:#e82315;font-size:25rpx;font-weight:500;float:left">精细管理</view> -->
 							<view style="color:#848585;font-size:22rpx;float:right;margin-right:20rpx">
 								<image src='/images/qb.png' mode='aspectFill' class="qb"></image>{{item.playTimes}}人看过

pages/feedBack/feedBack.js

@@ -212,12 +212,10 @@ Page({
     });
   },
   radioChange(e) {
-    console.log(e);
     const items = this.data.questionList[e.currentTarget.dataset.index].QuestChoice
     for (let i = 0, len = items.length; i < len; ++i) {
       items[i].checked = items[i].value === e.detail.value
     }
-
     let json = {};
     json.currentAnswer = e.detail.value;
     json.id = e.currentTarget.dataset.idx;
@@ -228,22 +226,6 @@ Page({
     })
     wx.setStorageSync('questionList' + wx.getStorageSync('answersId'), this.data.questionList);
     wx.setStorageSync('chooseValue' + wx.getStorageSync('answersId'), this.data.chooseValue);
-    console.log(this.data.questionList);
-    console.log(this.data.chooseValue, "0000");
-
-    // this.data.questionList[this.data.index].checked = e.detail.value;
-
-    // this.setData({
-    //   questionList: this.data.questionList
-    // })
-    // const items = this.data.items
-    // for (let i = 0, len = items.length; i < len; ++i) {
-    //   items[i].checked = items[i].value === e.detail.value
-    // }
-
-    // this.setData({
-    //   items
-    // })
   },
   checkboxChange(e) {
     const items = this.data.questionList[e.currentTarget.dataset.index].QuestChoice
@@ -270,8 +252,6 @@ Page({
     wx.setStorageSync('chooseValue' + wx.getStorageSync('answersId'), this.data.chooseValue);
   },
   bindTextAreaBlur(e) {
-    console.log(e, "hhhhh");
-    console.log(e.detail.value);
     let json = {};
     json.currentAnswer = e.detail.value;
     json.id = e.currentTarget.dataset.idx;
@@ -295,21 +275,16 @@ Page({
     });
   },
   onClose1() {
-    console.log("11111111111111");
     this.setData({
       postshow1: false
     });
   },
   onInput(event) {
-    console.log(event, "8888888");
-
-    console.log("点击了");
     this.setData({
       currentDate: event.detail,
     });
   },
   onInput1(event) {
-    console.log("000");
     this.setData({
       currentDate1: event.detail,
     });
@@ -321,21 +296,12 @@ Page({
   },
 
   share1(e) {
-    console.log(e);
-    console.log(e.currentTarget.dataset.index);
-    console.log(e.currentTarget.dataset.names, "8520852085208520");
-    console.log(this.data.postshow[e.currentTarget.dataset.index]);
     this.data.postshow[e.currentTarget.dataset.index] = true;
     this.data.names[e.currentTarget.dataset.index] = e.currentTarget.dataset.names;
     this.setData({
       postshow: this.data.postshow,
       timeIndex: e.currentTarget.dataset.index
     })
-    console.log(this.data.postshow, "打印下锕啊啊啊啊锕锕锕");
-
-    // this.setData({
-    //   postshow: true
-    // });
   },
   share() {
     this.setData({
@@ -347,7 +313,6 @@ Page({
     return `${date.getFullYear()-1}/${date.getMonth() + 1}/${date.getDate()}`;
   },
   onConfirm(event) {
-    console.log(event, "1111111");
     let timeValue = this.timeFormat(new Date(event.detail), "yyyy-MM-dd");
     let json = {};
     json.currentAnswer = timeValue;
@@ -363,13 +328,8 @@ Page({
     });
     wx.setStorageSync('questionList' + wx.getStorageSync('answersId'), this.data.questionList);
     wx.setStorageSync('chooseValue' + wx.getStorageSync('answersId'), this.data.chooseValue);
-    console.log(this.data.chooseValue, "确定后的值锕");
-    console.log(this.data.questionList, "789789798789");
-
-
   },
   onConfirm1(event) {
-    console.log(event, "0000");
     let timeValue = this.timeFormat(new Date(event.detail), "yyyy-MM-dd");
     this.setData({
       peixunTime: timeValue,
@@ -393,9 +353,6 @@ Page({
     })
   },
   submitForm() {
-    //let arr1 = this.data.chooseValue.filter(d => d);
-    //console.log(arr1,"打印下提交");
-    console.log(this.data.chooseValue, "打印下提交");
     wx.request({
       url: app.globalData.publicUrl + '/wx/paper/commit',
       method: "post",
@@ -405,7 +362,6 @@ Page({
         answersId: wx.getStorageSync('answersId')
       },
       success: (res) => {
-        console.log(res);
         if (res.data.code == 0) {
           wx.showModal({
             showCancel: false,
@@ -422,67 +378,10 @@ Page({
             content: res.data.msg
           })
         }
-        // console.log(res);
-        // if (res.data.msg == "请勿重复提交") {
-        //   wx.showModal({
-        //     showCancel: false,
-        //     content: res.data.msg,
-        //     success(res) {}
-        //   })
-        // } else {
-        //   wx.switchTab({
-        //     url: '/pages/myClass/myClass',
-        //   })
-        // }
-
       }
     })
-    // let isTrue = false;
-    // this.data.chooseValue.forEach(item => {
-    //   console.log(item, "123123");
-    //   if (item.currentAnswer) {
-    //     isTrue = true;
-
-    //   } else {
-    //     wx.showModal({
-    //       showCancel: false,
-    //       content: item.QuestStem + "不能为空",
-    //       success(res) {}
-    //     })
-    //   }
-    // })
-    // if (isTrue) {
-    //   console.log("提交了");
-    //   wx.request({
-    //     url: app.globalData.publicUrl + '/wx/paper/commit',
-    //     method: "post",
-    //     data: {
-    //       sessionKey: this.data.sessionKey,
-    //       currentAnswerTemp: this.data.chooseValue,
-    //       answersId: wx.getStorageSync('answersId')
-    //     },
-    //     success: (res) => {
-    //       console.log(res);
-    //       if(res.data.msg == "请勿重复提交"){
-    //         wx.showModal({
-    //           showCancel: false,
-    //           content: res.data.msg,
-    //           success(res) {}
-    //         })
-    //       }else{
-    //         wx.navigateTo({
-    //           url: '/pages/myClass/myClass',
-    //         })
-    //       }
-
-    //     }
-    //   })
-    // }
-
-
   },
   formSubmit(e) {
-    console.log(e.detail.value, "000000000000000");
     let arr1 = this.data.zaizhiTime.filter(d => d);
     let arr = this.data.names.filter(d => d);
     var activeSubjectsArr = [];
@@ -495,7 +394,6 @@ Page({
         }
       }
     }
-    console.log(activeSubjectsArr, "7777777");
     let count = 0;
     let data = {};
     for (let a in e.detail.value) {
@@ -507,130 +405,6 @@ Page({
     activeSubjectsArr.forEach(item => {
       Object.assign(data, item)
     })
-    console.log(data, "888888888888888888888888");
-    // Object.keys(data).forEach(function (key) {
-    //   if (!data[key]) {
-    //     wx.showModal({
-    //       showCancel: false,
-    //       content: key + "不能为空"
-    //     })
-    //     return;
-    //   }
-
-    // });
-    // if (!e.detail.value.username) {
-    //   this.setData({
-    //     nameIsTrue: true
-    //   })
-    // } else {
-    //   this.setData({
-    //     nameIsTrue: false
-    //   })
-    // }
-    // let sex = '';
-    // if (this.data.parameter[0].checked) {
-    //   sex = this.data.parameter[0].name
-    //   this.setData({
-    //     errorIsTrue: false
-    //   })
-    // } else if (this.data.parameter[1].checked) {
-    //   sex = this.data.parameter[1].name
-    //   this.setData({
-    //     errorIsTrue: false
-    //   })
-    // } else {
-    //   this.setData({
-    //     errorIsTrue: true
-    //   })
-    // }
-
-    // if (!e.detail.value.work) {
-    //   this.setData({
-    //     workIsTrue: true
-    //   })
-    // } else {
-    //   this.setData({
-    //     workIsTrue: false
-    //   })
-    // }
-
-    // if (!e.detail.value.culture) {
-    //   this.setData({
-    //     cultureIsTrue: true
-    //   })
-    // } else {
-    //   this.setData({
-    //     cultureIsTrue: false
-    //   })
-    // }
-
-    // if (!e.detail.value.graduation) {
-    //   this.setData({
-    //     graduationIsTrue: true
-    //   })
-    // } else {
-    //   this.setData({
-    //     graduationIsTrue: false
-    //   })
-    // }
-
-    // if (!e.detail.value.major) {
-    //   this.setData({
-    //     majorIsTrue: true
-    //   })
-    // } else {
-    //   this.setData({
-    //     majorIsTrue: false
-    //   })
-    // }
-
-    // if (!e.detail.value.post) {
-    //   this.setData({
-    //     postIsTrue: true
-    //   })
-    // } else {
-    //   this.setData({
-    //     postIsTrue: false
-    //   })
-    // }
-    // if (!e.detail.value.phone) {
-    //   this.setData({
-    //     phoneIsTrue: true
-    //   })
-    // } else {
-    //   this.setData({
-    //     phoneIsTrue: false
-    //   })
-    // }
-    // if (!this.data.zaizhiTime) {
-    //   this.setData({
-    //     renzhishijianIsTrue: true
-    //   })
-    // } else {
-    //   this.setData({
-    //     renzhishijianIsTrue: false
-    //   })
-    // }
-    // if (!this.data.peixunTime) {
-    //   this.setData({
-    //     peixunshijianTrue: true
-    //   })
-    // } else {
-    //   this.setData({
-    //     peixunshijianTrue: false
-    //   })
-    // }
-
-    // console.log(this.data.zaizhiTime, "在职时间000");
-    // console.log(this.data.peixunTime, "培训时间000");
-    // console.log(sex, "性别的");
-    // e.detail.value.zaizhiTime = this.data.zaizhiTime;
-    // e.detail.value.peixunTime = this.data.peixunTime;
-    // e.detail.value.sex = sex;
-    // console.log(e.detail.value, "我是合并后的锕");
-
-
-
   },
   timeFormat(date, fmt) {
     let o = {
@@ -653,24 +427,6 @@ Page({
   onReady: function () {},
   async onLoad(options) {
     const sessionKey = await tools.checkSessionAndLogin();
-    console.log(sessionKey, "111");
-
-    //const sessionKey = 'BqQROCKCxn7R2NXdQLud9Q==';
-    console.log("onloading.....................");
-    // let chooceArr = this.data.questionList.map(item => {
-    //   let json = {};
-    //   json.currentAnswer = '';
-    //   json.questType = '';
-    //   json.id = item.Id;
-    //   json.QuestStem = item.QuestStem;
-    //   return json
-    // })
-    // console.log(chooceArr);
-    // this.setData({
-    //   chooseValue: chooceArr
-    // })
-    console.log(options.answersId, "00000000000000000000000000");
-    console.log(options, "11111");
     wx.setStorageSync('answersId', options.answersId);
     this.setData({
       sessionKey: sessionKey,
@@ -679,32 +435,15 @@ Page({
       id: options.id,
     })
     if (wx.getStorageSync('questionList' + wx.getStorageSync('answersId'))) {
-      console.log("缓村了锕");
       const questionList = wx.getStorageSync('questionList' + wx.getStorageSync('answersId'));
       this.setData({
         questionList: questionList,
         answersId: wx.getStorageSync('answersId' + wx.getStorageSync('answersId')),
         chooseValue: wx.getStorageSync('chooseValue' + wx.getStorageSync('answersId')),
       })
-      console.log(this.data.questionList, "show 缓存的数据");
     } else {
-      console.log("无缓存");
       this.allShi(this.data.id, this.data.paperId, this.data.sessionKey);
     }
-
-    // if (wx.getStorageSync('questionList' + wx.getStorageSync('answersId'))) {
-    //   console.log("缓村了锕");
-    //   const questionList = wx.getStorageSync('questionList' + wx.getStorageSync('answersId'));
-    //   this.setData({
-    //     questionList: questionList,
-    //     answersId: wx.getStorageSync('answersId' + wx.getStorageSync('answersId')),
-    //     chooseValue: wx.getStorageSync('chooseValue' + wx.getStorageSync('answersId')),
-    //   })
-    //   console.log(this.data.questionList, "show 缓存的数据");
-    // } else {
-    //   console.log("无缓存");
-    //   this.allShi(this.data.id, this.data.paperId, this.data.sessionKey);
-    // }
   },
   allShi(id, paperId, sessionKey) {
     wx.request({
@@ -722,10 +461,6 @@ Page({
           json.Id = item.Id;
           json.QuestAnswer = item.QuestAnswer;
           json.QuestStem = item.QuestStem;
-          // if (item.QuestChoice) {
-          //   let arr = item.QuestChoice.split('||');
-          //   json.QuestChoice = arr;
-          // }
           if (item.QuestType == '1' || item.QuestType == '0') {
             let arr = item.QuestChoice.split('||');
             let arrJson = arr.map(item => {
@@ -739,14 +474,6 @@ Page({
           }
           return json;
         })
-
-        // for(let i = 0 ; i<jsonArr.length; i++){
-        //    let json = {};
-        //    json.currentAnswer = '';
-        //    json.questType = '';
-        //    json.id = '';
-        // }
-        //  答案锕 
         let chooceArr = jsonArr.map(item => {
           let json = {};
           json.currentAnswer = '';
@@ -759,7 +486,6 @@ Page({
           questionList: jsonArr,
           chooseValue: chooceArr
         })
-        console.log(this.data.questionList, "00000");
         wx.setStorageSync('questionList' + wx.getStorageSync('answersId'), this.data.questionList);
         wx.setStorageSync('chooseValue' + wx.getStorageSync('answersId'), this.data.chooseValue);
       }

pages/feedBack/feedBack.wxml

@@ -30,7 +30,6 @@
 						<radio value="{{ item.value }}" />{{item.name}}
 					</label>
 				</radio-group>
-				<!-- <view class="{{nameIsTrue?'error':'noerror'}}">请输入姓名</view> -->
 			</view>
 		</view>
 

pages/feedBackDetail/feedBackDetail.js

@@ -1,45 +1,8 @@
-//index.js
-//获取应用实例
+
 const app = require('../../utils/util.js');
-const tools = require('../../utils/tools.js');
 Page({
   data: {
-    // 课程轮播
-    "bnrUrl": [{
-      "url": "/images/banner2.jpg",
-      "name": "二期素质教育培训",
-      "zbf": "xx委员会",
-      "starttime": "2020年6月"
-    }, {
-      "url": "/images/banner1.jpg",
-      "name": "三期素质教育培训",
-      "zbf": "xx委员会",
-      "starttime": "2020年6月"
-    }, {
-      "url": "/images/banner2.jpg",
-      "name": "四期素质教育培训",
-      "zbf": "xx委员会",
-      "starttime": "2020年6月"
-    }],
     gridArr: [
-      // {
-      //   "num": "1",
-      //   "qusetion": "深入贯彻习近平总书记关于加大社会组织党建工作 力度的重要批示精神，坚决落实社会组织与社会组 织党组织“五个同步”，五个同步是以下哪一个？",
-      //   'daanTrue': 'Ｂ. 同培育、同孵化',
-      //   'daanFalse': 'A. 同培育、同孵化、同年检、同评估',
-      // },
-      // {
-      //   "num": "2",
-      //   "qusetion": "深入贯彻习近平总书记关于加大社会组织党建工作 力度的重要批示精神，坚决落实社会组织与社会组 织党组织“五个同步”，五个同步是以下哪一个？",
-      //   'daanTrue': 'Ｂ. 同培育、同孵化、同年检',
-      //   'daanFalse': 'A. 同培育、同孵化、同年检、同评估',
-      // },
-      // {
-      //   "num": "3",
-      //   "qusetion": "深入贯彻习近平总书记关于加大社会组织党建工作 力度的重要批示精神，坚决落实社会组织与社会组 织党组织“五个同步”，五个同步是以下哪一个？",
-      //   'daanTrue': 'Ｂ. 同培育、同孵化、同年检',
-      //   'daanFalse': 'A. 同培育、同孵化、同年检、同评估',
-      // },
     ],
 
   },
@@ -53,22 +16,16 @@ Page({
       },
       success: (res) => {
         if (res.data.code == 0) {
-          console.log(res, "suoyoude");
           this.setData({
             gridArr:res.data.list
           })
-          console.log(this.data.gridArr);
         }
       }
     })
   },
-  onReady: function () {},
   async onLoad(options) {
-    console.log(options.answersId);
-    console.log("onload..................................");
     let answersId = options.answersId;
     const sessionKey = 'yoa0rZTt2bAiTVDsiRjysw==';
-    //const sessionKey = await tools.checkSessionAndLogin();  
     this.chengji(sessionKey, answersId);
 
   },

pages/grade/grade.js

@@ -1,47 +1,8 @@
-//index.js
-//获取应用实例
 const app = require('../../utils/util.js');
 const tools = require('../../utils/tools.js');
 Page({
   data: {
-    // 课程轮播
-    "bnrUrl": [{
-      "url": "/images/banner2.jpg",
-      "name": "二期素质教育培训",
-      "zbf": "xx委员会",
-      "starttime": "2020年6月"
-    }, {
-      "url": "/images/banner1.jpg",
-      "name": "三期素质教育培训",
-      "zbf": "xx委员会",
-      "starttime": "2020年6月"
-    }, {
-      "url": "/images/banner2.jpg",
-      "name": "四期素质教育培训",
-      "zbf": "xx委员会",
-      "starttime": "2020年6月"
-    }],
-    gridArr: [
-      // {
-      //   "num": "1",
-      //   "qusetion": "深入贯彻习近平总书记关于加大社会组织党建工作 力度的重要批示精神，坚决落实社会组织与社会组 织党组织“五个同步”，五个同步是以下哪一个？",
-      //   'daanTrue': 'Ｂ. 同培育、同孵化',
-      //   'daanFalse': 'A. 同培育、同孵化、同年检、同评估',
-      // },
-      // {
-      //   "num": "2",
-      //   "qusetion": "深入贯彻习近平总书记关于加大社会组织党建工作 力度的重要批示精神，坚决落实社会组织与社会组 织党组织“五个同步”，五个同步是以下哪一个？",
-      //   'daanTrue': 'Ｂ. 同培育、同孵化、同年检',
-      //   'daanFalse': 'A. 同培育、同孵化、同年检、同评估',
-      // },
-      // {
-      //   "num": "3",
-      //   "qusetion": "深入贯彻习近平总书记关于加大社会组织党建工作 力度的重要批示精神，坚决落实社会组织与社会组 织党组织“五个同步”，五个同步是以下哪一个？",
-      //   'daanTrue': 'Ｂ. 同培育、同孵化、同年检',
-      //   'daanFalse': 'A. 同培育、同孵化、同年检、同评估',
-      // },
-    ],
-
+    gridArr: [],
   },
   chengji(sessionKey, answersId) {
     wx.request({
@@ -53,38 +14,16 @@ Page({
       },
       success: (res) => {
         if (res.data.code == 0) {
-          console.log(res, "suoyoude");
           this.setData({
-            gridArr:res.data.list
+            gridArr: res.data.list
           })
-          console.log(this.data.gridArr);
-          
-          // res.data.list.forEach(item=>{
-          //   if(item.answerScore){
-          //      this.setData({
-          //       gridArr:res.data.list
-          //      }) 
-          //   }else{
-          //     wx.showModal({
-          //       showCancel: false,
-          //       content: '当前老师批阅中,请耐心等待',
-          //       success(res) {}
-          //     })
-          //   }
-          // })
         }
       }
     })
   },
-  onReady: function () {},
   async onLoad(options) {
-    console.log(options.answersId);
-    console.log("onload..................................");
     let answersId = options.answersId;
-    //const sessionKey = 'yoa0rZTt2bAiTVDsiRjysw==';
-    const sessionKey = await tools.checkSessionAndLogin();  
+    const sessionKey = await tools.checkSessionAndLogin();
     this.chengji(sessionKey, answersId);
-
   },
-
 })

pages/historyClass/historyClass.js

@@ -30,7 +30,6 @@ Page({
         clasId: this.data.id
       },
       success: (res) => {
-        console.log(res, "kckckc")
         this.setData({
           kcArr: res.data.list
         });
@@ -79,7 +78,6 @@ Page({
     return `${hoursValue}时${minutesValue}分${secondValue}秒`;
   },
   checkTaskList(sessionKey) {
-    console.log(this.data.classInfo, "777777");
     wx.request({
       url: app.globalData.publicUrl + '/wx/exam/status',
       method: "post",
@@ -88,7 +86,6 @@ Page({
         clasId: this.data.id
       },
       success: (res) => {
-        console.log(res.data, "我是第四个任务的检查状态")
         if (res.data.code == 0 && res.data.status == 1) {
           this.setData({
             istask: true
@@ -99,7 +96,6 @@ Page({
   },
   // 综合反馈填写
   goWrite2() {
-    console.log(this.data.istask)
     if (this.data.istask) {
       wx.request({
         url: app.globalData.publicUrl + '/wx/exam/quesExamList',
@@ -163,7 +159,6 @@ Page({
     })
   },
   beginKao(id, paperId, sessionKey, address) {
-    console.log(paperId, "8888888");
     wx.request({
       url: app.globalData.publicUrl + '/wx/exam/begin',
       method: "post",
@@ -173,9 +168,7 @@ Page({
         paperId: paperId
       },
       success: (res) => {
-        console.log(res);
         if (res.data.code == 0) {
-          console.log(res, "为我么我们微妙"); // 提交答案是后
           this.setData({
             status: res.data.status
           })
@@ -185,7 +178,6 @@ Page({
     })
   },
   async onLoad(options) {
-    console.log(options)
     const sessionKey = await tools.checkSessionAndLogin();
     this.setData({
       sessionKey: sessionKey,

pages/index/index.js

@@ -29,7 +29,6 @@ Page({
     xczsArr: []
   },
   gomyClass(e) {
-    console.log(e.currentTarget.dataset.item.isActive, "我是测试跳转的")
     if (e.currentTarget.dataset.item.isActive == 5) {
       wx.switchTab({
         url: '/pages/myClass/myClass',
@@ -91,7 +90,6 @@ Page({
   },
   // 首页的四个点击
   goGrid(e) {
-    // console.log(e)
     if (e.currentTarget.dataset.id == 0) {
       wx.navigateTo({
         url: '/pages/onlineClass/onlineClass',
@@ -128,29 +126,6 @@ Page({
       }
     })
   },
-  // 防止图片闪烁在onshow中调用这个判断一下
-  getBanner1(sessionKey) {
-    wx.request({
-      url: app.globalData.publicUrl + '/wx/student/selAllClas',
-      method: "post",
-      data: {
-        sessionKey: sessionKey
-      },
-      success: (res) => {
-        console.log(this.data.bnrUrl, res.data.data.claList)
-        if (this.data.bnrUrl.sort().toString() == res.data.data.claList.sort().toString()) {
-          console.log("我和上次一样")
-        } else {
-          console.log("我和上次不一样")
-          if (res.data.data.claList.length != 0) {
-            this.setData({
-              bnrUrl: res.data.data.claList
-            })
-          }
-        }
-      }
-    })
-  },
   // 即将开班
   getjjLength(sessionKey) {
     wx.request({
@@ -161,7 +136,6 @@ Page({
         isActive: "0"
       },
       success: (res) => {
-        // console.log(res.data.data.length, "我是即将开班的列表")
         if (res.data.data)
           this.setData({
             jjdataArr: res.data.data.length
@@ -179,7 +153,6 @@ Page({
         isActive: "2"
       },
       success: (res) => {
-        // console.log(res, "我是往期开班的列表")
         if (res.data.data)
           this.setData({
             wqdataArr: res.data.data.length
@@ -189,7 +162,6 @@ Page({
   },
   // 四个宣传图
   getfour() {
-    console.log("调取公开课")
     wx.request({
       url: app.globalData.publicUrl + '/wx/course/listCategory',
       method: "post",
@@ -197,9 +169,6 @@ Page({
         this.setData({
           xczsArr: res.data.list
         })
-      },
-      fail(res) {
-        console.log(res, "调取请求公开课失败")
       }
     })
   },
@@ -210,17 +179,12 @@ Page({
       success: (res) => {
         if (this.data.xczsArr.length != 0) {
           if (this.data.xczsArr.sort().toString() == res.data.list.sort().toString()) {
-            console.log("我和上次一样")
           } else {
-            console.log("我和上次不一样")
             this.setData({
               xczsArr: res.data.list
             })
           }
         }
-      },
-      fail(res) {
-        console.log(res, "调取请求公开课失败")
       }
     })
   },
@@ -234,7 +198,6 @@ Page({
         sessionKey
       },
       success: (res) => {
-        console.log(res, "我是调取第一个小红点的结果")
         if (res.data.code == 0 && res.data.isLive == true) {
           this.setData({
             [completeStatus1]: false
@@ -245,9 +208,6 @@ Page({
             [completeStatus2]: false
           })
         }
-      },
-      fail(res) {
-        console.log(res, "调取第1/2个小红点失败")
       }
     })
   },
@@ -261,22 +221,17 @@ Page({
         status: 0
       },
       success: (res) => {
-        console.log(res, "我是调取第四个小红点的结果")
         if (res.data.code == 0 && res.data.list.length > 0) {
           this.setData({
             [completeStatus]: false
           })
         }
-      },
-      fail(res) {
-        console.log(res, "调取第四个小红点失败")
       }
     })
   },
-  onReady: function () {},
   async onShow() {
     const sessionKey = await tools.checkSessionAndLogin();
-    this.getBanner1(sessionKey);
+    this.getBanner(sessionKey);
     this.getjjLength(sessionKey);
     this.getwqLength(sessionKey);
     this.getRedPoint1(sessionKey);
@@ -284,9 +239,6 @@ Page({
     this.getfour1();
   },
   async onLoad() {
-    const sessionKey = await tools.checkSessionAndLogin();
-    // console.log("我调用了onShow")
     this.getfour();
-    this.getBanner(sessionKey);
   },
 })

pages/index/index.wxml

@@ -5,8 +5,9 @@
 				<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" wx:if="{{item.remark}}">主办：{{item.remark}}</view>
+					<view class="text text0">{{item.clasName}}</view>
+					<view class="text text1" wx:if="{{item.remark}}">主办：{{item.remark}}</view>
+					<view class="text text2" wx:if="{{item.organizer}}">承办：{{item.remark}}</view>
 					<view class="text text3" wx:if="{{item.beginDate}}">开班时间：{{item.beginDate}} 至 {{item.endDate}}</view>
 					<image src='/images/goclass.png' mode='aspectFill' class="gozbbtn" wx:if='{{item.isActive==5}}'></image>
 				</swiper-item>

pages/index/index.wxss

@@ -36,15 +36,19 @@
   font-weight: 900;
 }
 
-.text1 {
+.text0 {
   font-size: 30rpx;
-  /* font-weight: 900; */
-  top: 25rpx;
+  top: 10rpx;
+}
+
+.text1 {
+  font-size: 25rpx;
+  top: 55rpx;
 }
 
 .text2 {
   font-size: 25rpx;
-  top: 85rpx;
+  top: 95rpx;
 }
 
 .text3 {

pages/last/last.js

@@ -1,53 +1,19 @@
-//logs.js
-// const util = require('../../utils/util.js')
 const tools = require('../../utils/tools.js');
 const app = require('../../utils/util.js');
 Page({
   data: {
     showNull: false,
-    dataArr: [
-      // {
-      //   "image": "/images/scdj1.jpg",
-      //   "name": "长春市社区工作者线上培训班",
-      //   "lecturer": "李老师",
-      //   "examBegin": "2020年07月10日",
-      //   examBegin:'2020202020222222'
-      // },{
-      //   "image": "/images/scdj2.jpg",
-      //   "name": "长春市专职党务工作者线上培训班",
-      //   "lecturer": "刘老师",
-      //   "examBegin": "2020年07月12日"
-      // },{
-      //   "image": "/images/scdj4.jpg",
-      //   "name": "区域党建联盟",
-      //   "lecturer": "王老师",
-      //   "examBegin": "2020年07月15日"
-      // },{
-      //   "image": "/images/scdj3.jpg",
-      //   "name": "小区党组织建设",
-      //   "lecturer": "张老师",
-      //   "examBegin": "2020年07月30日"
-      // }
-    ],
+    dataArr: [],
     sessionKey: '',
     classInfo: {},
-  },
-  checkboxChange() {
-
   },
   startAnswer(e) {
     let id = e.currentTarget.dataset.idx;
     let paperId = e.currentTarget.dataset.paperid;
     let answersId = e.currentTarget.dataset.answersid;
-    console.log(this.data.sessionKey, "787878");
-    console.log(e.currentTarget.dataset, "8888888");
-
     if (answersId) {
-      console.log("有answeid");
       this.toPath(id, paperId, answersId);
     } else {
-      console.log("没有");
-      // 获取answerid
       this.beginKao(id, paperId, this.data.sessionKey);
     }
   },
@@ -57,7 +23,6 @@ Page({
     })
   },
   beginKao(id, paperId, sessionKey) {
-    console.log(paperId, "8888888");
     wx.request({
       url: app.globalData.publicUrl + '/wx/exam/begin',
       method: "post",
@@ -67,16 +32,13 @@ Page({
         paperId: paperId,
       },
       success: (res) => {
-        console.log(res);
         if (res.data.code == 0) {
-          console.log(res, "为我么我们微妙"); // 提交答案是后
           this.toPath(id, paperId, res.data.answersId);
         }
       }
     })
   },
   lookAnswer(e) {
-    console.log("00000");
     let answersId = e.currentTarget.dataset.answersid;
     wx.request({
       url: app.globalData.publicUrl + '/wx/answer/detail',
@@ -86,17 +48,13 @@ Page({
         answersId: answersId
       },
       success: (res) => {
-        console.log(res);
-
         if (res.data.code == 0) {
-          console.log(res, "suoyoude");
           wx.navigateTo({
             url: '/pages/lastdetailDetail/lastdetailDetail?answersId=' + answersId,
           })
         }
       }
     })
-
   },
   async onLoad() {
     const sessionKey = await tools.checkSessionAndLogin();
@@ -104,10 +62,8 @@ Page({
       sessionKey: sessionKey
     })
     this.isClass(sessionKey);
-
   },
   getBanner(sessionKey) {
-    console.log(sessionKey, "sessionKey");
     wx.request({
       url: app.globalData.publicUrl + '/wx/exam/quesExamList',
       method: "post",
@@ -145,7 +101,6 @@ Page({
         sessionKey: sessionKey
       },
       success: (res) => {
-        console.log(res.data.code, "我是返回是否有班级")
         if (res.data.code == 0) {
           this.setData({
             classInfo: res.data.data

pages/lastdetail/lastdetail.js

@@ -35,7 +35,7 @@ Page({
       }
       return value;
     },
-    questionList: [ ],
+    questionList: [],
     answersId: '', // 提交答案用到
     sessionKey: '',
     paperId: '',
@@ -89,8 +89,6 @@ Page({
     wx.setStorageSync('chooseValue' + wx.getStorageSync('answersId'), this.data.chooseValue);
   },
   bindTextAreaBlur(e) {
-    console.log(e, "hhhhh");
-    console.log(e.detail.value);
     let json = {};
     json.currentAnswer = e.detail.value;
     json.id = e.currentTarget.dataset.idx;
@@ -119,7 +117,6 @@ Page({
     });
   },
   onInput(event) {
-    console.log("点击了");
     this.setData({
       currentDate: event.detail,
     });
@@ -201,23 +198,43 @@ Page({
         answersId: wx.getStorageSync('answersId')
       },
       success: (res) => {
-        console.log(res);
-        if (res.data.msg == "请勿重复提交") {
+        if (res.data.code == 0) {
           wx.showModal({
             showCancel: false,
-            content: res.data.msg
+            content: '提交成功啦',
+            success() {
+              wx.navigateTo({
+                url: '/pages/last/last',
+              })
+            }
           })
         } else {
           wx.showModal({
             showCancel: false,
-            content: "提交成功",
+            content: res.data.msg,
             success() {
-              wx.navigateTo({
-                url: '/pages/last/last',
+              wx.navigateBack({
+                delta: 1
               })
             }
           })
         }
+        // if (res.data.msg == "请勿重复提交") {
+        //   wx.showModal({
+        //     showCancel: false,
+        //     content: res.data.msg
+        //   })
+        // } else {
+        //   wx.showModal({
+        //     showCancel: false,
+        //     content: "提交成功",
+        //     success() {
+        //       wx.navigateTo({
+        //         url: '/pages/last/last',
+        //       })
+        //     }
+        //   })
+        // }
       }
     })
   },
@@ -264,9 +281,7 @@ Page({
     return fmt;
 
   },
-  onReady: function () {},
   async onLoad(options) {
-    const sessionKey = await tools.checkSessionAndLogin();
     wx.setStorageSync('answersId', options.answersId);
     this.setData({
       sessionKey: sessionKey,

pages/lastdetailDetail/lastdetailDetail.js

@@ -13,7 +13,6 @@ Page({
       },
       success: (res) => {
         if (res.data.code == 0) {
-          console.log(res, "suoyoude");
           this.setData({
             gridArr: res.data.list
           })
@@ -23,7 +22,7 @@ Page({
   },
   async onLoad(options) {
     let answersId = options.answersId;
-    const sessionKey = 'yoa0rZTt2bAiTVDsiRjysw==';
+    const sessionKey = await tools.checkSessionAndLogin();
     this.chengji(sessionKey, answersId);
   },
 

pages/myClass/myClass.js

@@ -5,7 +5,6 @@ Page({
     showMore: false, //更多
     showzs: false, //证书显示
     show: false, //协议显示
-    sessionKey: "",
     notice: "暂无未读通知",
     classInfo: {}, //班级信息
     kcArr: [], //课程列表
@@ -21,7 +20,8 @@ Page({
     istask3: false, //期末考试是否完成
     istask4: false, //综合反馈是否完成
   },
-  isRz(sessionKey){
+  // 查询我是否认证
+  isRz(sessionKey) {
     wx.request({
       url: app.globalData.publicUrl + '/wx/student/selStudentSessionKey',
       method: "post",
@@ -29,21 +29,34 @@ Page({
         sessionKey: sessionKey
       },
       success: (res) => {
-        if (res.data.code == 0 && res.data.data) {
-          if (res.data.data.studentOpenId == "" ||res.data.data.studentOpenId == null) {
+        if (res.data.code == 0) {
+          if (res.data.data !== null || res.data.data !== "") {
+            this.isClass(sessionKey)
+          } else {
             wx.showModal({
               content: "您还没有进行身份认证哦",
               showCancel: false,
               success(res) {
                 if (res.confirm) {
-                  wx.switchTab({
-                    url: '../index/index'
+                  wx.redirectTo({
+                    url: '../Identity/Identity'
                   })
                 }
               }
             })
-            return false;
           }
+        } else {
+          wx.showModal({
+            content: "您还没有进行身份认证哦",
+            showCancel: false,
+            success(res) {
+              if (res.confirm) {
+                wx.redirectTo({
+                  url: '../Identity/Identity'
+                })
+              }
+            }
+          })
         }
       }
     })
@@ -92,7 +105,6 @@ Page({
         sessionKey: sessionKey
       },
       success: (res) => {
-        console.log(res,"00000000000000000000000000")
         if (res.data.code == 0 && res.data.data) {
           if (res.data.data.agreement == 0) {
             this.setData({
@@ -131,10 +143,8 @@ Page({
         })
       },
       fail() {
-        console.log("我没有缓存并去登录请求")
         wx.login({
           success(res) {
-            console.log(res);
             let code = res.code
             wx.request({
               url: app.globalData.publicUrl + '/wx/user/wx7e7a46e129d6cd0f/login',
@@ -171,7 +181,6 @@ Page({
         sessionKey: sessionKey
       },
       success: (res) => {
-        console.log(res.data, "检查第一个任务")
         if (res.data.code == 0) {
           if (res.data.data.joinClas == 0) {
             this.setData({
@@ -194,7 +203,6 @@ Page({
         sessionKey: sessionKey
       },
       success: (res) => {
-        console.log(res.data, "我是第一个任务的检查状态")
         if (res.data.code == 0 && res.data.data.register == 0) {
           this.setData({
             istask1: true
@@ -213,7 +221,6 @@ Page({
         clasId: id
       },
       success: (res) => {
-        console.log(res.data, "我是第三个任务的检查状态")
         if (res.data.code == 0 && res.data.status == 1) {
           this.setData({
             istask3: true
@@ -224,7 +231,6 @@ Page({
   },
   // 综合反馈任务check
   checkTaskList4(sessionKey, id) {
-    console.log(this.data.classInfo, "777777");
     wx.request({
       url: app.globalData.publicUrl + '/wx/exam/status',
       method: "post",
@@ -233,7 +239,6 @@ Page({
         clasId: id
       },
       success: (res) => {
-        console.log(res.data, "我是第四个任务的检查状态")
         if (res.data.code == 0 && res.data.status == 1) {
           this.setData({
             istask4: true
@@ -254,7 +259,6 @@ Page({
         isNotice: 0
       },
       success: (res) => {
-        console.log(res, "333333333")
         if (res.data.code == 0) {
           if (res.data.list && res.data.list.length !== 0)
             this.setData({
@@ -302,12 +306,10 @@ Page({
         sessionKey: sessionKey
       },
       success: (res) => {
-        console.log(res, "11111111111111111111111111111111")
         this.setData({
           kcArr: res.data.list,
           istask2: res.data.allDone
         });
-        console.log(this.data.kcArr, "9999999999999999")
         for (let i = 0; i < res.data.list.length; i++) {
           if (res.data.list[i].isStudyDone == 0) {
             this.setData({
@@ -339,56 +341,6 @@ Page({
       }
     })
   },
-  // getMycourse1(sessionKey) {
-  //   wx.request({
-  //     url: app.globalData.publicUrl + '/wx/course/selectBySessionKey',
-  //     method: "post",
-  //     data: {
-  //       sessionKey: sessionKey
-  //     },
-  //     success: (res) => {
-  //       if (this.data.kcArr.sort().toString() == res.data.list.sort().toString()) {
-  //         console.log("我和上次一样")
-  //       } else {
-  //         console.log("我和上次不一样")
-  //         this.setData({
-  //           kcArr: res.data.list,
-  //           istask2: res.data.allDone
-  //         });
-  //         console.log(this.data.kcArr, "9999999999999999")
-  //         for (let i = 0; i < res.data.list.length; i++) {
-  //           if (res.data.list[i].isStudyDone == 0) {
-  //             this.setData({
-  //               IngCourseArr: res.data.list[i]
-  //             })
-  //           }
-  //         }
-  //         let result = [];
-  //         if (res.data.list)
-  //           for (let i = 0; i < res.data.list.length; i++) {
-  //             result.push({
-  //               courseTime: res.data.list[i].courseTime
-  //             });
-  //           }
-  //         const timesArr = result.map((item) => {
-  //           return item.courseTime;
-  //         });
-  //         let sfmArr = [];
-  //         for (let i = 0; i < timesArr.length; i++) {
-  //           let value = timesArr[i];
-  //           const resultValue = this.handler(value);
-  //           sfmArr.push({
-  //             courseTime: resultValue
-  //           })
-  //           this.setData({
-  //             sfmArr: sfmArr
-  //           })
-  //         }
-  //       }
-
-  //     }
-  //   })
-  // },
   // 时间换算
   handler(value) {
     //换算为秒 进制1000
@@ -417,7 +369,6 @@ Page({
   },
   // 去学习
   goStudy(e) {
-    // console.log(this.data.istask)
     if (!this.data.istask) {
       wx.showModal({
         showCancel: false,
@@ -529,7 +480,7 @@ Page({
             if (res.data.list.length == 0) {
               wx.showModal({
                 showCancel: false,
-                content: '此课程还没有考试噢'
+                content: '老师还未出考试题哦'
               })
             } else {
               if (res.data.list[0]) {
@@ -581,17 +532,16 @@ Page({
         method: "post",
         data: {
           sessionKey: this.data.sessionKey,
-          questSub: '3',
+          // questSub: '3',
           courseId: e.currentTarget.dataset.item.id,
           clasId: this.data.classInfo.id
         },
         success: (res) => {
-          console.log(res, "我去评价啦")
           if (res.data.code == 0) {
             if (res.data.list.length == 0) {
               wx.showModal({
                 showCancel: false,
-                content: '此课程还不可以评价哦！'
+                content: '老师还未出评价模板哦'
               })
             } else {
               if (res.data.list[0]) {
@@ -602,7 +552,6 @@ Page({
                 }
               }
             }
-
           }
         }
       })
@@ -610,7 +559,6 @@ Page({
   },
   // 查看详情成绩
   gockcj(e) {
-    console.log(e.currentTarget.dataset.item.isExamId);
     if (e.currentTarget.dataset.item.isExamId) {
       wx.request({
         url: app.globalData.publicUrl + '/wx/answer/detail',
@@ -619,16 +567,16 @@ Page({
           answersId: e.currentTarget.dataset.item.isExamId
         },
         success: (res) => {
-          console.log(res.data, "我是第四个任务的检查状态")
-          if (res.data.list[0].answerScore) {
-            wx.navigateTo({
-              url: '/pages/grade/grade?answersId=' + e.currentTarget.dataset.item.isExamId,
-            })
-          } else {
+          console.log(res.data.list[0].answerScore)
+          if (res.data.list[0].answerScore < 0 && (res.data.list[0].answerScore == null || res.data.list[0].answerScore == "")) {
             wx.showModal({
               showCancel: false,
               content: '当前老师批阅中,请耐心等待'
             })
+          } else {
+            wx.navigateTo({
+              url: '/pages/grade/grade?answersId=' + e.currentTarget.dataset.item.isExamId,
+            })
           }
         }
       })
@@ -636,7 +584,6 @@ Page({
   },
   // 查看详情评价
   gockpj(e) {
-    console.log(e.currentTarget.dataset.item.isFeedbackId);
     wx.navigateTo({
       url: '/pages/evaluationCourseDetail/evaluationCourseDetail?answersId=' + e.currentTarget.dataset.item.isFeedbackId,
     })
@@ -672,7 +619,6 @@ Page({
         clasId: this.data.classInfo.id
       },
       success: (res) => {
-        console.log(res, "000000")
         if (res.data.code == 0) {
           if (res.data.list.length == 0) {
             wx.showModal({
@@ -680,7 +626,6 @@ Page({
               content: '期末考试还未开始哦！'
             })
           } else {
-            // if (res.data.list[0]) {
             if (res.data.list[0].answersId) {
               if (res.data.list[0].status == '1') {
                 wx.request({
@@ -708,7 +653,6 @@ Page({
             } else {
               this.beginKao(res.data.list[0].id, res.data.list[0].paperId, this.data.sessionKey, 'answerAfterclass');
             }
-            // }
           }
         }
       }
@@ -809,20 +753,12 @@ Page({
     this.setData({
       myCanvasId: this.data.myCanvasId + 1
     })
-    console.log(this.data.myCanvasId)
     let str = this.data.studentName + "同志于" + this.data.classInfo.beginDate + " 至 " + this.data.classInfo.endDate + "参加学习完成规定培训内容，准予结业，特发此证。"
     let strArr = [];
-    //每15个字截取一下
-    // let n = 15;
-    // for (let i = 0, l = str.length; i < l / n; i++) {
-    //   let a = str.slice(n * i, n * (i + 1));
-    //   strArr.push(a);
-    // }
     let a = str.slice(0, 16);
     let b = str.slice(16, 36);
     let c = str.slice(36, 56);
     strArr.push(a, b, c);
-    console.log(strArr, "我是截取之后的")
     const ctx = wx.createCanvasContext(this.data.myCanvasId);
     ctx.drawImage(this.data.byzsbj, 0, 0, 300, 415); //里面的参数无非就是图片放置的位置即图片的横纵坐标，图片的宽高
     ctx.setFillStyle("#000");
@@ -830,7 +766,6 @@ Page({
     ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
     let leftPositionAarr = [60, 30, 30, 30]
     for (let i = 0; i < strArr.length; i++) {
-      console.log(i);
       ctx.fillText(strArr[i], leftPositionAarr[i], 160 + i * 30);
     }
     // ctx.fillText(str, 150, 160); //150:canvas画布宽300，取1/2，中间，280：纵向位置
@@ -855,7 +790,6 @@ Page({
     wx.canvasToTempFilePath({ //把当前画布指定区域的内容导出生成指定大小的图片
       canvasId: this.data.myCanvasId,
       success(res) {
-        console.log(res)
         wx.authorize({ //向用户发起授权请求
           scope: 'scope.writePhotosAlbum', //保存相册授权
           success: () => {
@@ -884,7 +818,6 @@ Page({
     })
   },
   beginKao(id, paperId, sessionKey, address) {
-    console.log(paperId, "8888888");
     wx.request({
       url: app.globalData.publicUrl + '/wx/exam/begin',
       method: "post",
@@ -894,9 +827,7 @@ Page({
         paperId: paperId
       },
       success: (res) => {
-        console.log(res);
         if (res.data.code == 0) {
-          console.log(res, "为我么我们微妙"); // 提交答案是后
           this.setData({
             status: res.data.status
           })
@@ -908,19 +839,11 @@ Page({
   async onShow() {
     const sessionKey = await tools.checkSessionAndLogin();
     this.setData({
-      sessionKey: sessionKey
-    })
+      sessionKey
+    });
     this.isRz(sessionKey)
-    this.isClass(sessionKey);
     this.getMycourse(sessionKey);
     this.getMynotice(sessionKey);
     this.checkTaskList1(sessionKey);
-
-  },
-  async onLoad() {
-    const sessionKey = await tools.checkSessionAndLogin();
-    this.setData({
-      sessionKey: sessionKey
-    })
   }
 })

pages/myClass/myClass.wxml

@@ -40,15 +40,12 @@
 					<view class="start_text" wx:if='{{item.isLive==-1}}'>视频时长: {{sfmArr[idx].courseTime}}</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' wx:if='{{item.isExam==0}}' mode='aspectFill' class="an" data-item="{{item}}" bindtap="gokhAnswer"></image>
 					<image src='/images/ckcj.png' wx:if='{{item.isExam==1}}' mode='aspectFill' class="an" data-item="{{item}}" bindtap="gockcj"></image>
 					<image src='/images/pjkc.png' wx:if='{{item.isFeedback==0}}' mode='aspectFill' class="an" data-item="{{item}}" bindtap="gopjClass"></image>
 					<image src='/images/ckpj.png' wx:if='{{item.isFeedback==1}}' mode='aspectFill' class="an" data-item="{{item}}" bindtap="gockpj"></image>
-
 				</view>
 			</view>
 		</view>

pages/myInteractions/myInteractions.js

@@ -28,7 +28,6 @@ Page({
         sessionKey: sessionKey
       },
       success: (res) => {
-        console.log(res, "我是查到的列表")
         if (res.data.code == 0) {
           if (res.data.list.length == 0) {
             wx.showModal({
@@ -68,6 +67,7 @@ Page({
     }
 
   },
+  // 提交内容
   async bindFormSubmit(e) {
     let input_val = e.detail.value.textarea;
     const sessionKey = await tools.checkSessionAndLogin();
@@ -104,12 +104,13 @@ Page({
               }
             }
           })
-        } else {
-          wx.showModal({
-            showCancel: false,
-            content: res.data.msg
-          })
-        }
+        } 
+        // else {
+        //   wx.showModal({
+        //     showCancel: false,
+        //     content: res.data.msg
+        //   })
+        // }
       }
     })
   }

pages/myMission/myMission.js

@@ -27,7 +27,6 @@ Page({
         sessionKey: sessionKey
       },
       success: (res) => {
-        console.log(res.data, "检查第一个任务")
         if (res.data.code == 0) {
           if (res.data.data.joinClas == 0) {
             this.setData({
@@ -45,12 +44,10 @@ Page({
   saveImg() {
     wx.getSetting({
       success: (res) => {
-        console.log(res)
         if (!res.authSetting['scope.writePhotosAlbum']) {
           wx.authorize({
             scope: 'scope.writePhotosAlbum',
             success() {
-              console.log(res, "我点击同意啦")
               wx.showLoading({
                 title: '保存中...'
               })
@@ -58,12 +55,10 @@ Page({
               wx.downloadFile({
                 url: imgSrc,
                 success: function (res) {
-                  console.log(res, '我下载完成啦');
                   //图片保存到本地
                   wx.saveImageToPhotosAlbum({
                     filePath: res.tempFilePath,
                     success: function (data) {
-                      console.log(data, '我保存成功啦')
                       wx.hideLoading();
                       wx.showToast({
                         title: '保存成功',
@@ -72,13 +67,10 @@ Page({
                       })
                     },
                     fail: function (err) {
-                      console.log(err, '我保存失败啦')
                       wx.hideLoading();
                       if (err.errMsg === "saveImageToPhotosAlbum:fail auth deny") {
-                        console.log("当初用户拒绝，再次发起授权")
                         wx.openSetting({
                           success(settingdata) {
-                            console.log(settingdata)
                             if (settingdata.authSetting['scope.writePhotosAlbum']) {
                               console.log('获取权限成功，给出再次点击图片保存到相册的提示。')
                             } else {
@@ -100,18 +92,14 @@ Page({
           wx.showLoading({
             title: '保存中...'
           })
-          console.log(this.data.classInfo.codeImg)
           let imgSrc = this.data.classInfo.codeImg
           wx.downloadFile({
             url: imgSrc,
             success: function (res) {
-              console.log(res, '我下载完成啦');
               wx.hideLoading();
-              //图片保存到本地
               wx.saveImageToPhotosAlbum({
                 filePath: res.tempFilePath,
                 success: function (data) {
-                  console.log(data, '我保存成功啦')
                   wx.hideLoading();
                   wx.showToast({
                     title: '保存成功',
@@ -120,13 +108,11 @@ Page({
                   })
                 },
                 fail: function (err) {
-                  console.log(err, '我保存失败啦')
                   wx.hideLoading();
                   if (err.errMsg === "saveImageToPhotosAlbum:fail auth deny") {
                     console.log("当初用户拒绝，再次发起授权")
                     wx.openSetting({
                       success(settingdata) {
-                        console.log(settingdata)
                         if (settingdata.authSetting['scope.writePhotosAlbum']) {
                           console.log('获取权限成功，给出再次点击图片保存到相册的提示。')
                         } else {
@@ -155,7 +141,6 @@ Page({
         sessionKey: sessionKey
       },
       success: (res) => {
-        console.log(res.data, "我是第二个任务的检查状态")
         if (res.data.code == 0 && res.data.data.register == 0) {
           this.setData({
             istask2: true
@@ -174,7 +159,6 @@ Page({
         clasId: id
       },
       success: (res) => {
-        console.log(res.data, "我是第四个任务的检查状态")
         if (res.data.code == 0 && res.data.status == 1) {
           this.setData({
             istask4: true
@@ -193,7 +177,6 @@ Page({
         clasId: id
       },
       success: (res) => {
-        console.log(res.data, "我是第五个任务的检查状态")
         if (res.data.code == 0 && res.data.status == 1) {
           this.setData({
             istask5: true
@@ -211,7 +194,6 @@ Page({
         sessionKey: sessionKey
       },
       success: (res) => {
-        console.log(res.data, "我是第六个任务的检查状态")
         if (res.data.code == 0 &&res.data.data.graduation == 0 ) {
           this.setData({
             istask6: true
@@ -220,29 +202,43 @@ Page({
       }
     })
   },
-  isRz(sessionKey){
+  // 是否认证
+  isRz(sessionKey) {
     wx.request({
       url: app.globalData.publicUrl + '/wx/student/selStudentSessionKey',
       method: "post",
       data: {
         sessionKey: sessionKey
       },
-      success: (res) => {
-        if (res.data.code == 0 && res.data.data) {
-          if (res.data.data.studentOpenId == "" ||res.data.data.studentOpenId == null) {
+      success:  (res)=> {
+        if (res.data.code == 0) {
+          if (res.data.data !== null || res.data.data !== "") {
+            this.isClass(sessionKey)
+          } else {
             wx.showModal({
               content: "您还没有进行身份认证哦",
               showCancel: false,
               success(res) {
                 if (res.confirm) {
-                  wx.switchTab({
-                    url: '../index/index'
+                  wx.redirectTo({
+                    url: '../Identity/Identity'
                   })
                 }
               }
             })
-            return false;
           }
+        } else {
+          wx.showModal({
+            content: "您还没有进行身份认证哦",
+            showCancel: false,
+            success(res) {
+              if (res.confirm) {
+                wx.redirectTo({
+                  url: '../Identity/Identity'
+                })
+              }
+            }
+          })
         }
       }
     })
@@ -256,7 +252,6 @@ Page({
         sessionKey: sessionKey
       },
       success: (res) => {
-        console.log(res, "我是返回是否有班级")
         if (res.data.code == 0) {
           this.setData({
             classInfo: res.data.data
@@ -289,7 +284,6 @@ Page({
         sessionKey: sessionKey
       },
       success: (res) => {
-        console.log(res, "我的任务之课程")
         if (res.data.code == 0 && res.data.list.length !== 0) {
           this.setData({
             kcArr: res.data.list,
@@ -488,12 +482,11 @@ Page({
         method: "post",
         data: {
           sessionKey: this.data.sessionKey,
-          questSub: '3',
+          // questSub: '3',
           courseId: e.currentTarget.dataset.item.id,
           clasId: this.data.classInfo.id
         },
         success: (res) => {
-          console.log(res, "我去评价啦")
           if (res.data.code == 0) {
             if (res.data.list.length == 0) {
               wx.showModal({
@@ -618,7 +611,6 @@ Page({
   },
   // 考试需要的方法
   beginKao(id, paperId, sessionKey, address) {
-    console.log(paperId, "8888888");
     wx.request({
       url: app.globalData.publicUrl + '/wx/exam/begin',
       method: "post",
@@ -628,9 +620,7 @@ Page({
         paperId: paperId
       },
       success: (res) => {
-        console.log(res);
         if (res.data.code == 0) {
-          console.log(res, "为我么我们微妙"); // 提交答案是后
           this.setData({
             status: res.data.status
           })
@@ -655,20 +645,12 @@ Page({
     this.setData({
       myCanvasId: this.data.myCanvasId + 1
     })
-    console.log(this.data.myCanvasId)
     let str = this.data.studentName + "同志于" + this.data.classInfo.beginDate + " 至 " + this.data.classInfo.endDate + "参加学习完成规定培训内容，准予结业，特发此证。"
     let strArr = [];
-    //每15个字截取一下
-    // let n = 15;
-    // for (let i = 0, l = str.length; i < l / n; i++) {
-    //   let a = str.slice(n * i, n * (i + 1));
-    //   strArr.push(a);
-    // }
     let a = str.slice(0, 18);
     let b = str.slice(16, 36);
     let c = str.slice(36, 56);
     strArr.push(a, b, c);
-    console.log(strArr, "我是截取之后的")
     const ctx = wx.createCanvasContext(this.data.myCanvasId);
     ctx.drawImage(this.data.byzsbj, 0, 0, 300, 415); //里面的参数无非就是图片放置的位置即图片的横纵坐标，图片的宽高
     ctx.setFillStyle("#000");
@@ -676,7 +658,6 @@ Page({
     ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
     let leftPositionAarr = [60, 30, 30, 30]
     for (let i = 0; i < strArr.length; i++) {
-      console.log(i);
       ctx.fillText(strArr[i], leftPositionAarr[i], 160 + i * 30);
     }
     // ctx.fillText(str, 150, 160); //150:canvas画布宽300，取1/2，中间，280：纵向位置
@@ -702,7 +683,6 @@ Page({
     wx.canvasToTempFilePath({ //把当前画布指定区域的内容导出生成指定大小的图片
       canvasId: this.data.myCanvasId,
       success(res) {
-        console.log(res)
         wx.authorize({ //向用户发起授权请求
           scope: 'scope.writePhotosAlbum', //保存相册授权
           success: () => {
@@ -747,7 +727,6 @@ Page({
   },
   // 查看详情成绩
   gockcj(e) {
-    console.log(e.currentTarget.dataset.item.isExamId);
     if (e.currentTarget.dataset.item.isExamId) {
       wx.request({
         url: app.globalData.publicUrl + '/wx/answer/detail',
@@ -756,7 +735,6 @@ Page({
           answersId: e.currentTarget.dataset.item.isExamId
         },
         success: (res) => {
-          console.log(res.data, "我是第四个任务的检查状态")
           if (res.data.list[0].answerScore) {
             wx.navigateTo({
               url: '/pages/grade/grade?answersId=' + e.currentTarget.dataset.item.isExamId,
@@ -764,8 +742,7 @@ Page({
           } else {
             wx.showModal({
               showCancel: false,
-              content: '当前老师批阅中,请耐心等待',
-              success(res) {}
+              content: '当前老师批阅中,请耐心等待'
             })
           }
         }
@@ -774,7 +751,6 @@ Page({
   },
   // 查看详情评价
   gockpj(e) {
-    console.log(e.currentTarget.dataset.item.isFeedbackId);
     wx.navigateTo({
       url: '/pages/evaluationCourseDetail/evaluationCourseDetail?answersId=' + e.currentTarget.dataset.item.isFeedbackId,
     })
@@ -785,7 +761,6 @@ Page({
       sessionKey
     })
     this.isRz(sessionKey);
-    this.isClass(sessionKey);
     this.getMycourse(sessionKey);
     this.checkTaskList(sessionKey)
     this.checkTaskList2(sessionKey)

pages/myMission/myMission.wxss

@@ -220,7 +220,7 @@
 }
 
 .sp_text {
-  width: 620rpx;
+  width: 580rpx;
   height: 100%;
   float: left;
   margin-left: 10rpx;

pages/myTraining/myTraining.js

@@ -34,7 +34,6 @@ Page({
         sessionKey: sessionKey
       },
       success: (res) => {
-        console.log(res.data.data, "22222")
         if (res.data.code == 0) {
           this.setData({
             dataArr: res.data.data

pages/myTraining/myTraining.wxml

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

pages/pyip/pyip.js

@@ -0,0 +1,224 @@
+// pages/pyip/pyip.js
+const COS = require('../../utils/cos-wx-v5.js');
+Page({
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    carWin_img_hidden: true, //展示照片的view是否隐藏
+    carWin_img: '' //存放照片路径的
+  },
+  openCamera() {
+    var that = this;
+    wx.chooseImage({
+      count: 1,
+      success: (res) => {
+        var filePath = res.tempFilePaths[0];
+        that.setData({
+          carWin_img: filePath, //把照片路径存到变量中，
+          carWin_img_hidden: false //让展示照片的view显示
+        });
+        console.log(this.data.carWin_img)
+        // 这个是使用微信接口保存文件到数据库
+        // wx.uploadFile({
+        //   url: "",
+        //   filePath: filePath,
+        //   name: 'file',
+        //   success: function (res) {
+        //   }
+        // })
+      },
+      fail: function (error) {
+        console.error("调用本地相册文件时出错")
+        console.warn(error)
+      },
+      complete: function () {
+
+      }
+    });
+  },
+  submitImgToTxy() {
+    // var CosAuth = require('./cos-auth'); //  COS 签名方法 https://unpkg.com/cos-js-sdk-v5/demo/common/cos-auth.min.js
+    var Bucket = 'bucketnj1-1254259530';
+    var Region = 'ap-nanjing';
+    var ForcePathStyle = false; // 是否使用后缀式，涉及签名计算和域名白名单配置，后缀式说明看上文
+    // var uploadFile = function () {
+    // 请求用到的参数
+    var prefix = 'https://' + Bucket + '.cos.' + Region + '.myqcloud.com/';
+    if (ForcePathStyle) {
+      // 后缀式请求在签名时域名使用地域域名，而不是存储桶域名，具体说明见本文上述“3.后缀式请求”
+      prefix = 'https://cos.' + Region + '.myqcloud.com/' + Bucket + '/';
+    }
+    // 对更多字符编码的 url encode 格式
+    var camSafeUrlEncode = function (str) {
+      return encodeURIComponent(str)
+        .replace(/!/g, '%21')
+        .replace(/'/g, '%27')
+        .replace(/\(/g, '%28')
+        .replace(/\)/g, '%29')
+        .replace(/\*/g, '%2A');
+    };
+    // 获取临时密钥
+    var stsCache;
+    var getCredentials = function (callback) {
+      if (stsCache && Date.now() / 1000 + 30 < stsCache.expiredTime) {
+        callback(data.credentials);
+        return;
+      }
+      wx.request({
+        method: 'GET',
+        url: 'https://example.com/sts.php', // 服务端签名，参考上文说的获取临时密钥
+        dataType: 'json',
+        success: function (result) {
+          console.log(result)
+          var data = result.data;
+          var credentials = data.credentials;
+          if (credentials) {
+            stsCache = data
+          } else {
+            wx.showModal({
+              title: '临时密钥获取失败',
+              content: JSON.stringify(data),
+              showCancel: false
+            });
+          }
+          callback(stsCache && stsCache.credentials);
+        },
+        error: function (err) {
+          wx.showModal({
+            title: '临时密钥获取失败',
+            content: JSON.stringify(err),
+            showCancel: false
+          });
+        }
+      });
+    };
+    // 计算签名
+    var getAuthorization = function (options, callback) {
+      getCredentials(function (credentials) {
+        callback({
+          XCosSecurityToken: credentials.sessionToken,
+          Authorization: COS({
+            SecretId: credentials.tmpSecretId,
+            SecretKey: credentials.tmpSecretKey,
+            Method: options.Method,
+            Pathname: options.Pathname,
+          })
+        });
+      });
+    };
+    // 上传文件
+    // var uploadFile = function (filePath) {
+    var Key = this.data.carWin_img.substr(this.data.carWin_img.lastIndexOf('/') + 1); // 这里指定上传的文件名
+    var signPathname = '/'; // PostObject 接口 Key 是放在 Body 传输，所以请求路径和签名路径是 /
+    if (ForcePathStyle) {
+      // 后缀式请求在签名时用的路径，要包含存储桶名称，具体说明见本文上述“3.后缀式请求”
+      signPathname = '/' + Bucket + '/';
+    }
+    getAuthorization({
+      Method: 'POST',
+      Pathname: signPathname
+    }, function (AuthData) {
+      var requestTask = wx.uploadFile({
+        url: prefix,
+        name: 'file',
+        filePath: this.data.carWin_img,
+        formData: {
+          'key': Key,
+          'success_action_status': 200,
+          'Signature': AuthData.Authorization,
+          'x-cos-security-token': AuthData.XCosSecurityToken,
+          'Content-Type': '',
+        },
+        success: function (res) {
+          var url = prefix + camSafeUrlEncode(Key).replace(/%2F/g, '/');
+          console.log(res.statusCode);
+          console.log(url);
+          if (/^2\d\d$/.test('' + res.statusCode)) {
+            wx.showModal({
+              title: '上传成功',
+              content: url,
+              showCancel: false
+            });
+          } else {
+            wx.showModal({
+              title: '上传失败',
+              content: JSON.stringify(res),
+              showCancel: false
+            });
+          }
+        },
+        fail: function (res) {
+          wx.showModal({
+            title: '上传失败',
+            content: JSON.stringify(res),
+            showCancel: false
+          });
+        }
+      });
+      requestTask.onProgressUpdate(function (res) {
+        console.log('进度:', res);
+      });
+    });
+    // };
+    // }
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+    this.setData({
+      carWin_img_hidden: true,
+      carWin_img: ''
+    });
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/pyip/pyip.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText":"随手拍"
+}

pages/pyip/pyip.wxml

@@ -0,0 +1,29 @@
+<view>
+	<view class="pyp_box1">
+		<view class="add_text">添加图片或视频</view>
+		<image src="../../images/camera.png" class="xj" bindtap="openCamera" wx:if="{{carWin_img_hidden}}"></image>
+		<image src="{{carWin_img}}" class="xj" bindtap="openCamera" wx:if="{{!carWin_img_hidden}}"></image>
+		<van-button type="primary" block color="#eb3f33" custom-style="width:614rpx;border-radius:10rpx;margin-top:20rpx;" bindtap="submitImgToTxy">提交</van-button>
+	</view>
+	<view class="pyp_box2">
+		<view class="add_text">历史上传</view>
+	</view>
+	<!-- <van-tab title="学一学">
+			<view class="class_box" wx:for="{{dataArr}}" wx:for-index="idx" wx:for-item="item">
+				<view bindtap="goIn" data-item="{{item}}" style="display:flex">
+					<image src="{{item.courseImg}}" mode='aspectFill' class="scimg"></image>
+					<view class="sctext">
+						<view class="t1">{{item.Name}}</view>
+						<view class="t2">
+							<text class="t3">{{item.playTimes}}</text>
+							<text class="t4">{{item.date}}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view wx:if="{{showNull}}">
+				<image src='/images/nodata.png' mode='aspectFill' class="nodata"></image>
+				<view class="nodata_text">暂无数据</view>
+			</view>
+		</van-tab> -->
+</view>

pages/pyip/pyip.wxss

@@ -0,0 +1,30 @@
+page {
+  background-color: #f2f2f2;
+}
+.pyp_box1 {
+  width: 680rpx;
+  height: 620rpx;
+  margin-left: 35rpx;
+  margin-top: 20rpx;
+  background-color: #fff;
+  border-radius: 30rpx;
+}
+.add_text {
+  margin-left: 35rpx;
+  padding-top: 20rpx;
+  color: #000
+}
+.xj{
+  width: 614rpx;
+  height: 393rpx;
+  margin-top: 20rpx;
+  margin-left: 30rpx;
+}
+.pyp_box2 {
+  width: 680rpx;
+  /* height: 620rpx; */
+  margin-left: 35rpx;
+  margin-top: 20rpx;
+  background-color: #fff;
+  border-radius: 30rpx;
+}

pages/startClass/startClass.js

@@ -13,7 +13,6 @@ Page({
         isActive: "0"
       },
       success:  (res)=> {
-        console.log(res.data, "我是即将开班的列表")
         this.setData({
           dataArr: res.data.data
         })

pages/startClass/startClass.wxml

@@ -4,6 +4,7 @@
 		<view class="sctext">
 			<view class="t1">{{item.clasName}}</view>
 			<view class="t2">主办：{{item.remark}}</view>
+			<view class="t2">承办：{{item.organizer}}</view>
 			<view class="t2">开班时间：{{item.beginDate}} 至 {{item.endDate}}</view>
 		</view>
 	</view>

pages/studentRegistration/studentRegistration.js

@@ -2,6 +2,13 @@ const tools = require('../../utils/tools.js');
 const app = require('../../utils/util.js');
 Page({
   data: {
+    kaihutext:'请选择',
+    kaihuList:[
+      {   name:'高中'},
+      {   name:'大专'},
+      {   name:'本科'},
+      {   name:'硕士'},
+    ],
     nameIsTrue: false, //名字是否填写
     cultureIsTrue: false, //文化是否填写
     graduationIsTrue: false, //毕业学校
@@ -81,7 +88,12 @@ Page({
     date = new Date(date);
     return `${date.getFullYear()-1}/${date.getMonth() + 1}/${date.getDate()}`;
   },
-
+  kaihuListChange: function (e) {
+    this.setData({
+      kaihuindex: e.detail.value,
+      kaihutext: '',
+    })
+  },
   share1() {
     this.setData({
       postshow: true
@@ -97,7 +109,6 @@ Page({
     return `${date.getFullYear()-1}/${date.getMonth() + 1}/${date.getDate()}`;
   },
   onConfirm(event) {
-    console.log(event, "0000");
     let timeValue = this.timeFormat(new Date(event.detail), "yyyy-MM-dd");
     this.setData({
       tenure: timeValue,
@@ -106,7 +117,6 @@ Page({
     });
   },
   onConfirm1(event) {
-    console.log(event, "0000");
     let timeValue = this.timeFormat(new Date(event.detail), "yyyy-MM-dd");
     this.setData({
       peixunTime: timeValue,
@@ -131,7 +141,6 @@ Page({
   },
 
   formSubmit(e) {
-    console.log(e.detail.value, "000000000000000");
     if (!e.detail.value.username) {
       this.setData({
         nameIsTrue: true
@@ -233,13 +242,8 @@ Page({
         peixunshijianTrue: false
       })
     }
-
-    console.log(this.data.tenure, "在职时间000");
-    console.log(this.data.peixunTime, "培训时间000");
-    console.log(sex, "性别的");
     e.detail.value.tenure = this.data.tenure;
     e.detail.value.sessionKey = this.data.sessionKey;
-    console.log(e.detail.value, "我是合并后的锕");
     let aa = e.detail.value
     wx.request({
       url: app.globalData.publicUrl + '/wx/student/upStudent',
@@ -297,7 +301,6 @@ Page({
     this.getBanner(sessionKey);
   },
   getBanner(sessionKey) {
-    console.log(sessionKey, "sessionKey");
     wx.request({
       url: app.globalData.publicUrl + '/wx/student/selStudentSessionKeyEcho',
       method: "post",
@@ -306,19 +309,17 @@ Page({
       },
       success: (res) => {
         if (res.data.code == 0) {
-          console.log(res, "suoyoude");
           this.data.parameter.forEach(item => {
             if (item.value == res.data.data.studentSex) {
               item.checked = true;
             }
           })
-          console.log(this.data.parameter);
           this.setData({
             info: res.data.data,
             parameter: this.data.parameter,
             studentDept: res.data.data.studentDept,
             studentDuty:res.data.data.studentDuty,
-            culture:res.data.data.culture,
+            kaihutext:res.data.data.culture,
             major:res.data.data.major,
             tenure:res.data.data.tenure,
             studentPhone:res.data.data.studentPhone,

pages/studentRegistration/studentRegistration.wxml

@@ -65,11 +65,11 @@
 				<!-- <view class='weui-input'>
 					<input class="" name="culture" value="{{culture }}" placeholder="请输入文化程度" placeholder-style="font-size:25rpx"/>
 				</view> -->
-				<!-- <picker bindchange="kaihuListChange" value="{{kaihuList[kaihuindex]._id}}" range-key="{{'name'}}" range="{{kaihuList}}" disabled="{{flag}}">
-            <view class="picker">
-              {{kaihuList[kaihuindex].name}} <text >{{kaihutext}}</text>
-            </view>
-       </picker> -->
+				<picker bindchange="kaihuListChange"  name="culture" value="{{kaihuList[kaihuindex].name}}" range-key="{{'name'}}" range="{{kaihuList}}" disabled="{{flag}}">
+						<view class="weui-input aaa">
+							{{kaihuList[kaihuindex].name}} <text >{{kaihutext == null? '请选择':kaihutext}}</text>
+						</view>
+					</picker>
 			</view>
 			<view class='fwb'>
 				<view class="red-image">

pages/studentRegistration/studentRegistration.wxss

@@ -126,4 +126,8 @@ radio {
   background: linear-gradient(90deg, rgba(215, 47, 29, 1), rgba(249, 157, 48, 1)) !important;
   color: white !important;
  
+}
+.aaa{
+  padding: 10rpx 0;
+  color: #808080;
 }

pages/study/study.js

@@ -0,0 +1,82 @@
+// pages/study/study.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    showNull: false,
+    dataArr: [{
+      courseImg: '../../images/mb.png',
+      Name: '11111',
+      playTimes: "3jdsjdjsdj较好的看看较好的 代售点是多少电竞盛典 说的话是滴是滴 的好时机啊克鲁赛德 第三代ad 十赌九输卡加大大地啊的",
+      date: "2019-09-09"
+    }, {
+      courseImg: '../../images/mb.png',
+      Name: '11111',
+      playTimes: 3,
+      date: "0000"
+    }, {
+      courseImg: '../../images/mb.png',
+      Name: '11111',
+      playTimes: 3,
+      date: "0000"
+    }],
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/study/study.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText":"随便学"
+}

pages/study/study.wxml

@@ -0,0 +1,18 @@
+<view>
+	<view class="class_box" wx:for="{{dataArr}}" wx:for-index="idx" wx:for-item="item">
+		<view bindtap="goIn" data-item="{{item}}" style="display:flex">
+			<image src="{{item.courseImg}}" mode='aspectFill' class="scimg"></image>
+			<view class="sctext">
+				<view class="t1">{{item.Name}}</view>
+				<view class="t2">
+					<text class="t3">{{item.playTimes}}</text>
+					<text class="t4">{{item.date}}</text>
+				</view>
+			</view>
+		</view>
+	</view>
+	<view wx:if="{{showNull}}">
+		<image src='/images/nodata.png' mode='aspectFill' class="nodata"></image>
+		<view class="nodata_text">暂无数据</view>
+	</view>
+</view>

pages/study/study.wxss

@@ -0,0 +1,71 @@
+page {
+  background-color: #f2f2f2;
+}
+.class_box {
+  width: 710rpx;
+  margin-left: 20rpx;
+  margin-top: 30rpx;
+  background-color: #fff;
+  border-radius: 5rpx;
+  box-shadow: inset;
+  /* border: 1px solid red; */
+  display: flex;
+  align-items:center;
+}
+.scimg {
+  width: 150rpx;
+  height: 141rpx;
+  margin-top: 20rpx;
+  padding-bottom: 20rpx;
+  margin-left: 20rpx;
+  margin-right: 20rpx;
+  border-radius: 5rpx;
+  /* display: flex; */
+  /* align-items:center; */
+}
+.sctext {
+  width: 515rpx;
+  /* margin-top: 20rpx; */
+  font-size: 25rpx;
+  /* padding-bottom: 20rpx; */
+  /* border: 1px solid red; */
+}
+ .t1 {
+  color: #000;
+  font-size: 28rpx;
+  margin-top: 20rpx;
+  font-weight: 700;
+}
+.t2 {
+  display: block;
+  /* margin-bottom: 20rpx; */
+  color: #999999;
+  font-size: 24rpx;
+  /* border: 1px solid red; */
+  /* display: flex;
+  justify-content:space-between; */
+  /* flex-wrap:wrap; */
+  /* float: left; */
+}
+.t3 {
+  font-size: 24rpx;
+  float: left;
+}
+.t4 {
+  font-size: 24rpx;
+  float: right;
+}
+.nodata {
+  position: absolute;
+  top: 285rpx;
+  left: 205rpx;
+  width: 340rpx;
+  height: 262rpx;
+}
+.nodata_text{
+  position: absolute;
+  top: 550rpx;
+  left: 310rpx;
+  font-size: 30rpx;
+  color: #666666;
+}

pages/testAnswer/testAnswer.js

@@ -1,49 +1,20 @@
-//logs.js
-// const util = require('../../utils/util.js')
 const tools = require('../../utils/tools.js');
 const app = require('../../utils/util.js');
 Page({
   data: {
     showNull: false,
     dataArr: [
-      // {
-      //   "image": "/images/scdj1.jpg",
-      //   "name": "长春市社区工作者线上培训班",
-      //   "lecturer": "李老师",
-      //   "examBegin": "2020年07月10日",
-      //   examBegin:'2020202020222222'
-      // },{
-      //   "image": "/images/scdj2.jpg",
-      //   "name": "长春市专职党务工作者线上培训班",
-      //   "lecturer": "刘老师",
-      //   "examBegin": "2020年07月12日"
-      // },{
-      //   "image": "/images/scdj4.jpg",
-      //   "name": "区域党建联盟",
-      //   "lecturer": "王老师",
-      //   "examBegin": "2020年07月15日"
-      // },{
-      //   "image": "/images/scdj3.jpg",
-      //   "name": "小区党组织建设",
-      //   "lecturer": "张老师",
-      //   "examBegin": "2020年07月30日"
-      // }
+
     ],
     sessionKey: '',
-  },
-  checkboxChange() {
-
   },
   startAnswer(e) {
     let id = e.currentTarget.dataset.idx;
     let paperId = e.currentTarget.dataset.paperid;
     let answersId = e.currentTarget.dataset.answersid;
-    console.log(this.data.sessionKey, "787878");
-
     if (answersId) {
       this.toPath(id, paperId, answersId);
     } else {
-      // 获取answerid
       this.beginKao(id, paperId, this.data.sessionKey);
     }
   },
@@ -53,7 +24,6 @@ Page({
     })
   },
   beginKao(id, paperId, sessionKey) {
-    console.log(paperId, "8888888");
     wx.request({
       url: app.globalData.publicUrl + '/wx/exam/begin',
       method: "post",
@@ -63,16 +33,13 @@ Page({
         paperId: paperId
       },
       success: (res) => {
-        console.log(res);
         if (res.data.code == 0) {
-          console.log(res, "为我么我们微妙"); // 提交答案是后
           this.toPath(id, paperId, res.data.answersId);
         }
       }
     })
   },
   lookAnswer(e) {
-    console.log("00000");
     let answersId = e.currentTarget.dataset.answersid;
     wx.request({
       url: app.globalData.publicUrl + '/wx/answer/detail',
@@ -82,13 +49,7 @@ Page({
         answersId: answersId
       },
       success: (res) => {
-        console.log(res);
-
         if (res.data.code == 0) {
-          console.log(res, "suoyoude");
-          // wx.navigateTo({
-          //   url: '/pages/grade/grade?answersId=' + answersId,
-          // })
           if (res.data.list[0].answerScore) {
             wx.navigateTo({
               url: '/pages/grade/grade?answersId=' + answersId,
@@ -101,25 +62,6 @@ Page({
 
             })
           }
-          // res.data.list[0].forEach(item => {
-          //   if (item.answerScore) {
-          //     wx.navigateTo({
-          //       url: '/pages/grade/grade?answersId=' + answersId,
-          //     })
-          //   } else {
-          //     wx.showModal({
-          //       showCancel: false,
-          //       content: '当前老师批阅中,请耐心等待',
-          //       success(res) {}
-          //     })
-          //     // wx.showModal({
-          //     //   title: '提示',
-          //     //   content: '当前老师批阅中,请耐心等待',
-          //     //   showCancel: false,
-
-          //     // })
-          //   }
-          // })
         }
       }
     })
@@ -127,27 +69,12 @@ Page({
   },
   async onShow() {
     const sessionKey = await tools.checkSessionAndLogin();
-    //const sessionKey = 'yoa0rZTt2bAiTVDsiRjysw==';
     this.setData({
       sessionKey: sessionKey
     })
-    //....................
-    // if (wx.getStorageSync('questionList')) {
-    //   console.log("缓存锕锕66666666666666666666666666666666666666666666666666666");
-    //   this.setData({
-    //     questionList: wx.getStorageSync('questionList'),
-    //     index: wx.getStorageSync('titleINDEX'),
-    //     answersId:wx.getStorageSync('answersId'),
-    //     chooseValue:wx.getStorageSync('chooseValue'),
-    //   })
-    // } else {
-    //   console.log("请求了锕66666666666666666666666666666666666666666666666666666");
-
-    // }
     this.getBanner(sessionKey);
   },
   getBanner(sessionKey) {
-    console.log(sessionKey, "sessionKey");
     wx.request({
       url: app.globalData.publicUrl + '/wx/exam/list',
       method: "post",
@@ -161,12 +88,10 @@ Page({
               showNull: true
             })
           } else {
-            console.log(res.data.list)
             let newArr = res.data.list.findIndex(item => {
               return item.questSub == '10'
             })
-            console.log(newArr,"1111");
-            if(newArr == 0 || newArr ){
+            if (newArr == 0 || newArr) {
               wx.request({
                 url: app.globalData.publicUrl + '/wx/course/selectBySessionKey',
                 method: "post",
@@ -174,26 +99,24 @@ Page({
                   sessionKey: sessionKey
                 },
                 success: (res1) => {
-                  console.log(res1,"打印看看都学完了么");
-                    // 都学完了
-                    if(res1.data.allDone){
-                      this.setData({
-                        dataArr:res.data.list
-                      })
-                    }else {
-                     let arr =  res.data.list.filter(item=>{
-                        return item.questSub != '10'
-                      });
-                      this.setData({
-                        dataArr:arr
-                      })
-                    }
+                  if (res1.data.allDone) {
+                    this.setData({
+                      dataArr: res.data.list
+                    })
+                  } else {
+                    let arr = res.data.list.filter(item => {
+                      return item.questSub != '10'
+                    });
+                    this.setData({
+                      dataArr: arr
+                    })
+                  }
                 },
               })
-            }else {
-               this.setData({
+            } else {
+              this.setData({
                 dataArr: res.data.list
-               }) 
+              })
             }
           }
         }

pages/testAnswer/testAnswer.wxss

@@ -1,7 +1,7 @@
 .class_box {
   width: 710rpx;
   margin-left: 20rpx;
-  height: 165rpx;
+  /* height: 165rpx; */
   padding-bottom: 30rpx;
   /* border: 1px solid red; */
   /* margin-top: 30rpx; */
@@ -14,13 +14,14 @@
   width: 150rpx;
   height: 141rpx;
   float: left;
-  margin-top: 20rpx;
+  margin-top: 50rpx;
 }
 
 .sctext {
   float: right;
-  height: 165rpx;
+  /* height: 165rpx; */
   width: 530rpx;
+  margin-top: 40rpx;
   /* border: 1px solid red;   */
 }
 

pages/welcome/welcome.wxml

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

pages/zbDetails/zbDetails.js

@@ -11,7 +11,6 @@ Page({
       template: '1v1', // 必要参数 组件模版，支持的值 1v1 grid custom ，注意：不支持动态修改, iOS 不支持 pusher 动态渲染
     },
     roomIdandcourseId: "",
-    // imsdkAppID: 1400404379,
     currentGroup: null,
     chatContent: [],
     inputValue: '',

pages/zbDetails/zbDetails.wxml

@@ -3,7 +3,7 @@
 		<trtc-room id="trtcroom" config="{{rtcConfig}}" scene="live"></trtc-room>
 		<view class="area">
 			<view class="chatbox">
-				<scroll-view scroll-y="true" style="height: 280rpx;width:690rpx;" bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" scroll-into-view="{{bottom}}" scroll-top="{{scrollTop}}">
+				<scroll-view scroll-y="true" style="height: 490rpx;width:690rpx;" bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" scroll-into-view="{{bottom}}" scroll-top="{{scrollTop}}">
 					<view style="padding:30rpx">
 						<view wx:for="{{chatContent}}" wx:for-index="idx" wx:for-item="item" wx:key="idx" class="chat_text">
 							<text>{{item.nick}}:</text>{{item.payload.text}}

utils/util.js

@@ -1,8 +1,9 @@
 const globalData = {
   publicUrl: 'https://sqpx.jiaxintech.com',
   // publicUrl:'http://10.16.10.139'
-  // publicUrl:'http://10.16.4.19'
+  // publicUrl:'http://10.16.4.19:80'
+  // publicUrl:'http://10.16.4.26:8090'
 };
 module.exports = {
-  globalData: globalData,
+  globalData: globalData
 }