change

pages/index/index.wxml

@@ -43,7 +43,7 @@
     <image src="../../images/联系我们.png" mode="widthFix"></image>
   </navigator> -->
   <view class="news">
-      <image src="../../images/头条通知.png" mode="widthFix"></image>
+      <image src="../../images/tt.png" mode="widthFix"></image>
       国家安全生产监督管理总局30号令
   </view>
 </view>

pages/mine/mine.wxml

@@ -7,28 +7,28 @@
 </view>
 
 <view class="info">
-  <image class="icon" src="../../images/资料.png" mode="widthFix"></image>
+  <image class="icon" src="../../images/zl.png" mode="widthFix"></image>
   <view>我的资料</view>
   <text>实名认证信息</text>
   <image class="goto" src="../../images/back.png" mode="widthFix"></image>
 </view>
 
 <navigator url='../download/download' class="info">
-  <image class="icon" src="../../images/下载.png" mode="widthFix"></image>
+  <image class="icon" src="../../images/xz.png" mode="widthFix"></image>
   <view>资料下载</view>
   <text>资料下载</text>
   <image class="goto" src="../../images/back.png" mode="widthFix"></image>
 </navigator>
 
 <navigator url="../online/online" class="info">
-  <image class="icon" src="../../images/试题.png" mode="widthFix"></image>
+  <image class="icon" src="../../images/st.png" mode="widthFix"></image>
   <view>我的试题</view>
   <text>我的试题</text>
   <image class="goto" src="../../images/back.png" mode="widthFix"></image>
 </navigator>
 
 <navigator url="../myPapers/myPapers" class="info">
-  <image class="icon" src="../../images/证件.png" mode="widthFix"></image>
+  <image class="icon" src="../../images/zj.png" mode="widthFix"></image>
   <view>我的证件</view>
   <text>我的证件</text>
   <image class="goto" src="../../images/back.png" mode="widthFix"></image>

pages/onlinePost/onlinePost.js

@@ -22,7 +22,7 @@ Page({
   gotoForm:function(e){
     let id=e.target.dataset.id
     wx.navigateTo({
-      url: '../post/post?id='+id,
+      url: '../post/post?name='+id,
     })
   },
   /**

pages/post/post.js

@@ -26,7 +26,8 @@ Page({
     price:'0.00',
     classList:[],
     class_:-1,
-    class_id:0
+    class_id:0,
+    data:{}
   },
 
   /**
@@ -39,7 +40,9 @@ Page({
           method:'GET',
           data:{id:options.id},
           success:res=>{
-            console.log(res.data)
+            this.setData({
+              data: res.data.data
+            })
           }
         })
     }
@@ -52,7 +55,7 @@ Page({
       wx.request({
         url: host + '/api/wx/sujectitem',
         success: res => {
-          let list = res.data.data.filter(item => item.name == options.id)
+          let list = res.data.data.filter(item => item.name == options.name)
           this.setData({
             categoryArray: list[0].children,
             z_type: options.id
@@ -63,7 +66,7 @@ Page({
         url: host + '/api/wx/class/list',
         method: 'GET',
         success: res => {
-          let list = res.data.data.filter(item => item.type == options.id)
+          let list = res.data.data.filter(item => item.type == options.name)
           this.setData({
             classList: list[0].classes
           })

pages/post/post.wxml

@@ -1,4 +1,4 @@
-<form catchsubmit="next">
+<form wx:if="{{!id}}" catchsubmit="next">
   <view class="item">
       <label>姓名</label>
       <input  name='name' placeholder="请输入您的姓名"></input>
@@ -135,4 +135,143 @@
   </view>
 
   <view class="post"><button formType="submit">下一步，上传资料</button></view>
+</form>
+
+<form wx:else catchsubmit="next">
+  <view class="item">
+      <label>姓名</label>
+      <input value="data.name" name='name' placeholder="请输入您的姓名"></input>
+  </view>
+
+  <view class="item">
+      <label>性别</label>
+      <picker  name='sex' data-name='sex' bindchange="pickerChange" value="{{sex}}" range="{{sexArray}}">
+        <view class="picker">
+          {{sexArray[sex]}}
+        </view>
+      </picker>
+      <image src="../../images/arrow-bottom.png" mode="widthFix"></image>
+  </view>
+
+  <view class="item">
+      <label>身份证</label>
+      <input name='idno' type="idcard" placeholder="请输入您的身份证"></input>
+  </view>
+
+  <view class="item">
+      <label>文化程度</label>
+      <picker name='education' data-name='record'  bindchange="pickerChange" value="{{record}}" range="{{recordArray}}">
+        <view class="picker">
+          {{recordArray[record]}}
+        </view>
+      </picker>
+      <image src="../../images/arrow-bottom.png" mode="widthFix"></image>
+  </view>
+
+  <view class="item">
+      <label>手机号</label>
+      <input name='phone' type="number" placeholder="请输入您的手机号"></input>
+  </view>
+
+  <view class="item">
+      <label>单位全称</label>
+      <input name='company' placeholder="请输入您的单位名称"></input>
+  </view>
+
+  <view class="item" wx:if="{{!class_id}}">
+      <label>作业类别</label>
+      <picker  data-name='category'  bindchange="pickerChange" value="{{category}}" range="{{categoryArray}}" range-key="name">
+        <view class="picker">
+          <text wx:if="{{category<0}}">请选择</text>
+          {{categoryArray[category].name}}
+        </view>
+      </picker>
+      <image src="../../images/arrow-bottom.png" mode="widthFix"></image>
+
+      <view wx:if="{{category>=0}}" class="intro">{{categoryArray[category].intro}}</view>
+  </view>
+
+  <view class="item" wx:if="{{!class_id}}">
+      <label wx:if="{{z_type == '特种作业'}}">准操项目</label>
+      <label wx:else>资格类型</label>
+      <picker  data-name='subject'  bindchange="pickerChange" value="{{subject}}" range="{{subjectArray}}" range-key="name">
+        <view class="picker">
+        <text wx:if="{{subject<0}}">请选择</text>
+          {{subjectArray[subject].name}}
+        </view>
+      </picker>
+      <image src="../../images/arrow-bottom.png" mode="widthFix"></image>
+      <view wx:if="{{subject>=0}}" class="intro">{{subjectArray[subject].intro}}</view>
+  </view>
+
+  <view class="item">
+      <label>培训类型</label>
+      <picker name='train_type' data-name='train'  bindchange="pickerChange" value="{{train}}" range="{{trainArray}}" range-key="name">
+        <view class="picker">
+        <text wx:if="{{train<0}}">请选择</text>
+          {{trainArray[train].name}}
+        </view>
+      </picker>
+      <image src="../../images/arrow-bottom.png" mode="widthFix"></image>
+      <view wx:if="{{train>=0}}" class="intro">{{trainArray[train].intro}}</view>
+  </view>
+
+  <view class="item" wx:if="{{!class_id}}">
+      <label>班级</label>
+      <picker  data-name='class_'  bindchange="pickerChange" value="{{class_}}" range="{{classList}}" range-key="class_name">
+        <view class="picker">
+        <text wx:if="{{class_<0}}">请选择</text>
+          {{classList[class_].class_name}}
+        </view>
+      </picker>
+      <image src="../../images/arrow-bottom.png" mode="widthFix"></image>
+  </view>
+
+  <!-- <view class="item">
+      <label>培训时间</label>
+      <picker name='time' data-name='time' value="{{time}}"  mode="date" bindchange="pickerChange">
+        <view class="picker">
+          {{time}}
+        </view>
+      </picker>
+      <image src="../../images/arrow-bottom.png" mode="widthFix"></image>
+  </view> -->
+
+  <view class="item">
+      <label>领取方式</label>
+      <picker name='receive_card' data-name='receive'  bindchange="pickerChange" value="{{receive}}" range="{{receiveArray}}">
+        <view class="picker">
+          {{receiveArray[receive]}}
+        </view>
+      </picker>
+      <image src="../../images/arrow-bottom.png" mode="widthFix"></image>
+  </view>
+
+  <view class="item">
+      <label>所在地区</label>
+      <picker name='area' data-name='area' value="{{area}}"  mode="region" bindchange="pickerChange">
+        <view class="picker">
+          {{area[0]}}{{area[1]}}{{area[2]}}
+        </view>
+      </picker>
+      <image src="../../images/arrow-bottom.png" mode="widthFix"></image>
+  </view>
+  <view class="item" wx:if="{{receive==1}}">
+      <label>详细地址</label>
+      <input name='address' placeholder="请输入您的详细地址"></input>
+  </view>
+
+  <view class="item">
+      <label>备注</label>
+      <input name='remark' placeholder="请输入您的备注"></input>
+  </view>
+
+  <view class="fee">
+    <label>培训费用</label>¥{{price}}
+  </view>
+  <view class="fee">
+    <label>审核后需支付费用</label>¥{{price}}
+  </view>
+
+  <view class="post"><button formType="submit">下一步，上传资料</button></view>
 </form>

pages/subject/subject.wxml

@@ -6,9 +6,9 @@
 <!-- 判断 -->
 <view class="content" wx:for="{{data.questions}}"  wx:if="{{idx == index+1}}">
     <view class="num">{{index+1}}、
-    <image wx:if="{{item.type == 1}}" src="../../images/单选.svg" mode="widthFix"></image>
-    <image wx:if="{{item.type == 2}}" src="../../images/多选.svg" mode="widthFix"></image>
-    <image wx:if="{{item.type == 3}}" src="../../images/判断.svg" mode="widthFix"></image>
+    <image wx:if="{{item.type == 1}}" src="../../images/danx.svg" mode="widthFix"></image>
+    <image wx:if="{{item.type == 2}}" src="../../images/duox.svg" mode="widthFix"></image>
+    <image wx:if="{{item.type == 3}}" src="../../images/pd.svg" mode="widthFix"></image>
     </view>
     <view class="ques">  {{item.title}}  </view>
     <view class="ans">