bug

application/admin/controller/user/User.php

@@ -330,6 +330,7 @@ class User extends Backend
                         }
                     }
                     //删除旧关系
+                    $user_b_ids=[];
                     if ($row[$param_remarks] != 0 && $del_relations) {
                         $user_b = $this->model->where(['type_remarks' => $i, 'bind_remarks' => $row[$param_remarks]])->order('id', 'desc')->select();
                         foreach ($user_b as $vub) {

application/admin/lang/zh-cn/cannelorder.php

@@ -10,6 +10,10 @@ return [
     'Status 5'      => '已入库',
     'C_user_id'     => '商家id',
     'B_user_id'     => '配送员id',
+    'C_user_Check'  => '请选择商家',
+    'B_user_Check'  => '请选择配送员',
+    'C_user'        => '商家',
+    'B_user'        => '配送员',
     'Image'         => '图片',
     'Refund_money'  => '应退金额',
     'Offset_money'  => '已抵消金额',

application/admin/view/cannelorder/add.html

@@ -19,14 +19,14 @@
 <!--        </div>-->
 <!--    </div>-->
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('C_user_id')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('C_user_Check')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-c_user_id" data-rule="required" data-source="user/user_common/user_level?level=1&type=1" data-field="nickname"
                    class="form-control selectpage" name="row[c_user_id]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('B_user_id')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('B_user_Check')}:</label>
         <div class="col-xs-12 col-sm-8">
             <select id="c-b_user_id" data-rule="required" class="form-control selectpicker" name="row[b_user_id]" >
 

application/admin/view/cannelorder/edit.html

@@ -19,14 +19,14 @@
 <!--        </div>-->
 <!--    </div>-->
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('C_user_id')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('C_user')}:</label>
         <div class="col-xs-12 col-sm-8">
             <span class="form-control" disabled="disabled">{$row.user.username|htmlentities}</span>
 <!--            <input id="c-c_user_id" data-rule="required" data-source="c/user/index" class="form-control selectpage" name="row[c_user_id]" type="text" value="{$row.c_user_id|htmlentities}">-->
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('B_user_id')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('B_user')}:</label>
         <div class="col-xs-12 col-sm-8">
 <!--            <input id="c-b_user_id" data-rule="required" data-source="b/user/index" class="form-control selectpage" name="row[b_user_id]" type="text" value="{$row.b_user_id|htmlentities}">-->
             <span class="form-control" disabled="disabled">{$row.buser.username|htmlentities}</span>

application/api/controller/Chuyutimedtask.php

@@ -105,7 +105,7 @@ class Chuyutimedtask extends Api
         ];
         $where['status'] = 1;
         $where['timeout'] = 0;
-        $where['create_time'] = ['<=', $overtime];
+        $where['createtime'] = ['<=', $overtime];
         $cancel_order_model->isUpdate(true, $where)->save($data);
         $this->success('ok');
         //状态:1=已接收,2=已清点,3=待退款,4=已退款,5=已入库--