Merge branch 'dev/ver/1.0.0' of http://git.ichunt.net/semour/semour_web into dev/ver/1.0.0

app/Http/Controllers/Api/AuthApiController.php

@@ -219,13 +219,13 @@ class AuthApiController extends Controller
         $subject = config('mail.from.name');
         $subject = config('mail.from.name');
 
 
         // return $this->setSuccessData($code);
         // return $this->setSuccessData($code);
-//        Mail::to($email)->send(new SendCode($type, $code));
-//        //错误处理
-//        if (count(Mail::failures())) {
-//            return $this->setError('Email code send failed');
-//        }
+        Mail::to($email)->send(new SendCode($type, $code));
+        //错误处理
+        if (count(Mail::failures())) {
+            return $this->setError('Email code send failed');
+        }
 
 
-        return $this->setSuccess('A verification code has been sent. Please enter the code below to continue. '.$code);
+        return $this->setSuccess('A verification code has been sent. Please enter the code below to continue. ');
     }
     }
 
 
 }
 }

app/Http/Services/OrderService.php

@@ -428,7 +428,7 @@ class OrderService
             "finish_time"=>"", //交易成功时间
             "finish_time"=>"", //交易成功时间
             "shipping"=>\Arr::get($priceArr,3,0), //运费
             "shipping"=>\Arr::get($priceArr,3,0), //运费
             "payment_surcharge"=>\Arr::get($priceArr,5,0), //支付手续费
             "payment_surcharge"=>\Arr::get($priceArr,5,0), //支付手续费
-            "merchandise_total"=>$merchandise_total, //商品总额
+            "merchandise_total"=>round($merchandise_total,2), //商品总额
             "status"=>$orderInfo["status"],
             "status"=>$orderInfo["status"],
             "status_en"=>\Arr::get(OrderModel::$status,$orderInfo["status"],""),
             "status_en"=>\Arr::get(OrderModel::$status,$orderInfo["status"],""),
             "shipping_address"=>\Arr::get($orderAddressArr,1,[]),
             "shipping_address"=>\Arr::get($orderAddressArr,1,[]),