Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
jamesyang1999
ShopXO
提交
c510be0c
ShopXO
项目概览
jamesyang1999
/
ShopXO
与 Fork 源项目一致
Fork自
纵之格 / ShopXO
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
ShopXO
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c510be0c
编写于
12月 24, 2019
作者:
D
devil_gong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
用户中心新增浏览器标题
上级
de4abd7d
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
75 addition
and
0 deletion
+75
-0
application/index/controller/Answer.php
application/index/controller/Answer.php
+4
-0
application/index/controller/Cart.php
application/index/controller/Cart.php
+4
-0
application/index/controller/Message.php
application/index/controller/Message.php
+4
-0
application/index/controller/Order.php
application/index/controller/Order.php
+4
-0
application/index/controller/Orderaftersale.php
application/index/controller/Orderaftersale.php
+4
-0
application/index/controller/Personal.php
application/index/controller/Personal.php
+9
-0
application/index/controller/Safety.php
application/index/controller/Safety.php
+24
-0
application/index/controller/Useraddress.php
application/index/controller/Useraddress.php
+6
-0
application/index/controller/Userfavor.php
application/index/controller/Userfavor.php
+4
-0
application/index/controller/Usergoodsbrowse.php
application/index/controller/Usergoodsbrowse.php
+4
-0
application/index/controller/Userintegral.php
application/index/controller/Userintegral.php
+4
-0
application/index/view/default/user/index.html
application/index/view/default/user/index.html
+3
-0
public/static/index/default/css/user.index.css
public/static/index/default/css/user.index.css
+1
-0
未找到文件。
application/index/controller/Answer.php
浏览文件 @
c510be0c
...
@@ -10,6 +10,7 @@
...
@@ -10,6 +10,7 @@
// +----------------------------------------------------------------------
// +----------------------------------------------------------------------
namespace
app\index\controller
;
namespace
app\index\controller
;
use
app\service\SeoService
;
use
app\service\AnswerService
;
use
app\service\AnswerService
;
/**
/**
...
@@ -84,6 +85,9 @@ class Answer extends Common
...
@@ -84,6 +85,9 @@ class Answer extends Common
$this
->
assign
(
'common_is_show_list'
,
lang
(
'common_is_show_list'
));
$this
->
assign
(
'common_is_show_list'
,
lang
(
'common_is_show_list'
));
$this
->
assign
(
'common_is_text_list'
,
lang
(
'common_is_text_list'
));
$this
->
assign
(
'common_is_text_list'
,
lang
(
'common_is_text_list'
));
// 浏览器名称
$this
->
assign
(
'home_seo_site_title'
,
SeoService
::
BrowserSeoTitle
(
'问答/留言'
,
1
));
// 参数
// 参数
$this
->
assign
(
'params'
,
$params
);
$this
->
assign
(
'params'
,
$params
);
return
$this
->
fetch
();
return
$this
->
fetch
();
...
...
application/index/controller/Cart.php
浏览文件 @
c510be0c
...
@@ -11,6 +11,7 @@
...
@@ -11,6 +11,7 @@
namespace
app\index\controller
;
namespace
app\index\controller
;
use
app\service\BuyService
;
use
app\service\BuyService
;
use
app\service\SeoService
;
/**
/**
* 购物车
* 购物车
...
@@ -55,6 +56,9 @@ class Cart extends Common
...
@@ -55,6 +56,9 @@ class Cart extends Common
'ids'
=>
empty
(
$cart_list
[
'data'
])
?
''
:
implode
(
','
,
array_column
(
$cart_list
[
'data'
],
'id'
)),
'ids'
=>
empty
(
$cart_list
[
'data'
])
?
''
:
implode
(
','
,
array_column
(
$cart_list
[
'data'
],
'id'
)),
];
];
$this
->
assign
(
'base'
,
$base
);
$this
->
assign
(
'base'
,
$base
);
// 浏览器名称
$this
->
assign
(
'home_seo_site_title'
,
SeoService
::
BrowserSeoTitle
(
'购物车'
,
1
));
return
$this
->
fetch
();
return
$this
->
fetch
();
}
}
...
...
application/index/controller/Message.php
浏览文件 @
c510be0c
...
@@ -10,6 +10,7 @@
...
@@ -10,6 +10,7 @@
// +----------------------------------------------------------------------
// +----------------------------------------------------------------------
namespace
app\index\controller
;
namespace
app\index\controller
;
use
app\service\SeoService
;
use
app\service\MessageService
;
use
app\service\MessageService
;
/**
/**
...
@@ -92,6 +93,9 @@ class Message extends Common
...
@@ -92,6 +93,9 @@ class Message extends Common
// 是否已读
// 是否已读
$this
->
assign
(
'common_is_read_list'
,
lang
(
'common_is_read_list'
));
$this
->
assign
(
'common_is_read_list'
,
lang
(
'common_is_read_list'
));
// 浏览器名称
$this
->
assign
(
'home_seo_site_title'
,
SeoService
::
BrowserSeoTitle
(
'我的消息'
,
1
));
// 参数
// 参数
$this
->
assign
(
'params'
,
$params
);
$this
->
assign
(
'params'
,
$params
);
return
$this
->
fetch
();
return
$this
->
fetch
();
...
...
application/index/controller/Order.php
浏览文件 @
c510be0c
...
@@ -14,6 +14,7 @@ use app\service\OrderService;
...
@@ -14,6 +14,7 @@ use app\service\OrderService;
use
app\service\PaymentService
;
use
app\service\PaymentService
;
use
app\service\GoodsCommentsService
;
use
app\service\GoodsCommentsService
;
use
app\service\ConfigService
;
use
app\service\ConfigService
;
use
app\service\SeoService
;
/**
/**
* 订单管理
* 订单管理
...
@@ -97,6 +98,9 @@ class Order extends Common
...
@@ -97,6 +98,9 @@ class Order extends Common
// 评价状态
// 评价状态
$this
->
assign
(
'common_comments_status_list'
,
lang
(
'common_comments_status_list'
));
$this
->
assign
(
'common_comments_status_list'
,
lang
(
'common_comments_status_list'
));
// 浏览器名称
$this
->
assign
(
'home_seo_site_title'
,
SeoService
::
BrowserSeoTitle
(
'我的订单'
,
1
));
// 参数
// 参数
$this
->
assign
(
'params'
,
$params
);
$this
->
assign
(
'params'
,
$params
);
return
$this
->
fetch
();
return
$this
->
fetch
();
...
...
application/index/controller/Orderaftersale.php
浏览文件 @
c510be0c
...
@@ -11,6 +11,7 @@
...
@@ -11,6 +11,7 @@
namespace
app\index\controller
;
namespace
app\index\controller
;
use
app\service\OrderAftersaleService
;
use
app\service\OrderAftersaleService
;
use
app\service\SeoService
;
/**
/**
* 订单售后
* 订单售后
...
@@ -86,6 +87,9 @@ class Orderaftersale extends Common
...
@@ -86,6 +87,9 @@ class Orderaftersale extends Common
$this
->
assign
(
'common_order_aftersale_status_list'
,
lang
(
'common_order_aftersale_status_list'
));
$this
->
assign
(
'common_order_aftersale_status_list'
,
lang
(
'common_order_aftersale_status_list'
));
$this
->
assign
(
'common_order_aftersale_refundment_list'
,
lang
(
'common_order_aftersale_refundment_list'
));
$this
->
assign
(
'common_order_aftersale_refundment_list'
,
lang
(
'common_order_aftersale_refundment_list'
));
// 浏览器名称
$this
->
assign
(
'home_seo_site_title'
,
SeoService
::
BrowserSeoTitle
(
'订单售后'
,
1
));
// 参数
// 参数
$this
->
assign
(
'params'
,
$params
);
$this
->
assign
(
'params'
,
$params
);
return
$this
->
fetch
();
return
$this
->
fetch
();
...
...
application/index/controller/Personal.php
浏览文件 @
c510be0c
...
@@ -10,6 +10,7 @@
...
@@ -10,6 +10,7 @@
// +----------------------------------------------------------------------
// +----------------------------------------------------------------------
namespace
app\index\controller
;
namespace
app\index\controller
;
use
app\service\SeoService
;
use
app\service\UserService
;
use
app\service\UserService
;
use
app\service\NavigationService
;
use
app\service\NavigationService
;
...
@@ -47,7 +48,12 @@ class Personal extends Common
...
@@ -47,7 +48,12 @@ class Personal extends Common
*/
*/
public
function
Index
()
public
function
Index
()
{
{
// 用户展示数据
$this
->
assign
(
'personal_show_list'
,
NavigationService
::
UsersPersonalShowFieldList
());
$this
->
assign
(
'personal_show_list'
,
NavigationService
::
UsersPersonalShowFieldList
());
// 浏览器名称
$this
->
assign
(
'home_seo_site_title'
,
SeoService
::
BrowserSeoTitle
(
'个人资料'
,
1
));
return
$this
->
fetch
();
return
$this
->
fetch
();
}
}
...
@@ -66,6 +72,9 @@ class Personal extends Common
...
@@ -66,6 +72,9 @@ class Personal extends Common
// 数据
// 数据
$this
->
assign
(
'data'
,
$this
->
user
);
$this
->
assign
(
'data'
,
$this
->
user
);
// 浏览器名称
$this
->
assign
(
'home_seo_site_title'
,
SeoService
::
BrowserSeoTitle
(
'个人资料编辑'
,
1
));
return
$this
->
fetch
();
return
$this
->
fetch
();
}
}
...
...
application/index/controller/Safety.php
浏览文件 @
c510be0c
...
@@ -10,6 +10,7 @@
...
@@ -10,6 +10,7 @@
// +----------------------------------------------------------------------
// +----------------------------------------------------------------------
namespace
app\index\controller
;
namespace
app\index\controller
;
use
app\service\SeoService
;
use
app\service\SafetyService
;
use
app\service\SafetyService
;
use
app\service\NavigationService
;
use
app\service\NavigationService
;
...
@@ -56,6 +57,10 @@ class Safety extends Common
...
@@ -56,6 +57,10 @@ class Safety extends Common
'email'
=>
$this
->
user
[
'email_security'
],
'email'
=>
$this
->
user
[
'email_security'
],
);
);
$this
->
assign
(
'data'
,
$data
);
$this
->
assign
(
'data'
,
$data
);
// 浏览器名称
$this
->
assign
(
'home_seo_site_title'
,
SeoService
::
BrowserSeoTitle
(
'安全设置'
,
1
));
return
$this
->
fetch
();
return
$this
->
fetch
();
}
}
...
@@ -68,6 +73,9 @@ class Safety extends Common
...
@@ -68,6 +73,9 @@ class Safety extends Common
*/
*/
public
function
LoginPwdInfo
()
public
function
LoginPwdInfo
()
{
{
// 浏览器名称
$this
->
assign
(
'home_seo_site_title'
,
SeoService
::
BrowserSeoTitle
(
'登录密码修改 - 安全设置'
,
1
));
return
$this
->
fetch
();
return
$this
->
fetch
();
}
}
...
@@ -84,6 +92,10 @@ class Safety extends Common
...
@@ -84,6 +92,10 @@ class Safety extends Common
{
{
return
redirect
(
MyUrl
(
'index/safety/newmobileinfo'
));
return
redirect
(
MyUrl
(
'index/safety/newmobileinfo'
));
}
}
// 浏览器名称
$this
->
assign
(
'home_seo_site_title'
,
SeoService
::
BrowserSeoTitle
(
'手机号码修改 - 安全设置'
,
1
));
return
$this
->
fetch
();
return
$this
->
fetch
();
}
}
...
@@ -100,6 +112,10 @@ class Safety extends Common
...
@@ -100,6 +112,10 @@ class Safety extends Common
{
{
return
$this
->
error
(
'原帐号校验失败'
,
MyUrl
(
'index/safety/mobileinfo'
));
return
$this
->
error
(
'原帐号校验失败'
,
MyUrl
(
'index/safety/mobileinfo'
));
}
}
// 浏览器名称
$this
->
assign
(
'home_seo_site_title'
,
SeoService
::
BrowserSeoTitle
(
'手机号码修改 - 安全设置'
,
1
));
return
$this
->
fetch
();
return
$this
->
fetch
();
}
}
...
@@ -116,6 +132,10 @@ class Safety extends Common
...
@@ -116,6 +132,10 @@ class Safety extends Common
{
{
return
redirect
(
MyUrl
(
'index/safety/newemailinfo'
));
return
redirect
(
MyUrl
(
'index/safety/newemailinfo'
));
}
}
// 浏览器名称
$this
->
assign
(
'home_seo_site_title'
,
SeoService
::
BrowserSeoTitle
(
'电子邮箱修改 - 安全设置'
,
1
));
return
$this
->
fetch
();
return
$this
->
fetch
();
}
}
...
@@ -132,6 +152,10 @@ class Safety extends Common
...
@@ -132,6 +152,10 @@ class Safety extends Common
{
{
return
$this
->
error
(
'原帐号校验失败'
,
MyUrl
(
'index/safety/emailinfo'
));
return
$this
->
error
(
'原帐号校验失败'
,
MyUrl
(
'index/safety/emailinfo'
));
}
}
// 浏览器名称
$this
->
assign
(
'home_seo_site_title'
,
SeoService
::
BrowserSeoTitle
(
'电子邮箱修改 - 安全设置'
,
1
));
return
$this
->
fetch
();
return
$this
->
fetch
();
}
}
...
...
application/index/controller/Useraddress.php
浏览文件 @
c510be0c
...
@@ -10,6 +10,7 @@
...
@@ -10,6 +10,7 @@
// +----------------------------------------------------------------------
// +----------------------------------------------------------------------
namespace
app\index\controller
;
namespace
app\index\controller
;
use
app\service\SeoService
;
use
app\service\UserService
;
use
app\service\UserService
;
/**
/**
...
@@ -46,8 +47,13 @@ class UserAddress extends Common
...
@@ -46,8 +47,13 @@ class UserAddress extends Common
*/
*/
public
function
Index
()
public
function
Index
()
{
{
// 用户地址列表
$data
=
UserService
::
UserAddressList
([
'user'
=>
$this
->
user
]);
$data
=
UserService
::
UserAddressList
([
'user'
=>
$this
->
user
]);
$this
->
assign
(
'user_address_list'
,
$data
[
'data'
]);
$this
->
assign
(
'user_address_list'
,
$data
[
'data'
]);
// 浏览器名称
$this
->
assign
(
'home_seo_site_title'
,
SeoService
::
BrowserSeoTitle
(
'我的地址'
,
1
));
return
$this
->
fetch
();
return
$this
->
fetch
();
}
}
...
...
application/index/controller/Userfavor.php
浏览文件 @
c510be0c
...
@@ -11,6 +11,7 @@
...
@@ -11,6 +11,7 @@
namespace
app\index\controller
;
namespace
app\index\controller
;
use
app\service\GoodsService
;
use
app\service\GoodsService
;
use
app\service\SeoService
;
/**
/**
* 用户收藏
* 用户收藏
...
@@ -80,6 +81,9 @@ class UserFavor extends Common
...
@@ -80,6 +81,9 @@ class UserFavor extends Common
$data
=
GoodsService
::
GoodsFavorList
(
$data_params
);
$data
=
GoodsService
::
GoodsFavorList
(
$data_params
);
$this
->
assign
(
'data_list'
,
$data
[
'data'
]);
$this
->
assign
(
'data_list'
,
$data
[
'data'
]);
// 浏览器名称
$this
->
assign
(
'home_seo_site_title'
,
SeoService
::
BrowserSeoTitle
(
'我的收藏'
,
1
));
// 参数
// 参数
$this
->
assign
(
'params'
,
$params
);
$this
->
assign
(
'params'
,
$params
);
return
$this
->
fetch
();
return
$this
->
fetch
();
...
...
application/index/controller/Usergoodsbrowse.php
浏览文件 @
c510be0c
...
@@ -10,6 +10,7 @@
...
@@ -10,6 +10,7 @@
// +----------------------------------------------------------------------
// +----------------------------------------------------------------------
namespace
app\index\controller
;
namespace
app\index\controller
;
use
app\service\SeoService
;
use
app\service\GoodsService
;
use
app\service\GoodsService
;
/**
/**
...
@@ -81,6 +82,9 @@ class UserGoodsBrowse extends Common
...
@@ -81,6 +82,9 @@ class UserGoodsBrowse extends Common
$this
->
assign
(
'data_list'
,
$data
[
'data'
]);
$this
->
assign
(
'data_list'
,
$data
[
'data'
]);
$this
->
assign
(
'ids'
,
empty
(
$data
[
'data'
])
?
''
:
implode
(
','
,
array_column
(
$data
[
'data'
],
'id'
)));
$this
->
assign
(
'ids'
,
empty
(
$data
[
'data'
])
?
''
:
implode
(
','
,
array_column
(
$data
[
'data'
],
'id'
)));
// 浏览器名称
$this
->
assign
(
'home_seo_site_title'
,
SeoService
::
BrowserSeoTitle
(
'我的足迹'
,
1
));
// 参数
// 参数
$this
->
assign
(
'params'
,
$params
);
$this
->
assign
(
'params'
,
$params
);
return
$this
->
fetch
();
return
$this
->
fetch
();
...
...
application/index/controller/Userintegral.php
浏览文件 @
c510be0c
...
@@ -11,6 +11,7 @@
...
@@ -11,6 +11,7 @@
namespace
app\index\controller
;
namespace
app\index\controller
;
use
app\service\IntegralService
;
use
app\service\IntegralService
;
use
app\service\SeoService
;
/**
/**
* 用户积分管理
* 用户积分管理
...
@@ -83,6 +84,9 @@ class UserIntegral extends Common
...
@@ -83,6 +84,9 @@ class UserIntegral extends Common
// 操作类型
// 操作类型
$this
->
assign
(
'common_integral_log_type_list'
,
lang
(
'common_integral_log_type_list'
));
$this
->
assign
(
'common_integral_log_type_list'
,
lang
(
'common_integral_log_type_list'
));
// 浏览器名称
$this
->
assign
(
'home_seo_site_title'
,
SeoService
::
BrowserSeoTitle
(
'我的积分'
,
1
));
// 参数
// 参数
$this
->
assign
(
'params'
,
$params
);
$this
->
assign
(
'params'
,
$params
);
return
$this
->
fetch
();
return
$this
->
fetch
();
...
...
application/index/view/default/user/index.html
浏览文件 @
c510be0c
...
@@ -10,6 +10,9 @@
...
@@ -10,6 +10,9 @@
<!-- search -->
<!-- search -->
{{include file="public/nav_search" /}}
{{include file="public/nav_search" /}}
<!-- header nav -->
{{include file="public/header_nav" /}}
<!-- goods category -->
<!-- goods category -->
{{include file="public/goods_category" /}}
{{include file="public/goods_category" /}}
...
...
public/static/index/default/css/user.index.css
浏览文件 @
c510be0c
...
@@ -44,6 +44,7 @@ ul.order-base li span.am-badge{position: absolute; top: -7px; left: 55%;}
...
@@ -44,6 +44,7 @@ ul.order-base li span.am-badge{position: absolute; top: -7px; left: 55%;}
* 手机
* 手机
*/
*/
@media
only
screen
and
(
max-width
:
640px
)
{
@media
only
screen
and
(
max-width
:
640px
)
{
header
{
display
:
none
;}
.am-footer
{
padding-bottom
:
50px
;}
.am-footer
{
padding-bottom
:
50px
;}
.nav-search
{
display
:
none
;}
.user-main
{
padding-top
:
0
;}
.nav-search
{
display
:
none
;}
.user-main
{
padding-top
:
0
;}
.user-content-body
{
padding
:
0
;}
.user-content-body
{
padding
:
0
;}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录