0731定板

app.json

@@ -1,13 +1,15 @@
 {
   "pages": [
+    "pages/pyip/pyip",
     "pages/welcome/welcome",
-    "pages/groupsList/groupsList",
+    
+    "pages/userGuide/userGuide",
     "pages/studentList/studentList",
+    "pages/groupsList/groupsList",
     "pages/myClass/myClass",
     "pages/schoolIntrouce/schoolIntrouce",
     "pages/testAnswer/testAnswer",
     "pages/InteractiveQA/InteractiveQA",
-    "pages/pyip/pyip",
     "pages/demandCourses/demandCourses",
     "pages/studentRegistration/studentRegistration",
     "pages/zbDetails/zbDetails",
@@ -36,9 +38,7 @@
     "pages/Identity/Identity",
     "pages/myTraining/myTraining",
     "pages/agoClass/agoClass",
-    "pages/grade/grade",
-    "pages/study/study"
-    
+    "pages/grade/grade"
   ],
   "window": {
     "backgroundTextStyle": "light",

components/trtc-room/trtc-room.wxml

@@ -1,7 +1,6 @@
 <import src='./template/1v1/1v1.wxml'/>
 <import src='./template/grid/grid.wxml'/>
 <import src='./template/custom/custom.wxml'/>
-
 <view class="trtc-room-container {{isFullscreenDevice?'fullscreen-device-fix':''}}">
   <block wx:if="{{template === '1v1'}}">
     <template is='1v1' data="{{pusher, streamList, debug, enableIM}}"></template>
@@ -12,7 +11,6 @@
   <block wx:if="{{template === 'custom'}}">
     <template is='custom' data="{{pusher, streamList, debug}}"></template>
   </block>
-
   <view class="im-panel" wx:if="{{enableIM && showIMPanel}}">
     <view class="message-panel-body">
       <scroll-view scroll-y="true" class="message-scroll-container" scroll-into-view="message{{messageList.length-1}}" scroll-with-animation="{{true}}">

pages/Identity/Identity.js

@@ -44,12 +44,12 @@ Page({
             }
           })
         } 
-        // else {
-        //   wx.showModal({
-        //     showCancel: false,
-        //     content: res.data.msg
-        //   })
-        // }
+        else {
+          wx.showModal({
+            showCancel: false,
+            content: res.data.msg
+          })
+        }
       }
     })
   },

pages/InteractiveQA/InteractiveQA.js

@@ -19,7 +19,7 @@ Page({
   },
   toXyix(){
     wx.navigateTo({
-      url: '../study/study'
+      url: '/pages/exhibitionList/exhibitionList?id=2',
     })
   },
   /**

pages/answerAfterclass/answerAfterclass.js

@@ -256,18 +256,17 @@ 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

@@ -241,17 +241,17 @@ 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/evaluationCourse/evaluationCourse.js

@@ -386,27 +386,6 @@ 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
-        //       })
-        //     }
-        //   })
-        // }
       }
     })
   },

pages/feedBack/feedBack.wxml

@@ -21,9 +21,9 @@
 			</view>
 		<view class='fwb' wx:if="{{ item.QuestType == 0}}">
 			<view class="red-image">
-				<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+				<image src="/images/quan.png" style="width:20rpx;height:20rpx;  position: relative; top: 8rpx; "> </image>
+				<view class="xingbie tebie">{{item.QuestStem}}</view>
 			</view>
-			<view class="xingbie">{{item.QuestStem}}</view>
 			<view class='weui-input' style=" background: white">
 				<radio-group name="{{item.name}}" data-index='{{index}}' data-idx='{{item.Id}}' data-questTypes='{{item.QuestType}}' bindchange="radioChange">
 					<label class="checkbox my-choosebox {{ item.checked?'checkboxbox':''}}" wx:for-index="idx" wx:for="{{item.QuestChoice}}">
@@ -32,7 +32,6 @@
 				</radio-group>
 			</view>
 		</view>
-
 		<view class='fwb' wx:if="{{ item.QuestType == 1}}">
 			<view class="red-image">
 				<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
@@ -44,10 +43,8 @@
 						<checkbox value="{{ item.value }}" />{{item.name}}
 					</label>
 				</checkbox-group>
-				<!-- <view class="{{nameIsTrue?'error':'noerror'}}">请输入姓名</view> -->
 			</view>
 		</view>
-
 		<view class='fwb' wx:if="{{ item.QuestType == 2}}">
 			<view class="red-image">
 				<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
@@ -59,25 +56,20 @@
 						<radio value="{{ item.value }}" />{{item.name}}
 					</label>
 				</radio-group>
-				<!-- <view class="{{nameIsTrue?'error':'noerror'}}">请输入姓名</view> -->
 			</view>
 		</view>
-		
 		<view class='fwb' wx:if="{{ item.QuestType == 6}}"> 
 				<view class="red-image">
 					<image src="/images/quan.png" style="width:20rpx;height:20rpx;"> </image>
 				</view>
 				<view class="xingbie">{{item.QuestStem}}</view>
 			<view class='weui-input' style="font-size: 26rpx;  line-height: 56rpx;"  data-index = '{{index}}' data-names='{{item.name}}'  catchtap="share1" name="{{item.name}}">
-					<!-- QuestAnswer   chooseValue[index].currentAnswer -->
 			{{questionList[index].QuestAnswer}}<view wx:if='{{!questionList[index].QuestAnswer}}' style="color:#808080;display: inline-block;height:60rpx;line-height:60rpx;font-size:25rpx" >请选择</view>
-					<!-- <view class="{{renzhishijianIsTrue?'error':'noerror'}}">请输入任职时间</view> -->
 				</view>
 				<van-popup  show="{{ postshow[index] }}" position="bottom" custom-style="height: 50%;">
 					<van-datetime-picker  data-index='{{index}}' data-questTypes='{{item.QuestType}}' data-idx = '{{item.Id}}'  bind:confirm="onConfirm" bind:cancel='onClose'  type="date" value="{{ currentDate }}" bind:input="onInput" min-date="{{ minDate }}" formatter="{{ formatter }}" />
 				</van-popup>
 			</view>
-
 		</view>
 		<view style="margin-top: 100rpx;margin-bottom:100rpx">
 			<van-button   round bindtap="submitForm">提交表单</van-button>

pages/feedBack/feedBack.wxss

@@ -59,6 +59,7 @@ button:not([size='mini']) {
   display: flex;
   font-size: 28rpx;
   margin-top: 40rpx;
+  flex-direction: column;
 }
 
 
@@ -87,8 +88,7 @@ button:not([size='mini']) {
 .weui-input {
   margin-left: 20rpx;
   background: #F4F4F4;
-  width: 474rpx;
-
+  /* width: 474rpx; */
 }
 
 .weui-input input {
@@ -103,13 +103,15 @@ button:not([size='mini']) {
 
 .xingbie {
   margin-left: 10rpx;
-  width: 130rpx;
-  line-height: 60rpx;
+  width: 90%;
+  display: inline-block;
+
 }
 
 .red-image {
-  vertical-align: text-bottom;
   margin-top: 10rpx;
+  display: flex;
+ 
 }
 
 input {
@@ -128,6 +130,7 @@ textarea {
   width: 100%;
   height: 194rpx;
   margin-top: 20rpx;
+
 }
 
 .fwt {
@@ -157,7 +160,7 @@ textarea {
 .checkboxbox {
   background: linear-gradient(90deg, rgba(215, 47, 29, 1), rgba(249, 157, 48, 1)) !important;
   color: white !important;
- 
+
 }
 
 .my-choosebox {

pages/index/index.js

@@ -100,7 +100,8 @@ Page({
       })
     } else if (e.currentTarget.dataset.id == 2) {
       wx.navigateTo({
-        url: '/pages/myInteractions/myInteractions',
+        // url: '/pages/myInteractions/myInteractions',
+        url:'/pages/InteractiveQA/InteractiveQA'
       })
     } else if (e.currentTarget.dataset.id == 3) {
       wx.navigateTo({

pages/myClass/myClass.js

@@ -304,9 +304,13 @@ Page({
   },
   // 学员名单
   toAdd2() {
-    wx.navigateTo({
-      url: '../studentList/studentList?id=' + this.data.classInfo.id
+    wx.showModal({
+      showCancel: false,
+      content: '当前功能暂未开放'
     })
+    // wx.navigateTo({
+    //   url: '../studentList/studentList?id=' + this.data.classInfo.id
+    // })
   },
   // 项目组名单
   toAdd3() {
@@ -653,15 +657,17 @@ Page({
                     answersId: res.data.list[0].answersId
                   },
                   success: (res1) => {
-                    if (res1.data.list[0].answerScore) {
-                      wx.navigateTo({
-                        url: '/pages/grade/grade?answersId=' + res.data.list[0].answersId,
-                      })
-                    } else {
+                    // if (res1.data.list[0].answerScore) {
+                    if (res1.data.list[0].answerScore < 0 && (res1.data.list[0].answerScore == null || res1.data.list[0].answerScore == "")) {
                       wx.showModal({
                         showCancel: false,
                         content: '当前老师批阅中,请耐心等待'
                       })
+
+                    } else {
+                      wx.navigateTo({
+                        url: '/pages/grade/grade?answersId=' + res.data.list[0].answersId,
+                      })
                     }
                   }
                 })

pages/myClass/myClass.wxml

@@ -18,7 +18,7 @@
 		</van-row>
 	</view>
 	<van-divider contentPosition="center" customStyle="color: #eb3f33; border-color: #eb3f33; font-size: 30rpx;font-weight:900;position:relative">
-		<image src='{{classInfo.logoImg}}' mode='aspectFill' class="banjihz"></image><text>{{classInfo.clasName}}</text>
+		<image src='{{classInfo.logoImg}}' mode='aspectFill' class="banjihz" wx:if="{{classInfo.logoImg}}"></image><text>{{classInfo.clasName}}</text>
 	</van-divider>
 	<view class="layout" bindtap="goWrite">
 		<image src='/images/xydj_bj.png' mode='aspectFill' class="bgimg1"></image>

pages/myMission/myMission.js

@@ -509,11 +509,82 @@ Page({
     }
   },
   // 期末考试
+  // goQmks() {
+  //   if (!this.data.istask3) {
+  //     wx.showModal({
+  //       showCancel: false,
+  //       content: "请先完成所有的课程再来期末考试吧！"
+  //     })
+  //     return false
+  //   }
+  //   wx.request({
+  //     url: app.globalData.publicUrl + '/wx/exam/examList',
+  //     method: "post",
+  //     data: {
+  //       sessionKey: this.data.sessionKey,
+  //       clasId: this.data.classInfo.id
+  //     },
+  //     success: (res) => {
+  //       if (res.data.code == 0) {
+  //         if (res.data.list.length == 0) {
+  //           wx.showModal({
+  //             showCancel: false,
+  //             content: '期末考试还未开始哦！'
+  //           })
+  //         } else {
+  //           if (res.data.list[0]) {
+  //             if (res.data.list[0].answersId) {
+  //               if (res.data.list[0].status == '1') {
+  //                 wx.request({
+  //                   url: app.globalData.publicUrl + '/wx/answer/detail',
+  //                   method: "post",
+  //                   data: {
+  //                     answersId: res.data.list[0].answersId
+  //                   },
+  //                   success: (res1) => {
+  //                     if (res1.data.list[0].answerScore) {
+  //                       wx.navigateTo({
+  //                         url: '/pages/grade/grade?answersId=' + res.data.list[0].answersId,
+  //                       })
+  //                     } else {
+  //                       wx.showModal({
+  //                         showCancel: false,
+  //                         content: '当前老师批阅中,请耐心等待'
+  //                       })
+  //                     }
+  //                   }
+  //                 })
+  //               } else {
+  //                 this.toPath(res.data.list[0].id, res.data.list[0].paperId, res.data.list[0].answersId, 'answerAfterclass');
+  //               }
+  //             } else {
+  //               this.beginKao(res.data.list[0].id, res.data.list[0].paperId, this.data.sessionKey, 'answerAfterclass');
+  //             }
+  //           }
+  //         }
+  //       }
+  //     }
+  //   })
+  // },
   goQmks() {
+    if (!this.data.istask) {
+      wx.showModal({
+        showCancel: false,
+        content: "请先去扫描二维码加入班级群吧",
+        success(res) {
+          if (res.confirm) {
+            wx.switchTab({
+              url: '../myMission/myMission'
+            })
+          }
+        }
+      })
+      return false
+    }
     if (!this.data.istask3) {
       wx.showModal({
         showCancel: false,
-        content: "请先完成所有的课程再来期末考试吧！"
+        content: "您的课程任务还未全部完成哦！请先去完成再来期末考试吧！"
       })
       return false
     }
@@ -532,34 +603,34 @@ Page({
               content: '期末考试还未开始哦！'
             })
           } else {
-            if (res.data.list[0]) {
-              if (res.data.list[0].answersId) {
-                if (res.data.list[0].status == '1') {
-                  wx.request({
-                    url: app.globalData.publicUrl + '/wx/answer/detail',
-                    method: "post",
-                    data: {
-                      answersId: res.data.list[0].answersId
-                    },
-                    success: (res1) => {
-                      if (res1.data.list[0].answerScore) {
-                        wx.navigateTo({
-                          url: '/pages/grade/grade?answersId=' + res.data.list[0].answersId,
-                        })
-                      } else {
-                        wx.showModal({
-                          showCancel: false,
-                          content: '当前老师批阅中,请耐心等待'
-                        })
-                      }
+            if (res.data.list[0].answersId) {
+              if (res.data.list[0].status == '1') {
+                wx.request({
+                  url: app.globalData.publicUrl + '/wx/answer/detail',
+                  method: "post",
+                  data: {
+                    answersId: res.data.list[0].answersId
+                  },
+                  success: (res1) => {
+                    // if (res1.data.list[0].answerScore) {
+                    if (res1.data.list[0].answerScore < 0 && (res1.data.list[0].answerScore == null || res1.data.list[0].answerScore == "")) {
+                      wx.showModal({
+                        showCancel: false,
+                        content: '当前老师批阅中,请耐心等待'
+                      })
+
+                    } else {
+                      wx.navigateTo({
+                        url: '/pages/grade/grade?answersId=' + res.data.list[0].answersId,
+                      })
                     }
-                  })
-                } else {
-                  this.toPath(res.data.list[0].id, res.data.list[0].paperId, res.data.list[0].answersId, 'answerAfterclass');
-                }
+                  }
+                })
               } else {
-                this.beginKao(res.data.list[0].id, res.data.list[0].paperId, this.data.sessionKey, 'answerAfterclass');
+                this.toPath(res.data.list[0].id, res.data.list[0].paperId, res.data.list[0].answersId, 'answerAfterclass');
               }
+            } else {
+              this.beginKao(res.data.list[0].id, res.data.list[0].paperId, this.data.sessionKey, 'answerAfterclass');
             }
           }
         }
@@ -735,15 +806,16 @@ Page({
           answersId: e.currentTarget.dataset.item.isExamId
         },
         success: (res) => {
-          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,
+            })
           }
         }
       })

pages/myPoints/myPoints.wxml

@@ -1,7 +1,7 @@
 <view class="container">
 	<view class="show_box">
 		<image src="/images/redcloud.png" mode='aspectFill' class="cloud_img"></image>
-		<view class="jfnum">80</view>
+		<view class="jfnum">0</view>
 		<view class="jftext">当前可用积分</view>
 	</view>
 	<view class="prize_box">

pages/personInfo/personInfo.js

@@ -26,5 +26,14 @@ Page({
     wx.navigateTo({
       url: '/pages/last/last',
     })
+  },
+  toUser(){
+    wx.showModal({
+      showCancel: false,
+      content: '当前功能暂未开放'
+    })
+    // wx.navigateTo({
+    //   url: '/pages/userGuide/userGuide',
+    // })
   }
 })

pages/personInfo/personInfo.wxml

@@ -46,6 +46,14 @@
 				<view class='right-bpx'>
 					<view class='big-title' >身份认证</view>
 				</view>
+			</view>
+						<view class="content" bindtap="toUser">
+				<view>
+					<van-image fit="cover" width="76rpx" height="76rpx" src="/images/person6.png" />
+				</view>
+				<view class='right-bpx'>
+					<view class='big-title' >使用指南</view>
+				</view>
 			</view>
 		</view> 
 </view>

pages/pyip/pyip.js

@@ -1,5 +1,6 @@
 // pages/pyip/pyip.js
-const COS = require('../../utils/cos-wx-v5.js');
+const COS = require('../../utils/cos.js');
+const app = require('../../utils/util.js');
 Page({
   /**
    * 页面的初始数据
@@ -9,35 +10,34 @@ Page({
     carWin_img: '' //存放照片路径的
   },
   openCamera() {
-    var that = this;
-    wx.chooseImage({
+    wx.chooseMedia({
       count: 1,
+      mediaType: ['image', 'video'],
+      sourceType: ['album', 'camera'],
+      maxDuration: 30,
+      camera: 'back',
       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 () {
-
+        console.log(res.tempFiles[0].tempFilePath)
+        console.log(res.tempFiles[0].size)
+        this.setData({
+          carWin_img: res.tempFiles[0].tempFilePath,
+          carWin_img_hidden: false,
+        })
       }
-    });
+    })
   },
   submitImgToTxy() {
+    if (this.data.carWin_img == "" || this.data.carWin_img == null) {
+      wx.showModal({
+        title: '请点击上方选择照片或者视频哦',
+        showCancel: false
+      });
+      return false
+    }
+    wx.showLoading({
+      mask: true,
+      title: '加载中',
+    })
     // 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';
@@ -66,15 +66,14 @@ Page({
         return;
       }
       wx.request({
-        method: 'GET',
-        url: 'https://example.com/sts.php', // 服务端签名，参考上文说的获取临时密钥
-        dataType: 'json',
+        method: 'POST',
+        url: app.globalData.publicUrl + '/wx/course/getSts', // 服务端签名，参考上文说的获取临时密钥
+        // dataType: 'json',
         success: function (result) {
-          console.log(result)
-          var data = result.data;
-          var credentials = data.credentials;
+          console.log(result, "000000000000")
+          var credentials = result.data.credential.credentials;
           if (credentials) {
-            stsCache = data
+            stsCache = result.data.credential
           } else {
             wx.showModal({
               title: '临时密钥获取失败',
@@ -110,6 +109,7 @@ Page({
     // 上传文件
     // var uploadFile = function (filePath) {
     var Key = this.data.carWin_img.substr(this.data.carWin_img.lastIndexOf('/') + 1); // 这里指定上传的文件名
+    // var Key = '456abcd.png';
     var signPathname = '/'; // PostObject 接口 Key 是放在 Body 传输，所以请求路径和签名路径是 /
     if (ForcePathStyle) {
       // 后缀式请求在签名时用的路径，要包含存储桶名称，具体说明见本文上述“3.后缀式请求”
@@ -118,46 +118,56 @@ Page({
     getAuthorization({
       Method: 'POST',
       Pathname: signPathname
-    }, function (AuthData) {
+    }, (AuthData) => {
       var requestTask = wx.uploadFile({
         url: prefix,
         name: 'file',
         filePath: this.data.carWin_img,
         formData: {
-          'key': Key,
+          'key': "paiyipai/"+Key,
           'success_action_status': 200,
           'Signature': AuthData.Authorization,
           'x-cos-security-token': AuthData.XCosSecurityToken,
           'Content-Type': '',
         },
-        success: function (res) {
+        success: (res) => {
           var url = prefix + camSafeUrlEncode(Key).replace(/%2F/g, '/');
+          console.log('prefix' + prefix);
+          console.log('Key' + Key);
+          console.log('4564564654654');
           console.log(res.statusCode);
           console.log(url);
           if (/^2\d\d$/.test('' + res.statusCode)) {
             wx.showModal({
               title: '上传成功',
-              content: url,
               showCancel: false
             });
+            this.setData({
+              carWin_img: "",
+              carWin_img_hidden:true
+            })
           } else {
             wx.showModal({
               title: '上传失败',
-              content: JSON.stringify(res),
+              // content: JSON.stringify(res),
               showCancel: false
             });
           }
         },
         fail: function (res) {
+          wx.hideLoading();
           wx.showModal({
             title: '上传失败',
-            content: JSON.stringify(res),
+            // content: JSON.stringify(res),
             showCancel: false
           });
         }
       });
       requestTask.onProgressUpdate(function (res) {
         console.log('进度:', res);
+        if (res.progress == 100) {
+          wx.hideLoading();
+        }
       });
     });
     // };
@@ -166,7 +176,7 @@ Page({
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function (options) {
+  onLoad: function () {
 
   },
 

pages/pyip/pyip.wxml

@@ -5,25 +5,7 @@
 		<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="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> -->
 </view>

pages/studentList/studentList.wxml

@@ -1,14 +1,14 @@
-<view>
+<view class="block">
 	<van-row class="text1">
-		<van-col span="6">姓名</van-col>
-		<van-col span="6">性别</van-col>
-		<van-col span="6">工作单位及职务</van-col>
-		<van-col span="6">联系方式</van-col>
+		<van-col span="4">姓名</van-col>
+		<van-col span="3">性别</van-col>
+		<van-col span="9">工作单位及职务</van-col>
+		<van-col span="8">联系方式</van-col>
 	</van-row>
-	<van-row class="text1" wx:for="{{Arr}}" wx:for-item="item">
-		<van-col span="6">{{item.name}}</van-col>
-		<van-col span="6">{{item.sex}}</van-col>
-		<van-col span="6">{{item.sex}}</van-col>
-		<van-col span="6">{{item.phone}}</van-col>
+	<van-row class="text2" wx:for="{{Arr}}" wx:for-item="item">
+		<van-col span="4">{{item.name}}</van-col>
+		<van-col span="3">{{item.sex}}</van-col>
+		<van-col span="9">{{item.zw}}</van-col>
+		<van-col span="8">{{item.phone}}</van-col>
 	</van-row>
 </view>

pages/studentList/studentList.wxss

@@ -1,5 +1,22 @@
+.block{
+  width: 750rpx;
+  /* margin-left: 25rpx; */
+}
 .text1{
   text-align: center;
-  font-size: 25rpx;
+  font-size: 28rpx;
+  line-height: 80rpx;
+  display: block;
   background-color: #fff7e7;
+  border-bottom: 1px solid #cccccc;
+}
+.text2{
+  text-align: center;
+  font-size: 28rpx;
+  line-height: 90rpx;
+  display: block;
+  width: 700rpx;
+  margin-left: 25rpx;
+  border-bottom: 1px solid #cccccc;
+  color: #666666;
 }

pages/study/study.js

@@ -1,82 +0,0 @@
-// 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

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

pages/study/study.wxml

@@ -1,18 +0,0 @@
-<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

@@ -1,71 +0,0 @@
-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/userGuide/userGuide.js

@@ -0,0 +1,72 @@
+// pages/userGuide/userGuide.js
+Page({
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    Arr: [{
+      num: "Q1",
+      question: "我是问题我是问题我是问题我是问题我是问题我是问题我是问题我是问题我是问题我是问题我是问题我是问题我是问题我是问题我是问题我是问题我是问题1",
+      answer: "我是回答我是回答我是回答我是回答我是回答我是回答我是回答我是回答我是回答我是回答我是回答我是回答我是回答我是回答我是回答我是回答我是回答1"
+    }, {
+      num: "Q2",
+      question: "我是问题我是问题我是问题我是问题我是问题我是问题我是问题我是问题我是问题我是问题我是问题我是问题我是问题我是问题我是问题我是问题我是问题2",
+      answer: "我是回答我是回答我是回答我是回答我是回答我是回答我是回答我是回答我是回答我是回答我是回答我是回答我是回答我是回答我是回答我是回答我是回答2"
+    }]
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/userGuide/userGuide.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText":"使用指南"
+}

pages/userGuide/userGuide.wxml

@@ -0,0 +1,11 @@
+<view wx:for="{{Arr}}" wx:for-item="item">
+	<view class="block">
+		<view class="num">
+			{{item.num}}
+		</view>
+		<view class="question">
+			{{item.question}}
+		</view>
+	</view>
+	<view class="hd">{{item.answer}}</view>
+</view>

pages/userGuide/userGuide.wxss

@@ -0,0 +1,26 @@
+.block {
+  display: flex;
+  width: 700rpx;
+  margin-left: 25rpx;
+  margin-top: 20rpx;
+  font-size: 28rpx;
+}
+
+.num {
+  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACIAAAAhCAYAAAC803lsAAAAl0lEQVRYhe3QsQ0BcRTH8c+JNSygsYElzEAhlrCFKcQQrIAF6LWaU8i/eYSL5O4U75u86jWf/KrTZFT7gwZ9A0oJiSUklpBYQmIJiSUklpBYQmIJiSUklpBYQmJNIVfMULV13yA1Nhhj2xD9U8MPvzPm2LcJKL1b5I41Jl0heF3kgAWOXQFKZZEblpj2geC5yA4rXPoAlB7PmxEJGepk2wAAAABJRU5ErkJggg==);
+  background-repeat: no-repeat;
+  background-size: 100% 50rpx;
+  color: #fff;
+  padding-left: 5rpx;
+  padding-right: 5rpx;
+  padding-bottom: 10rpx;
+  margin-right: 20rpx;
+  font-size: 28rpx;
+}
+.hd{
+  width: 625rpx;
+  margin-left: 100rpx;
+  margin-top: 10rpx;
+  color: #999999;
+  font-size: 28rpx;
+}