9

plugin/admin/app/controller/ConversationController.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace plugin\admin\app\controller;
+
+use app\model\User;
+use plugin\admin\app\controller\Crud;
+use support\exception\BusinessException;
+use support\Request;
+use support\Response;
+use Throwable;
+
+/**
+ * 会话管理 
+ */
+class ConversationController  extends Crud
+{
+    
+    /**
+     * @var \app\model\UserXuanchuan
+     */
+    protected $model = null;
+    /**
+     * 构造函数
+     * @return void
+     */
+    function __construct()
+    {
+    }
+    function select(Request $request): Response{
+        $list = $request->IM->conversation->getSortedConversationList();
+        return json([
+            'code' => 0,
+            'msg' => 'success',
+            'data' => $list
+        ]);
+    }
+    
+}

plugin/admin/app/controller/FriendController.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace plugin\admin\app\controller;
+
+use app\model\User;
+use plugin\admin\app\controller\Crud;
+use support\exception\BusinessException;
+use support\Request;
+use support\Response;
+use Throwable;
+
+/**
+ * 用户宣传 
+ */
+class FriendController extends Crud
+{
+    
+    /**
+     * @var \app\model\UserXuanchuan
+     */
+    protected $model = null;
+    protected $relationSearch = ['user'];
+    /**
+     * 构造函数
+     * @return void
+     */
+    function __construct()
+    {
+        $this->model = new \app\model\UserXuanchuan();
+        $statusList = $this->model->getStatusList();
+        $this->assign("statusList", $statusList);
+        $this->assignconfig("statusList", $statusList);
+        $typeList = $this->model->getTypeList();
+        $this->assign("typeList", $typeList);
+        $this->assignconfig("typeList", $typeList);
+    }
+    
+}

plugin/admin/app/controller/GroupController.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace plugin\admin\app\controller;
+
+use app\model\User;
+use plugin\admin\app\controller\Crud;
+use support\exception\BusinessException;
+use support\Request;
+use support\Response;
+use Throwable;
+
+/**
+ * 用户宣传 
+ */
+class GroupController extends Crud
+{
+    
+    /**
+     * @var \app\model\UserXuanchuan
+     */
+    protected $model = null;
+    protected $relationSearch = ['user'];
+    /**
+     * 构造函数
+     * @return void
+     */
+    function __construct()
+    {
+        $this->model = new \app\model\UserXuanchuan();
+        $statusList = $this->model->getStatusList();
+        $this->assign("statusList", $statusList);
+        $this->assignconfig("statusList", $statusList);
+        $typeList = $this->model->getTypeList();
+        $this->assign("typeList", $typeList);
+        $this->assignconfig("typeList", $typeList);
+    }
+    
+}

plugin/admin/app/controller/MessageController.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace plugin\admin\app\controller;
+
+use app\model\User;
+use plugin\admin\app\controller\Crud;
+use support\exception\BusinessException;
+use support\Request;
+use support\Response;
+use Throwable;
+
+/**
+ * 用户宣传 
+ */
+class MessageController extends Crud
+{
+    
+    /**
+     * @var \app\model\UserXuanchuan
+     */
+    protected $model = null;
+    protected $relationSearch = ['user'];
+    /**
+     * 构造函数
+     * @return void
+     */
+    function __construct()
+    {
+        $this->model = new \app\model\UserXuanchuan();
+        $statusList = $this->model->getStatusList();
+        $this->assign("statusList", $statusList);
+        $this->assignconfig("statusList", $statusList);
+        $typeList = $this->model->getTypeList();
+        $this->assign("typeList", $typeList);
+        $this->assignconfig("typeList", $typeList);
+    }
+    
+}

plugin/admin/app/controller/UserController.php

@@ -38,6 +38,9 @@ class UserController extends Crud
         $this->assignconfig('groupList',$groupList);
         $this->assign('roleList',$roleList);
         $this->assignconfig('roleList',$roleList);
+        $areaList = Config('areacode');
+        $this->assign('areaList',$areaList);
+        $this->assignconfig('areaList',$areaList);
     }
     public function team(Request $request): Response
     {

plugin/admin/app/view/balance_log/index.html

@@ -2,7 +2,7 @@
 <!-- 数据表格 -->
 <div class="card"> 
     <ul class="nav nav-tabs page-tabs" id="filter_currency">
-        {volist name=":Config('site.allow_balance_log')" id="cvo"}
+        {volist name=":Config('site.allow_currency_logs')" id="cvo"}
         <li {if $cvo == 'money'}class="active" {/if} data-currency="{$cvo}"> <a href="javascript:;">{:__($cvo)}</a> </li>
         {/volist}
     </ul>

plugin/admin/app/view/user/update.html

@@ -47,9 +47,18 @@
                 </div>
             </div> -->
             <div class="form-group">
-                <label class="control-label col-xs-12 col-sm-2">用户名</label>
+                <label class="control-label col-xs-12 col-sm-2">手机号</label>
                 <div class="col-xs-12 col-sm-8 col-md-6">
-                    <input type="text" name="username" value="{$row.username|null}" autocomplete="off" data-rule="required" class="form-control">
+                    <div class="input-group" style="width: 100%;">
+                        <div class="input-group-addon" style="padding: 0;width: 200px;">
+                            <select name="region" class="form-control">
+                                {foreach name=":Config('areacode')" item="vo"}
+                                <option value="{$vo.value}" {if $vo.value == $row.region}selected{/if}>(+{$vo.value}){$vo.label}</option>
+                                {/foreach}
+                            </select>
+                        </div>
+                        <input type="text" name="mobile" value="{$row.mobile|null}" autocomplete="off" data-rule="required" class="form-control">
+                    </div>
                 </div>
             </div>
 
@@ -86,7 +95,7 @@
             <div class="form-group">
                 <label for="type" class="control-label col-xs-12 col-sm-2">头像</label>
                 <div class="col-xs-12 col-sm-8 col-md-6">
-                    <input id="c-avatar" class="form-control" size="50" name="avatar" type="hidden" value="{$row.avatar|default='__IMG__/user/avatar.svg'}" data-tip="头像">
+                    <input id="c-avatar" class="form-control" size="50" name="avatar" type="hidden" value="{$row.avatar|default='/static/avatar/'.rand(0,17).'.png'|cdnurl}" data-tip="头像">
                     <ul class="list-inline clearfix lyear-uploads-pic" data-template="preview" id="p-avatar">
                         <li nodelete class="col-xs-4 col-sm-3 col-md-2">
                             <a class="pic-add faupload" style="height: auto;border: 0;" permission="app.admin.files.upload" id="add-pic-btn" href="javascript:;" title="点击上传" data-input-id="c-avatar" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="false" data-preview-id="p-avatar"></a>
@@ -103,10 +112,10 @@
                 </div>
             </div>
 
-            <div class="form-group">
-                <label class="control-label col-xs-12 col-sm-2">手机</label>
+            <div class="form-group" style="display:none;">
+                <label class="control-label col-xs-12 col-sm-2">用户名</label>
                 <div class="col-xs-12 col-sm-8 col-md-6">
-                    <input type="text" name="mobile" value="{$row.mobile|null}" autocomplete="off" class="form-control">
+                    <input type="text" name="username" value="{$row.username|null}" autocomplete="off" class="form-control">
                 </div>
             </div>
 
@@ -125,7 +134,7 @@
                         data-date-debug="true"
                         data-date-sideBySide="true"
                         data-date-collapse="false"
-                        data-date-format="YYYY-MM-DD HH:mm:ss"
+                        data-date-format="YYYY-MM-DD"
                         autocomplete="off" class="form-control datetimepicker">
                 </div>
             </div>