刘朕 / qiaohu · 提交

转到一个项目

作者 刘朕
提交 5c20ddc7acc127e387f5df037e28d845b271aee1 2 个父辈 bbbc126c ed550489

合并分支 '1iuzhen' 到 'master' 

1iuzhen



查看合并请求 !13
内嵌 并排对比
正在显示 2 个修改的文件 包含 18 行增加 和 10 行删除
... ... @@ -105,6 +105,9 @@ class MemberController extends AdminBaseController
$this->error('参数错误');
}
$info = $this->singleData($this->table,['id'=>$id,'delete_time'=>0]);
if(!empty($info['channel_id'])) {
$info['channel_name'] = Db::name('Channel')->where(['id'=>$info['channel_id']])->value('name');
}
$this->assign($info);
return $this->fetch();
}
... ...
<include file="public@header" />
<style>
.pad-top {
padding-top: 7px;
}
</style>
</head>
<body>
<div class="wrap">
... ... @@ -9,7 +14,7 @@
<form method="post" class="form-horizontal js-ajax-form margin-top-20" action="{:url('Member/editPost')}">
<div class="form-group">
<label for="input-user_login" class="col-sm-2 control-label"><span class="form-required">*</span>账号</label>
<div class="col-md-6 col-sm-10">
<div class="col-md-6 col-sm-10 pad-top">
{$user_login}
<!--<input type="text" class="form-control" id="input-user_login" value="{$user_login}" name="user_login">-->
</div>
... ... @@ -22,49 +27,49 @@
<!--</div>-->
<div class="form-group">
<label for="input-user_login" class="col-sm-2 control-label"><span class="form-required">*</span>宝宝姓名</label>
<div class="col-md-6 col-sm-10">
<div class="col-md-6 col-sm-10 pad-top">
{$baby_name}
<!--<input type="text" class="form-control" id="input-user_login" value="{$user_login}" name="user_login">-->
</div>
</div>
<div class="form-group">
<label for="input-user_login" class="col-sm-2 control-label"><span class="form-required">*</span>宝宝生日</label>
<div class="col-md-6 col-sm-10">
<div class="col-md-6 col-sm-10 pad-top">
{$baby_birth}
<!--<input type="text" class="form-control" id="input-user_login" value="{$user_login}" name="user_login">-->
</div>
</div>
<div class="form-group">
<label for="input-user_login" class="col-sm-2 control-label"><span class="form-required">*</span>家长姓名</label>
<div class="col-md-6 col-sm-10">
<div class="col-md-6 col-sm-10 pad-top">
{$parent_name}
<!--<input type="text" class="form-control" id="input-user_login" value="{$user_login}" name="user_login">-->
</div>
</div>
<div class="form-group">
<label for="input-user_login" class="col-sm-2 control-label"><span class="form-required">*</span>家长身份</label>
<div class="col-md-6 col-sm-10">
<div class="col-md-6 col-sm-10 pad-top">
{$parent_status}
<!--<input type="text" class="form-control" id="input-user_login" value="{$user_login}" name="user_login">-->
</div>
</div>
<div class="form-group">
<label for="input-user_login" class="col-sm-2 control-label"><span class="form-required">*</span>是否为巧虎会员</label>
<div class="col-md-6 col-sm-10">
<div class="col-md-6 col-sm-10 pad-top">
<eq name="is_member" value="1">是</eq><eq name="is_member" value="0">否</eq>
<!--<input type="text" class="form-control" id="input-user_login" value="{$user_login}" name="user_login">-->
</div>
</div>
<div class="form-group">
<label for="input-user_login" class="col-sm-2 control-label"><span class="form-required">*</span>注册渠道</label>
<div class="col-md-6 col-sm-10">
<eq name="channel" value="1">站内</eq><eq name="channel" value="2">淘宝</eq><eq name="channel" value="3">京东</eq>
<!--<input type="text" class="form-control" id="input-user_login" value="{$user_login}" name="user_login">-->
<div class="col-md-6 col-sm-10 pad-top">
<empty name="channel_name">站内<else/>{$channel_name}</empty>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<button type="submit" class="btn btn-primary js-ajax-submit">{:lang('EDIT')}</button>
<!--<button type="submit" class="btn btn-primary js-ajax-submit">{:lang('EDIT')}</button>-->
<a class="btn btn-default" href="{:url('Member/index')}">{:lang('BACK')}</a>
</div>
</div>
</form>
... ...