From e6cd42047a702c0f7fc7a86ddb4e93fba8130c69 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Tue, 9 Apr 2019 18:28:48 +0800 Subject: [PATCH] 1.5 --- application/admin/controller/Config.php | 27 ++++- .../admin/view/default/config/index.html | 4 - .../admin/view/default/config/store.html | 45 +++++++++ .../admin/view/default/site/index.html | 15 ++- application/index/controller/Common.php | 6 ++ application/index/view/default/config.json | 2 +- .../index/view/default/public/footer_nav.html | 73 +++++++++++--- application/lang/zh-cn.php | 1 + application/plugins/answers/config.json | 2 +- application/plugins/expressforkdn/config.json | 2 +- application/plugins/freightfee/config.json | 2 +- .../plugins/newuserreduction/config.json | 2 +- application/plugins/ucenter/config.json | 2 +- .../usernotloginhidegoodsprice/config.json | 2 +- application/service/ConfigService.php | 2 +- application/service/NavigationService.php | 3 +- config/app.php | 2 +- config/shopxo.sql | 41 +++++--- .../old/alipay/pages/common/copyright.axml | 2 +- .../old/weixin/pages/common/copyright.wxml | 2 +- public/core.php | 2 +- public/static/index/default/css/common.css | 94 ++++++++++++++---- .../common/2019/04/09/1554805439263794.jpeg | Bin 0 -> 19885 bytes 23 files changed, 252 insertions(+), 81 deletions(-) create mode 100644 application/admin/view/default/config/store.html create mode 100644 public/static/upload/images/common/2019/04/09/1554805439263794.jpeg diff --git a/application/admin/controller/Config.php b/application/admin/controller/Config.php index 142e1742a..43d85098a 100755 --- a/application/admin/controller/Config.php +++ b/application/admin/controller/Config.php @@ -41,7 +41,7 @@ class Config extends Common } /** - * [Index 配置列表] + * 后台配置 * @author Devil * @blog http://gong.gg/ * @version 0.0.1 @@ -68,7 +68,22 @@ class Config extends Common } /** - * [Save 配置数据保存] + * 商店信息 + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2016-12-06T21:31:53+0800 + */ + public function Store() + { + // 配置信息 + $this->assign('data', ConfigService::ConfigList()); + + return $this->fetch(); + } + + /** + * 配置数据保存 * @author Devil * @blog http://gong.gg/ * @version 0.0.1 @@ -76,6 +91,14 @@ class Config extends Common */ public function Save() { + // 数据处理 + // 商店二维码 + if(!isset($_POST['common_customer_store_qrcode'])) + { + $_POST['common_customer_store_qrcode'] = ''; + } + + // 保存 return ConfigService::ConfigSave($_POST); } } diff --git a/application/admin/view/default/config/index.html b/application/admin/view/default/config/index.html index 88c773363..6ac774aff 100755 --- a/application/admin/view/default/config/index.html +++ b/application/admin/view/default/config/index.html @@ -70,10 +70,6 @@ -
- - -
diff --git a/application/admin/view/default/config/store.html b/application/admin/view/default/config/store.html new file mode 100644 index 000000000..164470e3f --- /dev/null +++ b/application/admin/view/default/config/store.html @@ -0,0 +1,45 @@ +{{include file="public/header" /}} + + +
+
+ +
+ +
+ + +
+
+ + +
+
+ + +
+
+ +
    + {{if !empty($data['common_customer_store_qrcode']['value'])}} +
  • + + + × +
  • + {{/if}} +
+
+选择图片
+
+
+ +
+
+ +
+
+ + + +{{include file="public/footer" /}} + \ No newline at end of file diff --git a/application/admin/view/default/site/index.html b/application/admin/view/default/site/index.html index 3cfc15f17..616784801 100755 --- a/application/admin/view/default/site/index.html +++ b/application/admin/view/default/site/index.html @@ -11,12 +11,11 @@
-