浏览代码

622版本页面完成

ssfg 5 年之前
父节点
当前提交
910c6b4849
共有 38 个文件被更改,包括 1464 次插入251 次删除
  1. 5 3
      app.json
  2. 二进制
      images/bjewm.png
  3. 二进制
      images/clock.png
  4. 二进制
      images/close.png
  5. 二进制
      images/ewm_closebtn.png
  6. 二进制
      images/ewmbj.png
  7. 二进制
      images/kcxq1.png
  8. 二进制
      images/kcxqb.png
  9. 二进制
      images/quan.png
  10. 二进制
      images/step_finish.png
  11. 二进制
      images/xydj1.png
  12. 二进制
      images/xydj_bj.png
  13. 二进制
      images/xydjb.png
  14. 二进制
      images/zhfk_bj.png
  15. 二进制
      images/zsbj.jpg
  16. 26 7
      pages/demandCourses/demandCourses.js
  17. 11 31
      pages/demandCourses/demandCourses.wxml
  18. 31 87
      pages/demandCourses/demandCourses.wxss
  19. 79 0
      pages/feedBack/feedBack.js
  20. 4 0
      pages/feedBack/feedBack.json
  21. 243 0
      pages/feedBack/feedBack.wxml
  22. 124 0
      pages/feedBack/feedBack.wxss
  23. 10 0
      pages/myClass/myClass.js
  24. 9 4
      pages/myClass/myClass.wxml
  25. 44 9
      pages/myClass/myClass.wxss
  26. 72 7
      pages/myMission/myMission.js
  27. 33 43
      pages/myMission/myMission.wxml
  28. 149 14
      pages/myMission/myMission.wxss
  29. 38 27
      pages/personInfo/personInfo.js
  30. 3 1
      pages/personInfo/personInfo.wxml
  31. 277 0
      pages/studentRegistration/studentRegistration.js
  32. 4 0
      pages/studentRegistration/studentRegistration.json
  33. 155 0
      pages/studentRegistration/studentRegistration.wxml
  34. 110 0
      pages/studentRegistration/studentRegistration.wxss
  35. 3 3
      pages/testAnswer/testAnswer.js
  36. 9 8
      pages/testAnswer/testAnswer.wxml
  37. 24 6
      pages/testAnswer/testAnswer.wxss
  38. 1 1
      project.config.json

+ 5 - 3
app.json

@@ -1,9 +1,10 @@
 {
   "pages": [
-    "pages/index/index",
     "pages/personInfo/personInfo",
+    "pages/myMission/myMission",
+    "pages/index/index",
+   
     "pages/myClass/myClass",
-    
     "pages/testAnswer/testAnswer",
     "pages/demandCourses/demandCourses",
     "pages/onlineClass/onlineClass",
@@ -14,9 +15,10 @@
     "pages/myPoints/myPoints",
     "pages/evaluationCourse/evaluationCourse",
     "pages/Identity/Identity",
-    "pages/myMission/myMission",
     "pages/myTraining/myTraining",
     "pages/agoClass/agoClass",
+    "pages/feedBack/feedBack",
+    "pages/studentRegistration/studentRegistration",
     "pages/startClass/startClass",
     "pages/grade/grade",
     

二进制
images/bjewm.png


二进制
images/clock.png


二进制
images/close.png


二进制
images/ewm_closebtn.png


二进制
images/ewmbj.png


二进制
images/kcxq1.png


二进制
images/kcxqb.png


二进制
images/quan.png


二进制
images/step_finish.png


二进制
images/xydj1.png


二进制
images/xydj_bj.png


二进制
images/xydjb.png


二进制
images/zhfk_bj.png


二进制
images/zsbj.jpg


+ 26 - 7
pages/demandCourses/demandCourses.js

@@ -3,14 +3,33 @@
 
 Page({
   data: {
-    // logs: [],
-    active: 0,
+    xczsArr: [{
+      "url": "/images/show1.jpg",
+      "name": "社区干部综合素质提升培训",
+      "time": "09:10",
+      "people": "1234"
+    }, {
+      "url": "/images/show2.jpg",
+      "name": "社区干部综合素质提升培训",
+      "time": "09:10",
+      "people": "1234"
+    }, {
+      "url": "/images/show3.jpg",
+      "name": "社区干部综合素质提升培训",
+      "time": "09:10",
+      "people": "1234"
+    }, {
+      "url": "/images/show4.jpg",
+      "name": "社区干部综合素质提升培训",
+      "time": "09:10",
+      "people": "1234"
+    }]
   },
   onLoad: function () {
-    // this.setData({
-    //   logs: (wx.getStorageSync('logs') || []).map(log => {
-    //     return util.formatTime(new Date(log))
-    //   })
-    // })
+    this.setData({
+      logs: (wx.getStorageSync('logs') || []).map(log => {
+        return util.formatTime(new Date(log))
+      })
+    })
   }
 })

+ 11 - 31
pages/demandCourses/demandCourses.wxml

@@ -1,33 +1,13 @@
-<!--logs.wxml-->
-<view class="container">
-	<view class="video_box">
-		<view class="video">
-			<image src='../../images/spfm.jpg' mode='aspectFill' class="spbj"></image>
-			<view class="text1">社区干部综合素质提升培训</view>
-			<view class="text2">
-				<image src='../../images/onlinenum.png' mode='aspectFill' class="onlinenumicon"></image>1234人在线观看
+	<view class="xczs">
+		<view class="zb1" wx:for="{{xczsArr}}" wx:for-index="idx" wx:for-item="item" bindtap="turnDetails" id="{{idx}}" wx:key="idx">
+			<image src='{{item.url}}' mode='aspectFill' class="show1"></image>
+			<view class="grayblock">
+				<view class="show_text">{{item.name}}</view>
+				<view class="viedoxx">
+					<image src='/images/clock.png' mode='aspectFill' class="qb"></image>
+					<view style="color:#e82315;font-size:25rpx;font-weight:500;float:left">{{item.time}}</view>
+					<view style="color:#848585;font-size:22rpx;float:right;margin-right:20rpx">{{item.people}}人看过</view>
+				</view>
 			</view>
-			<view class="text3">社区干部综合素质提升培训...</view>
-			<view class="getinroom">进入课堂</view>
 		</view>
-		<view class="video">
-			<image src='../../images/spfm.jpg' mode='aspectFill' class="spbj"></image>
-			<view class="text1">社区干部综合素质提升培训</view>
-			<view class="text2">
-				<image src='../../images/onlinenum.png' mode='aspectFill' class="onlinenumicon"></image>1234人在线观看
-			</view>
-			<view class="text3">社区干部综合素质提升培训...</view>
-			<view class="getinroom">进入课堂</view>
-		</view>
-		<view class="video">
-			<image src='../../images/spfm.jpg' mode='aspectFill' class="spbj"></image>
-			<view class="text1">社区干部综合素质提升培训</view>
-			<view class="text2">
-				<image src='../../images/onlinenum.png' mode='aspectFill' class="onlinenumicon"></image>1234人在线观看
-			</view>
-			<view class="text3">社区干部综合素质提升培训...</view>
-			<view class="getinroom">进入课堂</view>
-		</view>
-	</view>
-
-</view>
+	</view>

+ 31 - 87
pages/demandCourses/demandCourses.wxss

@@ -1,104 +1,48 @@
-.video_box {
+.xczs {
+  width: 720rpx;
+  margin-left: 20rpx;
+  /* height: 250rpx; */
+  /* border: 1px solid yellow; */
+  margin-top: 20rpx;
+  margin-bottom: 20rpx;
   display: flex;
-  width: 750rpx;
-  flex-wrap: wrap;
+  display: block;
 }
 
-.video {
-  width: 340rpx;
-  height: 470rpx;
-  margin-left: 20rpx;
+.zb1 {
+  width: 338rpx;
+  height: 283rpx;
+  margin-right: 20rpx;
+  margin-bottom: 10rpx;
+  border-radius: 10rpx;
+  overflow: hidden;
+  float: left;
   position: relative;
 }
 
-.spbj {
-  width: 100%;
-  height: 250rpx;
-  border-radius: 20rpx 20rpx 0 0;
-}
-
-.onlinenumicon {
-  width: 30rpx;
-  height: 30rpx;
-}
-
-.text1 {
-  color: #373737;
-  font-size: 25rpx;
-  margin-top: 10rpx;
-  margin-left: 10rpx;
+.show1 {
+  width: 338rpx;
+  height: 283rpx;
 }
 
-.text2 {
-  color: #e40000;
-  font-size: 25rpx;
+.show_text {
+  font-size: 22rpx;
   margin-top: 10rpx;
-  margin-left: 10rpx;
-}
-
-.text3 {
-  color: #9b9b9b;
-  font-size: 25rpx;
-  margin-top: 10rpx;
-  margin-left: 10rpx;
 }
 
-.zbz {
-  display: flex;
-  border-radius: 0 0 10rpx 10rpx;
-  height: 40rpx;
-  background-color: #ba5047;
-  position: absolute;
-  left: 20rpx;
-  padding-right: 10rpx;
-}
-
-.dzb {
-  display: flex;
-  border-radius: 0 0 10rpx 10rpx;
-  height: 40rpx;
-  background-color: #5d6a69;
+.grayblock {
+  width: 100%;
+  height: 80rpx;
+  background-color: rgba(255, 255, 255, 0.7);
   position: absolute;
-  left: 20rpx;
-  padding-right: 10rpx;
+  bottom: 0;
+  text-indent: 10rpx;
 }
 
-.onlineimg {
-  width: 25rpx;
+.qb {
+  width: 23rpx;
   height: 25rpx;
   margin-left: 10rpx;
-  margin-top: 8rpx;
-}
-
-.onlinetext {
-  font-size: 20rpx;
-  color: white;
-  margin-left: 10rpx;
-  line-height: 40rpx;
-}
-
-.getinroom {
-  color: #d72c1a;
-  border: 1px solid #f2b09d;
-  text-align: center;
-  border-radius: 20rpx;
-  width: 50%;
-  margin-left: 25%;
-  margin-top: 15rpx;
-  height: 50rpx;
-  line-height: 50rpx;
-  font-size: 24rpx;
-}
-
-.nogetinroom {
-  color: #999999;
-  border: 1px solid #999999;
-  text-align: center;
-  border-radius: 20rpx;
-  width: 50%;
-  margin-left: 25%;
-  margin-top: 15rpx;
-  height: 50rpx;
-  line-height: 50rpx;
-  font-size: 24rpx;
+  margin-top: 5rpx;
+  float: left;
 }

+ 79 - 0
pages/feedBack/feedBack.js

@@ -0,0 +1,79 @@
+//index.js
+//获取应用实例
+const app = getApp()
+Page({
+  data: {
+    nameIsTrue: false, //名字是否填写
+    cultureIsTrue: false, //文化是否填写
+    classList: [{
+        id: '1',
+        name: '班级1'
+      },
+      {
+        id: '2',
+        name: '班级2'
+      },
+    ],
+    classText: '请选择培训班次',
+    classIndex: null,
+
+    headmasterList: [{
+        id: '1',
+        name: '班主任1'
+      },
+      {
+        id: '2',
+        name: '班主任2'
+      },
+    ],
+    headmasterText: '请选择班主任',
+    headmasterIndex: null,
+
+    oldPostList: [{
+        id: '1',
+        name: '原职务1'
+      },
+      {
+        id: '2',
+        name: '原职务2'
+      },
+    ],
+    oldPostText: '请选择原职务',
+    oldPostIndex: null,
+  },
+  // 班级
+  classChange: function (e) {
+    console.log("0000", e.detail.value);
+    this.setData({
+      classIndex: e.detail.value,
+      classText: '',
+    })
+  },
+  // 班主任
+  headmasterChange: function (e) {
+    console.log("0000", e.detail.value);
+    this.setData({
+      headmasterIndex: e.detail.value,
+      headmasterText: '',
+    })
+  },
+
+  // 原职务
+  oldPostChange: function (e) {
+    console.log("0000", e.detail.value);
+    this.setData({
+      oldPostIndex: e.detail.value,
+      oldPostText: '',
+    })
+  },
+
+
+
+
+  formSubmit(e) {},
+  onReady: function () {},
+  onLoad: function () {
+
+  },
+
+})

+ 4 - 0
pages/feedBack/feedBack.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText":"综合反馈表"
+}

+ 243 - 0
pages/feedBack/feedBack.wxml

@@ -0,0 +1,243 @@
+<view class="home">
+	<form bindsubmit="formSubmit">
+		<!-- <van-cell-group> -->
+			<view class='fwb'>
+				<view class="red-image">
+					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+				</view>
+				<view class="xingbie">姓名</view>
+				<view class='weui-input'>
+					<input class="" name="username" value="{{ username }}" placeholder="请输入姓名"   />
+					<view class="{{nameIsTrue?'error':'noerror'}}">请输入姓名</view>
+				</view>
+			</view>
+
+			<view class='fwb'>
+				<view class="red-image">
+					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+				</view>
+				<view class="xingbie">培训班次</view>
+				<view class='weui-input'>
+					<picker bindchange="classChange" name="ensure_id" value="{{classList[classIndex].id}}" range-key="{{'name'}}" range="{{classList}}">
+						<view class="picker">
+							{{classList[classIndex].name}} <text style="color:#808080;display: inline-block;"  >{{classText}}</text>
+						</view>
+					</picker>
+					<!-- <input class="" name="username" value="{{ username }}" placeholder="请输入姓名" />
+					<view class="{{nameIsTrue?'error':'noerror'}}">请输入姓名</view> -->
+				</view>
+
+			</view>
+
+			<view class='fwb'>
+				<view class="red-image">
+					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+				</view>
+				<view class="xingbie">班主任</view>
+				<view class='weui-input'>
+					<picker bindchange="headmasterChange" name="headmaster_id" value="{{headmasterList[classIndex].id}}" range-key="{{'name'}}" range="{{headmasterList}}">
+						<view class="picker">
+							{{headmasterList[headmasterIndex].name}} <text style="color:#808080;display: inline-block;" >{{headmasterText}}</text>
+						</view>
+					</picker>
+					<!-- <input class="" name="username" value="{{ username }}" placeholder="请输入姓名" />
+					<view class="{{nameIsTrue?'error':'noerror'}}">请输入姓名</view> -->
+				</view>
+
+			</view>
+
+			<view class='fwb'>
+				<view class="red-image">
+					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+				</view>
+				<view class="xingbie">工作单位</view>
+				<view class='weui-input'>
+					<input class="" name="username" value="{{ username }}" placeholder="请输入工作单位"  />
+					<view class="{{nameIsTrue?'error':'noerror'}}">请输入工作单位</view>
+				</view>
+			</view>
+
+			<view class='fwb'>
+				<view class="red-image">
+					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+				</view>
+				<view class="xingbie">现职务</view>
+				<view class='weui-input'>
+					<input class="" name="username" value="{{ username }}" placeholder="请输入现职务"   />
+					<view class="{{nameIsTrue?'error':'noerror'}}">请输入现职务</view>
+				</view>
+			</view>
+
+			<view class='fwb'>
+				<view class="red-image">
+					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+				</view>
+				<view class="xingbie">现任职务</view>
+				<view class='weui-input'>
+					<input class="" name="username" value="{{ username }}" placeholder="请输入现任职务"   />
+					<view class="{{nameIsTrue?'error':'noerror'}}">请输入现任职务</view>
+				</view>
+			</view>
+
+			<view class='fwb'>
+				<view class="red-image">
+					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+				</view>
+				<view class="xingbie">原职务</view>
+				<view class='weui-input'>
+					<picker bindchange="oldPostChange" name="oldPost_id" value="{{oldPostList[oldPostIndex].id}}" range-key="{{'name'}}" range="{{oldPostList}}">
+						<view class="picker">
+							{{oldPostList[oldPostIndex].name}} <text  style="color:#808080;display: inline-block;" >{{oldPostText}}</text>
+						</view>
+					</picker>
+					<!-- <input class="" name="username" value="{{ username }}" placeholder="请输入姓名" />
+					<view class="{{nameIsTrue?'error':'noerror'}}">请输入姓名</view> -->
+				</view>
+
+			</view>
+
+
+			<view class='fwt'>
+				<view class="red-image">
+					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+				</view>
+				<view class=" xingbie moreTitle">您参加培训后工作职职务有变动吗?</view>
+				<!-- <view class='weui-input'>
+					<input class="" name="username" value="{{ username }}" placeholder="请输入姓名" />
+					<view class="{{nameIsTrue?'error':'noerror'}}">请输入姓名</view>
+				</view> -->
+			</view>
+			<textarea placeholder="请输入" maxlength='500' />
+
+			<view class='fwt'>
+				<view class="red-image">
+					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+				</view>
+				<view class=" xingbie moreTitle">您是否将学到的一些工作方法运用到工作中?</view>
+				<!-- <view class='weui-input'>
+					<input class="" name="username" value="{{ username }}" placeholder="请输入姓名" />
+					<view class="{{nameIsTrue?'error':'noerror'}}">请输入姓名</view>
+				</view> -->
+			</view>
+			<textarea placeholder="请输入"  maxlength='500' />
+
+			<view class='fwt'>
+				<view class="red-image">
+					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+				</view>
+				<view class=" xingbie moreTitle">培训的课程是否帮助您解决了工作中出现的问题? (如果有请举例是哪类问题)</view>
+				<!-- <view class='weui-input'>
+					<input class="" name="username" value="{{ username }}" placeholder="请输入姓名" />
+					<view class="{{nameIsTrue?'error':'noerror'}}">请输入姓名</view>
+				</view> -->
+			</view>
+			<textarea placeholder="请输入"  maxlength='500' />
+
+			<view class='fwt'>
+				<view class="red-image">
+					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+				</view>
+				<view class=" xingbie moreTitle">结合您现有的工作,您觉得哪类课程对于您实际工作有 所帮助?</view>
+				<!-- <view class='weui-input'>
+					<input class="" name="username" value="{{ username }}" placeholder="请输入姓名" />
+					<view class="{{nameIsTrue?'error':'noerror'}}">请输入姓名</view>
+				</view> -->
+			</view>
+			<textarea placeholder="请输入"  maxlength='500' />
+
+			<view class='fwt'>
+				<view class="red-image">
+					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+				</view>
+				<view class=" xingbie moreTitle">您觉得我们在课程设置上有哪些需要改进的?(调整或者增加哪个方面的专项培训)?</view>
+				<!-- <view class='weui-input'>
+					<input class="" name="username" value="{{ username }}" placeholder="请输入姓名" />
+					<view class="{{nameIsTrue?'error':'noerror'}}">请输入姓名</view>
+				</view> -->
+			</view>
+			<textarea placeholder="请输入"  maxlength='500' />
+
+
+			<view class='fwt'>
+				<view class="red-image">
+					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+				</view>
+				<view class=" xingbie moreTitle">您觉得培训周期多长时间为最佳?</view>
+				<!-- <view class='weui-input'>
+					<input class="" name="username" value="{{ username }}" placeholder="请输入姓名" />
+					<view class="{{nameIsTrue?'error':'noerror'}}">请输入姓名</view>
+				</view> -->
+			</view>
+			<textarea placeholder="请输入"  maxlength='500' />
+
+
+					<view class='fwt'>
+				<view class="red-image">
+					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+				</view>
+				<view class=" xingbie moreTitle">主题党日活动您有什么建议?</view>
+				<!-- <view class='weui-input'>
+					<input class="" name="username" value="{{ username }}" placeholder="请输入姓名" />
+					<view class="{{nameIsTrue?'error':'noerror'}}">请输入姓名</view>
+				</view> -->
+			</view>
+			<textarea placeholder="请输入"  maxlength='500' />
+
+			
+					<view class='fwt'>
+				<view class="red-image">
+					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+				</view>
+				<view class=" xingbie moreTitle">您对学院的服务有哪些建议和看法?</view>
+				<!-- <view class='weui-input'>
+					<input class="" name="username" value="{{ username }}" placeholder="请输入姓名" />
+					<view class="{{nameIsTrue?'error':'noerror'}}">请输入姓名</view>
+				</view> -->
+			</view>
+			<textarea placeholder="请输入"  maxlength='500' />
+
+			<view class='fwt'>
+				<view class="red-image">
+					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+				</view>
+				<view class=" xingbie moreTitle">您对学院的管理有哪些建议和看法?</view>
+				<!-- <view class='weui-input'>
+					<input class="" name="username" value="{{ username }}" placeholder="请输入姓名" />
+					<view class="{{nameIsTrue?'error':'noerror'}}">请输入姓名</view>
+				</view> -->
+			</view>
+			<textarea placeholder="请输入"  maxlength='500' />
+
+			<view class='fwt'>
+				<view class="red-image">
+					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+				</view>
+				<view class=" xingbie moreTitle">您本年度取得了什么成绩或荣誉方便跟我们分享一下吗?</view>
+				<!-- <view class='weui-input'>
+					<input class="" name="username" value="{{ username }}" placeholder="请输入姓名" />
+					<view class="{{nameIsTrue?'error':'noerror'}}">请输入姓名</view>
+				</view> -->
+			</view>
+			<textarea placeholder="请输入"  maxlength='500' />
+
+			<view class='fwt'>
+				<view class="red-image">
+					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+				</view>
+				<view class=" xingbie moreTitle">您希望我们对您提供哪些帮助(如:跟踪辅导、转达诉 求、提出一些工作的建议、体制改革、社区打造等)?</view>
+				<!-- <view class='weui-input'>
+					<input class="" name="username" value="{{ username }}" placeholder="请输入姓名" />
+					<view class="{{nameIsTrue?'error':'noerror'}}">请输入姓名</view>
+				</view> -->
+			</view>
+			<textarea placeholder="请输入"  maxlength='500' />
+
+			<!-- </van-cell-group> -->
+
+		<!-- <button formType="submit">提交表单</button> -->
+		<view style="  margin-top: 100rpx;">
+			<van-button round formType="submit">提交表单</van-button>
+		</view>
+
+	</form>
+</view>

+ 124 - 0
pages/feedBack/feedBack.wxss

@@ -0,0 +1,124 @@
+.home {
+  margin: 40rpx 40rpx 0 40rpx;
+
+}
+
+van-button {
+  color: white;
+  text-align: center;
+  margin: 0 80rpx;
+}
+
+.van-button--default {
+  background: linear-gradient(90deg, rgba(215, 47, 29, 1), rgba(249, 157, 48, 1)) !important;
+  color: white !important;
+
+}
+
+.van-field__input {
+  background: #F4F4F4 !important;
+}
+
+button:not([size='mini']) {
+  width: 550rpx !important;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.van-radio__icon--round {
+  display: none !important;
+}
+
+.van-radio__label {
+  background: red;
+  padding: 0 70rpx;
+}
+
+.parameter-wrap {
+  margin-left: 20rpx;
+
+}
+
+.checked_parameter {
+  background: linear-gradient(90deg, rgba(215, 47, 29, 1), rgba(249, 157, 48, 1)) !important;
+  color: white;
+}
+
+.parameter-info {
+  width: 232rpx;
+  background: #FFF0ED;
+  border-radius: 10rpx;
+  display: inline-block;
+  text-align: center;
+  padding: 10rpx 0;
+}
+
+.parameter-info:first-child {
+  margin-right: 10rpx;
+}
+
+.fwb {
+  display: flex;
+  font-size: 28rpx;
+  margin-top: 40rpx;
+}
+
+
+
+.error {
+  font-size: 24rpx;
+  color: #EE0A24;
+}
+
+.noerror {
+  display: none !important;
+}
+
+.time {
+  margin-left: 18rpx;
+  font-size: 28rpx;
+  color: #808080;
+  background: #F4F4F4;
+  width: 452rpx;
+  padding: 0 10rpx;
+}
+
+.weui-input {
+  margin-left: 20rpx;
+  background: #F4F4F4;
+  width: 474rpx;
+}
+
+.van-icon-circle {
+  color: #EE0A24;
+
+}
+
+.xingbie {
+  margin-left: 10rpx;
+  width: 130rpx;
+}
+
+.red-image {
+  vertical-align: text-bottom;
+}
+
+.moreTitle {
+  width: 100%;
+
+}
+
+.fwt {
+  display: flex;
+  font-size: 28rpx;
+  margin-top: 40rpx;
+}
+
+textarea {
+  background: rgba(244, 244, 244, 1);
+  border-radius: 10px;
+  border: 1rpx solid rgba(244, 244, 244, 1);
+  width: 100%;
+  height: 194rpx;
+  margin-top: 20rpx;
+}

+ 10 - 0
pages/myClass/myClass.js

@@ -131,6 +131,16 @@ Page({
       title: '领取成功'
     })
   },
+  goWrite(){
+    wx.navigateTo({
+      url: '../studentRegistration/studentRegistration'
+    })
+  },
+  goWrite2(){
+    wx.navigateTo({
+      url: '../feedBack/feedBack'
+    })
+  },
   onReady: function () {},
   onLoad: function () {
 

+ 9 - 4
pages/myClass/myClass.wxml

@@ -17,11 +17,11 @@
 		<text>长春市城市社区“两委”成员线上培训班</text>
 		<!-- <view style="height:30rpx;width:8rpx;background-color:#eb3f33"></view> -->
 	</van-divider>
-	<view class="layout bg">
-		<!-- <image src='/images/xydjb.png' mode='aspectFill' class="bgimg1"></image>
-		<image src='/images/kcxqb.png' mode='aspectFill' class="bgimg2"></image> -->
+	<view class="layout" bindtap="goWrite">
+		<image src='/images/xydj_bj.png' mode='aspectFill' class="bgimg1"></image>
+		<view class="layout_text1">学员登记表</view>
+		<view class="layout_text2">去填写</view>
 	</view>
-
 	<view class="{{!showMore? 'hiddenmore' : 'showmore'}}">
 		<view class="sp {{idx>2 ? 'none' : ''}}" wx:for="{{spxxArr}}" wx:for-index="idx" wx:for-item="item">
 			<image src='{{item.spfm}}' mode='aspectFill' class="spfm"></image>
@@ -52,6 +52,11 @@
 			</view>
 		</block>
 	</view>
+	<view class="layout" style="margin-top:40rpx" bindtap="goWrite2">
+		<image src='/images/zhfk_bj.png' mode='aspectFill' class="bgimg1"></image>
+		<view class="layout_text1">综合反馈表</view>
+		<view class="layout_text3">去填写</view>
+	</view>
 	<view class="qy_title" bindtap="goMyPoints">
 		<view class="redk"></view>我的积分:7655积分
 		<view class="more">></view>

+ 44 - 9
pages/myClass/myClass.wxss

@@ -34,21 +34,56 @@
   border: 1px solid red;
 } */
 .layout {
-  width: 710rpx;
-  margin-left: 20rpx;
+  width: 693rpx;
+  margin-left: 28rpx;
+  position: relative;
 }
-
 .bgimg1 {
-  width: 334rpx;
-  height: 125rpx;
-  float: left;
+  width: 693rpx;
+  height: 74rpx;
+  /* float: left; */
 }
-
-.bgimg2 {
+.layout_text1{
+  position: absolute;
+  color: #fff;
+  font-size: 30rpx;
+  font-weight: 900;
+  top: 20rpx;
+  left: 50rpx;
+}
+.layout_text2{
+  position: absolute;
+  color: #df7e33;
+  font-size: 25rpx;
+  line-height: 40rpx;
+  font-weight: 900;
+  top: 20rpx;
+  right: 50rpx;
+  background-color: #fff;
+  text-align: center;
+  width: 140rpx;
+  border-radius: 20rpx;
+  height: 40rpx;
+}
+.layout_text3{
+  position: absolute;
+  color: #3a7dcd;
+  font-size: 25rpx;
+  line-height: 40rpx;
+  font-weight: 900;
+  top: 20rpx;
+  right: 50rpx;
+  background-color: #fff;
+  text-align: center;
+  width: 140rpx;
+  border-radius: 20rpx;
+  height: 40rpx;
+}
+/* .bgimg2 {
   width: 350rpx;
   height: 125rpx;
   float: right;
-}
+} */
 
 .bg {
   margin-top: 10rpx;

+ 72 - 7
pages/myMission/myMission.js

@@ -5,6 +5,8 @@ Page({
    * 页面的初始数据
    */
   data: {
+    showewm: false,
+    showzs: false,
     "spxxArr": [{
       "isfinish": "/images/unfinish.png",
       "spfm": "/images/spfm.jpg",
@@ -57,25 +59,28 @@ Page({
       select: 1
     });
   },
-  gokhAnswer(){
+  gokhAnswer() {
     wx.navigateTo({
       url: '../answerAfterclass/answerAfterclass'
     })
   },
-  gopjClass(){
+  gopjClass() {
     wx.navigateTo({
       url: '../evaluationCourse/evaluationCourse'
     })
   },
-  startAnswer(){
+  startAnswer() {
     wx.navigateTo({
       url: '/pages/answerAfterclass/answerAfterclass',
     })
   },
-  lq(){
-    wx.showToast({
-      title: '领取成功'
-    })
+  lq() {
+    this.setData({
+      showzs: true
+    });
+    // wx.showToast({
+    //   title: '领取成功'
+    // })
   },
   /**
    * 生命周期函数--监听页面加载
@@ -83,10 +88,70 @@ Page({
   onLoad: function (options) {
 
   },
+  showEwm() {
+    this.setData({
+      showewm: true
+    });
+  },
+  // showzs(){
 
+  // },
+  onClose() {
+    this.setData({
+      showewm: false
+    });
+  },
+  onClose1() {
+    this.setData({
+      showzs: false
+    });
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
+  saveImg() {
+    wx.showLoading({
+      title: '保存中...'
+    })
+    var imgSrc = "https://sqdx.windd.cn/files/21.png"
+    wx.downloadFile({
+      url: imgSrc,
+      success: function (res) {
+        console.log(res);
+        //图片保存到本地
+        wx.saveImageToPhotosAlbum({
+          filePath: res.tempFilePath,
+          success: function (data) {
+            wx.hideLoading()
+            wx.showToast({
+              title: '保存成功',
+              icon: 'success',
+              duration: 2000
+            })
+          },
+          fail: function (err) {
+            console.log(err);
+            if (err.errMsg === "saveImageToPhotosAlbum:fail auth deny") {
+              console.log("当初用户拒绝,再次发起授权")
+              wx.openSetting({
+                success(settingdata) {
+                  console.log(settingdata)
+                  if (settingdata.authSetting['scope.writePhotosAlbum']) {
+                    console.log('获取权限成功,给出再次点击图片保存到相册的提示。')
+                  } else {
+                    console.log('获取权限失败,给出不给权限就无法正常使用的提示')
+                  }
+                }
+              })
+            }
+          },
+          complete(res) {
+            console.log(res);
+          }
+        })
+      }
+    })
+  },
   onReady: function () {
 
   },

+ 33 - 43
pages/myMission/myMission.wxml

@@ -5,10 +5,23 @@
 		<image src='/images/ewm.png' mode='aspectFill' class="ewm_icon"></image>
 		<view class="join_btn" bindtap="showEwm">加入按钮确认</view>
 	</view>
+	<van-popup show="{{ showewm }}" bind:close="onClose">
+		<view style="position:relative">
+			<image src='/images/ewm_closebtn.png' mode='aspectFill' class="ewm_close" bindtap="onClose"></image>
+			<image src='/images/ewmbj.png' mode='aspectFill' class="ewmbj"></image>
+			<view class="bjq_text">城市社区培训班班级群</view>
+			<view class="sm_text">扫码进群与老师沟通</view>
+			<image src='/images/bjewm.png' mode='aspectFill' class="bjewm"></image>
+			<view class="save_btn" bindtap="saveImg">保存二维码</view>
+		</view>
+	</van-popup>
 	<view class="step">
 		<image src='/images/step_finish.png' mode='aspectFill' class="finish_img"></image>
-		<image src='/images/xydj1.png' mode='aspectFill' class="bgimg1"></image>
-		<image src='/images/kcxq1.png' mode='aspectFill' class="bgimg2"></image>
+		<view class="layout">
+			<image src='/images/xydj_bj.png' mode='aspectFill' class="bgimg1"></image>
+			<view class="layout_text1">学员登记表</view>
+			<view class="layout_text2">去填写</view>
+		</view>
 	</view>
 	<view class="step" style="height:500rpx;">
 		<image src='/images/step_finish.png' mode='aspectFill' class="finish_img"></image>
@@ -28,50 +41,27 @@
 			</view>
 		</view>
 	</view>
-	<view class="step">
+	<view class="step" style="padding-top:30rpx">
 		<image src='/images/step_finish.png' mode='aspectFill' class="finish_img"></image>
-		<view class="lq_btn" bindtap="lq">领取结业证</view>
-	<!-- <image src='/images/lqxy.png' mode='aspectFill' class="lqxyimg" bindtap="lq"></image> -->
-	</view>
-	<!-- <view class="sp" wx:for="{{spxxArr}}" wx:for-index="idx" wx:for-item="item">
-		<image src='{{item.spfm}}' mode='aspectFill' class="spfm"></image>
-		<image src='{{item.isfinish}}' mode='aspectFill' class="isfinish"></image>
-		<view class="sp_text">
-			<view>
-				<view class="fisrt_set">
-					<image src='{{item.iszburl}}' mode='aspectFill' class="dbimg"></image><text class="name">{{item.name}}</text>
-				</view>
-				<view class="start_text">开始时间:{{item.startdate}} <text class="time">{{item.starttime}}</text></view>
-				<view>
-					<image src='/images/startstudy.png' mode='aspectFill' class="an"></image>
-					<image src='/images/dtxs.png' mode='aspectFill' class="an"></image>
-					<image src='/images/pjkc.png' mode='aspectFill' class="an"></image>
-				</view>
-			</view>
+		<view class="layout">
+			<image src='/images/zhfk_bj.png' mode='aspectFill' class="bgimg1"></image>
+			<view class="layout_text1">综合反馈表</view>
+			<view class="layout_text3">去填写</view>
 		</view>
 	</view>
-	<view class="openall">展开全部<image src='/images/openall.png' mode='aspectFill' class="openallimg"></image>
-	</view>
-	<view class="tab_btnbox">
-		<text class="tab1 {{select==0?'activetab':'unactivetab'}}" bindtap='selectBtn0'>课后答题</text>
-		<text class="tab2 {{select==1?'activetab':'unactivetab'}}" bindtap='selectBtn1'>期末问卷</text>
-	</view>
-	<view class="khzy_qy">
-		<view class="unanawer">未答题</view>
-		<image src='../../images/khzy_icon1.jpg' mode='aspectFill' class="khzyimg"></image>
-		<view class="khzytext">
-			<view class="khzy_text1">社区干部综合素质提升培训</view>
-			<view class="khzy_text2">讲师:XXX 2010-06-12</view>
-			<view class="startanswer_btn" bindtap="startAnswer">开始答题</view>
-		</view>
+	<view class="step">
+		<image src='/images/step_finish.png' mode='aspectFill' class="finish_img"></image>
+		<view class="lq_btn" bindtap="lq">领取结业证</view>
+		<!-- <image src='/images/lqxy.png' mode='aspectFill' class="lqxyimg" bindtap="lq"></image> -->
 	</view>
-	<view class="khzy_qy">
-		<view class="anawered">已答题</view>
-		<image src='../../images/khzy_icon1.jpg' mode='aspectFill' class="khzyimg"></image>
-		<view class="khzytext">
-			<view class="khzy_text1">社区干部综合素质提升培训</view>
-			<view class="khzy_text2">讲师:XXX 2010-06-12</view>
-			<view class="checkgrade_btn">查看成绩</view>
+	<van-popup show="{{ showzs }}" bind:close="onClose1">
+		<view style="position:relative">
+			<!-- <image src='/images/ewm_closebtn.png' mode='aspectFill' class="ewm_close" bindtap="onClose1"></image> -->
+			<image src='/images/zsbj.jpg' mode='aspectFill' class="zsbj"></image>
+			<view class="byzc"> xxx,xxx 班期培训结束,成绩优异,兹授予结业证书,特此证明!</view>
+			<view class="zsdw_text">授予证书单位:XXXXXXXXXXXX</view>
+			<!--<view class="save_btn" bindtap="saveImg">保存二维码</view> -->
 		</view>
-	</view> -->
+		<!-- <image src='/images/close.png' mode='aspectFill' class="zscloseimg"></image> -->
+	</van-popup>
 </view>

+ 149 - 14
pages/myMission/myMission.wxss

@@ -1,21 +1,68 @@
 .step {
   width: 690rpx;
-  margin-left: 30rpx;
+  margin-left: 50rpx;
   position: relative;
-  border-left: 2px solid #dcdcdc;
-  padding-bottom: 70rpx;
+  border-left: 3px solid #eb3f33;
+  padding-bottom: 50rpx;
 }
 .finish_img{
-  width: 30rpx;
-  height: 30rpx;
+  width: 53rpx;
+  height: 53rpx;
   position: absolute;
   top: 0;
-  left: -15rpx;
+  left: -25rpx;
 }
 .ewm_icon{
   width: 33rpx;
   height: 32rpx;
 }
+.ewmbj{
+  width: 641rpx;
+  height: 931rpx;
+}
+.ewm_close{
+  width: 30rpx;
+  height: 30rpx;
+  position: absolute;
+  top: 30rpx;
+  right: 30rpx;
+}
+.bjewm{
+  width: 363rpx;
+  height: 360rpx;
+  position: absolute;
+  top: 340rpx;
+  left: 140rpx;
+}
+.bjq_text{
+  font-size: 30rpx;
+  font-weight: 900;
+  position: absolute;
+  top: 90rpx;
+  left: 200rpx;
+}
+.sm_text{
+  font-size: 28rpx;
+  color: #999999;
+  /* font-weight: 900; */
+  position: absolute;
+  top: 140rpx;
+  left: 200rpx;
+}
+.save_btn{
+  width: 400rpx;
+  height: 80rpx;
+  font-size: 28rpx;
+  color: #fff;
+  /* font-weight: 900; */
+  position: absolute;
+  bottom: 80rpx;
+  left: 120rpx;
+  background-color: #eb3f33;
+  text-align: center;
+  line-height: 80rpx;
+  border-radius: 50rpx;
+}
 .join_btn{
   border: 1px solid #da2c15;
   border-radius: 20rpx;
@@ -26,10 +73,11 @@
   font-size: 28rpx;
   font-weight: 900;
   line-height: 45rpx;
+  margin-right: 30rpx;
 }
 .join_classtext{
   font-size: 28rpx;
-  margin-left: 70rpx;
+  margin-left: 50rpx;
   font-weight: 900;
   float: left;
 }
@@ -37,23 +85,23 @@
   margin-left: 20rpx;
   float: left;
 }
-.bgimg1 {
+/* .bgimg1 {
   width: 291rpx;
   height: 124rpx;
   float: left;
   margin-left: 70rpx;
-}
+} */
 
-.bgimg2 {
+/* .bgimg2 {
   width: 291rpx;
   height: 124rpx;
   float: right;
-}
+} */
 .sp_bigbox{
   width:620rpx;
   height: 550rpx;
   /* border: 1px solid red; */
-  margin-left: 70rpx;
+  margin-left: 50rpx;
   overflow-y: auto;
   overflow-x: hidden;
 }
@@ -135,7 +183,7 @@
   color: #eb3f33;
 }
 .lq_btn {
-  width: 559rpx;
+  width: 500rpx;
   height: 77rpx;
   line-height: 77rpx;
   margin-left: 95rpx;
@@ -145,6 +193,93 @@
   color: #fff;
   background: -webkit-linear-gradient(left,#d7301d,#f99c30);
   box-shadow: 5px 5px 5px #eea390; 
-  margin-bottom: 20rpx;
+  margin-bottom: 0rpx;
+  text-align: center;
+}
+.layout {
+  width: 610rpx;
+  margin-left: 50rpx;
+  /* margin-left: 28rpx; */
+  position: relative;
+  /* border: 1px solid red; */
+  height: 74rpx;
+}
+.bgimg1 {
+  width: 610rpx;
+  height: 74rpx;
+  /* float: left; */
+}
+.layout_text1{
+  position: absolute;
+  color: #fff;
+  font-size: 30rpx;
+  font-weight: 900;
+  top: 20rpx;
+  left: 50rpx;
+}
+.layout_text2{
+  position: absolute;
+  color: #df7e33;
+  font-size: 25rpx;
+  line-height: 40rpx;
+  font-weight: 900;
+  top: 20rpx;
+  right: 50rpx;
+  background-color: #fff;
+  text-align: center;
+  width: 140rpx;
+  border-radius: 20rpx;
+  height: 40rpx;
+}
+.layout_text3{
+  position: absolute;
+  color: #3a7dcd;
+  font-size: 25rpx;
+  line-height: 40rpx;
+  font-weight: 900;
+  top: 20rpx;
+  right: 50rpx;
+  background-color: #fff;
   text-align: center;
+  width: 140rpx;
+  border-radius: 20rpx;
+  height: 40rpx;
+}
+.zsbj{
+  width: 657rpx;
+  height: 891rpx;
+}
+.byzc{
+  width: 400rpx;
+  /* border: 1px solid red; */
+  font-size: 30rpx;
+  color: #000;
+  font-weight: 900;
+  position: absolute;
+  top: 340rpx;
+  left: 130rpx;
+  text-indent: 60rpx;
+  letter-spacing: 5rpx;
+  line-height: 70rpx;
+}
+.zsdw_text{
+  width: 500rpx;
+  /* border: 1px solid red; */
+  font-size: 30rpx;
+  color: #000;
+  font-weight: 900;
+  position: absolute;
+  top: 680rpx;
+  left: 80rpx;
+  /* text-indent: 60rpx; */
+  /* letter-spacing: 5rpx; */
+  /* line-height: 70rpx; */
+}
+.zscloseimg{
+  position: absolute;
+  top: 900rpx;
+  left: 300rpx;
+  width: 40rpx;
+  height: 40rpx;
+  border: 1px solid red;
 }

+ 38 - 27
pages/personInfo/personInfo.js

@@ -25,33 +25,44 @@ Page({
       url: '/pages/myInteractions/myInteractions',
     })
   },
-  // login() {
-  //   wx.login({
-  //     success(res) {
-  //       console.log(res);
-  //     }
-  //   })
-  // },
-  // getPhoneNumber: function (e) {
-  //   var that = this;
-  //   console.log(e);
-  //   if (e.detail.errMsg == "getPhoneNumber:ok") {
-  //     wx.request({
-  //       url: 'http://localhost/index/users/decodePhone',
-  //       data: {
-  //         encryptedData: e.detail.encryptedData,
-  //         iv: e.detail.iv,
-  //         sessionKey: that.data.session_key,
-  //         uid: "",
-  //       },
-  //       method: "post",
-  //       success: function (res) {
-  //         console.log(res);
-  //       }
-  //     })
-  //   }
-  // },
+  getPhoneNumber: function (e) {
+    var that = this;
+    console.log(e)
+    console.log(e.detail.errMsg == "getPhoneNumber:ok");
+    if (e.detail.errMsg == "getPhoneNumber:ok") {
+      wx.request({
+        url: 'http://localhost/index/users/decodePhone',
+        data: {
+          encryptedData: e.detail.encryptedData,
+          iv: e.detail.iv,
+          sessionKey: that.data.session_key,
+          uid: "",
+        },
+        method: "post",
+        success: function (res) {
+          console.log(res);
+        }
+      })
+    }
+  },
   onLoad: function () {
-
+    var that = this;
+    wx.login({
+      success(res) {
+        console.log(res);
+        var code = res.code
+        wx.request({
+          url: '',
+          method: "post",
+          data: {
+            code
+          },
+          success: function (res) {
+            console.log(res.data.openid);
+            that.setData(res.data);
+          }
+        })
+      }
+    })
   }
 })

+ 3 - 1
pages/personInfo/personInfo.wxml

@@ -47,7 +47,9 @@
 				<view class='right-bpx'>
 				<!-- <button class='big-title' open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">身份认证
 				</button> -->
-					<view class='big-title' bindtap="toIdentity">身份认证</view>
+				<view><button class='big-title' open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">身份认证
+				</button></view>
+					<!-- <view class='big-title' bindtap="toIdentity">身份认证</view> -->
 				</view>
 			</view>
 		</view> 

+ 277 - 0
pages/studentRegistration/studentRegistration.js

@@ -0,0 +1,277 @@
+//index.js
+//获取应用实例
+const app = getApp()
+Page({
+  data: {
+    nameIsTrue: false, //名字是否填写
+    cultureIsTrue: false, //文化是否填写
+    graduationIsTrue: false, //毕业学校
+    majorIsTrue: false, //所有专业
+    postIsTrue: false, //现任职务
+    renzhishijianIsTrue :false,
+    phoneIsTrue: false, //电话
+    peixunshijianTrue :false,  // 培训时间
+    nameMessage: '',
+    zaizhiTime:'',//在线时间
+    peixunTime:'',  //培训时间
+    headmasterText: '请选择任职时间', // 
+    peixunText:'请选择培训时间',
+    radio: '1',
+    parameter: [{
+      id: 1,
+      name: '男',
+      checked: false
+    }, {
+      id: 2,
+      name: '女',
+      checked: false
+    }],
+    renzhiDate: '',
+    postshow: false,
+    postshow1: false,
+    errorIsTrue: false,
+    currentDate: new Date().getTime(),
+    currentDate1: new Date().getTime(),
+    minDate: new Date().getTime ,
+    formatter(type, value) {
+      if (type === 'year') {
+        return `${value}年`;
+      } else if (type === 'month') {
+        return `${value}月`;
+      }
+      return value;
+    },
+  },
+  onChange(event) {
+    this.setData({
+      radio: event.detail,
+    });
+  },
+
+  share() {
+    this.setData({
+      show: true
+    });
+  },
+  onClose() {
+    console.log("11111111111111");
+    this.setData({
+      postshow: false
+    });
+  },
+  onClose1() {
+    console.log("11111111111111");
+    this.setData({
+      postshow1: false
+    });
+  },
+  onInput(event) {
+    console.log("000");
+    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() {
+    this.setData({
+      postshow: true
+    });
+  },
+  share() {
+    this.setData({
+      postshow1: true
+    });
+  },
+  formatDate(date) {
+    date = new Date(date);
+    return `${date.getFullYear()-1}/${date.getMonth() + 1}/${date.getDate()}`;
+  },
+  onConfirm(event) {
+    console.log(event, "0000");
+    var timeValue = this.timeFormat(new Date(event.detail), "yyyy-MM-dd");
+    this.setData({
+      zaizhiTime: timeValue,
+      postshow :false,
+      headmasterText :''
+    });
+  },
+  onConfirm1(event) {
+    console.log(event, "0000");
+    var timeValue = this.timeFormat(new Date(event.detail), "yyyy-MM-dd");
+    this.setData({
+      peixunTime: timeValue,
+      postshow1 :false,
+      peixunText :''
+    });
+  },
+
+
+
+  parameterTap: function (e) { //e是获取e.currentTarget.dataset.id所以是必备的,跟前端的data-id获取的方式差不多
+    var that = this
+    var this_checked = e.currentTarget.dataset.id
+    var parameterList = this.data.parameter //获取Json数组
+    for (var i = 0; i < parameterList.length; i++) {
+      if (parameterList[i].id == this_checked) {
+        parameterList[i].checked = true; //当前点击的位置为true即选中
+      } else {
+        parameterList[i].checked = false; //其他的位置为false
+      }
+    }
+    that.setData({
+      parameter: parameterList
+    })
+  },
+
+  formSubmit(e) {
+    console.log(e.detail.value, "000000000000000");
+    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) {
+    var o = {
+      "M+": date.getMonth() + 1, //月份   
+      "d+": date.getDate(), //日
+      "h+": date.getHours(), //小时   
+      "m+": date.getMinutes(), //分   
+      "s+": date.getSeconds(), //秒   
+      "q+": Math.floor((date.getMonth() + 3) / 3), //季度   
+      "S": date.getMilliseconds() //毫秒   
+    };
+    if (/(y+)/.test(fmt))
+      fmt = fmt.replace(RegExp.$1, (date.getFullYear() + "").substr(4 - RegExp.$1.length));
+    for (var k in o)
+      if (new RegExp("(" + k + ")").test(fmt))
+        fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+    return fmt;
+
+  },
+  onReady: function () {},
+  onLoad: function () {
+
+  },
+
+})

+ 4 - 0
pages/studentRegistration/studentRegistration.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText":"学员登记表"
+}

+ 155 - 0
pages/studentRegistration/studentRegistration.wxml

@@ -0,0 +1,155 @@
+<view class="home">
+	<form bindsubmit="formSubmit">
+			<!-- <van-field name="username" value="{{ username }}" label="姓名" placeholder="请输入姓名" error-message="{{nameMessage}}" /> -->
+			<view class='fwb'>
+				<!-- <van-icon name="circle" /> -->
+				<view class="red-image">
+					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+				</view>
+				<view class="xingbie">姓名</view>
+				<view class='weui-input'>
+					<input class="" name="username" value="{{ username }}" placeholder="请输入姓名"/>
+					<view class="{{nameIsTrue?'error':'noerror'}}">请输入姓名</view>
+				</view>
+			</view>
+
+			<!-- <van-field
+    value="{{ password }}"
+    label="密码"
+    placeholder="请输入密码"
+    required
+    border="{{ false }}"
+  /> -->
+			<!-- <van-radio-group value="{{ radio }}" bind:change="onChange">
+				<van-radio name="1">单选框 1</van-radio>
+				<van-radio name="2">单选框 2</van-radio>
+			</van-radio-group> -->
+			<view class='fwb'>
+				<view class="red-image">
+					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+				</view>
+				<view class="xingbie">性别</view>
+				<view class='parameter-wrap'>
+					<block wx:for="{{parameter}}" wx:key="parameter">
+						<view class='parameter-info text-over {{item.checked?"checked_parameter":""}}' data-id='{{item.id}}' bindtap='parameterTap'>{{item.name}}</view>
+					</block>
+					<view class="{{errorIsTrue?'error':'noerror'}}">请选择性别</view>
+				</view>
+			</view>
+			<!-- <van-field name="gongzuoName" value="{{ gongzuoName }}" label="工作单位" placeholder="请输入工作单位" error-message="{{nameMessage}}" />
+			<van-field name="gongzuoName" value="{{ gongzuoName }}" label="文化程度" placeholder="请输入文化程度" error-message="{{nameMessage}}" />
+			<van-field name="gongzuoName" value="{{ gongzuoName }}" label="毕业学校" placeholder="请输入最后毕业学校" error-message="{{nameMessage}}" />
+			<van-field name="gongzuoName" value="{{ gongzuoName }}" label="所学专业" placeholder="请输入所学专业" error-message="{{nameMessage}}" />
+			<van-field name="gongzuoName" value="{{ gongzuoName }}" label="现任职务" placeholder="请输入现任职务" error-message="{{nameMessage}}" /> -->
+			<!-- <van-cell title="任职时间" value="{{ date }}" bind:click="onDisplay" /> -->
+			<view class='fwb'>
+				<view class="red-image">
+					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+				</view>
+				<view class="xingbie">工作单位</view>
+				<view class='weui-input'>
+					<input class="" name="work" value="{{ work }}" placeholder="请输入工作单位"/>
+					<view class="{{workIsTrue?'error':'noerror'}}">请输入工作单位</view>
+				</view>
+			</view>
+
+			<view class='fwb'>
+				<view class="red-image">
+					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+				</view>
+				<view class="xingbie">文化程度</view>
+				<view class='weui-input'>
+					<input class="" name="culture" value="{{culture }}" placeholder="请输入文化程度"/>
+					<view class="{{ cultureIsTrue?'error':'noerror'}}">请输入文化程度</view>
+				</view>
+			</view>
+
+			<view class='fwb'>
+				<view class="red-image">
+					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+				</view>
+				<view class="xingbie">毕业学校</view>
+				<view class='weui-input'>
+					<input class="" name="graduation" value="{{ graduation }}" placeholder="请输入毕业学校"/>
+					<view class="{{graduationIsTrue?'error':'noerror'}}">请输入毕业学校</view>
+				</view>
+			</view>
+
+			<view class='fwb'>
+				<view class="red-image">
+					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+				</view>
+				<view class="xingbie">所学专业</view>
+				<view class='weui-input'>
+					<input class="" name="major" value="{{ major }}" placeholder="请输入所学专业"/>
+					<view class="{{majorIsTrue?'error':'noerror'}}">请输入所学专业</view>
+				</view>
+			</view>
+
+
+			<view class='fwb'>
+				<view class="red-image">
+					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+				</view>
+				<view class="xingbie">现任职务</view>
+				<view class='weui-input'>
+					<input class="" name="post" value="{{ post }}" placeholder="请输入现任职务" />
+					<view class="{{postIsTrue?'error':'noerror'}}">请输入现任职务</view>
+				</view>
+			</view>
+			<view class='fwb'>
+				<view class="red-image">
+					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+				</view>
+				<view class="xingbie">任职时间</view>
+				<view class='weui-input' catchtap="share1">
+					{{zaizhiTime}}<view style="color:#808080;display: inline-block;" >{{headmasterText}}</view>
+					<view class="{{renzhishijianIsTrue?'error':'noerror'}}">请输入任职时间</view>
+				</view>
+				<van-popup show="{{ postshow }}" position="bottom" custom-style="height: 50%;">
+					<van-datetime-picker bind:confirm="onConfirm" bind:cancel='onClose' type="date" value="{{ currentDate }}" bind:input="onInput" min-date="{{ minDate }}" formatter="{{ formatter }}" />
+				</van-popup>
+			</view>
+			<view class='fwb'>
+				<view class="red-image">
+					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+				</view>
+				<view class="xingbie">联系电话</view>
+				<view class='weui-input'>
+					<input class="" name="phone" value="{{ phone }}" placeholder="请输入联系电话" />
+					<view class="{{phoneIsTrue?'error':'noerror'}}">请输入联系电话</view>
+				</view>
+			</view>
+			<view class='fwb'>
+				<view class="red-image">
+					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+				</view>
+				<view class="xingbie">培训时间</view>
+				<view class='weui-input' catchtap="share">
+					{{peixunTime}}<view  style="color:#808080;display: inline-block;">{{peixunText}}</view>
+					<view class="{{peixunshijianTrue?'error':'noerror'}}">请选择培训时间</view>
+				</view>
+				<van-popup show="{{ postshow1 }}" position="bottom" custom-style="height: 50%;">
+					<van-datetime-picker bind:confirm="onConfirm1" bind:cancel='onClose1' type="date" value="{{ currentDate1 }}" bind:input="onInput1" min-date="{{ minDate }}" formatter="{{ formatter }}" />
+				</van-popup>
+			</view>
+			<!-- <view class='fwb'>
+				<view class="red-image">
+					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+				</view>
+				<view class="xingbie">培训时间</view>
+				<view class='time' catchtap="">
+					请选择培训时间
+				</view>
+			</view> -->
+
+
+
+
+		<!-- <button formType="submit">提交表单</button> -->
+		<view style="  margin-top: 100rpx;">
+			<van-button round formType="submit">提交表单</van-button>
+		</view>
+
+	</form>
+</view>

+ 110 - 0
pages/studentRegistration/studentRegistration.wxss

@@ -0,0 +1,110 @@
+.home {
+  margin: 0 40rpx;
+  margin-top: 40rpx;
+}
+
+van-button {
+  color: white;
+  text-align: center;
+  margin: 0 80rpx;
+}
+
+.van-button--default {
+  background: linear-gradient(90deg, rgba(215, 47, 29, 1), rgba(249, 157, 48, 1)) !important;
+  color: white !important;
+
+}
+
+.van-field__input {
+  background: #F4F4F4 !important;
+}
+
+button:not([size='mini']) {
+  width: 550rpx !important;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.van-radio__icon--round {
+  display: none !important;
+}
+
+.van-radio__label {
+  background: red;
+  padding: 0 70rpx;
+}
+
+.parameter-wrap {
+  margin-left: 20rpx;
+
+}
+
+.checked_parameter {
+  background: linear-gradient(90deg, rgba(215, 47, 29, 1), rgba(249, 157, 48, 1)) !important;
+  color: white;
+}
+
+.parameter-info {
+  width: 232rpx;
+  background: #FFF0ED;
+  border-radius: 10rpx;
+  display: inline-block;
+  text-align: center;
+  padding: 10rpx 0;
+}
+
+.parameter-info:first-child {
+  margin-right: 10rpx;
+}
+
+.fwb {
+  display: flex;
+  font-size: 28rpx;
+  margin-top: 40rpx;
+}
+
+
+
+.error {
+  font-size: 24rpx;
+  color: #EE0A24;
+  background: white;
+  
+}
+
+.noerror {
+  display: none!important;
+  
+}
+
+.time {
+  margin-left: 18rpx;
+  font-size: 28rpx;
+  color: #808080;
+  background: #F4F4F4;
+  width: 452rpx;
+  padding: 0 10rpx;
+}
+
+.weui-input {
+  margin-left: 20rpx;
+  background: #F4F4F4;
+  width: 474rpx;
+  
+}
+
+.van-icon-circle {
+  color: #EE0A24;
+
+}
+
+.xingbie {
+  margin-left: 10rpx;
+  width: 130rpx;
+}
+.red-image {
+  vertical-align: text-bottom;
+}
+input {
+  height: 40rpx; 
+}

+ 3 - 3
pages/testAnswer/testAnswer.js

@@ -12,17 +12,17 @@ Page({
       },{
         "url": "/images/sc_img.png",
         "name": "长春市专职党务工作者线上培训班",
-        "zbdw": "长春市委组织部",
+        "zbdw": "李老师",
         "time": "2020年06月26日"
       },{
         "url": "/images/sc_img.png",
         "name": "区域党建联盟",
-        "zbdw": "宽城区委组织部",
+        "zbdw": "李老师",
         "time": "2020年06月29日"
       },{
         "url": "/images/sc_img.png",
         "name": "小区党组织建设",
-        "zbdw": "宽城区委组织部",
+        "zbdw": "李老师",
         "time": "2020年06月30日"
       }
     ]

+ 9 - 8
pages/testAnswer/testAnswer.wxml

@@ -1,10 +1,11 @@
 <view class="container">
-<view class="class_box" wx:for="{{dataArr}}" wx:for-index="idx" wx:for-item="item">
-<image src="{{item.url}}" mode='aspectFill' class="scimg"></image>
-<view class="sctext">
-<view class="t1">{{item.name}}</view>
-<view class="t2">主讲人: {{item.zbdw}} {{item.time}}</view>
-<view class="t3">开始答题</view>
-</view>
-</view>
+	<view class="class_box" wx:for="{{dataArr}}" wx:for-index="idx" wx:for-item="item">
+		<image src="{{item.url}}" mode='aspectFill' class="scimg"></image>
+		<view class="sctext">
+			<view class="t1">{{item.name}}</view>
+			<view class="t2">主讲人: {{item.zbdw}} <text style="margin-left:20rpx">{{item.time}}</text></view>
+			<view class="t3">开始答题</view>
+		</view>
+    <view class="isanswertag">未答题</view>
+	</view>
 </view>

+ 24 - 6
pages/testAnswer/testAnswer.wxss

@@ -1,26 +1,31 @@
 .class_box {
   width: 710rpx;
   margin-left: 20rpx;
-  height: 145rpx;
+  height: 165rpx;
+  padding-bottom: 30rpx;
   /* border: 1px solid red; */
-  margin-top: 30rpx;
+  /* margin-top: 30rpx; */
+  position: relative;
+  /* border: 1px solid red; */
+  border-bottom: 1px solid #d4d4d4;
 }
 
 .scimg {
   width: 150rpx;
   height: 141rpx;
   float: left;
+  margin-top: 20rpx;
 }
 .sctext{
 float: right;
-height: 141rpx;
+height: 165rpx;
 width: 530rpx;
 /* border: 1px solid red;   */
 }
 .t1{
-  color: #eb3f33;
-  font-size: 30rpx;
-  margin-top: 10rpx;
+  color: #000;
+  font-size: 28rpx;
+  margin-top: 45rpx;
   font-weight: 700;
 }
 .t2{
@@ -37,4 +42,17 @@ width: 530rpx;
   border-radius: 20rpx;
   background-color: rgba(255,125,127);
   text-align: center;
+}
+.isanswertag{
+  width: 140rpx;
+  background-color: #b9b9b9;
+  height: 40rpx;
+  line-height: 40rpx;
+  border-radius: 0 0 20rpx 20rpx;
+  position: absolute;
+  top: 0;
+  right: 0;
+  color: #fff;
+  font-size: 24rpx;
+  text-align: center;
 }

+ 1 - 1
project.config.json

@@ -4,7 +4,7 @@
 		"ignore": []
 	},
 	"setting": {
-		"urlCheck": true,
+		"urlCheck": false,
 		"es6": true,
 		"postcss": true,
 		"preloadBackgroundData": false,