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

pages/apply/apply.wxml

@@ -16,8 +16,8 @@
             <text>{{item.subject_item_1[0]}}</text>
             <text decode="{{true}}">作业类别  &nbsp;&nbsp; {{item.subject_item_1[1]}}</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.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>
@@ -38,7 +38,10 @@
         <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 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.js

@@ -239,13 +239,13 @@ Page({
         price = this.data.parice_list[e.detail.value]
       }else if(this.data.category>=0 && this.data.subject>=0){
         if (e.detail.value == 0){
-          price = this.data.categoryArray[this.data.category].price_new
+          price = this.data.subjectArray[this.data.subject].price_new
         }
         if (e.detail.value == 1) {
-          price = this.data.categoryArray[this.data.category].price_re
+          price = this.data.subjectArray[this.data.subject].price_re
         }
         if (e.detail.value == 2) {
-          price = this.data.categoryArray[this.data.category].price_change
+          price = this.data.subjectArray[this.data.subject].price_change
         }
       }
       this.setData({