hrjy %!s(int64=3) %!d(string=hai) anos
pai
achega
b0186cf8c9
Modificáronse 29 ficheiros con 107 adicións e 65 borrados
  1. 1 1
      .env
  2. 2 1
      app/admin/controller/auction/AuctionBooking.php
  3. 16 4
      app/admin/controller/auction/AuctionGu.php
  4. 4 2
      app/admin/controller/auction/AuctionProduct.php
  5. 9 2
      app/admin/controller/setting/SystemAdmin.php
  6. 1 1
      app/admin/model/auction/Auction.php
  7. 5 1
      app/admin/model/auction/AuctionGu.php
  8. 1 1
      app/admin/model/auction/AuctionProduct.php
  9. 1 0
      app/admin/view/auction/auction/index.php
  10. 3 1
      app/admin/view/auction/auction_gu/edit.php
  11. 4 0
      app/admin/view/auction/auction_gu/index.php
  12. 6 6
      app/admin/view/auction/auction_product/create.php
  13. 2 19
      app/admin/view/auction/auction_product/edit.php
  14. 3 2
      app/api/controller/auction/AuctionProductController.php
  15. 2 2
      app/models/auction/Auction.php
  16. 6 3
      app/models/auction/AuctionOrder.php
  17. 3 1
      app/models/auction/AuctionProduct.php
  18. BIN=BIN
      public/uploads/attach/2022/03/20220330/9d482e7e7cf64d3f4349139810adf5e7.jpg
  19. BIN=BIN
      public/uploads/store/comment/20220330/9e67dad2772a9b95a211ab4115679f90.png
  20. BIN=BIN
      public/uploads/store/comment/20220331/3d8456d0f5059f0028ca976534ae5658.jpg
  21. 2 1
      runtime/admin/temp/5a82649edd1b40af6f202faef65620f4.php
  22. 1 1
      runtime/admin/temp/6d45e8baf4052f27e05d6dc3c74206d4.php
  23. 1 1
      runtime/admin/temp/b3614fd0470c8fca440dc55e960e0bcc.php
  24. 11 11
      runtime/admin/temp/d7d372ab726862fb447d17cfe02c83d6.php
  25. 5 1
      runtime/admin/temp/eda6d0cd8c23ae79a39c8fdfa6a9b382.php
  26. 1 1
      runtime/cache/2e/26d95f3b2397f1dbd714cb44636198.php
  27. 16 0
      runtime/log/202203/30.log
  28. 0 1
      runtime/session/sess_c0a4cb83742d2f48151d700b295981bf
  29. 1 1
      runtime/session/sess_e933a47d1e79bb070a55a2d46e11eb99

+ 1 - 1
.env

@@ -1 +1 @@
-APP_DEBUG = true

[APP]
DEFAULT_TIMEZONE = Asia/Shanghai

[DATABASE]
TYPE = mysql
HOSTNAME = 192.168.2.17
HOSTPORT = 3306
USERNAME = root
PASSWORD = 'root'
DATABASE = crmebr
PREFIX = eb_
CHARSET = utf8
DEBUG = true

[LANG]
default_lang = zh-cn
+APP_DEBUG = true

[APP]
DEFAULT_TIMEZONE = Asia/Shanghai

[DATABASE]
TYPE = mysql
HOSTNAME = 127.0.0.1
HOSTPORT = 3306
USERNAME = root
PASSWORD = 'root'
DATABASE = crmebr
PREFIX = eb_
CHARSET = utf8
DEBUG = true

[LANG]
default_lang = zh-cn

+ 2 - 1
app/admin/controller/auction/AuctionBooking.php

@@ -223,7 +223,7 @@ class AuctionBooking extends AuthController
     {
         if (!$id) Json::fail('没有数据');
         $data = model::find($id);
-        if ($data['status'] < 1 or $data['status'] == 2) Json::fail('无法退回');
+        if ($data['status'] < 1) Json::fail('已退回请勿重复提交');
 
         $userModel = new User();
         $user = $userModel->where('uid', $data['uid'])->find();
@@ -238,6 +238,7 @@ class AuctionBooking extends AuthController
             'type' => '预约卷',
             'number' => $data['anticipate'],
             'balance' => $user['anticipate'],
+            'mark' => '后台操作退回',
             'add_time' => time(),
         ]);
 

+ 16 - 4
app/admin/controller/auction/AuctionGu.php

@@ -16,6 +16,7 @@ use crmeb\services\{ExpressService,
 use app\admin\model\system\{
     SystemAttachment as SystemAttachmentModel, SystemAttachmentCategory as Category
 };
+use think\Db;
 use think\facade\Route as Url;
 
 /**
@@ -30,7 +31,7 @@ class AuctionGu extends AuthController
     public function index()
     {
 
-
+        $this->assign('admin', $this->adminInfo);
         return $this->fetch();
     }
 
@@ -41,10 +42,21 @@ class AuctionGu extends AuthController
             ['status', ''],
             ['page', 1],
             ['limit', 20],
-            ['auction']
+            ['auction'],
+            ['uid'],
+            ['null']
         ]);
-        $data = \app\admin\model\auction\AuctionGu::list($where);
 
+        $admin  = \think\facade\Db::name('system_admin')->where('id', $this->adminId)->find();
+        if ($admin['roles'] > 1){
+            if ($admin['uid']){
+                $where['uid'] = $admin['uid'];
+            }else{
+                $where['null'] = 1;
+            }
+        }
+
+        $data = \app\admin\model\auction\AuctionGu::list($where);
         return Json::successlayui($data);
     }
 
@@ -132,7 +144,7 @@ class AuctionGu extends AuthController
         $userModel = new \app\models\user\User();
         $user = $userModel->select();
 
-        $this->assign(['id' => $id, 'user' => $user]);
+        $this->assign(['id' => $id, 'user' => $user, 'admin' => $this->adminInfo]);
         return $this->fetch();
     }
 

+ 4 - 2
app/admin/controller/auction/AuctionProduct.php

@@ -94,6 +94,9 @@ class AuctionProduct extends AuthController
         ]);
         $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 ($res){
@@ -114,7 +117,7 @@ class AuctionProduct extends AuthController
     {
         if (!$id) Json::fail('删除失败');
 
-        $res = model::where('id', $id)->useSoftDelete('delete_time',time())->delete();
+        $res = model::where('id', $id)->delete();
         if ($res){
             return Json::success('删除成功!');
         }else{
@@ -163,7 +166,6 @@ class AuctionProduct extends AuthController
         $data = Util::postMore([
             'id',
             'name',
-            'is_show',
             'image',
             'price',
             'deduct',

+ 9 - 2
app/admin/controller/setting/SystemAdmin.php

@@ -3,6 +3,7 @@
 namespace app\admin\controller\setting;
 
 use app\admin\controller\AuthController;
+use app\models\user\User;
 use crmeb\services\{FormBuilder as Form, JsonService as Json, UtilService as Util};
 use app\admin\model\system\{SystemRole, SystemAdmin as AdminModel};
 use think\facade\Route as Url;
@@ -74,7 +75,8 @@ class SystemAdmin extends AuthController
             'pwd',
             'real_name',
             ['roles', []],
-            ['status', 0]
+            ['status', 0],
+            ['uid']
         ]);
         if (!$data['account']) return Json::fail('请输入管理员账号');
         if (!$data['roles']) return Json::fail('请选择至少一个管理员身份');
@@ -114,6 +116,10 @@ class SystemAdmin extends AuthController
             }
             return $options;
         })->multiple(1);
+
+        $f[] = Form::selectOne('uid', '绑定会员', $admin->uid)
+            ->options(User::field('uid as value,nickname as label')->select()->toArray());
+
         $f[] = Form::radio('status', '状态', 1)->options([['label' => '开启', 'value' => 1], ['label' => '关闭', 'value' => 0]]);
         $form = Form::make_post_form('编辑管理员', $f, Url::buildUrl('update', compact('id')));
         $this->assign(compact('form'));
@@ -135,7 +141,8 @@ class SystemAdmin extends AuthController
             'pwd',
             'real_name',
             ['roles', []],
-            ['status', 0]
+            ['status', 0],
+            ['uid']
         ]);
         if (!$data['account']) return Json::fail('请输入管理员账号');
         if (!$data['roles']) return Json::fail('请选择至少一个管理员身份');

+ 1 - 1
app/admin/model/auction/Auction.php

@@ -31,7 +31,7 @@ class Auction extends BaseModel
     {
         $model = self::alias('a')
             ->field('a.*, gu.name')
-            ->order('a.sort DESC,a.id DESC')
+            ->order('a.id DESC')
             ->leftJoin('auction_gu gu', 'a.auction_gu_id = gu.id');
 
         $model->where(['a.delete_time' => 0]);

+ 5 - 1
app/admin/model/auction/AuctionGu.php

@@ -34,9 +34,12 @@ class AuctionGu extends BaseModel
     {
         $model = self::alias('a')
             ->field('a.*, u.nickname')
-            ->order('a.sort DESC,a.id DESC')
+            ->order('a.id DESC')
             ->leftJoin('user u', 'u.uid = a.uid');
 
+        if ($where['uid']) $model->where('a.uid', $where['uid']);
+        if ($where['null']) $model->where('a.status', '>', 5);
+
         if ($where['auction'])$model->where('a.id|a.name|u.nickname' , 'like', '%'.$where['auction'],'%');
         if ($where['page'] && $where['limit']){
             $model->page($where['page'], $where['limit']);
@@ -46,6 +49,7 @@ class AuctionGu extends BaseModel
 
         $data['count'] = $model->count();
         $list = $model->select();
+
         $list = count($list) ? $list->toArray() : [];
 
         $data['data'] = $list;

+ 1 - 1
app/admin/model/auction/AuctionProduct.php

@@ -32,7 +32,7 @@ class AuctionProduct extends BaseModel
 
         $model = self::alias('a')
             ->field('a.*,u.nickname, au.nickname as au_name')
-            ->order('a.sort DESC,a.id DESC')
+            ->order('a.id DESC')
             ->leftJoin('auction au', 'a.auction_id = au.id')
             ->leftJoin('user u', 'a.uid = u.uid');
 

+ 1 - 0
app/admin/view/auction/auction/index.php

@@ -66,6 +66,7 @@
             <div class="layui-card">
                 <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>
 <!--                        <button class="layui-btn layui-btn-sm" data-type="del_auction">批量删除</button>-->

+ 3 - 1
app/admin/view/auction/auction_gu/edit.php

@@ -167,7 +167,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="pictrueBox">
                                                     <div class="pictrue" v-if="formData.image" @click="uploadImage('image')">
                                                         <img :src="formData.image"></div>
@@ -179,6 +179,7 @@
                                             </div>
                                         </div>
                                     </div>
+                                    {if $admin['roles'] == 1}
                                     <div class="layui-col-xs12 layui-col-sm12 layui-col-md12">
                                         <div class="grid-demo grid-demo-bg1">
                                             <div class="layui-form-item">
@@ -193,6 +194,7 @@
                                             </div>
                                         </div>
                                     </div>
+                                    {/if}
                                     <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">

+ 4 - 0
app/admin/view/auction/auction_gu/index.php

@@ -66,10 +66,12 @@
             <div class="layui-card">
                 <div class="layui-card-header">场馆列表</div>
                 <div class="layui-card-body">
+                    {if $admin['roles'] == 1}
                     <div class="layui-btn-container" id="container-action">
                         <a class="layui-btn layui-btn-sm" href="{:Url('create')}">添加会馆</a>
 <!--                        <button class="layui-btn layui-btn-sm" data-type="del_auction">批量删除</button>-->
                     </div>
+                    {/if}
                     <table class="layui-hide" id="List" lay-filter="List"></table>
 
 
@@ -83,9 +85,11 @@
                         <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" lay-event='edit'>
                             编辑
                         </button>
+                        {if $admin['roles'] == 1}
                         <button type="button" class="layui-btn layui-btn-xs layui-btn-danger" lay-event='delete' id="">
                             删除
                         </button>
+                        {/if}
 
                     </script>
                 </div>

+ 6 - 6
app/admin/view/auction/auction_product/create.php

@@ -216,9 +216,9 @@
                                                 <div class="layui-form-item">
                                                     <label class="layui-form-label">商品状态</label>
                                                     <div class="layui-input-block">
-                                                        <input type="radio" name="is_show" lay-filter="status" value="1" title="上架"
+                                                        <input type="radio" name="is_show" lay-filter="is_show" value="1" title="上架"
                                                                :checked="formData.is_show == 1 ? true : false">
-                                                        <input type="radio" name="is_show" lay-filter="status" value="0" title="下架"
+                                                        <input type="radio" name="is_show" lay-filter="is_show" value="0" title="下架"
                                                                :checked="formData.is_show == 0 ? true : false">
                                                     </div>
                                                 </div>
@@ -341,13 +341,13 @@
             formData: {
                 description: '',
                 name: '',
-                is_show: '',
+                is_show:1,
                 image:'',
                 price:'',
-                deduct: '',
-                rise: '',
+                deduct: 1.2,
+                rise: 2.7,
                 info: '',
-                sort: '',
+                sort: 0,
                 auction_id: '',
                 hanging_price: '',
                 slider_image: []

+ 2 - 19
app/admin/view/auction/auction_product/edit.php

@@ -202,7 +202,7 @@
                                     <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">
+                                            <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>
@@ -210,21 +210,6 @@
                                             </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">
-                                                <div class="layui-form-item">
-                                                    <label class="layui-form-label">场馆状态</label>
-                                                    <div class="layui-input-block">
-                                                        <input type="radio" name="is_show" lay-filter="status" value="1" title="上架"
-                                                               :checked="formData.is_show == 1 ? true : false">
-                                                        <input type="radio" name="is_show" lay-filter="status" value="0" title="下架"
-                                                               :checked="formData.is_show == 0 ? true : false">
-                                                    </div>
-                                                </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">
@@ -339,7 +324,6 @@
             formData: {
                 description: '',
                 name: '',
-                is_show: '',
                 image:'',
                 price:'',
                 deduct: '',
@@ -807,7 +791,6 @@
             handleSubmit:function () {
                 var that = this;
                 var auction_id = $('#auction_id').val();
-                console.log(auction_id);
                 if (that.formData.name === ''){
                     return that.showMsg('请输入商品名称');
                 }
@@ -829,7 +812,7 @@
 
                 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.requestPost(that.U({c:'auction.auctionProduct',a:'update',p:{id:that.id}}),that.formData).then(function (res) {
                     that.confirm();
                 }).catch(function (res) {
                     that.showMsg(res.msg);

+ 3 - 2
app/api/controller/auction/AuctionProductController.php

@@ -38,7 +38,8 @@ class AuctionProductController
         $data = UtilService::getMore([
             [['page', 'd'], 0],
             [['limit', 'd'], 0],
-            ['id']
+            ['id'],
+            ['name']
         ]);
         if (!$data['id']) return app('json')->fail('数据传入错误');
         return app('json')->successful(AuctionProduct::list($data, $request->uid()));
@@ -140,7 +141,7 @@ class AuctionProductController
     }
 
     /**
-     * 上传大框凭证
+     * 上传打款凭证
      * @param Request $request
      * @return mixed
      * @throws \think\db\exception\DataNotFoundException

+ 2 - 2
app/models/auction/Auction.php

@@ -48,8 +48,8 @@ class Auction extends BaseModel
         if ($list){
             foreach ($list as  $k =>$v)
             {
-                $list[$k]['time'] = strtotime($v['rend_time']);
-                $list[$k]['day'] = date('Y-m-d H:i:s', strtotime($v['rend_time']));
+                $list[$k]['time'] = strtotime($v['end_time']);
+                $list[$k]['day'] = date('Y-m-d H:i:s', strtotime($v['end_time']));
                 if (in_array($v['id'], $id)){
                     $list[$k]['sta'] = 2; // 进入
                     $list[$k]['str'] = '进入';

+ 6 - 3
app/models/auction/AuctionOrder.php

@@ -43,11 +43,15 @@ class AuctionOrder extends BaseModel
     {
         if ($data['order_id']){
             $list = self::alias('a')
-                ->field('a.*,u.nickname,u.avatar')
+                ->field('a.*,u.nickname,u.avatar,u.uid as user_id')
                 ->leftJoin('user u', 'a.collection_id = u.uid')
                 ->where('a.order_id', $data['order_id'])->find(); //详细订单
             $pay = AuctionPay::where('uid', $list['collection_id'])->select();
 
+            $list['wx'] = [];
+            $list['zfb'] = [];
+            $list['bank'] = [];
+            $list['time'] = strtotime($list['create_time']);
             if ($pay){
                 foreach ($pay as $k => $v){
                     if ($v['type'] == 1){
@@ -74,7 +78,6 @@ class AuctionOrder extends BaseModel
         }
 
         $list = !empty($list)? $list->toArray(): [];
-
         return $list;
     }
 
@@ -91,7 +94,7 @@ class AuctionOrder extends BaseModel
     {
         if ($data['order_id']){
             $list = self::alias('a')
-                ->field('a.*,u.nickname,u.avatar')
+                ->field('a.*,u.nickname,u.avatar,u.uid as user_id')
                 ->leftJoin('user u', 'a.uid = u.uid')
                 ->where('a.order_id', $data['order_id'])->find(); //详细订单
         }else{

+ 3 - 1
app/models/auction/AuctionProduct.php

@@ -38,7 +38,9 @@ class AuctionProduct extends BaseModel
     public static function list($data, $uid){
         $model = self::where('is_show', 1)->where('auction_id', $data['id'])->order('sort DESC,id DESC');
         $model->page($data['page'], $data['limit']);
-        $list = $model->select()->toArray();
+        if ($data['name']) $model->where('name', 'like', '%'.$data['name'].'%');
+        $list = $model->select();
+        $list = empty($list)? [] : $list->toArray();
         if ($list){
             foreach ($list as $k => $v) {
                 $order = AuctionOrder::where('product_id', $v['id'])->where('status', '>', 0)->whereBetweenTime('create_time', date('Y-m-d H:i:s', strtotime(date('Y-m-d'))), date('Y-m-d H:i:s', strtotime('+1 day')))->find();

BIN=BIN
public/uploads/attach/2022/03/20220330/9d482e7e7cf64d3f4349139810adf5e7.jpg


BIN=BIN
public/uploads/store/comment/20220330/9e67dad2772a9b95a211ab4115679f90.png


BIN=BIN
public/uploads/store/comment/20220331/3d8456d0f5059f0028ca976534ae5658.jpg


+ 2 - 1
runtime/admin/temp/5a82649edd1b40af6f202faef65620f4.php

@@ -1,4 +1,4 @@
-<?php /*a:5:{s:66:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\auction\auction\index.php";i:1648602069;s:61:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\container.php";i:1595820902;s:62:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\frame_head.php";i:1595820902;s:57:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\style.php";i:1595820902;s:64:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\frame_footer.php";i:1595820902;}*/ ?>
+<?php /*a:5:{s:66:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\auction\auction\index.php";i:1648690725;s:61:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\container.php";i:1595820902;s:62:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\frame_head.php";i:1595820902;s:57:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\style.php";i:1595820902;s:64:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\frame_footer.php";i:1595820902;}*/ ?>
 <!DOCTYPE html>
 <html lang="zh-CN">
 <head>
@@ -140,6 +140,7 @@
             <div class="layui-card">
                 <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="<?php echo Url('create'); ?>">添加场次</a>
 <!--                        <button class="layui-btn layui-btn-sm" data-type="del_auction">批量删除</button>-->

+ 1 - 1
runtime/admin/temp/6d45e8baf4052f27e05d6dc3c74206d4.php

@@ -1,4 +1,4 @@
-<?php /*a:1:{s:70:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\auction\auction_gu\create.php";i:1648541911;}*/ ?>
+<?php /*a:1:{s:70:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\auction\auction_gu\create.php";i:1648602077;}*/ ?>
 <!DOCTYPE html>
 <html>
 <head>

+ 1 - 1
runtime/admin/temp/b3614fd0470c8fca440dc55e960e0bcc.php

@@ -1,4 +1,4 @@
-<?php /*a:1:{s:67:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\auction\auction\create.php";i:1648539506;}*/ ?>
+<?php /*a:1:{s:67:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\auction\auction\create.php";i:1648602069;}*/ ?>
 <!DOCTYPE html>
 <html>
 <head>

+ 11 - 11
runtime/admin/temp/d7d372ab726862fb447d17cfe02c83d6.php

@@ -1,4 +1,4 @@
-<?php /*a:1:{s:75:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\auction\auction_product\create.php";i:1648545622;}*/ ?>
+<?php /*a:1:{s:75:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\auction\auction_product\create.php";i:1648693789;}*/ ?>
 <!DOCTYPE html>
 <html>
 <head>
@@ -160,7 +160,7 @@
                                                 <label class="layui-form-label">商品名称<i class="red">*</i></label>
                                                 <div class="layui-input-block">
                                                     <input type="text" name="nickname" lay-verify="title" autocomplete="off"
-                                                           placeholder="场馆名称" class="layui-input" v-model="formData.name" maxlength="100">
+                                                           placeholder="商品名称" class="layui-input" v-model="formData.name" maxlength="100">
                                                 </div>
                                             </div>
                                         </div>
@@ -217,9 +217,9 @@
                                                 <div class="layui-form-item">
                                                     <label class="layui-form-label">商品状态</label>
                                                     <div class="layui-input-block">
-                                                        <input type="radio" name="is_show" lay-filter="status" value="1" title="上架"
+                                                        <input type="radio" name="is_show" lay-filter="is_show" value="1" title="上架"
                                                                :checked="formData.is_show == 1 ? true : false">
-                                                        <input type="radio" name="is_show" lay-filter="status" value="0" title="下架"
+                                                        <input type="radio" name="is_show" lay-filter="is_show" value="0" title="下架"
                                                                :checked="formData.is_show == 0 ? true : false">
                                                     </div>
                                                 </div>
@@ -277,11 +277,6 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-tab-item">
-                                        <div class="layui-row layui-col-space15">
-                                            <textarea type="text/plain" name="description" id="myEditor" style="width:100%;">{{formData.description}}</textarea>
-                                        </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">
@@ -292,6 +287,10 @@
                                             </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>
+                                    </div>
 
 
                                 </div>
@@ -343,7 +342,7 @@
             formData: {
                 description: '',
                 name: '',
-                is_show: 1,
+                is_show:1,
                 image:'',
                 price:'',
                 deduct: 1.2,
@@ -351,7 +350,7 @@
                 info: '',
                 sort: 0,
                 auction_id: '',
-                hanging_price:'',
+                hanging_price: '',
                 slider_image: []
 
             },
@@ -834,6 +833,7 @@
                 }
 
                 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();
                 }).catch(function (res) {

+ 5 - 1
runtime/admin/temp/eda6d0cd8c23ae79a39c8fdfa6a9b382.php

@@ -1,4 +1,4 @@
-<?php /*a:5:{s:69:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\auction\auction_gu\index.php";i:1648602077;s:61:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\container.php";i:1595820902;s:62:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\frame_head.php";i:1595820902;s:57:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\style.php";i:1595820902;s:64:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\frame_footer.php";i:1595820902;}*/ ?>
+<?php /*a:5:{s:69:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\auction\auction_gu\index.php";i:1648690740;s:61:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\container.php";i:1595820902;s:62:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\frame_head.php";i:1595820902;s:57:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\style.php";i:1595820902;s:64:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\frame_footer.php";i:1595820902;}*/ ?>
 <!DOCTYPE html>
 <html lang="zh-CN">
 <head>
@@ -140,10 +140,12 @@
             <div class="layui-card">
                 <div class="layui-card-header">场馆列表</div>
                 <div class="layui-card-body">
+                    <?php if($admin['roles'] == 1): ?>
                     <div class="layui-btn-container" id="container-action">
                         <a class="layui-btn layui-btn-sm" href="<?php echo Url('create'); ?>">添加会馆</a>
 <!--                        <button class="layui-btn layui-btn-sm" data-type="del_auction">批量删除</button>-->
                     </div>
+                    <?php endif; ?>
                     <table class="layui-hide" id="List" lay-filter="List"></table>
 
 
@@ -157,9 +159,11 @@
                         <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" lay-event='edit'>
                             编辑
                         </button>
+                        <?php if($admin['roles'] == 1): ?>
                         <button type="button" class="layui-btn layui-btn-xs layui-btn-danger" lay-event='delete' id="">
                             删除
                         </button>
+                        <?php endif; ?>
 
                     </script>
                 </div>

+ 1 - 1
runtime/cache/2e/26d95f3b2397f1dbd714cb44636198.php

@@ -1,4 +1,4 @@
 <?php
 //000000086400
  exit();?>
-1
+2

+ 16 - 0
runtime/log/202203/30.log

@@ -31,3 +31,19 @@
 [2022-03-30T11:24:35+08:00][error] [2]Use of undefined constant data - assumed 'data' (this will throw an Error in a future version of PHP)[D:\phpstudy_pro\WWW\CRMEB\app\admin\controller\auction\AuctionOrder.php:247]
 [2022-03-30T11:25:37+08:00][error] [2]Use of undefined constant data - assumed 'data' (this will throw an Error in a future version of PHP)[D:\phpstudy_pro\WWW\CRMEB\app\admin\controller\auction\AuctionOrder.php:247]
 [2022-03-30T11:26:33+08:00][error] [2]Use of undefined constant data - assumed 'data' (this will throw an Error in a future version of PHP)[D:\phpstudy_pro\WWW\CRMEB\app\admin\controller\auction\AuctionOrder.php:246]
+[2022-03-30T14:22:35+08:00][error] [0]语法错误: unexpected ';', expecting ')'[D:\phpstudy_pro\WWW\CRMEB\app\models\auction\Auction.php:68]
+[2022-03-30T14:29:41+08:00][error] [8]未定义数组索引: order[D:\phpstudy_pro\WWW\CRMEB\app\models\auction\AuctionOrder.php:45]
+[2022-03-30T14:30:13+08:00][error] [2]count(): Parameter must be an array or an object that implements Countable[D:\phpstudy_pro\WWW\CRMEB\app\models\auction\AuctionOrder.php:59]
+[2022-03-30T14:43:28+08:00][error] [8]未定义数组索引: slider_image[D:\phpstudy_pro\WWW\CRMEB\app\api\controller\auction\AuctionProductController.php:241]
+[2022-03-30T14:43:44+08:00][error] [8]未定义数组索引: slider_image[D:\phpstudy_pro\WWW\CRMEB\app\api\controller\auction\AuctionProductController.php:241]
+[2022-03-30T14:44:06+08:00][error] [8]未定义数组索引: slider_image[D:\phpstudy_pro\WWW\CRMEB\app\api\controller\auction\AuctionProductController.php:241]
+[2022-03-30T15:13:12+08:00][error] [10500]method not exist:think\db\Query->ailas[D:\phpstudy_pro\WWW\CRMEB\vendor\topthink\think-orm\src\db\BaseQuery.php:117]
+[2022-03-30T15:57:54+08:00][error] [8]Indirect modification of overloaded element of app\models\auction\AuctionOrder has no effect[D:\phpstudy_pro\WWW\CRMEB\app\models\auction\AuctionOrder.php:54]
+[2022-03-30T15:59:58+08:00][error] [8]Indirect modification of overloaded element of app\models\auction\AuctionOrder has no effect[D:\phpstudy_pro\WWW\CRMEB\app\models\auction\AuctionOrder.php:57]
+[2022-03-30T16:00:07+08:00][error] [2]array_push() expects parameter 1 to be array, object given[D:\phpstudy_pro\WWW\CRMEB\app\models\auction\AuctionOrder.php:57]
+[2022-03-30T16:33:17+08:00][error] [8]未定义变量: list[D:\phpstudy_pro\WWW\CRMEB\runtime\admin\temp\8fc817836ac8aa087779a6a8af3d62b1.php:188]
+[2022-03-30T16:33:57+08:00][error] [0]Call to undefined function app\api\controller\auction\day()[D:\phpstudy_pro\WWW\CRMEB\app\api\controller\auction\AuctionProductController.php:85]
+[2022-03-30T16:35:01+08:00][error] [0]Call to undefined function app\api\controller\auction\day()[D:\phpstudy_pro\WWW\CRMEB\app\api\controller\auction\AuctionProductController.php:85]
+[2022-03-30T16:51:56+08:00][error] [8]未定义变量: list[D:\phpstudy_pro\WWW\CRMEB\runtime\admin\temp\8fc817836ac8aa087779a6a8af3d62b1.php:208]
+[2022-03-30T16:53:27+08:00][error] [8]未定义数组索引: description[D:\phpstudy_pro\WWW\CRMEB\app\admin\controller\auction\AuctionProduct.php:156]
+[2022-03-30T16:53:33+08:00][error] [8]未定义数组索引: description[D:\phpstudy_pro\WWW\CRMEB\app\admin\controller\auction\AuctionProduct.php:156]

+ 0 - 1
runtime/session/sess_c0a4cb83742d2f48151d700b295981bf

@@ -1 +0,0 @@
-a:4:{s:7:"adminId";i:1;s:9:"adminInfo";a:12:{s:2:"id";i:1;s:7:"account";s:5:"admin";s:3:"pwd";s:32:"e10adc3949ba59abbe56e057f20f883e";s:9:"real_name";s:5:"admin";s:5:"roles";s:1:"1";s:7:"last_ip";s:9:"127.0.0.1";s:9:"last_time";i:1648600795;s:8:"add_time";i:1647842101;s:11:"login_count";i:0;s:5:"level";i:0;s:6:"status";i:1;s:6:"is_del";i:0;}s:11:"login_error";N;s:3:"pid";i:0;}

+ 1 - 1
runtime/session/sess_e933a47d1e79bb070a55a2d46e11eb99

@@ -1 +1 @@
-a:4:{s:7:"adminId";i:1;s:9:"adminInfo";a:12:{s:2:"id";i:1;s:7:"account";s:5:"admin";s:3:"pwd";s:32:"e10adc3949ba59abbe56e057f20f883e";s:9:"real_name";s:5:"admin";s:5:"roles";s:1:"1";s:7:"last_ip";s:9:"127.0.0.1";s:9:"last_time";i:1648600795;s:8:"add_time";i:1647842101;s:11:"login_count";i:0;s:5:"level";i:0;s:6:"status";i:1;s:6:"is_del";i:0;}s:11:"login_error";N;s:3:"pid";i:0;}
+a:3:{s:7:"adminId";i:1;s:9:"adminInfo";a:12:{s:2:"id";i:1;s:7:"account";s:5:"admin";s:3:"pwd";s:32:"e10adc3949ba59abbe56e057f20f883e";s:9:"real_name";s:5:"admin";s:5:"roles";s:1:"1";s:7:"last_ip";s:11:"192.168.2.1";s:9:"last_time";i:1648687689;s:8:"add_time";i:1647842101;s:11:"login_count";i:0;s:5:"level";i:0;s:6:"status";i:1;s:6:"is_del";i:0;}s:11:"login_error";N;}