From 829cccfee1ed29abda35fd0b479ac5a4a6a6d83e Mon Sep 17 00:00:00 2001
From: lore-w <metro-cpu@hotmail.com>
Date: Mon, 16 Nov 2015 19:13:12 +0800
Subject: [PATCH] 我的收藏列表
---
static/config.rb | 1 +
static/img/me/fav-s432b9a1e79.png | Bin 5115 -> 0 bytes
static/img/me/fav-s7d0775342b.png | Bin 0 -> 6394 bytes
static/img/me/fav/fav-del.png | Bin 0 -> 1478 bytes
static/img/me/fav/save-price.png | Bin 0 -> 1683 bytes
static/img/me/suggest-s037b5f6162.png | Bin 0 -> 749 bytes
static/img/me/suggest-s8a27d3c01a.png | Bin 516 -> 0 bytes
static/img/me/suggest/suggest-add.png | Bin 0 -> 1267 bytes
static/js/me/fav.js | 26 ++++++++++++++++++++++++--
static/js/me/jquery.uploadifive.js | 874 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
static/js/me/suggest.js | 40 +++++++++++++++++-----------------------
static/sass/layout/_header.scss | 11 +++++++++++
static/sass/me/_fav.scss | 182 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
static/sass/me/_suggest.scss | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
template/m.yohobuy.com/actions/index/home/favorite.phtml | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
template/m.yohobuy.com/actions/index/home/suggest.phtml | 3 +++
template/m.yohobuy.com/actions/index/home/suggest_sub.phtml | 14 ++++++++++++++
template/m.yohobuy.com/partials/layout/page_header.phtml | 3 +++
template/m.yohobuy.com/partials/layout/use.phtml | 7 +++++++
yohobuy/m.yohobuy.com/application/controllers/Home.php | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
20 files changed, 1419 insertions(+), 33 deletions(-)
delete mode 100644 static/img/me/fav-s432b9a1e79.png
create mode 100644 static/img/me/fav-s7d0775342b.png
create mode 100644 static/img/me/fav/fav-del.png
create mode 100644 static/img/me/fav/save-price.png
create mode 100644 static/img/me/suggest-s037b5f6162.png
delete mode 100644 static/img/me/suggest-s8a27d3c01a.png
create mode 100644 static/img/me/suggest/suggest-add.png
create mode 100644 static/js/me/jquery.uploadifive.js
create mode 100644 template/m.yohobuy.com/actions/index/home/suggest_sub.phtml
diff --git a/static/config.rb b/static/config.rb
index 12701d9..8b7dd5b 100644
--- a/static/config.rb
+++ b/static/config.rb
@@ -14,6 +14,7 @@ fonts_dir = "font"
output_style = :expanded
# To enable relative paths to assets via compass helper functions. Uncomment:
relative_assets = true
+sourcemap = true
# To disable debugging comments that display the original location of your selectors. Uncomment:
line_comments = false
diff --git a/static/img/me/fav-s432b9a1e79.png b/static/img/me/fav-s432b9a1e79.png
deleted file mode 100644
index b83d3bb..0000000
Binary files a/static/img/me/fav-s432b9a1e79.png and /dev/null differ
diff --git a/static/img/me/fav-s7d0775342b.png b/static/img/me/fav-s7d0775342b.png
new file mode 100644
index 0000000..c914d68
Binary files /dev/null and b/static/img/me/fav-s7d0775342b.png differ
diff --git a/static/img/me/fav/fav-del.png b/static/img/me/fav/fav-del.png
new file mode 100644
index 0000000..afa24a9
Binary files /dev/null and b/static/img/me/fav/fav-del.png differ
diff --git a/static/img/me/fav/save-price.png b/static/img/me/fav/save-price.png
new file mode 100644
index 0000000..50b795f
Binary files /dev/null and b/static/img/me/fav/save-price.png differ
diff --git a/static/img/me/suggest-s037b5f6162.png b/static/img/me/suggest-s037b5f6162.png
new file mode 100644
index 0000000..f0ab2fc
Binary files /dev/null and b/static/img/me/suggest-s037b5f6162.png differ
diff --git a/static/img/me/suggest-s8a27d3c01a.png b/static/img/me/suggest-s8a27d3c01a.png
deleted file mode 100644
index a1bda07..0000000
Binary files a/static/img/me/suggest-s8a27d3c01a.png and /dev/null differ
diff --git a/static/img/me/suggest/suggest-add.png b/static/img/me/suggest/suggest-add.png
new file mode 100644
index 0000000..e4f868c
Binary files /dev/null and b/static/img/me/suggest/suggest-add.png differ
diff --git a/static/js/me/fav.js b/static/js/me/fav.js
index eef8b10..bcb68cc 100644
--- a/static/js/me/fav.js
+++ b/static/js/me/fav.js
@@ -6,8 +6,10 @@
var $ = require('jquery'),
Hammer = require('yoho.hammer'),
- lazyLoad = require('yoho.lazyload');
+ lazyLoad = require('yoho.lazyload'),
+ Swiper = require('yoho.iswiper');
+//导航
var $navLi = $('#fav-tab > li'),
$favContainer = $('.fav-content');
@@ -15,11 +17,15 @@ var $curContainer = $favContainer.children('.fav-type').first();//保存当前�
var favTabHammer;
+//轮播图
+var $swiperList = $('.swiper-container'),
+ swiperArray = [],
+ swiperObj = {};
+
//lazyLoad();
favTabHammer = new Hammer(document.getElementById('fav-tab'));
favTabHammer.on('tap', function(e) {
- console.log(1);
var $cur = $(e.target).closest('li'),
index;
@@ -34,4 +40,20 @@ favTabHammer.on('tap', function(e) {
$curContainer.addClass('hide');
$curContainer = $favContainer.children(':eq(' + index + ')').removeClass('hide');
+
+ if (index === 1) {
+ //导航
+ for (var i = 0; i < $swiperList.length; i++) {
+ var id = $swiperList.eq(i).attr('data-id');
+ swiperObj[id] = new Swiper('#swiper-container-' + id, {
+ slidesPerView: 'auto',
+ grabCursor: true,
+ slideElement: 'li',
+ wrapperClass: 'swiper-wrapper-' + id,
+ lazyLoading: true,
+ watchSlidesVisibility: true
+ });
+ }
+
+ }
});
diff --git a/static/js/me/jquery.uploadifive.js b/static/js/me/jquery.uploadifive.js
new file mode 100644
index 0000000..9d8562c
--- /dev/null
+++ b/static/js/me/jquery.uploadifive.js
@@ -0,0 +1,874 @@
+/*
+UploadiFive 1.2.2
+Copyright (c) 2012 Reactive Apps, Ronnie Garcia
+Released under the UploadiFive Standard License <http://www.uploadify.com/uploadifive-standard-license>
+*/
+
+var jQuery = require('jquery');
+
+;(function($) {
+
+ var methods = {
+
+ init : function(options) {
+
+ return this.each(function() {
+
+ // Create a reference to the jQuery DOM object
+ var $this = $(this);
+ $this.data('uploadifive', {
+ inputs : {}, // The object that contains all the file inputs
+ inputCount : 0, // The total number of file inputs created
+ fileID : 0,
+ queue : {
+ count : 0, // Total number of files in the queue
+ selected : 0, // Number of files selected in the last select operation
+ replaced : 0, // Number of files replaced in the last select operation
+ errors : 0, // Number of files that returned an error in the last select operation
+ queued : 0, // Number of files added to the queue in the last select operation
+ cancelled : 0 // Total number of files that have been cancelled or removed from the queue
+ },
+ uploads : {
+ current : 0, // Number of files currently being uploaded
+ attempts : 0, // Number of file uploads attempted in the last upload operation
+ successful : 0, // Number of files successfully uploaded in the last upload operation
+ errors : 0, // Number of files returning errors in the last upload operation
+ count : 0 // Total number of files uploaded successfully
+ }
+ });
+ var $data = $this.data('uploadifive');
+
+ // Set the default options
+ var settings = $data.settings = $.extend({
+ 'auto' : true, // Automatically upload a file when it's added to the queue
+ 'buttonClass' : false, // A class to add to the UploadiFive button
+ 'buttonText' : 'Select Files', // The text that appears on the UploadiFive button
+ 'checkScript' : false, // Path to the script that checks for existing file names
+ 'dnd' : true, // Allow drag and drop into the queue
+ 'dropTarget' : false, // Selector for the drop target
+ 'fileObjName' : 'Filedata', // The name of the file object to use in your server-side script
+ 'fileSizeLimit' : 0, // Maximum allowed size of files to upload
+ 'fileType' : false, // Type of files allowed (image, etc), separate with a pipe character |
+ 'formData' : {}, // Additional data to send to the upload script
+ 'height' : 30, // The height of the button
+ 'itemTemplate' : false, // The HTML markup for the item in the queue
+ 'method' : 'post', // The method to use when submitting the upload
+ 'multi' : true, // Set to true to allow multiple file selections
+ 'overrideEvents' : [], // An array of events to override
+ 'queueID' : false, // The ID of the file queue
+ 'queueSizeLimit' : 0, // The maximum number of files that can be in the queue
+ 'removeCompleted' : false, // Set to true to remove files that have completed uploading
+ 'simUploadLimit' : 0, // The maximum number of files to upload at once
+ 'truncateLength' : 0, // The length to truncate the file names to
+ 'uploadLimit' : 0, // The maximum number of files you can upload
+ 'uploadScript' : 'uploadifive.php', // The path to the upload script
+ 'width' : 100 // The width of the button
+
+ /*
+ // Events
+ 'onAddQueueItem' : function(file) {}, // Triggered for each file that is added to the queue
+ 'onCancel' : function(file) {}, // Triggered when a file is cancelled or removed from the queue
+ 'onCheck' : function(file, exists) {}, // Triggered when the server is checked for an existing file
+ 'onClearQueue' : function(queue) {}, // Triggered during the clearQueue function
+ 'onDestroy' : function() {} // Triggered during the destroy function
+ 'onDrop' : function(files, numberOfFilesDropped) {}, // Triggered when files are dropped into the file queue
+ 'onError' : function(file, fileType, data) {}, // Triggered when an error occurs
+ 'onFallback' : function() {}, // Triggered if the HTML5 File API is not supported by the browser
+ 'onInit' : function() {}, // Triggered when UploadiFive if initialized
+ 'onQueueComplete' : function() {}, // Triggered once when an upload queue is done
+ 'onProgress' : function(file, event) {}, // Triggered during each progress update of an upload
+ 'onSelect' : function() {}, // Triggered once when files are selected from a dialog box
+ 'onUpload' : function(file) {}, // Triggered when an upload queue is started
+ 'onUploadComplete' : function(file, data) {}, // Triggered when a file is successfully uploaded
+ 'onUploadFile' : function(file) {}, // Triggered for each file being uploaded
+ */
+ }, options);
+
+ // Calculate the file size limit
+ if (isNaN(settings.fileSizeLimit)) {
+ var fileSizeLimitBytes = parseInt(settings.fileSizeLimit) * 1.024
+ if (settings.fileSizeLimit.indexOf('KB') > -1) {
+ settings.fileSizeLimit = fileSizeLimitBytes * 1000;
+ } else if (settings.fileSizeLimit.indexOf('MB') > -1) {
+ settings.fileSizeLimit = fileSizeLimitBytes * 1000000;
+ } else if (settings.fileSizeLimit.indexOf('GB') > -1) {
+ settings.fileSizeLimit = fileSizeLimitBytes * 1000000000;
+ }
+ } else {
+ settings.fileSizeLimit = settings.fileSizeLimit * 1024;
+ }
+
+ // Create a template for a file input
+ $data.inputTemplate = $('<input type="file">')
+ .css({
+ 'font-size' : settings.height + 'px',
+ 'opacity' : 0,
+ 'position' : 'absolute',
+ 'right' : '-3px',
+ 'top' : '-3px',
+ 'z-index' : 999
+ });
+
+ // Create a new input
+ $data.createInput = function() {
+
+ // Create a clone of the file input
+ var input = $data.inputTemplate.clone();
+ // Create a unique name for the input item
+ var inputName = input.name = 'input' + $data.inputCount++;
+ // Set the multiple attribute
+ if (settings.multi) {
+ input.attr('multiple', true);
+ }
+ // Set the accept attribute on the input
+ if (settings.fileType) {
+ input.attr('accept', settings.fileType);
+ }
+ // Set the onchange event for the input
+ input.bind('change', function() {
+ $data.queue.selected = 0;
+ $data.queue.replaced = 0;
+ $data.queue.errors = 0;
+ $data.queue.queued = 0;
+ // Add a queue item to the queue for each file
+ var limit = this.files.length;
+ $data.queue.selected = limit;
+ if (($data.queue.count + limit) > settings.queueSizeLimit && settings.queueSizeLimit !== 0) {
+ if ($.inArray('onError', settings.overrideEvents) < 0) {
+ alert('The maximum number of queue items has been reached (' + settings.queueSizeLimit + '). Please select fewer files.');
+ }
+ // Trigger the error event
+ if (typeof settings.onError === 'function') {
+ settings.onError.call($this, 'QUEUE_LIMIT_EXCEEDED');
+ }
+ } else {
+ for (var n = 0; n < limit; n++) {
+ file = this.files[n];
+ $data.addQueueItem(file);
+ }
+ $data.inputs[inputName] = this;
+ $data.createInput();
+ }
+ // Upload the file if auto-uploads are enabled
+ if (settings.auto) {
+ methods.upload.call($this);
+ }
+ // Trigger the select event
+ if (typeof settings.onSelect === 'function') {
+ settings.onSelect.call($this, $data.queue);
+ }
+ });
+ // Hide the existing current item and add the new one
+ if ($data.currentInput) {
+ $data.currentInput.hide();
+ }
+ $data.button.append(input);
+ $data.currentInput = input;
+ }
+
+ // Remove an input
+ $data.destroyInput = function(key) {
+ $($data.inputs[key]).remove();
+ delete $data.inputs[key];
+ $data.inputCount--;
+ }
+
+ // Drop a file into the queue
+ $data.drop = function(e) {
+ $data.queue.selected = 0;
+ $data.queue.replaced = 0;
+ $data.queue.errors = 0;
+ $data.queue.queued = 0;
+
+ var fileData = e.dataTransfer;
+
+ var inputName = fileData.name = 'input' + $data.inputCount++;
+ // Add a queue item to the queue for each file
+ var limit = fileData.files.length;
+ $data.queue.selected = limit;
+ if (($data.queue.count + limit) > settings.queueSizeLimit && settings.queueSizeLimit !== 0) {
+ // Check if the queueSizeLimit was reached
+ if ($.inArray('onError', settings.overrideEvents) < 0) {
+ alert('The maximum number of queue items has been reached (' + settings.queueSizeLimit + '). Please select fewer files.');
+ }
+ // Trigger the onError event
+ if (typeof settings.onError === 'function') {
+ settings.onError.call($this, 'QUEUE_LIMIT_EXCEEDED');
+ }
+ } else {
+ // Add a queue item for each file
+ for (var n = 0; n < limit; n++) {
+ file = fileData.files[n];
+ $data.addQueueItem(file);
+ }
+ // Save the data to the inputs object
+ $data.inputs[inputName] = fileData;
+ }
+
+ // Upload the file if auto-uploads are enabled
+ if (settings.auto) {
+ methods.upload.call($this);
+ }
+
+ // Trigger the onDrop event
+ if (typeof settings.onDrop === 'function') {
+ settings.onDrop.call($this, fileData.files, fileData.files.length);
+ }
+
+ // Stop FireFox from opening the dropped file(s)
+ e.preventDefault();
+ e.stopPropagation();
+ }
+
+ // Check if a filename exists in the queue
+ $data.fileExistsInQueue = function(file) {
+ for (var key in $data.inputs) {
+ input = $data.inputs[key];
+ limit = input.files.length;
+ for (var n = 0; n < limit; n++) {
+ existingFile = input.files[n];
+ // Check if the filename matches
+ if (existingFile.name == file.name && !existingFile.complete) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ // Remove an existing file in the queue
+ $data.removeExistingFile = function(file) {
+ for (var key in $data.inputs) {
+ input = $data.inputs[key];
+ limit = input.files.length;
+ for (var n = 0; n < limit; n++) {
+ existingFile = input.files[n];
+ // Check if the filename matches
+ if (existingFile.name == file.name && !existingFile.complete) {
+ $data.queue.replaced++;
+ methods.cancel.call($this, existingFile, true);
+ }
+ }
+ }
+ }
+
+ // Create the file item template
+ if (settings.itemTemplate == false) {
+ $data.queueItem = $('<div class="uploadifive-queue-item">\
+ <a class="close" href="#">X</a>\
+ <div><span class="filename"></span><span class="fileinfo"></span></div>\
+ <div class="progress">\
+ <div class="progress-bar"></div>\
+ </div>\
+ </div>');
+ } else {
+ $data.queueItem = $(settings.itemTemplate);
+ }
+
+ // Add an item to the queue
+ $data.addQueueItem = function(file) {
+ if ($.inArray('onAddQueueItem', settings.overrideEvents) < 0) {
+ // Check if the filename already exists in the queue
+ $data.removeExistingFile(file);
+ // Create a clone of the queue item template
+ file.queueItem = $data.queueItem.clone();
+ // Add an ID to the queue item
+ file.queueItem.attr('id', settings.id + '-file-' + $data.fileID++);
+ // Bind the close event to the close button
+ file.queueItem.find('.close').bind('click', function() {
+ methods.cancel.call($this, file);
+ return false;
+ });
+ var fileName = file.name;
+ if (fileName.length > settings.truncateLength && settings.truncateLength != 0) {
+ fileName = fileName.substring(0, settings.truncateLength) + '...';
+ }
+ file.queueItem.find('.filename').html(fileName);
+ // Add a reference to the file
+ file.queueItem.data('file', file);
+ $data.queueEl.append(file.queueItem);
+ }
+ // Trigger the addQueueItem event
+ if (typeof settings.onAddQueueItem === 'function') {
+ settings.onAddQueueItem.call($this, file);
+ }
+ // Check the filesize
+ if (file.size > settings.fileSizeLimit && settings.fileSizeLimit != 0) {
+ $data.error('FILE_SIZE_LIMIT_EXCEEDED', file);
+ } else {
+ $data.queue.queued++;
+ $data.queue.count++;
+ }
+ }
+
+ // Remove an item from the queue
+ $data.removeQueueItem = function(file, instant, delay) {
+ // Set the default delay
+ if (!delay) delay = 0;
+ var fadeTime = instant ? 0 : 500;
+ if (file.queueItem) {
+ if (file.queueItem.find('.fileinfo').html() != ' - Completed') {
+ file.queueItem.find('.fileinfo').html(' - Cancelled');
+ }
+ file.queueItem.find('.progress-bar').width(0);
+ file.queueItem.delay(delay).fadeOut(fadeTime, function() {
+ $(this).remove();
+ });
+ delete file.queueItem;
+ $data.queue.count--;
+ }
+ }
+
+ // Count the number of files that need to be uploaded
+ $data.filesToUpload = function() {
+ var filesToUpload = 0;
+ for (var key in $data.inputs) {
+ input = $data.inputs[key];
+ limit = input.files.length;
+ for (var n = 0; n < limit; n++) {
+ file = input.files[n];
+ if (!file.skip && !file.complete) {
+ filesToUpload++;
+ }
+ }
+ }
+ return filesToUpload;
+ }
+
+ // Check if a file exists
+ $data.checkExists = function(file) {
+ if ($.inArray('onCheck', settings.overrideEvents) < 0) {
+ // This request needs to be synchronous
+ $.ajaxSetup({
+ 'async' : false
+ });
+ // Send the filename to the check script
+ var checkData = $.extend(settings.formData, {filename: file.name});
+ $.post(settings.checkScript, checkData, function(fileExists) {
+ file.exists = parseInt(fileExists);
+ });
+ if (file.exists) {
+ if (!confirm('A file named ' + file.name + ' already exists in the upload folder.\nWould you like to replace it?')) {
+ // If not replacing the file, cancel the upload
+ methods.cancel.call($this, file);
+ return true;
+ }
+ }
+ }
+ // Trigger the check event
+ if (typeof settings.onCheck === 'function') {
+ settings.onCheck.call($this, file, file.exists);
+ }
+ return false;
+ }
+
+ // Upload a single file
+ $data.uploadFile = function(file, uploadAll) {
+ if (!file.skip && !file.complete && !file.uploading) {
+ file.uploading = true;
+ $data.uploads.current++;
+ $data.uploads.attempted++;
+
+ // Create a new AJAX request
+ xhr = file.xhr = new XMLHttpRequest();
+
+ // Start the upload
+ // Use the faster FormData if it exists
+ if (typeof FormData === 'function' || typeof FormData === 'object') {
+
+ // Create a new FormData object
+ var formData = new FormData();
+
+ // Add the form data
+ formData.append(settings.fileObjName, file);
+
+ // Add the rest of the formData
+ for (i in settings.formData) {
+ formData.append(i, settings.formData[i]);
+ }
+
+ // Open the AJAX call
+ xhr.open(settings.method, settings.uploadScript, true);
+
+ // On progress function
+ xhr.upload.addEventListener('progress', function(e) {
+ if (e.lengthComputable) {
+ $data.progress(e, file);
+ }
+ }, false);
+
+ // On complete function
+ xhr.addEventListener('load', function(e) {
+ if (this.readyState == 4) {
+ file.uploading = false;
+ if (this.status == 200) {
+ if (file.xhr.responseText !== 'Invalid file type.') {
+ $data.uploadComplete(e, file, uploadAll);
+ } else {
+ $data.error(file.xhr.responseText, file, uploadAll);
+ }
+ } else if (this.status == 404) {
+ $data.error('404_FILE_NOT_FOUND', file, uploadAll);
+ } else if (this.status == 403) {
+ $data.error('403_FORBIDDEN', file, uploadAll);
+ } else {
+ $data.error('Unknown Error', file, uploadAll);
+ }
+ }
+ });
+
+ // Send the form data (multipart/form-data)
+ xhr.send(formData);
+
+ } else {
+
+ // Send as binary
+ var reader = new FileReader();
+ reader.onload = function(e) {
+
+ // Set some file builder variables
+ var boundary = '-------------------------' + (new Date).getTime(),
+ dashes = '--',
+ eol = '\r\n',
+ binFile = '';
+
+ // Build an RFC2388 String
+ binFile += dashes + boundary + eol;
+ // Generate the headers
+ binFile += 'Content-Disposition: form-data; name="' + settings.fileObjName + '"';
+ if (file.name) {
+ binFile += '; filename="' + file.name + '"';
+ }
+ binFile += eol;
+ binFile += 'Content-Type: application/octet-stream' + eol + eol;
+ binFile += e.target.result + eol;
+
+ for (key in settings.formData) {
+ binFile += dashes + boundary + eol;
+ binFile += 'Content-Disposition: form-data; name="' + key + '"' + eol + eol;
+ binFile += settings.formData[key] + eol;
+ }
+
+ binFile += dashes + boundary + dashes + eol;
+
+ // On progress function
+ xhr.upload.addEventListener('progress', function(e) {
+ $data.progress(e, file);
+ }, false);
+
+ // On complete function
+ xhr.addEventListener('load', function(e) {
+ file.uploading = false;
+ var status = this.status;
+ if (status == 404) {
+ $data.error('404_FILE_NOT_FOUND', file, uploadAll);
+ } else {
+ if (file.xhr.responseText != 'Invalid file type.') {
+ $data.uploadComplete(e, file, uploadAll);
+ } else {
+ $data.error(file.xhr.responseText, file, uploadAll);
+ }
+ }
+ }, false);
+
+ // Open the ajax request
+ var url = settings.uploadScript;
+ if (settings.method == 'get') {
+ var params = $(settings.formData).param();
+ url += params;
+ }
+ xhr.open(settings.method, settings.uploadScript, true);
+ xhr.setRequestHeader("Content-Type", "multipart/form-data; boundary=" + boundary);
+
+ // Trigger the uploadFile event
+ if (typeof settings.onUploadFile === 'function') {
+ settings.onUploadFile.call($this, file);
+ }
+
+ // Send the file for upload
+ xhr.sendAsBinary(binFile);
+ }
+ reader.readAsBinaryString(file);
+
+ }
+ }
+ }
+
+ // Update a file upload's progress
+ $data.progress = function(e, file) {
+ if ($.inArray('onProgress', settings.overrideEvents) < 0) {
+ if (e.lengthComputable) {
+ var percent = Math.round((e.loaded / e.total) * 100);
+ }
+ file.queueItem.find('.fileinfo').html(' - ' + percent + '%');
+ file.queueItem.find('.progress-bar').css('width', percent + '%');
+ }
+ // Trigger the progress event
+ if (typeof settings.onProgress === 'function') {
+ settings.onProgress.call($this, file, e);
+ }
+ }
+
+ // Trigger an error
+ $data.error = function(errorType, file, uploadAll) {
+ if ($.inArray('onError', settings.overrideEvents) < 0) {
+ // Get the error message
+ switch(errorType) {
+ case '404_FILE_NOT_FOUND':
+ errorMsg = '404 Error';
+ break;
+ case '403_FORBIDDEN':
+ errorMsg = '403 Forbidden';
+ break;
+ case 'FORBIDDEN_FILE_TYPE':
+ errorMsg = 'Forbidden File Type';
+ break;
+ case 'FILE_SIZE_LIMIT_EXCEEDED':
+ errorMsg = 'File Too Large';
+ break;
+ default:
+ errorMsg = 'Unknown Error';
+ break;
+ }
+
+ // Add the error class to the queue item
+ file.queueItem.addClass('error')
+ // Output the error in the queue item
+ .find('.fileinfo').html(' - ' + errorMsg);
+ // Hide the
+ file.queueItem.find('.progress').remove();
+ }
+ // Trigger the error event
+ if (typeof settings.onError === 'function') {
+ settings.onError.call($this, errorType, file);
+ }
+ file.skip = true;
+ if (errorType == '404_FILE_NOT_FOUND') {
+ $data.uploads.errors++;
+ } else {
+ $data.queue.errors++;
+ }
+ if (uploadAll) {
+ methods.upload.call($this, null, true);
+ }
+ }
+
+ // Trigger when a single file upload is complete
+ $data.uploadComplete = function(e, file, uploadAll) {
+ if ($.inArray('onUploadComplete', settings.overrideEvents) < 0) {
+ file.queueItem.find('.progress-bar').css('width', '100%');
+ file.queueItem.find('.fileinfo').html(' - Completed');
+ file.queueItem.find('.progress').slideUp(250);
+ file.queueItem.addClass('complete');
+ }
+ // Trigger the complete event
+ if (typeof settings.onUploadComplete === 'function') {
+ settings.onUploadComplete.call($this, file, file.xhr.responseText);
+ }
+ if (settings.removeCompleted) {
+ setTimeout(function() { methods.cancel.call($this, file); }, 3000);
+ }
+ file.complete = true;
+ $data.uploads.successful++;
+ $data.uploads.count++;
+ $data.uploads.current--;
+ delete file.xhr;
+ if (uploadAll) {
+ methods.upload.call($this, null, true);
+ }
+ }
+
+ // Trigger when all the files are done uploading
+ $data.queueComplete = function() {
+ // Trigger the queueComplete event
+ if (typeof settings.onQueueComplete === 'function') {
+ settings.onQueueComplete.call($this, $data.uploads);
+ }
+ }
+
+ // ----------------------
+ // Initialize UploadiFive
+ // ----------------------
+
+ // Check if HTML5 is available
+ if (window.File && window.FileList && window.Blob && (window.FileReader || window.FormData)) {
+ // Assign an ID to the object
+ settings.id = 'uploadifive-' + $this.attr('id');
+
+ // Wrap the file input in a div with overflow set to hidden
+ $data.button = $('<div id="' + settings.id + '" class="uploadifive-button">' + settings.buttonText + '</div>');
+ if (settings.buttonClass) $data.button.addClass(settings.buttonClass);
+
+ // Style the button wrapper
+ $data.button.css({
+ 'height' : settings.height,
+ 'line-height' : settings.height + 'px',
+ 'overflow' : 'hidden',
+ 'position' : 'relative',
+ 'text-align' : 'center',
+ 'width' : settings.width
+ });
+
+ // Insert the button above the file input
+ $this.before($data.button)
+ // Add the file input to the button
+ .appendTo($data.button)
+ // Modify the styles of the file input
+ .hide();
+
+ // Create a new input
+ $data.createInput.call($this);
+
+ // Create the queue container
+ if (!settings.queueID) {
+ settings.queueID = settings.id + '-queue';
+ $data.queueEl = $('<div id="' + settings.queueID + '" class="uploadifive-queue" />');
+ $data.button.after($data.queueEl);
+ } else {
+ $data.queueEl = $('#' + settings.queueID);
+ }
+
+ // Add drag and drop functionality
+ if (settings.dnd) {
+ var $dropTarget = settings.dropTarget ? $(settings.dropTarget) : $data.queueEl.get(0);
+ $dropTarget.addEventListener('dragleave', function(e) {
+ // Stop FireFox from opening the dropped file(s)
+ e.preventDefault();
+ e.stopPropagation();
+ }, false);
+ $dropTarget.addEventListener('dragenter', function(e) {
+ // Stop FireFox from opening the dropped file(s)
+ e.preventDefault();
+ e.stopPropagation();
+ }, false);
+ $dropTarget.addEventListener('dragover', function(e) {
+ // Stop FireFox from opening the dropped file(s)
+ e.preventDefault();
+ e.stopPropagation();
+ }, false);
+ $dropTarget.addEventListener('drop', $data.drop, false);
+ }
+
+ // Send as binary workaround for Chrome
+ if (!XMLHttpRequest.prototype.sendAsBinary) {
+ XMLHttpRequest.prototype.sendAsBinary = function(datastr) {
+ function byteValue(x) {
+ return x.charCodeAt(0) & 0xff;
+ }
+ var ords = Array.prototype.map.call(datastr, byteValue);
+ var ui8a = new Uint8Array(ords);
+ this.send(ui8a.buffer);
+ }
+ }
+
+ // Trigger the oninit event
+ if (typeof settings.onInit === 'function') {
+ settings.onInit.call($this);
+ }
+
+ } else {
+
+ // Trigger the fallback event
+ if (typeof settings.onFallback === 'function') {
+ settings.onFallback.call($this);
+ }
+ return false;
+
+ }
+
+ });
+
+ },
+
+
+ // Write some data to the console
+ debug : function() {
+
+ return this.each(function() {
+
+ console.log($(this).data('uploadifive'));
+
+ });
+
+ },
+
+ // Clear all the items from the queue
+ clearQueue : function() {
+
+ this.each(function() {
+
+ var $this = $(this),
+ $data = $this.data('uploadifive'),
+ settings = $data.settings;
+
+ for (var key in $data.inputs) {
+ input = $data.inputs[key];
+ limit = input.files.length;
+ for (i = 0; i < limit; i++) {
+ file = input.files[i];
+ methods.cancel.call($this, file);
+ }
+ }
+ // Trigger the onClearQueue event
+ if (typeof settings.onClearQueue === 'function') {
+ settings.onClearQueue.call($this, $('#' + $data.settings.queueID));
+ }
+
+ });
+
+ },
+
+ // Cancel a file upload in progress or remove a file from the queue
+ cancel : function(file, fast) {
+
+ this.each(function() {
+
+ var $this = $(this),
+ $data = $this.data('uploadifive'),
+ settings = $data.settings;
+
+ // If user passed a queue item ID instead of file...
+ if (typeof file === 'string') {
+ if (!isNaN(file)) {
+ fileID = 'uploadifive-' + $(this).attr('id') + '-file-' + file;
+ }
+ file = $('#' + fileID).data('file');
+ }
+
+ file.skip = true;
+ $data.filesCancelled++;
+ if (file.uploading) {
+ $data.uploads.current--;
+ file.uploading = false;
+ file.xhr.abort();
+ delete file.xhr;
+ methods.upload.call($this);
+ }
+ if ($.inArray('onCancel', settings.overrideEvents) < 0) {
+ $data.removeQueueItem(file, fast);
+ }
+
+ // Trigger the cancel event
+ if (typeof settings.onCancel === 'function') {
+ settings.onCancel.call($this, file);
+ }
+
+ });
+
+ },
+
+ // Upload the files in the queue
+ upload : function(file, keepVars) {
+
+ this.each(function() {
+
+ var $this = $(this),
+ $data = $this.data('uploadifive'),
+ settings = $data.settings;
+
+ if (file) {
+
+ $data.uploadFile.call($this, file);
+
+ } else {
+
+ // Check if the upload limit was reached
+ if (($data.uploads.count + $data.uploads.current) < settings.uploadLimit || settings.uploadLimit == 0) {
+ if (!keepVars) {
+ $data.uploads.attempted = 0;
+ $data.uploads.successsful = 0;
+ $data.uploads.errors = 0;
+ var filesToUpload = $data.filesToUpload();
+ // Trigger the onUpload event
+ if (typeof settings.onUpload === 'function') {
+ settings.onUpload.call($this, filesToUpload);
+ }
+ }
+
+ // Loop through the files
+ $('#' + settings.queueID).find('.uploadifive-queue-item').not('.error, .complete').each(function() {
+ _file = $(this).data('file');
+ // Check if the simUpload limit was reached
+ if (($data.uploads.current >= settings.simUploadLimit && settings.simUploadLimit !== 0) || ($data.uploads.current >= settings.uploadLimit && settings.uploadLimit !== 0) || ($data.uploads.count >= settings.uploadLimit && settings.uploadLimit !== 0)) {
+ return false;
+ }
+ if (settings.checkScript) {
+ // Let the loop know that we're already processing this file
+ _file.checking = true;
+ skipFile = $data.checkExists(_file);
+ _file.checking = false;
+ if (!skipFile) {
+ $data.uploadFile(_file, true);
+ }
+ } else {
+ $data.uploadFile(_file, true);
+ }
+ });
+ if ($('#' + settings.queueID).find('.uploadifive-queue-item').not('.error, .complete').size() == 0) {
+ $data.queueComplete();
+ }
+ } else {
+ if ($data.uploads.current == 0) {
+ if ($.inArray('onError', settings.overrideEvents) < 0) {
+ if ($data.filesToUpload() > 0 && settings.uploadLimit != 0) {
+ alert('The maximum upload limit has been reached.');
+ }
+ }
+ // Trigger the onError event
+ if (typeof settings.onError === 'function') {
+ settings.onError.call($this, 'UPLOAD_LIMIT_EXCEEDED', $data.filesToUpload());
+ }
+ }
+ }
+
+ }
+
+ });
+
+ },
+
+ // Destroy an instance of UploadiFive
+ destroy : function() {
+
+ this.each(function() {
+
+ var $this = $(this),
+ $data = $this.data('uploadifive'),
+ settings = $data.settings;
+
+ // Clear the queue
+ methods.clearQueue.call($this);
+ // Destroy the queue if it was created
+ if (!settings.queueID) $('#' + settings.queueID).remove();
+ // Remove extra inputs
+ $this.siblings('input').remove();
+ // Show the original file input
+ $this.show()
+ // Move the file input out of the button
+ .insertBefore($data.button);
+ // Delete the button
+ $data.button.remove();
+ // Trigger the destroy event
+ if (typeof settings.onDestroy === 'function') {
+ settings.onDestroy.call($this);
+ }
+
+ });
+
+ }
+
+ }
+
+ $.fn.uploadifive = function(method) {
+
+ if (methods[method]) {
+ return methods[method].apply(this, Array.prototype.slice.call(arguments, 1));
+ } else if (typeof method === 'object' || !method) {
+ return methods.init.apply(this, arguments);
+ } else {
+ $.error('The method ' + method + ' does not exist in $.uploadify');
+ }
+
+ }
+
+})(jQuery);
\ No newline at end of file
diff --git a/static/js/me/suggest.js b/static/js/me/suggest.js
index 30ce9cb..b526ce7 100644
--- a/static/js/me/suggest.js
+++ b/static/js/me/suggest.js
@@ -4,34 +4,28 @@
* @date: 2015/11/12
*/
+
var $ = require('jquery'),
Hammer = require('yoho.hammer'),
lazyLoad = require('yoho.lazyload');
-var $navLi = $('#fav-tab > li'),
- $favContainer = $('.fav-content');
-
-var $curContainer = $favContainer.children('.fav-type').first();//保存当前显示的$favContainer
-
-var favTabHammer;
+require('./jquery.uploadifive');
-//lazyLoad();
+$('#upload-img').uploadifive({
+ 'auto': false,
+ 'buttonClass': 'nav-btn',
+ 'formData': {
-favTabHammer = new Hammer(document.getElementById('fav-tab'));
-favTabHammer.on('tap', function(e) {
- console.log(1);
- var $cur = $(e.target).closest('li'),
- index;
+ },
+ 'fileType': 'image/*',
+ 'uploadScript': 'url',
+ 'fileObjName': 'imgName',
+ 'fileSizeLimit': 1024,
+ 'onAddQueueItem': function (file) {
+ console.log(file);
+ alert(1);
+ },
+ 'onQueueComplete': function (file) {
- if ($cur.length === 0 || $cur.hasClass('active')) {
- return;
}
-
- index = $cur.index();
-
- $navLi.filter('.active').removeClass('active');
- $cur.addClass('active');
-
- $curContainer.addClass('hide');
- $curContainer = $favContainer.children(':eq(' + index + ')').removeClass('hide');
-});
+});
\ No newline at end of file
diff --git a/static/sass/layout/_header.scss b/static/sass/layout/_header.scss
index 3e97370..89dda0b 100644
--- a/static/sass/layout/_header.scss
+++ b/static/sass/layout/_header.scss
@@ -62,4 +62,15 @@
text-overflow: ellipsis;
text-align: center;
}
+
+ .nav-btn {
+ display: block;
+ height: 100%;
+ position: absolute;
+ top: 0;
+ right: 0;
+ font-size: pxToRem(26px);
+ color: #b0b0b0;
+ padding-right: pxToRem(32px);
+ }
}
\ No newline at end of file
diff --git a/static/sass/me/_fav.scss b/static/sass/me/_fav.scss
index 22d251d..5f97be9 100644
--- a/static/sass/me/_fav.scss
+++ b/static/sass/me/_fav.scss
@@ -43,7 +43,7 @@ $fav: sprite-map("me/fav/*.png",$spacing: 5px);
//收藏主体
.fav-content {
- padding: 0 pxToRem(30px);
+ //padding: 0 pxToRem(30px);
.fav-null {
font-size: pxToRem(22px);
@@ -74,5 +74,185 @@ $fav: sprite-map("me/fav/*.png",$spacing: 5px);
display: block;
font-size: pxToRem(26px);
}
+
+ .fav-product-list {
+ list-style: none;
+ margin-left: pxToRem(30px);
+
+ li {
+ height: auto;
+ overflow: hidden;
+ margin-top: pxToRem(20px);
+ }
+
+ .fav-img-box {
+ width: pxToRem(90px);
+ height: pxToRem(120px);
+ float: left;
+ margin-right: pxToRem(24px);
+
+ img {
+ display: block;
+ overflow: hidden;
+ width: 100%;
+ height: 100%;
+ }
+ }
+
+ .fav-info-list {
+ color: #444;
+ font-size: pxToRem(24px);
+ border-bottom: 1px solid #e0e0e0;
+ padding-bottom: pxToRem(20px);
+ height: pxToRem(120px);
+ overflow: hidden;
+ position: relative;
+
+ h2 {
+ width: pxToRem(430px);
+ @include ellipsis();
+ }
+
+ .fav-price {
+
+ .new-price {
+ color: #d1021c;
+ }
+
+ .price-underline {
+ text-decoration: line-through;
+ }
+ }
+
+ .save-price {
+ $width: pxToRem(image_width(sprite-file($fav, save-price)));
+ $height: pxToRem(image_height(sprite-file($fav, save-price)));
+
+ position: absolute;
+ bottom: pxToRem(20px);
+ left: 0;
+ width: 100%;
+
+ &.save-price-number {
+ text-indent: $width + pxToRem(10px);
+
+ &:before {
+ content: '';
+ display: block;
+
+ @include rem-sprite($fav, save-price);
+ width: $width;
+ height: $height;
+
+ position: absolute;
+ top: 50%;
+ left: 0;
+ margin-top: -$height / 2;
+
+ }
+ }
+
+ span {
+ color: #d1021c;
+
+ &.sell-out {
+ padding: pxToRem(5px) pxToRem(18px);
+ color: #fffefe;
+ @include border-radius(pxToRem(20px));
+ background: #7f7f7f;
+ font-size: pxToRem(22px);
+ }
+
+ &.del-fav {
+ $width: pxToRem(image_width(sprite-file($fav, fav-del)));
+ $height: pxToRem(image_height(sprite-file($fav, fav-del)));
+
+ @include rem-sprite($fav, fav-del);
+ width: $width;
+ height: $height;
+
+ position: absolute;
+ top: 50%;
+ right: pxToRem(30px);
+ margin-top: -$height / 2;
+ }
+ }
+ }
+ }
+ }
+ //品牌收藏
+ .fav-brand-swiper {
+
+ .swiper-header {
+ height: pxToRem(60px);
+ padding: pxToRem(20px) pxToRem(30px);
+ display: inline-block;
+
+ .swiper-logo {
+ height: 100%;
+ display: inline-block;
+ float: left;
+ margin-right: pxToRem(45px);
+
+ > img {
+ max-height: 100%;
+ vertical-align: middle;
+ }
+ }
+
+ .brand-info {
+ float: left;
+
+ .brand-name {
+ font-size: pxToRem(28px);
+
+ b {
+ color: #b0b0b0;
+ font-weight: normal;
+ }
+ }
+
+ .brand-update {
+ font-size: pxToRem(22px);
+
+ b {
+ color: #b0b0b0;
+ font-weight: normal;
+ }
+
+ .brand-new {
+ color: #86bf4a;
+ margin-right: pxToRem(24px);
+ }
+ .brand-discount {
+ color: #d1021c;
+ }
+ }
+ }
+ }
+ .swiper-container {
+ height: pxToRem(300px);
+ margin: 0 pxToRem(30px);
+
+ .swiper-slide {
+ width: pxToRem(225px);
+ //width: (225/580)*100%;
+ height: 100%;
+ float: left;
+ padding-right: pxToRem(30px);
+
+ &:nth-last-of-type(1) {
+ padding-right: 0;
+ }
+
+ img {
+ display: block;
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+ }
+ }
+ }
+ }
}
}
\ No newline at end of file
diff --git a/static/sass/me/_suggest.scss b/static/sass/me/_suggest.scss
index 2698909..4d581ee 100644
--- a/static/sass/me/_suggest.scss
+++ b/static/sass/me/_suggest.scss
@@ -1,3 +1,5 @@
+@import "compass/layout";
+
$suggest: sprite-map("me/suggest/*.png",$spacing: 5px);
.yoho-suggest-page {
@@ -102,4 +104,97 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px);
}
}
}
+
+ //发表意见
+ .create-new-suggest {
+ display: block;
+ color: #444;
+ width: 100%;
+ height: pxToRem(88px);
+ line-height: pxToRem(88px);
+ text-align: center;
+ font-size: pxToRem(30px);
+ border-top: 1px solid #e0e0e0;
+ border-bottom: 1px solid #e0e0e0;
+
+ > span {
+ color: #b0b0b0;
+ font-size: pxToRem(26px);
+ }
+ }
+}
+
+// 提交页面
+.yoho-suggest-sub-page {
+ width: 100%;
+ //height: 100%;
+ background: #f0f0f0;
+
+ .suggest-sub-form {
+ background: #fff;
+ width: 100%;
+
+ #suggest-textarea {
+ @include box-sizing();
+ width: 100%;
+ max-width: 100%;
+ min-width: 100%;
+ height: pxToRem(255px);
+ max-height: pxToRem(255px);
+ min-height: pxToRem(255px);
+ padding: pxToRem(30px);
+ font-size: pxToRem(26px);
+ line-height: pxToRem(48px);
+ //color: #b0b0b0;
+ color: #000;
+ display: block;
+ background: #fff;
+ border: none;
+ outline: none;
+ }
+
+ .img-form {
+ padding: 0 pxToRem(30px);
+
+ .img-add {
+ display: block;
+ width: pxToRem(130px);
+ height: pxToRem(130px);
+ border: 1px dashed #e0e0e0;
+ position: relative;
+
+ &:after {
+ $width: pxToRem(image_width(sprite-file($suggest, suggest-add)));
+ $height: pxToRem(image_height(sprite-file($suggest, suggest-add)));
+ content: '';
+ display: block;
+
+ @include rem-sprite($suggest, suggest-add);
+ width: $width;
+ height: $height;
+
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ margin-top: -$height / 2;
+ margin-left: -$width / 2;
+ }
+
+ > input[type="file"] {
+ position: absolute;
+ //@include stretch();
+ @include opacity(0.2);
+ border: none;
+ outline: none;
+ display: block;
+
+ width: pxToRem(130px);
+ height: pxToRem(130px);
+
+ top: 0;
+ left: 0;
+ }
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/template/m.yohobuy.com/actions/index/home/favorite.phtml b/template/m.yohobuy.com/actions/index/home/favorite.phtml
index 622a38c..a423749 100644
--- a/template/m.yohobuy.com/actions/index/home/favorite.phtml
+++ b/template/m.yohobuy.com/actions/index/home/favorite.phtml
@@ -7,9 +7,41 @@
</ul>
<div class="fav-content">
<div class="fav-type">
- {{# hasFavProduct}}
+ <ul class="fav-product-list">
+ {{# hasFavProduct}}
+ <li>
+ <div class="fav-img-box">
+ <img src="{{imgUrl}}" alt=""/>
+ </div>
+ <div class="fav-info-list">
+ <h2>{{title}}</h2>
+ <div class="fav-price">
+ {{# discountPrice}}
+ <span class="new-price">{{.}}</span>
+ {{/ discountPrice}}
+ <span class="fav-price {{# discountPrice}}price-underline{{/ discountPrice}}">{{price}}</span>
+ </div>
- {{/ hasFavProduct}}
+ {{# savePrice}}
+ <div class="save-price save-price-number">
+ 比收藏时降价了<span>{{.}}</span>
+ <span class="del-fav"></span>
+ </div>
+ {{/ savePrice}}
+
+ {{^ savePrice}}
+ <div class="save-price">
+ {{# sellOut}}
+ <span class="sell-out">已售罄</span>
+ {{/ sellOut}}
+ <span class="del-fav"></span>
+ </div>
+ {{/ savePrice}}
+
+ </div>
+ </li>
+ {{/ hasFavProduct}}
+ </ul>
{{^ hasFavProduct}}
<span class="fav-null">您暂无收藏任何商品</span>
@@ -18,7 +50,41 @@
</div>
<div class="fav-type hide">
{{# hasFavBrand}}
-
+ <div class="fav-brand-swiper">
+ <div class="swiper-header">
+ <div class="swiper-logo">
+ <img src="{{brandImg}}" alt=""/>
+ </div>
+ <div class="brand-info">
+ <span class="brand-name">{{brandName}}</span>
+ <div class="brand-update">
+ {{# update}}
+ <span class="brand-new">上新<b>{{.}}</b></span>
+ {{/ update}}
+ {{# discount}}
+ <span class="brand-discount">折扣<b>{{.}}</b></span>
+ {{/ discount}}
+ </div>
+ </div>
+ <a href="{{link}}"></a>
+ </div>
+ <div id="swiper-container-{{id}}" class="swiper-container" data-id="{{id}}">
+ <ul class="swiper-wrapper swiper-wrapper-{{id}}">
+ {{# productList}}
+ <li class="swiper-slide">
+ <img class="swiper-lazy" data-src="{{imgUrl}}" alt=""/>
+ <div class="brand-product">
+ <p class="{{# discount}}price-discount{{/ discount}}">
+ {{price}}
+ {{# discount}}<span>{{.}}{{/ discount}}<span>
+ </p>
+ </div>
+ <div class="swiper-lazy-preloader"></div>
+ </li>
+ {{/ productList}}
+ </ul>
+ </div>
+ </div>
{{/ hasFavBrand}}
{{^ hasFavBrand}}
diff --git a/template/m.yohobuy.com/actions/index/home/suggest.phtml b/template/m.yohobuy.com/actions/index/home/suggest.phtml
index 9b90933..6db0ee3 100644
--- a/template/m.yohobuy.com/actions/index/home/suggest.phtml
+++ b/template/m.yohobuy.com/actions/index/home/suggest.phtml
@@ -33,6 +33,9 @@
</div>
{{/ suggestContent}}
</div>
+ <a class="create-new-suggest" href="#">
+ 反馈问题<span>（功能意见，界面意见）</span>
+ </a>
{{/ suggest}}
</div>
{{> layout/footer}}
\ No newline at end of file
diff --git a/template/m.yohobuy.com/actions/index/home/suggest_sub.phtml b/template/m.yohobuy.com/actions/index/home/suggest_sub.phtml
new file mode 100644
index 0000000..0e9c4b5
--- /dev/null
+++ b/template/m.yohobuy.com/actions/index/home/suggest_sub.phtml
@@ -0,0 +1,14 @@
+{{> layout/header}}
+<div class="yoho-suggest-sub-page yoho-page">
+ {{# suggestSub}}
+ <div class="suggest-sub-form">
+ <textarea name="" id="suggest-textarea" placeholder="请输入意见反馈，我们会以消息形式回复您的建议或意见，改进产品体验，谢谢！"></textarea>
+ <div class="img-form">
+ <span class="img-add">
+ <input id="upload-img" type="file" name="fileselect[]" multiple />
+ </span>
+ </div>
+ </div>
+ {{/ suggestSub}}
+</div>
+{{> layout/footer}}
\ No newline at end of file
diff --git a/template/m.yohobuy.com/partials/layout/page_header.phtml b/template/m.yohobuy.com/partials/layout/page_header.phtml
index 9c77b69..24c7fc2 100644
--- a/template/m.yohobuy.com/partials/layout/page_header.phtml
+++ b/template/m.yohobuy.com/partials/layout/page_header.phtml
@@ -9,5 +9,8 @@
{{#navTitle}}
<p class="nav-title">{{.}}</p>
{{/navTitle}}
+ {{# navBtn}}
+ <span class="nav-btn">{{.}}</span>
+ {{/ navBtn}}
</header>
{{/pageHeader}}
\ No newline at end of file
diff --git a/template/m.yohobuy.com/partials/layout/use.phtml b/template/m.yohobuy.com/partials/layout/use.phtml
index 76e0da3..dd01354 100644
--- a/template/m.yohobuy.com/partials/layout/use.phtml
+++ b/template/m.yohobuy.com/partials/layout/use.phtml
@@ -217,10 +217,17 @@
</script>
{{/if}}
{{#if favPage}}
+{{!-- 个人中心: 收藏 --}}
<script>
seajs.use('js/me/fav');
</script>
{{/if}}
+{{!-- 个人中心: 意见反馈 --}}
+{{#if suggestPage}}
+<script>
+ seajs.use('js/me/suggest');
+</script>
+{{/if}}
{{#if couponsPage}}
<script>
seajs.use('js/me/coupons');
diff --git a/yohobuy/m.yohobuy.com/application/controllers/Home.php b/yohobuy/m.yohobuy.com/application/controllers/Home.php
index 980bd21..1916228 100644
--- a/yohobuy/m.yohobuy.com/application/controllers/Home.php
+++ b/yohobuy/m.yohobuy.com/application/controllers/Home.php
@@ -100,7 +100,7 @@ class HomeController extends AbstractAction
//print_r($favProducts);
$this->_view->display('favorite', array(
- 'favPage' => true,
+ 'favPage' => true, //加载js
'pageHeader' => array(
'navBack' => true,
'navTitle' => '我的收藏',
@@ -108,8 +108,99 @@ class HomeController extends AbstractAction
),
'pageFooter' => true,
'favorite' => true,
- 'hasFavProduct' => false,
- 'hasFavBrand' => false
+ 'hasFavProduct' => array(
+ '0' => array(
+ 'imgUrl' => 'http://img11.static.yhbimg.com/goodsimg/2015/11/04/05/01ce2aff32fc3c90584f516167cd526d91.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
+ 'title' => 'adidas Originals ZX FLUXM22508 ',
+ 'price' => '￥800',
+ 'discountPrice' => false,
+ 'savePrice' => false,
+ 'sellOut' => true
+ ),
+ '1' => array(
+ 'imgUrl' => 'http://img11.static.yhbimg.com/goodsimg/2015/11/04/05/01ce2aff32fc3c90584f516167cd526d91.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
+ 'title' => 'adidas Originals ZX FLUXM22508 ',
+ 'price' => '￥800',
+ 'discountPrice' => '￥500',
+ 'savePrice' => '￥300',
+ 'sellOut' => false
+ )
+ ),
+ 'hasFavBrand' => array(
+ '0' => array(
+ 'id'=> '1',
+ 'brandImg' => 'http://img11.static.yhbimg.com/goodsimg/2015/11/04/05/01ce2aff32fc3c90584f516167cd526d91.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
+ 'brandName' => 'VANS',
+ 'update' => 12,
+ 'discount' => 10,
+ 'link' => '#',
+ 'productList' => array(
+ '0' => array(
+ 'imgUrl' => 'http://img11.static.yhbimg.com/goodsimg/2015/11/04/05/01ce2aff32fc3c90584f516167cd526d91.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
+ 'price' => '￥240',
+ 'discount' => '￥240'
+ ),
+ '1' => array(
+ 'imgUrl' => 'http://img11.static.yhbimg.com/goodsimg/2015/11/04/05/01ce2aff32fc3c90584f516167cd526d91.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
+ 'price' => '￥240',
+ 'discount' => '￥240'
+ ),
+ '2' => array(
+ 'imgUrl' => 'http://img11.static.yhbimg.com/goodsimg/2015/11/04/05/01ce2aff32fc3c90584f516167cd526d91.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
+ 'price' => '￥240',
+ 'discount' => '￥240'
+ ),
+ '3' => array(
+ 'imgUrl' => 'http://img11.static.yhbimg.com/goodsimg/2015/11/04/05/01ce2aff32fc3c90584f516167cd526d91.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
+ 'price' => '￥240',
+ 'discount' => '￥240'
+ )
+ )
+ ),
+ '1' => array(
+ 'id'=> '2',
+ 'brandImg' => 'http://img11.static.yhbimg.com/goodsimg/2015/11/04/05/01ce2aff32fc3c90584f516167cd526d91.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
+ 'brandName' => 'VANS',
+ 'update' => 12,
+ 'discount' => 10,
+ 'link' => '#',
+ 'productList' => array(
+ '0' => array(
+ 'imgUrl' => 'http://img11.static.yhbimg.com/goodsimg/2015/11/04/05/01ce2aff32fc3c90584f516167cd526d91.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
+ 'price' => '￥240',
+ 'discount' => '￥240'
+ ),
+ '1' => array(
+ 'imgUrl' => 'http://img11.static.yhbimg.com/goodsimg/2015/11/04/05/01ce2aff32fc3c90584f516167cd526d91.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
+ 'price' => '￥240',
+ 'discount' => '￥240'
+ ),
+ '2' => array(
+ 'imgUrl' => 'http://img11.static.yhbimg.com/goodsimg/2015/11/04/05/01ce2aff32fc3c90584f516167cd526d91.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
+ 'price' => '￥240',
+ 'discount' => '￥240'
+ ),
+ '3' => array(
+ 'imgUrl' => 'http://img11.static.yhbimg.com/goodsimg/2015/11/04/05/01ce2aff32fc3c90584f516167cd526d91.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
+ 'price' => '￥240',
+ 'discount' => '￥240'
+ )
+ )
+ ),
+ '2' => array(
+ 'id'=> '3',
+ 'brandImg' => 'http://img11.static.yhbimg.com/goodsimg/2015/11/04/05/01ce2aff32fc3c90584f516167cd526d91.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
+ 'brandName' => 'VANS',
+ 'update' => 12,
+ 'discount' => 10,
+ 'link' => '#',
+ 'productList' => array(
+ 'imgUrl' => 'http://img11.static.yhbimg.com/goodsimg/2015/11/04/05/01ce2aff32fc3c90584f516167cd526d91.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
+ 'price' => '￥240',
+ 'discount' => false
+ )
+ )
+ )
));
}
@@ -324,7 +415,7 @@ class HomeController extends AbstractAction
//print_r($suggest);
$this->_view->display('suggest', array(
- 'suggestPage' => true,
+ 'suggestPage' => true, //加载js
'pageHeader' => array(
'navBack' => true,
'navTitle' => '意见反馈'
@@ -355,6 +446,31 @@ class HomeController extends AbstractAction
}
+ /**
+ * 意见反馈-提交表单
+ */
+ public function suggest_subAction()
+ {
+ $udid = $this->getUdid();
+ $page = $this->get('page', 1);
+ $limit = $this->get('limit', 30);
+
+ $suggest = \Index\UserModel::getSuggestData($udid, $page, $limit);
+
+ //print_r($suggest);
+ $this->_view->display('suggest_sub', array(
+ 'suggestPage' => true, //加载js
+ 'pageHeader' => array(
+ 'navBack' => true,
+ 'navTitle' => '反馈问题',
+ 'navBtn' => '提交'
+ ),
+ 'suggestSub' => true,
+ 'pageFooter' => true
+ ));
+
+ }
+
/**
* 异步保存意见反馈数据
*/
--
libgit2 0.24.0