'p'

application/admin/controller/general/Config.php

@@ -186,7 +186,7 @@ class Config extends Backend
             }
             $config[$value['name']] = $value['value'];
         }
-        $config['siteUrl']='https://car.xoxoso.com/';
+        $config['siteUrl']='https://qiche.com/';
         $config['wxapp']['appid']='wxf11690b1dc5210d3';
         $config['wxapp']['mch_id']='1600885158';
         $config['wxapp']['secret']='d3ae9d4426ccdaf913898c5a046ec9f6';

application/admin/view/category/add.html

@@ -52,20 +52,20 @@
 
 <!--        </div>-->
 <!--    </div>-->
-<!--    <div class="form-group">-->
-<!--        <label for="c-image" class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>-->
-<!--        <div class="col-xs-12 col-sm-8">-->
-<!--            <div class="input-group">-->
-<!--                <input id="c-image" class="form-control" size="35" name="row[image]" type="text" value="">-->
-<!--                <div class="input-group-addon no-border no-padding">-->
-<!--                    <span><button type="button" id="plupload-image" class="btn btn-danger plupload" data-input-id="c-image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>-->
-<!--                    <span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-input-id="c-image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>-->
-<!--                </div>-->
-<!--                <span class="msg-box n-right"></span>-->
-<!--            </div>-->
-<!--            <ul class="row list-inline plupload-preview" id="p-image"></ul>-->
-<!--        </div>-->
-<!--    </div>-->
+    <div class="form-group">
+        <label for="c-image" class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <div class="input-group">
+                <input id="c-image" class="form-control" size="35" name="row[image]" type="text" value="">
+                <div class="input-group-addon no-border no-padding">
+                    <span><button type="button" id="plupload-image" class="btn btn-danger plupload" data-input-id="c-image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-input-id="c-image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                </div>
+                <span class="msg-box n-right"></span>
+            </div>
+            <ul class="row list-inline plupload-preview" id="p-image"></ul>
+        </div>
+    </div>
 <!--    <div class="form-group">-->
 <!--        <label for="c-keywords" class="control-label col-xs-12 col-sm-2">{:__('Keywords')}:</label>-->
 <!--        <div class="col-xs-12 col-sm-8">-->

application/admin/view/category/edit.html

@@ -48,20 +48,20 @@
 
 <!--        </div>-->
 <!--    </div>-->
-<!--    <div class="form-group">-->
-<!--        <label for="c-image" class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>-->
-<!--        <div class="col-xs-12 col-sm-8">-->
-<!--            <div class="input-group">-->
-<!--                <input id="c-image" class="form-control" size="35" name="row[image]" type="text" value="{$row.image}">-->
-<!--                <div class="input-group-addon no-border no-padding">-->
-<!--                    <span><button type="button" id="plupload-image" class="btn btn-danger plupload" data-input-id="c-image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>-->
-<!--                    <span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-input-id="c-image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>-->
-<!--                </div>-->
-<!--                <span class="msg-box n-right"></span>-->
-<!--            </div>-->
-<!--            <ul class="row list-inline plupload-preview" id="p-image"></ul>-->
-<!--        </div>-->
-<!--    </div>-->
+    <div class="form-group">
+        <label for="c-image" class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <div class="input-group">
+                <input id="c-image" class="form-control" size="35" name="row[image]" type="text" value="{$row.image}">
+                <div class="input-group-addon no-border no-padding">
+                    <span><button type="button" id="plupload-image" class="btn btn-danger plupload" data-input-id="c-image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-input-id="c-image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                </div>
+                <span class="msg-box n-right"></span>
+            </div>
+            <ul class="row list-inline plupload-preview" id="p-image"></ul>
+        </div>
+    </div>
 <!--    <div class="form-group">-->
 <!--        <label for="c-keywords" class="control-label col-xs-12 col-sm-2">{:__('Keywords')}:</label>-->
 <!--        <div class="col-xs-12 col-sm-8">-->

application/api/controller/Mall.php

@@ -0,0 +1,41 @@
+<?php
+
+
+namespace app\api\controller;
+
+
+
+use app\common\controller\Api;
+use app\api\model\Category;
+
+class Mall extends Api
+{
+
+    //无需登录的接口
+    protected $noNeedLogin = ['category'];//都需要登录
+    /**
+     * 获取分类
+     *
+     * @ApiTitle    (获取分类)
+     * @ApiSummary  (获取分类)
+     * @ApiMethod   (POST)
+     * @ApiHeaders  (name="user-token", type="string", required=true, description="请求的Token")
+     * @ApiRoute    (/api/mall/category)
+     * @ApiParams   (name="user_id", type="int", required=true, description="用户user_id")
+     */
+
+    //获取分类
+    public function category(){
+        $where = ['status' => 'normal'];
+        $where['pid']=8;//商家下面的分类
+
+        $list = Category::where($where)
+           //->field('id,name,type')
+            ->with('catelist')
+            ->field('id,name,pid,image')
+            ->order('weigh desc,id desc')
+            ->select();
+        $this->result('ok', $list, 1);
+    }
+
+}

application/api/controller/Shop.php

@@ -6,6 +6,7 @@ namespace app\api\controller;
 
 use app\admin\model\Attribute;
 use app\admin\model\Label;
+use app\api\model\Category;
 use app\api\model\ShopUserOld;
 use app\api\model\StoreEvaluate;
 use app\api\model\StoreOrder;
@@ -16,7 +17,22 @@ use app\common\controller\Api;
 use app\api\model\ShopUser;
 class Shop extends Api
 {
-    protected $noNeedLogin =[ 'attribute','attribute_xh','label'];//都需要登录
+    protected $noNeedLogin =[ 'attribute','attribute_xh','label','category','store_list'];//都需要登录
+
+    //获取分类
+    public function category(){
+        $where = ['status' => 'normal'];
+        $where['pid']=0;//商家下面的分类
+
+        $list = Category::where($where)
+            //->field('id,name,type')
+            ->with('catelist')
+            ->field('id,name,pid')
+            ->order('weigh desc,id desc')
+            ->select();
+        $this->result('ok', $list, 1);
+    }
+
     /**
      * 申请成为商家
      *
@@ -198,13 +214,23 @@ class Shop extends Api
     public function store_list(){
         $userId = $this->request->post('user_id');
         $suser_id= $this->request->post('suser_id');
-        $where['suser_id']=$suser_id;
+        $search = $this->request->post('search');
+        $cate_id = $this->request->post('cate_id');//分类id
         $where['is_del']=array('eq',0);
-        $list=StoreProduct::where($where)->field('id,slider_image,image,store_name,deposit_price,price,false as shop_show,cate_top_id ')->select();
+        if (!empty($suser_id)){
+            $where['suser_id']=$suser_id;
+        }
+        if (!empty($search)){
+            $where['store_name']=array('like','%'.$search.'%');
+        }
+        if (!empty($cate_id)){
+            $where['cate_id']=$cate_id;
+        }
+        $list=StoreProduct::where($where)->field('id,slider_image,image,store_name,deposit_price,price,false as shop_show,cate_top_id ')->order('id desc')->select();
         foreach ($list as $k=>$v){
             $v['shop_show']=false;
         }
-        //  echo StoreProduct::getLastSql();
+
         $this->result('success', $list, 1);
     }
     //获取筛选条件

application/api/model/Category.php

@@ -17,11 +17,16 @@ class Category extends Model
 
     public function catelist()
     {
-        return $this->hasMany('Category','pid','id')->where('status','normal')->order('weigh desc,id desc');
+        return $this->hasMany('Category','pid','id')->where('status','normal')->field('id,name,pid,image')->order('weigh desc,id desc');
     }
     public function getImageAttr($value)
     {
         // $status = [-1=>'删除',0=>'禁用',1=>'正常',2=>'待审核'];
-        return config('site.siteUrl').$value;
+        if (!empty($value)){
+            return config('site.siteUrl').$value;
+        }else{
+            return $value;
+        }
+
     }
 }

application/api/model/ProductShangpin.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace app\api\model;
+
+use think\Model;
+
+
+class ProductShangpin extends Model
+{
+
+    
+
+    
+
+    // 表名
+    protected $name = 'product_shangpin';
+    
+    // 自动写入时间戳字段
+    protected $autoWriteTimestamp = 'int';
+
+    // 定义时间戳字段名
+    protected $createTime = 'createtime';
+    protected $updateTime = 'updatetime';
+    protected $deleteTime = false;
+
+    // 追加属性
+    protected $append = [
+
+    ];
+    public function shopuser()
+    {
+        return $this->belongsTo('app\admin\model\ShopUser','suser_id','id')->field('id,shopname,phone,phone_axn,axn_id');
+    }
+    public function storeseckill()
+    {
+        return $this->hasOne('StoreSeckill','store_id','id');
+    }
+    public function attribute()
+    {
+        return $this->hasMany('app\admin\model\store\StoreProductAttribute','pro_id','id')->order('id asc');
+    }
+    public function getImageAttr($value)
+    {
+        if (empty($value)){
+            return '';
+        }
+        // $status = [-1=>'删除',0=>'禁用',1=>'正常',2=>'待审核'];
+        return config('site.siteUrl').$value;
+    }
+    public function getMp4Attr($value)
+    {
+        if (empty($value)){
+            return '';
+        }
+        // $status = [-1=>'删除',0=>'禁用',1=>'正常',2=>'待审核'];
+        return config('site.siteUrl').$value;
+    }
+    public function getSliderImageAttr($value)
+    {
+        $images=explode(',',$value);
+        foreach ($images as $k=>$v){
+            if (!empty($v)){
+                $images[$k]=config('site.siteUrl').$v;
+            }else{
+                $images[$k]='';
+            }
+        }
+        // $status = [-1=>'删除',0=>'禁用',1=>'正常',2=>'待审核'];
+        return $images;
+    }
+}

application/extra/upload.php

@@ -9,7 +9,7 @@ return [
     /**
      * CDN地址
      */
-    'cdnurl'    => 'https://car.xoxoso.com/',
+    'cdnurl'    => '',//https://qiche.com/
     /**
      * 文件保存格式
      */

public/assets/js/backend/category.js

@@ -8,9 +8,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     index_url: 'category/index',
                     add_url: 'category/add',
                     edit_url: 'category/edit',
-                    // del_url: 'category/del',
+                    del_url: 'category/del',
                     multi_url: 'category/multi',
-                    dragsort_url: '',//ajax/weigh
+                    dragsort_url: 'ajax/weigh',
                     table: 'category',
                 }
             });
@@ -28,32 +28,27 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
-                        // {field: 'type', title: __('Type'), operate: false, searchList: Config.searchList, formatter: Table.api.formatter.label},
                         {field: 'name', title: __('Name'), align: 'left'},
-                        // {field: 'nickname', title: __('Nickname')},
-                        // {field: 'flag', title: __('Flag'), formatter: Table.api.formatter.flag},
-                        // {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
-                       // {field: 'weigh', title: __('Weigh')},
+
+                        // {field: 'weigh', title: __('Weigh')},
                         {field: 'status', title: __('Status'), operate: false, formatter: Table.api.formatter.status},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate,
                             formatter:function(value,row,index){
                                 var that=$.extend({},this);
                                 var table =$(that.table).clone(true);
                                 //alert(row.id);
-                                if (row.id==14 || row.id ==15 || row.id ==17 || row.id ==18|| row.id ==19){
+                                if (row.pid=='0'){
                                     $(table).data('operate_edit',null);
                                 }else{
                                     that.table=table;
                                     return Table.api.formatter.operate.call(that,value,row,index);
                                 }
                             }
-
-                           // formatter: Table.api.formatter.operate
+                          //  formatter: Table.api.formatter.operate
                         }
                     ]
                 ]
             };
-
             // 初始化表格
             table.bootstrapTable(tableOptions);
 
@@ -103,4 +98,4 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
         }
     };
     return Controller;
-});
+});