1.0

app/Http/Controllers/HandleController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
 use App\Jobs\JopExportAbnormlList;
 use App\Jobs\JopExportAbnormlList;
 use App\Jobs\JopExportGoodsList;
 use App\Jobs\JopExportGoodsList;
 use App\Jobs\JopExportOrderList;
 use App\Jobs\JopExportOrderList;
+use App\Jobs\JopExportPutawayList;
 use App\Jobs\PreSaleOrder;
 use App\Jobs\PreSaleOrder;
 use App\Jobs\PushFinancePeriod;
 use App\Jobs\PushFinancePeriod;
 use App\Jobs\SafeStock;
 use App\Jobs\SafeStock;
@@ -93,7 +94,7 @@ class HandleController extends Controller
     }
     }
 
 
     private function c(){
     private function c(){
-        $s = (new JopExportAbnormlList($_GET['id']))->handle();
+        $s = (new JopExportPutawayList($_GET['id']))->handle();
         print_r($s);
         print_r($s);
         die();
         die();
        echo  dispatch(new JopExportOrderList($_GET['id']));
        echo  dispatch(new JopExportOrderList($_GET['id']));

public/pc/js/controller/ForgetPassword.js

@@ -32,7 +32,7 @@ var yunxin_forget_mobile;
           return false;
           return false;
         }
         }
         if(!(/^1[3|4|5|8][0-9]\d{4,8}$/.test(opt.getMobile()))){
         if(!(/^1[3|4|5|8][0-9]\d{4,8}$/.test(opt.getMobile()))){
-            $(".error").show().text("不是完整的11位手机号或者正确的手机号前七位");
+            $(".error").show().text("手机号不正确");
              return false;
              return false;
         }
         }
       }
       }

public/pc/js/controller/OrderDetail.js

@@ -15,7 +15,7 @@
             $(".putaway_time").html(other.putaway_time);
             $(".putaway_time").html(other.putaway_time);
             $(".pay_type_name").html(other.pay_type_name);
             $(".pay_type_name").html(other.pay_type_name);
             $(".status").html(other.status);
             $(".status").html(other.status);
-            $(".settle").html(other.settle);
+            $(".settle").html(other.picking_amount);
             $(".currency").html(other.currency);
             $(".currency").html(other.currency);
 
 
             var html;
             var html;