diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index 6fca9a9..2037ebc 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -6,7 +6,7 @@ var util_pay = require("../../../utils/pay.js"); Page({ data: { - url: t.globalData.setting.url, + url: t.globalData.setting.url, resourceUrl: t.globalData.setting.resourceUrl, imgUrl: t.globalData.setting.imghost, goods: null, @@ -997,9 +997,10 @@ Page({ // order_sn: data.data, //}, 1); util_pay.pay(data.data, function() { + app.my_warnning("支付成功",1,th); setTimeout(function () { wx.navigateTo({ - url: "/pages/payment/pay_success/pay_success?type="+2+"&order_sn="+data.data, + url: "/pages/user/order_list/order_list" }) },1000) diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml index 840a580..799e4d1 100644 --- a/pages/cart/cart2/cart2.wxml +++ b/pages/cart/cart2/cart2.wxml @@ -3,21 +3,23 @@
- + 品牌 - + @@ -52,7 +52,7 @@ {{bitem.name}} - enname + {{bitem.enname}} @@ -125,11 +125,7 @@ @@ -171,10 +167,7 @@ {{ishaf_three==1?good_list.name:classify_name}} - + @@ -183,28 +176,17 @@ {{bitem.name}} - enname + {{bitem.enname}} - - - {{classify_name}} - + @@ -222,11 +204,31 @@ + + + + +{{classify_name}} + + 选择更多 + + + + + + + + {{goods.items.name}} + + + + - - + + + @@ -242,7 +244,7 @@ - + {{item.name}} diff --git a/pages/goods/categoryList/categoryList.wxss b/pages/goods/categoryList/categoryList.wxss index fc78bac..dec47cf 100644 --- a/pages/goods/categoryList/categoryList.wxss +++ b/pages/goods/categoryList/categoryList.wxss @@ -204,12 +204,14 @@ margin-top: 8rpx; height: 100%; border-right: 1rpx solid #eee; white-space: nowrap; +overflow: hidden; +overflow-y: scroll; } .share_type{ margin: auto; width: 58%; - margin-top: 35rpx; + margin-top: 40rpx; overflow: hidden; } @@ -218,7 +220,7 @@ padding-left: 29rpx; padding-right: 29rpx; width: 51%; margin: auto; -margin-top: 35rpx; +margin-top: 40rpx; } @@ -291,6 +293,7 @@ width: 60%; width:80%; height:70%; left: 70.5%; +overflow: hidden; } .nt_1.line-height{ @@ -323,12 +326,15 @@ line-height: 65rpx; margin-top: 18rpx; margin-right: 15rpx; + } .brand_img{ width:100%; height: 61.5%; - margin-bottom: 10rpx + margin-bottom: 10rpx; + margin-top: 10rpx; + } .brand_img-name{ width: 100%;