微信小程序路由修改

app/Http/Controllers/ProcessController.php

@@ -935,11 +935,11 @@ class ProcessController extends Controller
             'user_id'=>'required',
             'started_at'=>'required|date_format:H:i',
             'ended_at'=>'required|date_format:H:i',
-            'hour_price'=>'required_without:unit_price|min:0|max:999999|numeric',
-            'unit_price'=>'required_without:hour_price|min:0|max:999999|numeric',
+            'hour_price'=>'required_without:unit_price|min:0|max:999999|nullable|numeric',
+            'unit_price'=>'required_without:hour_price|min:0|max:999999|nullable|numeric',
             'dinner_duration'=>'nullable|integer',
-            'hour_count'=>'required_with:hour_price|min:0|max:999999|numeric',
-            'unit_count'=>'required_with:unit_price|min:0|max:999999|numeric',
+            'hour_count'=>'required_with:hour_price|min:0|max:999999|nullable|numeric',
+            'unit_count'=>'required_with:unit_price|min:0|max:999999|nullable|numeric',
             'remark'=>'nullable',
         ],[
             'required'=>':attribute 不应为空',
@@ -949,6 +949,7 @@ class ProcessController extends Controller
             'required_without'=>':attribute 计时与计件至少填一项',
             'date_format'=>':attribute 格式错误',
             'integer'=>':attribute 选择错误',
+            'required_with'=>':attribute 必须填写',
         ],[
             'daily_id'=>'所属每日单',
             'user_id'=>'参与人',

app/Http/Controllers/TestController.php

@@ -126,7 +126,7 @@ class TestController extends Controller
     }
 
     public function test1(){
-
+        return 7|6;
     }
 
 

app/Http/Controllers/WaybillsController.php

@@ -742,9 +742,9 @@ class WaybillsController extends Controller
             'carrier_id'=>'required|integer',
             'destination_city_id'=>'required|integer',
             'warehouse_weight'=>'nullable|min:0|numeric|max:999999',
-            'warehouse_weight_unit_id'=>'required_with:warehouse_weight|integer',
+            'warehouse_weight_unit_id'=>'required_with:warehouse_weight|nullable|integer',
             'warehouse_weight_other'=>'nullable|min:0|numeric|max:999999',
-            'warehouse_weight_unit_id_other'=>'required_with:warehouse_weight_other|integer',
+            'warehouse_weight_unit_id_other'=>'required_with:warehouse_weight_other|nullable|integer',
             'charge'=>'nullable|min:0|numeric|max:999999',
             'carrier_weight'=>'nullable|min:0|numeric|max:999999',
             'carrier_weight_unit_id'=>'required_with:carrier_weight',

resources/views/process/create.blade.php

@@ -159,7 +159,6 @@
             },
             mounted:function(){
                 $(".tooltipTarget").tooltip({'trigger':'hover'});
-                alert(new Date('2017-05-04T18:30:00.000Z').to)
             },
             methods:{
                 //新增库单据

routes/api.php

@@ -18,5 +18,4 @@ Route::prefix('log')->group(function(){ //日志记录
 });
 Route::post('rejected/jianshang/send', "Api\jianshang\RejectedController@fakingReceiveSend");//faking rejected发给笕尚的退货信息
 
-Route::any('wx/login', "Api\WxLoginController@login");//微信小程序登录验证
 

routes/api/thirdPart/weixin.php

@@ -9,8 +9,9 @@ use Illuminate\Http\Request;
 */
 
 Route::group(['middleware'=>'auth:api'],function(){
-    Route::get('wx/waybill', "Api\WxController@index");//微信小程序数据返回
-    Route::post('wx/waybill/show', "Api\WxController@show");//微信小程序数据返回
-    Route::post('wx/waybill/update', "Api\WxController@update");//微信小程序数据修改
+    Route::get('waybill', "WxController@index");//微信小程序数据返回
+    Route::post('waybill/show', "WxController@show");//微信小程序数据返回
+    Route::post('waybill/update', "WxController@update");//微信小程序数据修改
 });
+Route::post('login', "WxLoginController@login");//微信小程序登录验证