卡单

application/admin/controller/user/User.php

@@ -126,12 +126,12 @@ class User extends Backend
             $this->error(__('You have no permission'));
         }
         if (false === $this->request->isPost()) {
-
-            $task = json_decode($row->limit_task, true);
-            $row->which_start   = $task['which_start']??'';
-            $row->min_amount    = $task['min_amount']??'';
-            $row->max_amount    = $task['max_amount']??'';
-            $row->income_multiple= $task['income_multiple']??'';
+    
+            // $task = json_decode($row->limit_task, true);
+            // $row->which_start   = $task['which_start']??'';
+            // $row->min_amount    = $task['min_amount']??'';
+            // $row->max_amount    = $task['max_amount']??'';
+            // $row->income_multiple= $task['income_multiple']??'';
             $this->view->assign('row', $row);
             return $this->view->fetch();
         }
@@ -143,9 +143,8 @@ class User extends Backend
         $result = false;
         Db::startTrans();
         try {
-      
-            unset($params['id']);
-            $result = $row->allowField(true)->save(['limit_task'=>json_encode($params)]);
+   
+            $result = $row->allowField(true)->save(['limit_task'=>$params['limit_task']]);
             Db::commit();
         } catch (ValidateException|PDOException|Exception $e) {
             Db::rollback();

application/admin/lang/vn/user/user.php

@@ -47,5 +47,6 @@ return [
     '一键清空'               => 'Xóa bằng một cú nhấp chuột',
     '抢单开关'               => 'Lấy công tắc đặt hàng',
     '卡单开关'               => 'Công tắc đơn thẻ',
-    '累计收益'               => 'Thu nhập tích lũy'
+    '累计收益'               => 'Thu nhập tích lũy',
+    'Append'                => 'Nối thêm'
 ];

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

@@ -51,4 +51,5 @@ return [
     'Task num'              => '当前任务数',
     'Pwd title'             => '留空则不修改',
     '一键清空'               => '一键清空',
+    'Append'                => '追加'
 ];

application/admin/view/user/user/cardslip.html

@@ -2,7 +2,7 @@
     {:token()}
     <div class="form-horizontal">
     <input type="hidden" name="row[id]" value="{$row.id}">
-    <div class="form-group">
+    <!-- <div class="form-group">
         <label for="c-which_start" class="control-label col-xs-12 col-sm-2">{:__('Which start')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-which_start" class="form-control" name="row[which_start]" placeholder="{:__('多次卡单时')}" type="text" value="{$row.which_start|htmlentities}">
@@ -26,9 +26,37 @@
         <div class="col-xs-12 col-sm-8">
             <input id="c-income_multiple" class="form-control" name="row[income_multiple]" type="number" value="{$row.income_multiple|htmlentities}">
         </div>
-    </div>
- 
+    </div> -->
 
+    <div class="form-group">
+    <div class="col-xs-12 col-sm-12">
+    <table class="table table-responsive fieldlist" data-name="row[limit_task]" data-template="testtpl" data-tag="tr">
+        <tr>
+            <td>{:__('Which start')}</td>
+            <td>{:__('Min amount')}</td>
+            <td>{:__('Max amount')}</td>
+            <td>{:__('Income multiple')}</td>
+            <td></td>
+        </tr>
+        <tr>
+            <td colspan="5"><a href="javascript:;" class="btn btn-sm btn-success btn-append"><i class="fa fa-plus"></i>{:__('Append')} </a></td>
+        </tr>
+        <textarea name="row[limit_task]" class="form-control hide" cols="3" rows="1">
+            {$row.limit_task|htmlentities}
+        </textarea>
+    </table>
+    <!--定义模板，模板语法使用Art-Template模板语法-->
+    <script type="text/html" id="testtpl">
+        <tr class="form-inline">
+            <td><input type="text" name="row[<%=name%>][<%=index%>][which_start]" data-rule="required" class="form-control" value="<%=row['which_start']%>" size="10"></td> 
+            <td><input type="text" name="row[<%=name%>][<%=index%>][min_amount]" data-rule="required" class="form-control" value="<%=row['min_amount']%>" size="10"></td> 
+            <td><input type="text" name="row[<%=name%>][<%=index%>][max_amount]" data-rule="required" class="form-control" value="<%=row['max_amount']%>" size="10"></td> 
+            <td><input type="text" name="row[<%=name%>][<%=index%>][income_multiple]" data-rule="required" class="form-control" value="<%=row['income_multiple']%>" size="10"></td>
+            <td><span class="btn btn-sm btn-danger btn-remove"><i class="fa fa-times"></i></span></td>
+        </tr>
+    </script>
+</div>
+</div>
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

application/api/controller/Order.php

@@ -113,19 +113,19 @@ class Order extends Api
             if(empty($limit_task)){
                 $this->error(__('参数错误'));
             }
-            $val_arr = explode(',', $limit_task['which_start']);
-            if(in_array($user['task_num'] + 1, $val_arr)){
+            $val_arr = array_column($limit_task, 'which_start');
+            $key =  array_search($user['task_num'] + 1, $val_arr);
+            if($key !== false){
                 //从这单开始卡单
                 if(!($user['freeze'] < 0)){
                     //冻结金额不小于0时，说明未卡单，则进行卡单操作：向用户展示余额时，显示 负的订单金额
                     $freeze = true;
                 }
-                $task_income    = $task_income * $limit_task['income_multiple'];//单次收益
-                $amount_mini    = $limit_task['min_amount'];
-                $amount_max     = $limit_task['max_amount'];
+                $task_income    = $task_income * $limit_task[$key]['income_multiple'];//单次收益
+                $amount_mini    = $limit_task[$key]['income_multiple'];
+                $amount_max     = $limit_task[$key]['income_multiple'];
             }
         }
-
         $goods_info = (new Goods())
             ->fetchSql(false)
             ->whereBetween('price', [$amount_mini, $amount_max])