美行者BUG

f06a2356 · LiuJunYi · c8af6d1f · f06a2356 · f06a2356 · f06a2356
Commit f06a2356 authored Nov 06, 2018 by LiuJunYi
6 changed files
--- a/application/admin/controller/Order.php
+++ b/application/admin/controller/Order.php
@@ -52,6 +52,9 @@ class Order extends AuthBase
                $condition['created_at'] = ['<', $end_time . ' 00:00:00'];
            }
        }
+        if(input('get.title')){
+            $condition['title'] = ['like','%'.input('get.title').'%'];
+        }
        //根据筛选条件查询
        $order_list = $this->order_model->with(['project' => function ($query) {

--- a/application/admin/controller/Project.php
+++ b/application/admin/controller/Project.php
@@ -228,7 +228,7 @@ class Project extends AuthBase
    public function tags()
    {
        $title = input('get.name', '');
-        $tag_list = $this->tag_model->where('name', 'like', "%" . $title . "%")->order('sort', 'asc')->paginate(15, false, ['query' => ['name' => $title]]);
+        $tag_list = $this->tag_model->where('name', 'like', "%" . $title . "%")->order('sort', 'desc')->order('id','desc')->paginate(15);
        $this->assign("tag_list", $tag_list);
        return $this->fetch('');
    }
@@ -316,7 +316,7 @@ class Project extends AuthBase
    public function citys()
    {
        $title = input('get.name', '');
-        $tag_list = $this->city_model->where('name', 'like', "%" . $title . "%")->order('sort', 'asc')->paginate(15, false, ['query' => ['name' => $title]]);
+        $tag_list = $this->city_model->where('name', 'like', "%" . $title . "%")->order('sort', 'desc')->order('id','desc')->paginate(15);
        $this->assign("tag_list", $tag_list);
        return $this->fetch('');
    }

--- a/application/admin/view/order/index.html
+++ b/application/admin/view/order/index.html
@@ -7,8 +7,11 @@
    <div class="row margin-bottom">
        <div class="col-md-12">
-             <form class="form-inline pull-left" method="GET" id="order-search" action="<?php echo url('@admin/order/index')?>">
+            <form class="form-inline pull-left" method="GET" id="order-search" action="<?php echo url('@admin/order/index')?>">
-                 <div class="form-group margin-right">
+                <div class="form-group margin-right">
+                    <input class="form-control" type="text" name="title"  value="{:input('title')}" placeholder="活动名称"/>
+                </div>
+                <div class="form-group margin-right">
                     <select name="status" class="form-control" id="status">
                         <option value="-1" {if condition="$status=='-1'"}selected{/if}>全部订单状态</option>
                         <option value="0" {if condition="$status=='0'"}selected{/if}>未付款</option>
@@ -16,7 +19,7 @@
                         <option value="2" {if condition="$status=='2'"}selected{/if}>待评价</option>
                         <option value="3" {if condition="$status=='3'"}selected{/if}>已完成</option>
                     </select>
-                </div>
+                 </div>
                 <div class="form-group margin-right">
                     <select name="type" class="form-control" id="type">
                         <option value="">全部订单类型</option>
@@ -49,7 +52,7 @@
                            <th>用户信息</th>
                            <th>订单总价</th>
                            <th>订单状态</th>
-                            <th>微信支付状态</th>
+                            <th>地址</th>
                            <th>退款状态</th>
                            <th>评论状态</th>
                            <th>下单时间</th>
@@ -89,7 +92,7 @@
                                <span style="color:{$vo.status_name.color}">{$vo.StatusText}</span>
                            </td>
                            <td>
-                              {$vo.trade_status}
+                              {$vo.extras['address']??''}
                            </td>
                            <td>
                              {if condition="$vo.is_refund == 0"}

--- a/application/admin/view/project/citys.html
+++ b/application/admin/view/project/citys.html
@@ -53,7 +53,7 @@
                    <tbody>
                    {volist name="tag_list" id="vo" key="k" empty="暂时没有数据"}
                    <tr id="tr_{$vo.id}">
-                        <td>{$k}</td>
+                        <td>{$vo.id}</td>
                        <td>{$vo.name}</td>
                        <!-- <td>{$vo.used_num}</td> -->
                        <td>{$vo.sort}</td>

--- a/application/admin/view/project/updateproject.html
+++ b/application/admin/view/project/updateproject.html
@@ -88,12 +88,7 @@
                        <input type="text" class="form-control validate[required,custom[number]]" name="sign_limits" id="sign_limits" value="{$project_info.sign_limits}" placeholder="限制家庭组数">
                    </div>
                </div>
-                <div class="form-group type_toggle" >
-                    <label for="title" class="col-sm-2 control-label text-right">晚数</label>
-                    <div class="col-sm-10 col-md-8 col-lg-6">
-                        <input type="text" class="form-control validate[required,custom[number]]" name="night_num" id="night_num" value="{$project_info.sign_limits}" placeholder="晚数">
-                    </div>
-                </div>
                <div class="form-group">
                    <label for="title" class="col-sm-2 control-label text-right">城市</label>
                    <div class="col-sm-10 col-md-8 col-lg-6">
@@ -138,12 +133,18 @@
                        <input type="text" class="form-control validate[required,custom[number]]" name="" id="price" placeholder="价格" value="{$project_info.price}">
                    </div>
                </div>
-                <div class="form-group type_toggle" >
+                <div class="form-group" >
                    <label for="title" class="col-sm-2 control-label text-right">会员价</label>
                    <div class="col-sm-10 col-md-8 col-lg-6">
                        <input type="text" class="form-control validate[required,custom[number]]" name="" id="vip_price" placeholder="价格" value="{$project_info.vip_price}">
                    </div>
                </div>
+                <div class="form-group" >
+                    <label for="title" class="col-sm-2 control-label text-right">晚数</label>
+                    <div class="col-sm-10 col-md-8 col-lg-6">
+                        <input type="text" class="form-control validate[required,custom[number]]" name="night_num" id="night_num" value="{$project_info.sign_limits}" placeholder="晚数">
+                    </div>
+                </div>
                <!-- <input type="hidden" id="poster" name="poster"> -->
                <div class="form-group">
                  <label for="title" class="col-sm-2 control-label text-right" >封面</label>
@@ -373,16 +374,10 @@ $(function(){
                formValue.append('time_period',$("#start").val());
                formValue.append('sign_endtime',$("#end").val());
                formValue.append('sign_limits',$("#sign_limits").val());
-                formValue.append('night_num',$("#night_num").val());
-                formValue.append('price',$("#price").val());
-                formValue.append('vip_price',$("#vip_price").val());
            }else{
                formValue.append('time_period','');
                formValue.append('sign_endtime',null);
                formValue.append('sign_limits',null);
-                formValue.append('night_num',null);
-                formValue.append('price',null);
-                formValue.append('vip_price',null);
            }
            var tagArr = $("#tags_select").val();
            var tagStr = null;

--- a/application/api/controller/Order.php
+++ b/application/api/controller/Order.php
@@ -47,7 +47,7 @@ class Order extends Base
            'adult_number'    => 'require',
            'children_number' => 'require',
            'children_age'    => 'require',
-            'sign_limits'     => 'require'
+            'sign_limits'     => 'require',
        ]);
        $res      = $validate->check(input('post.'));
        if (!$res) return ['code' => 1, 'msg' => $validate->getError()];
@@ -86,6 +86,7 @@ class Order extends Base
                'children_number' => input('post.children_number'),
                'children_age'    => input('post.children_age'),
                'sign_limits'     => input('post.sign_limits'),
+                'address'         => input('post.address'),
                'price'           => $price,
                'remark'          => input('post.remark'),
            ];