Browse Source

'商家搜索'

aiyou 4 years ago
parent
commit
1bed7988a9

+ 4 - 4
application/admin/validate/Admin.php

@@ -14,7 +14,7 @@ class Admin extends Validate
         'username' => 'require|regex:\w{3,12}|unique:admin',
         'nickname' => 'require',
         'password' => 'require|regex:\S{32}',
-        'email'    => 'require|email|unique:admin,email',
+      //  'email'    => 'require|email|unique:admin,email',
     ];
 
     /**
@@ -33,8 +33,8 @@ class Admin extends Validate
      * 验证场景
      */
     protected $scene = [
-        'add'  => ['username', 'email', 'nickname', 'password'],
-        'edit' => ['username', 'email', 'nickname', 'password'],
+        'add'  => ['username', 'nickname', 'password'],
+        'edit' => ['username', 'nickname', 'password'],
     ];
 
     public function __construct(array $rules = [], $message = [], $field = [])
@@ -43,7 +43,7 @@ class Admin extends Validate
             'username' => __('Username'),
             'nickname' => __('Nickname'),
             'password' => __('Password'),
-            'email'    => __('Email'),
+           // 'email'    => __('Email'),
         ];
         $this->message = array_merge($this->message, [
             'username.regex' => __('Please input correct username'),

+ 14 - 14
application/admin/view/attlist/add.html

@@ -27,20 +27,20 @@
             <input id="c-weigh" data-rule="required" class="form-control" name="row[weigh]" type="number" value="0">
         </div>
     </div>
-<!--    <div class="form-group">-->
-<!--        <label for="c-image" class="control-label col-xs-12 col-sm-2">{:__('图片')}:</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">{:__('图片')}:</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 layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

+ 14 - 14
application/admin/view/attlist/edit.html

@@ -25,20 +25,20 @@
             <input id="c-weigh" data-rule="required" class="form-control" name="row[weigh]" type="number" value="{$row.weigh|htmlentities}">
         </div>
     </div>
-<!--    <div class="form-group">-->
-<!--        <label for="c-image" class="control-label col-xs-12 col-sm-2">{:__('图片')}:</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">{:__('图片')}:</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 layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

+ 26 - 6
application/admin/view/store/store_product/add.html

@@ -6,14 +6,34 @@
             <input id="c-store_name" data-rule="required" class="form-control" name="row[store_name]" type="text">
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Store_info')}:</label>
-        <div class="col-xs-12 col-sm-8">
-<!--            data-rule="required"-->
-           <textarea class="form-control"  id ="c-store_info" name="row[store_info]" rel="result" rows="3" cols="50"></textarea>
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Store_info')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--&lt;!&ndash;            data-rule="required"&ndash;&gt;-->
+<!--           <textarea class="form-control"  id ="c-store_info" name="row[store_info]" rel="result" rows="3" cols="50"></textarea>-->
+
+<!--        </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">
+                <!--            data-rule="required"-->
+                <input id="c-car_start_date" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD" data-use-current="true" name="row[car_start_date]" type="text" value="{:date('Y-m-d H:i:s')}">
+
+
+            </div>
 
         </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">
+                <!--            data-rule="required"-->
+                <input id="c-car_distance" data-rule="required" class="form-control" name="row[car_distance]" type="text">
+
+
+
+            </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">-->

+ 21 - 2
application/admin/view/store/store_product/edit.html

@@ -7,16 +7,35 @@
             <input id="c-store_name" data-rule="required" class="form-control" name="row[store_name]" type="text" value="{$row.store_name|htmlentities}">
         </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">
+            <!--            data-rule="required"-->
+            <input id="c-car_start_date" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD" data-use-current="true" name="row[car_start_date]" type="text"  value="{:$row.car_start_date?datetime($row.car_start_date):''}">
+
 
+        </div>
+
+    </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Store_info')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('车辆里程')}:</label>
         <div class="col-xs-12 col-sm-8">
             <!--            data-rule="required"-->
-            <textarea class="form-control"  id ="c-store_info" name="row[store_info]" rel="result" rows="3" cols="50">{$row.store_info|htmlentities}</textarea>
+            <input id="c-car_distance" data-rule="required" class="form-control" name="row[car_distance]" type="text"  value="{$row.car_distance|htmlentities}">
+
+
 
         </div>
     </div>
 <!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Store_info')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            &lt;!&ndash;            data-rule="required"&ndash;&gt;-->
+<!--            <textarea class="form-control"  id ="c-store_info" name="row[store_info]" rel="result" rows="3" cols="50">{$row.store_info|htmlentities}</textarea>-->
+
+<!--        </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">-->
 <!--            &lt;!&ndash;            data-rule="required"&ndash;&gt;-->

+ 1 - 1
application/api/controller/Store.php

@@ -19,7 +19,7 @@ use app\api\model\StoreEvaluate;
 use app\api\model\StoreProduct;
 use app\common\controller\Api;
 use app\api\model\Category;
-use app\admin\model\Attribute;
+use app\api\model\Attribute;
 
 class Store extends Api
 {

+ 60 - 0
application/api/model/Attribute.php

@@ -0,0 +1,60 @@
+<?php
+
+
+namespace app\api\model;
+
+use think\Model;
+
+
+class Attribute extends Model
+{
+
+    
+
+    
+
+    // 表名
+    protected $name = 'attribute';
+    
+    // 自动写入时间戳字段
+    protected $autoWriteTimestamp = 'int';
+
+    // 定义时间戳字段名
+    protected $createTime = 'createtime';
+    protected $updateTime = 'updatetime';
+    protected $deleteTime = false;
+
+    // 追加属性
+    protected $append = [
+
+    ];
+    
+
+    protected static function init()
+    {
+        self::afterInsert(function ($row) {
+            $pk = $row->getPk();
+            $row->getQuery()->where($pk, $row[$pk])->update(['weigh' => $row[$pk]]);
+        });
+    }
+    public function attlist()
+    {
+        return $this->hasMany('Attribute','pid','id')->field('*,0 AS `check`')->where('status',1)->order('weigh desc,id desc');
+    }
+
+    public function getImageAttr($value)
+    {
+        if (empty($value)){
+            return '';
+        }
+        // $status = [-1=>'删除',0=>'禁用',1=>'正常',2=>'待审核'];
+        return config('site.siteUrl').$value;
+    }
+
+
+
+
+
+
+
+}