dever 3 năm trước cách đây
mục cha
commit
3817c59305

+ 1 - 1
service/agent/assets/pc/html/setGoods.html

@@ -52,7 +52,7 @@
                                 <th lay-data="{field:'id'}">商品编码</th>
                                 <th lay-data="{field:'name'}">商品名称</th>
                                 <th lay-data="{field:'price', edit: 'text'}">销售价(元)</th>
-                                <th lay-data="{field:'number', edit: 'text'}">更改数量</th>
+                                <th lay-data="{field:'number', edit: 'text'}">更改数量</th>
                                 <th lay-data="{field:'operation'}">操作</th>
                             </tr>
                         </thead>

+ 1 - 1
service/agent/assets/pc/html/setMemberGoods.html

@@ -41,7 +41,7 @@
                                 <th lay-data="{field:'id'}">商品编码</th>
                                 <th lay-data="{field:'name'}">商品名称</th>
                                 <th lay-data="{field:'price', edit: 'text'}">价值(元)</th>
-                                <th lay-data="{field:'number', edit: 'text'}">更改数量</th>
+                                <th lay-data="{field:'number', edit: 'text'}">更改数量</th>
                                 <th lay-data="{field:'operation'}">操作</th>
                             </tr>
                         </thead>

+ 1 - 1
service/agent/assets/pc/html/setOrderGoods.html

@@ -41,7 +41,7 @@
                                 <th lay-data="{field:'id'}">商品编码</th>
                                 <th lay-data="{field:'name'}">商品名称</th>
                                 <th lay-data="{field:'price', edit: 'text'}">销售价(元)</th>
-                                <th lay-data="{field:'number', edit: 'text'}">更改数量</th>
+                                <th lay-data="{field:'number', edit: 'text'}">更改数量</th>
                                 <th lay-data="{field:'operation'}">操作</th>
                             </tr>
                         </thead>

+ 1 - 1
service/agent/lib/Member_set.php

@@ -80,7 +80,7 @@ class Member_set
                 }
             } else {
                 if ($info) {
-                    $w['total_num'] = $v['total'] - $info['total_num'] - $info['sell_num'];
+                    $w['total_num'] = $v['total'];
                 } else {
                     $w['total_num'] = $v['total'];
                 }

+ 4 - 2
service/agent/lib/Set.php

@@ -58,7 +58,8 @@ class Set
                 $info = Dever::db($table)->find(array('type' => 3, 'type_id' => $v['id'], $col => $value));
                 if ($info) {
                     if ($table == 'agent/member_goods') {
-                        $info['num'] = $info['total_num'] - $info['sell_num'];
+                        //$info['num'] = $info['total_num'] - $info['sell_num'];
+                        $info['num'] = $info['total_num'];
                     }
                     $data[0]['children'][$k]['select'] = 1;
                     $data[0]['children'][$k]['total'] = $info['num'];
@@ -88,7 +89,8 @@ class Set
                 $info = Dever::db($table)->find(array('type' => 2, 'type_id' => $v['id'], $col => $value));
                 if ($info) {
                     if ($table == 'agent/member_goods') {
-                        $info['num'] = $info['total_num'] - $info['sell_num'];
+                        //$info['num'] = $info['total_num'] - $info['sell_num'];
+                        $info['num'] = $info['total_num'];
                         if ($info['sku_id'] > 0) {
                             $code = Dever::db('card/code')->find($info['sku_id']);
                             $data[1]['children'][$k]['price'] = $code['total_cash'];