瀏覽代碼

社区公告

lizhen 1 周之前
父節點
當前提交
3c4ce187ce

+ 2 - 2
application/admin/view/banner/add.html

@@ -20,12 +20,12 @@
             <ul class="row list-inline faupload-preview" id="p-image"></ul>
         </div>
     </div>
-    <!--<div class="form-group">
+    <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>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 2 - 2
application/admin/view/banner/edit.html

@@ -20,12 +20,12 @@
             <ul class="row list-inline faupload-preview" id="p-image"></ul>
         </div>
     </div>
-    <!--<div class="form-group">
+    <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|htmlentities}">
         </div>
-    </div>-->
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 0 - 29
application/api/controller/Baseconfig.php

@@ -52,36 +52,7 @@ class Baseconfig extends Api
         $this->success("获取成功!",["versionCode"=>$versionCode,"isForceUpdate"=>$is_force,"apkUrl"=>$apkUrl,"apkName"=>$apkName,"desc"=>$desc]);
     }
 
-    //启动广告图
-    public function start_advert(){
-        $info = Db::name('start_advert')->where('is_show',1)->order('id desc')->find();
-        $info = info_domain_image($info,['images','video_file']);
-        $this->success_find('success',$info);
-    }
-
-
-
 
-    //个人资料的一下枚举
-    public function userinfo_enum(){
-        $enum_hobby = Db::name('enum_hobby')->field('id,name')->order('weight desc,id desc')->select();
-        $enum_job = Db::name('enum_job')->field('id,name')->order('weight desc,id desc')->select();
-        $enum_marital = Db::name('enum_marital')->field('id,name')->order('weight desc,id desc')->select();
-        $enum_suqiu = Db::name('enum_suqiu')->field('id,name')->order('weight desc,id desc')->select();
-        $enum_tag = Db::name('enum_tag')->field('id,name')->order('weight desc,id desc')->select();
-        $enum_wages = Db::name('enum_wages')->field('id,name')->order('weight desc,id desc')->select();
-
-        $data = [
-            'enum_hobby' => $enum_hobby,
-            'enum_job' => $enum_job,
-            'enum_marital' => $enum_marital,
-            'enum_suqiu' => $enum_suqiu,
-            'enum_tag' => $enum_tag,
-            'enum_wages' => $enum_wages,
-        ];
-
-        $this->success('success',$data);
-    }
 
     //关键字过滤
     public function keyworld_config(){

+ 0 - 71
application/api/controller/Index.php

@@ -54,76 +54,5 @@ class Index extends Api
         $this->success(1,$result);
     }
 
-    //是否有可领取的优惠券
-    public function new_coupon(){
-        //未领取的优惠券
-        $coupon = (object)[];
-        if($this->auth->isLogin()){
-            //我拥有的
-            $user_coupon = Db::name('unishop_coupon_user')->where('user_id',$this->auth->id)->column('coupon_id');
-            //我没有的,可领取的
-            $coupon = Db::name('unishop_coupon')->field('id,title,least,value,number')
-                ->where('id','NOTIN',$user_coupon)
-                ->where('deletetime',NULL)
-                ->where('switch',1)
-                ->where('starttime','<',time())
-                ->where('endtime','>',time())
-                ->order('id asc')->find();
 
-            if(empty($coupon)){
-                $coupon = (object)[];
-            }else{
-                $coupon['value'] = intval($coupon['value']);
-            }
-        }
-
-        $this->success(1,$coupon);
-    }
-
-    //领取优惠券
-    public function get_coupon(){
-        $coupon_id = input('coupon_id',0);
-
-        $coupon = Db::name('unishop_coupon')->field('id,title,least,value,number')
-            ->where('id',$coupon_id)
-            ->where('deletetime',NULL)
-            ->where('switch',1)
-            ->where('starttime','<',time())
-            ->where('endtime','>',time())
-            ->find();
-
-        $user_coupon = Db::name('unishop_coupon_user')->where('user_id',$this->auth->id)->where('coupon_id',$coupon_id)->find();
-
-        if($coupon && empty($user_coupon)){
-            $data = [];
-            for($i=1;$i<=$coupon['number'];$i++){
-                $data[] = [
-                    'coupon_id' => $coupon_id,
-                    'user_id'   => $this->auth->id,
-                ];
-            }
-            Db::name('unishop_coupon_user')->insertAll($data);
-        }
-
-        $this->success('领取成功');
-    }
-
-    //吃喝玩乐
-    //列表
-    public function chihewanle_list(){
-        $list = Db::name('chihewanle')->field('id, title, info, image')->where(['status' => 1])->order('weigh', 'desc')->select();
-        $list = list_domain_image($list, ['image']);
-
-        $this->success(1,$list);
-    }
-
-    //吃喝玩乐
-    //详情
-    public function chihewanle_info(){
-        $id = input('id',0);
-        $info = Db::name('chihewanle')->field('id, title, info, image, content')->where('id',$id)->order('weigh', 'desc')->find();
-        $info = info_domain_image($info, ['image']);
-
-        $this->success(1,$info);
-    }
 }

+ 1 - 1
public/assets/js/backend/banner.js

@@ -28,7 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'id', title: __('Id')},
                         {field: 'title', title: __('Title'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
-//                        {field: 'url', title: __('Url'), operate: 'LIKE', formatter: Table.api.formatter.url},
+                        {field: 'url', title: __('Url')},
                         {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"0":__('Status 0')}, formatter: Table.api.formatter.status},
                         {field: 'weigh', title: __('Weigh'), operate: false},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}