From 3d2f5d157d717cdf07d20dd08300f47b5d53324e Mon Sep 17 00:00:00 2001 From: chenkainan Date: Wed, 6 Nov 2024 15:42:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/index.vue | 1 - pages/user/user.vue | 3 +-- subPackages/hotelHomestay/order.vue | 2 +- subPackages/line/order.vue | 6 +++--- subPackages/line/orders.vue | 5 ++--- subPackages/notice/noticeList.vue | 1 - subPackages/order/detail.vue | 16 ++++++++-------- subPackages/order/orderCoupon.vue | 6 +++--- subPackages/order/trades.vue | 4 ++-- subPackages/techan/detail.vue | 2 +- subPackages/techan/techanList.vue | 6 +++--- subPackages/ticketBooking/detail.vue | 5 ++--- subPackages/user/myAddressAdd.vue | 5 +++-- subPackages/user/myContactsAdd.vue | 3 ++- 14 files changed, 31 insertions(+), 34 deletions(-) diff --git a/pages/index/index.vue b/pages/index/index.vue index 0254cbd..28991a1 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -546,7 +546,6 @@ .scenic-title { padding: 0 4rpx; - font-weight: 500; color: #100e0e; font-size: 28rpx; margin-top: 10rpx; diff --git a/pages/user/user.vue b/pages/user/user.vue index 95b1c32..d550310 100644 --- a/pages/user/user.vue +++ b/pages/user/user.vue @@ -357,7 +357,6 @@ .username { margin-left: 20rpx; - font-weight: 500; font-size: 40rpx; color: #000000; } @@ -377,7 +376,7 @@ .orderBox { width: 697rpx; - background: #FFFFFF; + background: linear-gradient(to bottom, #f8f4f0,rgba(248, 244, 240, .8),rgba(248, 244, 240, .5)); box-shadow: 0rpx 0rpx 23rpx 0rpx rgba(80, 80, 80, 0.12); border-radius: 20rpx; margin: -85rpx auto 0; diff --git a/subPackages/hotelHomestay/order.vue b/subPackages/hotelHomestay/order.vue index 6758e2d..4818a4b 100644 --- a/subPackages/hotelHomestay/order.vue +++ b/subPackages/hotelHomestay/order.vue @@ -38,7 +38,7 @@ 订单确认后，您在{{new Date(selectDate.startDay).Format('yyyy年MM月dd日')}}20:00前之免费取消或 变更订单，20:00后将收取30%房费作为违约费用。 - 预期不可取消或/修改，扣取全额房费 + 预期不可取消或/修改，扣取全额房费 diff --git a/subPackages/line/order.vue b/subPackages/line/order.vue index 8e6bae6..43b2b0a 100644 --- a/subPackages/line/order.vue +++ b/subPackages/line/order.vue @@ -444,7 +444,7 @@ .price { font-size: 23rpx; - color: #F84A56; + color: #C3282E; line-height: 20rpx; } .price::after { @@ -544,7 +544,7 @@ display: flex; justify-content: space-between; align-items: center; - padding-left: 26rpx; + padding: 0 26rpx; box-shadow: 0px 0px 16rpx 0px rgba(6, 0, 1, 0.1); z-index: 999; @@ -556,7 +556,7 @@ .price { flex: 1; font-size: 36rpx; - color: #F84A56; + color: #C3282E; font-weight: bold; } diff --git a/subPackages/line/orders.vue b/subPackages/line/orders.vue index 20f6615..3f48024 100644 --- a/subPackages/line/orders.vue +++ b/subPackages/line/orders.vue @@ -46,7 +46,7 @@ 优惠券 选择优惠券 - + -￥{{coupon.CouponActivity.discounts/100}} @@ -417,7 +417,6 @@ .product-title { color: #000000; font-size: 33rpx; - font-weight: 500; line-height: 47rpx; margin-bottom: 30rpx; } @@ -676,7 +675,7 @@ .order-all-text { flex: 1; font-size: 36rpx; - color: #F84A56; + color: #C3282E; font-weight: bold; } } diff --git a/subPackages/notice/noticeList.vue b/subPackages/notice/noticeList.vue index 3c02071..ec0418b 100644 --- a/subPackages/notice/noticeList.vue +++ b/subPackages/notice/noticeList.vue @@ -121,7 +121,6 @@ margin-left: 20rpx; .title { - font-weight: 500; font-size: 28rpx; color: #000000; } diff --git a/subPackages/order/detail.vue b/subPackages/order/detail.vue index 9ae9e87..90f129c 100644 --- a/subPackages/order/detail.vue +++ b/subPackages/order/detail.vue @@ -95,7 +95,7 @@ 优惠券：-￥{{info.discounts / 100}} - 实付金额：￥{{info.pay_money / 100}} + 实付金额：￥{{info.pay_money / 100}} @@ -161,7 +161,7 @@ 优惠券：-￥{{info.discounts / 100}} - 实付金额：￥{{info.pay_money / 100}} + 实付金额：￥{{info.pay_money / 100}} @@ -231,7 +231,7 @@ 优惠券：-￥{{info.discounts / 100}} - 实付金额：￥{{info.pay_money / 100}} + 实付金额：￥{{info.pay_money / 100}} @@ -331,7 +331,7 @@ 优惠券：-￥{{info.discounts / 100}} - 实付金额：￥{{info.pay_money / 100}} + 实付金额：￥{{info.pay_money / 100}} @@ -778,7 +778,7 @@ span { width: 60rpx; text-align: center; - color: rgba(238, 62, 59, 1); + color: #C3282E; display: inline-block; } } @@ -863,7 +863,7 @@ .swiper-prompt { font-weight: 500; font-size: 29rpx; - color: #EE3E3B; + color: #C3282E; text-align: center; margin-bottom: 45rpx; } @@ -1420,7 +1420,7 @@ span { font-weight: bold; font-size: 48rpx; - color: #EE3E3B; + color: #C3282E; } span::before { @@ -1451,7 +1451,7 @@ .pay-btn { height: 73rpx; - background: rgba(195, 40, 46, 1); + background: #C3282E; border: none; color: #FFFFFF; } diff --git a/subPackages/order/orderCoupon.vue b/subPackages/order/orderCoupon.vue index 3b3d75d..d952ec7 100644 --- a/subPackages/order/orderCoupon.vue +++ b/subPackages/order/orderCoupon.vue @@ -53,12 +53,12 @@ 优惠： - ￥ - {{reducePrice}} + ￥ + {{reducePrice}} 优惠： - {{reducePrice}} + {{reducePrice}} diff --git a/subPackages/order/trades.vue b/subPackages/order/trades.vue index 7476303..22ce130 100644 --- a/subPackages/order/trades.vue +++ b/subPackages/order/trades.vue @@ -446,7 +446,7 @@ font-size: 27rpx; font-family: PingFang SC; font-weight: bold; - color: #EE0000; + color: #C3282E; } .trade-item-head-name { @@ -524,7 +524,7 @@ .trade-item-pro-price-pri { font-size: 27rpx; - color: #fc514b; + color: #C3282E; font-weight: 500; color: #333333; } diff --git a/subPackages/techan/detail.vue b/subPackages/techan/detail.vue index d25dea6..b7d8b88 100644 --- a/subPackages/techan/detail.vue +++ b/subPackages/techan/detail.vue @@ -466,7 +466,7 @@ font-size: 42rpx; font-family: PingFang SC; font-weight: bold; - color: rgba(248, 74, 86, 1); + color: #C3282E; &:before { content: '¥'; diff --git a/subPackages/techan/techanList.vue b/subPackages/techan/techanList.vue index 122b46a..bae0246 100644 --- a/subPackages/techan/techanList.vue +++ b/subPackages/techan/techanList.vue @@ -47,7 +47,7 @@ + :custom-style="{background:'#F7F7F7',color:'#C3282E',border:'1px solid #C3282E'}"> @@ -591,7 +591,7 @@ .bottom-productPrice { font-size: 40rpx; - color: #FC524B; + color: #C3282E; &:before { content: "￥"; @@ -686,7 +686,7 @@ height: 78rpx; text-align: center; line-height: 78rpx; - background: linear-gradient(90deg, #F84A56, #FF9834); + background: linear-gradient(90deg, #C3282E, #FF9834); border-radius: 40rpx; font-size: 34rpx; diff --git a/subPackages/ticketBooking/detail.vue b/subPackages/ticketBooking/detail.vue index 8b4cb8b..295fcfb 100644 --- a/subPackages/ticketBooking/detail.vue +++ b/subPackages/ticketBooking/detail.vue @@ -881,7 +881,7 @@ } .price{ - color: #EE3E3B; + color: #C3282E; } } @@ -943,7 +943,7 @@ .bottom-price { font-size: 48rpx; font-weight: bold; - color: #EE3E3B; + color: #C3282E; } .bottom-price::before { font-size: 24rpx; @@ -967,7 +967,6 @@ display: flex; align-items: flex-start; .address-detail{ - font-weight: 500; font-size: 27rpx; color: #666666; padding-right: 40rpx; diff --git a/subPackages/user/myAddressAdd.vue b/subPackages/user/myAddressAdd.vue index 4a45460..67b7403 100644 --- a/subPackages/user/myAddressAdd.vue +++ b/subPackages/user/myAddressAdd.vue @@ -27,7 +27,7 @@ 设为默认: - + @@ -351,8 +351,9 @@ border: 0; background-color: transparent; line-height: 34rpx; - font-size: 34rpx; + font-size: 31rpx; text-align: right; + font-weight: 500; } .list-item-input input::placeholder { diff --git a/subPackages/user/myContactsAdd.vue b/subPackages/user/myContactsAdd.vue index 3ecdde8..becb04b 100644 --- a/subPackages/user/myContactsAdd.vue +++ b/subPackages/user/myContactsAdd.vue @@ -240,8 +240,9 @@ border: 0; background-color: transparent; line-height: 34rpx; - font-size: 34rpx; + font-size: 31rpx; text-align: right; + font-weight: 500; } input::placeholder { From 62a04f860ebc22b02a7751bbb8ba19d723845532 Mon Sep 17 00:00:00 2001 From: chenkainan Date: Thu, 7 Nov 2024 09:11:12 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- subPackages/user/myAddressAdd.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/subPackages/user/myAddressAdd.vue b/subPackages/user/myAddressAdd.vue index 67b7403..b3dc06a 100644 --- a/subPackages/user/myAddressAdd.vue +++ b/subPackages/user/myAddressAdd.vue @@ -12,10 +12,10 @@ 选择地区: - + - From 79ee1a9e749dd38d9b3f20738272b3fef71cb679 Mon Sep 17 00:00:00 2001 From: chenkainan Date: Fri, 8 Nov 2024 15:02:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=AF=84=E4=BB=B7=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 12 + static/js/CommonFunction.js | 27 ++- subPackages/order/commentList.vue | 349 ++++++++++++++++++++++++++++ subPackages/order/detail.vue | 17 ++ subPackages/order/writeComment.vue | 289 +++++++++++++++++++++++ subPackages/ticketBooking/order.vue | 5 +- 6 files changed, 695 insertions(+), 4 deletions(-) create mode 100644 subPackages/order/commentList.vue create mode 100644 subPackages/order/writeComment.vue diff --git a/pages.json b/pages.json index c71cc4b..507c667 100644 --- a/pages.json +++ b/pages.json @@ -267,6 +267,12 @@ "navigationStyle": "custom" } }, + { + "path": "order/writeComment", + "style": { + "navigationBarTitleText": "填写评价" + } + }, { "path": "user/bindTel", "style": { @@ -351,6 +357,12 @@ "navigationBarTitleText": "游踪指南", "navigationStyle": "custom" } + }, + { + "path": "order/commentList", + "style": { + "navigationBarTitleText": "用户评价" + } } ] }], diff --git a/static/js/CommonFunction.js b/static/js/CommonFunction.js index 46e8e72..5ff37f0 100644 --- a/static/js/CommonFunction.js +++ b/static/js/CommonFunction.js @@ -283,7 +283,28 @@ Vue.prototype.goDetailByType= function(item){ url: `${detailData.url}?id=${(['ticket','hotel'].includes(detailData.genre)?item.scenic_id:item.id)}` }) } - - - } + +// 是否接收订阅消息 +Vue.prototype.getSubscribeMessage = () => { + const templateIds = [ + // 退款成功通知 + 'hRZoiEES2BWtKb6Xgsnn8khLQH9un5j_11qu0bwlhfE', + // 订单核销通知 + // '7D-JP7o0nQ_NiQk2w8mBs8jdT1_7ofvyBN-G9NLY2Zk', + // 订单支付成功通知 + // '6cHez9KDlCDp1_nWUlUSV7qEaahIQWmYVlOCE-J6ODQ', + // 出票失败提醒 + // 'G-N85zK2gPwgTRZWQrtHZo_-5TFcdAqBxSk4qsqcvVc', + // 出票结果通知 + 'YyTCUIYBnrj9CyKks8cOjNX_Rk8a4yVdswMP-zXVbhc' + ] + uni.requestSubscribeMessage({ + tmplIds: templateIds, + complete (res) { + uni.navigateTo({ + url: '/subPackages/order/trades' + }) + } + }) +} \ No newline at end of file diff --git a/subPackages/order/commentList.vue b/subPackages/order/commentList.vue new file mode 100644 index 0000000..1cddc55 --- /dev/null +++ b/subPackages/order/commentList.vue @@ -0,0 +1,349 @@ + + + + + diff --git a/subPackages/order/detail.vue b/subPackages/order/detail.vue index 90f129c..3691c61 100644 --- a/subPackages/order/detail.vue +++ b/subPackages/order/detail.vue @@ -382,6 +382,10 @@ 关闭订单 + + + 立即评价 + index ? 'star-seld.png' : 'star.png')" + v-for="(item,index) in 5" :key="index" @click="changeStar(item)" class="starImg"/> + --> + +