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

pages/apply/apply.wxml

@@ -15,7 +15,9 @@
         <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.subject_item_1[0]=="特种作业人员"}}' decode="{{true}}">准操项目  &nbsp;&nbsp;{{item.subject_item_1[2]}}</text>
+            <text wx:if='{{item.subject_item_1[0]=="特种设备培训"}}' decode="{{true}}">准操项目  &nbsp;&nbsp;{{item.subject_item_1[2]}}</text>
+            <text wx:if='{{item.subject_item_1[0]!=="特种作业人员"&&item.subject_item_1[0]!=="特种设备培训"}}}' 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>

pages/post/post.wxml

@@ -58,7 +58,7 @@
   <view class="item" wx:if="{{type != 3}}">
       <label wx:if="{{z_type == '特种作业人员'}}">准操项目</label>
       <label wx:if="{{z_type == '特种设备培训'}}">项目代码</label>
-      <label wx:else>资格类型</label>
+      <label wx:if="{{z_type !== '特种设备培训'&&z_type !== '特种作业人员'}}">资格类型</label>
       <picker  data-name='subject'  bindchange="pickerChange" value="{{subject}}" range="{{subjectArray}}" range-key="name">
         <view class="picker">
         <text wx:if="{{subject<0}}">请选择</text>
@@ -200,7 +200,7 @@
   <view class="item" wx:if="{{!class_id}}">
        <label wx:if="{{z_type == '特种作业人员'}}">准操项目</label>
       <label wx:if="{{z_type == '特种设备培训'}}">项目代码</label>
-      <label wx:else>资格类型</label>
+      <label wx:if="{{z_type !== '特种设备培训'&&z_type !== '特种作业人员'}}">资格类型</label>
       <picker  data-name='subject'  bindchange="pickerChange" value="{{subject}}" range="{{subjectArray}}" range-key="name">
         <view class="picker">
         <text wx:if="{{subject<0}}">请选择</text>