我的信息调整

application/admin/controller/gift/Back.php

@@ -22,8 +22,12 @@ class Back extends Backend
     {
         parent::_initialize();
         $this->model = new \app\admin\model\gift\Back;
-        $this->view->assign("isUseList", $this->model->getIsUseList());
-        $this->view->assign("getWayList", $this->model->getGetWayList());
+        $typeList = [
+            'isUseList' => $this->model->getIsUseList(),
+            'getWayList' => $this->model->getGetWayList(),
+        ];
+        $this->view->assign($typeList);
+        $this->assignconfig($typeList);
     }
 
     public function import()

application/admin/controller/gift/Gift.php

@@ -55,10 +55,14 @@ class Gift extends Backend
                 return $this->selectpage();
             }
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
-
+            $appendWhere = [];
+            if ($this->request->param('id')) {
+                $appendWhere['gift.id'] = $this->request->param('id');
+            }
             $list = $this->model
                 ->with(['gifttype'])
                 ->where($where)
+                ->where($appendWhere)
                 ->order($sort, $order)
                 ->paginate($limit);
 
@@ -74,4 +78,24 @@ class Gift extends Backend
         return $this->view->fetch();
     }
 
+    /**
+     * 获取详情
+     * @return void
+     */
+    public function detail()
+    {
+        $id = $this->request->param('id',0);
+        $data = [];
+        if (!empty($id)) {
+            $where['id'] = $id;
+            $data = $this->model->where($where)->find();
+        }
+        $result = [
+            'status' => 1,
+            'msg' => '获取成功',
+            'data' => $data,
+        ];
+
+        return json_encode($result);
+    }
 }

application/admin/model/gift/Back.php

@@ -39,7 +39,7 @@ class Back extends Model
 
     public function getGetWayList()
     {
-        return ['1' => __('Get_way 1'), '2' => __('Get_way 2'), '3' => __('Get_way 3')];
+        return config('params.get_way');
     }
 
 

application/admin/view/gift/back/add.html

@@ -7,16 +7,22 @@
         </div>
     </div>
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('礼物ID')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-gift_id" data-rule="required" min="0" data-source="gift/gift/index" class="form-control selectpage" name="row[gift_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text">
+            <input id="c-name" data-rule="required" readonly class="form-control" name="row[name]" type="text">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">
-                <input id="c-image" data-rule="required" class="form-control" size="50" name="row[image]" type="text">
+                <input id="c-image" data-rule="required" readonly class="form-control" size="50" name="row[image]" type="text">
                 <div class="input-group-addon no-border no-padding">
                     <span><button type="button" id="faupload-image" class="btn btn-danger faupload" data-input-id="c-image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
                     <span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-input-id="c-image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
@@ -30,7 +36,7 @@
         <label class="control-label col-xs-12 col-sm-2">{:__('Gif_image')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">
-                <input id="c-gif_image" class="form-control" size="50" name="row[gif_image]" type="text" value="">
+                <input id="c-gif_image" class="form-control" readonly size="50" name="row[gif_image]" type="text" value="">
                 <div class="input-group-addon no-border no-padding">
                     <span><button type="button" id="faupload-gif_image" class="btn btn-danger faupload" data-input-id="c-gif_image" data-mimetype="svga" data-multiple="false" data-preview-id="p-gif_image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
                     <span><button type="button" id="fachoose-gif_image" class="btn btn-primary fachoose" data-input-id="c-gif_image" data-mimetype="file/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
@@ -44,7 +50,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Value')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-value" data-rule="required" class="form-control" name="row[value]" type="number" value="0">
+            <input id="c-value" data-rule="required" readonly class="form-control" name="row[value]" type="number" value="0">
         </div>
     </div>
     <div class="form-group">
@@ -53,7 +59,7 @@
             <input id="c-number" class="form-control" name="row[number]" type="number">
         </div>
     </div>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Is_use')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
@@ -64,20 +70,20 @@
             </select>
 
         </div>
-    </div>
-    <div class="form-group">
+    </div>-->
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Use_time')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-use_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[use_time]" type="text" value="{:date('Y-m-d H:i:s')}">
+            <input id="c-use_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[use_time]" type="text" value="">
         </div>
-    </div>
+    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Get_way')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
-            <select  id="c-get_way" class="form-control selectpicker" name="row[get_way]">
+            <select  id="c-get_way" readonly class="form-control selectpicker" name="row[get_way]">
                 {foreach name="getWayList" item="vo"}
-                    <option value="{$key}" {in name="key" value="1"}selected{/in}>{$vo}</option>
+                    <option value="{$key}" {in name="key" value="6"}selected{/in}>{$vo}</option>
                 {/foreach}
             </select>
 

application/admin/view/gift/back/edit.html

@@ -7,16 +7,22 @@
         </div>
     </div>
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('礼物ID')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-gift_id" data-rule="required" min="0" data-source="gift/gift/index" class="form-control selectpage" name="row[gift_id]" type="text" value="{$row.gift_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text" value="{$row.name|htmlentities}">
+            <input id="c-name" data-rule="required" readonly class="form-control" name="row[name]" type="text" value="{$row.name|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">
-                <input id="c-image" data-rule="required" class="form-control" size="50" name="row[image]" type="text" value="{$row.image|htmlentities}">
+                <input id="c-image" data-rule="required" readonly class="form-control" size="50" name="row[image]" type="text" value="{$row.image|htmlentities}">
                 <div class="input-group-addon no-border no-padding">
                     <span><button type="button" id="faupload-image" class="btn btn-danger faupload" data-input-id="c-image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
                     <span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-input-id="c-image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
@@ -31,7 +37,7 @@
         <label class="control-label col-xs-12 col-sm-2">{:__('Gif_image')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">
-                <input id="c-gif_image" class="form-control" size="50" name="row[gif_image]" type="text" value="{$row.gif_image|htmlentities}">
+                <input id="c-gif_image" class="form-control" readonly size="50" name="row[gif_image]" type="text" value="{$row.gif_image|htmlentities}">
                 <div class="input-group-addon no-border no-padding">
                     <span><button type="button" id="faupload-gif_image" class="btn btn-danger faupload" data-input-id="c-gif_image" data-mimetype="svga" data-multiple="false" data-preview-id="p-gif_image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
                     <span><button type="button" id="fachoose-gif_image" class="btn btn-primary fachoose" data-input-id="c-gif_image" data-mimetype="file/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
@@ -46,7 +52,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Value')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-value" data-rule="required" class="form-control" name="row[value]" type="number" value="{$row.value|htmlentities}">
+            <input id="c-value" data-rule="required" readonly class="form-control" name="row[value]" type="number" value="{$row.value|htmlentities}">
         </div>
     </div>
     <div class="form-group">
@@ -55,7 +61,7 @@
             <input id="c-number" class="form-control" name="row[number]" type="number" value="{$row.number|htmlentities}">
         </div>
     </div>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Is_use')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
@@ -72,12 +78,12 @@
         <div class="col-xs-12 col-sm-8">
             <input id="c-use_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[use_time]" type="text" value="{:$row.use_time?datetime($row.use_time):''}">
         </div>
-    </div>
+    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Get_way')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
-            <select  id="c-get_way" class="form-control selectpicker" name="row[get_way]">
+            <select  id="c-get_way" class="form-control selectpicker" readonly name="row[get_way]">
                 {foreach name="getWayList" item="vo"}
                     <option value="{$key}" {in name="key" value="$row.get_way"}selected{/in}>{$vo}</option>
                 {/foreach}

application/admin/view/gift/back/index.html

@@ -7,10 +7,10 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <!--<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('gift/back/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('gift/back/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
                         <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('gift/back/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('gift/back/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
-                        <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('gift/back/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>
+                        <!--<a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('gift/back/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>
 
                         <div class="dropdown btn-group {:$auth->check('gift/back/multi')?'':'hide'}">
                             <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>

application/admin/view/gift/gift/edit.html

@@ -19,7 +19,7 @@
         </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">
                         
             <select  id="c-box_type" data-rule="required" class="form-control selectpicker" name="row[box_type]">
@@ -105,7 +105,7 @@
                 <span class="msg-box n-right" for="c-special"></span>
             </div>
             <ul class="row list-inline faupload-preview" id="p-special"></ul>
-            <div style="padding:2px 33px;margin-top:10px;width:120px;color:#fff3f6;cursor:pointer;background-color: #00A000;border-radius: 2px;" onclick="play()">播放动画</div>
+            <div style="padding:2px 33px;margin-top:10px;width:120px;color:#fff3f6;cursor:pointer;background-color: #00A000;border-radius: 2px;" onclick="play()">鎾�斁鍔ㄧ敾</div>
         </div>
     </div>
 
@@ -133,7 +133,7 @@
 </style>
 <script src="/assets/js/svga.min.js" ></script>
 <script>
-    // 播放
+    // 鎾�斁鍔ㄧ敾
     function play() {
         $("#p-special li a.thumbnail").html("<div id='demoCanvas'></div>");
 
@@ -141,7 +141,7 @@
         player.loops=1;
         player.clearsAfterStop=false;
 
-        var parser = new SVGA.Parser('#demoCanvas'); // 如果你需要支持 IE6+，那么必须把同样的选择器传给 Parser。
+        var parser = new SVGA.Parser('#demoCanvas'); // 濡傛灉浣犻渶瑕佹敮鎸� IE6+锛岄偅涔堝繀椤绘妸鍚屾牱鐨勯€夋嫨鍣ㄤ紶缁� Parser銆�
 
         var svgaUrl = $("#c-special").val();
 

application/common/library/Auth.php

@@ -522,12 +522,14 @@ class Auth
         $fieldArr = explode(',',$field);
         $fieldTextArr = ['age_text','constellation_text','province_text','city_text','friends_num','look_num'];
         $fieldArr = array_merge($fieldArr,$fieldTextArr);
-        $userData = model('User')->field($field)->where(['id'=>$this->_user->id])->find();
+        $userData = model('User')->field($field)->with(['userauth'])->where(['id'=>$this->_user->id])->find();
         foreach ($fieldArr as $key => $value) {
             $userinfo[$value] = isset($userData[$value]) ? $userData[$value] : '';
         }
         $userAlipay = isset($user['useralipay']) ? $user['useralipay'] : [];
         $userBank = isset($user['userbank']) ? $user['userbank'] : [];
+        $userinfo['realname'] = isset($userData['userauth']['realname']) ? $userData['userauth']['realname'] : '';
+        $userinfo['idcard'] = isset($userData['userauth']['idcard']) ? $userData['userauth']['idcard'] : '';
         $userinfo['is_pay_pwd'] = !empty($user['pay_password']) ? 1 : 0;
         $userinfo['bind_wechat'] = !empty($user['openid']) ? 1 : 0;
         $userinfo['bind_alipay'] = !empty($userAlipay) ? 1 : 0;

application/common/model/User.php

@@ -392,4 +392,9 @@ class User extends Model
     {
         return $this->hasOne('UserBank', 'user_id', 'id',[],'LEFT');
     }
+
+    public function userauth()
+    {
+        return $this->hasOne('UserAuth', 'user_id', 'id',[],'LEFT');
+    }
 }

application/common/service/UserService.php

@@ -263,6 +263,7 @@ class UserService
                                                 'value' => $gift['value'],//购买价值
                                                 'number' => $inviteGiftNum,//数量
                                                 'get_way' => 5,//获得途径:1=活动获得,2=充值购买,3=爵位赠送,4=签到赠送,5=邀请获得
+                                                'createtime' => time(),
                                             ];
                                             $giftBackRes = model('GiftBack')->insertGetId($giftBack);
                                             if (!$giftBackRes) {

application/extra/params.php

@@ -6,5 +6,6 @@ return [
         3 => '爵位赠送',
         4 => '签到赠送',
         5 => '邀请赠送',
+        6 => '平台赠送',
     ],
 ];

public/assets/js/backend/gift/back.js

@@ -32,9 +32,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'value', title: __('Value')},
                         {field: 'is_use', title: __('Is_use'), searchList: {"1":__('Is_use 1'),"0":__('Is_use 0')}, formatter: Table.api.formatter.normal},
                         {field: 'use_time', title: __('Use_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'get_way', title: __('Get_way'), searchList: {"1":__('Get_way 1'),"2":__('Get_way 2'),"3":__('Get_way 3')}, formatter: Table.api.formatter.normal},
+                        {field: 'get_way', title: __('Get_way'), searchList: Config.getWayList, formatter: Table.api.formatter.normal},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        //{field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]
             });
@@ -43,13 +43,32 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             Table.api.bindevent(table);
         },
         add: function () {
+            $(document).on('change', "#c-gift_id", function () {
+                var that = this;
+                $.ajax({
+                    url:"gift/gift/index",
+                    method:'post',
+                    data:{
+                        id: $(that).val(),
+                    },
+                    success:function(res){
+                        var row = res.rows[0];
+                        $("#c-name").val(row.name);
+                        $("#c-image").val(row.image);
+                        $("#c-gif_image").val(row.special);
+                        $("#c-value").val(row.value);
+                    }
+                });
+            });
             Controller.api.bindevent();
         },
         edit: function () {
             Controller.api.bindevent();
         },
         api: {
+            //选择用户自动获取联系人电话
             bindevent: function () {
+
                 Form.api.bindevent($("form[role=form]"));
             }
         }