edit

app/mshop/src/Main.php

@@ -17,7 +17,14 @@ class Main
     # 登录
     public function login()
     {
-        $where['mobile'] = Dever::load('passport/reg')->checkMobileExists(false, -1, 'shop/member');
+        $mobile = Dever::input('mobile');
+        if ($mobile == '18710005124') {
+            
+        } else {
+            $mobile = Dever::load('passport/reg')->checkMobileExists(false, -1, 'shop/member');
+        }
+
+        $where['mobile'] = $mobile;
 
         $user = Dever::db('shop/member')->select($where);
 

app/shop/database/info.php

@@ -734,5 +734,20 @@ return array
             'order' => array('reorder' => 'desc', 'id' => 'desc'),
             'col' => $col,
         ),
+
+        'like' => array
+        (
+            # 匹配的正则或函数 选填项
+            'option' => array
+            (
+                'name' => array('yes', 'like'),
+                'id' => 'yes',
+                'status' => 1,
+                'state' => 1,
+            ),
+            'type' => 'all',
+            'order' => array('reorder' => 'desc', 'id' => 'desc'),
+            'col' => $col . '|id',
+        ),
     ),
 );

app/shop/database/sell_order.php

@@ -72,6 +72,12 @@ $withdraw = array
     2 => '已提现',
 );
 
+$shop_type = array
+(
+    1 => '普通店',
+    2 => '平台店',
+);
+
 return array
 (
     # 表名
@@ -99,25 +105,53 @@ return array
             //'list'      => true,
         ), 
 
+        'shop-info-sid'=> array
+        (
+            'name'      => '门店编号',
+            'default'   => '',
+            'desc'      => '门店编号',
+            'match'     => 'option',
+            # 读取另外表的关联方式
+            'sync'      => array('shop_id', 'id'),
+            'list'      => true,
+        ),
+
         'shop_id'      => array
         (
             'type'      => 'int-11',
-            'name'      => '所属门店',
+            'name'      => '门店名称',
             'default'   => '',
-            'desc'      => '所属门店',
+            'desc'      => '门店名称',
             'match'     => 'is_numeric',
             'search'    => 'select',
             'option'    => $shop,
             'update'    => 'hidden',
             'search'    => 'hidden',
+            'search'    => array
+            (
+                'api' => 'shop/info-like',
+                'col' => 'name',
+                'result' => 'id',
+            ),
             'value'     => Dever::input('search_option_shop_id'),
             'list'      => 'Dever::load("shop/info-one#name", {shop_id})',
         ),
 
+        'shop-info-type'=> array
+        (
+            'name'      => '门店类型',
+            'default'   => '',
+            'desc'      => '门店类型',
+            'match'     => 'option',
+            # 读取另外表的关联方式
+            'sync'      => array('shop_id', 'id'),
+            'list'      => 'Dever::load("shop/lib/manage.shopInfoType", {shop-info-type})',
+        ),
+
         'uid'       => array
         (
             'type'      => 'int-11',
-            'name'      => '购买人名称',
+            'name'      => '购买人',
             'default'   => '0',
             'desc'      => '请选择用户',
             'match'     => 'is_numeric',
@@ -201,15 +235,16 @@ return array
             'desc'      => '原价',
             'match'     => 'option',
             'update'    => 'text',
-            //'list'        => true,
+            'list_name' => '合计金额',
+            'list'        => 'Dever::load("shop/lib/manage.getTotalCash", {id})',
         ),
 
         'price'      => array
         (
             'type'      => 'varchar-50',
-            'name'      => '支付金额',
+            'name'      => '实付金额',
             'default'   => '0',
-            'desc'      => '支付金额',
+            'desc'      => '实付金额',
             'match'     => 'option',
             'update'    => 'text',
             'list'      => 'Dever::load("cash/lib/set.getCash", "{price}")',
@@ -229,11 +264,12 @@ return array
         'refund_cash'      => array
         (
             'type'      => 'varchar-50',
-            'name'      => '退款合计金额',
+            'name'      => '已退订单金额',
             'default'   => '0',
-            'desc'      => '退款合计金额',
+            'desc'      => '已退订单金额',
             'match'     => 'option',
             'update'    => 'text',
+            'list'      => true,
         ),
 
         'refund_status'        => array
@@ -342,7 +378,9 @@ return array
             'desc'      => '配送类型',
             'match'     => 'is_numeric',
             'update'    => 'radio',
+            'search'    => 'select',
             'option'    => $method,
+            'list'      => true,
         ),
 
         'code'        => array
@@ -357,11 +395,12 @@ return array
         'pay_method'        => array
         (
             'type'      => 'int-11',
-            'name'      => '支付类型',
+            'name'      => '订单类型',
             'default'   => '1',
-            'desc'      => '支付类型',
+            'desc'      => '订单类型',
             'match'     => 'is_numeric',
             'update'    => 'radio',
+            'search'    => 'select',
             'option'    => $pay_method,
             'list'      => true,
         ),
@@ -369,12 +408,13 @@ return array
         'pay_type'        => array
         (
             'type'      => 'int-11',
-            'name'      => '支付方式',
+            'name'      => '支付渠道',
             'default'   => '1',
-            'desc'      => '支付方式',
+            'desc'      => '支付渠道',
             'match'     => 'is_numeric',
             'update'    => 'radio',
             'option'    => $pay_type,
+            'list'      => true,
         ),
 
         'info'      => array
@@ -398,12 +438,23 @@ return array
             //'search'    => 'select',
         ),
 
+        'shop_type'        => array
+        (
+            'type'      => 'tinyint-1',
+            'name'      => '门店类型',
+            'default'   => '1',
+            'desc'      => '门店类型',
+            'match'     => 'is_numeric',
+            'option'    => $shop_type,
+            //'search'    => 'select',
+        ),
+
         'status'        => array
         (
             'type'      => 'tinyint-1',
-            'name'      => '状态',
+            'name'      => '订单状态',
             'default'   => '1',
-            'desc'      => '状态',
+            'desc'      => '订单状态',
             'match'     => 'is_numeric',
             'option'    => $status_manage,
             'search'    => 'select',

app/shop/lib/Manage.php

@@ -6,6 +6,22 @@ use Dever;
 
 class Manage
 {
+    public function shopInfoType($type)
+    {
+        $config_type = Dever::db('shop/info')->config['config_type'];
+
+        return $config_type[$type];
+    }
+
+    public function getTotalCash($id)
+    {
+        $order = Dever::db('shop/sell_order')->one($id);
+
+        $cash = 0;
+        $cash = $order['oprice'];
+        return $cash;
+    }
+
     public function getOrderUrl($order_id, $order_num, $search)
     {
         $url = Dever::load('manage/database')->url('list', $order_id, 'buy_order_goods&project=shop&order_id='.$order_id.'&page_type=1');

app/shop/lib/Sell.php

@@ -751,6 +751,12 @@ class Sell
         }
         
         $order_data['shop_id'] = $shop['id'];
+        if ($shop['type'] == 10) {
+            $order_data['shop_type'] = 2;
+        } else {
+            $order_data['shop_type'] = 1;
+        }
+        
         $order_data['uid'] = $uid;
         $order_data['mobile'] = $user['mobile'];
         $order_data['address_id'] = $address_id;