wupengfei 2 年之前
父節點
當前提交
fd25c1ef34
共有 93 個文件被更改,包括 1 次插入7153 次删除
  1. 0 200
      application/api/controller/Address.php
  2. 0 222
      application/api/controller/Appointment.php
  3. 0 192
      application/api/controller/Expedite.php
  4. 1 1
      application/api/controller/General.php
  5. 0 190
      application/api/controller/Mall.php
  6. 0 333
      application/api/controller/Order.php
  7. 0 42
      application/api/controller/Task.php
  8. 0 305
      application/api/controller/Trolley.php
  9. 0 2
      application/api/controller/Upload.php
  10. 0 3
      application/api/controller/UserCenter.php
  11. 0 279
      application/api/controller/WalletManage.php
  12. 0 315
      application/api/controller/WashOrder.php
  13. 0 151
      application/api/controller/WeChatPay.php
  14. 0 8
      application/common/model/AppOrder.php
  15. 0 9
      application/common/model/GoodsOrderRefund.php
  16. 0 8
      application/common/model/GoodsParam.php
  17. 0 14
      application/common/model/GoodsSeason.php
  18. 0 8
      application/common/model/GoodsSellInfo.php
  19. 0 12
      application/common/model/GoodsServe.php
  20. 0 9
      application/common/model/InviteInfo.php
  21. 0 9
      application/common/model/LevelOrder.php
  22. 0 12
      application/common/model/OrderComment.php
  23. 0 26
      application/common/model/ShoppingTrolley.php
  24. 0 9
      application/common/model/UserBank.php
  25. 0 81
      application/common/model/UserCollect.php
  26. 0 9
      application/common/model/UserIntegralLog.php
  27. 0 11
      application/common/model/UserLearn.php
  28. 0 9
      application/common/model/UserLevel.php
  29. 0 39
      application/common/model/UserLevelRank.php
  30. 0 8
      application/common/model/UserMoneyInfo.php
  31. 0 7
      application/common/model/UserSign.php
  32. 0 12
      application/common/model/UserWallet.php
  33. 0 10
      application/common/model/WashCate.php
  34. 0 14
      application/common/model/WashOrder.php
  35. 0 11
      application/common/model/WashOrderItem.php
  36. 0 61
      application/common/service/Activity.php
  37. 0 129
      application/mall/controller/Banner.php
  38. 0 89
      application/mall/controller/Comment.php
  39. 0 179
      application/mall/controller/CouponConfig.php
  40. 0 249
      application/mall/controller/CouponList.php
  41. 0 145
      application/mall/controller/ExpressCompany.php
  42. 0 157
      application/mall/controller/FreightTemplate.php
  43. 0 131
      application/mall/controller/WashCate.php
  44. 0 44
      application/mall/view/banner/form.html
  45. 0 63
      application/mall/view/banner/index.html
  46. 0 15
      application/mall/view/banner/index_search.html
  47. 0 69
      application/mall/view/comment/index.html
  48. 0 22
      application/mall/view/comment/index_search.html
  49. 0 38
      application/mall/view/express_company/form.html
  50. 0 65
      application/mall/view/express_company/index.html
  51. 0 312
      application/mall/view/freight_template/form.html
  52. 0 74
      application/mall/view/freight_template/index.html
  53. 0 16
      application/mall/view/freight_template/index_search.html
  54. 0 92
      application/mall/view/wash_cate/form.html
  55. 0 63
      application/mall/view/wash_cate/index.html
  56. 0 16
      application/mall/view/wash_cate/index_search.html
  57. 0 104
      application/order/controller/AppOrder.php
  58. 0 53
      application/order/controller/LevelOrder.php
  59. 0 167
      application/order/controller/StoreOrder.php
  60. 0 191
      application/order/controller/WashOrder.php
  61. 0 90
      application/order/view/app_order/detail.html
  62. 0 36
      application/order/view/app_order/form.html
  63. 0 92
      application/order/view/app_order/index.html
  64. 0 54
      application/order/view/app_order/index_search.html
  65. 0 36
      application/order/view/level_order/form.html
  66. 0 35
      application/order/view/level_order/index.html
  67. 0 28
      application/order/view/level_order/index_search.html
  68. 0 102
      application/order/view/store_order/detail.html
  69. 0 66
      application/order/view/store_order/express.html
  70. 0 93
      application/order/view/store_order/index.html
  71. 0 72
      application/order/view/store_order/index_search.html
  72. 0 90
      application/order/view/wash_order/detail.html
  73. 0 101
      application/order/view/wash_order/index.html
  74. 0 72
      application/order/view/wash_order/index_search.html
  75. 0 87
      application/user/controller/Bank.php
  76. 0 64
      application/user/controller/Delivery.php
  77. 0 61
      application/user/controller/Integral.php
  78. 0 123
      application/user/controller/Level.php
  79. 0 115
      application/user/controller/Message.php
  80. 0 61
      application/user/controller/Money.php
  81. 0 65
      application/user/view/delivery/index.html
  82. 0 48
      application/user/view/delivery/index_search.html
  83. 0 34
      application/user/view/integral/index.html
  84. 0 26
      application/user/view/integral/index_search.html
  85. 0 97
      application/user/view/level/form.html
  86. 0 61
      application/user/view/level/index.html
  87. 0 34
      application/user/view/money/index.html
  88. 0 26
      application/user/view/money/index_search.html
  89. 0 32
      application/user/view/sign_log/index.html
  90. 0 26
      application/user/view/sign_log/index_search.html
  91. 0 30
      application/user/view/tag/form.html
  92. 0 62
      application/user/view/tag/index.html
  93. 0 20
      application/user/view/tag/send.html

+ 0 - 200
application/api/controller/Address.php

@@ -1,200 +0,0 @@
-<?php
-namespace app\api\controller;
-use app\common\model\DeliveryAddress;
-use think\Db;
-/**
- * @title 地址管理
- * @controller Address
- * @group base
- */
-class Address extends Base
-{
-    public function initialize()
-    {
-        parent::initialize();
-        parent::checkLogin();
-    }
-
-
-    /**
-     * @title 设置收货地址(新增或修改)
-     * @desc  设置收货地址(新增或修改)
-     * @author  qc
-     * @url /api/Address/setDeliveryAddress
-     * @method POST
-     * @header name:Authorization require:1 desc:Token
-     * @param  name:id type:int  : default:0 desc:收货地址记录id(不传值是添加)
-     * @param  name:pro_name type:string  require:1  default:-- desc:省名
-     * @param  name:city_name type:string  require:1  default:-- desc:市名
-     * @param  name:county_name type:string  require:1  default:-- desc:县区名
-     * @param  name:detail type:string  require:1  default:-- desc:详细地址
-     * @param  name:phone type:string  require:1  default:-- desc:联系电话
-     * @param  name:name type:string  require:1  default:-- desc:联系人
-     * @param  name:is_mr type:int  require:0  default:0 desc:是否是默认(0不默认,1默认)
-     */
-    public function  setDeliveryAddress()
-    {
-        $pro_name     = input('post.pro_name');// 省
-        $city_name    = input('post.city_name');// 市
-        $county_name  = input('post.county_name');// 县区
-        $street_name  = input('post.street_name','' );
-        $pro_id     = Db::name('store_area')->where('name',$pro_name)->value('id');
-        $city_id    = Db::name('store_area')->where('name',$city_name)->value('id');
-        $county_id  = Db::name('store_area')->where('name',$county_name)->value('id');
-        $detail     = input('post.detail');// 详细地址
-        $phone      = input('post.phone');
-        $name       = input('post.name');
-        $id         = input('post.id');
-        $is_mr      = input('post.is_mr',0);
-        $set_data =  compact(['pro_id','city_id','county_id','detail','phone','name','is_mr']);
-        $set_data['user_id']    = $this->user_id;
-        $set_data['pro_name']   = $pro_name;
-        $set_data['city_name']  = $city_name;
-        $set_data['county_name']= $county_name;
-        $set_data['street_name']= $street_name;
-        $set_data['mer_name']=$pro_name . $city_name. $county_name;
-        if($id) {
-            Db::name('delivery_address')->where(['id'=>$id])->update($set_data);
-        }else{
-            Db::name('delivery_address')->insert($set_data);
-            $id = Db::getLastInsID();
-        }
-        if($is_mr) Db::name('delivery_address')->where('user_id','=',$this->user_id)->where('id','<>',$id)->where('is_mr','=',1)->update(['is_mr'=>0]);
-        $this->success('编辑成功');
-    }
-
-    /**
-     * @title 修改默认收货地址
-     * @desc  修改默认收货地址
-     * @author  qc
-     * @url /api/Address/changeApproveDelivery
-     * @method POST
-     * @header name:Authorization require:1 desc:Token
-     * @param name:id type:int default:0 desc:收货地址记录id
-     * @param name:is_mr type:int  default:1 desc:是否是默认(0不默认,1默认)
-     */
-    public function changeApproveDelivery()
-    {
-        $id         = input('post.id');
-        $is_mr      = input('post.is_mr',1);
-        if($is_mr) {
-            Db::name('delivery_address')
-                ->where('user_id','=',$this->user_id)
-                ->where('is_mr','=',1)
-                ->update(['is_mr'=>0]);
-            Db::name('delivery_address')
-                ->where('user_id','=',$this->user_id)
-                ->where('id','=',$id)
-                ->update(['is_mr'=>1]);
-        }else{
-            Db::name('delivery_address')
-                ->where('user_id','=',$this->user_id)
-                ->where('id','=',$id)
-                ->update(['is_mr'=>0]);
-        }
-        $this->success('修改成功');
-    }
-
-    /**
-     * @title 删除收货地址
-     * @desc  删除收货地址
-     * @author  qc
-     * @url /api/Address/delDeliveryAddress
-     * @method POST
-     * @header name:Authorization require:1 desc:Token
-     * @param  name:id type:int  require:1 default:1 desc:收货地址记录id
-     */
-    public function delDeliveryAddress()
-    {
-        $id = input('post.id');
-        if(!$id)$this->error('请选择要删除的收货地址');
-        Db::name('delivery_address')->where(['user_id'=>$this->user_id,'id'=>$id])->update(['is_deleted'=>1,'is_mr'=>0]);
-        $this->success('删除成功!');
-    }
-
-    /**
-     * @title 获取收货地址列表
-     * @desc  获取收货地址列表
-     * @author  qc
-     * @url /api/Address/getDeliveryAddressList
-     * @method GET
-     * @header name:Authorization require:1 desc:Token
-     * @param  name:page type:int   default:1 desc:页数
-     * @param  name:page_num type:int   default:20 desc:每页数
-     * @return name:pro_id type:int   default:-- desc:省id
-     * @return name:city_id type:int   default:-- desc:市id
-     * @return name:county_id type:int  default:-- desc:县区id
-     * @return name:pro_name type:string  default:-- desc:省名
-     * @return name:city_name type:string  default:-- desc:市名
-     * @return name:county_name type:string  default:-- desc:县区名
-     * @return name:detail type:string  default:-- desc:详细地址
-     * @return name:phone type:string  default:-- desc:联系电话
-     * @return name:name type:string   default:-- desc:联系人
-     * @return name:is_mr type:int   default:0 desc:是否是默认(0不默认,1默认)
-     */
-    public function getDeliveryAddressList()
-    {
-        $list = DeliveryAddress::where(['user_id'=>$this->user_id,'is_deleted'=>0])
-            ->order('is_mr desc ,id desc')
-            ->limit($this->off_set,$this->page_num)
-            ->select()->toArray();
-        $this->success('ok',['list'=>$list]);
-
-    }
-
-    /**
-     * @title 获取收货地址详情
-     * @desc  获取收货地址详情
-     * @author  qc
-     * @url /api/Address/getDeliveryAddressDetail
-     * @method GET
-     * @header name:Authorization require:1 desc:Token
-     * @param  name:id type:int   default:1 desc:收货地址记录id
-     * @return name:pro_id type:int   default:-- desc:省id
-     * @return name:city_id type:int   default:-- desc:市id
-     * @return name:county_id type:int  default:-- desc:县区id
-     * @return name:pro_name type:string  default:-- desc:省名
-     * @return name:city_name type:string  default:-- desc:市名
-     * @return name:county_name type:string  default:-- desc:县区名
-     * @return name:detail type:string  default:-- desc:详细地址
-     * @return name:phone type:string  default:-- desc:联系电话
-     * @return name:name type:string   default:-- desc:联系人
-     * @return name:is_mr type:int   default:0 desc:是否是默认(0不默认,1默认)
-     */
-    public function getDeliveryAddressDetail()
-    {
-        $detail  = Db::name('delivery_address')->find(input('id'));
-        $this->success('ok',$detail);
-    }
-
-    /**
-     * @title 获取默认收货地址详情
-     * @desc  获取默认收货地址详情
-     * @author  qc
-     * @url /api/Address/getDefaultAddress
-     * @method GET
-     * @header name:Authorization require:1 desc:Token
-     * @return name:pro_id type:int   default:-- desc:省id
-     * @return name:city_id type:int   default:-- desc:市id
-     * @return name:county_id type:int  default:-- desc:县区id
-     * @return name:pro_name type:string  default:-- desc:省名
-     * @return name:city_name type:string  default:-- desc:市名
-     * @return name:county_name type:string  default:-- desc:县区名
-     * @return name:detail type:string  default:-- desc:详细地址
-     * @return name:phone type:string  default:-- desc:联系电话
-     * @return name:name type:string   default:-- desc:联系人
-     * @return name:is_mr type:int   default:0 desc:是否是默认(0不默认,1默认)
-     */
-    public function getDefaultAddress()
-    {
-        $default  = DeliveryAddress::where(['user_id'=>$this->user_id,'is_mr'=>1])->find();
-        $detail = $default ? $default->toArray() : '';
-        $this->success('ok',$detail);
-    }
-
-
-
-
-
-
-}

+ 0 - 222
application/api/controller/Appointment.php

@@ -1,222 +0,0 @@
-<?php
-namespace app\api\controller;
-use app\common\model\AppOrder;
-use app\common\model\User;
-use think\Db;
-use think\Exception;
-
-/**
- * @title 
- * @controller Appointment
- * @group base
- */
-class Appointment extends Base
-{
-    public function initialize()
-    {
-        parent::initialize();
-        parent::checkLogin();
-    }
-
-    /**
-     * @title 创建预约||修改预约
-     * @desc  创建预约||修改预约
-     * @author  qc
-     * @url /api/Appointment/makeAppointment
-     * @method POST
-     * @header name:Authorization require:1 desc:Token
-
-     * @param name:id type:int default:-- desc:预约记录id(不传值为创建新预约,传id修改预约记录)
-     * @param name:goods_id type:int default:-- desc:商品id
-     * @param name:spec_id type:int default:-- desc:规格id
-     * @param name:pro_name type:string default:-- desc:预约地址--省
-     * @param name:city_name type:string default:-- desc:预约地址--市
-     * @param name:county_name type:string default:-- desc:预约地址--区
-     * @param name:add_detail type:string default:-- desc:预约地址--详情
-     * @param name:user_name type:string default:-- desc:预约人
-     * @param name:phone type:string default:-- desc:人联系方式
-     * @param name:remark type:string default:1 desc:订单备注
-     * @return name:order_id type:int default:1 desc:预约订单id
-     */
-    public function makeAppointment()
-    {
-        $goods_id = input('post.goods_id','');
-        $spec_id = input('post.spec_id','');
-        $pro_name = input('post.pro_name','');
-        $city_name = input('post.city_name','');
-        $county_name = input('post.county_name','');
-        $add_detail = input('post.add_detail','');
-        $user_name = input('post.user_name','');
-        $phone = input('post.phone','');
-        $remark = input('post.remark','');
-        $app_time = input('post.app_time',date("Y-m-d H:i:s"));
-        $app_id= input('post.id','');
-        if(!$goods_id || !$spec_id) $this->error('请选择商品');
-        if(!$pro_name || !$city_name || !$county_name || !$add_detail) $this->error('请完善预约地址');
-        if(!$user_name || !$phone) $this->error('请完善预约人信息');
-        Db::startTrans();
-        try{
-            $order_insert = [
-                'user_id' => $this->user_id,
-                'goods_id' => $goods_id,
-                'spec_id' => $spec_id,
-                'order_no' => get_order_sn(),
-                'pro_name' => $pro_name,
-                'city_name' =>$city_name,
-                'county_name' => $county_name,
-                'add_detail' => $add_detail,
-                'user_name' => $user_name,
-                'phone' => $phone,
-                'remark' => $remark,
-                'app_time' => $app_time,
-                'code' =>  date('d',strtotime($app_time)).'-'.date('H',strtotime($app_time)).'-'.$this->user_id.rand(00,99)
-            ];
-            if($app_id) {
-                $order_insert = $app_id;
-                $app_info = AppOrder::where('id',$app_id)->find()->toArray();
-                if($app_info['status'] == 1) $this->exception('预约已完成无法修改');
-                if($app_info['status'] == 2) $this->exception('预约已取消无法修改');
-                AppOrder::where('id',$app_id)->update($order_insert);
-            }else{
-                $order_info = AppOrder::create($order_insert);
-            }
-            Db::commit();
-        }catch (\Exception $e){
-            $this->ret_msg = $e->getMessage();
-            $this->is_commit = false;
-            Db::rollback();
-        }
-        $this->success('预约成功',['order_id'=>$app_id ? $app_id :$order_info->id ]);
-    }
-
-
-    /**
-     * @title 获取预约列表
-     * @desc 获取预约列表
-     * @author qc
-     * @method GET
-     * @url /api/Appointment/getAppointmentList
-     * @header name:Authorization require:1 desc:Token
-     * @param  name:page type:int  default:1 desc:页数
-     * @param  name:page_num type:int default:20 desc:每页数
-     * @param  name:status type:int default:-1  desc:订单状态(-1全部,0未完成,1已完成,9已取消)
-     * @return name:id type:int default:--  desc:预约id
-     * @return name:order_no type:string default:--  desc:订单号
-     * @return name:status type:int default:--  desc:订单状态(0未完成,1已完成,9已取消)
-     * @return name:create_at type:string default:--  desc:下单时间
-     * @return name:code type:string default:--  desc:预约号
-     * @return name:remark type:string default:--  desc:订单备注
-     * @return name:goods_name type:string default:--  desc:商品名称
-     * @return name:cover type:string default:--  desc:商品封面
-     * @return name:goods_spec type:string default:--  desc:商品规格
-     * @return name:goods_id type:int default:--  desc:商品id
-     * @return name:spec_id type:int default:--  desc:规格id
-     */
-    public function getAppointmentList()
-    {
-        $status = input('get.status',-1);
-        $where = [];
-        $where[] = ['a.user_id','=',$this->user_id];
-        $where[] = ['a.is_deleted','=',0];
-        if($status > -1) $where[] = ['status','=',$status];
-        $list = AppOrder::field('a.id,a.goods_id,a.spec_id,a.order_no,a.status,a.code,a.remark,g.name goods_name,g.cover,i.goods_spec')->alias('a')
-            ->leftJoin('StoreGoods g','a.goods_id = g.id')
-            ->leftJoin('StoreGoodsItem i','a.spec_id = i.id')
-            ->where($where)
-            ->limit($this->off_set,$this->page_num)
-            ->order('a.id desc')
-            ->select()->toArray();
-        $this->success('ok',['list'=>$list]);
-    }
-
-
-    /**
-     * @title 获取预约详情
-     * @desc 获取预约详情
-     * @author qc
-     * @method GET
-     * @url /api/Appointment/getAppointmentInfo
-     * @header name:Authorization require:1 desc:Token
-     * @param name:id type:int default:--  desc:预约id
-     * @return name:id type:int default:--  desc:预约id
-     * @return name:order_no type:string default:--  desc:订单号
-     * @return name:status type:int default:--  desc:订单状态(0未完成,1已完成,9已取消)
-     * @return name:create_at type:string default:--  desc:下单时间
-     * @return name:remark type:string default:--  desc:订单备注
-     * @return name:code type:string default:--  desc:预约号
-     * @return name:pro_name type:string default:--  desc:省名称(预约地址)
-     * @return name:city_name type:string default:--  desc:市名称(预约地址)
-     * @return name:county_name type:string default:--  desc:县区名称(预约地址)
-     * @return name:add_detail type:string default:--  desc:详细地址(预约地址)
-     * @return name:user_name type:string default:--  desc:预约人
-     * @return name:phone type:string default:--  desc:人联系
-     * @return name:app_time type:string default:--  desc:预约时间
-     * @return name:goods_name type:string default:--  desc:商品名称
-     * @return name:cover type:string default:--  desc:商品封面
-     * @return name:goods_spec type:string default:--  desc:商品规格
-     * @return name:goods_id type:int default:--  desc:商品id
-     * @return name:spec_id type:int default:--  desc:规格id
-     */
-    public function getAppointmentInfo()
-    {
-        $order_id = input('get.id');
-        $detail = AppOrder::field('a.*,g.name goods_name,i.goods_spec,g.cover')->alias('a')
-            ->leftJoin('StoreGoods g','a.goods_id = g.id')
-            ->leftJoin('StoreGoodsItem i','a.spec_id = i.id')
-            ->where('a.id',$order_id)
-            ->find()->toArray();
-        $this->success('ok',['detail'=>$detail]);
-    }
-
-
-
-    /**
-     * @title 取消预约
-     * @desc  取消预约
-     * @author  qc
-     * @url /api/Appointment/cancelAppointment
-     * @method POST
-     * @header name:Authorization require:1 desc:Token
-     * @param  name:id type:int require:1  default:0 desc:预约id
-     * @param  name:cancel_desc type:string  default:0 desc:取消原因
-     */
-    public function cancelAppointment()
-    {
-        $order_id = input('post.id');
-        $cancel_desc = input('post.cancel_desc');
-        Db::startTrans();
-        try {
-            $detail = AppOrder::where('id',$order_id)->find()->toArray();
-            if($detail['status'] != 0) $this->exception('预约记录已完成或是已取消');
-           // if(strtotime($detail['app_time']) < time() + 7200) $this->exception('2小时内无法直接取消预约,请联系客服');
-            AppOrder::where('id',$order_id)->update(['status'=>9,'cancel_at'=>date("Y-m-d H:i:s"),'cancel_state'=>1,'cancel_desc'=>$cancel_desc]);
-            Db::commit();
-        }catch (\Exception $e){
-            $this->ret_msg = $e->getMessage();
-            $this->is_commit = false;
-            Db::rollback();
-        }
-        $this->is_commit ? $this->success('取消成功') : $this->error($this->ret_msg);
-    }
-
-
-
-    /**
-     * @title 预约完成
-     * @desc  预约完成
-     * @author  qc
-     * @url /api/Appointment/completeAppointment
-     * @method POST
-     * @header name:Authorization require:1 desc:Token
-     * @param  name:id type:int require:1  default:0 desc:预约记录id
-     */
-    public function completeAppointment()
-    {
-        $order_id = input('post.id');
-        $detail = AppOrder::where('id',$order_id)->find()->toArray();
-        if($detail['status'] != 0) $this->error('预约记录状态错误');
-        AppOrder::update(['status'=>1],['id'=>$order_id]);
-        $this->success('预约已完成');
-    }
-
-}

+ 0 - 192
application/api/controller/Expedite.php

@@ -1,192 +0,0 @@
-<?php
-namespace app\api\controller;
-use AlibabaCloud\Client\AlibabaCloud;
-use AlibabaCloud\Client\Exception\ClientException;
-use AlibabaCloud\Client\Exception\ServerException;
-use app\common\model\StoreBanner;
-use app\common\model\User;
-use think\Db;
-/**
- * @title 不需要验证token接口
- * @controller Expedite
- * @package app\api\controller
- */
-class Expedite extends Base
-{
-
-    public function initialize(){
-        parent::initialize();
-        parent::setUid();
-    }
-
-    /**
-     * @title 获取首页轮播图
-     * @desc  获取首页轮播图
-     * @author  qc
-     * @url /api/Expedite/getBanner
-     * @method GET
-     * @header name:Authorization require:1 desc:Token
-     * @param  name:num type:int  default:5 desc:查询数量
-     * @return name:cover type:srting default:-- desc:图片路径
-     */
-    public function getBanner()
-    {
-        $num = input('get.num',5);
-        $list = StoreBanner::field('id,cover')
-            ->where(['is_deleted'=>0])->limit(0,$num)
-            ->order('sort desc ,id desc')->select()->toArray();
-        $this->success('ok',['list'=>$list]);
-    }
-
-    /**
-     * @title 发送短信验证码
-     * @desc 发送短信验证码
-     * @author qc
-     * @url /api/Expedite/sendSms
-     * @method POST
-     * @tag 短信验证码
-     * @param name:phone type:int require:1 default:-- desc:要获取验证码的手机号
-     * @return name:code type:string default:-- desc:验证码
-     */
-    public function sendSms(){
-        $phone = input('post.phone');
-        $user_info  = User::where('phone',$phone)->where('is_deleted',0)->field('id,status')->find();
-        if($user_info && $user_info['status'] == 0)$this ->error('用户被禁用,请联系官方');
-        if(empty($phone)) $this ->error('参数错误');
-        $code = rand(0,9).rand(0,9).rand(0,9).rand(0,9).rand(0,9).rand(0,9);
-        AlibabaCloud::accessKeyClient('LTAI5tJ5p12drZegeWVG33xZ', '82UWAiY5e5wH8tSkRvMtqVoGO0h8SB')
-            ->regionId('cn-hangzhou')->asDefaultClient();
-        try {
-            $result = AlibabaCloud::rpc()
-                ->product('Dysmsapi')
-                ->version('2017-05-25')
-                ->action('SendSms')
-                ->method('POST')
-                ->host('dysmsapi.aliyuncs.com')
-                ->options([
-                    'query' => [
-                        'RegionId' => "cn-hangzhou",
-                        'PhoneNumbers' => $phone,
-                        'SignName' => "搞一下汽车电子",
-                        'TemplateCode' => "SMS_234397351",
-                        'TemplateParam' => json_encode(array("code"=>$code)),
-                    ],
-                ])->request();
-            $result = $result->toArray();
-            if($result['Code'] == "OK") {
-                $sms_data = array(
-                    'phone'=>$phone,
-                    'code'=>$code,
-                    'result'=>$result['Message']
-                );
-                Db::name('store_member_sms')->insert($sms_data);
-                $this->success('发送成功',['code'=>$code]);
-            }else{
-                $this->error('发送失败');
-            }
-        } catch (ClientException $e) {
-            echo $e->getErrorMessage() . PHP_EOL;
-        } catch (ServerException $e) {
-            echo $e->getErrorMessage() . PHP_EOL;
-        }
-
-    }
-
-    /**
-     * @title 获取签名
-     * @desc 获取签名
-     * @url /api/Expedite/getWeChatSign
-     * @method POST
-     * @param  name:url type:string default:-- desc:页面地址
-     * @return name:appid type:string default:-- desc:appid
-     * @return name:noncestr type:string default:-- desc:随机字符
-     * @return name:timestamp type:string default:-- desc:时间戳
-     * @return name:sign type:string default:-- desc:签名
-     * @return name:ticket type:string default:-- desc:ticket
-     **/
-    public function getWeChatSign(){
-        $urls = input('post.url');
-        $appid = config('app.official_account')['appid'];
-        $secret =  config('app.official_account')['secret'];
-        $redis = new Redis();
-        $access_token = $redis->get('access_token');
-        if (!$access_token){
-            $access_token = '';
-            $url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=$appid&secret=$secret";
-            $res= http_curl($url);
-            if (isset($res['access_token'])){
-                $redis->set('access_token',$res['access_token'],'7000');
-                $access_token = $res['access_token'];
-            }
-        }
-
-        $url2 ="https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=".$access_token."&type=jsapi";
-        $res2=http_curl($url2);
-        if (!isset($res2) || $res2['errcode']!=0) $this->error('获取ticket失败');
-        $timestamp = time();
-        $noncestr = get32Str(15);
-        $string = "jsapi_ticket=".$res2['ticket']."&noncestr=$noncestr&timestamp=$timestamp&url=".$urls;
-        $sign = sha1($string);
-        $return = [
-            'appid'=>$appid,
-            'noncestr'=>$noncestr,
-            'timestamp'=>$timestamp,
-            'url'=>$urls,
-            'sign'=>$sign,
-            'ticket'=>$res2['ticket']
-        ];
-        $this->success('成功',$return);
-    }
-
-    /**
-     * @title 获取平台文案设置
-     * @desc  获取平台文案设置
-     * @author  qc
-     * @url /api/Expedite/getSysConfig
-     * @method GET
-     * @param name:search_name type:string default:-- desc:根据下面名称查(不传查全部的)
-     * @return name:agreement type:string default:-- desc:用户协议【使用协议】富文本
-     * @return name:notice_title type:string default:-- desc:公告标题【字符串】
-     * @return name:notice_content type:string default:-- desc:公告内容【富文本】
-     */
-    public function getSysConfig(){
-        $search_name = input('get.search_name');
-        $con_name = $search_name? [$search_name] : ['agreement','notice_title','notice_content'];
-        $set = Db::name('system_config')->where('name','in',$con_name)->select();
-        $ret = [];
-        foreach ($set as $value) {
-            $ret[$value['name']]=$value['value'];
-        }
-        $this->success('获取成功',$ret);
-    }
-
-
-    /**
-     * @title 获取店铺信息设置
-     * @desc  获取店铺信息设置
-     * @author  qc
-     * @url /api/Expedite/getShopSet
-     * @method GET
-     * @param name:search_name type:string default:-- desc:根据下面名称查(不传查全部的)
-     * @return name:app_name type:string default:-- desc:店铺名称
-     * @return name:app_logo type:string default:-- desc:店铺封面
-     * @return name:app_address type:string default:-- desc:店铺地址
-     * @return name:service_phone type:string default:-- desc:联系电话
-     * @return name:service_email type:string default:-- desc:邮箱
-     */
-    public function getShopSet()
-    {
-        $con_name =  ['app_name','app_logo','app_address','service_phone','service_email'];
-        $set = Db::name('system_config')->where('name','in',$con_name)->select();
-        $ret = [];
-        foreach ($set as $value) {
-            $ret[$value['name']]=$value['value'];
-        }
-        $this->success('获取成功',$ret);
-    }
-
-
-
-
-
-}

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

@@ -1,6 +1,6 @@
 <?php
 namespace app\api\controller;
-use app\common\model\UserSearch;
+
 
 /**
  * @title 其他接口

+ 0 - 190
application/api/controller/Mall.php

@@ -1,190 +0,0 @@
-<?php
-namespace app\api\controller;
-use app\common\model\GoodsCate;
-use app\common\model\GoodsSeason;
-use app\common\model\GoodsServe;
-use app\common\model\StoreGoods;
-use app\common\model\User;
-use app\common\model\UserCollect;
-use app\common\model\UserSearch;
-use app\common\model\UserTrack;
-use app\common\model\WashCate;
-use app\common\service\Activity;
-use library\tools\Data;
-use think\Db;
-
-/**
- * @title 商城商品
- * @controller Mall
- * @group base
- */
-class Mall extends Base
-{
-    // 需要登录的
-    public function initialize(){
-        parent::initialize();
-        parent::setUid();
-    }
-
-    /**
-     * @title 获取商品分类【商城商品】
-     * @desc  获取商品分类
-     * @author  qc
-     * @url /api/Mall/getGoodsCate
-     * @method GET
-     * @header name:Authorization require:1 desc:Token
-     * @return name:id type:int default:-- desc:分类id
-     * @return name:title type:string default:-- desc:标题
-     */
-    public function getGoodsCate()
-    {
-        $list = GoodsCate::getCateTree();
-        $this->success('ok',['list'=>$list]);
-    }
-
-    /**
-     * @title 获取洗鞋分类
-     * @desc  获取洗鞋分类
-     * @author  qc
-     * @url /api/Mall/getWashCate
-     * @method GET
-     * @header name:Authorization require:1 desc:Token
-     * @return name:id type:int default:-- desc:分类id
-     * @return name:title type:string default:-- desc:分类名称
-     * @return name:logo type:string default:-- desc:分类log
-     * @return name:ladder_set type:array default:-- desc:价格设置
-     * @return name:ladder_set.title type:string default:-- desc:标题
-     * @return name:ladder_set.price type:float default:-- desc:价格
-     * @return name:ladder_set.ladder_key type:int default:-- desc:ladder_set数组的键【下单用的到】
-     */
-    public function getWashCate()
-    {
-        $list =  WashCate::where('is_deleted',0)->field('id,logo,title,ladder_set')->select()->toArray();
-        array_walk($list,function (&$v,$k){
-            $v['ladder_set'] = $v['ladder_set'] ? json_decode($v['ladder_set'],true):null;
-        });
-        $this->success('ok',['list'=>$list]);
-    }
-
-
-
-    /**
-     * @title 获取商品列表
-     * @desc  获取商品列表
-     * @author  qc
-     * @url /api/Mall/getGoodsList
-     * @method GET
-     * @header name:Authorization require:1 desc:Token
-     * @param  name:page type:int default:1 desc:页数
-     * @param  name:page_num type:int default:20 desc:每页数
-     * @param  name:goods_name type:string require:0  default:-- desc:商品名称
-     * @param  name:first_classify type:int require:0  default:-- desc:分类id
-     * @param  name:sort_type type:int default:1 desc:排序--1默认2时间升序3时间降序
-     * @return name:name type:string default:-- desc:商品名称
-     * @return name:cover type:string default:-- desc:商品封面图
-     * @return name:desc type:string default:-- desc:商品简述(副标题)
-     * @return name:low_price type:float default:-- desc:最低售价
-     * @return name:max_price type:float default:-- desc:最高售价
-     * @return name:low_original type:float default:-- desc:最低原价格
-     * @return name:total_num type:int default:-- desc:商品总数量
-     * @return name:first_classify type:int require:0  default:-- desc:一级分类id
-     * @return name:item_list type:array default:-- desc:商品多规格列表
-     * @return name:item_list.goods_spec type:string default:-- desc:规格
-     * @return name:item_list.goods_no type:string default:-- desc:规格货号
-     * @return name:item_list.goods_title:string default:-- desc:规格标题
-     * @return name:item_list.stock type:int default:-- desc:剩余库存
-     * @return name:item_list.original_price type:float default:-- desc:原价
-     * @return name:item_list.sell_price type:float default:-- desc:售价
-     * @return name:item_list.virtual type:int default:-- desc:虚拟销量
-     * @return name:item_list.weight type:float default:-- desc:重量【kg】
-     * @return name:total_num type:int default:-- desc:总数
-     */
-    public function getGoodsList(){
-        $all_cate = GoodsCate::getCateTree();
-        $all_cate = array_column($all_cate,null,'id');
-        $input = input('get.');
-        $sel_where = [];
-        $sel_where[] = ['status','=',1];
-        $sel_where[] = ['is_deleted','=',0];
-        $sort_type = input('get.sort_type',1);
-        if(isset_full($input,'first_classify'))$sel_where[] = ['first_classify','=',$input['first_classify']];
-        switch ($sort_type) {
-            case 1:
-                $order =  ['sort'=>'desc','id'=>'desc'];
-                break;
-            case 2:
-                $order =  ['id'=>'asc','sort'=>'desc'];
-                break;
-            case 3:
-                $order =  ['id'=>'desc','sort'=>'desc'];
-                break;
-        }
-
-        $list = StoreGoods::with(['itemList'])
-            ->field('id,name,cover,desc,low_price,first_classify')
-            ->where($sel_where)->limit($this->off_set,$this->page_num)
-            ->order($order)
-            ->select()->toArray();
-        foreach ($list as &$v){
-            $v['first_classify_name'] = isset($all_cate[$v['first_classify']]['title']) ? $all_cate[$v['first_classify']]['title']:'';
-            $v['low_original'] = empty($v['item_list']) ? 0 :  min(array_column($v['item_list'],'original_price'));
-            $v['low_price'] = empty($v['item_list']) ? 0 : min(array_column($v['item_list'],'sell_price'));
-            $v['max_price'] = empty($v['item_list']) ? 0 : max(array_column($v['item_list'],'sell_price'));
-            $v['total_num'] =  empty($v['item_list']) ? 0 :array_sum(array_column($v['item_list'],'base_stock'));
-        }
-        $total_num =  StoreGoods::where($sel_where)->count();
-        $this->success('ok',['list'=>$list,'total_num'=>$total_num]);
-
-    }
-
-    /**
-     * @title 获取商品详情
-     * @desc  获取商品详情
-     * @author  qc
-     * @url /api/Mall/getGoodsDetail
-     * @method GET
-     * @header name:Authorization require:1 desc:Token
-     * @param  name:goods_id  type:int require:1  default:0 desc:商品id
-     * @return name:name type:string default:-- desc:商品名称
-     * @return name:cover type:string default:-- desc:商品封面图
-     * @return name:desc type:string default:-- desc:商品简述(副标题)
-     * @return name:image type:string default:-- desc:商品展示图[多张|隔开]
-     * @return name:content type:string default:-- desc:商品详情图[多张|隔开]
-     * @return name:content_arr type:array default:-- desc:商品详情图
-     * @return name:low_price type:float default:-- desc:最低售价
-     * @return name:max_price type:float default:-- desc:最高售价
-     * @return name:low_original type:float default:-- desc:最低原价格
-     * @return name:total_num type:int default:-- desc:商品总数量
-     * @return name:detail type:int default:-- desc:商品详情[富文本]
-     * @return name:first_classify type:int require:0  default:-- desc:一级分类id
-     * @return name:item_list type:array default:-- desc:商品多规格列表
-     * @return name:item_list.id type:int default:-- desc:规格id【提交订单时spec_id】
-     * @return name:item_list.goods_spec type:string default:-- desc:规格
-     * @return name:item_list.goods_no type:string default:-- desc:规格货号
-     * @return name:item_list.goods_title:string default:-- desc:规格标题
-     * @return name:item_list.stock type:int default:-- desc:剩余库存
-     * @return name:item_list.original_price type:float default:-- desc:原价
-     * @return name:item_list.sell_price type:float default:-- desc:售价
-     * @return name:item_list.virtual type:int default:-- desc:虚拟销量
-     * @return name:item_list.weight type:float default:-- desc:重量【kg】
-     */
-    public function getGoodsDetail()
-    {
-        $goods_id = input('goods_id');
-        $all_cate = GoodsCate::getCateTree();
-        $all_cate = array_column($all_cate,null,'id');
-        $detail = StoreGoods::with(['itemList'])->field('specs,lists',true)->where('id',$goods_id)->find()->toArray();
-        $detail['max_price'] = max(array_column($detail['item_list'],'original_price'));
-        $detail['first_classify_name'] = isset($all_cate[$detail['first_classify']]['title']) ? $all_cate[$detail['first_classify']]['title']:'';
-        $detail['low_original'] = empty($detail['item_list']) ? 0 :  min(array_column($detail['item_list'],'original_price'));
-        $detail['low_price'] = empty($detail['item_list']) ? 0 : min(array_column($detail['item_list'],'sell_price'));
-        $detail['max_price'] = empty($detail['item_list']) ? 0 : max(array_column($detail['item_list'],'sell_price'));
-        $detail['content_arr'] = $detail['content'] ? explode('|',$detail['content']) : null;
-        $this->success('oK',['goods_info'=>$detail]);
-    }
-
-
-
-
-
-}

+ 0 - 333
application/api/controller/Order.php

@@ -1,333 +0,0 @@
-<?php
-namespace app\api\controller;
-use app\common\model\GoodsOrder;
-use app\common\model\GoodsOrderItem;
-use app\common\model\StoreGoods;
-use app\common\model\StoreGoodsItem;
-use app\common\model\User;
-use think\Db;
-use think\Exception;
-
-/**
- * @title 商城订单
- * @controller Order
- * @group base
- */
-class Order extends Base
-{
-    public function initialize()
-    {
-        parent::initialize();
-        parent::checkLogin();
-    }
-
-    /**
-     * @title 创建订单
-     * @desc  创建订单
-     * @author  qc
-     * @url /api/Order/createOrder
-     * @method POST
-     * @header name:Authorization require:1 desc:Token
-     * @param name:goods_json type:string require:1  default:0 desc:商品json信息[{'goods_id':'商品id',spec_id:'规格id';'num':'数量'}]
-     * @param name:pro_name type:string default:-- desc:收货地址--省
-     * @param name:city_name type:string default:-- desc:收货地址--市
-     * @param name:county_name type:string default:-- desc:收货地址--区
-     * @param name:add_detail type:string default:-- desc:收货地址--详情
-     * @param name:user_name type:string default:-- desc:收货人
-     * @param name:phone type:string default:-- desc:收货人联系方式
-     * @param name:remark type:string default:1 desc:订单备注
-     * @return name:order_id type:int default:1 desc:订单id
-     */
-    public function createOrder()
-    {
-        $goods_json = input('post.goods_json','');
-        $pro_name = input('post.pro_name','');
-        $city_name = input('post.city_name','');
-        $county_name = input('post.county_name','');
-        $add_detail = input('post.add_detail','');
-        $user_name = input('post.user_name','');
-        $phone = input('post.phone','');
-        $remark = input('post.remark','');
-        if(!$goods_json) $this->error('请选择商品');
-        if(!$pro_name || !$city_name || !$county_name || !$add_detail) $this->error('请完善收货地址');
-        if(!$user_name || !$phone) $this->error('请完善收货人信息');
-        $goods_data = json_decode($goods_json,true);
-        $goods_ids = array_column($goods_data,'goods_id');
-        $goods_list = StoreGoods::field('specs,lists',true)->where('id','in',implode(',',$goods_ids))->where('status',1)->where('is_deleted',0)->with('itemList')->select()->toArray();
-        if(count($goods_list) != count($goods_ids)) $this->error('所选商品已下架');
-        $goods_column = array_column($goods_list,null,'id');
-        $ret_data = ['pay_status'=>0,'config'=>[],'order_id'=>0];
-        Db::startTrans();
-        try{
-            // 验证商品库存start
-            $check_goods =  0;
-            $error_goods =  '';
-            $price_goods =  0; // 商品总金额
-            $original_total = 0; // 商品总原价
-            $order_item = [];// 订单列表
-            foreach ($goods_data as $gv) {
-                $goods_spec = $goods_column[$gv['goods_id']]['item_list'];
-                $spec_column = array_column($goods_spec,null,'id');
-                if(!isset($spec_column[$gv['spec_id']])){
-                    $check_goods =  1;
-                    $error_goods = $goods_column[$gv['goods_id']]['name'];
-                    break;
-                }else if($spec_column[$gv['spec_id']]['stock'] < $gv['num']){
-                    $check_goods =  2;
-                    $error_goods = $goods_column[$gv['goods_id']]['name'];
-                    break;
-                }
-                $price_goods += $gv['num'] * $spec_column[$gv['spec_id']]['sell_price'];
-                $original_total += $gv['num'] * $spec_column[$gv['spec_id']]['original_price'];
-                $order_item[] = [
-                    'user_id' => $this->user_id,
-                    'goods_id' => $gv['goods_id'],
-                    'goods_no' => $spec_column[$gv['spec_id']]['goods_no'],
-                    'goods_name' => $goods_column[$gv['goods_id']]['name'],
-                    'goods_spec' =>  $spec_column[$gv['spec_id']]['goods_spec'],
-                    'spec_title' =>  $spec_column[$gv['spec_id']]['spec_title'],
-                    'spec_id' => $gv['spec_id'],
-                    'cover' =>   $spec_column[$gv['spec_id']]['cover'],
-                    'original_price' =>  $spec_column[$gv['spec_id']]['original_price'],
-                    'sell_price' =>  $spec_column[$gv['spec_id']]['sell_price'],
-                    'num' => $gv['num'],
-                ];
-                StoreGoods::where('id',$gv['goods_id'])->setDec('stock',$gv['num']);
-                StoreGoodsItem::where('id',$gv['spec_id'])->setDec('stock',$gv['num']);
-            }
-            if($check_goods == 1) $this->exception('所选商品'.$error_goods.'已下架');
-            if($check_goods == 2) $this->exception('所选商品'.$error_goods.'规格库存不足');
-            // 验证商品库存end
-            $order_insert = [
-                'user_id' => $this->user_id,
-                'order_no' => get_order_sn(),
-                'goods_num' => array_sum(array_column($goods_data,'num')),
-                'pro_name' => $pro_name,
-                'city_name' =>$city_name,
-                'county_name' => $county_name,
-                'add_detail' => $add_detail,
-                'user_name' => $user_name,
-                'phone' => $phone,
-                'remark' => $remark,
-            ];
-            $order_insert['price_total'] = $price_goods;
-            $order_insert['price_goods'] = $price_goods ;
-            $order_insert['original_total'] = $original_total ;
-            $order_insert['price_express'] = 0 ;
-            $order_info = GoodsOrder::create($order_insert);// 生成订单
-            array_walk($order_item,function (&$v,$k)use ($order_info){
-                $v['order_id'] = $order_info->id;
-            });
-            (new GoodsOrderItem())->insertAll($order_item);// 生成订单商品详情
-            $ret_data['order_id'] =  $order_info->id;
-            Db::commit();
-        }catch (\Exception $e){
-            Db::rollback();
-            $this->error($e->getMessage());
-        }
-        $this->success('ok',$ret_data);
-    }
-
-
-
-    /**
-     * @title 订单支付
-     * @desc  订单支付
-     * @author  qc
-     * @url /api/Order/payOrder
-     * @method POST
-     * @header name:Authorization require:1 desc:Token
-     * @param  name:order_id type:int require:1  default:0 desc:订单id
-     * @return name:config type:array default:0 desc:小程序支付配置
-     * @return name:config.appId type:string default:-- desc:appid
-     * @return name:config.nonceStr type:string default:-- desc:随机字符串
-     * @return name:config.signType type:string default:-- desc:签名类型
-     * @return name:config.paySign type:string default:-- desc:签名
-     * @return name:config.timestamp type:string default:-- desc:时间戳
-     */
-
-    public function payOrder()
-    {
-        $order_id = input('post.order_id');
-        $order_info = GoodsOrder::with('orderItem')->where('id',$order_id)->find()->toArray();
-        if($order_info['status'] != 0) $this->error('订单状态错误');
-        if($order_info['cancel_state'] != 0 || $order_info['is_deleted'] != 0) $this->error('订单异常');
-        if($order_info['price_total'] <= 0) $this->error('订单金额错误');
-        $user_info = User::where('id',$this->user_id)->find()->toArray();
-        $ret_data = ['pay_status'=>0,'config'=>[]];
-        Db::startTrans();
-        try {
-            $notify_url = $this->request->root(true) . '/api/we_chat_pay/goodsOrderNotify';
-            $pay_no = $order_info['pay_no'] ?  $order_info['pay_no'] : get_order_sn();
-            Db::name('store_order')->where(['user_id'=>$this->user_id,'id'=>$order_id])->update(['pay_no'=>$pay_no]);
-            $config = WeChatPay::wxPay('订单支付',$pay_no,$order_info['price_total'],$notify_url,'JSAPI',$user_info['openid']);
-            if(!$config) throw  new  Exception('支付配置错误');
-            $ret_data['config'] = $config;
-            Db::commit();
-        }catch (\Exception $e) {
-            Db::rollback();
-            $this->error($e->getMessage());
-        }
-        $this->success('ok',$ret_data);
-    }
-
-
-    /**
-     * @title 获取订单列表
-     * @desc 获取订单列表
-     * @author qc
-     * @method GET
-     * @url /api/Order/getOrderList
-     * @header name:Authorization require:1 desc:Token
-     * @param  name:page type:int  default:1 desc:页数
-     * @param  name:page_num type:int default:20 desc:每页数
-     * @param  name:status type:int default:-1  desc:订单状态(-1全部,0待支付,1已支付(待发货),2已发货(待收货),3已收货(待评论)4已完成,8已退款,9取消)
-     * @param  name:pay_state type:int default:-1  desc:支付状态(-1全部,0未支付,1已支付)
-     * @return name:id type:int default:--  desc:订单id
-     * @return name:order_no type:string default:--  desc:订单号
-     * @return name:price_total type:float default:--  desc:订单金额
-     * @return name:status type:int default:--  desc:订单状态(0待支付,1已支付(待发货),2已发货(待收货),3已收货(待评论)4已完成,8已退款,9取消)
-     * @return name:create_at type:string default:--  desc:下单时间
-     * @return name:remark type:string default:--  desc:订单备注
-     * @return name:order_item type:array default:--  desc:订单商品列表
-     * @return name:order_item.name type:float default:--  desc:商品名
-     * @return name:order_item.cover type:float default:--  desc:商品图
-     * @return name:order_item.sell_price type:float default:--  desc:购买价格
-     * @return name:order_item.goods_spec type:float default:--  desc:规格
-     * @return name:order_item.num type:int default:--  desc:数量
-     */
-    public function getOrderList()
-    {
-        $status = input('get.status',-1);
-        $pay_state = input('get.pay_state',-1);
-        $cancel_state = input('get.cancel_state',-1);
-        $refund_state = input('get.apply_refund',-1);
-        $where = [];
-        $where[] = ['user_id','=',$this->user_id];
-        if($status > -1) $where[] = ['status','=',$status];
-        if($pay_state > -1) $where[] = ['pay_state','=',$pay_state];
-        if($cancel_state > -1) $where[] = ['cancel_state','=',$cancel_state];
-        if($refund_state == 0) $where[] = ['refund_state','=',$refund_state];
-        if($refund_state == 1) $where[] = ['refund_state','in','1,2,3,4'];
-        $list = GoodsOrder::field('id,order_no,status,create_at,remark')->with(['orderItem'])->where($where)->order('id desc ')
-            ->limit($this->off_set,$this->page_num)
-            ->select()->toArray();
-        $this->success('ok',['list'=>$list]);
-    }
-
-
-    /**
-     * @title 获取订单详情
-     * @desc 获取订单详情
-     * @author qc
-     * @method GET
-     * @url /api/Order/getOrderDetail
-     * @header name:Authorization require:1 desc:Token
-     * @param name:order_id type:int default:--  desc:订单id
-     * @return name:id type:int default:--  desc:订单id
-     * @return name:order_no type:string default:--  desc:订单号
-     * @return name:price_total type:float default:--  desc:待支付金额(
-     * @return name:price_goods type:float default:--  desc:商品金额
-     * @return name:price_express type:0 default:--  desc:运费金额
-     * @return name:original_total type:float default:--  desc:总原价(下划线)
-     * @return name:original_total type:float default:--  desc:总原价(下划线)
-     * @return name:pay_state type:int default:--  desc:支付状态(0未支付1已支付)
-     * @return name:pay_type type:int default:--  desc:支付方式(1微信)
-     * @return name:pay_no type:string default:--  desc:支付号
-     * @return name:pay_at type:string default:--  desc:支付时间
-     * @return name:cancel_state type:int default:--  desc:取消状态(0未取消1已取消)
-     * @return name:cancel_at type:string default:--  desc:取消时间
-     * @return name:cancel_desc type:string default:--  desc:取消原因
-     * @return name:express_state type:int default:--  desc:发货状态(0未发货,1已发货,2已签收)
-     * @return name:express_company_title type:string default:--  desc:发货快递公司名称
-     * @return name:express_send_no type:string default:--  desc:物流单号
-     * @return name:express_send_at type:string default:--  desc:发货时间
-     * @return name:status type:int default:--  desc:订单状态(0待支付,1已支付(待发货),2已发货(待收货),3已收货(待评论)4已完成,8已退款,9取消)
-     * @return name:create_at type:string default:--  desc:下单时间
-     * @return name:pay_at type:string default:--  desc:支付时间
-     * @return name:remark type:string default:--  desc:订单备注
-     * @return name:goods_num type:int default:--  desc:订单商品总数量
-     * @return name:pro_name type:string default:--  desc:省名称(收货地址)
-     * @return name:city_name type:string default:--  desc:市名称(收货地址)
-     * @return name:county_name type:string default:--  desc:县区名称(收货地址)
-     * @return name:street_name type:string default:--  desc:街道名称(收货地址)
-     * @return name:add_detail type:string default:--  desc:详细地址(收货地址)
-     * @return name:user_name type:string default:--  desc:收货人
-     * @return name:phone type:string default:--  desc:收货人联系电话
-     * @return name:order_item type:array default:--  desc:订单商品列表(按商品id分组)
-     * @return name:order_item.name type:float default:--  desc:商品名
-     * @return name:order_item.cover type:float default:--  desc:商品图
-     * @return name:order_item.sell_price type:float default:--  desc:购买价格
-     * @return name:order_item.goods_spec type:float default:--  desc:规格
-     * @return name:order_item.num type:int default:--  desc:数量
-     */
-    public function getOrderDetail()
-    {
-        $order_id = input('get.order_id');
-        $detail = GoodsOrder::where('id',$order_id)->find()->toArray();
-        $detail['order_item']  = (new GoodsOrderItem())->getOrderItem($order_id);
-        $this->success('ok',['detail'=>$detail]);
-    }
-
-
-
-    /**
-     * @title 取消订单
-     * @desc  取消订单
-     * @author  qc
-     * @url /api/Order/cancelOrder
-     * @method POST
-     * @header name:Authorization require:1 desc:Token
-     * @param  name:order_id type:int require:1  default:0 desc:订单id
-     */
-    public function cancelOrder()
-    {
-        $order_id = input('post.order_id');
-        Db::startTrans();
-        try {
-            $detail = GoodsOrder::with('orderItem')->where('id',$order_id)->find()->toArray();
-            if($detail['status'] != 0) $this->exception('订单状态有误');
-            // 取消订单状态
-            GoodsOrder::update(['status'=>9],['id'=>$order_id]);
-            // 订单处理
-            foreach ($detail['order_item'] as $item_info) {
-                //  更改订单详情状态
-                GoodsOrderItem::update(['status'=>9],['id'=>$item_info['id']]);
-                // 商品规格库存返回
-                StoreGoodsItem::where('id',$item_info['spec_id'])->setInc('stock',$item_info['num']);
-                // 商品总库存增加
-                StoreGoods::where('id',$item_info['goods_id'])->setInc('stock',$item_info['num']);
-            }
-            Db::commit();
-        }catch (\Exception $e){
-            $this->ret_msg = $e->getMessage();
-            $this->is_commit = false;
-            Db::rollback();
-        }
-        $this->is_commit ? $this->success('取消成功') : $this->error($this->ret_msg);
-    }
-
-
-
-    /**
-     * @title 确认收货
-     * @desc  确认收货
-     * @author  qc
-     * @url /api/Order/confirmReceipt
-     * @method POST
-     * @header name:Authorization require:1 desc:Token
-     * @param  name:order_id type:int require:1  default:0 desc:订单id
-     */
-    public function confirmReceipt()
-    {
-        $order_id = input('post.order_id');
-        $detail = GoodsOrder::with('orderItem')->where('id',$order_id)->find()->toArray();
-        if($detail['status'] == 0) $this->error('订单未支付');
-        if($detail['status'] == 1) $this->error('订单未发货');
-        if($detail['status'] == 3) $this->error('订单已收货');
-        GoodsOrder::update(['status'=>3,'express_state'=>2],['id'=>$order_id]);
-        GoodsOrderItem::update(['status'=>3,'express_state'=>2],['order_id'=>$order_id]);
-        $this->success('已确认收货');
-    }
-
-}

+ 0 - 42
application/api/controller/Task.php

@@ -1,10 +1,5 @@
 <?php
 namespace app\api\controller;
-
-use app\common\model\LabelMessage;
-use app\common\model\User;
-use app\common\model\UserMessage;
-
 /**
  * @title 定时任务
  * Class Task
@@ -13,43 +8,6 @@ use app\common\model\UserMessage;
  */
 class Task extends Base
 {
-    // 会员消息推送
-    public function taskUserMessage(){
-        $list = UserMessage::field('id,user_id,content')->where('jg_type',1)->where('jg_status',0)->limit(0,50)->order('id')->select();
-        foreach ($list as $v) {
-            UserMessage::where(['id'=>$v['id']])->update(['jg_status'=>1]);
-            Jpush($v['user_id'],$v['content']);
-        }
-    }
-
-
-    /**
-     * @title 标签推送[根据标签id]
-     * @desc  标签推送
-     * @author  qc
-     * @url /api/Task/taskLabelMessage
-     */
-    //按照标签推送
-    public function taskLabelMessage()
-    {
-        $list = LabelMessage::where('jg_status',0)->where('is_deleted',0)->select()->toArray();
-        foreach ($list as $v) {
-            LabelMessage::where(['id'=>$v['id']])->update(['jg_status'=>1]);
-            $user_list = User::field('id')
-                ->where('label','like','%|'.$v['label_id'].'|%')
-                ->where('status','=',1)
-                ->where('type','=',1)
-                ->where('is_deleted','=',0)->select()->toArray();;
-            foreach ($user_list as $user_info) {
-              $res =  Jpush($user_info['id'],$v['content']);
-            }
-        }
-    }
-
-
-
-
-
 
 
 

+ 0 - 305
application/api/controller/Trolley.php

@@ -1,305 +0,0 @@
-<?php
-namespace app\api\controller;
-use app\common\model\StoreGoods;
-use app\common\model\StoreGoodsItem;
-use app\common\service\ExpressService;
-use think\Db;
-use app\common\model\ShoppingTrolley;
-use app\common\model\DeliveryAddress;
-use think\Exception;
-
-/**
- * @title 购物车
- * @controller Trolley
- * @group base
- */
-class Trolley extends Base
-{
-
-    protected $no_login = ['delComment'];// 不需要登录的
-
-    public function initialize()
-    {
-        parent::initialize();
-        $path = explode('/',$this->request->path());
-        if(!in_array(end($path),$this->no_login)) parent::checkLogin();
-    }
-
-    /**
-     * @title 获取购物车商品数量
-     * @desc  获取购物车商品数量
-     * @author  qc
-     * @url /api/Trolley/getTrolleyNum
-     * @method GET
-     * @header name:Authorization require:1 desc:Token
-     * @param name:goods_id type:int default:-- desc:商品id(商品id不传查全部的)
-     * @return name:total_num type:int default:-- desc:购物车商品数量
-     */
-    public function getTrolleyNum()
-    {
-        $where = [];
-        $where['user_id'] = $this->user_id;
-        if($goods_id = input('get.goods_id',0)) $where['goods_id'] = $goods_id;
-        $total_num = ShoppingTrolley::where($where)->sum('num');
-        $this->success('ok',['total_num'=>$total_num]);
-    }
-
-    /**
-     * @title 获取购物车列表
-     * @desc  获取购物车列表
-     * @author  qc
-     * @url /api/Trolley/getTrolleyList
-     * @method GET
-     * @header name:Authorization require:1 desc:Token
-     * @return name:id type:int default:-- desc:购物车记录id
-     * @return name:goods_id type:int default:-- desc:商品id
-     * @return name:goods_name type:string default:-- desc:商品名称
-     * @return name:goods_status type:int default:-- desc:商品状态(1上架,0下架)
-     * @return name:cover type:string default:-- desc:商品封面
-     * @return name:deleted_status type:string default:-- desc:商品删除状态(1删除,0未删除)
-     * @return name:num type:int default:-- desc:数量
-     * @return name:goods_id type:int default:-- desc:商品id
-     * @return name:goods_id type:int default:-- desc:商品id
-     * @return name:spec_id type:int default:-- desc:规格id
-     * @return name:goods_spec type:int default:-- desc:规格
-     * @return name:goods_no type:int default:-- desc:货号
-     * @return name:original_price type:float default:-- desc:规格原价(下划线价格)
-     * @return name:sell_price type:float default:-- desc:规格售价
-     */
-    public function getTrolleyList()
-    {
-        $join_field = 't.id,t.num,t.spec_id,t.goods_id,i.goods_spec,g.cover,i.goods_no,i.is_deleted,i.original_price,i.sell_price,i.weight,g.name goods_name,g.status goods_status,g.is_deleted deleted_status';
-        $list = ShoppingTrolley::field($join_field)
-            ->alias('t')
-            ->where(['t.user_id'=>$this->user_id])
-            ->leftJoin('StoreGoodsItem i','i.id = t.spec_id')
-            ->leftJoin('StoreGoods g','t.goods_id = g.id')
-            ->order('t.id desc')
-            ->select()->toArray();
-        $this->success('ok',['list'=>$list]);
-    }
-
-    /**
-     * @title 商品添加购物车(按规格加入)
-     * @desc  商品某个规格加入多少
-     * @author  qc
-     * @url /api/Trolley/addTrolley
-     * @method POST
-     * @header name:Authorization require:1 desc:Token
-     * @param  name:goods_id type:int require:1  default:0 desc:商品id
-     * @param  name:spec_id type:int  require:1 default:0 desc:规格id
-     * @param  name:num type:int default:1 desc:数量
-     */
-    public function addTrolley()
-    {
-        $goods_id = input('post.goods_id');
-        $spec_id = input('post.spec_id');
-        $num    = input('post.num',1);
-        if(!$goods_id || !$spec_id)  $this->error('请选择商品');
-        if($num <=0 ) $this->error('添加数量有误');
-        Db::startTrans();
-        try {
-            // 商品详情
-            $goods_info = StoreGoods::with(['itemList'=>function($query)use($spec_id){
-                return $query->where('id',$spec_id)->where('is_deleted',0);
-            }])->where('id',$goods_id)->where('is_deleted',0)->where('status',1)->find();
-            if(!$goods_info) throw new Exception('商品已下架');
-            $goods_info = $goods_info->toArray();
-            if(empty($goods_info['item_list'])) throw new Exception('该规格已下架');
-            if($goods_info['item_list'][0]['stock'] < $num) throw new Exception('库存不足');
-            $trolley_id = ShoppingTrolley::checkTrolley($this->user_id,$goods_id,$spec_id);
-            // 添加到购物车
-            if($trolley_id) {
-                ShoppingTrolley::where('id',$trolley_id)->setInc('num',$num);
-            }else{
-                $trolley_info = [
-                    'user_id' => $this->user_id,
-                    'goods_id' => $goods_id,
-                    'spec_id' => $spec_id,
-                    'goods_no' => $goods_info['item_list'][0]['goods_no'],
-                    'num' => $num,
-                ];
-                ShoppingTrolley::create($trolley_info);
-            }
-            // 扣减库存
-            StoreGoods::where('id',$goods_id)->setDec('stock',$num);
-            StoreGoodsItem::where('id',$spec_id)->setDec('stock',$num);
-            Db::commit();
-        }catch (\Exception $e){
-            $this->is_commit = false;
-            $this->ret_msg = $e->getMessage();
-            Db::rollback();
-        }
-        $this->is_commit ? $this->success('添加成功'):$this->error($this->ret_msg);
-    }
-
-    /**
-     * @title 修改购物车商品数量
-     * @desc  修改购物车商品数量
-     * @author  qc
-     * @url /api/Trolley/changeTrolleyNum
-     * @method POST
-     * @header name:Authorization require:1 desc:Token
-     * @param  name:trolley_id type:int require:1  default:0 desc:购物车记录id
-     * @param name:num type:int require:1 default:1 desc:变更数量
-     * @param name:type type:int require:1 default:1 desc:变更类型(1增加2扣减)
-     */
-    public function changeTrolleyNum()
-    {
-        $trolley_id = input('post.trolley_id');
-        $num = input('post.num',1);
-        $type = input('post.type',1);
-        if(!in_array($type,[1,2])) $this->error('变更可类型错误');
-        Db::startTrans();
-        try {
-            $trolley_info = ShoppingTrolley::get($trolley_id);
-            if(!$trolley_info) $this->exception('记录不存在!');
-            $goods_info = StoreGoods::getGoodsSpec($trolley_info->goods_id,$trolley_info->spec_id);
-            if($type == 1){
-                if(!$goods_info) $this->exception('商品已下架');
-                if(empty($goods_info['item_list'])) $this->exception('该规格已下架');
-                if($goods_info['item_list'][0]['stock'] < $num)$this->exception('库存不足');
-                ShoppingTrolley::where('id',$trolley_id)->setInc('num',$num);
-                StoreGoods::where('id',$trolley_info->goods_id)->setDec('stock',$num);// 扣减商品库存
-                StoreGoodsItem::where('id',$trolley_info->spec_id)->setDec('stock',$num);// 扣减规格库存
-            }else{
-                if($trolley_info->num < $num) $this->exception('扣减数量有误');
-                if($trolley_info->num > $num){
-                    ShoppingTrolley::where('id',$trolley_id)->setDec('num',$num);//扣减数量
-                }else{
-                    ShoppingTrolley::where('id',$trolley_id)->delete();//删除记录
-                }
-                StoreGoods::where('id',$trolley_info->goods_id)->setInc('stock',$num);//增加商品库存
-                StoreGoodsItem::where('id',$trolley_info->spec_id)->setInc('stock',$num);//增加规格库存
-            }
-            Db::commit();
-        }catch (\Exception $e){
-            $this->ret_msg = $e->getMessage();
-            $this->is_commit = false;
-            Db::rollback();
-        }
-        $this->is_commit ? $this->success('操作成功') : $this->error($this->ret_msg);
-    }
-
-    /**
-     * @title 删除购物车记录
-     * @desc  删除购物车记录
-     * @author  qc
-     * @url /api/Trolley/cancelTrolleyList
-     * @method POST
-     * @header name:Authorization require:1 desc:Token
-     * @param  name:ids type:string require:1  default:0 desc:购物车记录id(多条用逗号隔开)
-     */
-    public function cancelTrolleyList()
-    {
-        $ids = input('post.ids');
-        if(!$ids) $this->error('请选择要删除的数据');
-        $trolley_list = ShoppingTrolley::where('id','in',$ids)->select();
-        Db::startTrans();
-        foreach ($trolley_list as $trolley_info) {
-            StoreGoods::where('id',$trolley_info->goods_id)->setInc('stock',$trolley_info->num);//增加商品库存
-            StoreGoodsItem::where('id',$trolley_info->spec_id)->setInc('stock',$trolley_info->num);//增加规格库存
-        }
-        ShoppingTrolley::where('id','in',$ids)->delete();
-        Db::commit();
-        $this->success('删除成功');
-
-    }
-
-    /**
-     * @title 某商品是否添加到购物
-     * @desc  获取某商品添加到购物车规格及数量
-     * @author  qc
-     * @url /api/Trolley/getTrolleyByGoodsId
-     * @method GET
-     * @header name:Authorization require:1 desc:Token
-     * @param  name:goods_id type:int  default:1 desc:商品id
-     * @return name:spec_id type:int default:-- desc:规格id
-     * @return name:num type:int default:-- desc:数量
-     */
-    public function getTrolleyByGoodsId()
-    {
-        $goods_id = input('get.goods_id');
-        $list = ShoppingTrolley::field('id,goods_id,spec_id,goods_no,num')
-            ->where(['user_id'=>$this->user_id,'goods_id'=>$goods_id])
-            ->order('id desc')
-            ->select();
-        $this->success('ok',['list'=>$list?$list->toArray() : null ]);
-    }
-
-
-    /**
-     * @title 购物车订单确认
-     * @desc  购物车订单确认
-     * @author  qc
-     * @url /api/Trolley/confirmTrolleyList
-     * @method GET
-     * @header name:Authorization require:1 desc:Token
-     * @param  name:ids type:int  default:1 desc:购物车记录id(多条用逗号隔开)
-     * @return name:goods_id type:int default:-- desc:商品id
-     * @return name:goods_name type:string default:-- desc:商品名称
-     * @return name:goods_status type:int default:-- desc:商品状态(1上架,0下架)
-     * @return name:deleted_status type:string default:-- desc:删除状态(1删除,0未删除)
-     * @return name:cover type:string default:-- desc:封面
-     * @return name:item_list type:array default:-- desc:添加该商品的规格列表
-     * @return name:item_list.spec_id type:int default:-- desc:规格id
-     * @return name:item_list.goods_no type:int default:-- desc:货号
-     * @return name:item_list.original_price type:float default:-- desc:规格原价
-     * @return name:item_list.sell_price type:float default:-- desc:规格售价
-     * @return name:item_list.goods_spec type:string default:-- desc:规格
-     * @return name:total_money type:float default:-- desc:商品总金额【不含运费】
-     * @return name:freight type:float default:-- desc:运费
-     * @return name:freight_code type:int default:1 desc:运费提示编号【1所选地址支持发货,0所选地址不支持发货】
-     * @return name:freight_msg type:string default:-- desc:运费提示信息【freight_code=1忽略】
-     */
-    public function confirmTrolleyList()
-    {
-        $ids = input('get.ids');
-        $trolley_goods = ShoppingTrolley::field('goods_id')
-            ->where('user_id',$this->user_id)
-            ->where('id','in',$ids)
-            ->group('goods_id')
-            ->select();
-        if(!$trolley_goods) $this->error('请选择商品');
-        $goods_ids = array_column($trolley_goods->toArray(),'goods_id');
-        $freight = 0;
-        $list = [];
-        $total_money = 0;
-        $goods_list = StoreGoods::where('id','in',$goods_ids)->select()->toArray();
-        $address_info = DeliveryAddress::where(['user_id'=>$this->user_id,'is_mr'=>1])->find();
-        foreach ($goods_list as $goods_info){
-            $trolley_data =  ['goods_id'=>$goods_info['id'],'goods_name'=>$goods_info['name'],'goods_status'=>$goods_info['status'],'cover'=>$goods_info['cover'],'deleted_status'=>$goods_info['is_deleted']];
-            $trolley_data['item_list'] = ShoppingTrolley::field('t.*,i.original_price,i.sell_price,i.goods_spec')
-                ->alias('t')
-                ->where('t.id','in',$ids)
-                ->where('t.goods_id',$goods_info['id'])
-                ->leftJoin('StoreGoodsItem i','i.id = t.spec_id')
-                ->select()->toArray();
-            foreach ($trolley_data['item_list'] as $iv){
-                $total_money = bcadd(bcmul($iv['num'],$iv['sell_price'],2),$total_money,2);
-            }
-            $list[] = $trolley_data;
-            $fre_num = array_sum(array_column($trolley_data['item_list'],'num'));
-            if($address_info) {
-                $goods_freight = ExpressService::getGoodsExpressPrice($goods_info,$address_info->id,$fre_num);
-                if($goods_freight['code'] !=200){
-                    $this->is_commit =  false;
-                    $this->ret_msg =  $goods_freight['msg'];
-                }
-                $freight +=  $goods_freight['freight']; //  商品运费
-            }
-        }
-        $this->success('ok',[
-            'list'=>$list,
-            'total_money'=>$total_money,
-            'address_info'=>$address_info ? $address_info->toArray():null,
-            'freight' =>$freight,
-            'freight_msg' => $this->ret_msg,
-            'freight_code' => $this->is_commit ? 1 :0
-        ]);
-    }
-
-
-
-
-}

+ 0 - 2
application/api/controller/Upload.php

@@ -14,8 +14,6 @@
 // +----------------------------------------------------------------------
 
 namespace app\api\controller;
-
-use app\common\controller\Api;
 use library\File;
 
 /**

+ 0 - 3
application/api/controller/UserCenter.php

@@ -1,8 +1,5 @@
 <?php
 namespace app\api\controller;
-use app\common\model\UserLevelRank;
-use app\common\model\UserMessage;
-use app\common\validate\UserVali;
 use think\Db;
 use app\common\model\User;
 /**

+ 0 - 279
application/api/controller/WalletManage.php

@@ -1,279 +0,0 @@
-<?php
-
-
-namespace app\api\controller;
-use app\common\model\GoodsOrderItem;
-use app\common\model\UserBank;
-use app\common\model\UserIntegralLog;
-use app\common\model\UserLevel;
-use app\common\model\UserMoneyInfo;
-use app\common\model\UserWallet;
-use app\common\model\UserWithdrawLog;
-use think\Db;
-use app\common\model\User;
-/**
- * @title 会员钱包管理(佣金提现,积分,经验...)
- * @controller WalletManage
- * @group base
- */
-class WalletManage extends Base
-{
-    public function initialize()
-    {
-        parent::initialize();
-        parent::checkLogin();
-    }
-
-    /**
-     * @title 获取钱包详情
-     * @desc 获取钱包详情
-     * @author qc
-     * @url /api/Wallet_manage/walletInfo
-     * @method GET
-     * @tag 个人信息
-     * @header name:Authorization require:1 desc:Token
-     * @return name:detail type:array default:-- desc:钱包
-     * @return name:detail.integral type:int default:-- desc:积分
-     * @return name:detail.growth type:int default:-- desc:经验值(分销等级成长值)
-     * @return name:detail.money type:float default:-- desc:佣金
-     * @return name:detail.level_exp type:int default:-- desc:等级经验(会员等级经验值)
-     * @return name:detail.withdraw type:float default:-- desc:累积提现
-     * @return name:openid type:string default:-- desc:绑定的微信openid
-     * @return name:ali_account type:array default:-- desc:支付宝账号
-     * @return name:ali_account.real_name type:string default:-- desc:支付宝姓名
-     * @return name:ali_account.card_no type:string default:-- desc:支付宝账号
-     * @return name:bank_list type:array default:-- desc:绑定银行卡列表
-     * @return name:bank_list.real_name type:string require:1 default:-- desc:真实姓名
-     * @return name:bank_list.card_no type:string require:1 default:-- desc:账号
-     * @return name:bank_list.bank_name type:string require:1 default:-- desc:所属银行
-     *
-     */
-    public function walletInfo()
-    {
-        $wallet = UserWallet::where('user_id',$this->user_id)->find();
-        if(!$wallet) $wallet =  UserWallet::create(['user_id'=>$this->user_id]);
-        $user_info = User::field('id,name,openid,headimg')->where('id',$this->user_id)->find();
-        $ali_account = UserBank::field('id,real_name,card_no')->where(['user_id'=>$this->user_id,'type'=>1,'is_deleted'=>0])->find();
-        $bank_list = UserBank::field('id,real_name,card_no,bank_name')->where(['user_id'=>$this->user_id,'type'=>2,'is_deleted'=>0])->order('id desc')->select()->toArray();
-        $this->success('获取成功',['detail'=> $wallet->toArray(),'user_info'=>$user_info,'ali_account'=>$ali_account,'bank_list'=>$bank_list]);
-    }
-
-    /**
-     * @title 获取个人钱包信息
-     * @desc 获取个人钱包信息
-     * @author qc
-     * @url /api/Wallet_manage/getUserWallet
-     * @method GET
-     * @tag 获取个人钱包信息
-     * @header name:Authorization require:1 desc:Token
-     * @return name:phone type:int default:-- desc:手机号
-     * @return name:name type:string default:-- desc:昵称
-     * @return name:headimg type:string default:-- desc:头像地址
-     * @return name:card_front type:string default:-- desc:身份证正面
-     * @return name:card_back type:string default:-- desc:身份证背面
-     * @return name:level_name type:string default:-- desc:等级名称
-     * @return name:partner_lev type:int default:-- desc:分销商等级id(0不是分销商)
-     * @return name:is_agency type:int default:-- desc:是否是区域代理(0不是)
-     * @return name:wallet type:array default:-- desc:钱包
-     * @return name:wallet.integral type:int default:-- desc:积分
-     * @return name:wallet.growth type:int default:-- desc:经验值(分销等级成长值)
-     * @return name:wallet.money type:float default:-- desc:佣金
-     * @return name:wallet.level_exp type:int default:-- desc:经验值(会员等级)
-     *
-     */
-    public function getUserWallet()
-    {
-        $field = 'id,name,level_id,headimg,true_name,birthday,is_agency,partner_lev';
-        $user_info = User::with('wallet')->field($field)->where('id',$this->user_id)->find()->toArray();
-        $user_info['level_name'] = UserLevel::where('id',$user_info['level_id'])->value('name');
-        if(empty($user_info)) $this->error('用户信息不正确');
-        $this->success('获取成功',['user_info'=>$user_info]);
-    }
-
-
-    /**
-     * @title 佣金提现
-     * @desc 佣金提现
-     * @author qc
-     * @url /api/Wallet_manage/withdraw
-     * @method POST
-     * @tag 佣金提现
-     * @header name:Authorization require:1 desc:Token
-     * @param name:money type:float default:-- desc:提现金额
-     * @param name:type type:int default:-- desc:到账类型(1支付宝,2银行卡,3微信)
-     * @param name:pay_password type:string default:-- desc:支付密码
-     * @param name:bank_id type:int default:-- desc:账号id(type=1或2必传)
-     */
-    public function withdraw()
-    {
-       $rate        = 0.03;// 提现手续费
-       $min_money   = 100 ;// 最低提现金额
-       $max_money   = 1000;// 最大提现金额
-       $money = input('post.money',0);
-       $type = input('post.type',0);
-       $bank_id = input('post.bank_id',0);
-       $pay_password = input('post.pay_password',0);
-       if($money < $min_money) $this->error('最低提现金额:'.$min_money);
-       if($money > $max_money) $this->error('最大提现金额:'.$max_money);
-       $user_info = User::where('id',$this->user_id)->find()->toArray();
-       if(!$user_info['pay_password']) $this->error('请设置提现密码');
-       if(!check_password($pay_password,$user_info['pay_password'])) $this->error('密码错误');
-       if($type == 3 && !$user_info['openid']) $this->error('请先绑定微信!');
-       if(in_array($type,[1,2])) {
-           $acc_info = UserBank::where(['id'=>$bank_id,'user_id'=>$this->user_id])->find();
-           if(!$acc_info) $this->error('账号信息有误');
-       }
-       Db::startTrans();
-       try {
-           $wallet = UserWallet::where(['user_id'=>$this->user_id])->find();
-           if($wallet->money < $money)  $this->exception('佣金余额不足');
-           $service_fee = bcmul($money,$rate,2);
-           $account =  bcsub($money,$service_fee,2);
-           $ins_data = [
-               'user_id' => $this->user_id,
-               'money' => $money,// 提现金额
-               'rate' => $rate,// 手续费率
-               'service_fee' => $service_fee,// 手续费
-               'account' => $account,// 实际到账金额
-               'type' => $type,
-               'user_name' => $type == 3 ? $user_info['name'] : $acc_info->real_name,
-               'card_no' => $type == 3 ?  $user_info['openid'] : $acc_info->card_no,
-               'bank_name' => $type == 3 ? '微信账户' : $acc_info->bank_name,
-           ];
-           $ins_res = UserWithdrawLog::create($ins_data);// 提现日志
-           UserWallet::userMoneyChange($this->user_id,$money,'提现申请',3,-1,$ins_res->id);
-           $this->ret_msg = '申请成功';
-       }catch (\Exception $e){
-            $this->is_commit = false;
-            $this->ret_msg = $e->getMessage();
-       }
-       $this->transReturn();
-    }
-
-    /**
-     * @title 获取用户提现日志
-     * @desc 获取用户提现日志
-     * @author qc
-     * @url /api/Wallet_manage/getWithdrawLog
-     * @method GET
-     * @header name:Authorization require:1 desc:Token
-     * @param  name:status type:int default:-1 desc:状态(0待处理,1已审核 2已到账 3已拒绝 4异常)
-     * @param  name:type type:int default:-- desc:类型
-     * @param  name:page type:int  : default:1 desc:页数
-     * @param  name:page_num type:int  : default:20 desc:每页数
-     * @return name:money type:float default:-- desc:提现金额
-     * @return name:type type:int default:-- desc:到账类型(1支付宝,2银行卡,3微信)
-     * @return name:money type:float default:-- desc:申请提现金额
-     * @return name:rate type:float default:-- desc:手续费率
-     * @return name:service_fee type:float default:-- desc:手续费
-     * @return name:desc type:float default:-- desc:描述
-     * @return name:status type:int default:-- desc:状态(0待处理,1已审核 2已到账 3已拒绝 4异常)
-     * @return name:user_name type:string default:-- desc:收款人
-     * @return name:card_no type:string default:-- desc:收款账号
-     * @return name:bank_name type:string default:-- desc:名称
-     */
-    public function getWithdrawLog()
-    {
-        $status = input('get.status',-1);
-        $where = [];
-        $where['is_deleted'] = 0;
-        $where['user_id'] = $this->user_id;
-        if($status) $where['status'] =  $status;
-        $list = UserWithdrawLog::where($where)->limit($this->off_set,$this->page_num)
-            ->order('id desc')->select();
-        $this->success('ok',['list'=>$list ? $list->toArray():[]]);
-    }
-
-    /**
-     * @title 获取用户佣金变更记录
-     * @desc 获取用户佣金变更记录
-     * @author qc
-     * @url /api/Wallet_manage/getUserMoneyInfo
-     * @method GET
-     * @header name:Authorization require:1 desc:Token
-     * @param  name:page type:int  : default:1 desc:页数
-     * @param  name:page_num type:int  : default:20 desc:每页数
-     * @return name:money type:float default:-- desc:金额
-     * @return name:create_at type:string default:-- desc:时间
-     * @return name:desc type:float default:-- desc:描述
-     */
-    public function getUserMoneyInfo()
-    {
-        $where = [];
-        $where['user_id'] = $this->user_id;
-        $list = UserMoneyInfo::where($where)->limit($this->off_set,$this->page_num)->order('id desc')->select();
-        $this->success('ok',['list'=>$list ? $list->toArray():[]]);
-    }
-
-    /**
-     * @title 获取用户积分变更记录
-     * @desc 获取用户积分变更记录
-     * @author qc
-     * @url /api/Wallet_manage/getUserIntegralLog
-     * @method GET
-     * @header name:Authorization require:1 desc:Token
-     * @param  name:page type:int  : default:1 desc:页数
-     * @param  name:page_num type:int  : default:20 desc:每页数
-     * @param  name:type type:int  : default:0 desc:类型(0全部,1增加,2减少)
-     * @return name:integral type:int default:-- desc:变更数量
-     * @return name:create_at type:string default:-- desc:时间
-     * @return name:desc type:float default:-- desc:描述
-     */
-    public function getUserIntegralLog()
-    {
-        $where = [];
-        $where[] = ['user_id','=',$this->user_id];
-        $where[] = ['is_deleted','=',0];
-        if(input('type') == 1) $where[] = ['integral','>','0'];
-        if(input('type') == 2) $where[] = ['integral','<','0'];
-        $list = UserIntegralLog::where($where)->limit($this->off_set,$this->page_num)->order('id desc')->select();
-        $this->success('ok',['list'=>$list ? $list->toArray():[]]);
-    }
-
-
-    /**
-     * @title 获取用户分销佣金记录
-     * @desc 获取用户分销佣金记录
-     * @author qc
-     * @url /api/Wallet_manage/getDistributionMoney
-     * @method GET
-     * @header name:Authorization require:1 desc:Token
-     * @param  name:page type:int  : default:1 desc:页数
-     * @param  name:page_num type:int  : default:20 desc:每页数
-     * @return name:money type:float default:-- desc:金额
-     * @return name:create_at type:string default:-- desc:时间
-     * @return name:desc type:float default:-- desc:描述
-     * @return name:type type:float default:-- desc:类型(7一级分销,8二级分销)
-     * @return name:user_info type:array default:-- desc:会员信息
-     * @return name:user_info.name type:string default:-- desc:会员名
-     * @return name:user_info.headimg type:string default:-- desc:会员头像
-     * @return name:goods_list type:array default:-- desc:商品列表
-     * @return name:goods_list.cover type:array default:-- desc:商品图
-     * @return name:goods_list.goods_name type:string default:-- desc:商品名
-     * @return name:goods_list.goods_spec type:string default:-- desc:商品规格
-     * @return name:goods_list.sell_money type:float default:-- desc:商品价格
-     * @return name:goods_list.is_dist type:int default:-- desc:是否是分销商品(0否,1是)
-     */
-    public function getDistributionMoney()
-    {
-        $where = [];
-        $where[] = ['user_id','=',$this->user_id];
-        $where[] = ['type','in','7,8'];
-        $list = UserMoneyInfo::where($where)->limit($this->off_set,$this->page_num)->order('id desc')->select();
-        array_walk($list,function ($val){
-            $val['user_info']  = User::where('id',$val['user_id'])->field('id,name,headimg')->find()->toArray();
-            $goods_list = GoodsOrderItem::where('i.order_id',$val['id'])
-                ->alias('i')
-                ->leftJoin('StoreGoods g','g.id = i.goods_id')
-                ->field('i.cover,i.sell_money,i.num,g.is_dist,i.goods_name,i.goods_spec')
-                ->select()->toArray();
-            $val['goods_list'] = $goods_list;
-        });
-        $this->success('ok',['list'=>$list ? $list->toArray():'']);
-    }
-
-
-
-
-
-}

+ 0 - 315
application/api/controller/WashOrder.php

@@ -1,315 +0,0 @@
-<?php
-namespace app\api\controller;
-use app\common\model\GoodsOrder;
-use app\common\model\User;
-use app\common\model\WashCate;
-use app\common\model\WashOrderItem;
-use think\Db;
-use think\Exception;
-
-/**
- * @title 商城订单
- * @controller WashOrder
- * @group base
- */
-class WashOrder extends Base
-{
-    public function initialize()
-    {
-        parent::initialize();
-        parent::checkLogin();
-    }
-
-    /**
-     * @title 创建订单【创建洗鞋订】
-     * @desc  创建订单
-     * @author  qc
-     * @url /api/Wash_order/createOrder
-     * @method POST
-     * @header name:Authorization require:1 desc:Token
-     * @param name:goods_json type:string require:1  default:0 desc:洗鞋信息[{'cate_id':'洗鞋分类id',ladder_key:'洗鞋分类ladder_key',images:'图片(多张|隔开)',remark:'备注'}
-     * @param name:pro_name type:string default:-- desc:收货地址--省
-     * @param name:city_name type:string default:-- desc:收货地址--市
-     * @param name:county_name type:string default:-- desc:收货地址--区
-     * @param name:add_detail type:string default:-- desc:收货地址--详情
-     * @param name:user_name type:string default:-- desc:收货人
-     * @param name:phone type:string default:-- desc:收货人联系方式
-     * @param name:remark type:string default:1 desc:订单备注
-     * @return name:order_id type:int default:1 desc:订单id
-     */
-    public function createOrder()
-    {
-     /*  $post_json = [
-           [
-               'cate_id'=>1,
-               'ladder_key'=>0,
-               'images'=>'https://gaoyixia2.oss-cn-shanghai.aliyuncs.com/5e48b5b47f8f0770/55fdfd184a2b4c55.jpg',
-               'remark'=>'AAAAA',
-           ]
-       ];
-       var_dump(json_encode($post_json));*/
-
-        $goods_json = input('post.goods_json','');
-        $pro_name = input('post.pro_name','');
-        $city_name = input('post.city_name','');
-        $county_name = input('post.county_name','');
-        $add_detail = input('post.add_detail','');
-        $user_name = input('post.user_name','');
-        $phone = input('post.phone','');
-        if(!$pro_name || !$city_name || !$county_name || !$add_detail) $this->error('请完善地址信心');
-        if(!$user_name || !$phone) $this->error('请完善收货人信息');
-        $goods_data = json_decode($goods_json,true);
-        Db::startTrans();
-        try {
-            $user_info  =  $this->userInfo();
-            $wash_cate = WashCate::column('ladder_set','id');
-            $item_data = [];
-            $user_id = $this->user_id;
-            $price_total = 0;
-            array_walk($goods_data,function (&$v,$k)use (&$item_data,$user_id,$wash_cate,&$price_total){
-                $item_info = [
-                       'user_id' => $user_id,
-                       'num' => 1,
-                       'cate_id' => $v['cate_id'],
-                       'ladder_key' => $v['ladder_key'],
-                       'images' => $v['images'],
-                       'remark' => $v['remark'],
-                       'sell_price' => json_decode($wash_cate[$v['cate_id']],true)[$v['ladder_key']]['price'],
-                ];
-                $price_total = bcadd($price_total,$item_info['sell_price'],2);
-                $item_data[] = $item_info;
-            });
-            $order_insert = [
-                'user_id' => $this->user_id,
-                'order_no' => get_order_sn(),
-                'pay_no' => get_order_sn(),
-                'pro_name' => $pro_name,
-                'city_name' =>$city_name,
-                'county_name' => $county_name,
-                'add_detail' => $add_detail,
-                'user_name' => $user_name,
-                'phone' => $phone,
-                'price_total' => $price_total,
-                'goods_num' => array_sum(array_column($item_data,'num')),
-            ];
-            $order_info = \app\common\model\WashOrder::create($order_insert);
-            foreach ($item_data as &$gv) {
-                $gv['order_id'] = $order_info->id;
-            }
-            (new WashOrderItem())->insertAll($item_data);
-            Db::commit();
-        }catch (\Exception $e) {
-            Db::rollback();
-            $this->error($e->getMessage());
-        }
-        $this->success('订单创建成功',['order_id'=>$order_info->id]);
-    }
-
-
-
-    /**
-     * @title 订单支付
-     * @desc  订单支付
-     * @author  qc
-     * @url /api/Wash_order/payOrder
-     * @method POST
-     * @header name:Authorization require:1 desc:Token
-     * @param  name:order_id type:int require:1  default:0 desc:订单id
-     * @return name:config type:array default:0 desc:小程序支付配置
-     * @return name:config.appId type:string default:-- desc:appid
-     * @return name:config.nonceStr type:string default:-- desc:随机字符串
-     * @return name:config.signType type:string default:-- desc:签名类型
-     * @return name:config.paySign type:string default:-- desc:签名
-     * @return name:config.timestamp type:string default:-- desc:时间戳
-     */
-
-    public function payOrder()
-    {
-        $order_id = input('post.order_id');
-        $order_info = \app\common\model\WashOrder::with('orderItem')->where('id',$order_id)->find()->toArray();
-        if($order_info['status'] != 0) $this->error('订单状态错误');
-        if($order_info['cancel_state'] != 0 || $order_info['is_deleted'] != 0) $this->error('订单异常');
-        if($order_info['price_total'] <= 0) $this->error('订单金额错误');
-        $user_info = User::where('id',$this->user_id)->find()->toArray();
-        $ret_data = ['pay_status'=>0,'config'=>[]];
-        Db::startTrans();
-        try {
-            $notify_url = $this->request->root(true) . '/api/we_chat_pay/washOrderNotify';
-            $pay_no = $order_info['pay_no'] ;
-            $config = WeChatPay::wxPay('订单支付',$pay_no,$order_info['price_total'],$notify_url,'JSAPI',$user_info['openid']);
-            if(!$config) throw  new  Exception('支付配置错误');
-            $ret_data['config'] = $config;
-            Db::commit();
-        }catch (\Exception $e) {
-            Db::rollback();
-            $this->error($e->getMessage());
-        }
-        $this->success('ok',$ret_data);
-    }
-
-
-
-    /**
-     * @title 获取订单列表
-     * @desc 获取订单列表
-     * @author qc
-     * @method GET
-     * @url /api/Wash_order/getWashOrderList
-     * @header name:Authorization require:1 desc:Token
-     * @param  name:page type:int  default:1 desc:页数
-     * @param  name:page_num type:int default:20 desc:每页数
-     * @param  name:status type:int default:-1  desc:订单状态(-1全部,0未支付,1已支付,2已完成,9取消)
-     * @return name:id type:int default:--  desc:订单id
-     * @return name:order_no type:string default:--  desc:订单号
-     * @return name:pay_no type:string default:--  desc:支付号
-     * @return name:status type:int default:--  desc:订单状态(-1全部,0未支付,1已支付,2已完成,9取消)
-     * @return name:create_at type:string default:--  desc:下单时间
-     * @return name:pro_name type:string default:--  desc:省名称(订单地址)
-     * @return name:city_name type:string default:--  desc:市名称(订单地址)
-     * @return name:county_name type:string default:--  desc:县区名称(订单地址)
-     * @return name:add_detail type:string default:--  desc:详细地址(订单地址)
-     * @return name:user_name type:string default:--  desc:订单人
-     * @return name:phone type:string default:--  desc:人联系
-     * @return name:order_item type:array default:--  desc:订单明细
-     * @return name:order_item.id type:int default:--  desc:订单明细id
-     * @return name:order_item.cate_id type:int default:--  desc:洗鞋分类id
-     * @return name:order_item.sell_price type:int default:--  desc:价格
-     * @return name:order_item.images type:int default:--  desc:图片(多张)
-     * @return name:order_item.images_arr type:array default:--  desc:图片(多张)
-     * @return name:order_item.remark type:int default:--  desc:备注
-     * @return name:order_item.cate_name type:string default:--  desc:分类名
-     * @return name:order_item.cate_cover type:string default:--  desc:分类logo
-     * @return name:order_item.cate_title type:string default:--  desc:价格区间标题
-     * @return name:order_item.cate_price type:string default:--  desc:价格[订单单价]
-     */
-    public function getWashOrderList()
-    {
-        $status = input('get.status',-1);
-        $where = [];
-        $where[] = ['user_id','=',$this->user_id];
-        $where[] = ['is_deleted','=',0];
-        if($status > -1) $where[] = ['status','=',$status];
-        $list = \app\common\model\WashOrder::with('orderItem')
-            ->where($where)
-            ->limit($this->off_set,$this->page_num)
-            ->order('id desc')
-            ->select()->toArray();
-        array_walk($list,function (&$v,$k){
-            foreach ($v['order_item'] as &$iv){
-                $iv['images_arr'] = $iv['images'] ? explode('|',$iv['images']) : null;
-                $cate_info = WashCate::where('id',$iv['cate_id'])->find()->toArray();
-                $iv['cate_name'] = $cate_info['title'];
-                $iv['cate_cover'] = $cate_info['logo'];
-                $ladder_set =  json_decode($cate_info['ladder_set'],true);
-                $iv['cate_title'] = $ladder_set[$iv['ladder_key']]['title'];
-                $iv['cate_price'] = $ladder_set[$iv['ladder_key']]['price'];
-            }
-        });
-        $this->success('ok',['list'=>$list]);
-    }
-
-    /**
-     * @title 获取订单列表
-     * @desc 获取订单列表【订单类型不要了】
-     * @author qc
-     * @method GET
-     * @url /api/Wash_order/getWashOrderDetail
-     * @header name:Authorization require:1 desc:Token
-     * @param  name:id type:int  default:1 desc:订单id
-     * @return name:id type:int default:--  desc:订单id
-     * @return name:order_no type:string default:--  desc:订单号
-     * @return name:pay_no type:string default:--  desc:支付号
-     * @return name:status type:int default:--  desc:订单状态(0未支付,1已支付,2已完成,9取消)
-     * @return name:create_at type:string default:--  desc:下单时间
-     * @return name:pay_at type:string default:--  desc:支付时间
-     * @return name:pro_name type:string default:--  desc:省名称(订单地址)
-     * @return name:city_name type:string default:--  desc:市名称(订单地址)
-     * @return name:county_name type:string default:--  desc:县区名称(订单地址)
-     * @return name:add_detail type:string default:--  desc:详细地址(订单地址)
-     * @return name:user_name type:string default:--  desc:订单人
-     * @return name:phone type:string default:--  desc:人联系
-     * @return name:order_item type:array default:--  desc:订单明细
-     * @return name:order_item.id type:int default:--  desc:订单明细id
-     * @return name:order_item.cate_id type:int default:--  desc:洗鞋分类id
-     * @return name:order_item.sell_price type:int default:--  desc:价格
-     * @return name:order_item.images type:int default:--  desc:图片(多张)
-     * @return name:order_item.images_arr type:array default:--  desc:图片(多张)
-     * @return name:order_item.remark type:string default:--  desc:备注
-     * @return name:order_item.cate_name type:string default:--  desc:分类名
-     * @return name:order_item.cate_cover type:string default:--  desc:分类logo
-     * @return name:order_item.cate_title type:string default:--  desc:价格区间标题
-     * @return name:order_item.cate_price type:string default:--  desc:价格[订单单价]
-     *
-     */
-    public function getWashOrderDetail()
-    {
-        $order_id = input('get.id');
-        $detail = \app\common\model\WashOrder::with('orderItem')
-            ->where('id',$order_id)
-            ->find()->toArray();
-        array_walk($detail['order_item'],function (&$v){
-            $v['images_arr'] = $v['images'] ? explode('|',$v['images']) : null;
-            $cate_info = WashCate::where('id',$v['cate_id'])->find()->toArray();
-            $v['cate_name'] = $cate_info['title'];
-            $v['cate_cover'] = $cate_info['logo'];
-            $ladder_set =  json_decode($cate_info['ladder_set'],true);
-            $v['cate_title'] = $ladder_set[$v['ladder_key']]['title'];
-            $v['cate_price'] = $ladder_set[$v['ladder_key']]['title'];
-        });
-        $this->success('ok',['detail'=>$detail]);
-    }
-
-    /**
-     * @title 取消预约
-     * @desc  取消预约
-     * @author  qc
-     * @url /api/Wash_order/cancelOrder
-     * @method POST
-     * @header name:Authorization require:1 desc:Token
-     * @param  name:id type:int require:1  default:0 desc:订单id
-     * @param  name:cancel_desc type:string  default:0 desc:取消原因
-     */
-    public function cancelOrder()
-    {
-        $order_id = input('post.id');
-        $cancel_desc = input('post.cancel_desc');
-        Db::startTrans();
-        try {
-            $detail = \app\common\model\WashOrder::where('id',$order_id)->find()->toArray();
-            if($detail['status'] != 0) $this->exception('订单已完成或是已取消');
-            \app\common\model\WashOrder::where('id',$order_id)->update(['status'=>9,'cancel_at'=>date("Y-m-d H:i:s"),'cancel_state'=>1,'cancel_desc'=>$cancel_desc]);
-            Db::commit();
-        }catch (\Exception $e){
-            $this->ret_msg = $e->getMessage();
-            $this->is_commit = false;
-            Db::rollback();
-        }
-        $this->is_commit ? $this->success('取消成功') : $this->error($this->ret_msg);
-    }
-
-    /**
-     * @title 预约完成
-     * @desc  预约完成
-     * @author  qc
-     * @url /api/Wash_order/completeOrder
-     * @method POST
-     * @header name:Authorization require:1 desc:Token
-     * @param  name:id type:int require:1  default:0 desc:订单记录id
-     */
-    public function completeOrder()
-    {
-        $order_id = input('post.id');
-        $detail = \app\common\model\WashOrder::where('id',$order_id)->find()->toArray();
-        if($detail['status'] != 1) $this->error('订单状态错误');
-        \app\common\model\WashOrder::update(['status'=>2],['id'=>$order_id]);
-        $this->success('订单已完成');
-    }
-
-
-
-
-
-
-
-
-}

+ 0 - 151
application/api/controller/WeChatPay.php

@@ -1,151 +0,0 @@
-<?php
-
-// +----------------------------------------------------------------------
-// | ThinkAdmin
-// +----------------------------------------------------------------------
-// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
-// +----------------------------------------------------------------------
-// | 官方网站: http://demo.thinkadmin.top
-// +----------------------------------------------------------------------
-// | 开源协议 ( https://mit-license.org )
-// +----------------------------------------------------------------------
-// | gitee 代码仓库:https://gitee.com/zoujingli/ThinkAdmin
-// | github 代码仓库:https://github.com/zoujingli/ThinkAdmin
-// +----------------------------------------------------------------------
-
-namespace app\api\controller;
-use app\common\model\GoodsOrder;
-use app\common\service\OrderCallback;
-use EasyWeChat\Factory;
-use think\Controller;
-use think\Db;
-use think\Exception;
-use AlibabaCloud\Client\AlibabaCloud;
-use AlibabaCloud\Client\Exception\ClientException;
-use AlibabaCloud\Client\Exception\ServerException;
-/**
- * 微信支付管理类
- * Class WeChatPay
- * @package app\api\controller\WeChatPay
- */
-class WeChatPay extends Controller
-{
-    //小程序微信支付(type为1时是货主端微信配置,type为2时是接单端微信配置)
-    public static function wxPay($name='订单支付',$out_trade_no,$total_fee,$notify_url,$trade_type = 'JSAPI',$openid = ''){
-        try{
-            if(empty($out_trade_no) || empty($total_fee) || empty($notify_url)) return false;
-            $parameter = [
-                'body'          => $name,
-                'out_trade_no'  => $out_trade_no,
-                'total_fee'     => $total_fee*100,
-                'notify_url'    => $notify_url, // 支付结果通知网址,如果不设置则会使用配置里的默认地址
-                'trade_type'    => $trade_type, // 请对应换成你的支付方式对应的值类型
-                'openid'        => $openid,
-            ];
-            switch ($trade_type){
-                case 'JSAPI':
-                    $app = Factory::payment(config('app.wx_pay'));
-                    break;
-                case 'NATIVE':
-                    $app = Factory::payment(config('app.wx_pay'));
-                    break;
-                case 'APP':
-                    $app = Factory::payment(config('app.app_wx'));
-                    break;
-                case 'MWEB':
-                    $app = Factory::payment(config('app.wx_pay'));
-                    break;
-                case 'WAP':
-                    $app = Factory::payment(config('app.wx_pay'));
-                    break;
-            }
-            if(in_array($trade_type ,['JSAPI'])) $parameter['openid'] = $openid;
-            if(in_array($trade_type ,['MWEB'])) $parameter['spbill_create_ip'] = request()->ip();
-            $result = $app->order->unify($parameter);
-            $jssdk = $app->jssdk;
-            if($trade_type == 'APP') {
-                $config = $jssdk->appConfig($result['prepay_id']);
-            }else if($trade_type == 'MWEB'){
-                $config = $jssdk->bridgeConfig($result['prepay_id']);
-            }else{
-                $config = $jssdk->sdkConfig($result['prepay_id']);
-            }
-            if(!is_array($config) && $config) $config = json_decode($config,true);
-            return ['code'=> $config ? 200 : 201 , 'config'=>$config,'msg'=>'ok','mweb_url'=> isset($result['mweb_url']) ?  $result['mweb_url']:''];
-        }catch (\Exception $e){
-            return ['code'=> 201,'config'=>[],'msg'=>$e->getMessage(),'mweb_url'=>''];
-        }
-    }
-
-    /**
-     * 商城订单支付回调
-     */
-    public function goodsOrderNotify()
-    {
-        $app = Factory::payment(config('app.wx_pay'));
-        $response = $app->handlePaidNotify(function ($message, $fail) {
-            $this->payResultLog($message,'dd_goods_order');
-            // 使用通知里的 "微信支付订单号" 或者 "商户订单号" 去自己的数据库找到订单
-            $pay_no = $message['out_trade_no'];
-            // 如果订单不存在 或者 订单已经支付过了  告诉微信,我已经处理完了,订单没找到,别再通知我了
-            if ($message['result_code'] == 'SUCCESS') { // return_code 表示通信状态,不代表支付状态
-                $order_info = GoodsOrder::with('orderItem')->where('pay_no',$pay_no)->find();
-                if(!$order_info) return false;
-                $order_info = $order_info->toArray();
-                if($order_info['status'] != 0) return true;
-                $back_res = OrderCallback::goodsOrderCallBack($order_info,1);// 支付完成后回调
-                return $back_res['ret_val'];
-            } else if ($message['return_code'] != 'SUCCESS'){
-                return $fail('通信失败,请稍后再通知我');
-            }
-        });
-        $response->send();
-    }
-
-    /**
-     * 洗鞋订单支付
-     */
-    public function washOrderNotify()
-    {
-        $app = Factory::payment(config('app.wx_pay'));
-        $response = $app->handlePaidNotify(function ($message, $fail) {
-            $this->payResultLog($message,'dd_wash_order');
-            // 使用通知里的 "微信支付订单号" 或者 "商户订单号" 去自己的数据库找到订单
-            $pay_no = $message['out_trade_no'];
-            // 如果订单不存在 或者 订单已经支付过了  告诉微信,我已经处理完了,订单没找到,别再通知我了
-            if ($message['result_code'] == 'SUCCESS') { // return_code 表示通信状态,不代表支付状态
-                $order_info = \app\common\model\WashOrder::with('orderItem')->where('pay_no',$pay_no)->find();
-                if(!$order_info) return false;
-                $order_info = $order_info->toArray();
-                if($order_info['status'] != 0) return true;
-                $back_res = OrderCallback::washOrderCallBack($order_info,1);// 支付完成后回调
-                return $back_res['ret_val'];
-            } else if ($message['return_code'] != 'SUCCESS'){
-                return $fail('通信失败,请稍后再通知我');
-            }
-        });
-        $response->send();
-    }
-
-
-    /**
-     * 记录支付日志
-     * @param $message
-     * @param $table_name
-     */
-    public function payResultLog($message,$table_name)
-    {
-        // 回调记录
-        $ret_arr = [];
-        $ret_arr['transaction_id'] =    isset($message['transaction_id']) ?$message['transaction_id']: '';
-        $ret_arr['trade_no'] =          isset($message['out_trade_no']) ?$message['out_trade_no']: '';
-        $ret_arr['return_code'] =       isset($message['return_code']) ?$message['return_code']: '';
-        $ret_arr['result_code'] =       isset($message['result_code']) ?$message['result_code']: '';
-        $ret_arr['create_at'] =         date('Y-m-d H:i:s');
-        $ret_arr['order_table'] =       $table_name;
-        $ret_arr['result'] =            json_encode($message);
-        Db::name('order_pay_result')->insert($ret_arr);
-    }
-
-
-}

+ 0 - 8
application/common/model/AppOrder.php

@@ -1,8 +0,0 @@
-<?php
-namespace app\common\model;
-use think\Model;
-// 预约订单
-class AppOrder extends Model
-{
-
-}

+ 0 - 9
application/common/model/GoodsOrderRefund.php

@@ -1,9 +0,0 @@
-<?php
-namespace app\common\model;
-use think\Model;
-// 订单
-class GoodsOrderRefund extends Model
-{
-    protected $name='store_order_refund';
-    
-}

+ 0 - 8
application/common/model/GoodsParam.php

@@ -1,8 +0,0 @@
-<?php
-namespace app\common\model;
-use think\Model;
-// 商品参数
-class GoodsParam extends Model
-{
-
-}

+ 0 - 14
application/common/model/GoodsSeason.php

@@ -1,14 +0,0 @@
-<?php
-namespace app\common\model;
-use think\Model;
-// 商品时令
-class GoodsSeason extends Model
-{
-
-    public static function getSeasonTree()
-    {
-        $all_season = self::where(['status'=>1,'is_deleted'=>0])->order('sort desc ,id desc')->select();
-        return make_tree($all_season);
-    }
-
-}

+ 0 - 8
application/common/model/GoodsSellInfo.php

@@ -1,8 +0,0 @@
-<?php
-namespace app\common\model;
-use think\Model;
-// 商品销售记录
-class GoodsSellInfo extends Model
-{
-
-}

+ 0 - 12
application/common/model/GoodsServe.php

@@ -1,12 +0,0 @@
-<?php
-namespace app\common\model;
-use think\Model;
-// 商品服务标签
-class GoodsServe extends Model
-{
-    public static function getServeLabelTitle($ids)
-    {
-        return static::where('id','in',$ids)->column('title');
-    }
-
-}

+ 0 - 9
application/common/model/InviteInfo.php

@@ -1,9 +0,0 @@
-<?php
-namespace app\common\model;
-use think\Model;
-// 邀请模型
-class InviteInfo extends Model
-{
-    //protected $resultSetType = 'collection';// 设置返回类型
-
-}

+ 0 - 9
application/common/model/LevelOrder.php

@@ -1,9 +0,0 @@
-<?php
-namespace app\common\model;
-use think\Model;
-// 会员等级订单
-class LevelOrder extends Model
-{
-
-
-}

+ 0 - 12
application/common/model/OrderComment.php

@@ -1,12 +0,0 @@
-<?php
-namespace app\common\model;
-use think\Model;
-// 订单评论表
-class OrderComment extends Model
-{
-    public function user()
-    {
-        return $this->belongsTo('User','user_id','id')->field('id,name,headimg');
-    }
-
-}

+ 0 - 26
application/common/model/ShoppingTrolley.php

@@ -1,26 +0,0 @@
-<?php
-namespace app\common\model;
-use think\Model;
-// 购物车
-class ShoppingTrolley extends Model
-{
-    /**
-     * 验证商品某规格是否已加入购物车
-     */
-    public static function checkTrolley($user_id,$goods_id,$spec_id)
-    {
-        return self::where(['user_id'=>$user_id,'goods_id'=>$goods_id,'spec_id'=>$spec_id])->value('id');
-    }
-
-    public  function  goodsSpec()
-    {
-        return $this->belongsTo('StoreGoodsItem','spec_id')->field('id,goods_id,goods_spec,goods_no,spec_title,cover,is_deleted,original_price,sell_price');
-    }
-
-    public function goodsInfo()
-    {
-        return $this->belongsTo('StoreGoods','goods_id')->field('id,name,cover');
-
-    }
-
-}

+ 0 - 9
application/common/model/UserBank.php

@@ -1,9 +0,0 @@
-<?php
-namespace app\common\model;
-use think\Model;
-// 银行账号绑定
-class UserBank extends Model
-{
-    //protected $resultSetType = 'collection';// 设置返回类型
-
-}

+ 0 - 81
application/common/model/UserCollect.php

@@ -1,81 +0,0 @@
-<?php
-namespace app\common\model;
-use library\tools\Data;
-use think\Model;
-// 收藏
-class UserCollect extends Model
-{
-    //protected $resultSetType = 'collection';// 设置返回类型
-    static $type_desc = [
-        1=>'平台视频', 2=>'资料', 3=>'图文', 4=>'新闻', 5=>'论坛', 6=>'商品', 7=>'活动', 8=>'招聘',9=>'供应商商品',10=>'需求'
-        ];
-    public static function checkCollectByType($user_id,$type,$id,$children_id = 0)
-    {
-        $where = [];
-        $where['user_id'] = $user_id;
-        $where['coll_type'] = $type;
-        $where['coll_id'] = $id;
-        if($children_id) $where['children_id'] = $children_id;
-        return self::where($where)->value('id') ? 1:0;
-    }
-
-    // 收藏数量
-    public static function getCollectNum($type,$id,$children_id = 0)
-    {
-        $where = [];
-        $where['coll_type'] = $type;
-        $where['coll_id'] = $id;
-        if($children_id) $where['children_id'] = $children_id;
-        return self::where($where)->count() ;
-    }
-
-
-    /**
-     * @param $user_id
-     * @param $type 1平台视频,2资料,3图文4新闻5论坛6商品7活动
-     * @param $id
-     * @param int $children_id
-     * @return int
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public static function plateCollect($user_id,$type,$id,$children_id = 0)
-    {
-        $check_collect = self::checkCollectByType($user_id,$type,$id,$children_id);
-        $ret_val = 0;
-        if($check_collect) {
-            self::where(['user_id'=>$user_id,'coll_type'=>$type,'coll_id'=>$id,'children_id'=>$children_id])->delete();
-        }else{
-            Data::save('UserCollect', [
-                'user_id'=>$user_id,
-                'coll_type'=>$type,
-                'coll_id'=>$id,
-                'children_id'=>$children_id,
-                'create_int'=>time()],'user_id',['user_id'=>$user_id,'coll_type'=>$type, 'coll_id'=>$id,'children_id'=>$children_id]);
-            $ret_val =  1;
-        }
-        return  $ret_val;
-    }
-
-
-
-    public function videoItem()
-    {
-        return $this->belongsTo('VideoUrl','children_id')->field('id,video_id,cover,url,title,create_at');
-    }
-
-    public function datumItem()
-    {
-        return $this->belongsTo('DatumUrl','children_id')->field('id,datum_id,url,title,create_at');
-    }
-
-    public function articleItem()
-    {
-        return $this->belongsTo('DatumUrl','children_id')->field('id,article_id,cover,images,content,create_at');
-    }
-
-
-
-
-
-}

+ 0 - 9
application/common/model/UserIntegralLog.php

@@ -1,9 +0,0 @@
-<?php
-namespace app\common\model;
-use think\Model;
-// 积分变更记录
-class UserIntegralLog extends Model
-{
-
-
-}

+ 0 - 11
application/common/model/UserLearn.php

@@ -1,11 +0,0 @@
-<?php
-namespace app\common\model;
-use think\Model;
-// 会员视频资料,图文学习服务
-class UserLearn extends Model
-{
-    static $type_desc = [
-        1=>'平台视频', 2=>'资料', 3=>'图文'
-    ];
-
-}

+ 0 - 9
application/common/model/UserLevel.php

@@ -1,9 +0,0 @@
-<?php
-namespace app\common\model;
-use think\Model;
-// 会员等级
-class UserLevel extends Model
-{
-
-
-}

+ 0 - 39
application/common/model/UserLevelRank.php

@@ -1,39 +0,0 @@
-<?php
-namespace app\common\model;
-use think\Model;
-// 会员等级
-class UserLevelRank extends Model
-{
-    // 判断会员是否有会员权限
-    public static function getUserVip($user_id)
-    {
-        $user_info = User::where('id',$user_id)->field('id,account_type,group_id,is_first,group_first')->find();
-        // 非公司会员 || 公司会员主账号
-        if($user_info['account_type'] == 2 || ($user_info['account_type'] == 1 && $user_info['is_first'] == 1)) {
-          return  static::where([['user_id','=',$user_id],['end_time','>',time()]])->max('level_id');
-        }
-        // 公司员工查询主账号的会员
-        if($user_info['account_type'] == 1) {
-            return  static::where([['user_id','=',$user_info['group_first']],['end_time','>',time()]])->max('level_id');
-        }
-        return 0;
-    }
-
-    // 获取vip 详情
-    public static function getUserVipInfo($user_id)
-    {
-        $user_info = User::where('id',$user_id)->field('id,account_type,group_id,is_first,group_first')->find();
-        // 非公司会员 || 公司会员主账号
-        if($user_info['account_type'] == 2 || ($user_info['account_type'] == 1 && $user_info['is_first'] == 1)) {
-            $vip_info =  static::where([['user_id','=',$user_id],['end_time','>',time()]])->find();
-        }
-        // 公司员工查询主账号的会员
-        if($user_info['account_type'] == 1) {
-            $vip_info =   static::where([['user_id','=',$user_info['group_first']],['end_time','>',time()]])->find();
-        }
-        return empty($vip_info) ? [] : $vip_info->toArray();
-    }
-
-
-
-}

+ 0 - 8
application/common/model/UserMoneyInfo.php

@@ -1,8 +0,0 @@
-<?php
-namespace app\common\model;
-use think\Model;
-// 佣金变更记录
-class UserMoneyInfo extends Model
-{
-
-}

+ 0 - 7
application/common/model/UserSign.php

@@ -1,7 +0,0 @@
-<?php
-namespace app\common\model;
-use think\Model;
-class UserSign extends Model
-{
-
-}

+ 0 - 12
application/common/model/UserWallet.php

@@ -1,12 +0,0 @@
-<?php
-namespace app\common\model;
-use think\Model;
-// 钱包
-class UserWallet extends Model
-{
-
-
-
-
-
-}

+ 0 - 10
application/common/model/WashCate.php

@@ -1,10 +0,0 @@
-<?php
-namespace app\common\model;
-use think\Model;
-// 洗鞋分类
-class WashCate extends Model
-{
-
-
-
-}

+ 0 - 14
application/common/model/WashOrder.php

@@ -1,14 +0,0 @@
-<?php
-namespace app\common\model;
-use think\Model;
-// 订单
-class WashOrder extends Model
-{
-    protected $name='wash_order';
-    public function orderItem()
-    {
-        return $this->hasMany('WashOrderItem','order_id');
-    }
-
-
-}

+ 0 - 11
application/common/model/WashOrderItem.php

@@ -1,11 +0,0 @@
-<?php
-namespace app\common\model;
-use think\Model;
-// 订单
-class WashOrderItem extends Model
-{
-    protected $name='wash_order_item';
-
-    
-
-}

+ 0 - 61
application/common/service/Activity.php

@@ -1,61 +0,0 @@
-<?php
-namespace app\common\service;
-use app\common\model\DiscountActivity;
-use app\common\model\DiscountGoods;
-use app\common\model\GroupActivity;
-use app\common\model\GroupGoods;
-use app\common\model\ReductionActivity;
-use app\common\model\SeckillActivity;
-use app\common\model\SeckillGoods;
-
-/**
- * 活动管理
- * Class Activity
- */
-class Activity
-{
-    // 商品参与活动详情
-    public static function goodsActivityList($goods_id)
-    {
-       $data = [
-           'seckill'    =>['act'=>'', 'goods'=>[]],
-           'group'      =>['act'=>'', 'goods'=>[]],
-           'discount'   =>['act'=>'', 'goods'=>[]],
-           'reduction'   =>['act'=>'', 'goods'=>[]],
-       ];
-       // 秒杀活动
-        $seckill_act = SeckillActivity::field('id,start_time,end_time')->where(['status'=>1,'is_deleted'=>0])->where('end_time','> time',date('Y-m-d H:i:s'))->find();
-        if($seckill_act){
-           $goods_seckill = SeckillGoods::with('item')->field('id,act_id,goods_id')->where(['act_id'=>$seckill_act->id,'goods_id'=>$goods_id])->find();
-           if($goods_seckill){
-               $data['seckill']['act'] = $seckill_act->toArray();
-               $data['seckill']['goods'] = $goods_seckill->toArray();
-           }
-       }
-       //拼团活动
-        $group_act = GroupActivity::field('id,start_time,end_time,full_num')->where(['status'=>1,'is_deleted'=>0])->where('end_time','> time',date('Y-m-d H:i:s'))->find();
-        if($group_act){
-            $goods_group = GroupGoods::with('item')->field('id,act_id,goods_id')->where(['act_id'=>$group_act->id,'goods_id'=>$goods_id])->find();
-            if($goods_group){
-                $data['group']['act'] = $group_act->toArray();
-                $data['group']['goods'] = $goods_group->toArray();
-            }
-        }
-        // 折扣活动
-        $discount_act = DiscountActivity::field('id,start_time,end_time,discount')->where(['status'=>1,'is_deleted'=>0])->where('end_time','> time',date('Y-m-d H:i:s'))->find();
-        if($discount_act){
-            $goods_discount = DiscountGoods::field('id,act_id,goods_id')->where(['act_id'=>$discount_act->id,'goods_id'=>$goods_id])->find();
-            if($goods_discount){
-                $data['discount']['act'] = $discount_act->toArray();
-                $data['discount']['goods'] = $goods_discount->toArray();
-            }
-        }
-        // 满减活动
-       // $data['reduction']['act'] = ReductionActivity::getAct();
-
-        return $data;
-    }
-
-
-
-}

+ 0 - 129
application/mall/controller/Banner.php

@@ -1,129 +0,0 @@
-<?php
-namespace app\mall\controller;
-use library\Controller;
-use think\Db;
-
-/**
- * 轮播图
- * Class Goods
- * @package app\mall\controller
- */
-class Banner extends Controller
-{
-
-    /**
-     * 绑定数据表
-     * @var string
-     */
-    protected $table = 'StoreBanner';
-
-    /**
-     * 轮播图列表
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function index()
-    {
-        $this->title = '轮播图列表';
-        $query = $this->_query($this->table)->where('is_deleted',0);
-        $query->like('name');
-        $query->order(' sort desc , id desc')->page();
-    }
-
-    /**
-     * 数据列表处理
-     * @auth true
-     * @menu true
-     * @param array $data
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    protected function _index_page_filter(&$data)
-    {
-
-    }
-
-
-
-
-
-
-
-    /**
-     * 添加轮播图
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function add()
-    {
-        $this->title = '添加轮播图';
-        $this->_form($this->table, 'form');
-    }
-
-
-    /**
-     * 编辑轮播图
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function edit()
-    {
-        $this->title = '编辑轮播图';
-        $this->_form($this->table, 'form');
-    }
-
-
-
-    /**
-     * 启用
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function enable()
-    {
-        $this->_save($this->table, ['status' => 1]);
-    }
-
-    /**
-     * 删除
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function del()
-    {
-        $this->_save($this->table, ['is_deleted' => 1]);
-    }
-
-
-    /**
-     * 表单数据处理
-     * @auth true
-     * @menu true
-     * @param array $data
-     */
-    protected function _form_filter(&$data)
-    {
-        $data['create_at'] = date('Y-m-d H:i:s');
-    }
-
-}

+ 0 - 89
application/mall/controller/Comment.php

@@ -1,89 +0,0 @@
-<?php
-namespace app\mall\controller;
-use library\Controller;
-use think\Db;
-
-/**
- * 商品评价
- * Class Comment
- * @package app\mall\controller
- */
-class Comment extends Controller
-{
-
-    /**
-     * 绑定数据表
-     * @var string
-     */
-    protected $table = 'OrderComment';
-
-    /**
-     * 列表
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function index()
-    {
-        $this->title = '列表';
-        $where = [];
-        $where[] = ['c.is_deleted','=',0];
-        if($good_name = input('goods_name')) $where[] = ['g.name','like','%'.$good_name.'%'];
-        if($user_name = input('user_name')) $where[] = ['m.name','like','%'.$user_name.'%'];
-        $query = $this->_query($this->table)
-            ->field('c.*,m.name user_name,m.headimg,g.cover,g.name goods_name')
-            ->alias('c')
-            ->leftJoin('StoreMember m','c.user_id = m.id')
-            ->leftJoin('StoreGoods g','c.goods_id = g.id')
-            ->where($where);
-        $query->order('c.id desc')->page();
-    }
-
-    /**
-     * 数据列表处理
-     * @auth true
-     * @menu true
-     * @param array $data
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    protected function _index_page_filter(&$data)
-    {
-
-    }
-
-
-
-
-    /**
-     * 删除
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function del()
-    {
-        $this->_save($this->table, ['is_deleted' => 1]);
-    }
-
-
-    /**
-     * 表单数据处理
-     * @auth true
-     * @menu true
-     * @param array $data
-     */
-    protected function _form_filter(&$data)
-    {
-        if($this->request->isGet()){
-
-        }
-    }
-
-}

+ 0 - 179
application/mall/controller/CouponConfig.php

@@ -1,179 +0,0 @@
-<?php
-
-// +----------------------------------------------------------------------
-// | ThinkAdmin
-// +----------------------------------------------------------------------
-// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
-// +----------------------------------------------------------------------
-// | 官方网站: http://demo.thinkadmin.top
-// +----------------------------------------------------------------------
-// | 开源协议 ( https://mit-license.org )
-// +----------------------------------------------------------------------
-// | gitee 代码仓库:https://gitee.com/zoujingli/ThinkAdmin
-// | github 代码仓库:https://github.com/zoujingli/ThinkAdmin
-// +----------------------------------------------------------------------
-
-namespace app\mall\controller;
-use library\Controller;
-use library\tools\Data;
-use think\Db;
-
-/**
- * 优惠券配置
- * Class CouponConfig
- * @package app\mall\controller
- */
-class  CouponConfig extends Controller
-{
-    /**
-     * 绑定数据表
-     * @var string
-     */
-    protected $table = 'CouponConfig';
-
-    /**
-     * 优惠券管理
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function index()
-    {
-        $this->title = '优惠券配置';
-        $query = $this->_query($this->table)->like('title')->equal('status');
-        $query->where(['is_deleted' => '0'])->order('id desc')->page();
-    }
-
-    /**
-     * 数据列表处理
-     * @param array $data
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    protected function _index_page_filter(&$data)
-    {
-        foreach ($data as $k=>&$v) {
-            if ($v['coupon_type'] == 1) {
-                if ($v['goods_id']) {
-                    $v['goods_name']=Db::name('store_goods')->where('id',$v['goods_id'])->value('name');
-                }
-
-            }
-            $v['sheng']=Db::name('user_coupon_list')->where('config_id',$v['id'])->count();
-
-        }
-
-    }
-
-
-    /**
-     * 添加优惠券
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function add()
-    {
-        $this->title = '添加优惠券';
-        $this->_form($this->table, 'form');
-    }
-
-    /**
-     * 编辑优惠券
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function edit()
-    {
-        $this->title = '编辑优惠券';
-        $this->_form($this->table, 'form');
-    }
-
-    /**
-     * 表单数据处理
-     * @param array $data
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    protected function _form_filter(&$data)
-    {
-        if($this->request->isPost()){
-            if($data['time_type']==1){
-                if(empty($data['time'])){
-                    $this->error('请选择优惠券限定日期');
-                }
-                $time=explode('~',$data['time']);
-                $data['start_tm']=$time[0];
-                $data['end_tm']=$time[1];
-            }
-
-            if($data['coupon_type']==1){
-                if(empty($data['goods_id'])){
-                    $this->error('请选择优惠券商品');
-                }
-            }
-
-            if($data['low_amount']<=0){
-                $data['low_amount']=$data['amount']+0.01;
-            }
-
-            if($data['amount']>$data['low_amount']){
-                $this->error('对不起,优惠金额不能大于限制金额');
-            }
-
-        }else{
-            $this->goods=Db::name('store_goods')->where('is_deleted',0)->where('status',1)->field('id,name')->select();
-        }
-    }
-
-
-
-
-    /**
-     * 禁用优惠券
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function forbid()
-    {
-        $this->_save($this->table, ['status' => '0']);
-    }
-
-    /**
-     * 启用优惠券
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function resume()
-    {
-        $this->_save($this->table, ['status' => '1']);
-    }
-
-    /**
-     * 删除优惠券
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function remove()
-    {
-        $this->_delete($this->table);
-    }
-}

+ 0 - 249
application/mall/controller/CouponList.php

@@ -1,249 +0,0 @@
-<?php
-
-// +----------------------------------------------------------------------
-// | ThinkAdmin
-// +----------------------------------------------------------------------
-// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
-// +----------------------------------------------------------------------
-// | 官方网站: http://demo.thinkadmin.top
-// +----------------------------------------------------------------------
-// | 开源协议 ( https://mit-license.org )
-// +----------------------------------------------------------------------
-// | gitee 代码仓库:https://gitee.com/zoujingli/ThinkAdmin
-// | github 代码仓库:https://github.com/zoujingli/ThinkAdmin
-// +----------------------------------------------------------------------
-
-namespace app\mall\controller;
-use library\Controller;;
-use think\Db;
-
-/**
- * 会员优惠券
- * Class CouponList
- * @package app\mall\controller
- */
-class  CouponList extends Controller
-{
-    /**
-     * 绑定数据表
-     * @var string
-     */
-    protected $table = 'UserCouponList';
-
-    /**
-     * 优惠券管理
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function index()
-    {
-        $this->title = '优惠券';
-        $coupon_id=$this->request->get('coupon_id');
-        $this->byWhere(1)
-            ->field('a.*,b.name,b.headimg')
-            ->where('a.config_id',$coupon_id)
-            ->order('a.id desc')
-            ->page();
-    }
-
-    /**
-     * 搜索条件
-     * @return \library\helper\QueryHelper
-     */
-    protected  function byWhere($type)
-    {
-        if ($type == 1) {
-            $query = $this->_query($this->table);
-        } elseif ($type == 2) {
-            $query = Db::name($this->table);
-        }
-        $query = $query->alias('a')
-            ->join('store_member b', 'a.user_id=b.id');
-
-        if (isset($_GET['status']) && $_GET['status']) {
-            $query->where('a.status', $_GET['status']);
-        }
-        if (isset($_GET['title']) && $_GET['title']) {
-            $query->where('a.title', 'like','%'.$_GET['title'].'%');
-        }
-        if (isset($_GET['user_info']) && $_GET['user_info']) {
-            $query->where('b.name|b.phone', 'like', '%' . $_GET['user_info'] . '%');
-        }
-        return $query;
-    }
-
-    /**
-     * 数据列表处理
-     * @param array $data
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    protected function _index_page_filter(&$data)
-    {
-        foreach ($data as $k=>&$v) {
-            $coupon=Db::name('coupon_config')->where('id',$this->request->get('coupon_id'))->find();
-            if ($coupon['coupon_type'] == 1) {
-                if ($coupon['goods_id']) {
-                    $v['goods_name']=Db::name('store_goods')->where('id',$v['goods_id'])->value('name');
-                }
-            }
-            $v['coupon_type']=$coupon['coupon_type'];
-            $v['member'] = Db::name('store_member')->where('id',$v['user_id'])->find();
-        }
-
-    }
-
-
-    /**
-     * 添加优惠券
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function add()
-    {
-        $this->title = '添加优惠券';
-        if($this->request->isPost()){
-
-            if($this->request->post('user')==0){
-                $user_ids=explode(',',$this->request->post('user_ids'));
-                //指定用户发放
-            }else{
-                //全部用户发方
-                $user_ids=Db::name('store_member')->where('status',1)->column('id');
-            }
-            $coupon=Db::name('coupon_config')->where('id',$this->request->post('coupon_id'))->where('status',1)->where('is_deleted',0)->find();
-            if(empty($coupon)){
-                $this->error('优惠券不存在或已禁用');
-            }
-
-            $error=[];
-            foreach ($user_ids as $k=>$v){
-                $data=[];
-                $count=Db::name('user_coupon_list')->where('config_id',$coupon['id'])->where('user_id',$v)->count();
-                if($count+1>$coupon['user_num']){
-                    array_push($error,$v);
-                }else{
-                    $data['config_id']=$coupon['id'];
-                    $data['user_id']=$v;
-                    $data['goods_id']=$coupon['goods_id'];
-                    $data['title']=$coupon['title'];
-                    $data['low_amount']=$coupon['low_amount'];
-                    $data['amount']=$coupon['amount'];
-                    if($coupon['time_type']==0){
-                        if($coupon['low_day']==0){
-                            $data['type']=0;
-                        }else{
-                            $data['type']=1;
-                            $data['start']=date('Y-m-d');
-                            $data['end']=date('Y-m-d', strtotime('+'.$coupon['low_day'].' days') );;
-                        }
-
-                    }else{
-                        $data['type']=1;
-                        $data['start']=$coupon['start_tm'];
-                        $data['end']=$coupon['end_tm'];
-                    }
-                    $data['status']=0;
-                    $data['create_at']=time();
-                    $data['coupon_type']=$coupon['coupon_type'];
-                    Db::name('user_coupon_list')->insert($data);
-                }
-            }
-
-            $msg='发放成功';
-            if($error){
-                $nickname=Db::name('store_member')->where('id','in',$error)->column('name');
-                $nickname=implode(',',$nickname);
-                $msg='发放成功'.$nickname.'等用户因规则原因,发放失败';
-            }
-            $this->success($msg);
-        }else{
-            $this->_form($this->table, 'form');
-        }
-    }
-
-    /**
-     * 编辑优惠券
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function edit()
-    {
-        $this->title = '编辑优惠券';
-        $this->_form($this->table, 'form');
-    }
-
-    /**
-     * 表单数据处理
-     * @param array $data
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    protected function _form_filter(&$data)
-    {
-        if($this->request->isPost()){
-
-
-        }else{
-            $coupon_id=$this->request->get('coupon_id');
-            $this->coupon_id=$coupon_id;
-            $this->member=Db::name('store_member')->field('id,phone,name')->where('status',1)->select();
-            $this->member_count=count($this->member);
-        }
-
-
-    }
-
-
-
-
-    /**
-     * 禁用优惠券
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function forbid()
-    {
-        $this->_save($this->table, ['status' => '0']);
-    }
-
-    /**
-     * 启用优惠券
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function resume()
-    {
-        $this->_save($this->table, ['status' => '1']);
-    }
-
-    /**
-     * 删除优惠券
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function remove()
-    {
-        $this->_delete($this->table);
-    }
-}

+ 0 - 145
application/mall/controller/ExpressCompany.php

@@ -1,145 +0,0 @@
-<?php
-namespace app\mall\controller;
-use library\Controller;
-use think\Db;
-
-/**
- * 物流公司管理
- * Class ExpressCompany
- * @package app\mall\controller
- */
-class ExpressCompany extends Controller
-{
-
-    /**
-     * 绑定数据表
-     * @var string
-     */
-    protected $table = 'ExpressCompany';
-
-    /**
-     * 物流公司列表
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function index()
-    {
-        $this->title = '物流公司列表';
-        $query = $this->_query($this->table)->where('is_deleted',0);
-        $query->like('name');
-        $query->order(' status desc ,sort desc , id desc')->page();
-    }
-
-    /**
-     * 数据列表处理
-     * @auth true
-     * @menu true
-     * @param array $data
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    protected function _index_page_filter(&$data)
-    {
-
-    }
-
-
-
-
-
-
-
-    /**
-     * 添加物流公司
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function add()
-    {
-        $this->title = '添加物流公司';
-        $this->_form($this->table, 'form');
-    }
-
-
-    /**
-     * 编辑物流公司
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function edit()
-    {
-        $this->title = '编辑物流公司';
-        $this->_form($this->table, 'form');
-    }
-
-
-
-    /**
-     * 启用
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function enable()
-    {
-        $this->_save($this->table, ['status' => 1]);
-    }
-
-
-    /**
-     * 禁用
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function forbidden()
-    {
-        $this->_save($this->table, ['status' => '0']);
-    }
-
-    /**
-     * 删除
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function del()
-    {
-        $this->_save($this->table, ['is_deleted' => 1]);
-    }
-
-
-    /**
-     * 表单数据处理
-     * @auth true
-     * @menu true
-     * @param array $data
-     */
-    protected function _form_filter(&$data)
-    {
-        $data['create_at'] = date('Y-m-d H:i:s');
-    }
-
-}

+ 0 - 157
application/mall/controller/FreightTemplate.php

@@ -1,157 +0,0 @@
-<?php
-namespace app\mall\controller;
-use library\Controller;
-use think\Db;
-use think\view\driver\Think;
-
-/**
- * 运费模板
- * Class FreightTemplate
- * @package app\mall\controller
- */
-class FreightTemplate extends Controller
-{
-
-    /**
-     * 绑定数据表
-     * @var string
-     */
-    protected $table = 'FreightTemplate';
-
-    /**
-     * 运费模板管理
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function index()
-    {
-        $this->title = '运费模板';
-        $query = $this->_query($this->table)->where('is_deleted',0)->like('name');
-        $query->order('status desc , sort desc , id desc')->page();
-    }
-
-    /**
-     * 数据列表处理
-     * @auth true
-     * @menu true
-     * @param array $data
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    protected function _index_page_filter(&$data)
-    {
-
-    }
-
-
-
-    /**
-     * 添加运费模板
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function add()
-    {
-        $this->title = '添加运费模板';
-        $this->city_area = get_city_area();
-        $this->_form($this->table, 'form');
-    }
-
-
-    /**
-     * 编辑运费模板
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function edit()
-    {
-        $this->title = '编辑运费模板';
-        $this->city_area = get_city_area();
-        $this->_form($this->table, 'form');
-    }
-
-    /**
-     * 禁用
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function forbidden()
-    {
-        $this->_save($this->table, ['status' => '0']);
-    }
-
-    /**
-     * 启用
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function enable()
-    {
-        $this->_save($this->table, ['status' => 1]);
-    }
-
-    /**
-     * 删除
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function del()
-    {
-        $this->_save($this->table, ['is_deleted' => 1]);
-    }
-
-
-
-
-    /* 表单数据处理
-    * @auth true
-    * @menu true
-    * @param array $data
-    */
-    protected function _form_filter(&$data)
-    {
-        // 添加或编辑模板
-        if ($this->request->isPost()) {
-            $custom_num = count($data['first_num']);
-            $custom_data = [];
-            for ($i= 0;$i < $custom_num;$i++) {
-                $custom_data[$i]['express']       = $data['express'][$i];
-                $custom_data[$i]['first_num']     = $data['first_num'][$i] > 0 ?  intval($data['first_num'][$i]):0;
-                $custom_data[$i]['first_price']   = $data['first_price'][$i]> 0  ? number_format($data['first_price'][$i],2) :0 ;
-                $custom_data[$i]['keep_price']    = $data['keep_price'][$i] > 0 ? number_format($data['keep_price'][$i],2) :0 ;
-            }
-            $data['custom'] = json_encode($custom_data);
-        }
-    }
-
-    protected function _form_result($id)
-    {
-        $this->success('操作成功', 'javascript:history.back()');
-    }
-
-
-
-
-}

+ 0 - 131
application/mall/controller/WashCate.php

@@ -1,131 +0,0 @@
-<?php
-namespace app\mall\controller;
-use library\Controller;
-
-/**
- * 分类管理
- * Class WashCate
- * @package app\mall\controller
- */
-class WashCate extends Controller
-{
-
-    /**
-     * 当前操作数据库
-     * @var string
-     */
-    protected $table = 'WashCate';
-
-    /**
-     * 分类管理
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function index()
-    {
-        $this->title = '分类管理';
-        $query = $this->_query($this->table)->where('is_deleted',0)->page(false);
-    }
-
-    /**
-     * 列表数据处理
-     * @param array $data
-     */
-    protected function _index_page_filter(&$data)
-    {
-    }
-
-    /**
-     * 添加分类
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function add()
-    {
-        $this->_form($this->table, 'form');
-    }
-
-    /**
-     * 编辑分类
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function edit()
-    {
-        $this->_form($this->table, 'form');
-    }
-
-    /**
-     * 表单数据处理
-     * @param array $vo
-     * @throws \ReflectionException
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    protected function _form_filter(&$data)
-    {
-        if($this->request->isGet()) {
-            $this->ladder_set = !empty($data['ladder_set']) ? json_decode($data['ladder_set'],true):[];
-        }
-        if($this->request->isPost()) {
-            // 价格设置
-            $title_arr= input('post.title');
-            $price_arr= input('post.price');
-            $price_param = [];
-            if(empty($price_arr) || empty($title_arr)) $this->error('请设置价格');
-            foreach ($title_arr as $k=>$t){
-                $price_param[] = ['title'=>$t,'price'=>bcadd($price_arr[$k],0,2),'ladder_key'=>$k];
-            }
-            $data['ladder_set'] = json_encode($price_param);
-        }
-    }
-
-
-    /**
-     * 启用分类
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function resume()
-    {
-        $this->_save($this->table, ['status' => '1']);
-    }
-
-    /**
-     * 禁用分类
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function forbid()
-    {
-        $this->_save($this->table, ['status' => '0']);
-    }
-
-    /**
-     * 删除分类
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function remove()
-    {
-        $this->_delete($this->table);
-    }
-
-}

+ 0 - 44
application/mall/view/banner/form.html

@@ -1,44 +0,0 @@
-<style>
-    .uploadimage{
-        width: 10pc !important;
-    }
-</style>
-<div class="think-box-shadow">
-    <form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
-        <div class="layui-card-body">
-
-            <div class="layui-form-item">
-                <label class="layui-form-label label-required">名称</label>
-                <div class="layui-input-block">
-                    <input name="name" maxlength="20"  value='{$vo.name|default=""}' placeholder="请输入名称" class="layui-input">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label label-required">图片</label>
-                <div class="layui-input-block">
-                    <input name="cover" type="hidden" value="{$vo.cover|default=''}">
-                    &nbsp; &nbsp;<span style="margin-right: 20px">建议尺寸宽700px 高330px </span>
-                </div>
-
-            </div>
-
-
-            <div class="layui-form-item">
-                <label class="layui-form-label label-required">排序</label>
-                <div class="layui-input-block">
-                    <input type="number" name="sort"  value='{$vo.sort|default=""}' placeholder="请输入排序号" class="layui-input">
-                </div>
-            </div>
-            {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
-            <div class="layui-form-item text-center">
-                <button class="layui-btn" type='submit'>保 存</button>
-                <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定取消编辑吗?" data-close>取消编辑</button>
-            </div>
-        </div>
-    </form>
-    <script>
-        window.form.render();
-        $('[name="cover"]').uploadOneImage();
-    </script>
-</div>

+ 0 - 63
application/mall/view/banner/index.html

@@ -1,63 +0,0 @@
-{extend name='admin@main'}
-
-{block name="button"}
-    <button data-modal='{:url("add")}' data-title="添加轮播图" class='layui-btn layui-btn-sm layui-btn-primary'>添加轮播图</button>
-{/block}
-
-{block name="content"}
-<div class="think-box-shadow">
-    {include file='banner/index_search'}
-    <table class="layui-table margin-top-20" lay-skin="line">
-        <thead>
-        <tr>
-            <th class='list-table-check-td think-checkbox'><input data-auto-none data-check-target='.list-check-box' type='checkbox'></th>
-            <th class='list-table-sort-td'><button type="button" data-reload class="layui-btn layui-btn-xs">刷 新</button></th>
-            <th class='text-left nowrap'>名称</th>
-            <th class='text-left nowrap'>轮播图</th>
-            <th class="text-left" style="width: 20%">操作</th>
-        </tr>
-        </thead>
-        <tbody>
-        {foreach $list as $key=>$vo}
-        <tr>
-            <td class='list-table-check-td think-checkbox'><input class="list-check-box" value='{$vo.id}' type='checkbox'></td>
-            <td class='list-table-sort-td'><input data-action-blur="{:request()->url()}" data-value="id#{$vo.id};action#sort;sort#{value}" data-loading="false" value="{$vo.sort}" class="list-sort-input"></td>
-            <td class='text-left nowrap'>{$vo.name|default=''}</td>
-            <td class='text-left nowrap'><img data-tips-image="{$vo.cover|default=''}"  src="{$vo.cover|default=''}" height="50" width="110px"></td>
-            <td class='text-left' style="width: 20%">
-                <a data-title="编辑轮播图" class="layui-btn layui-btn-sm" data-modal='{:url("edit")}?id={$vo.id}'>编 辑</a>
-                <span class="layui-btn layui-btn-sm layui-btn-danger" onclick="btn_confirm('删除','del','{$vo.id}');">删 除</span>
-            </td>
-        </tr>
-        {/foreach}
-        </tbody>
-    </table>
-
-    {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
-</div>
-<script>
-    function btn_confirm(msg,fun,id) {
-        layer.confirm('请确定是否'+msg, {btn: ['确定', '取消'], title: "提示"}, function () {
-            var url = "/mall/banner/"+fun;
-            layer.closeAll();
-            $.ajax({
-                type: "post",
-                url: url,
-                data: {id:id},
-                dataType: "json",
-                async: false,
-                success: function (data) {
-                    layer.msg(data.info);
-                    setTimeout(function () {
-                        window.location.reload();
-                    },1000)
-                }
-            });
-        });
-    }
-
-</script>
-{/block}
-
-
-

+ 0 - 15
application/mall/view/banner/index_search.html

@@ -1,15 +0,0 @@
-<fieldset>
-    <legend>条件搜索</legend>
-    <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get" autocomplete="off">
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">名称</label>
-            <div class="layui-input-inline">
-                <input name="name" value="{$Think.get.name|default=''}" placeholder="请输入微信昵称" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item layui-inline">
-            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
-        </div>
-    </form>
-    <script>form.render()</script>
-</fieldset>

+ 0 - 69
application/mall/view/comment/index.html

@@ -1,69 +0,0 @@
-{extend name='admin@main'}
-{block name="content"}
-<div class="think-box-shadow">
-    {include file='comment/index_search'}
-    <table class="layui-table margin-top-10" lay-skin="line">
-        {notempty name='list'}
-        <thead>
-        <tr>
-            <th class='text-left nowrap'>会员</th>
-            <th class='text-left nowrap'>商品</th>
-            <th class='text-left nowrap'>内容</th>
-            <th class='text-left nowrap'>图片</th>
-            <th class='text-left nowrap'>评分</th>
-            <th class='text-left nowrap'>时间</th>
-            <th class='text-left nowrap'>操作</th>
-        </tr>
-        </thead>
-        {/notempty}
-        <tbody>
-        {foreach $list as $key=>$vo}
-        <tr>
-            <td class="text-left nowrap relative">
-                {notempty name='vo.headimg'}
-                <img data-tips-image style="width:40px;height:40px" src="{$vo.headimg|default=''}" class="margin-right-5 text-top">
-                {/notempty}
-                <div class="inline-block">
-                    会员ID:{$vo.user_id|default='--'}<br>
-                    会员名称:{$vo.user_name|default='--'}
-                </div>
-            </td>
-
-            <td class="text-left nowrap relative">
-                {notempty name='vo.cover'}
-                <img data-tips-image style="width:40px;height:40px" src="{$vo.cover|default=''}" class="margin-right-5 text-top">
-                {/notempty}
-                <div class="inline-block">
-                    商品ID:{$vo.goods_id|default='--'}<br>
-                    商品名称:{$vo.goods_name|default='--'}
-                </div>
-            </td>
-
-            <td class='text-left nowrap'>{$vo.content|default=''}</td>
-            <td class='text-left nowrap'>
-                {if $vo['images']}
-                    {foreach :explode(',',$vo['images']) as $v}
-                        <img data-tips-image style="width:40px;height:40px" src="{$v|default=''}" class="margin-right-5 text-top">
-                    {/foreach}
-                {else}
-                ----
-                {/if}
-            </td>
-            <td class='text-left nowrap'>
-                <div class="inline-block">
-                    物流评分:{$vo.wl_core|default='--'}<br>
-                    服务评分:{$vo.serve_core|default='--'}<br>
-                    商品描述:{$vo.goods_core|default='--'}
-                </div>
-            </td>
-            <td class='text-left nowrap'>{$vo.create_at|default=''}</td>
-            <td class='text-left nowrap'>
-                <a class="layui-btn layui-btn-sm layui-btn-danger" data-action="{:url('del')}" data-value="id#{$vo.id}">删除</a>
-            </td>
-        </tr>
-        {/foreach}
-        </tbody>
-    </table>
-    {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
-</div>
-{/block}

+ 0 - 22
application/mall/view/comment/index_search.html

@@ -1,22 +0,0 @@
-<fieldset>
-    <legend>条件搜索</legend>
-    <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get" autocomplete="off">
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">商品名称</label>
-            <div class="layui-input-inline">
-                <input name="goods_name" value="{$Think.get.goods_name|default=''}" placeholder="请输入商品名称" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">会员名称</label>
-            <div class="layui-input-inline">
-                <input name="user_name" value="{$Think.get.user_name|default=''}" placeholder="请输入会员名称" class="layui-input">
-            </div>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
-        </div>
-    </form>
-    <script>form.render()</script>
-</fieldset>

+ 0 - 38
application/mall/view/express_company/form.html

@@ -1,38 +0,0 @@
-<style>
-
-</style>
-<div class="think-box-shadow">
-    <form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
-        <div class="layui-card-body">
-
-            <div class="layui-form-item">
-                <label class="layui-form-label label-required">名称</label>
-                <div class="layui-input-block">
-                    <input name="express_title" maxlength="20"  value='{$vo.express_title|default=""}' placeholder="请输入名称" class="layui-input">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label label-required">编码</label>
-                <div class="layui-input-block">
-                    <input name="express_code" maxlength="20"  value='{$vo.express_code|default=""}' placeholder="请输入编码" class="layui-input">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label label-required">排序</label>
-                <div class="layui-input-block">
-                    <input type="number" name="sort"  value='{$vo.sort|default=""}' placeholder="请输入排序号" class="layui-input">
-                </div>
-            </div>
-            {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
-            <div class="layui-form-item text-center">
-                <button class="layui-btn" type='submit'>保 存</button>
-                <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定取消编辑吗?" data-close>取消编辑</button>
-            </div>
-        </div>
-    </form>
-    <script>
-        window.form.render();
-    </script>
-</div>

+ 0 - 65
application/mall/view/express_company/index.html

@@ -1,65 +0,0 @@
-{extend name='admin@main'}
-
-{block name="button"}
-    <button data-modal='{:url("add")}' data-title="添加" class='layui-btn layui-btn-sm layui-btn-primary'>添加</button>
-{/block}
-
-{block name="content"}
-<div class="think-box-shadow">
-    <table class="layui-table margin-top-20" lay-skin="line">
-        <thead>
-        <tr>
-            <th class='text-left nowrap' style="width: 25%">物流公司</th>
-            <th class='text-left nowrap' style="width: 25%">编码</th>
-            <th class='text-left nowrap' style="width: 25%">状态</th>
-            <th class="text-left nowrap" style="width: 25%">操作</th>
-        </tr>
-        </thead>
-        <tbody>
-        {foreach $list as $key=>$vo}
-        <tr>
-            <td class='text-left nowrap'>{$vo.express_title|default=''}</td>
-            <td class='text-left nowrap'>{$vo.express_code|default=''}</td>
-            <td class='text-left nowrap'>{$vo.status == 1 ?'已启用' :'已禁用'}</td>
-            <td class='text-left' >
-                <a data-title="编辑" class="layui-btn layui-btn-sm" data-modal='{:url("edit")}?id={$vo.id}'>编 辑</a>
-                {if $vo.status == 1}
-                <span class="layui-btn layui-btn-sm layui-btn-warm"  onclick="btn_confirm('禁用','forbidden','{$vo.id}');" >禁 用</span>
-                {else}
-                <span class="layui-btn layui-btn-sm layui-btn-sm"  onclick="btn_confirm('启用','enable','{$vo.id}');">启 用</span>
-                {/if}
-                <span class="layui-btn layui-btn-sm layui-btn-danger" onclick="btn_confirm('删除','del','{$vo.id}');">删 除</span>
-            </td>
-        </tr>
-        {/foreach}
-        </tbody>
-    </table>
-
-    {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
-</div>
-<script>
-    function btn_confirm(msg,fun,id) {
-        layer.confirm('请确定是否'+msg, {btn: ['确定', '取消'], title: "提示"}, function () {
-            var url = "/mall/express_company/"+fun;
-            layer.closeAll();
-            $.ajax({
-                type: "post",
-                url: url,
-                data: {id:id},
-                dataType: "json",
-                async: false,
-                success: function (data) {
-                    layer.msg(data.info);
-                    setTimeout(function () {
-                        window.location.reload();
-                    },1000)
-                }
-            });
-        });
-    }
-
-</script>
-{/block}
-
-
-

+ 0 - 312
application/mall/view/freight_template/form.html

@@ -1,312 +0,0 @@
-{extend name='admin@main'}
-
-{block name="content"}
-<div class="think-box-shadow" >
-    <form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
-        <div class="layui-card-body" style="width: 85%">
-
-            <div class="layui-form-item">
-                <label class="layui-form-label label-required">模板名称</label>
-                <div class="layui-input-block">
-                    <input name="name" maxlength="20"  value='{$vo.name|default=""}' placeholder="请输入商品名称" class="layui-input">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label label-required">首件</label>
-                <div class="layui-input-block">
-                    <div class="layui-input-inline"   style="width: 50%" >
-                        <input type="number" name="base_num"    value='{$vo.base_num|default=""}' placeholder="请输入件数量" class="layui-input">
-                    </div>
-                    <div class="layui-form-mid layui-word-aux">X件(含)内以首件费用计算</div>
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label label-required">首件费用</label>
-                <div class="layui-input-block" >
-                    <input type="number" name="base_price"  style="width: 50%"   value='{$vo.base_price|default=""}' placeholder="请输入首件费用" class="layui-input">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label label-required">续件费用</label>
-                <div class="layui-input-block" >
-                    <div class="layui-input-inline"   style="width: 50%" >
-                        <input type="number" name="base_keep_price"   value='{$vo.base_keep_price|default=""}' placeholder="请输入续件费用" class="layui-input">
-                    </div>
-                    <div class="layui-form-mid layui-word-aux">每续加1件额外增加的运费</div>
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label label-required">不发货地区</label>
-                <div class="layui-input-block">
-                    <table class="layui-table margin-top-10" lay-skin="line" style="width: 100% ; border-width: 1px 1px 1px !important;">
-                        <thead>
-                        <tr>
-                            <th class='text-left nowrap' style="width: 90% ; border-width: 1px 1px 1px !important;">地区</th>
-                            <th class='text-left nowrap' style=" border-width: 1px 1px 1px !important;">操作</th>
-                        </tr>
-                        </thead>
-                        <tbody class="no_html">
-                        <tr>
-                            <input type="hidden" name="no_express" class="area_input" value='{$vo.no_express|default=""}' />
-                            <td class='text-left area_part'  style=" border-width: 1px 1px 1px !important;">
-
-                            </td>
-                            <td class='text-left'  style=" border-width: 1px 1px 1px !important;"><span class='edit_area' >编辑</span></td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label label-required">自定义分组</label>
-                <div class="layui-input-block">
-                    <table class="layui-table margin-top-10" lay-skin="line">
-                        <thead>
-                        <tr>
-                            <th class='text-left nowrap' style="width: 60%">地区</th>
-                            <th class='text-left nowrap'  style=" border-width: 1px 1px 1px !important;">首件(个)</th>
-                            <th class='text-left nowrap'  style=" border-width: 1px 1px 1px !important;">运费(元)</th>
-                            <th class='text-left nowrap'  style=" border-width: 1px 1px 1px !important;">续件费(元)</th>
-                            <th class='text-left nowrap'  style="width: 10%; border-width: 1px 1px 1px !important;">操作</th>
-                        </tr>
-                        </thead>
-                        <tbody class="mud_html">
-                            {if isset($vo.custom) && $vo.custom}
-                            {foreach :json_decode($vo.custom,true) as $k=>$v}
-                            <tr>
-                                <input type="hidden" name="express[]" class="area_input" value="{$v.express|default=0}" />
-                                <td class='text-left area_part'></td>
-                                <td class='text-left '  style=" border-width: 1px 1px 1px !important;">
-                                    <input  class="layui-input" type="number" step="1" min="0"  name="first_num[]"   value="{$v.first_num|default=0}" />
-                                </td>
-                                <td class='text-left '  style=" border-width: 1px 1px 1px !important;">
-                                    <input  class="layui-input" type="number" step="0.01" min="0"  name="first_price[]"  value="{$v.first_price|default=0}" />
-                                </td>
-                                <td class='text-left '  style=" border-width: 1px 1px 1px !important;">
-                                    <input  class="layui-input" type="number" step="0.01" min="0"  name="keep_price[]"   value="{$v.keep_price|default=0}" />
-                                </td>
-                                <td class='text-left '  style=" border-width: 1px 1px 1px !important;">
-                                    <span class='edit_area' >编 辑</span>  &nbsp;&nbsp;&nbsp;
-                                    {if $k == 0}
-                                    <span class="add_mud">添加分组</span>
-                                    {else}
-                                    <span class="del_mud">删 除</span>
-                                    {/if}
-                                </td>
-                            </tr>
-                            {/foreach}
-                            {else}
-                            <tr>
-                                <input type="hidden" name="express[]" class="area_input" value="" />
-                                <td class='text-left area_part'></td>
-                                <td class='text-left '  style=" border-width: 1px 1px 1px !important;">
-                                    <input  class="layui-input" type="number" step="1" min="0"  name="first_num[]"   value="" />
-                                </td>
-                                <td class='text-left '  style=" border-width: 1px 1px 1px !important;">
-                                    <input  class="layui-input" type="number" step="0.01" min="0"  name="first_price[]"  value="" />
-                                </td>
-                                <td class='text-left '  style=" border-width: 1px 1px 1px !important;">
-                                    <input  class="layui-input" type="number" step="0.01" min="0"  name="keep_price[]"   value="" />
-                                </td>
-                                <td class='text-left '  style=" border-width: 1px 1px 1px !important;">
-                                    <span class='edit_area' >编 辑</span>  &nbsp;&nbsp;&nbsp;<span class="add_mud">添加分组</span>
-                                </td>
-                            </tr>
-                            {/if}
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-
-
-            {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
-            <div class="layui-form-item text-center">
-                <button class="layui-btn" type='submit'>保 存</button>
-                <button class="layui-btn layui-btn-danger" type='button' onclick="history.go(-1)" data-close>返回</button>
-            </div>
-        </div>
-    </form>
-    <input type="hidden" id="edit_index" value="0"/>
-    <div style="display: none" id="area_div">
-    </div>
-    <script>
-        form.render()
-        var all_area = {:json_encode($city_area)};
-
-        $(document).on('click','.edit_area',function () {
-            var edit_index = $('.edit_area').index(this);
-            console.log(edit_index);
-            $("#edit_index").val(edit_index);
-            var sel_ids = $(".area_input").eq(edit_index).val().split(',');
-            var  html =''
-            html += '<div class="think-box-shadow" id="city_area">'
-            $.each(all_area,function (k,v) {
-                var  is_sel_sheng = $.inArray( v.id.toString(),sel_ids);
-                html += '<table class="layui-table margin-top-5" lay-skin="line">'
-                html +=     '<thead>'
-                html +=         '<tr>'
-                if(is_sel_sheng >=0 ){
-                    html +=             '<th class="text-left nowrap list-table-check-td think-checkbox"><input class="sheng_class" value="'+v.id+'" checked type="checkbox"> <span class="sheng_span" style="color: #1E9FFF">'+v.name+'</span></th>'
-                } else{
-                    html +=             '<th class="text-left nowrap list-table-check-td think-checkbox"><input class="sheng_class" value="'+v.id+'" type="checkbox"> <span class="sheng_span" style="color: #1E9FFF">'+v.name+'</span></th>'
-                }
-                html +=         '</tr>'
-                html +=     '</thead>'
-                html +=     '<tbody>'
-                html +=         '<tr>'
-                html +=             '<td class="text-left  list-table-check-td think-checkbox" style="padding-left: 40px !important">'
-                $.each(v.children,function (rk,rv) {
-                    var  is_sel_shi = $.inArray(rv.id.toString(),sel_ids);
-                    if(is_sel_shi>= 0) {
-                        html +=                 '<div  style="float:left;word-wrap: normal;margin-right:10px"><input class="shi_class" value="'+rv.id+'" checked type="checkbox"><span class="shi_span"> '+rv.name+'</span></div>'
-                    }else{
-                        html +=                 '<div  style="float:left;word-wrap: normal;margin-right:10px"><input class="shi_class" value="'+rv.id+'" type="checkbox"><span class="shi_span"> '+rv.name+'</span></div>'
-                    }
-                })
-                html +=             '</td>'
-                html +=         '</tr>'
-                html +=     '</tbody>'
-                html +=  '</table>'
-            })
-            html += '<div class="layui-form-item text-center">'
-            html +=     '<button class="layui-btn" id="save_area">保 存</button>'
-            html += '</div>'
-
-            html += '</div>'
-
-            layer.open({
-                type: 1,
-                title: false,
-                area: ['80%', '80%'],
-                shade: [0.3, 'rgb(14, 16, 22)'],
-                skin: 'demo-class',
-                content: html
-            });
-           layer.render()
-        });
-
-
-        $.each($(".area_input"),function (k,v) {
-            var has_sel_ids = $(".area_input").eq(k).val().split(',');
-            console.log(has_sel_ids);
-            var aht = '';
-            $.each(all_area,function (ak,av) {
-                var  sel_sheng = $.inArray( av.id.toString(),has_sel_ids);
-                if(sel_sheng >= 0){
-                    console.log(av.id.toString())
-                    aht += '<span style="color: #1E9FFF">'+av.name+"</span>" ;
-                    aht += '( ';
-                    $.each(av.children,function (rk,rv) {
-                        if( $.inArray( rv.id.toString(),has_sel_ids) >=0){
-                            aht += rv.name +'  ';
-                        }
-                    })
-                    aht += ')、 ';
-                }
-            })
-            $(".area_part").eq(k).html(aht);
-           form.render()
-        })
-
-
-        $(document).on('click','.add_mud',function () {
-             var mh = '';
-             mh += '<tr>';
-             mh +=  '<input type="hidden" name="express[]" class="area_input" value="" />';
-             mh +=  '<td class=\'text-left area_part\'></td>';
-             mh +=  '<td class=\'text-left \'  style=" border-width: 1px 1px 1px !important;">';
-             mh +=  '     <input  class="layui-input" type="number" step="1" min="0"  name="first_num[]"   value="0" />';
-             mh +=  '</td>';
-             mh +=  '<td class=\'text-left \'  style=" border-width: 1px 1px 1px !important;">';
-             mh +=  '     <input  class="layui-input" type="number" step="1" min="0"  name="first_price[]"   value="0" />';
-             mh +=  '</td>';
-             mh +=  '<td class=\'text-left \'  style=" border-width: 1px 1px 1px !important;">';
-             mh +=  '     <input  class="layui-input" type="number" step="1" min="0"  name="keep_price[]"   value="0" />';
-             mh +=  '</td>';
-             mh +=  '<td class=\'text-left \'  style=" border-width: 1px 1px 1px !important;">';
-             mh +=       '<span class=\'edit_area\' >编 辑</span>&nbsp;&nbsp;   &nbsp;&nbsp;<span class="del_mud">删 除</span>';
-             mh +=  '</td>';
-             mh += '</tr>';
-             $(".mud_html").append(mh)
-             layer.render()
-        })
-        $(document).on('click','.del_mud',function () {
-            $(this).parents('tr').remove();
-            layer.render()
-        })
-
-        $(document).on('click','.sheng_class',function () {
-            if($(this).is(':checked')){
-                $(this).parents('.layui-table').find('.shi_class').prop('checked',true)
-            }else{
-                $(this).parents('.layui-table').find('.shi_class').prop('checked',false)
-            }
-           form.render()
-        })
-
-        $(document).on('click','.shi_class',function () {
-            if($(this).is(':checked')){
-                $(this).parents('.layui-table').find('.sheng_class').prop('checked',true)
-            }else{
-                var sel_num = 0;
-                var box = $(this).parents('.layui-table').find('.shi_class');
-                $.each(box,function (bk,bv) {
-                    if(box.eq(bk).is(':checked')) sel_num = 1;
-                })
-               if(sel_num) {
-                   $(this).parents('.layui-table').find('.sheng_class').prop('checked',true)
-               }else{
-                   $(this).parents('.layui-table').find('.sheng_class').prop('checked',false)
-               }
-
-            }
-           form.render()
-        })
-
-        $(document).on('click','.sheng_span',function () {
-            $(this).siblings('.sheng_class').click();
-        })
-
-        $(document).on('click','.shi_span',function () {
-            $(this).siblings('.shi_class').click();
-        })
-        // 保存所選的地區
-        $(document).on('click','#save_area',function () {
-            var sel_area = '';
-            var sel_id = [];
-            $.each($("#city_area .sheng_class"),function (sk,sv) {
-                if($("#city_area .sheng_class").eq(sk).is(":checked"))
-                {
-                    sel_id.push($("#city_area .sheng_class").eq(sk).val());
-                    var sh_name = $("#city_area .sheng_class").eq(sk).siblings('.sheng_span').text();
-                    sel_area += '<span style="color: #1E9FFF">'+sh_name+"</span>" ;
-                    sel_area += '( ';
-                    var shi_input = $("#city_area .sheng_class").eq(sk).parents('.layui-table').find('.shi_class');
-                    $.each(shi_input,function (ck,cv) {
-                        if(shi_input.eq(ck).is(":checked")) {
-                            sel_id.push(shi_input.eq(ck).val());
-                            var city_name = shi_input.eq(ck).siblings('.shi_span').text();
-                            sel_area += city_name+'  ';
-                        }
-                    })
-                    sel_area += ')、';
-                }
-            })
-
-            $(".area_part").eq($("#edit_index").val()).html(sel_area);
-            $(".area_input").eq($("#edit_index").val()).val(sel_id.join(','));
-            layer.closeAll();
-           form.render()
-        })
-
-    </script>
-</div>
-
-{/block}
-
-

+ 0 - 74
application/mall/view/freight_template/index.html

@@ -1,74 +0,0 @@
-{extend name='admin@main'}
-
-{block name="button"}
-    <button data-open='{:url("add")}' data-title="添加运费模板" class='layui-btn layui-btn-sm layui-btn-primary'>添加运费模板</button>
-{/block}
-
-{block name="content"}
-<div class="think-box-shadow">
-    {include file='freight_template/index_search'}
-    <table class="layui-table margin-top-20" lay-skin="line">
-        <thead>
-        <tr>
-            <th class='list-table-check-td think-checkbox'><input data-auto-none data-check-target='.list-check-box' type='checkbox'></th>
-            <th class='list-table-sort-td'><button type="button" data-reload class="layui-btn layui-btn-xs">刷 新</button></th>
-            <th class='text-left nowrap'>模板名称</th>
-            <th class='text-left nowrap'>使用状态</th>
-            <th class="text-left" style="width: 20%">操作</th>
-        </tr>
-        </thead>
-        <tbody>
-        {foreach $list as $key=>$vo}
-        <tr>
-            <td class='list-table-check-td think-checkbox'><input class="list-check-box" value='{$vo.id}' type='checkbox'></td>
-            <td class='list-table-sort-td'><input data-action-blur="{:request()->url()}" data-value="id#{$vo.id};action#sort;sort#{value}" data-loading="false" value="{$vo.sort}" class="list-sort-input"></td>
-            <td class='text-left nowrap'>{$vo.name|default=''}</td>
-            <td class='text-left nowrap'>
-                {if $vo.status == 1}
-                    <span style="color: green">已启用</span>
-                {else}
-                    <span style="color: red">已禁用</span>
-                {/if}
-            </td>
-            <td class='text-left' style="width: 20%">
-                <a data-title="编辑运费模板" class="layui-btn layui-btn-sm" data-open='{:url("edit")}?id={$vo.id}'>编 辑</a>
-                {if $vo.status == 1}
-                <span class="layui-btn layui-btn-sm layui-btn-warm"  onclick="btn_confirm('禁用','forbidden','{$vo.id}');" >禁 用</span>
-                {else}
-                <span class="layui-btn layui-btn-sm layui-btn-sm"  onclick="btn_confirm('启用','enable','{$vo.id}');">启 用</span>
-                {/if}
-                <span class="layui-btn layui-btn-sm layui-btn-danger" onclick="btn_confirm('删除','del','{$vo.id}');">删 除</span>
-            </td>
-        </tr>
-        {/foreach}
-        </tbody>
-    </table>
-
-    {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
-</div>
-<script>
-    function btn_confirm(msg,fun,id) {
-        layer.confirm('请确定是否'+msg, {btn: ['确定', '取消'], title: "提示"}, function () {
-            var url = "/mall/freight_template/"+fun;
-            layer.closeAll();
-            $.ajax({
-                type: "post",
-                url: url,
-                data: {id:id},
-                dataType: "json",
-                async: false,
-                success: function (data) {
-                    layer.msg(data.info);
-                    setTimeout(function () {
-                        window.location.reload();
-                    },1000)
-                }
-            });
-        });
-    }
-
-</script>
-{/block}
-
-
-

+ 0 - 16
application/mall/view/freight_template/index_search.html

@@ -1,16 +0,0 @@
-<fieldset>
-    <legend>条件搜索</legend>
-    <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get" autocomplete="off">
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">名称</label>
-            <div class="layui-input-inline">
-                <input name="name" value="{$Think.get.name|default=''}" placeholder="请输入名称" class="layui-input">
-            </div>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
-        </div>
-    </form>
-    <script>form.render()</script>
-</fieldset>

+ 0 - 92
application/mall/view/wash_cate/form.html

@@ -1,92 +0,0 @@
-<style>
-
-</style>
-<div class="think-box-shadow">
-    <form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
-        <div class="layui-card-body">
-
-            <div class="layui-form-item">
-                <label class="layui-form-label label-required">分类名称</label>
-                <div class="layui-input-block">
-                    <input name="title" maxlength="20"  value='{$vo.title|default=""}' placeholder="请输入分类名称" class="layui-input">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label label-required">LOGO</label>
-                <div class="layui-input-block">
-                    <input name="logo" type="hidden" value="{$vo.logo|default=''}">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label">价格设置</label>
-                <div class="layui-input-block">
-                    <table class="layui-table param">
-                        <thead>
-                        <tr>
-                            <th class="text-left" width="40%">标题</th>
-                            <th class="text-center" width="40%">价格(元)</th>
-                            <th class="text-center">
-                                <a class="layui-btn layui-btn-sm layui-btn-normal"  onclick="add_param()">添 加</a>
-                            </th>
-                        </tr>
-                        </thead>
-                        <!--{foreach $ladder_set as $param}-->
-                        <tr class="param_index">
-                            <td class="padding-0" >
-                                <input class="layui-input  border-0" name="title[]" value="{$param.title|default=''}">
-                            </td>
-                            <td class="padding-0">
-                                <input class="layui-input  border-0"   type="number" step="1" name="price[]" value="{$param.price|default=''}">
-                            </td>
-                            <td class="padding-0 text-center">
-                                <a class="layui-btn layui-btn-sm layui-btn-danger del">删 除</a>
-                            </td>
-                        </tr>
-                        <!--{/foreach}-->
-                    </table>
-                </div>
-            </div>
-
-
-            <div class="layui-form-item">
-                <label class="layui-form-label label-required">排序</label>
-                <div class="layui-input-block">
-                    <input type="number" name="sort"  value='{$vo.sort|default=""}' placeholder="请输入排序号" class="layui-input">
-                </div>
-            </div>
-            {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
-            <div class="layui-form-item text-center">
-                <button class="layui-btn" type='submit'>保 存</button>
-                <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定取消编辑吗?" data-close>取消编辑</button>
-            </div>
-        </div>
-    </form>
-    <script>
-        window.form.render();
-        $('[name="logo"]').uploadOneImage();
-        var html = '<tr class="param_index">\n' +
-            '                        <td class="padding-0" >\n' +
-            '                            <input class="layui-input  border-0" name="title[]" value="">\n' +
-            '                        </td>\n' +
-            '                        <td class="padding-0">\n' +
-            '                            <input class="layui-input  border-0" name="price[]" value="">\n' +
-            '                        </td>\n' +
-            '                        <td class="padding-0 text-center">\n' +
-            '                            <a class="layui-btn layui-btn-sm layui-btn-danger del"  >删 除</a>\n' +
-            '                        </td>\n' +
-            '                    </tr>';
-        function add_param() {
-            $(".param").append(html);
-            layer.render();
-        }
-
-        // 删除设置
-        $(document).on('click',".del",function (){
-            var index= $(".del").index(this);
-            $(".param_index").eq(index).remove();
-            layer.render();
-        })
-    </script>
-</div>

+ 0 - 63
application/mall/view/wash_cate/index.html

@@ -1,63 +0,0 @@
-{extend name='admin@main'}
-
-{block name="button"}
-<button data-modal='{:url("add")}' data-title="添加" class='layui-btn layui-btn-sm layui-btn-primary'>添加</button>
-{/block}
-
-{block name="content"}
-<div class="think-box-shadow">
-    <table class="layui-table margin-top-20" lay-skin="line">
-        <thead>
-        <tr>
-            <th class='text-left nowrap' style="width: 25%">分类名称</th>
-            <th class='text-left nowrap' style="width: 25%">状态</th>
-            <th class="text-left nowrap" style="width: 25%">操作</th>
-        </tr>
-        </thead>
-        <tbody>
-        {foreach $list as $key=>$vo}
-        <tr>
-            <td class='text-left nowrap'>{$vo.title|default=''}</td>
-            <td class='text-left nowrap'>{$vo.status == 1 ?'已启用' :'已禁用'}</td>
-            <td class='text-left' >
-                <a data-title="编辑" class="layui-btn layui-btn-sm" data-modal='{:url("edit")}?id={$vo.id}'>编 辑</a>
-                {if $vo.status == 1}
-                <span class="layui-btn layui-btn-sm layui-btn-warm"  onclick="btn_confirm('禁用','forbidden','{$vo.id}');" >禁 用</span>
-                {else}
-                <span class="layui-btn layui-btn-sm layui-btn-sm"  onclick="btn_confirm('启用','enable','{$vo.id}');">启 用</span>
-                {/if}
-                <span class="layui-btn layui-btn-sm layui-btn-danger" onclick="btn_confirm('删除','del','{$vo.id}');">删 除</span>
-            </td>
-        </tr>
-        {/foreach}
-        </tbody>
-    </table>
-
-    {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
-</div>
-<script>
-    function btn_confirm(msg,fun,id) {
-        layer.confirm('请确定是否'+msg, {btn: ['确定', '取消'], title: "提示"}, function () {
-            var url = "/mall/goods_cate/"+fun;
-            layer.closeAll();
-            $.ajax({
-                type: "post",
-                url: url,
-                data: {id:id},
-                dataType: "json",
-                async: false,
-                success: function (data) {
-                    layer.msg(data.info);
-                    setTimeout(function () {
-                        window.location.reload();
-                    },1000)
-                }
-            });
-        });
-    }
-
-</script>
-{/block}
-
-
-

+ 0 - 16
application/mall/view/wash_cate/index_search.html

@@ -1,16 +0,0 @@
-<fieldset>
-    <legend>条件搜索</legend>
-    <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get" autocomplete="off">
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">分类名称</label>
-            <div class="layui-input-inline">
-                <input name="title" value="{$Think.get.title|default=''}" placeholder="请输入分类名称" class="layui-input">
-            </div>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
-        </div>
-    </form>
-    <script>form.render()</script>
-</fieldset>

+ 0 - 104
application/order/controller/AppOrder.php

@@ -1,104 +0,0 @@
-<?php
-namespace app\order\controller;
-use library\Controller;
-use think\Db;
-/**
- * 会员预约管理
- * Class AppOrder
- * @package app\order\controller
- */
-class AppOrder extends Controller
-{
-    protected $table = 'AppOrder';
-    /**
-     * 预约列表
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    public function index()
-    {
-        $this->title = '预约管理';
-        $query = $this->_query($this->table);
-        $this->order_status = [0=>'预约中',1=>'已完成',9=>'已取消'];
-        $where = [];
-        $where[] = ['o.is_deleted','=',0];
-        if($this->request->request('phone'))$where[]= ['u.phone','like','%'.$this->request->request('phone').'%'];
-        if($this->request->request('user_name'))$where[]= ['u.name','like','%'.$this->request->request('user_name').'%'];
-        if($this->request->request('order_no')) $where[]= ['o.order_no','like','%'.$this->request->request('order_no').'%'];
-        if($this->request->request('code')) $where[]= ['o.code','like','%'.$this->request->request('code').'%'];
-        if($this->request->request('order_status',-1) >= 0) $where[]= ['o.status','=',$this->request->request('order_status')];
-        $query->alias('o')
-            ->field('o.* , u.name u_name ,u.phone u_phone,u.headimg,g.name goods_name,g.cover goods_cover,m.goods_spec')
-            ->join('store_member u',' o.user_id = u.id ','LEFT')
-            ->join('store_goods g',' o.goods_id = g.id ','LEFT')
-            ->join('store_goods_item m','o.spec_id = m.id ','LEFT');
-        if(!empty($where)) $query->where($where);
-        $query ->order('o.id desc')->page();
-    }
-
-    /**
-     * 订单完成
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function complete()
-    {
-        if($this->request->isPost())
-        {
-            $check_status = \app\common\model\WashOrder::where('id',input('post.id'))->value('status');
-            if($check_status != 0) $this->error('订单状态有误');
-        }
-        $this->_save($this->table, ['status' => 1]);
-    }
-
-
-    /**
-     * 订单详情
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function detail()
-    {
-        $this->title = '订单详情';
-        $this->_form($this->table);
-    }
-    /**
-     * 删除
-     * @auth true
-     * @menu true
-     * @param array $data
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    public function remove()
-    {
-        $this->_save($this->table, ['is_deleted' => '1']);
-    }
-    /**
-     * 表单数据处理
-     * @auth true
-     * @menu true
-     * @param array $data
-     */
-    protected function _form_filter(&$data)
-    {
-
-    }
-
-
-}

+ 0 - 53
application/order/controller/LevelOrder.php

@@ -1,53 +0,0 @@
-<?php
-namespace app\order\controller;
-use library\Controller;
-use think\Db;
-/**
- * 会员订单管理
- * Class LevelOrder
- * @package app\order\controller
- */
-class LevelOrder extends Controller
-{
-    protected $table = 'LevelOrder';
-    /**
-     * 订单列表
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOExceptio
-     */
-    public function index()
-    {
-        $this->title = '订单管理';
-        $query = $this->_query($this->table);
-        $where = [];
-        $where[] = ['o.is_deleted','=',0];
-        $where[] = ['o.cancel_state','=',0];
-        if($this->request->request('tel'))$where[]= ['u.phone','like','%'.$this->request->request('tel').'%'];
-        if($this->request->request('user_name'))$where[]= ['u.name','like','%'.$this->request->request('user_name').'%'];
-        if($this->request->request('order_no')) $where[]= ['o.order_no','like','%'.$this->request->request('order_no').'%'];
-        $query->alias('o')
-            ->field('o.* , u.name u_name ,u.phone u_phone,l.name level_name')
-            ->join('store_member u',' o.user_id = u.id ','LEFT')
-            ->leftJoin('user_level l',' o.level_id = l.id ');
-        if(!empty($where)) $query->where($where);
-        $query ->order('o.id desc')->page();
-    }
-
-    /**
-     * 表单数据处理
-     * @auth true
-     * @menu true
-     * @param array $data
-     */
-    protected function _form_filter(&$data)
-    {
-
-    }
-
-
-}

+ 0 - 167
application/order/controller/StoreOrder.php

@@ -1,167 +0,0 @@
-<?php
-namespace app\order\controller;
-use app\common\model\GoodsOrder;
-use library\Controller;
-use library\tools\Data;
-use think\Db;
-use app\common\model\GoodsOrderItem;
-/**
- * 商品订单
- * Class StoreOrder
- * @package app\order\controller
- */
-class StoreOrder extends Controller
-{
-    protected $table = 'StoreOrder';
-    /**
-     * 订单列表
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function index()
-    {
-        $this->title = '订单管理';
-        $this->order_status = [0=>'待支付',1=>'已支付[待发货]',2=>'已发货[待收货]',3=>'已收货[待评论]',4=>'已完成',9=>'已取消'];
-        $this->pay_state = ['待支付','已支付'];
-        $this->all_pay_type = all_pay_type();
-        $query = $this->_query($this->table);
-        $where = [];
-        if($this->request->request('tel'))$where[]= ['u.phone','like','%'.$this->request->request('tel').'%'];
-        if($this->request->request('user_name'))$where[]= ['u.name','like','%'.$this->request->request('user_name').'%'];
-        if($this->request->request('order_no')) $where[]= ['o.order_no','like','%'.$this->request->request('order_no').'%'];
-        if($this->request->request('pay_state',-1) > -1) $where[]= ['o.pay_state','=',$this->request->request('pay_state')];
-        if($this->request->request('order_status',-1) > -1) $where[]= ['o.status','=',$this->request->request('order_status')];
-        $query->alias('o')
-            ->field('o.* , u.name ,u.phone as user_phone,u.headimg')
-            ->join('store_member u',' o.user_id = u.id ','LEFT');
-        if(!empty($where)) $query->where($where);
-        $query ->order('o.id desc')->page();
-    }
-
-    /**
-     * 订单列表处理
-     * @param array $data
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    protected function _index_page_filter(array &$data)
-    {
-        foreach ($data as &$vo) {
-           $vo['item_list'] = GoodsOrderItem::field('i.num,i.sell_price,g.name,i.goods_spec')
-               ->alias('i')
-               ->where(['i.order_id'=>$vo['id']])
-               ->leftJoin('StoreGoods g','g.id = i.goods_id')
-               ->select();
-        }
-    }
-
-    /**
-     * 修改快递
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function express()
-    {
-        if ($this->request->isGet()) {
-            $where = ['is_deleted' => '0', 'status' => '1'];
-            $this->expressList = Db::name('express_company')->where($where)->order('sort desc,id desc')->select();
-        }
-        $this->_form($this->table);
-    }
-
-    /**
-     * 快递表单处理
-     * @param array $vo
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    protected function _express_form_filter(&$vo)
-    {
-        if ($this->request->isPost()) {
-            $order = Db::name($this->table)->where(['id' => $vo['id']])->find();
-            if (empty($order)) $this->error('订单查询异常,请稍候再试!');
-            $express = Db::name('express_company')->where(['express_code' => $vo['express_company_code']])->find();
-            if (empty($express)) $this->error('发货快递公司异常,请重新选择快递公司!');
-            $vo['express_company_title'] = $express['express_title'];
-            $vo['express_send_at'] = empty($order['express_send_at']) ? date('Y-m-d H:i:s') : $order['express_send_at'];
-            $vo['express_state'] = '1';
-            $vo['status'] = '2';
-        }
-    }
-
-
-    /**
-     * 订单详情
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function detail()
-    {
-        $this->title = '订单详情';
-        $this->_form($this->table);
-    }
-
-    /**
-     * 订单发货
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-
-    public function deliver()
-    {
-        $this->title = '发货';
-        $this->express_company = Db::name('express_company')->field('id,express_title')->select();
-        $this->_form($this->table,'deliver');
-    }
-
-
-
-    /**
-     * 表单数据处理
-     * @auth true
-     * @menu true
-     * @param array $data
-     */
-    protected function _form_filter(&$data)
-    {
-        if ($this->request->isGet() && $this->request->action() == 'detail'){
-            $this->order_item = GoodsOrderItem::where(['o.order_id'=>$data['id']])
-                ->alias('o')
-                ->field('o.*,g.name,g.cover')
-                ->leftJoin('StoreGoods g','g.id=o.goods_id')
-                ->select()->toArray();
-            $this->data = $data;
-        }
-
-        if ($this->request->isPost() && $this->request->action() == 'deliver') {
-            $express_company =  Db::name('express_company')->field('id,express_title')->find($data['express_company_id']);
-            $data['express_company_title'] = $express_company['express_title'] ? $express_company['express_title'] : '';
-            $data['express_send_at'] = date("Y-m-d H:i:s");
-            $data['express_state'] = 1;
-        }
-    }
-
-
-
-}

+ 0 - 191
application/order/controller/WashOrder.php

@@ -1,191 +0,0 @@
-<?php
-namespace app\order\controller;
-use app\common\model\GoodsOrder;
-use app\common\model\UserMessage;
-use app\common\model\WashOrderItem;
-use library\Controller;
-use library\tools\Data;
-use think\Db;
-use app\common\model\GoodsOrderItem;
-/**
- * 洗鞋订单
- * Class WashOrder
- * @package app\order\controller
- */
-class WashOrder extends Controller
-{
-    protected $table = 'WashOrder';
-    /**
-     * 订单列表
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function index()
-    {
-        $this->title = '订单管理';
-        $this->order_status = [0=>'待支付',1=>'已支付',2=>'已完成',9=>'已取消'];
-        $this->pay_state = ['待支付','已支付'];
-        $this->all_pay_type = all_pay_type();
-        $query = $this->_query($this->table);
-        $where = [];
-        if($this->request->request('phone'))$where[]= ['o.phone','like','%'.$this->request->request('tel').'%'];
-        if($this->request->request('user_name'))$where[]= ['u.name','like','%'.$this->request->request('user_name').'%'];
-        if($this->request->request('order_no')) $where[]= ['o.order_no','like','%'.$this->request->request('order_no').'%'];
-        if($this->request->request('pay_state',-1) > -1) $where[]= ['o.pay_state','=',$this->request->request('pay_state')];
-        if($this->request->request('order_status',-1) > -1) $where[]= ['o.status','=',$this->request->request('order_status')];
-        $query->alias('o')
-            ->field('o.* , u.name ,u.phone as user_phone,u.headimg')
-            ->join('store_member u',' o.user_id = u.id ','LEFT');
-        if(!empty($where)) $query->where($where);
-        $query ->order('o.id desc')->page();
-    }
-
-    /**
-     * 订单列表处理
-     * @param array $data
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    protected function _index_page_filter(array &$data)
-    {
-        foreach ($data as &$vo) {
-           $vo['item_list'] = WashOrderItem::field('i.*,g.ladder_set,g.title')
-               ->alias('i')
-               ->where(['i.order_id'=>$vo['id']])
-               ->leftJoin('wash_cate g','g.id = i.cate_id')
-               ->select()->toArray();
-        }
-    }
-
-    /**
-     * 修改快递
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function express()
-    {
-        if ($this->request->isGet()) {
-            $where = ['is_deleted' => '0', 'status' => '1'];
-            $this->expressList = Db::name('express_company')->where($where)->order('sort desc,id desc')->select();
-        }
-        $this->_form($this->table);
-    }
-
-    /**
-     * 快递表单处理
-     * @param array $vo
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    protected function _express_form_filter(&$vo)
-    {
-        if ($this->request->isPost()) {
-            $order = Db::name($this->table)->where(['id' => $vo['id']])->find();
-            if (empty($order)) $this->error('订单查询异常,请稍候再试!');
-            $express = Db::name('express_company')->where(['express_code' => $vo['express_company_code']])->find();
-            if (empty($express)) $this->error('发货快递公司异常,请重新选择快递公司!');
-            $vo['express_company_title'] = $express['express_title'];
-            $vo['express_send_at'] = empty($order['express_send_at']) ? date('Y-m-d H:i:s') : $order['express_send_at'];
-            $vo['express_state'] = '1';
-            $vo['status'] = '2';
-        }
-    }
-
-
-    /**
-     * 订单详情
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function detail()
-    {
-        $this->title = '订单详情';
-        $this->_form($this->table);
-    }
-
-    /**
-     * 订单发货
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-
-    public function deliver()
-    {
-        $this->title = '发货';
-        $this->express_company = Db::name('express_company')->field('id,express_title')->select();
-        $this->_form($this->table,'deliver');
-    }
-
-    /**
-     * 订单完成
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function complete()
-    {
-        if($this->request->isPost())
-        {
-            $check_status = \app\common\model\WashOrder::where('id',input('post.id'))->value('status');
-            if($check_status != 1) $this->error('订单状态有误');
-        }
-        $this->_save($this->table, ['status' => 2]);
-    }
-
-    /**
-     * 表单数据处理
-     * @auth true
-     * @menu true
-     * @param array $data
-     */
-    protected function _form_filter(&$data)
-    {
-        if ($this->request->isGet() && $this->request->action() == 'detail'){
-            $order_item = WashOrderItem::where(['o.order_id'=>$data['id']])
-                ->alias('o')
-                ->field('o.*,g.ladder_set,g.title')
-                ->leftJoin('wash_cate g','g.id=o.cate_id')
-                ->select()->toArray();
-            array_walk($order_item,function (&$v){
-                $v['images_arr'] = $v['images'] ? explode('|',$v['images']) : [];
-            });
-            $this->order_item = $order_item;
-            $this->data = $data;
-        }
-
-        if ($this->request->isPost() && $this->request->action() == 'deliver') {
-            $express_company =  Db::name('express_company')->field('id,express_title')->find($data['express_company_id']);
-            $data['express_company_title'] = $express_company['express_title'] ? $express_company['express_title'] : '';
-            $data['express_send_at'] = date("Y-m-d H:i:s");
-            $data['express_state'] = 1;
-        }
-    }
-
-
-
-}

+ 0 - 90
application/order/view/app_order/detail.html

@@ -1,90 +0,0 @@
-<div style="padding: 20px; background-color: #F2F2F2;">
-    <div class="layui-row layui-col-space15">
-        <div class="layui-col-md12">
-            <div class="layui-card">
-                <div class="layui-card-header">订单信息</div>
-                <div class="layui-card-body">
-                    <div class="layui-col-md6">订单号:{$data['order_no']}</div>
-                    <div class="layui-col-md6">订单状态:
-                        {eq name='vo.status' value='0'}<span class="layui-badge layui-bg-orange margin-left-5">待付款</span>{/eq}
-                        {eq name='vo.status' value='1'}<span class="layui-badge layui-bg-black margin-left-5">待发货</span>{/eq}
-                        {eq name='vo.status' value='2'}<span class="layui-badge layui-bg-green margin-left-5">已发货</span>{/eq}
-                        {eq name='vo.status' value='3'}<span class="layui-badge layui-bg-blue margin-left-5">已收货待评价</span>{/eq}
-                        {eq name='vo.status' value='4'}<span class="layui-badge layui-bg-blue margin-left-5">已完成</span>{/eq}
-                        {eq name='vo.status' value='9'}<span class="layui-badge layui-bg-blue margin-left-5">已取消</span>{/eq}
-                    </div><hr />
-                    <div class="layui-col-md6">商品总价:{$data['price_goods']|default='0'}</div><hr />
-                    <div class="layui-col-md6">需支付金额:{$data['price_total']|default='0'}</div>
-                    <div class="layui-col-md6">实际支付金额:{$data['price_total']|default='0'}</div><hr />
-                    <div class="layui-col-md6">优惠券抵扣金额:{$data['coupon_cash']|default='0'}</div>
-                    <hr />
-                    <div class="layui-col-md6">支付方式:
-                        {eq name='vo.pay_type' value='0'}<span class="layui-badge layui-bg-green margin-left-5">未支付</span>{/eq}
-                        {eq name='vo.pay_type' value='1'}<span class="layui-badge layui-bg-green margin-left-5">微信</span>{/eq}
-                        {eq name='vo.pay_type' value='2'}<span class="layui-badge layui-bg-blue margin-left-5">余额</span>{/eq}
-                        {eq name='vo.pay_type' value='3'}<span class="layui-badge layui-bg-orange margin-left-5">支付宝</span>{/eq}
-                    </div>
-                    <hr />
-                    <div class="layui-col-md6">下单时间:{$data.create_at|default='--'}</div>
-                    <div class="layui-col-md6">
-                        支付时间:{$vo.pay_at|default='--'}
-                    </div>
-                    <hr />
-                </div>
-            </div>
-        </div>
-        <div class="layui-col-md12">
-            <div class="layui-card">
-                <div class="layui-card-header">收货信息</div>
-                <div class="layui-card-body">
-                    <div class="layui-col-md6">收货人姓名:{$data.user_name|default='--'}</div>
-                    <div class="layui-col-md6">收货人手机:{$data.phone|default='--'}</div><hr />
-                    <div class="layui-col-md6">地址:{$vo.pro_name|default='--'}{$vo.city_name}{$vo.county_name}{$vo.street_name}{$vo.add_detail}{$vo.add_detail}</div><hr />
-                    <hr />
-                </div>
-            </div>
-        </div>
-        <div class="layui-col-md12">
-            <div class="layui-card">
-                <div class="layui-card-header">商品信息</div>
-                <div class="layui-card-body">
-                    <table class="layui-table margin-top-10" lay-skin="line">
-                        {notempty name='order_item'}
-                        <thead>
-                        <tr>
-                            <th class='text-left nowrap'>商品</th>
-                            <th class='text-left nowrap'>分类</th>
-                            <th class='text-left nowrap'>价格</th>
-                            <th class='text-left nowrap'>数量</th>
-                        </tr>
-                        </thead>
-                        {/notempty}
-                        <tbody>
-                        {foreach $order_item as $key=>$iv}
-                        <tr>
-                            <td class='text-left nowrap'>
-                                <div class="inline-block" style="max-width: 210px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
-                                    {foreach $iv.images_arr as $mv}
-                                        <img data-tips-image style="width:40px;height:40px;vertical-align:top" src="{$mv}" class="margin-right-5">
-                                    {/foreach}
-                                </div>
-                            </td>
-                            <td class='text-left'>
-                                {$iv.title|default='--'}
-                            </td>
-                            <td class='text-left'>
-                                {$iv.sell_price|default='0'}
-                            </td>
-                            <td class='text-left'>
-                                {$iv.num|default='0'}
-                            </td>
-                        </tr>
-                        {/foreach}
-                        </tbody>
-                    </table>
-                    {empty name='order_item'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
-                </div>
-            </div>
-        </div>
-    </div>
-</div>

+ 0 - 36
application/order/view/app_order/form.html

@@ -1,36 +0,0 @@
-<form onsubmit="return false;" action="{:request()->url()}" data-auto="true" method="post" class='layui-form layui-card' autocomplete="off">
-
-    <div class="layui-card-body">
-
-        <div class="layui-row margin-bottom-15">
-            <label class="layui-col-xs2 think-form-label">用户名</label>
-            <label class="layui-col-xs10">
-                {notempty name='vo.id'}  <input name="name" required value='{$vo.name|default=""}' style="background-color: #e6e6e6" readonly class="layui-input">{/notempty}
-                {empty name='vo.id'}  <input name="name" required value='{$vo.name|default=""}' placeholder="请输入用户名" class="layui-input">{/empty}
-            </label>
-        </div>
-
-        <div class="layui-row margin-bottom-15">
-            <label class="layui-col-xs2 think-form-label">登录手机号</label>
-            <label class="layui-col-xs10">
-                {notempty name='vo.id'}    <input name="phone" required value='{$vo.phone|default=""}' style="background-color: #e6e6e6" readonly class="layui-input">{/notempty}
-                {empty name='vo.id'}       <input name="phone" required value='{$vo.phone|default=""}' placeholder="请输入登录手机号" class="layui-input">{/empty}
-            </label>
-        </div>
-
-        <div class="layui-row margin-bottom-15">
-            <label class="layui-col-xs2 think-form-label">登录密码</label>
-            <label class="layui-col-xs10">
-                <input name="password" required value='{$vo.password|default=""}' placeholder="请输入登录密码" class="layui-input">
-            </label>
-        </div>
-
-    </div>
-
-    <div class="hr-line-dashed"></div>
-    <div class="layui-form-item text-center">
-        {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
-        <button class="layui-btn" type='submit'>保存数据</button>
-        <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗?" data-close>取消编辑</button>
-    </div>
-</form>

+ 0 - 92
application/order/view/app_order/index.html

@@ -1,92 +0,0 @@
-{extend name='admin@main'}
-{block name="content"}
-<div class="think-box-shadow">
-    {include file='app_order/index_search'}
-    <table class="layui-table margin-top-10" lay-skin="line">
-        {notempty name='list'}
-        <thead>
-        <tr>
-            <th class='text-left nowrap'>用户信息</th>
-            <th class='text-left nowrap'>预约商品</th>
-            <th class='text-left nowrap'>预约信息</th>
-            <th class='text-left nowrap'>预约地址</th>
-            <th class="text-left nowrap">预约单号</th>
-            <th class="text-left nowrap">预约状态</th>
-            <th class="text-left nowrap">操作</th>
-        </tr>
-        </thead>
-        {/notempty}
-        <tbody>
-        {foreach $list as $key=>$vo}
-        <tr>
-            <td class='text-left nowrap'>
-                <img data-tips-image style="width:50px;height:50px" src="{$vo.headimg|default=''}" class="margin-right-5 text-top">
-                <div class="inline-block">
-                    用户ID:{$vo.id|default='--'}<br><br>
-                    用户昵称:{$vo.u_name|default='--'}
-                </div>
-            </td>
-
-            <td class='text-left nowrap'>
-                <img data-tips-image style="width:50px;height:50px" src="{$vo.goods_cover|default=''}" class="margin-right-5 text-top">
-                <div class="inline-block">
-                    商品ID:{$vo.id|default='--'}<br>
-                    商品名称:{$vo.goods_name|default='--'}<br>
-                    商品规格:{$vo.goods_spec|default='--'}
-                </div>
-            </td>
-
-
-            <td class='text-left nowrap'>
-                <div class="inline-block">
-                    联系人:{$vo.user_name|default='--'}<br>
-                    预约号:{$vo.code|default='--'}<br>
-                    手机号:{$vo.phone|default='--'}
-                </div>
-            </td>
-            <td class='text-left nowrap'>
-                <div class="inline-block">
-                    预约地址:{$vo.pro_name|default='--'}{$vo.city_name|default='--'}{$vo.county_name|default='--'}<br>
-                    地址详情:{$vo.add_detail|default='--'}
-                </div>
-            </td>
-            <td class='text-left nowrap'>{$vo.order_no}</td>
-            <td class='text-left nowrap'>
-                {eq name='vo.status' value='0'}<span class="layui-badge layui-bg-orange margin-left-5">预约中</span>{/eq}
-                {eq name='vo.status' value='1'}<span class="layui-badge layui-bg-green margin-left-5">预约完成</span>{/eq}
-                {eq name='vo.status' value='9'}<span class="layui-badge layui-bg-black margin-left-5">已取消</span>{/eq}
-            </td>
-            <td class='text-left nowrap'>
-                <a class="layui-btn layui-btn-sm layui-btn-danger" data-confirm="确定要删除该记录吗?" data-action="{:url('remove')}" data-value="id#{$vo.id}">删 除</a>
-                {if $vo.status == 0}
-                    <span class="layui-btn layui-btn-sm layui-btn-warm" onclick="btn_confirm('订单完成','complete','{$vo.id}');">订单完成</span>
-                {/if}
-            </td>
-        </tr>
-        {/foreach}
-        </tbody>
-    </table>
-    {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
-</div>
-<script>
-    function btn_confirm(msg,fun,id) {
-        layer.confirm('请确定是否'+msg, {btn: ['确定', '取消'], title: "提示"}, function () {
-            var url = "/order/app_order/"+fun;
-            layer.closeAll();
-            $.ajax({
-                type: "post",
-                url: url,
-                data: {id:id},
-                dataType: "json",
-                async: false,
-                success: function (data) {
-                    layer.msg(data.info);
-                    setTimeout(function () {
-                        window.location.reload();
-                    },1000)
-                }
-            });
-        });
-    }
-</script>
-{/block}

+ 0 - 54
application/order/view/app_order/index_search.html

@@ -1,54 +0,0 @@
-<fieldset>
-    <legend>条件搜索</legend>
-    <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get" autocomplete="off">
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">预约号</label>
-            <div class="layui-input-inline">
-                <input name="code" value="{$Think.get.code|default=''}" placeholder="请输入预约号" class="layui-input">
-            </div>
-        </div>
-
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">订单号</label>
-            <div class="layui-input-inline">
-                <input name="order_no" value="{$Think.get.order_no|default=''}" placeholder="请输入订单号" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">手机号</label>
-            <div class="layui-input-inline">
-                <input name="phone" value="{$Think.get.phone|default=''}" placeholder="请输入手机号" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">用户名称</label>
-            <div class="layui-input-inline">
-                <input name="user_name" value="{$Think.get.user_name|default=''}" placeholder="请输入用户名称" class="layui-input">
-            </div>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">订单状态</label>
-            <div class="layui-input-inline">
-                <select class="layui-select" name="order_status">
-                    <option  value="-1">全部</option>
-                    {foreach $order_status as $k=>$v}
-                        {if $v}
-                            {if $Think.get.order_status > -1  && $Think.get.order_status eq $k}
-                                <option selected value="{$k}">{$v}</option>
-                                {else}
-                                <option  value="{$k}">{$v}</option>
-                             {/if}
-                         {/if}
-                    {/foreach}
-                </select>
-            </div>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
-        </div>
-    </form>
-    <script>form.render()</script>
-</fieldset>

+ 0 - 36
application/order/view/level_order/form.html

@@ -1,36 +0,0 @@
-<form onsubmit="return false;" action="{:request()->url()}" data-auto="true" method="post" class='layui-form layui-card' autocomplete="off">
-
-    <div class="layui-card-body">
-
-        <div class="layui-row margin-bottom-15">
-            <label class="layui-col-xs2 think-form-label">用户名</label>
-            <label class="layui-col-xs10">
-                {notempty name='vo.id'}  <input name="name" required value='{$vo.name|default=""}' style="background-color: #e6e6e6" readonly class="layui-input">{/notempty}
-                {empty name='vo.id'}  <input name="name" required value='{$vo.name|default=""}' placeholder="请输入用户名" class="layui-input">{/empty}
-            </label>
-        </div>
-
-        <div class="layui-row margin-bottom-15">
-            <label class="layui-col-xs2 think-form-label">登录手机号</label>
-            <label class="layui-col-xs10">
-                {notempty name='vo.id'}    <input name="phone" required value='{$vo.phone|default=""}' style="background-color: #e6e6e6" readonly class="layui-input">{/notempty}
-                {empty name='vo.id'}       <input name="phone" required value='{$vo.phone|default=""}' placeholder="请输入登录手机号" class="layui-input">{/empty}
-            </label>
-        </div>
-
-        <div class="layui-row margin-bottom-15">
-            <label class="layui-col-xs2 think-form-label">登录密码</label>
-            <label class="layui-col-xs10">
-                <input name="password" required value='{$vo.password|default=""}' placeholder="请输入登录密码" class="layui-input">
-            </label>
-        </div>
-
-    </div>
-
-    <div class="hr-line-dashed"></div>
-    <div class="layui-form-item text-center">
-        {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
-        <button class="layui-btn" type='submit'>保存数据</button>
-        <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗?" data-close>取消编辑</button>
-    </div>
-</form>

+ 0 - 35
application/order/view/level_order/index.html

@@ -1,35 +0,0 @@
-{extend name='admin@main'}
-{block name="content"}
-<div class="think-box-shadow">
-    {include file='level_order/index_search'}
-    <table class="layui-table margin-top-10" lay-skin="line">
-        {notempty name='list'}
-        <thead>
-        <tr>
-            <th class='text-left nowrap'>用户名</th>
-            <th class='text-left nowrap'>手机号</th>
-            <th class='text-left nowrap'>订单金额</th>
-            <th class='text-left nowrap'>会员</th>
-            <th class='text-left nowrap'>时间(月)</th>
-            <th class='text-left nowrap'>订单号</th>
-            <th class="text-left nowrap">添加时间</th>
-        </tr>
-        </thead>
-        {/notempty}
-        <tbody>
-        {foreach $list as $key=>$vo}
-        <tr>
-            <td class='text-left nowrap'>{$vo.u_name|default=''}</td>
-            <td class='text-left nowrap'>{$vo.u_phone|default=''}</td>
-            <td class='text-left nowrap'>{$vo.price_total|default=''}</td>
-            <td class='text-left nowrap'>{$vo.level_name|default=''}</td>
-            <td class='text-left nowrap'>{$vo.month|default=''}</td>
-            <td class='text-left nowrap'>{$vo.order_no|default=''}</td>
-            <td class='text-left nowrap'>{$vo.create_at}</td>
-        </tr>
-        {/foreach}
-        </tbody>
-    </table>
-    {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
-</div>
-{/block}

+ 0 - 28
application/order/view/level_order/index_search.html

@@ -1,28 +0,0 @@
-<fieldset>
-    <legend>条件搜索</legend>
-    <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get" autocomplete="off">
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">订单号</label>
-            <div class="layui-input-inline">
-                <input name="order_no" value="{$Think.get.order_no|default=''}" placeholder="请输入订单号" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">手机号</label>
-            <div class="layui-input-inline">
-                <input name="tel" value="{$Think.get.tel|default=''}" placeholder="请输入手机号" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">用户名称</label>
-            <div class="layui-input-inline">
-                <input name="user_name" value="{$Think.get.user_name|default=''}" placeholder="请输入用户名称" class="layui-input">
-            </div>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
-        </div>
-    </form>
-    <script>form.render()</script>
-</fieldset>

+ 0 - 102
application/order/view/store_order/detail.html

@@ -1,102 +0,0 @@
-<div style="padding: 20px; background-color: #F2F2F2;">
-    <div class="layui-row layui-col-space15">
-        <div class="layui-col-md12">
-            <div class="layui-card">
-                <div class="layui-card-header">订单信息</div>
-                <div class="layui-card-body">
-                    <div class="layui-col-md6">订单号:{$data['order_no']}</div>
-                    <div class="layui-col-md6">订单状态:
-                        {eq name='vo.status' value='0'}<span class="layui-badge layui-bg-orange margin-left-5">待付款</span>{/eq}
-                        {eq name='vo.status' value='1'}<span class="layui-badge layui-bg-black margin-left-5">待发货</span>{/eq}
-                        {eq name='vo.status' value='2'}<span class="layui-badge layui-bg-green margin-left-5">已发货</span>{/eq}
-                        {eq name='vo.status' value='3'}<span class="layui-badge layui-bg-blue margin-left-5">已收货待评价</span>{/eq}
-                        {eq name='vo.status' value='4'}<span class="layui-badge layui-bg-blue margin-left-5">已完成</span>{/eq}
-                        {eq name='vo.status' value='9'}<span class="layui-badge layui-bg-blue margin-left-5">已取消</span>{/eq}
-                    </div><hr />
-                    <div class="layui-col-md6">商品总价:{$data['price_goods']|default='0'}</div><hr />
-                    <div class="layui-col-md6">需支付金额:{$data['price_total']|default='0'}</div>
-                    <div class="layui-col-md6">实际支付金额:{$data['price_total']|default='0'}</div><hr />
-                    <div class="layui-col-md6">优惠券抵扣金额:{$data['coupon_cash']|default='0'}</div>
-                    <hr />
-                    <div class="layui-col-md6">支付方式:
-                        {eq name='vo.pay_type' value='0'}<span class="layui-badge layui-bg-green margin-left-5">未支付</span>{/eq}
-                        {eq name='vo.pay_type' value='1'}<span class="layui-badge layui-bg-green margin-left-5">微信</span>{/eq}
-                        {eq name='vo.pay_type' value='2'}<span class="layui-badge layui-bg-blue margin-left-5">余额</span>{/eq}
-                        {eq name='vo.pay_type' value='3'}<span class="layui-badge layui-bg-orange margin-left-5">支付宝</span>{/eq}
-                    </div>
-                    <hr />
-                    <div class="layui-col-md6">下单时间:{$data.create_at|default='--'}</div>
-                    <div class="layui-col-md6">
-                        支付时间:{$vo.pay_at|default='--'}
-                    </div>
-                    <hr />
-                </div>
-            </div>
-        </div>
-        <div class="layui-col-md12">
-            <div class="layui-card">
-                <div class="layui-card-header">收货信息</div>
-                <div class="layui-card-body">
-                    <div class="layui-col-md6">收货人姓名:{$data.user_name|default='--'}</div>
-                    <div class="layui-col-md6">收货人手机:{$data.phone|default='--'}</div><hr />
-                    <div class="layui-col-md6">地址:{$vo.pro_name|default='--'}{$vo.city_name}{$vo.county_name}{$vo.street_name}{$vo.add_detail}{$vo.add_detail}</div><hr />
-                    <div class="layui-col-md6">发货状态:{eq name='vo.express_state' value='0'}
-                        <span class="layui-badge layui-bg-black">未发货</span>
-                        {else}
-                        <span class="layui-badge layui-bg-blue">{$vo.express_company_title|default='--'}</span>
-                        <span class="layui-badge layui-bg-gray margin-left-5">{$vo.express_send_no|default='--'}</span>
-                        {/eq}
-                        {if $vo.status eq 3 || $vo.status eq -3 || $vo.pay_type eq 'offline'}
-                        <a class=" margin-left-5" data-title="填写订单信息" data-modal="{:url('express')}?id={$vo.id}">填写发货信息</a>
-                        {elseif $vo.status eq 4}
-                        <a class=" margin-left-5" data-title="修改发货信息" data-modal="{:url('express')}?id={$vo.id}">修改发货信息</a>
-                        {/if}
-                    </div>
-                    <div class="layui-col-md6">发货时间:{$vo.express_send_at|format_datetime}</div>
-                    <hr />
-
-                </div>
-            </div>
-        </div>
-        <div class="layui-col-md12">
-            <div class="layui-card">
-                <div class="layui-card-header">商品信息</div>
-                <div class="layui-card-body">
-                    <table class="layui-table margin-top-10" lay-skin="line">
-                        {notempty name='order_item'}
-                        <thead>
-                        <tr>
-                            <th class='text-left nowrap'>商品</th>
-                            <th class='text-left nowrap'>规格</th>
-                            <th class='text-left nowrap'>价格</th>
-                            <th class='text-left nowrap'>数量</th>
-                        </tr>
-                        </thead>
-                        {/notempty}
-                        <tbody>
-                        {foreach $order_item as $key=>$iv}
-                        <tr>
-                            <td class='text-left nowrap'>
-                                <div class="inline-block" style="max-width: 210px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
-                                    <img data-tips-image style="width:20px;height:20px;vertical-align:top" src="{$iv.cover}" class="margin-right-5"> {$iv.name}
-                                </div>
-                            </td>
-                            <td class='text-left nowrap' style="max-width: 210px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
-                                {$iv.goods_spec|default='-'}
-                            </td>
-                            <td class='text-left'>
-                                {$iv.sell_price|default='0'}
-                            </td>
-                            <td class='text-left'>
-                                {$iv.num|default='0'}
-                            </td>
-                        </tr>
-                        {/foreach}
-                        </tbody>
-                    </table>
-                    {empty name='order_item'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
-                </div>
-            </div>
-        </div>
-    </div>
-</div>

+ 0 - 66
application/order/view/store_order/express.html

@@ -1,66 +0,0 @@
-<form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
-    <div class="layui-card-body" style="padding-left:40px">
-
-        <fieldset>
-            <legend>收货信息</legend>
-            <div class="layui-form-item">
-                <label style='width:50px' class="layui-form-label">收货姓名</label>
-                <div class="layui-input-block" style="margin-left:80px">
-                    <input name="user_name" required value='{$vo.user_name|default=""}' placeholder="请输入收货姓名" class="layui-input">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label style='width:50px' class="layui-form-label">收货手机</label>
-                <div class="layui-input-block" style="margin-left:80px">
-                    <input name="phone" required value='{$vo.phone|default=""}' placeholder="请输入收货手机" class="layui-input">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label style='width:50px' class="layui-form-label label-required">收货地址</label>
-                <div class="layui-input-block" style="margin-left:80px">
-                    <div class="color-blue" style="line-height:38px;">{$vo.pro_name|default='--'} {$vo.city_name} {$vo.county_name} {$vo.street_name} {$vo.add_detail}</div>
-                </div>
-            </div>
-        </fieldset>
-
-        <fieldset class="margin-top-20">
-            <legend>快递信息</legend>
-            <div class="layui-form-item">
-                <label style='width:50px' class="layui-form-label label-required">快递公司</label>
-                <div class="layui-input-block" style="margin-left:80px">
-                    <select class="layui-select" name="express_company_code" lay-search >
-                        {foreach $expressList as $express}
-                            {if $vo.express_company_code eq $express.express_code}
-                                <option selected value="{$express.express_code}">{$express.express_title}</option>
-                            {else}
-                                <option value="{$express.express_code}">{$express.express_title}</option>
-                            {/if}
-                        {/foreach}
-                    </select>
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label style='width:50px' class="layui-form-label">快递单号</label>
-                <div class="layui-input-block" style="margin-left:80px">
-                    <input name="express_send_no" required value='{$vo.express_send_no|default=""}' placeholder="请输入快递单号" class="layui-input">
-                </div>
-            </div>
-        </fieldset>
-    </div>
-
-    <div class="hr-line-dashed"></div>
-
-    <div class="layui-form-item text-center">
-        <!--{notempty name='vo.id'}-->
-        <input type='hidden' value='{$vo.id}' name='id'>
-        <!--{/notempty}-->
-        <button class="layui-btn" type='submit'>保存数据</button>
-        <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗?" data-close>取消编辑</button>
-    </div>
-</form>
-<script>
-    window.form.render();
-</script>

+ 0 - 93
application/order/view/store_order/index.html

@@ -1,93 +0,0 @@
-{extend name='admin@main'}
-{block name="content"}
-<div class="think-box-shadow">
-    {include file='store_order/index_search'}
-    <table class="layui-table margin-top-10" lay-skin="line">
-        {notempty name='list'}
-        <thead>
-        <tr>
-            <th class='text-left nowrap'>用户信息</th>
-            <th class='text-left nowrap'>订单详情</th>
-            <th class='text-left nowrap'>物流信息</th>
-            <th class='text-left nowrap'>商品详情</th>
-            <th class="text-left nowrap">操作</th>
-        </tr>
-        </thead>
-        {/notempty}
-        <tbody>
-        {foreach $list as $key=>$vo}
-        <tr>
-            <td class="text-left nowrap relative">
-                <img data-tips-image style="width:60px;height:60px" src="{$vo.headimg|default=''}" class="margin-right-5 text-top">
-                <div class="inline-block">
-                    会员ID:{$vo.user_id|default='--'}<br>
-                    会员昵称:{$vo.name|default='--'}<br>
-                    会员手机:{$vo.user_phone|default='--'}<br>
-                </div>
-            </td>
-            <td class='text-left nowrap'>
-                订单单号:<span class="color-blue">{$vo.order_no|default=''}</span>
-                {eq name='vo.status' value='0'}<span class="layui-badge layui-bg-orange margin-left-5">待付款</span>{/eq}
-                {eq name='vo.status' value='1'}<span class="layui-badge layui-bg-black margin-left-5">待发货</span>{/eq}
-                {eq name='vo.status' value='2'}<span class="layui-badge layui-bg-green margin-left-5">已发货</span>{/eq}
-                {eq name='vo.status' value='3'}<span class="layui-badge layui-bg-blue margin-left-5">已收货待评价</span>{/eq}
-                {eq name='vo.status' value='4'}<span class="layui-badge layui-bg-blue margin-left-5">已完成</span>{/eq}
-                {eq name='vo.status' value='9'}<span class="layui-badge layui-bg-blue margin-left-5">已取消</span>{/eq}
-                <br>
-                退款状态:<span class="color-blue"></span>
-                {eq name='vo.refund_state' value='0'}
-                <span class="layui-badge layui-bg-blue margin-left-5">未申请</span>
-                {/eq}
-                {eq name='vo.refund_state' value='1'}
-                     <span class="layui-badge layui-bg-blue margin-left-5">待审核</span>
-                {/eq}
-                {eq name='vo.refund_state' value='2'}
-                    <span class="layui-badge layui-bg-blue margin-left-5">审核通过</span>
-                {/eq}
-                {eq name='vo.refund_state' value='3'}
-                    <span class="layui-badge layui-bg-blue margin-left-5">拒绝退款</span>
-                {/eq}
-                <br>
-                订单金额:<strong class="color-blue">{$vo.price_total}</strong> 元<br>
-                支付方式:<span class="layui-bg-green layui-badge">{if $vo.pay_state}{$all_pay_type[$vo.pay_type]}{else}待支付{/if}</span><br>
-                下单时间:{$vo.create_at|default='--'}<br>
-                支付时间:{$vo.pay_at|default='--'}<br>
-            </td>
-            <td class="text-left nowrap">
-                收货信息:{$vo.user_name|default='--'}<span class="margin-left-5 color-blue">{$vo.phone}</span><br>
-                收货地区:{$vo.pro_name|default='--'}{$vo.city_name}{$vo.county_name}<br>
-                收货地址:{$vo.street_name}{$vo.add_detail}{$vo.add_detail}<br>
-                发货状态:
-                {eq name='vo.express_state' value='0'}
-                    <span class="layui-badge layui-bg-black">未发货</span>
-                {else}
-                    <span class="layui-badge layui-bg-blue">{$vo.express_company_title|default='--'}</span>
-                    <span class="layui-badge layui-bg-gray margin-left-5">{$vo.express_send_no|default='--'}</span>
-                {/eq}
-
-                {if $vo.status eq 1}
-                 <a class=" margin-left-5" data-title="填写订单信息" data-modal="{:url('express')}?id={$vo.id}">填写发货信息</a>
-                {elseif $vo.status eq 2}
-                    <a class=" margin-left-5" data-title="修改发货信息" data-modal="{:url('express')}?id={$vo.id}">修改发货信息</a>
-                {/if}
-                <br>
-                发货时间:{$vo.express_send_at|format_datetime}<br>
-            </td>
-            <td class="text-left nowrap">
-                {foreach $vo.item_list as $g}
-                <div class="nowrap">
-                    <p class="text-left">{$g.name|default=''}({$g.goods_spec})</p>
-                    <p class="text-left color-desc">售价 {$g.sell_price} 元 &nbsp; 数量 {$g.num|default=0}</p>
-                </div>
-                {/foreach}
-            </td>
-            <td class='text-left nowrap'>
-                <a data-title="查看详情" class="layui-btn layui-btn-sm" data-modal='{:url("detail")}?id={$vo.id}'>查看详情</a>
-            </td>
-        </tr>
-        {/foreach}
-        </tbody>
-    </table>
-    {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
-</div>
-{/block}

+ 0 - 72
application/order/view/store_order/index_search.html

@@ -1,72 +0,0 @@
-<fieldset>
-    <legend>条件搜索</legend>
-    <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get" autocomplete="off">
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">订单号</label>
-            <div class="layui-input-inline">
-                <input name="order_no" value="{$Think.get.order_no|default=''}" placeholder="请输入订单号" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">手机号</label>
-            <div class="layui-input-inline">
-                <input name="tel" value="{$Think.get.tel|default=''}" placeholder="请输入手机号" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">用户名称</label>
-            <div class="layui-input-inline">
-                <input name="user_name" value="{$Think.get.user_name|default=''}" placeholder="请输入用户名称" class="layui-input">
-            </div>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">订单状态</label>
-            <div class="layui-input-inline">
-                <select class="layui-select" name="order_status">
-                    <option  value="-1">全部</option>
-                    {foreach $order_status as $k=>$v}
-                    {if $v}
-                    {if $Think.get.order_status > -1 && $Think.get.order_status eq $k}
-                    <option selected value="{$k}">{$v}</option>
-                    {else}
-                    <option  value="{$k}">{$v}</option>
-                    {/if}
-                    {/if}
-                    {/foreach}
-                </select>
-            </div>
-        </div>
-
-
-
-
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">支付状态</label>
-            <div class="layui-input-inline">
-                <select class="layui-select" name="pay_state">
-                    <option  value="-1">全部</option>
-                    {foreach $pay_state as $k=>$v}
-                        {if $v}
-                            {if $Think.get.pay_state > -1 && $Think.get.pay_state eq $k}
-                            <option selected value="{$k}">{$v}</option>
-                            {else}
-                            <option  value="{$k}">{$v}</option>
-                            {/if}
-                        {/if}
-                    {/foreach}
-                </select>
-            </div>
-        </div>
-
-
-
-
-
-        <div class="layui-form-item layui-inline">
-            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
-        </div>
-    </form>
-    <script>form.render()</script>
-</fieldset>

+ 0 - 90
application/order/view/wash_order/detail.html

@@ -1,90 +0,0 @@
-<div style="padding: 20px; background-color: #F2F2F2;">
-    <div class="layui-row layui-col-space15">
-        <div class="layui-col-md12">
-            <div class="layui-card">
-                <div class="layui-card-header">订单信息</div>
-                <div class="layui-card-body">
-                    <div class="layui-col-md6">订单号:{$data['order_no']}</div>
-                    <div class="layui-col-md6">订单状态:
-                        {eq name='vo.status' value='0'}<span class="layui-badge layui-bg-orange margin-left-5">待付款</span>{/eq}
-                        {eq name='vo.status' value='1'}<span class="layui-badge layui-bg-black margin-left-5">待发货</span>{/eq}
-                        {eq name='vo.status' value='2'}<span class="layui-badge layui-bg-green margin-left-5">已发货</span>{/eq}
-                        {eq name='vo.status' value='3'}<span class="layui-badge layui-bg-blue margin-left-5">已收货待评价</span>{/eq}
-                        {eq name='vo.status' value='4'}<span class="layui-badge layui-bg-blue margin-left-5">已完成</span>{/eq}
-                        {eq name='vo.status' value='9'}<span class="layui-badge layui-bg-blue margin-left-5">已取消</span>{/eq}
-                    </div><hr />
-                    <div class="layui-col-md6">商品总价:{$data['price_goods']|default='0'}</div><hr />
-                    <div class="layui-col-md6">需支付金额:{$data['price_total']|default='0'}</div>
-                    <div class="layui-col-md6">实际支付金额:{$data['price_total']|default='0'}</div><hr />
-                    <div class="layui-col-md6">优惠券抵扣金额:{$data['coupon_cash']|default='0'}</div>
-                    <hr />
-                    <div class="layui-col-md6">支付方式:
-                        {eq name='vo.pay_type' value='0'}<span class="layui-badge layui-bg-green margin-left-5">未支付</span>{/eq}
-                        {eq name='vo.pay_type' value='1'}<span class="layui-badge layui-bg-green margin-left-5">微信</span>{/eq}
-                        {eq name='vo.pay_type' value='2'}<span class="layui-badge layui-bg-blue margin-left-5">余额</span>{/eq}
-                        {eq name='vo.pay_type' value='3'}<span class="layui-badge layui-bg-orange margin-left-5">支付宝</span>{/eq}
-                    </div>
-                    <hr />
-                    <div class="layui-col-md6">下单时间:{$data.create_at|default='--'}</div>
-                    <div class="layui-col-md6">
-                        支付时间:{$vo.pay_at|default='--'}
-                    </div>
-                    <hr />
-                </div>
-            </div>
-        </div>
-        <div class="layui-col-md12">
-            <div class="layui-card">
-                <div class="layui-card-header">收货信息</div>
-                <div class="layui-card-body">
-                    <div class="layui-col-md6">收货人姓名:{$data.user_name|default='--'}</div>
-                    <div class="layui-col-md6">收货人手机:{$data.phone|default='--'}</div><hr />
-                    <div class="layui-col-md6">地址:{$vo.pro_name|default='--'}{$vo.city_name}{$vo.county_name}{$vo.street_name}{$vo.add_detail}{$vo.add_detail}</div><hr />
-                    <hr />
-                </div>
-            </div>
-        </div>
-        <div class="layui-col-md12">
-            <div class="layui-card">
-                <div class="layui-card-header">商品信息</div>
-                <div class="layui-card-body">
-                    <table class="layui-table margin-top-10" lay-skin="line">
-                        {notempty name='order_item'}
-                        <thead>
-                        <tr>
-                            <th class='text-left nowrap'>商品</th>
-                            <th class='text-left nowrap'>分类</th>
-                            <th class='text-left nowrap'>价格</th>
-                            <th class='text-left nowrap'>数量</th>
-                        </tr>
-                        </thead>
-                        {/notempty}
-                        <tbody>
-                        {foreach $order_item as $key=>$iv}
-                        <tr>
-                            <td class='text-left nowrap'>
-                                <div class="inline-block" style="max-width: 210px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
-                                    {foreach $iv.images_arr as $mv}
-                                        <img data-tips-image style="width:40px;height:40px;vertical-align:top" src="{$mv}" class="margin-right-5">
-                                    {/foreach}
-                                </div>
-                            </td>
-                            <td class='text-left'>
-                                {$iv.title|default='--'}
-                            </td>
-                            <td class='text-left'>
-                                {$iv.sell_price|default='0'}
-                            </td>
-                            <td class='text-left'>
-                                {$iv.num|default='0'}
-                            </td>
-                        </tr>
-                        {/foreach}
-                        </tbody>
-                    </table>
-                    {empty name='order_item'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
-                </div>
-            </div>
-        </div>
-    </div>
-</div>

+ 0 - 101
application/order/view/wash_order/index.html

@@ -1,101 +0,0 @@
-{extend name='admin@main'}
-{block name="content"}
-<div class="think-box-shadow">
-    {include file='wash_order/index_search'}
-    <table class="layui-table margin-top-10" lay-skin="line">
-        {notempty name='list'}
-        <thead>
-        <tr>
-            <th class='text-left nowrap'>用户信息</th>
-            <th class='text-left nowrap'>订单详情</th>
-            <th class='text-left nowrap'>物流信息</th>
-            <th class='text-left nowrap'>商品详情</th>
-            <th class="text-left nowrap">操作</th>
-        </tr>
-        </thead>
-        {/notempty}
-        <tbody>
-        {foreach $list as $key=>$vo}
-        <tr>
-            <td class="text-left nowrap relative">
-                <img data-tips-image style="width:60px;height:60px" src="{$vo.headimg|default=''}" class="margin-right-5 text-top">
-                <div class="inline-block">
-                    会员ID:{$vo.user_id|default='--'}<br>
-                    会员昵称:{$vo.name|default='--'}<br>
-                    会员手机:{$vo.user_phone|default='--'}<br>
-                </div>
-            </td>
-            <td class='text-left nowrap'>
-                订单单号:<span class="color-blue">{$vo.order_no|default=''}</span>
-                {eq name='vo.status' value='0'}<span class="layui-badge layui-bg-orange margin-left-5">待付款</span>{/eq}
-                {eq name='vo.status' value='1'}<span class="layui-badge layui-bg-black margin-left-5">待发货</span>{/eq}
-                {eq name='vo.status' value='2'}<span class="layui-badge layui-bg-green margin-left-5">已发货</span>{/eq}
-                {eq name='vo.status' value='3'}<span class="layui-badge layui-bg-blue margin-left-5">已收货待评价</span>{/eq}
-                {eq name='vo.status' value='4'}<span class="layui-badge layui-bg-blue margin-left-5">已完成</span>{/eq}
-                {eq name='vo.status' value='9'}<span class="layui-badge layui-bg-blue margin-left-5">已取消</span>{/eq}
-                <br>
-                退款状态:<span class="color-blue"></span>
-                {eq name='vo.refund_state' value='0'}
-                <span class="layui-badge layui-bg-blue margin-left-5">未申请</span>
-                {/eq}
-                {eq name='vo.refund_state' value='1'}
-                     <span class="layui-badge layui-bg-blue margin-left-5">待审核</span>
-                {/eq}
-                {eq name='vo.refund_state' value='2'}
-                    <span class="layui-badge layui-bg-blue margin-left-5">审核通过</span>
-                {/eq}
-                {eq name='vo.refund_state' value='3'}
-                    <span class="layui-badge layui-bg-blue margin-left-5">拒绝退款</span>
-                {/eq}
-                <br>
-                订单金额:<strong class="color-blue">{$vo.price_total}</strong> 元<br>
-                支付方式:<span class="layui-bg-green layui-badge">{if $vo.pay_state}{$all_pay_type[$vo.pay_type]}{else}待支付{/if}</span><br>
-                下单时间:{$vo.create_at|default='--'}<br>
-                支付时间:{$vo.pay_at|default='--'}<br>
-            </td>
-            <td class="text-left nowrap">
-                收货信息:{$vo.user_name|default='--'}<span class="margin-left-5 color-blue">{$vo.phone}</span><br>
-                收货地区:{$vo.pro_name|default='--'}{$vo.city_name}{$vo.county_name}<br>
-                收货地址:{$vo.street_name}{$vo.add_detail}{$vo.add_detail}<br>
-            </td>
-            <td class="text-left nowrap">
-                {foreach $vo.item_list as $g}
-                <div class="nowrap">
-                    <p class="text-left">{$g.title|default=''}</p>
-                    <p class="text-left color-desc">价格 {$g.sell_price} 元 &nbsp; 数量 {$g.num|default=0}</p>
-                </div>
-                {/foreach}
-            </td>
-            <td class='text-left nowrap'>
-                <a data-title="查看详情" class="layui-btn layui-btn-sm" data-modal='{:url("detail")}?id={$vo.id}'>查看详情</a>
-
-                <span class="layui-btn layui-btn-sm layui-btn-warm" onclick="btn_confirm('订单完成','complete','{$vo.id}');">订单完成</span>
-            </td>
-        </tr>
-        {/foreach}
-        </tbody>
-    </table>
-    {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
-</div>
-<script>
-    function btn_confirm(msg,fun,id) {
-        layer.confirm('请确定是否'+msg, {btn: ['确定', '取消'], title: "提示"}, function () {
-            var url = "/order/wash_order/"+fun;
-            layer.closeAll();
-            $.ajax({
-                type: "post",
-                url: url,
-                data: {id:id},
-                dataType: "json",
-                async: false,
-                success: function (data) {
-                    layer.msg(data.info);
-                    setTimeout(function () {
-                        window.location.reload();
-                    },1000)
-                }
-            });
-        });
-    }
-</script>
-{/block}

+ 0 - 72
application/order/view/wash_order/index_search.html

@@ -1,72 +0,0 @@
-<fieldset>
-    <legend>条件搜索</legend>
-    <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get" autocomplete="off">
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">订单号</label>
-            <div class="layui-input-inline">
-                <input name="order_no" value="{$Think.get.order_no|default=''}" placeholder="请输入订单号" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">手机号</label>
-            <div class="layui-input-inline">
-                <input name="tel" value="{$Think.get.tel|default=''}" placeholder="请输入手机号" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">用户名称</label>
-            <div class="layui-input-inline">
-                <input name="user_name" value="{$Think.get.user_name|default=''}" placeholder="请输入用户名称" class="layui-input">
-            </div>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">订单状态</label>
-            <div class="layui-input-inline">
-                <select class="layui-select" name="order_status">
-                    <option  value="-1">全部</option>
-                    {foreach $order_status as $k=>$v}
-                    {if $v}
-                    {if $Think.get.order_status > -1 && $Think.get.order_status eq $k}
-                    <option selected value="{$k}">{$v}</option>
-                    {else}
-                    <option  value="{$k}">{$v}</option>
-                    {/if}
-                    {/if}
-                    {/foreach}
-                </select>
-            </div>
-        </div>
-
-
-
-
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">支付状态</label>
-            <div class="layui-input-inline">
-                <select class="layui-select" name="pay_state">
-                    <option  value="-1">全部</option>
-                    {foreach $pay_state as $k=>$v}
-                        {if $v}
-                            {if $Think.get.pay_state >-1  && $Think.get.pay_state eq $k}
-                            <option selected value="{$k}">{$v}</option>
-                            {else}
-                            <option  value="{$k}">{$v}</option>
-                            {/if}
-                        {/if}
-                    {/foreach}
-                </select>
-            </div>
-        </div>
-
-
-
-
-
-        <div class="layui-form-item layui-inline">
-            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
-        </div>
-    </form>
-    <script>form.render()</script>
-</fieldset>

+ 0 - 87
application/user/controller/Bank.php

@@ -1,87 +0,0 @@
-<?php
-namespace app\user\controller;
-use library\Controller;
-use think\Db;
-
-/**
- * 银行账号管理
- * Class Bank
- * @package app\store\controller
- */
-class Bank extends Controller
-{
-
-    /**
-     * 绑定数据表
-     * @var string
-     */
-    protected $table = 'UserBank';
-
-    /**
-     * 账号管理
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function index()
-    {
-        $this->title = '等级管理';
-        $where = [] ;
-        $where[] = ['b.is_deleted','=',0];
-        $query = $this->_query($this->table)
-            ->field('b.*,m.headimg')
-            ->alias('b')
-            ->join('store_member m','m.id = b.user_id','LEFT')
-            ->order('b.id asc')->page();
-    }
-
-    /**
-     * 数据列表处理
-     * @auth true
-     * @menu true
-     * @param array $data
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    protected function _index_page_filter(&$data)
-    {
-
-    }
-
-
-
-    /**
-     * 编辑等级
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function edit()
-    {
-        $this->title = '编辑等级';
-        $this->_form($this->table, 'form');
-    }
-
-
-
-    /**
-     * 表单数据处理
-     * @auth true
-     * @menu true
-     * @param array $data
-     */
-    protected function _form_filter(&$data)
-    {
-
-    }
-
-}

+ 0 - 64
application/user/controller/Delivery.php

@@ -1,64 +0,0 @@
-<?php
-
-
-namespace app\user\controller;
-
-use library\Controller;
-use think\Db;
-
-/**
- * 收货地址
- * Class Delivery
- * @package app\user\controller
- */
-class Delivery extends Controller
-{
-    protected  $table ="DeliveryAddress";
-
-
-    /**
-     * 列表
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function index()
-    {
-        $this->title = '收货地址列表';
-        $query = $this->_query($this->table);
-        $where= [];
-        $were[] = ['i.is_deleted','=',0];
-        if($this->request->request('user_name'))    $where[]= ['m.name','like','%'.$this->request->request('user_name').'%'];
-        if($this->request->request('name'))         $where[]= ['i.name','like','%'.$this->request->request('name').'%'];
-        if($this->request->request('sel_pro'))      $where[]= ['i.pro_name','like','%'.$this->request->request('sel_pro').'%'];
-        if($this->request->request('sel_city'))     $where[]= ['i.city_name','like','%'.$this->request->request('sel_city').'%'];
-        if($this->request->request('name'))         $where[]= ['i.name','like','%'.$this->request->request('name').'%'];
-        if($this->request->request('add_name'))     $where[]= ['i.pro_name|i.city_name|i.county_name|i.street_name|i.detail','like','%'.$this->request->request('add_name').'%'];
-        $query->alias('i')->field('i.* ,m.headimg,m.name as user_name,m.phone')
-            ->join('store_member m',' m.id = i.user_id ','LEFT');
-        if(!empty($where)) $query->where($where);
-        $query ->order('i.id desc')->page();
-    }
-
-    /**
-     * 删除
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function del()
-    {
-        $this->_save($this->table, ['is_deleted' => 1]);
-    }
-
-
-
-}

+ 0 - 61
application/user/controller/Integral.php

@@ -1,61 +0,0 @@
-<?php
-
-
-namespace app\user\controller;
-
-use library\Controller;
-use think\Db;
-
-/**
- * 积分记录
- * Class Integral
- * @package app\user\controller
- */
-class Integral extends Controller
-{
-    protected  $table ="UserIntegralLog";
-
-
-    /**
-     * 变更列表
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function index()
-    {
-        $this->title = '积分变更日志';
-        $query = $this->_query($this->table);
-        $where= [];
-        if($this->request->request('user_name'))      $where[]= ['m.name','like','%'.$this->request->request('user_name').'%'];
-        if($this->request->request('sign_time'))      $where[] = ['i.create_at','between time',[$this->request->request('sign_time').' 00:00:00',$this->request->request('sign_time').' 23:59:59']];
-        $query->alias('i')
-            ->field('i.* ,m.headimg,m.name,m.phone')
-            ->join('store_member m',' m.id = i.user_id ','LEFT');
-        if(!empty($where)) $query->where($where);
-        $query ->order('i.id desc')->page();
-    }
-
-    /**
-     * 删除
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function del()
-    {
-        $this->_save($this->table, ['is_deleted' => 1]);
-    }
-
-
-
-
-}

+ 0 - 123
application/user/controller/Level.php

@@ -1,123 +0,0 @@
-<?php
-namespace app\user\controller;
-use library\Controller;
-use think\Db;
-
-/**
- * 会员等级管理
- * Class Level
- * @package app\store\controller
- */
-class Level extends Controller
-{
-
-    /**
-     * 绑定数据表
-     * @var string
-     */
-    protected $table = 'UserLevel';
-
-    /**
-     * 等级管理
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function index()
-    {
-        $this->title = '等级管理';
-        $query = $this->_query($this->table)->order('id asc')->page();
-    }
-
-    /**
-     * 数据列表处理
-     * @auth true
-     * @menu true
-     * @param array $data
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    protected function _index_page_filter(&$data)
-    {
-
-    }
-
-
-
-    /**
-     * 添加等级
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function add()
-    {
-        $this->title = '添加等级';
-        $this->_form($this->table, 'form');
-    }
-
-
-    /**
-     * 编辑等级
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function edit()
-    {
-        $this->title = '编辑等级';
-        $this->_form($this->table, 'form');
-    }
-
-    /**
-     * 删除
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function del()
-    {
-        $this->_save($this->table, ['is_deleted' => 1]);
-    }
-
-
-    /**
-     * 表单数据处理
-     * @auth true
-     * @menu true
-     * @param array $data
-     */
-    protected function _form_filter(&$data)
-    {
-        if($this->request->isGet()) {
-            $this->price = !empty($data['price']) ? json_decode($data['price'],true):[];
-        }
-        if($this->request->isPost())
-        {
-            // 会员价格设置
-            $title_arr= input('post.title');
-            $time_arr= input('post.time');
-            $price_arr= input('post.price');
-            $price_param = [];
-            foreach ($title_arr as $k=>$t){
-                $price_param[] = ['title'=>$t,'time'=>intval($time_arr[$k]),'price'=>bcadd($price_arr[$k],0,2),'level_key'=>$k];
-            }
-            $data['price'] = json_encode($price_param);
-        }
-    }
-
-}

+ 0 - 115
application/user/controller/Message.php

@@ -1,115 +0,0 @@
-<?php
-namespace app\user\controller;
-use app\common\model\LabelMessage;
-use library\Controller;
-use think\Db;
-
-/**
- * 消息推送管理
- * Class Message
- * @package app\user\controller
- */
-class Message extends Controller
-{
-
-    /**
-     * 绑定数据表
-     * @var string
-     */
-    protected $table = 'LabelMessage';
-
-    /**
-     * 列表
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function index()
-    {
-        $this->title = '列表';
-        $query = $this->_query($this->table)->where('type',2)->where('is_deleted',0)->order('id desc')->page();
-    }
-
-    /**
-     * 数据列表处理
-     * @auth true
-     * @menu true
-     * @param array $data
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    protected function _index_page_filter(&$data)
-    {
-
-    }
-
-
-
-    /**
-     * 添加分组
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function add()
-    {
-        $this->title = '添加';
-        $this->_form($this->table, 'form');
-    }
-
-
-    /**
-     * 编辑分组
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function edit()
-    {
-        $this->title = '编辑';
-        $this->_form($this->table, 'form');
-    }
-
-    /**
-     * 删除
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function del()
-    {
-        $this->_save($this->table, ['is_deleted' => 1]);
-    }
-
-
-    public function send()
-    {
-        $this->_form($this->table, 'send');
-    }
-
-    /**
-     * 表单数据处理
-     * @auth true
-     * @menu true
-     * @param array $data
-     */
-    protected function _form_filter(&$data)
-    {
-        $data['type'] = 2;
-    }
-
-}

+ 0 - 61
application/user/controller/Money.php

@@ -1,61 +0,0 @@
-<?php
-
-
-namespace app\user\controller;
-
-use library\Controller;
-use think\Db;
-
-/**
- * 佣金记录
- * Class Money
- * @package app\user\controller
- */
-class Money extends Controller
-{
-    protected  $table ="UserMoneyInfo";
-
-
-    /**
-     * 变更列表
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function index()
-    {
-        $this->title = '佣金变更列表';
-        $query = $this->_query($this->table);
-        $where= [];
-        if($this->request->request('user_name'))      $where[]= ['m.name','like','%'.$this->request->request('user_name').'%'];
-        if($this->request->request('sel_time'))      $where[] = ['i.create_at','between time',[$this->request->request('sel_time').' 00:00:00',$this->request->request('sel_time').' 23:59:59']];
-        $query->alias('i')
-            ->field('i.* ,m.headimg,m.name,m.phone')
-            ->join('store_member m',' m.id = i.user_id ','LEFT');
-        if(!empty($where)) $query->where($where);
-        $query ->order('i.id desc')->page();
-    }
-
-    /**
-     * 删除
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function del()
-    {
-        $this->_save($this->table, ['is_deleted' => 1]);
-    }
-
-
-
-
-}

+ 0 - 65
application/user/view/delivery/index.html

@@ -1,65 +0,0 @@
-{extend name='admin@main'}
-{block name="content"}
-<div class="think-box-shadow">
-    {include file='delivery/index_search'}
-    <table class="layui-table margin-top-10" lay-skin="line">
-        {notempty name='list'}
-        <thead>
-        <tr>
-            <th class='text-left nowrap' >用户信息</th>
-            <th class='text-left nowrap' >收货人</th>
-            <th class='text-left nowrap' >电话</th>
-            <th class='text-left nowrap' >省市区</th>
-            <th class='text-left nowrap' >详细地址</th>
-            <th class="text-left nowrap">时间</th>
-            <th class="text-left nowrap">操作</th>
-        </tr>
-        </thead>
-        {/notempty}
-        <tbody>
-        {foreach $list as $key=>$vo}
-        <tr>
-            <td class='text-left'>
-                <img data-tips-image style="width:50px;height:50px" src="{$vo.headimg|default=''}" class="margin-right-5 text-top">
-                <div class="inline-block">
-                    记录ID:{$vo.id}<br>
-                    用户ID:{$vo.user_id|default='--'}<br>
-                    用户昵称:{$vo.user_name|default='--'}
-                </div>
-            </td>
-            <td class='text-left nowrap'>{$vo.name}</td>
-            <td class='text-left nowrap'>{$vo.phone}</td>
-            <td class='text-left nowrap'>{$vo.pro_name}--{$vo.city_name}--{$vo.county_name}</td>
-            <td class='text-left nowrap'>{$vo.street_name}-{$vo.detail}</td>
-            <td class='text-left nowrap'>{$vo.create_at}</td>
-            <td class='text-left nowrap'>
-                <a class="layui-btn layui-btn-sm layui-btn-danger" onclick="btn_confirm('删除','del','{$vo.id}');">删 除</a>
-            </td>
-        </tr>
-        {/foreach}
-        </tbody>
-    </table>
-    {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
-</div>
-<script>
-    function btn_confirm(msg,fun,id) {
-        layer.confirm('请确定是否'+msg, {btn: ['确定', '取消'], title: "提示"}, function () {
-            var url = "/user/delivery/"+fun;
-            layer.closeAll();
-            $.ajax({
-                type: "post",
-                url: url,
-                data: {id:id},
-                dataType: "json",
-                async: false,
-                success: function (data) {
-                    layer.msg(data.info);
-                    setTimeout(function () {
-                        window.location.reload();
-                    },1000)
-                }
-            });
-        });
-    }
-</script>
-{/block}

+ 0 - 48
application/user/view/delivery/index_search.html

@@ -1,48 +0,0 @@
-<fieldset>
-    <legend>条件搜索</legend>
-    <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get" autocomplete="off">
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">会员名称</label>
-            <div class="layui-input-inline">
-                <input name="user_name" value="{$Think.get.user_name|default=''}" placeholder="请输入会员名称" class="layui-input">
-            </div>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">联系人</label>
-            <div class="layui-input-inline">
-                <input name="name" value="{$Think.get.name|default=''}" placeholder="请输入联系人名称" class="layui-input">
-            </div>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">省</label>
-            <div class="layui-input-inline">
-                <input name="sel_pro" value="{$Think.get.sel_pro|default=''}" placeholder="请输入省名称" class="layui-input">
-            </div>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">市</label>
-            <div class="layui-input-inline">
-                <input name="sel_city" value="{$Think.get.sel_city|default=''}" placeholder="请输入市名称" class="layui-input">
-            </div>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">地址</label>
-            <div class="layui-input-inline">
-                <input name="add_name" value="{$Think.get.add_name|default=''}" placeholder="省、市、区、街道或地址名" class="layui-input">
-            </div>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
-        </div>
-    </form>
-    <script>
-        form.render();
-        laydate.render({elem: '[name="sel_time"]'})
-    </script>
-</fieldset>

+ 0 - 34
application/user/view/integral/index.html

@@ -1,34 +0,0 @@
-{extend name='admin@main'}
-{block name="content"}
-<div class="think-box-shadow">
-    {include file='integral/index_search'}
-    <table class="layui-table margin-top-10" lay-skin="line">
-        {notempty name='list'}
-        <thead>
-        <tr>
-            <th class='text-left nowrap' style="width: 20%">头像</th>
-            <th class='text-left nowrap' style="width: 30%">名称</th>
-            <th class='text-left nowrap' style="width: 30%">变更数</th>
-            <th class='text-left nowrap' style="width: 30%">描述</th>
-            <th class="text-left nowrap">时间</th>
-        </tr>
-        </thead>
-        {/notempty}
-        <tbody>
-        {foreach $list as $key=>$vo}
-        <tr>
-            <td class='text-left nowrap'>{notempty name='vo.headimg'}<img data-tips-image style="width:25px;height:25px;vertical-align:top" src="{$vo.headimg|default=''}" class="margin-right-5">{/notempty}</td>
-            <td class='text-left nowrap'>{$vo.name|default='--'}</td>
-            <td class='text-left nowrap'>{$vo.integral|default='--'}</td>
-            <td class='text-left nowrap'>{$vo.desc|default='--'}</td>
-            <td class='text-left nowrap'>{$vo.create_at}</td>
-        </tr>
-        {/foreach}
-        </tbody>
-    </table>
-    {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
-</div>
-<script>
-
-</script>
-{/block}

+ 0 - 26
application/user/view/integral/index_search.html

@@ -1,26 +0,0 @@
-<fieldset>
-    <legend>条件搜索</legend>
-    <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get" autocomplete="off">
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">会员名称</label>
-            <div class="layui-input-inline">
-                <input name="user_name" value="{$Think.get.user_name|default=''}" placeholder="请输入会员名称" class="layui-input">
-            </div>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">时间</label>
-            <div class="layui-input-inline">
-                <input name="sign_time" value="{$Think.get.sign_time|default=''}" placeholder="请选择时间" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item layui-inline">
-            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
-        </div>
-    </form>
-    <script>
-        form.render();
-        laydate.render({elem: '[name="sign_time"]'})
-    </script>
-</fieldset>

+ 0 - 97
application/user/view/level/form.html

@@ -1,97 +0,0 @@
-<div class="think-box-shadow">
-    <form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
-        <div class="layui-card-body">
-            <div class="layui-form-item">
-                <label class="layui-form-label label-required">等级名称</label>
-                <div class="layui-input-block">
-                    <input name="name" maxlength="20"  value='{$vo.name|default=""}' placeholder="请输入等级名称" class="layui-input">
-                </div>
-            </div>
-
-
-            <div class="layui-form-item">
-                <label class="layui-form-label label-required">等级描述</label>
-                <div class="layui-input-block">
-                    <input name="desc" maxlength="20"  value='{$vo.desc|default=""}' placeholder="请输入等级描述" class="layui-input">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label label-required">LOGO</label>
-                <div class="layui-input-block">
-                    <input name="logo" type="hidden" value="{$vo.logo|default=''}">
-                </div>
-            </div>
-
-
-            <div class="layui-form-item">
-                <label class="layui-form-label">价格设置</label>
-                <div class="layui-input-block">
-                    <table class="layui-table param">
-                        <thead>
-                        <tr>
-                            <th class="text-left" width="40%">标题</th>
-                            <th class="text-center" width="20%">时间(月)</th>
-                            <th class="text-center" width="20%">价格(元)</th>
-                            <th class="text-center">
-                                <a class="layui-btn layui-btn-sm layui-btn-normal"  onclick="add_param()">添 加</a>
-                            </th>
-                        </tr>
-                        </thead>
-                        <!--{foreach $price as $param}-->
-                        <tr class="param_index">
-                            <td class="padding-0" >
-                                <input class="layui-input  border-0" name="title[]" value="{$param.title|default=''}">
-                            </td>
-                            <td class="padding-0">
-                                <input class="layui-input  border-0"  type="number" step="1" name="time[]" value="{$param.time|default=''}">
-                            </td>
-                            <td class="padding-0">
-                                <input class="layui-input  border-0"   type="number" step="1" name="price[]" value="{$param.price|default=''}">
-                            </td>
-                            <td class="padding-0 text-center">
-                                <a class="layui-btn layui-btn-sm layui-btn-danger del">删 除</a>
-                            </td>
-                        </tr>
-                        <!--{/foreach}-->
-                    </table>
-                </div>
-            </div>
-
-            {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
-            <div class="layui-form-item text-center">
-                <button class="layui-btn" type='submit'>保 存</button>
-                <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定取消编辑吗?" data-close>取消编辑</button>
-            </div>
-        </div>
-    </form>
-    <script>
-        window.form.render();
-        $('[name="logo"]').uploadOneImage();
-        var html = '<tr class="param_index">\n' +
-            '                        <td class="padding-0" >\n' +
-            '                            <input class="layui-input  border-0" name="title[]" value="">\n' +
-            '                        </td>\n' +
-            '                        <td class="padding-0">\n' +
-            '                            <input class="layui-input  border-0" name="time[]" value="">\n' +
-            '                        </td>\n' +
-            '                        <td class="padding-0">\n' +
-            '                            <input class="layui-input  border-0" name="price[]" value="">\n' +
-            '                        </td>\n' +
-            '                        <td class="padding-0 text-center">\n' +
-            '                            <a class="layui-btn layui-btn-sm layui-btn-danger del"  >删 除</a>\n' +
-            '                        </td>\n' +
-            '                    </tr>';
-        function add_param() {
-            $(".param").append(html);
-            layer.render();
-        }
-
-        // 删除设置
-        $(document).on('click',".del",function (){
-            var index= $(".del").index(this);
-            $(".param_index").eq(index).remove();
-            layer.render();
-        })
-    </script>
-</div>

+ 0 - 61
application/user/view/level/index.html

@@ -1,61 +0,0 @@
-{extend name='admin@main'}
-{block name="button"}
-<button data-modal='{:url("add")}' data-title="添加等级" class='layui-btn layui-btn-sm layui-btn-primary'>添加等级</button>
-{/block}
-{block name="content"}
-<div class="think-box-shadow">
-    <table class="layui-table margin-top-20" lay-skin="line">
-        <thead>
-        <tr>
-            <th class='list-table-check-td think-checkbox'><input data-auto-none data-check-target='.list-check-box' type='checkbox'></th>
-            <th class='text-left nowrap'>等级id</th>
-            <th class="text-left" >等级名称</th>
-            <th class="text-left" >等级描述</th>
-            <th class="text-left" style="width: 20%">操作</th>
-        </tr>
-        </thead>
-        <tbody>
-        {foreach $list as $key=>$vo}
-        <tr>
-            <td class='list-table-check-td think-checkbox'><input class="list-check-box" value='{$vo.id}' type='checkbox'></td>
-            <td class='text-left nowrap'>{$vo.id|default=''}</td>
-            <td class='text-left nowrap'>{$vo.name|default=''}</td>
-            <td class='text-left nowrap'>{$vo.desc|default=''}</td>
-            <td class='text-left' style="width: 20%">
-                <a data-title="编辑" class="layui-btn layui-btn-sm" data-modal='{:url("edit")}?id={$vo.id}'>编 辑</a>
-            </td>
-        </tr>
-        {/foreach}
-        </tbody>
-    </table>
-
-
-
-    {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
-</div>
-<script>
-    function btn_confirm(msg,fun,id) {
-        layer.confirm('请确定是否'+msg, {btn: ['确定', '取消'], title: "提示"}, function () {
-            var url = "/user/level/"+fun;
-            layer.closeAll();
-            $.ajax({
-                type: "post",
-                url: url,
-                data: {id:id},
-                dataType: "json",
-                async: false,
-                success: function (data) {
-                    layer.msg(data.info);
-                    setTimeout(function () {
-                        window.location.reload();
-                    },1000)
-                }
-            });
-        });
-    }
-
-</script>
-{/block}
-
-
-

+ 0 - 34
application/user/view/money/index.html

@@ -1,34 +0,0 @@
-{extend name='admin@main'}
-{block name="content"}
-<div class="think-box-shadow">
-    {include file='money/index_search'}
-    <table class="layui-table margin-top-10" lay-skin="line">
-        {notempty name='list'}
-        <thead>
-        <tr>
-            <th class='text-left nowrap' style="width: 20%">头像</th>
-            <th class='text-left nowrap' style="width: 30%">名称</th>
-            <th class='text-left nowrap' style="width: 20%">变更数</th>
-            <th class='text-left nowrap' style="width: 30%">描述</th>
-            <th class="text-left nowrap">时间</th>
-        </tr>
-        </thead>
-        {/notempty}
-        <tbody>
-        {foreach $list as $key=>$vo}
-        <tr>
-            <td class='text-left nowrap'>{notempty name='vo.headimg'}<img data-tips-image style="width:25px;height:25px;vertical-align:top" src="{$vo.headimg|default=''}" class="margin-right-5">{/notempty}</td>
-            <td class='text-left nowrap'>{$vo.name|default='--'}</td>
-            <td class='text-left nowrap'>{$vo.money|default='--'}</td>
-            <td class='text-left nowrap'>{$vo.desc|default='--'}</td>
-            <td class='text-left nowrap'>{$vo.create_at}</td>
-        </tr>
-        {/foreach}
-        </tbody>
-    </table>
-    {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
-</div>
-<script>
-
-</script>
-{/block}

+ 0 - 26
application/user/view/money/index_search.html

@@ -1,26 +0,0 @@
-<fieldset>
-    <legend>条件搜索</legend>
-    <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get" autocomplete="off">
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">会员名称</label>
-            <div class="layui-input-inline">
-                <input name="user_name" value="{$Think.get.user_name|default=''}" placeholder="请输入会员名称" class="layui-input">
-            </div>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">时间</label>
-            <div class="layui-input-inline">
-                <input name="sel_time" value="{$Think.get.sel_time|default=''}" placeholder="请选择时间" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item layui-inline">
-            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
-        </div>
-    </form>
-    <script>
-        form.render();
-        laydate.render({elem: '[name="sel_time"]'})
-    </script>
-</fieldset>

+ 0 - 32
application/user/view/sign_log/index.html

@@ -1,32 +0,0 @@
-{extend name='admin@main'}
-{block name="content"}
-<div class="think-box-shadow">
-    {include file='sign_log/index_search'}
-    <table class="layui-table margin-top-10" lay-skin="line">
-        {notempty name='list'}
-        <thead>
-        <tr>
-            <th class='text-left nowrap' style="width: 20%">头像</th>
-            <th class='text-left nowrap' style="width: 30%">名称</th>
-            <th class='text-left nowrap' style="width: 30%">描述</th>
-            <th class="text-left nowrap">时间</th>
-        </tr>
-        </thead>
-        {/notempty}
-        <tbody>
-        {foreach $list as $key=>$vo}
-        <tr>
-            <td class='list-table-check-td think-checkbox'>{notempty name='vo.headimg'}<img data-tips-image style="width:25px;height:25px;vertical-align:top" src="{$vo.headimg|default=''}" class="margin-right-5">{/notempty}</td>
-            <td class='text-left nowrap'>{$vo.name|default='--'}</td>
-            <td class='text-left nowrap'>{$vo.desc|default='--'}</td>
-            <td class='text-left nowrap'>{$vo.create_at}</td>
-        </tr>
-        {/foreach}
-        </tbody>
-    </table>
-    {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
-</div>
-<script>
-
-</script>
-{/block}

+ 0 - 26
application/user/view/sign_log/index_search.html

@@ -1,26 +0,0 @@
-<fieldset>
-    <legend>条件搜索</legend>
-    <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get" autocomplete="off">
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">会员名称</label>
-            <div class="layui-input-inline">
-                <input name="user_name" value="{$Think.get.user_name|default=''}" placeholder="请输入会员名称" class="layui-input">
-            </div>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">时间</label>
-            <div class="layui-input-inline">
-                <input name="sign_time" value="{$Think.get.sign_time|default=''}" placeholder="请选择时间" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item layui-inline">
-            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
-        </div>
-    </form>
-    <script>
-        form.render();
-        laydate.render({elem: '[name="sign_time"]'})
-    </script>
-</fieldset>

+ 0 - 30
application/user/view/tag/form.html

@@ -1,30 +0,0 @@
-<div class="think-box-shadow">
-    <form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
-        <div class="layui-card-body">
-            
-            <div class="layui-form-item">
-                <label class="layui-form-label label-required">标题</label>
-                <div class="layui-input-block">
-                    <input name="title" maxlength="20"  value='{$vo.title|default=""}' placeholder="请输入标题" class="layui-input">
-                </div>
-            </div>
-
-
-            <div class="layui-form-item">
-                <label class="layui-form-label label-required">描述</label>
-                <div class="layui-input-block">
-                    <input name="desc" maxlength="20"  value='{$vo.desc|default=""}' placeholder="请输入描述" class="layui-input">
-                </div>
-            </div>
-
-            {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
-            <div class="layui-form-item text-center">
-                <button class="layui-btn" type='submit'>保 存</button>
-                <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定取消编辑吗?" data-close>取消编辑</button>
-            </div>
-        </div>
-    </form>
-    <script>
-        window.form.render();
-    </script>
-</div>

+ 0 - 62
application/user/view/tag/index.html

@@ -1,62 +0,0 @@
-{extend name='admin@main'}
-{block name="button"}
-<button data-modal='{:url("add")}' data-title="添加" class='layui-btn layui-btn-sm layui-btn-primary'>添加</button>
-{/block}
-{block name="content"}
-<div class="think-box-shadow">
-    <table class="layui-table margin-top-20" lay-skin="line">
-        <thead>
-        <tr>
-            <th class='list-table-check-td think-checkbox'><input data-auto-none data-check-target='.list-check-box' type='checkbox'></th>
-            <th class='text-left nowrap'>ID</th>
-            <th class='text-left nowrap'>标题</th>
-            <th class="text-left" >描述</th>
-            <th class="text-left" style="width: 20%">操作</th>
-        </tr>
-        </thead>
-        <tbody>
-        {foreach $list as $key=>$vo}
-        <tr>
-            <td class='list-table-check-td think-checkbox'><input class="list-check-box" value='{$vo.id}' type='checkbox'></td>
-            <td class='text-left nowrap'>{$vo.id|default=''}</td>
-            <td class='text-left nowrap'>{$vo.title|default=''}</td>
-            <td class='text-left nowrap'>{$vo.desc|default=''}</td>
-            <td class='text-left' style="width: 20%">
-                <a data-title="编辑" class="layui-btn layui-btn-sm" data-modal='{:url("edit")}?id={$vo.id}'>编 辑</a>
-                <a data-title="推送" class="layui-btn layui-btn-sm" data-modal='{:url("send")}?id={$vo.id}'>推 送</a>
-            </td>
-        </tr>
-        {/foreach}
-        </tbody>
-    </table>
-
-
-
-    {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
-</div>
-<script>
-    function btn_confirm(msg,fun,id) {
-        layer.confirm('请确定是否'+msg, {btn: ['确定', '取消'], title: "提示"}, function () {
-            var url = "/user/tag/"+fun;
-            layer.closeAll();
-            $.ajax({
-                type: "post",
-                url: url,
-                data: {id:id},
-                dataType: "json",
-                async: false,
-                success: function (data) {
-                    layer.msg(data.info);
-                    setTimeout(function () {
-                        window.location.reload();
-                    },1000)
-                }
-            });
-        });
-    }
-
-</script>
-{/block}
-
-
-

+ 0 - 20
application/user/view/tag/send.html

@@ -1,20 +0,0 @@
-<form onsubmit="return false;" action="{:request()->url()}" data-auto="true" method="post" class='layui-form layui-card' autocomplete="off">
-
-    <div class="layui-card-body">
-        <div class="layui-row margin-bottom-15">
-            <label class="layui-col-xs2 think-form-label">发送内容:</label>
-            <label class="layui-col-xs10">
-                <textarea name="content" rows="10" cols="100"></textarea>
-            </label>
-        </div>
-    </div>
-    <div class="hr-line-dashed"></div>
-    <div class="layui-form-item text-center">
-        {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='label_id'>{/notempty}
-        <button class="layui-btn" type='submit'>提交</button>
-        <button class="layui-btn layui-btn-danger" type='button' data-close>取消</button>
-    </div>
-</form>
-<script>
-    window.form.render();
-</script>