From 9b9849bf7248a1eedea0c2b49002efa586657d5d Mon Sep 17 00:00:00 2001 From: "@fawn-nine" <1271023382@qq.com> Date: Fri, 18 Oct 2024 15:16:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/bookShop/orderList.vue | 5 +- pages/course/courseDetail.vue | 53 +- pages/goods/index/index.vue | 3876 +++++++++++++++--------------- pages/goods/order/index.vue | 2 +- pages/mine/wallet/couponList.vue | 285 ++- 5 files changed, 2242 insertions(+), 1979 deletions(-) diff --git a/pages/bookShop/orderList.vue b/pages/bookShop/orderList.vue index 66510f9..ac10980 100644 --- a/pages/bookShop/orderList.vue +++ b/pages/bookShop/orderList.vue @@ -1001,6 +1001,7 @@ export default { }, // 取消订单 canceOrder(item) { + console.log('item.orderSn',item); uni.showModal({ title: "提示", content: "确定要取消订单吗？", @@ -1011,7 +1012,9 @@ export default { success: (res) => { if (res.confirm) { this.$http - .get("book/buyOrder/cancelOrder?orderSn=" + item.orderSn) + .post( + "book/buyOrder/appDelete?orderId=" + item.orderId + ) .then((res) => { if (res.code == 0) { uni.showToast({ diff --git a/pages/course/courseDetail.vue b/pages/course/courseDetail.vue index ff1852f..89fd435 100644 --- a/pages/course/courseDetail.vue +++ b/pages/course/courseDetail.vue @@ -799,7 +799,7 @@ .then(async (res) => { console.log("res at line 493:", res); if (res.code == 0) { - this.getCourseDescriptionData(); + this.getCourseDescriptionData(v); // this.$commonJS.showToast(""); } this.$forceUpdate(); @@ -812,32 +812,35 @@ showCancel:false }) }else { - this.$http - .request({ - url: this.urlList.goodsList, - method: "POST", - data: { - id: v.id, - }, - header: { - //默认 无 说明：请求头 - "Content-Type": "application/json", - }, - }) - .then(async (res) => { - if (res.productList.length > 0) { - this.goodsList = res.productList; - this.selectGoodsData = this.goodsList[0]; - this.$refs.commonSelectGoods.open(); - this.show = true; - } else { - this.$commonJS.showToast("此课程暂无购买方式"); - } - - this.$forceUpdate(); - }) + this.getCourseDescriptionData(v); } }, + getCourseDescriptionData(v){ + this.$http + .request({ + url: this.urlList.goodsList, + method: "POST", + data: { + id: v.id, + }, + header: { + //默认 无 说明：请求头 + "Content-Type": "application/json", + }, + }) + .then(async (res) => { + if (res.productList.length > 0) { + this.goodsList = res.productList; + this.selectGoodsData = this.goodsList[0]; + this.$refs.commonSelectGoods.open(); + this.show = true; + } else { + this.$commonJS.showToast("此课程暂无购买方式"); + } + + this.$forceUpdate(); + }) + }, getUserInfo() { this.$http.post("common/user/getUserInfo").then((res) => { console.log("res at line 505:", res); diff --git a/pages/goods/index/index.vue b/pages/goods/index/index.vue index 4471507..84cf914 100644 --- a/pages/goods/index/index.vue +++ b/pages/goods/index/index.vue @@ -1,208 +1,127 @@ + + + + + 商品规格 + - - - - - - - 商品规格 - - 共{{ goodsList.length }}种商品可选择 - - - - - - - - - - - 书籍信息 - + + + + + + + 书籍信息 + + - - + + + + + + + 课程信息 + + - - + + + - - - + + - - - + + + - - + - - - - - - + + - - - - - 相关课程 - - - - - - + @import '@/style/mixin.scss'; + + .tanchu { + padding: 0 30rpx 40rpx 30rpx; + position: relative; + // max-height: 60vh; + // overflow-y: scroll; + + .dp_title { + font-size: 32rpx; + margin-bottom: 50rpx; + color: #555; + text-align: center; + font-weight: bold; + } + + .dp_add { + position: absolute; + top: 40rpx; + right: 30rpx; + font-size: 22rpx; + background-color: #fd6004; + color: #fff; + border-radius: 10rpx; + padding: 5rpx 10rpx; + + .u-icon { + display: inline-block; + margin-right: 5rpx; + } + } + + .addressItem { + border: 2px dashed #d9d9d9; + border-radius: 10rpx; + width: 100%; + display: flex; + padding: 20rpx 10rpx; + margin: 25rpx 0 0 0; + align-items: center; + background-color: #fff; + + .addrContent { + margin-left: 40rpx; + flex: 1; + + .addrContentTop { + display: flex; + align-items: flex-end; + margin: 0 0 15rpx 0; + position: relative; + + .userName { + font-size: 35rpx; + font-weight: bold; + margin-right: 30rpx; + } + + .userTel { + font-size: 25rpx; + color: #888; + } + + .userMoren { + border: 1px solid #fd6004; + color: #fd6004; + padding: 3rpx 10rpx; + font-size: 22rpx; + border-radius: 10rpx; + margin: 0 0 0 20rpx; + } + + + .chooseCheck { + position: absolute; + top: 3rpx; + right: 6rpx; + } + } + + .addrContentBottom { + font-size: 32rpx; + } + } + } + + + .addressItem.addItem_style { + border-color: #fd6004; + } + + .youhuiItem { + border: 1px solid #d9d9d9; + border-radius: 10rpx; + width: 100%; + display: flex; + padding: 20rpx 10rpx; + margin: 25rpx 0 0 0; + align-items: center; + background-color: #fff; + font-size: 30rpx; + } + + .youhuiItem>view { + float: left; + } + + .youhuiItem.youItem_style { + border-color: #fd6004; + } + } + + .u-grid-list { + // height: 40rpx; + } + + .searchList { + .item { + font-size: 28rpx; + padding: 20rpx; + border-bottom: 1px solid #dadbde; + } + } + + .scroll-view_H { + background-color: #fff; + white-space: nowrap; + padding: 10rpx; + } + + .contentBox { + height: calc(100% - 50px); + + .statusList { + padding: 10rpx; + box-sizing: border-box; + justify-content: space-between; + + text { + text-align: center; + display: inline-block; + width: 32%; + padding: 20rpx 0; + font-size: 34rpx; + border-radius: 10rpx; + } + + .cur { + background-color: $themeColor; + color: #fff; + box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); + } + } + + .twoCateList { + font-size: 28rpx; + margin-top: 20rpx; + + .grid-text { + padding: 10rpx 0rpx; + text-align: center; + } + + .cur { + color: $themeColor; + } + + // .u-grid-list{border: 0.5px solid #dadbde;} + } + + .dataList { + font-size: 26rpx; + padding-bottom: 40rpx; + // margin-top: 20rpx; + // padding: 32rpx 0rpx; + border-radius: 10rpx; + background-color: #fff; + box-sizing: border-box; + + .JFtitleItem { + background-color: #ffffff; + padding: 20rpx 10rpx; + width: 100%; + border-bottom: 0.5px solid #f8f9fa; + } + + .wmzhimg { + width: 220rpx; + height: 220rpx; + } + } + } + + .search_box { + margin: 0 auto; + overflow: hidden; + align-items: center; + width: calc(100% - 10px); + margin-top: 20rpx; + margin-bottom: 20rpx; + + .search { + height: 56upx; + display: flex; + width: 86%; + margin: 0 auto; + align-items: center; + padding: 0upx 40upx; + background-color: #fff; + border-radius: 20upx; + box-shadow: 0 0px 10px 1px #258feb33; + } + + .prompt { + color: #838383; + font-size: 24rpx; + } + + .icon_search { + background-image: url("@/static/icon/map_ic_search.png"); + background-position: center center; + background-repeat: no-repeat; + background-size: cover; + width: 36upx; + height: 36upx; + margin-right: 20upx; + } + } + + .flexbox { + display: flex; + } + + .uni-modal .uni-modal__bd { + text-align: left; + } + + .limiTy { + font-size: 28rpx; + line-height: 46rpx; + } + + .chImage { + height: 100rpx; + } + + .dataList { + height: 100%; + } + + .titleList2 { + height: calc(100% - 150rpx); + } + + .priceDetail { + height: calc(100% - 180rpx) !important; + padding: 0rpx 0; + box-sizing: border-box; + } + + .componentPage { + height: calc(100% - 90rpx) !important; + } + + .dateReminder { + width: 100%; + font-size: 24rpx; + text-align: right; + line-height: 40rpx; + } + + .fdButtonBox { + border: 1rpx solid $themeColor; + background-color: $themeColor; + color: #fff; + // width: 100%; + float: right; + padding: 4rpx 14rpx; + font-size: 24rpx; + font-weight: 500; + line-height: 30rpx; + border-radius: 10rpx; + box-sizing: border-box; + + // margin-top: 20rpx; + // display: flex; + // align-items: center; + } + + .headImage { + // height: 400rpx !important; + } + + .commonDetailPage { + padding-bottom: 150rpx !important; + background-color: #f5f5f5 !important; + } + + .goods_box { + background-color: #fff; + // margin-top: 20rpx; + // padding: 40rpx 30rpx; + box-sizing: border-box; + width: 100%; + + .curriulum_title_box { + width: calc(100%) !important; + padding-bottom: 20rpx; + background-color: #fff; + + .curriulum_title { + width: calc(100%); + font-weight: 600; + font-size: 34rpx; + // line-height: 40rpx; + // display: flex; + // align-items: center; + margin-top: 80rpx; + margin-bottom: 0rpx; + // padding: 20rpx; + box-sizing: border-box; + } + } + } + + .dataList { + background-color: #fff !important; + padding: 0 30rpx 40rpx !important; + box-sizing: border-box; + } + + /deep/.titleItem { + // width: calc(100% - 120rpx) !important; + } + + /deep/.scroll-view-item:nth-child(2n-1) { + background-color: transparent !important; + } + + .dataList { + height: auto !important; + } + + .small_class_teaching_box { + padding-top: 20rpx; + width: 100%; + margin-top: 20rpx; + background: #fff; + + .small_class_teaching_top { + padding: 20rpx 20rpx 0 10rpx; + box-sizing: border-box; + display: flex; + align-items: center; + justify-content: space-between; + // background: #EDFCF7; + color: #8f8e8e; + + // box-shadow: 0px 0px 6rpx 0px #E9DCCC; + .icon1 { + width: 50rpx; + height: 50rpx; + } + + .small_class_teaching_top_left { + display: flex; + align-items: center; + color: #018f89; + + font-family: MicrosoftYaHei; + } + } + + .small_class_teaching_content { + margin-top: 20rpx; + // background: #EDFCF7; + padding-bottom: 10rpx; + + .top { + padding: 20rpx 20rpx; + box-sizing: border-box; + display: flex; + align-items: center; + justify-content: space-between; + border-bottom: 4rpx solid #fff; + + .top_item { + width: 23%; + font-family: PangMenZhengDaoBiaoTiTiMianFeiBan; + font-weight: normal; + font-size: 34rpx; + color: #018f89; + line-height: 80rpx; + background: #cef8ea; + text-align: center; + border-radius: 10rpx; + box-shadow: 0px 0px 6rpx 0px #E9DCCC; + } + } + + .schedule { + width: 100%; + overflow: hidden; + padding: 20rpx 20rpx; + box-sizing: border-box; + align-items: center; + color: #018f89; + + font-family: MicrosoftYaHei; + + .icon_box { + width: 100%; + display: flex; + align-items: center; + margin-bottom: 0rpx; + + .icon1 { + width: 50rpx; + height: 50rpx; + margin-right: 10rpx; + } + } + + .progress_box { + width: 100%; + display: flex; + align-items: center; + position: relative; + + .progress_icon { + width: calc(100% - 240rpx); + } + + .icon1 { + width: 60rpx; + height: 60rpx; + margin: 0 20rpx; + } + + .icon2 { + width: 140rpx; + height: 100rpx; + position: absolute; + right: 0; + // margin-top: -20rpx; + } + } + } + } + } + + .related_courses_box { + background-color: #fff; + + .small_class_teaching_content { + padding: 10rpx 20rpx; + box-sizing: border-box; + } + } + + .related_courses_name { + display: inline-block; + width: calc(100% - 0rpx) !important; + + .aui-text-danger { + display: inline-block; + float: right; + } + } + + .original_price { + font-size: 28rpx !important; + font-weight: 500; + color: #999 !important; + white-space: nowrap; + text-decoration: line-through; + float: left; + margin-top: 6rpx; + } + + .price { + font-size: 48rpx; + font-weight: 700; + float: left; + margin-right: 10rpx; + // font-family: PangMenZhengDaoBiaoTiTiMianFeiBan; + } + + .price_box { + width: 100%; + overflow: hidden; + } + + .commonTags { + margin-right: 20rpx; + margin-top: -5rpx !important; + } + + .sales_number { + text-decoration: none; + color: #b0b0b0; + font-weight: 500; + } + + .miaosha_box { + overflow: hidden; + + .countdown { + display: flex; + align-items: center; + color: #fff; + font-size: 24rpx; + } + + .price_left { + width: calc(100% - 300rpx); + float: left; + } + + .price_box { + .price { + color: #fff !important; + } + + .original_price { + color: #e4dede !important; + font-weight: 500; + margin-left: 20rpx; + font-size: 26rpx !important; + } + + .sales_number { + display: block; + width: 100%; + color: #fff !important; + font-weight: 500; + padding-left: 10rpx; + margin-left: 0rpx; + font-size: 24rpx !important; + } + + padding: 30rpx 20rpx 30rpx; + background: linear-gradient(to right, #ff2701, #fd8d024d); + // height: 100rpx; + } + + .curriulum_title { + padding: 20rpx 40rpx; + margin-top: 20rpx !important; + } + } + + .normal_box { + padding: 40rpx 30rpx; + } + + .xianshimaiosha_box { + width: 300rpx; + height: 100%; + float: right; + } + + .xianshimaiosha { + display: inline-block; + width: 100%; + line-height: 100rpx; + font-family: PangMenZhengDaoBiaoTiTiMianFeiBan; + font-weight: blod; + font-size: 64rpx; + color: red; + text-align: right; + padding-right: 20rpx; + box-sizing: border-box; + font-style: italic; + } + + // .common_curriculum_list{ + + // } + /deep/.common_curriculum_list { + margin-top: 20rpx; + padding: 20rpx 20rpx 20rpx; + + .content_item { + width: 100% !important; + margin-bottom: 0 !important; + padding: 15rpx 0 0rpx; + border-top: 1rpx solid #f1f0f0; + // height: 160rpx; + + .book_image { + width: 60rpx !important; + height: 60rpx !important; + float: left !important; + background-color: #f5f5f5; + } + + .common_curriculum_item { + width: calc(100% - 88rpx); + float: right; + display: block !important; + + // overflow: hidden; + + .related_courses_name { + width: 100% !important; + } + } + } + + .content_item:nth-child(1) { + border-top: none !important; + } + } + + /deep/.common_section { + padding: 0 !important; + padding-bottom: 20rpx !important; + } + + .goods_detail_list_title { + display: flex; + align-items: center; + justify-content: space-between; + + .left { + display: flex; + align-items: center; + } + + .right { + font-size: 24rpx; + font-weight: 500 !important; + color: #333; + font-family: none; + } + + // justify-content: space-between; + } + + .commonPageContentBox { + height: auto !important; + } + + .goods_item { + overflow: hidden; + display: flex; + align-items: center; + justify-content: space-between; + // margin-bottom: 20rpx; + padding: 10rpx 20rpx; + border: 2rpx solid #fff; + border-radius: 10rpx; + } + + .title { + box-sizing: border-box; + // font-weight: bold; + margin-bottom: 40rpx; + padding-left: 20rpx; + } + + .image_box { + width: 70rpx; + height: 70rpx; + float: left; + background-color: #f5f5f5; + } + + .goods_image { + width: 100%; + height: 100%; + } + + .goods_info { + width: calc(100%); + // padding: 10rpx 20rpx; + box-sizing: border-box; + // height: 100rpx; + display: flex; + align-items: center; + justify-content: space-between; + float: left; + + .name { + font-size: 26rpx; + // font-weight: 600; + color: #333; + } + + .price { + font-size: 26rpx; + color: #aaa; + } + } + + .isSelectGoods { + color: $themeColor !important; + + .name { + color: $themeColor !important; + } + + .price { + color: $themeColor !important; + } + + border: 2rpx solid $themeColor; + border-radius: 10rpx; + } + + /deep/.list_item { + // border-bottom: none; + padding: 10rpx 0 !important; + padding-right: 0 !important; + } + + + .parameterList { + /deep/.list_item { + // border-bottom: none; + padding: 0 !important; + border: none !important; + box-shadow: none !important; + } + + .parameter_box { + padding: 20rpx 0; + } + + .goods_item { + padding-top: 5rpx !important; + padding-bottom: 5rpx !important; + } + } + + .parameter_info_box { + padding: 0 20rpx; + } + + .parameter_info { + /deep/.list_item { + // border-bottom: none; + padding: 0 !important; + border: none !important; + box-shadow: none !important; + } + + .goods_item { + border: none !important; + } + } + + .goodsList { + .image_box { + width: 80rpx; + height: 80rpx; + float: left; + background-color: #f5f5f5; + } + } + + /deep/.u-popup__content { + background-color: transparent !important; + } + + /deep/.u-popup__content__close { + color: #fff !important; + } + + .title_box { + display: flex; + align-items: center; + justify-content: space-between; + padding-left: 0; + + .title_price { + color: #ef1224; + font-size: 40rpx; + font-weight: 700; + } + } + + .title_list { + margin-bottom: 20rpx; + } + + .book_box { + .image_box { + width: 160rpx; + height: 160rpx; + } + + .goods_info { + display: block; + } + } + \ No newline at end of file diff --git a/pages/goods/order/index.vue b/pages/goods/order/index.vue index 37ea29e..92d4ee3 100644 --- a/pages/goods/order/index.vue +++ b/pages/goods/order/index.vue @@ -149,7 +149,7 @@