diff --git a/alipay/app.acss b/alipay/app.acss index 051dae4e00002b1be2e477b7a737f2036f364b68..80ee41afddcd0841a227e7fe384ece1ac941193e 100755 --- a/alipay/app.acss +++ b/alipay/app.acss @@ -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 16rpx; background-size: 26rpx 26rpx; color: #f7b240; border: 1px solid #faebd2; line-height: 36rpx; padding: 5px 5px 5px 15px; font-size: 26rpx; border-radius: 2px; display: block; } +.tips { background: #ffffeb url('/images/tips.png') no-repeat 5rpx 12rpx; background-size: 35rpx 35rpx; color: #f7b240; border: 1px solid #faebd2; line-height: 36rpx; padding: 5px 5px 5px 20px; font-size: 26rpx; border-radius: 2px; display: block; } .data-loding image { width: 60px; height: 60px; background-size: 80% 80% !important; } diff --git a/alipay/components/home-banner/home-banner.axml b/alipay/components/home-banner/home-banner.axml index c1bb5ab6dbce2068e7498be203d323899c71391f..efbf6edf9e7a2241a12151e37f9ea37badb09f59 100644 --- a/alipay/components/home-banner/home-banner.axml +++ b/alipay/components/home-banner/home-banner.axml @@ -13,7 +13,7 @@ - + \ No newline at end of file diff --git a/alipay/components/home-nav/home-nav.axml b/alipay/components/home-nav/home-nav.axml index 8111b4135d5674dfafe162f2d3644a6a3fec4a32..02d58ecb8ec35c3a2ec030de7dcc276f91af2a2e 100644 --- a/alipay/components/home-nav/home-nav.axml +++ b/alipay/components/home-nav/home-nav.axml @@ -9,7 +9,7 @@ - + diff --git a/alipay/images/tips.png b/alipay/images/tips.png old mode 100755 new mode 100644 index c7cfb238d9b6ad96dfb725af37a668363ce75af7..bf59c3cf12943c4edd5c0da9bb3f293a92772a6d Binary files a/alipay/images/tips.png and b/alipay/images/tips.png differ diff --git a/alipay/pages/index/index.axml b/alipay/pages/index/index.axml index facda51a86d90b5e8e821bc6c003ca8a999c4837..8c54f2626a3aff872c0ad7114b8d46d30e1a1925 100755 --- a/alipay/pages/index/index.axml +++ b/alipay/pages/index/index.axml @@ -1,11 +1,16 @@ - + + + + {{common_shop_notice}} + + diff --git a/alipay/pages/index/index.js b/alipay/pages/index/index.js index c2d9b60a6c7481bd8b050cc9d13972208796bbb6..cf5648124e0fee898047f0994f7fac661f544b57 100755 --- a/alipay/pages/index/index.js +++ b/alipay/pages/index/index.js @@ -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 { diff --git a/service/Application/Admin/Controller/AppConfigController.class.php b/service/Application/Admin/Controller/AppConfigController.class.php new file mode 100755 index 0000000000000000000000000000000000000000..bf4f9b273c0c77712d140db1f8db868977ee18ea --- /dev/null +++ b/service/Application/Admin/Controller/AppConfigController.class.php @@ -0,0 +1,64 @@ +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 diff --git a/service/Application/Admin/View/Default/AppConfig/Index.html b/service/Application/Admin/View/Default/AppConfig/Index.html new file mode 100755 index 0000000000000000000000000000000000000000..7546080641a0858253ea12d2dc355646cb35ae0e --- /dev/null +++ b/service/Application/Admin/View/Default/AppConfig/Index.html @@ -0,0 +1,31 @@ + + + + + + + + + {{$data.common_app_is_enable_search.name}} + + + selected>{{$v.name}} + + + + + {{$data.common_app_customer_service_tel.name}} + value="{{$data.common_app_customer_service_tel.value}}" /> + + + {{:L('common_operation_save')}} + + + + + + + + + + \ No newline at end of file diff --git a/service/Application/Admin/View/Default/AppMiniAlipayConfig/Index.html b/service/Application/Admin/View/Default/AppMiniAlipayConfig/Index.html index d2fc6a2ab2628d61517663d3f39b8b87ebb6d83a..fa6cfd9dbdcd98d853e966f123c3a4cf7b5079c8 100755 --- a/service/Application/Admin/View/Default/AppMiniAlipayConfig/Index.html +++ b/service/Application/Admin/View/Default/AppMiniAlipayConfig/Index.html @@ -30,10 +30,6 @@ {{$data.common_app_mini_alipay_describe.name}} value="{{$data.common_app_mini_alipay_describe.value}}" required /> - - {{$data.common_app_mini_alipay_customer_service_tel.name}} - value="{{$data.common_app_mini_alipay_customer_service_tel.value}}" /> - {{:L('common_operation_save')}} diff --git a/service/Application/Admin/View/Default/Config/Index.html b/service/Application/Admin/View/Default/Config/Index.html index d05a190cb246ffe4a045c4a8f18f348d562fa89c..ddaffd608f46588e92b531c6c778163ffc952a2b 100755 --- a/service/Application/Admin/View/Default/Config/Index.html +++ b/service/Application/Admin/View/Default/Config/Index.html @@ -53,10 +53,15 @@ {{$data.common_share_view_desc.name}} {{$data.common_share_view_desc.value}} --> + + {{$data.common_shop_notice.name}}({{$data.common_shop_notice.describe}}) + {{$data.common_shop_notice.value}} + {{$data.common_user_center_notice.name}}({{$data.common_user_center_notice.describe}}) {{$data.common_user_center_notice.value}} + {{$data.home_search_keywords_type.name}} diff --git a/service/Application/Api/Controller/IndexController.class.php b/service/Application/Api/Controller/IndexController.class.php index 03d11679f2cb1b7ad1f782c97f0a5f3b125887a1..6c8d7daeffdad4e5d5e711fc448a330a2827ebc2 100755 --- a/service/Application/Api/Controller/IndexController.class.php +++ b/service/Application/Api/Controller/IndexController.class.php @@ -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 diff --git a/service/Application/Api/Controller/UserController.class.php b/service/Application/Api/Controller/UserController.class.php index 3abebae39f25cc67cf45dceaa2ed61fc48e17a10..e307c0597bebe65c083f48e587b975a2b7327b77 100755 --- a/service/Application/Api/Controller/UserController.class.php +++ b/service/Application/Api/Controller/UserController.class.php @@ -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, diff --git a/service/Application/Home/Controller/CommonController.class.php b/service/Application/Home/Controller/CommonController.class.php index 4451809856da1a484771d8dc9ce959cc7e03c1bf..b9073cef7809a5d5885a77aaeea7c55f61f4322b 100755 --- a/service/Application/Home/Controller/CommonController.class.php +++ b/service/Application/Home/Controller/CommonController.class.php @@ -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); } diff --git a/service/Application/Home/View/Default/Public/Header.html b/service/Application/Home/View/Default/Public/Header.html index d3fcc082aeb6405dc58cfa65a7db018ffca8fc12..918a4809b0c0197a30c9ece09a150b824f7eb1d5 100755 --- a/service/Application/Home/View/Default/Public/Header.html +++ b/service/Application/Home/View/Default/Public/Header.html @@ -30,4 +30,11 @@ var __user_id__ = 0{{$user.id}}; - \ No newline at end of file + + + + + + {{$common_shop_notice}} + + \ No newline at end of file diff --git a/service/Public/Home/Default/Css/Common.css b/service/Public/Home/Default/Css/Common.css index 54625dd80b13c79d69f0d822e43ec1e4c64bef24..c055d3f4ca3032103920fb70ecc8494adc63a5f2 100755 --- a/service/Public/Home/Default/Css/Common.css +++ b/service/Public/Home/Default/Css/Common.css @@ -31,6 +31,11 @@ button { outline: none; } font-size: 12px !important; } +/* 商城公告 */ +.common-shop-notice { + margin: 0; +} + /*所有超链接不要下划线*/ *, *:after, *:before{ -webkit-box-sizing: border-box;