edit

app/goods/lib/Sku.php

@@ -9,11 +9,14 @@ class Sku
     # 设置sku特殊字段
     private $col = array
     (
-        'f_price' => '销售价',
         's_price' => '市场价',
-        'price' => '进货价',
+        'f_price' => '采购价',
+        'price' => '销售价',
     );
 
+    # 主要价格字段
+    private $main = 'price';
+
     public function __construct()
     {
         # 设置权限
@@ -141,10 +144,12 @@ class Sku
                         if (isset($value[$k])) {
                             $data[$k1] = $value[$k];
 
-                            if (!isset($min[$k1])) {
-                                $min[$k1] = $data[$k1];
-                            } elseif ($min[$k1] > $data[$k1]) {
-                                $min[$k1] = $data[$k1];
+                            if ($k1 == $this->main) {
+                                if (!isset($min[$k1])) {
+                                    $min = $data;
+                                } elseif ($min[$k1] > $data[$k1]) {
+                                    $min = $data;
+                                }
                             }
                         }
                     }
@@ -160,8 +165,14 @@ class Sku
             }
 
             if (!$config['other'] && $min) {
-                $update = $min;
-                $update['where_id'] = $info['id'];
+                $update = array();
+                foreach ($config['col'] as $k => $v) {
+                    if (isset($min[$k])) {
+                        $update[$k] = $min[$k];
+                    }
+                    
+                }
+                $update['where_id'] = $config['goods_id'];
                 Dever::db($table)->update($update);
             }
         }

app/shop/database/goods.php

@@ -216,7 +216,7 @@ return array
                 ),
             ),
             'type' => 'all',
-            'order' => array('reorder' => 'desc', 'id' => 'desc'),
+            'order' => array('t_2.reorder' => 'desc', 't_2.id' => 'desc'),
             'limit' => '0,6',
             'col' => '*,t_2.*,t_1.total_num-t_1.sell_num as num,t_1.sell_num',
         ),

app/shop/database/info.php

@@ -98,6 +98,16 @@ return array
             'list'      => true,
         ),
 
+        'desc'      => array
+        (
+            'type'      => 'varchar-800',
+            'name'      => '门店介绍',
+            'default'   => '',
+            'desc'      => '门店介绍',
+            'match'     => 'is_string',
+            'update'    => 'textarea',
+        ),
+
         'truename'      => array
         (
             'type'      => 'varchar-100',

app/shop/lib/Info.php

@@ -7,7 +7,7 @@ use Dever;
 class Info
 {
     # 获取店铺基本信息
-    public function get($city, $lng, $lat, $name = '', $method = 'fetch')
+    public function get($city, $lng, $lat, $name = '', $method = 'fetch', $shop_id = false)
     {
         if (!$city) {
             Dever::alert('请传入城市');
@@ -25,7 +25,18 @@ class Info
         }
 
         if ($data) {
-            $data = $this->getInfo($data);
+            if ($method == 'fetch') {
+                $data = $this->getInfo($data);
+            } else {
+                foreach ($data as $k => $v) {
+                    $data[$k] = $this->getInfo($data[$k]);
+                    if ($shop_id == $v['id']) {
+                        $data[$k]['cur'] = 1;
+                    } else {
+                        $data[$k]['cur'] = 2;
+                    }
+                }
+            }
         }
 
         return $data;
@@ -36,7 +47,7 @@ class Info
     {
         if ($shop) {
             $table = 'shop/goods';
-            $where['shop_id'] = $shop['id'];
+            $where['shop_id'] = isset($shop['id']) ? $shop['id'] : $shop;
         } else {
             $table = 'goods/info';
         }
@@ -55,7 +66,7 @@ class Info
 
         if ($data) {
             foreach ($data as $k => $v) {
-                $data[$k] = Dever::load('goods/lib/info')->getInfo($v);
+                $data[$k] = Dever::load('goods/lib/info')->getInfo($v, false);
 
                 /*
                 $price = $data[$k]['price']['value'];

app/shop/src/Main.php

@@ -55,11 +55,12 @@ class Main extends Core
         $lng = Dever::input('lng');
         $lat = Dever::input('lat');
         $name = Dever::input('name');
+        $shop_id = Dever::input('shop_id');
 
         # 获取门店
         $this->data['shop'] = array();
         if ($city && $lng && $lat) {
-            $this->data['shop'] = Dever::load('shop/lib/info')->get($city, $lng, $lat, $name, 'fetchAll');
+            $this->data['shop'] = Dever::load('shop/lib/info')->get($city, $lng, $lat, $name, 'fetchAll', $shop_id);
         }
 
         return $this->data;
@@ -122,9 +123,9 @@ class Main extends Core
         $column = Dever::db('goods/column')->select();
 
         $data = array();
-        if ($cate) {
-            foreach ($cate as $k => $v) {
-                $v['data'] = Dever::load('shop/lib/info')->getGoods($this->data['shop'], 3, $v['id']);
+        if ($column) {
+            foreach ($column as $k => $v) {
+                $v['data'] = Dever::load('shop/lib/info')->getGoods($shop_id, 3, $v['id']);
                 $data['cate'][] = $v;
             }
         }