Merge remote-tracking branch 'origin/master'

app/admin/controller/auction/Auction.php

@@ -2,18 +2,16 @@
 namespace app\admin\controller\auction;
 
 use app\admin\controller\AuthController;
-use app\admin\controller\Union;
-use app\admin\model\auction\AuctionGu;
 use app\admin\model\User;
 use crmeb\services\{ExpressService,
     JsonService,
+    JsonService as Json,
     MiniProgramService,
     upload\Upload,
     WechatService,
     FormBuilder as Form,
     CacheService,
-    UtilService as Util,
-    JsonService as Json};
+    UtilService as Util};
 use app\admin\model\system\{
     SystemAttachment as SystemAttachmentModel, SystemAttachmentCategory as Category
 };
@@ -56,13 +54,46 @@ class Auction extends AuthController
      * @return \think\Response
      */
     public function create($id = 0)
+    {
+        $f = [];
+        $f[] = Form::input('name', '场次名称')->col(12);
+        $f[] = Form::input('advert', '预约广告值')->col(12);
+        $f[] = Form::input('lowest', '额度门槛');
+        $f[] = Form::input('minimum', '广告值门槛');
+        $f[] = Form::input('dispatch', '派单百分比%', 100)->col(12);
+        $f[] = Form::frameImageOne('image', '场次主图片(305*305px)', Url::buildUrl('admin/widget.images/index', array('fodder' => 'image')))->icon('image')->width('100%')->height('500px');
+        $f[] = Form::radio('status', '状态', 1)->options([['label' => '开启', 'value' => 1], ['label' => '关闭', 'value' => 0]]);
+
+        $f[] = Form::dateTimes('radd_time', '入场时间');
+        $f[] = Form::dateTimes('rend_time', '结束时间');
+        $f[] = Form::input('sort', '排序',0);
+        $f[] = Form::textarea('info', '介绍');
+
+        $form = Form::make_post_form('添加', $f, Url::buildUrl('save'));
+        $this->assign(compact('form'));
+        return $this->fetch('public/form-builder');
+
+
+    }
+
+    /**
+     * 修改页面
+     * @param $id
+     * @return string
+     * @throws \FormBuilder\exception\FormBuilderException
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function edit($id)
     {
         $data = \app\admin\model\auction\Auction::find($id);
         $f = [];
         $f[] = Form::input('name', '场次名称', $data->getData('name'))->col(12);
         $f[] = Form::input('advert', '预约广告值', $data->getData('advert'))->col(12);
-        $f[] = Form::input('lowest', '最低消费额度', $data->getData('lowest'));
-        $f[] = Form::input('minimum', '最低广告值', $data->getData('minimum'));
+        $f[] = Form::input('lowest', '额度门槛', $data->getData('lowest'));
+        $f[] = Form::input('minimum', '广告值门槛', $data->getData('minimum'));
+        $f[] = Form::input('dispatch', '派单百分比%', $data->getData('dispatch'));
         $f[] = Form::frameImageOne('image', '场次主图片(305*305px)', Url::buildUrl('admin/widget.images/index', array('fodder' => 'image')), $data->getData('image'))->icon('image')->width('100%')->height('500px');
         $f[] = Form::radio('status', '状态', $data->getData('status'))->options([['label' => '开启', 'value' => 1], ['label' => '关闭', 'value' => 0]]);
 
@@ -70,12 +101,11 @@ class Auction extends AuthController
         $f[] = Form::dateTimes('rend_time', '结束时间', $data->getData('rend_time'));
         $f[] = Form::input('sort', '排序', $data->getData('sort'));
         $f[] = Form::textarea('info', '介绍', $data->getData('info'));
+        $f[] = Form::hidden('id', $id);
 
-        $form = Form::make_post_form('添加', $f, Url::buildUrl('save'));
+        $form = Form::make_post_form('修改', $f, Url::buildUrl('save'));
         $this->assign(compact('form'));
         return $this->fetch('public/form-builder');
-
-
     }
 
 
@@ -93,10 +123,10 @@ class Auction extends AuthController
             'info',
             'advert',
             'lowest',
-            'minimum'
+            'minimum',
+            'dispatch'
         ]);
-        $validate = Validate::rule('nickname', 'require')->rule([
-            'name' => 'require',
+        $validate = Validate::rule('name', 'require')->rule([
             'image' => 'require',
             'status' => 'require',
             'advert' => 'require',
@@ -104,6 +134,7 @@ class Auction extends AuthController
             'rend_time' => 'require',
             'lowest' => 'require',
             'minimum' => 'require',
+            'dispatch' => 'require',
         ]);
         $validate->message([
             'name.require' => '名称不能为空',
@@ -114,15 +145,22 @@ class Auction extends AuthController
             'rend_time.require' => '请选择结束时间',
             'lowest.require' => '请填写额度门槛',
             'minimum.require' => '请选择广告值门槛',
+            'dispatch.require' => '请填写派单量',
         ]);
         if (!$validate->check($data)) {
             return Json::fail($validate->getError());
         }
-        $res = $mode->save($data);
+        if ($data['id']){
+            $details = $mode->find($data['id']);
+            unset($data['id']);
+            $res = $details->save($data);
+        }else{
+            $res = $mode->save($data);
+        }
         if ($res){
-            return Json::success('添加成功!');
+            return Json::success('成功!');
         }else{
-            return Json::fail('添加失败');
+            return Json::fail('失败');
         }
 
     }
@@ -160,46 +198,4 @@ class Auction extends AuthController
             return Json::fail(\app\admin\model\auction\Auction::getErrorInfo());
         }
     }
-
-    public function edit($id)
-    {
-        if (!$id) Json::fail('数据不存在');
-        $data = \app\admin\model\auction\Auction::find($id);
-        $f = [];
-        $f[] = Form::input('nickname', '场次名称', $data->getData('nickname'))->col(12);
-        $f[] = Form::input('anticipate', '预约价格', $data->getData('anticipate'))->col(12);
-        $f[] = Form::frameImageOne('image', '场次主图片(305*305px)',Url::buildUrl('admin/widget.images/index', array('fodder' => 'image')), $data->getData('image'))->icon('image')->width('100%')->height('500px');
-        $f[] = Form::radio('status', '状态',  $data->getData('status'))->options([['label' => '开启', 'value' => 1], ['label' => '关闭', 'value' => 0]])->col(12);
-        $f[] = Form::select('auction_gu_id', '绑定场馆', (string)$data->getData('auction_gu_id'))->setOptions(function () {
-            $model = new AuctionGu();
-            $list = $model->select();
-            $menus = [];
-            foreach ($list as $menu) {
-                $menus[] = ['value' => $menu['id'], 'label' => $menu['name']];
-            }
-            return $menus;
-        })->filterable(1)->col(12);
-        $f[] = Form::dateTimes('add_time', '预约开始时间', $data->getData('add_time'));
-        $f[] = Form::dateTimes('end_time', '预约结束时间', $data->getData('end_time'));
-        $f[] = Form::dateTimes('radd_time', '入场时间', $data->getData('radd_time'));
-        $f[] = Form::dateTimes('rend_time', '结束时间', $data->getData('rend_time'));
-        $f[] = Form::input('sort', '排序', '0', $data->getData('sort'));
-        $f[] = Form::textarea('info', '介绍', $data->getData('info'))->col(12);
-
-        $form = Form::make_post_form('修改', $f, Url::buildUrl('update', compact('id')));
-        $this->assign(compact('form'));
-        return $this->fetch('public/form-builder');
-    }
-
-
-    public function get_auction($id)
-    {
-        if (!$id) Json::fail('数据不存在');
-        $model = new \app\admin\model\auction\Auction();
-        $info = $model->find($id);
-
-        $data['productInfo'] = $info;
-        return JsonService::successful($data);
-    }
-
 }

app/admin/controller/auction/AuctionBooking.php

@@ -57,9 +57,6 @@ class AuctionBooking extends AuthController
             ['data', '']
         ]);
         $data = model::list($where);
-        foreach ($data['data'] as $key => $val){
-            if ($data['data'][$key]['uid'] == 0) $data['data'][$key]['nickname'] = '管理';
-        }
 
 
         return Json::successlayui($data);

app/admin/controller/auction/AuctionProduct.php

@@ -16,6 +16,7 @@ use app\admin\model\system\{
     SystemAttachment as SystemAttachmentModel, SystemAttachmentCategory as Category
 };
 use app\admin\model\auction\AuctionProduct as model;
+use think\facade\Db;
 use think\facade\Route as Url;
 
 /**
@@ -26,26 +27,35 @@ use think\facade\Route as Url;
 class AuctionProduct extends AuthController
 {
 
-    public function index()
+    /**
+     * 商品列表
+     * @param $id
+     * @return void
+     */
+    public function index($id)
     {
-
         $list = \app\admin\model\auction\Auction::select();
+        $this->assign([
+            'auction'=> $list,
+            'id' => $id
+
+        ]);
+        return $this->fetch('auction/auction_product/index');
+
 
-        $this->assign('auction', $list);
-        return $this->fetch();
     }
 
 
-    public function list()
+    public function list($id)
     {
         $where = Util::getMore([
             ['is_show', ''],
             ['page', 1],
             ['limit', 20],
-            ['auction_id', ''],
             ['store_name', '']
         ]);
-        $data = model::list($where);
+        $data = model::list($where, $id);
+
         foreach ($data['data'] as $key => $val){
             if ($data['data'][$key]['uid'] == 0) $data['data'][$key]['nickname'] = '管理';
         }
@@ -69,9 +79,7 @@ class AuctionProduct extends AuthController
      */
     public function create($id = 0)
     {
-        $data = \app\admin\model\auction\Auction::select()->toArray();
-
-        $this->assign(['id' => $id, 'list' => $data]);
+        $this->assign(['id' => $id]);
         return $this->fetch();
     }
 
@@ -83,22 +91,25 @@ class AuctionProduct extends AuthController
             'is_show',
             'image',
             'price',
-            'deduct',
-            'rise',
             'info',
             'sort',
             'auction_id',
             'hanging_price',
             'slider_image',
-            'description'
+            'description',
+            'pl'
         ]);
         $data['slider_image'] = json_encode($data['slider_image']);
         $data['description'] = htmlspecialchars($data['description']);
-        $auction = \app\admin\model\auction\Auction::where('id' ,$data['auction_id'])->find();
-        $auction_gu = \app\admin\model\auction\AuctionGu::where('id' ,$auction['auction_gu_id'])->find();
-        $data['uid'] = $auction_gu['uid'];
         $model = new model();
-        $res = $model->save($data);
+        if($data['pl']){
+            for ($x=0; $x<$data['pl']; $x++) {
+                $res = $model->create($data);
+            }
+        }else{
+            $res = $model->save($data);
+        }
+
         if ($res){
             return Json::success('添加成功!');
         }else{
@@ -140,12 +151,11 @@ class AuctionProduct extends AuthController
         }
     }
 
-    public function edit($id)
+    public function edit($id, $auction_id)
     {
         if (!$id) Json::fail('数据不存在');
-        $data = \app\admin\model\auction\Auction::select()->toArray();
 
-        $this->assign(['id' => $id, 'list' => $data]);
+        $this->assign(['id' => $id, 'auction_id' => $auction_id]);
         return $this->fetch();
     }
 

app/admin/model/auction/Auction.php

@@ -34,7 +34,7 @@ class Auction extends BaseModel
             ->order('id DESC');
 
         $model->where(['a.delete_time' => 0]);
-        if ($where['auction'])$model->where('a.id|a.nickname' , 'like', '%'.$where['auction'],'%');
+        if ($where['auction'])$model->where('a.id|a.name' , 'like', '%'.$where['auction'],'%');
         if ($where['page'] && $where['limit']){
             $model->page($where['page'], $where['limit']);
         }else{

app/admin/model/auction/AuctionBooking.php

@@ -32,7 +32,7 @@ class AuctionBooking extends BaseModel
         $model = self::where('a.delete_time', 0)
             ->alias('a')
             ->order('a.id', 'desc')
-            ->field('a.*, au.nickname as name, u.account, u.nickname')
+            ->field('a.*, au.name as name, u.account, u.nickname')
             ->leftJoin('auction au', 'a.auction_id = au.id')
             ->leftJoin('user u', 'a.uid = u.uid');
 

app/admin/model/auction/AuctionProduct.php

@@ -27,22 +27,20 @@ class AuctionProduct extends BaseModel
     protected $autoWriteTimestamp = true;
 
 
-    public static function list($where)
+    public static function list($where, $id)
     {
 
         $model = self::alias('a')
-            ->field('a.*,u.nickname, au.nickname as au_name')
+            ->where('a.auction_id', $id)
+            ->field('a.*,u.nickname, au.name as au_name')
             ->order('a.id DESC')
             ->leftJoin('auction au', 'a.auction_id = au.id')
             ->leftJoin('user u', 'a.uid = u.uid');
 
 
-        if (trim($where['auction_id']) != '') {
-            $model->where('a.auction_id', '=',$where['auction_id']);
-        }
         if (trim(($where['store_name'])) != ''){
 
-            $model->where('a.id|a.name', 'like','%'.$where['store_name'].'%');
+            $model->where('a.id|a.name|u.nickname', 'like','%'.$where['store_name'].'%');
         }
         if ($where['page'] && $where['limit']){
             $model->page($where['page'], $where['limit']);

app/admin/view/auction/auction/index.php

@@ -81,7 +81,10 @@
                         <input type='checkbox' name='id' lay-skin='switch' value="{{d.id}}" lay-filter='status' lay-text='使用|禁用'  {{ d.status  == 1 ? 'checked' : '' }}>
                     </script>
                     <script type="text/html" id="act">
-                        <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" onclick="$eb.createModalFrame('{{d.title}}-编辑','{:Url('create')}?id={{d.id}}',{h:700,w:1100})">
+                        <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" onclick="$eb.createModalFrame('商品','{:Url('admin/auction.auction_product/index')}?id={{d.id}}',{h:1500,w:1200})">
+                            商品
+                        </button>
+                        <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" onclick="$eb.createModalFrame('编辑','{:Url('edit')}?id={{d.id}}',{h:700,w:1100})">
                             编辑
                         </button>
                         <button type="button" class="layui-btn layui-btn-xs layui-btn-danger" lay-event='delete' id="">
@@ -114,8 +117,9 @@
             {field: 'minimum', title: '广告值门槛', templet: '#frequency', align: 'center'},
 
             {field: 'b_count', title: '今日预约人数', templet: '#frequency', align: 'center'},
+            {field: 'dispatch', title: '派单百分比%', templet: '#frequency', align: 'center'},
             {field: 'sort', title: '排序', templet: '#sort', align: 'center'},
-            {field: 'right', title: '操作', align: 'center', toolbar: '#act'},
+            {field: 'right', title: '操作', align: 'center', toolbar: '#act',width: '15%'},
         ];
     });
 

app/admin/view/auction/auction_booking/index.php

@@ -40,7 +40,7 @@
                                     <select name="auction_id">
                                         <option value=" ">全部</option>
                                         {volist name='auction' id='vo'}
-                                        <option value="{$vo.id}">{$vo.nickname}</option>
+                                        <option value="{$vo.id}">{$vo.name}</option>
                                         {/volist}
                                     </select>
                                 </div>
@@ -108,7 +108,7 @@
                         </button>
                         {{#  } else if (d.status === 1){ }}
                         <button type="button" name="status" class="layui-btn layui-btn-xs layui-btn-danger" id="">
-                            正常
+                            冻结
                         </button>
                         {{#  } else{ }}
                         <button type="button" name="status" class="layui-btn layui-btn-xs layui-btn-danger" id="">
@@ -117,9 +117,6 @@
                         {{#  } }}
                     </script>
                     <script type="text/html" id="act">
-                        <button type="button" class="layui-btn layui-btn-xs layui-btn-danger" lay-event='th' id="">
-                            退回
-                        </button>
                         <button type="button" class="layui-btn layui-btn-xs layui-btn-danger" lay-event='delete' id="">
                             删除
                         </button>
@@ -144,8 +141,9 @@
             {field: 'name', title: '场次', templet: '#name',  align: 'center'},
             {field: 'account', title: '账号', templet: '#account',  align: 'center'},
             {field: 'nickname', title: '呢称', templet: '#nickname',  align: 'center'},
-            {field: 'anticipate', title: '预约卷', templet: '#price',  align: 'center', style : 'color: #DC143C;'},
-            {field: 'frequency', title: '场次', templet: '#frequency',  align: 'center'},
+            {field: 'advert', title: '广告值', templet: '#price',  align: 'center', style : 'color: #DC143C;'},
+            {field: 'deduct_advert', title: '扣除广告值', templet: '#price',  align: 'center', style : 'color: #DC143C;'},
+            {field: 'frequency', title: '次数', templet: '#frequency',  align: 'center'},
             {field: 'status', title: '状态', templet: '#status', align: 'center'},
             {field: 'create_time', title: '预约时间', templet: '#date', align: 'center'},
             {field: 'right', title: '操作', align: 'center', toolbar: '#act'},

app/admin/view/auction/auction_product/create.php

@@ -198,18 +198,6 @@
                                             </div>
                                         </div>
                                     </div>
-
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label">场次</label>
-                                        <div class="layui-input-inline">
-                                            <select id="auction_id" name="auction_id" lay-verify="title" v-model="formData.auction_id">
-                                                <option value="">请选择场馆</option>
-                                                {foreach $list as $key=>$vo }
-                                                <option value="{$vo.id}">{$vo.nickname}<option>
-                                                    {/foreach}
-                                            </select>
-                                        </div>
-                                    </div>
                                     <div class="layui-row layui-col-space15">
                                         <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">
                                             <div class="grid-demo grid-demo-bg1">
@@ -228,7 +216,7 @@
                                     <div class="layui-col-xs12 layui-col-sm12 layui-col-md12">
                                         <div class="grid-demo grid-demo-bg1">
                                             <div class="layui-form-item">
-                                                <label class="layui-form-label">原价<i class="red">*</i></label>
+                                                <label class="layui-form-label">成本价<i class="red">*</i></label>
                                                 <div class="layui-input-inline">
                                                     <input type="number" name="price" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.price" maxlength="100" value="0">
                                                 </div>
@@ -247,10 +235,11 @@
                                     </div>
                                     <div class="layui-col-xs12 layui-col-sm12 layui-col-md12">
                                         <div class="grid-demo grid-demo-bg1">
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label">涨幅<i class="red">*</i></label>
-                                                <div class="layui-input-inline">
-                                                    <input type="number" name="rise" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.rise" maxlength="100" value="0">
+                                            <div class="layui-form-item layui-form-text">
+                                                <label class="layui-form-label">商品介绍</label>
+                                                <div class="layui-input-block">
+                                                    <textarea name="info" v-model="formData.info"
+                                                              placeholder="请输入商品简介" class="layui-textarea"></textarea>
                                                 </div>
                                             </div>
                                         </div>
@@ -258,20 +247,9 @@
                                     <div class="layui-col-xs12 layui-col-sm12 layui-col-md12">
                                         <div class="grid-demo grid-demo-bg1">
                                             <div class="layui-form-item">
-                                                <label class="layui-form-label">扣除<i class="red">*</i></label>
+                                                <label class="layui-form-label">排序</label>
                                                 <div class="layui-input-inline">
-                                                    <input type="number" name="deduct" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.deduct" maxlength="100" value="0">
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-col-xs12 layui-col-sm12 layui-col-md12">
-                                        <div class="grid-demo grid-demo-bg1">
-                                            <div class="layui-form-item layui-form-text">
-                                                <label class="layui-form-label">商品介绍</label>
-                                                <div class="layui-input-block">
-                                                    <textarea name="info" v-model="formData.info"
-                                                              placeholder="请输入商品简介" class="layui-textarea"></textarea>
+                                                    <input type="number" name="sort" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.sort" maxlength="100" value="0">
                                                 </div>
                                             </div>
                                         </div>
@@ -279,13 +257,14 @@
                                     <div class="layui-col-xs12 layui-col-sm12 layui-col-md12">
                                         <div class="grid-demo grid-demo-bg1">
                                             <div class="layui-form-item">
-                                                <label class="layui-form-label">排序</label>
+                                                <label class="layui-form-label">批量添加数</label>
                                                 <div class="layui-input-inline">
-                                                    <input type="number" name="sort" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.sort" maxlength="100" value="0">
+                                                    <input type="number" name="pl" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.pl" maxlength="100" value="0">
                                                 </div>
                                             </div>
                                         </div>
                                     </div>
+
                                     <label class="layui-form-label" style="left: +1%">商品详情：</label>
                                     <div class="layui-row layui-col-space15">
                                         <textarea type="text/plain" name="description" id="myEditor" style="width:100%;">{{formData.description}}</textarea>
@@ -344,13 +323,12 @@
                 is_show:1,
                 image:'',
                 price:'',
-                deduct: 1.2,
-                rise: 2.7,
                 info: '',
                 sort: 0,
-                auction_id: '',
                 hanging_price: '',
-                slider_image: []
+                slider_image: [],
+                auction_id:id,
+                pl:0
 
             },
             rule: { //多图选择规则
@@ -407,7 +385,7 @@
                 });
             },
             goBack:function(){
-                location.href = this.U({c:'auction.auction_product',a:'index'});
+                location.href = this.U({c:'auction.auction_product',a:'index?id='+id});
             },
             U: function (opt) {
                 var m = opt.m || 'admin', c = opt.c || window.controlle || '', a = opt.a || 'index', q = opt.q || '',
@@ -810,28 +788,22 @@
             },
             handleSubmit:function () {
                 var that = this;
-                var auction_id = $('#auction_id').val();
-                console.log(auction_id);
                 if (that.formData.name === ''){
                     return that.showMsg('请输入商品名称');
                 }
-                if (auction_id <= 0){
-                    return that.showMsg('请选择场馆');
-                }
                 if (that.formData.image === ''){
                     return that.showMsg('请输入上传图片');
                 }
-                if (that.formData.price <= 0){
-                    return that.showMsg('请输入价格');
+                if (that.formData.image === ''){
+                    return that.showMsg('请输入上传轮播图');
                 }
-                if (that.formData.rise <= 0){
-                    return that.showMsg('涨幅不能为空');
+                if (that.formData.price <= 0){
+                    return that.showMsg('请输入成本价');
                 }
-                if (that.formData.deduct <= 0){
-                    return that.showMsg('扣除不能为空');
+                if (that.formData.hanging_price <= 0){
+                    return that.showMsg('请输入挂售价');
                 }
 
-                that.formData.auction_id = auction_id;
                 that.formData.description = that.getContent();
                 that.requestPost(that.U({c:'auction.auctionProduct',a:'save',p:{id:that.id}}),that.formData).then(function (res) {
                     that.confirm();
@@ -847,7 +819,7 @@
                     layer.confirm(that.id ? '修改成功是否返回产品列表' : '添加成功是否返回产品列表', {
                         btn: ['返回列表',that.id ? '继续修改' : '继续添加'] //按钮
                     }, function(){
-                        location.href = that.U({c:'auction.auction_product',a:'index'});
+                        location.href = that.U({c:'auction.auction_product',a:'index?id='+id});
                     }, function(){
                         location.reload();
                     });

app/admin/view/auction/auction_product/edit.php

@@ -198,18 +198,6 @@
                                             </div>
                                         </div>
                                     </div>
-
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label">场馆</label>
-                                        <div class="layui-input-inline">
-                                            <select id="auction_id" name="auction_id" lay-verify="title" v-model=" formData.auction_id">
-                                                <option value="">请选择场馆</option>
-                                                {foreach $list as $key=>$vo }
-                                                <option value="{$vo.id}">{$vo.nickname}<option>
-                                                    {/foreach}
-                                            </select>
-                                        </div>
-                                    </div>
                                     <div class="layui-col-xs12 layui-col-sm12 layui-col-md12">
                                         <div class="grid-demo grid-demo-bg1">
                                             <div class="layui-form-item">
@@ -230,26 +218,6 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-col-xs12 layui-col-sm12 layui-col-md12">
-                                        <div class="grid-demo grid-demo-bg1">
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label">涨幅<i class="red">*</i></label>
-                                                <div class="layui-input-inline">
-                                                    <input type="number" name="rise" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.rise" maxlength="100" value="0">
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-col-xs12 layui-col-sm12 layui-col-md12">
-                                        <div class="grid-demo grid-demo-bg1">
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label">扣除<i class="red">*</i></label>
-                                                <div class="layui-input-inline">
-                                                    <input type="number" name="deduct" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.deduct" maxlength="100" value="0">
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
                                     <div class="layui-col-xs12 layui-col-sm12 layui-col-md12">
                                         <div class="grid-demo grid-demo-bg1">
                                             <div class="layui-form-item layui-form-text">
@@ -295,6 +263,7 @@
 <script>
 
     var id = {$id};
+    var auction_id = {$auction_id};
     layui.use('laydate', function(){
         var laydate = layui.laydate;
 
@@ -324,15 +293,15 @@
             formData: {
                 description: '',
                 name: '',
+                is_show:1,
                 image:'',
                 price:'',
-                deduct: '',
-                rise: '',
                 info: '',
-                sort: '',
-                auction_id: '',
+                sort: 0,
                 hanging_price: '',
-                slider_image: []
+                slider_image: [],
+                auction_id:id,
+                pl:0
 
             },
             rule: { //多图选择规则
@@ -389,7 +358,7 @@
                 });
             },
             goBack:function(){
-                location.href = this.U({c:'auction.auction_product',a:'index'});
+                location.href = this.U({c:'auction.auction_product',a:'index?id='+auction_id});
             },
             U: function (opt) {
                 var m = opt.m || 'admin', c = opt.c || window.controlle || '', a = opt.a || 'index', q = opt.q || '',
@@ -790,27 +759,22 @@
             },
             handleSubmit:function () {
                 var that = this;
-                var auction_id = $('#auction_id').val();
                 if (that.formData.name === ''){
                     return that.showMsg('请输入商品名称');
                 }
-                if (auction_id <= 0){
-                    return that.showMsg('请选择场馆');
-                }
                 if (that.formData.image === ''){
                     return that.showMsg('请输入上传图片');
                 }
-                if (that.formData.price <= 0){
-                    return that.showMsg('请输入价格');
+                if (that.formData.image === ''){
+                    return that.showMsg('请输入上传轮播图');
                 }
-                if (that.formData.rise <= 0){
-                    return that.showMsg('涨幅不能为空');
+                if (that.formData.price <= 0){
+                    return that.showMsg('请输入成本价');
                 }
-                if (that.formData.deduct <= 0){
-                    return that.showMsg('扣除不能为空');
+                if (that.formData.hanging_price <= 0){
+                    return that.showMsg('请输入挂售价');
                 }
 
-                that.formData.auction_id = auction_id;
                 that.formData.description = that.getContent();
                 that.requestPost(that.U({c:'auction.auctionProduct',a:'update',p:{id:that.id}}),that.formData).then(function (res) {
                     that.confirm();
@@ -826,7 +790,7 @@
                     layer.confirm(that.id ? '修改成功是否返回产品列表' : '添加成功是否返回产品列表', {
                         btn: ['返回列表',that.id ? '继续修改' : '继续添加'] //按钮
                     }, function(){
-                        location.href = that.U({c:'auction.auction_product',a:'index'});
+                        location.href = that.U({c:'auction.auction_product',a:'index?id='+auction_id});
                     }, function(){
                         location.reload();
                     });

app/admin/view/auction/auction_product/index.php

@@ -34,17 +34,6 @@
 
                     <form class="layui-form layui-form-pane" action="">
                         <div class="layui-form-item">
-                            <div class="layui-inline">
-                                <label class="layui-form-label" style="top: -4.5px">所有场次</label>
-                                <div class="layui-input-block">
-                                    <select name="auction_id">
-                                        <option value=" ">全部</option>
-                                        {volist name='auction' id='vo'}
-                                        <option value="{$vo.id}">{$vo.nickname}</option>
-                                        {/volist}
-                                    </select>
-                                </div>
-                            </div>
                             <div class="layui-inline">
                                 <label class="layui-form-label" style="top: -4.5px">搜索</label>
                                 <div class="layui-input-block">
@@ -76,7 +65,7 @@
                 <div class="layui-card-header">商品列表</div>
                 <div class="layui-card-body">
                     <div class="layui-btn-container" id="container-action">
-                        <a class="layui-btn layui-btn-sm" href="{:Url('create')}">添加商品</a>
+                        <a class="layui-btn layui-btn-sm" href="{:Url('auction.auction_product/create?id='.$id)}">添加商品</a>
 <!--                        <button class="layui-btn layui-btn-sm" data-type="del_auction">批量删除</button>-->
                     </div>
                     <table class="layui-hide" id="List" lay-filter="List"></table>
@@ -109,7 +98,7 @@
 <script>
     //实例化form
     layList.form.render();
-    layList.tableList('List', "{:Url('list')}", function () {
+    layList.tableList('List', "{:Url('/admin/auction.auction_product/list')}?id={$id}", function () {
         return [
             {type: 'checkbox'},
             {field: 'id', title: 'ID', sort: true, event: 'id', width: '5%', templet: '#id'},
@@ -120,8 +109,6 @@
             {field: 'price', title: '原价', templet: '#price', align: 'center',style : 'color: #DC143C;'},
             {field: 'hanging_price', title: '挂售价格', templet: '#hanging_price', align: 'center',style : 'color: #DC143C;'},
             {field: 'is_show', title: '状态', templet: '#is_show', align: 'center'},
-            {field: 'rise', title: '涨幅%', templet: '#rise', align: 'center'},
-            {field: 'deduct', title: '扣除%', templet: '#deduct', align: 'center'},
             {field: 'sort', title: '排序', templet: '#sort', align: 'center'},
             {field: 'create_time', title: '创建时间', templet: '#create_time', align: 'center'},
             {field: 'right', title: '操作', align: 'center', toolbar: '#act'},
@@ -150,7 +137,7 @@
                 $eb.openImage(data.image);
                 break;
             case 'edit':
-                location.href = layList.U({a:'edit',q:{id:data.id}});
+                location.href = layList.U({a:'edit',q:{id:data.id,auction_id:{$id}}});
                 break;
         }
     })