修改后台订单列表以及未通过的理由

郭盛
application/admin/controller/Order.php
application/admin/model/Order.php
application/admin/view/order/edit.html
application/admin/view/order/index.html
application/api/controller/Order.php
public/api.html
public/assets/js/backend/order.js
--- a/application/admin/controller/Order.php
查看文件 @8ba2acf
+++ b/application/admin/controller/Order.php
查看文件 @8ba2acf
@@ -134,8 +134,15 @@ class Order extends Backend
                         $gold = $teacher['balance'] + ($money['money'] - $money['money'] * ($money['commission']/100));
                         $income = $teacher['income'] + ($money['money'] - $money['money'] * ($money['commission']/100));
-                        Db::name('teacher')->where('id',$money['teacher_id'])->update(['balance'=>$gold,'income'=>$income]);
+                        Db::name('teacher')->where('id',$money['teacher_id'])->update(['balance'=>$gold,'income'=>$income,'finish_status'=>5]);
                     }
+
+                }
+                if($params['order_status'] == 2){
+                    if(empty($params['nopass'])){
+                        $this->error('请填写未通过理由');
+                    }
+                    Db::name('order')->where('id',$ids)->update(['finish_status'=>5]);
                 }
                 Db::startTrans();
                 try {
--- a/application/admin/model/Order.php
查看文件 @8ba2acf
+++ b/application/admin/model/Order.php
查看文件 @8ba2acf
@@ -35,7 +35,7 @@ class Order extends Model
     }
     public function setStatusList()
     {
-        return ['1' => __('审核通过'),'2' => __('审核未通过')];
+        return ['0' => __('待审核')];
     }
--- a/application/admin/view/order/edit.html
查看文件 @8ba2acf
+++ b/application/admin/view/order/edit.html
查看文件 @8ba2acf
@@ -67,12 +67,6 @@
         <!--</div>-->
     <!--</div>-->
     <!--<div class="form-group">-->
-        <!--<label class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>-->
-        <!--<div class="col-xs-12 col-sm-8">-->
-            <!--<input id="c-content" class="form-control" name="row[content]" type="text" value="{$row.content|htmlentities}">-->
-        <!--</div>-->
-    <!--</div>-->
-    <!--<div class="form-group">-->
         <!--<label class="control-label col-xs-12 col-sm-2">{:__('Finish_status')}:</label>-->
         <!--<div class="col-xs-12 col-sm-8">-->
             <!--<input id="c-finish_status" class="form-control" name="row[finish_status]" type="number" value="{$row.finish_status|htmlentities}">-->
@@ -84,6 +78,12 @@
             {:build_radios('row[order_status]', ['1'=>__('通过'),'2'=>__('未通过')], $row['order_status'])}
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('未通过的理由(通过无需填写)')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <textarea id="c-nopass" class="form-control" rows="5" name="row[nopass]" cols="50">{$row.nopass|htmlentities}</textarea>
+        </div>
+    </div>
     <!--<div class="form-group">-->
         <!--<label class="control-label col-xs-12 col-sm-2">{:__('Paytime')}:</label>-->
         <!--<div class="col-xs-12 col-sm-8">-->
--- a/application/admin/view/order/index.html
查看文件 @8ba2acf
+++ b/application/admin/view/order/index.html
查看文件 @8ba2acf
@@ -7,12 +7,11 @@
             <li><a href="#t-{$key}" data-value="{$key}" data-toggle="tab">{$vo}</a></li>
             {/foreach}
         </ul>
-        <!--<ul class="nav nav-tabs" data-field="order_status">-->
-            <!--<li class="active"><a href="#t-all" data-value="" data-toggle="tab">{:__('All')}</a></li>-->
-            <!--{foreach name="statusList1" item="vo"}-->
-            <!--<li><a href="#t-{$key}" data-value="{$key}" data-toggle="tab">{$vo}</a></li>-->
-            <!--{/foreach}-->
-        <!--</ul>-->
+        <ul class="nav nav-tabs" data-field="order_status">
+            {foreach name="statusList1" item="vo"}
+            <li><a href="#t-{$key}" data-value="{$key}" data-toggle="tab">{$vo}</a></li>
+            {/foreach}
+        </ul>
     </div>
     <div class="panel-body">
--- a/application/api/controller/Order.php
查看文件 @8ba2acf
+++ b/application/api/controller/Order.php
查看文件 @8ba2acf
@@ -126,7 +126,7 @@ class Order extends Api
           "scale"://公司规模/下属人数
           "content"://问题描述
           "commission"://佣金比例
-          "finish_status"://完成状态(1进行中2已完成3售后
+          "finish_status"://完成状态(1进行中2待总结3已总结4售后5已完成
           "order_status"://订单审核(1通过2未通过
           "is_summarize"://是否总结过(1是2否
           "is_complaint"://是否投诉(1是2否3已处理
--- a/public/api.html
查看文件 @8ba2acf
+++ b/public/api.html
查看文件 @8ba2acf
@@ -3728,7 +3728,7 @@
           "scale"://公司规模/下属人数
           "content"://问题描述
           "commission"://佣金比例
-          "finish_status"://完成状态(1进行中2已完成3售后
+          "finish_status"://完成状态(1进行中2待总结3已总结4售后5已完成
           "order_status"://订单审核(1通过2未通过
           "is_summarize"://是否总结过(1是2否
           "is_complaint"://是否投诉(1是2否3已处理
@@ -9579,7 +9579,7 @@
             <div class="row mt0 footer">
                 <div class="col-md-6" align="left">
-                    Generated on 2020-03-20 18:27:55                </div>
+                    Generated on 2020-03-21 09:58:25                </div>
                 <div class="col-md-6" align="right">
                     <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
                 </div>
--- a/public/assets/js/backend/order.js
查看文件 @8ba2acf
+++ b/public/assets/js/backend/order.js
查看文件 @8ba2acf
@@ -42,6 +42,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
                         {field: 'finish_status', title: __('Finish_status'),formatter: Table.api.formatter.label,searchList:{'1': '进行中','2':'待总结','3':'已总结','4':'售后','5':'已完成'}},
                         {field: 'is_complaint', title: __('Is_complaint'),formatter: Table.api.formatter.label,searchList:{'1': '是','2':'否','3':'已处理'}},
+                        {field: 'is_chargeback', title: __('是否退单'),formatter: Table.api.formatter.label,searchList:{'1': '是','2':'否'}},
                         {field: 'id', title: __('按钮组'), table: table, events: Table.api.events.operate, buttons:
                             [
                                 {