Commit 97f7902b41aa9c961f86602e89d3f876ff3f361d
1 parent
cf48065c
OA测试返回修改优化
Showing
21 changed files
with
400 additions
and
82 deletions
app.wxss
| @@ -1220,7 +1220,10 @@ background: #ffe3e2; | @@ -1220,7 +1220,10 @@ background: #ffe3e2; | ||
| 1220 | 1220 | ||
| 1221 | 1221 | ||
| 1222 | /* 保障服务样式,多使用 */ | 1222 | /* 保障服务样式,多使用 */ |
| 1223 | -.bz_view { | 1223 | + |
| 1224 | + | ||
| 1225 | + | ||
| 1226 | +.bz_view22 { | ||
| 1224 | /* height:100rpx; padding: 0 34rpx 0 13rpx; */ | 1227 | /* height:100rpx; padding: 0 34rpx 0 13rpx; */ |
| 1225 | color: #333; | 1228 | color: #333; |
| 1226 | font-size: 28rpx; | 1229 | font-size: 28rpx; |
| @@ -1230,20 +1233,31 @@ background: #ffe3e2; | @@ -1230,20 +1233,31 @@ background: #ffe3e2; | ||
| 1230 | /* border-bottom: 3rpx solid #eee; */ | 1233 | /* border-bottom: 3rpx solid #eee; */ |
| 1231 | /* border-top: 3rpx solid #eee; */ | 1234 | /* border-top: 3rpx solid #eee; */ |
| 1232 | } | 1235 | } |
| 1233 | -.bzfu_img { | 1236 | + |
| 1237 | +.bz_view22 view { | ||
| 1238 | + width: 470rpx; | ||
| 1239 | + /* max-height: 70rpx; */ | ||
| 1240 | + /* overflow: hidden; */ | ||
| 1241 | +} | ||
| 1242 | + | ||
| 1243 | +.bzfu_img22 { | ||
| 1234 | width: 164rpx; | 1244 | width: 164rpx; |
| 1235 | - height: 34rpx; | ||
| 1236 | - min-width: 35%; | 1245 | + height: 34rpx; |
| 1237 | /* margin-right: 18rpx; margin-left: 12rpx */ | 1246 | /* margin-right: 18rpx; margin-left: 12rpx */ |
| 1238 | } | 1247 | } |
| 1239 | -.bz-content { | ||
| 1240 | - padding: 0 0 0 20rpx; | ||
| 1241 | - text-align: right; | ||
| 1242 | - width: 100%; | ||
| 1243 | - | 1248 | + |
| 1249 | +.bz-content22 { | ||
| 1250 | + padding: 0 0 0 20rpx; | ||
| 1251 | +} | ||
| 1252 | + | ||
| 1253 | + | ||
| 1254 | +.hideArea22 { | ||
| 1255 | + position: absolute; | ||
| 1256 | + left: -1000px; | ||
| 1257 | + top: -1000px; | ||
| 1244 | } | 1258 | } |
| 1245 | 1259 | ||
| 1246 | -.bg_jj { | 1260 | +.bg_jj22 { |
| 1247 | width: 14rpx; | 1261 | width: 14rpx; |
| 1248 | height: 14rpx; | 1262 | height: 14rpx; |
| 1249 | border-top: 2rpx solid #d70026; | 1263 | border-top: 2rpx solid #d70026; |
| @@ -1252,10 +1266,15 @@ background: #ffe3e2; | @@ -1252,10 +1266,15 @@ background: #ffe3e2; | ||
| 1252 | display: inline-block; | 1266 | display: inline-block; |
| 1253 | margin-bottom: 3rpx; | 1267 | margin-bottom: 3rpx; |
| 1254 | } | 1268 | } |
| 1255 | -.bg_jj.down { | 1269 | +.bg_jj22.down22 { |
| 1256 | transform: rotateZ(135deg); | 1270 | transform: rotateZ(135deg); |
| 1257 | } | 1271 | } |
| 1258 | -.cx-obtain-coupon { | 1272 | +.bg_jj22.up22 { |
| 1273 | + transform: rotateZ(-45deg); | ||
| 1274 | + margin-top: 6rpx; | ||
| 1275 | +} | ||
| 1276 | + | ||
| 1277 | +.cx-obtain-coupon22 { | ||
| 1259 | /* width: 65rpx; | 1278 | /* width: 65rpx; |
| 1260 | height: 100%; | 1279 | height: 100%; |
| 1261 | padding-left:15rpx; */ | 1280 | padding-left:15rpx; */ |
| @@ -1265,21 +1284,21 @@ background: #ffe3e2; | @@ -1265,21 +1284,21 @@ background: #ffe3e2; | ||
| 1265 | /* position: absolute; | 1284 | /* position: absolute; |
| 1266 | right: 5rpx; */ | 1285 | right: 5rpx; */ |
| 1267 | } | 1286 | } |
| 1268 | -.wsize { | 1287 | +.wsize22 { |
| 1269 | font-size: 32rpx | 1288 | font-size: 32rpx |
| 1270 | } | 1289 | } |
| 1271 | -.arrow { | 1290 | +.arrow22 { |
| 1272 | width: auto !important; | 1291 | width: auto !important; |
| 1273 | position: absolute; | 1292 | position: absolute; |
| 1274 | - right: 0; | 1293 | + right: 10rpx; |
| 1275 | top: 50%; | 1294 | top: 50%; |
| 1276 | transform: translateY(-50%); | 1295 | transform: translateY(-50%); |
| 1277 | } | 1296 | } |
| 1278 | -.xc-coupon-frame .rel:not(:first-child) { | 1297 | +.xc-coupon-frame22 .rel22:not(:first-child) { |
| 1279 | margin-top: 20rpx; | 1298 | margin-top: 20rpx; |
| 1280 | } | 1299 | } |
| 1281 | 1300 | ||
| 1282 | -.xc-coupon-frame .coupon { | 1301 | +.xc-coupon-frame22 .coupon22 { |
| 1283 | width: 100%; | 1302 | width: 100%; |
| 1284 | height: 168rpx; | 1303 | height: 168rpx; |
| 1285 | border-radius: 25rpx; | 1304 | border-radius: 25rpx; |
| @@ -1290,3 +1309,31 @@ background: #ffe3e2; | @@ -1290,3 +1309,31 @@ background: #ffe3e2; | ||
| 1290 | 1309 | ||
| 1291 | } | 1310 | } |
| 1292 | 1311 | ||
| 1312 | + | ||
| 1313 | +.up22 { | ||
| 1314 | + animation: up .7s; | ||
| 1315 | +} | ||
| 1316 | + | ||
| 1317 | +.down22 { | ||
| 1318 | + animation: down 1s; | ||
| 1319 | +} | ||
| 1320 | + | ||
| 1321 | +@keyframes up22 { | ||
| 1322 | + 0% { | ||
| 1323 | + transform: translateY(550rpx); | ||
| 1324 | + } | ||
| 1325 | + | ||
| 1326 | + 100% { | ||
| 1327 | + transform: translateY(0); | ||
| 1328 | + } | ||
| 1329 | +} | ||
| 1330 | + | ||
| 1331 | +@keyframes down22 { | ||
| 1332 | + 0% { | ||
| 1333 | + transform: translateY(0); | ||
| 1334 | + } | ||
| 1335 | + | ||
| 1336 | + 100% { | ||
| 1337 | + transform: translateY(550rpx); | ||
| 1338 | + } | ||
| 1339 | +} | ||
| 1293 | \ No newline at end of file | 1340 | \ No newline at end of file |
packageA/pages/serviceCard_pd/cart/cart.js
| @@ -63,7 +63,31 @@ Page({ | @@ -63,7 +63,31 @@ Page({ | ||
| 63 | show_card: null, //显示的等级卡 | 63 | show_card: null, //显示的等级卡 |
| 64 | card_name: '', //显示的卡的名称 | 64 | card_name: '', //显示的卡的名称 |
| 65 | card_cut_price: null,//减价多少钱 | 65 | card_cut_price: null,//减价多少钱 |
| 66 | - bconfig: null, | 66 | + bconfig: null, |
| 67 | + showFold:true, | ||
| 68 | + }, | ||
| 69 | + | ||
| 70 | + | ||
| 71 | + | ||
| 72 | + onReady() { | ||
| 73 | + | ||
| 74 | + setTimeout(() => { | ||
| 75 | + wx.createSelectorQuery().selectAll(".showArea, .hideArea").boundingClientRect(res => { | ||
| 76 | + if (res.length != 0) { | ||
| 77 | + this.setData({ | ||
| 78 | + showFold: res[0].height < res[1].height, | ||
| 79 | + }); | ||
| 80 | + }; | ||
| 81 | + | ||
| 82 | + }).exec(); | ||
| 83 | + }, 1000); | ||
| 84 | + | ||
| 85 | + }, | ||
| 86 | + | ||
| 87 | + clickCollapse() { | ||
| 88 | + this.setData({ | ||
| 89 | + flag: !this.data.flag, | ||
| 90 | + }) | ||
| 67 | }, | 91 | }, |
| 68 | onLoad: function (t) { | 92 | onLoad: function (t) { |
| 69 | console.log("onLoad_pt_cart"); | 93 | console.log("onLoad_pt_cart"); |
packageA/pages/serviceCard_pd/cart/cart.wxml
| @@ -113,12 +113,16 @@ | @@ -113,12 +113,16 @@ | ||
| 113 | 113 | ||
| 114 | </view> | 114 | </view> |
| 115 | <!-- 保障服务 --> | 115 | <!-- 保障服务 --> |
| 116 | - <view class="bz_view flex bdt16" wx:if="{{bconfig.service_bz}}"> | ||
| 117 | - <image class="bzfu_img" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image> | ||
| 118 | - <view class="flex f1 rel" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}"> | ||
| 119 | - <view class="bz-content showArea {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view> | 116 | +<view class="bz_view22 flex bdt16 ai_c" wx:if="{{bconfig.service_bz}}"> |
| 117 | + <image class="bzfu_img22" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image> | ||
| 118 | + <view class="flex f1 ai_c rel22" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}"> | ||
| 119 | + <view class="bz-content22 showArea22 {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view> | ||
| 120 | + <view class="bz-content22 hideArea22">{{bconfig.service_bz}}</view> | ||
| 121 | + <view class="cx-obtain-coupon22 wsize22 arrow22" wx:if="{{showFold}}"> | ||
| 122 | + <text class="bg_jj22 down22 {{flag ? 'up22':''}}"></text> | ||
| 123 | + </view> | ||
| 120 | </view> | 124 | </view> |
| 121 | - </view> | 125 | + </view> |
| 122 | 126 | ||
| 123 | <view class="coupon-mes flex-vertical"> | 127 | <view class="coupon-mes flex-vertical"> |
| 124 | <view>留言</view> | 128 | <view>留言</view> |
packageB/pages/zuhegou/index/index.wxss
packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js
| @@ -125,8 +125,32 @@ Page({ | @@ -125,8 +125,32 @@ Page({ | ||
| 125 | hid_inp: 1, | 125 | hid_inp: 1, |
| 126 | user_note: {}, | 126 | user_note: {}, |
| 127 | zuhe_map_good: {}, | 127 | zuhe_map_good: {}, |
| 128 | - bconfig:null | ||
| 129 | - }, | 128 | + bconfig:null, |
| 129 | + showFold:true, | ||
| 130 | + }, | ||
| 131 | + | ||
| 132 | + | ||
| 133 | + | ||
| 134 | + onReady() { | ||
| 135 | + | ||
| 136 | + setTimeout(() => { | ||
| 137 | + wx.createSelectorQuery().selectAll(".showArea, .hideArea").boundingClientRect(res => { | ||
| 138 | + if (res.length != 0) { | ||
| 139 | + this.setData({ | ||
| 140 | + showFold: res[0].height < res[1].height, | ||
| 141 | + }); | ||
| 142 | + }; | ||
| 143 | + | ||
| 144 | + }).exec(); | ||
| 145 | + }, 1000); | ||
| 146 | + | ||
| 147 | + }, | ||
| 148 | + | ||
| 149 | + clickCollapse() { | ||
| 150 | + this.setData({ | ||
| 151 | + flag: !this.data.flag, | ||
| 152 | + }) | ||
| 153 | + }, | ||
| 130 | 154 | ||
| 131 | onLoad: function (t) { | 155 | onLoad: function (t) { |
| 132 | wx.setNavigationBarTitle({ title: "填写订单", }) | 156 | wx.setNavigationBarTitle({ title: "填写订单", }) |
packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.wxml
| @@ -375,12 +375,16 @@ | @@ -375,12 +375,16 @@ | ||
| 375 | </view> | 375 | </view> |
| 376 | 376 | ||
| 377 | <!-- 保障服务 --> | 377 | <!-- 保障服务 --> |
| 378 | - <view class="bz_view flex bdt16" wx:if="{{bconfig.service_bz}}"> | ||
| 379 | - <image class="bzfu_img" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image> | ||
| 380 | - <view class="flex f1 rel" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}"> | ||
| 381 | - <view class="bz-content showArea {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view> | 378 | +<view class="bz_view22 flex bdt16 ai_c" wx:if="{{bconfig.service_bz}}"> |
| 379 | + <image class="bzfu_img22" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image> | ||
| 380 | + <view class="flex f1 ai_c rel22" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}"> | ||
| 381 | + <view class="bz-content22 showArea22 {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view> | ||
| 382 | + <view class="bz-content22 hideArea22">{{bconfig.service_bz}}</view> | ||
| 383 | + <view class="cx-obtain-coupon22 wsize22 arrow22" wx:if="{{showFold}}"> | ||
| 384 | + <text class="bg_jj22 down22 {{flag ? 'up22':''}}"></text> | ||
| 385 | + </view> | ||
| 382 | </view> | 386 | </view> |
| 383 | - </view> | 387 | + </view> |
| 384 | <!-- 留言 --> | 388 | <!-- 留言 --> |
| 385 | <view class="coupon-mes flex-vertical"> | 389 | <view class="coupon-mes flex-vertical"> |
| 386 | <view>留言</view> | 390 | <view>留言</view> |
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
| @@ -78,9 +78,32 @@ Page({ | @@ -78,9 +78,32 @@ Page({ | ||
| 78 | act:null, //幸运购的活动 | 78 | act:null, //幸运购的活动 |
| 79 | 79 | ||
| 80 | same_ok:1, //同城配送的控制,默认ok | 80 | same_ok:1, //同城配送的控制,默认ok |
| 81 | - bconfig:null | 81 | + bconfig:null, |
| 82 | + showFold:true, | ||
| 82 | }, | 83 | }, |
| 83 | 84 | ||
| 85 | + | ||
| 86 | + | ||
| 87 | + onReady() { | ||
| 88 | + | ||
| 89 | + setTimeout(() => { | ||
| 90 | + wx.createSelectorQuery().selectAll(".showArea, .hideArea").boundingClientRect(res => { | ||
| 91 | + if (res.length != 0) { | ||
| 92 | + this.setData({ | ||
| 93 | + showFold: res[0].height < res[1].height, | ||
| 94 | + }); | ||
| 95 | + }; | ||
| 96 | + | ||
| 97 | + }).exec(); | ||
| 98 | + }, 1000); | ||
| 99 | + | ||
| 100 | + }, | ||
| 101 | + | ||
| 102 | + clickCollapse() { | ||
| 103 | + this.setData({ | ||
| 104 | + flag: !this.data.flag, | ||
| 105 | + }) | ||
| 106 | + }, | ||
| 84 | onLoad: function (t) { | 107 | onLoad: function (t) { |
| 85 | 108 | ||
| 86 | // console.log('收到的传参', t); | 109 | // console.log('收到的传参', t); |
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml
| @@ -124,12 +124,16 @@ | @@ -124,12 +124,16 @@ | ||
| 124 | </view> | 124 | </view> |
| 125 | 125 | ||
| 126 | <!-- 保障服务 --> | 126 | <!-- 保障服务 --> |
| 127 | - <view class="bz_view flex bdt16" wx:if="{{bconfig.service_bz}}"> | ||
| 128 | - <image class="bzfu_img" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image> | ||
| 129 | - <view class="flex f1 rel" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}"> | ||
| 130 | - <view class="bz-content showArea {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view> | 127 | + <view class="bz_view22 flex bdt16 ai_c" wx:if="{{bconfig.service_bz}}"> |
| 128 | + <image class="bzfu_img22" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image> | ||
| 129 | + <view class="flex f1 ai_c rel22" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}"> | ||
| 130 | + <view class="bz-content22 showArea22 {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view> | ||
| 131 | + <view class="bz-content22 hideArea22">{{bconfig.service_bz}}</view> | ||
| 132 | + <view class="cx-obtain-coupon22 wsize22 arrow22" wx:if="{{showFold}}"> | ||
| 133 | + <text class="bg_jj22 down22 {{flag ? 'up22':''}}"></text> | ||
| 134 | + </view> | ||
| 131 | </view> | 135 | </view> |
| 132 | - </view> | 136 | + </view> |
| 133 | 137 | ||
| 134 | <view class="coupon-mes flex-vertical"> | 138 | <view class="coupon-mes flex-vertical"> |
| 135 | <view>留言</view> | 139 | <view>留言</view> |
packageC/pages/presell/cart/cart.js
| @@ -120,8 +120,32 @@ Page({ | @@ -120,8 +120,32 @@ Page({ | ||
| 120 | paying:0, | 120 | paying:0, |
| 121 | 121 | ||
| 122 | same_ok:1 , //同城配送按钮控制 | 122 | same_ok:1 , //同城配送按钮控制 |
| 123 | - bconfig:null | ||
| 124 | - }, | 123 | + bconfig:null, |
| 124 | + showFold:true, | ||
| 125 | + }, | ||
| 126 | + | ||
| 127 | + | ||
| 128 | + | ||
| 129 | + onReady() { | ||
| 130 | + | ||
| 131 | + setTimeout(() => { | ||
| 132 | + wx.createSelectorQuery().selectAll(".showArea, .hideArea").boundingClientRect(res => { | ||
| 133 | + if (res.length != 0) { | ||
| 134 | + this.setData({ | ||
| 135 | + showFold: res[0].height < res[1].height, | ||
| 136 | + }); | ||
| 137 | + }; | ||
| 138 | + | ||
| 139 | + }).exec(); | ||
| 140 | + }, 1000); | ||
| 141 | + | ||
| 142 | + }, | ||
| 143 | + | ||
| 144 | + clickCollapse() { | ||
| 145 | + this.setData({ | ||
| 146 | + flag: !this.data.flag, | ||
| 147 | + }) | ||
| 148 | + }, | ||
| 125 | onLoad: function (t) { | 149 | onLoad: function (t) { |
| 126 | 150 | ||
| 127 | if (t.order_id) this.data.order_id = t.order_id; | 151 | if (t.order_id) this.data.order_id = t.order_id; |
packageC/pages/presell/cart/cart.wxml
| @@ -265,12 +265,16 @@ | @@ -265,12 +265,16 @@ | ||
| 265 | </view> | 265 | </view> |
| 266 | 266 | ||
| 267 | <!-- 保障服务 --> | 267 | <!-- 保障服务 --> |
| 268 | - <view class="bz_view flex bdt16" wx:if="{{bconfig.service_bz}}"> | ||
| 269 | - <image class="bzfu_img" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image> | ||
| 270 | - <view class="flex f1 rel" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}"> | ||
| 271 | - <view class="bz-content showArea {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view> | 268 | + <view class="bz_view22 flex bdt16 ai_c" wx:if="{{bconfig.service_bz}}"> |
| 269 | + <image class="bzfu_img22" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image> | ||
| 270 | + <view class="flex f1 ai_c rel22" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}"> | ||
| 271 | + <view class="bz-content22 showArea22 {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view> | ||
| 272 | + <view class="bz-content22 hideArea22">{{bconfig.service_bz}}</view> | ||
| 273 | + <view class="cx-obtain-coupon22 wsize22 arrow22" wx:if="{{showFold}}"> | ||
| 274 | + <text class="bg_jj22 down22 {{flag ? 'up22':''}}"></text> | ||
| 275 | + </view> | ||
| 272 | </view> | 276 | </view> |
| 273 | - </view> | 277 | + </view> |
| 274 | <!-- 留言 --> | 278 | <!-- 留言 --> |
| 275 | <view class="coupon-mes flex-vertical"> | 279 | <view class="coupon-mes flex-vertical"> |
| 276 | <view>留言</view> | 280 | <view>留言</view> |
packageC/pages/presell/cart/cart2.js
| @@ -131,9 +131,32 @@ Page({ | @@ -131,9 +131,32 @@ Page({ | ||
| 131 | same_ok:1, | 131 | same_ok:1, |
| 132 | appoint_pick_keyid: '', | 132 | appoint_pick_keyid: '', |
| 133 | 133 | ||
| 134 | - bconfig:null | ||
| 135 | - | ||
| 136 | - }, | 134 | + bconfig:null, |
| 135 | + showFold:true, | ||
| 136 | + }, | ||
| 137 | + | ||
| 138 | + | ||
| 139 | + | ||
| 140 | + onReady() { | ||
| 141 | + | ||
| 142 | + setTimeout(() => { | ||
| 143 | + wx.createSelectorQuery().selectAll(".showArea, .hideArea").boundingClientRect(res => { | ||
| 144 | + if (res.length != 0) { | ||
| 145 | + this.setData({ | ||
| 146 | + showFold: res[0].height < res[1].height, | ||
| 147 | + }); | ||
| 148 | + }; | ||
| 149 | + | ||
| 150 | + }).exec(); | ||
| 151 | + }, 1000); | ||
| 152 | + | ||
| 153 | + }, | ||
| 154 | + | ||
| 155 | + clickCollapse() { | ||
| 156 | + this.setData({ | ||
| 157 | + flag: !this.data.flag, | ||
| 158 | + }) | ||
| 159 | + }, | ||
| 137 | onLoad: function (t) { | 160 | onLoad: function (t) { |
| 138 | wx.setNavigationBarTitle({ title: "填写订单", }) | 161 | wx.setNavigationBarTitle({ title: "填写订单", }) |
| 139 | var th = this; | 162 | var th = this; |
packageC/pages/presell/cart/cart2.wxml
| @@ -178,12 +178,16 @@ | @@ -178,12 +178,16 @@ | ||
| 178 | </view> | 178 | </view> |
| 179 | 179 | ||
| 180 | <!-- 保障服务 --> | 180 | <!-- 保障服务 --> |
| 181 | - <view class="bz_view flex bdt16" wx:if="{{bconfig.service_bz}}"> | ||
| 182 | - <image class="bzfu_img" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image> | ||
| 183 | - <view class="flex f1 rel" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}"> | ||
| 184 | - <view class="bz-content showArea {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view> | 181 | + <view class="bz_view22 flex bdt16 ai_c" wx:if="{{bconfig.service_bz}}"> |
| 182 | + <image class="bzfu_img22" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image> | ||
| 183 | + <view class="flex f1 ai_c rel22" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}"> | ||
| 184 | + <view class="bz-content22 showArea22 {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view> | ||
| 185 | + <view class="bz-content22 hideArea22">{{bconfig.service_bz}}</view> | ||
| 186 | + <view class="cx-obtain-coupon22 wsize22 arrow22" wx:if="{{showFold}}"> | ||
| 187 | + <text class="bg_jj22 down22 {{flag ? 'up22':''}}"></text> | ||
| 188 | + </view> | ||
| 185 | </view> | 189 | </view> |
| 186 | - </view> | 190 | + </view> |
| 187 | <!-- 留言 --> | 191 | <!-- 留言 --> |
| 188 | <view class="coupon-mes flex-vertical"> | 192 | <view class="coupon-mes flex-vertical"> |
| 189 | <view>留言</view> | 193 | <view>留言</view> |
packageC/pages/presell/cart/cart2_pre.js
| @@ -55,7 +55,28 @@ Page({ | @@ -55,7 +55,28 @@ Page({ | ||
| 55 | yuer: 0, | 55 | yuer: 0, |
| 56 | agree_no_ref: 0, | 56 | agree_no_ref: 0, |
| 57 | is_pre_cut:0, //是否可以使用预存 0是不可以1的可以 | 57 | is_pre_cut:0, //是否可以使用预存 0是不可以1的可以 |
| 58 | - bconfig:null | 58 | + bconfig:null, |
| 59 | + showFold:true, | ||
| 60 | + }, | ||
| 61 | + | ||
| 62 | + onReady() { | ||
| 63 | + setTimeout(() => { | ||
| 64 | + wx.createSelectorQuery().selectAll(".showArea, .hideArea").boundingClientRect(res => { | ||
| 65 | + if (res.length != 0) { | ||
| 66 | + this.setData({ | ||
| 67 | + showFold: res[0].height < res[1].height, | ||
| 68 | + }); | ||
| 69 | + }; | ||
| 70 | + | ||
| 71 | + }).exec(); | ||
| 72 | + }, 1000); | ||
| 73 | + | ||
| 74 | + }, | ||
| 75 | + | ||
| 76 | + clickCollapse() { | ||
| 77 | + this.setData({ | ||
| 78 | + flag: !this.data.flag, | ||
| 79 | + }) | ||
| 59 | }, | 80 | }, |
| 60 | onLoad: function (t) { | 81 | onLoad: function (t) { |
| 61 | wx.setNavigationBarTitle({ | 82 | wx.setNavigationBarTitle({ |
packageC/pages/presell/cart/cart2_pre.wxml
| @@ -112,12 +112,16 @@ | @@ -112,12 +112,16 @@ | ||
| 112 | </view> | 112 | </view> |
| 113 | 113 | ||
| 114 | <!-- 保障服务 --> | 114 | <!-- 保障服务 --> |
| 115 | - <view class="bz_view flex bdt16" wx:if="{{bconfig.service_bz}}"> | ||
| 116 | - <image class="bzfu_img" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image> | ||
| 117 | - <view class="flex f1 rel" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}"> | ||
| 118 | - <view class="bz-content showArea {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view> | 115 | + <view class="bz_view22 flex bdt16 ai_c" wx:if="{{bconfig.service_bz}}"> |
| 116 | + <image class="bzfu_img22" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image> | ||
| 117 | + <view class="flex f1 ai_c rel22" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}"> | ||
| 118 | + <view class="bz-content22 showArea22 {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view> | ||
| 119 | + <view class="bz-content22 hideArea22">{{bconfig.service_bz}}</view> | ||
| 120 | + <view class="cx-obtain-coupon22 wsize22 arrow22" wx:if="{{showFold}}"> | ||
| 121 | + <text class="bg_jj22 down22 {{flag ? 'up22':''}}"></text> | ||
| 122 | + </view> | ||
| 119 | </view> | 123 | </view> |
| 120 | - </view> | 124 | + </view> |
| 121 | 125 | ||
| 122 | <view class="coupon-mes flex-vertical"> | 126 | <view class="coupon-mes flex-vertical"> |
| 123 | <view>留言</view> | 127 | <view>留言</view> |
packageE/pages/cart/cart2/cart2.js
| @@ -167,8 +167,31 @@ Page({ | @@ -167,8 +167,31 @@ Page({ | ||
| 167 | 167 | ||
| 168 | same_ok:1, //同城配送的控制,默认ok | 168 | same_ok:1, //同城配送的控制,默认ok |
| 169 | 169 | ||
| 170 | - bconfig:null | 170 | + bconfig:null, |
| 171 | + showFold:true, | ||
| 172 | + }, | ||
| 173 | + | ||
| 174 | + | ||
| 171 | 175 | ||
| 176 | + onReady() { | ||
| 177 | + | ||
| 178 | + setTimeout(() => { | ||
| 179 | + wx.createSelectorQuery().selectAll(".showArea, .hideArea").boundingClientRect(res => { | ||
| 180 | + if (res.length != 0) { | ||
| 181 | + this.setData({ | ||
| 182 | + showFold: res[0].height < res[1].height, | ||
| 183 | + }); | ||
| 184 | + }; | ||
| 185 | + | ||
| 186 | + }).exec(); | ||
| 187 | + }, 1000); | ||
| 188 | + | ||
| 189 | + }, | ||
| 190 | + | ||
| 191 | + clickCollapse() { | ||
| 192 | + this.setData({ | ||
| 193 | + flag: !this.data.flag, | ||
| 194 | + }) | ||
| 172 | }, | 195 | }, |
| 173 | 196 | ||
| 174 | onLoad: function (t) { | 197 | onLoad: function (t) { |
| @@ -214,6 +237,27 @@ Page({ | @@ -214,6 +237,27 @@ Page({ | ||
| 214 | onUnload: function () { | 237 | onUnload: function () { |
| 215 | this.setData({ isclose: 1 }) | 238 | this.setData({ isclose: 1 }) |
| 216 | }, | 239 | }, |
| 240 | + | ||
| 241 | + onReady() { | ||
| 242 | + | ||
| 243 | + setTimeout(() => { | ||
| 244 | + wx.createSelectorQuery().selectAll(".showArea, .hideArea").boundingClientRect(res => { | ||
| 245 | + if (res.length != 0) { | ||
| 246 | + this.setData({ | ||
| 247 | + showFold: res[0].height < res[1].height, | ||
| 248 | + }); | ||
| 249 | + }; | ||
| 250 | + | ||
| 251 | + }).exec(); | ||
| 252 | + }, 1000); | ||
| 253 | + | ||
| 254 | + }, | ||
| 255 | + | ||
| 256 | + clickCollapse() { | ||
| 257 | + this.setData({ | ||
| 258 | + flag: !this.data.flag, | ||
| 259 | + }) | ||
| 260 | + }, | ||
| 217 | onHide: function () { | 261 | onHide: function () { |
| 218 | this.setData({ | 262 | this.setData({ |
| 219 | isget_by_quan: {}, | 263 | isget_by_quan: {}, |
packageE/pages/cart/cart2/cart2.wxml
| @@ -327,12 +327,16 @@ | @@ -327,12 +327,16 @@ | ||
| 327 | </view> | 327 | </view> |
| 328 | 328 | ||
| 329 | <!-- 保障服务 --> | 329 | <!-- 保障服务 --> |
| 330 | - <view class="bz_view flex bdt16" wx:if="{{bconfig.service_bz}}"> | ||
| 331 | - <image class="bzfu_img" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image> | ||
| 332 | - <view class="flex f1 rel" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}"> | ||
| 333 | - <view class="bz-content showArea {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view> | 330 | + <view class="bz_view22 flex bdt16 ai_c" wx:if="{{bconfig.service_bz}}"> |
| 331 | + <image class="bzfu_img22" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image> | ||
| 332 | + <view class="flex f1 ai_c rel22" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}"> | ||
| 333 | + <view class="bz-content22 showArea22 {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view> | ||
| 334 | + <view class="bz-content22 hideArea22">{{bconfig.service_bz}}</view> | ||
| 335 | + <view class="cx-obtain-coupon22 wsize22 arrow22" wx:if="{{showFold}}"> | ||
| 336 | + <text class="bg_jj22 down22 {{flag ? 'up22':''}}"></text> | ||
| 337 | + </view> | ||
| 334 | </view> | 338 | </view> |
| 335 | - </view> | 339 | + </view> |
| 336 | 340 | ||
| 337 | 341 | ||
| 338 | 342 | ||
| @@ -588,12 +592,16 @@ | @@ -588,12 +592,16 @@ | ||
| 588 | </view> | 592 | </view> |
| 589 | 593 | ||
| 590 | <!-- 保障服务 --> | 594 | <!-- 保障服务 --> |
| 591 | - <view class="bz_view flex bdt16" wx:if="{{bconfig.service_bz}}"> | ||
| 592 | - <image class="bzfu_img" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image> | ||
| 593 | - <view class="flex f1 rel" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}"> | ||
| 594 | - <view class="bz-content showArea {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view> | 595 | + <view class="bz_view22 flex bdt16 ai_c" wx:if="{{bconfig.service_bz}}"> |
| 596 | + <image class="bzfu_img22" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image> | ||
| 597 | + <view class="flex f1 ai_c rel22" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}"> | ||
| 598 | + <view class="bz-content22 showArea22 {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view> | ||
| 599 | + <view class="bz-content22 hideArea22">{{bconfig.service_bz}}</view> | ||
| 600 | + <view class="cx-obtain-coupon22 wsize22 arrow22" wx:if="{{showFold}}"> | ||
| 601 | + <text class="bg_jj22 down22 {{flag ? 'up22':''}}"></text> | ||
| 602 | + </view> | ||
| 595 | </view> | 603 | </view> |
| 596 | - </view> | 604 | + </view> |
| 597 | 605 | ||
| 598 | <!-- 留言 --> | 606 | <!-- 留言 --> |
| 599 | <view class="coupon-mes flex-vertical"> | 607 | <view class="coupon-mes flex-vertical"> |
packageE/pages/cart/cart2_inte/cart2_inte.js
| @@ -83,7 +83,31 @@ Page({ | @@ -83,7 +83,31 @@ Page({ | ||
| 83 | is_pre_cut:0, //是否可以使用预存 0是不可以1的可以 | 83 | is_pre_cut:0, //是否可以使用预存 0是不可以1的可以 |
| 84 | 84 | ||
| 85 | same_ok:1, //同城配送的控制,默认ok | 85 | same_ok:1, //同城配送的控制,默认ok |
| 86 | - bconfig:null | 86 | + bconfig:null, |
| 87 | + showFold:true, | ||
| 88 | + }, | ||
| 89 | + | ||
| 90 | + | ||
| 91 | + | ||
| 92 | + onReady() { | ||
| 93 | + | ||
| 94 | + setTimeout(() => { | ||
| 95 | + wx.createSelectorQuery().selectAll(".showArea, .hideArea").boundingClientRect(res => { | ||
| 96 | + if (res.length != 0) { | ||
| 97 | + this.setData({ | ||
| 98 | + showFold: res[0].height < res[1].height, | ||
| 99 | + }); | ||
| 100 | + }; | ||
| 101 | + | ||
| 102 | + }).exec(); | ||
| 103 | + }, 1000); | ||
| 104 | + | ||
| 105 | + }, | ||
| 106 | + | ||
| 107 | + clickCollapse() { | ||
| 108 | + this.setData({ | ||
| 109 | + flag: !this.data.flag, | ||
| 110 | + }) | ||
| 87 | }, | 111 | }, |
| 88 | onLoad: function (t) { | 112 | onLoad: function (t) { |
| 89 | wx.setNavigationBarTitle({ title: "填写订单", }) | 113 | wx.setNavigationBarTitle({ title: "填写订单", }) |
packageE/pages/cart/cart2_inte/cart2_inte.wxml
| @@ -125,12 +125,16 @@ | @@ -125,12 +125,16 @@ | ||
| 125 | </view> | 125 | </view> |
| 126 | 126 | ||
| 127 | <!-- 保障服务 --> | 127 | <!-- 保障服务 --> |
| 128 | - <view class="bz_view flex bdt16" wx:if="{{bconfig.service_bz}}"> | ||
| 129 | - <image class="bzfu_img" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image> | ||
| 130 | - <view class="flex f1 rel" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}"> | ||
| 131 | - <view class="bz-content showArea {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view> | 128 | + <view class="bz_view22 flex bdt16 ai_c" wx:if="{{bconfig.service_bz}}"> |
| 129 | + <image class="bzfu_img22" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image> | ||
| 130 | + <view class="flex f1 ai_c rel22" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}"> | ||
| 131 | + <view class="bz-content22 showArea22 {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view> | ||
| 132 | + <view class="bz-content22 hideArea22">{{bconfig.service_bz}}</view> | ||
| 133 | + <view class="cx-obtain-coupon22 wsize22 arrow22" wx:if="{{showFold}}"> | ||
| 134 | + <text class="bg_jj22 down22 {{flag ? 'up22':''}}"></text> | ||
| 135 | + </view> | ||
| 132 | </view> | 136 | </view> |
| 133 | - </view> | 137 | + </view> |
| 134 | 138 | ||
| 135 | <view class="coupon-mes flex-vertical"> | 139 | <view class="coupon-mes flex-vertical"> |
| 136 | <view>留言</view> | 140 | <view>留言</view> |
pages/cart/cart2_pt/cart2_pt.js
| @@ -75,7 +75,31 @@ Page({ | @@ -75,7 +75,31 @@ Page({ | ||
| 75 | 75 | ||
| 76 | same_ok:1, //同城配送的控制,默认ok | 76 | same_ok:1, //同城配送的控制,默认ok |
| 77 | 77 | ||
| 78 | - bconfig:null | 78 | + bconfig:null, |
| 79 | + showFold:true, | ||
| 80 | + }, | ||
| 81 | + | ||
| 82 | + | ||
| 83 | + | ||
| 84 | + onReady() { | ||
| 85 | + | ||
| 86 | + setTimeout(() => { | ||
| 87 | + wx.createSelectorQuery().selectAll(".showArea, .hideArea").boundingClientRect(res => { | ||
| 88 | + if (res.length != 0) { | ||
| 89 | + this.setData({ | ||
| 90 | + showFold: res[0].height < res[1].height, | ||
| 91 | + }); | ||
| 92 | + }; | ||
| 93 | + | ||
| 94 | + }).exec(); | ||
| 95 | + }, 1000); | ||
| 96 | + | ||
| 97 | + }, | ||
| 98 | + | ||
| 99 | + clickCollapse() { | ||
| 100 | + this.setData({ | ||
| 101 | + flag: !this.data.flag, | ||
| 102 | + }) | ||
| 79 | }, | 103 | }, |
| 80 | onLoad: function (t) { | 104 | onLoad: function (t) { |
| 81 | console.log("onLoad_pt_cart"); | 105 | console.log("onLoad_pt_cart"); |
pages/cart/cart2_pt/cart2_pt.wxml
| @@ -125,12 +125,16 @@ | @@ -125,12 +125,16 @@ | ||
| 125 | </view> | 125 | </view> |
| 126 | 126 | ||
| 127 | <!-- 保障服务 --> | 127 | <!-- 保障服务 --> |
| 128 | - <view class="bz_view flex bdt16" wx:if="{{bconfig.service_bz}}"> | ||
| 129 | - <image class="bzfu_img" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image> | ||
| 130 | - <view class="flex f1 rel" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}"> | ||
| 131 | - <view class="bz-content showArea {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view> | 128 | + <view class="bz_view22 flex bdt16 ai_c" wx:if="{{bconfig.service_bz}}"> |
| 129 | + <image class="bzfu_img22" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image> | ||
| 130 | + <view class="flex f1 ai_c rel22" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}"> | ||
| 131 | + <view class="bz-content22 showArea22 {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view> | ||
| 132 | + <view class="bz-content22 hideArea22">{{bconfig.service_bz}}</view> | ||
| 133 | + <view class="cx-obtain-coupon22 wsize22 arrow22" wx:if="{{showFold}}"> | ||
| 134 | + <text class="bg_jj22 down22 {{flag ? 'up22':''}}"></text> | ||
| 135 | + </view> | ||
| 132 | </view> | 136 | </view> |
| 133 | - </view> | 137 | + </view> |
| 134 | 138 | ||
| 135 | 139 | ||
| 136 | <view class="coupon-mes flex-vertical"> | 140 | <view class="coupon-mes flex-vertical"> |
pages/goods/goodsInfo/goodsInfo.wxss
| @@ -1642,7 +1642,7 @@ view.cart-btn-lg { | @@ -1642,7 +1642,7 @@ view.cart-btn-lg { | ||
| 1642 | } | 1642 | } |
| 1643 | 1643 | ||
| 1644 | .bz_view view { | 1644 | .bz_view view { |
| 1645 | - max-width: 65%; | 1645 | + width: 520rpx; |
| 1646 | /* max-height: 70rpx; */ | 1646 | /* max-height: 70rpx; */ |
| 1647 | /* overflow: hidden; */ | 1647 | /* overflow: hidden; */ |
| 1648 | } | 1648 | } |