edit

app/factory/admin/Auth.php

@@ -297,7 +297,7 @@ class Auth
     public function menu()
     {
         $info = $this->info();
-        if ($info) {
+        if ($info && Dever::project('message')) {
             $this->msg = Dever::load('message/lib/data')->num($info['factory_id'], 4);
         } else {
             $this->msg = 0;

app/factory/lib/Order.php

@@ -87,6 +87,7 @@ class Order
             $data['sku_id'] = $v['sku_id'];
             $data['price'] = $v['price'] * $v['buy_num'];
             $data['p_price'] = $v['p_price'] * $v['buy_num'];
+            $data['d_price'] = $v['price'];
             $data['num'] = $v['buy_num'];
 
             $state = Dever::db('shop/buy_order_goods')->insert($data);

app/mshop/lib/Buy.php

@@ -268,6 +268,7 @@ class Buy
             $data['goods_id'] = $v['id'];
             $data['sku_id'] = $v['sku_id'];
             $data['price'] = $v['price'] * $v['buy_num'];
+            $data['d_price'] = $v['price'];
             $data['num'] = $v['buy_num'];
 
             Dever::db('shop/buy_order_goods')->insert($data);
@@ -566,14 +567,24 @@ class Buy
         $html = '<div class="layui-col-md12"><div class="layui-card"><div class="layui-card-header">基本信息</div><div class="layui-card-body">';
         $html .= '<table class="layui-table"><thead><tr><th style="width:20%">项目</th><th style="width:80%">详情</th></tr> </thead><tbody>';
 
-        if ($type == 2) {
+        if ($type == 2 || $info['type'] == 2) {
             $info['price'] = $info['p_price'];
         }
-        $html .= '<tr>
-          <td>订单信息</td>
-          <td>'.$this->table(false, array(array('订单号：' . $info['order_num'], '金额：' . $info['price'], '数量：' . $info['num'], '状态：' . $status))).'</td>
 
-        </tr>';
+        if ($type == 3) {
+            $html .= '<tr>
+              <td>订单信息</td>
+              <td>'.$this->table(false, array(array('订单号：' . $info['order_num'], '数量：' . $info['num'], '状态：' . $status))).'</td>
+
+            </tr>';
+        } else {
+            $html .= '<tr>
+              <td>订单信息</td>
+              <td>'.$this->table(false, array(array('订单号：' . $info['order_num'], '金额：' . $info['price'], '数量：' . $info['num'], '状态：' . $status))).'</td>
+
+            </tr>';
+        }
+        
 
         if ($type == 1 && $tk && $tk['process'] == 1) {
             $status = '申请' . $tk_status[$tk['status']];
@@ -652,7 +663,7 @@ class Buy
                   <td>'.$this->table(false, array($button)).'</td>
 
                 </tr>';
-        } elseif ($info['type'] == 2) {
+        } elseif ($type == 3) {
             $config = Dever::load('factory/admin/auth.config');
             $button = array();
             $button[] = '<button class="layui-btn layui-btn-primary" onclick="print(\''.$info['id'].'\')">打印订单</button>';
@@ -722,11 +733,16 @@ class Buy
                 $info['ps_info']['service_name'] = $service['name'];
             }
 
-            $head = array('名称', '单号', '费用', '数量', '重量', '体积', '配货员', '打包员', '发货时间', '收货时间');
+            if ($type == 3) {
+                $head = array('名称', '单号', '数量', '重量', '体积', '发货时间', '收货时间');
 
-            //, '<a href="javascript:showAlert($(\'#refund_content\').html());">查看</a><span id="refund_content" style="display:none">'.Dever::table($table).'</span>')
+                $body = array(array($info['ps_info']['service_name'], $info['ps_info']['order_num'], $info['ps_info']['num'], $info['ps_info']['zl'], $info['ps_info']['tj'], $info['ps_info']['cdate'], $info['ps_info']['ydate']));
+            } else {
+                $head = array('名称', '单号', '费用', '数量', '重量', '体积', '配货员', '打包员', '发货时间', '收货时间');
 
-            $body = array(array($info['ps_info']['service_name'], $info['ps_info']['order_num'], $info['ps_info']['price'], $info['ps_info']['num'], $info['ps_info']['zl'], $info['ps_info']['tj'], $info['ps_info']['phy'], $info['ps_info']['dby'], $info['ps_info']['cdate'], $info['ps_info']['ydate']));
+                $body = array(array($info['ps_info']['service_name'], $info['ps_info']['order_num'], $info['ps_info']['price'], $info['ps_info']['num'], $info['ps_info']['zl'], $info['ps_info']['tj'], $info['ps_info']['phy'], $info['ps_info']['dby'], $info['ps_info']['cdate'], $info['ps_info']['ydate']));
+            }
+            
 
             $html .= '<div class="layui-card"><div class="layui-card-header">物流信息</div><div class="layui-card-body">' . $this->table($head, $body) . '</div></div>';
         }
@@ -745,7 +761,7 @@ class Buy
         $refund_body_total['price'] = 0;
         $refund_body_total['num'] = 0;
         foreach ($goods as $k => $v) {
-            if ($type == 2) {
+            if ($type == 2 || $info['type'] == 2) {
                 $v['price'] = $v['p_price'];
             }
             $goods_info = Dever::load('goods/lib/info')->getInfoBySku($v['goods_id'], $v['sku_id']);
@@ -791,23 +807,31 @@ class Buy
             }
 
             if ($tk && $v['status'] == 3) {
-                $refund_body[] = array
+                $d = array
                 (
                     $goods_info['name'] . ' ' . $sku,
                     $v['price'],
                     $v['num'],
                     $tk_status[$tk['status']],
                 );
+                if ($type == 3) {
+                    unset($d[1]);
+                }
+                $refund_body[] = $d;
                 $refund_body_total['price'] += $v['price'];
                 $refund_body_total['num'] += $v['num'];
             } else {
-                $body[] = array
+                $d = array
                 (
                     $goods_info['name'] . ' ' . $sku,
                     $v['price'],
                     $v['num'],
                     $status,
                 );
+                if ($type == 3) {
+                    unset($d[1]);
+                }
+                $body[] = $d;
                 $body_total['price'] += $v['price'];
                 $body_total['num'] += $v['num'];
             }
@@ -817,7 +841,7 @@ class Buy
 
             $head = array('名称', '金额', '数量', '状态');
 
-            $body[] = array
+            $d = array
             (
                 '合计',
                 $body_total['price'],
@@ -825,6 +849,12 @@ class Buy
                 '-'
             );
 
+            if ($type == 3) {
+                unset($head[1]);
+                unset($d[1]);
+            }
+            $body[] = $d;
+
 
             $html .= '<div class="layui-card"><div class="layui-card-header">商品清单</div><div class="layui-card-body" style="max-heights: 500px;overflow: auto;">' . $this->table($head, $body) . '</div></div>';
         }
@@ -833,13 +863,18 @@ class Buy
 
             $head = array('名称', '金额', '数量', '状态');
 
-            $refund_body[] = array
+            $d = array
             (
                 '合计',
                 $refund_body_total['price'],
                 $refund_body_total['num'],
                 '-'
             );
+            if ($type == 3) {
+                unset($head[1]);
+                unset($d[1]);
+            }
+            $refund_body[] = $d;
 
             $html .= '<div class="layui-card"><div class="layui-card-header">缺货与报损商品</div><div class="layui-card-body" style="max-heights: 300px;overflow: auto;">' . $this->table($head, $refund_body) . '</div></div>';
         }
@@ -856,7 +891,7 @@ class Buy
         if (isset($cash_order) && $cash_order) {
             $head = array('序号', '结算单号', '数量', '金额', '结算类型', '入账状态', '审核状态', '结算时间', '审核未通过原因', '管理');
 
-            if ($type == 1 && $info['type'] == 2) {
+            if ($type == 3) {
                 unset($head[3]);
             }
 
@@ -891,7 +926,7 @@ class Buy
                     $m,
                 );
 
-                if ($type == 1 && $info['type'] == 2) {
+                if ($type == 3) {
                     unset($d[3]);
                 }
                 $body[] = $d;
@@ -1120,7 +1155,7 @@ class Buy
             if ($sku) {
                 if ($goods['num'] <= $sku['total']) {
                     # 如果库存符合，直接下单即可，生成仓库订单
-                    $state = $this->createOrder($order_id, $order_num, 1, $shop['id'], 2, $where['store_id'], $goods['price'], $goods['price'], $goods['num'], $where['goods_id'], $where['sku_id']);
+                    $state = $this->createOrder($order_id, $order_num, 1, $shop['id'], 2, $where['store_id'], $goods['price'], $goods['price'], $goods['d_price'], $goods['num'], $where['goods_id'], $where['sku_id']);
                     if ($state) {
                         $type_id[] = $where['store_id'];
                         $id[] = $state;
@@ -1131,7 +1166,7 @@ class Buy
                     # 如果库存不够，从这个仓库扣下一部分，剩余的从另外仓库处理
                     $goods['num'] = $goods['num'] - $sku['total'];
                     # 生成仓库订单
-                    $state = $this->createOrder($order_id, $order_num, 1, $shop['id'], 2, $where['store_id'], $goods['price'], $goods['price'], $sku['total'], $where['goods_id'], $where['sku_id']);
+                    $state = $this->createOrder($order_id, $order_num, 1, $shop['id'], 2, $where['store_id'], $goods['price'], $goods['price'], $goods['d_price'], $sku['total'], $where['goods_id'], $where['sku_id']);
                     if (!$state) {
                         $goods['num'] = $goods['num'] + $sku['total'];
                     } else {
@@ -1167,7 +1202,7 @@ class Buy
             $sku = Dever::db('factory/goods_sku')->getOne($where);
 
             if ($sku && $sku['p_price'] > 0) {
-                $state = $this->createOrder($order_id, $order_num, 1, $shop['id'], 3, $where['factory_id'], $goods['price'], $sku['p_price'], $goods['num'], $where['goods_id'], $where['sku_id']);
+                $state = $this->createOrder($order_id, $order_num, 1, $shop['id'], 3, $where['factory_id'], $goods['price'], $sku['p_price'], $goods['d_price'], $goods['num'], $where['goods_id'], $where['sku_id']);
                 if ($state) {
                     $type_id[] = $where['factory_id'];
                     $id[] = $state;
@@ -1198,7 +1233,7 @@ class Buy
     }
 
     # 生成拆单的订单
-    private function createOrder($order_id, $order_num, $type, $type_id, $source_type, $source_id, $price, $p_price, $num, $goods_id, $sku_id)
+    private function createOrder($order_id, $order_num, $type, $type_id, $source_type, $source_id, $price, $p_price, $d_price, $num, $goods_id, $sku_id)
     {
         $where['parent_order_id'] = $order_id;
         $where['type'] = $type;
@@ -1236,6 +1271,7 @@ class Buy
                 $goods['goods_id'] = $goods_id;
                 $goods['sku_id'] = $sku_id;
                 $goods['price'] = $price;
+                $goods['d_price'] = $d_price;
                 $goods['p_price'] = $p_price;
                 $goods['num'] = $num;
                 Dever::db('shop/buy_order_goods')->insert($goods);

app/mshop/src/Out.php

@@ -18,7 +18,8 @@ class Out extends Core
     # 采购订单列表
     public function getList()
     {
-        $where['shop_id'] = $this->shop_id;
+        $where['use_type'] = 1;
+        $where['use_id'] = $this->shop_id;
 
         $this->data['search_value'] = $where;
         $this->data['search_value']['day'] = $day = Dever::input('day');
@@ -41,7 +42,8 @@ class Out extends Core
     # 查看订单详情
     public function view()
     {
-    	$where['shop_id'] = $this->shop_id;
+    	$where['use_type'] = 1;
+        $where['use_id'] = $this->shop_id;
         $where['id'] = Dever::input('order_id');
 
         $this->data = Dever::db('shop/out_order')->find($where);
@@ -131,8 +133,8 @@ class Out extends Core
 
         $this->goods();
         
-        $order_data['shop_id'] = $this->shop['id'];
-        $order_data['mobile'] = $this->shop['mobile'];
+        $order_data['use_type'] = 1;
+        $order_data['use_id'] = $this->shop['id'];
         $order_data['name'] = $this->data['name'];
         $order_data['num'] = $this->data['num'];
         $order_data['info'] = $info;
@@ -140,12 +142,6 @@ class Out extends Core
         $order_data['price'] = $this->data['price'];
         $order_data['member_id'] = $this->uid;
 
-        $order_data['area'] = $this->shop['area'];
-        $order_data['province'] = $this->shop['province'];
-        $order_data['city'] = $this->shop['city'];
-        $order_data['county'] = $this->shop['county'];
-        $order_data['town'] = $this->shop['town'];
-
         $order_data['order_num'] = $this->getOrderId();
         $id = Dever::db('shop/out_order')->insert($order_data);
 
@@ -155,11 +151,11 @@ class Out extends Core
 
         foreach($this->data['list'] as $k => $v) {
         	if ($v['ku_state'] == 1) {
-	            $data['shop_id'] = $this->shop['id'];
 	            $data['order_id'] = $id;
 	            $data['goods_id'] = $v['id'];
 	            $data['sku_id'] = $v['sku_id'];
 	            $data['price'] = $v['price'] * $v['buy_num'];
+                $data['d_price'] = $v['price'];
 	            $data['num'] = $v['buy_num'];
 
 	            $state = Dever::db('shop/out_order_goods')->insert($data);

app/shop/database/buy_order_goods.php

@@ -100,6 +100,17 @@ return array
             'list'        => true,
         ),
 
+        'd_price'      => array
+        (
+            'type'      => 'varchar-50',
+            'name'      => '商品单价',
+            'default'   => '',
+            'desc'      => '商品单价',
+            'match'     => 'option',
+            'update'    => 'text',
+            'list'        => true,
+        ),
+
         'status'        => array
         (
             'type'      => 'int-11',

app/shop/database/out_order.php

@@ -37,32 +37,23 @@ return array
             //'list'      => true,
         ), 
 
-        'shop_id'      => array
+        'use_type'      => array
         (
             'type'      => 'int-11',
-            'name'      => '所属门店',
+            'name'      => '拥有人类型',
             'default'   => '',
-            'desc'      => '所属门店',
+            'desc'      => '拥有人类型',
             'match'     => 'is_numeric',
-            'update'    => 'hidden',
-            'value'     => Dever::input('search_option_shop_id'),
-            'list'      => 'Dever::load("shop/info-find#name", {shop_id})',
         ),
 
-        'mobile'        => array
+        'use_id'      => array
         (
-            'type'      => 'varchar-300',
-            'name'      => '下单手机号',
+            'type'      => 'int-11',
+            'name'      => '拥有人',
             'default'   => '',
-            'desc'      => '手机号',
-            'match'     => 'option',
-            'search'    => array
-            (
-                'api' => 'shop/info-select',//接口地址，最好是获取多条数据的地址
-                'col' => 'mobile',//要查询的字段
-                'result' => 'id',//返回的字段
-                'search' => 'shop_id',//本表的字段，默认为当前的字段
-            ),
+            'desc'      => '拥有人',
+            'match'     => 'is_numeric',
+            'list'      => 'Dever::load("shop/lib/manage.buyInfo", "{type}", "{type_id}")',
         ),
 
         'name'      => array
@@ -119,57 +110,6 @@ return array
             'update'    => 'textarea',
         ),
 
-        'area'       => array
-        (
-            'type'      => 'varchar-500',
-            'name'      => '所在地区',
-            'default'   => '',
-            'desc'      => '所在地区',
-            'match'     => 'option',
-            'search'    => 'linkage',
-            'option'    => Dever::url('api.get?level_total=4', 'area'),
-        ),
-
-        'province'      => array
-        (
-            'type'      => 'int-11',
-            'name'      => '省份',
-            'default'   => '',
-            'desc'      => '省份',
-            'match'     => 'option',
-            //'update'  => 'text',
-        ),
-
-        'city'      => array
-        (
-            'type'      => 'int-11',
-            'name'      => '城市',
-            'default'   => '',
-            'desc'      => '城市',
-            'match'     => 'option',
-            //'update'  => 'text',
-        ),
-
-        'county'      => array
-        (
-            'type'      => 'int-11',
-            'name'      => '县区',
-            'default'   => '',
-            'desc'      => '县区',
-            'match'     => 'option',
-            //'update'  => 'text',
-        ),
-
-        'town'      => array
-        (
-            'type'      => 'int-11',
-            'name'      => '街道',
-            'default'   => '',
-            'desc'      => '街道',
-            'match'     => 'option',
-            //'update'  => 'text',
-        ),
-
         'member_id'      => array
         (
             'type'      => 'int-11',
@@ -254,8 +194,8 @@ return array
             'option' => array
             (
                 'name' => array('yes', 'like'),
-                'shop_id' => 'yes',
-                'mobile' => 'yes',
+                'use_type' => 'yes',
+                'use_id' => 'yes',
                 'start' => array('yes-cdate', '>='),
                 'end' => array('yes-cdate', '<='),
                 'status' => array('yes', 'in'),
@@ -275,7 +215,8 @@ return array
             (
                 'start' => array('yes-cdate', '>='),
                 'end' => array('yes-cdate', '<='),
-                'shop_id' => 'yes',
+                'use_type' => 'yes',
+                'use_id' => 'yes',
                 'status' => array('yes', 'in'),
                 'state' => 1,
             ),
@@ -291,7 +232,8 @@ return array
             (
                 'start' => array('yes-cdate', '>='),
                 'end' => array('yes-cdate', '<='),
-                'shop_id' => 'yes',
+                'use_type' => 'yes',
+                'use_id' => 'yes',
                 'status' => array('yes', 'in'),
                 'state' => 1,
             ),
@@ -307,7 +249,8 @@ return array
             (
                 'start' => array('yes-cdate', '>='),
                 'end' => array('yes-cdate', '<='),
-                'shop_id' => 'yes',
+                'use_type' => 'yes',
+                'use_id' => 'yes',
                 'status' => array('yes', 'in'),
                 'state' => 1,
             ),

app/shop/database/out_order_goods.php

@@ -29,18 +29,6 @@ return array
             //'list'        => true,
         ),
 
-        'shop_id'      => array
-        (
-            'type'      => 'int-11',
-            'name'      => '所属门店',
-            'default'   => '',
-            'desc'      => '所属门店',
-            'match'     => 'is_numeric',
-            'update'    => 'hidden',
-            'value'     => Dever::input('search_option_shop_id'),
-            'list'      => 'Dever::load("shop/info-find#name", {shop_id})',
-        ),
-
         'order_id'      => array
         (
             'type'      => 'int-11',
@@ -91,6 +79,17 @@ return array
             'list'        => true,
         ),
 
+        'd_price'      => array
+        (
+            'type'      => 'varchar-50',
+            'name'      => '商品单价',
+            'default'   => '',
+            'desc'      => '商品单价',
+            'match'     => 'option',
+            'update'    => 'text',
+            'list'        => true,
+        ),
+
         'status'        => array
         (
             'type'      => 'int-11',

app/shop/database/sell_order_goods.php

@@ -62,9 +62,9 @@ return array
         'price'      => array
         (
             'type'      => 'varchar-50',
-            'name'      => '商品原价',
+            'name'      => '商品总价',
             'default'   => '',
-            'desc'      => '商品原价',
+            'desc'      => '商品总价',
             'match'     => 'option',
             'update'    => 'text',
             'list'        => true,
@@ -81,6 +81,17 @@ return array
             'list'        => true,
         ),
 
+        'd_price'      => array
+        (
+            'type'      => 'varchar-50',
+            'name'      => '商品单价',
+            'default'   => '',
+            'desc'      => '商品单价',
+            'match'     => 'option',
+            'update'    => 'text',
+            'list'        => true,
+        ),
+
         'coupon_id'      => array
         (
             'type'      => 'int-11',

app/shop/lib/Sell.php

@@ -232,6 +232,7 @@ class Sell
         if ($this->view == 2) {
 
             foreach ($info['goods'] as $k => $v) {
+                $info['goods'][$k]['price'] = $v['d_price'] ? $v['d_price'] : round($v['price']/$v['num'], 2);
                 $info['goods'][$k]['info'] = Dever::load('goods/lib/info')->getPayInfo($v['goods_id'], $v['sku_id']);
                 $info['goods'][$k]['status_name'] = $goods_status[$v['status']];
             }
@@ -249,6 +250,7 @@ class Sell
         } else {
             foreach ($info['goods'] as $k => $v) {
                 $goods = Dever::db('goods/info')->one($v['goods_id']);
+                $info['goods'][$k]['price'] = $v['d_price'] ? $v['d_price'] : round($v['price']/$v['num'], 2);
                 $info['goods'][$k]['name'] = $goods['name'];
                 $info['goods'][$k]['cover'] = $goods['cover'];
                 $info['goods'][$k]['status_name'] = $goods_status[$v['status']];
@@ -563,6 +565,7 @@ class Sell
                 $data['goods_id'] = $v['id'];
                 $data['sku_id'] = $v['sku_id'];
                 $data['price'] = $v['price'] * $v['buy_num'];
+                $data['d_price'] = $v['price'];
                 $data['num'] = $v['buy_num'];
 
                 if (isset($v['user_coupon_id']) && $v['user_coupon_id']) {

app/store/admin/Auth.php

@@ -297,7 +297,7 @@ class Auth
     public function menu()
     {
         $info = $this->info();
-        if ($info) {
+        if ($info && Dever::project('message')) {
             $this->msg = Dever::load('message/lib/data')->num($info['store_id'], 3);
         } else {
             $this->msg = 0;

app/store/admin/Factory_order.php

@@ -19,7 +19,7 @@ class Factory_order extends Core
         		} else {
         			$ps_date = $ydate = '-';
         		}
-        		$view = Dever::url('order_view?type=1&order_id=' . $v['id'], 'store');
+        		$view = Dever::url('order_view?type=3&order_id=' . $v['id'], 'store');
 
         		$send = Dever::url('order_send?id=' . $v['id'], 'store');
 

app/store/admin/Goods.php

@@ -11,33 +11,11 @@ class Goods extends Core
         $data = Dever::load('store/lib/goods')->getGoodsSku($this->id);
 
         $html = '';
-        print_r($data);die;
-        if ($data && $data['order']) {
-        	foreach ($data['order'] as $k => $v) {
-        		if ($v['ps_info']) {
-        			$ps_date = $v['ps_info']['cdate'];
-        			$ydate = $v['ps_info']['ydate'] ? $v['ps_info']['ydate'] : '-';
-        		} else {
-        			$ps_date = $ydate = '-';
-        		}
-        		$view = Dever::url('order_view?type=1&order_id=' . $v['id'], 'store');
-
-        		$send = Dever::url('order_send?id=' . $v['id'], 'store');
-
-        		$button = '<a href="'.$view.'"><button type="button" class="btn btn-info btn-rounded waves-effect waves-light m-b-5 layui-btn layui-btn-xs">查看详情</button></a>';
-
-        		$button .= '&nbsp;&nbsp;<a href="javascript:;" id="print_'.$v['id'].'" onclick="layer.alert(\'开发中\')"><button type="button" class="btn btn-info btn-rounded waves-effect waves-light m-b-5 layui-btn layui-btn-xs">打印订单</button></a>';
-        		
-        		if ($v['status'] == 4) {
-        			$url = Dever::url('admin/factory_order.action&order_id='.$v['id'], 'store');
-        			$button .= '&nbsp;&nbsp;<a href="javascript:;" onclick="load(\''.$url.'\')"><button type="button" class="btn btn-info btn-rounded waves-effect waves-light m-b-5 layui-btn layui-btn-xs">确认收货</button></a>';
-        		}
-
-                if ($v['refund_status'] == 2 && $v['status'] != 8) {
-                    $v['status_name'] .= '[缺货报损中]';
-                }
-
-        		$html .= '<tr><td>'.$v['order_num'].'</td><td>'.$ps_date.'</td><td>'.$v['source_info']['name'].'</td><td>'.$ydate.'</td><td>'.$v['num'].'</td><td>'.$v['status_name'].'</td><td>'.$button.'</td></tr>';
+        if ($data) {
+        	foreach ($data as $k => $v) {
+                $v['cover'] = '<img src="'.$v['cover'].'" width="50" />';
+                $v['sku_name'] = isset($v['sku_name']) ? $v['sku_name'] : '无';
+        		$html .= '<tr><td>'.$v['cover'].'</td><td>'.$v['name'].'</td><td>'.$v['sku_name'].'</td><td>'.$v['total'].'</td></tr>';
         	}
         }
         return $html;

app/store/admin/Order.php

@@ -45,7 +45,7 @@ class Order extends Core
         		} else {
         			$ps_date = '-';
         		}
-        		$view = Dever::url('order_view?type=2&order_id=' . $v['id'], 'store');
+        		$view = Dever::url('order_view?type=3&order_id=' . $v['id'], 'store');
 
         		$send = Dever::url('order_send?id=' . $v['id'], 'store');
 

app/store/assets/pc/html/goods.html

@@ -23,7 +23,7 @@
 
           <div class="layui-form layui-card-header layuiadmin-card-header-auto">
             <div class="layui-form-item">
-              <div id="search"><div style="margin-top:0px;"><div><div class="layui-inline"><div class="layui-input-inline"><input type="text" class="autoload_text layui-input update_value form-control layui-input " value="" name="name" id="name" autocomplete="off" placeholder="商品名称"></div></div><div class="layui-inline"><div class="layui-input-inline"><select lay-ignore="" xm-select-radio="" class="update_value form-control layui-input layui-select   " name="total" id="total"><option value="0" selected="">状态</option><option parent="" value="1">待支付</option><option parent="" value="2">待审核</option><option parent="" value="3">待发货</option><option parent="" value="4">待收货确认</option><option parent="" value="5">已完成</option><option parent="" value="6">已完成（有退款）</option><option parent="" value="7">已取消</option><option parent="" value="8">已退款</option><option parent="" value="11">已过期</option></select></div></div><div class="layui-inline"><input type="hidden" value="2" name="excel" id="excel" autocomplete="off"><button class="btn btn-primary layui-btn layuiadmin-btn-list" onclick="list_search($(this))" type="button" style="height: 38px;margin-left:0px;margin-top:-2px;">搜索</button></div></div></div></div>
+              <div id="search"><div style="margin-top:0px;"><div><div class="layui-inline"><div class="layui-input-inline"><input type="text" class="autoload_text layui-input update_value form-control layui-input " value="" name="name" id="name" autocomplete="off" placeholder="商品名称"></div></div><div class="layui-inline"><div class="layui-input-inline"><select lay-ignore="" xm-select-radio="" class="update_value form-control layui-input layui-select   " name="total" id="total"><option value="0" selected="">状态</option><option parent="" value="1">待支付</option><option parent="" value="2">待审核</option><option parent="" value="3">待发货</option><option parent="" value="4">待收货确认</option><option parent="" value="5">已完成</option><option parent="" value="6">已完成（有退款）</option><option parent="" value="7">已取消</option><option parent="" value="8">已退款</option><option parent="" value="11">已过期</option></select></div></div><div class="layui-inline"><input type="hidden" value="2" name="excel" id="excel" autocomplete="off"><button class="btn btn-primary layui-btn layuiadmin-btn-list" onclick="list_search($(this))" type="button" style="height: 38px;margin-left:0px;margin-top:-2px;">搜索</button>&nbsp;&nbsp;<button class="btn btn-primary layui-btn layuiadmin-btn-list" onclick="out()" type="button" style="height: 38px;margin-left:0px;margin-top:-2px;">打印清单</button></div></div></div></div>
             </div>
           </div>
         </div>