tanyanfei 4 vuotta sitten
vanhempi
commit
db2d723f6d
5 muutettua tiedostoa jossa 19 lisäystä ja 19 poistoa
  1. 2 2
      pages/apply/apply.wxml
  2. 8 8
      pages/post/post.js
  3. 6 7
      pages/post/post.wxml
  4. 2 1
      pages/upload/upload.js
  5. 1 1
      pages/upload/upload.wxml

+ 2 - 2
pages/apply/apply.wxml

@@ -14,7 +14,7 @@
             <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 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>
@@ -33,7 +33,7 @@
             <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 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>

+ 8 - 8
pages/post/post.js

@@ -274,14 +274,14 @@ Page({
         })
         return false
       }
-      if (this.data.class_ == -1) {
-        wx.showToast({
-          title: '请选择班级',
-          icon: 'none',
-          duration: 2000
-        })
-        return false
-      }
+      // if (this.data.class_ == -1) {
+      //   wx.showToast({
+      //     title: '请选择班级',
+      //     icon: 'none',
+      //     duration: 2000
+      //   })
+      //   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

+ 6 - 7
pages/post/post.wxml

@@ -77,8 +77,7 @@
       <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="{{type != 3}}">
+  <view class="item" wx:if="{{type != 3&&z_type!='特种作业人员'}}">
       <label>班级</label>
       <picker  data-name='class_'  bindchange="pickerChange" value="{{class_}}" range="{{classList}}" range-key="name">
         <view class="picker">
@@ -99,7 +98,7 @@
       <image src="../../images/arrow-bottom.png" mode="widthFix"></image>
   </view> -->
 
-  <view class="item">
+  <!-- <view class="item">
       <label>领取方式</label>
       <picker name='receive_card' data-name='receive'  bindchange="pickerChange" value="{{receive}}" range="{{receiveArray}}">
         <view class="picker">
@@ -107,7 +106,7 @@
         </view>
       </picker>
       <image src="../../images/arrow-bottom.png" mode="widthFix"></image>
-  </view>
+  </view> -->
 
   <view class="item" wx:if="{{receive==1}}">
       <label>所在地区</label>
@@ -217,7 +216,7 @@
       <view wx:if="{{train>=0}}" class="intro">{{trainArray[train].intro}}</view>
   </view>
 
-  <view class="item" wx:if="{{!class_id}}">
+  <view class="item" wx:if="{{!class_id&&z_type!='特种作业人员'}}">
       <label>班级</label>
       <picker  data-name='class_'  bindchange="pickerChange" value="{{class_}}" range="{{classList}}" range-key="name">
         <view class="picker">
@@ -238,7 +237,7 @@
       <image src="../../images/arrow-bottom.png" mode="widthFix"></image>
   </view> -->
 
-  <view class="item">
+  <!-- <view class="item">
       <label>领取方式</label>
       <picker name='receive_card' data-name='receive'  bindchange="pickerChange" value="{{receive}}" range="{{receiveArray}}">
         <view class="picker">
@@ -246,7 +245,7 @@
         </view>
       </picker>
       <image src="../../images/arrow-bottom.png" mode="widthFix"></image>
-  </view>
+  </view> -->
 
   <view class="item" wx:if="{{receive==1}}">
       <label>所在地区</label>

+ 2 - 1
pages/upload/upload.js

@@ -14,7 +14,8 @@ Page({
     education_img: "", //学历照
     oldcard_img:'',
     id:'',
-    train_type:''
+    train_type:'',
+    img:''
   },
 
   /**

+ 1 - 1
pages/upload/upload.wxml

@@ -45,5 +45,5 @@
 
 
 <view class="model {{show?'show':''}}" bindtap="hideImg">
-  <image src="../../images/upload.png" mode="widthFix"></image>
+  <image src="{{img}}" mode="widthFix"></image>
 </view>