diff --git a/bundle/reserve/confirm.vue b/bundle/reserve/confirm.vue new file mode 100644 index 0000000..45e8dac --- /dev/null +++ b/bundle/reserve/confirm.vue @@ -0,0 +1,399 @@ + + + + + \ No newline at end of file diff --git a/bundle/reserve/reserve.vue b/bundle/reserve/reserve.vue index 3c4f3cc..9e3351b 100644 --- a/bundle/reserve/reserve.vue +++ b/bundle/reserve/reserve.vue @@ -18,7 +18,7 @@ - + 选择时间 @@ -56,7 +56,7 @@ - 立即预定（{{countSelectedTime}}小时） + 立即预定（{{countSelectedTime}}小时） @@ -64,7 +64,7 @@ - + 费用明细 @@ -256,6 +256,12 @@ handleShowTime() { this.billPopup = false; this.timePopup = true; + }, + + toConfirm() { + uni.navigateTo({ + url: '/bundle/reserve/confirm' + }); } } }; diff --git a/common/style.scss b/common/style.scss index 5bcead9..6a4d87c 100644 --- a/common/style.scss +++ b/common/style.scss @@ -32,6 +32,10 @@ body { color: #333333; } +.gray7 { + color: #C9C9C9; +} + .white { color: #FFFFFF; } @@ -96,10 +100,10 @@ body { } .theme-btn{ border: 1rpx solid; - // @include border_color("border_color"); - // @include background_color("background_color"); - border-color: #365A9A; - background-color: #365A9A; + @include border_color("border_color"); + @include background_color("background_color"); + // border-color: #365A9A; + // background-color: #365A9A; @include text_color("text_color1"); } .theme-linbtn{ diff --git a/components/navbar.vue b/components/navbar.vue index 77c93f1..bf16ecf 100644 --- a/components/navbar.vue +++ b/components/navbar.vue @@ -3,8 +3,9 @@ - - {{ title }} + + {{ title }} + @@ -15,7 +16,7 @@ props: { title: { type: String, - default: '标题' + default: '' }, bg: { type: String, @@ -30,7 +31,11 @@ mounted() { }, methods: { - + back() { + uni.navigateBack({ + delta: 1 + }); + }, } }; diff --git a/pages.json b/pages.json index 751593f..348b497 100644 --- a/pages.json +++ b/pages.json @@ -951,7 +951,28 @@ //#endif } } - + }, + { + "path": "pages/order/cg-my-order", + "style": { + "navigationStyle": "custom", + "app-plus": { + //#ifdef H5 + "titleNView": false + //#endif + } + } + }, + { + "path": "pages/order/cg-order-detail", + "style": { + "navigationStyle": "custom", + "app-plus": { + //#ifdef H5 + "titleNView": false + //#endif + } + } } ], "subPackages": [{ @@ -974,6 +995,12 @@ "style": { "navigationBarTitleText": "支付结果" } + }, + { + "path": "reserve/confirm", + "style": { + "navigationStyle": "custom" + } } ] }], diff --git a/pages/index/index.vue b/pages/index/index.vue index 265ef81..331882a 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -110,7 +110,7 @@ - + 公告 目前仅开放1-2号场地预约，3-6号场地预约敬请期待 @@ -120,7 +120,7 @@ - + 温馨提示 diff --git a/pages/order/cg-my-order.vue b/pages/order/cg-my-order.vue index abe5361..d45e381 100644 --- a/pages/order/cg-my-order.vue +++ b/pages/order/cg-my-order.vue @@ -46,8 +46,8 @@ - - + + @@ -63,7 +63,7 @@ - + 这个是场馆的分场名称 @@ -165,7 +165,7 @@ - @@ -185,7 +185,7 @@ + @click="onDelOrder(item.order_id)">删除订单 --> @@ -216,6 +216,35 @@ + + + + + 确定取消订单？ + + 取消订单后无法恢复，是否确认取消 + + + 取消 + 确定 + + + + + + + + 确定删除订单？ + + 删除订单后无法恢复，是否确认删除订单？ + + + 取消 + 确定 + + + + @@ -265,7 +294,9 @@ loading: true, /*是否显示核销二维码*/ isCodeImg: false, - codeImg: '' + codeImg: '', + cancelOrderPopup: false, + delOrderPopup: false, }; }, computed: { @@ -417,7 +448,7 @@ /*跳转页面*/ gotoOrder(e) { - this.gotoPage('/pages/order/order-detail?order_id=' + e); + this.gotoPage('/pages/order/cg-order-detail?order_id=' + e); }, /*隐藏支付方式*/ @@ -518,36 +549,34 @@ } }); }, + + // 取消订单弹窗 + showCancleOrderPopup(order_id) { + this.cancelOrderPopup = true; + this.order_id = order_id; + }, + /*取消订单*/ cancelOrder(e) { let self = this; - let order_id = e; - uni.showModal({ - title: '提示', - content: '您确定要取消吗?', - success: function(o) { - if (o.confirm) { - uni.showLoading({ - title: '正在处理' - }); - self._get( - 'user.order/cancel', { - order_id: order_id - }, - function(res) { - uni.hideLoading(); - uni.showToast({ - title: '操作成功', - duration: 2000, - icon: 'success' - }); - self.listData = []; - self.getData(); - } - ); - } - } + uni.showLoading({ + title: '正在处理' }); + self._get( + 'user.order/cancel', { + order_id: self.order_id + }, + function(res) { + uni.hideLoading(); + uni.showToast({ + title: '操作成功', + duration: 2000, + icon: 'success' + }); + self.listData = []; + self.getData(); + } + ); }, nowOverTime(t) { @@ -589,6 +618,15 @@ gotoAssembleShare(e) { let url = '/pages/plus/assemble/fight-group-detail/fight-group-detail?assemble_bill_id=' + e; this.gotoPage(url); + }, + + // 删除订单 + onDelOrder() { + uni.showToast({ + title: '该功能正在开发中，敬请期待', + duration: 2000, + icon: 'none' + }); } } }; @@ -604,4 +642,54 @@ @import url("css/cg-order.css"); + +.notice-popup { + padding: 20rpx 0; + width: 100%; + + .title { + font-size: 36rpx; + color: #303133; + line-height: 50rpx; + text-align: center; + } + + .desc { + margin-top: 48rpx; + font-weight: 400; + font-size: 32rpx; + color: #303133; + line-height: 52rpx; + text-align: center; + } + + .btn { + font-size: 32rpx; + display: flex; + justify-content: center; + align-items: center; + margin-top: 44rpx; + + .btn1 { + width: 240rpx; + height: 80rpx; + line-height: 80rpx; + text-align: center; + background: #F6F7F8; + border-radius: 8rpx; + margin-right: 30rpx; + } + + .btn2 { + width: 240rpx; + height: 80rpx; + line-height: 80rpx; + text-align: center; + background: #365A9A; + color: #FFFFFF; + border-radius: 8rpx; + } + } +} + diff --git a/pages/order/cg-order-detail.vue b/pages/order/cg-order-detail.vue new file mode 100644 index 0000000..c3c1dcc --- /dev/null +++ b/pages/order/cg-order-detail.vue @@ -0,0 +1,769 @@ + + + + + diff --git a/pages/order/css/cg-order.css b/pages/order/css/cg-order.css new file mode 100644 index 0000000..6bc08d0 --- /dev/null +++ b/pages/order/css/cg-order.css @@ -0,0 +1,270 @@ +page { + background-color: #F6F7F9 !important; +} + +.cg-order .top-tabbar { + height: 96rpx; + display: flex; + flex-wrap: nowrap; + justify-content: flex-start; + align-items: center; + overflow-x: auto; + background-color: #F6F7F9 !important; + margin-bottom: 28rpx; +} + +.cg-order .top-tabbar .tab-item.active::after { + content: ''; + background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAAQCAMAAAB9TOwNAAAAn1BMVEUAAAAAQIAgQIAqVZUwUI8zWZkwWJczV5kyVZU0VZY0XJ0zWZk1WZo1WZo0WJc1WZg0WpszVpk0WJg0V5o1WZg2WZkzWZk0WJk0V5k1WZk2WZk0Wps2Wps2WJo0Wpo1WZk1Wpo1WZk1Wpo2WZo2WZk2WZo1Wpo1WZk1WZo2WZo2Wpo1Wpo1WZk2WZk2WZo1WZk1Wpo2WZk2Wpo2WZk2WppMVWQ4AAAANHRSTlMABAgMEBQgIyQnJygrP0BIT1BUWFxfZGtsc3t/f5OXm5+jp6uvr7O3v8PHz9Pf3+vv8/f7R0m5LAAAAMZJREFUGBmtwQlygjAABdBvUNzFWldADS6YKqiQf/+zSZlqhzIWM+17+BtrFas+DPVVvLIArJkJmjDQDJgJgLrmJy17eFFPaubqsHmnJhYqWRPFOxsi5UN6mHXwi87skPIhFYDLgsvOHbZr+KHWHrq7Cws8ZDyWxcdQLv3cUobHmGUecqOExq5v+NL6oCFl49v4RAOndxQ5e82X6L2DssY0TFghCacNPCEGi03EJ6LNYiBQQXSduS+3SkXnTKTUVvpzpyvwv24yMFfPCBJo4AAAAABJRU5ErkJggg=='); + background-color: transparent !important; + background-repeat: no-repeat; + background-size: cover; + width: 60rpx; + height: 16rpx; +} + + +.tab-item{ + flex-shrink: 0; + white-space: nowrap; + flex: auto; +} + +.order-list { + margin: 0 30rpx; +} + +.order-list .order-head .state-text { + padding: 10rpx 12rpx; + margin-right: 21rpx; + border-radius: 4rpx; + background: #FFE7E4; + font-size: 22rpx; + color: #F6220C; +} + +.shop-name { + font-size: 26rpx; + font-family: PingFang SC; + font-weight: 500; + color: #333333; +} + +.order-list .item { + margin-bottom: 30rpx; + padding: 30rpx; + background: #ffffff; + border-radius: 10rpx; +} + +.order-list .product-list, +.order-list .one-product { + padding: 30rpx 0 27rpx 0; + height: 150rpx; +} + +.one-product .pro-info { + padding: 0 21rpx 0 28rpx; + display: -webkit-box; + width: 361rpx; + overflow: hidden; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + font-size: 26rpx; + color: #333333; +} + +.order-list .cover, +.order-list .cover image { + width: 150rpx; + height: 150rpx; + border-radius: 8rpx; +} + +.order-list .total-count { + padding-left: 20rpx; + display: flex; + flex-direction: column; + justify-content: center; + align-items: flex-end; +} + +.total-count .count { + padding-top: 16rpx; + color: #999999; + font-size: 22rpx; +} + +.product-list .total-count { + position: absolute; + top: 0; + right: 0; + bottom: 0; + background: rgba(255, 255, 255, 0.9); +} + +.product-list .total-count .left-shadow { + position: absolute; + top: 0; + bottom: 0; + left: -24rpx; + width: 24rpx; + overflow: hidden; +} + +.product-list .total-count .left-shadow::after { + position: absolute; + top: 0; + bottom: 0; + width: 24rpx; + right: -12rpx; + display: block; + content: ''; + background-image: radial-gradient(rgba(0, 0, 0, 0.2) 10%, rgba(0, 0, 0, 0.1) 40%, rgba(0, 0, 0, 0) 80%); +} + +.order-list .order-bts { + display: flex; + justify-content: flex-end; + align-items: center; +} + +.order-list .order-bts.presale { + display: block; + padding-top: 12rpx; +} + +.order-list .order-bts button { + width: 176rpx; + height: 60rpx; + line-height: 60rpx; + margin-left: 20rpx; + font-size: 32rpx; + border: 1px solid #F6220C; + border-radius: 8px; + background: #ffffff; + white-space: nowrap; + font-family: PingFang SC; +} + +.order-list .order-bts button::after { + display: none; +} + +.order-list .order-bts button.btn-border-red { + border: 1px solid $dominant-color; + font-size: 24rpx; + color: $dominant-color; +} + +.order-list .order-bts button.btn-red { + background: linear-gradient(90deg, #FF6B6B 4%, #F6220C 100%); + border-radius: 30rpx; + font-size: 32rpx; + font-family: PingFang SC; + color: #ffffff; + border: none; +} + +.buy-checkout { + width: 100%; +} + +.buy-checkout .item { + min-height: 50rpx; + line-height: 50rpx; + padding: 20rpx; + display: flex; + justify-content: space-between; + font-size: 28rpx; +} + +.buy-checkout .iconfont.icon-weixin { + color: #04be01; + font-size: 50rpx; +} + +.buy-checkout .iconfont.icon-yue { + color: #f0de7c; + font-size: 50rpx; +} + +.buy-checkout .item.active .iconfont.icon-xuanze { + color: #04be01; +} + +.item-dianpu { + display: flex; + justify-content: space-between; + align-items: center; + font-size: 24rpx; + line-height: 30rpx; +} + +.item-dianpu .icon-jiantou { + font-size: 24rpx; + color: #333333; +} + +.item-d-l { + display: flex; +} + +.icon-dianpu1 { + margin-right: 20rpx; + color: #333333; + font-size: 32rpx; +} + +.cg-name { + font-weight: bold; + font-size: 30rpx; + color: #303133; + line-height: 42rpx; +} + +.cg-state { + font-weight: 400; + font-size: 28rpx; + color: #FF5951; + line-height: 40rpx; +} + +.cg-info1 { + font-weight: 500; + font-size: 30rpx; + color: #303133; + line-height: 42rpx; +} + +.cg-info2 { + margin-top: 34rpx; + font-weight: 400; + font-size: 26rpx; + color: #606266; + line-height: 36rpx; +} + +.cg-info3 { + margin-top: 18rpx; + font-weight: 400; + font-size: 26rpx; + color: #606266; + line-height: 36rpx; +} + +.order-bts .cancel-btn { + border: 2rpx solid #C2C9D5 !important; + color: #303133 !important; +} + +.order-bts .pay-btn { + border: 2rpx solid #365A9A !important; + background-color: transparent !important; + color: #365A9A !important; +} + +.order-bts .del-btn { + border: 2rpx solid #C2C9D5 !important; + color: #365A9A !important; +} diff --git a/pages/order/css/myorder.css b/pages/order/css/myorder.css index 26f01bd..038e535 100644 --- a/pages/order/css/myorder.css +++ b/pages/order/css/myorder.css @@ -125,7 +125,6 @@ page { border-radius: 30px; background: #ffffff; white-space: nowrap; - color: #F6220C; font-family: PingFang SC; } diff --git a/pages/user/address/add/add.vue b/pages/user/address/add/add.vue index f8e5109..e7e4635 100644 --- a/pages/user/address/add/add.vue +++ b/pages/user/address/add/add.vue @@ -39,7 +39,7 @@ - + @@ -202,6 +202,8 @@ line-height: 90rpx; border-radius: 8rpx; margin: 0 60rpx; + background-color: #365A9A !important; + color: #fff; } .border-b { diff --git a/pages/user/address/address.vue b/pages/user/address/address.vue index b9066cb..7f8a3d6 100644 --- a/pages/user/address/address.vue +++ b/pages/user/address/address.vue @@ -39,7 +39,7 @@ --> - 新增收货地址 + 新增收货地址 @@ -197,7 +197,7 @@ font-size: 32rpx; font-family: PingFang SC; font-weight: 500; - background: #365A9A; + background: #365A9A !important; color: #FFFFFF; position: fixed; bottom: 40rpx; @@ -248,6 +248,8 @@ display: flex; justify-content: center; align-items: center; + background-color: #365A9A !important; + color: #fff; } .pbenv{ padding-bottom: calc(env(safe-area-inset-bottom) + 120rpx); diff --git a/pages/user/address/edit/edit.vue b/pages/user/address/edit/edit.vue index 1bccb60..3d4a08c 100644 --- a/pages/user/address/edit/edit.vue +++ b/pages/user/address/edit/edit.vue @@ -41,7 +41,7 @@ - + @@ -270,6 +270,8 @@ height: 90rpx; line-height: 90rpx; border-radius: 8rpx; + background-color: #365A9A !important; + color: #fff; } .border-b { diff --git a/pages/user/index/index.vue b/pages/user/index/index.vue index 013a0dd..0d69029 100644 --- a/pages/user/index/index.vue +++ b/pages/user/index/index.vue @@ -54,11 +54,11 @@ 我的场馆订单 - 全部订单全部订单 - + 待付款 - + - + {{ orderCount.delivery }} + v-if="orderCount.reserve != null && orderCount.reserve > 0">{{ orderCount.reserve }} - 待发货 + 已预约 - + - + {{ orderCount.received }} + v-if="orderCount.completed != null && orderCount.completed > 0">{{ orderCount.completed }} - 待收货 + 已完成 - - + {{ orderCount.refund }} @@ -154,7 +146,7 @@ --> - + {{ orderCount.refund }} diff --git a/static/coupon.png b/static/coupon.png new file mode 100644 index 0000000..98a7433 Binary files /dev/null and b/static/coupon.png differ diff --git a/static/icon/active.png b/static/icon/active.png new file mode 100644 index 0000000..8791671 Binary files /dev/null and b/static/icon/active.png differ diff --git a/static/icon/time2.png b/static/icon/time2.png new file mode 100644 index 0000000..49dba34 Binary files /dev/null and b/static/icon/time2.png differ