hrjy 2 年之前
父节点
当前提交
8db711ea0b

+ 7 - 4
app/admin/controller/auction/Auction.php

@@ -244,7 +244,7 @@ class Auction extends AuthController
         $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'))->col(12);
+        $f[] = Form::input('sort', '排序', $data->getData('sort'))->col(12);
         $f[] = Form::input('goods_time', '放货时间(分钟)', $data->getData('goods_time'))->col(12);
 
         $f[] =  Form::checkbox('site', '开场日期', explode(',', $data->getData('site')))->options([
@@ -435,7 +435,8 @@ class Auction extends AuthController
             'auction_id',
             'hanging_price',
             'slider_image',
-            'description'
+            'description',
+            'fictitious_price'
         ]);
         $data['slider_image'] = json_encode($data['slider_image']);
         $data['description'] = htmlspecialchars($data['description']);
@@ -471,7 +472,8 @@ class Auction extends AuthController
             'auction_id',
             'hanging_price',
             'slider_image',
-            'description'
+            'description',
+            'fictitious_price'
         ]);
         $data['slider_image'] = json_encode($data['slider_image']);
         $data['description'] = htmlspecialchars($data['description']);
@@ -499,7 +501,8 @@ class Auction extends AuthController
             'hanging_price',
             'slider_image',
             'description',
-            'give'
+            'give',
+            'fictitious_price'
         ]);
         $data['slider_image'] = json_encode($data['slider_image']);
         $data['description'] = htmlspecialchars($data['description']);

+ 6 - 3
app/admin/controller/auction/AuctionProduct.php

@@ -93,7 +93,8 @@ class AuctionProduct extends AuthController
             'hanging_price',
             'slider_image',
             'description',
-            'give'
+            'give',
+            'fictitious_price'
         ]);
         $data['slider_image'] = json_encode($data['slider_image']);
         $data['description'] = htmlspecialchars($data['description']);
@@ -179,7 +180,8 @@ class AuctionProduct extends AuthController
             'hanging_price',
             'slider_image',
             'description',
-            'give'
+            'give',
+            'fictitious_price'
         ]);
         $data['slider_image'] = json_encode($data['slider_image']);
         $data['description'] = htmlspecialchars($data['description']);
@@ -260,7 +262,8 @@ class AuctionProduct extends AuthController
             'slider_image',
             'description',
             'give',
-            'uid'
+            'uid',
+            'fictitious_price'
         ]);
         $data['slider_image'] = json_encode($data['slider_image']);
         $data['description'] = htmlspecialchars($data['description']);

+ 17 - 0
app/admin/view/auction/auction/fz.php

@@ -218,6 +218,16 @@
                                             </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="fictitious_price" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.fictitious_price" 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">
@@ -340,6 +350,7 @@
                 sort: '',
                 auction_id: auction_id,
                 hanging_price: '',
+                fictitious_price: '',
                 slider_image: [],
                 give: 0,
                 uid:''
@@ -809,6 +820,12 @@
                 if (that.formData.price <= 0){
                     return that.showMsg('请输入价格');
                 }
+                if (that.formData.hanging_price <= 0){
+                    return that.showMsg('请输入挂售价格');
+                }
+                if (that.formData.fictitious_price <= 0){
+                    return that.showMsg('请输入虚拟价格');
+                }
                 if (that.formData.rise <= 0){
                     return that.showMsg('涨幅不能为空');
                 }

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

@@ -123,6 +123,7 @@
             {field: 'nickname', title: '拥有人', templet: '#nickname',  align: 'center'},
             {field: 'price', title: '原价', templet: '#price', align: 'center',style : 'color: #DC143C;'},
             {field: 'hanging_price', title: '挂售价格', templet: '#hanging_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'},

+ 17 - 0
app/admin/view/auction/auction/product_create.php

@@ -233,6 +233,16 @@
                                             </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="fictitious_price" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.fictitious_price" 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">
@@ -348,6 +358,7 @@
                 sort: 0,
                 auction_id: id,
                 hanging_price: '',
+                fictitious_price: '',
                 slider_image: [],
                 give: 0
 
@@ -818,6 +829,12 @@
                 if (that.formData.price <= 0){
                     return that.showMsg('请输入价格');
                 }
+                if (that.formData.hanging_price <= 0){
+                    return that.showMsg('请输入挂售价格');
+                }
+                if (that.formData.fictitious_price <= 0){
+                    return that.showMsg('请输入虚拟价格');
+                }
                 if (that.formData.rise <= 0){
                     return that.showMsg('涨幅不能为空');
                 }

+ 17 - 0
app/admin/view/auction/auction/product_edit.php

@@ -218,6 +218,16 @@
                                             </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="fictitious_price" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.fictitious_price" 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">
@@ -331,6 +341,7 @@
                 sort: '',
                 auction_id: auction_id,
                 hanging_price: '',
+                fictitious_price: '',
                 slider_image: [],
                 give: 0
 
@@ -799,6 +810,12 @@
                 if (that.formData.price <= 0){
                     return that.showMsg('请输入价格');
                 }
+                if (that.formData.hanging_price <= 0){
+                    return that.showMsg('请输入挂售价格');
+                }
+                if (that.formData.fictitious_price <= 0){
+                    return that.showMsg('请输入虚拟价格');
+                }
                 if (that.formData.rise <= 0){
                     return that.showMsg('涨幅不能为空');
                 }

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

@@ -245,6 +245,16 @@
                                             </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="fictitious_price" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.fictitious_price" 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">
@@ -354,12 +364,13 @@
                 is_show:1,
                 image:'',
                 price:'',
-                deduct: 1.2,
-                rise: 2.7,
+                deduct: 0,
+                rise: 0,
                 info: '',
                 sort: 0,
                 auction_id: '',
                 hanging_price: '',
+                fictitious_price: '',
                 slider_image: [],
                 give: 0
 
@@ -835,6 +846,12 @@
                 if (that.formData.price <= 0){
                     return that.showMsg('请输入价格');
                 }
+                if (that.formData.hanging_price <= 0){
+                    return that.showMsg('请输入挂售价格');
+                }
+                if (that.formData.fictitious_price <= 0){
+                    return that.showMsg('请输入虚拟价格');
+                }
                 if (that.formData.rise <= 0){
                     return that.showMsg('涨幅不能为空');
                 }

+ 17 - 0
app/admin/view/auction/auction_product/edit.php

@@ -230,6 +230,16 @@
                                             </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="fictitious_price" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.fictitious_price" 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">
@@ -342,6 +352,7 @@
                 sort: '',
                 auction_id: '',
                 hanging_price: '',
+                fictitious_price: '',
                 slider_image: [],
                 give: 0
 
@@ -814,6 +825,12 @@
                 if (that.formData.price <= 0){
                     return that.showMsg('请输入价格');
                 }
+                if (that.formData.hanging_price <= 0){
+                    return that.showMsg('请输入挂售价格');
+                }
+                if (that.formData.fictitious_price <= 0){
+                    return that.showMsg('请输入虚拟价格');
+                }
                 if (that.formData.rise <= 0){
                     return that.showMsg('涨幅不能为空');
                 }

+ 17 - 0
app/admin/view/auction/auction_product/fz.php

@@ -230,6 +230,16 @@
                                             </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="fictitious_price" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.fictitious_price" 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">
@@ -351,6 +361,7 @@
                 sort: '',
                 auction_id: '',
                 hanging_price: '',
+                fictitious_price: '',
                 slider_image: [],
                 give: 0,
                 uid:''
@@ -824,6 +835,12 @@
                 if (that.formData.price <= 0){
                     return that.showMsg('请输入价格');
                 }
+                if (that.formData.hanging_price <= 0){
+                    return that.showMsg('请输入挂售价格');
+                }
+                if (that.formData.fictitious_price <= 0){
+                    return that.showMsg('请输入虚拟价格');
+                }
                 if (that.formData.rise <= 0){
                     return that.showMsg('涨幅不能为空');
                 }

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

@@ -146,6 +146,7 @@
             {field: 'nickname', title: '拥有人', templet: '#nickname',  align: 'center'},
             {field: 'price', title: '原价', templet: '#price', align: 'center',style : 'color: #DC143C;'},
             {field: 'hanging_price', title: '挂售价格', templet: '#hanging_price', align: 'center',style : 'color: #DC143C;'},
+            {field: 'fictitious_price', title: '虚拟价格', templet: '#fictitious_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'},

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

@@ -35,7 +35,7 @@ class Auction extends BaseModel
     {
         $model = self::where([['delete_time', '=', 0], ['status' ,'=', '1'], ['auction_gu_id', '=', $data['auction_gu_id']]]);
         $model->page($data['page'], $data['limit']);
-        $model->order('id DESC, sort DESC');
+        $model->order('sort DESC,id DESC');
         $id = [];
 //        if ($data['advance']){
 //            $model->where('id', 'in', $id);