订单

application/admin/controller/unishop/Order.php

@@ -92,21 +92,21 @@ class Order extends Backend
                 ->where($where_user)
                 ->order($sort, $order)
                 ->limit($offset, $limit)
-                ->field('order.*,user.username,intro.username as intro_username,intro.mobile as intro_mobile,hexiao.username as hexiao_username,hexiao.mobile as hexiao_mobile,op.product_id as op_product_id,op.title as op_title,op.number as op_number,op.spec as op_spec,op.price as op_price')
+                ->field('order.*,user.nickname,intro.nickname as intro_nickname,intro.mobile as intro_mobile,hexiao.nickname as hexiao_nickname,hexiao.mobile as hexiao_mobile,op.product_id as op_product_id,op.title as op_title,op.number as op_number,op.spec as op_spec,op.price as op_price')
                 ->select();
 
             $list = collection($list)->toArray();
             foreach ($list as &$item) {
                 $item['id'] = (string)$item['id']; // 整形数字太大js会失准
                 $item['user'] = [];
-                $item['user']['username'] = $item['username'] ? $item['username'] : '';
+                $item['user']['nickname'] = $item['nickname'] ? $item['nickname'] : '';
 
                 $item['intro'] = [];
-                $item['intro']['username'] = $item['intro_username'] ? $item['intro_username'] : '';
+                $item['intro']['nickname'] = $item['intro_nickname'] ? $item['intro_nickname'] : '';
                 $item['intro']['mobile']   = $item['intro_mobile']   ? $item['intro_mobile'] : '';
 
                 $item['hexiao'] = [];
-                $item['hexiao']['username'] = $item['hexiao_username'] ? $item['hexiao_username'] : '';
+                $item['hexiao']['nickname'] = $item['hexiao_nickname'] ? $item['hexiao_nickname'] : '';
                 $item['hexiao']['mobile']   = $item['hexiao_mobile']   ? $item['hexiao_mobile'] : '';
 
                 $item['op'] = [];
@@ -540,7 +540,7 @@ class Order extends Backend
                 ->alias('order')
                 ->join('user', 'user.id = order.user_id')
                 ->where($where)
-                ->field('order.*,user.username')
+                ->field('order.*,user.nickname')
                 ->order($sort, $order)
                 ->limit($offset, $limit)
                 ->select();
@@ -549,7 +549,7 @@ class Order extends Backend
             foreach ($list as &$item) {
                 $item['id'] = (string)$item['id'];
                 $item['user'] = [];
-                $item['user']['username'] = $item['username'] ? $item['username'] : __('Tourist');
+                $item['user']['nickname'] = $item['nickname'] ? $item['nickname'] : __('Tourist');
 
                 $item['have_paid_status'] = $item['have_paid'];
                 $item['have_delivered_status'] = $item['have_delivered'];

application/admin/view/unishop/order/edit.html

@@ -5,7 +5,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-user_id" disabled data-rule="required" data-source="user/user/index" data-field="username" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id}">
+            <input id="c-user_id" disabled data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id}">
         </div>
     </div>
     <div class="form-group">
@@ -14,7 +14,7 @@
             <input id="c-out_trade_no" disabled class="form-control" name="row[out_trade_no]" type="text" value="{$row.out_trade_no}">
         </div>
     </div>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Order_price')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-order_price" disabled class="form-control" step="0.01" name="row[order_price]" type="number" value="{$row.order_price}">
@@ -25,7 +25,7 @@
         <div class="col-xs-12 col-sm-8">
             <input id="c-discount_price" disabled class="form-control" step="0.01" name="row[discount_price]" type="number" value="{$row.discount_price}">
         </div>
-    </div>
+    </div>-->
     <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Delivery_price')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -108,12 +108,12 @@
         </div>
     </div>
     <hr>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('booktime')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-booktime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[booktime]" type="text" value="{:$row.booktime?datetime($row.booktime):''}">
         </div>
-    </div>
+    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('book_realname')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -126,12 +126,12 @@
             <input id="c-book_mobile" class="form-control" name="row[book_mobile]" type="text" value="{$row.book_mobile}">
         </div>
     </div>
-    <div class="form-group">
+   <!-- <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Remark')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-remark" class="form-control" name="row[remark]" type="text" value="{$row.remark}">
         </div>
-    </div>
+    </div>-->
 
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>

public/assets/js/backend/unishop/order.js

@@ -99,21 +99,23 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {checkbox: true},
 //                        {field: 'id', title: __('Id'),visible:false},
                         {field: 'user_id', title: __('User_id')},
-                        {field: 'user.username', title: __('User name')},
-                        {field: 'intro.username', title: '推广人'},
-                        {field: 'intro.mobile', title: '推广人手机'},
-                        {field: 'hexiao.username', title: '核销人'},
-                        {field: 'hexiao.mobile', title: '核销人手机'},
+                        {field: 'user.nickname', title: __('User name')},
+                        // {field: 'intro.nickname', title: '推广人'},
+                        // {field: 'intro.mobile', title: '推广人手机'},
+                        {field: 'hexiao.nickname', title: '核销人'},
+                        // {field: 'hexiao.mobile', title: '核销人手机'},
                         {field: 'out_trade_no', title: __('Out_trade_no')},
 
-                        {field: 'op.product_id', title: '商品ID'},
-                        {field: 'op.title', title: '商品标题'},
-                        {field: 'op.spec', title: '商品规格'},
-                        {field: 'op.price', title: '商品单价'},
-                        {field: 'op.number', title: '商品数量'},
+                        {field: 'op.product_id', title: '活动ID'},
+                        {field: 'op.title', title: '活动标题'},
+                        // {field: 'op.spec', title: '商品规格'},
+                        {field: 'op.price', title: '活动单价'},
+                        {field: 'op.number', title: '报名人数'},
+                        {field: 'book_realname', title: __('book_realname'),operate:'LIKE'},
+                        {field: 'book_mobile', title: __('book_mobile'), operate:'LIKE'},
 
-                        {field: 'order_price', title: __('Order_price'), operate:'BETWEEN'},
-                        {field: 'discount_price', title: __('Discount_price'), operate:'BETWEEN'},
+                        // {field: 'order_price', title: __('Order_price'), operate:'BETWEEN'},
+                        // {field: 'discount_price', title: __('Discount_price'), operate:'BETWEEN'},
 //                        {field: 'delivery_price', title: __('Delivery_price'), operate:'BETWEEN'},
                         {field: 'total_price', title: __('Total_price'), operate:'BETWEEN'},
                         {field: 'status', title: __('Status'), searchList: {/*"-1":__('Refund'),*/"0":__('Cancel'),"1":__('Normal')}, formatter: Table.api.formatter.status},
@@ -129,10 +131,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'have_received', title: __('Received time'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime,visible:false},
 //                        {field: 'have_commented', title: __('Commented time'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime,visible:false},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
-                        {field: 'booktime', title: __('booktime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
-                        {field: 'book_realname', title: __('book_realname'),operate:'LIKE'},
-                        {field: 'book_mobile', title: __('book_mobile'), operate:'LIKE'},
-                        {field: 'remark', title: __('Remark'), operate: false},
+                        // {field: 'booktime', title: __('booktime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
+
+                        // {field: 'remark', title: __('Remark'), operate: false},
 //                        {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime,visible:false},
                         {
                             field: 'operate',
@@ -199,7 +200,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {checkbox: true},
 //                        {field: 'id', title: __('Id'),visible:false},
                         {field: 'user_id', title: __('User_id')},
-                        {field: 'user.username', title: __('User name')},
+                        {field: 'user.nickname', title: __('User name')},
                         {field: 'out_trade_no', title: __('Out_trade_no')},
                         {field: 'order_price', title: __('Order_price'), operate:'BETWEEN'},
                         {field: 'discount_price', title: __('Discount_price'), operate:'BETWEEN'},