李忠强 / temporaryfood · 提交

转到一个项目

作者 李忠强
提交 b535997d60b3e6baae31cdf28c8a7be4651259c1 1 个父辈 b44be1f5

更新

内嵌 并排对比
正在显示 12 个修改的文件 包含 128 行增加 和 185 行删除
@@ -14,7 +14,7 @@ class Litestorecategory extends Backend @@ -14,7 +14,7 @@ class Litestorecategory extends Backend
14 14
15 /** 15 /**
16 * Litestorecategory模型对象 16 * Litestorecategory模型对象
17 - * @var \app\admin\model\Litestorecategory 17 + * @var \app\admin\model\litestore\Litestorecategory
18 */ 18 */
19 protected $model = null; 19 protected $model = null;
20 protected $categorylist = []; 20 protected $categorylist = [];
@@ -32,7 +32,7 @@ class Litestorecategory extends Backend @@ -32,7 +32,7 @@ class Litestorecategory extends Backend
32 { 32 {
33 $categorydata[$v['id']] = $v; 33 $categorydata[$v['id']] = $v;
34 } 34 }
35 - $this->view->assign("parentList", $categorydata); 35 + $this->view->assign("isindexList", $this->model->getIsIndexList());
36 } 36 }
37 37
38 /** 38 /**
@@ -6,6 +6,9 @@ return [ @@ -6,6 +6,9 @@ return [
6 'Name' => '分类名称', 6 'Name' => '分类名称',
7 'Image' => '图片', 7 'Image' => '图片',
8 'Weigh' => '权重', 8 'Weigh' => '权重',
  9 + 'Is_index' => '是否首页展示',
  10 + 'Is_index 0' => '否',
  11 + 'Is_index 1' => '是',
9 'Createtime' => '创建时间', 12 'Createtime' => '创建时间',
10 'Updatetime' => '更新时间' 13 'Updatetime' => '更新时间'
11 ]; 14 ];
@@ -30,6 +30,11 @@ class Litestorecategory extends Model @@ -30,6 +30,11 @@ class Litestorecategory extends Model
30 }); 30 });
31 } 31 }
32 32
  33 + public function getIsIndexList()
  34 + {
  35 + return ['0'=>__('Is_index 0'),'1'=>__('Is_index 1')];
  36 + }
  37 +
33 38
34 39
35 40
1 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action=""> 1 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
2 2
3 - <div class="form-group">  
4 - <label for="c-pid" class="control-label col-xs-12 col-sm-2">{:__('Pid')}:</label>  
5 - <div class="col-xs-12 col-sm-8">  
6 -  
7 - <select id="c-pid" data-rule="required" class="form-control selectpicker" name="row[pid]">  
8 - {foreach name="parentList" item="vo"}  
9 - <option data-type="{$vo.name}" value="{$key}" {in name="key" value=""}selected{/in}>{$vo.name}</option>  
10 - {/foreach}  
11 - </select>  
12 3
13 - </div>  
14 - </div>  
15 <div class="form-group"> 4 <div class="form-group">
16 <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label> 5 <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
17 <div class="col-xs-12 col-sm-8"> 6 <div class="col-xs-12 col-sm-8">
1 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action=""> 1 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
2 2
3 <div class="form-group"> 3 <div class="form-group">
4 - <label for="c-pid" class="control-label col-xs-12 col-sm-2">{:__('Pid')}:</label> 4 + <label for="c-pid" class="control-label col-xs-12 col-sm-2">{:__('Is_index')}:</label>
5 <div class="col-xs-12 col-sm-8"> 5 <div class="col-xs-12 col-sm-8">
6 6
7 <select id="c-pid" data-rule="required" class="form-control selectpicker" name="row[pid]"> 7 <select id="c-pid" data-rule="required" class="form-control selectpicker" name="row[pid]">
8 - {foreach name="parentList" item="vo"}  
9 - <option data-type="{$vo.name}" value="{$key}" {in name="key" value="$row.pid"}selected{/in}>{$vo.name}</option> 8 + {foreach name="isindexList" item="vo"}
  9 + <option data-type="{$vo}" value="{$key}" {in name="key" value="$row.pid"}selected{/in}>{$vo}</option>
10 {/foreach} 10 {/foreach}
11 </select> 11 </select>
12 12
@@ -10,15 +10,15 @@ @@ -10,15 +10,15 @@
10 <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('litestore/litestorecategory/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a> 10 <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('litestore/litestorecategory/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
11 <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('litestore/litestorecategory/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a> 11 <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('litestore/litestorecategory/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
12 <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('litestore/litestorecategory/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a> 12 <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('litestore/litestorecategory/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
13 - <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('litestore/litestorecategory/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a> 13 +<!-- <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('litestore/litestorecategory/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>-->
14 14
15 - <div class="dropdown btn-group {:$auth->check('litestore/litestorecategory/multi')?'':'hide'}">  
16 - <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>  
17 - <ul class="dropdown-menu text-left" role="menu">  
18 - <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>  
19 - <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>  
20 - </ul>  
21 - </div> 15 +<!-- <div class="dropdown btn-group {:$auth->check('litestore/litestorecategory/multi')?'':'hide'}">-->
  16 +<!-- <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>-->
  17 +<!-- <ul class="dropdown-menu text-left" role="menu">-->
  18 +<!-- <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>-->
  19 +<!-- <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>-->
  20 +<!-- </ul>-->
  21 +<!-- </div>-->
22 </div> 22 </div>
23 <table id="table" class="table table-striped table-bordered table-hover table-nowrap" 23 <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
24 data-operate-edit="{:$auth->check('litestore/litestorecategory/edit')}" 24 data-operate-edit="{:$auth->check('litestore/litestorecategory/edit')}"
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
2 2
3 namespace app\api\controller; 3 namespace app\api\controller;
4 4
  5 +use app\api\model\News;
5 use app\common\controller\Api; 6 use app\common\controller\Api;
6 7
7 /** 8 /**
@@ -13,11 +14,38 @@ class Index extends Api @@ -13,11 +14,38 @@ class Index extends Api
13 protected $noNeedRight = ['*']; 14 protected $noNeedRight = ['*'];
14 15
15 /** 16 /**
16 - * 首页  
17 - * 17 + * @ApiTitle (首页轮播图)
  18 + * @ApiMethod (POST)
  19 + * @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
  20 + * @ApiReturn ({
  21 + 'code':'1',
  22 + 'msg':'返回成功'
  23 + 'data':'轮播图数组'
  24 + })
18 */ 25 */
19 - public function index() 26 + public function banner()
20 { 27 {
21 - $this->success('请求成功'); 28 +
  29 + $model = new News();
  30 + $list = $model->where('status','normal')->column('image');
  31 + $this->success('banner',$list);
  32 + }
  33 +
  34 + /**
  35 + * @ApiTitle (首页分类)
  36 + * @ApiMethod (POST)
  37 + * @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
  38 + * @ApiReturn ({
  39 + 'code':'1',
  40 + 'msg':'返回成功'
  41 + 'data':'轮播图数组'
  42 + })
  43 + */
  44 + public function category()
  45 + {
  46 +
  47 + $model = new Cat();
  48 + $list = $model->where('status','normal')->column('image');
  49 + $this->success('banner',$list);
22 } 50 }
23 } 51 }
@@ -37,107 +37,6 @@ class User extends Api @@ -37,107 +37,6 @@ class User extends Api
37 } 37 }
38 38
39 /** 39 /**
40 - * 会员登录  
41 - *  
42 - * @ApiMethod (POST)  
43 - * @param string $account 账号  
44 - * @param string $password 密码  
45 - */  
46 - public function login()  
47 - {  
48 - $account = $this->request->post('account');  
49 - $password = $this->request->post('password');  
50 - if (!$account || !$password) {  
51 - $this->error(__('Invalid parameters'));  
52 - }  
53 - $ret = $this->auth->login($account, $password);  
54 - if ($ret) {  
55 - $data = ['userinfo' => $this->auth->getUserinfo()];  
56 - $this->success(__('Logged in successful'), $data);  
57 - } else {  
58 - $this->error($this->auth->getError());  
59 - }  
60 - }  
61 -  
62 - /**  
63 - * 手机验证码登录  
64 - *  
65 - * @ApiMethod (POST)  
66 - * @param string $mobile 手机号  
67 - * @param string $captcha 验证码  
68 - */  
69 - public function mobilelogin()  
70 - {  
71 - $mobile = $this->request->post('mobile');  
72 - $captcha = $this->request->post('captcha');  
73 - if (!$mobile || !$captcha) {  
74 - $this->error(__('Invalid parameters'));  
75 - }  
76 - if (!Validate::regex($mobile, "^1\d{10}$")) {  
77 - $this->error(__('Mobile is incorrect'));  
78 - }  
79 - if (!Sms::check($mobile, $captcha, 'mobilelogin')) {  
80 - $this->error(__('Captcha is incorrect'));  
81 - }  
82 - $user = \app\common\model\User::getByMobile($mobile);  
83 - if ($user) {  
84 - if ($user->status != 'normal') {  
85 - $this->error(__('Account is locked'));  
86 - }  
87 - //如果已经有账号则直接登录  
88 - $ret = $this->auth->direct($user->id);  
89 - } else {  
90 - $ret = $this->auth->register($mobile, Random::alnum(), '', $mobile, []);  
91 - }  
92 - if ($ret) {  
93 - Sms::flush($mobile, 'mobilelogin');  
94 - $data = ['userinfo' => $this->auth->getUserinfo()];  
95 - $this->success(__('Logged in successful'), $data);  
96 - } else {  
97 - $this->error($this->auth->getError());  
98 - }  
99 - }  
100 -  
101 - /**  
102 - * 注册会员  
103 - *  
104 - * @ApiMethod (POST)  
105 - * @param string $username 用户名  
106 - * @param string $password 密码  
107 - * @param string $email 邮箱  
108 - * @param string $mobile 手机号  
109 - * @param string $code 验证码  
110 - */  
111 - public function register()  
112 - {  
113 - $username = $this->request->post('username');  
114 - $password = $this->request->post('password');  
115 - $email = $this->request->post('email');  
116 - $mobile = $this->request->post('mobile');  
117 - $code = $this->request->post('code');  
118 - if (!$username || !$password) {  
119 - $this->error(__('Invalid parameters'));  
120 - }  
121 - if ($email && !Validate::is($email, "email")) {  
122 - $this->error(__('Email is incorrect'));  
123 - }  
124 - if ($mobile && !Validate::regex($mobile, "^1\d{10}$")) {  
125 - $this->error(__('Mobile is incorrect'));  
126 - }  
127 - $ret = Sms::check($mobile, $code, 'register');  
128 - if (!$ret) {  
129 - $this->error(__('Captcha is incorrect'));  
130 - }  
131 - $ret = $this->auth->register($username, $password, $email, $mobile, []);  
132 - if ($ret) {  
133 - $data = ['userinfo' => $this->auth->getUserinfo()];  
134 - $this->success(__('Sign up successful'), $data);  
135 - } else {  
136 - $this->error($this->auth->getError());  
137 - }  
138 - }  
139 -  
140 - /**  
141 * 退出登录 40 * 退出登录
142 * @ApiMethod (POST) 41 * @ApiMethod (POST)
143 */ 42 */
@@ -299,57 +198,30 @@ class User extends Api @@ -299,57 +198,30 @@ class User extends Api
299 } 198 }
300 199
301 /** 200 /**
302 - * 重置密码  
303 - * 201 + * @ApiTitle (用户协议)
304 * @ApiMethod (POST) 202 * @ApiMethod (POST)
305 - * @param string $mobile 手机号  
306 - * @param string $newpassword 新密码  
307 - * @param string $captcha 验证码 203 + * @ApiReturn ({
  204 + 'code':'1',
  205 + 'msg':'用户协议'
  206 + 'data':'富文本'
  207 + })
308 */ 208 */
309 - public function resetpwd() 209 + public function userAgreement()
310 { 210 {
311 - $type = $this->request->post("type");  
312 - $mobile = $this->request->post("mobile");  
313 - $email = $this->request->post("email");  
314 - $newpassword = $this->request->post("newpassword");  
315 - $captcha = $this->request->post("captcha");  
316 - if (!$newpassword || !$captcha) {  
317 - $this->error(__('Invalid parameters'));  
318 - }  
319 - if ($type == 'mobile') {  
320 - if (!Validate::regex($mobile, "^1\d{10}$")) {  
321 - $this->error(__('Mobile is incorrect'));  
322 - }  
323 - $user = \app\common\model\User::getByMobile($mobile);  
324 - if (!$user) {  
325 - $this->error(__('User not found'));  
326 - }  
327 - $ret = Sms::check($mobile, $captcha, 'resetpwd');  
328 - if (!$ret) {  
329 - $this->error(__('Captcha is incorrect'));  
330 - }  
331 - Sms::flush($mobile, 'resetpwd');  
332 - } else {  
333 - if (!Validate::is($email, "email")) {  
334 - $this->error(__('Email is incorrect'));  
335 - }  
336 - $user = \app\common\model\User::getByEmail($email);  
337 - if (!$user) {  
338 - $this->error(__('User not found'));  
339 - }  
340 - $ret = Ems::check($email, $captcha, 'resetpwd');  
341 - if (!$ret) {  
342 - $this->error(__('Captcha is incorrect'));  
343 - }  
344 - Ems::flush($email, 'resetpwd');  
345 - }  
346 - //模拟一次登录  
347 - $this->auth->direct($user->id);  
348 - $ret = $this->auth->changepwd($newpassword, '', true);  
349 - if ($ret) {  
350 - $this->success(__('Reset password successful'));  
351 - } else {  
352 - $this->error($this->auth->getError()); 211 + $this->success('用户协议', Config::get('site.user_agreement'));
353 } 212 }
  213 +
  214 + /**
  215 + * @ApiTitle (隐私协议)
  216 + * @ApiMethod (POST)
  217 + * @ApiReturn ({
  218 + 'code':'1',
  219 + 'msg':'隐私协议'
  220 + 'data':'富文本'
  221 + })
  222 + */
  223 + public function privacyAgreement()
  224 + {
  225 + $this->success('隐私协议', Config::get('site.privacy_agreement'));
354 } 226 }
355 } 227 }
  1 +<?php
  2 +
  3 +
  4 +namespace app\api\model;
  5 +
  6 +
  7 +use think\Model;
  8 +
  9 +class Category extends Model
  10 +{
  11 + protected $name = 'litestore_category';
  12 + protected $append = [
  13 + 'image_text'
  14 + ];
  15 +
  16 + public function getImageTextAttr($value,$data)
  17 + {
  18 + $value = empty($data['image'])?'':cdnurl($data['image'],true);
  19 + return $value;
  20 + }
  21 +}
  1 +<?php
  2 +
  3 +
  4 +namespace app\api\model;
  5 +
  6 +
  7 +use think\Model;
  8 +
  9 +class News extends Model
  10 +{
  11 + protected $name = 'litestore_news';
  12 + protected $append = [
  13 + 'image_text'
  14 + ];
  15 +
  16 + public function getImageTextAttr($value,$data)
  17 + {
  18 + $value = !empty($data['image']) ? cdnurl($data['image'],true) : '';
  19 + return $value;
  20 + }
  21 +}
@@ -28,12 +28,6 @@ return array ( @@ -28,12 +28,6 @@ return array (
28 'user' => 'User', 28 'user' => 'User',
29 'example' => 'Example', 29 'example' => 'Example',
30 ), 30 ),
31 - 'attachmentcategory' =>  
32 - array (  
33 - 'category1' => 'Category1',  
34 - 'category2' => 'Category2',  
35 - 'custom' => 'Custom',  
36 - ),  
37 'mail_type' => '1', 31 'mail_type' => '1',
38 'mail_smtp_host' => 'smtp.qq.com', 32 'mail_smtp_host' => 'smtp.qq.com',
39 'mail_smtp_port' => '465', 33 'mail_smtp_port' => '465',
@@ -41,4 +35,12 @@ return array ( @@ -41,4 +35,12 @@ return array (
41 'mail_smtp_pass' => 'password', 35 'mail_smtp_pass' => 'password',
42 'mail_verify_type' => '2', 36 'mail_verify_type' => '2',
43 'mail_from' => '10000@qq.com', 37 'mail_from' => '10000@qq.com',
  38 + 'attachmentcategory' =>
  39 + array (
  40 + 'category1' => 'Category1',
  41 + 'category2' => 'Category2',
  42 + 'custom' => 'Custom',
  43 + ),
  44 + 'user_agreement' => '<p>64645646564公开警告</p><p>；回来了框架</p>',
  45 + 'privacy_agreement' => '<p>45315448</p><p>他房间后</p>',
44 ); 46 );
@@ -24,15 +24,17 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -24,15 +24,17 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
24 sortName: 'weigh', 24 sortName: 'weigh',
25 pagination: false, 25 pagination: false,
26 commonSearch: false, 26 commonSearch: false,
  27 + search: false,
  28 + showExport:false,
27 columns: [ 29 columns: [
28 [ 30 [
29 {checkbox: true}, 31 {checkbox: true},
30 {field: 'id', title: __('Id')}, 32 {field: 'id', title: __('Id')},
31 - {field: 'pid', title: __('Pid')},  
32 - //{field: 'name', title: __('Name')}, 33 + // {field: 'pid', title: __('Pid')},
33 {field: 'name', title: __('Name'), align: 'left'}, 34 {field: 'name', title: __('Name'), align: 'left'},
34 {field: 'image', title: __('Image'), formatter: Table.api.formatter.image}, 35 {field: 'image', title: __('Image'), formatter: Table.api.formatter.image},
35 {field: 'weigh', title: __('Weigh')}, 36 {field: 'weigh', title: __('Weigh')},
  37 + {field: 'is_index', title: __('Is_index'), formatter: Table.api.formatter.status, searchList: {0: __('Is_index 0'), 1: __('Is_index 1')}},
36 {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime}, 38 {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
37 {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime}, 39 {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
38 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} 40 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}