志愿者修改

@@ -69,19 +69,27 @@ class VolunteerModel extends Model
         $userInfo['work_time']=$user['work_time'];
         $userInfo['use_time']=$user['use_time']??0;
         $userInfo['level_time']=$user['work_time']-$user['use_time'];
-        if ($user['study_time']<5){
-            $userInfo['status']='志愿者(待学习)';
-            $userInfo['user_num']='';
-        }
+        if ($userInfo['status']==2){
+            if ($user['study_time']<10){
+                $userInfo['status']='志愿者';
+                $userInfo['user_num']=$userId.$user['create_time'];
+            }
+
+            if ($user['study_time']<5){
+                $userInfo['status']='志愿者(待学习)';
+                $userInfo['user_num']='';
+            }
 
-        if ($user['study_time']>=5 && $user['study_time']<10){
-            $userInfo['status']='志愿者(待实习)';
+            if ($user['study_time']>=5 && $user['study_time']<10){
+                $userInfo['status']='志愿者(待实习)';
+                $userInfo['user_num']='';
+            }
+        }else{
+            $userInfo['status']='非志愿者';
             $userInfo['user_num']='';
         }
-        if ($user['study_time']<10){
-            $userInfo['status']='志愿者';
-            $userInfo['user_num']=$userId.$user['create_time'];
-        }
+
+
         return $userInfo;
 
     }

@@ -101,7 +101,6 @@ class SlideItemController extends AdminBaseController
         $result = Db::name('slideItem')->where(['id' => $id])->find();
         $activity = Db::name('activity')->where(array('delete_time'=>0,'is_up'=>1))->order('create_time desc')->select();
         $this->assign('activity', $activity);
-
         $this->assign('result', $result);
         $this->assign('slide_id', $result['slide_id']);
         return $this->fetch();

@@ -28,7 +28,25 @@
                             </select> &nbsp;&nbsp;
                         </td>
                     </tr>
+
+                    <tr>
+                        <th>关联类型<span class="form-required">*</span></th>
+                        <td>
+                            <select class="form-control" name="post[jump_type]" style="width:400px;">
+                                 <option value="1" <if condition="$result.type eq 1">selected</if>>团队详情</option>
+                                 <option value="2" <if condition="$result.type eq 2">selected</if>>在线培训</option>
+                                 <option value="3" <if condition="$result.type eq 3">selected</if>>管理条例</option>
+                                 <option value="4" <if condition="$result.type eq 4">selected</if>>志愿动态</option>
+                                 <option value="5" <if condition="$result.type eq 5">selected</if>>活动详情</option>
+                            </select>
+                        </td>
+                    </tr>
+
+
+
+
                     <!--<tr>-->
+
                         <!--<th>链接</th>-->
                         <!--<td>-->
                             <!--<input class="form-control" type="text" name="post[url]" id="keywords" value="{$result.url}"-->