From 5a197c2e4621f62ba8fb107099f186c1ff6aa8a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=97=E4=B8=80=E5=B3=B0?= <1feng.0595@gmail.com>
Date: Thu, 14 Dec 2017 23:22:20 +0800
Subject: [PATCH] userwithdraw

---
 .../Controllers/Admin/FeedbackController.php  |  82 +++++++++++++
 app/Http/Controllers/Admin/UserController.php |  36 +++++-
 .../Admin/UserWithdrawController.php          |  57 +++++++++
 app/Http/Model/User.php                       |  40 +++++++
 .../views/admin/UserWithdraw/add.blade.php    |  64 ++++++++++
 .../views/admin/UserWithdraw/edit.blade.php   |  67 +++++++++++
 .../views/admin/UserWithdraw/index.blade.php  |  34 ++++++
 resources/views/admin/admin/index.blade.php   |   2 +-
 .../views/admin/adminrole/index.blade.php     |   2 +-
 .../views/admin/category/index.blade.php      |   2 +-
 resources/views/admin/feedback/add.blade.php  | 110 ++++++++++++++++++
 resources/views/admin/feedback/edit.blade.php | 110 ++++++++++++++++++
 .../views/admin/feedback/index.blade.php      |  26 +++++
 .../views/admin/friendlink/index.blade.php    |   2 +-
 .../views/admin/guestbook/index.blade.php     |  35 +++---
 resources/views/admin/menu/index.blade.php    |   2 +-
 resources/views/admin/order/detail.blade.php  |   3 +-
 resources/views/admin/order/index.blade.php   |   8 +-
 resources/views/admin/slide/index.blade.php   |   4 +-
 resources/views/admin/user/edit222.blade.php  |  58 ---------
 resources/views/admin/user/index.blade.php    |  32 +++--
 resources/views/admin/user/money.blade.php    |  26 +++++
 .../views/weixin/order/orderDetail.blade.php  |   2 +-
 .../views/weixin/order/orderList.blade.php    |   2 +-
 .../weixin/user/userDistribution.blade.php    |   4 +-
 .../views/weixin/user/userWithdraw.blade.php  |   2 +-
 routes/web.php                                |  12 ++
 27 files changed, 716 insertions(+), 108 deletions(-)
 create mode 100644 app/Http/Controllers/Admin/FeedbackController.php
 create mode 100644 app/Http/Controllers/Admin/UserWithdrawController.php
 create mode 100644 resources/views/admin/UserWithdraw/add.blade.php
 create mode 100644 resources/views/admin/UserWithdraw/edit.blade.php
 create mode 100644 resources/views/admin/UserWithdraw/index.blade.php
 create mode 100644 resources/views/admin/feedback/add.blade.php
 create mode 100644 resources/views/admin/feedback/edit.blade.php
 create mode 100644 resources/views/admin/feedback/index.blade.php
 delete mode 100644 resources/views/admin/user/edit222.blade.php
 create mode 100644 resources/views/admin/user/money.blade.php

diff --git a/app/Http/Controllers/Admin/FeedbackController.php b/app/Http/Controllers/Admin/FeedbackController.php
new file mode 100644
index 0000000..b25aa80
--- /dev/null
+++ b/app/Http/Controllers/Admin/FeedbackController.php
@@ -0,0 +1,82 @@
+<?php
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Admin\CommonController;
+use DB;
+
+class FeedbackController extends CommonController
+{
+    public function __construct()
+    {
+        parent::__construct();
+    }
+    
+    public function index()
+    {
+        $data['posts'] = parent::pageList('feedback');
+		
+		return view('admin.feedback.index', $data);
+    }
+    
+    public function add()
+    {
+        return view('admin.feedback.add');
+    }
+    
+    public function doadd()
+    {
+		if(isset($_POST['editorValue'])){unset($_POST['editorValue']);}
+		unset($_POST["_token"]);
+		
+		if(DB::table('feedback')->insert(array_filter($_POST)))
+        {
+            success_jump('添加成功！', route('admin_feedback'));
+        }
+		else
+		{
+			error_jump('添加失败！请修改后重新添加');
+		}
+    }
+    
+    public function edit()
+    {
+        if(!empty($_GET["id"])){$id = $_GET["id"];}else{$id="";}
+        if(preg_match('/[0-9]*/',$id)){}else{exit;}
+        
+        $data['id'] = $id;
+		$data['post'] = object_to_array(DB::table('feedback')->where('id', $id)->first(), 1);
+        
+        return view('admin.feedback.edit', $data);
+    }
+    
+    public function doedit()
+    {
+        if(!empty($_POST["id"])){$id = $_POST["id"];unset($_POST["id"]);}else{$id="";exit;}
+        
+		if(isset($_POST['editorValue'])){unset($_POST['editorValue']);}
+		unset($_POST["_token"]);
+		
+		if(DB::table('feedback')->where('id', $id)->update($_POST))
+        {
+            success_jump('修改成功！', route('admin_slide'));
+        }
+		else
+		{
+			error_jump('修改失败！');
+		}
+    }
+    
+    public function del()
+    {
+		if(!empty($_GET["id"])){$id = $_GET["id"];}else{error_jump('删除失败！请重新提交');}
+		
+		if(DB::table('feedback')->whereIn("id", explode(',', $id))->delete())
+        {
+            success_jump('删除成功');
+        }
+		else
+		{
+			error_jump('删除失败！请重新提交');
+		}
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
index 39e5bf2..3bf7479 100644
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -3,6 +3,7 @@ namespace App\Http\Controllers\Admin;
 
 use App\Http\Controllers\Admin\CommonController;
 use DB;
+use App\Http\Model\User;
 
 class UserController extends CommonController
 {
@@ -15,11 +16,42 @@ class UserController extends CommonController
     {
         $posts = parent::pageList('user');
 		
-        $data['posts'] = $posts;
+        if($posts)
+        {
+            foreach($posts as $k=>$v)
+            {
+                $posts[$k]->sex_text = User::getSexText(['sex'=>$v->sex]);
+                $posts[$k]->status_text = User::getStatusText(['status'=>$v->status]);
+            }
+        }
         
+        $data['posts'] = $posts;
         return view('admin.user.index', $data);
     }
     
+    //会员账户记录
+    public function money()
+    {
+        $where = '';
+        if(isset($_REQUEST["user_id"]))
+        {
+            $where['user_id'] = $_REQUEST["user_id"];
+        }
+        
+        $posts = parent::pageList('user_money',$where);
+		
+        if($posts)
+        {
+            foreach($posts as $k=>$v)
+            {
+                $posts[$k]->user = DB::table('user')->where('id', $v->user_id)->first();
+            }
+        }
+        
+        $data['posts'] = $posts;
+        return view('admin.user.money', $data);
+    }
+    
     public function add()
     {
         return view('admin.user.add');
@@ -68,7 +100,7 @@ class UserController extends CommonController
     {
         if(!empty($_GET["id"])){$id = $_GET["id"];}else{error_jump('删除失败！请重新提交');}
 		
-		if(DB::table('user')->whereIn("id", explode(',', $id))->delete())
+		if(DB::table('user')->whereIn("id", explode(',', $id))->update(['status' => 2]))
         {
             success_jump('删除成功');
         }
diff --git a/app/Http/Controllers/Admin/UserWithdrawController.php b/app/Http/Controllers/Admin/UserWithdrawController.php
new file mode 100644
index 0000000..ca27563
--- /dev/null
+++ b/app/Http/Controllers/Admin/UserWithdrawController.php
@@ -0,0 +1,57 @@
+<?php
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Admin\CommonController;
+use DB;
+use App\Http\Model\UserWithdraw;
+
+class UserWithdrawController extends CommonController
+{
+    public function __construct()
+    {
+        parent::__construct();
+    }
+	
+    public function index()
+    {
+        $posts = parent::pageList('user_withdraw',array('is_delete'=>0));
+		
+        if($posts)
+        {
+            foreach($posts as $k=>$v)
+            {
+                $posts[$k]->user = DB::table('user')->where('id', $v->id)->first();
+                $posts[$k]->status_text = UserWithdraw::getStatusText(['status'=>$v->status]);
+            }
+        }
+        
+        $data['posts'] = $posts;
+        return view('admin.UserWithdraw.index', $data);
+    }
+    
+    public function edit()
+    {
+        if(!empty($_GET["id"])){$id = $_GET["id"];}else{$id="";}
+        if(preg_match('/[0-9]*/',$id)){}else{exit;}
+        
+        $data['id'] = $id;
+		$data['post'] = object_to_array(DB::table('user_withdraw')->where('id', $id)->first(), 1);
+        
+        return view('admin.UserWithdraw.edit', $data);
+    }
+	
+	public function doedit()
+    {
+        if(!empty($_POST["id"])){$id = $_POST["id"];unset($_POST["id"]);}else {$id="";exit;}
+        
+		unset($_POST["_token"]);
+		if(DB::table('user_withdraw')->where('id', $id)->update($_POST))
+        {
+            success_jump('修改成功！', route('admin_user'));
+        }
+		else
+		{
+			error_jump('修改失败！');
+		}
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Model/User.php b/app/Http/Model/User.php
index 9152165..28a0a81 100644
--- a/app/Http/Model/User.php
+++ b/app/Http/Model/User.php
@@ -223,4 +223,44 @@ class User extends BaseModel
         
 		return $res;
     }
+    
+    //获取性别文字：0未知,1男,2女
+    public static function getSexText($where)
+    {
+        $res = '';
+        if($where['sex'] === 0)
+        {
+            $res = '未知';
+        }
+        elseif($where['sex'] === 1)
+        {
+            $res = '男';
+        }
+        elseif($where['sex'] === 2)
+        {
+            $res = '女';
+        }
+        
+        return $res;
+    }
+    
+    //获取用户状态文字：1正常 2 删除 3锁定
+    public static function getStatusText($where)
+    {
+        $res = '';
+        if($where['status'] === 1)
+        {
+            $res = '正常';
+        }
+        elseif($where['status'] === 2)
+        {
+            $res = '删除';
+        }
+        elseif($where['status'] === 3)
+        {
+            $res = '锁定';
+        }
+        
+        return $res;
+    }
 }
\ No newline at end of file
diff --git a/resources/views/admin/UserWithdraw/add.blade.php b/resources/views/admin/UserWithdraw/add.blade.php
new file mode 100644
index 0000000..772a67f
--- /dev/null
+++ b/resources/views/admin/UserWithdraw/add.blade.php
@@ -0,0 +1,64 @@
+@extends('admin.layouts.app')
+@section('title', '管理员添加')
+
+@section('content')
+<h5 class="sub-header"><a href="<?php echo route('admin_admin'); ?>">管理员列表</a> > 管理员添加</h5>
+
+<form id="addarc" method="post" action="<?php echo route('admin_admin_doadd'); ?>" role="form" enctype="multipart/form-data" class="table-responsive">{{ csrf_field() }}
+<table class="table table-striped table-bordered">
+<tbody>
+    <tr>
+        <td align="right">用户名：</td>
+        <td><input name="username" type="text" id="username" value="" class="required" style="width:30%" placeholder="在此输入用户名"></td>
+    </tr>
+    <tr>
+        <td align="right">密码：</td>
+        <td><input name="pwd" type="password" id="pwd" value="" class="required" style="width:60%"></td>
+    </tr>
+    <tr>
+        <td align="right">邮箱：</td>
+        <td><input name="email" type="text" id="email" value="" style="width:60%"></td>
+    </tr>
+    <tr>
+        <td align="right">角色：</td>
+        <td>
+		<select name="role_id" id="role_id">
+			<?php if($rolelist){foreach($rolelist as $row){ ?>
+				<option value="<?php echo $row["id"]; ?>"><?php echo $row["name"]; ?></option>
+			<?php }} ?>
+		</select>
+		</td>
+    </tr>
+    <tr>
+        <td colspan="2"><button type="submit" class="btn btn-success" value="Submit">保存(Submit)</button>&nbsp;&nbsp;<button type="reset" class="btn btn-default" value="Reset">重置(Reset)</button><input type="hidden"></input></td>
+    </tr>
+</tbody></table></form><!-- 表单结束 -->
+<script>
+$(function(){
+    $(".required").blur(function(){
+        var $parent = $(this).parent();
+        $parent.find(".formtips").remove();
+        if(this.value=="")
+        {
+            $parent.append(' <small class="formtips onError"><font color="red">不能为空！</font></small>');
+        }
+        else
+        {
+            $parent.append(' <small class="formtips onSuccess"><font color="green">OK</font></small>');
+        }
+    });
+
+    //重置
+    $('#addarc input[type="reset"]').click(function(){
+            $(".formtips").remove(); 
+    });
+
+    $("#addarc").submit(function(){
+        $(".required").trigger('blur');
+        var numError = $('#addarc .onError').length;
+        
+        if(numError){return false;}
+    });
+});
+</script>
+@endsection
\ No newline at end of file
diff --git a/resources/views/admin/UserWithdraw/edit.blade.php b/resources/views/admin/UserWithdraw/edit.blade.php
new file mode 100644
index 0000000..65b5341
--- /dev/null
+++ b/resources/views/admin/UserWithdraw/edit.blade.php
@@ -0,0 +1,67 @@
+@extends('admin.layouts.app')
+@section('title', '管理员修改')
+
+@section('content')
+<h5 class="sub-header"><a href="<?php echo route('admin_admin'); ?>">管理员列表</a> > 管理员修改</h5>
+
+<form id="addarc" method="post" action="<?php echo route('admin_admin_doedit'); ?>" role="form" enctype="multipart/form-data" class="table-responsive">{{ csrf_field() }}
+<table class="table table-striped table-bordered">
+<tbody>
+    <tr>
+        <td align="right">用户名：</td>
+        <td><input name="username" type="text" id="username" value="<?php echo $post["username"]; ?>" class="required" style="width:30%" placeholder="在此输入用户名"><input style="display:none;" type="text" name="id" id="id" value="<?php echo $id; ?>"></td>
+    </tr>
+    <tr>
+        <td align="right">密码：</td>
+        <td><input name="pwd" type="password" id="pwd" value="" class="required" style="width:30%"></td>
+    </tr>
+    <tr>
+        <td align="right">邮箱：</td>
+        <td><input name="email" type="text" id="email" value="<?php echo $post["email"]; ?>" style="width:30%"></td>
+    </tr>
+    <tr>
+        <td align="right">角色：</td>
+        <td>
+		<select name="role_id" id="role_id">
+			<?php if($rolelist){foreach($rolelist as $row){ ?>
+				<?php if($post["role_id"]==$row["id"]){ ?>
+				<option selected value="<?php echo $row["id"]; ?>"><?php echo $row["name"]; ?></option>
+				<?php }else{ ?>
+				<option value="<?php echo $row["id"]; ?>"><?php echo $row["name"]; ?></option>
+			<?php }}} ?>
+		</select>
+		</td>
+    </tr>
+    <tr>
+        <td colspan="2"><button type="submit" class="btn btn-success" value="Submit">保存(Submit)</button>&nbsp;&nbsp;<button type="reset" class="btn btn-default" value="Reset">重置(Reset)</button></td>
+    </tr>
+</tbody></table></form><!-- 表单结束 -->
+<script>
+$(function(){
+    $(".required").blur(function(){
+        var $parent = $(this).parent();
+        $parent.find(".formtips").remove();
+        if(this.value=="")
+        {
+            $parent.append(' <small class="formtips onError"><font color="red">不能为空！</font></small>');
+        }
+        else
+        {
+            $parent.append(' <small class="formtips onSuccess"><font color="green">OK</font></small>');
+        }
+    });
+
+    //重置
+    $('#addarc input[type="reset"]').click(function(){
+            $(".formtips").remove(); 
+    });
+
+    $("#addarc").submit(function(){
+        $(".required").trigger('blur');
+        var numError = $('#addarc .onError').length;
+        
+        if(numError){return false;}
+    });
+});
+</script>
+@endsection
\ No newline at end of file
diff --git a/resources/views/admin/UserWithdraw/index.blade.php b/resources/views/admin/UserWithdraw/index.blade.php
new file mode 100644
index 0000000..fb8d653
--- /dev/null
+++ b/resources/views/admin/UserWithdraw/index.blade.php
@@ -0,0 +1,34 @@
+@extends('admin.layouts.app')
+@section('title', '提现申请列表')
+
+@section('content')
+<h2 class="sub-header">提现申请列表</h2>
+
+<form name="listarc"><div class="table-responsive"><table class="table table-hover">
+<thead><tr class="info">
+<th>ID</th>
+<th>用户名</th>
+<th>提现金额</th>
+<th>姓名</th>
+<th>收款方式</th>
+<th>收款账号</th>
+<th>申请时间</th>
+<th>状态</th>
+<th>操作</th>
+</tr></thead>
+<tbody>
+<?php if($posts){foreach($posts as $row){ ?><tr>
+<td><?php echo $row->id; ?></td>
+<td><?php echo $row->user->user_name; ?><br><?php if($row->user->mobile){echo 'TEL:'.$row->user->mobile;} ?></td>
+<td><font color="red"><?php echo $row->money; ?></font></td>
+<td><?php echo $row->name; ?></td>
+<td><?php echo $row->method; ?></td>
+<td>账号：<?php echo $row->account;if($row->bank_name){echo '<br>银行名称：'.$row->bank_name;}if($row->bank_place){echo '<br>开户行：'.$row->bank_place;} ?></td>
+<td><?php echo date('Y-m-d H:i:s',$row->add_time); ?></td>
+<td><?php echo $row->status_text; ?></td>
+<td><a href="">成功</a>&nbsp;<a href="">拒绝</a></td>
+</tr><?php }} ?>
+</tbody></table></div><!-- 表格结束 --></form><!-- 表单结束 -->
+
+<nav aria-label="Page navigation">{{ $posts->links() }}</nav>
+@endsection
\ No newline at end of file
diff --git a/resources/views/admin/admin/index.blade.php b/resources/views/admin/admin/index.blade.php
index fa86294..04d1ade 100644
--- a/resources/views/admin/admin/index.blade.php
+++ b/resources/views/admin/admin/index.blade.php
@@ -5,7 +5,7 @@
 <h2 class="sub-header">管理员列表</h2>[ <a href="<?php echo route('admin_admin_add'); ?>">添加管理员</a> ]<br><br>
 
 <form name="listarc"><div class="table-responsive"><table class="table table-striped table-hover">
-<thead><tr>
+<thead><tr class="info">
 <th>ID</th>
 <th>用户名</th>
 <th>邮箱</th>
diff --git a/resources/views/admin/adminrole/index.blade.php b/resources/views/admin/adminrole/index.blade.php
index 715ece7..2670609 100644
--- a/resources/views/admin/adminrole/index.blade.php
+++ b/resources/views/admin/adminrole/index.blade.php
@@ -5,7 +5,7 @@
 <h2 class="sub-header">角色管理</h2>[ <a href="<?php echo route('admin_adminrole_add'); ?>">添加角色</a> ]<br><br>
 
 <form name="listarc"><div class="table-responsive"><table class="table table-striped table-hover">
-<thead><tr>
+<thead><tr class="info">
 <th>ID</th>
 <th>角色名称</th>
 <th>角色描述</th>
diff --git a/resources/views/admin/category/index.blade.php b/resources/views/admin/category/index.blade.php
index 684dce6..8634bf1 100644
--- a/resources/views/admin/category/index.blade.php
+++ b/resources/views/admin/category/index.blade.php
@@ -6,7 +6,7 @@
 
 <form name="listarc"><div class="table-responsive">
 <table class="table table-striped table-hover">
-<thead><tr><th>ID</th><th>名称</th><th>文章数</th><th>别名</th><th>更新时间</th><th>操作</th></tr></thead>
+<thead><tr class="info"><th>ID</th><th>名称</th><th>文章数</th><th>别名</th><th>更新时间</th><th>操作</th></tr></thead>
 <tbody id="cat-list">
 <?php if($catlist){foreach($catlist as $row){ ?>
 <tr id="cat-<?php echo $row["id"]; ?>">
diff --git a/resources/views/admin/feedback/add.blade.php b/resources/views/admin/feedback/add.blade.php
new file mode 100644
index 0000000..a59a946
--- /dev/null
+++ b/resources/views/admin/feedback/add.blade.php
@@ -0,0 +1,110 @@
+@extends('admin.layouts.app')
+@section('title', '轮播图添加')
+
+@section('content')
+<h5 class="sub-header"><a href="/fladmin/slide">轮播图列表</a> > 添加轮播图</h5>
+
+<form id="addarc" method="post" action="/fladmin/slide/doadd" role="form" enctype="multipart/form-data" class="table-responsive">{{ csrf_field() }}
+<table class="table table-striped table-bordered">
+<tbody>
+    <tr>
+        <td align="right">标题：</td>
+        <td><input name="title" type="text" id="title" value="" class="required" style="width:30%" placeholder="在此输入关键词"></td>
+    </tr>
+    <tr>
+        <td align="right">链接网址：</td>
+        <td><input name="url" type="text" id="url" value="http://" style="width:60%" class="required"> (请用绝对地址)</td>
+    </tr>
+    <tr>
+        <td align="right">跳转方式：</td>
+        <td>
+			<input type="radio" value='0' name="target" checked />&nbsp;_blank&nbsp;&nbsp;
+			<input type="radio" value='1' name="target" />&nbsp;_self
+		</td>
+    </tr>
+    <tr>
+        <td align="right">是否显示：</td>
+        <td>
+			<input type="radio" value='0' name="is_show" checked />&nbsp;是&nbsp;&nbsp;
+			<input type="radio" value='1' name="is_show" />&nbsp;否
+		</td>
+    </tr>
+    <tr>
+        <td align="right">排序：</td>
+        <td>
+			<input name="rank" type="text" id="rank" value="" size="3" />
+		</td>
+    </tr>
+    <tr>
+        <td align="right">所属的组：</td>
+        <td>
+			<input name="group_id" type="text" id="group_id" value="" size="3" />
+		</td>
+    </tr>
+    <tr>
+        <td style="vertical-align:middle;" align="right">图片：</td>
+        <td style="vertical-align:middle;"><button type="button" onclick="upImage();">选择图片</button> <input class="required" name="pic" type="text" id="pic" value="" style="width:40%"> <img style="margin-left:20px;display:none;" src="" width="120" height="80" id="picview"></td>
+    </tr>
+<!-- 配置文件 --><script type="text/javascript" src="/other/flueditor/ueditor.config.js"></script>
+<!-- 编辑器源码文件 --><script type="text/javascript" src="/other/flueditor/ueditor.all.js"></script>
+<script type="text/javascript">
+var _editor;
+$(function() {
+    //重新实例化一个编辑器，防止在上面的editor编辑器中显示上传的图片或者文件
+    _editor = UE.getEditor('ueditorimg');
+    _editor.ready(function () {
+        //设置编辑器不可用
+        _editor.setDisabled('insertimage');
+        //隐藏编辑器，因为不会用到这个编辑器实例，所以要隐藏
+        _editor.hide();
+        //侦听图片上传
+        _editor.addListener('beforeInsertImage', function (t, arg) {
+            //将地址赋值给相应的input,只取第一张图片的路径
+			$('#pic').val(arg[0].src);
+            //图片预览
+            $('#picview').attr("src",arg[0].src).css("display","inline-block");
+        })
+    });
+});
+//弹出图片上传的对话框
+function upImage()
+{
+    var myImage = _editor.getDialog("insertimage");
+	myImage.render();
+    myImage.open();
+}
+</script>
+<script type="text/plain" id="ueditorimg"></script>
+    <tr>
+        <td colspan="2"><button type="submit" class="btn btn-success" value="Submit">保存(Submit)</button>&nbsp;&nbsp;<button type="reset" class="btn btn-default" value="Reset">重置(Reset)</button></td>
+    </tr>
+</tbody></table></form><!-- 表单结束 -->
+<script>
+$(function(){
+    $(".required").blur(function(){
+        var $parent = $(this).parent();
+        $parent.find(".formtips").remove();
+        if(this.value=="")
+        {
+            $parent.append(' <small class="formtips onError"><font color="red">不能为空！</font></small>');
+        }
+        else
+        {
+            $parent.append(' <small class="formtips onSuccess"><font color="green">OK</font></small>');
+        }
+    });
+
+    //重置
+    $('#addarc input[type="reset"]').click(function(){
+            $(".formtips").remove(); 
+    });
+
+    $("#addarc").submit(function(){
+        $(".required").trigger('blur');
+        var numError = $('#addarc .onError').length;
+        
+        if(numError){return false;}
+    });
+});
+</script>
+@endsection
\ No newline at end of file
diff --git a/resources/views/admin/feedback/edit.blade.php b/resources/views/admin/feedback/edit.blade.php
new file mode 100644
index 0000000..d7e6216
--- /dev/null
+++ b/resources/views/admin/feedback/edit.blade.php
@@ -0,0 +1,110 @@
+@extends('admin.layouts.app')
+@section('title', '轮播图修改')
+
+@section('content')
+<h5 class="sub-header"><a href="/fladmin/slide">轮播图列表</a> > 轮播图修改</h5>
+
+<form id="addarc" method="post" action="/fladmin/slide/doedit" role="form" enctype="multipart/form-data" class="table-responsive">{{ csrf_field() }}
+<table class="table table-striped table-bordered">
+<tbody>
+    <tr>
+        <td align="right">标题：</td>
+        <td><input name="title" type="text" id="title" value="<?php echo $post['title']; ?>" class="required" style="width:30%" placeholder="在此输入关键词"><input style="display:none;" name="id" type="text" id="id" value="<?php echo $id; ?>"></td>
+    </tr>
+    <tr>
+        <td align="right">链接网址：</td>
+        <td><input name="url" type="text" id="url" value="<?php echo $post['url']; ?>" style="width:60%" class="required"> (请用绝对地址)</td>
+    </tr>
+    <tr>
+        <td align="right">跳转方式：</td>
+        <td>
+			<input type="radio" value='0' name="target" <?php if(isset($post['target']) && $post['target']==0){echo 'checked';} ?> />&nbsp;_blank&nbsp;&nbsp;
+			<input type="radio" value='1' name="target" <?php if(isset($post['target']) && $post['target']==1){echo 'checked';} ?> />&nbsp;_self
+		</td>
+    </tr>
+    <tr>
+        <td align="right">是否显示：</td>
+        <td>
+			<input type="radio" value='0' name="is_show" <?php if(isset($post['is_show']) && $post['is_show']==0){echo 'checked';} ?> />&nbsp;是&nbsp;&nbsp;
+			<input type="radio" value='1' name="is_show" <?php if(isset($post['is_show']) && $post['is_show']==1){echo 'checked';} ?> />&nbsp;否
+		</td>
+    </tr>
+    <tr>
+        <td align="right">排序：</td>
+        <td>
+			<input name="rank" type="text" id="rank" value="<?php echo $post['rank']; ?>" size="3" />
+		</td>
+    </tr>
+    <tr>
+        <td align="right">所属的组：</td>
+        <td>
+			<input name="group_id" type="text" id="group_id" value="<?php echo $post['group_id']; ?>" size="3" />
+		</td>
+    </tr>
+    <tr>
+        <td style="vertical-align:middle;" align="right">图片：</td>
+        <td style="vertical-align:middle;"><button type="button" onclick="upImage();">选择图片</button> <input name="pic" type="text" id="pic" value="<?php echo $post['pic']; ?>" style="width:40%"> <img style="margin-left:20px;<?php if(empty($post["pic"]) || !imgmatch($post["pic"])){ echo "display:none;"; } ?>" src="<?php if(imgmatch($post["pic"])){echo $post["pic"];} ?>" width="120" height="80" id="picview"></td>
+    </tr>
+<!-- 配置文件 --><script type="text/javascript" src="/other/flueditor/ueditor.config.js"></script>
+<!-- 编辑器源码文件 --><script type="text/javascript" src="/other/flueditor/ueditor.all.js"></script>
+<script type="text/javascript">
+var _editor;
+$(function() {
+    //重新实例化一个编辑器，防止在上面的editor编辑器中显示上传的图片或者文件
+    _editor = UE.getEditor('ueditorimg');
+    _editor.ready(function () {
+        //设置编辑器不可用
+        _editor.setDisabled('insertimage');
+        //隐藏编辑器，因为不会用到这个编辑器实例，所以要隐藏
+        _editor.hide();
+        //侦听图片上传
+        _editor.addListener('beforeInsertImage', function (t, arg) {
+            //将地址赋值给相应的input,只取第一张图片的路径
+			$('#pic').val(arg[0].src);
+            //图片预览
+            $('#picview').attr("src",arg[0].src).css("display","inline-block");
+        })
+    });
+});
+//弹出图片上传的对话框
+function upImage()
+{
+    var myImage = _editor.getDialog("insertimage");
+	myImage.render();
+    myImage.open();
+}
+</script>
+<script type="text/plain" id="ueditorimg"></script>
+    <tr>
+        <td colspan="2"><button type="submit" class="btn btn-success" value="Submit">保存(Submit)</button>&nbsp;&nbsp;<button type="reset" class="btn btn-default" value="Reset">重置(Reset)</button></td>
+    </tr>
+</tbody></table></form><!-- 表单结束 -->
+<script>
+$(function(){
+    $(".required").blur(function(){
+        var $parent = $(this).parent();
+        $parent.find(".formtips").remove();
+        if(this.value=="")
+        {
+            $parent.append(' <small class="formtips onError"><font color="red">不能为空！</font></small>');
+        }
+        else
+        {
+            $parent.append(' <small class="formtips onSuccess"><font color="green">OK</font></small>');
+        }
+    });
+
+    //重置
+    $('#addarc input[type="reset"]').click(function(){
+            $(".formtips").remove(); 
+    });
+
+    $("#addarc").submit(function(){
+        $(".required").trigger('blur');
+        var numError = $('#addarc .onError').length;
+        
+        if(numError){return false;}
+    });
+});
+</script>
+@endsection
\ No newline at end of file
diff --git a/resources/views/admin/feedback/index.blade.php b/resources/views/admin/feedback/index.blade.php
new file mode 100644
index 0000000..f0523d3
--- /dev/null
+++ b/resources/views/admin/feedback/index.blade.php
@@ -0,0 +1,26 @@
+@extends('admin.layouts.app')
+@section('title', '意见反馈列表')
+
+@section('content')
+<h2 class="sub-header">意见反馈列表</h2>
+
+<form name="listarc"><div class="table-responsive"><table class="table table-hover">
+<thead><tr class="info">
+<th>ID</th>
+<th>标题</th>
+<th>内容</th>
+<th>时间</th>
+<th>管理</th>
+</tr></thead>
+<tbody>
+<?php if($posts){foreach($posts as $row){ ?><tr>
+<td><?php echo $row->id; ?></td>
+<td><?php echo $row->title; ?></td>
+<td><?php echo $row->content; ?></td>
+<td><?php echo $row->created_at; ?></td>
+<td><a onclick="delconfirm('<?php echo route('admin_feedback_del',array('id'=>$row->id)); ?>')" href="javascript:;">删除</a></td>
+</tr><?php }} ?>
+</tbody></table></div><!-- 表格结束 --></form><!-- 表单结束 -->
+
+<nav aria-label="Page navigation">{{ $posts->links() }}</nav>
+@endsection
\ No newline at end of file
diff --git a/resources/views/admin/friendlink/index.blade.php b/resources/views/admin/friendlink/index.blade.php
index 81b8b6b..a1aed45 100644
--- a/resources/views/admin/friendlink/index.blade.php
+++ b/resources/views/admin/friendlink/index.blade.php
@@ -5,7 +5,7 @@
 <h2 class="sub-header">友情链接管理</h2>[ <a href="/fladmin/friendlink/add">添加友情链接</a> ]<br><br>
 
 <form name="listarc"><div class="table-responsive"><table class="table table-striped table-hover">
-<thead><tr>
+<thead><tr class="info">
 <th>编号</th>
 <th>链接名称</th>
 <th>链接网址</th>
diff --git a/resources/views/admin/guestbook/index.blade.php b/resources/views/admin/guestbook/index.blade.php
index c9c6e47..84bb603 100644
--- a/resources/views/admin/guestbook/index.blade.php
+++ b/resources/views/admin/guestbook/index.blade.php
@@ -7,26 +7,21 @@
 
 <div class="table-responsive">
 <table class="table table-striped table-hover">
-  <thead>
-	<tr>
-	  <th>ID</th>
-	  <th width=25%>标题</th>
-	  <th>留言时间</th>
-	  <th width=45%>内容</th><th>操作</th>
-	</tr>
-  </thead>
-  <tbody>
-  <?php if($posts){foreach($posts as $row){ ?>
-	<tr>
-	  <td><?php echo $row->id; ?></td>
-	  <td><?php echo $row->title; ?></td>
-	  <td><?php echo date('Y-m-d H:i:s',$row->addtime); ?></td>
-	  <td><?php echo $row->msg; ?></td><td>&nbsp;<a onclick="delconfirm('/fladmin/guestbook/del?id=<?php echo $row->id; ?>')" href="javascript:;">删除</a></td>
-	</tr>
-  <?php }} ?>
-  </tbody>
-</table>
-</div><!-- 表格结束 -->
+<thead><tr class="info">
+<th>ID</th>
+<th width=25%>标题</th>
+<th>留言时间</th>
+<th width=45%>内容</th><th>操作</th>
+</tr></thead><tbody>
+<?php if($posts){foreach($posts as $row){ ?>
+<tr>
+<td><?php echo $row->id; ?></td>
+<td><?php echo $row->title; ?></td>
+<td><?php echo date('Y-m-d H:i:s',$row->addtime); ?></td>
+<td><?php echo $row->msg; ?></td><td>&nbsp;<a onclick="delconfirm('/fladmin/guestbook/del?id=<?php echo $row->id; ?>')" href="javascript:;">删除</a></td>
+</tr>
+<?php }} ?>
+</tbody></table></div><!-- 表格结束 -->
 
 <nav aria-label="Page navigation">{{ $posts->links() }}</nav>
 
diff --git a/resources/views/admin/menu/index.blade.php b/resources/views/admin/menu/index.blade.php
index 0d8a6b8..b1c3dd9 100644
--- a/resources/views/admin/menu/index.blade.php
+++ b/resources/views/admin/menu/index.blade.php
@@ -5,7 +5,7 @@
 <h2 class="sub-header">菜单管理</h2>[ <a href="/fladmin/menu/add">菜单添加</a> ]<br><br>
 
 <form name="listarc"><div class="table-responsive"><table class="table table-striped table-hover">
-<thead><tr>
+<thead><tr class="info">
 <th>ID</th>
 <th>菜单名称</th>
 <th>操作方法</th>
diff --git a/resources/views/admin/order/detail.blade.php b/resources/views/admin/order/detail.blade.php
index afb0497..35a6b44 100644
--- a/resources/views/admin/order/detail.blade.php
+++ b/resources/views/admin/order/detail.blade.php
@@ -10,8 +10,9 @@
             当前可执行操作：
         </div>
         <button class="btn btn-info" onclick="show_search()">发货</button>
-        <button class="btn btn-success">设为付款</button>
+        <button class="btn btn-success">设为已付款</button>
         <button class="btn btn-danger" onclick="show_search()">设为无效</button>
+        <button class="btn btn-warning" onclick="javascript:history.back(-1);">返回</button>
     </div>
     <div style="clear:both;"></div>
 </div>
diff --git a/resources/views/admin/order/index.blade.php b/resources/views/admin/order/index.blade.php
index 2dc2757..905cffd 100644
--- a/resources/views/admin/order/index.blade.php
+++ b/resources/views/admin/order/index.blade.php
@@ -9,11 +9,11 @@
     <div class="form-inline" style="display:inline;float:left;">
         <div class="form-group">
             <label for="order_sn">订单号:</label>
-            <input type="text" class="form-control" id="order_sn" name="order_sn" placeholder="">
+            <input size="15" type="text" class="form-control" id="order_sn" name="order_sn" placeholder="">
         </div>
         <div class="form-group">
             <label for="name">收货人:</label>
-            <input type="text" class="form-control" id="name" name="name" placeholder="">
+            <input size="5" type="text" class="form-control" id="name" name="name" placeholder="">
         </div>
         <button type="submit" class="btn btn-success">查询</button>
         <button class="btn btn-warning" onclick="show_search()">高级</button>
@@ -22,10 +22,10 @@
     <div class="form-inline" style="display:inline;float:right;">
         <div class="form-group">
             <label for="min_addtime">导出列表:</label>
-            <input onclick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd HH:mm:ss'})" type="text" class="form-control" id="min_addtime" name="min_addtime" placeholder="开始时间">
+            <input size="15" onclick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd HH:mm:ss'})" type="text" class="form-control" id="min_addtime" name="min_addtime" placeholder="开始时间">
         </div>
         <div class="form-group">
-            <input onclick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd HH:mm:ss'})" type="text" class="form-control" id="max_addtime" name="max_addtime" placeholder="结束时间">
+            <input size="15" onclick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd HH:mm:ss'})" type="text" class="form-control" id="max_addtime" name="max_addtime" placeholder="结束时间">
         </div>
         <button onclick="javascript:output();" class="btn btn-success">导出</button>
     </div>
diff --git a/resources/views/admin/slide/index.blade.php b/resources/views/admin/slide/index.blade.php
index a6e15bd..ca4e05e 100644
--- a/resources/views/admin/slide/index.blade.php
+++ b/resources/views/admin/slide/index.blade.php
@@ -4,8 +4,8 @@
 @section('content')
 <h2 class="sub-header">轮播图管理</h2>[ <a href="/fladmin/slide/add">添加轮播图</a> ]<br><br>
 
-<form name="listarc"><div class="table-responsive"><table class="table table-striped table-hover">
-<thead><tr>
+<form name="listarc"><div class="table-responsive"><table class="table table-hover">
+<thead><tr class="info">
 <th>图片</th>
 <th>标题</th>
 <th>链接网址</th>
diff --git a/resources/views/admin/user/edit222.blade.php b/resources/views/admin/user/edit222.blade.php
deleted file mode 100644
index 0bdafea..0000000
--- a/resources/views/admin/user/edit222.blade.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE html><html><head><title>密码修改_后台管理</title>@include('admin.common.header')
-<div class="container-fluid">
-<div class="row">
-<!-- 左边开始 --><div class="col-sm-3 col-md-2 sidebar">@include('admin.common.leftmenu')</div><!-- 左边结束 -->
-<style>.input-error{background-color:#ffe7e7;}</style>
-<!-- 右边开始 --><div class="col-sm-9 col-md-10 rightbox"><div id="mainbox">
-<h2 class="sub-header">密码修改</h2>
-<form id="addarc" method="post" action="/fladmin/user/doedit" class="table-responsive" role="form">{{ csrf_field() }}
-<table class="table table-striped table-bordered">
-<tbody>
-    <tr>
-        <td align="right">用户名：</td>
-        <td><input name="username" type="text" class="" id="username" value="<?php echo $post["username"]; ?>" style="width:30%"></td>
-    </tr>
-    <tr>
-        <td align="right">旧密码：</td>
-        <td><input name="oldpwd" type="password" class="" id="oldpwd" value="" style="width:30%"></td>
-    </tr>
-    <tr>
-        <td align="right">新密码：</td>
-        <td><input name="newpwd" type="password" class="" id="newpwd" value="" style="width:30%"></td>
-    </tr>
-    <tr>
-        <td align="right">确认密码：</td>
-        <td><input name="newpwd2" type="password" class="" id="newpwd2" value="" style="width:30%"></td>
-    </tr>
-    <tr>
-        <td colspan="2"><button type="submit" class="btn btn-success" value="Submit">保存(Submit)</button>&nbsp;&nbsp;<button type="reset" class="btn btn-default" value="Reset">重置(Reset)</button><input type="hidden"></input></td>
-    </tr>
-</tbody></table></form><!-- 表单结束 -->
-</div></div><!-- 右边结束 --></div></div>
-<script>
-$('#addarc input[type="text"], #addarc input[type="password"]').on('focus', function() {
-	$(this).removeClass('input-error');
-});
-$('#addarc').on('submit', function(e) {
-    $(this).find('input[type="text"], input[type="password"]').each(function(){
-		if( $(this).val() == "" ) {
-			e.preventDefault();
-			$(this).addClass('input-error');
-		}
-		else {
-			$(this).removeClass('input-error');
-		}
-	});
-    if($('#newpwd').val()!=$('#newpwd2').val() || $('#newpwd').val()=='')
-    {
-        e.preventDefault();
-        $('#newpwd').addClass('input-error');
-        $('#newpwd2').addClass('input-error');
-    }
-    else {
-        $('#newpwd').removeClass('input-error');
-        $('#newpwd2').removeClass('input-error');
-    }
-});
-</script>
-</body></html>
\ No newline at end of file
diff --git a/resources/views/admin/user/index.blade.php b/resources/views/admin/user/index.blade.php
index fa86294..3736b3e 100644
--- a/resources/views/admin/user/index.blade.php
+++ b/resources/views/admin/user/index.blade.php
@@ -1,25 +1,35 @@
 @extends('admin.layouts.app')
-@section('title', '管理员列表')
+@section('title', '会员列表')
 
 @section('content')
-<h2 class="sub-header">管理员列表</h2>[ <a href="<?php echo route('admin_admin_add'); ?>">添加管理员</a> ]<br><br>
+<h2 class="sub-header">会员列表</h2>[ <a href="<?php echo route('admin_user_add'); ?>">添加会员</a> ] [ <a href="<?php echo route('admin_user_money'); ?>">账户记录</a> ]<br><br>
 
-<form name="listarc"><div class="table-responsive"><table class="table table-striped table-hover">
-<thead><tr>
+<form name="listarc"><div class="table-responsive"><table class="table table-hover">
+<thead><tr class="info">
 <th>ID</th>
+<th>头像</th>
 <th>用户名</th>
-<th>邮箱</th>
+<th>性别</th>
+<th>余额</th>
+<th>积分</th>
+<th>佣金</th>
+<th>注册时间</th>
 <th>状态</th>
 <th>管理</th>
 </tr></thead>
 <tbody>
-<?php foreach($posts as $row){ ?><tr>
+<?php if($posts){foreach($posts as $row){ ?><tr>
 <td><?php echo $row->id; ?></td>
-<td><?php echo $row->username; ?></td>
-<td><?php echo $row->email; ?></td>
-<td><?php if($row->status==0){echo '正常';}elseif($row->status==1){echo '禁用';}elseif($row->status==2){echo '禁用';} ?></td>
-<td><a href="<?php echo route('admin_admin_edit'); ?>?id=<?php echo $row->id; ?>">修改</a><?php if($row->id<>1){ ?> | <a onclick="delconfirm('<?php echo route('admin_admin_del'); ?>?id=<?php echo $row->id; ?>')" href="javascript:;">删除</a><?php } ?></td>
-</tr><?php } ?>
+<td><img src="<?php echo $row->head_img; ?>" style="width:24px;height:24px;"></td>
+<td><?php if($row->user_name){echo $row->user_name;}else{echo $row->mobile;} ?></td>
+<td><?php echo $row->sex_text; ?></td>
+<td><?php echo $row->money; ?></td>
+<td><?php echo $row->point; ?></td>
+<td><font color="red"><?php echo $row->commission; ?></font></td>
+<td><?php echo date('Y-m-d H:i:s',$row->add_time); ?></td>
+<td><?php echo $row->status_text; ?></td>
+<td><a href="">人工充值</a> | <a href="<?php echo route('admin_user_money',array('user_id'=>$row->id)); ?>">帐户记录</a> | <a href="<?php echo route('admin_user_edit'); ?>?id=<?php echo $row->id; ?>">修改</a><?php if($row->id<>1){ ?> | <a onclick="delconfirm('<?php echo route('admin_user_del'); ?>?id=<?php echo $row->id; ?>')" href="javascript:;">删除</a><?php } ?></td>
+</tr><?php }} ?>
 </tbody></table></div><!-- 表格结束 --></form><!-- 表单结束 -->
 
 <nav aria-label="Page navigation">{{ $posts->links() }}</nav>
diff --git a/resources/views/admin/user/money.blade.php b/resources/views/admin/user/money.blade.php
new file mode 100644
index 0000000..8feb046
--- /dev/null
+++ b/resources/views/admin/user/money.blade.php
@@ -0,0 +1,26 @@
+@extends('admin.layouts.app')
+@section('title', '账户记录列表')
+
+@section('content')
+<h2 class="sub-header">账户记录列表</h2>
+
+<form name="listarc"><div class="table-responsive"><table class="table table-hover">
+<thead><tr class="info">
+<th>ID</th>
+<th>用户名</th>
+<th>金额</th>
+<th>说明</th>
+<th>时间</th>
+</tr></thead>
+<tbody>
+<?php if($posts){foreach($posts as $row){ ?><tr>
+<td><?php echo $row->id; ?></td>
+<td><a href="<?php echo route('admin_user_money',array('user_id'=>$row->user_id)); ?>"><?php if($row->user->user_name){echo $row->user->user_name;}else{echo $row->user->mobile;} ?></a></td>
+<td><font<?php if($row->type==1){echo ' color="#0C0"';}else{echo ' color="red"';} ?>><?php if($row->type==1){echo '-';} ?><?php echo $row->money; ?></font></td>
+<td><?php echo $row->des; ?></td>
+<td><?php echo date('Y-m-d H:i:s',$row->add_time); ?></td>
+</tr><?php }} ?>
+</tbody></table></div><!-- 表格结束 --></form><!-- 表单结束 -->
+
+<nav aria-label="Page navigation">{{ $posts->links() }}</nav>
+@endsection
\ No newline at end of file
diff --git a/resources/views/weixin/order/orderDetail.blade.php b/resources/views/weixin/order/orderDetail.blade.php
index bdc32dc..c524ba8 100644
--- a/resources/views/weixin/order/orderDetail.blade.php
+++ b/resources/views/weixin/order/orderDetail.blade.php
@@ -44,7 +44,7 @@
 </ul>
 
 <p class="des">合计: ￥<?php echo $post['order_amount']; ?> <small>(含运费:￥<?php echo $post['shipping_fee']; ?>)</small></p>
-<div class="tag"><?php if($post['order_status_num']==4 || $post['order_status_num']==6 || $post['order_status_num']==7){ ?><a href="javascript:del_order(<?php echo $post['id']; ?>);">删除</a><?php } ?><?php if($post['order_status_num']==1){ ?><a href="javascript:cancel_order(<?php echo $post['id']; ?>);">取消订单</a><?php } ?><?php if($post['order_status_num']==1){ ?><a href="<?php echo route('weixin_order_pay',array('id'=>$post['id'])); ?>">付款</a><?php } ?><?php if($post['order_status_num']==3){ ?><a href="http://m.kuaidi100.com/index_all.html?type=<?php echo $post['shipping_name']; ?>&postid=<?php echo $post['shipping_sn']; ?>#result">查看物流</a><?php } ?><?php if($post['order_status_num']==3 || $post['order_status_num']==2){ ?><a href="javascript:done_order(<?php echo $post['id']; ?>);">确认收货</a><?php } ?><?php if($post['order_status_num']==4){ ?><a class="activate" href="<?php echo route('weixin_order_comment',array('id'=>$post['id'])); ?>">评价</a><?php } ?></div>
+<div class="tag"><?php if($post['order_status_num']==4 || $post['order_status_num']==6 || $post['order_status_num']==7){ ?><a href="javascript:del_order(<?php echo $post['id']; ?>);">删除</a><?php } ?><?php if($post['order_status_num']==1){ ?><a href="javascript:cancel_order(<?php echo $post['id']; ?>);">取消订单</a><?php } ?><?php if($post['order_status_num']==1){ ?><a href="<?php echo route('weixin_order_pay',array('id'=>$post['id'])); ?>">付款</a><?php } ?><?php if($post['order_status_num']==3){ ?><a href="http://m.kuaidi100.com/index_all.html?type=<?php echo $post['shipping_name']; ?>&postid=<?php echo $post['shipping_sn']; ?>#result">查看物流</a><?php } ?><?php if($post['order_status_num']==3){ ?><a href="javascript:done_order(<?php echo $post['id']; ?>);">确认收货</a><?php } ?><?php if($post['order_status_num']==4){ ?><a class="activate" href="<?php echo route('weixin_order_comment',array('id'=>$post['id'])); ?>">评价</a><?php } ?></div>
 </div>
 <style>
 .goodslist{background-color:#fbfbfb;}
diff --git a/resources/views/weixin/order/orderList.blade.php b/resources/views/weixin/order/orderList.blade.php
index ebcc053..2444906 100644
--- a/resources/views/weixin/order/orderList.blade.php
+++ b/resources/views/weixin/order/orderList.blade.php
@@ -51,7 +51,7 @@ var swiper = new Swiper('.swiper-nav', {
 </a>
 
 <p class="des">合计: ￥<?php echo $value['order_amount']; ?> <small>(含运费:￥<?php echo $value['shipping_fee']; ?>)</small></p>
-<div class="tag"><?php if($value['order_status_num']==4 || $value['order_status_num']==6 || $value['order_status_num']==7){ ?><a href="javascript:del_order(<?php echo $value['id']; ?>);">删除</a><?php } ?><?php if($value['order_status_num']==1){ ?><a href="javascript:cancel_order(<?php echo $value['id']; ?>);">取消订单</a><?php } ?><?php if($value['order_status_num']==1){ ?><a href="<?php echo route('weixin_order_pay',array('id'=>$value['id'])); ?>">付款</a><?php } ?><?php if($value['order_status_num']==3){ ?><a href="http://m.kuaidi100.com/index_all.html?type=<?php echo $value['shipping_name']; ?>&postid=<?php echo $value['shipping_sn']; ?>#result">查看物流</a><?php } ?><?php if($value['order_status_num']==3 || $value['order_status_num']==2){ ?><a href="javascript:done_order(<?php echo $value['id']; ?>);">确认收货</a><?php } ?><?php if($value['order_status_num']==4){ ?><a class="activate" href="<?php echo route('weixin_order_comment',array('id'=>$value['id'])); ?>">评价</a><?php } ?></div>
+<div class="tag"><?php if($value['order_status_num']==4 || $value['order_status_num']==6 || $value['order_status_num']==7){ ?><a href="javascript:del_order(<?php echo $value['id']; ?>);">删除</a><?php } ?><?php if($value['order_status_num']==1){ ?><a href="javascript:cancel_order(<?php echo $value['id']; ?>);">取消订单</a><?php } ?><?php if($value['order_status_num']==1){ ?><a href="<?php echo route('weixin_order_pay',array('id'=>$value['id'])); ?>">付款</a><?php } ?><?php if($value['order_status_num']==3){ ?><a href="http://m.kuaidi100.com/index_all.html?type=<?php echo $value['shipping_name']; ?>&postid=<?php echo $value['shipping_sn']; ?>#result">查看物流</a><?php } ?><?php if($value['order_status_num']==3){ ?><a href="javascript:done_order(<?php echo $value['id']; ?>);">确认收货</a><?php } ?><?php if($value['order_status_num']==4){ ?><a class="activate" href="<?php echo route('weixin_order_comment',array('id'=>$value['id'])); ?>">评价</a><?php } ?></div>
 </div>
 <?php }}else{ ?>
     <div style="text-align:center;line-height:40px;color:#999;">暂无记录</div>
diff --git a/resources/views/weixin/user/userDistribution.blade.php b/resources/views/weixin/user/userDistribution.blade.php
index 5adb57f..3257c3a 100644
--- a/resources/views/weixin/user/userDistribution.blade.php
+++ b/resources/views/weixin/user/userDistribution.blade.php
@@ -15,7 +15,7 @@
 .account .icon{color:#FFCC00;font-size:100px;}
 .account .money{color:#353535;font-size:36px;}
 .account .tit{color:#000;font-size:18px;}
-.banner_tit{font-size:18px;font-weight:400;background-color:#fff;color:#f23030;height:46px;line-height:46px;padding-left:10px;padding-right:10px;border-bottom:1px solid #eee;text-align:center;}
+.banner_tit{font-size:18px;font-weight:400;background-color:#fff;color:#f23030;height:46px;line-height:46px;padding-left:10px;padding-right:10px;border-bottom:1px solid #eee;border-top:10px solid #f1f1f1;text-align:center;}
 </style>
 <div class="floor account">
     <div class="icon"><i class="fa fa-diamond"></i></div>
@@ -23,7 +23,7 @@
     <div class="money"><small>￥</small><?php echo $user_info['commission']; ?></div>
 </div>
 <div class="floor">
-<div class="banner_tit">- 我的推荐 -</div>
+<div class="banner_tit mt10">- 我的推荐 -</div>
 <?php if($list){ ?>
     <ul class="goods_list_s cl">
         <?php foreach($list as $k=>$v){ ?>
diff --git a/resources/views/weixin/user/userWithdraw.blade.php b/resources/views/weixin/user/userWithdraw.blade.php
index a6a0316..0ca8550 100644
--- a/resources/views/weixin/user/userWithdraw.blade.php
+++ b/resources/views/weixin/user/userWithdraw.blade.php
@@ -17,7 +17,7 @@
 .bottoma{display:block;font-size:18px;padding:10px;color:white;background-color:#f23030;text-align:center;}
 .yongjin_tip{padding:10px;background-color:#FFC;color:#666;border-bottom:1px solid #DDD;font-size:14px;}.yongjin_tip b{color:red;}
 </style>
-<div class="yongjin_tip">余额：<b>￥<?php echo $user_info['money']; ?></b>，手续费率：<b>0.5%</b>，最少金额：<b>￥<?php echo $min_withdraw_money; ?></b></div>
+<div class="yongjin_tip">余额：<b>￥<?php echo $user_info['money']; ?></b>，最少金额：<b>￥<?php echo $min_withdraw_money; ?></b></div>
 <div class="adr_add">
 <div class="adr-form-group">
   <label><font color="red">*</font>收款人姓名</label>
diff --git a/routes/web.php b/routes/web.php
index b243d91..cc6b347 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -346,6 +346,13 @@ Route::group(['prefix' => 'fladmin', 'namespace' => 'Admin', 'middleware' => ['w
 	Route::get('/sysconfig/edit', 'SysconfigController@edit')->name('admin_sysconfig_edit');
 	Route::post('/sysconfig/doedit', 'SysconfigController@doedit')->name('admin_sysconfig_doedit');
 	Route::get('/sysconfig/del', 'SysconfigController@del')->name('admin_sysconfig_del');
+    //意见反馈
+	Route::get('/feedback', 'FeedbackController@index')->name('admin_feedback');
+	Route::get('/feedback/add', 'FeedbackController@add')->name('admin_feedback_add');
+	Route::post('/feedback/doadd', 'FeedbackController@doadd')->name('admin_feedback_doadd');
+	Route::get('/feedback/edit', 'FeedbackController@edit')->name('admin_feedback_edit');
+	Route::post('/feedback/doedit', 'FeedbackController@doedit')->name('admin_feedback_doedit');
+	Route::get('/feedback/del', 'FeedbackController@del')->name('admin_feedback_del');
     //会员管理
 	Route::get('/user', 'UserController@index')->name('admin_user');
 	Route::get('/user/add', 'UserController@add')->name('admin_user_add');
@@ -353,6 +360,11 @@ Route::group(['prefix' => 'fladmin', 'namespace' => 'Admin', 'middleware' => ['w
 	Route::get('/user/edit', 'UserController@edit')->name('admin_user_edit');
 	Route::post('/user/doedit', 'UserController@doedit')->name('admin_user_doedit');
 	Route::get('/user/del', 'UserController@del')->name('admin_user_del');
+    Route::get('/user/money', 'UserController@money')->name('admin_user_money'); //会员账户记录
+    //提现申请
+	Route::get('/userwithdraw', 'UserWithdrawController@index')->name('admin_userwithdraw');
+	Route::get('/userwithdraw/edit', 'UserWithdrawController@edit')->name('admin_userwithdraw_edit');
+	Route::post('/userwithdraw/doedit', 'UserWithdrawController@doedit')->name('admin_userwithdraw_doedit');
 	//管理员管理
 	Route::get('/admin', 'AdminController@index')->name('admin_admin');
 	Route::get('/admin/add', 'AdminController@add')->name('admin_admin_add');