sunhao 5 years ago
parent
commit
bde3b083b9

+ 17 - 8
app/Http/Controllers/Admin/StatisticsController.php

@@ -3983,16 +3983,16 @@ class StatisticsController extends Controller
3983 3983
                         $sort_c = 'total_roi';
3984 3984
                         break;
3985 3985
                     case '1':
3986
-                        $sort_c = 'total_roi15';
3986
+                        $sort_c = 'total_roi15_sort';
3987 3987
                         break;
3988 3988
                     case '2':
3989
-                        $sort_c = 'total_roi30';
3989
+                        $sort_c = 'total_roi30_sort';
3990 3990
                         break;
3991 3991
                     case '3':
3992
-                        $sort_c = 'total_roi45';
3992
+                        $sort_c = 'total_roi45_sort';
3993 3993
                         break;
3994 3994
                     case '4':
3995
-                        $sort_c = 'total_roi60';
3995
+                        $sort_c = 'total_roi60_sort';
3996 3996
                         break;
3997 3997
                     default:
3998 3998
                         $sort_c = 'total_roi';
@@ -4033,6 +4033,7 @@ class StatisticsController extends Controller
4033 4033
             $v['new_roi'] = $v['cost']>0 ? round($v['new_fan_order_amount'] / $v['cost'], 4) * 100 .'%' : '';
4034 4034
             //累计roi
4035 4035
             $v['total_roi'] = $v['cost']>0 ? round($v['sum_order_amount'] / $v['cost'], 4) * 100 .'%' : '';
4036
+            $v['total_roi_sort'] = rtrim($v['total_roi'], '%') * 100;
4036 4037
             //数据格式化
4037 4038
             $v['order_amount'] = round($v['sum_order_amount'],2);
4038 4039
 
@@ -4043,11 +4044,13 @@ class StatisticsController extends Controller
4043 4044
                 $v['order_count15'] = $data15->order_count;
4044 4045
                 $v['order_amount15'] = round($data15->sum_order_amount,2);
4045 4046
                 $v['total_roi15'] = $v['cost15']>0 ? round($data15->sum_order_amount / $v['cost15'], 4) * 100 .'%' : '';
4047
+                $v['total_roi15_sort'] = rtrim($v['total_roi15'], '%') * 100;
4046 4048
             }else{
4047 4049
                 $v['cost15'] = '';
4048 4050
                 $v['order_count15'] = '';
4049 4051
                 $v['order_amount15'] = '';
4050 4052
                 $v['total_roi15'] = '';
4053
+                $v['total_roi15_sort'] = 0;
4051 4054
             }
4052 4055
 
4053 4056
             //30日
@@ -4057,11 +4060,13 @@ class StatisticsController extends Controller
4057 4060
                 $v['order_count30'] = $data30->order_count;
4058 4061
                 $v['order_amount30'] = round($data30->sum_order_amount,2);
4059 4062
                 $v['total_roi30'] = $v['cost30']>0 ? round($data30->sum_order_amount / $v['cost30'], 4) * 100 .'%' : '';
4063
+                $v['total_roi30_sort'] = rtrim($v['total_roi30'], '%') * 100;
4060 4064
             }else{
4061 4065
                 $v['cost30'] = '';
4062 4066
                 $v['order_count30'] = '';
4063 4067
                 $v['order_amount30'] = '';
4064 4068
                 $v['total_roi30'] = '';
4069
+                $v['total_roi30_sort'] = 0;
4065 4070
             }
4066 4071
 
4067 4072
             //45日
@@ -4071,11 +4076,13 @@ class StatisticsController extends Controller
4071 4076
                 $v['order_count45'] = $data45->order_count;
4072 4077
                 $v['order_amount45'] = round($data45->sum_order_amount,2);
4073 4078
                 $v['total_roi45'] = $v['cost45']>0 ? round($data45->sum_order_amount / $v['cost45'], 4) * 100 .'%' : '';
4079
+                $v['total_roi45_sort'] = rtrim($v['total_roi45'], '%') * 100;
4074 4080
             }else{
4075 4081
                 $v['cost45'] = '';
4076 4082
                 $v['order_count45'] = '';
4077 4083
                 $v['order_amount45'] = '';
4078 4084
                 $v['total_roi45'] = '';
4085
+                $v['total_roi45_sort'] = 0;
4079 4086
             }
4080 4087
 
4081 4088
             //60日
@@ -4085,11 +4092,13 @@ class StatisticsController extends Controller
4085 4092
                 $v['order_count60'] = $data60->order_count;
4086 4093
                 $v['order_amount60'] = round($data60->sum_order_amount,2);
4087 4094
                 $v['total_roi60'] = $v['cost60']>0 ? round($data60->sum_order_amount / $v['cost60'], 4) * 100 .'%' : '';
4095
+                $v['total_roi60_sort'] = rtrim($v['total_roi60'], '%') * 100;
4088 4096
             }else{
4089 4097
                 $v['cost60'] = '';
4090 4098
                 $v['order_count60'] = '';
4091 4099
                 $v['order_amount60'] = '';
4092 4100
                 $v['total_roi60'] = '';
4101
+                $v['total_roi60_sort'] = 0;
4093 4102
             }
4094 4103
 
4095 4104
         }
@@ -4105,16 +4114,16 @@ class StatisticsController extends Controller
4105 4114
                     $sort_c = 'total_roi';
4106 4115
                     break;
4107 4116
                 case '1':
4108
-                    $sort_c = 'total_roi15';
4117
+                    $sort_c = 'total_roi15_sort';
4109 4118
                     break;
4110 4119
                 case '2':
4111
-                    $sort_c = 'total_roi30';
4120
+                    $sort_c = 'total_roi30_sort';
4112 4121
                     break;
4113 4122
                 case '3':
4114
-                    $sort_c = 'total_roi45';
4123
+                    $sort_c = 'total_roi45_sort';
4115 4124
                     break;
4116 4125
                 case '4':
4117
-                    $sort_c = 'total_roi60';
4126
+                    $sort_c = 'total_roi60_sort';
4118 4127
                     break;
4119 4128
                 default:
4120 4129
                     $sort_c = 'total_roi';

+ 5 - 5
resources/views/statistics/districtRoiAllTotal.blade.php

@@ -23,11 +23,11 @@
23 23
                 <input id="city" type="text"  class="input-text" style="width:6%;text-align:center" name="city" value="{{$city?$city:''}}">   
24 24
                 <input class="input-text" style="width:6%;text-align:center" type="text" value="排序方式"/> 
25 25
                 <select style="width:10%;text-align:center" id='sort' name="sort">
26
-                    <option value="0">7日roi降序 </option>                   
27
-                    <option value="1">15日roi降序</option>                                     
28
-                    <option value="2">30日roi降序</option>
29
-                    <option value="3">45日roi降序</option>                                                                          
30
-                    <option value="4">60日roi降序</option>                                                                          
26
+                    <option value="0"  @if($sort==0) selected @endif>7日roi降序 </option>                   
27
+                    <option value="1"  @if($sort==1) selected @endif>15日roi降序</option>                                     
28
+                    <option value="2"  @if($sort==2) selected @endif>30日roi降序</option>
29
+                    <option value="3"  @if($sort==3) selected @endif>45日roi降序</option>                                                                          
30
+                    <option value="4"  @if($sort==4) selected @endif>60日roi降序</option>                                                                          
31 31
                   
32 32
                 </select>                       
33 33