图片上传

--Subproject commit 75bbc3b075de19f239532f60c5995d06c5f814e2
++Subproject commit 119c247f5cf929aa1e059e40609bb16dd6b58f05

@@ -12,20 +12,16 @@ var $ = require('jquery'),
 require('./jquery.uploadifive');
 require('./jquery.uploadifive');
 
 
 $('#upload-img').uploadifive({
 $('#upload-img').uploadifive({
-    'auto': false,
-    'buttonClass': 'nav-btn',
-    'formData': {
-
-    },
-    'fileType': 'image/*',
-    'uploadScript': 'url',
-    'fileObjName': 'imgName',
-    'fileSizeLimit': 1024,
-    'onAddQueueItem': function (file) {
+    auto: true,
+    buttonClass: 'nav-btn',
+    fileType: 'image/*',
+    uploadScript: '/home/suggestimgUpload',
+    fileObjName: 'fileData',
+    fileSizeLimit: 1024,
+    onAddQueueItem: function (file) {
         console.log(file);
         console.log(file);
-        alert(1);
     },
     },
-    'onQueueComplete': function (file) {
-
+    onQueueComplete: function (file) {
+        console.log(file);
     }
     }
 });
 });

@@ -184,9 +184,12 @@ $fav: sprite-map("me/fav/*.png",$spacing: 5px);
         .fav-brand-swiper {
         .fav-brand-swiper {
 
 
             .swiper-header {
             .swiper-header {
-                height: pxToRem(60px);
+                height: pxToRem(100px);
                 padding: pxToRem(20px) pxToRem(30px);
                 padding: pxToRem(20px) pxToRem(30px);
                 display: inline-block;
                 display: inline-block;
+                position: relative;
+                width: 100%;
+                @include box-sizing();
 
 
                 .swiper-logo {
                 .swiper-logo {
                     height: 100%;
                     height: 100%;
@@ -229,6 +232,19 @@ $fav: sprite-map("me/fav/*.png",$spacing: 5px);
                         }
                         }
                     }
                     }
                 }
                 }
+                .fav-more {
+                    $width: pxToRem(image_width(sprite-file($fav, fav-more)));
+                    $height: pxToRem(image_height(sprite-file($fav, fav-more)));
+
+                    @include rem-sprite($fav, fav-more);
+                    width: $width;
+                    height: $height;
+
+                    position: absolute;
+                    top: 50%;
+                    right: pxToRem(30px);
+                    margin-top: -$height / 2;
+                }
             }
             }
             .swiper-container {
             .swiper-container {
                 height: pxToRem(300px);
                 height: pxToRem(300px);

@@ -66,7 +66,7 @@
                             {{/ discount}}
                             {{/ discount}}
                         </div>
                         </div>
                     </div>
                     </div>
-                    <a href="{{link}}"></a>
+                    <a class="fav-more" href="{{link}}"></a>
                 </div>
                 </div>
                 <div id="swiper-container-{{id}}" class="swiper-container" data-id="{{id}}">
                 <div id="swiper-container-{{id}}" class="swiper-container" data-id="{{id}}">
                     <ul class="swiper-wrapper swiper-wrapper-{{id}}">
                     <ul class="swiper-wrapper swiper-wrapper-{{id}}">

 {{> layout/header}}
 {{> layout/header}}
 <div class="yoho-suggest-sub-page yoho-page">
 <div class="yoho-suggest-sub-page yoho-page">
     {{# suggestSub}}
     {{# suggestSub}}
-    <div class="suggest-sub-form">
+    <div class="suggest-sub-form"
+         data-version="{{param.app_version}}"
+         data-type="{{param.client_type}}"
+         data-os-version="{{param.os_version}}"
+         data-screen-size="{{param.screen_size}}"
+         data-v="{{param.v}}"
+         data-project="{{param.project}}"
+         data-client-secret="{{param.client_secret}}">
         <textarea name="" id="suggest-textarea" placeholder="请输入意见反馈，我们会以消息形式回复您的建议或意见，改进产品体验，谢谢！"></textarea>
         <textarea name="" id="suggest-textarea" placeholder="请输入意见反馈，我们会以消息形式回复您的建议或意见，改进产品体验，谢谢！"></textarea>
         <div class="img-form">
         <div class="img-form">
             <span class="img-add">
             <span class="img-add">

@@ -157,6 +157,15 @@ class HomeController extends AbstractAction
         ));
         ));
     }
     }
 
 
+
+    /**
+     * 用户收藏的商品-删除
+     */
+    public function favoriteDelAction() {
+
+        //$this->echoJson();
+    }
+
     /**
     /**
      * 用户收藏的品牌
      * 用户收藏的品牌
      */
      */
@@ -381,7 +390,7 @@ class HomeController extends AbstractAction
 		    'suggestSub' => true,
 		    'suggestSub' => true,
 		    'pageFooter' => true
 		    'pageFooter' => true
 	    );
 	    );
-	    print_r($data);
+	    //print_r($data);
 
 
         $this->_view->display('suggest_sub', $data);
         $this->_view->display('suggest_sub', $data);
     }
     }