Merge branch 'feature/bundleToCart' into release/5.6

郭成尧
Commit ea882731f97463dfc957f61f2cc2b96bafefb6f8 2 parents 9174a480 3e910de4
Showing 2 changed files with 9 additions and 5 deletions
public/js/product/bundle.page.js
public/scss/product/detail/_bundle.css
--- a/public/js/product/bundle.page.js
View file @ea88273
+++ b/public/js/product/bundle.page.js
View file @ea88273
@@ -168,11 +168,11 @@ $buyNowBtn.on('touchstart', function() {
             success: function(result) {
                 tip.show(result.message);
-                if (result.code === 200) {
-                    setTimeout(function() {
-                        window.location.href = '/cart/index/index?cartType=ordinary';
-                    }, 500);
-                }
+                // if (result.code === 200) {
+                //     setTimeout(function() {
+                //         window.location.href = '/cart/index/index?cartType=ordinary';
+                //     }, 500);
+                // }
             },
             error: function() {
                 tip.show('请求失败，请重试！');
--- a/public/scss/product/detail/_bundle.css
View file @ea88273
+++ b/public/scss/product/detail/_bundle.css
View file @ea88273
@@ -77,6 +77,10 @@
             float: left;
             color: #444;
             font-size: 28px;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            width: 100%;
         }
         .bundle-right {