molong/sentcms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

内核更新，多余文件清理

Browse Source
This commit is contained in:
molong
2016-07-01 18:04:46 +08:00
parent a595f3a13e
commit 0398e5bd80
31 changed files with 426 additions and 551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
application/user/controller/Order.php
View File

@@ -51,20 +51,27 @@ class Order extends User{
if (!$order_id) {
$price_count = '0.00';
$list = $this->cart->all();
foreach ($list as $key => $value) {
$price_count += $value['price_count'];
if ($list) {
foreach ($list as $key => $value) {
$price_count += $value['price_count'];
}
$data = array(
'list' => $list,
'price_count' => $price_count
);
//生成订单
$map['id'] = $this->order->createOrder($data);
}
$data = array(
'list' => $list,
'price_count' => $price_count
);
//生成订单
$map['id'] = $this->order->createOrder($data);
}else{
$map['id'] = $order_id;
}
if (!isset($map['id'])) {
return $this->error('非法操作！');
}
$order = $this->order->where($map)->find();
$data = array(

7
application/user/controller/Profile.php
View File

@@ -24,8 +24,13 @@ class Profile extends User{
}
}else{
$group['基础资料'] = $user->useredit;
$group['扩展信息'] = $user->userextend;
$info = $user->getInfo(session('user_auth.uid'));
$info = $user->where(array('uid'=>session('user_auth.uid')))->find();
if ($info->extend) {
$info = array_merge($info->toArray(), $info->extend->toArray());
}
$data = array(
'fieldGroup' => $group,
'info' => $info

2
application/user/static/css/member_login.css
View File

@@ -79,7 +79,7 @@ time { color: #777;}
.nc-login-form dl { background-color: #FFF; width: 398px; height: 52px; margin-top: -1px; border: solid 1px #E6E6E6; position: relative; z-index: 1; overflow: hidden;}
.nc-login-form dl.focus { border-color: #7ABD54; z-index: 3;}
.nc-login-form dl.error { border-color: #F87622 !important; z-index: 2;}
.nc-login-form dl dt { font-size: 14px; line-height: 20px; color: #666; width: 72px; padding: 16px 0 16px 20px; float: left;}
.nc-login-form dl dt { font-size: 14px; line-height: 20px; color: #333333; width: 72px; padding: 16px 0 16px 20px; float: left;}
.nc-login-form dl dd { height: 28px; float: left; padding: 12px 0;}
.nc-login-form dl dd .text { font-family: "microsoft yahei"; font-size: 14px; line-height: 28px; width: 290px; height: 28px; padding: 0; border: none 0;}

2
application/user/view/login/index.html
View File

@@ -39,7 +39,7 @@
<dl>
<dt>账&nbsp;&nbsp;&nbsp;号：</dt>
<dd>
<input type="text" class="text" autocomplete="off" name="username" placeholder="用户名/邮箱" id="username" >
<input type="text" class="text" autocomplete="off" name="username" placeholder="用户名/邮箱/手机号码" id="username" >
</dd>
</dl>
<dl>