!1 测试Pull Request

Merge pull request !1 from 灰大狼/crazy

Crazy.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: Crazy
+ * Email: crazys@126.com
+ * Date: 2018/12/29
+ * Time: 11:13
+ */
+
+$test='这是一个测试文件，用来测试Pull Request贡献代码的。';
\ No newline at end of file

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']]));

application/index/view/default/index/index.html

@@ -182,7 +182,7 @@
                                         <div class="goods-title ellipsis">
                                             <a href="{{$goods['goods_url']}}" target="_blank" {{if !empty($goods.title_color)}}style="color:{{$goods.title_color}};"{{/if}}>{{$goods.title}}</a>
                                         </div>
-                                        <div class="price">￥{{$goods.price}}</div>
+                                        <div class="price">￥{{$goods.min_price}}</div>
                                     </div>
                                     <a href="{{$goods.goods_url}}" target="_blank">
                                         <img src="{{$goods.home_recommended_images}}" />

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)
         {

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 = [
@@ -729,8 +729,8 @@ class UserService
 
         // 开始处理图片存储
         // 定义图片目录
-        $root_path = ROOT_PATH;
-        $img_path = 'Public'.DS.'Upload'.DS.'user_avatar'.DS;
+        $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;
 
         // 图像类库

index.php

@@ -13,5 +13,4 @@
 define('IS_ROOT_ACCESS', true);
 
 // 引入公共入口文件
-require './public/index.php';
-?>
\ No newline at end of file
+require './public/index.php';
\ No newline at end of file

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;}