diff --git a/ext.json b/ext.json index af9aa49..46be677 100644 --- a/ext.json +++ b/ext.json @@ -34,12 +34,11 @@ ], "configUrl": "https://c.malls.iformall.com/C/api", "ifStoreApp": "0", - "businessSwitch": "1", "ifHaveWebSocket": "0", "ifHaveCarModular": "0" }, - "name": "富茂链客生产版", - "weappId": "wx6a2524a8286d687f", + "name": "金茂悦茂邻荟", + "weappId": "wx7c9c7122a91946a7", "appVersion": "C.5.1.1" }, "debug": false, @@ -84,17 +83,7 @@ "navigationBarTitleText": "", "navigationBarBackgroundColor": "#FFFFFF" }, - "plugins": { - "auto-points-plugin": { - "version": "1.3.0", - "provider": "wxfab2bf944bfc4da6" - }, - "live-player-plugin": { - "version": "1.3.5", - "provider": "wx2b03c6e691cd7370" - } - }, - "extAppid": "wx6a2524a8286d687f", + "extAppid": "wx7c9c7122a91946a7", "extEnable": true, "permission": { "scope.userLocation": { diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml index 4627ea8..1439cd2 100644 --- a/pages/order/detail/index.wxml +++ b/pages/order/detail/index.wxml @@ -63,6 +63,10 @@ 订单编号: {{order.orderNumber}} + + 支付状态: + 订单已取消,即将退款 + 物流状态: {{(order.shippingStatus==10||order.shippingStatus==14)?"待自提":order.shippingStatus==15?"已自提":order.shippingStatus==20?"待发货":order.shippingStatus==24?"待收货":order.shippingStatus==25?"已收货":""}} diff --git a/pages/order/detail/index.wxss b/pages/order/detail/index.wxss index 238998b..03df905 100644 --- a/pages/order/detail/index.wxss +++ b/pages/order/detail/index.wxss @@ -13,12 +13,14 @@ page { width: 100%; padding-bottom: 160rpx; } -.barnumImg{ + +.barnumImg { float: left; height: 40rpx; width: 40rpx; - margin: 24rpx 20rpx; + margin: 24rpx 20rpx; } + .success { vertical-align: middle; width: 40rpx; @@ -130,14 +132,16 @@ page { font-size: 24rpx; } -.info view:nth-child(2), .info view:nth-child(3) { +.info view:nth-child(2), +.info view:nth-child(3) { font-size: 24rpx; padding-left: 4%; color: #919191; letter-spacing: 0; } -.info view:nth-child(2) text, .info view:nth-child(3) text { +.info view:nth-child(2) text, +.info view:nth-child(3) text { font-size: 22rpx; color: #b8b8b8; } @@ -209,7 +213,7 @@ page { .left { float: left; font-size: 26rpx; - color: #a6a6a6; + color: #a6a6a6; } .copeCode { @@ -220,7 +224,7 @@ page { line-height: 30rpx; border-radius: 8rpx; color: #df3502; - border:1rpx #a6a6a6 solid; + border: 1rpx #a6a6a6 solid; font-size: 28rpx; } @@ -231,7 +235,7 @@ page { padding: 10rpx; height: 30rpx; line-height: 30rpx; - border:1rpx #a6a6a6 solid; + border: 1rpx #a6a6a6 solid; border-radius: 8rpx; color: #3cc51f; font-size: 28rpx; @@ -260,7 +264,8 @@ page { line-height:94rpx; } */ -.classif > view:nth-child(2), .classif > view:nth-child(3) { +.classif>view:nth-child(2), +.classif>view:nth-child(3) { position: relative; height: 94rpx; line-height: 94rpx; @@ -271,22 +276,22 @@ page { /* border-bottom: 1rpx solid #eee; */ } -.classif > view text:nth-child(2) { +.classif>view text:nth-child(2) { font-size: 28rpx; /* color: #3c3c3c; */ } -.classif > view text:nth-child(1) { +.classif>view text:nth-child(1) { font-size: 28rpx; color: #a6a6a6; float: left; } -.classif > view:nth-child(1) { +.classif>view:nth-child(1) { display: block; } -.classif > view:nth-child(6) text:nth-child(2) { +.classif>view:nth-child(6) text:nth-child(2) { color: #666; } @@ -342,7 +347,8 @@ page { .drawer_content { height: 210px; - overflow-y: scroll; /*超出父盒子高度可滚动*/ + overflow-y: scroll; + /*超出父盒子高度可滚动*/ } .btn_ok { @@ -476,7 +482,7 @@ radio { color: #333; } -.barcode > canvas { +.barcode>canvas { width: 500rpx; height: 100rpx; } @@ -489,7 +495,7 @@ radio { align-items: center; } -.qrcode > canvas { +.qrcode>canvas { width: 350rpx; height: 350rpx; } @@ -710,4 +716,4 @@ radio { color: #919191; letter-spacing: 0; margin-left: 20rpx; -} +} \ No newline at end of file diff --git a/pages/order/index/index.wxml b/pages/order/index/index.wxml index 8011980..227c75a 100644 --- a/pages/order/index/index.wxml +++ b/pages/order/index/index.wxml @@ -32,6 +32,7 @@ 免费领取 积分兑换 付款成功 + 订单已取消,即将退款 @@ -93,7 +94,7 @@ 再忙,也要记得买点什么犒赏自己~ - + {{content}} diff --git a/pages/order/index/index.wxss b/pages/order/index/index.wxss index 3b6a255..289726e 100644 --- a/pages/order/index/index.wxss +++ b/pages/order/index/index.wxss @@ -4,6 +4,7 @@ background: #F4F5F9; margin-top: 20rpx; } + .tabs { position: fixed; width: 100% !important; @@ -21,10 +22,12 @@ width: 30% !important; display: inline-block; } -.section{ + +.section { background: #FFFFFF; overflow: hidden; } + .detail_msg { position: relative; width: 92%; @@ -35,7 +38,8 @@ padding-top: 20rpx; /* border-bottom: 1rpx solid #eee; */ } -.sendImg{ + +.sendImg { position: absolute; width: 100rpx; top: 100rpx; @@ -56,13 +60,15 @@ height: 120rpx; border-radius: 20rpx; } -.detail_top{ + +.detail_top { width: 100%; height: 40rpx; line-height: 40rpx; font-size: 30rpx; padding-top: 30rpx; } + .detail_top view:nth-child(1) { display: flex; justify-content: space-between; @@ -96,20 +102,21 @@ white-space: nowrap; text-overflow: ellipsis; } -.discount{ + +.discount { position: absolute; width: 100rpx; - top:86rpx; - right:2rpx; + top: 86rpx; + right: 2rpx; } .detail_top .sucess { display: inline-block; width: 123rpx !important; /* overflow: hidden; */ - font-family:PingFangSC-Regular; + font-family: PingFangSC-Regular; font-size: 28rpx; - font-weight:400; + font-weight: 400; color: #2C8DFF; letter-spacing: 0; text-align: right; @@ -118,13 +125,26 @@ .wait { display: inline-block; - width: 123rpx !important; - overflow: visible!important; + width: 130rpx !important; + overflow: visible !important; font-size: 28rpx; color: #FD832D; letter-spacing: 0; text-align: right; - line-height: 28rpx!important; + line-height: 28rpx !important; +} + +.waiting { + position: relative; + top: 20rpx; + display: inline-block; + width: 280rpx !important; + overflow: visible !important; + font-size: 28rpx; + color: red; + letter-spacing: 0; + text-align: right; + line-height: 28rpx !important; } .close { @@ -165,9 +185,11 @@ .info view:nth-child(3) { margin-top: 16rpx; } + .info view:nth-child(2) { margin-top: 16rpx; } + .payment { position: relative; width: 92%; @@ -213,9 +235,10 @@ float: right; font-size: 26rpx; border-radius: 20rpx; - background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); + background: linear-gradient(127deg, rgba(252, 177, 74, 1) 0%, rgba(254, 70, 20, 1) 100%); } -.btnZf{ + +.btnZf { position: absolute; bottom: 0; right: 0; @@ -227,9 +250,10 @@ float: right; font-size: 26rpx; border-radius: 20rpx; - background:linear-gradient(130deg,rgba(50,177,252,1) 0%,rgba(47,108,255,1) 100%); + background: linear-gradient(130deg, rgba(50, 177, 252, 1) 0%, rgba(47, 108, 255, 1) 100%); } -.btnGm{ + +.btnGm { position: absolute; bottom: 0; right: 0; @@ -248,10 +272,12 @@ font-size: 26rpx; color: #FFFFFF; } -.txGm{ - font-size: 26rpx!important; - color: #2C8DFF!important; + +.txGm { + font-size: 26rpx !important; + color: #2C8DFF !important; } + .dingdan { margin-top: 33rpx; } @@ -293,20 +319,25 @@ vertical-align: middle; margin-right: 10rpx; } -button::after{ border: none; } -.goback{ + +button::after { + border: none; +} + +.goback { position: fixed; right: 50rpx; bottom: 60rpx; - width:100rpx!important; - height:100rpx; + width: 100rpx !important; + height: 100rpx; z-index: 100; - background:rgba(255,255,255,1); + background: rgba(255, 255, 255, 1); line-height: 95rpx; - border:1rpx solid rgba(227,227,227,1); - border-radius:50%; + border: 1rpx solid rgba(227, 227, 227, 1); + border-radius: 50%; } -.goback image{ + +.goback image { position: absolute; width: 60rpx; left: 0; @@ -315,28 +346,32 @@ button::after{ border: none; } bottom: 0; margin: auto; } -.itemBox{ + +.itemBox { overflow: hidden; margin: 0 60rpx 20rpx 60rpx; padding-bottom: 20rpx; position: relative; } -.payStatus{ + +.payStatus { text-align: right; } + .payStatus .sucess { display: inline-block; width: 123rpx !important; /* overflow: hidden; */ - font-family:PingFangSC-Regular; + font-family: PingFangSC-Regular; font-size: 28rpx; - font-weight:400; + font-weight: 400; color: #2C8DFF; letter-spacing: 0; text-align: right; line-height: 26px; } -.itemImg{ + +.itemImg { float: left; display: block; width: 120rpx; @@ -344,31 +379,36 @@ button::after{ border: none; } border: 1px solid #f8f8f8; border-radius: 20rpx; } + .itemImg image { display: block; width: 120rpx; height: 120rpx; border-radius: 20rpx; } -.itemContent{ + +.itemContent { float: left; width: 70%; } -.face{ + +.face { font-size: 24rpx; color: #999; letter-spacing: 0; padding-left: 4%; line-height: 33rpx; } -.face text{ + +.face text { font-size: 24rpx; color: #333; letter-spacing: 0; line-height: 33rpx; } -.date{ + +.date { /* margin-top: 16rpx; */ font-size: 24rpx; color: #999; @@ -377,7 +417,8 @@ button::after{ border: none; } line-height: 26rpx; } -.yunfe{ + +.yunfe { font-size: 24rpx; color: #999; letter-spacing: 0; @@ -385,7 +426,8 @@ button::after{ border: none; } height: 33rpx; line-height: 33rpx; } -.yunfeK{ + +.yunfeK { font-size: 24rpx; color: #999; letter-spacing: 0;