afa 1 月之前
父节点
当前提交
2f54a6852f

+ 39 - 4
application/admin/controller/user/User.php

@@ -12,6 +12,7 @@ use fast\Asset;
 use think\exception\PDOException;
 use think\exception\ValidateException;
 use app\common\model\LedgerTeacChangeModel;
+use app\common\model\CodeUserModel;
 use think\Db;
 use think\exception\DbException;
 
@@ -76,7 +77,6 @@ class User extends Backend
     
     /**
      * 编辑
-     *
      * @param $ids
      * @return string
      * @throws DbException
@@ -101,7 +101,7 @@ class User extends Backend
             $this->error(__('Parameter %s can not be empty', ''));
         }
         $params = $this->preExcludeFields($params);
-        if($this->model::where('nickname', $params['nickname'])->count() > 0) $this->error(__('UID已存在', ''));
+        if($this->model::where('nickname', $params['nickname'])->where('id', '<>', $ids)->count() > 0) $this->error(__('UID已存在', ''));
         $result = false;
         Db::startTrans();
         try {
@@ -190,8 +190,43 @@ class User extends Backend
 
 
 
-
-
+    /**
+     * 激活码礼包
+     * @param $ids
+     * @return string
+     * @throws DbException
+     * @throws \think\Exception
+     */
+    public function codeno($ids = null)
+    {
+        $ids = intval($ids);
+        $row = CodeUserModel::where('user_id',$ids)->find();
+        if (false === $this->request->isPost()) {
+            $this->view->assign('row', $row);
+            return $this->view->fetch();
+        }
+        $params = $this->request->post('row/a');
+        if (empty($params)) {
+            $this->error(__('Parameter %s can not be empty', ''));
+        }
+        $params = $this->preExcludeFields($params);
+        // 启动事务
+        Db::startTrans();
+        try {
+         
+            $result = $row->allowField(true)->save($params);
+            // 提交事务
+            Db::commit();
+        } catch (Exception $e) {
+            // 回滚事务
+            Db::rollback();
+            $this->error('调整失败:' . $e->getMessage());
+        }
+        if (false === $result) {
+            $this->error(__('No rows were updated'));
+        }
+        $this->success();
+    }
 
 
 

+ 0 - 70
application/admin/view/user/codeuserlog/add.html

@@ -1,70 +0,0 @@
-<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
-
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Gift1')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-gift1" class="form-control" name="row[gift1]" type="number" value="0">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Gift2')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-gift2" class="form-control" name="row[gift2]" type="number" value="0">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Frozen')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-frozen" class="form-control" step="0.000001" name="row[frozen]" type="number" value="0.000000">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Code_no')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-code_no" class="form-control" name="row[code_no]" type="text" value="">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Level')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-level" data-rule="required" class="form-control" name="row[level]" type="number" value="0">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            
-            <div class="radio">
-            {foreach name="statusList" item="vo"}
-            <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="30"}checked{/in} /> {$vo}</label> 
-            {/foreach}
-            </div>
-
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Create_time')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-create_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[create_time]" type="text" value="{:date('Y-m-d H:i:s')}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Update_time')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-update_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[update_time]" type="text" value="{:date('Y-m-d H:i:s')}">
-        </div>
-    </div>
-    <div class="form-group layer-footer">
-        <label class="control-label col-xs-12 col-sm-2"></label>
-        <div class="col-xs-12 col-sm-8">
-            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
-            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
-        </div>
-    </div>
-</form>

+ 0 - 70
application/admin/view/user/codeuserlog/edit.html

@@ -1,70 +0,0 @@
-<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
-
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Gift1')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-gift1" class="form-control" name="row[gift1]" type="number" value="{$row.gift1|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Gift2')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-gift2" class="form-control" name="row[gift2]" type="number" value="{$row.gift2|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Frozen')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-frozen" class="form-control" step="0.000001" name="row[frozen]" type="number" value="{$row.frozen|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Code_no')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-code_no" class="form-control" name="row[code_no]" type="text" value="{$row.code_no|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Level')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-level" data-rule="required" class="form-control" name="row[level]" type="number" value="{$row.level|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            
-            <div class="radio">
-            {foreach name="statusList" item="vo"}
-            <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="$row.status"}checked{/in} /> {$vo}</label> 
-            {/foreach}
-            </div>
-
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Create_time')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-create_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[create_time]" type="text" value="{:$row.create_time?datetime($row.create_time):''}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Update_time')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-update_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[update_time]" type="text" value="{:$row.update_time?datetime($row.update_time):''}">
-        </div>
-    </div>
-    <div class="form-group layer-footer">
-        <label class="control-label col-xs-12 col-sm-2"></label>
-        <div class="col-xs-12 col-sm-8">
-            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
-            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
-        </div>
-    </div>
-</form>

+ 38 - 0
application/admin/view/user/user/codeno.html

@@ -0,0 +1,38 @@
+<form id="edit-form" role="form" data-toggle="validator" method="POST" action="">
+    <div class="form-horizontal"> 
+  
+ 
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('财神送喜')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-level_v1" class="form-control" sname="row[level_v1]" type="number" value="{$row.level_v1|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('社区主理人')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-level_v2" class="form-control" name="row[level_v2]" type="text" value="{$row.level_v2|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('生态主理人')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-level_v3" class="form-control" name="row[level_v3]" type="number" value="{$row.level_v3|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('超级主理人')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-level_v4" class="form-control" name="row[level_v4]" type="number" value="{$row.level_v4|htmlentities}">
+        </div>
+    </div>
+
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+    </div>
+</form>

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

@@ -53,9 +53,6 @@ class Codeno extends Api
                   // 发放激活礼包
                   CodenoLogic::setActivate($this->auth->id, $this->auth->parent_id, $row->level, $params['code_no']);
                   
-                  //扣除激活剩余数量
-                  CodeUserModel::reduceCodeUser($row->user_id, $row->level);
-
                   $row->status = CodeNoModel::STATUS_USED;
                   $row->save();
                   // 提交事务

+ 10 - 0
public/assets/js/backend/user/user.js

@@ -62,6 +62,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                 classname: 'btn btn-xs btn-info btn-dialog btn-receivable',
                                 url: 'user/user/approve',
                                 extend: 'data-area=\'["50%", "50%"]\'',
+                            },{
+                                name: 'codeno',
+                                text: '激活码',
+                                title: '激活码',
+                                classname: 'btn btn-xs btn-warning btn-dialog btn-receivable',
+                                url: 'user/user/codeno',
+                                extend: 'data-area=\'["50%", "50%"]\'',
                             },{
                                 name: 'counts',
                                 text: '统计',
@@ -82,6 +89,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
         approve: function () {
             Controller.api.bindevent();
         },
+        codeno: function () {
+            Controller.api.bindevent();
+        },
         edit: function () {
             Controller.api.bindevent();
         },