Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
jamesyang1999
ShopXO
提交
219a7de5
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,发现更多精彩内容 >>
提交
219a7de5
编写于
5月 13, 2019
作者:
D
devil_gong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
新增短信,邮箱通用模板
上级
cccb8677
变更
6
展开全部
显示空白变更内容
内联
并排
Showing
6 changed file
with
25 addition
and
15 deletion
+25
-15
application/admin/view/default/email/message.html
application/admin/view/default/email/message.html
+4
-0
application/admin/view/default/sms/message.html
application/admin/view/default/sms/message.html
+4
-0
application/plugins/wallet/service/CashService.php
application/plugins/wallet/service/CashService.php
+2
-2
application/service/ConfigService.php
application/service/ConfigService.php
+1
-0
config/shopxo.sql
config/shopxo.sql
+13
-13
public/static/admin/default/js/email.js
public/static/admin/default/js/email.js
+1
-0
未找到文件。
application/admin/view/default/email/message.html
浏览文件 @
219a7de5
...
...
@@ -9,6 +9,10 @@
<!-- form start -->
<form
class=
"am-form form-validation view-save"
action=
"{{:MyUrl('admin/email/save')}}"
method=
"POST"
request-type=
"ajax-url"
request-value=
"{{:MyUrl('admin/email/index', ['type'=>'message'])}}"
>
<div
class=
"am-form-group"
>
<label>
{{$data.common_email_currency_template.name}}
<span
class=
"am-form-group-label-tips"
>
{{$data.common_email_currency_template.describe}}
</span></label>
<script
type=
"text/plain"
id=
"common_email_currency_template"
name=
"{{$data.common_email_currency_template.only_tag}}"
>
{{
if
!
empty
(
$data
)}}{{
$data
.
common_email_currency_template
.
value
|
raw
}}{{
/
if
}}
</script>
</div>
<div
class=
"am-form-group"
>
<label>
{{$data.home_email_user_reg.name}}
<span
class=
"am-form-group-label-tips"
>
{{$data.home_email_user_reg.describe}}
</span></label>
<script
type=
"text/plain"
id=
"email_user_reg"
name=
"{{$data.home_email_user_reg.only_tag}}"
>
{{
if
!
empty
(
$data
)}}{{
$data
.
home_email_user_reg
.
value
|
raw
}}{{
/
if
}}
</script>
...
...
application/admin/view/default/sms/message.html
浏览文件 @
219a7de5
...
...
@@ -9,6 +9,10 @@
<!-- form start -->
<form
class=
"am-form form-validation view-save"
action=
"{{:MyUrl('admin/sms/save')}}"
method=
"POST"
request-type=
"ajax-url"
request-value=
"{{:MyUrl('admin/sms/index', ['type'=>'message'])}}"
>
<div
class=
"am-form-group"
>
<label>
{{$data.common_sms_currency_template.name}}
<span
class=
"am-form-group-label-tips"
>
{{$data.common_sms_currency_template.describe}}
</span></label>
<input
type=
"text"
name=
"{{$data.common_sms_currency_template.only_tag}}"
placeholder=
"{{$data.common_sms_currency_template.name}}"
data-validation-message=
"{{$data.common_sms_currency_template.error_tips}}"
class=
"am-radius"
{{
if
!
empty
($
data
)}}
value=
"{{$data.common_sms_currency_template.value}}"
{{/
if
}}
/>
</div>
<div
class=
"am-form-group"
>
<label>
{{$data.home_sms_user_reg.name}}
<span
class=
"am-form-group-label-tips"
>
{{$data.home_sms_user_reg.describe}}
</span></label>
<input
type=
"text"
name=
"{{$data.home_sms_user_reg.only_tag}}"
placeholder=
"{{$data.home_sms_user_reg.name}}"
data-validation-message=
"{{$data.home_sms_user_reg.error_tips}}"
class=
"am-radius"
{{
if
!
empty
($
data
)}}
value=
"{{$data.home_sms_user_reg.value}}"
{{/
if
}}
/>
...
...
application/plugins/wallet/service/CashService.php
浏览文件 @
219a7de5
...
...
@@ -92,12 +92,12 @@ class CashService
if
(
$params
[
'account_type'
]
==
'mobile'
)
{
$obj
=
new
\
base\Sms
(
$verify_params
);
$status
=
$obj
->
SendCode
(
$accounts
,
$code
,
MyC
(
'
home_sms_user_mobile_binding
'
));
$status
=
$obj
->
SendCode
(
$accounts
,
$code
,
MyC
(
'
common_sms_currency_template
'
));
}
else
{
$obj
=
new
\
base\Email
(
$verify_params
);
$email_params
=
array
(
'email'
=>
$accounts
,
'content'
=>
MyC
(
'
home_email_user_email_binding
'
),
'content'
=>
MyC
(
'
common_email_currency_template
'
),
'title'
=>
MyC
(
'home_site_name'
)
.
' - 账户安全认证'
,
'code'
=>
$code
,
);
...
...
application/service/ConfigService.php
浏览文件 @
219a7de5
...
...
@@ -78,6 +78,7 @@ class ConfigService
// 不实例化的字段
$no_all
=
array
(
'home_footer_info'
,
'common_email_currency_template'
,
'home_email_user_reg'
,
'home_email_user_forget_pwd'
,
'home_email_user_email_binding'
,
...
...
config/shopxo.sql
浏览文件 @
219a7de5
此差异已折叠。
点击以展开。
public/static/admin/default/js/email.js
浏览文件 @
219a7de5
...
...
@@ -45,6 +45,7 @@ $(function()
toolbars
:
toolbars
,
initialFrameHeight
:
150
}
UE
.
getEditor
(
'
common_email_currency_template
'
,
config
);
UE
.
getEditor
(
'
email_user_reg
'
,
config
);
UE
.
getEditor
(
'
email_user_forget_pwd
'
,
config
);
UE
.
getEditor
(
'
email_user_student_binding
'
,
config
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录