Blame view
src/pages/myOrderPaying/myOrderPaying.vue
18.8 KB
058f060df 冲突修改 |
1 |
<!-- 订单待付款 待收货 --> |
4de4be344 客服在线和我的订单-待付款 |
2 |
<template> |
ecde40693 部分bug修改 |
3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 |
<view class="content"> <view class="headerBanner" v-if="status == '2'||'3'" > <view class="bannerLeft"> <view class="T1">订单已完成</view> </view> <image src="../../static/car.png" mode="aspectFill" ></image> </view> <!-- 待付款 --> <view class="order-time" v-if="status == '0'" > <text>请在</text> <uni-countdown color="#EC5D3B" splitor-color="#EC5D3B" :show-day="false" :hour="0" :second="getLeftTime" @timeup="timeup" > </uni-countdown> <text>内完成付款</text> </view> <view class="headerBanner" v-if="status == '1'" > |
058f060df 冲突修改 |
39 40 |
<view class="bannerLeft"> <view class="T1">卖家已发货</view> |
1a4cad719 修改待付款支付跳转逻辑&新增已完成... |
41 |
<!-- <view class="T2">还剩 确认收货</view> --> |
058f060df 冲突修改 |
42 43 44 45 46 |
</view> <image src="../../static/car.png" mode="aspectFill" ></image> |
ecde40693 部分bug修改 |
47 |
</view> |
7d6833f2c 地址列表 |
48 49 50 |
<view class="order"> <view class="order-user"> <view class="order-user-head"> |
248b0e031 解决支付问题 |
51 52 |
<text class="p1">{{orderAddressInfo.name}}</text> <text class="p2">{{orderAddressInfo.mobile}}</text> |
7d6833f2c 地址列表 |
53 54 55 |
</view> <view class="order-user-body"> <image src="../../static/myorder-paying-location.png"></image> |
248b0e031 解决支付问题 |
56 |
<text class="p3">{{orderAddressInfo.address}}</text> |
7d6833f2c 地址列表 |
57 58 59 |
</view> </view> <view class="order-info"> |
058f060df 冲突修改 |
60 61 |
<view class="order-info-head" |
7c039b6f9 订单详情页规格修改 |
62 |
v-for="(orderInfoListItem, index) in orderInfoList" |
058f060df 冲突修改 |
63 64 65 66 67 68 |
:key="index" > <image :src="orderInfoListItem.imgUrl" mode="aspectFill" ></image> |
7d6833f2c 地址列表 |
69 |
<view class="order-info-head-r"> |
058f060df 冲突修改 |
70 |
<text class="p1">{{orderInfoListItem.p_name}}</text> |
7d6833f2c 地址列表 |
71 72 73 74 |
<view class="p2" style="margin: 0;" > |
7c039b6f9 订单详情页规格修改 |
75 76 77 |
<!-- {{index}} --> {{skuList[index] ? skuList[0].sku_name.replace('_', '/') : ''}} <!-- {{skuList.length === 0 ? '' : skuList[0].sku_name.replace('_', '/')}} --> |
7d6833f2c 地址列表 |
78 79 |
<!-- <view class="arrow"></view> --> </view> |
058f060df 冲突修改 |
80 |
<view class="infoText-bottom"> |
7c039b6f9 订单详情页规格修改 |
81 |
<view class="markPrice">¥{{Number(orderInfoListItem.nowPrice)/100}}</view> |
058f060df 冲突修改 |
82 83 |
<view class="buy-num">X {{orderInfoListItem.num}}</view> </view> |
7d6833f2c 地址列表 |
84 85 |
</view> </view> |
058f060df 冲突修改 |
86 87 88 |
<!-- <view class="order-info-goodsnum"> <text>X1</text> </view> --> |
7d6833f2c 地址列表 |
89 90 |
<text class="order-info-freight"> <text class="p1">运费</text> |
a3d2beaa8 立即支付功能 |
91 |
<text class="p2">免运费</text> |
7d6833f2c 地址列表 |
92 93 94 |
</text> <text class="order-info-discount"> <text class="p1">优惠</text> |
058f060df 冲突修改 |
95 |
<text class="p2">-¥{{totalDiscount}}</text> |
7d6833f2c 地址列表 |
96 97 98 |
</text> <text class="order-info-price"> <text class="p1">实付</text> |
ecde40693 部分bug修改 |
99 |
<text class="p2">¥{{Number(totalPrice)/100}}</text> |
7d6833f2c 地址列表 |
100 101 |
</text> <text class="order-info-num"> |
37ccd9675 订单详情页获取数据 |
102 |
<text>订单号:{{payId}}</text> |
7d6833f2c 地址列表 |
103 104 |
</text> <text class="order-info-time"> |
ecde40693 部分bug修改 |
105 |
<text>下单时间:{{orderInfo.pay_time}}</text> |
7d6833f2c 地址列表 |
106 107 108 109 |
</text> <view class="order-info-hr"></view> <view class="order-info-contact"> <image src="../../static/myorder-paying-contact.png"></image> |
9394b5df7 报错修复 |
110 |
<button open-type="contact">联系客服</button> |
7d6833f2c 地址列表 |
111 112 113 |
</view> </view> </view> |
058f060df 冲突修改 |
114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 |
<view class="order-confim" v-if="status == '0'" > <button class="b1" @click="cancleOrder" >取消订单</button> <button class="b2" @click="paylog" >立即支付</button> </view> <view class="order-confim" v-if="status == '1'" > <!-- <button class="b1">取消订单</button> --> <button class="b2" @click="confirmOrder" >确认收货</button> |
ecde40693 部分bug修改 |
137 138 139 140 141 142 143 144 145 146 |
</view> <view class="order-confim" v-if="status == '2'" > <button class="b2" @click="toDetail" >再次购买</button> </view> |
7d6833f2c 地址列表 |
147 |
</view> |
4de4be344 客服在线和我的订单-待付款 |
148 149 150 |
</template> <script> |
ecde40693 部分bug修改 |
151 |
import store from '@/store' |
34703a767 订单逻辑修改 |
152 |
import MD5Util from '../../utils/md5' |
ecde40693 部分bug修改 |
153 |
import UniCountdown from '../../components/UniCountdown/UniCountdown.vue' |
7d6833f2c 地址列表 |
154 155 |
export default { components: { |
ecde40693 部分bug修改 |
156 157 |
UniCountdown, }, |
92d01cfd5 修正订单数据 |
158 |
data() { |
7d6833f2c 地址列表 |
159 |
return { |
ecde40693 部分bug修改 |
160 161 162 163 164 |
payId: '', payTime: '', status: '', // status 0 待付款 1 已发货 uid: '', openid: '', |
a3d2beaa8 立即支付功能 |
165 |
lefttime: 0, |
ecde40693 部分bug修改 |
166 167 168 |
isPay: 0, totalPrice: 0, } |
058f060df 冲突修改 |
169 |
}, |
ecde40693 部分bug修改 |
170 |
async onLoad ({ payId, status, isPay }) { |
607bc3a4d 修改了直接购买的流程,添加弹窗,选... |
171 |
this.payId = payId |
36e559203 逻辑完善 |
172 |
this.status = status |
607bc3a4d 修改了直接购买的流程,添加弹窗,选... |
173 |
this.isPay = isPay |
eed6c3ca9 订单列表添加支付和取消功能,修改订... |
174 |
// console.log('++++++++++++++++++',this.status) |
058f060df 冲突修改 |
175 |
const openid = uni.getStorageSync('openid') |
36e559203 逻辑完善 |
176 |
const uid = this.$store.state.user.userInfo.uid |
058f060df 冲突修改 |
177 178 |
this.uid = uid this.openid = openid |
36e559203 逻辑完善 |
179 |
await store.dispatch('orderRead/getOrderInfo', { |
058f060df 冲突修改 |
180 |
pay_id: this.payId, |
36e559203 逻辑完善 |
181 |
uid: uid, |
ecde40693 部分bug修改 |
182 183 |
openid: openid, }) |
7c039b6f9 订单详情页规格修改 |
184 185 186 187 188 189 190 |
const { list } = this.orderInfo.order_info for (let index = 0; index < list.length; index++) { await store.dispatch('orderRead/goodDetails', { pid: list[index].pid, skId: list[index].sk_id, }) } |
ecde40693 部分bug修改 |
191 |
this.totalPrice = this.orderInfo.total_fee |
058f060df 冲突修改 |
192 |
}, |
a3d2beaa8 立即支付功能 |
193 194 |
// 若从支付页面跳转过来,返回直接返回到首页 onBackPress(option) { |
ecde40693 部分bug修改 |
195 |
if (option.from === 'backbutton' && this.isPay) { |
a3d2beaa8 立即支付功能 |
196 |
uni.switchTab({ |
ecde40693 部分bug修改 |
197 198 199 |
url: '/pages/index/index', }) return true // 阻止默认返回行为 |
a3d2beaa8 立即支付功能 |
200 201 |
} }, |
058f060df 冲突修改 |
202 |
computed: { |
7c039b6f9 订单详情页规格修改 |
203 204 205 206 |
// 规格列表 skuList () { return this.$store.state.orderRead.skuList }, |
ecde40693 部分bug修改 |
207 208 209 210 211 |
orderInfo() { return this.$store.state.orderRead.orderInfo }, orderInfoList () { return this.orderInfo.order_info ? this.orderInfo.order_info.list : null |
058f060df 冲突修改 |
212 213 |
}, // 获取订单地址信息 |
ecde40693 部分bug修改 |
214 215 |
orderAddressInfo () { return this.orderInfo.order_info ? this.orderInfo.order_info.address : null |
058f060df 冲突修改 |
216 217 |
}, // 订单付款时间 |
ecde40693 部分bug修改 |
218 219 |
getLeftTime () { return this.orderInfo.order_info ? this.orderInfo.order_info.lefttime : 1800 |
058f060df 冲突修改 |
220 221 |
}, // 计算总优惠额 |
92d01cfd5 修正订单数据 |
222 |
totalDiscount() { |
ecde40693 部分bug修改 |
223 224 |
const discountInfoList = this.orderInfo.discount_info let totalDiscount = 0 |
058f060df 冲突修改 |
225 226 |
if (discountInfoList) { discountInfoList.map((discountItem, index) => { |
ecde40693 部分bug修改 |
227 228 |
totalDiscount += Number(discountItem.value) }) |
058f060df 冲突修改 |
229 230 |
} // console.log(totalDiscount) |
ecde40693 部分bug修改 |
231 232 233 234 235 236 237 238 239 240 241 242 243 |
return totalDiscount }, }, methods: { // 再次购买 暂时只支持跳转第一个商品 toDetail() { const pid = this.orderInfo.order_info.list[0].pid uni.navigateTo({ url: '../details/details?pid=' + pid, fail: (res) => { console.log(res) }, }) }, |
058f060df 冲突修改 |
244 |
// 取消订单 |
92d01cfd5 修正订单数据 |
245 |
timeup() { |
ecde40693 部分bug修改 |
246 |
this.cancleOrder() |
058f060df 冲突修改 |
247 |
}, |
92d01cfd5 修正订单数据 |
248 |
cancleOrder() { |
7c039b6f9 订单详情页规格修改 |
249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 |
console.log('dddd', this.skuList) // const uid = this.uid // const openid = this.openid // const keyname = this.orderInfo.order_info.keyname // // console.log('keyname',this.orderInfo.keyname) // uni.showModal({ // title: '提示', // content: '现在取消,订单不可恢复哦,确认取消吗?', // success: function(res) { // if (res.confirm) { // store.dispatch('cancelOrder/cancel', { // keyname: keyname, // uid: uid, // openid: openid, // }) // uni.navigateBack({ // delta: 1, // }) // } else if (res.cancel) { // console.log('用户点击取消') // } // }, // }) |
ecde40693 部分bug修改 |
272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 |
}, paylog() { console.log('pay', this.orderInfo) const { data, exKeyName: keyName } = this.orderInfo const uid = uni.getStorageSync('uid') const timeStamp = new Date().getTime().toString() const nonceStr = 'asfafasfasfasfasf' // 支付参数 const fieldSet = { openid: this.$store.state.user.userInfo.openid, uid: this.$store.state.user.userInfo.uid, shopid: 0, payCate: 2020, payMoney: this.totalPrice, payWoodId: `fcdj-${uid}-${keyName}`, payWoodDesc: '在【非常戴镜】的微信付款凭证', nonceStr, signType: 'MD5', app_uid: 2020, timeStamp, keyname: keyName, billInfo: JSON.stringify(data), } // 请求后台支付接口 store.dispatch('order/pay', fieldSet).then(({ data, data2, pay_id: payId }) => { if (data.return_code === 'SUCCESS' && data.result_code === 'SUCCESS') { const stringA = `appId=wx115b25aa396d27ac&nonceStr=${nonceStr}&package=prepay_id=${data.prepay_id}&signType=MD5&timeStamp=${timeStamp}` const stringSignTemp = stringA + '&key=NewMoney2017hatemydaddy123456789' // 微信支付接口 uni.requestPayment({ appId: data.appid, timeStamp, nonceStr, total_fee: this.totalPrice, package: `prepay_id=${data.prepay_id}`, signType: 'MD5', paySign: MD5Util.MD5(stringSignTemp).toUpperCase(), success: (res) => { // 支付成功 uni.showModal({ content: '支付成功', showCancel: false, }) // 跳转订单详情页->状态 待收货 uni.reLaunch({ url: `../myOrderPaying/myOrderPaying?payId=${payId}&status=1&isPay=1`, }) }, fail: (res) => { // 支付失败 uni.showModal({ content: '支付失败', showCancel: false, }) // 跳转订单详情页->刷新本页面 // uni.redirectTo({ // url: `../myOrderPaying/myOrderPaying?payId=${payId}&status=0&isPay=1`, // }) }, complete: () => { uni.hideLoading() }, }) } else { uni.showModal({ content: '支付失败', showCancel: false, }) console.log('支付失败') uni.hideLoading() // uni.redirectTo({ // url: `../myOrderPaying/myOrderPaying?payId=${payId}&status=0&isPay=1`, // }) |
92d01cfd5 修正订单数据 |
346 |
} |
ecde40693 部分bug修改 |
347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 |
}) // 修改订单状态 待付款==>待收货 store.dispatch('statusConfirm/confirm', { uid: this.uid, openid: this.openid, oldway: '0', way: '1', pay_id: this.payId, judgeContent: '', orderInfo: this.orderInfo.order_info, }) .then( // setTimeout(() => { // uni.navigateBack(); // }, 1500) ) |
a3d2beaa8 立即支付功能 |
364 |
}, |
ecde40693 部分bug修改 |
365 366 |
confirmOrder() { // 确认收货 way1 ==>way2 |
92d01cfd5 修正订单数据 |
367 |
store |
ecde40693 部分bug修改 |
368 |
.dispatch('statusConfirm/confirm', { |
92d01cfd5 修正订单数据 |
369 370 |
uid: this.uid, openid: this.openid, |
ecde40693 部分bug修改 |
371 372 |
oldway: '1', way: '2', |
92d01cfd5 修正订单数据 |
373 |
pay_id: this.payId, |
ecde40693 部分bug修改 |
374 375 |
judgeContent: '', orderInfo: this.orderInfo.order_info, |
92d01cfd5 修正订单数据 |
376 |
}) |
ecde40693 部分bug修改 |
377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 |
.then((res) => { if (res.data.code === 1) { uni.showToast({ title: '已确认', mask: true, duration: 1500, icon: 'success', }) } else { uni.showToast({ title: '服务器错误,确认失败!', mask: true, }) } setTimeout(() => { uni.navigateBack() }, 1500) }) }, |
87e0a4103 修改订单详情时间戳 |
396 |
}, |
ecde40693 部分bug修改 |
397 398 399 400 401 402 403 404 |
// filters: { // timerChange: function(value) { // var newDate = new Date() // newDate.setTime(value * 1000) // return newDate.toLocaleString() // }, // }, } |
4de4be344 客服在线和我的订单-待付款 |
405 406 407 |
</script> <style lang="scss" scoped> |
7d6833f2c 地址列表 |
408 |
.content { |
058f060df 冲突修改 |
409 |
min-height: 100vh; |
7d6833f2c 地址列表 |
410 411 |
display: flex; flex-direction: column; |
058f060df 冲突修改 |
412 |
justify-content: flex-start; |
7d6833f2c 地址列表 |
413 414 415 416 417 |
align-items: center; background-color: #f2f2f2; } .order { |
7d6833f2c 地址列表 |
418 419 |
margin-bottom: 112rpx; background: #f2f2f2; |
058f060df 冲突修改 |
420 421 |
margin-top: 140rpx; width: 670rpx; |
7d6833f2c 地址列表 |
422 |
} |
058f060df 冲突修改 |
423 |
|
7d6833f2c 地址列表 |
424 425 426 427 428 429 |
.order-time { width: 100%; height: 140rpx; background-color: #fff; display: flex; justify-content: center; |
058f060df 冲突修改 |
430 431 432 433 |
align-items: center; position: fixed; top: 0; left: 0; |
7d6833f2c 地址列表 |
434 435 |
text { // font-family: PingFangSC-Regular; |
058f060df 冲突修改 |
436 |
// margin-top: 48rpx; |
7d6833f2c 地址列表 |
437 438 439 440 441 442 443 444 445 446 447 448 |
font-size: 14px; color: #333333; letter-spacing: -0.26px; } .p2 { // font-family: DINAlternate-Bold; margin: 42rpx 20rpx 0 20rpx; font-size: 18px; color: #ec5d3b; letter-spacing: -0.34px; } } |
058f060df 冲突修改 |
449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 |
.headerBanner { width: 100%; height: 140rpx; background: #4a90e2; padding: 26rpx 60rpx 24rpx 60rpx; box-sizing: border-box; color: #ffffff; display: flex; justify-content: space-between; align-items: center; position: fixed; top: 0; left: 0; .bannerLeft { font-size: 36rpx; display: flex; flex-direction: column; justify-content: center; align-items: center; .T2 { font-size: 24rpx; } } image { height: 56rpx; width: 72rpx; } } |
7d6833f2c 地址列表 |
477 478 |
.order-user { |
7d6833f2c 地址列表 |
479 480 481 482 483 484 485 486 487 |
height: 228rpx; background: #ffffff; border-radius: 14rpx; margin: 0 auto; margin-top: 20rpx; margin-bottom: 20rpx; .order-user-head { display: flex; height: 108rpx; |
7d6833f2c 地址列表 |
488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 |
align-items: center; margin-left: 126rpx; .p1 { // font-family: PingFangSC-Regular; font-size: 14px; color: #333333; letter-spacing: -0.26px; margin-right: 20rpx; } .p2 { // font-family: PingFangSC-Regular; font-size: 14px; color: #999999; letter-spacing: -0.26px; } } .order-user-body { display: flex; width: 100%; image { width: 24px; height: 26px; margin: 12rpx 32rpx 0 40rpx; } .p3 { // font-family: PingFangSC-Semibold; font-size: 14px; color: #333333; letter-spacing: -0.26px; |
ecde40693 部分bug修改 |
517 |
line-height: 70rpx; |
7d6833f2c 地址列表 |
518 519 520 521 522 |
} } } .order-info { |
7d6833f2c 地址列表 |
523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 |
background-color: #fff; box-shadow: 0 0 20rpx 0 rgba(177, 128, 128, 0.06); border-radius: 16rpx; margin: 0 auto; view { margin-left: 40rpx; } text { font-size: 14px; } .order-info-head { display: flex; padding-top: 40rpx; image { height: 188rpx; width: 188rpx; } .order-info-head-r { margin: 0; width: 368rpx; margin-left: 24rpx; // margin-top: 40rpx; text { display: block; } // .arrow{ // width: 0; // height: 0; // border-left: 5px transparent; // border-right: 5px transparent; // border-top: 5px #979797; // border-bottom: 0 transparent; // border-style: solid; // position: relative; // // transform: scaleY(-1); // } // .arrow::after{ // content: ''; // position: absolute; // top: -6.5px; // left: -5px; |
058f060df 冲突修改 |
564 565 566 567 568 |
// border-left: 5px transparent; // border-right: 5px transparent; // border-top: 5px #FFFFFF; // border-bottom: 0 transparent; // border-style: solid; |
7d6833f2c 地址列表 |
569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 |
// } .p1 { min-height: 40px; // font-family: PingFangSC-Regular; font-size: 14px; color: #333333; letter-spacing: -0.26px; line-height: 18px; // line-height: 20px; } .p2 { height: 34px; padding: 1px 0 3px 0; // font-family: PingFangSC-Regular; font-size: 12px; color: #999999; letter-spacing: -0.23px; } |
058f060df 冲突修改 |
587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 |
.infoText-bottom { display: flex; flex-direction: row; justify-content: flex-start; align-items: center; width: 100%; margin-left: 0; .markPrice { font-size: 14px; color: #ff6b4a; margin-right: 20rpx; margin-left: 0rpx; } .buy-num { font-size: 12px; color: #999999; |
7c039b6f9 订单详情页规格修改 |
603 |
margin-left: 0; |
058f060df 冲突修改 |
604 |
} |
7d6833f2c 地址列表 |
605 606 607 608 |
} } } // .order-info-goodsnum { |
058f060df 冲突修改 |
609 610 611 612 613 614 615 616 617 618 |
// display: flex; // align-items: center; // justify-content: flex-end; // text { // margin-right: 44rpx; // // ont-family: PingFangSC-Regular; // font-size: 12px; // color: #999999; // letter-spacing: -0.23px; // } |
7d6833f2c 地址列表 |
619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 |
// } .order-info-freight { display: block; margin-left: 40rpx; margin-top: 22rpx; .p1 { // font-family: PingFangSC-Regular; font-size: 14px; color: #333333; letter-spacing: -0.26px; line-height: 18px; margin-right: 24px; } .p2 { // font-family: PingFangSC-Regular; font-size: 14px; color: #ff6b4a; letter-spacing: -0.26px; } } .order-info-discount { display: block; margin-left: 40rpx; margin-top: 24rpx; .p1 { // font-family: PingFangSC-Regular; font-size: 14px; color: #333333; letter-spacing: -0.26px; line-height: 18px; margin-right: 24px; } .p2 { // font-family: PingFangSC-Regular; font-size: 14px; color: #ff6b4a; letter-spacing: -0.26px; } } .order-info-price { display: block; margin-left: 40rpx; margin-top: 24rpx; .p1 { // font-family: PingFangSC-Semibold; font-size: 14px; color: #333333; letter-spacing: -0.26px; line-height: 18px; margin-right: 24px; } .p2 { // font-family: PingFangSC-Semibold; font-size: 14px; color: #ff6b4a; letter-spacing: -0.26px; } } .order-info-num { display: block; margin-left: 40rpx; margin-top: 44rpx; text { // font-family: PingFangSC-Regular; font-size: 12px; color: #999999; letter-spacing: -0.23px; } } .order-info-time { display: block; margin: 8rpx 0 48rpx 40rpx; text { // font-family: PingFangSC-Regular; font-size: 12px; color: #999999; letter-spacing: -0.23px; } } .order-info-hr { width: 520rpx; height: 1px; background-color: #e9e9e9; margin-bottom: 20rpx; } .order-info-contact { display: flex; padding-bottom: 28rpx; image { width: 19px; height: 16px; } |
7c039b6f9 订单详情页规格修改 |
711 |
button { |
7d6833f2c 地址列表 |
712 |
// font-family: PingFangSC-Regular; |
7c039b6f9 订单详情页规格修改 |
713 714 715 |
border: none; border-radius: 0; text-align: left; |
7d6833f2c 地址列表 |
716 717 718 719 720 |
margin-left: 20rpx; font-size: 14px; color: #333333; letter-spacing: -0.26px; line-height: 18px; |
7c039b6f9 订单详情页规格修改 |
721 722 723 724 725 |
background-color: #fff; padding: 0; &::after { border: 0; } |
7d6833f2c 地址列表 |
726 727 728 |
} } } |
4de4be344 客服在线和我的订单-待付款 |
729 |
|
7d6833f2c 地址列表 |
730 731 732 |
.order-confim { display: flex; align-items: center; |
058f060df 冲突修改 |
733 734 |
justify-content: flex-end; // z-index: 999; |
7d6833f2c 地址列表 |
735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 |
width: 100%; height: 112rpx; position: fixed; bottom: 0; background: #ffffff; button { width: 204rpx; height: 80rpx; border: 1px solid #ff6b4a; border-radius: 40rpx; font-size: 32rpx; letter-spacing: -0.3px; margin-right: 0; } .b1 { // font-family: PingFangSC-Regular; color: #ff6b4a; |
058f060df 冲突修改 |
752 |
background-color: #ffffff; |
7d6833f2c 地址列表 |
753 754 755 756 757 758 759 760 |
} .b2 { // font-family: PingFangSC-Regular; background-color: #ff6b4a; color: #ffffff; margin: 0 26rpx 0 20rpx; } } |
4de4be344 客服在线和我的订单-待付款 |
761 |
</style> |