Merge branch 'zjl_adjust_20181026' into development

app/Http/Controllers/OrderController.php

@@ -287,6 +287,8 @@ Class OrderController extends Controller
     {
     {
         $uri = '/' . $request->path();
         $uri = '/' . $request->path();
 
 
+        if ($request->path() == '/') $uri = '/list';           
+
         $username = $request->user->email;
         $username = $request->user->email;
         $useremail= $request->user->email;
         $useremail= $request->user->email;
 
 

resources/views/orderlist/content.blade.php

@@ -122,6 +122,7 @@
                                                 <li data-val="1">PC端</li>
                                                 <li data-val="1">PC端</li>
                                                 <li data-val="2">移动端</li>
                                                 <li data-val="2">移动端</li>
                                                 <li data-val="3">后台</li>
                                                 <li data-val="3">后台</li>
+                                                <li data-val="6">小程序</li>
                                             </ul>
                                             </ul>
                                         </div>
                                         </div>
                                     </dd>
                                     </dd>

resources/views/selfOrder/content.blade.php

@@ -91,6 +91,7 @@
                                                 <li data-val="2">移动端</li>
                                                 <li data-val="2">移动端</li>
                                                 <li data-val="3">后台</li>
                                                 <li data-val="3">后台</li>
                                                 <li data-val="4">京东</li>
                                                 <li data-val="4">京东</li>
+                                                <li data-val="6">小程序</li>
                                             </ul>
                                             </ul>
                                         </div>
                                         </div>
                                     </dd>
                                     </dd>