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

app.js

@@ -46,7 +46,7 @@ App({
             console.log(res)
             // 发送 res.code 到后台换取 openId, sessionKey, unionId
             wx.request({
-              url: 'https://www.scxjc.club/api/wx/openid',
+              url: 'https://wxapi.yifeng2016.com/api/wx/openid',
               method: 'GET',
               data: {
                 code: res.code
@@ -68,7 +68,7 @@ App({
   },
   globalData: {
     userInfo: null,
-    host:'https://www.scxjc.club',
+    host:'https://wxapi.yifeng2016.com',
     categoryArray:[],
     openid:''
   }

pages/apply/apply.wxml

@@ -11,7 +11,10 @@
         <text wx:if="{{item.order_status == 7}}">考试完成</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="title">{{item.name}}   {{item.phone}}  
+          <text wx:if="{{item.class_name}}">{{item.class_name}}</text>
+          <text class="signup_count" wx:if="{{item.class_name}}">计划{{item.signup_limit}}人/已报名{{item.signup_count}}人</text>
+        </view>
         <view class="info">
             <text>{{item.subject_item_1[0]}}</text>
             <text decode="{{true}}">作业类别  &nbsp;&nbsp; {{item.subject_item_1[1]}}</text>
@@ -34,7 +37,10 @@
         <text wx:if="{{item.order_status == 7}}">考试完成</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="title">{{item.name}}   {{item.phone}}  
+          <text>{{item.class_name}}</text>
+          <text class="signup_count" wx:if="{{item.class_name}}">计划{{item.signup_limit}}人/已报名{{item.signup_count}}人</text>
+        </view>
         <view class="info">
             <text>{{item.subject_item_1[0]}}</text>
             <text decode="{{true}}">作业类别  &nbsp;&nbsp; {{item.subject_item_1[1]}}</text>

pages/apply/apply.wxss

@@ -32,6 +32,11 @@ page{
   font-size: 28rpx;
   font-weight: 400;
 }
+.title .signup_count{
+  color: #E85546;
+  font-size: 28rpx;
+  font-weight: 400;
+}
 .info text{
   display: block;
   color: #222;

pages/post/post.js

@@ -360,7 +360,7 @@ Page({
       if (formData.subject_item.indexOf("特种作业人员")==-1){
         formData.class_id = data.classList[data.class_].id
       }else{
-        formData.class_id = 0
+        formData.class_id = data.classList[data.class_].id
       }
     }else{
       formData.class_id = data.class_id

project.config.json

@@ -7,14 +7,27 @@
 		"urlCheck": true,
 		"es6": true,
 		"postcss": true,
+		"preloadBackgroundData": false,
 		"minified": true,
 		"newFeature": true,
+		"coverView": true,
 		"autoAudits": false,
-		"coverView": true
+		"showShadowRootInWxmlPanel": true,
+		"scopeDataCheck": false,
+		"checkInvalidKey": true,
+		"checkSiteMap": true,
+		"uploadWithSourceMap": true,
+		"babelSetting": {
+			"ignore": [],
+			"disablePlugins": [],
+			"outputPath": ""
+		},
+		"useCompilerModule": false,
+		"userConfirmedUseCompilerModuleSwitch": false
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.11.0",
-	"appid": "wx2938132b773c7b5a",
+	"appid": "wxd417822087cf4573",
 	"projectname": "yifeng",
 	"debugOptions": {
 		"hidedInDevtools": []