diff --git a/application/admin/common.php b/application/admin/common.php
index a8324df..b69d855 100755
--- a/application/admin/common.php
+++ b/application/admin/common.php
@@ -6,6 +6,8 @@ const URL_BACK = 'url://back';
use think\exception\HttpResponseException;
use think\Response;
use think\response\Redirect;
+use app\common\model\MallImage;
+use think\db;
if (!function_exists('success')) {
@@ -50,4 +52,90 @@ if (!function_exists('result')) {
throw new HttpResponseException($response);
}
+}
+
+if(!function_exists('goods_imgs_upload')){
+ /**
+ * 简单对称加密算法之解密
+ * @param String $union_id 指定id
+ * @param String $type 类型
+ * @param String $ori_img 原图
+ * @param String $thumb_img 缩略图
+ * @param String $ori_fm_img 原图封面
+ * @param String $thumb_img_f 缩略图封面
+ * @param String $goods_imgs 编辑时数据库中图片
+ * @date 20190906
+ * @return li
+ */
+ //上传商品图片
+ function goods_imgs_upload($union_id,$type,$ori_img, $thumb_img,$ori_fm_img,$thumb_img_f,$goods_imgs=array())
+ {
+ $_goodsimgsModel= new MallImage();
+ //$tps = C('TMPL_PARSE_STRING');
+ $inequality_img=array();
+ if($ori_img){
+ $ori_img_ys=array();
+ if($goods_imgs){
+ foreach ($goods_imgs as $key=> $v){
+ $ori_img_ys[$v['id']]=$v['ori_image'];
+ $goods_imgs[$v['id']]=$v;
+ }
+ $inequality_img = array_diff($ori_img_ys,$ori_img);//前端踢掉的图片
+ }
+ foreach ($ori_img as $key=> $v){
+ if(in_array($v,$ori_img_ys,TRUE)){
+ if($v==$ori_fm_img && $thumb_img_f=$thumb_img[$key]){
+ $data3['is_cover']=1;
+ }else{
+ $data3['is_cover']=0;
+ }
+ $_goodsimgsModel->where(array('ori_image'=>$v))->update($data3);
+ continue;
+ }
+ $ori_img_url=trim($v);
+ if(!$ori_img_url){
+ $array = array(
+ 'code' =>400,
+ 'msg' =>'上传文件处理失败',
+ );
+ return $array;
+ }
+ $thumb_img_url=trim($thumb_img[$key]);
+ if(!$thumb_img_url){
+ $array = array(
+ 'code' =>400,
+ 'msg' =>'上传文件处理失败',
+ );
+ return $array;
+ }
+ $data1['ori_image']=$yu_url=$ori_img_url;
+ $data1['thumb_image']=$slt_url=$thumb_img_url;
+ if($v==$ori_fm_img && $thumb_img_f=$thumb_img[$key]){
+ $data1['is_cover']=1;
+ }else{
+ $data1['is_cover']=0;
+ }
+ $data1['type']=$type;
+ $data1['union_id']=$union_id;
+ $_goodsimgsModel::create($data1);
+ }
+ if($inequality_img){
+ foreach ($inequality_img as $key1=> $v1){
+ $mag=Db::table('yo_mall_image')->where('id',$key1)->delete();
+ if($mag){
+ $ori_image_del=Env::get('root_path').'public'.$goods_imgs[$key1]['ori_image'];
+ if(file_exists($ori_image_del))
+ {
+ unlink($ori_image_del);
+ }
+ $thumb_image_del=Env::get('root_path').'public'.$goods_imgs[$key1]['thumb_image'];
+ if(file_exists($thumb_image_del))
+ {
+ unlink($thumb_image_del);
+ }
+ }
+ }
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/application/admin/controller/AccountLogController.php b/application/admin/controller/AccountLogController.php
new file mode 100644
index 0000000..c3ca6b6
--- /dev/null
+++ b/application/admin/controller/AccountLogController.php
@@ -0,0 +1,53 @@
+SOURCE_TYPE;
+ $param = $request->param();
+
+ $where = [];
+ if(isset($param['source_type']) && $param['source_type']){
+ $source_type = $param['source_type'];
+ $where[] = ['source_type','in',$source_type];
+ }
+
+ if(isset($param['keyword']) && $param['keyword']){
+ $where[] = [$param['keyword_type'],'like','%'.$param['keyword'].'%'];
+ }
+ if (isset($param['start_time']) && $param['start_time'] && isset($param['end_time']) && $param['end_time']) {
+ $where[] = ['al.create_time', 'between', [strtotime($param['start_time']), strtotime($param['end_time'])]];
+ }
+ $model = $model
+ ->alias('al')
+ ->field('al.*,u.mobile,u.nickname,u.sn as user_sn,u.avatar')
+ ->join('user u', 'u.id = al.user_id')
+ ->where($where)
+ ->scope('where', $param);
+
+ $data = $model->paginate($this->admin['per_page'], false, ['query'=>$request->get()]);
+ //关键词，排序等赋值
+ $this->assign($request->get());
+
+ $this->assign([
+ 'data' => $data,
+ 'page' => $data->render(),
+ 'total' => $data->total(),
+ 'source_type_list'=>$SOURCE_TYPE,
+ ]);
+ return $this->fetch();
+ }
+}
diff --git a/application/admin/controller/ArticleCategoryController.php b/application/admin/controller/ArticleCategoryController.php
deleted file mode 100755
index 05643fb..0000000
--- a/application/admin/controller/ArticleCategoryController.php
+++ /dev/null
@@ -1,103 +0,0 @@
-getTreeList($model);
- $this->assign([
- 'data' => $data,
-
- ]);
- return $this->fetch();
- }
-
- //添加
- public function add(Request $request, ArticleCategory $model, ArticleCategoryValidate $validate)
- {
- if ($request->isPost()) {
- $param = $request->param();
- $validate_result = $validate->scene('add')->check($param);
- if (!$validate_result) {
- return error($validate->getError());
- }
-
- $result = $model::create($param);
-
- $url = URL_BACK;
- if (isset($param['_create']) && $param['_create'] == 1) {
- $url = URL_RELOAD;
- }
-
- return $result ? success('添加成功', $url) : error();
- }
-
- $this->assign([
- 'cat_list' => $model::where('parent_id', 0)->select(),
- ]);
-
- return $this->fetch();
- }
-
- //修改
- public function edit($id, Request $request, ArticleCategory $model, ArticleCategoryValidate $validate)
- {
-
- $data = $model::get($id);
- if ($request->isPost()) {
- $param = $request->param();
- $validate_result = $validate->scene('edit')->check($param);
- if (!$validate_result) {
- return error($validate->getError());
- }
-
- $result = $data->save($param);
- return $result ? success() : error();
- }
-
- $this->assign([
- 'data' => $data,
- 'cat_list' => $model::where('parent_id', 0)->select(),
-
- ]);
- return $this->fetch('add');
-
- }
-
- //删除
- public function del($id, ArticleCategory $model)
- {
- if (count($model->noDeletionId) > 0) {
- if (is_array($id)) {
- if (array_intersect($model->noDeletionId, $id)) {
- return error('ID为' . implode(',', $model->noDeletionId) . '的数据无法删除');
- }
- } else if (in_array($id, $model->noDeletionId)) {
- return error('ID为' . $id . '的数据无法删除');
- }
- }
-
- if ($model->softDelete) {
- $result = $model->whereIn('id', $id)->useSoftDelete('delete_time', time())->delete();
- } else {
- $result = $model->whereIn('id', $id)->delete();
- }
-
- return $result ? success('操作成功', URL_RELOAD) : error();
- }
-
-
-}
diff --git a/application/admin/controller/ArticleController.php b/application/admin/controller/ArticleController.php
deleted file mode 100755
index 57301b6..0000000
--- a/application/admin/controller/ArticleController.php
+++ /dev/null
@@ -1,141 +0,0 @@
-param();
- $model = $model->scope('where', $param);
-
- $data = $model->paginate($this->admin['per_page'], false, ['query'=>$request->get()]);
- //关键词，排序等赋值
- $this->assign($request->get());
-
- $this->assign([
- 'data' => $data,
- 'page' => $data->render(),
- 'total' => $data->total(),
- ]);
- return $this->fetch();
- }
-
- //添加
- public function add(Request $request, Article $model, ArticleValidate $validate)
- {
- if ($request->isPost()) {
- $param = $request->param();
- $validate_result = $validate->scene('add')->check($param);
- if (!$validate_result) {
- return error($validate->getError());
- }
- $param['content'] = $request->param(false)['content'];
-
-//处理缩略图上传
-$attachment_img = new \app\common\model\Attachment;
-$file_img = $attachment_img->upload('img');
-if ($file_img) {
- $param['img'] = $file_img->url;
-} else {
- return error($attachment_img->getError());
-}
-
-
- $result = $model::create($param);
-
- $url = URL_BACK;
- if(isset($param['_create']) && $param['_create']==1){
- $url = URL_RELOAD;
- }
-
- return $result ? success('添加成功',$url) : error();
- }
-
-
-
- return $this->fetch();
- }
-
- //修改
- public function edit($id, Request $request, Article $model, ArticleValidate $validate)
- {
-
- $data = $model::get($id);
- if ($request->isPost()) {
- $param = $request->param();
- $validate_result = $validate->scene('edit')->check($param);
- if (!$validate_result) {
- return error($validate->getError());
- }
- $param['content'] = $request->param(false)['content'];
-
-//处理缩略图上传
-if (!empty($_FILES['img']['name'])) {
- $attachment_img = new \app\common\model\Attachment;
- $file_img = $attachment_img->upload('img');
- if ($file_img) {
- $param['img'] = $file_img->url;
- }
-}
-
-
- $result = $data->save($param);
- return $result ? success() : error();
- }
-
- $this->assign([
- 'data' => $data,
-
- ]);
- return $this->fetch('add');
-
- }
-
- //删除
- public function del($id, Article $model)
- {
- if (count($model->noDeletionId) > 0) {
- if (is_array($id)) {
- if (array_intersect($model->noDeletionId, $id)) {
- return error('ID为' . implode(',', $model->noDeletionId) . '的数据无法删除');
- }
- } else if (in_array($id, $model->noDeletionId)) {
- return error('ID为' . $id . '的数据无法删除');
- }
- }
-
- if ($model->softDelete) {
- $result = $model->whereIn('id', $id)->useSoftDelete('delete_time', time())->delete();
- } else {
- $result = $model->whereIn('id', $id)->delete();
- }
-
- return $result ? success('操作成功', URL_RELOAD) : error();
- }
-
- //启用
-public function enable($id,Article $model)
-{
- $result = $model->whereIn('id',$id)->update(['status'=>1]);
- return $result ? success('操作成功', URL_RELOAD) : error();
-}
-
-
-//禁用
-public function disable($id,Article $model)
-{
- $result = $model->whereIn('id',$id)->update(['status'=>0]);
- return $result ? success('操作成功', URL_RELOAD) : error();
-}
-}
diff --git a/application/admin/controller/BrandController.php b/application/admin/controller/BrandController.php
deleted file mode 100755
index 0c5d5e1..0000000
--- a/application/admin/controller/BrandController.php
+++ /dev/null
@@ -1,123 +0,0 @@
-param();
- $model = $model->scope('where', $param);
-
- $data = $model->paginate($this->admin['per_page'], false, ['query' => $request->get()]);
- //关键词，排序等赋值
- $this->assign($request->get());
-
- $this->assign([
- 'data' => $data,
- 'page' => $data->render(),
- 'total' => $data->total(),
- ]);
- return $this->fetch();
- }
-
- //添加
- public function add(Request $request, Brand $model, BrandValidate $validate)
- {
- if ($request->isPost()) {
- $param = $request->param();
- $validate_result = $validate->scene('add')->check($param);
- if (!$validate_result) {
- return error($validate->getError());
- }
- //处理图片上传
- $attachment_img = new \app\common\model\Attachment;
- $file_img = $attachment_img->upload('img');
- if ($file_img) {
- $param['img'] = $file_img->url;
- } else {
- return error($attachment_img->getError());
- }
-
-
- $result = $model::create($param);
-
- $url = URL_BACK;
- if (isset($param['_create']) && $param['_create'] == 1) {
- $url = URL_RELOAD;
- }
-
- return $result ? success('添加成功', $url) : error();
- }
-
-
- return $this->fetch();
- }
-
- //修改
- public function edit($id, Request $request, Brand $model, BrandValidate $validate)
- {
-
- $data = $model::get($id);
- if ($request->isPost()) {
- $param = $request->param();
- $validate_result = $validate->scene('edit')->check($param);
- if (!$validate_result) {
- return error($validate->getError());
- }
- //处理图片上传
- if (!empty($_FILES['img']['name'])) {
- $attachment_img = new \app\common\model\Attachment;
- $file_img = $attachment_img->upload('img');
- if ($file_img) {
- $param['img'] = $file_img->url;
- }
- }
-
-
- $result = $data->save($param);
- return $result ? success() : error();
- }
-
- $this->assign([
- 'data' => $data,
-
- ]);
- return $this->fetch('add');
-
- }
-
- //删除
- public function del($id, Brand $model)
- {
- if (count($model->noDeletionId) > 0) {
- if (is_array($id)) {
- if (array_intersect($model->noDeletionId, $id)) {
- return error('ID为' . implode(',', $model->noDeletionId) . '的数据无法删除');
- }
- } else if (in_array($id, $model->noDeletionId)) {
- return error('ID为' . $id . '的数据无法删除');
- }
- }
-
- if ($model->softDelete) {
- $result = $model->whereIn('id', $id)->useSoftDelete('delete_time', time())->delete();
- } else {
- $result = $model->whereIn('id', $id)->delete();
- }
-
- return $result ? success('操作成功', URL_RELOAD) : error();
- }
-
-
-}
diff --git a/application/admin/controller/DeliverAddressController.php b/application/admin/controller/DeliverAddressController.php
deleted file mode 100755
index f7e6b4d..0000000
--- a/application/admin/controller/DeliverAddressController.php
+++ /dev/null
@@ -1,123 +0,0 @@
-param();
- $model = $model->with('user,province,city,district,street')->scope('where', $param);
-
- $data = $model->paginate($this->admin['per_page'], false, ['query' => $request->get()]);
- //关键词，排序等赋值
- $this->assign($request->get());
-
- $this->assign([
- 'data' => $data,
- 'page' => $data->render(),
- 'total' => $data->total(),
- ]);
- return $this->fetch();
- }
-
- //添加
- public function add(Request $request, DeliverAddress $model, DeliverAddressValidate $validate, Region $region)
- {
- if ($request->isPost()) {
- $param = $request->param();
- $validate_result = $validate->scene('add')->check($param);
- if (!$validate_result) {
- return error($validate->getError());
- }
-
- $result = $model::create($param);
-
- $url = URL_BACK;
- if (isset($param['_create']) && $param['_create'] == 1) {
- $url = URL_RELOAD;
- }
-
- return $result ? success('添加成功', $url) : error();
- }
-
- $this->assign([
- 'user_list' => User::all(),
- 'province_list' => $region->getProvince(),
- 'city_list' => $region->getCity(1),
- 'district_list' => $region->getDistrict(1),
- 'street_list' => $region->getStreet(1),
-
- ]);
-
-
- return $this->fetch();
- }
-
- //修改
- public function edit($id, Request $request, DeliverAddress $model, DeliverAddressValidate $validate, Region $region)
- {
-
- $data = $model::get($id);
- if ($request->isPost()) {
- $param = $request->param();
- $validate_result = $validate->scene('edit')->check($param);
- if (!$validate_result) {
- return error($validate->getError());
- }
-
- $result = $data->save($param);
- return $result ? success() : error();
- }
-
- $this->assign([
- 'data' => $data,
- 'user_list' => User::all(),
- 'province_list' => $region->getProvince(),
- 'city_list' => $region->getCity(1),
- 'district_list' => $region->getDistrict(1),
- 'street_list' => $region->getStreet(1),
-
-
- ]);
- return $this->fetch('add');
-
- }
-
- //删除
- public function del($id, DeliverAddress $model)
- {
- if (count($model->noDeletionId) > 0) {
- if (is_array($id)) {
- if (array_intersect($model->noDeletionId, $id)) {
- return error('ID为' . implode(',', $model->noDeletionId) . '的数据无法删除');
- }
- } else if (in_array($id, $model->noDeletionId)) {
- return error('ID为' . $id . '的数据无法删除');
- }
- }
-
- if ($model->softDelete) {
- $result = $model->whereIn('id', $id)->useSoftDelete('delete_time', time())->delete();
- } else {
- $result = $model->whereIn('id', $id)->delete();
- }
-
- return $result ? success('操作成功', URL_RELOAD) : error();
- }
-
-
-}
diff --git a/application/admin/controller/DemoController.php b/application/admin/controller/DemoController.php
deleted file mode 100755
index 9547577..0000000
--- a/application/admin/controller/DemoController.php
+++ /dev/null
@@ -1,175 +0,0 @@
-fetch();
- }
-
-
- //发送邮件功能
- public function sendEmail(Request $request)
- {
- $param = $request->param();
-
- $config = config('email.smtp');
- $mail = new PHPMailer(true); // Passing `true` enables exceptions
- try {
-
- $address = $param['address'];
- $subject = $param['subject'];
- $content = $param['content'];
- $full_content = $request->param(false)['content'];
-
- //服务器配置
- $mail->CharSet = "UTF-8"; //设定邮件编码
- $mail->SMTPDebug = 0; // 调试模式输出
- $mail->isSMTP(); // 使用SMTP
- $mail->Host = $config['host']; // SMTP服务器
- $mail->SMTPAuth = true; // 允许 SMTP 认证
- $mail->Username = $config['username']; // SMTP 用户名 即邮箱的用户名
- $mail->Password = $config['password']; // SMTP 密码 部分邮箱是授权码(例如163邮箱)
- $mail->SMTPSecure = 'ssl'; // 允许 TLS 或者ssl协议
- $mail->Port = 465; // 服务器端口 25 或者465 具体要看邮箱服务器支持
-
- $mail->setFrom($config['address'], $config['name']); //发件人
- $mail->addAddress($address, $address); // 收件人
- //$mail->addAddress('ellen@example.com'); // 可添加多个收件人
- $mail->addReplyTo($config['address'], $config['name']); //回复的时候回复给哪个邮箱 建议和发件人一致
- //$mail->addCC('cc@example.com'); //抄送
- //$mail->addBCC('bcc@example.com'); //密送
-
- //发送附件
- // $mail->addAttachment('../xy.zip'); // 添加附件
- //$mail->addAttachment(app()->getRootPath() . 'public/uploads/attachment/20190902/6a673f554c694a41971fca94c7503315.jpg', 'test.jpg'); // 发送附件并且重命名
-
- //Content
- $mail->isHTML(true); // 是否以HTML文档格式发送 发送后客户端可直接显示对应HTML内容
- $mail->Subject = $subject;
- $mail->Body = $full_content;
- $mail->AltBody = $content;
-
- $mail->send();
- $result = true;
- $msg = '邮件发送成功';
- } catch (\Exception $e) {
- $msg = '邮件发送失败,错误信息:' . $mail->ErrorInfo;
- $result = false;
- }
-
- return $result ? success('成功', URL_RELOAD, '') : error($msg);
- }
-
- //短信页面
- public function sms()
- {
- return $this->fetch();
- }
-
- //发送短信功能
- public function sendSms(Request $request)
- {
- $param = $request->param();
- $config = config('sms.');
- $easySms = new EasySms($config);
-
- try {
- $result = $easySms->send($param['mobile'], [
- 'template' => 'SMS_001',
- 'data' => [
- 'code' => 543260
- ],
- ]);
- $success = true;
- $msg = '发送成功';
- } catch (\Exception $e) {
- $success = false;
- $msg = $e->getMessage();
- }
-
- if (!$success || $result['aliyun']['status'] !== 'success') {
- return error($msg);
- }
-
- return success($msg);
- }
-
-
- //二维码页面
- public function qrCode()
- {
- return $this->fetch();
- }
-
-
- //生成二维码功能
- public function createQrCode(Request $request)
- {
- $param = $request->param();
-
- $content = $param['content'] ?? '麻烦输入内容OK？';
-
- //创建码，$content为二维码内容
- $qrCode = new QrCode($content);
- //设置尺寸
- $qrCode->setSize(300);
- //可以设置binary,png,svg,eps,debug
- $qrCode->setWriterByName('png');
- //设置边距
- $qrCode->setMargin(10);
- //编码
- $qrCode->setEncoding('UTF-8');
- //容错等级
- $qrCode->setErrorCorrectionLevel(new ErrorCorrectionLevel(ErrorCorrectionLevel::HIGH));
- //前景色
- $qrCode->setForegroundColor(['r' => 0, 'g' => 0, 'b' => 0, 'a' => 0]);
- //背景色
- $qrCode->setBackgroundColor(['r' => 255, 'g' => 255, 'b' => 255, 'a' => 0]);
- //标签
- $qrCode->setLabel('Admin Demo QrCode', 16, null, LabelAlignment::CENTER);
- //logo地址
-
-
- $qrCode->setLogoPath(app()->getRootPath() . 'public/uploads/attachment/20190902/6a673f554c694a41971fca94c7503315.jpg');
- //logo大小
- $qrCode->setLogoSize(100, 100);
- //块尺寸设置为整数，默认为true
- $qrCode->setRoundBlockSize(true);
- //验证结果
- $qrCode->setValidateResult(false);
- //写入选项
- $qrCode->setWriterOptions(['exclude_xml_declaration' => true]);
-
- //直接输出图片
- //header('Content-Type: '.$qrCode->getContentType());
- //return $qrCode->writeString();
-
- $file_name = random_int(1, 5);
- //保存成文件
- $qrCode->writeFile(app()->getRootPath() . 'public/demo/qrcode/' . $file_name . '.png');
- $code_url = '/demo/qrcode/' . $file_name . '.png';
-
- return success('生成成功', URL_CURRENT, ['qrcode' => $code_url]);
-
-
- // Create a response object
-
-
- }
-}
\ No newline at end of file
diff --git a/application/admin/controller/EditorController.php b/application/admin/controller/EditorController.php
deleted file mode 100755
index 8f8834f..0000000
--- a/application/admin/controller/EditorController.php
+++ /dev/null
@@ -1,24 +0,0 @@
-
- */
-
-namespace app\admin\controller;
-
-use think\Request;
-use tools\UEditor;
-
-class EditorController extends Controller
-{
-
- //编辑器上传等url
- public function server(Request $request)
- {
- $param = $request->param();
- $config = config('ueditor.');
- $action = $param['action'];
- $editor = new UEditor($config);
- return $editor->server($action);
- }
-}
\ No newline at end of file
diff --git a/application/admin/controller/ExpressController.php b/application/admin/controller/ExpressController.php
deleted file mode 100755
index b921405..0000000
--- a/application/admin/controller/ExpressController.php
+++ /dev/null
@@ -1,105 +0,0 @@
-param();
- $model = $model->scope('where', $param);
-
- $data = $model->paginate($this->admin['per_page'], false, ['query' => $request->get()]);
- //关键词，排序等赋值
- $this->assign($request->get());
-
- $this->assign([
- 'data' => $data,
- 'page' => $data->render(),
- 'total' => $data->total(),
- ]);
- return $this->fetch();
- }
-
- //添加
- public function add(Request $request, Express $model, ExpressValidate $validate)
- {
- if ($request->isPost()) {
- $param = $request->param();
- $validate_result = $validate->scene('add')->check($param);
- if (!$validate_result) {
- return error($validate->getError());
- }
-
- $result = $model::create($param);
-
- $url = URL_BACK;
- if (isset($param['_create']) && $param['_create'] == 1) {
- $url = URL_RELOAD;
- }
-
- return $result ? success('添加成功', $url) : error();
- }
-
-
- return $this->fetch();
- }
-
- //修改
- public function edit($id, Request $request, Express $model, ExpressValidate $validate)
- {
-
- $data = $model::get($id);
- if ($request->isPost()) {
- $param = $request->param();
- $validate_result = $validate->scene('edit')->check($param);
- if (!$validate_result) {
- return error($validate->getError());
- }
-
- $result = $data->save($param);
- return $result ? success() : error();
- }
-
- $this->assign([
- 'data' => $data,
-
- ]);
- return $this->fetch('add');
-
- }
-
- //删除
- public function del($id, Express $model)
- {
- if (count($model->noDeletionId) > 0) {
- if (is_array($id)) {
- if (array_intersect($model->noDeletionId, $id)) {
- return error('ID为' . implode(',', $model->noDeletionId) . '的数据无法删除');
- }
- } else if (in_array($id, $model->noDeletionId)) {
- return error('ID为' . $id . '的数据无法删除');
- }
- }
-
- if ($model->softDelete) {
- $result = $model->whereIn('id', $id)->useSoftDelete('delete_time', time())->delete();
- } else {
- $result = $model->whereIn('id', $id)->delete();
- }
-
- return $result ? success('操作成功', URL_RELOAD) : error();
- }
-
-
-}
diff --git a/application/admin/controller/FinanceController.php b/application/admin/controller/FinanceController.php
new file mode 100755
index 0000000..d5f77b5
--- /dev/null
+++ b/application/admin/controller/FinanceController.php
@@ -0,0 +1,24 @@
+
+ */
+
+namespace app\admin\controller;
+
+use app\admin\model\AdminLog;
+use app\admin\model\AdminMenu;
+use app\admin\model\AdminRole;
+use app\admin\model\AdminUser;
+use tools\SystemInfo;
+use think\Request;
+
+class FinanceController extends Controller
+{
+ public function lists(Request $request)
+ {
+ return $this->fetch();
+ }
+
+
+}
diff --git a/application/admin/controller/GoodsAttrCategoryController.php b/application/admin/controller/GoodsAttrCategoryController.php
deleted file mode 100755
index 207c406..0000000
--- a/application/admin/controller/GoodsAttrCategoryController.php
+++ /dev/null
@@ -1,170 +0,0 @@
-param();
- $model = $model->scope('where', $param);
-
- $data = $model->paginate($this->admin['per_page'], false, ['query'=>$request->get()]);
- //关键词，排序等赋值
- $this->assign($request->get());
-
- $this->assign([
- 'data' => $data,
- 'page' => $data->render(),
- 'total' => $data->total(),
- ]);
- return $this->fetch();
- }
-
- //添加
- public function add(Request $request, GoodsAttrCategory $model,GoodsAttr $gamodel, GoodsAttrCategoryValidate $validate)
- {
- if ($request->isPost()) {
- $param = $request->param();
- $validate_result = $validate->scene('add')->check($param);
- if (!$validate_result) {
- return error($validate->getError());
- }
- $attrcategory['name']=$param['name'];
- // 启动事务
- $model->startTrans();
- try{
- $result = $model::create($attrcategory);
- $class_id=$result->id;
- $field_data = [];
- foreach ($param['attr_name'] as $key => $value) {
- $field_data[] = [
- 'attr_name' => $param['attr_name'][$key][0],
- 'attr_class_id' => $class_id,
- 'attr_index' =>0,
- 'attr_values' =>'',
- 'sort_order' => $param['sort_order'][$key][0] ?? 255,
- ];
- }
- $gamodel::insertAll($field_data);
- // 提交事务
- $model->commit();
- }catch(\Exception $e){
- // 回滚事务
- $model->rollback();
- return error('添加失败');
- }
- $url = URL_BACK;
- if(isset($param['_create']) && $param['_create']==1){
- $url = URL_RELOAD;
- }
- return success('添加成功',$url);
- }
- $this->assign([
- 'gamodel_count'=>0,
- ]);
- return $this->fetch();
- }
-
-
- //修改
- public function edit($id, Request $request, GoodsAttrCategory $model,GoodsAttr $gamodel, GoodsAttrCategoryValidate $validate)
- {
-
- $data = $model::get($id);
- if ($request->isPost()) {
- $param = $request->param();
- $validate_result = $validate->scene('edit')->check($param);
- if (!$validate_result) {
- return error($validate->getError());
- }
- $attrcategory['name']=$param['name'];
- // 启动事务
- $model->startTrans();
- try{
- $model->where('id',$id)->update($attrcategory);
- $where[]=array('attr_class_id','=',$id);
- Db::table('goods_attr')->where($where)->delete();
- $field_data = [];
- foreach ($param['attr_name'] as $key => $value) {
- $field_data[] = [
- 'attr_name' => $param['attr_name'][$key][0],
- 'attr_class_id' => $id,
- 'attr_index' =>0,
- 'attr_values' =>'',
- 'sort_order' => $param['sort_order'][$key][0] ?? 255,
- ];
- }
- $gamodel::insertAll($field_data);
- // 提交事务
- $model->commit();
- }catch(\Exception $e){
- $msg='提交失败';
- // 回滚事务
- $model->rollback();
- return error($msg);//
- }
-
-
-
- $result = $data->save($param);
- return $result ? success() : error();
- }
- $gamodel_list=$gamodel->field('attr_name,sort_order')->where(array('attr_class_id'=>$id))->select();
- $gamodel_l=array();
- foreach ($gamodel_list as $k1 =>$v1) {
- $key=$k1+1;
- $gamodel_l[$key]['attr_name']=$v1['attr_name'];
- $gamodel_l[$key]['sort_order']=$v1['sort_order'];
- }
-
-
- $this->assign([
- 'data' => $data,
- 'gamodel_list'=>$gamodel_l,
- 'gamodel_count'=>count($gamodel_list),
- ]);
- return $this->fetch('add');
-
- }
-
- //删除
- public function del($id, GoodsAttrCategory $model)
- {
- if (count($model->noDeletionId) > 0) {
- if (is_array($id)) {
- if (array_intersect($model->noDeletionId, $id)) {
- return error('ID为' . implode(',', $model->noDeletionId) . '的数据无法删除');
- }
- } else if (in_array($id, $model->noDeletionId)) {
- return error('ID为' . $id . '的数据无法删除');
- }
- }
-
- if ($model->softDelete) {
- $result = $model->whereIn('id', $id)->useSoftDelete('delete_time', time())->delete();
- } else {
- $result = $model->whereIn('id', $id)->delete();
- }
-
- return $result ? success('操作成功', URL_RELOAD) : error();
- }
-
- //获取规格分类下的规格
- public function get_attr()
- {
-
- }
-
-}
diff --git a/application/admin/controller/GoodsController.php b/application/admin/controller/GoodsController.php
index 1e927e2..8fec781 100755
--- a/application/admin/controller/GoodsController.php
+++ b/application/admin/controller/GoodsController.php
@@ -7,6 +7,7 @@ namespace app\admin\controller;
use think\Request;
use app\common\model\Goods;
+use app\common\model\MallImage;
use app\common\model\GoodsCategory;
use app\common\model\Brand;
use app\common\model\GoodsAttrCategory;
@@ -20,7 +21,7 @@ class GoodsController extends Controller
public function index(Request $request, Goods $model)
{
$param = $request->param();
- $model = $model->with('goods_category,brand')->scope('where', $param);
+ $model = $model->with('goods_category')->scope('where', $param);
$data = $model->paginate($this->admin['per_page'], false, ['query' => $request->get()]);
//关键词，排序等赋值
@@ -35,7 +36,7 @@ class GoodsController extends Controller
}
//添加
- public function add(Request $request, Goods $model, GoodsValidate $validate)
+ public function add(Request $request, Goods $model,MallImage $mimode, GoodsValidate $validate)
{
if ($request->isPost()) {
$param = $request->param();
@@ -43,39 +44,39 @@ class GoodsController extends Controller
if (!$validate_result) {
return error($validate->getError());
}
- $param['attr'] = $request->param(false)['attr'];
$param['detail'] = $request->param(false)['detail'];
-
- //处理图片上传
- $attachment_img = new \app\common\model\Attachment;
- $file_img = $attachment_img->upload('img');
- if ($file_img) {
- $param['img'] = $file_img->url;
- } else {
- return error($attachment_img->getError());
+ // 启动事务
+ $model->startTrans();
+ try{
+ $model::create($param);
+ $goods_id=$model->getLastInsID();
+ goods_imgs_upload($goods_id,1,$param['ori_img'],$param['thumb_img'],$param['ori_fm_img'],$param['thumb_img_f']);
+ // 提交事务
+ $model->commit();
+ }catch(\Exception $e){
+ // 回滚事务
+ $model->rollback();
+ return error($e->getMessage());
}
- $result = $model::create($param);
-
$url = URL_BACK;
- if (isset($param['_create']) && $param['_create'] == 1) {
- $url = URL_RELOAD;
+ if(isset($param['_create']) && $param['_create']==1){
+ $url = URL_RELOAD;
}
- return $result ? success('添加成功', $url) : error();
+ return success('添加成功',$url);
}
$this->assign([
'goods_category_list' => $this->getSelectList(new GoodsCategory),
- 'brand_list' => Brand::all(),
'imgurl_list'=>array(),
]);
return $this->fetch();
}
//修改
- public function edit($id, Request $request, Goods $model, GoodsValidate $validate)
+ public function edit($id, Request $request, Goods $model ,MallImage $mimode, GoodsValidate $validate)
{
$data = $model::get($id);
@@ -85,29 +86,39 @@ class GoodsController extends Controller
if (!$validate_result) {
return error($validate->getError());
}
- $param['attr'] = $request->param(false)['attr'];
$param['detail'] = $request->param(false)['detail'];
-
- //处理图片上传
- if (!empty($_FILES['img']['name'])) {
- $attachment_img = new \app\common\model\Attachment;
- $file_img = $attachment_img->upload('img');
- if ($file_img) {
- $param['img'] = $file_img->url;
- }
+ // 启动事务
+ $model->startTrans();
+ try{
+ $data->save($param);
+ $MallImage=$mimode->where(array('type'=>1,'union_id'=>$id))->select();
+ goods_imgs_upload($id,1,$param['ori_img'],$param['thumb_img'],$param['ori_fm_img'],$param['thumb_img_f'],$MallImage);
+ // 提交事务
+ $model->commit();
+ }catch(\Exception $e){
+ // 回滚事务
+ $model->rollback();
+ return error($e->getMessage());
+ }
+ return success();
+ }
+ $ori_img='';
+ $thumb_img='';
+ $imgurl_list=$mimode->field('thumb_image,ori_image,is_cover')->where(array('type'=>1,'union_id'=>$id))->select();
+ foreach ($imgurl_list as $key => $v) {
+ $is_cover=$v['is_cover']>0 ? $v['is_cover']:'0';
+ if ($is_cover == 1) {
+ $ori_img = $v['ori_image'];
+ $thumb_img = $v['thumb_image'];
}
-
- $result = $data->save($param);
- return $result ? success() : error();
}
-
$this->assign([
'data' => $data,
'goods_category_list' => $this->getSelectList(new GoodsCategory, $data->goods_category_id),
- 'brand_list' => Brand::all(),
- 'goodsattrcategory_list' => GoodsAttrCategory::all(),
- 'imgurl_list'=>array(),
+ 'ori_img'=>$ori_img,
+ 'thumb_img'=>$thumb_img,
+ 'imgurl_list'=>$imgurl_list,
]);
return $this->fetch('add');
diff --git a/application/admin/controller/IndexController.php b/application/admin/controller/IndexController.php
index 5d80b33..af6f6ea 100755
--- a/application/admin/controller/IndexController.php
+++ b/application/admin/controller/IndexController.php
@@ -12,49 +12,91 @@ use app\admin\model\AdminRole;
use app\admin\model\AdminUser;
use tools\SystemInfo;
use think\Request;
+use think\Db;
class IndexController extends Controller
{
public function index(Request $request)
{
- //默认密码修改检测
- $password_danger = 0;
- if (config('admin.password_warning') && $this->user->id == 1 && password_verify('super-admin', $this->user->password)) {
- $password_danger = 1;
+
+ //更新时间
+ $time = date('Y-m-d H:i:s', time());
+ //今日成交订单
+ $order_num_today = Db::name('order')
+ ->where(['order_type' =>1])
+ ->whereTime('create_time', 'today')
+ ->count();
+ //昨日
+ $order_num_yesterday = Db::name('order')
+ ->where(['order_type' =>1])
+ ->whereTime('create_time', 'yesterday')
+ ->count();
+ //变化
+ $order_num_change = $order_num_today - $order_num_yesterday;
+ if ($order_num_change >= 0) {
+ $order_num_change = '+' . $order_num_change;
+ }
+ //总
+ $order_num_all = Db::name('order')
+ ->where(['order_type' =>1])
+ ->count();
+ //今日销售金额（元）
+ $order_amount_today = Db::name('order')
+ ->where(['order_type' =>1])
+ ->whereTime('create_time', 'today')
+ ->sum('order_price');
+ //昨日
+ $order_amount_yesterday = Db::name('order')
+ ->where(['order_type' =>1])
+ ->whereTime('create_time', 'yesterday')
+ ->sum('order_price');
+ //总
+ $order_amount_all = Db::name('order')
+ ->where(['order_type' =>1])
+ ->sum('order_price');
+ //变化
+ $order_amount_change = $order_amount_today - $order_amount_yesterday;
+ if ($order_amount_change >= 0) {
+ $order_amount_change = '+' . $order_amount_change;
}
- /**
- * 首页数据展示，可自行替换
- */
- $this->assign([
- //后台用户数量
- 'admin_user_count' => AdminUser::count(),
- //后台角色数量
- 'admin_role_count' => AdminRole::count(),
- //后台菜单数量
- 'admin_menu_count' => AdminMenu::count(),
- //后台日志数量
- 'admin_log_count' => AdminLog::count(),
- ]);
- //是否显示欢迎信息
- $welcome_info = config('admin.welcome_info');
- if ($welcome_info) {
- $this->admin['name'] = config('admin.name');
+ // 今天新增会员数量
+ $add_user_today = Db::name('user')
+ ->whereTime('create_time', 'today')
+ ->count();
+ //昨天
+ $add_user_yesterday = Db::name('user')
+ ->whereTime('create_time', 'yesterday')
+ ->count();
+ //总
+ $user_all = Db::name('user')
+ ->count();
+ //变化
+ $add_change = $add_user_today - $add_user_yesterday;
+ if ($add_change >= 0) {
+ $add_change = '+' . $add_change;
}
+ $date=[
+ 'time' => $time,
+ 'order_num_today' => $order_num_today,
+ 'order_num_yesterday' => $order_num_yesterday,
+ 'order_num_change' => $order_num_change,
+ 'order_amount_today' => $order_amount_today,
+ 'order_amount_yesterday' => $order_amount_yesterday,
+ 'order_amount_change' => $order_amount_change,
+ 'add_user_today' => $add_user_today,
+ 'add_user_yesterday' => $add_user_yesterday,
+ 'add_user_change' => $add_change,
+
+ 'order_num_all' => $order_num_all,
+ 'order_amount_all' => $order_amount_all,
+ 'user_all' => $user_all,
+ ];
$this->assign([
- //系统信息
- 'system_info' => SystemInfo::getSystemInfo(),
- //访问信息
- 'visitor_info' => $request,
- //默认密码警告
- 'password_danger' => $password_danger,
- //当前用户
- 'user' => $this->user,
- //欢迎信息
- 'welcome_info' => $welcome_info
+ 'res'=>$date,
]);
return $this->fetch();
}
diff --git a/application/admin/controller/OrderController.php b/application/admin/controller/OrderController.php
index 607fcaf..b211d5b 100755
--- a/application/admin/controller/OrderController.php
+++ b/application/admin/controller/OrderController.php
@@ -5,15 +5,10 @@
namespace app\admin\controller;
-use app\common\model\DeliverAddress;
-use app\common\model\Express;
-use app\common\model\Goods;
-use app\common\model\Order;
-use app\common\model\OrderGoods;
-use app\common\model\User;
-use app\common\validate\OrderValidate;
-use think\Db;
use think\Request;
+use app\common\model\Order;
+
+use app\common\validate\OrderValidate;
class OrderController extends Controller
{
@@ -22,9 +17,53 @@ class OrderController extends Controller
public function index(Request $request, Order $model)
{
$param = $request->param();
- $model = $model->with('user,express')->scope('where', $param);
+ $where = [];
+ //订单搜素
+ if (!empty($param['search_key']) && !empty($param['keyword'])) {
+ $keyword = $param['keyword'];
+ switch ($param['search_key']) {
+ case 'order_sn':
+ $where[] = ['o.order_sn', 'like', '%' . $keyword . '%'];
+ break;
+ case 'user_sn':
+ $where[] = ['u.sn', 'like', '%' . $keyword . '%'];
+ break;
+ case 'nickname':
+ $where[] = ['u.nickname', 'like', '%' . $keyword . '%'];
+ break;
+ case 'user_mobile':
+ $where[] = ['u.mobile', 'like', '%' . $keyword . '%'];
+ break;
+ }
+ }
- $data = $model->paginate($this->admin['per_page'], false, ['query' => $request->get()]);
+ //商品名称
+ if (isset($param['goods_name']) && $param['goods_name'] != '') {
+ $where[] = ['o.goods_name', 'like', '%' . $param['goods_name'] . '%'];
+ }
+
+ //订单类型
+ if (isset($param['order_type']) && $param['order_type'] != '') {
+ $where[] = ['o.order_type', '=', $param['order_type']];
+ }
+
+ //下单时间
+ if (isset($param['start_time']) && $param['start_time'] != '') {
+ $where[] = ['o.create_time', '>=', strtotime($param['start_time'])];
+ }
+ if (isset($param['end_time']) && $param['end_time'] != '') {
+ $where[] = ['o.create_time', '<=', strtotime($param['end_time'])];
+ }
+ $model = $model
+ ->alias('o')
+ ->field('o.*,u.mobile,u.nickname,u.sn,u.avatar')
+ ->join('user u', 'u.id = o.user_id')
+ ->where($where)
+ ->order('o.id desc')
+ ->group('o.id')
+ ->scope('where', $param);
+
+ $data = $model->paginate($this->admin['per_page'], false, ['query'=>$request->get()]);
//关键词，排序等赋值
$this->assign($request->get());
@@ -35,95 +74,4 @@ class OrderController extends Controller
]);
return $this->fetch();
}
-
- //添加
- public function add(Request $request, Order $model, OrderValidate $validate)
- {
- if ($request->isPost()) {
- $param = $request->param();
- $validate_result = $validate->scene('add')->check($param);
- if (!$validate_result) {
- return error($validate->getError());
- }
-
- $result = $model::create($param);
-
- $url = URL_BACK;
- if (isset($param['_create']) && $param['_create'] == 1) {
- $url = URL_RELOAD;
- }
-
- return $result ? success('添加成功', $url) : error();
- }
-
- $this->assign([
- 'user_list' => User::all(),
- 'express_list' => Express::all(),
-
- ]);
-
-
- return $this->fetch();
- }
-
- //修改
- public function edit($id, Request $request, Order $model, OrderValidate $validate)
- {
-
- $data = $model::get($id);
- if ($request->isPost()) {
- $param = $request->param();
- $validate_result = $validate->scene('edit')->check($param);
- if (!$validate_result) {
- return error($validate->getError());
- }
-
- $result = $data->save($param);
- return $result ? success() : error();
- }
-
- $this->assign([
- 'data' => $data,
- 'user_list' => User::all(),
- 'express_list' => Express::all(),
-
- ]);
- return $this->fetch('add');
-
- }
-
- //删除
- public function del($id, Order $model)
- {
- if (count($model->noDeletionId) > 0) {
- if (is_array($id)) {
- if (array_intersect($model->noDeletionId, $id)) {
- return error('ID为' . implode(',', $model->noDeletionId) . '的数据无法删除');
- }
- } else if (in_array($id, $model->noDeletionId)) {
- return error('ID为' . $id . '的数据无法删除');
- }
- }
-
- if ($model->softDelete) {
- $result = $model->whereIn('id', $id)->useSoftDelete('delete_time', time())->delete();
- } else {
- $result = $model->whereIn('id', $id)->delete();
- }
-
- return $result ? success('操作成功', URL_RELOAD) : error();
- }
-
-
- //订单详情
- public function detail($id, Order $model)
- {
- $data = $model::get($id);
- $this->assign([
- 'data' => $data
- ]);
-
- return $this->fetch();
- }
-
}
diff --git a/application/admin/controller/ShopConfigController.php b/application/admin/controller/ShopConfigController.php
new file mode 100644
index 0000000..56adf26
--- /dev/null
+++ b/application/admin/controller/ShopConfigController.php
@@ -0,0 +1,125 @@
+isPost()) {
+ $param = $request->param();
+ ShopConfig::set('shouyi', 'time', $param['time']);
+ ShopConfig::set('shouyi', 'num', $param['num']);
+ $url = URL_RELOAD;
+ return success('添加成功',$url);
+ }
+ $config = [
+ 'time' => ShopConfig::get('shouyi', 'time'),
+ 'num' => ShopConfig::get('shouyi', 'num'),
+ ];
+ $this->assign([
+ 'config' => $config,
+ ]);
+ return $this->fetch();
+ }
+
+ //分销管理
+ public function fenxiao(Request $request, ShopConfig $model, ShopConfigValidate $validate)
+ {
+ if ($request->isPost()) {
+ $param = $request->param();
+ ShopConfig::set('fenxiao', 'first_ratio', $param['first_ratio']);
+ ShopConfig::set('fenxiao', 'second_ratio', $param['second_ratio']);
+ ShopConfig::set('fenxiao', 'number', $param['number']);
+ $url = URL_RELOAD;
+ return success('添加成功',$url);
+ }
+ $config = [
+ 'first_ratio' => ShopConfig::get('fenxiao', 'first_ratio'),
+ 'second_ratio' => ShopConfig::get('fenxiao', 'second_ratio'),
+ 'number' => ShopConfig::get('fenxiao', 'number'),
+ ];
+ $this->assign([
+ 'config' => $config,
+ ]);
+ return $this->fetch();
+ }
+
+ //政策协议
+ public function policy(Request $request, ShopConfig $model, ShopConfigValidate $validate)
+ {
+ if ($request->isPost()) {
+ $param = $request->param();
+ ShopConfig::set('policy', 'integral_rule', $param['integral_rule']);
+ $url = URL_RELOAD;
+ return success('添加成功',$url);
+ }
+ $config = [
+ 'integral_rule' => ShopConfig::get('policy', 'integral_rule'),
+ ];
+ $this->assign([
+ 'config' => $config,
+ ]);
+ return $this->fetch();
+ }
+
+ //会员提现
+ public function withdraw(Request $request, ShopConfig $model, ShopConfigValidate $validate)
+ {
+ if ($request->isPost()) {
+ $param = $request->param();
+ ShopConfig::set('withdraw', 'min_withdraw', $param['min_withdraw']);
+ ShopConfig::set('withdraw', 'max_withdraw', $param['max_withdraw']);
+ ShopConfig::set('withdraw', 'poundage', $param['poundage']);
+ $url = URL_RELOAD;
+ return success('添加成功',$url);
+ }
+ $config = [
+ 'min_withdraw' => ShopConfig::get('withdraw', 'min_withdraw'),
+ 'max_withdraw' => ShopConfig::get('withdraw', 'max_withdraw'),
+ 'poundage' => ShopConfig::get('withdraw', 'poundage'),
+ ];
+ $this->assign([
+ 'config' => $config,
+ ]);
+ return $this->fetch();
+ }
+
+ //试用设备设置
+ public function goods(Request $request, Goods $gmodel, ShopConfigValidate $validate)
+ {
+ if ($request->isPost()) {
+ $param = $request->param();
+ ShopConfig::set('goods', 'goods_id', $param['goods_id']);
+ ShopConfig::set('goods', 'day', $param['day']);
+ ShopConfig::set('goods', 'is_withdraw', $param['is_withdraw']);
+ ShopConfig::set('goods', 'is_first', $param['is_first']);
+ ShopConfig::set('goods', 'is_open', $param['is_open']);
+ $url = URL_RELOAD;
+ return success('添加成功',$url);
+ }
+ $config = [
+ 'goods_id' => ShopConfig::get('goods', 'goods_id'),
+ 'day' => ShopConfig::get('goods', 'day'),
+ 'is_withdraw' => ShopConfig::get('goods', 'is_withdraw'),
+ 'is_first' => ShopConfig::get('goods', 'is_first'),
+ 'is_open' => ShopConfig::get('goods', 'is_open'),
+ 'goods_list'=>Goods::all(),
+ ];
+ $this->assign([
+ 'config' => $config,
+ ]);
+ return $this->fetch();
+ }
+}
diff --git a/application/admin/controller/TagController.php b/application/admin/controller/TagController.php
deleted file mode 100755
index 91560d7..0000000
--- a/application/admin/controller/TagController.php
+++ /dev/null
@@ -1,105 +0,0 @@
-param();
- $model = $model->scope('where', $param);
-
- $data = $model->paginate($this->admin['per_page'], false, ['query' => $request->get()]);
- //关键词，排序等赋值
- $this->assign($request->get());
-
- $this->assign([
- 'data' => $data,
- 'page' => $data->render(),
- 'total' => $data->total(),
- ]);
- return $this->fetch();
- }
-
- //添加
- public function add(Request $request, Tag $model, TagValidate $validate)
- {
- if ($request->isPost()) {
- $param = $request->param();
- $validate_result = $validate->scene('add')->check($param);
- if (!$validate_result) {
- return error($validate->getError());
- }
-
- $result = $model::create($param);
-
- $url = URL_BACK;
- if (isset($param['_create']) && $param['_create'] == 1) {
- $url = URL_RELOAD;
- }
-
- return $result ? success('添加成功', $url) : error();
- }
-
-
- return $this->fetch();
- }
-
- //修改
- public function edit($id, Request $request, Tag $model, TagValidate $validate)
- {
-
- $data = $model::get($id);
- if ($request->isPost()) {
- $param = $request->param();
- $validate_result = $validate->scene('edit')->check($param);
- if (!$validate_result) {
- return error($validate->getError());
- }
-
- $result = $data->save($param);
- return $result ? success() : error();
- }
-
- $this->assign([
- 'data' => $data,
-
- ]);
- return $this->fetch('add');
-
- }
-
- //删除
- public function del($id, Tag $model)
- {
- if (count($model->noDeletionId) > 0) {
- if (is_array($id)) {
- if (array_intersect($model->noDeletionId, $id)) {
- return error('ID为' . implode(',', $model->noDeletionId) . '的数据无法删除');
- }
- } else if (in_array($id, $model->noDeletionId)) {
- return error('ID为' . $id . '的数据无法删除');
- }
- }
-
- if ($model->softDelete) {
- $result = $model->whereIn('id', $id)->useSoftDelete('delete_time', time())->delete();
- } else {
- $result = $model->whereIn('id', $id)->delete();
- }
-
- return $result ? success('操作成功', URL_RELOAD) : error();
- }
-
-
-}
diff --git a/application/admin/controller/TestController.php b/application/admin/controller/TestController.php
deleted file mode 100755
index 539ce69..0000000
--- a/application/admin/controller/TestController.php
+++ /dev/null
@@ -1,131 +0,0 @@
-param();
- $model = $model->scope('where', $param);
- if (isset($param['export_data']) && $param['export_data'] == 1) {
- $header = ['ID','',];
- $body = [];
- $data = $model->select();
- foreach ($data as $item) {
- $record = [];
- $record['id'] = $item->id;
-$record['name'] = $item->name;
-
- $body[] = $record;
- }
- return $this->exportData($header, $body, 'test-' . date('Y-m-d-H-i-s'));
-}
- $data = $model->paginate($this->admin['per_page'], false, ['query'=>$request->get()]);
- //关键词，排序等赋值
- $this->assign($request->get());
-
- $this->assign([
- 'data' => $data,
- 'page' => $data->render(),
- 'total' => $data->total(),
- ]);
- return $this->fetch();
- }
-
- //添加
- public function add(Request $request, Test $model, TestValidate $validate)
- {
- if ($request->isPost()) {
- $param = $request->param();
- $validate_result = $validate->scene('add')->check($param);
- if (!$validate_result) {
- return error($validate->getError());
- }
-
- $result = $model::create($param);
-
- $url = URL_BACK;
- if(isset($param['_create']) && $param['_create']==1){
- $url = URL_RELOAD;
- }
-
- return $result ? success('添加成功',$url) : error();
- }
-
-
-
- return $this->fetch();
- }
-
- //修改
- public function edit($id, Request $request, Test $model, TestValidate $validate)
- {
-
- $data = $model::get($id);
- if ($request->isPost()) {
- $param = $request->param();
- $validate_result = $validate->scene('edit')->check($param);
- if (!$validate_result) {
- return error($validate->getError());
- }
-
- $result = $data->save($param);
- return $result ? success() : error();
- }
-
- $this->assign([
- 'data' => $data,
-
- ]);
- return $this->fetch('add');
-
- }
-
- //删除
- public function del($id, Test $model)
- {
- if (count($model->noDeletionId) > 0) {
- if (is_array($id)) {
- if (array_intersect($model->noDeletionId, $id)) {
- return error('ID为' . implode(',', $model->noDeletionId) . '的数据无法删除');
- }
- } else if (in_array($id, $model->noDeletionId)) {
- return error('ID为' . $id . '的数据无法删除');
- }
- }
-
- if ($model->softDelete) {
- $result = $model->whereIn('id', $id)->useSoftDelete('delete_time', time())->delete();
- } else {
- $result = $model->whereIn('id', $id)->delete();
- }
-
- return $result ? success('操作成功', URL_RELOAD) : error();
- }
-
- //启用
-public function enable($id,Test $model)
-{
- $result = $model->whereIn('id',$id)->update(['status'=>1]);
- return $result ? success('操作成功', URL_RELOAD) : error();
-}
-
-
-//禁用
-public function disable($id,Test $model)
-{
- $result = $model->whereIn('id',$id)->update(['status'=>0]);
- return $result ? success('操作成功', URL_RELOAD) : error();
-}
-}
diff --git a/application/admin/controller/UserController.php b/application/admin/controller/UserController.php
index 33b1d18..9af8180 100755
--- a/application/admin/controller/UserController.php
+++ b/application/admin/controller/UserController.php
@@ -7,9 +7,11 @@ namespace app\admin\controller;
use think\Request;
use app\common\model\User;
-use app\common\model\UserLevel;
+use app\common\model\Order;
+use app\common\model\Goods;
use app\common\validate\UserValidate;
+use app\common\validate\OrderValidate;
class UserController extends Controller
{
@@ -18,27 +20,45 @@ class UserController extends Controller
public function index(Request $request, User $model)
{
$param = $request->param();
- $model = $model->with('user_level')->scope('where', $param);
- if (isset($param['export_data']) && $param['export_data'] == 1) {
- $header = ['ID', '头像', '用户等级', '用户名', '手机号', '昵称', '是否启用', '创建时间',];
- $body = [];
- $data = $model->select();
- foreach ($data as $item) {
- $record = [];
- $record['id'] = $item->id;
- $record['avatar'] = $item->avatar;
- $record['user_level_id'] = $item->user_level->name ?? '';
- $record['username'] = $item->username;
- $record['mobile'] = $item->mobile;
- $record['nickname'] = $item->nickname;
- $record['status'] = $item->status_text;
- $record['create_time'] = $item->create_time;
-
- $body[] = $record;
- }
- return $this->exportData($header, $body, 'user-' . date('Y-m-d-H-i-s'));
+ $where = [];
+ //查询
+ if(isset($param['keyword']) && $param['keyword']){
+ $where[] = [$param['keyword_type'],'like','%'.$param['keyword'].'%'];
}
+ //等级查询
+ if(isset($param['level']) && $param['level'] != ''){
+ $where[] = ['user_level_id','=',$param['level']];
+ }
+ //提现积分
+ if(isset($param['integral_start']) && $param['integral_start']){
+ $where[] = ['integral','>=',$param['integral_start']];
+ }
+ if(isset($param['integral_end']) && $param['integral_end']){
+ $where[] = ['integral','<=',$param['integral_end']];
+ }
+ //注册时间
+ if(isset($param['start_time']) && $param['start_time']!=''){
+ $where[] = ['create_time','>=',strtotime($param['start_time'])];
+ }
+ if(isset($param['end_time']) && $param['end_time']!=''){
+ $where[] = ['create_time','<=',strtotime($param['end_time'])];
+ }
+
+ $model = $model->where($where)->scope('where', $param);
$data = $model->paginate($this->admin['per_page'], false, ['query' => $request->get()]);
+ foreach ($data as $key => $value) {
+ // 上级推荐人
+ $value['first_leader_info'] = User::getUserInfo($value['first_leader']);
+ //推荐下级人数
+ $value['fans'] = User::where([
+ ['first_leader|second_leader', '=', $value['id']]
+ ])->count();
+
+ //设备数量
+ $value['sb_num'] = Order::where([
+ ['user_id', '=', $value['id']]
+ ])->count();
+ }
//关键词，排序等赋值
$this->assign($request->get());
@@ -78,13 +98,6 @@ class UserController extends Controller
return $result ? success('添加成功', $url) : error();
}
-
- $this->assign([
- 'user_level_list' => UserLevel::all(),
-
- ]);
-
-
return $this->fetch();
}
@@ -115,8 +128,6 @@ class UserController extends Controller
$this->assign([
'data' => $data,
- 'user_level_list' => UserLevel::all(),
-
]);
return $this->fetch('add');
@@ -157,4 +168,47 @@ class UserController extends Controller
$result = $model->whereIn('id', $id)->update(['status' => 0]);
return $result ? success('操作成功', URL_RELOAD) : error();
}
+
+
+ //分配设备
+ public function equipmentadd(Request $request,Order $omodel)
+ {
+ if ($request->isPost()) {
+ $param = $request->param();
+ $goods_ids=$param['goods_id'];
+ if(count($goods_ids)==0){
+ return error('请选择设备信息');
+ }
+ $field_data = array();
+ foreach ($goods_ids as $key => $value) {
+ if($param['goods_id'][$key][0] && $param['number'][$key][0] && $param['end_time'][$key][0]){
+ $goods_info=Goods::where(array('id'=>$param['goods_id'][$key][0]))->find()->toArray();
+ $field_data[] = [
+ 'order_no'=>get_order_sn(),
+ 'goods_id' => $param['goods_id'][$key][0],
+ 'number' => $param['number'][$key][0],
+ 'end_time' => strtotime($param['end_time'][$key][0]),
+ 'user_id' => $param['id'],
+ 'goods_name' => $goods_info['name'],
+ 'attr' => $goods_info['attr'],
+ 'order_price' => $goods_info['price']*$param['number'][$key][0],
+ 'create_time'=>time(),
+ ];
+ }
+ }
+ if(count($field_data)==0){
+ return error('请检查设备信息是否填写完整');
+ }
+ $result = $omodel->insertAll($field_data);
+ $url = URL_BACK;
+ if (isset($param['_create']) && $param['_create'] == 1) {
+ $url = URL_RELOAD;
+ }
+ return $result ? success('添加成功', $url) : error();
+ }
+ $this->assign([
+ 'goods_list' => Goods::all(),
+ ]);
+ return $this->fetch();
+ }
}
diff --git a/application/admin/controller/UserLevelController.php b/application/admin/controller/UserLevelController.php
deleted file mode 100755
index 70f6550..0000000
--- a/application/admin/controller/UserLevelController.php
+++ /dev/null
@@ -1,152 +0,0 @@
-param();
- $model = $model->scope('where', $param);
- if (isset($param['export_data']) && $param['export_data'] == 1) {
- $header = ['ID', '名称', '简介', '图片', '是否启用', '创建时间',];
- $body = [];
- $data = $model->select();
- foreach ($data as $item) {
- $record = [];
- $record['id'] = $item->id;
- $record['name'] = $item->name;
- $record['description'] = $item->description;
- $record['img'] = $item->img;
- $record['status'] = $item->status_text;
- $record['create_time'] = $item->create_time;
-
- $body[] = $record;
- }
- return $this->exportData($header, $body, 'user_level-' . date('Y-m-d-H-i-s'));
- }
- $data = $model->paginate($this->admin['per_page'], false, ['query' => $request->get()]);
- //关键词，排序等赋值
- $this->assign($request->get());
-
- $this->assign([
- 'data' => $data,
- 'page' => $data->render(),
- 'total' => $data->total(),
- ]);
- return $this->fetch();
- }
-
- //添加
- public function add(Request $request, UserLevel $model, UserLevelValidate $validate)
- {
- if ($request->isPost()) {
- $param = $request->param();
- $validate_result = $validate->scene('add')->check($param);
- if (!$validate_result) {
- return error($validate->getError());
- }
- //处理图片上传
- $attachment_img = new \app\common\model\Attachment;
- $file_img = $attachment_img->upload('img');
- if ($file_img) {
- $param['img'] = $file_img->url;
- } else {
- return error($attachment_img->getError());
- }
-
-
- $result = $model::create($param);
-
- $url = URL_BACK;
- if (isset($param['_create']) && $param['_create'] == 1) {
- $url = URL_RELOAD;
- }
-
- return $result ? success('添加成功', $url) : error();
- }
-
-
- return $this->fetch();
- }
-
- //修改
- public function edit($id, Request $request, UserLevel $model, UserLevelValidate $validate)
- {
-
- $data = $model::get($id);
- if ($request->isPost()) {
- $param = $request->param();
- $validate_result = $validate->scene('edit')->check($param);
- if (!$validate_result) {
- return error($validate->getError());
- }
- //处理图片上传
- if (!empty($_FILES['img']['name'])) {
- $attachment_img = new \app\common\model\Attachment;
- $file_img = $attachment_img->upload('img');
- if ($file_img) {
- $param['img'] = $file_img->url;
- }
- }
-
-
- $result = $data->save($param);
- return $result ? success() : error();
- }
-
- $this->assign([
- 'data' => $data,
-
- ]);
- return $this->fetch('add');
-
- }
-
- //删除
- public function del($id, UserLevel $model)
- {
- if (count($model->noDeletionId) > 0) {
- if (is_array($id)) {
- if (array_intersect($model->noDeletionId, $id)) {
- return error('ID为' . implode(',', $model->noDeletionId) . '的数据无法删除');
- }
- } else if (in_array($id, $model->noDeletionId)) {
- return error('ID为' . $id . '的数据无法删除');
- }
- }
-
- if ($model->softDelete) {
- $result = $model->whereIn('id', $id)->useSoftDelete('delete_time', time())->delete();
- } else {
- $result = $model->whereIn('id', $id)->delete();
- }
-
- return $result ? success('操作成功', URL_RELOAD) : error();
- }
-
- //启用
- public function enable($id, UserLevel $model)
- {
- $result = $model->whereIn('id', $id)->update(['status' => 1]);
- return $result ? success('操作成功', URL_RELOAD) : error();
- }
-
-
- //禁用
- public function disable($id, UserLevel $model)
- {
- $result = $model->whereIn('id', $id)->update(['status' => 0]);
- return $result ? success('操作成功', URL_RELOAD) : error();
- }
-}
diff --git a/application/admin/controller/WeChatController.php b/application/admin/controller/WeChatController.php
deleted file mode 100755
index da7d4d3..0000000
--- a/application/admin/controller/WeChatController.php
+++ /dev/null
@@ -1,159 +0,0 @@
-fetch();
- }
-
- //服务端验证
- public function server()
- {
- $config = config('wechat.');
-
- $app = Factory::officialAccount($config);
-
- $response = $app->server->serve();
-
- // 将响应输出
- return $response->send();
- }
-
- //接收 & 回复用户消息
- public function msg()
- {
- $config = config('wechat.');
-
- $app = Factory::officialAccount($config);
-
- $app->server->push(function ($message) {
- return "你好哇";
- });
-
- $response = $app->server->serve();
-
- // 将响应输出
- $response->send(); // Laravel 里请使用：return $response;
- }
-
- //获取用户信息
- public function user()
- {
- $config = config('wechat.');
-
- $app = Factory::officialAccount($config);
- $user = $app->user->get('用户的openID');
-
- }
-
-
- //发送模版消息
- public function templateMsg()
- {
- $config = config('wechat.');
-
- $app = Factory::officialAccount($config);
-
- $app->template_message->send([
- 'touser' => 'user-openid',
- 'template_id' => 'template-id',
- 'url' => 'https://easywechat.org',
- 'miniprogram' => [
- 'appid' => 'xxxxxxx',
- 'pagepath' => 'pages/xxx',
- ],
- 'data' => [
- 'key1' => 'VALUE',
- 'key2' => 'VALUE2',
- ],
- ]);
- }
-
-
- //拉黑用户
- public function block()
- {
- $config = config('wechat.');
-
- $app = Factory::officialAccount($config);
-
- $app->user->block('openidxxxxx');
- // 或者多个用户
- $app->user->block(['openid1', 'openid2', 'openid3',]);
- }
-
-
- //统一下单
- public function pay()
- {
- $config = config('wechat.');
- $app = Factory::payment($config);
- $result = $app->order->unify([
- 'body' => '腾讯充值中心-QQ会员充值',
- 'out_trade_no' => '20150806125346',
- 'total_fee' => 88,
- 'spbill_create_ip' => '123.12.12.123', // 可选，如不传该参数，SDK 将会自动获取相应 IP 地址
- 'notify_url' => 'https://pay.weixin.qq.com/wxpay/pay.action', // 支付结果通知网址，如果不设置则会使用配置里的默认地址
- 'trade_type' => 'JSAPI', // 请对应换成你的支付方式对应的值类型
- 'openid' => 'oUpF8uMuAJO_M2pxb1Q9zNjWeS6o',
- ]);
- }
-
-
- //根据微信订单号退款
- public function refundByTransactionId()
- {
- $config = config('wechat.');
- $app = Factory::payment($config);
- $result = $app->refund->byTransactionId('transaction-id-xxx', 'refund-no-xxx', 10000, 10000, [
- // 可在此处传入其他参数，详细参数见微信支付文档
- 'refund_desc' => '商品已售完',
- ]);
- }
-
-
- //根据商户订单号退款
- public function refundByOutTradeNo()
- {
- $config = config('wechat.');
- $app = Factory::payment($config);
- $result = $app->refund->byOutTradeNumber('out-trade-no-xxx', 'refund-no-xxx', 20000, 1000, [
- // 可在此处传入其他参数，详细参数见微信支付文档
- 'refund_desc' => '退运费',
- ]);
- }
-
-
- //发送普通红包
- public function redPacket()
- {
- $config = config('wechat.');
- $app = Factory::payment($config);
- $redpack = $app->redpack;
- $redpackData = [
- 'mch_billno' => 'xy123456',
- 'send_name' => '测试红包',
- 're_openid' => 'oxTWIuGaIt6gTKsQRLau2M0yL16E',
- 'total_num' => 1, //固定为1，可不传
- 'total_amount' => 100, //单位为分，不小于100
- 'wishing' => '祝福语',
- 'client_ip' => '192.168.0.1', //可不传，不传则由 SDK 取当前客户端 IP
- 'act_name' => '测试活动',
- 'remark' => '测试备注',
- // ...
- ];
-
- $result = $redpack->sendNormal($redpackData);
- }
-}
\ No newline at end of file
diff --git a/application/admin/controller/WithdrawController.php b/application/admin/controller/WithdrawController.php
new file mode 100644
index 0000000..a588f21
--- /dev/null
+++ b/application/admin/controller/WithdrawController.php
@@ -0,0 +1,149 @@
+WITHDRAW_TYPE;
+ $STATUS_TYPE=$model->STATUS_TYPE;
+ $param = $request->param();
+
+ $where = [];
+ // 会员信息
+ if (!empty($param['search_key']) && !empty($param['keyword'])) {
+ $keyword = $param['keyword'];
+ if ($param['search_key'] == 'user_sn') {
+ $where[] = ['u.sn', '=', $keyword];
+ } elseif ($param['search_key'] == 'nickname'){
+ $where[] = ['u.nickname', 'like', '%' . $keyword . '%'];
+ }
+ }
+
+ //提现单号
+ if (isset($param['withdraw_sn']) && $param['withdraw_sn'] != '') {
+ $where[] = ['w.sn', '=', $param['withdraw_sn']];
+ }
+
+ //提现方式
+ if (isset($param['type']) && $param['type'] != '') {
+ $where[] = ['type', '=', $param['type']];
+ }
+
+ //提现状态
+ if (isset($param['status']) && $param['status'] != '') {
+ $where[] = ['w.status', '=', $param['status']];
+ }
+
+ // 提现时间
+ if (isset($param['start_time']) && $param['start_time'] && isset($param['end_time']) && $param['end_time']) {
+ $where[] = ['w.create_time', 'between', [strtotime($param['start_time']), strtotime($param['end_time'])]];
+ }
+
+ $model = $model
+ ->alias('w')
+ ->field('w.*,u.mobile,u.nickname,u.sn as user_sn,u.avatar')
+ ->join('user u', 'u.id = w.user_id')
+ ->where($where)
+ ->scope('where', $param);
+
+ $data = $model->paginate($this->admin['per_page'], false, ['query'=>$request->get()]);
+ //关键词，排序等赋值
+ $this->assign($request->get());
+
+ $this->assign([
+ 'data' => $data,
+ 'page' => $data->render(),
+ 'total' => $data->total(),
+ 'type_list' =>$WITHDRAW_TYPE,
+ 'status_list'=>$STATUS_TYPE,
+ ]);
+ return $this->fetch();
+ }
+
+ public function review($id,Request $request, WithdrawApply $model)
+ {
+ $this->assign([
+ 'id' => $id,
+ ]);
+ return $this->fetch();
+ }
+
+
+ //审核通过
+ public function confirm(Request $request, WithdrawApply $model)
+ {
+ $param = $request->param();
+ $id = $param['id'];
+ $withdraw =$model
+ ->where('id', $id)
+ ->find();
+ // 判断提现单是否为待提现状态 1
+ if($withdraw['status'] != 1) {
+ return error('不是待提现申请单');
+ }
+ // 启动事务
+ $model->startTrans();
+ try{
+ // 直接标识为审核成功状态
+ $model
+ ->where('id', $id)
+ ->update(['status' =>2, 'update_time' => time(),'description'=>$param['description']]);
+ // 提交事务
+ $model->commit();
+ }catch(\Exception $e){
+ // 回滚事务
+ $model->rollback();
+ return error($e->getMessage());
+ }
+ return success('审核通过');
+ }
+
+ //审核拒绝
+ public function refuse(Request $request, WithdrawApply $model)
+ {
+ $model->startTrans();
+ $param = $request->param();
+ try{
+ $withdraw_apply = WithdrawApply::where('id', $param['id'])->find();
+ $withdraw_apply->status =3; // 提现失败
+ $withdraw_apply->description = $param['description'];
+ $withdraw_apply->update_time = time();
+ $withdraw_apply->save();
+
+ //拒绝提现,回退佣金
+ $user = User::get($withdraw_apply['user_id']);
+ $user->integral = ['inc', $withdraw_apply['money']];
+ $user->save();
+
+ //增加账户变动记录
+ AccountLog::AccountRecord(
+ $withdraw_apply['user_id'],
+ $withdraw_apply['money'],
+ 1,
+ 130,
+ '',
+ $withdraw_apply['id'],
+ $withdraw_apply['sn']
+ );
+ $model->commit();
+ } catch (Exception $e){
+ $model->rollback();
+ return error($e->getMessage());
+ }
+ return success('提现失败已回退用户账户');
+ }
+}
diff --git a/application/admin/view/account_log/integrallist.html b/application/admin/view/account_log/integrallist.html
new file mode 100644
index 0000000..6a3bbae
--- /dev/null
+++ b/application/admin/view/account_log/integrallist.html
@@ -0,0 +1,174 @@
+{extend name="public/base" /}
+{block name='content'}
+{include file='public/content_header' /}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | 流水单号（20位） |
+ 会员昵称 |
+ 会员编号 |
+ 手机号码 |
+ 来源类型 |
+ 来源单号 |
+ 变动总数 |
+ 剩余总数 |
+ 变动时间 |
+
+
+
+ {foreach name="data" item="item"}
+
+ | {$item.log_sn} |
+ {$item.nickname} |
+ {$item.user_sn} |
+ {$item.mobile} |
+ {$item.source_type_text} |
+ {$item.source_sn} |
+ {$item.change_amount} |
+ {$item.left_amount} |
+ {$item.create_time} |
+
+ {/foreach}
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
![]()
-
-
-
-
-
-
-
-
-
-
-{/block}
\ No newline at end of file
diff --git a/application/admin/view/demo/sms.html b/application/admin/view/demo/sms.html
deleted file mode 100755
index eb32154..0000000
--- a/application/admin/view/demo/sms.html
+++ /dev/null
@@ -1,70 +0,0 @@
-
-{extend name="public/base" /}
-{block name='content'}
-{include file='public/content_header' /}
-
-
-{/block}
\ No newline at end of file
diff --git a/application/admin/view/express/add.html b/application/admin/view/express/add.html
deleted file mode 100755
index 9b4ccf3..0000000
--- a/application/admin/view/express/add.html
+++ /dev/null
@@ -1,91 +0,0 @@
-{extend name='public/base' /}
-{block name='content'}
-{include file='public/content_header' /}
-
-
-{/block}
\ No newline at end of file
diff --git a/application/admin/view/express/index.html b/application/admin/view/express/index.html
deleted file mode 100755
index de8c38e..0000000
--- a/application/admin/view/express/index.html
+++ /dev/null
@@ -1,124 +0,0 @@
-{extend name="public/base" /}
-{block name='content'}
-{include file='public/content_header' /}
-
-
-
-{/block}
-
diff --git a/application/admin/view/finance/lists.html b/application/admin/view/finance/lists.html
new file mode 100755
index 0000000..20276b0
--- /dev/null
+++ b/application/admin/view/finance/lists.html
@@ -0,0 +1,177 @@
+{extend name="public/base" /}
+{block name='content'}
+{include file='public/content_header' /}
+
+
+
+
+
+
+
+
+
+
本月订单金额（元）
+
+
+
1
+
+
+
+
+
订单总金额（元）
+
+
+
1
+
+
+
+
+
订单总数（笔）
+
+
+
1
+
+
+
+
+
退款订单总额（元）
+
+
+
1
+
+
+
+
+
退款订单总数（笔）
+
+
+
1
+
+
+
+
+
+
+
+
+
会员余额（元）
+
+
+
1
+
+
+
+
+
会员积分
+
+
+
1
+
+
+
+
+
会员可提现佣金（元）
+
+
+
1
+
+
+
+
+
会员已提现佣金（元）
+
+
+
1
+
+
+
+
+
+
+
+
+
本月分销佣金（元）
+
+
+
1
+
+
+
+
+
分销总佣金（元）
+
+
+
1
+
+
+
+
+
提现中佣金（元）
+
+
+
1
+
+
+
+
+
已提现佣金（元）
+
+
+
1
+
+
+
@@ -227,6 +226,26 @@ ul.albums li a.btn-fm_z{
}
});
+
+
diff --git a/application/admin/view/goods/index.html b/application/admin/view/goods/index.html
index aa02a02..11e3b7f 100755
--- a/application/admin/view/goods/index.html
+++ b/application/admin/view/goods/index.html
@@ -93,18 +93,14 @@
placeholder="全选/取消">
ID |
- 图片 |
名称 |
所属分类 |
- 品牌 |
- 原价 |
售价 |
- 重量(克) |
+ 规格 |
库存 |
排序(升序) |
是否上架 |
创建时间 |
-
操作 |
@@ -117,18 +113,14 @@
placeholder="选择/取消">
{$item.id} |
-  |
{$item.name} |
{$item.goods_category.name|default=''} |
- {$item.brand.name|default=''} |
- {$item.origin_price} |
{$item.price} |
- {$item.weight} |
+ {$item.attr} |
{$item.stock} |
{$item.sort_number} |
{$item.status_text} |
{$item.create_time} |
-
diff --git a/application/admin/view/goods_attr_category/add.html b/application/admin/view/goods_attr_category/add.html
deleted file mode 100755
index 6e960c6..0000000
--- a/application/admin/view/goods_attr_category/add.html
+++ /dev/null
@@ -1,170 +0,0 @@
-{extend name='public/base' /}
-{block name='content'}
-{include file='public/content_header' /}
-
-
-{/block}
\ No newline at end of file
diff --git a/application/admin/view/goods_attr_category/index.html b/application/admin/view/goods_attr_category/index.html
deleted file mode 100755
index 07b346d..0000000
--- a/application/admin/view/goods_attr_category/index.html
+++ /dev/null
@@ -1,118 +0,0 @@
-{extend name="public/base" /}
-{block name='content'}
-{include file='public/content_header' /}
-
-
-
-{/block}
-
diff --git a/application/admin/view/index/index.html b/application/admin/view/index/index.html
index 26313d4..3cdaddb 100755
--- a/application/admin/view/index/index.html
+++ b/application/admin/view/index/index.html
@@ -1,252 +1,155 @@
{extend name="public/base" /}
{block name='content'}
{include file='public/content_header' /}
+
-
- {if $welcome_info}
-
-
-
- 你好,{$user.nickname|default='管理员'}:
- 欢迎来到{$admin.name|default='后台管理系统'}，左侧为菜单区域，右侧为功能区。
-
+
+
+
- {/if}
-
-
-
-
-
-
-
-
-
- 后台用户
- {$admin_user_count|default='0'}
+
+
+
+
+
+ {$res.order_num_today}
+ 昨日：{$res.order_num_yesterday}
+ {$res.order_num_change}
+
+ 成交订单总量（笔） {$res.order_num_all}
+
-
-
-
-
-
-
-
- 后台角色
- {$admin_role_count|default='0'}
+
+
+
+
+ {$res.order_amount_today}
+
+ 昨日：{$res.order_amount_yesterday}
+ {$res.order_amount_change}
+ 销售总额（元） {$res.order_amount_all}
+
-
-
-
-
-
-
-
- 后台菜单
- {$admin_menu_count|default='0'}
+
+
+
+
+ {$res.add_user_today}
+ 昨日：{$res.add_user_yesterday}
+ {$res.add_user_change}
+
+
-
-
-
-
-
-
-
-
-
-
- 操作日志
- {$admin_log_count|default='0'}
+
+
-
-
-
-
+
{/block}
\ No newline at end of file
diff --git a/application/admin/view/layout1.html b/application/admin/view/layout1.html
new file mode 100755
index 0000000..5eeea22
--- /dev/null
+++ b/application/admin/view/layout1.html
@@ -0,0 +1,29 @@
+{if !$admin.pjax}
+
+
+
+
+
+
+{/if}
+ {block name='title'}
+ {$admin.title|default='Admin'} | {$admin.name|default='Admin'}
+ {/block}
+{if !$admin.pjax}
+
+ {include file='public/head_css' /}
+ {include file='public/head_js' /}
+
+
+{/if}
+
+
+ {block name='content'}{/block}
+
+{if !$admin.pjax}
+{/if}
+
+{if !$admin.pjax}
+
+
+{/if}
\ No newline at end of file
diff --git a/application/admin/view/order/add.html b/application/admin/view/order/add.html
deleted file mode 100755
index 69d9037..0000000
--- a/application/admin/view/order/add.html
+++ /dev/null
@@ -1,349 +0,0 @@
-{extend name='public/base' /}
-{block name='content'}
-{include file='public/content_header' /}
-
-
-{/block}
\ No newline at end of file
diff --git a/application/admin/view/order/detail.html b/application/admin/view/order/detail.html
deleted file mode 100755
index d2f5011..0000000
--- a/application/admin/view/order/detail.html
+++ /dev/null
@@ -1,113 +0,0 @@
-
-{extend name="public/base" /}
-{block name='content'}
-{include file='public/content_header' /}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- | 基本信息 |
-
-
-
- | 订单ID |
- {$data.id} |
- 订单号 |
- {$data.order_no} |
- 订单金额 |
- {$data.order_price} |
- 下单人 |
- {$data.user.nickname|default=''}[{$data.user.mobile|default=''}] |
- 下单时间 |
- {$data.create_time} |
-
-
-
- | 支付信息 |
-
-
-
- | 应付金额 |
- {$data.pay_price} |
- 支付方式 |
- {$data.pay_channel_text} |
- 实付金额 |
- {$data.pay_price} |
- 支付状态 |
- {$data.pay_status_text} |
- 付款时间 |
- {$data.pay_time} |
-
-
-
-
- | 商品信息 |
-
-
- | 名称 |
- 价格 |
- 数量 |
- 小记 |
-
-
- {foreach name='data.orderGoods' item='item'}
-
- | {$item.name} |
- {$item.price} |
- {$item.number} |
- {$item.total_price} |
-
- {/foreach}
-
-
- | 收货信息 |
-
-
-
- | 发货状态 |
- {$data.deliver_status_text} |
- 收货人姓名 |
- {$data.name} |
- 订收货人手机号 |
- {$data.mobile} |
- 收货地址 |
- {$data.full_address} |
- 快递单号 |
- {$data.express_no}[{$data.express.name|default=''}] |
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{/block}
\ No newline at end of file
diff --git a/application/admin/view/order/index.html b/application/admin/view/order/index.html
index f6768ec..5d0187f 100755
--- a/application/admin/view/order/index.html
+++ b/application/admin/view/order/index.html
@@ -1,90 +1,165 @@
{extend name="public/base" /}
{block name='content'}
{include file='public/content_header' /}
+
| 
+ 设备管理
+ 
+ 会员管理
+ 
+ 用户订单管理
+ 
+ 积分记录
+ 
+ 提现记录
+