From a8c21f3e4e5b99bfc9bec84052fbc70c7005d861 Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Fri, 28 Dec 2018 22:16:54 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=A4=B4=E5=83=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/service/UserService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/service/UserService.php b/application/service/UserService.php index 17174d3ae..adda3d447 100755 --- a/application/service/UserService.php +++ b/application/service/UserService.php @@ -686,7 +686,7 @@ class UserService * @desc description * @param [array] $params [输入参数] */ - public function UserAvatarUpload($params = []) + public static function UserAvatarUpload($params = []) { // 请求参数 $p = [ From c2de4b9a9129690efe3316bd410eeba6e4c6a1a8 Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Fri, 28 Dec 2018 22:22:32 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=A4=B4=E5=83=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/service/UserService.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/service/UserService.php b/application/service/UserService.php index adda3d447..e97ce8eef 100755 --- a/application/service/UserService.php +++ b/application/service/UserService.php @@ -729,8 +729,8 @@ class UserService // 开始处理图片存储 // 定义图片目录 - $root_path = ROOT_PATH; - $img_path = 'Public'.DS.'Upload'.DS.'user_avatar'.DS; + $root_path = ROOT; + $img_path = 'public'.DS.'static'.DS.'upload'.DS.'images'.DS.'user_avatar'.DS; $date = DS.date('Y').DS.date('m').DS.date('d').DS; // 图像类库 From 4654449744894fb36cb5e9f11feac9d44c4108a1 Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Fri, 28 Dec 2018 22:25:03 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=A4=B4=E5=83=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/service/UserService.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/service/UserService.php b/application/service/UserService.php index e97ce8eef..2a543f795 100755 --- a/application/service/UserService.php +++ b/application/service/UserService.php @@ -729,8 +729,8 @@ class UserService // 开始处理图片存储 // 定义图片目录 - $root_path = ROOT; - $img_path = 'public'.DS.'static'.DS.'upload'.DS.'images'.DS.'user_avatar'.DS; + $root_path = __MY_ROOT__; + $img_path = 'static'.DS.'upload'.DS.'images'.DS.'user_avatar'.DS; $date = DS.date('Y').DS.date('m').DS.date('d').DS; // 图像类库 From 2f155e6a2d38e6dfe5faa82965c487179dbc76f0 Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Fri, 28 Dec 2018 22:27:22 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=A4=B4=E5=83=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/service/UserService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/service/UserService.php b/application/service/UserService.php index 2a543f795..8a79f79ab 100755 --- a/application/service/UserService.php +++ b/application/service/UserService.php @@ -729,7 +729,7 @@ class UserService // 开始处理图片存储 // 定义图片目录 - $root_path = __MY_ROOT__; + $root_path = ROOT.'public'.DS; $img_path = 'static'.DS.'upload'.DS.'images'.DS.'user_avatar'.DS; $date = DS.date('Y').DS.date('m').DS.date('d').DS; From e96a81d00e080cc0c8eb984505a13dd8d1123af2 Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Sat, 29 Dec 2018 00:00:14 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=99=84=E4=BB=B6=E8=A2=AB=E8=A6=86=E7=9B=96?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/service/ConfigService.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/application/service/ConfigService.php b/application/service/ConfigService.php index b9e239265..886d2d0d5 100755 --- a/application/service/ConfigService.php +++ b/application/service/ConfigService.php @@ -55,6 +55,17 @@ class ConfigService // 附件 $data_fields = ['home_site_logo', 'home_site_logo_wap', 'home_site_desktop_icon']; + + // 当前参数中不存在则移除 + foreach($data_fields as $key=>$field) + { + if(!isset($params[$field])) + { + unset($data_fields[$key]); + } + } + + // 获取附件 $attachment = ResourcesService::AttachmentParams($params, $data_fields); foreach($attachment['data'] as $k=>$v) { From 7e42f5e8e32248cf34abe1ba04dcd83fc3f841eb Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Sat, 29 Dec 2018 00:48:56 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/index/controller/Search.php | 2 +- application/index/view/default/index/index.html | 2 +- public/static/index/default/css/common.css | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/application/index/controller/Search.php b/application/index/controller/Search.php index cd5163142..55f4782e6 100755 --- a/application/index/controller/Search.php +++ b/application/index/controller/Search.php @@ -67,7 +67,7 @@ class Search extends Common { if(input('post.')) { - return redirect('index/search/index', ['keywords'=>$this->params['keywords']]); + return redirect(MyUrl('index/search/index', ['keywords'=>$this->params['keywords']])); } else { // 品牌列表 $this->assign('brand_list', BrandService::CategoryBrandList(['category_id'=>$this->params['category_id']])); diff --git a/application/index/view/default/index/index.html b/application/index/view/default/index/index.html index 39be2dd2d..b27d76364 100755 --- a/application/index/view/default/index/index.html +++ b/application/index/view/default/index/index.html @@ -182,7 +182,7 @@
{{$goods.title}}
-
￥{{$goods.price}}
+
￥{{$goods.min_price}}
diff --git a/public/static/index/default/css/common.css b/public/static/index/default/css/common.css index b02ab0c1e..ca86f3252 100755 --- a/public/static/index/default/css/common.css +++ b/public/static/index/default/css/common.css @@ -89,11 +89,11 @@ color: #555555;background:none;border-color:transparent;cursor: default;} /*搜索框*/ .search-bar{height:36px; width: calc(100% - 103px); display: -webkit-inline-box;} -.search-bar form{border:2px solid #d2364c; width:100%;} +.search-bar form{border:2px solid #d2364c; width:100%;position: relative;} .search-bar input{height:32px;width:72%;outline:none; font-size:12px; border:none} #search-input { padding-left: 8px; } -#ai-topsearch { width:27%;height:32px;border:none;float:right;background: #d2364c none repeat scroll 0% 0%; -color: #F5F5F2;font-size: 14px;cursor:pointer;border-radius:0px 0px; } +#ai-topsearch { width:27%;height:32px;border:none;background: #d2364c none repeat scroll 0% 0%; +color: #F5F5F2;font-size: 14px;cursor:pointer;border-radius:0px 0px; position: absolute;top: 0;right: 0;} .search-hot-keywords { margin-top: 5px; height: 16px; overflow: hidden; display: none; } .search-hot-keywords li { float: left; } .search-hot-keywords li:not(:last-child) { margin-right: 10px; } @@ -109,7 +109,7 @@ color: #F5F5F2;font-size: 14px;cursor:pointer;border-radius:0px 0px; } /* 顶部小导航 */ .header-top { background-color: #fafafa; border-bottom: solid 1px #f0f0f0; } -.header{ display:none; max-width:1000px; margin:0px auto; font-size:12px;} +.header{ display:none; max-width:1000px; margin:0px auto; font-size:12px;position: relative; overflow: hidden; } .am-footer { border-top: 2px solid #d2364c; } .footer-bd{ display:none} @@ -133,14 +133,14 @@ color: #F5F5F2;font-size: 14px;cursor:pointer;border-radius:0px 0px; } .header { display:block;height: 30px;} .top-nav-left{ float:left;} .top-nav-left .top-nav-items, .top-nav-right .top-nav-items { padding: 0px 8px; height: 30px; line-height: 30px; } - .top-nav-right {float: right;} + .top-nav-right {position: absolute; top: 0; right: 0; } .top-nav-right .top-nav-items {float: left;} .nav-search .logo{display:none;} .nav-search .logo-big{ display:block;float:left;height:40px;width:135px; margin:0px auto; margin-left:5px; margin-right: 5px;} .nav-search .logo-big img{width:100%;} .search-bar {height: 40px; width: calc(100% - 146px);} - .search-bar input {width: 80%;height:36px;} + .search-bar input {width: 78%;height:36px;} .classified{display:none;} .mobile-navigation{display:none;} .nav-search{ position:relative;top:0px;z-index:0;margin-bottom: 5px;margin-top: 5px;} From 164844a44d302485f88fca447d53c57d8c1b2931 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=81=B0=E5=A4=A7=E7=8B=BC?= Date: Sat, 29 Dec 2018 11:15:39 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=B5=8B=E8=AF=95pull=20request?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Crazy.php | 10 ++++++++++ index.php | 3 +-- 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 Crazy.php diff --git a/Crazy.php b/Crazy.php new file mode 100644 index 000000000..59e5e5428 --- /dev/null +++ b/Crazy.php @@ -0,0 +1,10 @@ + \ No newline at end of file +require './public/index.php'; \ No newline at end of file