diff --git a/application/admin/controller/Common.php b/application/admin/controller/Common.php index de01d550c..1b3796167 100755 --- a/application/admin/controller/Common.php +++ b/application/admin/controller/Common.php @@ -128,7 +128,7 @@ class Common extends Controller $this->assign('admin', $this->admin); // 图片host地址 - $this->assign('image_host', config('IMAGE_HOST')); + $this->assign('images_host', config('images_host')); } /** diff --git a/application/admin/controller/Coupon.php b/application/admin/controller/Coupon.php index 76148e9a9..cb20fc3c9 100755 --- a/application/admin/controller/Coupon.php +++ b/application/admin/controller/Coupon.php @@ -375,7 +375,7 @@ class Coupon extends Common } if(empty($user['avatar'])) { - $user['avatar'] = config('IMAGE_HOST').'Public/Common/Images/user-img-md.gif'; + $user['avatar'] = config('images_host').'Public/Common/Images/user-img-md.gif'; } $this->ajaxReturn('操作成功', 0, $user); } diff --git a/application/admin/view/default/apphomenav/save_info.html b/application/admin/view/default/apphomenav/save_info.html index b1f8bfb72..8eee03e16 100755 --- a/application/admin/view/default/apphomenav/save_info.html +++ b/application/admin/view/default/apphomenav/save_info.html @@ -58,7 +58,7 @@
+上传图片
@@ -67,7 +67,7 @@
diff --git a/application/admin/view/default/article/save_info.html b/application/admin/view/default/article/save_info.html index 89a1874fd..9b26a5c9a 100755 --- a/application/admin/view/default/article/save_info.html +++ b/application/admin/view/default/article/save_info.html @@ -22,7 +22,7 @@
diff --git a/application/admin/view/default/articlecategory/index.html b/application/admin/view/default/articlecategory/index.html index f428c0e14..8e34bfeb9 100755 --- a/application/admin/view/default/articlecategory/index.html +++ b/application/admin/view/default/articlecategory/index.html @@ -42,7 +42,7 @@
- +

处理中...

diff --git a/application/admin/view/default/brandcategory/index.html b/application/admin/view/default/brandcategory/index.html index 86ccae29f..6d3d538e1 100755 --- a/application/admin/view/default/brandcategory/index.html +++ b/application/admin/view/default/brandcategory/index.html @@ -42,7 +42,7 @@
- +

处理中...

diff --git a/application/admin/view/default/coupon/send_info.html b/application/admin/view/default/coupon/send_info.html index 6c0c91ac8..a2c1669e2 100755 --- a/application/admin/view/default/coupon/send_info.html +++ b/application/admin/view/default/coupon/send_info.html @@ -61,7 +61,7 @@
- +

diff --git a/application/admin/view/default/express/index.html b/application/admin/view/default/express/index.html index bd4925be6..79b04bd8c 100755 --- a/application/admin/view/default/express/index.html +++ b/application/admin/view/default/express/index.html @@ -24,7 +24,7 @@ @@ -51,9 +51,9 @@ -
+
- +

处理中...

diff --git a/application/admin/view/default/goods/save_info.html b/application/admin/view/default/goods/save_info.html index bc4db77ea..bf1783d13 100755 --- a/application/admin/view/default/goods/save_info.html +++ b/application/admin/view/default/goods/save_info.html @@ -50,7 +50,7 @@
diff --git a/application/admin/view/default/goodscategory/index.html b/application/admin/view/default/goodscategory/index.html index af2f15dcf..25afe11eb 100755 --- a/application/admin/view/default/goodscategory/index.html +++ b/application/admin/view/default/goodscategory/index.html @@ -24,7 +24,7 @@ @@ -35,7 +35,7 @@ @@ -45,7 +45,7 @@
@@ -88,9 +88,9 @@ -
+
- +

处理中...

diff --git a/application/admin/view/default/public/header.html b/application/admin/view/default/public/header.html index 807f48b7e..aabfda105 100755 --- a/application/admin/view/default/public/header.html +++ b/application/admin/view/default/public/header.html @@ -17,6 +17,6 @@ {{/if}} \ No newline at end of file diff --git a/application/admin/view/default/region/index.html b/application/admin/view/default/region/index.html index 25b484fc5..7538bad5e 100755 --- a/application/admin/view/default/region/index.html +++ b/application/admin/view/default/region/index.html @@ -43,7 +43,7 @@
- +

处理中...

diff --git a/application/admin/view/default/screeningprice/index.html b/application/admin/view/default/screeningprice/index.html index 923ad01ea..9d68f9e4f 100755 --- a/application/admin/view/default/screeningprice/index.html +++ b/application/admin/view/default/screeningprice/index.html @@ -51,7 +51,7 @@
- +

处理中...

diff --git a/application/admin/view/default/slide/save_info.html b/application/admin/view/default/slide/save_info.html index 2b3585b4e..e9bbc69e0 100755 --- a/application/admin/view/default/slide/save_info.html +++ b/application/admin/view/default/slide/save_info.html @@ -54,7 +54,7 @@
  • - +
+上传图片
@@ -63,7 +63,7 @@
diff --git a/application/index/controller/Common.php b/application/index/controller/Common.php index 493bb1eaf..9d3bdbc6b 100755 --- a/application/index/controller/Common.php +++ b/application/index/controller/Common.php @@ -153,7 +153,7 @@ class Common extends Controller $this->assign('is_footer', 1); // 图片host地址 - $this->assign('image_host', config('IMAGE_HOST')); + $this->assign('images_host', config('images_host')); // 标题 $this->assign('home_seo_site_title', MyC('home_seo_site_title')); diff --git a/application/index/view/default/index/index.html b/application/index/view/default/index/index.html index 00d3ff653..5f232339a 100755 --- a/application/index/view/default/index/index.html +++ b/application/index/view/default/index/index.html @@ -26,7 +26,7 @@
分类
@@ -34,7 +34,7 @@
@@ -42,7 +42,7 @@
@@ -50,7 +50,7 @@
@@ -62,7 +62,7 @@
- + diff --git a/application/index/view/default/public/header.html b/application/index/view/default/public/header.html index ffddf151e..30a19d2ea 100755 --- a/application/index/view/default/public/header.html +++ b/application/index/view/default/public/header.html @@ -14,8 +14,8 @@ - - + + @@ -33,6 +33,7 @@ var __public__ = '{{$Think.__MY_ROOT__}}'; var __default_theme__ = '{{$default_theme}}'; var __modal_login_url__ = '{{:Url('index/user/modallogininfo')}}'; + var __images_host__ = '{{$images_host}}'; var __user_id__ = {{if empty($user['id'])}}0{{else /}}{{$user.id}}{{/if}}; diff --git a/application/index/view/default/public/header_nav.html b/application/index/view/default/public/header_nav.html index dbb15e9a6..afd0aadc8 100755 --- a/application/index/view/default/public/header_nav.html +++ b/application/index/view/default/public/header_nav.html @@ -13,7 +13,7 @@