主配套与赠送配套，同步激活

application/admin/controller/Packageorder.php

@@ -104,7 +104,7 @@ class Packageorder extends Backend
         $update['starttime']  = $time;
         $update['endtime']    = $time + ($package_order['days'] * 86400);
 
-        $rs = Db::name('package_order')->where('id',$id)->update($update); //这里不用order_no，主订单和赠品各自激活
+        $rs = Db::name('package_order')->where('order_no',$package_order['order_no'])->update($update); //这里用order_no，主订单和赠品一起激活
 
         $this->success(__('已激活'));
 

application/api/lang/en/usercenter.php

@@ -14,4 +14,8 @@ return [
     '套餐剩余课时不足' => 'Insufficient remaining class hours in the package',
     '购买套餐赠送' => 'Complimentary by package',
     '备注:' => 'Remark:',
+    '未找到配套,请刷新重试' => 'No plans found, please refresh and try again',
+    '已经申请过了,无需重复操作' => 'It has already been applied for, no need to repeat operation',
+    '已经激活了,无需重复操作' => 'Already activated, no need to repeat operation',
+    '申请成功' => 'Application successful',
 ];

application/index/controller/Plantask.php

@@ -452,7 +452,7 @@ class Plantask extends Controller
         $check = Db::name('lesson_slot')->where('starttime','BETWEEN',[$starttime,$endtime])->find();
         if($check){
             echo '下周有数据了';
-//            exit;
+            exit;
         }
 
         echo '准备复制';

public/assets/js/backend/packageorder.js

@@ -72,7 +72,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     url:'packageorder/jihuo/id/{ids}?dialog=1',
                                     target:'_self',
                                     hidden:function(row){
-                                        if(row.use_status == 0){
+                                        if(row.use_status == 0 && row.is_gift == 0){
                                             return false
                                         }
                                         return true;