Skip to content

I
introducer
Commit 239faa5a authored by twj's avatar twj
Browse files
Options

twj

parent 8a5f474c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 214 additions and 90 deletions
application/admin/controller/shopro/order/Goodsorder.php
View file @ 239faa5a
......@@ -178,6 +178,8 @@ class Goodsorder extends Backend
'DBL' =>'德邦快递',
'ZJS'=>'宅急送',
'TNT'=>'TNT快递',
'JT'=>'极兔快递',
'ZT'=>'自提订单'
];
$order_id = $this->request->param('ids');
$this->view->assign('groupdata', $groupdata);
......
application/admin/controller/users/Agent.php
View file @ 239faa5a
......@@ -28,7 +28,7 @@ class Agent extends Backend
$this->Usersmodel = new \app\admin\model\users\Users();
$this->view->assign("statusList", $this->model->getStatusList());
$this->view->assign("typeList", $this->model->getTypeList());
$this->view->assign("levelList", $this->model->getLevelList());
}
......
application/admin/lang/zh-cn/users/agent.php
View file @ 239faa5a
<?php
/*
* @Author: taowj 965042433@qq.com
* @Date: 2022-11-08 16:21:34
* @LastEditors: taowj 965042433@qq.com
* @LastEditTime: 2023-08-30 15:01:36
* @FilePath: \introducer\application\admin\lang\zh-cn\users\agent.php
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
return [
'Id' => 'id',
......@@ -29,4 +37,9 @@ return [
'Authorizestatus 1' => '未授权',
'Authorizestatus 2' => '已授权',
'Authorizetime' => '授权时间',
'Level' => '商城代理级别',
'Level 0' => '普通人',
'Level 1' => '团长',
'Level 2' => '区县代理',
'Level 3' => '市代理',
];
application/admin/lang/zh-cn/users/users.php
View file @ 239faa5a
<?php
/*
* @Author: taowj 965042433@qq.com
* @Date: 2022-11-08 16:21:34
* @LastEditors: taowj 965042433@qq.com
* @LastEditTime: 2023-08-12 17:15:32
* @FilePath: \introducer\application\admin\lang\zh-cn\users\users.php
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
return [
'Id' => 'id',
......@@ -31,5 +39,8 @@ return [
'User_type app' => 'APP登录',
'Status' => '状态',
'Status 1' => '正常',
'Status 2' => '冻结'
'Status 2' => '冻结',
'Equity' => '股权',
'Equity_code' => '股权代码',
'Signtime' => '签发时间'
];
application/admin/model/users/Agent.php
View file @ 239faa5a
<?php
/*
* @Author: taowj 965042433@qq.com
* @Date: 2022-11-08 16:21:34
* @LastEditors: taowj 965042433@qq.com
* @LastEditTime: 2023-08-30 15:02:39
* @FilePath: \introducer\application\admin\model\users\Agent.php
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
namespace app\admin\model\users;
......@@ -26,7 +34,8 @@ class Agent extends Model
// 追加属性
protected $append = [
'status_text',
'type_text'
'type_text',
'level_text'
];
......@@ -40,6 +49,10 @@ class Agent extends Model
return ['1' => __('Status 1'), '2' => __('Status 2')];
}
public function getLevelList()
{
return ['0' => __('Level 0'),'1' => __('Level 1'),'2' => __('Level 2'),'3' => __('Level 3')];
}
public function getTypeTextAttr($value, $data)
{
......@@ -55,6 +68,13 @@ class Agent extends Model
return isset($list[$value]) ? $list[$value] : '';
}
public function getLevelTextAttr($value, $data)
{
$value = $value ? $value : (isset($data['level']) ? $data['level'] : '');
$list = $this->getLevelList();
return isset($list[$value]) ? $list[$value] : '';
}
public function area()
{
return self::hasOne("app\admin\model\Addr",'ID',"area_id");
......
application/admin/model/users/Users.php
View file @ 239faa5a
......@@ -30,6 +30,7 @@ class Users extends Model
'prevtime_text',
'logintime_text',
'jointime_text',
'signtime_text',
'type_text',
'user_type_text',
'status_text'
......@@ -86,6 +87,11 @@ class Users extends Model
return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
}
public function getSigntimeTextAttr($value, $data)
{
$value = $value ? $value : (isset($data['signtime']) ? $data['signtime'] : '');
return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
}
public function getTypeTextAttr($value, $data)
{
......@@ -124,6 +130,10 @@ class Users extends Model
{
return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
}
protected function setSigntimeAttr($value)
{
return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
}
/**
* @param $user_id
......
application/admin/view/users/agent/add.html
View file @ 239faa5a
......@@ -56,6 +56,18 @@
</div>
</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">
<select id="c-level" data-rule="required" min="0" class="form-control selectpicker" name="row[level]">
{foreach name="levelList" item="vo"}
<option value="{$key}" {in name="key" value="1"}selected{/in}>{$vo}</option>
{/foreach}
</select>
</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">
......
application/admin/view/users/agent/edit.html
View file @ 239faa5a
......@@ -63,6 +63,18 @@
</div>
</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">
<select id="c-level" data-rule="required" min="0" class="form-control selectpicker" name="row[level]">
{foreach name="levelList" item="vo"}
<option value="{$key}" {in name="key" value="$row.level"}selected{/in}>{$vo}</option>
{/foreach}
</select>
</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">
......
application/admin/view/users/users/edit.html
View file @ 239faa5a
......@@ -159,4 +159,29 @@
<button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Equity')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-equity" class="form-control" name="row[equity]" type="number" value="{$row.equity|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Equity_code')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-equity_code" class="form-control" name="row[equity_code]" type="text" value="{$row.equity_code|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Signtime')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-signtime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[signtime]" type="text" value="{:$row.signtime?datetime($row.signtime):''}">
</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>
application/api/controller/Users.php
View file @ 239faa5a
......@@ -813,7 +813,7 @@ class Users extends Api
->field("user.id,user.realname,agent.identity_number,
user.equity,user.equity_code,
FROM_UNIXTIME(user.signtime,'%Y-%m-%d %T') as signtime")
->where(['id' => $this->auth->id])->find();
->where(['user.id' => $this->auth->id])->find();
if (!$userInfo) {
$this->error('获取用户信息失败');
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment