edit

app/factory/assets/pc/html/setGoods.html

@@ -215,6 +215,9 @@
     function addGoods()
     {
         var key = mini.get("key").getValue();
+        if (key == '请输入商品名称') {
+            key = '';
+        }
         if (key) {
             key = key.toLowerCase();
         }
@@ -250,6 +253,9 @@
     {
         if (confirm('确定删除吗？')) {
             var key = mini.get("key").getValue();
+            if (key == '请输入商品名称') {
+                key = '';
+            }
             if (key) {
                 key = key.toLowerCase();
             }

app/goods/lib/Info.php

@@ -58,7 +58,7 @@ class Info
             Dever::alert('商品不存在');
         }
 
-        $goods = Dever::db('goods/info')->find($sku['info_id']);
+        $goods = Dever::db('goods/info')->one($sku['info_id']);
 
         if (!$goods) {
             Dever::alert('商品不存在');

app/shop/assets/pc/html/setGoods.html

@@ -196,7 +196,7 @@
     {
         mini.get(e).setValue('');
     }
-    
+
     function searchGoods() 
     {
         var key = mini.get("search_key").getValue();
@@ -219,6 +219,9 @@
     function addGoods()
     {
         var key = mini.get("key").getValue();
+        if (key == '请输入商品名称') {
+            key = '';
+        }
         if (key) {
             key = key.toLowerCase();
         }
@@ -254,6 +257,9 @@
     {
         if (confirm('确定删除吗？')) {
             var key = mini.get("key").getValue();
+            if (key == '请输入商品名称') {
+                key = '';
+            }
             if (key) {
                 key = key.toLowerCase();
             }

app/shop/lib/Cron.php

@@ -415,7 +415,7 @@ class Cron
             if ($goods) {
                 foreach ($goods as $k1 => $v1) {
                     $where['goods_id'] = $v1['goods_id'];
-                    $goods_info = Dever::db('goods/info')->find($v1['goods_id']);
+                    $goods_info = Dever::db('goods/info')->one($v1['goods_id']);
                     for($i=0; $i<=$day; $i++) {
                         $where['start'] = $start + 86400*$i;
                         $where['end'] = $start + 86400*$i + 86399;

app/shop/lib/Goods.php

@@ -85,7 +85,7 @@ class Goods
                 $v['sku_id'] = -1;
             }
 
-            $goods = Dever::db('goods/info')->find($v['goods_id']);
+            $goods = Dever::db('goods/info')->one($v['goods_id']);
             if (!$goods) {
                 continue;
             }

app/shop/lib/Refund.php

@@ -459,7 +459,7 @@ class Refund
         	}
 
             $info['tui_one_price'] = $info['price'];
-            $info['goods'] = Dever::db('goods/info')->find($info['goods_id']);
+            $info['goods'] = Dever::db('goods/info')->one($info['goods_id']);
         }
         return $info;
     }

app/shop/src/My.php

@@ -84,7 +84,7 @@ class My extends Core
 				$info = Dever::db('goods/card')->find($v['card_id']);
 				$goods = Dever::array_decode($info['goods']);
 				foreach ($goods as $k1 => $v1) {
-					$this->data['card'][$k]['goods'][$k1] = Dever::db('goods/info')->find($v1['goods_id']);
+					$this->data['card'][$k]['goods'][$k1] = Dever::db('goods/info')->one($v1['goods_id']);
 					$this->data['card'][$k]['goods'][$k1]['num'] = $v1['num'];
 				}
 

app/store/assets/pc/html/setGoods.html

@@ -249,6 +249,9 @@
     function addGoods()
     {
         var key = mini.get("key").getValue();
+        if (key == '请输入商品名称') {
+            key = '';
+        }
         if (key) {
             key = key.toLowerCase();
         }
@@ -284,6 +287,9 @@
     {
         if (confirm('确定删除吗？')) {
             var key = mini.get("key").getValue();
+            if (key == '请输入商品名称') {
+                key = '';
+            }
             if (key) {
                 key = key.toLowerCase();
             }

app/store/assets/pc/html/setGoodsNum.html

@@ -205,6 +205,9 @@
     function addGoods()
     {
         var key = mini.get("key").getValue();
+        if (key == '请输入商品名称') {
+            key = '';
+        }
         if (key) {
             key = key.toLowerCase();
         }
@@ -240,6 +243,9 @@
     {
         if (confirm('确定删除吗？')) {
             var key = mini.get("key").getValue();
+            if (key == '请输入商品名称') {
+                key = '';
+            }
             if (key) {
                 key = key.toLowerCase();
             }

service/bill/database/cash.php

@@ -216,6 +216,7 @@ return array
             'match'     => 'is_numeric',
             'update'    => 'radio',
             'option'    => $manage_status,
+            'mul'       => true,
         ),
 
         'audit_desc'      => array

service/bill/database/tixian.php

@@ -200,6 +200,7 @@ return array
             'match'     => 'option',
             # 读取另外表的关联方式
             'sync'      => array('cash_id', 'id'),
+            'search'    => 'select',
             'list'      => true,
             'option'	=> $cash_status,
             'list_order' => 9,
@@ -228,6 +229,7 @@ return array
             'match'     => 'is_numeric',
             'update'    => 'radio',
             'option'    => $manage_status,
+            'mul'       => true,
         ),
 
         'audit_desc'      => array
@@ -293,6 +295,7 @@ return array
         'insert' => false,
         'delete' => false,
         'edit' => false,
+        'mul'  => true,
         'list_button' => array
         (
             'list' => array('查看详情', '"push_cash&project=bill&id={cash_id}&page_type=1"'),