diff --git a/app.wxss b/app.wxss index 257157d..0b2584c 100644 --- a/app.wxss +++ b/app.wxss @@ -1220,7 +1220,10 @@ background: #ffe3e2; /* 保障服务样式,多使用 */ -.bz_view { + + + +.bz_view22 { /* height:100rpx; padding: 0 34rpx 0 13rpx; */ color: #333; font-size: 28rpx; @@ -1230,20 +1233,31 @@ background: #ffe3e2; /* border-bottom: 3rpx solid #eee; */ /* border-top: 3rpx solid #eee; */ } -.bzfu_img { + +.bz_view22 view { + width: 470rpx; + /* max-height: 70rpx; */ + /* overflow: hidden; */ +} + +.bzfu_img22 { width: 164rpx; - height: 34rpx; - min-width: 35%; + height: 34rpx; /* margin-right: 18rpx; margin-left: 12rpx */ } -.bz-content { - padding: 0 0 0 20rpx; - text-align: right; - width: 100%; - + +.bz-content22 { + padding: 0 0 0 20rpx; +} + + +.hideArea22 { + position: absolute; + left: -1000px; + top: -1000px; } -.bg_jj { +.bg_jj22 { width: 14rpx; height: 14rpx; border-top: 2rpx solid #d70026; @@ -1252,10 +1266,15 @@ background: #ffe3e2; display: inline-block; margin-bottom: 3rpx; } -.bg_jj.down { +.bg_jj22.down22 { transform: rotateZ(135deg); } -.cx-obtain-coupon { +.bg_jj22.up22 { + transform: rotateZ(-45deg); + margin-top: 6rpx; +} + +.cx-obtain-coupon22 { /* width: 65rpx; height: 100%; padding-left:15rpx; */ @@ -1265,21 +1284,21 @@ background: #ffe3e2; /* position: absolute; right: 5rpx; */ } -.wsize { +.wsize22 { font-size: 32rpx } -.arrow { +.arrow22 { width: auto !important; position: absolute; - right: 0; + right: 10rpx; top: 50%; transform: translateY(-50%); } -.xc-coupon-frame .rel:not(:first-child) { +.xc-coupon-frame22 .rel22:not(:first-child) { margin-top: 20rpx; } -.xc-coupon-frame .coupon { +.xc-coupon-frame22 .coupon22 { width: 100%; height: 168rpx; border-radius: 25rpx; @@ -1290,3 +1309,31 @@ background: #ffe3e2; } + +.up22 { + animation: up .7s; +} + +.down22 { + animation: down 1s; +} + +@keyframes up22 { + 0% { + transform: translateY(550rpx); + } + + 100% { + transform: translateY(0); + } +} + +@keyframes down22 { + 0% { + transform: translateY(0); + } + + 100% { + transform: translateY(550rpx); + } +} \ No newline at end of file diff --git a/packageA/pages/serviceCard_pd/cart/cart.js b/packageA/pages/serviceCard_pd/cart/cart.js index 1a9678a..62ebc11 100644 --- a/packageA/pages/serviceCard_pd/cart/cart.js +++ b/packageA/pages/serviceCard_pd/cart/cart.js @@ -63,7 +63,31 @@ Page({ show_card: null, //显示的等级卡 card_name: '', //显示的卡的名称 card_cut_price: null,//减价多少钱 - bconfig: null, + bconfig: null, + showFold:true, + }, + + + + onReady() { + + setTimeout(() => { + wx.createSelectorQuery().selectAll(".showArea, .hideArea").boundingClientRect(res => { + if (res.length != 0) { + this.setData({ + showFold: res[0].height < res[1].height, + }); + }; + + }).exec(); + }, 1000); + + }, + + clickCollapse() { + this.setData({ + flag: !this.data.flag, + }) }, onLoad: function (t) { console.log("onLoad_pt_cart"); diff --git a/packageA/pages/serviceCard_pd/cart/cart.wxml b/packageA/pages/serviceCard_pd/cart/cart.wxml index ebd81d2..ec155ba 100644 --- a/packageA/pages/serviceCard_pd/cart/cart.wxml +++ b/packageA/pages/serviceCard_pd/cart/cart.wxml @@ -113,12 +113,16 @@ - - - - {{bconfig.service_bz}} + + + + {{bconfig.service_bz}} + {{bconfig.service_bz}} + + + - + 留言 diff --git a/packageB/pages/zuhegou/index/index.wxss b/packageB/pages/zuhegou/index/index.wxss index e018e5a..85a874f 100644 --- a/packageB/pages/zuhegou/index/index.wxss +++ b/packageB/pages/zuhegou/index/index.wxss @@ -194,7 +194,7 @@ page { .poster { width: 650rpx; - height: 943rpx; + height: 1088rpx; border-radius: 16rpx; margin: 0 auto; } diff --git a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js index 1cf9143..9e3a1d3 100644 --- a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js +++ b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js @@ -125,8 +125,32 @@ Page({ hid_inp: 1, user_note: {}, zuhe_map_good: {}, - bconfig:null - }, + bconfig:null, + showFold:true, + }, + + + + onReady() { + + setTimeout(() => { + wx.createSelectorQuery().selectAll(".showArea, .hideArea").boundingClientRect(res => { + if (res.length != 0) { + this.setData({ + showFold: res[0].height < res[1].height, + }); + }; + + }).exec(); + }, 1000); + + }, + + clickCollapse() { + this.setData({ + flag: !this.data.flag, + }) + }, onLoad: function (t) { wx.setNavigationBarTitle({ title: "填写订单", }) diff --git a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.wxml b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.wxml index 686e31c..85af26e 100644 --- a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.wxml +++ b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.wxml @@ -375,12 +375,16 @@ - - - - {{bconfig.service_bz}} + + + + {{bconfig.service_bz}} + {{bconfig.service_bz}} + + + - + 留言 diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js index 8ec7451..9701504 100644 --- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js +++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js @@ -78,9 +78,32 @@ Page({ act:null, //幸运购的活动 same_ok:1, //同城配送的控制,默认ok - bconfig:null + bconfig:null, + showFold:true, }, + + + onReady() { + + setTimeout(() => { + wx.createSelectorQuery().selectAll(".showArea, .hideArea").boundingClientRect(res => { + if (res.length != 0) { + this.setData({ + showFold: res[0].height < res[1].height, + }); + }; + + }).exec(); + }, 1000); + + }, + + clickCollapse() { + this.setData({ + flag: !this.data.flag, + }) + }, onLoad: function (t) { // console.log('收到的传参', t); diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml index 9a4d480..289ba32 100644 --- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml +++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml @@ -124,12 +124,16 @@ - - - - {{bconfig.service_bz}} + + + + {{bconfig.service_bz}} + {{bconfig.service_bz}} + + + - + 留言 diff --git a/packageC/pages/presell/cart/cart.js b/packageC/pages/presell/cart/cart.js index b64a91f..7e77779 100644 --- a/packageC/pages/presell/cart/cart.js +++ b/packageC/pages/presell/cart/cart.js @@ -120,8 +120,32 @@ Page({ paying:0, same_ok:1 , //同城配送按钮控制 - bconfig:null - }, + bconfig:null, + showFold:true, + }, + + + + onReady() { + + setTimeout(() => { + wx.createSelectorQuery().selectAll(".showArea, .hideArea").boundingClientRect(res => { + if (res.length != 0) { + this.setData({ + showFold: res[0].height < res[1].height, + }); + }; + + }).exec(); + }, 1000); + + }, + + clickCollapse() { + this.setData({ + flag: !this.data.flag, + }) + }, onLoad: function (t) { if (t.order_id) this.data.order_id = t.order_id; diff --git a/packageC/pages/presell/cart/cart.wxml b/packageC/pages/presell/cart/cart.wxml index 3c37e8d..db20af0 100644 --- a/packageC/pages/presell/cart/cart.wxml +++ b/packageC/pages/presell/cart/cart.wxml @@ -265,12 +265,16 @@ - - - - {{bconfig.service_bz}} + + + + {{bconfig.service_bz}} + {{bconfig.service_bz}} + + + - + 留言 diff --git a/packageC/pages/presell/cart/cart2.js b/packageC/pages/presell/cart/cart2.js index 392531d..71a62e3 100644 --- a/packageC/pages/presell/cart/cart2.js +++ b/packageC/pages/presell/cart/cart2.js @@ -131,9 +131,32 @@ Page({ same_ok:1, appoint_pick_keyid: '', - bconfig:null - - }, + bconfig:null, + showFold:true, + }, + + + + onReady() { + + setTimeout(() => { + wx.createSelectorQuery().selectAll(".showArea, .hideArea").boundingClientRect(res => { + if (res.length != 0) { + this.setData({ + showFold: res[0].height < res[1].height, + }); + }; + + }).exec(); + }, 1000); + + }, + + clickCollapse() { + this.setData({ + flag: !this.data.flag, + }) + }, onLoad: function (t) { wx.setNavigationBarTitle({ title: "填写订单", }) var th = this; diff --git a/packageC/pages/presell/cart/cart2.wxml b/packageC/pages/presell/cart/cart2.wxml index 53c44b0..6d09ffa 100644 --- a/packageC/pages/presell/cart/cart2.wxml +++ b/packageC/pages/presell/cart/cart2.wxml @@ -178,12 +178,16 @@ - - - - {{bconfig.service_bz}} + + + + {{bconfig.service_bz}} + {{bconfig.service_bz}} + + + - + 留言 diff --git a/packageC/pages/presell/cart/cart2_pre.js b/packageC/pages/presell/cart/cart2_pre.js index 74996a4..f5e4140 100644 --- a/packageC/pages/presell/cart/cart2_pre.js +++ b/packageC/pages/presell/cart/cart2_pre.js @@ -55,7 +55,28 @@ Page({ yuer: 0, agree_no_ref: 0, is_pre_cut:0, //是否可以使用预存 0是不可以1的可以 - bconfig:null + bconfig:null, + showFold:true, + }, + + onReady() { + setTimeout(() => { + wx.createSelectorQuery().selectAll(".showArea, .hideArea").boundingClientRect(res => { + if (res.length != 0) { + this.setData({ + showFold: res[0].height < res[1].height, + }); + }; + + }).exec(); + }, 1000); + + }, + + clickCollapse() { + this.setData({ + flag: !this.data.flag, + }) }, onLoad: function (t) { wx.setNavigationBarTitle({ diff --git a/packageC/pages/presell/cart/cart2_pre.wxml b/packageC/pages/presell/cart/cart2_pre.wxml index 30b8c8a..15668f4 100644 --- a/packageC/pages/presell/cart/cart2_pre.wxml +++ b/packageC/pages/presell/cart/cart2_pre.wxml @@ -112,12 +112,16 @@ - - - - {{bconfig.service_bz}} + + + + {{bconfig.service_bz}} + {{bconfig.service_bz}} + + + - + 留言 diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js index ca244cb..468429e 100644 --- a/packageE/pages/cart/cart2/cart2.js +++ b/packageE/pages/cart/cart2/cart2.js @@ -167,8 +167,31 @@ Page({ same_ok:1, //同城配送的控制,默认ok - bconfig:null + bconfig:null, + showFold:true, + }, + + + onReady() { + + setTimeout(() => { + wx.createSelectorQuery().selectAll(".showArea, .hideArea").boundingClientRect(res => { + if (res.length != 0) { + this.setData({ + showFold: res[0].height < res[1].height, + }); + }; + + }).exec(); + }, 1000); + + }, + + clickCollapse() { + this.setData({ + flag: !this.data.flag, + }) }, onLoad: function (t) { @@ -214,6 +237,27 @@ Page({ onUnload: function () { this.setData({ isclose: 1 }) }, + + onReady() { + + setTimeout(() => { + wx.createSelectorQuery().selectAll(".showArea, .hideArea").boundingClientRect(res => { + if (res.length != 0) { + this.setData({ + showFold: res[0].height < res[1].height, + }); + }; + + }).exec(); + }, 1000); + + }, + + clickCollapse() { + this.setData({ + flag: !this.data.flag, + }) + }, onHide: function () { this.setData({ isget_by_quan: {}, diff --git a/packageE/pages/cart/cart2/cart2.wxml b/packageE/pages/cart/cart2/cart2.wxml index a794f22..dfb7ea3 100644 --- a/packageE/pages/cart/cart2/cart2.wxml +++ b/packageE/pages/cart/cart2/cart2.wxml @@ -327,12 +327,16 @@ - - - - {{bconfig.service_bz}} + + + + {{bconfig.service_bz}} + {{bconfig.service_bz}} + + + - + @@ -588,12 +592,16 @@ - - - - {{bconfig.service_bz}} + + + + {{bconfig.service_bz}} + {{bconfig.service_bz}} + + + - + diff --git a/packageE/pages/cart/cart2_inte/cart2_inte.js b/packageE/pages/cart/cart2_inte/cart2_inte.js index 7bdc786..bd77c67 100644 --- a/packageE/pages/cart/cart2_inte/cart2_inte.js +++ b/packageE/pages/cart/cart2_inte/cart2_inte.js @@ -83,7 +83,31 @@ Page({ is_pre_cut:0, //是否可以使用预存 0是不可以1的可以 same_ok:1, //同城配送的控制,默认ok - bconfig:null + bconfig:null, + showFold:true, + }, + + + + onReady() { + + setTimeout(() => { + wx.createSelectorQuery().selectAll(".showArea, .hideArea").boundingClientRect(res => { + if (res.length != 0) { + this.setData({ + showFold: res[0].height < res[1].height, + }); + }; + + }).exec(); + }, 1000); + + }, + + clickCollapse() { + this.setData({ + flag: !this.data.flag, + }) }, onLoad: function (t) { wx.setNavigationBarTitle({ title: "填写订单", }) diff --git a/packageE/pages/cart/cart2_inte/cart2_inte.wxml b/packageE/pages/cart/cart2_inte/cart2_inte.wxml index 04e1222..aa11904 100644 --- a/packageE/pages/cart/cart2_inte/cart2_inte.wxml +++ b/packageE/pages/cart/cart2_inte/cart2_inte.wxml @@ -125,12 +125,16 @@ - - - - {{bconfig.service_bz}} + + + + {{bconfig.service_bz}} + {{bconfig.service_bz}} + + + - + 留言 diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js index 3ed9a13..8d1cb11 100644 --- a/pages/cart/cart2_pt/cart2_pt.js +++ b/pages/cart/cart2_pt/cart2_pt.js @@ -75,7 +75,31 @@ Page({ same_ok:1, //同城配送的控制,默认ok - bconfig:null + bconfig:null, + showFold:true, + }, + + + + onReady() { + + setTimeout(() => { + wx.createSelectorQuery().selectAll(".showArea, .hideArea").boundingClientRect(res => { + if (res.length != 0) { + this.setData({ + showFold: res[0].height < res[1].height, + }); + }; + + }).exec(); + }, 1000); + + }, + + clickCollapse() { + this.setData({ + flag: !this.data.flag, + }) }, onLoad: function (t) { console.log("onLoad_pt_cart"); diff --git a/pages/cart/cart2_pt/cart2_pt.wxml b/pages/cart/cart2_pt/cart2_pt.wxml index 293a063..8810eef 100644 --- a/pages/cart/cart2_pt/cart2_pt.wxml +++ b/pages/cart/cart2_pt/cart2_pt.wxml @@ -125,12 +125,16 @@ - - - - {{bconfig.service_bz}} + + + + {{bconfig.service_bz}} + {{bconfig.service_bz}} + + + - + diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss index cda529f..5fc4550 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxss +++ b/pages/goods/goodsInfo/goodsInfo.wxss @@ -1642,7 +1642,7 @@ view.cart-btn-lg { } .bz_view view { - max-width: 65%; + width: 520rpx; /* max-height: 70rpx; */ /* overflow: hidden; */ }