挂售

app/admin/controller/auction/Auction.php

@@ -66,6 +66,10 @@ class Auction extends AuthController
     public function create($id = 0)
     {
         $f = [];
+
+        $f[] = Form::select('addrs', '绑定场馆', [
+            'a' => 'a'
+        ])->col(12);
         $f[] = Form::input('nickname', '场次名称')->col(12);
         $f[] = Form::input('anticipate', '预约价格')->col(12);
         $f[] = Form::frameImageOne('image', '场次主图片(305*305px)', Url::buildUrl('admin/widget.images/index', array('fodder' => 'image')))->icon('image')->width('100%')->height('500px');

app/admin/controller/store/StoreProduct.php

@@ -271,7 +271,6 @@ class StoreProduct extends AuthController
             ['attrs', []],
             ['activity', []]
         ]);
-        pr($data['attrs']);
         foreach ($data['activity'] as $k => $v) {
             if ($v == '秒杀') {
                 $data['activity'][$k] = 1;

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

@@ -415,7 +415,7 @@
                     this.where['auction_id'] = auction_id;
                     this.where['gu_id'] = gu_id;
                     this.where.excel = 1;
-                    location.href = layList.U({c: 'auction.auction_order', a: 'list', q: this.where});
+                    location.href = layList.Url({c: 'auction.auction_order', a: 'list', q: this.where});
                     this.where.excel = 0;
                 }
             },

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

@@ -821,12 +821,13 @@
             },
             confirm: function(){
                 var that = this;
+                var index = parent.layer.getFrameIndex(window.name);
                 layui.use(['layer'], function () {
                     var layer = layui.layer;
                     layer.confirm(that.id ? '修改成功是否返回产品列表' : '添加成功是否返回产品列表', {
                         btn: ['返回列表',that.id ? '继续修改' : '继续添加'] //按钮
                     }, function(){
-                        location.href = that.U({c:'auction.auction_product',a:'index'});
+                        parent.layer.close(index);
                     }, function(){
                         location.reload();
                     });

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

@@ -176,7 +176,7 @@
                 $eb.openImage(data.image);
                 break;
             case 'edit':
-                location.href = layList.U({a:'edit',q:{id:data.id}});
+                layList.createModalFrame(data.name+'-修改',layList.U({a:'edit',q:{id:data.id}}),{h:750,w:1300})
                 break;
         }
     })

app/admin/view/store/store_product/create.php

@@ -1627,12 +1627,13 @@
             },
             confirm: function () {
                 var that = this;
+                var index = parent.layer.getFrameIndex(window.name);
                 layui.use(['layer'], function () {
                     var layer = layui.layer;
                     layer.confirm(that.id ? '修改成功是否返回产品列表' : '添加成功是否返回产品列表', {
                         btn: ['返回列表', that.id ? '继续修改' : '继续添加'] //按钮
                     }, function () {
-                        location.href = that.U({c: 'store.StoreProduct', a: 'index'});
+                        parent.layer.close(index);
                     }, function () {
                         if (that.id == 0) {
                             location.reload();

app/admin/view/store/store_product/index.php

@@ -282,7 +282,7 @@
                 $eb.openImage(data.image);
                 break;
             case 'edit':
-                location.href = layList.U({a:'create',q:{id:data.id}});
+                layList.createModalFrame(data.store_name+'-修改',layList.U({a:'create',q:{id:data.id}}),{h:750,w:1300})
                 break;
             case 'attr':
                 $eb.createModalFrame(data.store_name+'-属性',layList.U({a:'attr',q:{id:data.id}}),{h:600,w:800})

app/admin/view/system/system_store/add.php

@@ -97,9 +97,9 @@
                                                 </div>
                                             </div>
                                         </div>
-                                        <div style="width: 670px; height: 320px;bottom:10%;display: block; position: absolute;z-index: 999999" v-if="visible" @click="visible = false ">
-                                            <img :src="form.image"   style="max-width: 100%;max-height: 100%;width:auto;height:auto;position: absolute;left: 50%;top: 50%;transform: translate3d(-50%,-50%,0);-webkit-transform: translate3d(-50%,-50%,0);" >
-                                        </div>
+<!--                                        <div style="width: 670px; height: 320px;bottom:10%;display: block; position: absolute;z-index: 999999" v-if="visible" @click="visible = false ">-->
+<!--                                            <img :src="form.image"   style="max-width: 100%;max-height: 100%;width:auto;height:auto;position: absolute;left: 50%;top: 50%;transform: translate3d(-50%,-50%,0);-webkit-transform: translate3d(-50%,-50%,0);" >-->
+<!--                                        </div>-->
                                     </i-Col>
                                 </Row>
                             </Form-Item>
@@ -107,16 +107,16 @@
                                 <Row>
                                     <i-Col span="13">
                                         <span>门头：</span>
-                                        <div class="demo-upload-list" v-if="form.slider_image">
+                                        <div class="demo-upload-list" v-if="form.images">
                                             <template>
-                                                <img :src="form.slider_image">
+                                                <img :src="form.images">
                                                 <div class="demo-upload-list-cover">
                                                     <Icon type="ios-eye-outline" @click="visible = true "></Icon>
-                                                    <Icon type="ios-trash-outline" @click="form.slider_image=''"></Icon>
+                                                    <Icon type="ios-trash-outline" @click="form.images=''"></Icon>
                                                 </div>
                                             </template>
                                         </div>
-                                        <div class="ivu-upload" style="display: inline-block; width: 58px;" @click="uploadImage('slider_image')">
+                                        <div class="ivu-upload" style="display: inline-block; width: 58px;" @click="openWindows('选择图片','{:Url('widget.images/index',['fodder'=>'images'])}',{w:900,h:550})" v-if="!form.images">
                                             <div class="ivu-upload ivu-upload-drag">
                                                 <div style="width: 58px; height: 58px; line-height: 58px;">
                                                     <i class="ivu-icon ivu-icon-camera" style="font-size: 20px;"></i>
@@ -124,7 +124,7 @@
                                             </div>
                                         </div>
                                         <div style="width: 670px; height: 320px;bottom:10%;display: block; position: absolute;z-index: 999999" v-if="visible" @click="visible = false ">
-                                            <img :src="form.slider_image"   style="max-width: 100%;max-height: 100%;width:auto;height:auto;position: absolute;left: 50%;top: 50%;transform: translate3d(-50%,-50%,0);-webkit-transform: translate3d(-50%,-50%,0);" >
+                                            <img :src="form.images"   style="max-width: 100%;max-height: 100%;width:auto;height:auto;position: absolute;left: 50%;top: 50%;transform: translate3d(-50%,-50%,0);-webkit-transform: translate3d(-50%,-50%,0);" >
                                         </div>
                                     </i-Col>
                                 </Row>
@@ -135,14 +135,14 @@
                                         <span>门店：</span>
                                         <div class="demo-upload-list" v-if="form.images">
                                             <template>
-                                                <img :src="form.images">
+                                                <img :src="form.slider_image">
                                                 <div class="demo-upload-list-cover">
                                                     <Icon type="ios-eye-outline" @click="visible = true "></Icon>
-                                                    <Icon type="ios-trash-outline" @click="form.images=''"></Icon>
+                                                    <Icon type="ios-trash-outline" @click="form.slider_image=''"></Icon>
                                                 </div>
                                             </template>
                                         </div>
-                                        <div class="ivu-upload" style="display: inline-block; width: 58px;" @click="openWindows('选择图片','{:Url('widget.images/index',['fodder'=>'images'])}',{w:900,h:550})" v-if="!form.images">
+                                        <div class="ivu-upload" style="display: inline-block; width: 58px;" @click="openWindows('选择图片','{:Url('widget.images/index',['fodder'=>'slider_image'])}',{w:900,h:550})" v-if="!form.slider_image">
                                             <div class="ivu-upload ivu-upload-drag">
                                                 <div style="width: 58px; height: 58px; line-height: 58px;">
                                                     <i class="ivu-icon ivu-icon-camera" style="font-size: 20px;"></i>
@@ -150,7 +150,7 @@
                                             </div>
                                         </div>
                                         <div style="width: 670px; height: 320px;bottom:10%;display: block; position: absolute;z-index: 999999" v-if="visible" @click="visible = false ">
-                                            <img :src="form.images"   style="max-width: 100%;max-height: 100%;width:auto;height:auto;position: absolute;left: 50%;top: 50%;transform: translate3d(-50%,-50%,0);-webkit-transform: translate3d(-50%,-50%,0);" >
+                                            <img :src="form.slider_image"   style="max-width: 100%;max-height: 100%;width:auto;height:auto;position: absolute;left: 50%;top: 50%;transform: translate3d(-50%,-50%,0);-webkit-transform: translate3d(-50%,-50%,0);" >
                                         </div>
                                     </i-Col>
                                 </Row>
@@ -309,7 +309,7 @@
             mounted:function () {
                 window.changeIMG=this.changeIMG;
                 window.selectAdderss=this.selectAdderss;
-            }
+            },
         }).$mount(document.getElementById('store-attr'))
     })
 </script>

app/admin/view/user/user/index.php

@@ -319,8 +319,8 @@
             {field: 'now_money', title: '余额',width:'6%',sort:true,event:'now_money',align:'center'},
             {field: 'pay_count', title: '购买次数',align:'center',width:'6%'},
             {field: 'extract_count_price', title: '累计提现',align:'center',width:'6%'},
-            {field: 'integral', title: '积分',width:'6%',sort:true,event:'integral',align:'center'},
-            {field: 'anticipate', title: '预约券',width:'6%',sort:true,event:'integral',align:'center'},
+            {field: 'integral', title: '趣豆',width:'6%',sort:true,event:'integral',align:'center'},
+            {field: 'anticipate', title: '艺金券',width:'6%',sort:true,event:'integral',align:'center'},
             {field: 'spread_uid_nickname', title: '推荐人',align:'center'},
             {field: 'sex', title: '性别',width:'4%',align:'center'},
             {field: 'data_time', title: '访问日期',align:'center',width:'12%',templet:'#data_time'},
@@ -402,13 +402,13 @@
                 })
                 break;
             case 'give_level':
-                $eb.createModalFrame(data.nickname+'-赠送会员',layList.Url({a:'give_level',p:{uid:data.uid}}),{w:500,h:300});
+                layList.createModalFrame(data.nickname+'-赠送会员',layList.Url({a:'give_level',p:{uid:data.uid}}),{w:500,h:300});
                 break;
             case 'set_group':
-                $eb.createModalFrame(data.nickname+'-设置分组',layList.Url({a:'set_group',p:{uid:data.uid}}),{w:500,h:300});
+                layList.createModalFrame(data.nickname+'-设置分组',layList.Url({a:'set_group',p:{uid:data.uid}}),{w:500,h:300});
                 break;
             case 'money':
-                $eb.createModalFrame(data.nickname+'-积分余额修改',layList.Url({a:'edit_other',p:{uid:data.uid}}));
+                layList.createModalFrame(data.nickname+'-积分余额修改',layList.Url({a:'edit_other',p:{uid:data.uid}}));
                 break;
             case 'open_image':
                 $eb.openImage(data.avatar);

app/models/auction/AuctionOrder.php

@@ -44,9 +44,10 @@ class AuctionOrder extends BaseModel
     {
         if ($data['order_id']){
             $list = self::alias('a')
-                ->field('a.*,u.nickname,u.avatar,u.uid as user_id,c.nickname as c_nickname,c.phone')
+                ->field('a.*,u.nickname,u.avatar,u.uid as user_id,c.nickname as c_nickname,pay.phone')
                 ->leftJoin('user u', 'a.uid = u.uid')
                 ->leftJoin('user c', 'a.collection_id = c.uid')
+                ->leftJoin('auction_pay pay', 'a.collection_id = pay.uid')
                 ->where('a.order_id', $data['order_id'])->find(); //详细订单
             $pay = AuctionPay::where('uid', $list['collection_id'])->select();
 
@@ -83,6 +84,7 @@ class AuctionOrder extends BaseModel
                     foreach ($list as $k => $v){
                         $list[$k]['product_id'] = $v['id'];
                         $list[$k]['is_gs'] = 0;
+                        $list[$k]['order_id'] = $list[$k]['order'];
                     }
                 }
             }else{

app/models/auction/AuctionProduct.php

@@ -37,7 +37,6 @@ class AuctionProduct extends BaseModel
      */
     public static function list($data, $uid){
         $model = self::where('is_show', 1)->where('auction_id', $data['id'])->order('id DESC');
-        $model->page($data['page'], $data['limit']);
         if ($data['name']) $model->where('name', 'like', '%'.$data['name'].'%');
         $list = $model->select();
         $list = empty($list)? [] : $list->toArray();
@@ -70,6 +69,13 @@ class AuctionProduct extends BaseModel
                 ->leftJoin('auction_product p', 'a.product_id = p.id')
                 ->where([['a.product_id', 'in', $productId], ['a.frequency', '=', $auction['frequency']], ['a.status', '=', 3]])
                 ->select();
+        }else{
+            $productId = AuctionProduct::where('auction_id', $data['id'])->column('id');
+            $orderList = AuctionOrder::alias('a')
+                ->field('p.*')
+                ->leftJoin('auction_product p', 'a.product_id = p.id')
+                ->where([['a.product_id', 'in', $productId], ['a.frequency', '=', $auction['frequency']], ['a.status', '=', 3]])
+                ->select();
         }
 
         $a = [];
@@ -89,7 +95,9 @@ class AuctionProduct extends BaseModel
                 array_push($a, $v);
             }
         }
-        return $a;
+        $data['page'] = ($data['page'] - 1)*$data['limit'];
+        $List = array_slice($a, $data['page'], $data['limit']);
+        return $List;
     }
 
     /**
@@ -179,6 +187,7 @@ class AuctionProduct extends BaseModel
         $hanging_price = round($product['hanging_price'] * $product['rise']/100, 2); //  溢价
         $anticipate = round($product['hanging_price'] * $product['deduct']/100, 2); // 扣除
 
+        $data['price'] = $product['hanging_price'];
         $data['hanging_price'] = (int)$product['hanging_price'] + ($hanging_price * $bs);
         $data['anticipate'] = $anticipate*2;
 

public/system/js/layuiList.js

@@ -322,6 +322,9 @@
             move:'.layui-layer-title',// 默认".layui-layer-title",// 触发拖动的元素
             moveEnd:function(){//拖动之后回调
                 console.log(this);
+            },
+            end: function (){
+                layList.reload();
             }
         });
     };