Merge branch 'release/5.1'

@@ -31,6 +31,8 @@ var $footer = $('#yoho-footer'),
 //为您优选-40位随机数指纹请求id
 var RECID = (new Date().getTime() + '_H5_YOHOBUY_' + Math.floor(Math.random() * 1000000 + 1000000) + '_' + Math.floor(Math.random() * 1000000 + 1000000));
 
+var _ChannelVary = {boys: 1, girls: 2, kids: 3, lifestyle: 4};
+
 function cookie(name) {
     var cookies = document.cookie,
         cookieVal,
@@ -144,6 +146,25 @@ function rePosFooter() {
     }
 }
 
+function queryString() {
+    var vars = [],
+        hash,
+        i;
+    var hashes = window.location.search.slice(1).split('&');
+
+    for (i = 0; i < hashes.length; i++) {
+        hash = hashes[i].split('=');
+        vars.push(hash[0]);
+        vars[hash[0]] = hash[1];
+    }
+    return vars;
+}
+
+// 给jQuery 扩展 queryString函数
+$.extend({
+    queryString: queryString
+});
+
 /**
  *
  * add extra margin-bottom for footer to show yoho copyright when there is fixed bottom element on page
@@ -206,6 +227,12 @@ function reMarginFooter(fixedElement) {
     }
 
     $footer.removeClass('hide');
+
+    // 接受微信商城或者第三方来源的数据埋点信息
+    if ($.queryString().mkt_code) {
+        setCookie('mkt_code', $.queryString().mkt_code);
+    }
+
 }());
 
 (function(w, d, s, j, f) {
@@ -222,7 +249,7 @@ function reMarginFooter(fixedElement) {
     a.src = j;
     m.parentNode.insertBefore(a, m);
 })(window, document, 'script', ('https:' === document.location.protocol ? 'https' : 'http') + '://' +
-    'cdn.yoho.cn/yas-jssdk/1.0.17/yas.js', '_yas');
+    'cdn.yoho.cn/yas-jssdk/1.0.18/yas.js', '_yas');
 
 (function() {
     var uid = getUid(),
@@ -236,7 +263,7 @@ function reMarginFooter(fixedElement) {
     window._ozuid = uid; // 暴露ozuid
 
     if (window._yas) {
-        window._yas(1 * new Date(), '1.0.17', 'yohobuy_m', uid, '', '');
+        window._yas(1 * new Date(), '1.0.18', 'yohobuy_m', uid, '', '');
 
         // 发送埋点数据
         sendBpData = function(bpIdArr) {
@@ -301,22 +328,9 @@ function givePoint(parameter) {
         return false;
     }
 
-    //男:1，女:2，潮童:3，创意生活:4
-    switch(cookie('_Channel')) {
-        case 'boys':
-            CID = 1;
-            break;
-        case 'girls':
-            CID = 2;
-            break;
-        case 'kids':
-            CID = 3;
-            break;
-        case 'lifestyle':
-            CID = 4;
-            break;
-    }
-         
+    // 男:1，女:2，潮童:3，创意生活:4
+    CID = _ChannelVary[cookie('_Channel')] || 1;
+
     parameter = $.extend({
             'REC_POSE': '',
             'REC_ID': RECID,
@@ -409,23 +423,6 @@ $('.nav-home').on('touchstart', function() {
     window.cancelAnimationFrame = cancelAnimationFrame;
 }());
 
-// 给jQuery 扩展 queryString函数
-$.extend({
-    queryString: function() {
-        var vars = [],
-            hash,
-            i;
-        var hashes = window.location.search.slice(1).split('&');
-
-        for (i = 0; i < hashes.length; i++) {
-            hash = hashes[i].split('=');
-            vars.push(hash[0]);
-            vars[hash[0]] = hash[1];
-        }
-        return vars;
-    }
-});
-
 //临时修改  footer
 function phoneHidden(phone) {
     return phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');
@@ -452,8 +449,12 @@ window.rePosFooter = rePosFooter;
 
 window.reMarginFooter = reMarginFooter;
 
+window.queryString = queryString();
+
 window.givePoint = givePoint;
 
+window._ChannelVary = _ChannelVary;
+
 });
 define("js/category/entry", ["jquery","hammer","swiper","lazyload","index"], function(require, exports, module){
 /**
@@ -1231,18 +1232,10 @@ var mySwiper;
 
 lazyLoad($('img.lazy'));
 
-$('.star-content li').each(function(key, item) {
-    $(item).find('.swiper-container').addClass('swiper-' + key);
-
-    mySwiper = new Swiper('.swiper-' + key, {
-        lazyLoading: true,
-        pagination: '.swiper-' + key + ' .pagination-inner'
-    });
-});
-
 $('#nav-tab').bind('contextmenu', function(e) {
     return false;
 });
+
 $('#nav-tab').on('touchend touchcancel', function(e) {
     var $this = $(e.target).closest('li');
 
@@ -1250,11 +1243,32 @@ $('#nav-tab').on('touchend touchcancel', function(e) {
         return;
     }
 
-    $navs.toggleClass('focus');
-    $contents.toggleClass('hide');
+    $navs.removeClass('focus');
+    $this.addClass('focus');
+    $contents.addClass('hide');
+    $contents.eq($this.index()).removeClass('hide');
+
+    if (typeof $this.swiper === 'undefined') {//解决隐藏式，swiper不渲染
+        $this.swiper = false;
+        $contents.find('li').each(function(key, item) {
+            $(item).find('.swiper-container').addClass('swiper-' + key);
+
+            mySwiper = new Swiper('.swiper-' + key, {
+                lazyLoading: true,
+                pagination: '.swiper-' + key + ' .pagination-inner'
+            });
+        });
+    }
 
     $(document).trigger('scroll'); //Trigger lazyLoad
 });
+
+if ($('#nav-tab').find('li:eq(0)').hasClass('focus')) {
+    //解决li隐藏 swiper不渲染的问题
+    $('#nav-tab').find('li:eq(0)').removeClass('focus');
+    $('#nav-tab').find('li:eq(0)').trigger('touchend');
+}
+
 $('#nav-tab').on('touchstart', function(e) {
     var target = e.target || e.srcElement;
 
@@ -4613,34 +4627,32 @@ define("js/index/footer", ["jquery","hammer"], function(require, exports, module
 var $ = require("jquery"),
     Hammer = require("hammer");
 
-var floatLayerBtnHammer;
+var floatLayerBtnHammer,
+    C_ID;
 
 require("js/common");
 
-/**
- * 获取url参数
- */
-function getQueryString(name) {
-    var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
-    var r = window.location.search.substr(1).match(reg);
-
-    if (r != null) {
-        return window.unescape(r[2]);
-    }
-    return null;
-}
+C_ID = window._ChannelVary[window.cookie('_Channel')] || 1;
 
 function downLoadApp() {
-    var appUrl = 'http://www.yohoshow.com/about/index/yohobuyqr/';
+    var appUrl = 'http://union.yoho.cn/union/downapp.html';
     var clickedAt = new Date();
 
     setTimeout(function() {
-        var mkt = getQueryString('mkt_code');
+        var mkt = window.queryString.mkt_code || window.cookie('mkt_code') || false;
 
         if ((new Date()) - clickedAt < 2000) {
             if (mkt) {
                 appUrl += '?union_type=' + mkt;
             }
+
+            if (window._yas && window._yas.sendCustomInfo) {
+                window._yas.sendCustomInfo({
+                    op: 'YB_DOWNLOAD_C',
+                    param: JSON.stringify({'C_ID': C_ID, 'TO_URL': appUrl})
+                }, true);
+            }
+
             window.location = appUrl;
         }
     }, 500);
@@ -14895,7 +14907,7 @@ var $invoiceNotice = $('.invoice-notice'),
     isModifyTel = false;
 
 var myreg = /^(((13[0-9]{1})|(14[0-9]{1})|(15[0-9]{1})|(17[0-9]{1})|(18[0-9]{1}))+\d{8})$/,
-    linkUrl = '/cart/index/orderEnsure?cartType=ordinary';
+    linkUrl = $('.address-more').val() || '/cart/index/orderEnsure?cartType=ordinary';
 
 require("js/common");
 
@@ -15252,9 +15264,9 @@ require("js/common");
 
 $('.address-item').on('click', function() {
     var $this = $(this);
-    var addressId = $this.data('address-id');
+    var addressId = decodeURIComponent($this.data('address-id'));
     var address = {
-        address_id: $this.data('address-id'),
+        address_id: addressId,
         consignee: $this.find('.name').text(),
         mobile: $this.find('.tel').text(),
         address_info: $this.find('.address-info').text(),

+;(function() {
+var yohojson2_100_json2_debug, yas_jssdk_1018_src_config_debug, yas_jssdk_1018_src_cross_debug, yas_jssdk_1018_src_event_debug, yas_jssdk_1018_src_util_debug, yas_jssdk_1018_src_cookie_debug, yas_jssdk_1018_src_ya_debug, yas_jssdk_1018_yas_debug;
+yohojson2_100_json2_debug = function () {
+  /*
+      json2.js
+      2015-05-03
+  
+      Public Domain.
+  
+      NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
+  
+      See http://www.JSON.org/js.html
+  
+  
+      This code should be minified before deployment.
+      See http://javascript.crockford.com/jsmin.html
+  
+      USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO
+      NOT CONTROL.
+  
+  
+      This file creates a global JSON object containing two methods: stringify
+      and parse. This file is provides the ES5 JSON capability to ES3 systems.
+      If a project might run on IE8 or earlier, then this file should be included.
+      This file does nothing on ES5 systems.
+  
+          JSON.stringify(value, replacer, space)
+              value       any JavaScript value, usually an object or array.
+  
+              replacer    an optional parameter that determines how object
+                          values are stringified for objects. It can be a
+                          function or an array of strings.
+  
+              space       an optional parameter that specifies the indentation
+                          of nested structures. If it is omitted, the text will
+                          be packed without extra whitespace. If it is a number,
+                          it will specify the number of spaces to indent at each
+                          level. If it is a string (such as '\t' or ' '),
+                          it contains the characters used to indent at each level.
+  
+              This method produces a JSON text from a JavaScript value.
+  
+              When an object value is found, if the object contains a toJSON
+              method, its toJSON method will be called and the result will be
+              stringified. A toJSON method does not serialize: it returns the
+              value represented by the name/value pair that should be serialized,
+              or undefined if nothing should be serialized. The toJSON method
+              will be passed the key associated with the value, and this will be
+              bound to the value
+  
+              For example, this would serialize Dates as ISO strings.
+  
+                  Date.prototype.toJSON = function (key) {
+                      function f(n) {
+                          // Format integers to have at least two digits.
+                          return n < 10 
+                              ? '0' + n 
+                              : n;
+                      }
+  
+                      return this.getUTCFullYear()   + '-' +
+                           f(this.getUTCMonth() + 1) + '-' +
+                           f(this.getUTCDate())      + 'T' +
+                           f(this.getUTCHours())     + ':' +
+                           f(this.getUTCMinutes())   + ':' +
+                           f(this.getUTCSeconds())   + 'Z';
+                  };
+  
+              You can provide an optional replacer method. It will be passed the
+              key and value of each member, with this bound to the containing
+              object. The value that is returned from your method will be
+              serialized. If your method returns undefined, then the member will
+              be excluded from the serialization.
+  
+              If the replacer parameter is an array of strings, then it will be
+              used to select the members to be serialized. It filters the results
+              such that only members with keys listed in the replacer array are
+              stringified.
+  
+              Values that do not have JSON representations, such as undefined or
+              functions, will not be serialized. Such values in objects will be
+              dropped; in arrays they will be replaced with null. You can use
+              a replacer function to replace those with JSON values.
+              JSON.stringify(undefined) returns undefined.
+  
+              The optional space parameter produces a stringification of the
+              value that is filled with line breaks and indentation to make it
+              easier to read.
+  
+              If the space parameter is a non-empty string, then that string will
+              be used for indentation. If the space parameter is a number, then
+              the indentation will be that many spaces.
+  
+              Example:
+  
+              text = JSON.stringify(['e', {pluribus: 'unum'}]);
+              // text is '["e",{"pluribus":"unum"}]'
+  
+  
+              text = JSON.stringify(['e', {pluribus: 'unum'}], null, '\t');
+              // text is '[\n\t"e",\n\t{\n\t\t"pluribus": "unum"\n\t}\n]'
+  
+              text = JSON.stringify([new Date()], function (key, value) {
+                  return this[key] instanceof Date 
+                      ? 'Date(' + this[key] + ')' 
+                      : value;
+              });
+              // text is '["Date(---current time---)"]'
+  
+  
+          JSON.parse(text, reviver)
+              This method parses a JSON text to produce an object or array.
+              It can throw a SyntaxError exception.
+  
+              The optional reviver parameter is a function that can filter and
+              transform the results. It receives each of the keys and values,
+              and its return value is used instead of the original value.
+              If it returns what it received, then the structure is not modified.
+              If it returns undefined then the member is deleted.
+  
+              Example:
+  
+              // Parse the text. Values that look like ISO date strings will
+              // be converted to Date objects.
+  
+              myData = JSON.parse(text, function (key, value) {
+                  var a;
+                  if (typeof value === 'string') {
+                      a =
+  /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value);
+                      if (a) {
+                          return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4],
+                              +a[5], +a[6]));
+                      }
+                  }
+                  return value;
+              });
+  
+              myData = JSON.parse('["Date(09/09/2001)"]', function (key, value) {
+                  var d;
+                  if (typeof value === 'string' &&
+                          value.slice(0, 5) === 'Date(' &&
+                          value.slice(-1) === ')') {
+                      d = new Date(value.slice(5, -1));
+                      if (d) {
+                          return d;
+                      }
+                  }
+                  return value;
+              });
+  
+  
+      This is a reference implementation. You are free to copy, modify, or
+      redistribute.
+  */
+  /*jslint 
+      eval, for, this 
+  */
+  /*property
+      JSON, apply, call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours,
+      getUTCMinutes, getUTCMonth, getUTCSeconds, hasOwnProperty, join,
+      lastIndex, length, parse, prototype, push, replace, slice, stringify,
+      test, toJSON, toString, valueOf
+  */
+  // Create a JSON object only if one does not already exist. We create the
+  // methods in a closure to avoid creating global variables.
+  if (typeof JSON !== 'object') {
+    JSON = {};
+  }
+  (function () {
+    'use strict';
+    var rx_one = /^[\],:{}\s]*$/, rx_two = /\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, rx_three = /"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, rx_four = /(?:^|:|,)(?:\s*\[)+/g, rx_escapable = /[\\\"\u0000-\u001f\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g, rx_dangerous = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;
+    function f(n) {
+      // Format integers to have at least two digits.
+      return n < 10 ? '0' + n : n;
+    }
+    function this_value() {
+      return this.valueOf();
+    }
+    if (typeof Date.prototype.toJSON !== 'function') {
+      Date.prototype.toJSON = function () {
+        return isFinite(this.valueOf()) ? this.getUTCFullYear() + '-' + f(this.getUTCMonth() + 1) + '-' + f(this.getUTCDate()) + 'T' + f(this.getUTCHours()) + ':' + f(this.getUTCMinutes()) + ':' + f(this.getUTCSeconds()) + 'Z' : null;
+      };
+      Boolean.prototype.toJSON = this_value;
+      Number.prototype.toJSON = this_value;
+      String.prototype.toJSON = this_value;
+    }
+    var gap, indent, meta, rep;
+    function quote(string) {
+      // If the string contains no control characters, no quote characters, and no
+      // backslash characters, then we can safely slap some quotes around it.
+      // Otherwise we must also replace the offending characters with safe escape
+      // sequences.
+      rx_escapable.lastIndex = 0;
+      return rx_escapable.test(string) ? '"' + string.replace(rx_escapable, function (a) {
+        var c = meta[a];
+        return typeof c === 'string' ? c : '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+      }) + '"' : '"' + string + '"';
+    }
+    function str(key, holder) {
+      // Produce a string from holder[key].
+      var i,
+        // The loop counter.
+        k,
+        // The member key.
+        v,
+        // The member value.
+        length, mind = gap, partial, value = holder[key];
+      // If the value has a toJSON method, call it to obtain a replacement value.
+      if (value && typeof value === 'object' && typeof value.toJSON === 'function') {
+        value = value.toJSON(key);
+      }
+      // If we were called with a replacer function, then call the replacer to
+      // obtain a replacement value.
+      if (typeof rep === 'function') {
+        value = rep.call(holder, key, value);
+      }
+      // What happens next depends on the value's type.
+      switch (typeof value) {
+      case 'string':
+        return quote(value);
+      case 'number':
+        // JSON numbers must be finite. Encode non-finite numbers as null.
+        return isFinite(value) ? String(value) : 'null';
+      case 'boolean':
+      case 'null':
+        // If the value is a boolean or null, convert it to a string. Note:
+        // typeof null does not produce 'null'. The case is included here in
+        // the remote chance that this gets fixed someday.
+        return String(value);
+      // If the type is 'object', we might be dealing with an object or an array or
+      // null.
+      case 'object':
+        // Due to a specification blunder in ECMAScript, typeof null is 'object',
+        // so watch out for that case.
+        if (!value) {
+          return 'null';
+        }
+        // Make an array to hold the partial results of stringifying this object value.
+        gap += indent;
+        partial = [];
+        // Is the value an array?
+        if (Object.prototype.toString.apply(value) === '[object Array]') {
+          // The value is an array. Stringify every element. Use null as a placeholder
+          // for non-JSON values.
+          length = value.length;
+          for (i = 0; i < length; i += 1) {
+            partial[i] = str(i, value) || 'null';
+          }
+          // Join all of the elements together, separated with commas, and wrap them in
+          // brackets.
+          v = partial.length === 0 ? '[]' : gap ? '[\n' + gap + partial.join(',\n' + gap) + '\n' + mind + ']' : '[' + partial.join(',') + ']';
+          gap = mind;
+          return v;
+        }
+        // If the replacer is an array, use it to select the members to be stringified.
+        if (rep && typeof rep === 'object') {
+          length = rep.length;
+          for (i = 0; i < length; i += 1) {
+            if (typeof rep[i] === 'string') {
+              k = rep[i];
+              v = str(k, value);
+              if (v) {
+                partial.push(quote(k) + (gap ? ': ' : ':') + v);
+              }
+            }
+          }
+        } else {
+          // Otherwise, iterate through all of the keys in the object.
+          for (k in value) {
+            if (Object.prototype.hasOwnProperty.call(value, k)) {
+              v = str(k, value);
+              if (v) {
+                partial.push(quote(k) + (gap ? ': ' : ':') + v);
+              }
+            }
+          }
+        }
+        // Join all of the member texts together, separated with commas,
+        // and wrap them in braces.
+        v = partial.length === 0 ? '{}' : gap ? '{\n' + gap + partial.join(',\n' + gap) + '\n' + mind + '}' : '{' + partial.join(',') + '}';
+        gap = mind;
+        return v;
+      }
+    }
+    // If the JSON object does not yet have a stringify method, give it one.
+    if (typeof JSON.stringify !== 'function') {
+      meta = {
+        // table of character substitutions
+        '\b': '\\b',
+        '\t': '\\t',
+        '\n': '\\n',
+        '\f': '\\f',
+        '\r': '\\r',
+        '"': '\\"',
+        '\\': '\\\\'
+      };
+      JSON.stringify = function (value, replacer, space) {
+        // The stringify method takes a value and an optional replacer, and an optional
+        // space parameter, and returns a JSON text. The replacer can be a function
+        // that can replace values, or an array of strings that will select the keys.
+        // A default replacer method can be provided. Use of the space parameter can
+        // produce text that is more easily readable.
+        var i;
+        gap = '';
+        indent = '';
+        // If the space parameter is a number, make an indent string containing that
+        // many spaces.
+        if (typeof space === 'number') {
+          for (i = 0; i < space; i += 1) {
+            indent += ' ';
+          }
+        } else if (typeof space === 'string') {
+          indent = space;
+        }
+        // If there is a replacer, it must be a function or an array.
+        // Otherwise, throw an error.
+        rep = replacer;
+        if (replacer && typeof replacer !== 'function' && (typeof replacer !== 'object' || typeof replacer.length !== 'number')) {
+          throw new Error('JSON.stringify');
+        }
+        // Make a fake root object containing our value under the key of ''.
+        // Return the result of stringifying the value.
+        return str('', { '': value });
+      };
+    }
+    // If the JSON object does not yet have a parse method, give it one.
+    if (typeof JSON.parse !== 'function') {
+      JSON.parse = function (text, reviver) {
+        // The parse method takes a text and an optional reviver function, and returns
+        // a JavaScript value if the text is a valid JSON text.
+        var j;
+        function walk(holder, key) {
+          // The walk method is used to recursively walk the resulting structure so
+          // that modifications can be made.
+          var k, v, value = holder[key];
+          if (value && typeof value === 'object') {
+            for (k in value) {
+              if (Object.prototype.hasOwnProperty.call(value, k)) {
+                v = walk(value, k);
+                if (v !== undefined) {
+                  value[k] = v;
+                } else {
+                  delete value[k];
+                }
+              }
+            }
+          }
+          return reviver.call(holder, key, value);
+        }
+        // Parsing happens in four stages. In the first stage, we replace certain
+        // Unicode characters with escape sequences. JavaScript handles many characters
+        // incorrectly, either silently deleting them, or treating them as line endings.
+        text = String(text);
+        rx_dangerous.lastIndex = 0;
+        if (rx_dangerous.test(text)) {
+          text = text.replace(rx_dangerous, function (a) {
+            return '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+          });
+        }
+        // In the second stage, we run the text against regular expressions that look
+        // for non-JSON patterns. We are especially concerned with '()' and 'new'
+        // because they can cause invocation, and '=' because it can cause mutation.
+        // But just to be safe, we want to reject all unexpected forms.
+        // We split the second stage into 4 regexp operations in order to work around
+        // crippling inefficiencies in IE's and Safari's regexp engines. First we
+        // replace the JSON backslash pairs with '@' (a non-JSON character). Second, we
+        // replace all simple value tokens with ']' characters. Third, we delete all
+        // open brackets that follow a colon or comma or that begin the text. Finally,
+        // we look to see that the remaining characters are only whitespace or ']' or
+        // ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval.
+        if (rx_one.test(text.replace(rx_two, '@').replace(rx_three, ']').replace(rx_four, ''))) {
+          // In the third stage we use the eval function to compile the text into a
+          // JavaScript structure. The '{' operator is subject to a syntactic ambiguity
+          // in JavaScript: it can begin a block or an object literal. We wrap the text
+          // in parens to eliminate the ambiguity.
+          j = eval('(' + text + ')');
+          // In the optional fourth stage, we recursively walk the new structure, passing
+          // each name/value pair to a reviver function for possible transformation.
+          return typeof reviver === 'function' ? walk({ '': j }, '') : j;
+        }
+        // If the text is not JSON parseable, then a SyntaxError is thrown.
+        throw new SyntaxError('JSON.parse');
+      };
+    }
+  }());
+}();
+yas_jssdk_1018_src_config_debug = function (exports) {
+  exports = {
+    version: '1.0',
+    yasPath: '/web/',
+    yasDomain: getDomain(),
+    yasImgDomain: '//analytics.m.yohobuy.com/yas.gif'
+  };
+  function getDomain() {
+    var domainArr = document.domain.split('.');
+    var length = domainArr.length;
+    if (length > 1 && isNaN(domainArr[length - 1])) {
+      return '.' + domainArr[length - 2] + '.' + domainArr[length - 1];
+    } else {
+      return document.domain;
+    }
+  }
+  return exports;
+}();
+yas_jssdk_1018_src_cross_debug = function (exports) {
+  /**
+   * 跨域发送信息工具库
+   */
+  var config = yas_jssdk_1018_src_config_debug;
+  var yasPath = config.yasPath;
+  var yasImgDomain = config.yasImgDomain;
+  //发送图片方式
+  exports.imgSend = function (param, callback) {
+    var image = new Image(1, 1);
+    image.src = yasImgDomain + yasPath + '?' + param;
+    image.onload = function () {
+      image.onload = null;
+      if (callback) {
+        callback();
+      }
+    };
+  };
+  return exports;
+}({});
+yas_jssdk_1018_src_event_debug = function (exports) {
+  exports.addEventHandler = function (target, type, func) {
+    if (target.addEventListener)
+      target.addEventListener(type, func, false);
+    else if (target.attachEvent)
+      target.attachEvent('on' + type, func);
+    else
+      target['on' + type] = func;
+  };
+  exports.removeEventHandler = function (target, type, func) {
+    if (target.removeEventListener)
+      target.removeEventListener(type, func, false);
+    else if (target.detachEvent)
+      target.detachEvent('on' + type, func);
+    else
+      delete target['on' + type];
+  };
+  return exports;
+}({});
+yas_jssdk_1018_src_util_debug = function (exports) {
+  var config = yas_jssdk_1018_src_config_debug;
+  var yasPath = config.yaPath;
+  var yasDomain = config.yasDomain;
+  exports.flashChecker = function () {
+    var hasFlash = 0;
+    var flashVersion = 0;
+    var isIE = 0;
+    var swf = null;
+    if (isIE) {
+      swf = new ActiveXObject('ShockwaveFlash.ShockwaveFlash');
+      if (swf) {
+        hasFlash = 1;
+        flashVersion = swf.GetVariable('$version');
+      }
+    } else {
+      if (navigator.plugins && navigator.plugins.length > 0) {
+        swf = navigator.plugins['Shockwave Flash'];
+        if (swf) {
+          hasFlash = 1;
+          flashVersion = swf.description.replace('Shockwave Flash', '');
+        }
+      }
+    }
+    return {
+      f: hasFlash,
+      v: flashVersion
+    };
+  };
+  exports.Hash = function (str) {
+    var hash = 1, charCode = 0, idx;
+    if (str) {
+      hash = 0;
+      for (idx = str.length - 1; idx >= 0; idx--) {
+        charCode = str.charCodeAt(idx);
+        hash = (hash << 6 & 268435455) + charCode + (charCode << 14);
+        charCode = hash & 266338304;
+        if (charCode !== 0) {
+          hash = hash ^ charCode >> 21;
+        }
+      }
+    }
+    return hash;
+  };
+  exports.Random = function () {
+    return Math.round(Math.random() * 2147483647);
+  };
+  exports.hashClientInfo = function () {
+    var navigator = window.navigator;
+    var history_length = window.history.length;
+    var arr = [
+        navigator.appName,
+        navigator.version,
+        navigator.language,
+        navigator.platform,
+        navigator.userAgent,
+        navigator.javaEnabled(),
+        window.screen,
+        window.screen.colorDepth,
+        window.document.cookie ? window.document.cookie : '',
+        window.document.referrer ? window.document.referrer : ''
+      ];
+    navigator = arr.join('');
+    for (var len = navigator.length; history_length > 0;) {
+      navigator += history_length-- ^ len++;
+    }
+    return exports.Hash(navigator);
+  };
+  exports.merge = function (obj1, obj2) {
+    var ret = {};
+    for (var attr in obj1) {
+      ret[attr] = obj1[attr];
+    }
+    for (var attr2 in obj2) {
+      ret[attr2] = obj2[attr2];
+    }
+    return ret;
+  };
+  exports.genParam = function (obj) {
+    var arr = [];
+    for (var key in obj) {
+      arr.push(key + '=' + obj[key]);
+    }
+    return arr.join('&');
+  };
+  exports.trim = function (text) {
+    if (String.prototype.trim) {
+      return text === null ? '' : String.prototype.trim.call(text);
+    } else {
+      var trimLeft = /^\s+/;
+      var trimRight = /\s+$/;
+      var ret = '';
+      if (text) {
+        ret = text.toString().replace(trimLeft, '');
+        ret = ret.replace(trimRight, '');
+        return ret;
+      }
+    }
+  };
+  exports.getGeo = function (callback) {
+    if (window.navigator.geolocation) {
+      var options = { enableHighAccuracy: true };
+      window.navigator.geolocation.getCurrentPosition(handleSuccess, handleError, options);
+    } else {
+      callback(false);
+    }
+    function handleSuccess(position) {
+      var lng = position.coords.longitude;
+      var lat = position.coords.latitude;
+      callback(lat, lng);
+    }
+    function handleError(error) {
+      callback(false);
+    }
+  };
+  return exports;
+}({});
+yas_jssdk_1018_src_cookie_debug = function (exports) {
+  var util = yas_jssdk_1018_src_util_debug;
+  exports = function (name, value, options) {
+    if (typeof value != 'undefined') {
+      options = options || {};
+      if (value === null) {
+        value = '';
+        options.expires = -1;
+      }
+      var expires = '';
+      if (options.expires && (typeof options.expires == 'number' || options.expires.toUTCString)) {
+        var date;
+        if (typeof options.expires == 'number') {
+          date = new Date();
+          date.setTime(date.getTime() + options.expires * 24 * 60 * 60 * 1000);
+        } else {
+          date = options.expires;
+        }
+        expires = '; expires=' + date.toUTCString();
+      }
+      var path = options.path ? '; path=' + options.path : '';
+      var domain = options.domain ? '; domain=' + options.domain : '';
+      var secure = options.secure ? '; secure' : '';
+      document.cookie = [
+        name,
+        '=',
+        encodeURIComponent(value),
+        expires,
+        path,
+        domain,
+        secure
+      ].join('');
+    } else {
+      var cookieValue = null;
+      if (document.cookie) {
+        var cookies = document.cookie.split(';');
+        for (var i = 0; i < cookies.length; i++) {
+          var cookie = util.trim(cookies[i]);
+          if (cookie.substring(0, name.length + 1) == name + '=') {
+            cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
+            break;
+          }
+        }
+      }
+      return cookieValue;
+    }
+  };
+  return exports;
+}();
+yas_jssdk_1018_src_ya_debug = function (exports) {
+  yohojson2_100_json2_debug;
+  var util = yas_jssdk_1018_src_util_debug;
+  var cookies = yas_jssdk_1018_src_cookie_debug;
+  var cross = yas_jssdk_1018_src_cross_debug;
+  var ev = yas_jssdk_1018_src_event_debug;
+  var config = yas_jssdk_1018_src_config_debug;
+  var version = config.version;
+  var yasPath = config.yaPath;
+  var yasDomain = config.yasDomain;
+  var appInfo = {
+      h: document.domain,
+      p: window.location.port,
+      u: window.location.pathname,
+      ft: 0,
+      fst: 0,
+      sv: '',
+      ab: cookies('ab_5') || '',
+      apf: window.location.search.indexOf('app_version=') >= 0 ? 'Y' : 'N'
+    };
+  var VisitorId = getVisitorId();
+  var custInfo = {
+      ak: '',
+      cd: VisitorId.cid,
+      vd: new Date().getTime() + VisitorId.cid,
+      ud: '',
+      rf: document.referrer,
+      ckf: VisitorId.isNew
+    };
+  var custOpInfo = {
+      mp: '',
+      ev: '',
+      st: 0
+    };
+  var flash = util.flashChecker();
+  var browserInfo = {
+      sr: window.screen.width + 'x' + window.screen.height,
+      wr: window.screen.availWidth + 'x' + window.screen.availHeight,
+      sd: window.screen.colorDepth,
+      ln: window.navigator.language ? window.navigator.language : window.navigator.browserLanguage,
+      sy: window.navigator.platform,
+      ce: window.navigator.cookieEnabled,
+      fv: flash.f ? flash.v : 0
+    };
+  var _yas = function (initTime, version, tid, uid, geo, selector) {
+    custInfo.ak = tid;
+    appInfo.sv = version;
+    custInfo.ud = uid ? uid : '';
+    custInfo.ts = new Date().getTime();
+    if (cookies('_yasgeo')) {
+      var geoInfo = cookies('_yasgeo').split(',');
+      custInfo.la = geoInfo[0];
+      custInfo.lo = geoInfo[1];
+      cookies('_yasgeo', null, {
+        path: '/',
+        domain: config.yasDomain,
+        expires: 365 * 200
+      });
+    }
+    var beginTime = new Date().getTime();
+    var sendFlag = null;
+    var isOver3sSend = false;
+    appInfo.ft = beginTime - initTime;
+    ev.addEventHandler(window, 'load', function (e) {
+      var endTime = new Date().getTime();
+      appInfo.fst = endTime - initTime;
+      ev.removeEventHandler(window, 'load', arguments.callee);
+      window.clearTimeout(sendFlag);
+      if (!isOver3sSend) {
+        send();
+      }
+    });
+    sendFlag = window.setTimeout(function () {
+      appInfo.fst = 0;
+      appInfo.fse = '>3s';
+      isOver3sSend = true;
+      send();
+    }, 3000);
+    if (geo) {
+      util.getGeo(function (lat, lng) {
+        if (lat) {
+          cookies('_yasgeo', lat + ',' + lng, {
+            path: '/',
+            domain: yasDomain,
+            expires: 365 * 200
+          });
+        }
+      });
+    }
+    var reg = new RegExp('(^|&)mkt_code=([^&]*)(&|$)', 'i');
+    var regString = window.location.search.substr(1).match(reg);
+    if (regString !== null) {
+      cookies('mkt_code', unescape(regString[2]), {
+        path: '/',
+        domain: yasDomain
+      });
+    }
+    if (selector && selector[0]) {
+      for (var i = 0, length = selector.length; i < length; i++) {
+        selector[i].setAttribute('yoho_index', i + 1);
+      }
+    } else {
+      ev.addEventHandler(document, 'click', function (e) {
+        e = e || window.event;
+        var target = e.target || e.srcElement;
+        if (target && (target.nodeName === 'A' || target.nodeName === 'IMG' && target.parentNode.nodeName === 'A')) {
+          var pos = getMouseEventPosition(e);
+          var str = pos.x + ',' + pos.y + ',' + e.type;
+          var yoho_index = target.getAttribute('yoho_index') || target.parentNode.getAttribute('yoho_index');
+          if (yoho_index) {
+            str += ',' + yoho_index;
+          }
+          cookies('_yasmp', str, {
+            path: '/',
+            domain: yasDomain,
+            expires: 365 * 200
+          });
+        }
+        ix = 0;
+      });
+    }
+    onerror = handleErr;
+    var txt = '';
+    function handleErr(msg, url, l) {
+      txt = 'This page contains error! \n\n';
+      txt += 'Error message is\uFF1A' + msg + '\n';
+      txt += 'URL is: ' + url + '\n';
+      txt += 'Line is\uFF1A' + l + '\n\n';
+      var errString = JSON.stringify({ 'er': txt });
+      cookies('_yaserror', errString, {
+        path: '/',
+        domain: yasDomain,
+        expires: 365 * 200
+      });
+      return false;
+    }
+  };
+  function send(callback) {
+    var info = util.merge(appInfo, custInfo);
+    info = util.merge(info, browserInfo);
+    var mpJson = getMousePosition();
+    if (mpJson) {
+      info = util.merge(info, mpJson);
+      cookies('_yasmp', null, {
+        path: '/',
+        domain: config.yasDomain,
+        expires: 365 * 200
+      });
+    }
+    var _custJsonStr = cookies('_yascustjson');
+    if (_custJsonStr) {
+      var custJson = JSON.parse(_custJsonStr);
+      info = util.merge(info, custJson);
+      cookies('_yascustjson', null, {
+        path: '/',
+        domain: config.yasDomain,
+        expires: 365 * 200
+      });
+    }
+    var _yasErrorStr = cookies('_yaserror');
+    if (_yasErrorStr) {
+      var errorJson = JSON.parse(_yasErrorStr);
+      info = util.merge(info, errorJson);
+      cookies('_yaserror', null, {
+        path: '/',
+        domain: config.yasDomain,
+        expires: 365 * 200
+      });
+    }
+    var param = util.genParam(info);
+    callback = callback ? callback : function () {
+    };
+    cross.imgSend(param, callback);
+    var _yasev = cookies('_yasev');
+    if (_yasev) {
+      cross.imgSend(_yasev, function () {
+        cookies('_yasev', null, {
+          path: '/',
+          domain: config.yasDomain,
+          expires: 365 * 200
+        });
+      });
+    }
+  }
+  function getVisitorId() {
+    var cid = cookies('_yasvd');
+    if (cid) {
+      return {
+        cid: cid,
+        isNew: 'N'
+      };
+    }
+    cid = util.Random() ^ util.hashClientInfo() & 2147483647;
+    cookies('_yasvd', cid, {
+      path: '/',
+      domain: yasDomain,
+      expires: 365 * 200
+    });
+    return {
+      cid: cid,
+      isNew: 'Y'
+    };
+  }
+  function getMousePosition() {
+    var mp = cookies('_yasmp');
+    if (mp) {
+      var mpObject = mp.split(',');
+      if (mpObject.length === 3) {
+        return {
+          x: mpObject[0],
+          y: mpObject[1],
+          et: mpObject[2]
+        };
+      } else if (mpObject.length === 4) {
+        return {
+          x: mpObject[0],
+          y: mpObject[1],
+          et: mpObject[2],
+          ix: mpObject[3]
+        };
+      }
+    }
+    return null;
+  }
+  function getMouseEventPosition(e) {
+    var x = 0, y = 0;
+    if (e.pageX || e.pageY) {
+      x = e.pageX;
+      y = e.pageY;
+    } else if (e.clientX || e.clientY) {
+      x = e.clientX + document.body.scrollLeft + document.documentElement.scrollLeft;
+      y = e.clientY + document.body.scrollTop + document.documentElement.scrollTop;
+    }
+    x -= window.screen.width / 2;
+    y = window.screen.height / 2 - y;
+    return {
+      x: x,
+      y: y
+    };
+  }
+  function getMktc() {
+    var mktc = cookies('mkt_code');
+    if (mktc) {
+      return { mktc: mktc };
+    }
+    return null;
+  }
+  var evTimes = 0;
+  _yas.add = function (trackType, input, action, label, value) {
+    if (evTimes > 3) {
+      cross.imgSend(cookies('_yasev'), function () {
+        cookies('_yasev', null, {
+          path: '/',
+          domain: config.yasDomain,
+          expires: 365 * 200
+        });
+        evTimes = 0;
+        _addEv2Cookies(trackType, input, action, label, value);
+      });
+    } else {
+      _addEv2Cookies(trackType, input, action, label, value);
+    }
+  };
+  function _addEv2Cookies(trackType, input, action, label, value) {
+    var ev = cookies('_yasev');
+    if (ev) {
+      ev += '&';
+    } else {
+      ev = '';
+    }
+    cookies('_yasev', ev + 'vd=' + custInfo.vd + '&t=' + trackType + '&i=' + input + '&l=' + label + '&v=' + value, {
+      path: '/',
+      domain: yasDomain,
+      expires: 365 * 200
+    });
+    evTimes++;
+  }
+  _yas.sendMouseEvent = function (e, flag) {
+    e = e || window.event;
+    var pos = getMouseEventPosition(e);
+    if (!flag) {
+      cookies('_yasmp', pos.x + ',' + pos.y + ',' + e.type, {
+        path: '/',
+        domain: yasDomain,
+        expires: 365 * 200
+      });
+    } else {
+      var mp = {
+          x: pos.x,
+          y: pos.y,
+          et: e.type
+        };
+      var info = util.merge(appInfo, custInfo);
+      info = util.merge(info, browserInfo);
+      info = util.merge(info, mp);
+      var param = util.genParam(info);
+      cross.imgSend(param, function () {
+      });
+    }
+  };
+  _yas.sendCustomInfo = function (json, flag) {
+    json.ts = new Date().getTime();
+    if (!flag) {
+      var string = JSON.stringify(json);
+      cookies('_yascustjson', string, {
+        path: '/',
+        domain: yasDomain,
+        expires: 365 * 200
+      });
+    } else {
+      var info = util.merge(appInfo, custInfo);
+      info = util.merge(info, browserInfo);
+      info = util.merge(info, json);
+      var mktc = getMktc();
+      if (mktc) {
+        info = util.merge(info, mktc);
+      }
+      var param = util.genParam(info);
+      cross.imgSend(param, function () {
+      });
+    }
+  };
+  exports = _yas;
+  return exports;
+}();
+yas_jssdk_1018_yas_debug = function (exports) {
+  var yasJssdk = yas_jssdk_1018_src_ya_debug;
+  if (window.YohoAcquisitionObject) {
+    var yas = window.YohoAcquisitionObject;
+    if (window[yas].p) {
+      yasJssdk.apply(this, window[yas].p);
+      window[yas] = yasJssdk;
+    }
+  }
+  exports = yasJssdk;
+  return exports;
+}();
+}());
\ No newline at end of file

+!function(){var yohojson2_100_json2,yas_jssdk_1018_src_config,yas_jssdk_1018_src_cross,yas_jssdk_1018_src_event,yas_jssdk_1018_src_util,yas_jssdk_1018_src_cookie,yas_jssdk_1018_src_ya,yas_jssdk_1018_yas;yohojson2_100_json2=function(){"object"!=typeof JSON&&(JSON={}),function(){"use strict";function f(e){return 10>e?"0"+e:e}function this_value(){return this.valueOf()}function quote(e){return rx_escapable.lastIndex=0,rx_escapable.test(e)?'"'+e.replace(rx_escapable,function(e){var n=meta[e];return"string"==typeof n?n:"\\u"+("0000"+e.charCodeAt(0).toString(16)).slice(-4)})+'"':'"'+e+'"'}function str(e,n){var t,r,o,a,i,s=gap,u=n[e];switch(u&&"object"==typeof u&&"function"==typeof u.toJSON&&(u=u.toJSON(e)),"function"==typeof rep&&(u=rep.call(n,e,u)),typeof u){case"string":return quote(u);case"number":return isFinite(u)?String(u):"null";case"boolean":case"null":return String(u);case"object":if(!u)return"null";if(gap+=indent,i=[],"[object Array]"===Object.prototype.toString.apply(u)){for(a=u.length,t=0;a>t;t+=1)i[t]=str(t,u)||"null";return o=0===i.length?"[]":gap?"[\n"+gap+i.join(",\n"+gap)+"\n"+s+"]":"["+i.join(",")+"]",gap=s,o}if(rep&&"object"==typeof rep)for(a=rep.length,t=0;a>t;t+=1)"string"==typeof rep[t]&&(r=rep[t],o=str(r,u),o&&i.push(quote(r)+(gap?": ":":")+o));else for(r in u)Object.prototype.hasOwnProperty.call(u,r)&&(o=str(r,u),o&&i.push(quote(r)+(gap?": ":":")+o));return o=0===i.length?"{}":gap?"{\n"+gap+i.join(",\n"+gap)+"\n"+s+"}":"{"+i.join(",")+"}",gap=s,o}}var rx_one=/^[\],:{}\s]*$/,rx_two=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,rx_three=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,rx_four=/(?:^|:|,)(?:\s*\[)+/g,rx_escapable=/[\\\"\u0000-\u001f\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,rx_dangerous=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;"function"!=typeof Date.prototype.toJSON&&(Date.prototype.toJSON=function(){return isFinite(this.valueOf())?this.getUTCFullYear()+"-"+f(this.getUTCMonth()+1)+"-"+f(this.getUTCDate())+"T"+f(this.getUTCHours())+":"+f(this.getUTCMinutes())+":"+f(this.getUTCSeconds())+"Z":null},Boolean.prototype.toJSON=this_value,Number.prototype.toJSON=this_value,String.prototype.toJSON=this_value);var gap,indent,meta,rep;"function"!=typeof JSON.stringify&&(meta={"\b":"\\b","	":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"},JSON.stringify=function(e,n,t){var r;if(gap="",indent="","number"==typeof t)for(r=0;t>r;r+=1)indent+=" ";else"string"==typeof t&&(indent=t);if(rep=n,n&&"function"!=typeof n&&("object"!=typeof n||"number"!=typeof n.length))throw new Error("JSON.stringify");return str("",{"":e})}),"function"!=typeof JSON.parse&&(JSON.parse=function(text,reviver){function walk(e,n){var t,r,o=e[n];if(o&&"object"==typeof o)for(t in o)Object.prototype.hasOwnProperty.call(o,t)&&(r=walk(o,t),void 0!==r?o[t]=r:delete o[t]);return reviver.call(e,n,o)}var j;if(text=String(text),rx_dangerous.lastIndex=0,rx_dangerous.test(text)&&(text=text.replace(rx_dangerous,function(e){return"\\u"+("0000"+e.charCodeAt(0).toString(16)).slice(-4)})),rx_one.test(text.replace(rx_two,"@").replace(rx_three,"]").replace(rx_four,"")))return j=eval("("+text+")"),"function"==typeof reviver?walk({"":j},""):j;throw new SyntaxError("JSON.parse")})}()}(),yas_jssdk_1018_src_config=function(e){function n(){var e=document.domain.split("."),n=e.length;return n>1&&isNaN(e[n-1])?"."+e[n-2]+"."+e[n-1]:document.domain}return e={version:"1.0",yasPath:"/web/",yasDomain:n(),yasImgDomain:"//analytics.m.yohobuy.com/yas.gif"}}(),yas_jssdk_1018_src_cross=function(e){var n=yas_jssdk_1018_src_config,t=n.yasPath,r=n.yasImgDomain;return e.imgSend=function(e,n){var o=new Image(1,1);o.src=r+t+"?"+e,o.onload=function(){o.onload=null,n&&n()}},e}({}),yas_jssdk_1018_src_event=function(e){return e.addEventHandler=function(e,n,t){e.addEventListener?e.addEventListener(n,t,!1):e.attachEvent?e.attachEvent("on"+n,t):e["on"+n]=t},e.removeEventHandler=function(e,n,t){e.removeEventListener?e.removeEventListener(n,t,!1):e.detachEvent?e.detachEvent("on"+n,t):delete e["on"+n]},e}({}),yas_jssdk_1018_src_util=function(e){{var n=yas_jssdk_1018_src_config;n.yaPath,n.yasDomain}return e.flashChecker=function(){var e=0,n=0,t=0,r=null;return t?(r=new ActiveXObject("ShockwaveFlash.ShockwaveFlash"),r&&(e=1,n=r.GetVariable("$version"))):navigator.plugins&&navigator.plugins.length>0&&(r=navigator.plugins["Shockwave Flash"],r&&(e=1,n=r.description.replace("Shockwave Flash",""))),{f:e,v:n}},e.Hash=function(e){var n,t=1,r=0;if(e)for(t=0,n=e.length-1;n>=0;n--)r=e.charCodeAt(n),t=(t<<6&268435455)+r+(r<<14),r=266338304&t,0!==r&&(t^=r>>21);return t},e.Random=function(){return Math.round(2147483647*Math.random())},e.hashClientInfo=function(){var n=window.navigator,t=window.history.length,r=[n.appName,n.version,n.language,n.platform,n.userAgent,n.javaEnabled(),window.screen,window.screen.colorDepth,window.document.cookie?window.document.cookie:"",window.document.referrer?window.document.referrer:""];n=r.join("");for(var o=n.length;t>0;)n+=t--^o++;return e.Hash(n)},e.merge=function(e,n){var t={};for(var r in e)t[r]=e[r];for(var o in n)t[o]=n[o];return t},e.genParam=function(e){var n=[];for(var t in e)n.push(t+"="+e[t]);return n.join("&")},e.trim=function(e){if(String.prototype.trim)return null===e?"":String.prototype.trim.call(e);var n=/^\s+/,t=/\s+$/,r="";return e?(r=e.toString().replace(n,""),r=r.replace(t,"")):void 0},e.getGeo=function(e){function n(n){var t=n.coords.longitude,r=n.coords.latitude;e(r,t)}function t(){e(!1)}if(window.navigator.geolocation){var r={enableHighAccuracy:!0};window.navigator.geolocation.getCurrentPosition(n,t,r)}else e(!1)},e}({}),yas_jssdk_1018_src_cookie=function(e){var n=yas_jssdk_1018_src_util;return e=function(e,t,r){if("undefined"==typeof t){var o=null;if(document.cookie)for(var a=document.cookie.split(";"),i=0;i<a.length;i++){var s=n.trim(a[i]);if(s.substring(0,e.length+1)==e+"="){o=decodeURIComponent(s.substring(e.length+1));break}}return o}r=r||{},null===t&&(t="",r.expires=-1);var u="";if(r.expires&&("number"==typeof r.expires||r.expires.toUTCString)){var c;"number"==typeof r.expires?(c=new Date,c.setTime(c.getTime()+24*r.expires*60*60*1e3)):c=r.expires,u="; expires="+c.toUTCString()}var f=r.path?"; path="+r.path:"",d=r.domain?"; domain="+r.domain:"",l=r.secure?"; secure":"";document.cookie=[e,"=",encodeURIComponent(t),u,f,d,l].join("")}}(),yas_jssdk_1018_src_ya=function(e){function n(e){var n=s.merge(p,_);n=s.merge(n,y);var t=r();t&&(n=s.merge(n,t),u("_yasmp",null,{path:"/",domain:d.yasDomain,expires:73e3}));var o=u("_yascustjson");if(o){var a=JSON.parse(o);n=s.merge(n,a),u("_yascustjson",null,{path:"/",domain:d.yasDomain,expires:73e3})}var i=u("_yaserror");if(i){var f=JSON.parse(i);n=s.merge(n,f),u("_yaserror",null,{path:"/",domain:d.yasDomain,expires:73e3})}var l=s.genParam(n);e=e?e:function(){},c.imgSend(l,e);var g=u("_yasev");g&&c.imgSend(g,function(){u("_yasev",null,{path:"/",domain:d.yasDomain,expires:73e3})})}function t(){var e=u("_yasvd");return e?{cid:e,isNew:"N"}:(e=s.Random()^2147483647&s.hashClientInfo(),u("_yasvd",e,{path:"/",domain:l,expires:73e3}),{cid:e,isNew:"Y"})}function r(){var e=u("_yasmp");if(e){var n=e.split(",");if(3===n.length)return{x:n[0],y:n[1],et:n[2]};if(4===n.length)return{x:n[0],y:n[1],et:n[2],ix:n[3]}}return null}function o(e){var n=0,t=0;return e.pageX||e.pageY?(n=e.pageX,t=e.pageY):(e.clientX||e.clientY)&&(n=e.clientX+document.body.scrollLeft+document.documentElement.scrollLeft,t=e.clientY+document.body.scrollTop+document.documentElement.scrollTop),n-=window.screen.width/2,t=window.screen.height/2-t,{x:n,y:t}}function a(){var e=u("mkt_code");return e?{mktc:e}:null}function i(e,n,t,r,o){var a=u("_yasev");a?a+="&":a="",u("_yasev",a+"vd="+_.vd+"&t="+e+"&i="+n+"&l="+r+"&v="+o,{path:"/",domain:l,expires:73e3}),h++}var s=yas_jssdk_1018_src_util,u=yas_jssdk_1018_src_cookie,c=yas_jssdk_1018_src_cross,f=yas_jssdk_1018_src_event,d=yas_jssdk_1018_src_config,l=(d.version,d.yaPath,d.yasDomain),p={h:document.domain,p:window.location.port,u:window.location.pathname,ft:0,fst:0,sv:"",ab:u("ab_5")||"",apf:window.location.search.indexOf("app_version=")>=0?"Y":"N"},g=t(),_={ak:"",cd:g.cid,vd:(new Date).getTime()+g.cid,ud:"",rf:document.referrer,ckf:g.isNew},v=s.flashChecker(),y={sr:window.screen.width+"x"+window.screen.height,wr:window.screen.availWidth+"x"+window.screen.availHeight,sd:window.screen.colorDepth,ln:window.navigator.language?window.navigator.language:window.navigator.browserLanguage,sy:window.navigator.platform,ce:window.navigator.cookieEnabled,fv:v.f?v.v:0},m=function(e,t,r,a,i,c){function g(e,n,t){b="This page contains error! \n\n",b+="Error message is\uff1a"+e+"\n",b+="URL is: "+n+"\n",b+="Line is\uff1a"+t+"\n\n";var r=JSON.stringify({er:b});return u("_yaserror",r,{path:"/",domain:l,expires:73e3}),!1}if(_.ak=r,p.sv=t,_.ud=a?a:"",_.ts=(new Date).getTime(),u("_yasgeo")){var v=u("_yasgeo").split(",");_.la=v[0],_.lo=v[1],u("_yasgeo",null,{path:"/",domain:d.yasDomain,expires:73e3})}var y=(new Date).getTime(),m=null,h=!1;p.ft=y-e,f.addEventHandler(window,"load",function(){var t=(new Date).getTime();p.fst=t-e,f.removeEventHandler(window,"load",arguments.callee),window.clearTimeout(m),h||n()}),m=window.setTimeout(function(){p.fst=0,p.fse=">3s",h=!0,n()},3e3),i&&s.getGeo(function(e,n){e&&u("_yasgeo",e+","+n,{path:"/",domain:l,expires:73e3})});var w=new RegExp("(^|&)mkt_code=([^&]*)(&|$)","i"),x=window.location.search.substr(1).match(w);if(null!==x&&u("mkt_code",unescape(x[2]),{path:"/",domain:l}),c&&c[0])for(var j=0,k=c.length;k>j;j++)c[j].setAttribute("yoho_index",j+1);else f.addEventHandler(document,"click",function(e){e=e||window.event;var n=e.target||e.srcElement;if(n&&("A"===n.nodeName||"IMG"===n.nodeName&&"A"===n.parentNode.nodeName)){var t=o(e),r=t.x+","+t.y+","+e.type,a=n.getAttribute("yoho_index")||n.parentNode.getAttribute("yoho_index");a&&(r+=","+a),u("_yasmp",r,{path:"/",domain:l,expires:73e3})}ix=0});onerror=g;var b=""},h=0;return m.add=function(e,n,t,r,o){h>3?c.imgSend(u("_yasev"),function(){u("_yasev",null,{path:"/",domain:d.yasDomain,expires:73e3}),h=0,i(e,n,t,r,o)}):i(e,n,t,r,o)},m.sendMouseEvent=function(e,n){e=e||window.event;var t=o(e);if(n){var r={x:t.x,y:t.y,et:e.type},a=s.merge(p,_);a=s.merge(a,y),a=s.merge(a,r);var i=s.genParam(a);c.imgSend(i,function(){})}else u("_yasmp",t.x+","+t.y+","+e.type,{path:"/",domain:l,expires:73e3})},m.sendCustomInfo=function(e,n){if(e.ts=(new Date).getTime(),n){var t=s.merge(p,_);t=s.merge(t,y),t=s.merge(t,e);var r=a();r&&(t=s.merge(t,r));var o=s.genParam(t);c.imgSend(o,function(){})}else{var i=JSON.stringify(e);u("_yascustjson",i,{path:"/",domain:l,expires:73e3})}},e=m}(),yas_jssdk_1018_yas=function(e){var n=yas_jssdk_1018_src_ya;if(window.YohoAcquisitionObject){var t=window.YohoAcquisitionObject;window[t].p&&(n.apply(this,window[t].p),window[t]=n)}return e=n}()}();
\ No newline at end of file

@@ -23,7 +23,7 @@ var $invoiceNotice = $('.invoice-notice'),
     isModifyTel = false;
 
 var myreg = /^(((13[0-9]{1})|(14[0-9]{1})|(15[0-9]{1})|(17[0-9]{1})|(18[0-9]{1}))+\d{8})$/,
-    linkUrl = '/cart/index/orderEnsure?cartType=ordinary';
+    linkUrl = $('.address-more').val() || '/cart/index/orderEnsure?cartType=ordinary';
 
 require('../common');
 

@@ -14,9 +14,9 @@ require('../common');
 
 $('.address-item').on('click', function() {
     var $this = $(this);
-    var addressId = $this.data('address-id');
+    var addressId = decodeURIComponent($this.data('address-id'));
     var address = {
-        address_id: $this.data('address-id'),
+        address_id: addressId,
         consignee: $this.find('.name').text(),
         mobile: $this.find('.tel').text(),
         address_info: $this.find('.address-info').text(),

@@ -13,6 +13,8 @@ var $footer = $('#yoho-footer'),
 //为您优选-40位随机数指纹请求id
 var RECID = (new Date().getTime() + '_H5_YOHOBUY_' + Math.floor(Math.random() * 1000000 + 1000000) + '_' + Math.floor(Math.random() * 1000000 + 1000000));
 
+var _ChannelVary = {boys: 1, girls: 2, kids: 3, lifestyle: 4};
+
 function cookie(name) {
     var cookies = document.cookie,
         cookieVal,
@@ -126,6 +128,25 @@ function rePosFooter() {
     }
 }
 
+function queryString() {
+    var vars = [],
+        hash,
+        i;
+    var hashes = window.location.search.slice(1).split('&');
+
+    for (i = 0; i < hashes.length; i++) {
+        hash = hashes[i].split('=');
+        vars.push(hash[0]);
+        vars[hash[0]] = hash[1];
+    }
+    return vars;
+}
+
+// 给jQuery 扩展 queryString函数
+$.extend({
+    queryString: queryString
+});
+
 /**
  *
  * add extra margin-bottom for footer to show yoho copyright when there is fixed bottom element on page
@@ -188,6 +209,12 @@ function reMarginFooter(fixedElement) {
     }
 
     $footer.removeClass('hide');
+
+    // 接受微信商城或者第三方来源的数据埋点信息
+    if ($.queryString().mkt_code) {
+        setCookie('mkt_code', $.queryString().mkt_code);
+    }
+
 }());
 
 (function(w, d, s, j, f) {
@@ -204,7 +231,7 @@ function reMarginFooter(fixedElement) {
     a.src = j;
     m.parentNode.insertBefore(a, m);
 })(window, document, 'script', ('https:' === document.location.protocol ? 'https' : 'http') + '://' +
-    'cdn.yoho.cn/yas-jssdk/1.0.17/yas.js', '_yas');
+    'cdn.yoho.cn/yas-jssdk/1.0.18/yas.js', '_yas');
 
 (function() {
     var uid = getUid(),
@@ -218,7 +245,7 @@ function reMarginFooter(fixedElement) {
     window._ozuid = uid; // 暴露ozuid
 
     if (window._yas) {
-        window._yas(1 * new Date(), '1.0.17', 'yohobuy_m', uid, '', '');
+        window._yas(1 * new Date(), '1.0.18', 'yohobuy_m', uid, '', '');
 
         // 发送埋点数据
         sendBpData = function(bpIdArr) {
@@ -283,22 +310,9 @@ function givePoint(parameter) {
         return false;
     }
 
-    //男:1，女:2，潮童:3，创意生活:4
-    switch(cookie('_Channel')) {
-        case 'boys':
-            CID = 1;
-            break;
-        case 'girls':
-            CID = 2;
-            break;
-        case 'kids':
-            CID = 3;
-            break;
-        case 'lifestyle':
-            CID = 4;
-            break;
-    }
-         
+    // 男:1，女:2，潮童:3，创意生活:4
+    CID = _ChannelVary[cookie('_Channel')] || 1;
+
     parameter = $.extend({
             'REC_POSE': '',
             'REC_ID': RECID,
@@ -391,23 +405,6 @@ $('.nav-home').on('touchstart', function() {
     window.cancelAnimationFrame = cancelAnimationFrame;
 }());
 
-// 给jQuery 扩展 queryString函数
-$.extend({
-    queryString: function() {
-        var vars = [],
-            hash,
-            i;
-        var hashes = window.location.search.slice(1).split('&');
-
-        for (i = 0; i < hashes.length; i++) {
-            hash = hashes[i].split('=');
-            vars.push(hash[0]);
-            vars[hash[0]] = hash[1];
-        }
-        return vars;
-    }
-});
-
 //临时修改  footer
 function phoneHidden(phone) {
     return phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');
@@ -434,4 +431,8 @@ window.rePosFooter = rePosFooter;
 
 window.reMarginFooter = reMarginFooter;
 
+window.queryString = queryString();
+
 window.givePoint = givePoint;
+
+window._ChannelVary = _ChannelVary;

@@ -15,18 +15,10 @@ var mySwiper;
 
 lazyLoad($('img.lazy'));
 
-$('.star-content li').each(function(key, item) {
-    $(item).find('.swiper-container').addClass('swiper-' + key);
-
-    mySwiper = new Swiper('.swiper-' + key, {
-        lazyLoading: true,
-        pagination: '.swiper-' + key + ' .pagination-inner'
-    });
-});
-
 $('#nav-tab').bind('contextmenu', function(e) {
     return false;
 });
+
 $('#nav-tab').on('touchend touchcancel', function(e) {
     var $this = $(e.target).closest('li');
 
@@ -34,11 +26,32 @@ $('#nav-tab').on('touchend touchcancel', function(e) {
         return;
     }
 
-    $navs.toggleClass('focus');
-    $contents.toggleClass('hide');
+    $navs.removeClass('focus');
+    $this.addClass('focus');
+    $contents.addClass('hide');
+    $contents.eq($this.index()).removeClass('hide');
+
+    if (typeof $this.swiper === 'undefined') {//解决隐藏式，swiper不渲染
+        $this.swiper = false;
+        $contents.find('li').each(function(key, item) {
+            $(item).find('.swiper-container').addClass('swiper-' + key);
+
+            mySwiper = new Swiper('.swiper-' + key, {
+                lazyLoading: true,
+                pagination: '.swiper-' + key + ' .pagination-inner'
+            });
+        });
+    }
 
     $(document).trigger('scroll'); //Trigger lazyLoad
 });
+
+if ($('#nav-tab').find('li:eq(0)').hasClass('focus')) {
+    //解决li隐藏 swiper不渲染的问题
+    $('#nav-tab').find('li:eq(0)').removeClass('focus');
+    $('#nav-tab').find('li:eq(0)').trigger('touchend');
+}
+
 $('#nav-tab').on('touchstart', function(e) {
     var target = e.target || e.srcElement;
 

@@ -7,34 +7,32 @@
 var $ = require('jquery'),
     Hammer = require('yoho.hammer');
 
-var floatLayerBtnHammer;
+var floatLayerBtnHammer,
+    C_ID;
 
 require('../common');
 
-/**
- * 获取url参数
- */
-function getQueryString(name) {
-    var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
-    var r = window.location.search.substr(1).match(reg);
-
-    if (r != null) {
-        return window.unescape(r[2]);
-    }
-    return null;
-}
+C_ID = window._ChannelVary[window.cookie('_Channel')] || 1;
 
 function downLoadApp() {
-    var appUrl = 'http://www.yohoshow.com/about/index/yohobuyqr/';
+    var appUrl = 'http://union.yoho.cn/union/downapp.html';
     var clickedAt = new Date();
 
     setTimeout(function() {
-        var mkt = getQueryString('mkt_code');
+        var mkt = window.queryString.mkt_code || window.cookie('mkt_code') || false;
 
         if ((new Date()) - clickedAt < 2000) {
             if (mkt) {
                 appUrl += '?union_type=' + mkt;
             }
+
+            if (window._yas && window._yas.sendCustomInfo) {
+                window._yas.sendCustomInfo({
+                    op: 'YB_DOWNLOAD_C',
+                    param: JSON.stringify({'C_ID': C_ID, 'TO_URL': appUrl})
+                }, true);
+            }
+
             window.location = appUrl;
         }
     }, 500);

@@ -9,28 +9,31 @@
         height: 60px;
         padding: 10px 0;
         background-color: #fff;
-    }
 
-    .star-nav, .plus-nav {
-        box-sizing: border-box;
-        float: left;
-        width: 50%;
-        height: 60px;
-        line-height: 60px;
-        font-size: 16PX;
-        text-align: center;
-        color: #ccc;
+        li {
+            box-sizing: border-box;
+            float: left;
+            width: 50%;
+            height: 60px;
+            line-height: 60px;
+            font-size: 16PX;
+            text-align: center;
+            color: #ccc;
+            border-right: 1px solid #ccc;
 
-        &.focus {
-            color: #000;
+            &.focus {
+                color: #000;
+            }
+
+            &:last-child {
+                border-right: none;
+            }
         }
     }
+
     .bytouch{
         background:#eee;
     }
-    .star-nav {
-        border-right: 1px solid #ccc;
-    }
 
     .plus-star-row {
         margin-bottom: 30px;

@@ -163,6 +163,9 @@
             .rebuy {
                 margin-left: 20px;
             }
+            .order-opt-info{
+                color: #b6b6b6;
+            }
         }
     }
 

@@ -54,6 +54,7 @@
     </div>
 
     <input type="hidden" class="edit-flag" value="false" />
+    <input type="hidden" class="address-more" value="{{addressMore}}" />
 
     {{> layout/footer}}
 </div>

@@ -93,20 +93,20 @@
                 <a href="{{#if isLimit}}javascript:void(0);{{else}}/cart/index/selectCoupon{{/if}}">
                     <span class="title">优惠券</span>
                     {{# coupon}}
-                    <span class="coupon-count">
-                        {{count}}张可用
-                    </span>
-                    {{#if couponName}}
-                    <span class="used coupon-use" data-name="{{couponName}}">
-                        {{couponName}}
-                        <i class="iconfont">&#xe614;</i>
-                    </span>
-                    {{^}}
-                    <span class="not-used coupon-use">
-                        {{#if isLimit}}该商品不可使用优惠券{{else}}未使用{{/if}}
-                        <i class="iconfont">&#xe614;</i>
-                    </span>
-                    {{/if}}
+                        {{#if couponName}}
+                            <span class="used coupon-use" data-name="{{couponName}}">
+                                {{couponName}}
+                                <i class="iconfont">&#xe614;</i>
+                            </span>
+                        {{^}}
+                            <span class="coupon-count">
+                                {{count}}张可用
+                            </span>
+                            <span class="not-used coupon-use">
+                                {{#if isLimit}}该商品不可使用优惠券{{else}}未使用{{/if}}
+                                <i class="iconfont">&#xe614;</i>
+                            </span>
+                        {{/if}}
                     {{/coupon}}
                 </a>
             </li>

@@ -2,7 +2,7 @@
 <div class="my-address-page select-address-page yoho-page">
     <div class="page-wrap clearfix">
         {{# address}}
-        <div class="address-item" data-address-id="{{address_id}}" data-is-support="{{is_support}}" data-href="/cart/index/orderEnsure">
+        <div class="address-item" data-address-id="{{address_id}}" data-is-support="{{is_support}}" data-href="{{../moreUrl}}">
             <span class="name">{{consignee}}</span>
             <span class="tel">{{mobile}}</span>
             <p class="address-info">{{area}} {{address}}</p>

 {{>layout/header}}
 <div class="ps-list-page ps-page yoho-page">
-    {{# ps}}
+    {{#if ps}}
         <ul id="nav-tab" class="nav-tab clearfix">
-            <li class="star-nav focus">{{sName}}</li>
-            <li class="plus-nav">{{pName}}</li>
+            {{# ps}}
+                <li {{#if focus}} class="focus" {{/if}} >{{name}}</li>
+            {{/ps}}
         </ul>
         <div id="ps-content" class="ps-content">
-            <ul class="star-content content">
-                {{# star}}
-                    {{> guang/ps_item}}
-                {{/ star}}
-            </ul>
-            <ul class="plus-content content hide">
-                {{# plus}}
-                    {{> guang/ps_item}}
-                {{/ plus}}
-            </ul>
+            {{# ps}}
+                <ul class="content{{#if focus}}{{^}} hide {{/if}}">
+                    {{# list}}
+                        {{> guang/ps_item}}
+                    {{/list}}
+                </ul>
+            {{/ps}}
         </div>
-    {{/ ps}}
+    {{/if}}
 </div>
 {{>layout/footer}}
\ No newline at end of file

@@ -14,55 +14,60 @@
     </footer>
 
     {{!-- 对应订单状态的操作逻辑 --}}
-
-    {{!-- 完成和取消订单显示删除按钮 --}}
-    {{#unless unpaid}}
+    {{#if isDepositAdvance}}
         <div class="order-opt">
-            {{#unless unreceived}}
-                    <span class="btn del">删除订单</span>
-                    {{#if isVirtual}}
-                        <!--虚拟商品-->
-                    {{else}}
-                        <span class="btn rebuy">再次购买</span>
-                    {{/if}}
-            {{/unless}}
-
-            {{#if qrcode}}
-                <a class="locHref" href="{{qrcode}}">
-                    <span class="btn check-logistics">查看二维码</span>
-                </a>
-            {{/if}}
+          <span class="order-opt-info">请到App完成订单相关操作</span>
         </div>
-    {{/unless}}
+    {{^}}
+        {{!-- 完成和取消订单显示删除按钮 --}}
+        {{#unless unpaid}}
+            <div class="order-opt">
+                {{#unless unreceived}}
+                        <span class="btn del">删除订单</span>
+                        {{#if isVirtual}}
+                            <!--虚拟商品-->
+                        {{else}}
+                            <span class="btn rebuy">再次购买</span>
+                        {{/if}}
+                {{/unless}}
 
-    {{#if unpaid}}
-        <div class="order-opt">
-            <ul class="count-down hide">
-                <li>
-                    <span class="iconfont count-down-icon">&#xe64a;</span>
-                </li>
-                <li>
-                    <span class="hours">{{leftTime}}</span>
-                </li>
-            </ul>
-            <span class="btn cancel">取消订单</span>
-            {{#if payUrl}}
-            <a class="locHref" href="{{payUrl}}">
-                <span class="btn pay">立即付款</span>
-            </a>
-            {{/if}}
-        </div>
-    {{/if}}
+                {{#if qrcode}}
+                    <a class="locHref" href="{{qrcode}}">
+                        <span class="btn check-logistics">查看二维码</span>
+                    </a>
+                {{/if}}
+            </div>
+        {{/unless}}
 
-    {{!-- 包含未发货和已发货状态，未发货不传logisticsUrl --}}
-    {{#if unreceived}}
-        {{#if logisticsUrl}}
+        {{#if unpaid}}
             <div class="order-opt">
-                <a class="locHref" href="{{logisticsUrl}}">
-                    <span class="btn check-logistics">查看物流</span>
+                <ul class="count-down hide">
+                    <li>
+                        <span class="iconfont count-down-icon">&#xe64a;</span>
+                    </li>
+                    <li>
+                        <span class="hours">{{leftTime}}</span>
+                    </li>
+                </ul>
+                <span class="btn cancel">取消订单</span>
+                {{#if payUrl}}
+                <a class="locHref" href="{{payUrl}}">
+                    <span class="btn pay">立即付款</span>
                 </a>
+                {{/if}}
             </div>
         {{/if}}
-        
+
+        {{!-- 包含未发货和已发货状态，未发货不传logisticsUrl --}}
+        {{#if unreceived}}
+            {{#if logisticsUrl}}
+                <div class="order-opt">
+                    <a class="locHref" href="{{logisticsUrl}}">
+                        <span class="btn check-logistics">查看物流</span>
+                    </a>
+                </div>
+            {{/if}}
+            
+        {{/if}}
     {{/if}}
 </div>
\ No newline at end of file

@@ -480,6 +480,7 @@ class HomeController extends AbstractAction
             $this->setTitle('编辑地址');
             $this->setNavHeader('编辑地址', true, false);
 
+            $id = urlencode($id);
             $data['id'] = $id;
             // 获取特定地址的数据
             $data['address'] = UserModel::getAddressDataById($uid, $id);
@@ -508,6 +509,7 @@ class HomeController extends AbstractAction
             $email = $this->post('email', '');
             $id = $this->post('id', null);
             if ($id) {
+                $id = urldecode($id);
                 $id = Encryption::decrypt($id);
             }
             $mobile = $this->post('mobile', '');
@@ -535,6 +537,7 @@ class HomeController extends AbstractAction
             $uid = $this->getUid(true);
             $id = $this->post('id', '');
             if ($id) {
+                $id = urldecode($id);
                 $id = Encryption::decrypt($id);
             }
             $result = UserModel::setDefaultAddress($uid, $id);
@@ -559,6 +562,7 @@ class HomeController extends AbstractAction
             $uid = $this->getUid(true);
             $id = $this->post('id', '');
             if ($id) {
+                $id = urldecode($id);
                 $id = Encryption::decrypt($id);
             }
             $result = UserModel::deleteAddress($uid, $id);
@@ -1188,6 +1192,7 @@ class HomeController extends AbstractAction
                 break;
             }
             //address_id解密
+            $address_id = urldecode($address_id);
             $address_id = Encryption::decrypt($address_id);
             $result = OrderData::updateDeliveryAddress($order_code, $address_id);
             if (!isset($result['code'])) {

@@ -42,7 +42,7 @@ class PlusstarModel
         }
 
         if (USE_CACHE) {
-            $key = CacheConfig::KEY_ACTION_GUANG_PLUSSTAR_INDEX . $channel;
+            $key = CacheConfig::KEY_ACTION_GUANG_PLUSSTAR_INDEX . $channel . 'k1';
             // 先尝试获取一级缓存(master), 有数据则直接返回.
             $result = Cache::get($key, 'master');
             if (!empty($result)) {
@@ -61,8 +61,20 @@ class PlusstarModel
             return $result;
         }
         
-        $result['ps']['star'] = self::formatData($brandList['recom']['data']['list'][0]['data'], $gender, true);
-        $result['ps']['plus'] = self::formatData($brandList['all']['data']['list'][0]['data'], $gender, true);
+        if (!empty($brandList['recom']['data']['list'][0]['data'])) {
+            $result['ps'][] = array(
+                'list' => self::formatData($brandList['recom']['data']['list'][0]['data'], $gender, true),
+                'focus' => true,
+                'name' => '设计师',
+            );
+        }
+
+        if (!empty($brandList['all']['data']['list'][0]['data'])) {
+            $result['ps'][] = array(
+                'list' => self::formatData($brandList['all']['data']['list'][0]['data'], $gender, true),
+                'name' => '经典潮牌',
+            );
+        }
 
         // 接口调用正常,数据封装完成, 则设置一级(master)和二级(slave)数据缓存
         if (USE_CACHE) {
@@ -95,7 +107,7 @@ class PlusstarModel
         }
 
         if (USE_CACHE) {
-            $key = CacheConfig::KEY_ACTION_GUANG_PLUSSTAR_LIST . $channel;
+            $key = CacheConfig::KEY_ACTION_GUANG_PLUSSTAR_LIST . $channel . 'k1';
             // 先尝试获取一级缓存(master), 有数据则直接返回.
             $result = Cache::get($key, 'master');
             if (!empty($result)) {
@@ -104,14 +116,22 @@ class PlusstarModel
         }
 
         $result = array();
+        $star = array();
+
         $brandList = PlusstarData::brandList($gender, $channel);
-        if (!empty($brandList['star']['data']['list'][0]['data'])) {
-            $result['ps']['star'] = self::formatData($brandList['star']['data']['list'][0]['data'], $gender, false);
-            //$result['ps']['pName'] = isset($brandList['star']['data']['brand_type_name']) ? $brandList['star']['data']['brand_type_name'] : '';
-        }
         if (!empty($brandList['original']['data']['list'][0]['data'])) {
-            $result['ps']['plus'] = self::formatData($brandList['original']['data']['list'][0]['data'], $gender, true);
-            //$result['ps']['sName'] = isset($brandList['original']['data']['brand_type_name']) ? $brandList['original']['data']['brand_type_name'] : '';
+            $result['ps'][] = array(
+                'list' => self::formatData($brandList['original']['data']['list'][0]['data'], $gender, true),
+                'focus' => true,
+                'name' => '原创潮牌',
+            );
+        }
+
+        if (!empty($brandList['star']['data']['list'][0]['data'])) {
+            $result['ps'][] = array(
+                'list' => self::formatData($brandList['star']['data']['list'][0]['data'], $gender, false),
+                'name' => '明星潮品',
+            );
         }
 
         if (USE_CACHE) {

@@ -96,6 +96,7 @@ class OrderModel
                 $result[$key]['goods'] = Helpers::formatOrderGoods($vo['order_goods'], $count, false, $tickets);
                 $result[$key]['detailUrl'] = Helpers::url('/home/orderdetail', array('order_code' => $vo['order_code']));
                 $result[$key]['count'] = $count;
+                $result[$key]['isDepositAdvance'] = $vo['attribute'] * 1 === 9;//定金预售
                 //倒计时时间
                 if (isset($vo['counter_flag']) && $vo['counter_flag'] == 'Y') {
                     $result[$key]['leftTime'] = $vo['pay_lefttime']*1000;

@@ -604,7 +604,7 @@ class UserModel
         // 处理地址数据
         if (isset($address['data']) && !empty($address['data'])) {
             foreach ($address['data'] as $key => $val) {
-                $address['data'][$key]['address_id'] = Encryption::encrypt($val['address_id']);
+                $address['data'][$key]['address_id'] = urlencode(Encryption::encrypt($val['address_id']));
             }
             UdpLog::info('地址数据校验','uid'.$uid.'返回:'.json_encode($address));
             $result = $address['data'];

@@ -303,7 +303,8 @@ class IndexController extends AbstractAction
         $this->auditJumpLogin();
 
         // 返回地址
-        $returnUrl = Helpers::url('/cart/index/index');
+//        $returnUrl = Helpers::url('/cart/index/index');
+        $returnUrl = 'javascript:history.go(-1);';
         $cartType = $this->get('cartType', 'ordinary');
         $cookieData = $this->getCookie('order-info', null);
         $orderInfo = array();
@@ -481,6 +482,13 @@ class IndexController extends AbstractAction
         $this->setTitle('发票信息');
         $this->setNavHeader('发票信息', true, false); // 不显示右上角home按钮
 
+        $moreUrl = $this->server('HTTP_REFERER', '/cart/index/orderEnsure');//取跳过来的url
+        //购物车订单进来，秒杀进来
+        if (strrpos($moreUrl, '/cart/index/orderEnsure') !== false || strrpos($moreUrl, '/cart/index/seckill') !== false) {
+            $this->setSession('addressMore', $moreUrl);
+        }
+        $data['addressMore'] = $this->getSession('addressMore');
+
         $this->_view->display('invoice-info', $data);
     }
 
@@ -562,15 +570,24 @@ class IndexController extends AbstractAction
 
         // 设置网站标题
         $this->setTitle('选择地址');
-        $this->setNavHeader('选择地址', Helpers::url('/cart/index/orderEnsure'), false);
 
         $uid = $this->getUid(true);
         $address = UserModel::getAddressData($uid);
 
+        $moreUrl = $this->server('HTTP_REFERER', '/cart/index/orderEnsure');//取跳过来的url
+        //购物车订单进来，秒杀进来
+        if (strrpos($moreUrl, '/cart/index/orderEnsure') !== false || strrpos($moreUrl, '/cart/index/seckill') !== false) {
+            $this->setSession('addressMore', $moreUrl);
+        }
+
+        $moreUrl = $this->getSession('addressMore');
+        $this->setNavHeader('选择地址', $moreUrl, false);
+
         $this->_view->display('select-address', array(
             'selectAddressPage' => true,
             'pageFooter' => true,
-            'address' => $address
+            'address' => $address,
+            'moreUrl' => $moreUrl
         ));
     }
 

@@ -29,10 +29,7 @@ class PlusstarController extends AbstractAction
 
             $data = Guang\PlusstarModel::getBrands($gender);
             $data['psList'] = true; // 控制模板中的JS使用
-            $data['ps']['sName'] = '明星潮品';
-            $data['ps']['pName'] = '原创潮牌';
             $data['pageFooter'] = true;
-
             $this->_view->display('list', $data);
         } else {
             $this->setTitle('国际优选');
@@ -40,8 +37,6 @@ class PlusstarController extends AbstractAction
 
             $data = Guang\PlusstarModel::getFirstBrands($gender);
             $data['psList'] = true; // 控制模板中的JS使用
-            $data['ps']['sName'] = '设计师';
-            $data['ps']['pName'] = '经典潮牌';
             $data['pageFooter'] = true;
 
             $this->_view->display('list', $data);
@@ -50,8 +45,6 @@ class PlusstarController extends AbstractAction
 
     /**
      * 明星原创-品牌列表页
-     * 
-     * 备注：已不使用暂留着，可去掉
      * @param int gender "1,3"表示男, "2,3"表示女
      */
     public function listAction()
@@ -63,8 +56,6 @@ class PlusstarController extends AbstractAction
 
         $data = Guang\PlusstarModel::getBrands($gender);
         $data['psList'] = true; // 控制模板中的JS使用
-        $data['ps']['sName'] = '明星潮品';
-        $data['ps']['pName'] = '原创潮牌';
 
         $this->_view->display('list', $data);
     }