From 334b857b398865dc9e1cd223109ecf0b8c30f8a8 Mon Sep 17 00:00:00 2001 From: liuyuan <582976274@qq.com> Date: Tue, 8 Jul 2025 14:19:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=8C=E6=89=8B=E6=9C=BA=E5=8F=B7=E7=A0=81=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E5=8F=B0=E6=B9=BE=E9=A6=99=E6=B8=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/baseUrl.js | 1 + manifest.json | 4 +- .../component/commonComponents/anchorLink.vue | 2 +- .../commonComponents/orderSubmit.vue | 11 +- pages/curriculum/order/index.vue | 148 +++++++++++++++++- pages/detail/orderLCont.vue | 2 +- pages/goods/index.vue | 5 +- pages/goods/order.vue | 68 ++------ pages/goods/shopping.vue | 5 +- uni_modules/uni-scss/theme.scss | 2 +- .../components/uni-section/uni-section.vue | 2 +- .../uview-ui/components/u-dropdown/props.js | 2 +- .../uview-ui/libs/config/props/slider.js | 2 +- .../uview-ui/libs/config/props/switch.js | 2 +- 14 files changed, 175 insertions(+), 81 deletions(-) diff --git a/config/baseUrl.js b/config/baseUrl.js index 66edf5c..f1901ec 100644 --- a/config/baseUrl.js +++ b/config/baseUrl.js @@ -7,6 +7,7 @@ if (process.env.NODE_ENV === 'development') { } else if (process.env.NODE_ENV === 'production') { //baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川 baseUrl = "https://api.nuttyreading.com/"; //线上正式 + //baseUrl = "https://testapi.nuttyreading.com/"; //线上正式 } const courtConfig = { //微信公众号APPID diff --git a/manifest.json b/manifest.json index 8f89498..24389a3 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "心灵空间", "appid" : "__UNI__BBBDFD2", "description" : "心灵空间", - "versionName" : "1.0.32", - "versionCode" : 1032, + "versionName" : "1.0.33", + "versionCode" : 1033, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages/component/commonComponents/anchorLink.vue b/pages/component/commonComponents/anchorLink.vue index a408295..08019ec 100644 --- a/pages/component/commonComponents/anchorLink.vue +++ b/pages/component/commonComponents/anchorLink.vue @@ -533,7 +533,7 @@ .section_content_progress { background: initial; - padding: 0 15rpx; + padding: 0 20rpx; } .content_result { diff --git a/pages/component/commonComponents/orderSubmit.vue b/pages/component/commonComponents/orderSubmit.vue index 6e02bf3..51db50c 100644 --- a/pages/component/commonComponents/orderSubmit.vue +++ b/pages/component/commonComponents/orderSubmit.vue @@ -1123,21 +1123,14 @@ }, ]; } - if ( - this.goodsDataList[0].activityPrice && - this.goodsDataList[0].activityPrice > 0 - ) { + if (this.goodsDataList.some(item => item.activityPrice && item.activityPrice > 0)) { this.priceBreakdownList.push({ text: "活动立减", imgUrl: "", type: 5, }); } - if ( - this.goodsDataList[0].isVipPrice && - this.goodsDataList[0].vipPrice && - this.goodsDataList[0].vipPrice > 0 - ) { + if (this.goodsDataList.some(item => item.isVipPrice==1 && item.vipPrice && item.vipPrice > 0)) { this.priceBreakdownList.push({ text: "VIP专享立减", imgUrl: "", diff --git a/pages/curriculum/order/index.vue b/pages/curriculum/order/index.vue index 24820d3..db5e9f1 100644 --- a/pages/curriculum/order/index.vue +++ b/pages/curriculum/order/index.vue @@ -170,6 +170,73 @@ + + + + + + + + + VIP优惠 + + + + {{ item.productName }} + + + ￥{{ item.vipPrice.toFixed(2) }} + ￥{{ Number(item.price) }} + + + + ￥{{ item.activityPrice }} + ￥{{ Number(item.price)}} + + + ￥{{ Number(item.price) }} + + + + + @@ -297,6 +364,7 @@ fuduId: null, showNewPayBtn: [], //复读状态 newPaymentProList: [], //复读列表数据 + tjProList: [], //相关书籍 }; }, onLoad(options) { @@ -677,6 +745,15 @@ }; } + if ( + res.data.shopProductList && + res.data.shopProductList.length > 0 + ) { + this.tjProList = res.data.shopProductList; + } else { + this.tjProList = []; + } + //获取的数据解析 that.removeImagesFromHTML(); @@ -686,6 +763,16 @@ that.$forceUpdate(); }); }, + //相关书籍跳转 + goToGoodsList(data) { + if (data.delFlag == -1) { + this.$commonJS.showToast("商品已下架"); + } else { + uni.navigateTo({ + url: `/pages/goods/index?isMiaosha=1&id=${data.productId}`, + }); + } + }, }, onBackPress() { // #ifdef APP-PLUS @@ -709,12 +796,6 @@ } } - .scroll-view_H { - background-color: #fff; - white-space: nowrap; - padding: 10rpx; - } - .contentBox { height: calc(100% - 50px); @@ -1492,4 +1573,59 @@ max-height: 48px; height: auto; } + + .linkPro { + margin-top: 10rpx; + + .more { + font-size: 24rpx; + color: #666; + } + + .supermarketBox{ + background: #fff; + border-radius: 4px; + box-shadow: 0px 0px 10px 0px #a7bbe4; + } + } + .scroll-view_H { + white-space: nowrap; + padding: 20rpx 10rpx; + margin-top: 12rpx; + + .item { + padding: 10rpx; + overflow: hidden; + display: inline-block; + padding-bottom: 0; + width: 210rpx !important; + margin-right: 8rpx; + border-radius: 10rpx; + + image { + display: block; + width: 100%; + height: 260rpx; + } + + .name { + display: block; + margin-top: 2rpx; + color: #666; + font-size: 28rpx; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + } + } + /deep/.uni-section-header__decoration{ + width: 14px; + height: 34px; + } + /deep/.distraction{ + font-size: 32rpx !important; + color: #294a97 !important; + font-weight: bold; + } \ No newline at end of file diff --git a/pages/detail/orderLCont.vue b/pages/detail/orderLCont.vue index cdbbd1f..7464b57 100644 --- a/pages/detail/orderLCont.vue +++ b/pages/detail/orderLCont.vue @@ -1002,7 +1002,7 @@ export default { this.$commonJS.showToast("商品已下架"); } else { uni.navigateTo({ - url: `/pages/goods/index?id=${id}`, + url: `/pages/goods/index?isMiaosha=1&id=${id}`, }); } }, diff --git a/pages/goods/index.vue b/pages/goods/index.vue index 669cba8..9b1290f 100644 --- a/pages/goods/index.vue +++ b/pages/goods/index.vue @@ -454,7 +454,7 @@ this.$refs.commonSelectGoods.open(); }, //点击下单按钮 - onHandleClickBuy() { + onHandleClickBuy(e) { if(this.buttonType==0){ //如果是加入购物车 console.log('剩余', this.selectGoodsData.productStock) if(this.selectGoodsData.productStock==0){ @@ -476,7 +476,10 @@ productImages: this.selectGoodsData.productImages, productId: this.selectGoodsData.productId, productName: this.selectGoodsData.productName, + activityPrice: this.selectGoodsData.activityPrice, + price: this.selectGoodsData.price, goodsType: this.selectGoodsData.goodsType, + productAmount: 1, }], typeId: 0 }); diff --git a/pages/goods/order.vue b/pages/goods/order.vue index f7a19b9..80d8693 100644 --- a/pages/goods/order.vue +++ b/pages/goods/order.vue @@ -32,41 +32,18 @@ + + @@ -164,13 +128,10 @@ export default { //复读订单 this.pageType = "fudu"; this.showNumber = true; - await this.getFuduDataInfo(); } else { //普通 - this.pageType = "goods"; - await this.getGoodsDataInfo(); } @@ -283,7 +244,6 @@ export default { this.goodsDataList = res.productList.filter( (e) => this.options.goods[0].productName == e.productName ); - }); }, @@ -333,8 +293,6 @@ export default { }); this.goodsDataList = res.shopProductList; - - console.log('data-data', this.goodsDataList) }); }, }, diff --git a/pages/goods/shopping.vue b/pages/goods/shopping.vue index 2dc90e2..768826d 100644 --- a/pages/goods/shopping.vue +++ b/pages/goods/shopping.vue @@ -9,7 +9,7 @@ VIP优惠 + style="position: absolute;z-index: 1;top: 4px;left: 0px; text-align: center;font-size: 18rpx;background-color: #f94f04;color: #fff; border-radius:4px; padding:2px 4px;line-height: 14px;">VIP优惠 @@ -236,6 +236,8 @@ productName: item.productName, goodsType: item.goodsType, productAmount: item.productAmount, + price: item.price, + activityPrice: item.activityPrice, }) } }) @@ -326,6 +328,7 @@ justify-content: space-between; position: fixed; bottom: 0; + z-index: 9; .selectAll { diff --git a/uni_modules/uni-scss/theme.scss b/uni_modules/uni-scss/theme.scss index 80ee62f..c34c1dc 100644 --- a/uni_modules/uni-scss/theme.scss +++ b/uni_modules/uni-scss/theme.scss @@ -3,7 +3,7 @@ $uni-space-root: 2; // 边框半径默认值 $uni-radius-root:5px; // 主色 -$uni-primary: #2979ff; +$uni-primary: #294a97; // 辅助色 $uni-success: #4cd964; // 警告色 diff --git a/uni_modules/uni-section/components/uni-section/uni-section.vue b/uni_modules/uni-section/components/uni-section/uni-section.vue index 9a52e0b..e842f60 100644 --- a/uni_modules/uni-section/components/uni-section/uni-section.vue +++ b/uni_modules/uni-section/components/uni-section/uni-section.vue @@ -100,7 +100,7 @@ }