Merge branch 'master' into feature/add-sessionKey

@@ -106,7 +106,7 @@ if (isProduction) {
         },
         },
         memcache: {
         memcache: {
             master: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
             master: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
-            slave: ['memcache1.yohoops.org:12112', 'memcache2.yohoops.org:12112', 'memcache3.yohoops.org:12112'],
+            slave: [],
             session: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
             session: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
             timeout: 100,
             timeout: 100,
             retries: 0
             retries: 0

 {
 {
   "name": "yohoblk-wap",
   "name": "yohoblk-wap",
-  "version": "2.0.21",
+  "version": "2.0.26",
   "private": true,
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {

@@ -25,6 +25,7 @@ const hbsLoader = {
 const getEntries = () => {
 const getEntries = () => {
     const entries = {
     const entries = {
         libs: [
         libs: [
+            'babel-polyfill',
             'jquery',
             'jquery',
             'yoho-qs',
             'yoho-qs',
             'yoho-cookie',
             'yoho-cookie',

@@ -19,7 +19,7 @@ const origin = location.origin;
  */
  */
 const defaultTitleMap = {
 const defaultTitleMap = {
     1: {
     1: {
-        headerid: '1',
+        headerid: '-1',
         left: {
         left: {
             action: ''
             action: ''
         },
         },

@@ -58,7 +58,7 @@ export default {
             return {};
             return {};
         },
         },
         buttonText() {
         buttonText() {
-            if (this.value.storage_sum <= 0) {
+            if (this.value.storage_sum <= 0 || this.value.is_deposit_advance === 'Y') {
                 return '已售罄';
                 return '已售罄';
             }
             }
             return '加入购物车';
             return '加入购物车';
@@ -156,7 +156,7 @@ export default {
                 return yoho.goLogin();
                 return yoho.goLogin();
             }
             }
 
 
-            if (this.value.storage_sum <= 0) {
+            if (this.value.storage_sum <= 0 || this.value.is_deposit_advance === 'Y') {
                 return;
                 return;
             }
             }
             if (!this.colorId) {
             if (!this.colorId) {

@@ -283,6 +283,7 @@
     import operationBar from './operation-bar.vue';
     import operationBar from './operation-bar.vue';
     import 'common/back-top';
     import 'common/back-top';
     import cookie from 'yoho-cookie';
     import cookie from 'yoho-cookie';
+    import qs from 'yoho-qs';
 
 
 
 
     const app = $('#app');
     const app = $('#app');
@@ -413,13 +414,14 @@
                     }
                     }
                 });
                 });
 
 
-                const href = location.href;
-                const mark = /\?/.test(href) ? '&' : '?';
+                const origin = location.origin;
+                const pathname = location.pathname;
                 const channel = cookie.get('_Channel') || 'men';
                 const channel = cookie.get('_Channel') || 'men';
+                const queryStr = $.param(Object.assign(qs, {channel}));
 
 
                 share({
                 share({
                     title: this.entity.product_name,
                     title: this.entity.product_name,
-                    link: `${href}${mark}channel=${channel}`,
+                    link: `${origin}${pathname}?${queryStr}`,
                     desc: '我在BLK发现了一个不错的商品，快来看看吧！',
                     desc: '我在BLK发现了一个不错的商品，快来看看吧！',
                     imgUrl: this.firstImage.replace(/(\{width}|\{height}|\{mode})/g, function($0) {
                     imgUrl: this.firstImage.replace(/(\{width}|\{height}|\{mode})/g, function($0) {
                         const dict = {
                         const dict = {

@@ -56,9 +56,11 @@
     }
     }
 </style>
 </style>
 <script>
 <script>
+    import $ from 'yoho-jquery';
     import yoho from 'yoho';
     import yoho from 'yoho';
     import tip from 'common/tip';
     import tip from 'common/tip';
     import cookie from 'yoho-cookie';
     import cookie from 'yoho-cookie';
+    import qs from 'yoho-qs';
 
 
     export default {
     export default {
         name: 'operation-bar',
         name: 'operation-bar',
@@ -83,15 +85,16 @@
         },
         },
         methods: {
         methods: {
             share() {
             share() {
-                const href = location.href;
-                const mark = /\?/.test(href) ? '&' : '?';
+                const origin = location.origin;
+                const pathname = location.pathname;
                 const channel = cookie.get('_Channel') || 'men';
                 const channel = cookie.get('_Channel') || 'men';
+                const queryStr = $.param(Object.assign(qs, {channel}));
 
 
                 yoho.goShare({
                 yoho.goShare({
                     title: this.shareTitle || '',
                     title: this.shareTitle || '',
                     des: '我在BLK发现了一个不错的商品，快来看看吧！',
                     des: '我在BLK发现了一个不错的商品，快来看看吧！',
                     img: location.protocol + this.shareImg,
                     img: location.protocol + this.shareImg,
-                    url: `${href}${mark}channel=${channel}`
+                    url: `${origin}${pathname}?${queryStr}`
                 });
                 });
             },
             },
             toggleFavorite: function() {
             toggleFavorite: function() {