库存

application/admin/view/product/popular/add.html

@@ -46,9 +46,9 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Stock')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('初始销量')}:</label>
         <div class="col-xs-12 col-sm-3">
-            <input id="c-stock" data-rule="required" class="form-control" name="row[stock]" type="number" value="0">
+            <input id="c-init_num" data-rule="required" class="form-control" name="row[init_num]" type="number" value="0">
         </div>
         <label class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
         <div class="col-xs-12 col-sm-3">

application/admin/view/product/popular/edit.html

@@ -40,9 +40,9 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Stock')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('初始销量')}:</label>
         <div class="col-xs-12 col-sm-3">
-            <input id="c-stock" data-rule="required" class="form-control" name="row[stock]" type="number" value="{$row.stock|htmlentities}">
+            <input id="c-init_num" data-rule="required" class="form-control" name="row[init_num]" type="number" value="{$row.init_num|htmlentities}">
         </div>
         <label class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
         <div class="col-xs-12 col-sm-3">

application/api/controller/Product.php

@@ -36,7 +36,7 @@ class Product extends Api
             $proArr  = array();
             foreach ($list as $key => &$item) {
                 $pro =$productPopular
-                    ->field('id,product_id,price,cost_price,stock,num,start_time,end_time,status')
+                    ->field('id,product_id,price,cost_price,stock,(num+init_num) as num,start_time,end_time,status')
                     ->where('product_id', $item['id'])
                     ->where('status', '<', $productPopular::STOP)
                     ->order('start_time')

application/common/model/ProductPopular.php

@@ -70,14 +70,14 @@ class ProductPopular extends Model
     {
         $info = self::alias('a')
             ->join("product_list b", "a.product_id = b.id", "left")
-            ->field('a.id,a.product_id,'.'b.'.$lan.'_name as name,b.images as img_url,price,cost_price,stock,num,start_time,end_time,b.details')
+            ->field('a.id,a.product_id,'.'b.'.$lan.'_name as name,b.images as img_url,price,cost_price,stock,(num+init_num) as num,start_time,end_time,b.details')
             ->where('a.product_id', $product_id)
             ->where('a.status', self::NORMAL)
             ->find();
         if (empty($info)) {
             $info = self::alias('a')
                 ->join("product_list b", "a.product_id = b.id", "left")
-                ->field('a.id,a.product_id,'.'b.'.$lan.'_name as name,b.images as img_url,price,cost_price,stock,num,start_time,end_time,b.details')
+                ->field('a.id,a.product_id,'.'b.'.$lan.'_name as name,b.images as img_url,price,cost_price,stock,(num+init_num) as num,start_time,end_time,b.details')
                 ->where('a.id', $ids)
                 ->order('a.weigh desc')
                 ->find();

public/assets/js/backend/product/popular.js

@@ -34,6 +34,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'cost_price', title: __('Cost_price'), operate:false},
                         {field: 'min_transfer', title: __('最低转让价'), operate:false}, 
                         {field: 'stock', title: __('Stock'), operate:false},
+                        {field: 'init_num', title: __('初始销量'), operate:false},
                         {field: 'weigh', title: __('Weigh'), operate: false},
                         {field: 'start_time', title: __('Start_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'end_time', title: __('End_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},