Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
飞鱼0526
ShopXO
提交
e9039d59
ShopXO
项目概览
飞鱼0526
/
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,发现更多精彩内容 >>
提交
e9039d59
编写于
6月 01, 2019
作者:
G
gongfuxiang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
细节优化
上级
b13d7d6c
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
98 addition
and
42 deletion
+98
-42
application/admin/view/default/site/orderaftersale.html
application/admin/view/default/site/orderaftersale.html
+6
-0
application/admin/view/default/site/register.html
application/admin/view/default/site/register.html
+9
-0
application/index/view/default/orderaftersale/aftersale.html
application/index/view/default/orderaftersale/aftersale.html
+4
-0
application/index/view/default/orderaftersale/delivery.html
application/index/view/default/orderaftersale/delivery.html
+4
-0
application/index/view/default/user/reg_info.html
application/index/view/default/user/reg_info.html
+25
-21
config/shopxo.sql
config/shopxo.sql
+50
-21
未找到文件。
application/admin/view/default/site/orderaftersale.html
浏览文件 @
e9039d59
...
...
@@ -18,6 +18,12 @@
<label>
{{$data.home_order_aftersale_return_money_goods_reason.name}}
<span
class=
"am-form-group-label-tips"
>
{{$data.home_order_aftersale_return_money_goods_reason.describe}}
</span></label>
<textarea
rows=
"6"
name=
"{{$data.home_order_aftersale_return_money_goods_reason.only_tag}}"
class=
"am-radius"
placeholder=
"{{$data.home_order_aftersale_return_money_goods_reason.name}}"
data-validation-message=
"{{$data.home_order_aftersale_return_money_goods_reason.error_tips}}"
>
{{if !empty($data)}}{{$data.home_order_aftersale_return_money_goods_reason.value}}{{/if}}
</textarea>
</div>
<div
class=
"am-form-group"
>
<label>
{{$data.home_order_aftersale_return_goods_address.name}}
<span
class=
"am-form-group-label-tips"
>
{{$data.home_order_aftersale_return_goods_address.describe}}
</span></label>
<input
type=
"text"
name=
"{{$data.home_order_aftersale_return_goods_address.only_tag}}"
placeholder=
"{{$data.home_order_aftersale_return_goods_address.name}}"
data-validation-message=
"{{$data.home_order_aftersale_return_goods_address.error_tips}}"
class=
"am-radius"
{{
if
!
empty
($
data
)}}
value=
"{{$data.home_order_aftersale_return_goods_address.value}}"
{{/
if
}}
/>
</div>
<div
class=
"am-form-group am-form-group-refreshing"
>
<input
type=
"hidden"
name=
"nav_type"
value=
"{{$nav_type}}"
/>
<button
type=
"submit"
class=
"am-btn am-btn-primary am-radius btn-loading-example am-btn-sm am-btn-block"
data-am-loading=
"{loadingText:'处理中...'}"
>
保存
</button>
...
...
application/admin/view/default/site/register.html
浏览文件 @
e9039d59
...
...
@@ -40,6 +40,15 @@
{{/foreach}}
</select>
</div>
<div
class=
"am-form-group"
>
<label>
{{$data.home_is_enable_userregister_agreement.name}}
</label>
<select
name=
"{{$data.home_is_enable_userregister_agreement.only_tag}}"
class=
"am-radius chosen-select c-p"
data-validation-message=
"{{$data.home_is_enable_userregister_agreement.error_tips}}"
required
>
{{foreach $site_img_verify_state_list as $v}}
<option
value=
"{{$v.value}}"
{{
if
isset
($
data
['
home_is_enable_userregister_agreement
']['
value
'])
and
$
data
['
home_is_enable_userregister_agreement
']['
value
']
eq
$
v
['
value
']}}
selected
{{/
if
}}
>
{{$v.name}}
</option>
{{/foreach}}
</select>
</div>
<div
class=
"am-form-group am-form-group-refreshing"
>
<input
type=
"hidden"
name=
"nav_type"
value=
"{{$nav_type}}"
/>
...
...
application/index/view/default/orderaftersale/aftersale.html
浏览文件 @
e9039d59
...
...
@@ -158,6 +158,10 @@
当前订单商品售后,管理员已确认,请尽快完成退货!
<a
href=
"{{:MyUrl('index/orderaftersale/index', ['keywords'=>$new_aftersale_data['order_no']])}}"
>
详情查看
</a>
<button
type=
"button"
class=
"am-btn am-btn-primary am-radius am-margin-left-sm orderaftersale-delivery-submit"
data-am-modal=
"{target: '#popup-orderaftersale-delivery'}"
data-is-auto-delivery=
"{{if isset($params['is_auto_delivery'])}}{{$params.is_auto_delivery}}{{else /}}0{{/if}}"
>
立即退货
</button>
</div>
<div
class=
"am-alert am-alert-warning"
>
<span>
退货地址:
</span>
<span
class=
"am-text-primary"
>
{{:MyC('home_order_aftersale_return_goods_address', '管理员未填写', true)}}
</span>
</div>
{{include file="orderaftersale/delivery" /}}
{{else /}}
<div
class=
"am-alert"
>
...
...
application/index/view/default/orderaftersale/delivery.html
浏览文件 @
e9039d59
...
...
@@ -5,6 +5,10 @@
<span
data-am-modal-close
class=
"am-close"
>
×
</span>
</div>
<div
class=
"am-popup-bd"
>
<div
class=
"am-alert"
>
<span>
退货地址:
</span>
<span
class=
"am-text-warning"
>
{{:MyC('home_order_aftersale_return_goods_address', '管理员未填写', true)}}
</span>
</div>
<form
class=
"am-form form-validation view-save"
action=
"{{:MyUrl('index/orderaftersale/delivery')}}"
method=
"POST"
request-type=
"ajax-reload"
>
<div
class=
"am-form-group"
>
<label>
快递名称
<span
class=
"am-form-group-label-tips-must"
>
必选
</span></label>
...
...
application/index/view/default/user/reg_info.html
浏览文件 @
e9039d59
...
...
@@ -34,9 +34,7 @@
<div
class=
"register-top"
>
{{if MyC('home_user_login_state') eq 1}}
<span>
我已经注册,现在就
</span>
<a
href=
"{{:MyUrl('index/user/logininfo')}}"
>
<button
type=
"button"
class=
"am-btn am-btn-secondary am-btn-xs am-radius"
>
登录
</button>
</a>
<a
href=
"{{:MyUrl('index/user/logininfo')}}"
class=
"am-btn am-btn-secondary am-btn-xs am-radius"
>
登录
</a>
{{/if}}
<!-- 用户注册页面钩子 -->
...
...
@@ -103,12 +101,14 @@
</div>
{{/if}}
<div
class=
"agreement"
>
<label
class=
"am-checkbox am-success c-p"
>
<input
type=
"checkbox"
value=
"1"
name=
"is_agree_agreement"
data-validation-message=
"请同意注册协议"
data-am-ucheck
required
/>
阅读并同意
</label>
<a
href=
"{{:MyUrl('index/agreement/index', ['document'=>'userregister'])}}"
target=
"_blank"
>
《服务协议》
</a>
</div>
{{if MyC('home_is_enable_userregister_agreement') eq 1}}
<div
class=
"agreement"
>
<label
class=
"am-checkbox am-success c-p"
>
<input
type=
"checkbox"
value=
"1"
name=
"is_agree_agreement"
data-validation-message=
"请同意注册协议"
data-am-ucheck
required
/>
阅读并同意
</label>
<a
href=
"{{:MyUrl('index/agreement/index', ['document'=>'userregister'])}}"
target=
"_blank"
>
《服务协议》
</a>
</div>
{{/if}}
<div
class=
"am-form-group am-form-group-refreshing business-form-block"
>
<input
type=
"hidden"
name=
"type"
value=
"username"
/>
...
...
@@ -147,12 +147,14 @@
</div>
</div>
<div
class=
"agreement"
>
<label
class=
"am-checkbox am-success c-p"
>
<input
type=
"checkbox"
value=
"1"
name=
"is_agree_agreement"
data-validation-message=
"请同意注册协议"
data-am-ucheck
required
/>
阅读并同意
</label>
<a
href=
"{{:MyUrl('index/agreement/index', ['document'=>'userregister'])}}"
target=
"_blank"
>
《服务协议》
</a>
</div>
{{if MyC('home_is_enable_userregister_agreement') eq 1}}
<div
class=
"agreement"
>
<label
class=
"am-checkbox am-success c-p"
>
<input
type=
"checkbox"
value=
"1"
name=
"is_agree_agreement"
data-validation-message=
"请同意注册协议"
data-am-ucheck
required
/>
阅读并同意
</label>
<a
href=
"{{:MyUrl('index/agreement/index', ['document'=>'userregister'])}}"
target=
"_blank"
>
《服务协议》
</a>
</div>
{{/if}}
<div
class=
"am-form-group am-form-group-refreshing business-form-block"
>
<input
type=
"hidden"
name=
"type"
value=
"sms"
/>
...
...
@@ -191,12 +193,14 @@
</div>
</div>
<div
class=
"agreement"
>
<label
class=
"am-checkbox am-success c-p"
>
<input
type=
"checkbox"
value=
"1"
name=
"is_agree_agreement"
data-validation-message=
"请同意注册协议"
data-am-ucheck
required
/>
阅读并同意
</label>
<a
href=
"{{:MyUrl('index/agreement/index', ['document'=>'userregister'])}}"
target=
"_blank"
>
《服务协议》
</a>
</div>
{{if MyC('home_is_enable_userregister_agreement') eq 1}}
<div
class=
"agreement"
>
<label
class=
"am-checkbox am-success c-p"
>
<input
type=
"checkbox"
value=
"1"
name=
"is_agree_agreement"
data-validation-message=
"请同意注册协议"
data-am-ucheck
required
/>
阅读并同意
</label>
<a
href=
"{{:MyUrl('index/agreement/index', ['document'=>'userregister'])}}"
target=
"_blank"
>
《服务协议》
</a>
</div>
{{/if}}
<div
class=
"am-form-group am-form-group-refreshing business-form-block"
>
<input
type=
"hidden"
name=
"type"
value=
"email"
/>
...
...
config/shopxo.sql
浏览文件 @
e9039d59
因为 它太大了无法显示 source diff 。你可以改为
查看blob
。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录