景龙 / feifangu · 提交

转到一个项目

作者 jinglong
提交 0fcc8f0fd2ac04e7233428441894953046d0bc62 1 个父辈 4f18f814
1 个管道 的构建 通过 耗费 7 秒

修改文件支付

内嵌 并排对比
正在显示 11 个修改的文件 包含 34 行增加 和 8 行删除
... ... @@ -4,6 +4,7 @@ return [
'Id' => 'ID',
'Type' => '广告类型',
'Image' => '广告图',
'Url' => '跳转链接',
'Createtime' => '创建时间',
'Updatetime' => '更新时间'
];
... ...
... ... @@ -3,6 +3,7 @@
return [
'Id' => 'ID',
'Image' => '轮播图',
'Url' => '跳转链接',
'Createtime' => '创建时间',
'Updatetime' => '更新时间'
];
... ...
... ... @@ -20,6 +20,19 @@
<ul class="row list-inline plupload-preview" id="p-image"></ul>
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Url')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-url" class="form-control" name="row[url]" type="text" value="">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2"></label>
<div class="col-xs-12 col-sm-8">
<span style="color:red;">品牌详情页：</span><br/>
<span style="color:red;">商品详情页：</span>
</div>
</div>
<div class="form-group layer-footer">
<label class="control-label col-xs-12 col-sm-2"></label>
<div class="col-xs-12 col-sm-8">
... ...
... ... @@ -20,6 +20,12 @@
<ul class="row list-inline plupload-preview" id="p-image"></ul>
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Url')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-url" class="form-control" name="row[url]" type="text" value="{$row.url}">
</div>
</div>
<div class="form-group layer-footer">
<label class="control-label col-xs-12 col-sm-2"></label>
<div class="col-xs-12 col-sm-8">
... ...
... ... @@ -499,7 +499,7 @@ class Common
$data1['coupon_id'] = $data['coupon_id'];//优惠券id
}
if(!empty($status)){
$data1['status'] = $data['status'];//更新支付成功
$data1['status'] = $status;//更新支付成功
}
$data1['total_goods_price'] = $data['total_goods_price'];//商品金额
$data1['discount_price'] = $data['discount_price'];//优惠金额
... ...
... ... @@ -222,7 +222,7 @@ class Goods extends Api
$where['id'] = ['<>',$result['id']];
}
$limit = config('verify.limit');
$res = Common::goodsList($where,1,$this->uid,$limit);
$res = Common::goodsList($where,1,$this->uid,$limit,'hots desc,id desc');
$this->success('成功',$res);
}else{
$this->error('请求方式错误');
... ...
... ... @@ -35,6 +35,7 @@ class Index extends Api
{
"id": 1,//轮播图id
"image": ""//图片路径
"url": ""//跳转链接
},
{
"id": 2,
... ... @@ -44,6 +45,7 @@ class Index extends Api
"res_advert": {//活动广告位（没有则不显示）
"id": 1,//id
"image": "http://jinglong.springchunjia.cn/uploads/20191127/febfea9a34c918cb2f100f669ede2547.png"//图片路径
"url": ""//跳转链接
},
"res_design": [//设计师作品
{
... ... @@ -96,14 +98,14 @@ class Index extends Api
if($this->request->isGet()){
$arr = [];
//轮播图
$res_banner = Common::selectData('banner','id,image');
$res_banner = Common::selectData('banner','id,image,url');
foreach ($res_banner as &$b_value){
$b_value['image'] = $this->auth->absolutionUrlOne($b_value['image']);
}
$arr['res_banner'] = $res_banner;
//首页广告位
$res_advert = Common::findWhereData('advert',['type'=>0],'id,image');
$res_advert = Common::findWhereData('advert',['type'=>0],'id,image,url');
if($res_advert){
$res_advert['image'] = $this->auth->absolutionUrlOne($res_advert['image']);
}
... ... @@ -159,12 +161,13 @@ class Index extends Api
"data": {//没有则不显示
"id": 2,//弹窗广告位id
"image": "http://jinglong.springchunjia.cn/uploads/20191127/0b20812d4f80307dd1025db71d690395.png"//图片路径
"url": ""//跳转链接
}
})
*/
public function popupAdvert(){
if($this->request->isGet()){
$res = Common::findWhereData('advert',['type'=>1],'id,image');
$res = Common::findWhereData('advert',['type'=>1],'id,image,url');
if($res){
$res['image'] = $this->auth->absolutionUrlOne($res['image']);
}
... ...
... ... @@ -259,7 +259,7 @@ class News extends Api
$flag = config('verify.flag');
$where = ['is_new'=>$flag[1]];
$limit = config('verify.goods_limit');
$arr = Common::goodsList($where,$page,$this->uid,$limit);
$arr = Common::goodsList($where,$page,$this->uid,$limit,'hots desc,id desc');
$this->success('成功',$arr);
}else{
$this->error('请求方式错误');
... ...
... ... @@ -463,7 +463,7 @@ class Orders extends Api
//查询订单
$status = $this->order_status;
$where = ['id'=>$order_id,'uid'=>$this->uid,'status'=>$status[3]];//退款申请中
$where = ['id'=>$order_id,'uid'=>$this->uid,'status'=>['in',[$status[3],$status[10]]]];//退款申请中,已拒绝
$order = Common::findSoftWhereData('order',$where,'id');
if($order){
$orderModel = new Order();
... ... @@ -564,7 +564,7 @@ class Orders extends Api
//查询订单
$status = $this->order_status;
$where = ['id'=>$order_id,'uid'=>$this->uid,'status'=>$status[6]];//退换货申请中
$where = ['id'=>$order_id,'uid'=>$this->uid,'status'=>['in',[$status[6],$status[9]]]];//退换货申请中,退换货驳回
$order = Common::findSoftWhereData('order',$where,'id');
if($order){
$orderModel = new Order();
... ...
... ... @@ -27,6 +27,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'id', title: __('Id')},
{field: 'image', title: __('Image'), events: Table.api.events.image, formatter: Table.api.formatter.image},
{field: 'type', title: __('Type'),formatter: Table.api.formatter.label, searchList: {0: __('首页广告位'), 1: __('弹窗广告位')}},
{field: 'url', title: __('Url')},
{field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
// {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
{field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
... ...
... ... @@ -26,6 +26,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{checkbox: true},
{field: 'id', title: __('Id')},
{field: 'image', title: __('Image'), events: Table.api.events.image, formatter: Table.api.formatter.image},
{field: 'url', title: __('Url')},
{field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
{field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
]
... ...