hrjy пре 3 година
родитељ
комит
d1aca89aba

+ 1 - 1
app/admin/view/auction/auction_order/index.php

@@ -52,7 +52,7 @@
                                 </div>
                             </div>
                             <div class="layui-col-lg12">
-                                <label class="layui-form-label">创建时间:</label>
+                                <label class="layui-form-label">创建状态:</label>
                                 <div class="layui-input-block" v-cloak="">
                                     <button class="layui-btn layui-btn-sm" type="button" v-for="item in statusList"
                                             @click="where.status = item.value"

+ 1 - 2
app/http/middleware/AllowOriginMiddleware.php

@@ -64,10 +64,9 @@ class AllowOriginMiddleware implements MiddlewareInterface
         } catch (\Exception $e) {
             Db::rollback();
         }
-
         try {
             Db::startTrans();
-//            AuctionOrder::th();//退回预约卷
+            AuctionOrder::th();//退回预约卷
             Db::commit();
         } catch (\Exception $e) {
             Db::rollback();

+ 1 - 0
app/models/auction/AuctionOrder.php

@@ -283,6 +283,7 @@ class AuctionOrder extends BaseModel
             foreach ($auction as $k => $v){
 
                 $booking = AuctionBooking::where([['auction_id', '=', $v['id']], ['status','=' , 1]])->select();
+
                 if ($booking){
                     foreach ($booking as $key => $value){
                         $find = AuctionBooking::find($value['id']);