diff --git a/pages/info/roadInfo/index.js b/pages/info/roadInfo/index.js index 35a79f9..1508b5c 100644 --- a/pages/info/roadInfo/index.js +++ b/pages/info/roadInfo/index.js @@ -164,11 +164,11 @@ Page({ }, order: function () { // todo 判断组合产品 - // if (this.data.info.is_compose == 1) { - // // 打开规格弹窗 - // this.setData({skuFlag: true}) - // return - // } + if (this.data.info.is_compose == 1) { + // 打开规格弹窗 + this.setData({skuFlag: true}) + return + } commonApi.user_post('wx/get_user_keep', { @@ -211,13 +211,19 @@ 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: skuId }).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; + v.sku.compose_sku_id = v.compose_sku_id }); + app.globalData.list = [] + app.globalData.postProduct = [] + app.globalData.product = null util.orderByShoppingCart(res.data,app) } }) @@ -497,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/order/WineSceneOrder/index.js b/pages/order/WineSceneOrder/index.js index 9676795..d218f29 100644 --- a/pages/order/WineSceneOrder/index.js +++ b/pages/order/WineSceneOrder/index.js @@ -268,6 +268,7 @@ Page({ type: product.product.type, product_id: product.product.id, sku_id: product.sku.id, + compose_sku_id: product.sku.compose_sku_id, start_time: '', end_time: '', use_date: '', diff --git a/pages/order/orderList/index.js b/pages/order/orderList/index.js index 48b3f7a..ced412f 100644 --- a/pages/order/orderList/index.js +++ b/pages/order/orderList/index.js @@ -76,6 +76,7 @@ Page({ }, order: function (){ console.log(app.globalData.createDate); + app.globalData.createDate.coupon_id= this.data.coupon ? this.data.coupon.id : null; let service = "order/create", postData = {data: JSON.stringify(app.globalData.createDate)} commonApi.user_post(service, postData).then(res => { diff --git a/pages/order/postOrder/index.js b/pages/order/postOrder/index.js index 2f9c76c..425694b 100644 --- a/pages/order/postOrder/index.js +++ b/pages/order/postOrder/index.js @@ -157,6 +157,7 @@ Page({ product_num: item.productNum, remark: item.remark, is_batch_shipment: item.sku.batch_shipment, + compose_sku_id: item.sku.compose_sku_id, } product_list.push(productItem) }) diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js index 2a00084..eb8dba9 100644 --- a/pages/order/scene/index.js +++ b/pages/order/scene/index.js @@ -497,6 +497,7 @@ Page({ type: product.product.type, product_id: product.product.id, sku_id: (date && date.sku_id) ? date.sku_id : product.sku.id, + compose_sku_id: product.sku.compose_sku_id, start_time: time.start_time, end_time: time.end_time, use_date: date ? date.date : '', diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml index c18c03f..32de400 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/pages/order/showOrderNew/index.js b/pages/order/showOrderNew/index.js index 1118f99..99eff0f 100644 --- a/pages/order/showOrderNew/index.js +++ b/pages/order/showOrderNew/index.js @@ -418,6 +418,7 @@ Page({ type: product.product.type, product_id: product.product.id, sku_id: (date && date.sku_id) ? date.sku_id : product.sku.id, + compose_sku_id: product.sku.compose_sku_id, start_time: time.start_time, end_time: time.end_time, use_date: date ? date.date : '', 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/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..f384d99 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 { @@ -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; @@ -330,7 +330,8 @@ page { text-align: center; font-weight: 500; font-size: 23rpx; - color: #0E8790; + color: #0E8790; + height: 40rpx; } .goods-line{ 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/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/project.private.config.json b/project.private.config.json index 90e1973..01b81b5 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -19,62 +19,6 @@ "query": "id=457643", "scene": null, "launchMode": "default" - }, - { - "name": "pages/order/pay/index", - "pathName": "pages/order/pay/index", - "query": "id=28182508211650158717&token=de4306f5-7f80-4a0f-a7ae-af63cf089fa4", - "launchMode": "default", - "scene": null - }, - { - "name": "pages/pbService/web/index", - "pathName": "pages/pbService/web/index", - "query": "weburl=https%253A%252F%252Fm.cloud.sz-trip.com%252FmeetingLotus2025%253Ftoken%253D180c8775-e37f-4f91-a638-1d7f90069c52%2526lon%253D120.63327853732639%2526lat%253D31.26709312760416", - "launchMode": "default", - "scene": null - }, - { - "name": "pages/info/postProductInfo/index", - "pathName": "pages/info/postProductInfo/index", - "query": "id=457632", - "launchMode": "default", - "scene": null - }, - { - "name": "pages/login/index", - "pathName": "pages/login/index", - "query": "", - "launchMode": "default", - "scene": null - }, - { - "name": "活动首页", - "pathName": "subPackages/indexGQ/index", - "query": "", - "launchMode": "default", - "scene": null - }, - { - "name": "pages/pbService/web/index", - "pathName": "pages/pbService/web/index", - "query": "weburl=https%253A%252F%252Fm.cloud.sz-trip.com%252FaiPlay", - "launchMode": "default", - "scene": null - }, - { - "name": "pages/info/showInfo/index", - "pathName": "pages/info/showInfo/index", - "query": "id=13170", - "launchMode": "default", - "scene": null - }, - { - "name": "pages/order/showOrderNew/index", - "pathName": "pages/order/showOrderNew/index", - "query": "", - "launchMode": "default", - "scene": null } ] } diff --git a/subPackages/gwcOrder/index.js b/subPackages/gwcOrder/index.js index 54365f0..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 @@ -387,6 +388,7 @@ Page({ type: product.product.type, product_id: product.product.id, sku_id: (date && date.sku_id) ? date.sku_id : product.sku.id, + compose_sku_id: product.sku.compose_sku_id, start_time: time.start_time, end_time: time.end_time, use_date: date ? date.date : '', diff --git a/subPackages/gwcOrder/index.wxml b/subPackages/gwcOrder/index.wxml index 81db641..c28d857 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 916616f..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, @@ -578,6 +594,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({