From 8b025eb6d58fc9a6cd25ceb90ab80a2a4df232cf Mon Sep 17 00:00:00 2001 From: jiazhipeng Date: Thu, 21 Aug 2025 15:26:12 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E7=89=B9=E4=BA=A7=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/info/postProductInfo/index.js | 2 +- pages/info/postProductInfo/index.wxml | 5 +- pages/info/postProductInfo/index.wxss | 5 +- pages/info/sceneProductInfo/index.js | 17 ++++++ project.private.config.json | 7 +++ utils/util.js | 74 +++++++++++++++++++++++++++ 6 files changed, 104 insertions(+), 6 deletions(-) diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js index f320a6e..b7d518b 100644 --- a/pages/info/postProductInfo/index.js +++ b/pages/info/postProductInfo/index.js @@ -11,7 +11,7 @@ Page({ * 页面的初始数据 */ data: { - autoPlay: true, + autoPlay: false, fixed: false, type: 1, top: 0, diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml index 7f02116..c852edb 100644 --- a/pages/info/postProductInfo/index.wxml +++ b/pages/info/postProductInfo/index.wxml @@ -3,10 +3,11 @@ - + - + diff --git a/pages/info/postProductInfo/index.wxss b/pages/info/postProductInfo/index.wxss index ff73fe6..89f1a60 100644 --- a/pages/info/postProductInfo/index.wxss +++ b/pages/info/postProductInfo/index.wxss @@ -5,12 +5,12 @@ page { .swiper { width: 100%; - height: 420rpx; + height: 750rpx; } .swiper image, .swiper video { - height: 420rpx; + height: 750rpx; display: block; width: 100%; } @@ -20,7 +20,6 @@ page { background: white; position: relative; z-index: 1; - margin-top: -20rpx; padding: 20rpx 40rpx; } diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js index 38c3acb..b82804d 100644 --- a/pages/info/sceneProductInfo/index.js +++ b/pages/info/sceneProductInfo/index.js @@ -826,6 +826,12 @@ Page({ } console.log(app.globalData.product); console.log(ticket_type); + + // todo 判断是否组合产品 + // this.getComposeSku() + // return + + if (ticket_type != 2) { let today = util.formatDate(new Date()), end_date = util.formatDate(new Date(new Date().getTime() + 30 * 24 * 60 * 60 * 1000)); @@ -1029,6 +1035,17 @@ Page({ }) }, + // 组合产品获取购买的sku + getComposeSku () { + commonApi.user_post("product/get_sku_compose_list", { + sku_id: "190720" + }).then(res => { + if (res&&Array.isArray(res.data)&&res.data.length>0) { + util.orderByShoppingCart(res.data,app) + } + }) + }, + /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/project.private.config.json b/project.private.config.json index 3034e43..b247163 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -6,6 +6,13 @@ "condition": { "miniprogram": { "list": [ + { + "name": "pages/info/postProductInfo/index", + "pathName": "pages/info/postProductInfo/index", + "query": "id=108419", + "launchMode": "default", + "scene": null + }, { "name": "pages/pbService/web/index", "pathName": "pages/pbService/web/index", diff --git a/utils/util.js b/utils/util.js index 80d287f..1609034 100644 --- a/utils/util.js +++ b/utils/util.js @@ -561,6 +561,79 @@ const detailPagePoint = function (url, res) { } +// app 要传进来 util 获取不到 +const orderByShoppingCart = function (listData, app) { + let productType,flag,isCar; + commonApi.user_post('wx/get_user_keep', { + jumpurl: '/pages/user/cartlist/list', + title: '购物车', + type: 'mini' + }).then(res => { + if (res.data.subscribe == 0) { + this.setData({ + wxqrcode: res.data.qrcode, + showQrCode: true + }) + } else { + app.globalData.couponInfo = null; + let list = listData, product = [], product1 = [] + list.map(item => { + // item.product.type="post"; + if (item.product.type == 'post') { + product.push({ + product: item.product, + sku: item.sku, + productNum: item.num + }) + } else { + product1.push(item) + app.globalData.list = product1 + } + if (item.product.type.includes('post')) { + productType = 'post' + } + }) + if (product.length == 0 && product1.length == 0) { + wx.showToast({ + title: '请先选择产品', + icon: 'none' + }) + return; + } + if (product.length > 0 && product1.length > 0) { + flag = "mix"; + isCar = "multiple" + } + if (product1.length > 1) { + isCar = "multiple" + } else { + isCar = "single" + } + console.log(product1,'product1'); + + app.globalData.listName = null + if (product1.length>0) { + app.globalData.listName = 'car' + } + + app.globalData.postProduct = product; + if (app.globalData.list) { + app.globalData.index = 0 + app.globalData.product = app.globalData.list[app.globalData.index] + } + if (productType == 'post') { + wx.navigateTo({ + url: '/pages/order/postOrder/index?from=cart&flag=' + flag, + }) + } else { + wx.navigateTo({ + url: '/subPackages/gwcOrder/index?isCar=' + isCar, + }) + } + } + }) +} + module.exports = { formatTime: formatTime, @@ -586,4 +659,5 @@ module.exports = { getGlobalPagePoint: getGlobalPagePoint, clearGlobalPagePoint: clearGlobalPagePoint, detailPagePoint: detailPagePoint, + orderByShoppingCart: orderByShoppingCart, } From f0f9b0e8fdcbbd637faa4d6ea9ae3c970620fe80 Mon Sep 17 00:00:00 2001 From: jiazhipeng Date: Fri, 22 Aug 2025 15:32:37 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E9=82=AE=E5=AF=84=E6=94=B9=E7=89=88?= =?UTF-8?q?=E3=80=81=E7=BB=84=E5=90=88=E4=B8=8B=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/info/postProductInfo/index.wxml | 46 ++++++----- pages/info/postProductInfo/index.wxss | 108 ++++++++++---------------- pages/info/roadInfo/index.js | 16 ++-- pages/info/sceneProductInfo/index.js | 15 ---- pages/order/scene/index.wxml | 6 +- project.config.json | 23 +----- subPackages/gwcOrder/index.wxml | 4 +- utils/util.js | 1 + 8 files changed, 85 insertions(+), 134 deletions(-) diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml index c852edb..b074660 100644 --- a/pages/info/postProductInfo/index.wxml +++ b/pages/info/postProductInfo/index.wxml @@ -2,12 +2,21 @@ + + 1/2 + 视频 + 图片 + 款式 + + + + show-mute-btn="{{true}}" show-background-playback-button="{{false}}" + show-progress="{{false}}"> @@ -25,14 +34,16 @@ - -
-
{{info.price/100}}￥{{info.market_price/100}}
-
已售{{info.sales_number||0}}份
-
- - {{info.title}} - + + + {{info.price/100}}优惠前￥{{info.market_price/100}} + 已售{{info.sales_number>1000?"1000+":(info.sales_number||0)}} + + + + + {{info.title}} + + + + {{item}} - + {{info.scene_name}} @@ -65,15 +81,7 @@ - - {{info.title}} - {{info.subtitle}} - - {{item}} - - ￥{{info.price/100}}起 - - + diff --git a/pages/info/postProductInfo/index.wxss b/pages/info/postProductInfo/index.wxss index 89f1a60..8e4e39d 100644 --- a/pages/info/postProductInfo/index.wxss +++ b/pages/info/postProductInfo/index.wxss @@ -7,89 +7,64 @@ page { width: 100%; height: 750rpx; } - -.swiper image, -.swiper video { +.swiper image,.swiper video { height: 750rpx; display: block; width: 100%; } +.swiper-bottom{ + position: absolute; + /* top: 750rpx; */ + margin-top: 694rpx; + right: 0; + width: fit-content; + height: 56rpx; + line-height: 56rpx; + background: rgba(1, 0, 0, 0.6); + border-radius: 13rpx 0 0 13rpx; + display: flex; + font-weight: 500; + font-size: 24rpx; + color: rgba(255,255,255,0.5); + z-index: 10; + padding: 0 5rpx; + overflow: hidden; +} +.swiper-bottom-item{ + padding: 0 14rpx; +} +.swiper-bottom-item.active{ + color: #fff; +} .top-info { - border-radius: 20rpx 20rpx 0 0; background: white; position: relative; z-index: 1; - padding: 20rpx 40rpx; } .top-info .title { - font-size: 32rpx; - font-weight: 500; - color: #000; -} - -.top-info .subtitle { - color: #666; - font-size: 27rpx; - margin-top: 20rpx; + font-weight: bold; + font-size: 33rpx; + color: #000000; } .tags-box { - margin-top: 10rpx; display: flex; align-items: center; + font-weight: 500; + font-size: 25rpx; color: #0B898E; - font-size: 27rpx; - height: 50rpx; } .tags-box .tag { - position: relative; - line-height: 20rpx; - font-size: 20rpx; - font-weight: 500; - line-height: 50rpx; - margin-right: 10rpx; -} - -.tags-box .tag .line { - content: "1"; - display: block; - font-size: 0; - position: absolute; - left: 0; - right: 0; - background: #DAF3E9; - height: 8rpx; - top: 30rpx; - z-index: -1; -} - -.tags-price { - flex: 1; - text-align: right; - color: #D62828; -} - -.tags-price text:nth-child(1) { - font-size: 27rpx; -} - -.tags-price text:nth-child(2) { - font-size: 40rpx; - font-weight: bold; -} - -.tags-price text:nth-child(3) { - font-size: 20rpx; - color: #999999; - margin-left: 4rpx; -} - -.tags-box .iconfont { - margin-left: 4rpx; - font-size: 24rpx; + margin-top: 27rpx; + height: 40rpx; + line-height: 40rpx; + margin-right: 15rpx; + padding: 0 14rpx; + background: rgba(11, 137, 142, 0.1); + border-radius: 4rpx; } .address-box { @@ -982,8 +957,9 @@ height: 133rpx; .wineScene-price-container { width: 750rpx; height: 100rpx; - background: linear-gradient(-90deg,#FF413B, #FFAB2E); - border-radius: 20rpx 20rpx 0rpx 0rpx; + /* background: linear-gradient(-90deg,#FF413B, #FFAB2E); */ + background: #FD3856; + /* border-radius: 20rpx 20rpx 0rpx 0rpx; */ display: flex; align-items: center; justify-content: space-between; @@ -995,13 +971,13 @@ height: 133rpx; .wineScene-price-container .wineSecne-price { font-weight: bold; - font-size: 36rpx; + font-size: 48rpx; color: #FFFFFF; } .wineScene-price-container .wineSecne-money { font-size: 24rpx; font-weight: 500; - text-decoration-line: line-through; + /* text-decoration-line: line-through; */ padding-left: 14rpx; } .wineScene-price-container .wineSecne-price::before { diff --git a/pages/info/roadInfo/index.js b/pages/info/roadInfo/index.js index 1fab188..e213db5 100644 --- a/pages/info/roadInfo/index.js +++ b/pages/info/roadInfo/index.js @@ -165,11 +165,11 @@ Page({ order: function () { // todo 判断组合产品 // if (this.data.info.is_compose == 1) { - // if (true) { - // // 打开规格弹窗 - // this.setData({skuFlag: true}) - // return - // } + if (true) { + // 打开规格弹窗 + this.setData({skuFlag: true}) + return + } commonApi.user_post('wx/get_user_keep', { @@ -213,11 +213,13 @@ Page({ // 组合产品获取购买的sku getComposeSku () { commonApi.user_post("product/get_sku_compose_list", { - sku_id: "190720" + // sku_id: "190720" + sku_id: "190740" }).then(res => { if (res&&Array.isArray(res.data)&&res.data.length>0) { res.data.forEach(v => { - v.sku.is_compose = 1 + v.sku.is_compose = 1; + v.num = this.data.producNum; }); util.orderByShoppingCart(res.data,app) } diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js index b82804d..5725af7 100644 --- a/pages/info/sceneProductInfo/index.js +++ b/pages/info/sceneProductInfo/index.js @@ -827,10 +827,6 @@ Page({ console.log(app.globalData.product); console.log(ticket_type); - // todo 判断是否组合产品 - // this.getComposeSku() - // return - if (ticket_type != 2) { let today = util.formatDate(new Date()), @@ -1035,17 +1031,6 @@ Page({ }) }, - // 组合产品获取购买的sku - getComposeSku () { - commonApi.user_post("product/get_sku_compose_list", { - sku_id: "190720" - }).then(res => { - if (res&&Array.isArray(res.data)&&res.data.length>0) { - util.orderByShoppingCart(res.data,app) - } - }) - }, - /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml index 06a8275..e674c20 100644 --- a/pages/order/scene/index.wxml +++ b/pages/order/scene/index.wxml @@ -40,10 +40,10 @@ {{product.sku.price/100}} - - + + {{productNum}} - + diff --git a/project.config.json b/project.config.json index 1241058..744f8a8 100644 --- a/project.config.json +++ b/project.config.json @@ -54,60 +54,39 @@ "ignoreUploadUnusedFiles": true }, "compileType": "miniprogram", - "libVersion": "2.14.0", + "libVersion": "3.8.9", "appid": "wx4bb7b6050831f585", "projectname": "%E8%8B%8F%E5%B7%9E%E6%96%87%E6%97%85", "simulatorType": "wechat", "simulatorPluginLibVersion": {}, "condition": { - "search": { - "list": [] - }, - "conversation": { - "list": [] - }, - "plugin": { - "list": [] - }, - "game": { - "currentL": -1, - "list": [] - }, - "gamePlugin": { - "list": [] - }, "miniprogram": { "list": [ { - "id": 0, "name": "pages/user/bindtel/index", "pathName": "pages/user/bindtel/index", "query": "id=0000000000LINELINEINFO18082257199008", "scene": null }, { - "id": 1, "name": "好行", "pathName": "pages/list/haoxing/index", "query": "", "scene": null }, { - "id": 2, "name": "pages/list/activitynew/index", "pathName": "pages/list/activitynew/index", "query": "id=0000000000LINELINEINFO18082257199008", "scene": null }, { - "id": -1, "name": "微旅行", "pathName": "pages/list/minitrip/index", "query": "", "scene": null }, { - "id": -1, "name": "一日游", "pathName": "pages/list/oneday/index", "query": "", diff --git a/subPackages/gwcOrder/index.wxml b/subPackages/gwcOrder/index.wxml index 977d332..a258067 100644 --- a/subPackages/gwcOrder/index.wxml +++ b/subPackages/gwcOrder/index.wxml @@ -16,9 +16,9 @@ {{product && product.isGroup!=1?'购票数量':'预约人数'}} - + {{productNum}} - + diff --git a/utils/util.js b/utils/util.js index 1609034..c441416 100644 --- a/utils/util.js +++ b/utils/util.js @@ -578,6 +578,7 @@ const orderByShoppingCart = function (listData, app) { app.globalData.couponInfo = null; let list = listData, product = [], product1 = [] list.map(item => { + item.num = item.num || 1; // item.product.type="post"; if (item.product.type == 'post') { product.push({ From 08f60a2b1ba69407399b117b563f484891e819ed Mon Sep 17 00:00:00 2001 From: jiazhipeng Date: Fri, 22 Aug 2025 16:39:01 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E7=BB=84=E5=90=88=E4=B8=8B=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 2 +- pages/info/postProductInfo/index.wxml | 6 +++++- pages/info/postProductInfo/index.wxss | 10 ++++++++++ pages/info/roadInfo/index.js | 1 + pages/order/WineSceneOrder/index.js | 1 + pages/order/orderList/index.js | 1 + pages/order/postOrder/index.js | 1 + pages/order/scene/index.js | 1 + pages/order/showOrderNew/index.js | 1 + subPackages/gwcOrder/index.js | 1 + utils/https.js | 4 ++-- 11 files changed, 25 insertions(+), 4 deletions(-) diff --git a/app.js b/app.js index 8f07bc1..4267b37 100644 --- a/app.js +++ b/app.js @@ -38,7 +38,7 @@ App({ // 获取前端配置文件 commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => { let data = JSON.parse(res.data); - data.isTest = data.isTest115? true : false; + data.isTest = data.isTest114? true : false; data.indexSeason = null this.globalData.configJson = data }).then(() => { diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml index b074660..5f260fa 100644 --- a/pages/info/postProductInfo/index.wxml +++ b/pages/info/postProductInfo/index.wxml @@ -40,7 +40,11 @@ 已售{{info.sales_number>1000?"1000+":(info.sales_number||0)}} - + + + 款式选择 + + {{info.title}} @@ -34,20 +24,14 @@ - - - {{info.price/100}}优惠前￥{{info.market_price/100}} - 已售{{info.sales_number>1000?"1000+":(info.sales_number||0)}} - - - - - 款式选择 - - - - {{info.title}} - - - - {{item}} - + {{info.scene_name}} @@ -85,7 +64,15 @@ - + + {{info.title}} + {{info.subtitle}} + + {{item}} + + ￥{{info.price/100}}起 + + diff --git a/pages/info/postProductInfo/index.wxss b/pages/info/postProductInfo/index.wxss index c57475c..ff73fe6 100644 --- a/pages/info/postProductInfo/index.wxss +++ b/pages/info/postProductInfo/index.wxss @@ -5,66 +5,92 @@ page { .swiper { width: 100%; - height: 750rpx; + height: 420rpx; } -.swiper image,.swiper video { - height: 750rpx; + +.swiper image, +.swiper video { + height: 420rpx; display: block; width: 100%; } -.swiper-bottom{ - position: absolute; - /* top: 750rpx; */ - margin-top: 694rpx; - right: 0; - width: fit-content; - height: 56rpx; - line-height: 56rpx; - background: rgba(1, 0, 0, 0.6); - border-radius: 13rpx 0 0 13rpx; - display: flex; - font-weight: 500; - font-size: 24rpx; - color: rgba(255,255,255,0.5); - z-index: 10; - padding: 0 5rpx; - overflow: hidden; -} -.swiper-bottom-item{ - padding: 0 14rpx; -} -.swiper-bottom-item.active{ - color: #fff; -} .top-info { + border-radius: 20rpx 20rpx 0 0; background: white; position: relative; z-index: 1; + margin-top: -20rpx; + padding: 20rpx 40rpx; } .top-info .title { - font-weight: bold; - font-size: 33rpx; - color: #000000; + font-size: 32rpx; + font-weight: 500; + color: #000; +} + +.top-info .subtitle { + color: #666; + font-size: 27rpx; + margin-top: 20rpx; } .tags-box { + margin-top: 10rpx; display: flex; align-items: center; - font-weight: 500; - font-size: 25rpx; color: #0B898E; + font-size: 27rpx; + height: 50rpx; } .tags-box .tag { - margin-top: 27rpx; - height: 40rpx; - line-height: 40rpx; - margin-right: 15rpx; - padding: 0 14rpx; - background: rgba(11, 137, 142, 0.1); - border-radius: 4rpx; + position: relative; + line-height: 20rpx; + font-size: 20rpx; + font-weight: 500; + line-height: 50rpx; + margin-right: 10rpx; +} + +.tags-box .tag .line { + content: "1"; + display: block; + font-size: 0; + position: absolute; + left: 0; + right: 0; + background: #DAF3E9; + height: 8rpx; + top: 30rpx; + z-index: -1; +} + +.tags-price { + flex: 1; + text-align: right; + color: #D62828; +} + +.tags-price text:nth-child(1) { + font-size: 27rpx; +} + +.tags-price text:nth-child(2) { + font-size: 40rpx; + font-weight: bold; +} + +.tags-price text:nth-child(3) { + font-size: 20rpx; + color: #999999; + margin-left: 4rpx; +} + +.tags-box .iconfont { + margin-left: 4rpx; + font-size: 24rpx; } .address-box { @@ -957,9 +983,8 @@ height: 133rpx; .wineScene-price-container { width: 750rpx; height: 100rpx; - /* background: linear-gradient(-90deg,#FF413B, #FFAB2E); */ - background: #FD3856; - /* border-radius: 20rpx 20rpx 0rpx 0rpx; */ + background: linear-gradient(-90deg,#FF413B, #FFAB2E); + border-radius: 20rpx 20rpx 0rpx 0rpx; display: flex; align-items: center; justify-content: space-between; @@ -971,13 +996,13 @@ height: 133rpx; .wineScene-price-container .wineSecne-price { font-weight: bold; - font-size: 48rpx; + font-size: 36rpx; color: #FFFFFF; } .wineScene-price-container .wineSecne-money { font-size: 24rpx; font-weight: 500; - /* text-decoration-line: line-through; */ + text-decoration-line: line-through; padding-left: 14rpx; } .wineScene-price-container .wineSecne-price::before { @@ -1049,13 +1074,3 @@ height: 133rpx; width: 29rpx; height: 29rpx; } - -.select-img{ - display: flex; -} -.select-img image{ - width: 80rpx; - height: 80rpx; - border-radius: 13rpx; - margin-right:20rpx; -} \ No newline at end of file From 817b4b6e2541bf16adbcb93ee8147154a15d12d3 Mon Sep 17 00:00:00 2001 From: jiazhipeng Date: Wed, 10 Sep 2025 11:48:10 +0800 Subject: [PATCH 5/9] des --- pages/info/roadInfo/index.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pages/info/roadInfo/index.js b/pages/info/roadInfo/index.js index 3e90786..58d358d 100644 --- a/pages/info/roadInfo/index.js +++ b/pages/info/roadInfo/index.js @@ -164,8 +164,7 @@ Page({ }, order: function () { // todo 判断组合产品 - // if (this.data.info.is_compose == 1) { - if (true) { + if (this.data.info.is_compose == 1) { // 打开规格弹窗 this.setData({skuFlag: true}) return From 0eaf61eb4d1cb54fd9bb19c231759ea432c07d32 Mon Sep 17 00:00:00 2001 From: jiazhipeng Date: Wed, 10 Sep 2025 17:34:35 +0800 Subject: [PATCH 6/9] des --- pages/info/roadInfo/index.js | 7 +++++-- project.private.config.json | 11 +++++++++-- subPackages/gwcOrder/index.js | 5 +++-- utils/https.js | 4 ++-- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/pages/info/roadInfo/index.js b/pages/info/roadInfo/index.js index 58d358d..3c312d6 100644 --- a/pages/info/roadInfo/index.js +++ b/pages/info/roadInfo/index.js @@ -211,9 +211,9 @@ Page({ // 组合产品获取购买的sku getComposeSku () { + let skuId = this.data.info.sku[this.data.skuIndex].id commonApi.user_post("product/get_sku_compose_list", { - // sku_id: "190720" - sku_id: "190740" + sku_id: skuId }).then(res => { if (res&&Array.isArray(res.data)&&res.data.length>0) { res.data.forEach(v => { @@ -221,6 +221,9 @@ Page({ v.num = this.data.producNum; v.sku.compose_sku_id = v.compose_sku_id }); + app.globalData.list = [] + app.globalData.postProduct = [] + app.globalData.product = null util.orderByShoppingCart(res.data,app) } }) diff --git a/project.private.config.json b/project.private.config.json index 92c79b1..6ee0549 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -5,11 +5,18 @@ }, "condition": { "miniprogram": { - "list": [ + "list": [ + { + "name": "pages/info/roadInfo/index", + "pathName": "pages/info/roadInfo/index", + "query": "id=457643", + "scene": null, + "launchMode": "default" + } ] } }, "projectname": "%E8%8B%8F%E5%B7%9E%E6%96%87%E6%97%85", "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", - "libVersion": "development" + "libVersion": "3.9.3" } \ No newline at end of file diff --git a/subPackages/gwcOrder/index.js b/subPackages/gwcOrder/index.js index aea92d8..6d4ea30 100644 --- a/subPackages/gwcOrder/index.js +++ b/subPackages/gwcOrder/index.js @@ -321,8 +321,9 @@ Page({ commonApi._post("product/get_sku_detail_id", { sku_id: sku_id }).then(res => { - this.data.product.sku = res.data - app.globalData.product.sku = res.data + let skuInfo = {...this.data.product.sku, ...res.data, is_compose: this.data.product.sku.is_compose || 0} + this.data.product.sku = skuInfo + app.globalData.product.sku = skuInfo this.setData({ singlePrice: this.data.gp_id ? this.data.product.sku.event_price : e.detail.price, product: this.data.product diff --git a/utils/https.js b/utils/https.js index c120ad9..ac1e739 100644 --- a/utils/https.js +++ b/utils/https.js @@ -1,8 +1,8 @@ var app = getApp(); import util from "../utils/util" // import userApi from "../utils/https/user.js"; -const baseUrl = "https://test.api.cloud.sz-trip.com/api/"; -// let baseUrl = "https://api.cloud.sz-trip.com/api/"; +// const baseUrl = "https://test.api.cloud.sz-trip.com/api/"; +let baseUrl = "https://api.cloud.sz-trip.com/api/"; const env = wx.getAccountInfoSync().miniProgram.envVersion if (env == 'develop1') { baseUrl = "https://test.api.cloud.sz-trip.com/api/" From c222561c83b1d315bf5086f91a439c7d353bebdc Mon Sep 17 00:00:00 2001 From: jiazhipeng Date: Thu, 11 Sep 2025 15:45:20 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E7=BB=84=E5=90=88=E4=BA=A7=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/user/order/sceneOrderInfo/index.wxml | 2 +- pages/user/order/sceneOrderInfo/index.wxss | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml index a1976d8..40c9dd0 100644 --- a/pages/user/order/sceneOrderInfo/index.wxml +++ b/pages/user/order/sceneOrderInfo/index.wxml @@ -26,7 +26,7 @@ - {{codeImgs[codeIndex].text}}:{{codeImgs[codeIndex].code}} 复制 + {{codeImgs[codeIndex].text}}:{{codeImgs[codeIndex].code}} 复制 {{codeImgs[codeIndex].state}} {{codeIndex+1}}/{{codeImgs.length}} diff --git a/pages/user/order/sceneOrderInfo/index.wxss b/pages/user/order/sceneOrderInfo/index.wxss index 4a04db4..5aabe9b 100644 --- a/pages/user/order/sceneOrderInfo/index.wxss +++ b/pages/user/order/sceneOrderInfo/index.wxss @@ -198,7 +198,7 @@ page { } .code-box { text-align: center; - height: 440rpx; + min-height: 440rpx; position: relative; } .code-box .iconfont { @@ -330,7 +330,8 @@ page { text-align: center; font-weight: 500; font-size: 23rpx; - color: #0E8790; + color: #0E8790; + height: 40rpx; } .goods-line{ From bfa4cfe0fe03a06733074cfae19c8348c112b0be Mon Sep 17 00:00:00 2001 From: jiazhipeng Date: Thu, 11 Sep 2025 17:20:23 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/user/order/postOrderInfo/index.js | 2 ++ pages/user/order/sceneOrderInfo/index.js | 10 ++++++++++ pages/user/order/showOrderInfo/index.js | 3 +++ utils/util.js | 16 ++++++++++++++++ 4 files changed, 31 insertions(+) diff --git a/pages/user/order/postOrderInfo/index.js b/pages/user/order/postOrderInfo/index.js index 0d6a56a..0d3c819 100644 --- a/pages/user/order/postOrderInfo/index.js +++ b/pages/user/order/postOrderInfo/index.js @@ -191,6 +191,8 @@ Page({ goDetail(e){ console.log(e.currentTarget.dataset); let item = e.currentTarget.dataset.set + util.gotoDetail(item) + return if (item.is_package == 1) { wx.navigateTo({ url:"/pages/info/postProductInfo/index?id="+item.product_id diff --git a/pages/user/order/sceneOrderInfo/index.js b/pages/user/order/sceneOrderInfo/index.js index bb8e872..1d682c1 100644 --- a/pages/user/order/sceneOrderInfo/index.js +++ b/pages/user/order/sceneOrderInfo/index.js @@ -226,6 +226,16 @@ Page({ goDetail(e){ console.log(e.currentTarget.dataset); let item = e.currentTarget.dataset.set + + util.gotoDetail(item) + return + // 组合产品 跳线路 + if (item.compose_product_id) { + wx.navigateTo({ + url: '/pages/info/roadInfo/index?id='+item.compose_product_id + }) + return + } if (item.is_package == 1) { wx.navigateTo({ url:"/pages/info/postProductInfo/index?id="+item.product_id diff --git a/pages/user/order/showOrderInfo/index.js b/pages/user/order/showOrderInfo/index.js index ef6d292..bae81e8 100644 --- a/pages/user/order/showOrderInfo/index.js +++ b/pages/user/order/showOrderInfo/index.js @@ -223,6 +223,9 @@ Page({ goDetail(e){ console.log(e.currentTarget.dataset); let item = e.currentTarget.dataset.set + util.gotoDetail(item) + return + if (item.is_package==1) { wx.navigateTo({ url:"/pages/info/postProductInfo/index?id="+item.product_id diff --git a/utils/util.js b/utils/util.js index 0a025c2..dc2cb8b 100644 --- a/utils/util.js +++ b/utils/util.js @@ -180,6 +180,14 @@ const gotoDetail = (item,isPagePoint) =>{ }, type: item.type } + // 组合产品 跳线路 + if (item.compose_product_id) { + wx.navigateTo({ + url: '/pages/info/roadInfo/index?id='+item.compose_product_id + }) + return +} + if (item.is_package === 1) { wx.navigateTo({ @@ -339,6 +347,14 @@ const orderMoreTime = function(item){ if(item && item.order_product_list && item.order_product_list[0]){ let info = item.order_product_list[0]; console.log(info) + // 组合产品 跳线路 + if (info.compose_product_id) { + wx.navigateTo({ + url: '/pages/info/roadInfo/index?id='+info.compose_product_id + }) + return + } + if (info.is_package === 1) { wx.navigateTo({ url: '/pages/info/postProductInfo/index?id='+info.product_id, From 38d0acbacc1782b8197992e4d5c5e6ee060d1675 Mon Sep 17 00:00:00 2001 From: jiazhipeng Date: Fri, 12 Sep 2025 09:15:13 +0800 Subject: [PATCH 9/9] =?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/info/roadInfo/index.js | 5 ++++- pages/user/order/sceneOrderInfo/index.wxss | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pages/info/roadInfo/index.js b/pages/info/roadInfo/index.js index 3c312d6..1508b5c 100644 --- a/pages/info/roadInfo/index.js +++ b/pages/info/roadInfo/index.js @@ -503,9 +503,12 @@ Page({ setSimpleValue: function (e) { let keyname = e.currentTarget.dataset.keyname - let val = e.currentTarget.dataset.val + let val = e.currentTarget.dataset.value let param = {} param[keyname] = val + // this.setData({ + // skuFlag: false + // }) this.setData(param) }, minus: function () { diff --git a/pages/user/order/sceneOrderInfo/index.wxss b/pages/user/order/sceneOrderInfo/index.wxss index 5aabe9b..f384d99 100644 --- a/pages/user/order/sceneOrderInfo/index.wxss +++ b/pages/user/order/sceneOrderInfo/index.wxss @@ -210,7 +210,7 @@ page { left: 40rpx; text-align: center; margin-top: 125rpx; - z-index: 5; + z-index: 1; } .code-box .iconfont.icon-you { left: auto;