up

pages/apply/apply.wxml

@@ -1,10 +1,12 @@
 <view class="content">
-    <navigator class="list" wx:for="{{list}}" wx:key='*this' open-type="navigateTo" url="../post/post?type=2&&id={{item.id}}">
+<block  wx:for="{{list}}">
+    <navigator class="list" wx:key='*this' open-type="navigateTo" wx:if='{{item.order_status<2}}'
+     url="../post/post?type=2&&id={{item.id}}">
         <view class="status">
         <text wx:if="{{item.order_status == -1}}">待提交资料</text> 
         <text wx:if="{{item.order_status == 0}}">待审核</text> 
         <text wx:if="{{item.order_status == 1}}">已审核立即支付</text> 
-        <text wx:if="{{item.order_status == 2}}">学习中</text> 
+        <text wx:if="{{item.order_status == 2}}">已支付,学习中</text> 
         <text wx:if="{{item.order_status == 3}}">已完成</text> 
         <text style="color:green;">{{item.train_type}}</text></view>
         <view class="title">{{item.name}}   {{item.phone}}  <text>{{item.class_name}}</text></view>
@@ -18,8 +20,26 @@
         <view  data-id='{{item.id}}' catchtap="pay" wx:if="{{item.order_status == 1}}" class="study">立即支付</view>
         <navigator url="../online/online" wx:if="{{item.order_status == 2}}" class="study">立即学习</navigator>
     </navigator>
-
-
+    <navigator class="list" wx:key='*this' open-type="navigateTo" wx:else>
+        <view class="status">
+        <text wx:if="{{item.order_status == -1}}">待提交资料</text> 
+        <text wx:if="{{item.order_status == 0}}">待审核</text> 
+        <text wx:if="{{item.order_status == 1}}">已审核立即支付</text> 
+        <text wx:if="{{item.order_status == 2}}">已支付,学习中</text> 
+        <text wx:if="{{item.order_status == 3}}">已完成</text> 
+        <text style="color:green;">{{item.train_type}}</text></view>
+        <view class="title">{{item.name}}   {{item.phone}}  <text>{{item.class_name}}</text></view>
+        <view class="info">
+            <text>{{item.subject_item_1[0]}}</text>
+            <text decode="{{true}}">作业类别  &nbsp;&nbsp; {{item.subject_item_1[1]}}</text>
+            <text decode="{{true}}">准操项目  &nbsp;&nbsp;{{item.subject_item_1[2]}}</text>
+            <text wx:if="{{item.order_status == 2||item.order_status == 3}}" style="color:#358BFF;" decode="{{true}}">学时情况  &nbsp;&nbsp;已学习{{item.class_hour_finished}}/{{item.class_hour}}学时</text>
+            <text style="color:#999;margin-top:12px;">{{item.ctime}}</text>
+        </view>
+        <view  data-id='{{item.id}}' catchtap="pay" wx:if="{{item.order_status == 1}}" class="study">立即支付</view>
+        <navigator url="../online/online" wx:if="{{item.order_status == 2}}" class="study">立即学习</navigator>
+    </navigator>
+</block>
     <navigator url="../onlinePost/onlinePost" class="post">立即报名</navigator>
 </view>
 

pages/online/online.json

@@ -1,3 +1,3 @@
 {
-  "navigationBarTitleText": "培训计划"
+  "navigationBarTitleText": "在线培训"
 }