靓号

application/api/controller/MobileController.php

@@ -48,6 +48,7 @@ class MobileController extends UserApi
      * @ApiParams (name="limit",description="limit")
      * @ApiParams (name="page",description="page")
      * @ApiParams (name="is_activity",description="是否是优惠号码")
+     * @ApiParams (name="chanId",description="分站ID")
      * @ApiReturnParams (name=id,description=id)
      * @ApiReturnParams  (name="type",description="1靓号，2流量卡")
      * @ApiReturnParams (name=logo,description=缩略图)
@@ -131,10 +132,10 @@ class MobileController extends UserApi
         }else{
             if($data['type']==1) {
                 if($chanId){
-                    $model->join('mobile_sub',"mobile.id=mobile_sub.mobile_id and mobile_sub.sub_admin_id={$chanId}")
+                    $model->join('mobile_sub',"mobile.id=mobile_sub.mobile_id and mobile_sub.sub_admin_id={$chanId}",'LEFT')
                         ->order('activity_time', 'desc')
                         ->orderRaw('FIELD(top_time,1) DESC,FIELD(rec_time,1) DESC')
-                        ->order('mobile_sub.sub_sort', 'asc')
+                        ->orderRaw('mobile_sub.sub_sort is null,mobile_sub.sub_sort asc')
                         ->order('id', 'desc');
                 }else {
                     $model->order('activity_time', 'desc')

public/api.html

@@ -2491,6 +2491,12 @@
                                                         <td>是</td>
                                                         <td>是否是优惠号码</td>
                                                     </tr>
+                                                                                                        <tr>
+                                                        <td>chanId</td>
+                                                        <td>string</td>
+                                                        <td>是</td>
+                                                        <td>分站ID</td>
+                                                    </tr>
                                                                                                     </tbody>
                                             </table>
                                                                                     </div>
@@ -2577,6 +2583,10 @@
                                                             <label class="control-label" for="is_activity">is_activity</label>
                                                             <input type="string" class="form-control input-sm" id="is_activity" required placeholder="是否是优惠号码" name="is_activity">
                                                         </div>
+                                                                                                                <div class="form-group">
+                                                            <label class="control-label" for="chanId">chanId</label>
+                                                            <input type="string" class="form-control input-sm" id="chanId" required placeholder="分站ID" name="chanId">
+                                                        </div>
                                                                                                                 <div class="form-group form-group-submit">
                                                             <button type="submit" class="btn btn-success send" rel="13">提交</button>
                                                             <button type="reset" class="btn btn-info" rel="13">重置</button>
@@ -9863,7 +9873,7 @@
 
                 </div>
                 <div class="col-md-6" align="right">
-                    Generated on 2022-06-17 14:11:40 <a href="./" target="_blank">美美靓号</a>
+                    Generated on 2022-06-22 14:10:30 <a href="./" target="_blank">美美靓号</a>
                 </div>
             </div>