Home Explore Help
Register Sign In
PH
/
WaterTank
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

commit

hrjy 2 years ago
parent
54e9359466
commit
144ad8a468
3 changed files with 28 additions and 28 deletions
Split View Show Diff Stats
  1. 1 1
      app/admin/view/login/index.php
  2. 14 14
      app/admin/view/user/user/index.php
  3. 13 13
      app/api/controller/water/WaterQueryController.php

+ 1 - 1
app/admin/view/login/index.php
View File 

@@ -17,7 +17,7 @@
 
     </script>
 
 </head>
 
 <body class="gray-bg login-bg">
 
-<canvas id="canvas" width="900" height="300" style="position: fixed;top: -50px;width: 60%;left: 20%"></canvas>
 
+<!--<canvas id="canvas" width="900" height="300" style="position: fixed;top: -50px;width: 60%;left: 20%"></canvas>-->
 
 <div class="middle-box text-center loginscreen  animated fadeInDown">
 
     <div class="login-group">
 
         <h3 class="login-logo">

+ 14 - 14
app/admin/view/user/user/index.php
View File 

@@ -230,18 +230,18 @@
 
                         <button type="button" class="layui-btn layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</button>
 
                         <button type="button" class="layui-btn layui-btn-xs" onclick="dropdown(this)">操作 <span class="caret"></span></button>
 
                         <ul class="layui-nav-child layui-anim layui-anim-upbit">
 
-                            <li>
 
-                                <a href="javascript:void(0);" lay-event="money">
 
-                                    <i class="layui-icon layui-icon-edit"></i> 余额积分</a>
 
-                            </li>
 
-                            <li>
 
-                                <a href="javascript:void(0);" lay-event="see">
 
-                                    <i class="layui-icon layui-icon-edit"></i> 会员详情</a>
 
-                            </li>
 
-                            <li>
 
-                                <a href="javascript:void(0);" lay-event="give_level">
 
-                                    <i class="layui-icon layui-icon-star-fill" aria-hidden="true"></i> 修改会员等级</a>
 
-                            </li>
 
+<!--                            <li>-->
 
+<!--                                <a href="javascript:void(0);" lay-event="money">-->
 
+<!--                                    <i class="layui-icon layui-icon-edit"></i> 余额积分</a>-->
 
+<!--                            </li>-->
 
+<!--                            <li>-->
 
+<!--                                <a href="javascript:void(0);" lay-event="see">-->
 
+<!--                                    <i class="layui-icon layui-icon-edit"></i> 会员详情</a>-->
 
+<!--                            </li>-->
 
+<!--                            <li>-->
 
+<!--                                <a href="javascript:void(0);" lay-event="give_level">-->
 
+<!--                                    <i class="layui-icon layui-icon-star-fill" aria-hidden="true"></i> 修改会员等级</a>-->
 
+<!--                            </li>-->
 
                             <li>
 
                                 <a href="javascript:void(0);" lay-event="set_group">
 
                                     <i class="layui-icon layui-icon-star-fill" aria-hidden="true"></i> 设置分组</a>
 
@@ -309,14 +309,14 @@
 
             {field: 'avatar', title: '头像', event:'open_image', width: '6%',align:'center', templet: '<p lay-event="open_image"><img class="avatar" style="cursor: pointer" class="open_image" data-image="{{d.avatar}}" src="{{d.avatar}}" alt="{{d.nickname}}"></p>'},
 
             {field: 'nickname', title: '姓名',templet:'#nickname',align:'center'},
 
             {field: 'phone', title: '手机号',align:'center',width:'8%'},
 
-            {field: 'now_money', title: '余额',width:'6%',sort:true,event:'now_money',align:'center'},
 
+            // {field: 'now_money', title: '余额',width:'6%',sort:true,event:'now_money',align:'center'},
 
             // {field: 'pay_count', title: '购买次数',align:'center',width:'6%'},
 
             // {field: 'extract_count_price', title: '累计提现',align:'center',width:'6%'},
 
             {field: 'member', title: '会员',templet:'#member',align:'center',width:'6%'},
 
             {field: 'member_time', title: '到期时间',templet:'#member_time',align:'center',width:'6%'},
 
             {field: 'frequency', title: '注册次数',align:'center',width:'6%'},
 
             {field: 'free', title: '每月次数',align:'center',width:'6%'},
 
-            {field: 'integral', title: '积分',width:'6%',sort:true,event:'integral',align:'center'},
 
+            // {field: 'integral', title: '积分',width:'6%',sort:true,event:'integral',align:'center'},
 
             // {field: 'spread_uid_nickname', title: '推荐人',align:'center'},
 
             {field: 'sex', title: '性别',width:'4%',align:'center'},
 
             {field: 'data_time', title: '访问日期',align:'center',width:'12%',templet:'#data_time'},

+ 13 - 13
app/api/controller/water/WaterQueryController.php
View File 

@@ -41,11 +41,11 @@ class WaterQueryController
 
             ['fula', []], // 辅拉
 
         ]);
 
         $user = User::where('uid', $request->uid())->find();
 
-        if ($user['member'] == 0){
 
-            if ($user['frequency'] == 0 and $user['free'] == 0){
 
-                return app('json')->fail('查询次数已用完');
 
-            }
 
-        }
 
+//        if ($user['member'] == 0){
 
+//            if ($user['frequency'] == 0 and $user['free'] == 0){
 
+//                return app('json')->fail('查询次数已用完');
 
+//            }
 
+//        }
 
         //顶板
 
         $calculation = $this->calculation($data);
 
         $amount = $this->AmountOfMoney($calculation, $data);// 计算总价，表格
 
@@ -67,16 +67,16 @@ class WaterQueryController
 
                 $item['query_id'] = $res['id'];
 
                 WaterMaterial::create($item);
 
             }
 
-            if ($user['member'] == 0){
 
-                if ($user['free'] > 0){
 
-                    User::where('uid', $request->uid())->dec('free', 1)->update();
 
-                }else{
 
-                    User::where('uid', $request->uid())->dec('frequency', 1)->update();
 
-                }
 
-            }
 
+//            if ($user['member'] == 0){
 
+//                if ($user['free'] > 0){
 
+//                    User::where('uid', $request->uid())->dec('free', 1)->update();
 
+//                }else{
 
+//                    User::where('uid', $request->uid())->dec('frequency', 1)->update();
 
+//                }
 
+//            }
 
 
             if ($user['phone']){
 
-                $res1 = $this->NewSmsSend('18280937328', ['code' => $user['phone']], '');
 
+                $this->NewSmsSend('18280937328', ['code' => $user['phone']], '');
 
             }
 
             Db::commit();
 
             return app('json')->success($amount);