Merge branch 'master' of http://118.190.145.217:3000/xiaojincai/yifengxcx

node_modules/.package_versions.json

@@ -0,0 +1 @@
+{}

pages/post/post.js

@@ -8,7 +8,7 @@ Page({
    */
   data: {
     sexArray: ["男","女"],    //性别
-    recordArray: ["小学", "初中", "高中", "大专", "本科","硕士","博士"], //学历
+    recordArray: ["初中", "高中", "大专", "本科","硕士","博士"], //学历
     categoryArray: [{ label: '电工', id: 0 }, { label: '水工', id: 1 }], //作业类别
     subjectArray: [{name:'请选择'}],    //准操项目
     trainArray: [{ name: '新办', intro: '第一次取证；或者以前取证了没有按规定的时间复审、换证' }, 
@@ -283,8 +283,12 @@ Page({
       //   return false
       // }
       formData.subject_item = data.z_type + "|" + data.categoryArray[data.category].name + "|" + data.subjectArray[data.subject].name
-      formData.subject_id = data.subjectArray[data.subject].id   
-      formData.class_id = data.classList[data.class_].id
+      formData.subject_id = data.subjectArray[data.subject].id 
+      if (formData.subject_item.indexOf("特种作业人员")==-1){
+        formData.class_id = data.classList[data.class_].id
+      }else{
+        formData.class_id = 0
+      }
     }else{
       formData.class_id = data.class_id
     }

pages/post/post.wxss

@@ -34,7 +34,10 @@ form{
   width: 16px;
   top:20px;
 }
-
+.next_fee{
+  position: fixed;
+  bottom: 0rpx;
+}
 .fee{
   text-align: right;
   color: #E85546;