Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
jamesyang1999
ShopXO
提交
33d0c96d
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,发现更多精彩内容 >>
提交
33d0c96d
编写于
11月 26, 2018
作者:
D
devil_gong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
user
上级
0da65643
变更
15
隐藏空白更改
内联
并排
Showing
15 changed file
with
141 addition
and
17 deletion
+141
-17
alipay/app.acss
alipay/app.acss
+1
-1
alipay/components/home-banner/home-banner.axml
alipay/components/home-banner/home-banner.axml
+1
-1
alipay/components/home-nav/home-nav.axml
alipay/components/home-nav/home-nav.axml
+1
-1
alipay/images/tips.png
alipay/images/tips.png
+0
-0
alipay/pages/index/index.axml
alipay/pages/index/index.axml
+6
-1
alipay/pages/index/index.js
alipay/pages/index/index.js
+8
-4
service/Application/Admin/Controller/AppConfigController.class.php
...pplication/Admin/Controller/AppConfigController.class.php
+64
-0
service/Application/Admin/View/Default/AppConfig/Index.html
service/Application/Admin/View/Default/AppConfig/Index.html
+31
-0
service/Application/Admin/View/Default/AppMiniAlipayConfig/Index.html
...ication/Admin/View/Default/AppMiniAlipayConfig/Index.html
+0
-4
service/Application/Admin/View/Default/Config/Index.html
service/Application/Admin/View/Default/Config/Index.html
+5
-0
service/Application/Api/Controller/IndexController.class.php
service/Application/Api/Controller/IndexController.class.php
+6
-2
service/Application/Api/Controller/UserController.class.php
service/Application/Api/Controller/UserController.class.php
+2
-2
service/Application/Home/Controller/CommonController.class.php
...ce/Application/Home/Controller/CommonController.class.php
+3
-0
service/Application/Home/View/Default/Public/Header.html
service/Application/Home/View/Default/Public/Header.html
+8
-1
service/Public/Home/Default/Css/Common.css
service/Public/Home/Default/Css/Common.css
+5
-0
未找到文件。
alipay/app.acss
浏览文件 @
33d0c96d
...
...
@@ -72,7 +72,7 @@ textarea {
.nav-submit-fixed { background: #eee; height: 46px; position: fixed; bottom: 0; z-index: 10; }
.tips { background: #ffffeb url('/images/tips.png') no-repeat 5rpx 1
6rpx; background-size: 26rpx 26rpx; color: #f7b240; border: 1px solid #faebd2; line-height: 36rpx; padding: 5px 5px 5px 15
px; font-size: 26rpx; border-radius: 2px; display: block; }
.tips { background: #ffffeb url('/images/tips.png') no-repeat 5rpx 1
2rpx; background-size: 35rpx 35rpx; color: #f7b240; border: 1px solid #faebd2; line-height: 36rpx; padding: 5px 5px 5px 20
px; font-size: 26rpx; border-radius: 2px; display: block; }
.data-loding image { width: 60px; height: 60px; background-size: 80% 80% !important; }
...
...
alipay/components/home-banner/home-banner.axml
浏览文件 @
33d0c96d
...
...
@@ -13,7 +13,7 @@
</block>
</swiper>
<view a:if="{{data_list_loding_status
!= 0
}}">
<view a:if="{{data_list_loding_status
== 2
}}">
<import src="/pages/common/nodata.axml" />
<template is="nodata" data="{{status: data_list_loding_status}}"></template>
</view>
\ No newline at end of file
alipay/components/home-nav/home-nav.axml
浏览文件 @
33d0c96d
...
...
@@ -9,7 +9,7 @@
</view>
</view>
<view a:if="{{data_list_loding_status
!= 0
}}">
<view a:if="{{data_list_loding_status
== 2
}}">
<import src="/pages/common/nodata.axml" />
<template is="nodata" data="{{status: data_list_loding_status}}"></template>
</view>
alipay/images/tips.png
100755 → 100644
查看替换文件 @
0da65643
浏览文件 @
33d0c96d
3.1 KB
|
W:
|
H:
2.6 KB
|
W:
|
H:
2-up
Swipe
Onion skin
alipay/pages/index/index.axml
浏览文件 @
33d0c96d
<!-- 搜索 -->
<view class="search wh-auto">
<view
a:if="{{data_list_loding_status != 1 && is_enable_search == 1}}"
class="search wh-auto">
<view class="search-content bg-white oh">
<icon type="search" size="16" />
<input type="text" confirm-type="search" placeholder="其实搜索很简单^_^!" class="wh-auto cr-888" onConfirm="search_input_event" />
</view>
</view>
<!-- 商城公告 -->
<view a:if="{{common_shop_notice != null}}">
<view class="tips">{{common_shop_notice}}</view>
</view>
<!-- 轮播 -->
<component-home-banner />
...
...
alipay/pages/index/index.js
浏览文件 @
33d0c96d
...
...
@@ -9,6 +9,8 @@ Page({
data_list_loding_status
:
1
,
data_bottom_line_status
:
false
,
data_list
:
[],
common_shop_notice
:
null
,
is_enable_search
:
1
,
load_status
:
0
,
},
...
...
@@ -38,10 +40,12 @@ Page({
if
(
res
.
data
.
code
==
0
)
{
var
data
=
res
.
data
.
data
;
self
.
setData
({
data_list
:
data
,
indicator_dots
:
(
data
.
length
>
1
),
autoplay
:
(
data
.
length
>
1
),
data_list_loding_status
:
data
.
length
==
0
?
0
:
3
,
data_list
:
data
.
data_list
,
indicator_dots
:
(
data
.
data_list
.
length
>
1
),
autoplay
:
(
data
.
data_list
.
length
>
1
),
common_shop_notice
:
data
.
common_shop_notice
||
null
,
is_enable_search
:
data
.
is_enable_search
,
data_list_loding_status
:
data
.
data_list
.
length
==
0
?
0
:
3
,
data_bottom_line_status
:
true
,
});
}
else
{
...
...
service/Application/Admin/Controller/AppConfigController.class.php
0 → 100755
浏览文件 @
33d0c96d
<?php
namespace
Admin\Controller
;
/**
* 手机端 - 配置
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
class
AppConfigController
extends
CommonController
{
/**
* [_initialize 前置操作-继承公共前置方法]
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
* @datetime 2016-12-03T12:39:08+0800
*/
public
function
_initialize
()
{
// 调用父类前置方法
parent
::
_initialize
();
// 登录校验
$this
->
Is_Login
();
// 权限校验
$this
->
Is_Power
();
}
/**
* [Index 配置列表]
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
* @datetime 2016-12-06T21:31:53+0800
*/
public
function
Index
()
{
// 配置信息
$data
=
M
(
'Config'
)
->
getField
(
'only_tag,name,describe,value,error_tips'
);
$this
->
assign
(
'data'
,
$data
);
// 是否
$this
->
assign
(
'common_is_text_list'
,
L
(
'common_is_text_list'
));
$this
->
display
(
'Index'
);
}
/**
* [Save 配置数据保存]
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
* @datetime 2017-01-02T23:08:19+0800
*/
public
function
Save
()
{
$this
->
MyConfigSave
();
}
}
?>
\ No newline at end of file
service/Application/Admin/View/Default/AppConfig/Index.html
0 → 100755
浏览文件 @
33d0c96d
<include
file=
"Public/Header"
/>
<!-- right content start -->
<div
class=
"content-right"
>
<div
class=
"content"
>
<!-- form start -->
<form
class=
"am-form form-validation view-save"
action=
"{{:U('Admin/AppConfig/Save')}}"
method=
"POST"
request-type=
"ajax-url"
request-value=
"{{:U('Admin/AppConfig/Index')}}"
>
<div
class=
"am-form-group"
>
<label>
{{$data.common_app_is_enable_search.name}}
</label>
<select
name=
"{{$data.common_app_is_enable_search.only_tag}}"
class=
"am-radius chosen-select c-p"
data-validation-message=
"{{$data.common_app_is_enable_search.error_tips}}"
required
>
<foreach
name=
"common_is_text_list"
item=
"v"
>
<option
value=
"{{$v.id}}"
<
if
condition=
"isset($data['common_app_is_enable_search']['value']) and $data['common_app_is_enable_search']['value'] eq $v['id']"
>
selected
</if>
>{{$v.name}}
</option>
</foreach>
</select>
</div>
<div
class=
"am-form-group"
>
<label>
{{$data.common_app_customer_service_tel.name}}
</label>
<input
type=
"text"
name=
"{{$data.common_app_customer_service_tel.only_tag}}"
placeholder=
"{{$data.common_app_customer_service_tel.name}}"
data-validation-message=
"{{$data.common_app_customer_service_tel.error_tips}}"
class=
"am-radius"
<
present
name=
"data"
>
value="{{$data.common_app_customer_service_tel.value}}"
</present>
/>
</div>
<div
class=
"am-form-group"
>
<button
type=
"submit"
class=
"am-btn am-btn-primary am-radius btn-loading-example am-btn-sm w100"
data-am-loading=
"{loadingText:'{{:L('common_form_loading_tips')}}'}"
>
{{:L('common_operation_save')}}
</button>
</div>
</form>
<!-- form end -->
</div>
</div>
<!-- right content end -->
<!-- footer start -->
<include
file=
"Public/Footer"
/>
<!-- footer end -->
\ No newline at end of file
service/Application/Admin/View/Default/AppMiniAlipayConfig/Index.html
浏览文件 @
33d0c96d
...
...
@@ -30,10 +30,6 @@
<label>
{{$data.common_app_mini_alipay_describe.name}}
</label>
<input
type=
"text"
name=
"{{$data.common_app_mini_alipay_describe.only_tag}}"
placeholder=
"{{$data.common_app_mini_alipay_describe.name}}"
data-validation-message=
"{{$data.common_app_mini_alipay_describe.error_tips}}"
class=
"am-radius"
<
present
name=
"data"
>
value="{{$data.common_app_mini_alipay_describe.value}}"
</present>
required />
</div>
<div
class=
"am-form-group"
>
<label>
{{$data.common_app_mini_alipay_customer_service_tel.name}}
</label>
<input
type=
"text"
name=
"{{$data.common_app_mini_alipay_customer_service_tel.only_tag}}"
placeholder=
"{{$data.common_app_mini_alipay_customer_service_tel.name}}"
data-validation-message=
"{{$data.common_app_mini_alipay_customer_service_tel.error_tips}}"
class=
"am-radius"
<
present
name=
"data"
>
value="{{$data.common_app_mini_alipay_customer_service_tel.value}}"
</present>
/>
</div>
<div
class=
"am-form-group"
>
<button
type=
"submit"
class=
"am-btn am-btn-primary am-radius btn-loading-example am-btn-sm w100"
data-am-loading=
"{loadingText:'{{:L('common_form_loading_tips')}}'}"
>
{{:L('common_operation_save')}}
</button>
</div>
...
...
service/Application/Admin/View/Default/Config/Index.html
浏览文件 @
33d0c96d
...
...
@@ -53,10 +53,15 @@
<label>{{$data.common_share_view_desc.name}}</label>
<textarea rows="3" name="{{$data.common_share_view_desc.only_tag}}" class="am-radius" placeholder="{{$data.common_share_view_desc.name}}" data-validation-message="{{$data.common_share_view_desc.error_tips}}"><present name="data">{{$data.common_share_view_desc.value}}</present></textarea>
</div> -->
<div
class=
"am-form-group"
>
<label>
{{$data.common_shop_notice.name}}
<span
class=
"fs-12 fw-100 cr-999"
>
({{$data.common_shop_notice.describe}})
</span></label>
<textarea
rows=
"3"
name=
"{{$data.common_shop_notice.only_tag}}"
class=
"am-radius"
placeholder=
"{{$data.common_shop_notice.name}}"
data-validation-message=
"{{$data.common_shop_notice.error_tips}}"
><present
name=
"data"
>
{{$data.common_shop_notice.value}}
</present></textarea>
</div>
<div
class=
"am-form-group"
>
<label>
{{$data.common_user_center_notice.name}}
<span
class=
"fs-12 fw-100 cr-999"
>
({{$data.common_user_center_notice.describe}})
</span></label>
<textarea
rows=
"3"
name=
"{{$data.common_user_center_notice.only_tag}}"
class=
"am-radius"
placeholder=
"{{$data.common_user_center_notice.name}}"
data-validation-message=
"{{$data.common_user_center_notice.error_tips}}"
><present
name=
"data"
>
{{$data.common_user_center_notice.value}}
</present></textarea>
</div>
<div
class=
"am-form-group"
>
<label>
{{$data.home_search_keywords_type.name}}
</label>
<select
name=
"{{$data.home_search_keywords_type.only_tag}}"
class=
"am-radius chosen-select c-p"
data-validation-message=
"{{$data.home_search_keywords_type.error_tips}}"
>
...
...
service/Application/Api/Controller/IndexController.class.php
浏览文件 @
33d0c96d
...
...
@@ -41,10 +41,14 @@ class IndexController extends CommonController
*/
public
function
Index
()
{
$data
=
GoodsService
::
HomeFloorList
();
$result
=
[
'data_list'
=>
GoodsService
::
HomeFloorList
(),
'common_shop_notice'
=>
MyC
(
'common_shop_notice'
,
null
,
true
),
'is_enable_search'
=>
MyC
(
'common_app_is_enable_search'
,
1
),
];
// 返回数据
$this
->
ajaxReturn
(
L
(
'common_operation_success'
),
0
,
$
data
);
$this
->
ajaxReturn
(
L
(
'common_operation_success'
),
0
,
$
result
);
}
}
?>
\ No newline at end of file
service/Application/Api/Controller/UserController.class.php
浏览文件 @
33d0c96d
...
...
@@ -265,8 +265,8 @@ class UserController extends CommonController
'avatar'
=>
$this
->
user
[
'avatar'
],
'nickname'
=>
$this
->
user
[
'nickname'
],
'username'
=>
$this
->
user
[
'username'
],
'customer_service_tel'
=>
MyC
(
'common_app_
mini_alipay_customer_service_tel'
),
'common_user_center_notice'
=>
MyC
(
'common_user_center_notice'
),
'customer_service_tel'
=>
MyC
(
'common_app_
customer_service_tel'
,
null
,
true
),
'common_user_center_notice'
=>
MyC
(
'common_user_center_notice'
,
null
,
true
),
'user_order_status'
=>
$user_order_status
[
'data'
],
'user_order_count'
=>
$user_order_count
,
'user_goods_favor_count'
=>
$user_goods_favor_count
,
...
...
service/Application/Home/Controller/CommonController.class.php
浏览文件 @
33d0c96d
...
...
@@ -184,6 +184,9 @@ class CommonController extends Controller
}
$this
->
assign
(
'home_search_keywords'
,
$home_search_keywords
);
// 商城公告
$this
->
assign
(
'common_shop_notice'
,
MyC
(
'common_shop_notice'
));
// 当前控制器名称
$this
->
assign
(
'controller_name'
,
CONTROLLER_NAME
);
}
...
...
service/Application/Home/View/Default/Public/Header.html
浏览文件 @
33d0c96d
...
...
@@ -30,4 +30,11 @@
var
__user_id__
=
<
if
condition
=
"
empty($user['id'])
"
>
0
<
else
/>{{$user.id}}</i
f
>
;
</script>
</head>
<body>
\ No newline at end of file
<body>
<!-- 商城公告 -->
<notempty
name=
"common_shop_notice"
>
<div
class=
"am-alert am-alert-warning am-radius common-shop-notice"
data-am-alert
>
<div
class=
"am-container"
>
{{$common_shop_notice}}
</div>
</div>
</notempty>
\ No newline at end of file
service/Public/Home/Default/Css/Common.css
浏览文件 @
33d0c96d
...
...
@@ -31,6 +31,11 @@ button { outline: none; }
font-size
:
12px
!important
;
}
/* 商城公告 */
.common-shop-notice
{
margin
:
0
;
}
/*所有超链接不要下划线*/
*,
*
:after
,
*
:before
{
-webkit-box-sizing
:
border-box
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录